vxe-pc-ui 4.16.7 → 4.16.8

package/lib/index.umd.js

@@ -4657,7 +4657,7 @@ function checkDynamic() {
 const {
   log: log_log
 } = VxeUI;
-const uiVersion = `ui v${"4.16.7"}`;
+const uiVersion = `ui v${"4.16.8"}`;
 function createComponentLog(name) {
   const tableVersion = VxeUI.tableVersion ? `table v${VxeUI.tableVersion}` : '';
   const ganttVersion = VxeUI.ganttVersion ? `gantt v${VxeUI.ganttVersion}` : '';
@@ -4675,7 +4675,7 @@ const errLog = log_log.create('error', uiVersion);
 
 
 
-const ui_version = "4.16.7";
+const ui_version = "4.16.8";
 VxeUI.uiVersion = ui_version;
 VxeUI.dynamicApp = dynamicApp;
 function config(options) {
@@ -17403,6 +17403,7 @@ const Input = VxeInput;
 
 
 
+
 /**
  * 生成节点的唯一主键
  */
@@ -17449,6 +17450,7 @@ function cascader_createInternalData() {
     selectCheckboxMaps: {},
     treeExpandedMaps: {},
     treeExpandLazyLoadedMaps: {}
+    // isUpdateMode: false
   };
 }
 /* harmony default export */ var cascader = (defineVxeComponent({
@@ -17728,6 +17730,20 @@ function cascader_createInternalData() {
       const nodeKey = node[valueField];
       return enNodeValue(nodeKey);
     };
+    const isPathInTree = (treeData, pathIds) => {
+      if (!pathIds || !pathIds.length) {
+        return false;
+      }
+      let currentNodes = treeData;
+      for (const nodeid of pathIds) {
+        const found = currentNodes.find(node => getNodeId(node) === nodeid);
+        if (!found) {
+          return false;
+        }
+        currentNodes = found.children || [];
+      }
+      return true;
+    };
     const isCheckedByCheckboxNodeId = nodeid => {
       const {
         updateCheckboxFlag
@@ -17969,7 +17985,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
           });
@@ -17987,7 +18003,7 @@ function cascader_createInternalData() {
         if (transform) {
           treeList = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().searchTree(treeFullData, () => true, {
             original: true,
-            isEvery: true,
+            isEvery: false,
             children: childrenField,
             mapChildren: mapChildrenField
           });
@@ -18091,20 +18107,31 @@ function cascader_createInternalData() {
     }
     const triggerSearchEvent = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().debounce(() => {
       handleData(true);
-      updateModelChecked();
-      const filterOpts = computeFilterOpts.value;
+      updateCheckboxStatus();
       const {
-        autoExpandMode
-      } = filterOpts;
+        currentItems
+      } = reactData;
       const {
         afterTreeList
       } = internalData;
-      // 默认展开第
-      if (autoExpandMode === 'first' || autoExpandMode === 'last') {
-        const stItems = handleHasChildNodeIds(afterTreeList, autoExpandMode);
-        reactData.currentItems = stItems;
-      } else {
-        handleCurrentItems();
+      const filterOpts = computeFilterOpts.value;
+      const {
+        autoExpandMode
+      } = filterOpts;
+      // 如果当前不在列表情况下，触发默认行为
+      if (!isPathInTree(afterTreeList, currentItems)) {
+        // 默认展开
+        if (autoExpandMode === 'first' || autoExpandMode === 'last') {
+          const stItems = handleHasChildNodeIds(afterTreeList, autoExpandMode);
+          const expandedMaps = {};
+          stItems.forEach(nodeid => {
+            expandedMaps[nodeid] = true;
+          });
+          internalData.treeExpandedMaps = expandedMaps;
+          reactData.currentItems = stItems;
+        } else {
+          handleCurrentItems();
+        }
       }
       updateCurrentChunk();
     }, 350, {
@@ -18282,6 +18309,7 @@ function cascader_createInternalData() {
     };
     const setCurrentNode = node => {
       reactData.currentNode = node;
+      updateCurrentChunk();
       return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)();
     };
     const setAllCheckboxNode = checked => {
@@ -18330,6 +18358,7 @@ function cascader_createInternalData() {
     };
     const changeEvent = (evnt, selectValue, node) => {
       const value = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(selectValue) ? selectValue.map(deNodeValue) : deNodeValue(selectValue);
+      internalData.isUpdateMode = true;
       emitModel(value);
       if (value !== props.modelValue) {
         dispatchEvent('change', {
@@ -18476,9 +18505,12 @@ function cascader_createInternalData() {
         checked: isChecked
       }, evnt);
     };
-    const changeRadioEvent = (evnt, node) => {
+    const changeRadioEvent = (evnt, node, chunks, chunkIndex) => {
       evnt.preventDefault();
       evnt.stopPropagation();
+      const {
+        currentItems
+      } = reactData;
       const {
         nodeMaps
       } = internalData;
@@ -18508,6 +18540,10 @@ function cascader_createInternalData() {
       const value = nodeid;
       reactData.selectRadioKey = value;
       changeEvent(evnt, value, node);
+      if (!currentItems.includes(nodeid)) {
+        changeCurrentEvent(evnt, node);
+        toggleExpandEvent(evnt, node, chunks, chunkIndex);
+      }
       hideOptionPanel(evnt);
     };
     const handleAsyncTreeExpandChilds = node => {
@@ -18679,7 +18715,6 @@ function cascader_createInternalData() {
         handleBaseTreeExpand([node], expanded);
       }
       setCurrentNode(node);
-      updateCurrentChunk();
       dispatchEvent('node-expand', {
         node,
         expanded
@@ -18793,9 +18828,13 @@ function cascader_createInternalData() {
         reactData.updateCheckboxFlag++;
       }
     };
-    const changeCheckboxEvent = (evnt, node) => {
+    const changeCheckboxEvent = (evnt, node, chunks, chunkIndex) => {
       evnt.preventDefault();
       evnt.stopPropagation();
+      // const { filterable } = props
+      const {
+        currentItems
+      } = reactData;
       const {
         selectCheckboxMaps,
         nodeMaps
@@ -18832,11 +18871,11 @@ 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), childNode => {
+        external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(childList, childNode => {
           const childNodeid = getNodeId(childNode);
           if (isChecked) {
             if (!selectCheckboxMaps[childNodeid]) {
-              selectCheckboxMaps[childNodeid] = true;
+              selectCheckboxMaps[childNodeid] = childNode;
             }
           } else {
             if (selectCheckboxMaps[childNodeid]) {
@@ -18847,11 +18886,16 @@ function cascader_createInternalData() {
           children: transform ? mapChildrenField : childrenField
         });
       }
+      selectCheckboxMaps[nodeid] = node;
       reactData.updateCheckboxFlag++;
       updateCheckboxStatus();
       const nodeids = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().keys(selectCheckboxMaps);
       const value = nodeids;
       changeEvent(evnt, value, node);
+      if (!currentItems.includes(nodeid)) {
+        changeCurrentEvent(evnt, node);
+        toggleExpandEvent(evnt, node, chunks, chunkIndex);
+      }
     };
     const handleNodeClickEvent = (evnt, node, chunks, chunkIndex) => {
       const {
@@ -18882,12 +18926,12 @@ function cascader_createInternalData() {
       if (multiple) {
         if (checkboxOpts.trigger === 'node' || !showCheckbox && (!childList || !childList.length)) {
           triggerCheckbox = true;
-          changeCheckboxEvent(evnt, node);
+          changeCheckboxEvent(evnt, node, chunks, chunkIndex);
         }
       } else {
         if (radioOpts.trigger === 'node' || !showRadio && (!childList || !childList.length)) {
           triggerRadio = true;
-          changeRadioEvent(evnt, node);
+          changeRadioEvent(evnt, node, chunks, chunkIndex);
         }
       }
       dispatchEvent('node-click', {
@@ -19033,7 +19077,7 @@ function cascader_createInternalData() {
       }
       return true;
     };
-    const renderRadio = (node, isExistChild, nLevel, isChecked) => {
+    const renderRadio = (node, isExistChild, nLevel, isChecked, chunks, chunkIndex) => {
       const {
         showRadio
       } = props;
@@ -19060,7 +19104,7 @@ function cascader_createInternalData() {
           }],
           onClick: evnt => {
             if (!isDisabled) {
-              changeRadioEvent(evnt, node);
+              changeRadioEvent(evnt, node, chunks, chunkIndex);
             }
           }
         }, [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('span', {
@@ -19069,7 +19113,7 @@ function cascader_createInternalData() {
       }
       return renderEmptyElement($xeCascader);
     };
-    const renderCheckbox = (node, isExistChild, nLevel, isChecked, isIndeterminate) => {
+    const renderCheckbox = (node, isExistChild, nLevel, isChecked, isIndeterminate, chunks, chunkIndex) => {
       const {
         showCheckbox
       } = props;
@@ -19097,7 +19141,7 @@ function cascader_createInternalData() {
           }],
           onClick: evnt => {
             if (!isDisabled) {
-              changeCheckboxEvent(evnt, node);
+              changeCheckboxEvent(evnt, node, chunks, chunkIndex);
             }
           }
         }, [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('span', {
@@ -19183,7 +19227,7 @@ function cascader_createInternalData() {
         onClick(evnt) {
           handleNodeClickEvent(evnt, node, chunks, chunkIndex);
         }
-      }, [multiple ? renderCheckbox(node, isExistChild, nLevel, isCheckboxChecked, isIndeterminate) : renderRadio(node, isExistChild, nLevel, isRadioChecked), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
+      }, [multiple ? renderCheckbox(node, isExistChild, nLevel, isCheckboxChecked, isIndeterminate, chunks, chunkIndex) : renderRadio(node, isExistChild, nLevel, isRadioChecked, chunks, chunkIndex), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
         class: 'vxe-cascader-chunk--node-item-inner'
       }, [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
         class: 'vxe-cascader-chunk--node-item-title'
@@ -19354,9 +19398,12 @@ function cascader_createInternalData() {
       })]) : renderEmptyElement($xeCascader)])]) : renderEmptyElement($xeCascader)])] : [])])]);
     };
     (0,external_commonjs_vue_commonjs2_vue_root_Vue_.watch)(() => props.modelValue, () => {
-      updateModelChecked();
-      handleCurrentItems();
-      updateCurrentChunk();
+      if (!internalData.isUpdateMode) {
+        updateModelChecked();
+        handleCurrentItems();
+        updateCurrentChunk();
+      }
+      internalData.isUpdateMode = false;
     });
     (0,external_commonjs_vue_commonjs2_vue_root_Vue_.watch)(() => props.options, () => {
       cacheNodeMap();
@@ -28877,6 +28924,9 @@ function date_range_picker_createInternalData() {
       hidePanel();
     };
     const startPanelChangeEvent = params => {
+      const {
+        paneStartVal
+      } = reactData;
       const {
         selectStatus
       } = internalData;
@@ -28889,11 +28939,17 @@ function date_range_picker_createInternalData() {
       let startValue = '';
       let 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);
@@ -28914,6 +28970,9 @@ function date_range_picker_createInternalData() {
       });
     };
     const endPanelChangeEvent = params => {
+      const {
+        paneEndVal
+      } = reactData;
       const {
         selectStatus
       } = internalData;
@@ -28926,12 +28985,18 @@ function date_range_picker_createInternalData() {
       let startValue = '';
       let 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);
@@ -36355,6 +36420,7 @@ let nemuUniqueKey = 100000000;
         hasChild,
         isExpand
       } = item;
+      const isCollapsed = computeIsCollapsed.value;
       const expanded = !isExpand;
       if (hasChild) {
         evnt.stopPropagation();
@@ -36370,9 +36436,9 @@ let nemuUniqueKey = 100000000;
           });
         }
         item.isExpand = expanded;
-        const el = refElem.value;
-        if (el) {
-          const nemuEl = el.querySelector(`.vxe-menu--item-wrapper[data-menu-id="${itemId}"]`);
+        const wrapperEl = isCollapsed ? refCollapseElem.value : refElem.value;
+        if (wrapperEl) {
+          const nemuEl = wrapperEl.querySelector(`.vxe-menu--item-wrapper[data-menu-id="${itemId}"]`);
           const groupEl = nemuEl ? nemuEl.querySelector('.vxe-menu--item-group') : null;
           if (groupEl) {
             if (expanded) {