vxe-table 4.2.8 → 4.3.0-beta.2

package/es/tools/vn.js

@@ -1,3 +1,10 @@
+import XEUtils from 'xe-utils';
 export function getOnName(type) {
     return 'on' + type.substring(0, 1).toLocaleUpperCase() + type.substring(1);
 }
+export function getSlotVNs(vns) {
+    if (XEUtils.isArray(vns)) {
+        return vns;
+    }
+    return [vns];
+}

package/es/tooltip/src/tooltip.js

@@ -9,12 +9,22 @@ var __assign = (this && this.__assign) || function () {
     };
     return __assign.apply(this, arguments);
 };
+var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
+    if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
+        if (ar || !(i in from)) {
+            if (!ar) ar = Array.prototype.slice.call(from, 0, i);
+            ar[i] = from[i];
+        }
+    }
+    return to.concat(ar || Array.prototype.slice.call(from));
+};
 import { defineComponent, h, ref, nextTick, onBeforeUnmount, onMounted, reactive, watch } from 'vue';
 import XEUtils from 'xe-utils';
 import GlobalConfig from '../../v-x-e-table/src/conf';
 import { useSize } from '../../hooks/size';
 import { getLastZIndex, nextZIndex, formatText } from '../../tools/utils';
 import { getAbsolutePos, getDomNode } from '../../tools/dom';
