vxe-pc-ui 3.15.2 → 3.15.4

package/es/backtop/src/backtop.js

@@ -1,10 +1,11 @@
 import { defineVxeComponent } from '../../ui/src/comp';
 import XEUtils from 'xe-utils';
 import { getConfig, getIcon, createEvent, globalMixins, 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
@@ -86,13 +87,9 @@ export default {
     },
     data() {
         const xID = XEUtils.uniqueId();
-        const internalData = createInternalData();
         const reactData = createReactData();
-        return {
-            xID,
-            internalData,
-            reactData
-        };
+        return Object.assign(Object.assign({}, {}), { xID,
+            reactData });
     },
     computed: Object.assign(Object.assign({}, {}), { computeWrapperStyle() {
             const $xeBacktop = this;
@@ -281,6 +278,10 @@ export default {
             ]);
         }
     },
+    created() {
+        const $xeBacktop = this;
+        $xeBacktop.internalData = createInternalData();
+    },
     mounted() {
         const $xeBacktop = this;
         const props = $xeBacktop;

package/es/button/src/button.js

@@ -4,8 +4,9 @@ import { defineVxeComponent } from '../../ui/src/comp';
 import { getEventTargetNode, updatePanelPlacement } from '../../ui/src/dom';
 import { getFuncText, getLastZIndex, nextZIndex } from '../../ui/src/utils';
 import { getSlotVNs, getEventCaseName } from '../../ui/src/vn';
-import { warnLog } from '../../ui/src/log';
+import { createComponentLog } from '../../ui/src/log';
 import VxeTooltipComponent from '../../tooltip';
+const { warnLog } = createComponentLog('button');
 export default {
     name: 'VxeButton',
     mixins: [
@@ -849,7 +850,7 @@ export default {
         const $xeButton = this;
         const props = $xeButton;
         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', $xeButton.handleGlobalMousewheelEvent);
         globalEvents.on($xeButton, 'mousedown', $xeButton.handleGlobalMousedownEvent);

package/es/calendar/src/calendar.js

@@ -4,8 +4,9 @@ import { VxeUI, createEvent, globalMixins, 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';
+const { errLog } = createComponentLog('calendar');
 const { menus, getConfig, getI18n } = VxeUI;
 export default {
     name: 'VxeCalendar',

package/es/cascader/src/cascader.js

@@ -3,7 +3,6 @@ import { getConfig, getI18n, getIcon, globalEvents, createEvent, renderEmptyElem
 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';
@@ -178,12 +177,8 @@ export default {
     data() {
         const xID = XEUtils.uniqueId();
         const reactData = createReactData();
-        const internalData = createInternalData();
-        return {
-            xID,
-            reactData,
-            internalData
-        };
+        return Object.assign(Object.assign({}, {}), { xID,
+            reactData });
     },
     computed: Object.assign(Object.assign({}, {}), { computeFormReadonly() {
             const $xeCascader = this;
@@ -669,7 +664,6 @@ export default {
             const $xeCascader = this;
             const reactData = $xeCascader.reactData;
             const internalData = $xeCascader.internalData;
-            const { nodeMaps } = internalData;
             let fullList = internalData.afterVisibleList;
             if (force) {
                 // 更新数据，处理筛选和排序
@@ -678,18 +672,59 @@ export default {
                 fullList = $xeCascader.handleTreeToList();
             }
             const treeList = fullList.slice(0);
-            treeList.forEach((item, $index) => {
-                const nodeid = $xeCascader.getNodeId(item);
-                const itemRest = nodeMaps[nodeid];
-                if (itemRest) {
-                    itemRest.$index = $index;
-                }
-            });
             reactData.treeList = treeList;
         },
+        /**
+         * 获取第一个拥有子节点的节点
+         */
+        handleHasChildNodeIds(treeList, type) {
+            const $xeCascader = this;
+            const childrenField = $xeCascader.computeChildrenField;
+            const mapChildrenField = $xeCascader.computeMapChildrenField;
+            const treeOpts = $xeCascader.computeTreeOpts;
+            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($xeCascader.getNodeId(targetNode));
+                    currList = targetNode[childField];
+                }
+                else {
+                    const endNode = XEUtils[type](currList);
+                    nodeIds.push($xeCascader.getNodeId(endNode));
+                    break;
+                }
+            }
+            return nodeIds;
+        },
         triggerSearchEvent: XEUtils.debounce(function () {
             const $xeCascader = this;
+            const reactData = $xeCascader.reactData;
+            const internalData = $xeCascader.internalData;
             $xeCascader.handleData(true);
+            $xeCascader.updateModelChecked();
+            const filterOpts = $xeCascader.computeFilterOpts;
+            const { autoExpandMode } = filterOpts;
+            const { afterTreeList } = internalData;
+            // 默认展开第
+            if (autoExpandMode === 'first' || autoExpandMode === 'last') {
+                const stItems = $xeCascader.handleHasChildNodeIds(afterTreeList, autoExpandMode);
+                reactData.currentItems = stItems;
+            }
+            else {
+                $xeCascader.handleCurrentItems();
+            }
+            $xeCascader.updateCurrentChunk();
         }, 350, { trailing: true }),
         loadData(list) {
             const $xeCascader = this;
@@ -722,17 +757,20 @@ export default {
             const reactData = $xeCascader.reactData;
             const internalData = $xeCascader.internalData;
             const { currentItems } = reactData;
-            const { treeFullData } = internalData;
+            const { afterTreeList } = internalData;
             const childrenField = $xeCascader.computeChildrenField;
-            const currentCunkList = [treeFullData];
+            const mapChildrenField = $xeCascader.computeMapChildrenField;
+            const treeOpts = $xeCascader.computeTreeOpts;
+            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 === $xeCascader.getNodeId(item));
-                    optList = currOption ? currOption[childrenField] : [];
+                    optList = currOption ? currOption[transform ? mapChildrenField : childrenField] : [];
                     if (!optList || !optList.length) {
                         break;
                     }
@@ -745,7 +783,7 @@ export default {
             const $xeCascader = this;
             const reactData = $xeCascader.reactData;
             const internalData = $xeCascader.internalData;
-            const { treeFullData } = internalData;
+            const { afterTreeList } = internalData;
             const selectVals = $xeCascader.computeSelectVals;
             const childrenField = $xeCascader.computeChildrenField;
             const mapChildrenField = $xeCascader.computeMapChildrenField;
@@ -755,7 +793,7 @@ export default {
             const expandedMaps = {};
             if (selectVals.length) {
                 const lastVal = enNodeValue(XEUtils.last(selectVals));
-                const stRest = XEUtils.findTree(treeFullData, (item) => lastVal === $xeCascader.getNodeId(item), { children: transform ? mapChildrenField : childrenField });
+                const stRest = XEUtils.findTree(afterTreeList, (item) => lastVal === $xeCascader.getNodeId(item), { children: transform ? mapChildrenField : childrenField });
                 if (stRest) {
                     const { nodes } = stRest;
                     nodes.forEach(item => {
@@ -884,13 +922,14 @@ export default {
                 return { checkNodeKeys: checkKeys, checkNodes };
             });
         },
-        clearCheckboxNode() {
+        clearSelectedNode() {
             const $xeCascader = this;
             const reactData = $xeCascader.reactData;
             const internalData = $xeCascader.internalData;
             internalData.indeterminateRowMaps = {};
             internalData.selectCheckboxMaps = {};
             reactData.updateCheckboxFlag++;
+            reactData.selectRadioKey = null;
             $xeCascader.updateCheckboxStatus();
             return $xeCascader.$nextTick().then(() => {
                 return { checkNodeKeys: [], checkNodes: [] };
@@ -942,7 +981,7 @@ export default {
             const { $event } = params;
             const { multiple, checkedClosable } = props;
             const value = multiple ? [] : null;
-            $xeCascader.clearCheckboxNode().then(() => {
+            $xeCascader.clearSelectedNode().then(() => {
                 if (checkedClosable) {
                     $xeCascader.hideOptionPanel($event);
                 }
@@ -1040,9 +1079,12 @@ export default {
             const { nodeMaps } = internalData;
             const radioOpts = $xeCascader.computeRadioOpts;
             const childrenField = $xeCascader.computeChildrenField;
+            const mapChildrenField = $xeCascader.computeMapChildrenField;
+            const treeOpts = $xeCascader.computeTreeOpts;
+            const { transform } = treeOpts;
             const { checkMode, checkMethod } = radioOpts;
             const nodeid = $xeCascader.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;
@@ -1214,7 +1256,7 @@ export default {
                 const childRowList = [];
                 XEUtils.eachTree(afterTreeList, (node) => {
                     const nodeid = $xeCascader.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]);
@@ -1321,7 +1363,7 @@ export default {
             const treeOpts = $xeCascader.computeTreeOpts;
             const { transform } = treeOpts;
             const nodeid = $xeCascader.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;
@@ -1586,11 +1628,12 @@ export default {
             const { currentNode, selectRadioKey, updateCheckboxFlag, updateExpandedFlag } = reactData;
             const { nodeMaps, selectCheckboxMaps, indeterminateRowMaps, treeExpandedMaps, treeExpandLazyLoadedMaps } = internalData;
             const treeOpts = $xeCascader.computeTreeOpts;
-            const { lazy, iconLoaded, iconOpen, iconClose } = treeOpts;
+            const { lazy, transform, iconLoaded, iconOpen, iconClose } = treeOpts;
             const childrenField = $xeCascader.computeChildrenField;
+            const mapChildrenField = $xeCascader.computeMapChildrenField;
             const labelField = $xeCascader.computeLabelField;
             const hasChildField = $xeCascader.computeHasChildField;
-            const childList = node[childrenField];
+            const childList = node[transform ? mapChildrenField : childrenField];
             const isExistChild = childList && childList.length > 0;
             const iconSlot = slots.icon;
             const titleSlot = slots.title;
@@ -1790,7 +1833,7 @@ export default {
                                         h('div', {
                                             class: 'vxe-tree-select--header-button'
                                         }, [
-                                            showCheckedButton && showClearButton
+                                            (showCheckedButton && multiple) || showClearButton
                                                 ? h('div', {
                                                     class: 'vxe-tree-select--selected-btns'
                                                 }, [
@@ -1852,7 +1895,7 @@ export default {
                                     })
                                 ])
                             ]),
-                            footerSlot || showTotalButton || (showCloseButton && multiple)
+                            footerSlot || showTotalButton || showCloseButton
                                 ? h('div', {
                                     class: 'vxe-cascader--panel-footer'
                                 }, footerSlot
@@ -1866,7 +1909,7 @@ export default {
                                                     class: 'vxe-cascader--total-btns'
                                                 }, getI18n('vxe.treeSelect.total', [selectVals.length]))
                                                 : renderEmptyElement($xeCascader),
-                                            showCloseButton && multiple
+                                            showCloseButton
                                                 ? h('div', {
                                                     class: 'vxe-cascader--oper-btns'
                                                 }, [
@@ -1910,6 +1953,7 @@ export default {
         const $xeCascader = this;
         const props = $xeCascader;
         const reactData = $xeCascader.reactData;
+        $xeCascader.internalData = createInternalData();
         if (!props.multiple) {
             reactData.selectRadioKey = enNodeValue(props.value);
         }
@@ -1917,10 +1961,6 @@ export default {
     },
     mounted() {
         const $xeCascader = this;
-        const props = $xeCascader;
-        if (props.filterable) {
-            errLog('vxe.error.notProp', ['filterable']);
-        }
         globalEvents.on($xeCascader, 'mousewheel', $xeCascader.handleGlobalMousewheelEvent);
         globalEvents.on($xeCascader, 'mousedown', $xeCascader.handleGlobalMousedownEvent);
         globalEvents.on($xeCascader, 'blur', $xeCascader.handleGlobalBlurEvent);

package/es/checkbox/src/group.js

@@ -2,6 +2,9 @@ import { defineVxeComponent } from '../../ui/src/comp';
 import XEUtils from 'xe-utils';
 import { getConfig, createEvent, globalMixins } from '../../ui';
 import VxeCheckboxComponent from './checkbox';
+function createReactData() {
+    return {};
+}
 function createInternalData() {
     return {
     // isLoaded: false
@@ -50,13 +53,8 @@ export default {
         };
     },
     data() {
-        const reactData = {};
-        const internalData = createInternalData();
-        return {
-            xID: XEUtils.uniqueId(),
-            reactData,
-            internalData
-        };
+        const reactData = createReactData();
+        return Object.assign(Object.assign({}, {}), { xID: XEUtils.uniqueId(), reactData });
     },
     computed: Object.assign(Object.assign({}, {}), { computeIsReadonly() {
             const $xeCheckboxGroup = this;
@@ -236,6 +234,10 @@ export default {
             $xeCheckboxGroup.loadData(val);
         }
     },
+    created() {
+        const $xeCheckboxGroup = this;
+        $xeCheckboxGroup.internalData = createInternalData();
+    },
     mounted() {
         const $xeCheckboxGroup = this;
         const props = $xeCheckboxGroup;
@@ -246,6 +248,13 @@ export default {
             }
         });
     },
+    beforeDestroy() {
+        const $xeCheckboxGroup = this;
+        const reactData = $xeCheckboxGroup.reactData;
+        const internalData = $xeCheckboxGroup.internalData;
+        XEUtils.assign(reactData, createReactData());
+        XEUtils.assign(internalData, createInternalData());
+    },
     render(h) {
         return this.renderVN(h);
     }

package/es/context-menu/src/context-menu.js

@@ -182,13 +182,8 @@ export default {
         }
     },
     data() {
-        const internalData = createInternalData();
         const reactData = createReactData();
-        return {
-            xID: XEUtils.uniqueId(),
-            internalData,
-            reactData
-        };
+        return Object.assign(Object.assign({}, {}), { xID: XEUtils.uniqueId(), reactData });
     },
     computed: Object.assign(Object.assign({}, {}), { computeMenuGroups() {
             const $xeContextMenu = this;
@@ -661,6 +656,7 @@ export default {
     },
     created() {
         const $xeContextMenu = this;
+        $xeContextMenu.internalData = createInternalData();
         $xeContextMenu.handleVisible();
         globalEvents.on($xeContextMenu, 'mousewheel', $xeContextMenu.handleGlobalMousewheelEvent);
         globalEvents.on($xeContextMenu, 'keydown', $xeContextMenu.handleGlobalKeydownEvent);

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) {
@@ -90,10 +90,10 @@ export const parseDateValue = (val, type, options) => {
     }
     return null;
 };
-export const parseDateString = (val, type, options) => {
+export function parseDateString(val, type, options) {
     const dValue = parseDateValue(val, type, options);
     return dValue ? XEUtils.toDateString(dValue, options.valueFormat) : '';
-};
+}
 export function parseDateObj(val, type, options) {
     const { labelFormat, firstDay } = options;
     let dValue = null;
@@ -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;
+}