From 2a70df20daeb1e67c1c9f275dc73ff27606a4539 Mon Sep 17 00:00:00 2001 From: wangshaoping Date: Wed, 17 Apr 2024 10:09:57 +0800 Subject: [PATCH] update --- app.platform/build.gradle | 2 + erm.frontend/package.json | 37 ++++++++------- erm/build.gradle | 1 + .../controller/IndicatorWebController.java | 2 +- .../erm/kpi/controller/LibWebController.java | 2 +- .../erm/kpi/jpa/entity/IndicatorEntity.java | 2 +- .../java/erm/kpi/jpa/entity/LibEntity.java | 2 +- .../jpa/repository/IndicatorRepository.java | 2 + .../erm/kpi/jpa/repository/LibRepository.java | 2 + gradle.properties | 4 +- io.sc.engine.mv.frontend/package.json | 4 +- .../src/views/sample/Sample.vue | 4 +- io.sc.engine.rule.frontend/package.json | 4 +- .../src/views/lib/Lib.vue | 4 +- .../server/model/entity/ParameterEntity.java | 2 +- io.sc.platform.core.frontend/package.json | 2 +- .../platform/plugin/manager/TagViewManager.ts | 19 ++++---- .../template-project/package.json | 4 +- .../package.json | 4 +- .../src/views/springboot/Mapping.vue | 6 +-- .../templates/pgp/setup/gradle.properties | 4 +- io.sc.platform.lcdp.frontend/package.json | 4 +- .../src/views/bpm/Bpm.vue | 6 +-- io.sc.platform.mvc.frontend/package.json | 4 +- io.sc.platform.security.frontend/package.json | 4 +- io.sc.platform.system.frontend/package.json | 4 +- .../src/views/department/Department.vue | 2 +- .../src/views/menu/Menu.vue | 4 +- .../src/views/monitor/Log.vue | 31 +++++++++---- .../src/views/org/Org.vue | 4 +- .../src/views/role/Role.vue | 4 +- .../src/views/user/User.vue | 4 +- .../controller/ParameterWebController.java | 2 +- io.sc.standard.frontend/package.json | 4 +- io.sc.standard.frontend/src/App.vue | 5 ++ io.sc.standard.frontend/src/boostrap.ts | 46 +++++++++++++++++++ .../src/components/index.ts | 6 +-- io.sc.standard.frontend/src/css/tailwind.css | 7 +++ io.sc.standard.frontend/src/i18n/index.ts | 18 ++++++++ io.sc.standard.frontend/src/main.ts | 1 + io.sc.standard.frontend/src/mock/index.ts | 20 ++++++++ io.sc.standard.frontend/src/shims-vue.d.ts | 33 +++++++++++++ .../src/views/Standard.vue | 22 +++++---- .../src/views/standard/GB_T_2260_2007.vue | 23 ++++++---- .../src/views/standard/GB_T_4754_2017.vue | 23 ++++++---- 45 files changed, 280 insertions(+), 114 deletions(-) diff --git a/app.platform/build.gradle b/app.platform/build.gradle index 53c25c60..70233485 100644 --- a/app.platform/build.gradle +++ b/app.platform/build.gradle @@ -25,6 +25,8 @@ dependencies { project(":io.sc.engine.rule.server"), project(":io.sc.engine.rule.sample"), + project(":erm"), + // project(":erm"), // project(":erm.frontend"), diff --git a/erm.frontend/package.json b/erm.frontend/package.json index 68f36f3a..eb8bac97 100644 --- a/erm.frontend/package.json +++ b/erm.frontend/package.json @@ -1,6 +1,6 @@ { "name": "erm.frontend", - "version": "8.1.34", + "version": "8.1.36", "description": "", "private": false, "keywords": [], @@ -68,9 +68,23 @@ "@vue/babel-plugin-jsx": "1.1.5" }, "dependencies": { + "@codemirror/autocomplete": "6.11.1", + "@codemirror/commands": "6.3.3", + "@codemirror/lang-html": "6.4.7", + "@codemirror/lang-java": "6.0.1", + "@codemirror/lang-javascript": "6.2.1", + "@codemirror/lang-json": "6.0.1", + "@codemirror/lang-sql": "6.5.4", + "@codemirror/lang-xml": "6.0.2", + "@codemirror/language": "6.10.0", + "@codemirror/search": "6.5.5", + "@codemirror/state": "6.4.0", + "@codemirror/view": "6.23.0", + "@maxgraph/core": "0.9.0", "@quasar/extras": "1.16.9", "@vueuse/core": "10.7.1", "axios": "1.6.3", + "codemirror": "6.0.1", "dayjs": "1.11.10", "echarts": "5.4.3", "exceljs": "4.4.0", @@ -78,27 +92,12 @@ "luckyexcel": "1.0.1", "mockjs": "1.1.0", "pinia": "2.1.7", - "platform-core": "8.1.178", + "platform-core": "8.1.180", "quasar": "2.14.5", "tailwindcss": "3.4.0", "vue": "3.4.3", "vue-dompurify-html": "5.0.1", "vue-i18n": "9.8.0", - "vue-router": "4.2.5", - "@codemirror/autocomplete": "6.11.1", - "@codemirror/commands": "6.3.3", - "@codemirror/lang-html": "6.4.7", - "@codemirror/lang-java": "6.0.1", - "@codemirror/lang-javascript": "6.2.1", - "@codemirror/lang-json": "6.0.1", - "@codemirror/lang-sql": "6.5.4", - "@codemirror/lang-xml": "6.0.2", - "@codemirror/language": "6.10.0", - "@codemirror/search": "6.5.5", - "@codemirror/state": "6.4.0", - "@codemirror/view": "6.23.0", - "codemirror": "6.0.1", - "vue-codemirror6": "1.2.0", - "@maxgraph/core": "0.9.0" + "vue-router": "4.2.5" } -} \ No newline at end of file +} diff --git a/erm/build.gradle b/erm/build.gradle index eed269cd..5e3febba 100644 --- a/erm/build.gradle +++ b/erm/build.gradle @@ -1,6 +1,7 @@ dependencies { api( project(":erm.api"), + project(":erm.frontend"), project(":io.sc.standard"), project(":io.sc.platform.data"), project(":io.sc.platform.system"), diff --git a/erm/src/main/java/erm/kpi/controller/IndicatorWebController.java b/erm/src/main/java/erm/kpi/controller/IndicatorWebController.java index da98c791..5eba39fb 100644 --- a/erm/src/main/java/erm/kpi/controller/IndicatorWebController.java +++ b/erm/src/main/java/erm/kpi/controller/IndicatorWebController.java @@ -17,7 +17,7 @@ import org.springframework.web.bind.annotation.RestController; import java.util.List; -@RestController +@RestController("erm.kpi.controller.IndicatorWebController") @RequestMapping("/api/erm/kpi/indicator") public class IndicatorWebController extends RestCrudController { @GetMapping("queryIndicatorsByLib") diff --git a/erm/src/main/java/erm/kpi/controller/LibWebController.java b/erm/src/main/java/erm/kpi/controller/LibWebController.java index 63fe9578..b53d853b 100644 --- a/erm/src/main/java/erm/kpi/controller/LibWebController.java +++ b/erm/src/main/java/erm/kpi/controller/LibWebController.java @@ -19,7 +19,7 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.util.List; -@RestController +@RestController("erm.kpi.controller.LibWebController") @RequestMapping("/api/erm/kpi/lib") public class LibWebController extends RestCrudController { diff --git a/erm/src/main/java/erm/kpi/jpa/entity/IndicatorEntity.java b/erm/src/main/java/erm/kpi/jpa/entity/IndicatorEntity.java index b1ee8beb..17d0817a 100644 --- a/erm/src/main/java/erm/kpi/jpa/entity/IndicatorEntity.java +++ b/erm/src/main/java/erm/kpi/jpa/entity/IndicatorEntity.java @@ -11,7 +11,7 @@ import java.math.BigDecimal; import java.util.ArrayList; import java.util.List; -@Entity +@Entity(name="erm.kpi.jpa.entity.IndicatorEntity") @Table(name="RP_INDICATOR") public class IndicatorEntity extends CorporationAuditorEntity { //ID,主键 diff --git a/erm/src/main/java/erm/kpi/jpa/entity/LibEntity.java b/erm/src/main/java/erm/kpi/jpa/entity/LibEntity.java index 0a692c04..eba358b3 100644 --- a/erm/src/main/java/erm/kpi/jpa/entity/LibEntity.java +++ b/erm/src/main/java/erm/kpi/jpa/entity/LibEntity.java @@ -10,7 +10,7 @@ import javax.validation.constraints.Size; import java.util.ArrayList; import java.util.List; -@Entity +@Entity(name="erm.kpi.jpa.entity.LibEntity") @Table(name="RP_LIB") public class LibEntity extends CorporationAuditorEntity { //ID,主键 diff --git a/erm/src/main/java/erm/kpi/jpa/repository/IndicatorRepository.java b/erm/src/main/java/erm/kpi/jpa/repository/IndicatorRepository.java index d5d2b7e7..f58083ae 100644 --- a/erm/src/main/java/erm/kpi/jpa/repository/IndicatorRepository.java +++ b/erm/src/main/java/erm/kpi/jpa/repository/IndicatorRepository.java @@ -2,9 +2,11 @@ package erm.kpi.jpa.repository; import erm.kpi.jpa.entity.IndicatorEntity; import io.sc.platform.orm.repository.DaoRepository; +import org.springframework.stereotype.Service; import java.util.List; +@Service("erm.kpi.jpa.repository.IndicatorRepository" /* 避免其他同名接口冲突 */) public interface IndicatorRepository extends DaoRepository { public IndicatorEntity findByCode(String code); public List findByCategoryOrderByName(String category); diff --git a/erm/src/main/java/erm/kpi/jpa/repository/LibRepository.java b/erm/src/main/java/erm/kpi/jpa/repository/LibRepository.java index 17dccc97..ce03d9ac 100644 --- a/erm/src/main/java/erm/kpi/jpa/repository/LibRepository.java +++ b/erm/src/main/java/erm/kpi/jpa/repository/LibRepository.java @@ -2,9 +2,11 @@ package erm.kpi.jpa.repository; import erm.kpi.jpa.entity.LibEntity; import io.sc.platform.orm.repository.DaoRepository; +import org.springframework.stereotype.Service; import java.util.List; +@Service("erm.kpi.jpa.repository.LibRepository" /* 避免其他同名接口冲突 */) public interface LibRepository extends DaoRepository { public LibEntity findByCode(String code); public List findAllByOrderByName(); diff --git a/gradle.properties b/gradle.properties index d4ae8ca5..f3738f78 100644 --- a/gradle.properties +++ b/gradle.properties @@ -36,9 +36,9 @@ application_version=1.0.0 # platform ########################################################### platform_group=io.sc -platform_version=8.1.34 +platform_version=8.1.36 platform_plugin_version=8.1.13 -platform_core_frontend_version=8.1.178 +platform_core_frontend_version=8.1.180 ########################################################### # dependencies version diff --git a/io.sc.engine.mv.frontend/package.json b/io.sc.engine.mv.frontend/package.json index 36a55720..2d1612e2 100644 --- a/io.sc.engine.mv.frontend/package.json +++ b/io.sc.engine.mv.frontend/package.json @@ -1,6 +1,6 @@ { "name": "io.sc.engine.mv.frontend", - "version": "8.1.34", + "version": "8.1.36", "description": "", "private": false, "keywords": [], @@ -92,7 +92,7 @@ "luckyexcel": "1.0.1", "mockjs": "1.1.0", "pinia": "2.1.7", - "platform-core": "8.1.178", + "platform-core": "8.1.180", "quasar": "2.14.5", "tailwindcss": "3.4.0", "vue": "3.4.3", diff --git a/io.sc.engine.mv.frontend/src/views/sample/Sample.vue b/io.sc.engine.mv.frontend/src/views/sample/Sample.vue index 9ec9755f..57b54535 100644 --- a/io.sc.engine.mv.frontend/src/views/sample/Sample.vue +++ b/io.sc.engine.mv.frontend/src/views/sample/Sample.vue @@ -6,7 +6,7 @@ - + - + - +