vxe-table 3.22.9 → 3.22.11

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

@@ -1433,7 +1433,7 @@ export default {
                             ? [
                                 h(VxeUIRadioGroupComponent, {
                                     props: {
-                                        value: column.renderAlign || '',
+                                        value: column.renderAlign || 'left',
                                         type: 'button',
                                         strict: false,
                                         disabled: isHidden,
@@ -1458,7 +1458,7 @@ export default {
                                 ? [
                                     h(VxeUIRadioGroupComponent, {
                                         props: {
-                                            value: column.renderHeaderAlign || '',
+                                            value: column.renderHeaderAlign || 'left',
                                             type: 'button',
                                             strict: false,
                                             disabled: isHidden,
@@ -1483,7 +1483,7 @@ export default {
                                 ? [
                                     h(VxeUIRadioGroupComponent, {
                                         props: {
-                                            value: column.renderFooterAlign || '',
+                                            value: column.renderFooterAlign || 'left',
                                             type: 'button',
                                             strict: false,
                                             disabled: isHidden,

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

@@ -1607,15 +1607,17 @@ export default {
                         const gridReactData = $xeGGWrapper.reactData;
                         const proxyOpts = $xeGGWrapper.computeProxyOpts;
                         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,
@@ -1626,37 +1628,55 @@ export default {
                                 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($xeTable, handleOptions);
-                            })
-                                .catch((rest) => {
-                                if (queryAllErrorMethods) {
-                                    queryAllErrorMethods(Object.assign(Object.assign({}, params), { response: rest }));
-                                }
-                            });
+                                    return handleExport($xeTable, 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

@@ -909,7 +909,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);
@@ -961,7 +966,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/methods.js

@@ -5512,6 +5512,18 @@ const tableMethods = {
         }
         const { editConfig } = props;
         const { formatter, editRender, cellRender } = column;
+        let etOpSize = null;
+        let etOgSize = null;
+        let clOpSize = null;
+        let clOgSize = null;
+        if (editRender) {
+            etOpSize = editRender.options ? editRender.options.length : 0;
+            etOgSize = editRender.optionGroups ? editRender.optionGroups.length : 0;
+        }
+        if (cellRender) {
+            clOpSize = cellRender.options ? cellRender.options.length : 0;
+            clOgSize = cellRender.optionGroups ? cellRender.optionGroups.length : 0;
+        }
         // formatter > tableCellFormatter
         const renderOpts = formatter ? null : (editConfig && isEnableConf(editRender) ? editRender : (isEnableConf(cellRender) ? cellRender : null));
         const compConf = renderOpts ? renderer.get(renderOpts.name) : null;
@@ -5530,7 +5542,8 @@ const tableMethods = {
                     formatData = fullAllDataRowIdData[rowid].formatData = {};
                 }
                 if (rowRest && formatData[colid]) {
-                    if (formatData[colid].value === cellValue) {
+                    const ftValue = formatData[colid].value;
+                    if (ftValue && ftValue[0] === cellValue && ftValue[1] === etOpSize && ftValue[2] === etOgSize && ftValue[3] === clOpSize && ftValue[4] === clOgSize) {
                         return formatData[colid].label;
                     }
                 }
@@ -5562,7 +5575,8 @@ const tableMethods = {
                 cellLabel = tcFormatter(renderOpts, formatParams);
             }
             if (formatData) {
-                formatData[colid] = { value: cellValue, label: cellLabel };
+                const ftValue = [cellValue, etOpSize, etOgSize, clOpSize, clOgSize];
+                formatData[colid] = { value: ftValue, label: cellLabel };
             }
         }
         return cellLabel;

package/es/ui/index.js

@@ -1,6 +1,6 @@
 import { VxeUI } from '@vxe-ui/core';
 import { getFuncText } from './src/utils';
-export const version = "3.22.9";
+export const version = "3.22.11";
 VxeUI.version = version;
 VxeUI.tableVersion = version;
 VxeUI.setConfig({

package/es/ui/src/log.js

@@ -1,6 +1,6 @@
 import { VxeUI } from '@vxe-ui/core';
 const { log } = VxeUI;
-const tableVersion = `table v${"3.22.9"}`;
+const tableVersion = `table v${"3.22.11"}`;
 export function createComponentLog(name) {
     const uiVersion = VxeUI.uiVersion ? `ui v${VxeUI.uiVersion}` : '';
     const ganttVersion = VxeUI.ganttVersion ? `gantt v${VxeUI.ganttVersion}` : '';