diff --git a/erm.frontend/package.json b/erm.frontend/package.json index 341fbced..7ce44a4f 100644 --- a/erm.frontend/package.json +++ b/erm.frontend/package.json @@ -1,6 +1,6 @@ { "name": "erm.frontend", - "version": "8.1.29", + "version": "8.1.30", "description": "", "private": false, "keywords": [], @@ -78,7 +78,7 @@ "luckyexcel": "1.0.1", "mockjs": "1.1.0", "pinia": "2.1.7", - "platform-core": "8.1.158", + "platform-core": "8.1.159", "quasar": "2.14.5", "tailwindcss": "3.4.0", "vue": "3.4.3", diff --git a/gradle.properties b/gradle.properties index 58335e03..66cf22a3 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.29 +platform_version=8.1.30 platform_plugin_version=8.1.13 -platform_core_frontend_version=8.1.158 +platform_core_frontend_version=8.1.159 ########################################################### # dependencies version diff --git a/io.sc.engine.mv.frontend/package.json b/io.sc.engine.mv.frontend/package.json index 3e669194..dcb66744 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.29", + "version": "8.1.30", "description": "", "private": false, "keywords": [], @@ -91,7 +91,7 @@ "luckyexcel": "1.0.1", "mockjs": "1.1.0", "pinia": "2.1.7", - "platform-core": "8.1.158", + "platform-core": "8.1.159", "quasar": "2.14.5", "tailwindcss": "3.4.0", "vue": "3.4.3", diff --git a/io.sc.engine.rule.core/src/main/java/io/sc/engine/rule/core/enums/DictionaryType.java b/io.sc.engine.rule.core/src/main/java/io/sc/engine/rule/core/enums/DictionaryType.java index 0d803817..cc270e61 100644 --- a/io.sc.engine.rule.core/src/main/java/io/sc/engine/rule/core/enums/DictionaryType.java +++ b/io.sc.engine.rule.core/src/main/java/io/sc/engine/rule/core/enums/DictionaryType.java @@ -2,8 +2,6 @@ package io.sc.engine.rule.core.enums; /** * 数据字典类型枚举 - * @author wangshaoping - * */ public enum DictionaryType { FOLDER, //文件夹 diff --git a/io.sc.engine.rule.frontend/package.json b/io.sc.engine.rule.frontend/package.json index effecb01..db8980e4 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.1.29", + "version": "8.1.30", "description": "", "private": false, "keywords": [], @@ -91,7 +91,7 @@ "luckyexcel": "1.0.1", "mockjs": "1.1.0", "pinia": "2.1.7", - "platform-core": "8.1.158", + "platform-core": "8.1.159", "quasar": "2.14.5", "tailwindcss": "3.4.0", "vue": "3.4.3", diff --git a/io.sc.engine.rule.frontend/src/i18n/messages.json b/io.sc.engine.rule.frontend/src/i18n/messages.json index 44e9ede0..ed461c7a 100644 --- a/io.sc.engine.rule.frontend/src/i18n/messages.json +++ b/io.sc.engine.rule.frontend/src/i18n/messages.json @@ -106,4 +106,12 @@ "re.resources.designer.testCaseParameter.grid.entity.expectValue": "Expect Value", "re.resources.designer.testCaseParameter.grid.entity.resultValue": "Result Value", "re.resources.designer.testCaseParameter.grid.entity.skipCheck": "Skip Check", + "re.resources.designer.testCaseParameter.grid.entity.testResult": "Result", + + "re.resources.importSample.dialog.title": "Import Sample Resource", + "re.resources.importSample.grid.title": "Sample List", + "re.resources.importSample.grid.toolbar.import": "Import Sample", + "re.resources.importSample.grid.toolbar.import.tip": "Are you sure to import the samples?", + + "re.dictionary.grid.title": "Dictionary Tree", } \ No newline at end of file diff --git a/io.sc.engine.rule.frontend/src/i18n/messages_tw_CN.json b/io.sc.engine.rule.frontend/src/i18n/messages_tw_CN.json index 41ac84ee..050279c4 100644 --- a/io.sc.engine.rule.frontend/src/i18n/messages_tw_CN.json +++ b/io.sc.engine.rule.frontend/src/i18n/messages_tw_CN.json @@ -107,4 +107,11 @@ "re.resources.designer.testCaseParameter.grid.entity.resultValue": "結果值", "re.resources.designer.testCaseParameter.grid.entity.skipCheck": "跳過檢查", "re.resources.designer.testCaseParameter.grid.entity.testResult": "測試結果", + + "re.resources.importSample.dialog.title": "導入示例資源", + "re.resources.importSample.grid.title": "示例資源列表", + "re.resources.importSample.grid.toolbar.import": "導入示例", + "re.resources.importSample.grid.toolbar.import.tip": "您確定要導入示例資源嗎?", + + "re.dictionary.grid.title": "數據字典樹", } \ No newline at end of file diff --git a/io.sc.engine.rule.frontend/src/i18n/messages_zh_CN.json b/io.sc.engine.rule.frontend/src/i18n/messages_zh_CN.json index 40c7a20e..0db4245b 100644 --- a/io.sc.engine.rule.frontend/src/i18n/messages_zh_CN.json +++ b/io.sc.engine.rule.frontend/src/i18n/messages_zh_CN.json @@ -108,4 +108,34 @@ "re.resources.designer.testCaseParameter.grid.entity.skipCheck": "跳过检查", "re.resources.designer.testCaseParameter.grid.entity.testResult": "测试结果", + "re.resources.importSample.dialog.title": "导入示例资源", + "re.resources.importSample.grid.title": "示例资源列表", + "re.resources.importSample.grid.toolbar.import": "导入示例", + "re.resources.importSample.grid.toolbar.import.tip": "您确定要导入示例资源吗?", + + "re.dictionary.grid.title": "数据字典树", + "re.dictionary.grid.toolbar.addGroup": "新增", + "re.dictionary.grid.toolbar.addTop": "顶级文件夹", + "re.dictionary.grid.toolbar.addChild": "子文件夹", + "re.dictionary.grid.toolbar.addJavaType": "Java 类型", + "re.dictionary.grid.toolbar.addUserDefinedJavaClassType": "用户自定义类型", + "re.dictionary.grid.toolbar.addEnumType": "枚举类型", + "re.dictionary.grid.toolbar.cloneGroup": "复制", + "re.dictionary.grid.toolbar.deepClone": "深度复制", + "re.dictionary.grid.toolbar.deepCloneNew": "深度复制(新数据字典)", + "re.dictionary.grid.toolbar.generateJson": "生成示例 JSON", + "re.dictionary.grid.toolbar.deploy": "发布", + "re.dictionary.grid.toolbar.importGroup": "导入", + "re.dictionary.grid.toolbar.import": "导入", + "re.dictionary.grid.toolbar.importSample": "导入示例", + + "re.dictionary.grid.entity.javaClassName": "Java 类全路径名称", + + + + + + + + } \ No newline at end of file diff --git a/io.sc.engine.rule.frontend/src/views/authorization/Authorization.vue b/io.sc.engine.rule.frontend/src/views/authorization/Authorization.vue index bc1844a1..54d9039f 100644 --- a/io.sc.engine.rule.frontend/src/views/authorization/Authorization.vue +++ b/io.sc.engine.rule.frontend/src/views/authorization/Authorization.vue @@ -1,4 +1,131 @@ - + diff --git a/io.sc.engine.rule.frontend/src/views/dictionary/dictionary.vue b/io.sc.engine.rule.frontend/src/views/dictionary/dictionary.vue index a3ce0e14..10586fec 100644 --- a/io.sc.engine.rule.frontend/src/views/dictionary/dictionary.vue +++ b/io.sc.engine.rule.frontend/src/views/dictionary/dictionary.vue @@ -1,4 +1,410 @@ - + diff --git a/io.sc.engine.rule.frontend/src/views/resources/AttachmentDialog.vue b/io.sc.engine.rule.frontend/src/views/resources/AttachmentDialog.vue index 7c32ebd3..94a15397 100644 --- a/io.sc.engine.rule.frontend/src/views/resources/AttachmentDialog.vue +++ b/io.sc.engine.rule.frontend/src/views/resources/AttachmentDialog.vue @@ -1,8 +1,9 @@ + diff --git a/io.sc.engine.rule.frontend/src/views/resources/ImportSampleDialog.vue b/io.sc.engine.rule.frontend/src/views/resources/ImportSampleDialog.vue new file mode 100644 index 00000000..d711456c --- /dev/null +++ b/io.sc.engine.rule.frontend/src/views/resources/ImportSampleDialog.vue @@ -0,0 +1,91 @@ + + diff --git a/io.sc.engine.rule.frontend/src/views/resources/Resources.vue b/io.sc.engine.rule.frontend/src/views/resources/Resources.vue index 4984a082..f817bc86 100644 --- a/io.sc.engine.rule.frontend/src/views/resources/Resources.vue +++ b/io.sc.engine.rule.frontend/src/views/resources/Resources.vue @@ -6,7 +6,7 @@ dense-body :config-button="true" selection="multiple" - :checkbox-selection="true" + :checkbox-selection="false" :tree="true" :tree-icon=" (row) => { @@ -189,19 +189,33 @@ name: 'import', label: $t('import'), icon: 'file_upload', - click: () => {}, + click: () => { + importDialogRef.open(); + }, }, { name: 'importExample', label: $t('re.resources.grid.toolbar.importExample'), - icon: 'bi-cloud-arrow-up-fill', - click: () => {}, + icon: 'bi-database-up', + click: () => { + importSampleDialogRef.open(); + }, }, ], 'separator', 'view', 'separator', - 'export', + { + extend: 'export', + enableIf: (arg) => { + return arg.selected; + }, + click: (arg) => { + //axios.get(Environment.apiContextPath('/api/re/resource/export/' + arg.selected.id)); + let url = Environment.apiContextPath('/api/re/resource/export/' + arg.selected.id); + downloadIframe.src = url; + }, + }, ]" :columns="[ { width: '100%', name: 'name', label: $t('name') }, @@ -282,6 +296,13 @@ ], }, }" + @row-db-click=" + (e, row) => { + if (row.type !== 'FOLDER') { + designerDialogRef.open(row); + } + } + " > + + + diff --git a/io.sc.engine.rule.frontend/src/views/resources/designer/DesignerDialog.vue b/io.sc.engine.rule.frontend/src/views/resources/designer/DesignerDialog.vue index 14e5d0fa..f270188c 100644 --- a/io.sc.engine.rule.frontend/src/views/resources/designer/DesignerDialog.vue +++ b/io.sc.engine.rule.frontend/src/views/resources/designer/DesignerDialog.vue @@ -55,7 +55,7 @@ -