centaline-data-driven-v3 0.1.47 → 0.1.49

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

@@ -1,12 +1,13 @@
 <template>
   <div id="ct-tree" class="ct-tree" oncontextmenu="event.preventDefault()" style="overflow:auto;" v-loading="loading"
     :style="{ height: props.treeHeight - 10 + 'px' }">
-    <el-tree class="tree-line" :props="defaultProps" :expand-on-click-node="false" 
-      @node-click="handleNodeClick"
+    <el-tree class="tree-line" :props="defaultProps" :expand-on-click-node="false" @node-click="handleNodeClick"
       :filter-node-method="filterNode" lazy :load="loadNode" ref="refTree" @node-contextmenu="handleContextMenu"
       node-key="code" current-node-key="currentNodeKey" :default-expanded-keys="defaultExpandedKeys">
       <template #default="{ node, data }">
-        <span class="node_content" @mouseenter="handleMouseEnter(data, node)" @mousemove="handleMouseMove">
+        <!-- 添加鼠标离开事件监听 -->
+        <span class="node_content" @mouseenter="handleMouseEnter(data, node)" @mouseleave="handleMouseLeave(data)"
+          @mousemove="handleMouseMove">
           <el-icon class="node-icon" :class="{ 'is-leaf': node.isLeaf }">
             <Document v-if="node.isLeaf" :size="14" />
             <Folder v-else-if="!node.expanded" :size="14" />
@@ -16,10 +17,12 @@
             {{ data.name }}
           </span>
           <span @click.stop>
-            <el-popover placement="right" :show-arrow="false" :virtual-ref="nodeRef" virtual-triggering :visible="showPopover(data)" v-if="showPopover(data)" :show-after="0"
-              :hide-after="0" :popper-class="allIconsMode ? 'popper-transparent' : 'popper-menu'"
-              :popper-style="popoverStyle">
-              <div class="box-menu" :class="{ 'box-menu-icons': allIconsMode }">
+            <el-popover placement="right" :show-arrow="false" :virtual-ref="nodeRef" virtual-triggering
+              :visible="showPopover(data)" v-if="showPopover(data)" :show-after="0" :hide-after="0"
+              :popper-class="allIconsMode ? 'popper-transparent' : 'popper-menu'" :popper-style="popoverStyle">
+              <!-- 添加菜单区域的鼠标事件，防止移入菜单时触发离开 -->
+              <div class="box-menu" :class="{ 'box-menu-icons': allIconsMode }" @mouseenter="handleMenuEnter"
+                @mouseleave="handleMenuLeave">
                 <template v-for="(item, index) in allowedRoutes">
                   <template v-if="allIconsMode">
                     <img class="opertion" v-if="item.imgUrl" :src="item.imgUrl" :alt="item.controlLabel || ''"
@@ -103,6 +106,9 @@ const hoverNodeCode = ref('')
 const isHoverMode = ref(false) // 是否是悬停模式
 const isManualClose = ref(false) // 是否是手动关闭
 const allIconsMode = ref(false) // 是否全是图标模式
+// 新增：菜单相关状态
+const isMouseInMenu = ref(false) // 鼠标是否在菜单内
+const isMouseInNode = ref(false) // 鼠标是否在节点内
 // 新增：弹出框位置控制
 const popoverStyle = ref({})
 const currentMousePosition = ref({ x: 0, y: 0 }) // 当前鼠标位置
@@ -128,6 +134,9 @@ const isLazyInitialized = ref(false) // 标记是否已经初始化过lazy值
 // 新增：记录节点加载状态的Map
 const nodeLoadedStatus = ref(new Map())
 
