vxe-table 4.20.8 → 4.20.10

package/es/table/module/custom/panel.js

@@ -1219,7 +1219,7 @@ export default defineVxeComponent({
                         }, VxeUIRadioGroupComponent
                             ? [
                                 h(VxeUIRadioGroupComponent, {
-                                    modelValue: column.renderAlign || '',
+                                    modelValue: column.renderAlign || 'left',
                                     type: 'button',
                                     strict: false,
                                     disabled: isHidden,
@@ -1240,7 +1240,7 @@ export default defineVxeComponent({
                             : (VxeUIRadioGroupComponent
                                 ? [
                                     h(VxeUIRadioGroupComponent, {
-                                        modelValue: column.renderHeaderAlign || '',
+                                        modelValue: column.renderHeaderAlign || 'left',
                                         type: 'button',
                                         strict: false,
                                         disabled: isHidden,
@@ -1261,7 +1261,7 @@ export default defineVxeComponent({
                             : (VxeUIRadioGroupComponent
                                 ? [
                                     h(VxeUIRadioGroupComponent, {
-                                        modelValue: column.renderFooterAlign || '',
+                                        modelValue: column.renderFooterAlign || 'left',
                                         type: 'button',
                                         strict: false,
                                         disabled: isHidden,

package/es/table/module/export/hook.js

@@ -1285,7 +1285,7 @@ hooks.add('tableExportModule', {
                 const isColGroup = column.children && column.children.length > 0;
                 let isChecked = false;
                 const isExtraChecked = extraFdMaps[column.field];
-                if (columns && columns.length) {
+                if (columns) {
                     isChecked = handleFilterColumns(defOpts, column, columns);
                 }
                 else if (excludeFields || includeFields) {
@@ -1438,7 +1438,7 @@ hooks.add('tableExportModule', {
                 }
                 let isCustomCol = false;
                 let customCols = [];
-                if (columns && columns.length) {
+                if (columns) {
                     isCustomCol = true;
                     customCols = XEUtils.searchTree(columns, () => true, { children: 'children', mapChildren: 'childNodes', original: true });
                 }
@@ -1447,7 +1447,7 @@ hooks.add('tableExportModule', {
                         const isColGroup = column.children && column.children.length > 0;
                         let isChecked = false;
                         const isExtraChecked = extraFdMaps[column.field];
-                        if (columns && columns.length) {
+                        if (columns) {
                             isChecked = handleFilterColumns(opts, column, columns);
                         }
                         else if (excludeFields || includeFields) {
@@ -1588,15 +1588,17 @@ hooks.add('tableExportModule', {
                             const { computeProxyOpts } = $xeGGWrapper.getComputeMaps();
                             const proxyOpts = computeProxyOpts.value;
                             const { sortData } = gridReactData;
-                            const { beforeQueryAll, afterQueryAll, ajax = {} } = proxyOpts;
+                            const { beforeQueryAll: oldBeforeQueryAll, afterQueryAll: oldAfterQueryAll, ajax = {} } = proxyOpts;
                             const resConfigs = proxyOpts.response || proxyOpts.props || {};
-                            const ajaxMethods = ajax.queryAll;
-                            const queryAllSuccessMethods = ajax.queryAllSuccess;
-                            const queryAllErrorMethods = ajax.queryAllError;
-                            if (!ajaxMethods) {
+                            const beforeQueryAllMethod = ajax.beforeQueryAll;
+                            const queryAllMethod = ajax.queryAll;
+                            const afterQueryAllMethod = ajax.afterQueryAll;
+                            const queryAllSuccessMethod = ajax.queryAllSuccess;
+                            const queryAllErrorMethod = ajax.queryAllError;
+                            if (!queryAllMethod) {
                                 errLog('vxe.error.notFunc', ['proxy-config.ajax.queryAll']);
                             }
-                            if (ajaxMethods) {
+                            if (queryAllMethod) {
                                 const params = {
                                     $table: $xeTable,
                                     $grid: $xeGrid,
@@ -1607,37 +1609,55 @@ hooks.add('tableExportModule', {
                                     form: gridReactData.formData,
                                     options: handleOptions
                                 };
-                                return Promise.resolve((beforeQueryAll || ajaxMethods)(params))
-                                    .then(rest => {
-                                    const listProp = resConfigs.list;
-                                    let tdData = [];
-                                    if (listProp) {
-                                        if (XEUtils.isFunction(listProp)) {
-                                            tdData = listProp({ data: rest, $table: $xeTable, $grid: $xeGrid, $gantt: $xeGantt });
+                                const handleQueryAll = () => {
+                                    return Promise.resolve((oldBeforeQueryAll || queryAllMethod)(params))
+                                        .then((rest) => {
+                                        if (afterQueryAllMethod) {
+                                            afterQueryAllMethod(Object.assign(Object.assign({}, params), { response: rest, status: 'success' }));
                                         }
                                         else {
-                                            tdData = XEUtils.isArray(rest) ? rest : XEUtils.get(rest, listProp);
+                                            const listProp = resConfigs.list;
+                                            let tdData = [];
+                                            if (listProp) {
+                                                if (XEUtils.isFunction(listProp)) {
+                                                    tdData = listProp({ data: rest, $table: $xeTable, $grid: $xeGrid, $gantt: $xeGantt });
+                                                }
+                                                else {
+                                                    tdData = XEUtils.isArray(rest) ? rest : XEUtils.get(rest, listProp);
+                                                }
+                                            }
+                                            else {
+                                                if (XEUtils.isArray(rest)) {
+                                                    tdData = rest;
+                                                }
+                                            }
+                                            handleOptions.data = tdData;
+                                            if (oldAfterQueryAll) {
+                                                oldAfterQueryAll(Object.assign(Object.assign({}, params), { response: rest }));
+                                            }
                                         }
-                                    }
-                                    else {
-                                        if (XEUtils.isArray(rest)) {
-                                            tdData = rest;
+                                        if (queryAllSuccessMethod) {
+                                            queryAllSuccessMethod(Object.assign(Object.assign({}, params), { response: rest }));
                                         }
-                                    }
-                                    handleOptions.data = tdData;
-                                    if (afterQueryAll) {
-                                        afterQueryAll(params);
-                                    }
-                                    if (queryAllSuccessMethods) {
-                                        queryAllSuccessMethods(Object.assign(Object.assign({}, params), { response: rest }));
-                                    }
-                                    return handleExport(handleOptions);
-                                })
-                                    .catch((rest) => {
-                                    if (queryAllErrorMethods) {
-                                        queryAllErrorMethods(Object.assign(Object.assign({}, params), { response: rest }));
-                                    }
-                                });
+                                        return handleExport(handleOptions);
+                                    })
+                                        .catch((rest) => {
+                                        if (afterQueryAllMethod) {
+                                            afterQueryAllMethod(Object.assign(Object.assign({}, params), { response: rest, status: 'error' }));
+                                        }
+                                        if (queryAllErrorMethod) {
+                                            queryAllErrorMethod(Object.assign(Object.assign({}, params), { response: rest }));
+                                        }
+                                    });
+                                };
+                                if (beforeQueryAllMethod) {
+                                    return Promise.resolve(beforeQueryAllMethod(params)).then(status => {
+                                        if (status !== false) {
+                                            return handleQueryAll();
+                                        }
+                                    });
+                                }
+                                return handleQueryAll();
                             }
                         }
                     }

package/es/table/render/index.js

@@ -844,7 +844,12 @@ renderer.mixin({
     },
     FormatNumberInput: {
         renderTableDefault: handleNumberCell,
-        tableFilterDefaultMethod: handleInputFilterMethod,
+        tableFilterDefaultMethod({ option, row, column }) {
+            const { data } = option;
+            const cellValue = XEUtils.get(row, column.field);
+            /* eslint-disable eqeqeq */
+            return cellValue == data;
+        },
         tableExportMethod(params) {
             const { row, column } = params;
             const cellValue = XEUtils.get(row, column.field);
@@ -896,7 +901,12 @@ renderer.mixin({
         createTableFilterOptions: defaultFilterOptions,
         renderTableFilter: defaultFilterRender,
         renderTableFloatingFilter: defaultFloatingFilterRender,
-        tableFilterDefaultMethod: handleInputFilterMethod,
+        tableFilterDefaultMethod({ option, row, column }) {
+            const { data } = option;
+            const cellValue = XEUtils.get(row, column.field);
+            /* eslint-disable eqeqeq */
+            return cellValue == data;
+        },
         tableExportMethod(params) {
             const { row, column } = params;
             const cellValue = XEUtils.get(row, column.field);

package/es/table/src/table.js

@@ -3438,7 +3438,7 @@ export default defineVxeComponent({
                 return;
             }
             internalData.rsePending = true;
-            handleLazyRecalculate(false, true, true, {
+            handleLazyRecalculate(true, true, true, {
                 minRunDelay: 200
             }).then(() => {
                 internalData.rsePending = false;
@@ -11429,6 +11429,7 @@ export default defineVxeComponent({
                     status: false
                 };
                 if (!(el && prevDragRow && dragRow)) {
+                    handleRowDragEndClearStatus();
                     return Promise.resolve(errRest);
                 }
                 // 判断是否有拖动
@@ -11532,6 +11533,9 @@ export default defineVxeComponent({
                         }
                     }
                     const isDragToChildFlag = isSelfToChildDrag && dragToChildMethod ? dragToChildMethod(dragParams) : prevDragToChild;
+                    if (dEndMethod) {
+                        handleRowDragEndClearStatus();
+                    }
                     return Promise.resolve(dEndMethod ? dEndMethod(dragParams) : true).then((status) => {
                         if (!status) {
                             return errRest;
@@ -11826,6 +11830,9 @@ export default defineVxeComponent({
                         const errRest = {
                             status: false
                         };
+                        if (dragEndMethod) {
+                            handleRowDragEndClearStatus();
+                        }
                         Promise.resolve(dragEndMethod ? dragEndMethod(dragParams) : true).then((status) => {
                             if (!status) {
                                 if ($oldTable) {

package/es/table/style.css

@@ -1832,6 +1832,25 @@
   display: block;
 }
 
+.vxe-table {
+  --vxe-ui-table-current-font-size: var(--vxe-ui-font-size-default);
+}
+.vxe-table.size--xlarge {
+  --vxe-ui-table-current-font-size: var(--vxe-ui-font-size-xlarge);
+}
+.vxe-table.size--large {
+  --vxe-ui-table-current-font-size: var(--vxe-ui-font-size-large);
+}
+.vxe-table.size--medium {
+  --vxe-ui-table-current-font-size: var(--vxe-ui-font-size-medium);
+}
+.vxe-table.size--small {
+  --vxe-ui-table-current-font-size: var(--vxe-ui-font-size-small);
+}
+.vxe-table.size--mini {
+  --vxe-ui-table-current-font-size: var(--vxe-ui-font-size-mini);
+}
+
 .vxe-table-slots,
 .vxe-table--file-form {
   display: none;
@@ -2961,7 +2980,7 @@
 /*table*/
 .vxe-table--render-default {
   position: relative;
-  font-size: var(--vxe-ui-font-size-default);
+  font-size: var(--vxe-ui-table-current-font-size);
   color: var(--vxe-ui-font-color);
   font-family: var(--vxe-ui-font-family);
   direction: ltr;
@@ -3247,9 +3266,6 @@
 .vxe-table--render-default.border--none .vxe-table--border-line {
   display: none;
 }
-.vxe-table--render-default.size--medium {
-  font-size: var(--vxe-ui-font-size-medium);
-}
 .vxe-table--render-default.size--medium .vxe-table--empty-placeholder,
 .vxe-table--render-default.size--medium .vxe-table--empty-block {
   min-height: var(--vxe-ui-table-row-height-medium);
@@ -3275,9 +3291,6 @@
 .vxe-table--render-default.size--medium .vxe-cell--valid-error-tip {
   padding: 0 var(--vxe-ui-table-cell-padding-medium);
 }
-.vxe-table--render-default.size--small {
-  font-size: var(--vxe-ui-font-size-small);
-}
 .vxe-table--render-default.size--small .vxe-table--empty-placeholder,
 .vxe-table--render-default.size--small .vxe-table--empty-block {
   min-height: var(--vxe-ui-table-row-height-small);
@@ -3303,9 +3316,6 @@
 .vxe-table--render-default.size--small .vxe-cell--valid-error-tip {
   padding: 0 var(--vxe-ui-table-cell-padding-small);
 }
-.vxe-table--render-default.size--mini {
-  font-size: var(--vxe-ui-font-size-mini);
-}
 .vxe-table--render-default.size--mini .vxe-table--empty-placeholder,
 .vxe-table--render-default.size--mini .vxe-table--empty-block {
   min-height: var(--vxe-ui-table-row-height-mini);
@@ -3847,7 +3857,7 @@
   width: 100%;
   position: absolute;
   left: 50%;
-  font-size: var(--vxe-ui-table-validate-error-font-size);
+  font-size: var(--vxe-ui-table-validate-error-font-size, var(--vxe-ui-table-current-font-size));
   line-height: 1em;
   transform: translate(-50%, -2px);
   text-align: left;
@@ -3862,7 +3872,7 @@
   pointer-events: auto;
 }
 .vxe-table--render-default .vxe-body--column .vxe-cell--valid-error-theme-beautify {
-  padding: 0.2em 0.6em 0.25em 0.6em;
+  padding: var(--vxe-ui-table-validate-error-padding, 0.2em 0.6em);
   color: #fff;
   background-color: var(--vxe-ui-table-validate-error-color);
 }