update

erm.frontend/package.json

@@ -78,7 +78,7 @@
     "luckyexcel": "1.0.1",
     "mockjs": "1.1.0",
     "pinia": "2.1.7",
-    "platform-core": "8.1.159",
+    "platform-core": "8.1.160",
     "quasar": "2.14.5",
     "tailwindcss": "3.4.0",
     "vue": "3.4.3",

gradle.properties

@@ -38,7 +38,7 @@ application_version=1.0.0
 platform_group=io.sc
 platform_version=8.1.30
 platform_plugin_version=8.1.13
-platform_core_frontend_version=8.1.159
+platform_core_frontend_version=8.1.160
 
 ###########################################################
 # dependencies version

io.sc.engine.mv.frontend/package.json

@@ -91,7 +91,7 @@
     "luckyexcel": "1.0.1",
     "mockjs": "1.1.0",
     "pinia": "2.1.7",
-    "platform-core": "8.1.159",
+    "platform-core": "8.1.160",
     "quasar": "2.14.5",
     "tailwindcss": "3.4.0",
     "vue": "3.4.3",

io.sc.engine.rule.frontend/package.json

@@ -91,7 +91,7 @@
     "luckyexcel": "1.0.1",
     "mockjs": "1.1.0",
     "pinia": "2.1.7",
-    "platform-core": "8.1.159",
+    "platform-core": "8.1.160",
     "quasar": "2.14.5",
     "tailwindcss": "3.4.0",
     "vue": "3.4.3",

io.sc.engine.rule.frontend/src/i18n/messages.json

@@ -3,7 +3,7 @@
   "menu.engine.rule.resources": "Resources Manager",
   "menu.engine.rule.authorization": "Authorization Manager",
   "menu.engine.rule.workflow": "Workflow",
-  "menu.engine.rule.dictionary": "Dictionary Manager",
+  "menu.engine.rule.dictionary": "Meta Data Manager",
   "menu.engine.rule.lib": "Feature Library Manager",
   "menu.engine.rule.testcase": "Test Case Manager",
   "menu.engine.rule.migration": "Migration",

io.sc.engine.rule.frontend/src/i18n/messages_tw_CN.json

@@ -3,7 +3,7 @@
   "menu.engine.rule.resources": "資源管理",
   "menu.engine.rule.authorization": "權限管理",
   "menu.engine.rule.workflow": "流程審批",
-  "menu.engine.rule.dictionary": "數據字典管理",
+  "menu.engine.rule.dictionary": "元數據管理",
   "menu.engine.rule.lib": "特征庫管理",
   "menu.engine.rule.testcase": "測試用例",
   "menu.engine.rule.migration": "數據遷移",

io.sc.engine.rule.frontend/src/i18n/messages_zh_CN.json

@@ -3,7 +3,7 @@
   "menu.engine.rule.resources": "资源管理",
   "menu.engine.rule.authorization": "权限管理",
   "menu.engine.rule.workflow": "流程审批",
-  "menu.engine.rule.dictionary": "数据字典管理",
+  "menu.engine.rule.dictionary": "元数据管理",
   "menu.engine.rule.lib": "特征库管理",
   "menu.engine.rule.testcase": "测试用例管理",
   "menu.engine.rule.migration": "数据迁移",
@@ -113,7 +113,7 @@
   "re.resources.importSample.grid.toolbar.import": "导入示例",
   "re.resources.importSample.grid.toolbar.import.tip": "您确定要导入示例资源吗?",
 
-  "re.dictionary.grid.title": "数据字典树",
+  "re.dictionary.grid.title": "元数据树",
   "re.dictionary.grid.toolbar.addGroup": "新增",
   "re.dictionary.grid.toolbar.addTop": "顶级文件夹",
   "re.dictionary.grid.toolbar.addChild": "子文件夹",
@@ -122,14 +122,25 @@
   "re.dictionary.grid.toolbar.addEnumType": "枚举类型",
   "re.dictionary.grid.toolbar.cloneGroup": "复制",
   "re.dictionary.grid.toolbar.deepClone": "深度复制",
+  "re.dictionary.grid.toolbar.deepClone.tip": "您确定要深度复制元数据吗?",
   "re.dictionary.grid.toolbar.deepCloneNew": "深度复制(新数据字典)",
+  "re.dictionary.grid.toolbar.deepCloneNew.tip": "您确定要深度复制元数据成一个新的元数据吗?",
   "re.dictionary.grid.toolbar.generateJson": "生成示例 JSON",
   "re.dictionary.grid.toolbar.deploy": "发布",
