From eb8d2f34e10229cd6be457b5378bcdc5d899be0c Mon Sep 17 00:00:00 2001 From: wangshaoping Date: Fri, 22 Aug 2025 15:25:44 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9F=BA=E7=A1=80=E6=A1=86=E6=9E=B6=E5=8F=91?= =?UTF-8?q?=E5=B8=83:=208.2.35=20=20=201)=20=E4=BF=AE=E5=A4=8D=E5=B7=A5?= =?UTF-8?q?=E4=BD=9C=E6=B5=81=E4=B8=9A=E5=8A=A1=E7=B1=BB=E5=9E=8Bbug=20=20?= =?UTF-8?q?=202)=20=E4=BF=AE=E5=A4=8D=E8=A7=84=E5=88=99=E5=BC=95=E6=93=8E?= =?UTF-8?q?=E9=80=89=E9=A1=B9=E8=A1=A8=E8=BE=BE=E5=BC=8F=E9=85=8D=E7=BD=AE?= =?UTF-8?q?code=E5=92=8Cname=E6=9B=BF=E6=8D=A2=E7=9A=84bug=20=20=203?= =?UTF-8?q?=EF=BC=89=E4=BF=AE=E5=A4=8D=E6=97=A5=E6=9C=9F=E5=B7=A5=E5=85=B7?= =?UTF-8?q?=E7=B1=BB=E7=9A=84=20bug=20=20=204=EF=BC=89=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E6=B5=81=E9=80=80=E5=9B=9E=E5=90=8E=E5=8E=9F?= =?UTF-8?q?=E8=B7=AF=E6=8F=90=E4=BA=A4=E7=BB=99=E9=80=80=E5=9B=9E=E8=8A=82?= =?UTF-8?q?=E7=82=B9=E5=8F=8A=E5=85=B6=E5=8E=9F=E5=A4=84=E7=90=86=E4=BA=BA?= =?UTF-8?q?=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 前端核心发布: 8.2.128 1) --- .../main/java/app/platform/Application.java | 118 ------- cips.frontend/package.json | 4 +- erm.frontend/package.json | 4 +- gradle.properties | 4 +- io.sc.engine.mv.frontend/package.json | 4 +- .../plugins/exportable-resources.json | 32 +- io.sc.engine.rule.frontend/package.json | 4 +- .../controller/ParameterWebController.java | 2 +- .../ParameterInOptionItemServiceImpl.java | 6 +- .../service/impl/ParameterServiceImpl.java | 4 +- io.sc.platform.core.frontend/package.json | 2 +- .../components/select/WGridSelect.vue | 1 + .../src/views/testcase/form/form.vue | 271 ++++++++++----- .../template-project/package.json | 4 +- .../src/views/testcase/form/form.vue | 271 ++++++++++----- .../src/i18n/messages.json | 1 + .../src/i18n/messages_tw_CN.json | 1 + .../src/i18n/messages_zh_CN.json | 1 + .../remote-components/remote-components.json | 4 - .../src/views/XXX.vue | 4 - .../views/backend/ExportLiquibase copy.vue | 245 +++++++++++++ .../src/views/backend/ExportLiquibase.vue | 214 ++++++------ .../impl/ProcessOperationServiceImpl.java | 32 +- ...usinessKeyAndDescriptionWrapperMapper.java | 2 +- .../plugins/jdbc-connection-template.json | 2 +- .../exporter/LiquibaseDataCsvExporter.java | 2 +- .../exporter/LiquibaseSchemaExporter.java | 4 +- .../schemacrawler/MetaDataLoaderImpl.java | 322 +++++++++--------- .../JdbcMetaDataLoaderWebController.java | 15 +- .../exporter/support/DataExportConfigure.java | 9 + .../support/SchemaExportConfigure.java | 9 + .../sc/platform/jdbc/meta/MetaDataLoader.java | 36 +- .../platform/jdbc/meta/support/Catalog.java | 13 + .../service/JdbcMetaDataLoaderService.java | 6 +- .../impl/JdbcMetaDataLoaderServiceImpl.java | 24 +- .../io/sc/platform/jdbc/util/SqlTypeUtil.java | 1 - .../public/flowable/modeler/index.html | 2 +- .../lcdp/form/service/FormService.java | 2 + .../form/service/impl/FormServiceImpl.java | 9 +- .../plugins/application-properties.json | 8 + .../orm/task/thread/ExportTaskThread.java | 4 +- .../platform/orm/task/thread/TaskThread.java | 2 +- .../java/io/sc/platform/util/DateUtil.java | 8 +- 43 files changed, 1098 insertions(+), 615 deletions(-) delete mode 100644 io.sc.platform.developer.frontend/src/views/XXX.vue create mode 100644 io.sc.platform.developer.frontend/src/views/backend/ExportLiquibase copy.vue create mode 100644 io.sc.platform.jdbc/src/main/java/io/sc/platform/jdbc/meta/support/Catalog.java diff --git a/app.platform/src/main/java/app/platform/Application.java b/app.platform/src/main/java/app/platform/Application.java index fbf65453..e8a7f8e9 100644 --- a/app.platform/src/main/java/app/platform/Application.java +++ b/app.platform/src/main/java/app/platform/Application.java @@ -2,14 +2,9 @@ package app.platform; import io.sc.platform.core.ApplicationLauncher; import io.sc.platform.core.PlatformSpringBootServletInitializer; -import io.sc.platform.orm.service.support.QueryParameter; -import io.sc.platform.orm.service.support.criteria.Criteria; -import io.sc.platform.orm.service.support.criteria.impl.GreaterOrEquals; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.web.WebApplicationInitializer; -import java.util.List; - /** * 应用程序入口 */ @@ -17,118 +12,5 @@ import java.util.List; public class Application extends PlatformSpringBootServletInitializer implements WebApplicationInitializer { public static void main(String[] args) throws Exception { ApplicationLauncher.run(Application.class,args); - String xml ="\n" + - " \n" + - " \n" + - " \n" + - " \n" + - " {\"A2\":\"platformAssigneeQueryService\"}\n" + - " \n" + - " \n" + - " \n" + - " \n" + - " \n" + - " \n" + - " \n" + - " \n" + - " \n" + - " \n" + - " \n" + - " \n" + - " \n" + - " \n" + - " \n" + - " \n" + - " \n" + - " \n" + - " \n" + - " \n" + - " \n" + - " \n" + - " \n" + - " \n" + - " \n" + - " \n" + - " \n" + - " \n" + - " \n" + - " \n" + - " \n" + - " \n" + - " \n" + - " \n" + - " \n" + - " \n" + - " \n" + - " \n" + - " \n" + - " \n" + - " \n" + - " \n" + - " \n" + - " \n" + - " \n" + - " \n" + - " \n" + - " \n" + - " \n" + - " \n" + - " \n" + - " \n" + - " \n" + - " \n" + - " \n" + - " \n" + - " \n" + - " \n" + - " \n" + - " \n" + - " \n" + - " \n" + - " \n" + - " \n" + - " \n" + - " \n" + - " \n" + - " \n" + - " \n" + - " \n" + - " \n" + - " \n" + - " \n" + - " \n" + - " \n" + - " \n" + - " \n" + - " \n" + - " \n" + - " \n" + - " \n" + - " \n" + - " \n" + - " \n" + - " \n" + - " \n" + - " \n" + - " \n" + - " \n" + - " \n" + - " \n" + - " \n" + - " \n" + - " \n" + - " \n" + - " \n" + - " \n" + - " \n" + - " \n" + - " \n" + - " \n" + - " \n" + - " \n" + - " \n" + - " \n" + - " \n" + - " "; } } diff --git a/cips.frontend/package.json b/cips.frontend/package.json index 88e9e7a6..4dd6eeb8 100644 --- a/cips.frontend/package.json +++ b/cips.frontend/package.json @@ -1,6 +1,6 @@ { "name": "cips.frontend", - "version": "8.2.34", + "version": "8.2.35", "description": "", "private": false, "keywords": [], @@ -112,7 +112,7 @@ "node-sql-parser": "5.3.6", "pinia": "2.3.0", "pinia-undo": "0.2.4", - "platform-core": "8.2.127", + "platform-core": "8.2.128", "quasar": "2.17.6", "sort-array": "5.0.0", "svg-path-commander": "2.1.7", diff --git a/erm.frontend/package.json b/erm.frontend/package.json index 2f899ea1..1d84e840 100644 --- a/erm.frontend/package.json +++ b/erm.frontend/package.json @@ -1,6 +1,6 @@ { "name": "erm.frontend", - "version": "8.2.34", + "version": "8.2.35", "description": "", "private": false, "keywords": [], @@ -112,7 +112,7 @@ "node-sql-parser": "5.3.6", "pinia": "2.3.0", "pinia-undo": "0.2.4", - "platform-core": "8.2.127", + "platform-core": "8.2.128", "quasar": "2.17.6", "sort-array": "5.0.0", "svg-path-commander": "2.1.7", diff --git a/gradle.properties b/gradle.properties index b8850e93..b5f28e0b 100644 --- a/gradle.properties +++ b/gradle.properties @@ -37,9 +37,9 @@ application_version=1.0.0 # platform ########################################################### platform_group=io.sc -platform_version=8.2.34 +platform_version=8.2.35 platform_plugin_version=8.2.10 -platform_core_frontend_version=8.2.127 +platform_core_frontend_version=8.2.128 ########################################################### # dependencies version diff --git a/io.sc.engine.mv.frontend/package.json b/io.sc.engine.mv.frontend/package.json index ccfcf15b..47602526 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.2.34", + "version": "8.2.35", "description": "", "private": false, "keywords": [], @@ -112,7 +112,7 @@ "node-sql-parser": "5.3.6", "pinia": "2.3.0", "pinia-undo": "0.2.4", - "platform-core": "8.2.127", + "platform-core": "8.2.128", "quasar": "2.17.6", "sort-array": "5.0.0", "svg-path-commander": "2.1.7", diff --git a/io.sc.engine.rule.client/src/main/resources/META-INF/platform/plugins/exportable-resources.json b/io.sc.engine.rule.client/src/main/resources/META-INF/platform/plugins/exportable-resources.json index 45d85b8e..79ca3bf5 100644 --- a/io.sc.engine.rule.client/src/main/resources/META-INF/platform/plugins/exportable-resources.json +++ b/io.sc.engine.rule.client/src/main/resources/META-INF/platform/plugins/exportable-resources.json @@ -29,31 +29,31 @@ }, { "type" :"file", - "name" :"io.sc.engine.rule.core-8.2.27.jar", - "description" :"io.sc.engine.rule.core-8.2.27.jar", - "sources" :["classpath:/io/sc/engine/rule/client/jars/io.sc.engine.rule.core-8.2.27.jar"], - "target" :"${dir.engine.rule.classpath}/io.sc.engine.rule.core-8.2.27.jar" + "name" :"io.sc.engine.rule.core-8.2.34.jar", + "description" :"io.sc.engine.rule.core-8.2.34.jar", + "sources" :["classpath:/io/sc/engine/rule/client/jars/io.sc.engine.rule.core-8.2.34.jar"], + "target" :"${dir.engine.rule.classpath}/io.sc.engine.rule.core-8.2.34.jar" }, { "type" :"file", - "name" :"io.sc.platform.util-8.2.27.jar", - "description" :"io.sc.platform.util-8.2.27.jar", - "sources" :["classpath:/io/sc/engine/rule/client/jars/io.sc.platform.util-8.2.27.jar"], - "target" :"${dir.engine.rule.classpath}/io.sc.platform.util-8.2.27.jar" + "name" :"io.sc.platform.util-8.2.34.jar", + "description" :"io.sc.platform.util-8.2.34.jar", + "sources" :["classpath:/io/sc/engine/rule/client/jars/io.sc.platform.util-8.2.34.jar"], + "target" :"${dir.engine.rule.classpath}/io.sc.platform.util-8.2.34.jar" }, { "type" :"file", - "name" :"io.sc.creditreport.core-8.2.27.jar", - "description" :"io.sc.creditreport.core-8.2.27.jar", - "sources" :["classpath:/io/sc/engine/rule/client/jars/io.sc.creditreport.core-8.2.27.jar"], - "target" :"${dir.engine.rule.classpath}/io.sc.creditreport.core-8.2.27.jar" + "name" :"io.sc.creditreport.core-8.2.34.jar", + "description" :"io.sc.creditreport.core-8.2.34.jar", + "sources" :["classpath:/io/sc/engine/rule/client/jars/io.sc.creditreport.core-8.2.34.jar"], + "target" :"${dir.engine.rule.classpath}/io.sc.creditreport.core-8.2.34.jar" }, { "type" :"file", - "name" :"io.sc.engine.rule.client.spring-8.2.27.jar", - "description" :"io.sc.engine.rule.client.spring-8.2.27.jar", - "sources" :["classpath:/io/sc/engine/rule/client/jars/io.sc.engine.rule.client.spring-8.2.27.jar"], - "target" :"${dir.engine.rule.classpath}/io.sc.engine.rule.client.spring-8.2.27.jar" + "name" :"io.sc.engine.rule.client.spring-8.2.34.jar", + "description" :"io.sc.engine.rule.client.spring-8.2.34.jar", + "sources" :["classpath:/io/sc/engine/rule/client/jars/io.sc.engine.rule.client.spring-8.2.34.jar"], + "target" :"${dir.engine.rule.classpath}/io.sc.engine.rule.client.spring-8.2.34.jar" }, { diff --git a/io.sc.engine.rule.frontend/package.json b/io.sc.engine.rule.frontend/package.json index c6e9e5d3..d0cb74a8 100644 --- a/io.sc.engine.rule.frontend/package.json +++ b/io.sc.engine.rule.frontend/package.json @@ -1,6 +1,6 @@ { "name": "io.sc.engine.rule.frontend", - "version": "8.2.34", + "version": "8.2.35", "description": "", "private": false, "keywords": [], @@ -112,7 +112,7 @@ "node-sql-parser": "5.3.6", "pinia": "2.3.0", "pinia-undo": "0.2.4", - "platform-core": "8.2.127", + "platform-core": "8.2.128", "quasar": "2.17.6", "sort-array": "5.0.0", "svg-path-commander": "2.1.7", diff --git a/io.sc.engine.rule.server/src/main/java/io/sc/engine/rule/server/model/controller/ParameterWebController.java b/io.sc.engine.rule.server/src/main/java/io/sc/engine/rule/server/model/controller/ParameterWebController.java index 9229118a..7c2df198 100644 --- a/io.sc.engine.rule.server/src/main/java/io/sc/engine/rule/server/model/controller/ParameterWebController.java +++ b/io.sc.engine.rule.server/src/main/java/io/sc/engine/rule/server/model/controller/ParameterWebController.java @@ -47,7 +47,7 @@ public class ParameterWebController extends RestCrudController entities =service.findParametersByModelId(modelId); - ParameterAndValueType parameterAndValueType =parameterAndValueTypeService.findInParameterByResourceId(rootModelEntity.getResource().getId(),locale); + ParameterAndValueType parameterAndValueType =parameterAndValueTypeService.findByModelId(modelId,Locale.getDefault()); VariableCodeAndNameReplacer.replace(entities,parameterAndValueType, ReplaceMode.CODE_TO_NAME); return EntityVoUtil.toVo(entities); } diff --git a/io.sc.engine.rule.server/src/main/java/io/sc/engine/rule/server/model/service/impl/ParameterInOptionItemServiceImpl.java b/io.sc.engine.rule.server/src/main/java/io/sc/engine/rule/server/model/service/impl/ParameterInOptionItemServiceImpl.java index 1643670b..919fea59 100644 --- a/io.sc.engine.rule.server/src/main/java/io/sc/engine/rule/server/model/service/impl/ParameterInOptionItemServiceImpl.java +++ b/io.sc.engine.rule.server/src/main/java/io/sc/engine/rule/server/model/service/impl/ParameterInOptionItemServiceImpl.java @@ -72,7 +72,8 @@ public class ParameterInOptionItemServiceImpl extends DaoServiceImpl { } needFetchData.value = false; customDisplayValue.value = ''; + console.info('modelValue.value', modelValue.value); if (Array.isArray(modelValue.value)) { if (props.grid['tree']) { fieldMethodsClass.clearValue(); diff --git a/io.sc.platform.core.frontend/src/views/testcase/form/form.vue b/io.sc.platform.core.frontend/src/views/testcase/form/form.vue index a793640d..8e85a6e1 100644 --- a/io.sc.platform.core.frontend/src/views/testcase/form/form.vue +++ b/io.sc.platform.core.frontend/src/views/testcase/form/form.vue @@ -1,82 +1,199 @@ diff --git a/io.sc.platform.core.frontend/template-project/package.json b/io.sc.platform.core.frontend/template-project/package.json index 49ddf4a5..5ef81b7b 100644 --- a/io.sc.platform.core.frontend/template-project/package.json +++ b/io.sc.platform.core.frontend/template-project/package.json @@ -1,6 +1,6 @@ { "name": "platform-core", - "version": "8.2.127", + "version": "8.2.128", "description": "前端核心包,用于快速构建前端的脚手架", "private": false, "keywords": [], @@ -111,7 +111,7 @@ "mockjs": "1.1.0", "node-sql-parser": "5.3.6", "pinia": "2.3.0", - "platform-core": "8.2.127", + "platform-core": "8.2.128", "quasar": "2.17.6", "sort-array": "5.0.0", "svg-path-commander": "2.1.7", diff --git a/io.sc.platform.core.frontend/template-project/src/views/testcase/form/form.vue b/io.sc.platform.core.frontend/template-project/src/views/testcase/form/form.vue index a793640d..8e85a6e1 100644 --- a/io.sc.platform.core.frontend/template-project/src/views/testcase/form/form.vue +++ b/io.sc.platform.core.frontend/template-project/src/views/testcase/form/form.vue @@ -1,82 +1,199 @@ diff --git a/io.sc.platform.developer.frontend/src/i18n/messages.json b/io.sc.platform.developer.frontend/src/i18n/messages.json index 9b604d5c..4c90d6d3 100644 --- a/io.sc.platform.developer.frontend/src/i18n/messages.json +++ b/io.sc.platform.developer.frontend/src/i18n/messages.json @@ -46,6 +46,7 @@ "developer.backend.import.liquibase.import.tip": "Are you sure to import?", "developer.backend.export.liquibase.datasource": "Datasource", + "developer.backend.export.liquibase.catalog": "Catalog", "developer.backend.export.liquibase.schema": "Schema", "developer.backend.export.liquibase.tables": "Tables", "developer.backend.export.liquibase.export.tip": "Are you sure to export?", diff --git a/io.sc.platform.developer.frontend/src/i18n/messages_tw_CN.json b/io.sc.platform.developer.frontend/src/i18n/messages_tw_CN.json index 9c22c827..ae0d03a7 100644 --- a/io.sc.platform.developer.frontend/src/i18n/messages_tw_CN.json +++ b/io.sc.platform.developer.frontend/src/i18n/messages_tw_CN.json @@ -46,6 +46,7 @@ "developer.backend.import.liquibase.import.tip": "您確定要導入嗎?", "developer.backend.export.liquibase.datasource": "數據源", + "developer.backend.export.liquibase.catalog": "目錄", "developer.backend.export.liquibase.schema": "方案", "developer.backend.export.liquibase.tables": "表", "developer.backend.export.liquibase.export.tip": "您確定要導出嗎?", diff --git a/io.sc.platform.developer.frontend/src/i18n/messages_zh_CN.json b/io.sc.platform.developer.frontend/src/i18n/messages_zh_CN.json index 3c990656..e28924b1 100644 --- a/io.sc.platform.developer.frontend/src/i18n/messages_zh_CN.json +++ b/io.sc.platform.developer.frontend/src/i18n/messages_zh_CN.json @@ -46,6 +46,7 @@ "developer.backend.import.liquibase.import.tip": "您确定要导入吗?", "developer.backend.export.liquibase.datasource": "数据源", + "developer.backend.export.liquibase.catalog": "目录", "developer.backend.export.liquibase.schema": "方案", "developer.backend.export.liquibase.tables": "表", "developer.backend.export.liquibase.export.tip": "您确定要导出吗?", diff --git a/io.sc.platform.developer.frontend/src/remote-components/remote-components.json b/io.sc.platform.developer.frontend/src/remote-components/remote-components.json index 46e62520..8e2b7eeb 100644 --- a/io.sc.platform.developer.frontend/src/remote-components/remote-components.json +++ b/io.sc.platform.developer.frontend/src/remote-components/remote-components.json @@ -5,8 +5,4 @@ "componentPath": "组件 .vue 文件路径" } */ - { - "component": "component.remote.developer.XXX", - "componentPath": "@/views/XXX.vue" - } ] diff --git a/io.sc.platform.developer.frontend/src/views/XXX.vue b/io.sc.platform.developer.frontend/src/views/XXX.vue deleted file mode 100644 index 66471465..00000000 --- a/io.sc.platform.developer.frontend/src/views/XXX.vue +++ /dev/null @@ -1,4 +0,0 @@ - - diff --git a/io.sc.platform.developer.frontend/src/views/backend/ExportLiquibase copy.vue b/io.sc.platform.developer.frontend/src/views/backend/ExportLiquibase copy.vue new file mode 100644 index 00000000..4b648152 --- /dev/null +++ b/io.sc.platform.developer.frontend/src/views/backend/ExportLiquibase copy.vue @@ -0,0 +1,245 @@ + + diff --git a/io.sc.platform.developer.frontend/src/views/backend/ExportLiquibase.vue b/io.sc.platform.developer.frontend/src/views/backend/ExportLiquibase.vue index 2f6acc96..9714d04a 100644 --- a/io.sc.platform.developer.frontend/src/views/backend/ExportLiquibase.vue +++ b/io.sc.platform.developer.frontend/src/views/backend/ExportLiquibase.vue @@ -1,103 +1,73 @@