centaline-data-driven-v3 0.1.44 → 0.1.46

package/src/loader/src/Field.js

@@ -846,14 +846,13 @@ const Base = function (source, moreActionRouter, formLabelPlacement) {
                 || this.controlType === Enum.ControlType.MultiLineLabel) {
             }
             else if (this.isList || this.isScreen) {
-
                 if (this.controlType === Enum.ControlType.SearchListBox || this.controlType === Enum.ControlType.ComboBox || this.controlType === Enum.ControlType.MultiSelectWithSearch || this.controlType === Enum.ControlType.MultiSelectNoSearch
                     || this.controlType === Enum.ControlType.PhoneNumberText) {
                     if (this.multiple) {
                         this.value.splice(0);
                         this.labelValue.splice(0);
                         if (this.defaultCode1) {
-                            var defaultCode1=JSON.parse(this.defaultCode1)
+                            var defaultCode1 = JSON.parse(this.defaultCode1)
                             defaultCode1.forEach((v) => {
                                 this.value.push(v.code);
                                 this.labelValue.push(v);
@@ -876,20 +875,23 @@ const Base = function (source, moreActionRouter, formLabelPlacement) {
                     if (this.defaultValue) {
                         this.value = this.defaultValue;
                     }
-
                 }
                 else if (this.controlType === Enum.ControlType.CheckBox || this.controlType === Enum.ControlType.Switch) {
                     if (this.defaultCode1 == '1') {
                         this.value = true
                     }
-
                 }
                 this.code1 = this.defaultCode1 || '';
                 this.code2 = this.defaultCode2 || '';
                 this.name1 = this.defaultName1 || '';
-                if (this.controlType === Enum.ControlType.SearchListBox && this.defaultCode1 && this.defaultName1) {
+                if ((this.controlType === Enum.ControlType.SearchListBox || this.controlType === Enum.ControlType.ComboBox
+                ) && this.defaultCode1 && this.defaultName1) {
                     this.options = [{ value: this.code1, label: this.name1 }]
                 }
+                if ((this.controlType === Enum.ControlType.MultiSelectWithSearch || this.controlType === Enum.ControlType.MultiSelectNoSearch
+                ) && this.defaultCode1) {
+                    this.options = [].concat(JSON.parse(this.code1))
+                }
             }
             else {
                 if (this.controlType === Enum.ControlType.DateRange

package/src/loader/src/Tree.js

@@ -4,37 +4,37 @@ import request from '../../utils/request';
 import Router from './Router';
 
 function loadSearchTreeApi(action, searchModel) {
-    return new Promise((resolve, reject) => {  
-    var apiData = searchModel?.searchData ? searchModel.searchData : {};
-    request.postHandler(common.globalUri(),
-        {
-            action: action,
-            para:
+    return new Promise((resolve, reject) => {
+        var apiData = searchModel?.searchData ? searchModel.searchData : {};
+        request.postHandler(common.globalUri(),
             {
-                searchFields: apiData,
-                pageAttribute: { pageIndex: 1 },
-                flagSearch: true
-            }
-        }).then(
-            function (response) {
-                if (response.rtnCode === Enum.ReturnCode.Successful) {
-                  let rtn = loadSearchTreeModel(response);
-                    resolve(rtn);
-
-                    // if (callBack) {
-                    //     callBack(rtn, resolve1, firstLoad);
-                    // }
+                action: action,
+                para:
+                {
+                    searchFields: apiData,
+                    pageAttribute: { pageIndex: 1 },
+                    flagSearch: true
                 }
-                else { 
-                    reject(response);  
+            }).then(
+                function (response) {
+                    if (response.rtnCode === Enum.ReturnCode.Successful) {
+                        let rtn = loadSearchTreeModel(response);
+                        resolve(rtn);
+
+                        // if (callBack) {
+                        //     callBack(rtn, resolve1, firstLoad);
+                        // }
+                    }
+                    else {
+                        reject(response);
 
+                    }
                 }
-            }
-        );
-    });  
+            );
+    });
 }
 function loadSearchTreeModel(source, searchModel) {
-  let rtn = {
+    let rtn = {
         searchModel: searchModel,
         get source() {
             return source;
@@ -94,15 +94,15 @@ function loadSearchTreeModel(source, searchModel) {
         },
         //组装查询条件
         searchData(fieldName1, _parentID, operation, searchDataType) {
-          let rtn = {
-              fields: []
+            let rtn = {
+                fields: []
             };
             rtn.fields.push({
-              "fieldName1": fieldName1,
-              "groupName": fieldName1,
-              "operation": operation || 0,
-              "searchDataType": searchDataType || 3,
-              "searchValue1": _parentID
+                "fieldName1": fieldName1,
+                "groupName": fieldName1,
+                "operation": operation || 0,
+                "searchDataType": searchDataType || 3,
+                "searchValue1": _parentID
             });
             return rtn;
         },
@@ -128,8 +128,294 @@ function loadSearchTreeModel(source, searchModel) {
     };
     return rtn;
 }
+
+function buildDeptTreeByField(flatList, opt = {}) {
+    const {
+        pathKey = 'path',
+        separator = '.',
+        sortKey = 'sort',
+         lazyMode = false
+    } = opt;
+
+    const firstItem = flatList.length > 0 ? flatList[0] : null;
+    const actualSortKey = firstItem && firstItem.hasOwnProperty(sortKey) ? sortKey : pathKey;
+
+    const sortedList = [...flatList].sort((a, b) => {
+        const aPath = a[pathKey] || '';
+        const bPath = b[pathKey] || '';
+        return aPath.length - bPath.length || aPath.localeCompare(bPath);
+    });
+
+    const pathMap = new Map();
+    const root = [];
+
+    for (const item of sortedList) {
+        const path = item[pathKey];
+        if (!path) continue;
+
+        const node = {
+            ...item,
+            children: [],
+            isLeaf: !lazyMode, // 默认非懒加载模式下为叶子节点
+        };
+
+        pathMap.set(path, node);
+
+        const lastDotIndex = path.lastIndexOf(separator);
+        if (lastDotIndex > -1) {
+            const parentPath = path.substring(0, lastDotIndex);
+            const parentNode = pathMap.get(parentPath);
+
+            if (parentNode) {
+                parentNode.children.push(node);
+                parentNode.isLeaf = false;
+                continue;
+            }
+        }
+
+        root.push(node);
+    }
+  // 如果不是懒加载模式，需要递归判断所有节点是否为叶子节点
+    if (!lazyMode) {
+        const determineIsLeaf = (node) => {
+            if (node.children && node.children.length > 0) {
+                // 递归处理子节点
+                node.children.forEach(determineIsLeaf);
+                // 有子节点，不是叶子节点
+                node.isLeaf = false;
+            } else {
+                // 没有子节点，是叶子节点
+                node.isLeaf = true;
+            }
+        };
+        
+        root.forEach(determineIsLeaf);
+    }
+    const sortTree = (nodes) => {
+        nodes.sort((a, b) => {
+            const aVal = a[actualSortKey] || a[pathKey] || '';
+            const bVal = b[actualSortKey] || b[pathKey] || '';
+            return String(aVal).localeCompare(String(bVal));
+        });
+
+        nodes.forEach(node => {
+            if (node.children && node.children.length > 0) {
+                sortTree(node.children);
+            }
+        });
+    };
+
+    sortTree(root);
+
+    const hasAnyLeaf = root.some(n => !n.isLeaf);
+    return { tree: root, hasAnyLeaf };
+}
+
+
+// 获取前N层节点的 key
+function getFirstNLevelKeys(treeData, level = 0) {
+  const keys = [];
+  
+  function traverse(nodes, currentLevel) {
+    if (!nodes || nodes.length === 0 || currentLevel > level) return;
+    
+    nodes.forEach(node => {
+      if (node.code) {
+        keys.push(node.code);
+      }
+      
+      if (currentLevel < level && node.children && node.children.length > 0) {
+        traverse(node.children, currentLevel + 1);
+      }
+    });
+  }
+  
+  traverse(treeData, 0);
+  return keys;
+}
+// 获取树中所有节点的 key
+function getAllNodeKeys(treeData) {
+  const keys = [];
+  
+  function traverse(nodes) {
+    if (!nodes || nodes.length === 0) return;
+    
+    nodes.forEach(node => {
+      if (node.code) {
+        keys.push(node.code);
+      }
+      
+      if (node.children && node.children.length > 0) {
+        traverse(node.children);
+      }
+    });
+  }
+  
+  traverse(treeData);
+  return keys;
+}
+
+// 新增：构建节点Map，便于快速查找
+function buildNodeCodeMap(nodes) {
+    const map = new Map();
+
+    function traverse(nodeList) {
+        nodeList.forEach(node => {
+            if (node.code) {
+                map.set(node.code, node);
+            }
+
+            if (node.children && node.children.length > 0) {
+                traverse(node.children);
+            }
+        });
+    }
+
+    traverse(nodes);
+    return map;
+}
+
+// 新增：复制节点（深拷贝）
+function cloneNode(node) {
+    const cloned = { ...node };
+    cloned.children = [];
+    return cloned;
+}
+
+// 检查是否有有效的搜索条件
+function checkHasValidSearchConditions(filter) {
+    if (!filter) return false;
+
+    let searchConditions = [];
+
+    if (filter?.searchData?.fields) {
+        searchConditions = filter.searchData.fields;
+    } else if (filter?.fields) {
+        searchConditions = filter.fields;
+    }
+
+    const validConditions = filterValidConditions(searchConditions);
+    return validConditions && validConditions.length > 0;
+}
+// 过滤掉 operation 为 1 的条件
+function filterValidConditions(conditions) {
+    if (!conditions || !Array.isArray(conditions)) return [];
+
+    return conditions.filter(condition => {
+        return condition.operation !== 1;
+    });
+}
+
+// 判断节点是否匹配所有搜索条件
+function nodeMatchesAllConditions(node, conditions) {
+    const validConditions = filterValidConditions(conditions);
+
+    if (!validConditions || validConditions.length === 0) return true;
+
+    return validConditions.every(condition => {
+        const { fieldName1, operation, searchValue1, searchValue2, searchDataType } = condition;
+        let nodeValue = node[fieldName1];
+
+        if (nodeValue === undefined) {
+            const mappedField = Object.keys(node).find(key =>
+                key.toLowerCase() === fieldName1.toLowerCase()
+            );
+            if (mappedField) {
+                nodeValue = node[mappedField];
+            } else {
+                return false;
+            }
+        }
+
+        const strNodeValue = String(nodeValue || '').toLowerCase();
+        const strSearchValue = String(searchValue1 || '').toLowerCase();
+
+        switch (operation) {
+            case 2:
+                return strNodeValue === strSearchValue;
+            case 3:
+                return strNodeValue !== strSearchValue;
+            case 4:
+                return Number(nodeValue) > Number(searchValue1);
+            case 5:
+                return Number(nodeValue) >= Number(searchValue1);
+            case 6:
+                return Number(nodeValue) < Number(searchValue1);
+            case 7:
+                return Number(nodeValue) <= Number(searchValue1);
+            case 8:
+                return strNodeValue.includes(strSearchValue);
+            case 9:
+                return strNodeValue.startsWith(strSearchValue);
+            case 10:
+                return strNodeValue.endsWith(strSearchValue);
+            case 11:
+                return !strNodeValue.includes(strSearchValue);
+            case 12:
+                try {
+                    const regex = new RegExp(searchValue1, 'i');
+                    return regex.test(nodeValue);
+                } catch (e) {
+                    console.warn('正则表达式错误:', e);
+                    return false;
+                }
+            case 13:
+                if (!searchValue1) return false;
+                try {
+                    const values = searchValue1.split(',').map(v => v.trim().toLowerCase());
+                    return values.includes(strNodeValue);
+                } catch (e) {
+                    console.warn('解析IN条件错误:', e);
+                    return false;
+                }
+            case 14:
+                if (!searchValue1) return true;
+                try {
+                    const values = searchValue1.split(',').map(v => v.trim().toLowerCase());
+                    return !values.includes(strNodeValue);
+                } catch (e) {
+                    console.warn('解析NotIN条件错误:', e);
+                    return false;
+                }
+            default:
+                return false;
+        }
+    });
+}
+
+// 新增：检查节点是否在子树中
+function isNodeInChildren(parentNode, targetCode) {
+    if (parentNode.code === targetCode) {
+        return false;
+    }
+
+    if (!parentNode.children || parentNode.children.length === 0) {
+        return false;
+    }
+
+    for (const child of parentNode.children) {
+        if (child.code === targetCode) {
+            return true;
+        }
+
+        if (isNodeInChildren(child, targetCode)) {
+            return true;
+        }
+    }
+
+    return false;
+}
 const SearchStats = {
     loadSearchTreeApi,
-    loadSearchTreeModel
+    loadSearchTreeModel,
+    buildDeptTreeByField,
+    getFirstNLevelKeys,
+    getAllNodeKeys,
+    buildNodeCodeMap,
+    cloneNode,
+    checkHasValidSearchConditions,
+    filterValidConditions,
+    nodeMatchesAllConditions, 
+    isNodeInChildren,
 };
 export default SearchStats;

package/src/main.js

@@ -22,7 +22,7 @@ for (const [key, component] of Object.entries(ElementPlusIconsVue)) {
 
 app.use(centaline, {
     //baseUrl: "http://10.88.22.13:7080/ibs-api/",
-    baseUrl:"http://hkibswcfha01.centaline.com/mvc/api/",
+    baseUrl:"http://10.88.22.13:7070/onecard-api/",
     //baseUrl: "https://kq-api.centaline.com.cn/onecard-api/",
     //baseUrl: "http://10.88.22.13:6060/onecard-api/",
     //baseUrl: "http://10.88.22.66/IBS.Mvc/api/",
@@ -66,8 +66,8 @@ app.use(centaline, {
         getRequestHeaders: function () {
             return {
                 
-             //AuthorizationCode:'Bearer eyJhbGciOiJIUzUxMiJ9.eyJsb2dpbl91c2VyX2tleSI6IjQxZTM1MGE1LWFiMGMtNDY2Mi05MTQ5LTAwYTQ4NTljMDkyYSJ9.3ci0CpgcmIqm-ORf9efFnvB6sgAWVSGv6ptrWMe3ZSs3fQ8PvlZv3BizhcBJjk0l7csA2Ihw9oodq2N81ELUoQ',
-              authobject: '{EmpID:"Token_fce238af-47db-4fd9-9b14-f3ffb4767b55",MachineCode:"503aad67-3233-4256-8907-3e7d520245dc",SSO_Token:"SSOToken_fce238af-47db-4fd9-9b14-f3ffb4767b55",Platform:"WEB"}',
+             //AuthorizationCode:'Bearer eyJhbGciOiJIUzUxMiJ9.eyJ1c2VyaWQiOiIyNTEyMTUxNzQyMTg5QzI4MTgwRDkxRTk0MDhEOTA0QSIsImxvZ2luX3VzZXJfa2V5IjoiN2MzYzNjNjAtNWVjMy00MzdkLWExMDYtOWYxZTMwYjU0Mjg2In0.daG9mS98Gg8KmHSUjYHktMcO2Jk7SVtCcqm2sRB0I8Y2N0TuonIrVUDcHdNdDiuD3v6qO_f010tQWlBsAQ1dqg',
+              authobject: '{token:"wufw-2008030035520409600",platform:"WEB"}',
               //authobject: '{EmpID:"Token_946d56e1-7972-4382-9d10-4a72496aab39",MachineCode:"ae184643-f8e2-453c-a752-ba82612b592f",SSO_Token:"SSOToken_946d56e1-7972-4382-9d10-4a72496aab39",Platform:"WEB"}',
                 //oldToken: 'd92d4a3b-2274-42e8-96f0-100ffb579b6e',
                 //authObject: '{token:"jiangzf-1958445358178844672",platform:"WEB"}',

package/src/utils/request.js

@@ -77,7 +77,7 @@ const request = {
     if (data.rtnCode === Enum.ReturnCode.Successful) {
       if (data.rtnMsg && common.getDataDrivenOpts().showRequestSuccessMessage) {
         if (data.msgAlertStyle && data.msgAlertStyle == Enum.MessageAlertStyle.Dialog) {
-          common.message(data.rtnMsg, 'error', '', 0, true)
+          common.message(data.rtnMsg, 'success', '', 0, true)
         }
         else {
           common.message(data.rtnMsg, 'success')

package/src/views/Form.vue

@@ -1,10 +1,10 @@
 <template>
   <div id="form-app" class="data-driven" style="width:100%;height:100%;overflow:auto">
-   <ct-form :api="'/Employee/readDetail'" :apiParam="apiParam"></ct-form>
+   <ct-form :api="'/employee/getLayoutOfPwd'" :apiParam="apiParam"></ct-form>
     <!-- <ct-textbox :source="source"></ct-textbox> -->
 <ct-dialoglist ref="dialogList"></ct-dialoglist>
  </div>  
 </template>
 <script lang="ts" setup>
- const apiParam={"rowGUID":"{84373596-5043-4d58-935c-bc3559c8654f}","actionType":3}
+ const apiParam={actionType: 3,empId: "260104160031E4FF8D4434FD4400BAC9"}
 </script>