vxe-table 4.2.8 → 4.3.0-beta.0

package/es/form/src/form.js

@@ -20,6 +20,7 @@ import { createItem, handleFieldOrItem, isHiddenItem, isActivetem } from './util
 import { useSize } from '../../hooks/size';
 import VxeFormConfigItem from './form-config-item';
 import VxeLoading from '../../loading/index';
+import { getSlotVNs } from '../../tools/vn';
 var Rule = /** @class */ (function () {
     function Rule(rule) {
         Object.assign(this, {
@@ -93,6 +94,7 @@ export default defineComponent({
         titleAsterisk: { type: Boolean, default: function () { return GlobalConfig.form.titleAsterisk; } },
         titleOverflow: { type: [Boolean, String], default: null },
         className: [String, Function],
+        readonly: Boolean,
         items: Array,
         rules: Object,
         preventSubmit: { type: Boolean, default: function () { return GlobalConfig.form.preventSubmit; } },
@@ -156,7 +158,7 @@ export default defineComponent({
                     slotFunc = slots[slotFunc] || null;
                 }
                 if (XEUtils.isFunction(slotFunc)) {
-                    return slotFunc(params);
+                    return getSlotVNs(slotFunc(params));
                 }
             }
             return [];
@@ -232,7 +234,7 @@ export default defineComponent({
                             compConf.itemResetMethod({ data: data, field: field, property: field, item: item, $form: $xeform });
                         }
                         else if (field) {
-                            XEUtils.set(data, field, resetValue === null ? getResetValue(XEUtils.get(data, field), undefined) : resetValue);
+                            XEUtils.set(data, field, resetValue === null ? getResetValue(XEUtils.get(data, field), undefined) : XEUtils.clone(resetValue, true));
                         }
                     }
                 });
@@ -254,15 +256,15 @@ export default defineComponent({
                     var inputElem = null;
                     // 定位到第一个
                     if (!index) {
-                        scrollToView(el.querySelector("." + item.id));
+                        scrollToView(el.querySelector(".".concat(item.id)));
                     }
                     // 如果指定了聚焦 class
                     if (itemRender.autofocus) {
-                        inputElem = el.querySelector("." + item.id + " " + itemRender.autofocus);
+                        inputElem = el.querySelector(".".concat(item.id, " ").concat(itemRender.autofocus));
                     }
                     // 渲染器的聚焦处理
                     if (!inputElem && compConf && compConf.autofocus) {
-                        inputElem = el.querySelector("." + item.id + " " + compConf.autofocus);
+                        inputElem = el.querySelector(".".concat(item.id, " ").concat(compConf.autofocus));
                     }
                     if (inputElem) {
                         inputElem.focus();
@@ -549,7 +551,7 @@ export default defineComponent({
             return h('form', {
                 ref: refElem,
                 class: ['vxe-form', className ? (XEUtils.isFunction(className) ? className({ items: formItems, data: data, $form: $xeform }) : className) : '', (_a = {},
-                        _a["size--" + vSize] = vSize,
+                        _a["size--".concat(vSize)] = vSize,
                         _a['is--loading'] = loading,
                         _a)],
                 onSubmit: submitEvent,

package/es/form/style.css

@@ -61,9 +61,6 @@
   .vxe-form--item-title .vxe-form--item-title-suffix {
     cursor: help;
     vertical-align: middle; }
-    .vxe-form--item-title .vxe-form--item-title-prefix > i,
-    .vxe-form--item-title .vxe-form--item-title-suffix > i {
-      vertical-align: middle; }
   .vxe-form--item-title .vxe-form--item-title-prefix {
     margin-right: 0.25em; }
   .vxe-form--item-title .vxe-form--item-title-suffix {

package/es/grid/src/grid.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 { defineComponent, h, ref, computed, provide, getCurrentInstance, resolveComponent, reactive, onUnmounted, watch, nextTick, onMounted } from 'vue';
 import XEUtils from 'xe-utils';
@@ -25,9 +29,10 @@ import tableComponentProps from '../../table/src/props';
 import tableComponentEmits from '../../table/src/emits';
 import { useSize } from '../../hooks/size';
 import { GlobalEvent, hasEventKey, EVENT_KEYS } from '../../tools/event';
+import { getSlotVNs } from '../../tools/vn';
 var tableComponentPropKeys = Object.keys(tableComponentProps);
 var tableComponentMethodKeys = ['clearAll', 'syncData', 'updateData', 'loadData', 'reloadData', 'reloadRow', 'loadColumn', 'reloadColumn', 'getRowNode', 'getColumnNode', 'getRowIndex', 'getVTRowIndex', 'getVMRowIndex', 'getColumnIndex', 'getVTColumnIndex', 'getVMColumnIndex', 'createData', 'createRow', 'revertData', 'clearData', 'isInsertByRow', 'isUpdateByRow', 'getColumns', 'getColumnById', 'getColumnByField', 'getTableColumn', 'getData', 'getCheckboxRecords', 'getParentRow', 'getRowSeq', 'getRowById', 'getRowid', 'getTableData', 'hideColumn', 'showColumn', 'resetColumn', 'refreshColumn', 'refreshScroll', 'recalculate', 'closeTooltip', 'isAllCheckboxChecked', 'isAllCheckboxIndeterminate', 'getCheckboxIndeterminateRecords', 'setCheckboxRow', 'isCheckedByCheckboxRow', 'isIndeterminateByCheckboxRow', 'toggleCheckboxRow', 'setAllCheckboxRow', 'getRadioReserveRecord', 'clearRadioReserve', 'getCheckboxReserveRecords', 'clearCheckboxReserve', 'toggleAllCheckboxRow', 'clearCheckboxRow', 'setCurrentRow', 'isCheckedByRadioRow', 'setRadioRow', 'clearCurrentRow', 'clearRadioRow', 'getCurrentRecord', 'getRadioRecord', 'getCurrentColumn', 'setCurrentColumn', 'clearCurrentColumn', 'sort', 'clearSort', 'isSort', 'getSortColumns', 'closeFilter', 'isFilter', 'isRowExpandLoaded', 'clearRowExpandLoaded', 'reloadRowExpand', 'reloadRowExpand', 'toggleRowExpand', 'setAllRowExpand', 'setRowExpand', 'isExpandByRow', 'clearRowExpand', 'clearRowExpandReserve', 'getRowExpandRecords', 'getTreeExpandRecords', 'isTreeExpandLoaded', 'clearTreeExpandLoaded', 'reloadTreeExpand', 'reloadTreeChilds', 'toggleTreeExpand', 'setAllTreeExpand', 'setTreeExpand', 'isTreeExpandByRow', 'clearTreeExpand', 'clearTreeExpandReserve', 'getScroll', 'scrollTo', 'scrollToRow', 'scrollToColumn', 'clearScroll', 'updateFooter', 'updateStatus', 'setMergeCells', 'removeInsertRow', 'removeMergeCells', 'getMergeCells', 'clearMergeCells', 'setMergeFooterItems', 'removeMergeFooterItems', 'getMergeFooterItems', 'clearMergeFooterItems', 'openTooltip', 'focus', 'blur', 'connect'];
-var gridComponentEmits = __spreadArray(__spreadArray([], tableComponentEmits), [
+var gridComponentEmits = __spreadArray(__spreadArray([], tableComponentEmits, true), [
     'page-change',
     'form-submit',
     'form-submit-invalid',
@@ -37,7 +42,7 @@ var gridComponentEmits = __spreadArray(__spreadArray([], tableComponentEmits), [
     'toolbar-button-click',
     'toolbar-tool-click',
     'zoom'
-]);
+], false);
 export default defineComponent({
     name: 'VxeGrid',
     props: __assign(__assign({}, tableComponentProps), { columns: Array, pagerConfig: Object, proxyConfig: Object, toolbarConfig: Object, formConfig: Object, zoomConfig: Object, size: { type: String, default: function () { return GlobalConfig.grid.size || GlobalConfig.size; } } }),
@@ -272,7 +277,7 @@ export default defineComponent({
             var selectRecords = gridExtendTableMethods.getCheckboxRecords();
             if (isMsg) {
                 if (selectRecords.length) {
-                    return VXETable.modal.confirm({ id: "cfm_" + code, content: GlobalConfig.i18n(alertKey), escClosable: true }).then(function (type) {
+                    return VXETable.modal.confirm({ id: "cfm_".concat(code), content: GlobalConfig.i18n(alertKey), escClosable: true }).then(function (type) {
                         if (type === 'confirm') {
                             callback();
                         }
@@ -285,7 +290,7 @@ export default defineComponent({
                             errLog('vxe.error.reqModule', ['Modal']);
                         }
                     }
-                    VXETable.modal.message({ id: "msg_" + code, content: GlobalConfig.i18n('vxe.grid.selectOneRecord'), status: 'warning' });
+                    VXETable.modal.message({ id: "msg_".concat(code), content: GlobalConfig.i18n('vxe.grid.selectOneRecord'), status: 'warning' });
                 }
             }
             else {
@@ -487,13 +492,13 @@ export default defineComponent({
         };
         var tableCompEvents = {};
         tableComponentEmits.forEach(function (name) {
-            var type = XEUtils.camelCase("on-" + name);
+            var type = XEUtils.camelCase("on-".concat(name));
             tableCompEvents[type] = function () {
                 var args = [];
                 for (var _i = 0; _i < arguments.length; _i++) {
                     args[_i] = arguments[_i];
                 }
-                return emit.apply(void 0, __spreadArray([name], args));
+                return emit.apply(void 0, __spreadArray([name], args, false));
             };
         });
         /**
@@ -909,7 +914,7 @@ export default defineComponent({
                     default: {
                         var btnMethod = VXETable.commands.get(code);
                         if (btnMethod) {
-                            btnMethod.apply(void 0, __spreadArray([{ code: code, button: button, $grid: $xegrid, $table: $xetable }], args));
+                            btnMethod.apply(void 0, __spreadArray([{ code: code, button: button, $grid: $xegrid, $table: $xetable }], args, false));
                         }
                     }
                 }
@@ -989,7 +994,7 @@ export default defineComponent({
                         slotFunc = slots[slotFunc] || null;
                     }
                     if (XEUtils.isFunction(slotFunc)) {
-                        return slotFunc(params);
+                        return getSlotVNs(slotFunc(params));
                     }
                 }
                 return [];
@@ -1089,7 +1094,7 @@ export default defineComponent({
             return h('div', {
                 ref: refElem,
                 class: ['vxe-grid', (_a = {},
-                        _a["size--" + vSize] = vSize,
+                        _a["size--".concat(vSize)] = vSize,
                         _a['is--animat'] = !!props.animat,
                         _a['is--round'] = props.round,
                         _a['is--maximize'] = reactData.isZMax,

package/es/grid/style.css

@@ -37,7 +37,7 @@
        -moz-user-select: none;
         -ms-user-select: none;
             user-select: none;
-    background-color: rgba(0, 0, 0, 0.2); }
+    background-color: rgba(0, 0, 0, 0.3); }
   .vxe-grid.is--loading > .vxe-table .vxe-loading {
     background-color: transparent; }
   .vxe-grid.is--maximize {

package/es/header/src/header.js

@@ -103,7 +103,7 @@ export default defineComponent({
                     // left = Math.min(left, tableBodyElem.clientWidth + tableBodyElem.scrollLeft - 40)
                 }
                 dragLeft = Math.max(left, dragMinLeft);
-                resizeBarElem.style.left = dragLeft - scrollLeft + "px";
+                resizeBarElem.style.left = "".concat(dragLeft - scrollLeft, "px");
             };
             tableInternalData._isResize = true;
             addClass(tableEl, 'drag--resize');
@@ -136,13 +136,13 @@ export default defineComponent({
                 var fixedType = props.fixedType;
                 var internalData = $xetable.internalData;
                 var elemStore = internalData.elemStore;
-                var prefix = (fixedType || 'main') + "-header-";
-                elemStore[prefix + "wrapper"] = refElem;
-                elemStore[prefix + "table"] = refHeaderTable;
-                elemStore[prefix + "colgroup"] = refHeaderColgroup;
-                elemStore[prefix + "list"] = refHeaderTHead;
-                elemStore[prefix + "xSpace"] = refHeaderXSpace;
-                elemStore[prefix + "repair"] = refHeaderBorderRepair;
+                var prefix = "".concat(fixedType || 'main', "-header-");
+                elemStore["".concat(prefix, "wrapper")] = refElem;
+                elemStore["".concat(prefix, "table")] = refHeaderTable;
+                elemStore["".concat(prefix, "colgroup")] = refHeaderColgroup;
+                elemStore["".concat(prefix, "list")] = refHeaderTHead;
+                elemStore["".concat(prefix, "xSpace")] = refHeaderXSpace;
+                elemStore["".concat(prefix, "repair")] = refHeaderBorderRepair;
                 uploadColumn();
             });
         });
@@ -150,13 +150,13 @@ export default defineComponent({
             var fixedType = props.fixedType;
             var internalData = $xetable.internalData;
             var elemStore = internalData.elemStore;
-            var prefix = (fixedType || 'main') + "-header-";
-            elemStore[prefix + "wrapper"] = null;
-            elemStore[prefix + "table"] = null;
-            elemStore[prefix + "colgroup"] = null;
-            elemStore[prefix + "list"] = null;
-            elemStore[prefix + "xSpace"] = null;
-            elemStore[prefix + "repair"] = null;
+            var prefix = "".concat(fixedType || 'main', "-header-");
+            elemStore["".concat(prefix, "wrapper")] = null;
+            elemStore["".concat(prefix, "table")] = null;
+            elemStore["".concat(prefix, "colgroup")] = null;
+            elemStore["".concat(prefix, "list")] = null;
+            elemStore["".concat(prefix, "xSpace")] = null;
+            elemStore["".concat(prefix, "repair")] = null;
         });
         var renderVN = function () {
             var fixedType = props.fixedType, fixedColumn = props.fixedColumn, tableColumn = props.tableColumn;
@@ -175,7 +175,7 @@ export default defineComponent({
             }
             return h('div', {
                 ref: refElem,
-                class: ['vxe-table--header-wrapper', fixedType ? "fixed-" + fixedType + "--wrapper" : 'body--wrapper'],
+                class: ['vxe-table--header-wrapper', fixedType ? "fixed-".concat(fixedType, "--wrapper") : 'body--wrapper'],
                 xid: xID
             }, [
                 fixedType ? createCommentVNode() : h('div', {
@@ -242,8 +242,8 @@ export default defineComponent({
                                 thOns.onMousedown = function (evnt) { return $xetable.triggerHeaderCellMousedownEvent(evnt, params); };
                             }
                             return h('th', __assign(__assign({ class: ['vxe-header--column', column.id, (_a = {},
-                                        _a["col--" + headAlign] = headAlign,
-                                        _a["col--" + type] = type,
+                                        _a["col--".concat(headAlign)] = headAlign,
+                                        _a["col--".concat(type)] = type,
                                         _a['col--last'] = $columnIndex === cols.length - 1,
                                         _a['col--fixed'] = column.fixed,
                                         _a['col--group'] = isColGroup,

package/es/header/style.css

@@ -1,4 +1,3 @@
-@charset "UTF-8";
 /*font*/
 /*size*/
 /*icon*/
@@ -24,97 +23,3 @@
 /*select*/
 /*switch*/
 /*pulldown*/
-.vxe-table {
-  /*排序*/ }
-  .vxe-table .vxe-table--header-wrapper {
-    color: #606266; }
-    .vxe-table .vxe-table--header-wrapper .vxe-table--header-border-line {
-      position: absolute;
-      left: 0;
-      bottom: 0;
-      height: 0;
-      border-bottom: 1px solid #e8eaec; }
-  .vxe-table .vxe-cell--sort {
-    width: 1.5em;
-    height: 1.35em;
-    vertical-align: middle;
-    text-align: center;
-    display: inline-block;
-    position: relative; }
-  .vxe-table .vxe-sort--asc-btn,
-  .vxe-table .vxe-sort--desc-btn {
-    position: absolute;
-    left: 0.35em;
-    color: #c0c4cc;
-    width: 1em;
-    text-align: center;
-    cursor: pointer; }
-    .vxe-table .vxe-sort--asc-btn:hover,
-    .vxe-table .vxe-sort--desc-btn:hover {
-      color: #606266; }
-    .vxe-table .vxe-sort--asc-btn.sort--active,
-    .vxe-table .vxe-sort--desc-btn.sort--active {
-      color: #409eff; }
-  .vxe-table .vxe-sort--asc-btn {
-    top: -0.15em; }
-  .vxe-table .vxe-sort--desc-btn {
-    bottom: -0.15em; }
-
-.vxe-header--column {
-  position: relative;
-  font-weight: 700; }
-  .vxe-header--column.col--ellipsis > .vxe-cell {
-    display: flex;
-    align-items: center; }
-    .vxe-header--column.col--ellipsis > .vxe-cell .vxe-cell--title {
-      overflow: hidden;
-      text-overflow: ellipsis;
-      white-space: nowrap; }
-    .vxe-header--column.col--ellipsis > .vxe-cell > i:not(.vxe-cell--title),
-    .vxe-header--column.col--ellipsis > .vxe-cell > span:not(.vxe-cell--title) {
-      flex-shrink: 0; }
-  .vxe-header--column .vxe-cell--required-icon {
-    display: inline-block;
-    color: #f56c6c;
-    width: 0.8em;
-    height: 1em;
-    line-height: 1em;
-    font-family: Verdana, Arial, Tahoma;
-    font-weight: normal;
-    position: relative; }
-    .vxe-header--column .vxe-cell--required-icon:before {
-      content: "*";
-      position: absolute;
-      left: 0;
-      top: 0.2em; }
-  .vxe-header--column .vxe-cell--required-icon {
-    margin-right: 0.1em; }
-  .vxe-header--column .vxe-cell--edit-icon,
-  .vxe-header--column .vxe-cell-help-icon {
-    margin-right: 0.2em; }
-  .vxe-header--column .vxe-cell-help-icon {
-    cursor: help; }
-  .vxe-header--column .vxe-resizable {
-    position: absolute;
-    right: -7px;
-    bottom: 0;
-    width: 14px;
-    height: 100%;
-    text-align: center;
-    z-index: 1;
-    cursor: col-resize; }
-    .vxe-header--column .vxe-resizable.is--line:before, .vxe-header--column .vxe-resizable.is--line:after {
-      content: "";
-      display: inline-block;
-      vertical-align: middle; }
-    .vxe-header--column .vxe-resizable.is--line:before {
-      width: 1px;
-      height: 50%;
-      background-color: #D9DDDF; }
-    .vxe-header--column .vxe-resizable.is--line:after {
-      width: 0;
-      height: 100%; }
-
-.vxe-table--fixed-right-wrapper .vxe-header--column .vxe-resizable {
-  right: auto;
-  left: -7px; }