Merge branch 'master' of http://47.121.207.11:3000/developers/vue-fastapi-admin

vue-fastapi-frontend/src/views/meta/metaInfo/index.vue

@@ -387,40 +387,31 @@
         width="1100"
     >
       <el-form :model="currentTableTag" :inline="true" label-width="75px">
-        <el-form-item label="一级分类:" prop="userName">
+
-          <el-input
+        <template v-for="item in currentTableTag.clasList">
-              v-model="currentTableTag.clasPriClas"
+          <el-form-item :label="item.idxName + '级分类:'">
-              disabled
+            <el-input
-              style="width: 240px"
+                v-model="item.clasName"
-          />
+                disabled
-        </el-form-item>
+                style="width: 240px"
-        <el-form-item label="二级分类:">
+            />
-          <el-input
+          </el-form-item>
-              v-model="currentTableTag.clasScdClas"
+        </template>
-              disabled
+        <el-row>
-              style="width: 240px"
+          <el-form-item label="选择标签:">
-          />
+            <el-select
-        </el-form-item>
+                v-model="currentTableTag.clasOnum"
-        <el-form-item label="三级分类:">
+                filterable
-          <el-input
+                style="width: 240px"
-              v-model="currentTableTag.clasThreClas"
+                @change="changeTableTag"
-              disabled
+            >
-              style="width: 240px"
+              <el-option v-for="item in metaClasList" :key="item.clasOnum" :value="item.clasOnum" :label="item.clasOnum+'  -  '+item.clasName"/>
-          ></el-input>
+            </el-select>
-        </el-form-item>
+          </el-form-item>
-        <el-form-item label="选择标签:">
+          <el-form-item>
-          <el-select
+            <el-button type="primary" icon="Plus" @click="addTableTag">新增</el-button>
-              v-model="currentTableTag.clasOnum"
+          </el-form-item>
-              filterable
+        </el-row>
-              style="width: 240px"
-              @change="changeTableTag"
-          >
-            <el-option v-for="item in metaClasList" :key="item.clasOnum" :value="item.clasOnum" :label="item.clasOnum+'  -  '+item.clasName"/>
-          </el-select>
-        </el-form-item>
-        <el-form-item>
-          <el-button type="primary" icon="Plus" @click="addTableTag">新增</el-button>
-        </el-form-item>
       </el-form>
       <el-table v-loading="loading" :data="tableTags">
         <el-table-column label="标签编号" width="80" align="center" prop="onum"></el-table-column>
@@ -557,24 +548,14 @@
         </el-form-item>
       </el-form>
       <el-form :model="currentColumnTag" :inline="true" label-width="100px">
-        <el-form-item label="一级分类:" prop="userName">
+        <template v-for="item in currentColumnTag.clasList">
-          <el-input
+          <el-form-item :label="item.idxName + '级分类:'">
-              v-model="currentColumnTag.clasPriClas"
+            <el-input
-              disabled
+                v-model="item.clasName"
-          />
+                disabled
-        </el-form-item>
+            />
-        <el-form-item label="二级分类:">
+          </el-form-item>
-          <el-input
+        </template>
-              v-model="currentColumnTag.clasScdClas"
-              disabled
-          />
-        </el-form-item>
-        <el-form-item label="三级分类:">
-          <el-input
-              v-model="currentColumnTag.clasThreClas"
-              disabled
-          ></el-input>
-        </el-form-item>
         <el-form-item label="选择标签:">
           <el-select
               v-model="currentColumnTag.clasOnum"
@@ -855,6 +836,7 @@
   import BloodRelation from "./bloodRelation.vue";
   import {listMetadataSecOptions} from "@/api/metadataConfig/metadataConfig.js";
   import {getToken} from "@/utils/auth.js";