+// 新增：关闭菜单的定时器
+const closeTimer = ref(null)
+
 /** 动态设置Input Ref */
 const handleSetInputMap = (el: refItem, item) => {
   if (el) {
@@ -145,6 +154,10 @@ onBeforeUnmount(() => {
     clearTimeout(hoverTimer.value);
     hoverTimer.value = null;
   }
+  if (closeTimer.value) {
+    clearTimeout(closeTimer.value);
+    closeTimer.value = null;
+  }
 })
 
 // 检查allowedRoutes是否全是图标
@@ -161,6 +174,7 @@ function showPopover(data) {
 
   const isCurrentNode = data.code === currentData.value.code;
   const hasRoutes = allowedRoutes.value.length > 0;
+
   if (isHoverMode.value) {
     // 悬停模式：当前节点且有路由就显示
     return isCurrentNode && hasRoutes && menuVisible.value;
@@ -172,14 +186,19 @@ function showPopover(data) {
 
 // 鼠标进入节点
 function handleMouseEnter(data, node) {
-  // if (isManualClose.value) {
-  //   isManualClose.value = false;
-  //   return;
-  // }
+  // 清除可能存在的关闭定时器
+  if (closeTimer.value) {
+    clearTimeout(closeTimer.value);
+    closeTimer.value = null;
+  }
+
+  isMouseInNode.value = true;
+
   // 检查当前节点的allowedRoutes是否全是图标
   const routes = getAllowedRoutesForNode(data);
   const allIcons = checkIfAllIcons(routes);
   allIconsMode.value = allIcons;
+
   if (allIcons) {
     isHoverMode.value = true;
     hoverNodeCode.value = data.code;
@@ -191,6 +210,53 @@ function handleMouseEnter(data, node) {
   }
 }
 
+// 鼠标离开节点
+function handleMouseLeave(data) {
+  isMouseInNode.value = false;
+
+  // 如果是悬停模式且全是图标模式，开始关闭计时
+  if (isHoverMode.value && allIconsMode.value && !isMouseInMenu.value) {
+    startCloseTimer();
+  }
+}
+
+// 鼠标进入菜单
+function handleMenuEnter() {
+  isMouseInMenu.value = true;
+
+  // 清除关闭定时器
+  if (closeTimer.value) {
+    clearTimeout(closeTimer.value);
+    closeTimer.value = null;
+  }
+}
+
+// 鼠标离开菜单
+function handleMenuLeave() {
+  isMouseInMenu.value = false;
+
+  // 如果鼠标也不在节点内，开始关闭计时
+  if (isHoverMode.value && allIconsMode.value && !isMouseInNode.value) {
+    startCloseTimer();
+  }
+}
+
+// 开始关闭计时器
+function startCloseTimer() {
+  // 清除已有的计时器
+  if (closeTimer.value) {
+    clearTimeout(closeTimer.value);
+    closeTimer.value = null;
+  }
+
+  // 设置关闭计时器（延迟300ms关闭，避免误触）
+  closeTimer.value = setTimeout(() => {
+    if (!isMouseInNode.value && !isMouseInMenu.value) {
+      closeMenu();
+    }
+  }, 300);
+}
+
 // 鼠标移动事件
 function handleMouseMove(event) {
   // 更新鼠标位置
@@ -238,11 +304,18 @@ function updatePopoverPosition() {
 function handleContextMenu(event, object, node) {
   event.preventDefault();
 
+  // 清除可能的关闭计时器
+  if (closeTimer.value) {
+    clearTimeout(closeTimer.value);
+    closeTimer.value = null;
+  }
+
   // 记录鼠标位置
   currentMousePosition.value = {
     x: event.clientX,
     y: event.clientY
   };
+
   // 检查当前节点的allowedRoutes是否全是图标
   const routes = getAllowedRoutesForNode(object);
   const allIcons = checkIfAllIcons(routes);
@@ -251,7 +324,9 @@ function handleContextMenu(event, object, node) {
   if (allIcons) {
     return;
   }
+
   isManualClose.value = false;
+  isMouseInNode.value = true;
   showNodeMenu(object, node, false);
 }
 
@@ -308,6 +383,8 @@ function closeMenu() {
   isManualClose.value = true;
   menuVisible.value = false;
   isHoverMode.value = false;
+  isMouseInMenu.value = false;
+  isMouseInNode.value = false;
   lastNodeCode.value = '';
   isPositionLockedForCurrentNode.value = false;
 
@@ -316,6 +393,12 @@ function closeMenu() {
   // 重置弹出框样式
   popoverStyle.value = {};
 
+  // 清除关闭计时器
+  if (closeTimer.value) {
+    clearTimeout(closeTimer.value);
+    closeTimer.value = null;
+  }
+
   // 移除事件监听
   document.removeEventListener('click', closeMenuOnClick);
 
@@ -717,7 +800,7 @@ function getAllowedRoutesForNode(data) {
 }
 
 // 修改：加载节点，保存节点Map
-function loadNode(node, resolve) { 
+function loadNode(node, resolve) {
   // 如果是根节点（level === 0），清空节点加载状态
   if (node.level === 0) {
     nodeLoadedStatus.value.clear();
@@ -731,7 +814,7 @@ function loadNode(node, resolve) {
     }
     return;
   }
-  
+
   // 如果节点已经有数据且不是懒加载模式，直接返回子节点
   if (node.data && node.data.children && node.data.children.length > 0 && !lazy.value) {
     resolve(node.data.children);
@@ -743,7 +826,7 @@ function loadNode(node, resolve) {
     loading.value = true;
     rootNode.value = node;
     rootResolve.value = resolve;
-     
+
     return SearchTree(screenPara.value || undefined).then(data => {
       loading.value = false;
       // 重置前折叠所有节点
@@ -774,8 +857,8 @@ function loadNode(node, resolve) {
       // 无论是否第一次加载，都解析树数据
       const resultData = hasAnyLeaf ? tree : data.rows;
       resolve(resultData);
-      
-      
+
+
 
       if (props.expandTwoLevels && hasAnyLeaf) {
         fullTreeData.value = tree;
@@ -799,74 +882,73 @@ function loadNode(node, resolve) {
   }
 
   // 懒加载模式加载子节点
- // 懒加载模式加载子节点
   if (node.level >= 1 && lazy.value) {
-   
-  // 设置节点为加载中状态
-  if (node && node.key) {
-    nodeLoadedStatus.value.set(node.key, 'loading');
-  }
-  
-  // 检查是否已经有子节点数据
-  if (node.data.children && node.data.children.length > 0) {
+
+    // 设置节点为加载中状态
     if (node && node.key) {
-      nodeLoadedStatus.value.set(node.key, 'loaded');
+      nodeLoadedStatus.value.set(node.key, 'loading');
     }
-    resolve(node.data.children);
-    return;
-  }
 
-  let fields = model.value.searchData("code", node.data.code, 9, 3);
-  let filter = {
-    "searchData": {
-      ...(screenPara.value?.searchData || {}),
-      fields: [
-        ...fields.fields,
-        ...(screenPara.value?.searchData?.fields || [])
-      ]
+    // 检查是否已经有子节点数据
+    if (node.data.children && node.data.children.length > 0) {
+      if (node && node.key) {
+        nodeLoadedStatus.value.set(node.key, 'loaded');
+      }
+      resolve(node.data.children);
+      return;
     }
-  };
 
-  return SearchTree(filter).then(data => {
-    // 标记节点为已加载
-    if (node && node.key) {
-      nodeLoadedStatus.value.set(node.key, 'loaded');
-    }
-    
-    // 关键：更新节点的数据，添加children属性
-    if (node.data) {
-      node.data.children = data.rows;
-      
-      // 判断是否没有子节点
-      if (!data.rows || data.rows.length === 0) {
-        // 没有子节点，设置节点为叶子节点
+    let fields = model.value.searchData("code", node.data.code, 9, 3);
+    let filter = {
+      "searchData": {
+        ...(screenPara.value?.searchData || {}),
+        fields: [
+          ...fields.fields,
+          ...(screenPara.value?.searchData?.fields || [])
+        ]
+      }
+    };
+
+    return SearchTree(filter).then(data => {
+      // 标记节点为已加载
+      if (node && node.key) {
+        nodeLoadedStatus.value.set(node.key, 'loaded');
+      }
+
+      // 关键：更新节点的数据，添加children属性
+      if (node.data) {
+        node.data.children = data.rows;
+
+        // 判断是否没有子节点
+        if (!data.rows || data.rows.length === 0) {
+          // 没有子节点，设置节点为叶子节点
+          node.data.isLeaf = true;
+          node.isLeaf = true;
+        } else {
+          // 有子节点，设置节点为非叶子节点
+          node.data.isLeaf = false;
+          node.isLeaf = false;
+        }
+      }
+
+      resolve(data.rows || []);
+      load(data, false);
+    }).catch(error => {
+      loading.value = false;
+      if (node && node.key) {
+        nodeLoadedStatus.value.delete(node.key);
+      }
+      console.error('加载子节点失败:', error);
+
+      // 加载失败时，如果没有子节点数据，也标记为叶子节点
+      if (node && node.data) {
         node.data.isLeaf = true;
         node.isLeaf = true;
-      } else {
-        // 有子节点，设置节点为非叶子节点
-        node.data.isLeaf = false;
-        node.isLeaf = false;
       }
-    }
-    
-    resolve(data.rows || []);
-    load(data, false);
-  }).catch(error => {
-    loading.value = false;
-    if (node && node.key) {
-      nodeLoadedStatus.value.delete(node.key);
-    }
-    console.error('加载子节点失败:', error);
-    
-    // 加载失败时，如果没有子节点数据，也标记为叶子节点
-    if (node && node.data) {
-      node.data.isLeaf = true;
-      node.isLeaf = true;
-    }
-    
-    resolve([]);
-  });
-}
+
+      resolve([]);
+    });
+  }
 }
 
 // 加载数据
@@ -962,14 +1044,14 @@ function clearSearch() {
 }
 
 // 修改：节点点击事件，支持自动展开和懒加载
-function handleNodeClick(data) { 
-  
+function handleNodeClick(data) {
+
   closeMenu();
-  
+
   // 设置当前选中节点
   if (data && data.code) {
     refTree.value?.setCurrentKey(data.code);
-    
+
     // 如果是懒加载模式，检查节点是否需要加载子节点
     if (lazy.value) {
       const treeNode = refTree.value.getNode(data.code);
@@ -986,12 +1068,12 @@ function handleNodeClick(data) {
               // 没有子节点，标记为叶子节点
               treeNode.isLeaf = true;
               treeNode.loaded = true;
-              
+
               // 更新原始数据中的 isLeaf 属性
               if (treeNode.data) {
                 treeNode.data.isLeaf = true;
               }
-              
+
               // 如果有父节点，更新父节点的children数组
               if (treeNode.parent && treeNode.parent.data) {
                 const parentData = treeNode.parent.data;
@@ -1015,7 +1097,7 @@ function handleNodeClick(data) {
       }
     }
   }
-  
+
   if (LastClickNode.value != data) {
     LastClickNode.value = data;
     let rowRouter = model.value.rowSelectRouter;
@@ -1050,7 +1132,14 @@ function routerClickHandler(field) {
   submitData.actionType = field.actionType;
 
   RouterClickHandler(field, submitData, null, model.value, 'tree', function (newData) {
+    if (newData?.responseData?.notification == Enum.ActionType.Refersh || field.actionType == Enum.ActionType.Refersh) {
+      isLazyInitialized.value = false;
+      lazy.value = true;
+      search(screenPara.value);
+      return false;
+    }
     switch (field.actionType) {
+
       case Enum.ActionType.Delete:
       case Enum.ActionType.CloseTabThenDelete:
         removeNode(newData);
@@ -1063,6 +1152,7 @@ function routerClickHandler(field) {
       case Enum.ActionType.CloseTabThenUpdate:
         updateNode(newData)
         break;
+
       default:
         break;
     }
@@ -1411,7 +1501,6 @@ defineExpose({
 .box-menu {
   z-index: 1000;
   background-color: #fff;
-  // box-shadow: 0 2px 12px rgba(0, 0, 0, 0.1);
   border-radius: 4px;
   padding: 4px 0;
 
@@ -1539,11 +1628,6 @@ defineExpose({
 
 }
 
-// .popper-transparent .el-popper__arrow::before,
-// .popper-menu .el-popper__arrow::before {
-//   background: transparent !important;
-// }
-
 .popper-menu {
   padding: 0 !important;
 }

package/src/loader/src/CheckBoxList.js

@@ -2,6 +2,37 @@ import base from '../../loader/index';
 import valid from '../../utils//validate';
 const CheckBoxList = function (source) {
     let rtn = {
+        checkedAllCode: '-99999',
+        _flagCheckedAll: null,
+        get options() {
+            return source.selectItems1;
+        },
+        get normalItemValues() {
+            this._value = [];
+            this.options.forEach((v) => {
+                if (v['code']) {
+                    if (!v['flagDeleted']) {
+                        this._value.push(v.code);
+                    }
+                }
+            });
+            return this._value;
+        },
+        get flagCheckedAll() {
+            if (this._flagCheckedAll !== null) {
+                return this._flagCheckedAll;
+            }
+            else {
+                this._checkedItemArr = false;
+                source.selectItems1.forEach((v) => {
+                    if (v['code'] === this.checkedAllCode) {
+                        this._checkedItemArr = true;
+                        return;
+                    }
+                });
+                return this._checkedItemArr;
+            }
+        },
         _value: null,
         get value() {
 
@@ -18,16 +49,81 @@ const CheckBoxList = function (source) {
                         }
                     }
                 });
+                if (this.flagCheckedAll) {
+                    let ic = this._value.findIndex((op) => { return op === this.checkedAllCode });
+                    let opl = ic > -1 ? this.options.length : this.options.length - 1;
+                    if (ic > -1 || this._value.length === opl) {
+                        this._value.splice(0, this._value.length);
+                        source.code1 = JSON.stringify(this.options);
+                        this.options.forEach((v) => {
+                            if (v['code']) {
+                                this._value.push(v['code']);
+                            }
+                        });
+                    }
+                    else if (this._value.length < opl) {
+                        if (ic > -1) this._value.splice(ic, 1);
+                    }
+                }
             }
 
+
             return this._value
 
         },
         set value(v) {
             this._value = v
         },
+        checkAll() {
+            let checked = source.code1
+            if (typeof source.code1 === 'string') {
+                checked = JSON.parse(source.code1)
+            }
+            // 保存旧的选中值用于比较
+            const oldValue = [];
+            checked.forEach((v) => {
+                if (v['flagDeleted'] != true) {
+                    oldValue.push(v['code'])
+                }
+            });
+
+            // 找出新增和移除的项
+            const added = this.value.filter(item => !oldValue.includes(item))
+            const removed = oldValue.filter(item => !this.value.includes(item))
+
+            const hasAll = this.value.includes(this.checkedAllCode)
+            const selectedNormals = this.value.filter(item => item !== this.checkedAllCode)
+
+            // 处理各种情况
+            if (added.includes(this.checkedAllCode)) {
+                // 情况1: 点击了全选 -> 全选所有
+                this.value = this.normalItemValues
+            }
+            else if (removed.includes(this.checkedAllCode)) {
+                // 情况2: 取消了全选 -> 全部取消
+                this.value = []
+            }
+            else {
+                // 情况3: 操作了普通选项
+                if (selectedNormals.length === this.normalItemValues.length - 1) {
+                    // 如果所有普通项都选中了，加上全选
+                    this.value = this.normalItemValues
+                }
+                else if (hasAll && selectedNormals.length < this.normalItemValues.length) {
+                    // 如果当前有全选但普通项没全选，移除全选
+                    this.value = [...selectedNormals]
+                }
+                else {
+                    // 普通情况：只有普通项
+                    this.value = [...selectedNormals]
+                }
+            }
+        },
         //修改code1值
         setcode() {
+            if (this.flagCheckedAll) {
+                this.checkAll();
+            }
             let currentOptions = this.selectItems1.filter((v) => {
                 return this.value.indexOf(v['code']) >= 0;
             });
@@ -90,6 +186,23 @@ const CheckBoxList = function (source) {
             });
             return nameArr;
         },
+        getFormObj() {
+            var rtnFormObj = {};
+            Object.defineProperty(rtnFormObj, source.fieldName1, {
+                get: function () {
+                    if (rtn.flagCheckedAll && source.code1) {
+                        let v = JSON.parse(source.code1);
+                        let ic = v.findIndex((op) => { return op['code'] === rtn.checkedAllCode });
+                        if (ic > -1) v.splice(ic, 1);
+                        return JSON.stringify(v);
+                    }
+                    return source.code1;
+                },
+                enumerable: true,
+                configurable: true
+            });
+            return rtnFormObj;
+        },
 
     };
     rtn = base.copy(source, rtn);

package/src/loader/src/DatePicker.js

@@ -6,14 +6,15 @@ const DatePicker = function (source) {
     let rtn = {
         //格式
         get valueFormat() {
-            if (source.controlType == Enum.ControlType.DateTime || source.controlType == Enum.ControlType.DateTimeRange || this.flagtime) {
-                return 'yyyy-MM-dd HH:mm:ss'
-            }
-            else if (source.controlType == Enum.ControlType.DateYearMonth
-                || source.controlType == Enum.ControlType.MonthRange) {
-                return 'yyyy-MM'
-            }
-            return 'yyyy-MM-dd'
+            // if (source.controlType == Enum.ControlType.DateTime || source.controlType == Enum.ControlType.DateTimeRange || this.flagtime) {
+            //     return 'yyyy-MM-dd HH:mm:ss'
+            // }
+            // else if (source.controlType == Enum.ControlType.DateYearMonth
+            //     || source.controlType == Enum.ControlType.MonthRange) {
+            //     return 'yyyy-MM'
+            // }
+            // return 'yyyy-MM-dd'
+            return this.format;
         },
         //APP格式
         get valueFormatAPP() {

package/src/loader/src/Field.js

@@ -798,7 +798,7 @@ const Base = function (source, moreActionRouter, formLabelPlacement) {
                 if (source.code2) {
                     return source.code2 * 1024 * 1024;
                 }
-                return null;
+                return undefined;
             },
             set class(v) {
                 source.className = v
@@ -924,12 +924,24 @@ const Base = function (source, moreActionRouter, formLabelPlacement) {
         //搜索组件宽度
         get listBind() {
             let bind = {};
-            bind = {
-                style: {
-                    'width': source.width + 'px',
-                    display: 'inline-table'
+            if (this.controlType === Enum.ControlType.MultiSelectNoSearch
+                || this.controlType === Enum.ControlType.MultiSelectWithSearch) {
+                bind = {
+                    style: {
+                        'min-width': source.width + 'px',
+                        display: 'inline-table'
+                    }
+                }
+            }
+            else {
+                bind = {
+                    style: {
+                        'width': source.width + 'px',
+                        display: 'inline-table'
+                    }
                 }
             }
+
             return bind;
         },
         //获取控件fieldName1对应的code1

package/src/loader/src/Form.js

@@ -654,6 +654,13 @@ function loadFromModel(source, isFormList) {
     set col(v) {
       source.colSpan = v;
     },
+    _pageDisabled: false,
+    get pageDisabled() {
+      return this._pageDisabled;
+    },
+    set pageDisabled(v) {
+      this._pageDisabled = v;
+    },
     //操作按钮列表
     _buttons: null,
     get buttons() {
@@ -835,10 +842,11 @@ function loadFromModel(source, isFormList) {
             if (f.table) {
               let rtnFormArr = [];
               var tempListData = f.table.model.getSelectRowData({ isMulti: f.table.model.isMulti });
-              for (let i = 0; i < tempListData.length; i++) {
-                rtnFormArr.push(tempListData[i]);
+              if (tempListData) {
+                for (let i = 0; i < tempListData.length; i++) {
+                  rtnFormArr.push(tempListData[i]);
+                }
               }
-
               let rtnObj = {};
               Object.defineProperty(rtnObj, f.fieldName1, {
                 get: function () {