vxe-table 3.19.46 → 3.19.47

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

@@ -1338,7 +1338,21 @@ export default {
                             return Promise.resolve((beforeQueryAll || ajaxMethods)(params))
                                 .then(rest => {
                                 const listProp = resConfigs.list;
-                                handleOptions.data = (listProp ? (XEUtils.isFunction(listProp) ? listProp({ data: rest, $table: $xeTable, $grid: $xeGrid, $gantt: $xeGantt }) : XEUtils.get(rest, listProp)) : rest) || [];
+                                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 (afterQueryAll) {
                                     afterQueryAll(params);
                                 }

package/es/ui/index.js

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

package/es/ui/src/log.js

@@ -1,5 +1,5 @@
 import { VxeUI } from '@vxe-ui/core';
 const { log } = VxeUI;
-const version = `table v${"3.19.46"}`;
+const version = `table v${"3.19.47"}`;
 export const warnLog = log.create('warn', version);
 export const errLog = log.create('error', version);

package/lib/index.umd.js

@@ -3237,7 +3237,7 @@ function getClass(property, params) {
 ;// ./packages/ui/index.ts
 
 
-const version = "3.19.46";
+const version = "3.19.47";
 core_.VxeUI.version = version;
 core_.VxeUI.tableVersion = version;
 core_.VxeUI.setConfig({
@@ -3962,7 +3962,7 @@ var es_iterator_reduce = __webpack_require__(8237);
 const {
   log: log_log
 } = core_.VxeUI;
-const log_version = `table v${"3.19.46"}`;
+const log_version = `table v${"3.19.47"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// ./packages/table/src/columnInfo.ts
@@ -16633,12 +16633,24 @@ const convertToRows = originColumns => {
               };
               return Promise.resolve((beforeQueryAll || ajaxMethods)(params)).then(rest => {
                 const listProp = resConfigs.list;
-                handleOptions.data = (listProp ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(listProp) ? listProp({
-                  data: rest,
-                  $table: $xeTable,
-                  $grid: $xeGrid,
-                  $gantt: $xeGantt
-                }) : external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(rest, listProp) : rest) || [];
+                let tdData = [];
+                if (listProp) {
+                  if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(listProp)) {
+                    tdData = listProp({
+                      data: rest,
+                      $table: $xeTable,
+                      $grid: $xeGrid,
+                      $gantt: $xeGantt
+                    });
+                  } else {
+                    tdData = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(rest) ? rest : external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(rest, listProp);
+                  }
+                } else {
+                  if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(rest)) {
+                    tdData = rest;
+                  }
+                }
+                handleOptions.data = tdData;
                 if (afterQueryAll) {
                   afterQueryAll(params);
                 }