vxe-pc-ui 3.14.19 → 3.14.21

package/es/tree-select/src/tree-select.js

@@ -23,14 +23,17 @@ function createReactData() {
         triggerFocusPanel: false,
         visiblePanel: false,
         isAniVisible: false,
-        isActivated: false
+        isActivated: false,
+        fullOptFlag: 1,
+        lazyOptFlag: 1
     };
 }
 function createInternalData() {
     return {
         // hpTimeout: undefined,
         fullOptionList: [],
-        fullNodeMaps: {}
+        fullNodeMaps: {},
+        lazyNodeMaps: {}
     };
 }
 export default {
@@ -58,6 +61,14 @@ export default {
             type: Boolean,
             default: null
         },
+        showFullLabel: {
+            type: Boolean,
+            default: getConfig().treeSelect.showFullLabel
+        },
+        separator: {
+            type: String,
+            default: getConfig().treeSelect.separator
+        },
         filterable: Boolean,
         filterConfig: Object,
         multiple: Boolean,
@@ -308,21 +319,22 @@ export default {
         computeSelectLabel() {
             const $xeTreeSelect = this;
             const props = $xeTreeSelect;
+            const reactData = $xeTreeSelect.reactData;
             const internalData = $xeTreeSelect.internalData;
-            const { value: modelValue, lazyOptions } = props;
-            const { fullNodeMaps } = internalData;
-            const valueField = $xeTreeSelect.computeValueField;
+            const { value: modelValue, showFullLabel } = props;
+            const { fullOptFlag, lazyOptFlag } = reactData;
+            const { fullNodeMaps, lazyNodeMaps } = internalData;
             const labelField = $xeTreeSelect.computeLabelField;
             const selectVals = XEUtils.eqNull(modelValue) ? [] : (XEUtils.isArray(modelValue) ? modelValue : [modelValue]);
             return selectVals.map(val => {
                 const cacheItem = fullNodeMaps[val];
-                if (cacheItem) {
-                    return cacheItem.item[labelField];
+                if (fullOptFlag && cacheItem) {
+                    return showFullLabel ? cacheItem.fullLabel : cacheItem.item[labelField];
                 }
-                if (lazyOptions) {
-                    const lazyItem = lazyOptions.find(item => item[valueField] === val);
-                    if (lazyItem) {
-                        return lazyItem[labelField];
+                if (lazyOptFlag) {
+                    const lazyCacheItem = lazyNodeMaps[val];
+                    if (lazyCacheItem) {
+                        return showFullLabel ? lazyCacheItem.fullLabel : lazyCacheItem.item[labelField];
                     }
                 }
                 return val;
@@ -379,17 +391,19 @@ export default {
             const nodeid = option[nodeKeyField];
             return nodeid ? encodeURIComponent(nodeid) : '';
         },
-        cacheDataMap() {
+        handleCacheMap(optList) {
             const $xeTreeSelect = this;
             const props = $xeTreeSelect;
-            const internalData = $xeTreeSelect.internalData;
-            const { options } = props;
+            const { separator } = props;
+            const treeOpts = $xeTreeSelect.computeTreeOpts;
             const nodeKeyField = $xeTreeSelect.computeNodeKeyField;
             const childrenField = $xeTreeSelect.computeChildrenField;
             const valueField = $xeTreeSelect.computeValueField;
+            const labelField = $xeTreeSelect.computeLabelField;
+            const { transform } = treeOpts;
             const nodeMaps = {};
             const keyMaps = {};
-            XEUtils.eachTree(options, (item, index, items, path, parent, nodes) => {
+            const handleOptNode = (item, index, items, path, parentItem, nodes) => {
                 let nodeid = $xeTreeSelect.getNodeid(item);
                 if (!nodeid) {
                     nodeid = getOptUniqueId();
@@ -402,10 +416,45 @@ export default {
                 if (nodeMaps[value]) {
                     errLog('vxe.error.repeatKey', [`[tree-select] ${valueField}`, value]);
                 }
-                nodeMaps[value] = { item, index, items, parent, nodes };
-            }, { children: childrenField });
+                nodeMaps[value] = {
+                    item,
+                    index,
+                    items,
+                    parent: parentItem,
+                    nodes,
+                    fullLabel: nodes.map(item => item[labelField]).join((separator || '/') + ' ')
+                };
+            };
+            if (optList) {
+                if (transform) {
+                    optList.forEach((item, index, items) => {
+                        handleOptNode(item, index, items, [], null, []);
+                    });
+                }
+                else {
+                    XEUtils.eachTree(optList, handleOptNode, { children: childrenField });
+                }
+            }
+            return nodeMaps;
+        },
+        cacheDataMap() {
+            const $xeTreeSelect = this;
+            const props = $xeTreeSelect;
+            const reactData = $xeTreeSelect.reactData;
+            const internalData = $xeTreeSelect.internalData;
+            const { options } = props;
+            internalData.fullNodeMaps = $xeTreeSelect.handleCacheMap(options || []);
             internalData.fullOptionList = options || [];
-            internalData.fullNodeMaps = nodeMaps;
+            reactData.fullOptFlag++;
+        },
+        cacheLazyDataMap() {
+            const $xeTreeSelect = this;
+            const props = $xeTreeSelect;
+            const reactData = $xeTreeSelect.reactData;
+            const internalData = $xeTreeSelect.internalData;
+            const { lazyOptions } = props;
+            internalData.lazyNodeMaps = $xeTreeSelect.handleCacheMap(lazyOptions || []);
+            reactData.lazyOptFlag++;
         },
         updateZindex() {
             const $xeTreeSelect = this;
@@ -1039,11 +1088,16 @@ export default {
         options() {
             const $xeTreeSelect = this;
             $xeTreeSelect.cacheDataMap();
+        },
+        lazyOptions() {
+            const $xeTreeSelect = this;
+            $xeTreeSelect.cacheLazyDataMap();
         }
     },
     created() {
         const $xeTreeSelect = this;
         $xeTreeSelect.cacheDataMap();
+        $xeTreeSelect.cacheLazyDataMap();
     },
     mounted() {
         const $xeTreeSelect = this;

package/es/ui/index.js

@@ -1,7 +1,7 @@
 import { VxeUI, setConfig, setIcon } from '@vxe-ui/core';
 import { dynamicApp } from '../dynamics';
 import { warnLog } from './src/log';
-export const version = "3.14.19";
+export const version = "3.14.21";
 VxeUI.uiVersion = version;
 VxeUI.dynamicApp = dynamicApp;
 export function config(options) {
@@ -416,6 +416,7 @@ setConfig({
     },
     treeSelect: {
         autoClose: null,
+        // separator: '/',
         virtualYConfig: {
             enabled: true,
             gt: 0,

package/es/ui/src/log.js

@@ -1,4 +1,4 @@
 import { log } from '@vxe-ui/core';
-const version = `ui v${"3.14.19"}`;
+const version = `ui v${"3.14.21"}`;
 export const warnLog = log.create('warn', version);
 export const errLog = log.create('error', version);

package/lib/index.umd.js

@@ -13214,7 +13214,7 @@ function checkDynamic() {
 }
 ;// ./packages/ui/src/log.ts
 
-var log_version = "ui v".concat("3.14.19");
+var log_version = "ui v".concat("3.14.21");
 var warnLog = log.create('warn', log_version);
 var errLog = log.create('error', log_version);
 ;// ./packages/ui/index.ts
@@ -13222,7 +13222,7 @@ var errLog = log.create('error', log_version);
 
 
 
-var ui_version = "3.14.19";
+var ui_version = "3.14.21";
 VxeUI.uiVersion = ui_version;
 VxeUI.dynamicApp = dynamicApp;
 function config(options) {
@@ -13637,6 +13637,7 @@ setConfig({
   },
   treeSelect: {
     autoClose: null,
+    // separator: '/',
     virtualYConfig: {
       enabled: true,
       gt: 0,
@@ -14046,7 +14047,7 @@ setIcon({
       cstmDragTarget: '移动：{0}',
       setting: {
         colSort: '排序',
-        sortHelpTip: '点击并拖动图标可以调整顺序',
+        sortHelpTip: '点击图标开始拖动',
         colTitle: '列标题',
         colResizable: '列宽（像素）',
         colVisible: '是否显示',
@@ -14532,7 +14533,7 @@ setIcon({
           groupPlaceholder: '拖至此处进行分组',
           valuesPlaceholder: '拖至此处进行聚合',
           dragExistCol: '该列已存在',
-          sortHelpTip: '点击并拖动图标可以调整顺序'
+          sortHelpTip: '点击图标开始拖动'
         },
         aggFuncs: {
           sum: '求和',
@@ -56887,6 +56888,17 @@ function handleNodeDragSwapEvent($xeTree, evnt, dragNode, prevDragNode, prevDrag
   clearCrossTreeDragStatus($xeTree);
   return Promise.resolve(errRest);
 }
+function handleVisibleOrCheckMode(mode, isExistChild, nLevel) {
+  if (mode) {
+    if (mode === 'first') {
+      return !nLevel;
+    }
+    if (mode === 'last') {
+      return !isExistChild;
+    }
+  }
+  return true;
+}
 function tree_createInternalData() {
   return {
     // initialized: false,
@@ -59111,26 +59123,25 @@ function tree_createReactData() {
       }
       return renderEmptyElement($xeTree);
     },
-    renderRadio: function renderRadio(h, node, nodeid, isChecked) {
+    renderRadio: function renderRadio(h, node, nodeid, isExistChild, nLevel, isChecked) {
       var $xeTree = this;
       var props = $xeTree;
       var showRadio = props.showRadio;
       var radioOpts = $xeTree.computeRadioOpts;
       var showIcon = radioOpts.showIcon,
+        checkMode = radioOpts.checkMode,
         checkMethod = radioOpts.checkMethod,
+        visibleMode = radioOpts.visibleMode,
         visibleMethod = radioOpts.visibleMethod;
-      var isVisible = !visibleMethod || visibleMethod({
+      var isVisible = visibleMethod ? visibleMethod({
         $tree: $xeTree,
         node: node
-      });
-      var isDisabled = !!checkMethod;
+      }) : handleVisibleOrCheckMode(visibleMode, isExistChild, nLevel);
       if (showRadio && showIcon && isVisible) {
-        if (checkMethod) {
-          isDisabled = !checkMethod({
-            $tree: $xeTree,
-            node: node
-          });
-        }
+        var isDisabled = checkMethod ? !checkMethod({
+          $tree: $xeTree,
+          node: node
+        }) : !handleVisibleOrCheckMode(checkMode, isExistChild, nLevel);
         return h('div', {
           class: ['vxe-tree--radio-option', {
             'is--checked': isChecked,
@@ -59149,26 +59160,25 @@ function tree_createReactData() {
       }
       return renderEmptyElement($xeTree);
     },
-    renderCheckbox: function renderCheckbox(h, node, nodeid, isChecked, isIndeterminate) {
+    renderCheckbox: function renderCheckbox(h, node, nodeid, isExistChild, nLevel, isChecked, isIndeterminate) {
       var $xeTree = this;
       var props = $xeTree;
       var showCheckbox = props.showCheckbox;
       var checkboxOpts = $xeTree.computeCheckboxOpts;
       var showIcon = checkboxOpts.showIcon,
+        checkMode = checkboxOpts.checkMode,
         checkMethod = checkboxOpts.checkMethod,
+        visibleMode = checkboxOpts.visibleMode,
         visibleMethod = checkboxOpts.visibleMethod;
-      var isVisible = !visibleMethod || visibleMethod({
+      var isVisible = visibleMethod ? visibleMethod({
         $tree: $xeTree,
         node: node
-      });
-      var isDisabled = !!checkMethod;
+      }) : handleVisibleOrCheckMode(visibleMode, isExistChild, nLevel);
       if (showCheckbox && showIcon && isVisible) {
-        if (checkMethod) {
-          isDisabled = !checkMethod({
-            $tree: $xeTree,
-            node: node
-          });
-        }
+        var isDisabled = checkMethod ? !checkMethod({
+          $tree: $xeTree,
+          node: node
+        }) : !handleVisibleOrCheckMode(checkMode, isExistChild, nLevel);
         return h('div', {
           class: ['vxe-tree--checkbox-option', {
             'is--checked': isChecked,
@@ -59215,12 +59225,12 @@ function tree_createReactData() {
       var titleField = $xeTree.computeTitleField;
       var hasChildField = $xeTree.computeHasChildField;
       var childList = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(node, childrenField);
-      var hasChild = childList && childList.length;
+      var isExistChild = childList && childList.length > 0;
       var iconSlot = slots.icon;
       var titleSlot = slots.title;
       var extraSlot = slots.extra;
       var isExpand = updateExpandedFlag && treeExpandedMaps[nodeid];
-      var nodeItem = nodeMaps[nodeid];
+      var nodeItem = nodeMaps[nodeid] || {};
       var nodeValue = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(node, titleField);
       var nLevel = nodeItem.level;
       var isRadioChecked = false;
@@ -59290,7 +59300,7 @@ function tree_createReactData() {
         }
       })]) : renderEmptyElement($xeTree), h('div', {
         class: 'vxe-tree--node-item-switcher'
-      }, showIcon && (lazy ? isLazyLoaded ? hasChild : hasLazyChilds : hasChild) ? [h('div', {
+      }, showIcon && (lazy ? isLazyLoaded ? isExistChild : hasLazyChilds : isExistChild) ? [h('div', {
         class: 'vxe-tree--node-item-icon',
         on: {
           click: function click(evnt) {
@@ -59299,7 +59309,7 @@ function tree_createReactData() {
         }
       }, iconSlot ? vn_getSlotVNs(iconSlot(nParams)) : [h('i', {
         class: isLazyLoading ? iconLoaded || tree_getIcon().TREE_NODE_LOADED : isExpand ? iconOpen || tree_getIcon().TREE_NODE_OPEN : iconClose || tree_getIcon().TREE_NODE_CLOSE
-      })])] : []), $xeTree.renderDragIcon(h, node, nodeid), $xeTree.renderRadio(h, node, nodeid, isRadioChecked), $xeTree.renderCheckbox(h, node, nodeid, isCheckboxChecked, isIndeterminate), h('div', {
+      })])] : []), $xeTree.renderDragIcon(h, node, nodeid), $xeTree.renderRadio(h, node, nodeid, isExistChild, nLevel, isRadioChecked), $xeTree.renderCheckbox(h, node, nodeid, isExistChild, nLevel, isCheckboxChecked, isIndeterminate), h('div', {
         class: 'vxe-tree--node-item-inner'
       }, [h('div', {
         class: 'vxe-tree--node-item-title'
@@ -59608,14 +59618,17 @@ function tree_select_createReactData() {
     triggerFocusPanel: false,
     visiblePanel: false,
     isAniVisible: false,
-    isActivated: false
+    isActivated: false,
+    fullOptFlag: 1,
+    lazyOptFlag: 1
   };
 }
 function tree_select_createInternalData() {
   return {
     // hpTimeout: undefined,
     fullOptionList: [],
-    fullNodeMaps: {}
+    fullNodeMaps: {},
+    lazyNodeMaps: {}
   };
 }
 /* harmony default export */ var tree_select = (/* define-vxe-component start */defineVxeComponent({
@@ -59643,6 +59656,14 @@ function tree_select_createInternalData() {
       type: Boolean,
       default: null
     },
+    showFullLabel: {
+      type: Boolean,
+      default: getConfig().treeSelect.showFullLabel
+    },
+    separator: {
+      type: String,
+      default: getConfig().treeSelect.separator
+    },
     filterable: Boolean,
     filterConfig: Object,
     multiple: Boolean,
@@ -59914,24 +59935,25 @@ function tree_select_createInternalData() {
     computeSelectLabel: function computeSelectLabel() {
       var $xeTreeSelect = this;
       var props = $xeTreeSelect;
+      var reactData = $xeTreeSelect.reactData;
       var internalData = $xeTreeSelect.internalData;
       var modelValue = props.value,
-        lazyOptions = props.lazyOptions;
-      var fullNodeMaps = internalData.fullNodeMaps;
-      var valueField = $xeTreeSelect.computeValueField;
+        showFullLabel = props.showFullLabel;
+      var fullOptFlag = reactData.fullOptFlag,
+        lazyOptFlag = reactData.lazyOptFlag;
+      var fullNodeMaps = internalData.fullNodeMaps,
+        lazyNodeMaps = internalData.lazyNodeMaps;
       var labelField = $xeTreeSelect.computeLabelField;
       var selectVals = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eqNull(modelValue) ? [] : external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(modelValue) ? modelValue : [modelValue];
       return selectVals.map(function (val) {
         var cacheItem = fullNodeMaps[val];
-        if (cacheItem) {
-          return cacheItem.item[labelField];
+        if (fullOptFlag && cacheItem) {
+          return showFullLabel ? cacheItem.fullLabel : cacheItem.item[labelField];
         }
-        if (lazyOptions) {
-          var lazyItem = lazyOptions.find(function (item) {
-            return item[valueField] === val;
-          });
-          if (lazyItem) {
-            return lazyItem[labelField];
+        if (lazyOptFlag) {
+          var lazyCacheItem = lazyNodeMaps[val];
+          if (lazyCacheItem) {
+            return showFullLabel ? lazyCacheItem.fullLabel : lazyCacheItem.item[labelField];
           }
         }
         return val;
@@ -59991,17 +60013,19 @@ function tree_select_createInternalData() {
       var nodeid = option[nodeKeyField];
       return nodeid ? encodeURIComponent(nodeid) : '';
     },
-    cacheDataMap: function cacheDataMap() {
+    handleCacheMap: function handleCacheMap(optList) {
       var $xeTreeSelect = this;
       var props = $xeTreeSelect;
-      var internalData = $xeTreeSelect.internalData;
-      var options = props.options;
+      var separator = props.separator;
+      var treeOpts = $xeTreeSelect.computeTreeOpts;
       var nodeKeyField = $xeTreeSelect.computeNodeKeyField;
       var childrenField = $xeTreeSelect.computeChildrenField;
       var valueField = $xeTreeSelect.computeValueField;
+      var labelField = $xeTreeSelect.computeLabelField;
+      var transform = treeOpts.transform;
       var nodeMaps = {};
       var keyMaps = {};
-      external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(options, function (item, index, items, path, parent, nodes) {
+      var handleOptNode = function handleOptNode(item, index, items, path, parentItem, nodes) {
         var nodeid = $xeTreeSelect.getNodeid(item);
         if (!nodeid) {
           nodeid = tree_select_getOptUniqueId();
@@ -60018,14 +60042,44 @@ function tree_select_createInternalData() {
           item: item,
           index: index,
           items: items,
-          parent: parent,
-          nodes: nodes
+          parent: parentItem,
+          nodes: nodes,
+          fullLabel: nodes.map(function (item) {
+            return item[labelField];
+          }).join((separator || '/') + ' ')
         };
-      }, {
-        children: childrenField
-      });
+      };
+      if (optList) {
+        if (transform) {
+          optList.forEach(function (item, index, items) {
+            handleOptNode(item, index, items, [], null, []);
+          });
+        } else {
+          external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(optList, handleOptNode, {
+            children: childrenField
+          });
+        }
+      }
+      return nodeMaps;
+    },
+    cacheDataMap: function cacheDataMap() {
+      var $xeTreeSelect = this;
+      var props = $xeTreeSelect;
+      var reactData = $xeTreeSelect.reactData;
+      var internalData = $xeTreeSelect.internalData;
+      var options = props.options;
+      internalData.fullNodeMaps = $xeTreeSelect.handleCacheMap(options || []);
       internalData.fullOptionList = options || [];
-      internalData.fullNodeMaps = nodeMaps;
+      reactData.fullOptFlag++;
+    },
+    cacheLazyDataMap: function cacheLazyDataMap() {
+      var $xeTreeSelect = this;
+      var props = $xeTreeSelect;
+      var reactData = $xeTreeSelect.reactData;
+      var internalData = $xeTreeSelect.internalData;
+      var lazyOptions = props.lazyOptions;
+      internalData.lazyNodeMaps = $xeTreeSelect.handleCacheMap(lazyOptions || []);
+      reactData.lazyOptFlag++;
     },
     updateZindex: function updateZindex() {
       var $xeTreeSelect = this;
@@ -60641,11 +60695,16 @@ function tree_select_createInternalData() {
     options: function options() {
       var $xeTreeSelect = this;
       $xeTreeSelect.cacheDataMap();
+    },
+    lazyOptions: function lazyOptions() {
+      var $xeTreeSelect = this;
+      $xeTreeSelect.cacheLazyDataMap();
     }
   },
   created: function created() {
     var $xeTreeSelect = this;
     $xeTreeSelect.cacheDataMap();
+    $xeTreeSelect.cacheLazyDataMap();
   },
   mounted: function mounted() {
     var $xeTreeSelect = this;