Merge branch 'develop' of http://117.78.60.236:8000/csbr-daop/fe-data-asset-management into develop

@@ -432,9 +432,10 @@ const open = (msg, type, isBatch = false) => {
       if (res.code == proxy.$passCode) {
         page.value.curr = 1;
         getTableData();
-        let node = qualityModelTreeRef.value.treeRef.store.nodesMap[currTableData.value.modelGroupGuid];
-        node.loaded = false;
-        node.expand();
+        // let node = qualityModelTreeRef.value.treeRef.store.nodesMap[currTableData.value.modelGroupGuid];
+        // node.loaded = false;
+        // node.expand();
+        getQualityGroupTreeData();
         ElMessage.success('删除成功');
       } else {
         ElMessage.error(res.msg);
@@ -612,9 +613,10 @@ const ruleOpen = (msg, type, isBatch = false) => {
     deleteQualityTableRule(guids).then((res: any) => {
       if (res.code == proxy.$passCode) {
         getRuleTableData();
-        let node = qualityModelTreeRef.value.treeRef.store.nodesMap[lastSelectNode.value.data.guid];
-        node.loaded = false;
-        node.expand();
+        // let node = qualityModelTreeRef.value.treeRef.store.nodesMap[lastSelectNode.value.data.guid];
+        // node.loaded = false;
+        // node.expand();
+        getQualityGroupTreeData();
         ElMessage.success('删除质检表成功');
       } else {
         ElMessage.error(res.msg);
@@ -871,8 +873,9 @@ onActivated(async () => {
         if (lastSelectNode.value && lastSelectNode.value.data.guid == dataQualityStore.modelGroupGuid) {
           getTableData();
         }
-        let node = qualityModelTreeRef.value.treeRef.store.nodesMap[dataQualityStore.modelGroupGuid];
-        node?.expand();
+        // let node = qualityModelTreeRef.value.treeRef.store.nodesMap[dataQualityStore.modelGroupGuid];
+        // node?.expand();
+        getQualityGroupTreeData();
         dataQualityStore.set(null);
       });
     } else {
@@ -880,8 +883,9 @@ onActivated(async () => {
       if (lastSelectNode.value && lastSelectNode.value.data.guid == dataQualityStore.modelGroupGuid) {
         getTableData();
       }
-      let node = qualityModelTreeRef.value.treeRef.store.nodesMap[dataQualityStore.modelGroupGuid];
-      node.expand();
+      // let node = qualityModelTreeRef.value.treeRef.store.nodesMap[dataQualityStore.modelGroupGuid];
+      // node.expand();
+      getQualityGroupTreeData();
       dataQualityStore.set(null);
     }
   }

@@ -146,15 +146,15 @@ const rulesListByType: any = computed(() => {
 		char: checkRulesList.value.filter(r => r.value == 'length_rule' || r.value == 'ch_rule' || r.value == 'en_rule' || r.value == 'num_value_rule' || r.value == 'custom_regular_rule'),
 		varchar: checkRulesList.value.filter(r => r.value == 'length_rule' || r.value == 'id_card_rule' || r.value == 'phone_number_rule' || r.value == 'ch_rule' || r.value == 'en_rule' || r.value == 'num_value_rule' || r.value == 'custom_regular_rule'),
 		int: checkRulesList.value.filter(r => r.value == 'length_rule' || r.value == 'num_value_rule' || r.value == 'custom_regular_rule'),
-		date: checkRulesList.value.filter(r => r.value == 'date_format_rule' || r.value == 'custom_regular_rule'),
-		datetime: checkRulesList.value.filter(r => r.value == 'date_format_rule' || r.value == 'custom_regular_rule'),
-		timestamp: checkRulesList.value.filter(r => r.value == 'custom_regular_rule' || r.value == 'custom_regular_rule'),
+		date: checkRulesList.value.filter(r => r.value == 'length_rule' || r.value == 'date_format_rule' || r.value == 'custom_regular_rule'),
+		datetime: checkRulesList.value.filter(r => r.value == 'length_rule' || r.value == 'date_format_rule' || r.value == 'custom_regular_rule'),
+		timestamp: checkRulesList.value.filter(r => r.value == 'length_rule' || r.value == 'custom_regular_rule' || r.value == 'custom_regular_rule'),
 		//	text: checkRulesList.value.filter(r => r.value == ''),
 		decimal: checkRulesList.value.filter(r => r.value == 'length_rule' || r.value == 'precision_rule' || r.value == 'num_value_rule' || r.value == 'custom_regular_rule'),
 		//	json: checkRulesList.value.filter(r => r.value == ''),
 		tinyint: checkRulesList.value.filter(r => r.value == 'length_rule' || r.value == 'num_value_rule' || r.value == 'custom_regular_rule'),
-		time: checkRulesList.value.filter(r => r.value == 'custom_regular_rule'),
-		bit: checkRulesList.value.filter(r => r.value == 'ch_rule' || r.value == 'en_rule' || r.value == 'custom_regular_rule'),
+		time: checkRulesList.value.filter(r => r.value == 'length_rule' || r.value == 'custom_regular_rule'),
+		bit: checkRulesList.value.filter(r => r.value == 'length_rule' || r.value == 'ch_rule' || r.value == 'en_rule' || r.value == 'custom_regular_rule'),
 	}
 });
 
@@ -1065,7 +1065,6 @@ const setPanelListValue = (item, isSelectChange = false, init = false, radioGrou
 		}
 	});
 	formItems.value[0].children = panelList.value;
-	console.log(panelList.value);
 }
 
 const radioGroupChange = (val, inlineValue, init) => {
@@ -1779,14 +1778,14 @@ const submitValueRange = () => {
 		let valueTableFields = valueRangeTableListData.value[table];
 		let ruleFields: any = []
 		for (const field of valueTableFields) {
-			if (field.startValue != null && field.endValue == null || (field.endValue != null && field.startValue == null)) {
+			if (field.startValue == null && field.endValue == null) {
 				if (dialogSelectSubjectTable.value.enName != table) {
 					valueCheckFormListRef.value.setSelectList(table, 'enName');
 				}
 				ElMessage.error(`表【${table}】的字段【${field.enName}】设置了值域，但范围未填写完整`);
 				return;
 			}
-			if (field.startValue) {
+			if (field.startValue != null || field.endValue != null) {
 				ruleFields.push(field);
 			} else if (field.dataRange) {
 				ruleFields.push(field);
@@ -2350,7 +2349,7 @@ defineExpose({
 						<template #default="scope">
 							<el-select v-if="!props.readonly || (scope.row.dataType == 'text' || scope.row.dataType == 'json')"
 								v-model="scope.row['checkRule']" placeholder="请选择" filterable clearable>
-								<el-option v-for="opt in rulesListByType[scope.row.dataType]" :key="opt['value']"
+								<el-option v-for="opt in (rulesListByType[scope.row.dataType] || checkRulesList)" :key="opt['value']"
 									:label="opt['label']" :value="opt['value']" />
 							</el-select>
 							<span v-else>{{ scope.row.checkRuleName ?? '--' }}</span>

@@ -424,10 +424,17 @@ const transformRulesInfo = (info: any) => {
           databaseName: tableInfo.dataServerName,
           dataSource: route.query.dataSource ? parseInt(<string>route.query.dataSource) : null,
           modelRuleConfList: [Object.assign({}, info, {
+            ruleField: info.ruleFields.map(row => {
+              return {
+                // guid: row.mainTable,
                 enName: row.mainTableField,
+                //chName: row.chName,
                 compareTableGuid: row.compareTableGuid,
                 compareTableName: row.compareTableName,
                 compareEnName: row.compareEnName
+              }
+            }),
+            ruleFields: ''
           })]
         }));
       }