+  import {getDirectoryTree} from "@/api/metadataConfig/directory.js";
 
   const data = reactive({
     queryParams:{
@@ -892,20 +874,16 @@
   const currentColumnData = ref({});
   const loadingBusiness = ref(false);
   const currentTableTag = ref({
-    "clasThreClas": "",
     "clasOnum": null,
     "clasName": "",
     "recSubmPrsn": "",
-    "clasPriClas": "",
+    "clasList":[]
-    "clasScdClas": ""
   });
   const currentColumnTag = ref({
-    "clasThreClas": "",
     "clasOnum": null,
     "clasName": "",
     "recSubmPrsn": "",
-    "clasPriClas": "",
+    "clasList":[]
-    "clasScdClas": ""
   });
   const columnParam = ref({
     total:0,
@@ -942,6 +920,7 @@
   });
   const stddictOptions = ref([])
   const secLvlOptions = ref([])
+  const directoryTree = ref([])
   /*** 导入参数 */
   const upload = reactive({
     // 是否显示弹出层（导入）
@@ -959,6 +938,7 @@
     resultMsg: {}
   });
 
+
   function changeColumnTab(){
     if (activeColumnTab.value === 'businessRelation'){
       changeBusinessOption()
@@ -1272,6 +1252,29 @@
           currentTableTag.value = item
         }
       }
+      currentTableTag.value.clasList = []
+      let array = findFullPathNames(currentTableTag.value.beltBatchContent)
+      if (array && array.length>0){
+        const index = array.indexOf("表标签");
+        let arr = index !== -1 ? array.slice(index + 1) : [];
+        let numberMap = {
+          1: '一',
+          2: '二',
+          3: '三',
+          4: '四',
+          5: '五',
+          6: '六',
+          7: '七',
+          8: '八',
+          9: '九',
+          10: '十'
+        };
+        if (arr.length > 0){
+          for (let i = 0; i < arr.length; i++) {
+            currentTableTag.value.clasList.push({idxName: numberMap[i+1], clasName: arr[i]})
+          }
+        }
+      }
     }
   }
   function changeAstTag(){
@@ -1294,6 +1297,29 @@
           currentColumnTag.value = item
         }
       }
+      currentColumnTag.value.clasList = []
+      let array = findFullPathNames(currentColumnTag.value.beltBatchContent)
+      if (array && array.length>0){
+        const index = array.indexOf("字段标签");
+        let arr = index !== -1 ? array.slice(index + 1) : [];
+        let numberMap = {
+          1: '一',
+          2: '二',
+          3: '三',
+          4: '四',
+          5: '五',
+          6: '六',
+          7: '七',
+          8: '八',
+          9: '九',
+          10: '十'
+        };
+        if (arr.length > 0){
+          for (let i = 0; i < arr.length; i++) {
+            currentColumnTag.value.clasList.push({idxName: numberMap[i+1], clasName: arr[i]})
+          }
+        }
+      }
     }
   }
   function handleTableTagClose(index){
@@ -1433,6 +1459,29 @@
         procId.value = -1;
       }
     })
+    getDirectoryTree({pageSize: 999}).then(res => {
+      directoryTree.value = res.rows
+    })
+  }
+
+  function findFullPathNames(targetId) {
+    function dfs(node, path = []) {
+      // 创建新路径数组避免引用污染
+      const currentPath = [...path, node.contentName];
+      // 检查当前节点是否为目标
+      if (node.contentOnum === targetId) {
+        return currentPath;
+      }
+      // 递归搜索子节点
+      if (node.children?.length > 0) {
+        for (const child of node.children) {
+          const result = dfs(child, currentPath);
+          if (result) return result;
+        }
+      }
+      return null;
+  }
+  return dfs(directoryTree.value[0],[])
   }
 
   function getDatabaseList() {
@@ -1577,7 +1626,8 @@
       delete dataAst.showDataAstSrc
     })
     publishAstData({assetItems:data}).then(res=>{
-      proxy.$modal.msgSuccess(res.msg)
+      proxy.$modal.msgSuccess("发布成功，已提交审批")
+      // proxy.$modal.msgSuccess(res.msg)
       astPublish.value = false
     })
   }