+  "re.dictionary.grid.toolbar.deploy.tip": "您确定要发布元数据吗?",
   "re.dictionary.grid.toolbar.importGroup": "导入",
   "re.dictionary.grid.toolbar.import": "导入",
   "re.dictionary.grid.toolbar.importSample": "导入示例",
 
   "re.dictionary.grid.entity.javaClassName": "Java 类全路径名称",
+
+  "re.dictionary.field.grid.title": "字段列表",
+  "re.dictionary.field.grid.entity.valueType": "值类型",
+  "re.dictionary.field.grid.entity.valueTypeIsList": "是否列表",
+  "re.dictionary.field.grid.entity.valueCalculation": "值计算公式",
+  
+
+  "re.dictionary.enum.grid.title": "枚举列表",
   
   
   

io.sc.engine.rule.server/src/main/java/io/sc/engine/rule/server/dictionary/entity/DictionaryEntity.java

@@ -67,7 +67,7 @@ public class DictionaryEntity extends AuditorEntity<DictionaryVo> implements Dee
 	private DictionaryEntity parent;
 	
 	//孩子集合
-	@OneToMany(mappedBy="parent",cascade= {CascadeType.PERSIST})
+	@OneToMany(mappedBy="parent",cascade= {CascadeType.PERSIST},fetch=FetchType.LAZY)
 	@OrderBy("order")
 	private List<DictionaryEntity> children =new ArrayList<DictionaryEntity>();
 

io.sc.engine.rule.server/src/main/java/io/sc/engine/rule/server/dictionary/entity/EnumDictionaryEntity.java

@@ -6,10 +6,7 @@ import io.sc.engine.rule.server.dictionary.vo.EnumDictionaryVo;
 import io.sc.platform.orm.util.EntityVoUtil;
 import org.springframework.beans.BeanUtils;
 
-import javax.persistence.CascadeType;
-import javax.persistence.DiscriminatorValue;
-import javax.persistence.Entity;
-import javax.persistence.OneToMany;
+import javax.persistence.*;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -21,7 +18,7 @@ import java.util.List;
 @JsonTypeName("ENUM")
 public class EnumDictionaryEntity extends ReleasableDictionaryEntity {
 	//包含的枚举项列表
-	@OneToMany(mappedBy="dictionary",cascade= {CascadeType.PERSIST})
+	@OneToMany(mappedBy="dictionary",cascade= {CascadeType.PERSIST},fetch= FetchType.LAZY)
 	protected List<EnumItemEntity> items =new ArrayList<EnumItemEntity>();
 
 	@Override

io.sc.engine.rule.server/src/main/java/io/sc/engine/rule/server/dictionary/entity/UserDefinedJavaClassDictionaryEntity.java

@@ -7,10 +7,7 @@ import io.sc.engine.rule.server.dictionary.vo.UserDefinedJavaClassDictionaryVo;
 import io.sc.platform.orm.util.EntityVoUtil;
 import org.springframework.beans.BeanUtils;
 
-import javax.persistence.CascadeType;
-import javax.persistence.DiscriminatorValue;
-import javax.persistence.Entity;
-import javax.persistence.OneToMany;
+import javax.persistence.*;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -30,7 +27,7 @@ public class UserDefinedJavaClassDictionaryEntity extends ReleasableDictionaryEn
 	}
 	
 	//包含的属性
-	@OneToMany(mappedBy="dictionary",cascade= {CascadeType.PERSIST})
+	@OneToMany(mappedBy="dictionary",cascade= {CascadeType.PERSIST},fetch= FetchType.LAZY)
 	protected List<UserDefinedJavaClassFieldEntity> fields =new ArrayList<UserDefinedJavaClassFieldEntity>();
 	
 	@Override

io.sc.engine.rule.server/src/main/java/io/sc/engine/rule/server/dictionary/entity/UserDefinedJavaClassFieldEntity.java

@@ -86,6 +86,7 @@ public class UserDefinedJavaClassFieldEntity extends AuditorEntity<UserDefinedJa
 		vo.setDescription(this.getDescription());
 		vo.setValueType(this.getValueType());
 		vo.setValueTypeVersion(this.getValueTypeVersion());
+		vo.setValueTypeIsList(this.getValueTypeIsList());
 		vo.setDefaultValue(this.getDefaultValue());
 		vo.setValueCalculation(this.getValueCalculation());
 		vo.setOrder(this.getOrder());

