vxe-pc-ui 4.15.2 → 4.15.4

package/es/backtop/src/backtop.js

@@ -2,10 +2,11 @@ import { ref, h, reactive, watch, onMounted, nextTick, computed, onBeforeUnmount
 import { defineVxeComponent } from '../../ui/src/comp';
 import XEUtils from 'xe-utils';
 import { getConfig, getIcon, createEvent, useSize, renderEmptyElement } from '../../ui';
-import { errLog } from '../../ui/src/log';
+import { createComponentLog } from '../../ui/src/log';
 import { getLastZIndex, nextZIndex } from '../../ui/src/utils';
 import { toCssUnit } from '../../ui/src/dom';
 import VxeButtonComponent from '../../button';
+const { errLog } = createComponentLog('backtop');
 function createInternalData() {
     return {
         targetEl: null

package/es/button/src/button.js

@@ -5,8 +5,9 @@ import { getConfig, globalEvents, getIcon, createEvent, useSize, renderer, usePe
 import { getEventTargetNode, updatePanelPlacement } from '../../ui/src/dom';
 import { getFuncText, getLastZIndex, nextZIndex } from '../../ui/src/utils';
 import { getSlotVNs } from '../../ui/src/vn';
-import { warnLog } from '../../ui/src/log';
+import { createComponentLog } from '../../ui/src/log';
 import VxeTooltipComponent from '../../tooltip';
+const { warnLog } = createComponentLog('button');
 const VxeButtonComponent = defineVxeComponent({
     name: 'VxeButton',
     props: {
@@ -725,7 +726,7 @@ const VxeButtonComponent = defineVxeComponent({
         $xeButton.renderVN = renderVN;
         onMounted(() => {
             if (props.type === 'text') {
-                warnLog('vxe.error.delProp', ['[button] type=text', 'mode=text']);
+                warnLog('vxe.error.delProp', ['type=text', 'mode=text']);
             }
             globalEvents.on($xeButton, 'mousewheel', handleGlobalMousewheelEvent);
             globalEvents.on($xeButton, 'mousedown', handleGlobalMousedownEvent);

package/es/calendar/src/calendar.js

@@ -4,9 +4,10 @@ import { VxeUI, createEvent, useSize, renderEmptyElement } from '../../ui';
 import { getDateQuarter } from '../../date-panel/src/util';
 import { toCssUnit } from '../../ui/src/dom';
 import { isEnableConf } from '../../ui/src/utils';
-import { errLog } from '../../ui/src/log';
+import { createComponentLog } from '../../ui/src/log';
 import VxeButtonComponent from '../../button/src/button';
 import XEUtils from 'xe-utils';
+const { errLog } = createComponentLog('calendar');
 const { menus, getConfig, getI18n } = VxeUI;
 export default defineVxeComponent({
     name: 'VxeCalendar',

package/es/cascader/src/cascader.js

@@ -4,7 +4,6 @@ import { getConfig, getI18n, getIcon, globalEvents, createEvent, useSize, render
 import { getEventTargetNode, updatePanelPlacement, toCssUnit } from '../../ui/src/dom';
 import { getLastZIndex, nextZIndex } from '../../ui/src/utils';
 import { enNodeValue, deNodeValue } from './util';
-import { errLog } from '../../ui/src/log';
 import XEUtils from 'xe-utils';
 import VxeListComponent from '../../list/src/list';
 import VxeInputComponent from '../../input/src/input';
@@ -584,7 +583,6 @@ export default defineVxeComponent({
             return internalData.afterVisibleList;
         };
         const handleData = (force) => {
-            const { nodeMaps } = internalData;
             let fullList = internalData.afterVisibleList;
             if (force) {
                 // 更新数据，处理筛选和排序
@@ -593,16 +591,56 @@ export default defineVxeComponent({
                 fullList = handleTreeToList();
             }
             const treeList = fullList.slice(0);
-            treeList.forEach((item, $index) => {
-                const nodeid = getNodeId(item);
-                const itemRest = nodeMaps[nodeid];
-                if (itemRest) {
-                    itemRest.$index = $index;
-                }
-            });
             reactData.treeList = treeList;
         };
-        const triggerSearchEvent = XEUtils.debounce(() => handleData(true), 350, { trailing: true });
+        /**
+         * 获取第一个拥有子节点的节点
+         */
+        function handleHasChildNodeIds(treeList, type) {
+            const childrenField = computeChildrenField.value;
+            const mapChildrenField = computeMapChildrenField.value;
+            const treeOpts = computeTreeOpts.value;
+            const { transform } = treeOpts;
+            const childField = transform ? mapChildrenField : childrenField;
+            const nodeIds = [];
+            let currList = treeList;
+            while (currList.length) {
+                let targetNode = null;
+                for (const item of currList) {
+                    const kids = item[childField];
+                    if (XEUtils.isArray(kids) && kids.length > 0) {
+                        targetNode = item;
+                        break;
+                    }
+                }
+                if (targetNode) {
+                    nodeIds.push(getNodeId(targetNode));
+                    currList = targetNode[childField];
+                }
+                else {
+                    const endNode = XEUtils[type](currList);
+                    nodeIds.push(getNodeId(endNode));
+                    break;
+                }
+            }
+            return nodeIds;
+        }
+        const triggerSearchEvent = XEUtils.debounce(() => {
+            handleData(true);
+            updateModelChecked();
+            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();
+            }
+            updateCurrentChunk();
+        }, 350, { trailing: true });
         const loadData = (list) => {
             const treeOpts = computeTreeOpts.value;
             const keyField = computeKeyField.value;
@@ -629,17 +667,20 @@ export default defineVxeComponent({
         };
         const updateCurrentChunk = () => {
             const { currentItems } = reactData;
-            const { treeFullData } = internalData;
+            const { afterTreeList } = internalData;
             const childrenField = computeChildrenField.value;
-            const currentCunkList = [treeFullData];
+            const mapChildrenField = computeMapChildrenField.value;
+            const treeOpts = computeTreeOpts.value;
+            const { transform } = treeOpts;
+            const currentCunkList = [afterTreeList];
             if (currentItems.length) {
                 let chunkIndex = 0;
                 let stNodeid = currentItems[chunkIndex];
-                let optList = treeFullData;
+                let optList = afterTreeList;
                 while (stNodeid && optList && optList.length) {
                     stNodeid = currentItems[chunkIndex++];
                     const currOption = optList.find(item => stNodeid === getNodeId(item));
-                    optList = currOption ? currOption[childrenField] : [];
+                    optList = currOption ? currOption[transform ? mapChildrenField : childrenField] : [];
                     if (!optList || !optList.length) {
                         break;
                     }
@@ -649,7 +690,7 @@ export default defineVxeComponent({
             reactData.currentCunkList = currentCunkList;
         };
         const handleCurrentItems = () => {
-            const { treeFullData } = internalData;
+            const { afterTreeList } = internalData;
             const selectVals = computeSelectVals.value;
             const childrenField = computeChildrenField.value;
             const mapChildrenField = computeMapChildrenField.value;
@@ -659,7 +700,7 @@ export default defineVxeComponent({
             const expandedMaps = {};
             if (selectVals.length) {
                 const lastVal = enNodeValue(XEUtils.last(selectVals));
-                const stRest = XEUtils.findTree(treeFullData, (item) => lastVal === getNodeId(item), { children: transform ? mapChildrenField : childrenField });
+                const stRest = XEUtils.findTree(afterTreeList, (item) => lastVal === getNodeId(item), { children: transform ? mapChildrenField : childrenField });
                 if (stRest) {
                     const { nodes } = stRest;
                     nodes.forEach(item => {
@@ -765,10 +806,11 @@ export default defineVxeComponent({
                 return { checkNodeKeys: checkKeys, checkNodes };
             });
         };
-        const clearCheckboxNode = () => {
+        const clearSelectedNode = () => {
             internalData.indeterminateRowMaps = {};
             internalData.selectCheckboxMaps = {};
             reactData.updateCheckboxFlag++;
+            reactData.selectRadioKey = null;
             updateCheckboxStatus();
             return nextTick().then(() => {
                 return { checkNodeKeys: [], checkNodes: [] };
@@ -810,7 +852,7 @@ export default defineVxeComponent({
             const { $event } = params;
             const { multiple, checkedClosable } = props;
             const value = multiple ? [] : null;
-            clearCheckboxNode().then(() => {
+            clearSelectedNode().then(() => {
                 if (checkedClosable) {
                     hideOptionPanel($event);
                 }
@@ -892,9 +934,12 @@ export default defineVxeComponent({
             const { nodeMaps } = internalData;
             const radioOpts = computeRadioOpts.value;
             const childrenField = computeChildrenField.value;
+            const treeOpts = computeTreeOpts.value;
+            const { transform } = treeOpts;
+            const mapChildrenField = computeMapChildrenField.value;
             const { checkMode, checkMethod } = radioOpts;
             const nodeid = getNodeId(node);
-            const childList = node[childrenField];
+            const childList = node[transform ? mapChildrenField : childrenField];
             const isExistChild = childList && childList.length > 0;
             const nodeItem = nodeMaps[nodeid] || {};
             const nLevel = nodeItem.level;
@@ -1054,7 +1099,7 @@ export default defineVxeComponent({
                 const childRowList = [];
                 XEUtils.eachTree(afterTreeList, (node) => {
                     const nodeid = getNodeId(node);
-                    const childList = node[childrenField];
+                    const childList = node[transform ? mapChildrenField : childrenField];
                     if (childList && childList.length && !childRowMaps[nodeid]) {
                         childRowMaps[nodeid] = 1;
                         childRowList.unshift([node, nodeid, childList]);
@@ -1158,7 +1203,7 @@ export default defineVxeComponent({
             const treeOpts = computeTreeOpts.value;
             const { transform } = treeOpts;
             const nodeid = getNodeId(node);
-            const childList = node[childrenField];
+            const childList = node[transform ? mapChildrenField : childrenField];
             const isExistChild = childList && childList.length > 0;
             const nodeItem = nodeMaps[nodeid] || {};
             const nLevel = nodeItem.level;
@@ -1404,11 +1449,12 @@ export default defineVxeComponent({
             const { currentNode, selectRadioKey, updateCheckboxFlag, updateExpandedFlag } = reactData;
             const { nodeMaps, selectCheckboxMaps, indeterminateRowMaps, treeExpandedMaps, treeExpandLazyLoadedMaps } = internalData;
             const treeOpts = computeTreeOpts.value;
-            const { lazy, iconLoaded, iconOpen, iconClose } = treeOpts;
+            const { lazy, transform, iconLoaded, iconOpen, iconClose } = treeOpts;
             const childrenField = computeChildrenField.value;
+            const mapChildrenField = computeMapChildrenField.value;
             const labelField = computeLabelField.value;
             const hasChildField = computeHasChildField.value;
-            const childList = node[childrenField];
+            const childList = node[transform ? mapChildrenField : childrenField];
             const isExistChild = childList && childList.length > 0;
             const iconSlot = slots.icon;
             const titleSlot = slots.title;
@@ -1590,7 +1636,7 @@ export default defineVxeComponent({
                                             h('div', {
                                                 class: 'vxe-tree-select--header-button'
                                             }, [
-                                                showCheckedButton && showClearButton
+                                                (showCheckedButton && multiple) || showClearButton
                                                     ? h('div', {
                                                         class: 'vxe-tree-select--selected-btns'
                                                     }, [
@@ -1641,7 +1687,7 @@ export default defineVxeComponent({
                                         })
                                     ])
                                 ]),
-                                footerSlot || showTotalButton || (showCloseButton && multiple)
+                                footerSlot || showTotalButton || showCloseButton
                                     ? h('div', {
                                         class: 'vxe-cascader--panel-footer'
                                     }, footerSlot
@@ -1655,7 +1701,7 @@ export default defineVxeComponent({
                                                         class: 'vxe-cascader--total-btns'
                                                     }, getI18n('vxe.treeSelect.total', [selectVals.length]))
                                                     : renderEmptyElement($xeCascader),
-                                                showCloseButton && multiple
+                                                showCloseButton
                                                     ? h('div', {
                                                         class: 'vxe-cascader--oper-btns'
                                                     }, [
@@ -1697,9 +1743,6 @@ export default defineVxeComponent({
         });
         loadData(props.options || []);
         onMounted(() => {
-            if (props.filterable) {
-                errLog('vxe.error.notProp', ['filterable']);
-            }
             globalEvents.on($xeCascader, 'mousewheel', handleGlobalMousewheelEvent);
             globalEvents.on($xeCascader, 'mousedown', handleGlobalMousedownEvent);
             globalEvents.on($xeCascader, 'blur', handleGlobalBlurEvent);

package/es/checkbox/src/group.js

@@ -3,6 +3,9 @@ import { defineVxeComponent } from '../../ui/src/comp';
 import { getConfig, createEvent, useSize } from '../../ui';
 import XEUtils from 'xe-utils';
 import VxeCheckboxComponent from './checkbox';
+function createReactData() {
+    return {};
+}
 function createInternalData() {
     return {
     // isLoaded: false
@@ -42,7 +45,7 @@ export default defineVxeComponent({
         const $xeForm = inject('$xeForm', null);
         const formItemInfo = inject('xeFormItemInfo', null);
         const xID = XEUtils.uniqueId();
-        const reactData = reactive({});
+        const reactData = reactive(createReactData());
         const internalData = createInternalData();
         const computeIsReadonly = computed(() => {
             const { readonly } = props;
@@ -202,6 +205,7 @@ export default defineVxeComponent({
             });
         });
         onUnmounted(() => {
+            XEUtils.assign(reactData, createReactData());
             XEUtils.assign(internalData, createInternalData());
         });
         provide('$xeCheckboxGroup', $xeCheckboxGroup);

package/es/date-panel/src/util.js

@@ -1,4 +1,16 @@
 import XEUtils from 'xe-utils';
+export function getChunkDefaultNum(selectKey) {
+    const currDate = new Date();
+    switch (selectKey) {
+        case 'y': return currDate.getFullYear();
+        case 'M': return currDate.getMonth() + 1;
+        case 'd': return currDate.getDate();
+        case 'H': return currDate.getHours();
+        case 'm': return currDate.getMinutes();
+        case 's': return currDate.getSeconds();
+    }
+    return 0;
+}
 export function hasTimestampValueType(valueFormat) {
     return valueFormat === 'timestamp';
 }
@@ -19,18 +31,6 @@ export function handleValueFormat(type, valueFormat) {
     }
     return 'yyyy-MM-dd';
 }
-export function handleInputFormat(type, inputFormat) {
-    if (inputFormat) {
-        return inputFormat;
-    }
-    if (type === 'time') {
-        return 'HH:mm:ss';
-    }
-    if (type === 'datetime') {
-        return 'yyyy-MM-dd HH:mm:ss';
-    }
-    return 'yyyy-MM-dd';
-}
 export function toStringTimeDate(str) {
     const rest = new Date(2e3, 0, 1);
     if (str) {
@@ -74,7 +74,7 @@ export function getDateQuarter(date) {
     }
     return 4;
 }
-export const parseDateValue = (val, type, options) => {
+export function parseDateValue(val, type, options) {
     const { valueFormat } = options;
     if (val) {
         if (type === 'time') {
@@ -89,7 +89,7 @@ export const parseDateValue = (val, type, options) => {
         return XEUtils.toStringDate(val, valueFormat);
     }
     return null;
-};
+}
 export const parseDateString = (val, type, options) => {
     const dValue = parseDateValue(val, type, options);
     return dValue ? XEUtils.toDateString(dValue, options.valueFormat) : '';
@@ -226,6 +226,17 @@ export function getRangeDateByCode(code, val, type, options) {
 /**
  * 判断周的年份是否跨年
  */
-const checkWeekOfsetYear = (W, M) => {
+function checkWeekOfsetYear(W, M) {
     return `${W}` === '1' && `${M}` === '12';
-};
+}
+export function isAllSameChar(str, char) {
+    if (str.length === 0) {
+        return false;
+    }
+    for (let i = 0; i < str.length; i++) {
+        if (str[i] !== char) {
+            return false;
+        }
+    }
+    return true;
+}