centaline-data-driven-v3 0.1.42 → 0.1.43

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "centaline-data-driven-v3",
-  "version": "0.1.42",
+  "version": "0.1.43",
   "private": false,
   "description": "centaline-data-driven-v3",
   "main": "dist/centaline-data-driven-v3.umd.js",

package/src/components/web/Tree/Tree.vue

@@ -103,6 +103,7 @@ const fullTreeData = ref([])
 // 新增：缓存所有节点的Map，用于快速查找
 const nodeCodeMap = ref(new Map())
 
+const isExpandAll = ref(false);
 /** 动态设置Input Ref */
 const handleSetInputMap = (el: refItem, item) => {
   if (el) {
@@ -118,22 +119,29 @@ onBeforeUnmount(() => {
   }
 })
 
-// 递归获取前两级节点的key
-function getFirstTwoLevelKeys(nodes, level = 0, result = []) {
-  if (!nodes || nodes.length === 0 || level >= 1) {
+function getFirstNLevelKeys(nodes, targetLevel = 1) {
+  const result = [];
+
+  if (!nodes || nodes.length === 0 || targetLevel < 0) {
     return result;
   }
 
-  nodes.forEach(node => {
-    if (node.code) {
-      result.push(node.code);
-    }
+  const traverse = (nodes, currentLevel) => {
+    if (currentLevel > targetLevel || !nodes) return;
 
-    if (level < 1 && node.children && node.children.length > 0) {
-      getFirstTwoLevelKeys(node.children, level + 1, result);
-    }
-  });
+    nodes.forEach(node => {
+      if (node.code) {
+        result.push(node.code);
+      }
+
+      // 如果还有下一层且没超过目标层级，继续遍历
+      if (currentLevel < targetLevel && node.children && node.children.length > 0) {
+        traverse(node.children, currentLevel + 1);
+      }
+    });
+  };
 
+  traverse(nodes, 0);
   return result;
 }
 
@@ -163,10 +171,36 @@ function setDefaultExpandedNodes() {
   }
 
   if (isSearching.value) {
+    isExpandAll.value = true;
     const allKeys = getAllNodeKeys(fullTreeData.value);
     defaultExpandedKeys.value = allKeys;
   } else {
-    defaultExpandedKeys.value = getFirstTwoLevelKeys(fullTreeData.value);
+    isExpandAll.value = false;
+    // 检查是否有全展开搜索条件
+    const expandValue = findSearchFieldValue(screenPara.value, 'expanded', {
+      caseInsensitive: true, // 添加不区分大小写的选项
+      keyFields: ['fieldName1', 'groupName', 'fieldLabel'] // 扩展可能的key字段
+    });
+
+    // 如果找到expanded=all的搜索条件，设置全展开
+    if (expandValue && expandValue.toString().toLowerCase() === 'all') {
+      isExpandAll.value = true;
+      const allKeys = getAllNodeKeys(fullTreeData.value);
+      defaultExpandedKeys.value = allKeys;
+    } else {
+      // 处理非'all'的情况
+      let expandLevel = 1; // 默认展开级别为1
+
+      if (expandValue) {
+        const numericValue = Number(expandValue);
+        if (!isNaN(numericValue) && numericValue > 0) {
+          expandLevel = Math.max(0, numericValue - 1); // 减1但最小为1
+
+        }
+      }
+
+      defaultExpandedKeys.value = getFirstNLevelKeys(fullTreeData.value, expandLevel);
+    }
   }
 
   hasSetDefaultExpand.value = true;
@@ -626,8 +660,8 @@ function loadNode(node, resolve) {
       loading.value = false;
 
 
-      const { tree, hasAnyLeaf } = buildDeptTreeByField(data.rows, data.source.content.columns || [], {
-        pathKey: 'deptPath',
+      const { tree, hasAnyLeaf } = buildDeptTreeByField(data.rows, {
+        pathKey: 'path',
         separator: '.'
       });
 
@@ -665,7 +699,7 @@ function loadNode(node, resolve) {
           ...(screenPara.value?.searchData?.fields || [])
         ]
       }
-    }; 
+    };
 
     return SearchTree(filter).then(data => {
       loading.value = false;
@@ -771,6 +805,7 @@ function clearSearch() {
 
 //节点点击事件
 function handleNodeClick(data, formType) {
+
   closeMenu();
   if (data && formType) {
     refTree.value.setCurrentKey(data.code)
@@ -784,6 +819,7 @@ function handleNodeClick(data, formType) {
         SearchData[v] = data[v];
       }
     })
+
     model.value.requestAction(rowRouter.action, SearchData, function (rowdata) {
       var newdata = common.deepClone(data);
       delete newdata.children;
@@ -859,8 +895,9 @@ function routerClickHandler(field) {
 
 //删除树节点
 function removeNode(newData) {
-  getNextClickNode()
+  getNextClickNode(currentNode.value)
   refTree.value.remove(currentNode.value);
+
 }
 
 //新增树节点
@@ -882,13 +919,13 @@ function updateNode(newData) {
 }
 
 function getNextClickNode() {
-  const node = refTree.value.getNode(currentData.value.code);
+  const node = refTree.value.getNode((currentData.value.code || currentNode.value.key));
   let data = {};
-  if (node.nextSibling) {
+  if (node?.nextSibling) {
     data = node.nextSibling.data;
   } else if (node.previousSibling) {
     data = node.previousSibling.data;
-  } else if (node.parent) {
+  } else if (node?.parent) {
     data = node.parent.data;
   }
   handleNodeClick(data, true)
@@ -900,18 +937,17 @@ function filterNode(value, data) {
   return data.name.toLowerCase().includes(value.toLowerCase())
 }
 
-function buildDeptTreeByField(flatList, fieldDefine, opt = {}) {
+function buildDeptTreeByField(flatList, opt = {}) {
   const {
     pathKey = 'path',
     separator = '.',
-    sortKey = 'path'
+    sortKey = 'sort'
   } = opt;
 
-  const keepFields = fieldDefine
-    .filter(f => f.visible && f.isDataField)
-    .sort((a, b) => a.trOrder - b.trOrder)
-    .map(f => f.fieldName);
-
+  // 检查第一行是否有 sort 字段
+  const firstItem = flatList.length > 0 ? flatList[0] : null;
+  const actualSortKey = firstItem && firstItem.hasOwnProperty(sortKey) ? sortKey : 'path';
+  
   const createNode = (tplItem, path) => {
     const node = { children: [] };
 
@@ -929,7 +965,6 @@ function buildDeptTreeByField(flatList, fieldDefine, opt = {}) {
   const nodeMap = new Map();
 
   for (const item of flatList) {
-
     if (!item[pathKey]) {
       break;
     }
@@ -967,20 +1002,22 @@ function buildDeptTreeByField(flatList, fieldDefine, opt = {}) {
     }
   }
 
+  // 按实际排序键排序子节点
   for (const node of nodeMap.values()) {
     if (node.children && node.children.length > 0) {
       node.children.sort((a, b) => {
-        const aVal = a[sortKey] || '';
-        const bVal = b[sortKey] || '';
+        const aVal = a[actualSortKey] || '';
+        const bVal = b[actualSortKey] || '';
         return String(aVal).localeCompare(String(bVal));
       });
     }
     node.isLeaf = node.children.length === 0;
   }
 
+  // 按实际排序键排序根节点
   root.sort((a, b) => {
-    const aVal = a[sortKey] || '';
-    const bVal = b[sortKey] || '';
+    const aVal = a[actualSortKey] || '';
+    const bVal = b[actualSortKey] || '';
     return String(aVal).localeCompare(String(bVal));
   });
 
@@ -988,6 +1025,38 @@ function buildDeptTreeByField(flatList, fieldDefine, opt = {}) {
   return { tree: root, hasAnyLeaf };
 }
 
+function findSearchFieldValue(searchFields, targetKey, options = {}) {
+  const {
+    keyFields = ['fieldName1', 'groupName'], // 要查找的key字段列表
+    valueField = 'searchValue1', // 要返回值的字段
+    defaultValue = 2
+  } = options;
+
+  // 检查数据结构
+  if (!searchFields?.searchData?.fields?.length) {
+    return defaultValue;
+  }
+
+  // 遍历fields数组
+  for (const field of searchFields.searchData.fields) {
+    // 检查所有可能的key字段
+    for (const keyField of keyFields) {
+      if (field[keyField] === targetKey) {
+        // 找到了匹配的key，返回对应的值
+        const value = field[valueField];
+        // 如果值为undefined、null或空字符串，返回默认值
+        return value !== undefined && value !== null && value !== ''
+          ? value
+          : defaultValue;
+      }
+    }
+  }
+
+  return defaultValue;
+}
+
+
+
 // 暴露方法
 defineExpose({
   search,