io.sc.engine.rule.server/src/main/java/io/sc/engine/rule/server/dictionary/service/impl/DictionaryServiceImpl.java

@@ -40,6 +40,7 @@ import org.springframework.context.ApplicationContext;
 import org.springframework.context.MessageSource;
 import org.springframework.core.io.DefaultResourceLoader;
 import org.springframework.core.io.Resource;
+import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.StringUtils;
@@ -55,7 +56,8 @@ public class DictionaryServiceImpl extends DaoServiceImpl<DictionaryEntity, Stri
 	@Autowired private ModelService modelService;
 	@Autowired private LibService libService;
 	@Autowired private DictionaryService dictionaryService;
-	
+	@Autowired private JdbcTemplate jdbcTemplate;
+
 	@Override
 	@Transactional
 	public DictionaryEntity add(DictionaryEntity entity) throws Exception {

io.sc.platform.core.frontend/package.json

@@ -1,6 +1,6 @@
 {
   "name": "platform-core",
-  "version": "8.1.159",
+  "version": "8.1.160",
   "description": "前端核心包,用于快速构建前端的脚手架",
   "//main": "库的主文件",
   "main": "dist/platform-core.js",

io.sc.platform.core.frontend/template-project/package.json

@@ -1,6 +1,6 @@
 {
   "name": "platform-core",
-  "version": "8.1.159",
+  "version": "8.1.160",
   "description": "前端核心包,用于快速构建前端的脚手架",
   "private": false,
   "keywords": [],
@@ -92,7 +92,7 @@
     "luckyexcel": "1.0.1",
     "mockjs": "1.1.0",
     "pinia": "2.1.7",
-    "platform-core": "8.1.159",
+    "platform-core": "8.1.160",
     "quasar": "2.14.5",
     "tailwindcss": "3.4.0",
     "vue": "3.4.3",

io.sc.platform.developer.frontend/package.json

@@ -91,7 +91,7 @@
     "luckyexcel": "1.0.1",
     "mockjs": "1.1.0",
     "pinia": "2.1.7",
-    "platform-core": "8.1.159",
+    "platform-core": "8.1.160",
     "quasar": "2.14.5",
     "tailwindcss": "3.4.0",
     "vue": "3.4.3",

io.sc.platform.gradle/templates/pgp/setup/gradle.properties

@@ -38,7 +38,7 @@ application_version=1.0.0
 platform_group=io.sc
 platform_version=8.1.30
 platform_plugin_version=8.1.13
-platform_core_frontend_version=8.1.159
+platform_core_frontend_version=8.1.160
 
 ###########################################################
 # dependencies version

io.sc.platform.lcdp.frontend/package.json

@@ -91,7 +91,7 @@
     "luckyexcel": "1.0.1",
     "mockjs": "1.1.0",
     "pinia": "2.1.7",
-    "platform-core": "8.1.159",
+    "platform-core": "8.1.160",
     "quasar": "2.14.5",
     "tailwindcss": "3.4.0",
     "vue": "3.4.3",

io.sc.platform.mvc.frontend/package.json

@@ -78,7 +78,7 @@
     "luckyexcel": "1.0.1",
     "mockjs": "1.1.0",
     "pinia": "2.1.7",
-    "platform-core": "8.1.159",
+    "platform-core": "8.1.160",
     "quasar": "2.14.5",
     "tailwindcss": "3.4.0",
     "vue": "3.4.3",

io.sc.platform.security.frontend/package.json

@@ -92,7 +92,7 @@
         "luckyexcel": "1.0.1",
         "mockjs": "1.1.0",
         "pinia": "2.1.7",
-        "platform-core": "8.1.159",
+        "platform-core": "8.1.160",
         "quasar": "2.14.2",
         "tailwindcss": "3.4.0",
         "vue": "3.4.3",

io.sc.platform.system.frontend/package.json

@@ -91,7 +91,7 @@
     "luckyexcel": "1.0.1",
     "mockjs": "1.1.0",
     "pinia": "2.1.7",
-    "platform-core": "8.1.159",
+    "platform-core": "8.1.160",
     "quasar": "2.14.5",
     "tailwindcss": "3.4.0",
     "vue": "3.4.3",

io.sc.standard.frontend/package.json

@@ -91,7 +91,7 @@
     "luckyexcel": "1.0.1",
     "mockjs": "1.1.0",
     "pinia": "2.1.7",
-    "platform-core": "8.1.159",
+    "platform-core": "8.1.160",
     "quasar": "2.14.5",
     "tailwindcss": "3.4.0",
     "vue": "3.4.3",