vxe-table 4.14.0-beta.0 → 4.14.0-beta.1

package/lib/index.umd.js

@@ -3138,7 +3138,7 @@ function eqEmptyValue(cellValue) {
 ;// ./packages/ui/index.ts
 
 
-const version = "4.14.0-beta.0";
+const version = "4.14.0-beta.1";
 core_.VxeUI.version = version;
 core_.VxeUI.tableVersion = version;
 core_.VxeUI.setConfig({
@@ -3390,7 +3390,7 @@ core_.VxeUI.setConfig({
       autoLoad: true,
       showResponseMsg: true,
       showActiveMsg: true,
-      props: {
+      response: {
         list: null,
         result: 'result',
         total: 'page.total',
@@ -3622,7 +3622,7 @@ var esnext_iterator_some = __webpack_require__(7550);
 const {
   log: log_log
 } = core_.VxeUI;
-const log_version = `table v${"4.14.0-beta.0"}`;
+const log_version = `table v${"4.14.0-beta.1"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// ./packages/table/src/columnInfo.ts
@@ -11790,7 +11790,7 @@ if(inited){handleKeyField();reactData.tableData=[];(0,external_commonjs_vue_comm
 //   warnLog('vxe.error.delProp', ['scroll-x', 'virtual-x-config'])
 // }
 // 检查导入导出类型，如果自定义导入导出方法，则不校验类型
-if(importConfig&&importOpts.types&&!importOpts.importMethod&&!external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().includeArrays(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().keys(importOpts._typeMaps),importOpts.types)){warnLog('vxe.error.errProp',[`export-config.types=${importOpts.types.join(',')}`,importOpts.types.filter(type=>external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().includes(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().keys(importOpts._typeMaps),type)).join(',')||external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().keys(importOpts._typeMaps).join(',')]);}if(exportConfig&&exportOpts.types&&!exportOpts.exportMethod&&!external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().includeArrays(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().keys(exportOpts._typeMaps),exportOpts.types)){warnLog('vxe.error.errProp',[`export-config.types=${exportOpts.types.join(',')}`,exportOpts.types.filter(type=>external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().includes(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().keys(exportOpts._typeMaps),type)).join(',')||external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().keys(exportOpts._typeMaps).join(',')]);}if(!props.id){if((props.customConfig?isEnableConf(customOpts):customOpts.enabled)&&customOpts.storage){errLog('vxe.error.reqProp',['id']);}}if(props.treeConfig&&checkboxOpts.range){errLog('vxe.error.noTree',['checkbox-config.range']);}if(rowOpts.height&&!props.showOverflow){warnLog('vxe.error.notProp',['table.show-overflow']);}if(!$xeTable.triggerCellAreaMousedownEvent){if(props.areaConfig){warnLog('vxe.error.notProp',['area-config']);}if(props.clipConfig){warnLog('vxe.error.notProp',['clip-config']);}if(props.fnrConfig){warnLog('vxe.error.notProp',['fnr-config']);}if(mouseOpts.area){errLog('vxe.error.notProp',['mouse-config.area']);return;}}if(!$xeTable.handlePivotTableAggregateData){if(customOpts.allowGroup){errLog('vxe.error.notProp',['custom-config.allowGroup']);return;}if(customOpts.allowValues){errLog('vxe.error.notProp',['custom-config.allowValues']);return;}}if(treeConfig&&rowOpts.drag&&!treeOpts.transform){errLog('vxe.error.notSupportProp',['column-config.drag','tree-config.transform=false','tree-config.transform=true']);}if(props.dragConfig){warnLog('vxe.error.delProp',['drag-config','row-drag-config']);}if(props.rowGroupConfig){warnLog('vxe.error.delProp',['row-group-config','aggregate-config']);}if(aggregateOpts.countFields){warnLog('vxe.error.delProp',['row-group-config.countFields','column.agg-func']);}if(aggregateOpts.aggregateMethod){warnLog('vxe.error.delProp',['row-group-config.aggregateMethod','aggregate-config.countMethod']);}if(props.treeConfig&&treeOpts.children){warnLog('vxe.error.delProp',['tree-config.children','tree-config.childrenField']);}if(props.treeConfig&&treeOpts.line){warnLog('vxe.error.delProp',['tree-config.line','tree-config.showLine']);}if(mouseOpts.area&&mouseOpts.selected){warnLog('vxe.error.errConflicts',['mouse-config.area','mouse-config.selected']);}if(mouseOpts.area&&props.treeConfig&&!treeOpts.transform){errLog('vxe.error.noTree',['mouse-config.area']);}if(props.editConfig&&editOpts.activeMethod){warnLog('vxe.error.delProp',['edit-config.activeMethod','edit-config.beforeEditMethod']);}if(props.treeConfig&&checkboxOpts.isShiftKey){errLog('vxe.error.errConflicts',['tree-config','checkbox-config.isShiftKey']);}if(checkboxOpts.halfField){warnLog('vxe.error.delProp',['checkbox-config.halfField','checkbox-config.indeterminateField']);}if(rowOpts.currentMethod){warnLog('vxe.error.delProp',['row-config.currentMethod','current-row-config.beforeSelectMethod']);}if(columnOpts.currentMethod){warnLog('vxe.error.delProp',['row-config.currentMethod','current-column-config.beforeSelectMethod']);}if((rowOpts.isCurrent||highlightCurrentRow)&&props.keyboardConfig&&keyboardOpts.isArrow&&!external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isBoolean(currentRowOpts.isFollowSelected)){warnLog('vxe.error.notConflictProp',['row-config.isCurrent','current-row-config.isFollowSelected']);}if((columnOpts.isCurrent||highlightCurrentColumn)&&props.keyboardConfig&&keyboardOpts.isArrow&&!external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isBoolean(currentColumnOpts.isFollowSelected)){warnLog('vxe.error.notConflictProp',['column-config.isCurrent','current-column-config.isFollowSelected']);}// 如果不支持虚拟滚动
+if(importConfig&&importOpts.types&&!importOpts.importMethod&&!external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().includeArrays(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().keys(importOpts._typeMaps),importOpts.types)){warnLog('vxe.error.errProp',[`export-config.types=${importOpts.types.join(',')}`,importOpts.types.filter(type=>external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().includes(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().keys(importOpts._typeMaps),type)).join(',')||external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().keys(importOpts._typeMaps).join(',')]);}if(exportConfig&&exportOpts.types&&!exportOpts.exportMethod&&!external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().includeArrays(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().keys(exportOpts._typeMaps),exportOpts.types)){warnLog('vxe.error.errProp',[`export-config.types=${exportOpts.types.join(',')}`,exportOpts.types.filter(type=>external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().includes(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().keys(exportOpts._typeMaps),type)).join(',')||external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().keys(exportOpts._typeMaps).join(',')]);}if(!props.id){if((props.customConfig?isEnableConf(customOpts):customOpts.enabled)&&customOpts.storage){errLog('vxe.error.reqProp',['id']);}}if(props.treeConfig&&checkboxOpts.range){errLog('vxe.error.noTree',['checkbox-config.range']);}if(rowOpts.height&&!props.showOverflow){warnLog('vxe.error.notProp',['table.show-overflow']);}if(!$xeTable.triggerCellAreaMousednEvent){if(props.areaConfig){warnLog('vxe.error.notProp',['area-config']);}if(props.clipConfig){warnLog('vxe.error.notProp',['clip-config']);}if(props.fnrConfig){warnLog('vxe.error.notProp',['fnr-config']);}if(mouseOpts.area){errLog('vxe.error.notProp',['mouse-config.area']);return;}}if(!$xeTable.handlePivotTableAggregateData){if(customOpts.allowGroup){errLog('vxe.error.notProp',['custom-config.allowGroup']);return;}if(customOpts.allowValues){errLog('vxe.error.notProp',['custom-config.allowValues']);return;}}if(treeConfig&&rowOpts.drag&&!treeOpts.transform){errLog('vxe.error.notSupportProp',['column-config.drag','tree-config.transform=false','tree-config.transform=true']);}if(props.dragConfig){warnLog('vxe.error.delProp',['drag-config','row-drag-config']);}if(props.rowGroupConfig){warnLog('vxe.error.delProp',['row-group-config','aggregate-config']);}if(aggregateOpts.countFields){warnLog('vxe.error.delProp',['row-group-config.countFields','column.agg-func']);}if(aggregateOpts.aggregateMethod){warnLog('vxe.error.delProp',['row-group-config.aggregateMethod','aggregate-config.countMethod']);}if(props.treeConfig&&treeOpts.children){warnLog('vxe.error.delProp',['tree-config.children','tree-config.childrenField']);}if(props.treeConfig&&treeOpts.line){warnLog('vxe.error.delProp',['tree-config.line','tree-config.showLine']);}if(mouseOpts.area&&mouseOpts.selected){warnLog('vxe.error.errConflicts',['mouse-config.area','mouse-config.selected']);}if(mouseOpts.area&&props.treeConfig&&!treeOpts.transform){errLog('vxe.error.noTree',['mouse-config.area']);}if(props.editConfig&&editOpts.activeMethod){warnLog('vxe.error.delProp',['edit-config.activeMethod','edit-config.beforeEditMethod']);}if(props.treeConfig&&checkboxOpts.isShiftKey){errLog('vxe.error.errConflicts',['tree-config','checkbox-config.isShiftKey']);}if(checkboxOpts.halfField){warnLog('vxe.error.delProp',['checkbox-config.halfField','checkbox-config.indeterminateField']);}if(rowOpts.currentMethod){warnLog('vxe.error.delProp',['row-config.currentMethod','current-row-config.beforeSelectMethod']);}if(columnOpts.currentMethod){warnLog('vxe.error.delProp',['row-config.currentMethod','current-column-config.beforeSelectMethod']);}if((rowOpts.isCurrent||highlightCurrentRow)&&props.keyboardConfig&&keyboardOpts.isArrow&&!external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isBoolean(currentRowOpts.isFollowSelected)){warnLog('vxe.error.notConflictProp',['row-config.isCurrent','current-row-config.isFollowSelected']);}if((columnOpts.isCurrent||highlightCurrentColumn)&&props.keyboardConfig&&keyboardOpts.isArrow&&!external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isBoolean(currentColumnOpts.isFollowSelected)){warnLog('vxe.error.notConflictProp',['column-config.isCurrent','current-column-config.isFollowSelected']);}// 如果不支持虚拟滚动
 // if (props.spanMethod) {
 //   if (virtualXOpts.enabled) {
 //     warnLog('vxe.error.notConflictProp', ['span-method', 'virtual-x-config.enabled=false'])
@@ -12678,11 +12678,11 @@ const gridComponentEmits = [...emits, 'page-change', 'form-submit', 'form-submit
     });
     const computeIsRespMsg = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.computed)(() => {
       const proxyOpts = computeProxyOpts.value;
-      return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isBoolean(proxyOpts.message) ? proxyOpts.message : proxyOpts.showResponseMsg;
+      return !!(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isBoolean(proxyOpts.message) ? proxyOpts.message : proxyOpts.showResponseMsg);
     });
     const computeIsActiveMsg = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.computed)(() => {
       const proxyOpts = computeProxyOpts.value;
-      return proxyOpts.showActiveMsg;
+      return !!proxyOpts.showActiveMsg;
     });
     const computePagerOpts = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.computed)(() => {
       return Object.assign({}, grid_getConfig().grid.pagerConfig, props.pagerConfig);
@@ -12980,12 +12980,12 @@ const gridComponentEmits = [...emits, 'page-change', 'form-submit', 'form-submit
         reactData.sortData = params.sortList;
         if (proxyConfig && isEnableConf(proxyOpts)) {
           reactData.tablePage.currentPage = 1;
-          gridMethods.commitProxy('query').then(rest => {
-            gridMethods.dispatchEvent('proxy-query', rest, params.$event);
+          $xeGrid.commitProxy('query').then(rest => {
+            $xeGrid.dispatchEvent('proxy-query', rest, params.$event);
           });
         }
       }
-      gridMethods.dispatchEvent('sort-change', params, params.$event);
+      $xeGrid.dispatchEvent('sort-change', params, params.$event);
     };
     const filterChangeEvent = params => {
       const $xeTable = refTable.value;
@@ -13002,12 +13002,12 @@ const gridComponentEmits = [...emits, 'page-change', 'form-submit', 'form-submit
         reactData.filterData = params.filterList;
         if (proxyConfig && isEnableConf(proxyOpts)) {
           reactData.tablePage.currentPage = 1;
-          gridMethods.commitProxy('query').then(rest => {
-            gridMethods.dispatchEvent('proxy-query', rest, params.$event);
+          $xeGrid.commitProxy('query').then(rest => {
+            $xeGrid.dispatchEvent('proxy-query', rest, params.$event);
           });
         }
       }
-      gridMethods.dispatchEvent('filter-change', params, params.$event);
+      $xeGrid.dispatchEvent('filter-change', params, params.$event);
     };
     const submitFormEvent = params => {
       const {
@@ -13018,16 +13018,17 @@ const gridComponentEmits = [...emits, 'page-change', 'form-submit', 'form-submit
         return;
       }
       if (proxyConfig && isEnableConf(proxyOpts)) {
-        gridMethods.commitProxy('reload').then(rest => {
-          gridMethods.dispatchEvent('proxy-query', {
+        $xeGrid.commitProxy('reload').then(rest => {
+          $xeGrid.dispatchEvent('proxy-query', {
             ...rest,
             isReload: true
           }, params.$event);
         });
       }
-      gridMethods.dispatchEvent('form-submit', params, params.$event);
+      $xeGrid.dispatchEvent('form-submit', params, params.$event);
     };
     const resetFormEvent = params => {
+      const $xeTable = refTable.value;
       const {
         proxyConfig
       } = props;
@@ -13035,27 +13036,26 @@ const gridComponentEmits = [...emits, 'page-change', 'form-submit', 'form-submit
         $event
       } = params;
       const proxyOpts = computeProxyOpts.value;
-      const $xeTable = refTable.value;
       if (proxyConfig && isEnableConf(proxyOpts)) {
         $xeTable.clearScroll();
-        gridMethods.commitProxy('reload').then(rest => {
-          gridMethods.dispatchEvent('proxy-query', {
+        $xeGrid.commitProxy('reload').then(rest => {
+          $xeGrid.dispatchEvent('proxy-query', {
             ...rest,
             isReload: true
           }, $event);
         });
       }
-      gridMethods.dispatchEvent('form-reset', params, $event);
+      $xeGrid.dispatchEvent('form-reset', params, $event);
     };
     const submitInvalidEvent = params => {
-      gridMethods.dispatchEvent('form-submit-invalid', params, params.$event);
+      $xeGrid.dispatchEvent('form-submit-invalid', params, params.$event);
     };
     const collapseEvent = params => {
       const {
         $event
       } = params;
-      gridMethods.dispatchEvent('form-toggle-collapse', params, $event);
-      gridMethods.dispatchEvent('form-collapse', params, $event);
+      $xeGrid.dispatchEvent('form-toggle-collapse', params, $event);
+      $xeGrid.dispatchEvent('form-collapse', params, $event);
     };
     const handleZoom = isMax => {
       const {
@@ -13067,8 +13067,8 @@ const gridComponentEmits = [...emits, 'page-change', 'form-submit', 'form-submit
           reactData.tZindex = nextZIndex();
         }
       }
-      return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)().then(() => gridExtendTableMethods.recalculate(true)).then(() => {
-        setTimeout(() => gridExtendTableMethods.recalculate(true), 15);
+      return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)().then(() => $xeGrid.recalculate(true)).then(() => {
+        setTimeout(() => $xeGrid.recalculate(true), 15);
         return reactData.isZMax;
       });
     };
@@ -13231,12 +13231,13 @@ const gridComponentEmits = [...emits, 'page-change', 'form-submit', 'form-submit
      * 渲染表格顶部区域
      */
     const renderTop = () => {
-      if (slots.top) {
+      const topSlot = slots.top;
+      if (topSlot) {
         return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
           ref: refTopWrapper,
           key: 'top',
           class: 'vxe-grid--top-wrapper'
-        }, slots.top({
+        }, topSlot({
           $grid: $xeGrid
         }));
       }
@@ -13409,6 +13410,36 @@ const gridComponentEmits = [...emits, 'page-change', 'form-submit', 'form-submit
       const type = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().camelCase(`on-${name}`);
       tableCompEvents[type] = (...args) => emit(name, ...args);
     });
+    const getDefaultFormData = () => {
+      const formOpts = computeFormOpts.value;
+      if (formOpts.items) {
+        const fData = {};
+        formOpts.items.forEach(item => {
+          const {
+            field,
+            itemRender
+          } = item;
+          if (field) {
+            let itemValue = null;
+            if (itemRender) {
+              const {
+                defaultValue
+              } = itemRender;
+              if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(defaultValue)) {
+                itemValue = defaultValue({
+                  item
+                });
+              } else if (!external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isUndefined(defaultValue)) {
+                itemValue = defaultValue;
+              }
+            }
+            fData[field] = itemValue;
+          }
+        });
+        return fData;
+      }
+      return {};
+    };
     const initProxy = () => {
       const {
         proxyConfig,
@@ -13421,39 +13452,16 @@ const gridComponentEmits = [...emits, 'page-change', 'form-submit', 'form-submit
       const formOpts = computeFormOpts.value;
       if (proxyConfig && isEnableConf(proxyOpts)) {
         if (formConfig && isEnableConf(formOpts) && proxyOpts.form && formOpts.items) {
-          const fData = {};
-          formOpts.items.forEach(item => {
-            const {
-              field,
-              itemRender
-            } = item;
-            if (field) {
-              let itemValue = null;
-              if (itemRender) {
-                const {
-                  defaultValue
-                } = itemRender;
-                if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(defaultValue)) {
-                  itemValue = defaultValue({
-                    item
-                  });
-                } else if (!external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isUndefined(defaultValue)) {
-                  itemValue = defaultValue;
-                }
-              }
-              fData[field] = itemValue;
-            }
-          });
-          reactData.formData = fData;
+          reactData.formData = getDefaultFormData();
         }
         if (!proxyInited) {
           reactData.proxyInited = true;
           if (proxyOpts.autoLoad !== false) {
-            (0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)().then(() => gridMethods.commitProxy('_init')).then(rest => {
+            (0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)().then(() => gridMethods.commitProxy('initial')).then(rest => {
               gridMethods.dispatchEvent('proxy-query', {
                 ...rest,
                 isInited: true
-              }, new Event('init'));
+              }, new Event('initial'));
             });
           }
         }
@@ -13463,7 +13471,7 @@ const gridComponentEmits = [...emits, 'page-change', 'form-submit', 'form-submit
       const zoomOpts = computeZoomOpts.value;
       const isEsc = grid_globalEvents.hasKey(evnt, grid_GLOBAL_EVENT_KEYS.ESCAPE);
       if (isEsc && reactData.isZMax && zoomOpts.escRestore !== false) {
-        gridPrivateMethods.triggerZoomEvent(evnt);
+        $xeGrid.triggerZoomEvent(evnt);
       }
     };
     const dispatchEvent = (type, params, evnt) => {
@@ -13482,6 +13490,7 @@ const gridComponentEmits = [...emits, 'page-change', 'form-submit', 'form-submit
        */
       commitProxy(proxyTarget, ...args) {
         const {
+          proxyConfig,
           toolbarConfig,
           pagerConfig,
           editRules,
@@ -13506,7 +13515,7 @@ const gridComponentEmits = [...emits, 'page-change', 'form-submit', 'form-submit
         } = proxyOpts;
         const resConfigs = proxyOpts.response || proxyOpts.props || {};
         const $xeTable = refTable.value;
-        const formData = getFormData();
+        let formData = getFormData();
         let button = null;
         let code = null;
         if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isString(proxyTarget)) {
@@ -13555,7 +13564,7 @@ const gridComponentEmits = [...emits, 'page-change', 'form-submit', 'form-submit
             break;
           case 'reset_custom':
             return $xeTable.resetCustom(true);
-          case '_init':
+          case 'initial':
           case 'reload':
           case 'query':
             {
@@ -13563,7 +13572,7 @@ const gridComponentEmits = [...emits, 'page-change', 'form-submit', 'form-submit
               const querySuccessMethods = ajax.querySuccess;
               const queryErrorMethods = ajax.queryError;
               if (ajaxMethods) {
-                const isInited = code === '_init';
+                const isInited = code === 'initial';
                 const isReload = code === 'reload';
                 if (!isInited && reactData.tableLoading) {
                   return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)();
@@ -13573,6 +13582,7 @@ const gridComponentEmits = [...emits, 'page-change', 'form-submit', 'form-submit
                 let pageParams = {};
                 if (pagerConfig) {
                   if (isInited || isReload) {
+                    // 重置分页
                     tablePage.currentPage = 1;
                   }
                   if (isEnableConf(pagerOpts)) {
@@ -13582,28 +13592,51 @@ const gridComponentEmits = [...emits, 'page-change', 'form-submit', 'form-submit
                   }
                 }
                 if (isInited) {
-                  let defaultSort = null;
+                  // 重置代理表单数据
+                  if (proxyConfig && isEnableConf(proxyOpts) && proxyOpts.form) {
+                    formData = getDefaultFormData();
+                    reactData.formData = formData;
+                  }
                   if ($xeTable) {
+                    const {
+                      internalData: tableInternalData
+                    } = $xeTable;
+                    const {
+                      tableFullColumn,
+                      fullColumnFieldData
+                    } = tableInternalData;
                     const {
                       computeSortOpts
                     } = $xeTable.getComputeMaps();
                     const sortOpts = computeSortOpts.value;
-                    defaultSort = sortOpts.defaultSort;
-                  }
-                  // 如果使用默认排序
-                  if (defaultSort) {
-                    if (!external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(defaultSort)) {
-                      defaultSort = [defaultSort];
-                    }
-                    sortList = defaultSort.map(item => {
-                      return {
-                        field: item.field,
-                        property: item.field,
-                        order: item.order
-                      };
+                    let defaultSort = sortOpts.defaultSort;
+                    tableFullColumn.forEach(column => {
+                      column.order = null;
                     });
-                  }
-                  if ($xeTable) {
+                    // 如果使用默认排序
+                    if (defaultSort) {
+                      if (!external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(defaultSort)) {
+                        defaultSort = [defaultSort];
+                      }
+                      sortList = defaultSort.map(item => {
+                        const {
+                          field,
+                          order
+                        } = item;
+                        const colRest = fullColumnFieldData[field];
+                        if (colRest) {
+                          const column = colRest.column;
+                          if (column) {
+                            column.order = order;
+                          }
+                        }
+                        return {
+                          field,
+                          property: field,
+                          order
+                        };
+                      });
+                    }
                     filterList = $xeTable.getCheckedFilters();
                   }
                 } else {
@@ -14025,9 +14058,9 @@ const gridComponentEmits = [...emits, 'page-change', 'form-submit', 'form-submit
         const {
           code
         } = params;
-        return gridMethods.commitProxy(params, evnt).then(rest => {
+        return $xeGrid.commitProxy(params, evnt).then(rest => {
           if (code && rest && rest.status && ['query', 'reload', 'delete', 'save'].includes(code)) {
-            gridMethods.dispatchEvent(code === 'delete' || code === 'save' ? `proxy-${code}` : 'proxy-query', {
+            $xeGrid.dispatchEvent(code === 'delete' || code === 'save' ? `proxy-${code}` : 'proxy-query', {
               ...rest,
               isReload: code === 'reload'
             }, evnt);
@@ -14035,22 +14068,22 @@ const gridComponentEmits = [...emits, 'page-change', 'form-submit', 'form-submit
         });
       },
       triggerToolbarBtnEvent(button, evnt) {
-        gridPrivateMethods.triggerToolbarCommitEvent(button, evnt);
-        gridMethods.dispatchEvent('toolbar-button-click', {
+        $xeGrid.triggerToolbarCommitEvent(button, evnt);
+        $xeGrid.dispatchEvent('toolbar-button-click', {
           code: button.code,
           button
         }, evnt);
       },
       triggerToolbarTolEvent(tool, evnt) {
-        gridPrivateMethods.triggerToolbarCommitEvent(tool, evnt);
-        gridMethods.dispatchEvent('toolbar-tool-click', {
+        $xeGrid.triggerToolbarCommitEvent(tool, evnt);
+        $xeGrid.dispatchEvent('toolbar-tool-click', {
           code: tool.code,
           tool
         }, evnt);
       },
       triggerZoomEvent(evnt) {
-        gridMethods.zoom();
-        gridMethods.dispatchEvent('zoom', {
+        $xeGrid.zoom();
+        $xeGrid.dispatchEvent('zoom', {
           type: reactData.isZMax ? 'max' : 'revert'
         }, evnt);
       }
@@ -14122,6 +14155,7 @@ const gridComponentEmits = [...emits, 'page-change', 'form-submit', 'form-submit
         const {
           columns
         } = props;
+        const proxyOpts = computeProxyOpts.value;
         if (props.formConfig) {
           if (!VxeUIFormComponent) {
             errLog('vxe.error.reqComp', ['vxe-form']);
@@ -14133,14 +14167,13 @@ const gridComponentEmits = [...emits, 'page-change', 'form-submit', 'form-submit
           }
         }
         // const { data, columns, proxyConfig } = props
-        // const proxyOpts = computeProxyOpts.value
         // const formOpts = computeFormOpts.value
         // if (isEnableConf(proxyConfig) && (data || (proxyOpts.form && formOpts.data))) {
         //   errLog('vxe.error.errConflicts', ['grid.data', 'grid.proxy-config'])
         // }
-        //   if (proxyOpts.props) {
-        //     warnLog('vxe.error.delProp', ['proxy-config.props', 'proxy-config.response'])
-        //   }
+        if (proxyOpts.props) {
+          warnLog('vxe.error.delProp', ['proxy-config.props', 'proxy-config.response']);
+        }
         if (columns && columns.length) {
           $xeGrid.loadColumn(columns);
         }
@@ -18520,8 +18553,8 @@ keyboard_hook_hooks.add('tableKeyboardModule', {
       const checkboxOpts = computeCheckboxOpts.value;
       const mouseOpts = computeMouseOpts.value;
       const editOpts = computeEditOpts.value;
-      if (mouseConfig && mouseOpts.area && $xeTable.triggerCellAreaMousedownEvent) {
-        return $xeTable.triggerCellAreaMousedownEvent(evnt, params);
+      if (mouseConfig && mouseOpts.area && $xeTable.triggerCellAreaMousednEvent) {
+        return $xeTable.triggerCellAreaMousednEvent(evnt, params);
       } else {
         if (checkboxConfig && checkboxOpts.range) {
           handleCheckboxRangeEvent(evnt, params);