+import { getSlotVNs } from '../../tools/vn';
 export default defineComponent({
     name: 'VxeTooltip',
     props: {
@@ -82,9 +92,9 @@ export default defineComponent({
                     tipStore.placement = 'bottom';
                     tipTop = top_1 + tipTarget.offsetHeight + marginSize;
                 }
-                tipStore.style.top = tipTop + "px";
-                tipStore.style.left = tipLeft + "px";
-                tipStore.arrowStyle.left = left - tipLeft + tipTarget.offsetWidth / 2 + "px";
+                tipStore.style.top = "".concat(tipTop, "px");
+                tipStore.style.left = "".concat(tipLeft, "px");
+                tipStore.arrowStyle.left = "".concat(left - tipLeft + tipTarget.offsetWidth / 2, "px");
             }
         };
         var updateValue = function (value) {
@@ -282,11 +292,12 @@ export default defineComponent({
         var renderContent = function () {
             var useHTML = props.useHTML;
             var tipContent = reactData.tipContent;
-            if (slots.content) {
+            var contentSlot = slots.content;
+            if (contentSlot) {
                 return h('div', {
                     key: 1,
                     class: 'vxe-table--tooltip-content'
-                }, slots.content({}));
+                }, getSlotVNs(contentSlot({})));
             }
             if (useHTML) {
                 return h('div', {
@@ -304,6 +315,7 @@ export default defineComponent({
             var _a;
             var theme = props.theme, isArrow = props.isArrow, enterable = props.enterable;
             var tipActive = reactData.tipActive, visible = reactData.visible, tipStore = reactData.tipStore;
+            var defaultSlot = slots.default;
             var vSize = computeSize.value;
             var ons;
             if (enterable) {
@@ -312,20 +324,20 @@ export default defineComponent({
                     onMouseleave: wrapperMouseleaveEvent
                 };
             }
-            return h('div', __assign({ ref: refElem, class: ['vxe-table--tooltip-wrapper', "theme--" + theme, (_a = {},
-                        _a["size--" + vSize] = vSize,
-                        _a["placement--" + tipStore.placement] = tipStore.placement,
+            return h('div', __assign({ ref: refElem, class: ['vxe-table--tooltip-wrapper', "theme--".concat(theme), (_a = {},
+                        _a["size--".concat(vSize)] = vSize,
+                        _a["placement--".concat(tipStore.placement)] = tipStore.placement,
                         _a['is--enterable'] = enterable,
                         _a['is--visible'] = visible,
                         _a['is--arrow'] = isArrow,
                         _a['is--actived'] = tipActive,
-                        _a)], style: tipStore.style }, ons), [
+                        _a)], style: tipStore.style }, ons), __spreadArray([
                 renderContent(),
                 h('div', {
                     class: 'vxe-table--tooltip-arrow',
                     style: tipStore.arrowStyle
                 })
-            ].concat(slots.default ? slots.default({}) : []));
+            ], (defaultSlot ? getSlotVNs(defaultSlot({})) : []), true));
         };
         $xetooltip.renderVN = renderVN;
         return $xetooltip;

package/es/v-x-e-table/index.js

@@ -83,7 +83,7 @@ export var config = new VXETableConfig();
 export var v = 'v4';
 export var VXETable = {
     v: v,
-    version: "4.2.8",
+    version: "4.3.0-beta.2",
     setup: setup,
     interceptor: interceptor,
     renderer: renderer,

package/es/v-x-e-table/src/conf.js

@@ -1,11 +1,11 @@
-var iconPrefix = 'vxe-icon--';
+var iconPrefix = 'vxe-icon-';
 var GlobalConfig = {
     size: null,
     zIndex: 999,
     version: 0,
     // resizeInterval: 500,
     emptyCell: '　',
-    loadingText: null,
+    // loadingText: null, // 自定义loading提示内容，如果为null则不显示文本
     table: {
         fit: true,
         showHeader: true,
@@ -124,65 +124,70 @@ var GlobalConfig = {
     },
     icon: {
         // loading
-        // LOADING: iconPrefix + 'refresh roll vxe-loading--default-icon',
+        LOADING: iconPrefix + 'spinner roll vxe-loading--default-icon',
         // table
-        TABLE_SORT_ASC: iconPrefix + 'caret-top',
-        TABLE_SORT_DESC: iconPrefix + 'caret-bottom',
+        TABLE_SORT_ASC: iconPrefix + 'caret-up',
+        TABLE_SORT_DESC: iconPrefix + 'caret-down',
         TABLE_FILTER_NONE: iconPrefix + 'funnel',
         TABLE_FILTER_MATCH: iconPrefix + 'funnel',
-        TABLE_EDIT: iconPrefix + 'edit-outline',
-        TABLE_HELP: iconPrefix + 'question',
-        TABLE_TREE_LOADED: iconPrefix + 'refresh roll',
+        TABLE_EDIT: iconPrefix + 'edit',
+        TABLE_HELP: iconPrefix + 'question-circle-fill',
+        TABLE_TREE_LOADED: iconPrefix + 'spinner roll',
         TABLE_TREE_OPEN: iconPrefix + 'caret-right rotate90',
         TABLE_TREE_CLOSE: iconPrefix + 'caret-right',
-        TABLE_EXPAND_LOADED: iconPrefix + 'refresh roll',
+        TABLE_EXPAND_LOADED: iconPrefix + 'spinner roll',
         TABLE_EXPAND_OPEN: iconPrefix + 'arrow-right rotate90',
         TABLE_EXPAND_CLOSE: iconPrefix + 'arrow-right',
+        TABLE_CHECKBOX_CHECKED: iconPrefix + 'checkbox-checked',
+        TABLE_CHECKBOX_UNCHECKED: iconPrefix + 'checkbox-unchecked',
+        TABLE_CHECKBOX_INDETERMINATE: iconPrefix + 'checkbox-indeterminate',
+        TABLE_RADIO_CHECKED: iconPrefix + 'radio-checked',
+        TABLE_RADIO_UNCHECKED: iconPrefix + 'radio-unchecked',
         // button
-        BUTTON_DROPDOWN: iconPrefix + 'arrow-bottom',
-        BUTTON_LOADING: iconPrefix + 'refresh roll',
+        BUTTON_DROPDOWN: iconPrefix + 'arrow-down',
+        BUTTON_LOADING: iconPrefix + 'spinner roll',
         // select
-        SELECT_LOADED: iconPrefix + 'refresh roll',
-        SELECT_OPEN: iconPrefix + 'caret-bottom rotate180',
-        SELECT_CLOSE: iconPrefix + 'caret-bottom',
+        SELECT_LOADED: iconPrefix + 'spinner roll',
+        SELECT_OPEN: iconPrefix + 'caret-down rotate180',
+        SELECT_CLOSE: iconPrefix + 'caret-down',
         // pager
-        PAGER_JUMP_PREV: iconPrefix + 'd-arrow-left',
-        PAGER_JUMP_NEXT: iconPrefix + 'd-arrow-right',
+        PAGER_JUMP_PREV: iconPrefix + 'arrow-double-left',
+        PAGER_JUMP_NEXT: iconPrefix + 'arrow-double-right',
         PAGER_PREV_PAGE: iconPrefix + 'arrow-left',
         PAGER_NEXT_PAGE: iconPrefix + 'arrow-right',
-        PAGER_JUMP_MORE: iconPrefix + 'more',
+        PAGER_JUMP_MORE: iconPrefix + 'ellipsis-h',
         // input
-        INPUT_CLEAR: iconPrefix + 'close',
-        INPUT_PWD: iconPrefix + 'eye-slash',
-        INPUT_SHOW_PWD: iconPrefix + 'eye',
-        INPUT_PREV_NUM: iconPrefix + 'caret-top',
-        INPUT_NEXT_NUM: iconPrefix + 'caret-bottom',
+        INPUT_CLEAR: iconPrefix + 'error-circle-fill',
+        INPUT_PWD: iconPrefix + 'eye-fill',
+        INPUT_SHOW_PWD: iconPrefix + 'eye-fill-close',
+        INPUT_PREV_NUM: iconPrefix + 'caret-up',
+        INPUT_NEXT_NUM: iconPrefix + 'caret-down',
         INPUT_DATE: iconPrefix + 'calendar',
         INPUT_SEARCH: iconPrefix + 'search',
         // modal
         MODAL_ZOOM_IN: iconPrefix + 'square',
-        MODAL_ZOOM_OUT: iconPrefix + 'zoomout',
+        MODAL_ZOOM_OUT: iconPrefix + 'maximize',
         MODAL_CLOSE: iconPrefix + 'close',
-        MODAL_INFO: iconPrefix + 'info',
-        MODAL_SUCCESS: iconPrefix + 'success',
-        MODAL_WARNING: iconPrefix + 'warning',
-        MODAL_ERROR: iconPrefix + 'error',
-        MODAL_QUESTION: iconPrefix + 'question',
-        MODAL_LOADING: iconPrefix + 'refresh roll',
+        MODAL_INFO: iconPrefix + 'info-circle-fill',
+        MODAL_SUCCESS: iconPrefix + 'success-circle-fill',
+        MODAL_WARNING: iconPrefix + 'warnion-circle-fill',
+        MODAL_ERROR: iconPrefix + 'error-circle-fill',
+        MODAL_QUESTION: iconPrefix + 'question-circle-fill',
+        MODAL_LOADING: iconPrefix + 'spinner roll',
         // toolbar
-        TOOLBAR_TOOLS_REFRESH: iconPrefix + 'refresh',
-        TOOLBAR_TOOLS_REFRESH_LOADING: iconPrefix + 'refresh roll',
+        TOOLBAR_TOOLS_REFRESH: iconPrefix + 'repeat',
+        TOOLBAR_TOOLS_REFRESH_LOADING: iconPrefix + 'repeat roll',
         TOOLBAR_TOOLS_IMPORT: iconPrefix + 'upload',
         TOOLBAR_TOOLS_EXPORT: iconPrefix + 'download',
         TOOLBAR_TOOLS_PRINT: iconPrefix + 'print',
-        TOOLBAR_TOOLS_ZOOM_IN: iconPrefix + 'zoomin',
-        TOOLBAR_TOOLS_ZOOM_OUT: iconPrefix + 'zoomout',
-        TOOLBAR_TOOLS_CUSTOM: iconPrefix + 'menu',
+        TOOLBAR_TOOLS_FULLSCREEN: iconPrefix + 'fullscreen',
+        TOOLBAR_TOOLS_MINIMIZE: iconPrefix + 'minimize',
+        TOOLBAR_TOOLS_CUSTOM: iconPrefix + 'custom-column',
         // form
-        FORM_PREFIX: iconPrefix + 'question',
-        FORM_SUFFIX: iconPrefix + 'question',
-        FORM_FOLDING: iconPrefix + 'arrow-top rotate180',
-        FORM_UNFOLDING: iconPrefix + 'arrow-top'
+        FORM_PREFIX: iconPrefix + 'question-circle-fill',
+        FORM_SUFFIX: iconPrefix + 'question-circle-fill',
+        FORM_FOLDING: iconPrefix + 'arrow-up rotate180',
+        FORM_UNFOLDING: iconPrefix + 'arrow-up'
     },
     grid: {
         // size: null,

package/es/v-x-e-table/src/interceptor.js

@@ -14,7 +14,7 @@ export var interceptor = {
         if (process.env.NODE_ENV === 'development') {
             var eventTypes = ['created', 'mounted', 'activated', 'beforeUnmount', 'unmounted', 'event.clearActived', 'event.clearFilter', 'event.clearAreas', 'event.showMenu', 'event.keydown', 'event.export', 'event.import'];
             if (eventTypes.indexOf(type) === -1) {
-                warnLog('vxe.error.errProp', ["Interceptor." + type, eventTypes.join('|')]);
+                warnLog('vxe.error.errProp', ["Interceptor.".concat(type), eventTypes.join('|')]);
             }
         }
         if (callback) {

package/es/v-x-e-table/src/renderer.js

@@ -9,10 +9,14 @@ var __assign = (this && this.__assign) || function () {
     };
     return __assign.apply(this, arguments);
 };
-var __spreadArray = (this && this.__spreadArray) || function (to, from) {
-    for (var i = 0, il = from.length, j = to.length; i < il; i++, j++)
-        to[j] = from[i];
-    return to;
+var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
+    if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
+        if (ar || !(i in from)) {
+            if (!ar) ar = Array.prototype.slice.call(from, 0, i);
+            ar[i] = from[i];
+        }
+    }
+    return to.concat(ar || Array.prototype.slice.call(from));
 };
 import { h, resolveComponent } from 'vue';
 import XEUtils from 'xe-utils';
@@ -49,10 +53,10 @@ function getFormatDate(value, props, defaultFormat) {
     return XEUtils.toDateString(parseDate(value, props), dateConfig.labelFormat || defaultFormat);
 }
 function getLabelFormatDate(value, props) {
-    return getFormatDate(value, props, GlobalConfig.i18n("vxe.input.date.labelFormat." + props.type));
+    return getFormatDate(value, props, GlobalConfig.i18n("vxe.input.date.labelFormat.".concat(props.type)));
 }
 function getComponentName(name) {
-    return "vxe-" + name.replace('$', '');
+    return "vxe-".concat(name.replace('$', ''));
 }
 function getDefaultComponent(_a) {
     var name = _a.name;
@@ -130,7 +134,7 @@ function getElementOns(renderOpts, params, modelFunc, changeFunc) {
                 for (var _i = 0; _i < arguments.length; _i++) {
                     args[_i] = arguments[_i];
                 }
-                func.apply(void 0, __spreadArray([params], args));
+                func.apply(void 0, __spreadArray([params], args, false));
             };
         });
     }
@@ -153,7 +157,7 @@ function getElementOns(renderOpts, params, modelFunc, changeFunc) {
             }
             changeFunc.apply(void 0, args);
             if (events && events[changeEvent]) {
-                events[changeEvent].apply(events, __spreadArray([params], args));
+                events[changeEvent].apply(events, __spreadArray([params], args, false));
             }
         };
     }
@@ -177,7 +181,7 @@ function getComponentOns(renderOpts, params, modelFunc, changeFunc) {
             for (var _i = 0; _i < arguments.length; _i++) {
                 args[_i] = arguments[_i];
             }
-            func.apply(void 0, __spreadArray([params], args));
+            func.apply(void 0, __spreadArray([params], args, false));
         };
     });
     if (modelFunc) {
@@ -196,7 +200,7 @@ function getComponentOns(renderOpts, params, modelFunc, changeFunc) {
             }
             changeFunc.apply(void 0, args);
             if (events && events[changeEvent]) {
-                events[changeEvent].apply(events, __spreadArray([params], args));
+                events[changeEvent].apply(events, __spreadArray([params], args, false));
             }
         };
     }
@@ -294,7 +298,7 @@ function nativeEditRender(renderOpts, params) {
     var name = renderOpts.name;
     var cellValue = isImmediateCell(renderOpts, params) ? getCellValue(row, column) : column.model.value;
     return [
-        h(name, __assign(__assign(__assign({ class: "vxe-default-" + name }, getNativeAttrs(renderOpts)), { value: cellValue }), getNativeEditOns(renderOpts, params)))
+        h(name, __assign(__assign(__assign({ class: "vxe-default-".concat(name) }, getNativeAttrs(renderOpts)), { value: cellValue }), getNativeEditOns(renderOpts, params)))
     ];
 }
 function defaultEditRender(renderOpts, params) {
@@ -348,7 +352,7 @@ function nativeFilterRender(renderOpts, params) {
     var name = renderOpts.name;
     var attrs = getNativeAttrs(renderOpts);
     return column.filters.map(function (option, oIndex) {
-        return h(name, __assign(__assign(__assign({ key: oIndex, class: "vxe-default-" + name }, attrs), { value: option.data }), getNativeFilterOns(renderOpts, params, option)));
+        return h(name, __assign(__assign(__assign({ key: oIndex, class: "vxe-default-".concat(name) }, attrs), { value: option.data }), getNativeFilterOns(renderOpts, params, option)));
     });
 }
 function defaultFilterRender(renderOpts, params) {
@@ -414,7 +418,7 @@ function nativeItemRender(renderOpts, params) {
     var attrs = getNativeAttrs(renderOpts);
     var itemValue = XEUtils.get(data, property);
     return [
-        h(name, __assign(__assign(__assign({ class: "vxe-default-" + name }, attrs), { value: attrs && name === 'input' && (attrs.type === 'submit' || attrs.type === 'reset') ? null : itemValue }), getNativeItemOns(renderOpts, params)))
+        h(name, __assign(__assign(__assign({ class: "vxe-default-".concat(name) }, attrs), { value: attrs && name === 'input' && (attrs.type === 'submit' || attrs.type === 'reset') ? null : itemValue }), getNativeItemOns(renderOpts, params)))
     ];
 }
 function defaultItemRender(renderOpts, params) {
@@ -471,7 +475,7 @@ function defaultFormItemRadioAndCheckboxRender(renderOpts, params) {
     // 如果是分组
     if (options) {
         return [
-            h(resolveComponent(compName + "-group"), __assign(__assign({}, getComponentFormItemProps(renderOpts, params, itemValue)), getItemOns(renderOpts, params)), {
+            h(resolveComponent("".concat(compName, "-group")), __assign(__assign({}, getComponentFormItemProps(renderOpts, params, itemValue)), getItemOns(renderOpts, params)), {
                 default: function () {
                     return options.map(function (item, index) {
                         return h(resolveComponent(compName), {
@@ -626,7 +630,7 @@ export var renderer = {
                 if (process.env.NODE_ENV === 'development') {
                     XEUtils.each(options, function (val, key) {
                         if (!XEUtils.eqNull(renders_1[key]) && renders_1[key] !== val) {
-                            warnLog('vxe.error.coverProp', ["Renderer." + name, key]);
+                            warnLog('vxe.error.coverProp', ["Renderer.".concat(name), key]);
                         }
                     });
                 }