vxe-pc-ui 3.16.7 → 3.16.9

package/lib/index.umd.js

@@ -11680,7 +11680,7 @@ var es_regexp_exec = __webpack_require__(7495);
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.string.match.js
 var es_string_match = __webpack_require__(1761);
 ;// ./node_modules/@vxe-ui/core/es/src/core.js
-var coreVersion = "3.4.16";
+var coreVersion = "3.4.17";
 var VxeCore = {
   coreVersion: coreVersion,
   uiVersion: '',
@@ -12440,7 +12440,7 @@ function createLog(type, name) {
     return msg;
   };
 }
-var version = "3.4.16";
+var version = "3.4.17";
 var log = {
   create: createLog,
   warn: createLog('warn', "v".concat(version)),
@@ -13256,7 +13256,7 @@ var es_array_join = __webpack_require__(8598);
 
 
 var log_log = VxeUI.log;
-var uiVersion = "ui v".concat("3.16.7");
+var uiVersion = "ui v".concat("3.16.9");
 function createComponentLog(name) {
   var tableVersion = VxeUI.tableVersion ? "table v".concat(VxeUI.tableVersion) : '';
   var ganttVersion = VxeUI.ganttVersion ? "gantt v".concat(VxeUI.ganttVersion) : '';
@@ -13274,7 +13274,7 @@ var errLog = log_log.create('error', uiVersion);
 
 
 
-var ui_version = "3.16.7";
+var ui_version = "3.16.9";
 VxeUI.uiVersion = ui_version;
 VxeUI.dynamicApp = dynamicApp;
 function config(options) {
@@ -27084,6 +27084,8 @@ var Input = VxeInput;
 
 
 
+
+
 
 
 
@@ -27144,6 +27146,7 @@ function cascader_createInternalData() {
     selectCheckboxMaps: {},
     treeExpandedMaps: {},
     treeExpandLazyLoadedMaps: {}
+    // isUpdateMode: false
   };
 }
 /* harmony default export */ var cascader = (/* define-vxe-component start */defineVxeComponent({
@@ -27481,6 +27484,39 @@ function cascader_createInternalData() {
       var nodeKey = node[valueField];
       return enNodeValue(nodeKey);
     },
+    isPathInTree: function isPathInTree(treeData, pathIds) {
+      var $xeCascader = this;
+      if (!pathIds || !pathIds.length) {
+        return false;
+      }
+      var currentNodes = treeData;
+      var _iterator = _createForOfIteratorHelper(pathIds),
+        _step;
+      try {
+        var _loop = function _loop() {
+            var nodeid = _step.value;
+            var found = currentNodes.find(function (node) {
+              return $xeCascader.getNodeId(node) === nodeid;
+            });
+            if (!found) {
+              return {
+                v: false
+              };
+            }
+            currentNodes = found.children || [];
+          },
+          _ret;
+        for (_iterator.s(); !(_step = _iterator.n()).done;) {
+          _ret = _loop();
+          if (_ret) return _ret.v;
+        }
+      } catch (err) {
+        _iterator.e(err);
+      } finally {
+        _iterator.f();
+      }
+      return true;
+    },
     isCheckedByCheckboxNodeId: function isCheckedByCheckboxNodeId(nodeid) {
       var $xeCascader = this;
       var reactData = $xeCascader.reactData;
@@ -27715,7 +27751,7 @@ function cascader_createInternalData() {
         if (transform) {
           treeList = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().searchTree(treeFullData, handleSearch, {
             original: true,
-            isEvery: true,
+            isEvery: false,
             children: childrenField,
             mapChildren: mapChildrenField
           });
@@ -27735,7 +27771,7 @@ function cascader_createInternalData() {
             return true;
           }, {
             original: true,
-            isEvery: true,
+            isEvery: false,
             children: childrenField,
             mapChildren: mapChildrenField
           });
@@ -27819,11 +27855,11 @@ function cascader_createInternalData() {
       var currList = treeList;
       while (currList.length) {
         var targetNode = null;
-        var _iterator = _createForOfIteratorHelper(currList),
-          _step;
+        var _iterator2 = _createForOfIteratorHelper(currList),
+          _step2;
         try {
-          for (_iterator.s(); !(_step = _iterator.n()).done;) {
-            var item = _step.value;
+          for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
+            var item = _step2.value;
             var kids = item[childField];
             if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(kids) && kids.length > 0) {
               targetNode = item;
@@ -27831,9 +27867,9 @@ function cascader_createInternalData() {
             }
           }
         } catch (err) {
-          _iterator.e(err);
+          _iterator2.e(err);
         } finally {
-          _iterator.f();
+          _iterator2.f();
         }
         if (targetNode) {
           nodeIds.push($xeCascader.getNodeId(targetNode));
@@ -27851,16 +27887,25 @@ function cascader_createInternalData() {
       var reactData = $xeCascader.reactData;
       var internalData = $xeCascader.internalData;
       $xeCascader.handleData(true);
-      $xeCascader.updateModelChecked();
+      $xeCascader.updateCheckboxStatus();
+      var currentItems = reactData.currentItems;
+      var afterTreeList = internalData.afterTreeList;
       var filterOpts = $xeCascader.computeFilterOpts;
       var autoExpandMode = filterOpts.autoExpandMode;
-      var afterTreeList = internalData.afterTreeList;
-      // 默认展开第
-      if (autoExpandMode === 'first' || autoExpandMode === 'last') {
-        var stItems = $xeCascader.handleHasChildNodeIds(afterTreeList, autoExpandMode);
-        reactData.currentItems = stItems;
-      } else {
-        $xeCascader.handleCurrentItems();
+      // 如果当前不在列表情况下，触发默认行为
+      if (!$xeCascader.isPathInTree(afterTreeList, currentItems)) {
+        // 默认展开
+        if (autoExpandMode === 'first' || autoExpandMode === 'last') {
+          var stItems = $xeCascader.handleHasChildNodeIds(afterTreeList, autoExpandMode);
+          var expandedMaps = {};
+          stItems.forEach(function (nodeid) {
+            expandedMaps[nodeid] = true;
+          });
+          internalData.treeExpandedMaps = expandedMaps;
+          reactData.currentItems = stItems;
+        } else {
+          $xeCascader.handleCurrentItems();
+        }
       }
       $xeCascader.updateCurrentChunk();
     }, 350, {
@@ -28097,9 +28142,11 @@ function cascader_createInternalData() {
     changeEvent: function changeEvent(evnt, selectValue, node) {
       var $xeCascader = this;
       var props = $xeCascader;
+      var internalData = $xeCascader.internalData;
       var $xeForm = $xeCascader.$xeForm;
       var formItemInfo = $xeCascader.formItemInfo;
       var value = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(selectValue) ? selectValue.map(deNodeValue) : deNodeValue(selectValue);
+      internalData.isUpdateMode = true;
       $xeCascader.emitModel(value);
       if (value !== props.value) {
         $xeCascader.dispatchEvent('change', {
@@ -28246,12 +28293,13 @@ function cascader_createInternalData() {
         checked: isChecked
       }, evnt);
     },
-    changeRadioEvent: function changeRadioEvent(evnt, node) {
+    changeRadioEvent: function changeRadioEvent(evnt, node, chunks, chunkIndex) {
       var $xeCascader = this;
       var reactData = $xeCascader.reactData;
       var internalData = $xeCascader.internalData;
       evnt.preventDefault();
       evnt.stopPropagation();
+      var currentItems = reactData.currentItems;
       var nodeMaps = internalData.nodeMaps;
       var radioOpts = $xeCascader.computeRadioOpts;
       var childrenField = $xeCascader.computeChildrenField;
@@ -28275,6 +28323,10 @@ function cascader_createInternalData() {
       var value = nodeid;
       reactData.selectRadioKey = value;
       $xeCascader.changeEvent(evnt, value, node);
+      if (!currentItems.includes(nodeid)) {
+        $xeCascader.changeCurrentEvent(evnt, node);
+        $xeCascader.toggleExpandEvent(evnt, node, chunks, chunkIndex);
+      }
       $xeCascader.hideOptionPanel(evnt);
     },
     handleAsyncTreeExpandChilds: function handleAsyncTreeExpandChilds(node) {
@@ -28544,12 +28596,14 @@ function cascader_createInternalData() {
         reactData.updateCheckboxFlag++;
       }
     },
-    changeCheckboxEvent: function changeCheckboxEvent(evnt, node) {
+    changeCheckboxEvent: function changeCheckboxEvent(evnt, node, chunks, chunkIndex) {
       var $xeCascader = this;
       var reactData = $xeCascader.reactData;
       var internalData = $xeCascader.internalData;
       evnt.preventDefault();
       evnt.stopPropagation();
+      // const { filterable } = props
+      var currentItems = reactData.currentItems;
       var selectCheckboxMaps = internalData.selectCheckboxMaps,
         nodeMaps = internalData.nodeMaps;
       var childrenField = $xeCascader.computeChildrenField;
@@ -28580,7 +28634,7 @@ function cascader_createInternalData() {
         selectCheckboxMaps[nodeid] = node;
       }
       if (!checkStrictly) {
-        external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(node, transform ? mapChildrenField : childrenField), function (childNode) {
+        external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(childList, function (childNode) {
           var childNodeid = $xeCascader.getNodeId(childNode);
           if (isChecked) {
             if (!selectCheckboxMaps[childNodeid]) {
@@ -28600,6 +28654,10 @@ function cascader_createInternalData() {
       var nodeids = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().keys(selectCheckboxMaps);
       var value = nodeids;
       $xeCascader.changeEvent(evnt, value, node);
+      if (!currentItems.includes(nodeid)) {
+        $xeCascader.changeCurrentEvent(evnt, node);
+        $xeCascader.toggleExpandEvent(evnt, node, chunks, chunkIndex);
+      }
     },
     handleNodeClickEvent: function handleNodeClickEvent(evnt, node, chunks, chunkIndex) {
       var $xeCascader = this;
@@ -28628,12 +28686,12 @@ function cascader_createInternalData() {
       if (multiple) {
         if (checkboxOpts.trigger === 'node' || !showCheckbox && (!childList || !childList.length)) {
           triggerCheckbox = true;
-          $xeCascader.changeCheckboxEvent(evnt, node);
+          $xeCascader.changeCheckboxEvent(evnt, node, chunks, chunkIndex);
         }
       } else {
         if (radioOpts.trigger === 'node' || !showRadio && (!childList || !childList.length)) {
           triggerRadio = true;
-          $xeCascader.changeRadioEvent(evnt, node);
+          $xeCascader.changeRadioEvent(evnt, node, chunks, chunkIndex);
         }
       }
       $xeCascader.dispatchEvent('node-click', {
@@ -28777,7 +28835,7 @@ function cascader_createInternalData() {
     //
     // Render
     //
-    renderRadio: function renderRadio(h, node, isExistChild, nLevel, isChecked) {
+    renderRadio: function renderRadio(h, node, isExistChild, nLevel, isChecked, chunks, chunkIndex) {
       var $xeCascader = this;
       var props = $xeCascader;
       var showRadio = props.showRadio;
@@ -28803,7 +28861,7 @@ function cascader_createInternalData() {
           on: {
             click: function click(evnt) {
               if (!isDisabled) {
-                $xeCascader.changeRadioEvent(evnt, node);
+                $xeCascader.changeRadioEvent(evnt, node, chunks, chunkIndex);
               }
             }
           }
@@ -28813,7 +28871,7 @@ function cascader_createInternalData() {
       }
       return renderEmptyElement($xeCascader);
     },
-    renderCheckbox: function renderCheckbox(h, node, isExistChild, nLevel, isChecked, isIndeterminate) {
+    renderCheckbox: function renderCheckbox(h, node, isExistChild, nLevel, isChecked, isIndeterminate, chunks, chunkIndex) {
       var $xeCascader = this;
       var props = $xeCascader;
       var showCheckbox = props.showCheckbox;
@@ -28840,7 +28898,7 @@ function cascader_createInternalData() {
           on: {
             click: function click(evnt) {
               if (!isDisabled) {
-                $xeCascader.changeCheckboxEvent(evnt, node);
+                $xeCascader.changeCheckboxEvent(evnt, node, chunks, chunkIndex);
               }
             }
           }
@@ -28928,7 +28986,7 @@ function cascader_createInternalData() {
             $xeCascader.handleNodeClickEvent(evnt, node, chunks, chunkIndex);
           }
         }
-      }, [multiple ? $xeCascader.renderCheckbox(h, node, isExistChild, nLevel, isCheckboxChecked, isIndeterminate) : $xeCascader.renderRadio(h, node, isExistChild, nLevel, isRadioChecked), h('div', {
+      }, [multiple ? $xeCascader.renderCheckbox(h, node, isExistChild, nLevel, isCheckboxChecked, isIndeterminate, chunks, chunkIndex) : $xeCascader.renderRadio(h, node, isExistChild, nLevel, isRadioChecked, chunks, chunkIndex), h('div', {
         class: 'vxe-cascader-chunk--node-item-inner'
       }, [h('div', {
         class: 'vxe-cascader-chunk--node-item-title'
@@ -29114,9 +29172,13 @@ function cascader_createInternalData() {
   watch: {
     value: function value() {
       var $xeCascader = this;
-      $xeCascader.updateModelChecked();
-      $xeCascader.handleCurrentItems();
-      $xeCascader.updateCurrentChunk();
+      var internalData = $xeCascader.internalData;
+      if (!internalData.isUpdateMode) {
+        $xeCascader.updateModelChecked();
+        $xeCascader.handleCurrentItems();
+        $xeCascader.updateCurrentChunk();
+      }
+      internalData.isUpdateMode = false;
     },
     options: function options() {
       var $xeCascader = this;
@@ -29674,6 +29736,7 @@ var CheckboxButton = VxeCheckboxButton;
 
 
 
+
 function group_createReactData() {
   return {};
 }
@@ -29693,6 +29756,7 @@ function group_createInternalData() {
       type: Boolean,
       default: null
     },
+    type: String,
     disabled: {
       type: Boolean,
       default: null
@@ -29902,7 +29966,8 @@ function group_createInternalData() {
       var props = $xeCheckboxGroup;
       var slots = $xeCheckboxGroup.$scopedSlots;
       var status = props.status,
-        options = props.options;
+        options = props.options,
+        type = props.type;
       var defaultSlot = slots.default;
       var valueField = $xeCheckboxGroup.computeValueField;
       var labelField = $xeCheckboxGroup.computeLabelField;
@@ -29911,10 +29976,11 @@ function group_createInternalData() {
       var titleField = $xeCheckboxGroup.computeTitleField;
       var isReadonly = $xeCheckboxGroup.computeIsReadonly;
       var isDisabled = $xeCheckboxGroup.computeIsDisabled;
+      var btnComp = type === 'button' ? checkbox_button : packages_checkbox;
       return h('div', {
-        class: ['vxe-checkbox-group', _defineProperty(_defineProperty(_defineProperty({}, "theme--".concat(status), status), 'is--readonly', isReadonly), 'is--disabled', isDisabled)]
+        class: ['vxe-checkbox-group', "type--".concat(type === 'button' ? type : ''), _defineProperty(_defineProperty(_defineProperty({}, "theme--".concat(status), status), 'is--readonly', isReadonly), 'is--disabled', isDisabled)]
       }, defaultSlot ? defaultSlot({}) : options ? options.map(function (item) {
-        return h(src_checkbox, {
+        return h(btnComp, {
           key: item[valueField],
           props: {
             checkedValue: item[valueField],
@@ -39514,6 +39580,7 @@ function date_range_picker_createInternalData() {
       var $xeDateRangePicker = this;
       var reactData = $xeDateRangePicker.reactData;
       var internalData = $xeDateRangePicker.internalData;
+      var paneStartVal = reactData.paneStartVal;
       var selectStatus = internalData.selectStatus;
       var value = params.value,
         currValue = params.currValue,
@@ -39522,11 +39589,17 @@ function date_range_picker_createInternalData() {
       var startValue = '';
       var endValue = '';
       if (selectStatus) {
-        startValue = paneVals[0];
-        if (paneVals[1]) {
-          endValue = paneVals[1];
+        // 如果选择同一天
+        if (!value && currValue === paneStartVal[0]) {
+          startValue = currValue;
+          endValue = currValue;
         } else {
-          endValue = reactData.selectEdValue;
+          startValue = paneVals[0];
+          if (paneVals[1]) {
+            endValue = paneVals[1];
+          } else {
+            endValue = reactData.selectEdValue;
+          }
         }
       } else {
         startValue = currValue || external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().last(paneVals);
@@ -39550,6 +39623,7 @@ function date_range_picker_createInternalData() {
       var $xeDateRangePicker = this;
       var reactData = $xeDateRangePicker.reactData;
       var internalData = $xeDateRangePicker.internalData;
+      var paneEndVal = reactData.paneEndVal;
       var selectStatus = internalData.selectStatus;
       var value = params.value,
         currValue = params.currValue,
@@ -39558,12 +39632,18 @@ function date_range_picker_createInternalData() {
       var startValue = '';
       var endValue = '';
       if (selectStatus) {
-        endValue = paneVals[0];
-        if (paneVals[1]) {
-          startValue = paneVals[0];
-          endValue = paneVals[1];
+        // 如果选择同一天
+        if (!value && currValue === paneEndVal[1]) {
+          startValue = currValue;
+          endValue = currValue;
         } else {
-          startValue = reactData.selectStValue;
+          endValue = paneVals[0];
+          if (paneVals[1]) {
+            startValue = paneVals[0];
+            endValue = paneVals[1];
+          } else {
+            startValue = reactData.selectStValue;
+          }
         }
       } else {
         endValue = currValue || external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().last(paneVals);
@@ -47396,6 +47476,7 @@ var nemuUniqueKey = 100000000;
       var itemId = item.itemId,
         hasChild = item.hasChild,
         isExpand = item.isExpand;
+      var isCollapsed = $xeMenu.computeIsCollapsed;
       var expanded = !isExpand;
       if (hasChild) {
         evnt.stopPropagation();
@@ -47411,9 +47492,9 @@ var nemuUniqueKey = 100000000;
           });
         }
         item.isExpand = expanded;
-        var el = $xeMenu.$refs.refElem;
-        if (el) {
-          var nemuEl = el.querySelector(".vxe-menu--item-wrapper[data-menu-id=\"".concat(itemId, "\"]"));
+        var wrapperEl = isCollapsed ? $xeMenu.$refs.refCollapseElem : $xeMenu.$refs.refElem;
+        if (wrapperEl) {
+          var nemuEl = wrapperEl.querySelector(".vxe-menu--item-wrapper[data-menu-id=\"".concat(itemId, "\"]"));
           var groupEl = nemuEl ? nemuEl.querySelector('.vxe-menu--item-group') : null;
           if (groupEl) {
             if (expanded) {
@@ -53498,6 +53579,7 @@ var Pager = VxePager;
       var formItemInfo = $xePasswordInput.formItemInfo;
       var inputValue = reactData.inputValue;
       var value = inputValue;
+      reactData.isActivated = false;
       $xePasswordInput.dispatchEvent('blur', {
         value: value
       }, evnt);
@@ -55630,9 +55712,9 @@ function src_group_createInternalData() {
       var disabledField = $xeRadioGroup.computeDisabledField;
       var iconField = $xeRadioGroup.computeIconField;
       var titleField = $xeRadioGroup.computeTitleField;
-      var btnComp = type === 'button' ? radio_src_button : src_radio;
+      var btnComp = type === 'button' ? radio_button : packages_radio;
       return h('div', {
-        class: ['vxe-radio-group', _defineProperty(_defineProperty({}, "theme--".concat(status), status), "size--".concat(vSize), vSize)]
+        class: ['vxe-radio-group', "type--".concat(type === 'button' ? type : ''), _defineProperty(_defineProperty({}, "theme--".concat(status), status), "size--".concat(vSize), vSize)]
       }, defaultSlot ? defaultSlot({}) : options ? options.map(function (item) {
         return h(btnComp, {
           key: item[valueField],
@@ -62599,6 +62681,12 @@ function tree_createReactData() {
         return tree_getConfig().tree.minHeight;
       }
     },
+    emptyText: {
+      type: [String, Number],
+      default: function _default() {
+        return tree_getConfig().tree.emptyText;
+      }
+    },
     loading: Boolean,
     loadingConfig: Object,
     accordion: {
@@ -65673,14 +65761,19 @@ function tree_createReactData() {
     renderList: function renderList(h, treeList) {
       var $xeTree = this;
       var props = $xeTree;
+      var slots = $xeTree.$scopedSlots;
       var internalData = $xeTree.internalData;
-      var transform = props.transform;
+      var transform = props.transform,
+        emptyText = props.emptyText;
       var treeExpandedMaps = internalData.treeExpandedMaps;
       var childrenField = $xeTree.computeChildrenField;
+      var emptySlot = slots.empty;
       if (!treeList.length) {
         return [h('div', {
           class: 'vxe-tree--empty-placeholder'
-        }, tree_getI18n('vxe.tree.searchEmpty'))];
+        }, emptySlot ? emptySlot({}) : [h('div', {
+          class: 'vxe-tree--empty-placeholder-content'
+        }, getText(emptyText || tree_getI18n('vxe.tree.searchEmpty')))])];
       }
       var nodeVNs = [];
       treeList.forEach(transform ? function (node) {