vxe-table 4.3.0-beta.7 → 4.3.1

package/es/table/src/body.js

@@ -44,7 +44,7 @@ export default defineComponent({
         var xesize = inject('xesize', null);
         var xID = $xetable.xID, tableProps = $xetable.props, tableContext = $xetable.context, tableReactData = $xetable.reactData, tableInternalData = $xetable.internalData;
         var _a = $xetable.getRefMaps(), refTableHeader = _a.refTableHeader, refTableBody = _a.refTableBody, refTableFooter = _a.refTableFooter, refTableLeftBody = _a.refTableLeftBody, refTableRightBody = _a.refTableRightBody, refValidTooltip = _a.refValidTooltip;
-        var _b = $xetable.getComputeMaps(), computeEditOpts = _b.computeEditOpts, computeMouseOpts = _b.computeMouseOpts, computeSYOpts = _b.computeSYOpts, computeEmptyOpts = _b.computeEmptyOpts, computeKeyboardOpts = _b.computeKeyboardOpts, computeTooltipOpts = _b.computeTooltipOpts, computeRadioOpts = _b.computeRadioOpts, computeTreeOpts = _b.computeTreeOpts, computeCheckboxOpts = _b.computeCheckboxOpts, computeValidOpts = _b.computeValidOpts, computeRowOpts = _b.computeRowOpts, computeColumnOpts = _b.computeColumnOpts;
+        var _b = $xetable.getComputeMaps(), computeEditOpts = _b.computeEditOpts, computeMouseOpts = _b.computeMouseOpts, computeSYOpts = _b.computeSYOpts, computeEmptyOpts = _b.computeEmptyOpts, computeKeyboardOpts = _b.computeKeyboardOpts, computeTooltipOpts = _b.computeTooltipOpts, computeRadioOpts = _b.computeRadioOpts, computeExpandOpts = _b.computeExpandOpts, computeTreeOpts = _b.computeTreeOpts, computeCheckboxOpts = _b.computeCheckboxOpts, computeValidOpts = _b.computeValidOpts, computeRowOpts = _b.computeRowOpts, computeColumnOpts = _b.computeColumnOpts;
         var refElem = ref();
         var refBodyTable = ref();
         var refBodyColgroup = ref();
@@ -384,25 +384,32 @@ export default defineComponent({
                 })));
                 // 如果行被展开了
                 if (isExpandRow) {
-                    var cellStyle = void 0;
+                    var expandOpts = computeExpandOpts.value;
+                    var expandHeight = expandOpts.height;
+                    var cellStyle = {};
+                    if (expandHeight) {
+                        cellStyle.height = "".concat(expandHeight, "px");
+                    }
                     if (treeConfig) {
-                        cellStyle = {
-                            paddingLeft: "".concat((rowLevel * treeOpts.indent) + 30, "px")
-                        };
+                        cellStyle.paddingLeft = "".concat((rowLevel * treeOpts.indent) + 30, "px");
                     }
                     var showOverflow = expandColumn.showOverflow;
                     var hasEllipsis = (XEUtils.isUndefined(showOverflow) || XEUtils.isNull(showOverflow)) ? allColumnOverflow : showOverflow;
                     var expandParams = { $table: $xetable, seq: seq, column: expandColumn, fixed: fixedType, type: renderType, level: rowLevel, row: row, rowIndex: rowIndex, $rowIndex: $rowIndex, _rowIndex: _rowIndex };
                     rows.push(h('tr', __assign({ class: 'vxe-body--expanded-row', key: "expand_".concat(rowid), style: rowStyle ? (XEUtils.isFunction(rowStyle) ? rowStyle(expandParams) : rowStyle) : null }, trOn), [
                         h('td', {
-                            class: ['vxe-body--expanded-column', {
-                                    'fixed--hidden': fixedType && !hasFixedColumn,
-                                    'col--ellipsis': hasEllipsis
-                                }],
+                            class: {
+                                'vxe-body--expanded-column': 1,
+                                'fixed--hidden': fixedType && !hasFixedColumn,
+                                'col--ellipsis': hasEllipsis
+                            },
                             colspan: tableColumn.length
                         }, [
                             h('div', {
-                                class: 'vxe-body--expanded-cell',
+                                class: {
+                                    'vxe-body--expanded-cell': 1,
+                                    'is--ellipsis': expandHeight
+                                },
                                 style: cellStyle
                             }, [
                                 expandColumn.renderData(expandParams)

package/es/table/src/props.js

@@ -142,6 +142,8 @@ export default {
     validConfig: Object,
     // 校验规则配置项
     editRules: Object,
+    // 加载中配置项
+    loadingConfig: Object,
     // 空内容渲染配置项
     emptyRender: Object,
     // 自定义列配置项

package/es/table/src/table.js

@@ -452,6 +452,9 @@ export default defineComponent({
         var computeEmptyOpts = computed(function () {
             return Object.assign({}, GlobalConfig.table.emptyRender, props.emptyRender);
         });
+        var computeLoadingOpts = computed(function () {
+            return Object.assign({}, GlobalConfig.table.loadingConfig, props.loadingConfig);
+        });
         var computeCellOffsetWidth = computed(function () {
             return props.border ? Math.max(2, Math.ceil(reactData.scrollbarWidth / reactData.tableColumn.length)) : 1;
         });
@@ -539,6 +542,7 @@ export default defineComponent({
             computeExpandOpts: computeExpandOpts,
             computeTreeOpts: computeTreeOpts,
             computeEmptyOpts: computeEmptyOpts,
+            computeLoadingOpts: computeLoadingOpts,
             computeCustomOpts: computeCustomOpts,
             computeIsAllCheckboxDisabled: computeIsAllCheckboxDisabled
         };
@@ -5949,6 +5953,7 @@ export default defineComponent({
             var mouseOpts = computeMouseOpts.value;
             var validOpts = computeValidOpts.value;
             var validTipOpts = computeValidTipOpts.value;
+            var loadingOpts = computeLoadingOpts.value;
             var isMenu = computeIsMenu.value;
             return h('div', {
                 ref: refElem,
@@ -6061,7 +6066,9 @@ export default defineComponent({
                  */
                 h(VxeLoading, {
                     class: 'vxe-table--loading',
-                    loading: loading
+                    modelValue: loading,
+                    icon: loadingOpts.icon,
+                    text: loadingOpts.text
                 }),
                 /**
                  * 筛选

package/es/table/style.css

@@ -25,7 +25,7 @@
 /*switch*/
 /*pulldown*/
 .vxe-table--render-default .vxe-cell--checkbox .vxe-checkbox--icon {
-  font-size: 1.4em; }
+  font-size: 1.34em; }
 
 .vxe-table--render-default .vxe-cell--checkbox .vxe-checkbox--icon {
   color: #dcdfe6;
@@ -900,6 +900,7 @@
   .vxe-table--render-default .vxe-table--expanded {
     cursor: pointer; }
     .vxe-table--render-default .vxe-table--expanded .vxe-table--expand-btn {
+      display: inline-block;
       width: 1em;
       height: 1em;
       text-align: center;
@@ -921,6 +922,8 @@
   .vxe-table--render-default .vxe-body--expanded-cell {
     position: relative;
     z-index: 1; }
+    .vxe-table--render-default .vxe-body--expanded-cell.is--ellipsis {
+      overflow: auto; }
   .vxe-table--render-default .vxe-header--column.col--ellipsis > .vxe-cell,
   .vxe-table--render-default .vxe-body--column.col--ellipsis > .vxe-cell,
   .vxe-table--render-default .vxe-footer--column.col--ellipsis > .vxe-cell {

package/es/toolbar/src/toolbar.js

@@ -241,11 +241,11 @@ export default defineComponent({
             var isRefresh = reactData.isRefresh;
             var refreshOpts = computeRefreshOpts.value;
             if (!isRefresh) {
-                var query = refreshOpts.query;
-                if (query) {
+                var queryMethod = refreshOpts.queryMethod || refreshOpts.query;
+                if (queryMethod) {
                     reactData.isRefresh = true;
                     try {
-                        Promise.resolve(query({})).catch(function (e) { return e; }).then(function () {
+                        Promise.resolve(queryMethod({})).catch(function (e) { return e; }).then(function () {
                             reactData.isRefresh = false;
                         });
                     }
@@ -255,7 +255,7 @@ export default defineComponent({
                 }
                 else if ($xegrid) {
                     reactData.isRefresh = true;
-                    $xegrid.commitProxy('reload').catch(function (e) { return e; }).then(function () {
+                    $xegrid.commitProxy(refreshOpts.code || 'reload').catch(function (e) { return e; }).then(function () {
                         reactData.isRefresh = false;
                     });
                 }
@@ -549,8 +549,9 @@ export default defineComponent({
         nextTick(function () {
             var refresh = props.refresh;
             var refreshOpts = computeRefreshOpts.value;
-            if (refresh && !$xegrid && !refreshOpts.query) {
-                warnLog('vxe.error.notFunc', ['query']);
+            var queryMethod = refreshOpts.queryMethod || refreshOpts.query;
+            if (refresh && !$xegrid && !queryMethod) {
+                warnLog('vxe.error.notFunc', ['queryMethod']);
             }
         });
         var renderVN = function () {

package/es/toolbar/style.css

@@ -24,7 +24,7 @@
 /*switch*/
 /*pulldown*/
 .vxe-custom--option .vxe-checkbox--icon {
-  font-size: 1.4em; }
+  font-size: 1.34em; }
 
 .vxe-custom--option .vxe-checkbox--icon {
   color: #dcdfe6;
@@ -88,7 +88,7 @@
        -moz-user-select: none;
         -ms-user-select: none;
             user-select: none;
-    background-color: rgba(0, 0, 0, 0.2); }
+    background-color: rgba(255, 255, 255, 0.5); }
   .vxe-toolbar .vxe-buttons--wrapper {
     flex-grow: 1; }
     .vxe-toolbar .vxe-buttons--wrapper > .vxe-button + .vxe-button--item,

package/es/tools/log.js

@@ -1,6 +1,6 @@
 import GlobalConfig from '../v-x-e-table/src/conf';
 export function getLog(message, params) {
-    return "[vxe-table v".concat("4.3.0", "] ").concat(GlobalConfig.i18n(message, params));
+    return "[vxe-table v".concat("4.3.1", "] ").concat(GlobalConfig.i18n(message, params));
 }
 function outLog(type) {
     return function (message, params) {

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.3.0",
+    version: "4.3.1",
     setup: setup,
     interceptor: interceptor,
     renderer: renderer,