vxe-pc-ui 4.16.7 → 4.16.8

package/dist/all.esm.js

@@ -81,7 +81,7 @@ function checkDynamic() {
 }
 
 const { 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}` : '';
@@ -95,7 +95,7 @@ function createComponentLog(name) {
 const warnLog$h = log.create('warn', uiVersion);
 log.create('error', uiVersion);
 
-const version = "4.16.7";
+const version = "4.16.8";
 VxeUI.uiVersion = version;
 VxeUI.dynamicApp = dynamicApp;
 function config(options) {
@@ -11732,6 +11732,7 @@ function createInternalData$i() {
         selectCheckboxMaps: {},
         treeExpandedMaps: {},
         treeExpandLazyLoadedMaps: {}
+        // isUpdateMode: false
     };
 }
 var VxeCascaderComponent = defineVxeComponent({
@@ -11994,6 +11995,20 @@ var VxeCascaderComponent = defineVxeComponent({
             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 } = reactData;
             const { selectCheckboxMaps } = internalData;
@@ -12187,7 +12202,7 @@ var VxeCascaderComponent = defineVxeComponent({
                 if (transform) {
                     treeList = XEUtils.searchTree(treeFullData, handleSearch, {
                         original: true,
-                        isEvery: true,
+                        isEvery: false,
                         children: childrenField,
                         mapChildren: mapChildrenField
                     });
@@ -12207,7 +12222,7 @@ var VxeCascaderComponent = defineVxeComponent({
                 if (transform) {
                     treeList = XEUtils.searchTree(treeFullData, () => true, {
                         original: true,
-                        isEvery: true,
+                        isEvery: false,
                         children: childrenField,
                         mapChildren: mapChildrenField
                     });
@@ -12300,17 +12315,26 @@ var VxeCascaderComponent = defineVxeComponent({
         }
         const triggerSearchEvent = XEUtils.debounce(() => {
             handleData(true);
-            updateModelChecked();
+            updateCheckboxStatus();
+            const { currentItems } = reactData;
+            const { afterTreeList } = internalData;
             const filterOpts = computeFilterOpts.value;
             const { autoExpandMode } = filterOpts;
-            const { afterTreeList } = internalData;
-            // 默认展开第
-            if (autoExpandMode === 'first' || autoExpandMode === 'last') {
-                const stItems = handleHasChildNodeIds(afterTreeList, autoExpandMode);
-                reactData.currentItems = stItems;
-            }
-            else {
-                handleCurrentItems();
+            // 如果当前不在列表情况下，触发默认行为
+            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, { trailing: true });
@@ -12454,6 +12478,7 @@ var VxeCascaderComponent = defineVxeComponent({
         };
         const setCurrentNode = (node) => {
             reactData.currentNode = node;
+            updateCurrentChunk();
             return nextTick();
         };
         const setAllCheckboxNode = (checked) => {
@@ -12492,6 +12517,7 @@ var VxeCascaderComponent = defineVxeComponent({
         };
         const changeEvent = (evnt, selectValue, node) => {
             const value = XEUtils.isArray(selectValue) ? selectValue.map(deNodeValue) : deNodeValue(selectValue);
+            internalData.isUpdateMode = true;
             emitModel(value);
             if (value !== props.modelValue) {
                 dispatchEvent('change', { value, node, option: node }, evnt);
@@ -12602,9 +12628,10 @@ var VxeCascaderComponent = defineVxeComponent({
             reactData.currentNode = node;
             dispatchEvent('current-change', { node, checked: isChecked }, evnt);
         };
-        const changeRadioEvent = (evnt, node) => {
+        const changeRadioEvent = (evnt, node, chunks, chunkIndex) => {
             evnt.preventDefault();
             evnt.stopPropagation();
+            const { currentItems } = reactData;
             const { nodeMaps } = internalData;
             const radioOpts = computeRadioOpts.value;
             const childrenField = computeChildrenField.value;
@@ -12624,6 +12651,10 @@ var VxeCascaderComponent = defineVxeComponent({
             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) => {
@@ -12746,7 +12777,6 @@ var VxeCascaderComponent = defineVxeComponent({
                 handleBaseTreeExpand([node], expanded);
             }
             setCurrentNode(node);
-            updateCurrentChunk();
             dispatchEvent('node-expand', { node, expanded }, evnt);
         };
         const updateCheckboxStatus = () => {
@@ -12855,9 +12885,11 @@ var VxeCascaderComponent = defineVxeComponent({
                 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 } = internalData;
             const childrenField = computeChildrenField.value;
             const mapChildrenField = computeMapChildrenField.value;
@@ -12883,11 +12915,11 @@ var VxeCascaderComponent = defineVxeComponent({
                 selectCheckboxMaps[nodeid] = node;
             }
             if (!checkStrictly) {
-                XEUtils.eachTree(XEUtils.get(node, transform ? mapChildrenField : childrenField), (childNode) => {
+                XEUtils.eachTree(childList, (childNode) => {
                     const childNodeid = getNodeId(childNode);
                     if (isChecked) {
                         if (!selectCheckboxMaps[childNodeid]) {
-                            selectCheckboxMaps[childNodeid] = true;
+                            selectCheckboxMaps[childNodeid] = childNode;
                         }
                     }
                     else {
@@ -12897,11 +12929,16 @@ var VxeCascaderComponent = defineVxeComponent({
                     }
                 }, { children: transform ? mapChildrenField : childrenField });
             }
+            selectCheckboxMaps[nodeid] = node;
             reactData.updateCheckboxFlag++;
             updateCheckboxStatus();
             const nodeids = XEUtils.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 { multiple, showCheckbox, showRadio } = props;
@@ -12925,13 +12962,13 @@ var VxeCascaderComponent = defineVxeComponent({
             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', { node, triggerCurrent, triggerRadio, triggerCheckbox, triggerExpand }, evnt);
@@ -13056,7 +13093,7 @@ var VxeCascaderComponent = defineVxeComponent({
             }
             return true;
         };
-        const renderRadio = (node, isExistChild, nLevel, isChecked) => {
+        const renderRadio = (node, isExistChild, nLevel, isChecked, chunks, chunkIndex) => {
             const { showRadio } = props;
             const radioOpts = computeRadioOpts.value;
             const { checkMode, checkMethod, visibleMode, visibleMethod } = radioOpts;
@@ -13070,7 +13107,7 @@ var VxeCascaderComponent = defineVxeComponent({
                         }],
                     onClick: (evnt) => {
                         if (!isDisabled) {
-                            changeRadioEvent(evnt, node);
+                            changeRadioEvent(evnt, node, chunks, chunkIndex);
                         }
                     }
                 }, [
@@ -13081,7 +13118,7 @@ var VxeCascaderComponent = defineVxeComponent({
             }
             return renderEmptyElement($xeCascader);
         };
-        const renderCheckbox = (node, isExistChild, nLevel, isChecked, isIndeterminate) => {
+        const renderCheckbox = (node, isExistChild, nLevel, isChecked, isIndeterminate, chunks, chunkIndex) => {
             const { showCheckbox } = props;
             const checkboxOpts = computeCheckboxOpts.value;
             const { checkMode, checkMethod, visibleMode, visibleMethod } = checkboxOpts;
@@ -13096,7 +13133,7 @@ var VxeCascaderComponent = defineVxeComponent({
                         }],
                     onClick: (evnt) => {
                         if (!isDisabled) {
-                            changeCheckboxEvent(evnt, node);
+                            changeCheckboxEvent(evnt, node, chunks, chunkIndex);
                         }
                     }
                 }, [
@@ -13164,7 +13201,7 @@ var VxeCascaderComponent = defineVxeComponent({
                     handleNodeClickEvent(evnt, node, chunks, chunkIndex);
                 }
             }, [
-                multiple ? renderCheckbox(node, isExistChild, nLevel, isCheckboxChecked, isIndeterminate) : renderRadio(node, isExistChild, nLevel, isRadioChecked),
+                multiple ? renderCheckbox(node, isExistChild, nLevel, isCheckboxChecked, isIndeterminate, chunks, chunkIndex) : renderRadio(node, isExistChild, nLevel, isRadioChecked, chunks, chunkIndex),
                 h('div', {
                     class: 'vxe-cascader-chunk--node-item-inner'
                 }, [
@@ -13385,9 +13422,12 @@ var VxeCascaderComponent = defineVxeComponent({
             ]);
         };
         watch(() => props.modelValue, () => {
-            updateModelChecked();
-            handleCurrentItems();
-            updateCurrentChunk();
+            if (!internalData.isUpdateMode) {
+                updateModelChecked();
+                handleCurrentItems();
+                updateCurrentChunk();
+            }
+            internalData.isUpdateMode = false;
         });
         watch(() => props.options, () => {
             cacheNodeMap();
@@ -22055,18 +22095,26 @@ var VxeDateRangePickerComponent = defineVxeComponent({
             hidePanel();
         };
         const startPanelChangeEvent = (params) => {
+            const { paneStartVal } = reactData;
             const { selectStatus } = internalData;
             const { value, currValue, $event } = params;
             const paneVals = value ? (XEUtils.isString(value) ? value.split(',') : [value]) : [];
             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 {
@@ -22089,19 +22137,27 @@ var VxeDateRangePickerComponent = defineVxeComponent({
             });
         };
         const endPanelChangeEvent = (params) => {
+            const { paneEndVal } = reactData;
             const { selectStatus } = internalData;
             const { value, currValue, $event } = params;
             const paneVals = value ? (XEUtils.isString(value) ? value.split(',') : [value]) : [];
             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 {
@@ -28572,6 +28628,7 @@ var VxeMenuComponent = defineVxeComponent({
             const { accordion } = props;
             const { menuEffectMaps } = internalData;
             const { itemId, hasChild, isExpand } = item;
+            const isCollapsed = computeIsCollapsed.value;
             const expanded = !isExpand;
             if (hasChild) {
                 evnt.stopPropagation();
@@ -28587,9 +28644,9 @@ var VxeMenuComponent = defineVxeComponent({
                     });
                 }
                 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) {