vxe-pc-ui 3.14.19 → 3.14.20

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.20");
 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.20";
 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: '求和',
@@ -59608,14 +59609,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 +59647,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 +59926,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 +60004,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 +60033,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 +60686,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;