centaline-data-driven-v3 0.1.43 → 0.1.44

package/package.json

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

package/src/assets/commonWeb.css

@@ -587,6 +587,11 @@ body {
   background-color: inherit;
 }
 
+.ct-table .left-fixation .el-checkbox {
+  padding: 0px;
+  vertical-align: -2px;
+}
+
 .ct-table .right-fixation {
   position: sticky;
   background-color: inherit;
@@ -780,7 +785,8 @@ body {
   user-select: none;
   /* 禁止文本选择 */
 }
-.ct-form .btnPadBom .el-checkbox{
+
+.ct-form .btnPadBom .el-checkbox {
   height: 100% !important;
   padding: 0 !important;
 }

package/src/components/web/SearchList/SearchTable.vue

@@ -29,7 +29,7 @@
                                 :rowspan="model.multiRowSpan" class="ct-td left-fixation-th checkbox-td"
                                 :class="[model.tdClass]">
                                 <el-checkbox v-model="model.selectAll" :indeterminate="model.isIndeterminate"
-                                    size="default" @change="selectAll"></el-checkbox>
+                                    size="small" @change="selectAll"></el-checkbox>
                             </th>
                             <template v-for="(column, colIndex) in columns" :key="colIndex">
                                 <th v-if="column.show" class="ct-td ct-searchtable-th" :rowspan="column.rowspan"
@@ -70,7 +70,7 @@
                                     align="center">
                                     <el-checkbox
                                         v-if="!model.rightCheckBoxColumn || common.getDataOfUpperLower(row, model.rightCheckBoxColumn) == 1"
-                                        v-model="row.$select" @change="selectRow()" size="default" />
+                                        v-model="row.$select" @change="selectRow()" size="small" />
 
                                 </td>
                                 <template v-for="(column, colIndex) in model.dataFieldcolumns" :key="colIndex">

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

@@ -946,82 +946,66 @@ function buildDeptTreeByField(flatList, opt = {}) {
 
   // 检查第一行是否有 sort 字段
   const firstItem = flatList.length > 0 ? flatList[0] : null;
-  const actualSortKey = firstItem && firstItem.hasOwnProperty(sortKey) ? sortKey : 'path';
-  
-  const createNode = (tplItem, path) => {
-    const node = { children: [] };
-
-    for (const key in tplItem) {
-      if (key !== 'children') {
-        node[key] = tplItem[key];
-      }
-    }
+  const actualSortKey = firstItem && firstItem.hasOwnProperty(sortKey) ? sortKey : pathKey;
 
-    node[pathKey] = path;
-    return node;
-  };
+  // 按路径排序，确保父节点在前
+  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(); // path -> node
   const root = [];
-  const nodeMap = new Map();
 
-  for (const item of flatList) {
-    if (!item[pathKey]) {
-      break;
-    }
+  for (const item of sortedList) {
     const path = item[pathKey];
-    const levels = path.split(separator);
+    if (!path) continue;
 
-    let curPath = '';
-    let parentPath = '';
+    const node = {
+      ...item,
+      children: [],
+      isLeaf: true // 默认为叶子节点，后续会更新
+    };
 
-    levels.forEach((lvl, idx) => {
-      curPath = idx === 0 ? lvl : `${parentPath}${separator}${lvl}`;
-      let curNode = nodeMap.get(curPath);
+    // 添加到路径映射
+    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;
+      }
+    }
 
-      if (!curNode) {
-        curNode = createNode(item, curPath);
-        nodeMap.set(curPath, curNode);
+    // 没有找到父节点，或者没有父路径，则作为根节点
+    root.push(node);
+  }
 
-        if (idx === 0) {
-          root.push(curNode);
-        } else {
-          const pNode = nodeMap.get(parentPath);
-          if (pNode) {
-            pNode.children.push(curNode);
-          }
-        }
-      }
-      parentPath = curPath;
+  // 排序：按 sortKey 或 path 排序
+  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));
     });
 
-    const lastNode = nodeMap.get(path);
-    for (const key in item) {
-      if (key !== 'children') {
-        lastNode[key] = item[key];
+    nodes.forEach(node => {
+      if (node.children && node.children.length > 0) {
+        sortTree(node.children);
       }
-    }
-  }
-
-  // 按实际排序键排序子节点
-  for (const node of nodeMap.values()) {
-    if (node.children && node.children.length > 0) {
-      node.children.sort((a, b) => {
-        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[actualSortKey] || '';
-    const bVal = b[actualSortKey] || '';
-    return String(aVal).localeCompare(String(bVal));
-  });
+  sortTree(root);
 
-  const hasAnyLeaf = [...nodeMap.values()].some(n => n.isLeaf == false);
+  const hasAnyLeaf = root.some(n => !n.isLeaf);
   return { tree: root, hasAnyLeaf };
 }
 

package/src/main.js

@@ -21,8 +21,8 @@ for (const [key, component] of Object.entries(ElementPlusIconsVue)) {
 }
 
 app.use(centaline, {
-    baseUrl: "https://kq-api.centaline.com.cn/onecard-api/",
-    //baseUrl:"http://10.88.22.66/IBS.Mvc/api/",
+    //baseUrl: "http://10.88.22.13:7080/ibs-api/",
+    baseUrl:"http://hkibswcfha01.centaline.com/mvc/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.eyJsb2dpbl91c2VyX2tleSI6ImIzMjNmYjZjLTU5MWEtNGU5Mi1iODNmLWUzZDBhNThmMDMzMSJ9.P32j9z5ujG9bg76InDMrs89NgLhjly6ESp9MIipYVmCoiYQD0kgscqdk_7E6NKsi_FKosZVliKEeZFlPwqsBZQ',
-              authobject: '{token:"16-2005889170303787008",platform:"WEB"}',
+             //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"}',
               //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"}',