vxe-table 3.8.6-beta.1 → 3.8.6-beta.3

package/lib/v-x-e-table/src/conf.min.js

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var iconPrefix="vxe-icon-",_default=exports.default={size:null,zIndex:999,version:0,emptyCell:"　",table:{fit:!0,showHeader:!0,animat:!0,delayHover:250,autoResize:!0,minHeight:144,resizeConfig:{refreshDelay:250},radioConfig:{strict:!0},checkboxConfig:{strict:!0},tooltipConfig:{enterable:!0},validConfig:{showMessage:!0,autoClear:!0,message:"inline",msgMode:"single"},columnConfig:{maxFixedSize:4},customConfig:{allowFixed:!0,showFooter:!0},sortConfig:{showIcon:!0,iconLayout:"vertical"},filterConfig:{showIcon:!0},treeConfig:{rowField:"id",parentField:"parentId",childrenField:"children",hasChildField:"hasChild",mapChildrenField:"_X_ROW_CHILD",indent:20,showIcon:!0},expandConfig:{showIcon:!0},editConfig:{showIcon:!0,showAsterisk:!0},importConfig:{modes:["insert","covering"]},exportConfig:{modes:["current","selected"]},printConfig:{modes:["current","selected"]},mouseConfig:{extension:!0},keyboardConfig:{isEsc:!0},areaConfig:{selectCellByHeader:!0},clipConfig:{isCopy:!0,isCut:!0,isPaste:!0},fnrConfig:{isFind:!0,isReplace:!0},scrollX:{gt:60},scrollY:{gt:100}},export:{types:{}},icon:{LOADING:iconPrefix+"spinner roll vxe-loading--default-icon",TABLE_SORT_ASC:iconPrefix+"caret-up",TABLE_SORT_DESC:iconPrefix+"caret-down",TABLE_FILTER_NONE:iconPrefix+"funnel",TABLE_FILTER_MATCH:iconPrefix+"funnel",TABLE_EDIT:iconPrefix+"edit",TABLE_TITLE_PREFIX:iconPrefix+"question-circle-fill",TABLE_TITLE_SUFFIX:iconPrefix+"question-circle-fill",TABLE_TREE_LOADED:iconPrefix+"spinner roll",TABLE_TREE_OPEN:iconPrefix+"caret-right rotate90",TABLE_TREE_CLOSE:iconPrefix+"caret-right",TABLE_EXPAND_LOADED:iconPrefix+"spinner roll",TABLE_EXPAND_OPEN:iconPrefix+"arrow-right rotate90",TABLE_EXPAND_CLOSE:iconPrefix+"arrow-right",TABLE_CHECKBOX_CHECKED:iconPrefix+"checkbox-checked",TABLE_CHECKBOX_UNCHECKED:iconPrefix+"checkbox-unchecked",TABLE_CHECKBOX_INDETERMINATE:iconPrefix+"checkbox-indeterminate",TABLE_RADIO_CHECKED:iconPrefix+"radio-checked",TABLE_RADIO_UNCHECKED:iconPrefix+"radio-unchecked",BUTTON_DROPDOWN:iconPrefix+"arrow-down",BUTTON_LOADING:iconPrefix+"spinner roll",SELECT_LOADED:iconPrefix+"spinner roll",SELECT_OPEN:iconPrefix+"caret-down rotate180",SELECT_CLOSE:iconPrefix+"caret-down",PAGER_HOME:iconPrefix+"home-page",PAGER_END:iconPrefix+"end-page",PAGER_JUMP_PREV:iconPrefix+"arrow-double-left",PAGER_JUMP_NEXT:iconPrefix+"arrow-double-right",PAGER_PREV_PAGE:iconPrefix+"arrow-left",PAGER_NEXT_PAGE:iconPrefix+"arrow-right",PAGER_JUMP_MORE:iconPrefix+"ellipsis-h",INPUT_CLEAR:iconPrefix+"error-circle-fill",INPUT_PWD:iconPrefix+"eye-fill",INPUT_SHOW_PWD:iconPrefix+"eye-fill-close",INPUT_PREV_NUM:iconPrefix+"caret-up",INPUT_NEXT_NUM:iconPrefix+"caret-down",INPUT_DATE:iconPrefix+"calendar",INPUT_SEARCH:iconPrefix+"search",MODAL_ZOOM_IN:iconPrefix+"square",MODAL_ZOOM_OUT:iconPrefix+"maximize",MODAL_CLOSE:iconPrefix+"close",MODAL_INFO:iconPrefix+"info-circle-fill",MODAL_SUCCESS:iconPrefix+"success-circle-fill",MODAL_WARNING:iconPrefix+"warnion-circle-fill",MODAL_ERROR:iconPrefix+"error-circle-fill",MODAL_QUESTION:iconPrefix+"question-circle-fill",MODAL_LOADING:iconPrefix+"spinner roll",TOOLBAR_TOOLS_REFRESH:iconPrefix+"repeat",TOOLBAR_TOOLS_REFRESH_LOADING:iconPrefix+"repeat roll",TOOLBAR_TOOLS_IMPORT:iconPrefix+"upload",TOOLBAR_TOOLS_EXPORT:iconPrefix+"download",TOOLBAR_TOOLS_PRINT:iconPrefix+"print",TOOLBAR_TOOLS_FULLSCREEN:iconPrefix+"fullscreen",TOOLBAR_TOOLS_MINIMIZE:iconPrefix+"minimize",TOOLBAR_TOOLS_CUSTOM:iconPrefix+"custom-column",TOOLBAR_TOOLS_FIXED_LEFT:iconPrefix+"fixed-left",TOOLBAR_TOOLS_FIXED_LEFT_ACTIVED:iconPrefix+"fixed-left-fill",TOOLBAR_TOOLS_FIXED_RIGHT:iconPrefix+"fixed-right",TOOLBAR_TOOLS_FIXED_RIGHT_ACTIVED:iconPrefix+"fixed-right-fill",FORM_PREFIX:iconPrefix+"question-circle-fill",FORM_SUFFIX:iconPrefix+"question-circle-fill",FORM_FOLDING:iconPrefix+"arrow-up rotate180",FORM_UNFOLDING:iconPrefix+"arrow-up"},grid:{formConfig:{enabled:!0},pagerConfig:{enabled:!0},toolbarConfig:{enabled:!0},proxyConfig:{enabled:!0,autoLoad:!0,message:!0,props:{list:null,result:"result",total:"page.total",message:"message"}}},tooltip:{trigger:"hover",theme:"dark",enterDelay:500,leaveDelay:300},pager:{},form:{validConfig:{showMessage:!0,autoPos:!0},tooltipConfig:{enterable:!0},titleAsterisk:!0},input:{startDate:new Date(1900,0,1),endDate:new Date(2100,0,1),startDay:1,selectDay:1,digits:2,controls:!0},textarea:{},select:{multiCharOverflow:8},toolbar:{},button:{},buttonGroup:{},radio:{strict:!0},radioButton:{strict:!0},radioGroup:{strict:!0},checkbox:{},checkboxGroup:{},switch:{},modal:{top:15,showHeader:!0,minWidth:340,minHeight:140,lockView:!0,mask:!0,duration:3e3,marginSize:0,dblclickZoom:!0,showTitleOverflow:!0,animat:!0,showClose:!0,draggable:!0,storageKey:"VXE_MODAL_POSITION"},list:{scrollY:{enabled:!0,gt:100}},i18n:function(e){return e}};
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var iconPrefix="vxe-icon-",_default=exports.default={size:null,zIndex:999,version:0,emptyCell:"　",table:{fit:!0,showHeader:!0,animat:!0,delayHover:250,autoResize:!0,minHeight:144,resizeConfig:{refreshDelay:250},radioConfig:{strict:!0},checkboxConfig:{strict:!0},tooltipConfig:{enterable:!0},validConfig:{showMessage:!0,autoClear:!0,message:"inline",msgMode:"single"},columnConfig:{maxFixedSize:4},customConfig:{allowFixed:!0,showFooter:!0},sortConfig:{showIcon:!0,iconLayout:"vertical"},filterConfig:{showIcon:!0},treeConfig:{rowField:"id",parentField:"parentId",childrenField:"children",hasChildField:"hasChild",mapChildrenField:"_X_ROW_CHILD",indent:20,showIcon:!0},expandConfig:{showIcon:!0},editConfig:{showIcon:!0,showAsterisk:!0},importConfig:{modes:["insert","covering"]},exportConfig:{modes:["current","selected"]},printConfig:{modes:["current","selected"]},mouseConfig:{extension:!0},keyboardConfig:{isEsc:!0},areaConfig:{autoClear:!0,selectCellByHeader:!0},clipConfig:{isCopy:!0,isCut:!0,isPaste:!0},fnrConfig:{isFind:!0,isReplace:!0},scrollX:{gt:60},scrollY:{gt:100}},export:{types:{}},icon:{LOADING:iconPrefix+"spinner roll vxe-loading--default-icon",TABLE_SORT_ASC:iconPrefix+"caret-up",TABLE_SORT_DESC:iconPrefix+"caret-down",TABLE_FILTER_NONE:iconPrefix+"funnel",TABLE_FILTER_MATCH:iconPrefix+"funnel",TABLE_EDIT:iconPrefix+"edit",TABLE_TITLE_PREFIX:iconPrefix+"question-circle-fill",TABLE_TITLE_SUFFIX:iconPrefix+"question-circle-fill",TABLE_TREE_LOADED:iconPrefix+"spinner roll",TABLE_TREE_OPEN:iconPrefix+"caret-right rotate90",TABLE_TREE_CLOSE:iconPrefix+"caret-right",TABLE_EXPAND_LOADED:iconPrefix+"spinner roll",TABLE_EXPAND_OPEN:iconPrefix+"arrow-right rotate90",TABLE_EXPAND_CLOSE:iconPrefix+"arrow-right",TABLE_CHECKBOX_CHECKED:iconPrefix+"checkbox-checked",TABLE_CHECKBOX_UNCHECKED:iconPrefix+"checkbox-unchecked",TABLE_CHECKBOX_INDETERMINATE:iconPrefix+"checkbox-indeterminate",TABLE_RADIO_CHECKED:iconPrefix+"radio-checked",TABLE_RADIO_UNCHECKED:iconPrefix+"radio-unchecked",BUTTON_DROPDOWN:iconPrefix+"arrow-down",BUTTON_LOADING:iconPrefix+"spinner roll",SELECT_LOADED:iconPrefix+"spinner roll",SELECT_OPEN:iconPrefix+"caret-down rotate180",SELECT_CLOSE:iconPrefix+"caret-down",PAGER_HOME:iconPrefix+"home-page",PAGER_END:iconPrefix+"end-page",PAGER_JUMP_PREV:iconPrefix+"arrow-double-left",PAGER_JUMP_NEXT:iconPrefix+"arrow-double-right",PAGER_PREV_PAGE:iconPrefix+"arrow-left",PAGER_NEXT_PAGE:iconPrefix+"arrow-right",PAGER_JUMP_MORE:iconPrefix+"ellipsis-h",INPUT_CLEAR:iconPrefix+"error-circle-fill",INPUT_PWD:iconPrefix+"eye-fill",INPUT_SHOW_PWD:iconPrefix+"eye-fill-close",INPUT_PREV_NUM:iconPrefix+"caret-up",INPUT_NEXT_NUM:iconPrefix+"caret-down",INPUT_DATE:iconPrefix+"calendar",INPUT_SEARCH:iconPrefix+"search",MODAL_ZOOM_IN:iconPrefix+"square",MODAL_ZOOM_OUT:iconPrefix+"maximize",MODAL_CLOSE:iconPrefix+"close",MODAL_INFO:iconPrefix+"info-circle-fill",MODAL_SUCCESS:iconPrefix+"success-circle-fill",MODAL_WARNING:iconPrefix+"warnion-circle-fill",MODAL_ERROR:iconPrefix+"error-circle-fill",MODAL_QUESTION:iconPrefix+"question-circle-fill",MODAL_LOADING:iconPrefix+"spinner roll",TOOLBAR_TOOLS_REFRESH:iconPrefix+"repeat",TOOLBAR_TOOLS_REFRESH_LOADING:iconPrefix+"repeat roll",TOOLBAR_TOOLS_IMPORT:iconPrefix+"upload",TOOLBAR_TOOLS_EXPORT:iconPrefix+"download",TOOLBAR_TOOLS_PRINT:iconPrefix+"print",TOOLBAR_TOOLS_FULLSCREEN:iconPrefix+"fullscreen",TOOLBAR_TOOLS_MINIMIZE:iconPrefix+"minimize",TOOLBAR_TOOLS_CUSTOM:iconPrefix+"custom-column",TOOLBAR_TOOLS_FIXED_LEFT:iconPrefix+"fixed-left",TOOLBAR_TOOLS_FIXED_LEFT_ACTIVED:iconPrefix+"fixed-left-fill",TOOLBAR_TOOLS_FIXED_RIGHT:iconPrefix+"fixed-right",TOOLBAR_TOOLS_FIXED_RIGHT_ACTIVED:iconPrefix+"fixed-right-fill",FORM_PREFIX:iconPrefix+"question-circle-fill",FORM_SUFFIX:iconPrefix+"question-circle-fill",FORM_FOLDING:iconPrefix+"arrow-up rotate180",FORM_UNFOLDING:iconPrefix+"arrow-up"},grid:{formConfig:{enabled:!0},pagerConfig:{enabled:!0},toolbarConfig:{enabled:!0},proxyConfig:{enabled:!0,autoLoad:!0,message:!0,props:{list:null,result:"result",total:"page.total",message:"message"}}},tooltip:{trigger:"hover",theme:"dark",enterDelay:500,leaveDelay:300},pager:{},form:{validConfig:{showMessage:!0,autoPos:!0},tooltipConfig:{enterable:!0},titleAsterisk:!0},input:{startDate:new Date(1900,0,1),endDate:new Date(2100,0,1),startDay:1,selectDay:1,digits:2,controls:!0},textarea:{},select:{multiCharOverflow:8},toolbar:{},button:{},buttonGroup:{},radio:{strict:!0},radioButton:{strict:!0},radioGroup:{strict:!0},checkbox:{},checkboxGroup:{},switch:{},modal:{top:15,showHeader:!0,minWidth:340,minHeight:140,lockView:!0,mask:!0,duration:3e3,marginSize:0,dblclickZoom:!0,showTitleOverflow:!0,animat:!0,showClose:!0,draggable:!0,storageKey:"VXE_MODAL_POSITION"},list:{scrollY:{enabled:!0,gt:100}},i18n:function(e){return e}};

package/lib/v-x-e-table/src/config.js

@@ -3,7 +3,8 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.config = config;
+exports.config = void 0;
+exports.setConfig = setConfig;
 var _conf = _interopRequireDefault(require("./conf"));
 var _domZindex = _interopRequireDefault(require("dom-zindex"));
 var _xeUtils = _interopRequireDefault(require("xe-utils"));
@@ -12,12 +13,15 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 /**
  * 全局参数设置
  */
-function config(options) {
+function setConfig(options) {
   if (options) {
-    (0, _theme.setTheme)(options);
+    if (options.theme) {
+      (0, _theme.setTheme)(options);
+    }
     if (options.zIndex) {
       _domZindex.default.setCurrent(options.zIndex);
     }
   }
   return _xeUtils.default.merge(_conf.default, options);
-}
+}
+var config = exports.config = setConfig;

package/lib/v-x-e-table/src/config.min.js

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.config=config;var _conf=_interopRequireDefault(require("./conf")),_domZindex=_interopRequireDefault(require("dom-zindex")),_xeUtils=_interopRequireDefault(require("xe-utils")),_theme=require("./theme");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}function config(e){return e&&((0,_theme.setTheme)(e),e.zIndex)&&_domZindex.default.setCurrent(e.zIndex),_xeUtils.default.merge(_conf.default,e)}
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.config=void 0,exports.setConfig=setConfig;var _conf=_interopRequireDefault(require("./conf")),_domZindex=_interopRequireDefault(require("dom-zindex")),_xeUtils=_interopRequireDefault(require("xe-utils")),_theme=require("./theme");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}function setConfig(e){return e&&(e.theme&&(0,_theme.setTheme)(e),e.zIndex)&&_domZindex.default.setCurrent(e.zIndex),_xeUtils.default.merge(_conf.default,e)}var config=exports.config=setConfig;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vxe-table",
-  "version": "3.8.6-beta.1",
+  "version": "3.8.6-beta.3",
   "description": "一个基于 vue 的 PC 端表单/表格组件，支持增删改查、虚拟列表、虚拟树、懒加载、快捷菜单、数据校验、树形结构、打印导出、表单渲染、数据分页、弹窗、自定义模板、渲染器、JSON 配置式...",
   "scripts": {
     "update": "npm install --legacy-peer-deps",

package/packages/all.js

@@ -85,7 +85,9 @@ const components = [
 export function install (Vue, options) {
   if (XEUtils.isPlainObject(options)) {
     VXETable.config(options)
-    setTheme(options)
+    if (options.theme) {
+      setTheme(options)
+    }
   }
   components.map(component => component.install(Vue))
 }

package/packages/custom/src/panel.js

@@ -15,11 +15,11 @@ function updateDropHint (_vm, evnt) {
     return
   }
   if (dragHintEl) {
-    const warpperEl = bodyEl.parentNode
-    const warpperRect = warpperEl.getBoundingClientRect()
+    const wrapperEl = bodyEl.parentNode
+    const wrapperRect = wrapperEl.getBoundingClientRect()
     dragHintEl.style.display = 'block'
-    dragHintEl.style.top = `${Math.min(warpperEl.clientHeight - warpperEl.scrollTop - dragHintEl.clientHeight, evnt.clientY - warpperRect.y)}px`
-    dragHintEl.style.left = `${Math.min(warpperEl.clientWidth - warpperEl.scrollLeft - dragHintEl.clientWidth - 16, evnt.clientX - warpperRect.x)}px`
+    dragHintEl.style.top = `${Math.min(wrapperEl.clientHeight - wrapperEl.scrollTop - dragHintEl.clientHeight, evnt.clientY - wrapperRect.y)}px`
+    dragHintEl.style.left = `${Math.min(wrapperEl.clientWidth - wrapperEl.scrollLeft - dragHintEl.clientWidth - 16, evnt.clientX - wrapperRect.x)}px`
   }
 }
 

package/packages/grid/src/grid.js

@@ -409,6 +409,9 @@ export default {
       if (this.toolbarConfig && !XEUtils.isObject(this.toolbarConfig)) {
         warnLog('vxe.error.errProp', [`grid.toolbar-config=${this.toolbarConfig}`, 'grid.toolbar-config={}'])
       }
+      // if (proxyOpts.props) {
+      //   warnLog('vxe.error.delProp', ['proxy-config.props', 'proxy-config.response'])
+      // }
     }
     this.initPages()
     GlobalEvent.on(this, 'keydown', this.handleGlobalKeydownEvent)
@@ -524,8 +527,9 @@ export default {
      * @param {String/Object} code 字符串或对象
      */
     commitProxy (proxyTarget, ...args) {
-      const { $refs, toolbar, toolbarConfig, toolbarOpts, proxyOpts, tablePage, pagerConfig, editRules, formData, isMsg, validConfig } = this
-      const { beforeQuery, afterQuery, beforeDelete, afterDelete, beforeSave, afterSave, ajax = {}, props: proxyProps = {} } = proxyOpts
+      const { $refs, toolbar, toolbarConfig, toolbarOpts, proxyOpts, tablePage, pagerConfig, editRules, formData, isMsg, validConfig, pagerOpts } = this
+      const { beforeQuery, afterQuery, beforeDelete, afterDelete, beforeSave, afterSave, ajax = {} } = proxyOpts
+      const resConfigs = proxyOpts.response || proxyOpts.props || {}
       const $xetable = $refs.xTable
       let button
       let code
@@ -633,17 +637,20 @@ export default {
               .then(rest => {
                 this.tableLoading = false
                 if (rest) {
-                  if (isEnableConf(pagerConfig)) {
-                    const total = XEUtils.get(rest, proxyProps.total || 'page.total') || 0
+                  if (pagerConfig && isEnableConf(pagerOpts)) {
+                    const totalProp = resConfigs.total
+                    const total = (XEUtils.isFunction(totalProp) ? totalProp({ data: rest, $grid: this }) : XEUtils.get(rest, totalProp || 'page.total')) || 0
                     tablePage.total = XEUtils.toNumber(total)
-                    this.tableData = XEUtils.get(rest, proxyProps.result || 'result') || []
+                    const resultProp = resConfigs.result
+                    this.tableData = (XEUtils.isFunction(resultProp) ? resultProp({ data: rest, $grid: this }) : XEUtils.get(rest, resultProp || 'result')) || []
                     // 检验当前页码，不能超出当前最大页数
                     const pageCount = Math.max(Math.ceil(total / tablePage.pageSize), 1)
                     if (tablePage.currentPage > pageCount) {
                       tablePage.currentPage = pageCount
                     }
                   } else {
-                    this.tableData = (proxyProps.list ? XEUtils.get(rest, proxyProps.list) : rest) || []
+                    const listProp = resConfigs.list
+                    this.tableData = (listProp ? (XEUtils.isFunction(listProp) ? listProp({ data: rest, $grid: this }) : XEUtils.get(rest, listProp)) : rest) || []
                   }
                 } else {
                   this.tableData = []
@@ -822,10 +829,11 @@ export default {
       return this.$nextTick()
     },
     getRespMsg (rest, defaultMsg) {
-      const { props: proxyProps = {} } = this.proxyOpts
+      const { proxyOpts } = this
+      const resConfigs = proxyOpts.response || proxyOpts.props || {}
       let msg
-      if (rest && proxyProps.message) {
-        msg = XEUtils.get(rest, proxyProps.message)
+      if (rest && resConfigs.message) {
+        msg = XEUtils.get(rest, resConfigs.message)
       }
       return msg || GlobalConfig.i18n(defaultMsg)
     },

package/packages/table/src/body.js

@@ -15,7 +15,7 @@ function isVMScrollProcess ($xetable) {
 
 function renderLine (h, _vm, $xetable, params) {
   const { row, column } = params
-  const { treeOpts, treeConfig, fullAllDataRowIdData } = $xetable
+  const { afterFullData, treeOpts, treeConfig, fullAllDataRowIdData } = $xetable
   const { slots, treeNode } = column
   const rowid = getRowid($xetable, row)
   const rest = fullAllDataRowIdData[rowid]
@@ -30,6 +30,7 @@ function renderLine (h, _vm, $xetable, params) {
   if (slots && slots.line) {
     return $xetable.callSlot(slots.line, params, h)
   }
+  const isFirstRow = $xetable.eqRow(afterFullData[0], row)
   if (treeConfig && treeNode && (treeOpts.showLine || treeOpts.line)) {
     return [
       h('div', {
@@ -38,7 +39,7 @@ function renderLine (h, _vm, $xetable, params) {
         h('div', {
           class: 'vxe-tree--line',
           style: {
-            height: `${calcTreeLine(params, items, rIndex)}px`,
+            height: `${isFirstRow ? 1 : calcTreeLine(params, items, rIndex)}px`,
             left: `${(rLevel * treeOpts.indent) + (rLevel ? 2 - getOffsetSize($xetable) : 0) + 16}px`
           }
         })

package/packages/table/src/methods.js

@@ -2491,7 +2491,7 @@ const Methods = {
    * 全局按下事件处理
    */
   handleGlobalMousedownEvent (evnt) {
-    const { $el, $refs, $xegrid, $toolbar, mouseConfig, editStore, ctxMenuStore, editRules, editOpts, validOpts, filterStore, customStore, getRowNode } = this
+    const { $el, $refs, $xegrid, $toolbar, mouseConfig, editStore, ctxMenuStore, editRules, editOpts, validOpts, areaOpts, filterStore, customStore, getRowNode } = this
     const { actived } = editStore
     const { ctxWrapper, filterWrapper, customWrapper, validTip } = $refs
     // 筛选
@@ -2572,11 +2572,13 @@ const Methods = {
         if (this.clearSelected) {
           this.clearSelected()
         }
-        if (!getEventTargetNode(evnt, document.body, 'vxe-table--ignore-areas-clear').flag) {
-          this.preventEvent(evnt, 'event.clearAreas', {}, () => {
-            this.clearCellAreas()
-            this.clearCopyCellArea()
-          })
+        if (areaOpts.autoClear) {
+          if (!getEventTargetNode(evnt, document.body, 'vxe-table--ignore-areas-clear').flag) {
+            this.preventEvent(evnt, 'event.clearAreas', {}, () => {
+              this.clearCellAreas()
+              this.clearCopyCellArea()
+            })
+          }
         }
       }
     }

package/packages/table/src/table.js

@@ -969,10 +969,10 @@ export default {
       }
     }
     if (this.autoResize) {
-      const handleWarpperResize = this.resizeOpts.refreshDelay ? XEUtils.throttle(() => this.recalculate(true), this.resizeOpts.refreshDelay, { leading: true, trailing: true }) : null
-      const resizeObserver = createResizeEvent(handleWarpperResize ? () => {
+      const handleWrapperResize = this.resizeOpts.refreshDelay ? XEUtils.throttle(() => this.recalculate(true), this.resizeOpts.refreshDelay, { leading: true, trailing: true }) : null
+      const resizeObserver = createResizeEvent(handleWrapperResize ? () => {
         if (this.autoResize) {
-          requestAnimationFrame(handleWarpperResize)
+          requestAnimationFrame(handleWrapperResize)
         }
       } : () => {
         if (this.autoResize) {

package/packages/v-x-e-table/index.js

@@ -6,7 +6,7 @@ import { commands } from './src/commands'
 import { menus } from './src/menus'
 import { formats } from './src/formats'
 import { validators } from './src/validators'
-import { config } from './src/config'
+import { setConfig } from './src/config'
 import { setTheme } from './src/theme'
 import { UtilTools } from '../tools/utils'
 import { errLog } from '../tools/log'
@@ -90,7 +90,7 @@ export function _t (key, args) {
 }
 
 export const v = 'v3'
-export const setup = config
+export const setup = setConfig
 
 export const globalStore = {}
 
@@ -99,7 +99,7 @@ export const VXETable = {
   version: process.env.VUE_APP_VXE_TABLE_VERSION,
   reg,
   use,
-  setup,
+  setConfig,
   globalStore,
   interceptor,
   renderer,
@@ -111,7 +111,8 @@ export const VXETable = {
   _t,
 
   // 已废弃
-  config,
+  config: setConfig,
+  setup,
   globalConfs
 }
 

package/packages/v-x-e-table/src/conf.js

@@ -110,6 +110,7 @@ export default {
       isEsc: true
     },
     areaConfig: {
+      autoClear: true,
       selectCellByHeader: true
     },
     clipConfig: {

package/packages/v-x-e-table/src/config.js

@@ -6,12 +6,16 @@ import { setTheme } from './theme'
 /**
  * 全局参数设置
  */
-export function config (options) {
+export function setConfig (options) {
   if (options) {
-    setTheme(options)
+    if (options.theme) {
+      setTheme(options)
+    }
     if (options.zIndex) {
       DomZIndex.setCurrent(options.zIndex)
     }
   }
   return XEUtils.merge(GlobalConfig, options)
 }
+
+export const config = setConfig

package/types/grid.d.ts

@@ -103,11 +103,11 @@ export interface GridProxyConfig {
   sort?: boolean;
   filter?: boolean;
   form?: boolean;
-  props?: {
-    list?: string;
-    result?: string;
-    total?: string;
-    message?: string;
+  response?: {
+    list?: string | null | ((params: { data: any }) => any[])
+    result?: string | ((params: { data: any }) => any[])
+    total?: string | ((params: { data: any }) => number)
+    message?: string | ((params: { data: any }) => string)
   };
   ajax?: {
     query?(params: { page: GridProxyQueryPageParams, sort: GridProxyQuerySortParams, filters: GridProxyQueryFiltersParams[], form: any }, ...args: any[]): Promise<any>;
@@ -115,6 +115,33 @@ export interface GridProxyConfig {
     save?(params: { body: { insertRecords: any[], updateRecords: any[], removeRecords: any[], pendingRecords: any[] } }, ...args: any[]): Promise<any>;
   }
   [key: string]: any;
+
+  /**
+   * 已废弃，请使用 proxy-config.response
+   * @deprecated
+   */
+  props?: {
+    /**
+     * 已废弃，请使用 proxy-config.response.list
+     * @deprecated
+     */
+    list?: string | null
+    /**
+     * 已废弃，请使用 proxy-config.response.result
+     * @deprecated
+     */
+    result?: string
+    /**
+     * 已废弃，请使用 proxy-config.response.total
+     * @deprecated
+     */
+    total?: string
+    /**
+     * 已废弃，请使用 proxy-config.response.message
+     * @deprecated
+     */
+    message?: string
+  }
 }
 
 export interface GridPagerConfig extends PagerOptions {

package/types/v-x-e-table/index.d.ts

@@ -1,5 +1,3 @@
-import Vue from 'vue'
-
 import { ModalController } from '../modal'
 import { SaveFileFunction, ReadFileFunction, PrintFunction } from '../module/export'
 
@@ -27,6 +25,7 @@ export interface VxeGlobalStore {
 export const globalStore: VxeGlobalStore
 
 export const config: VxeGlobalConfigMethod
+export const setConfig: VxeGlobalConfigMethod
 export const interceptor: VxeGlobalInterceptor
 export const renderer: VxeGlobalRenderer
 export const commands: VxeGlobalCommands
@@ -63,7 +62,7 @@ export interface VXETableCore {
   /**
    * 设置全局参数/获取所有参数
    */
-  config: VxeGlobalConfigMethod;
+  setConfig: VxeGlobalConfigMethod;
   /**
    * 读取内部数据
    */
@@ -120,6 +119,7 @@ export interface VXETableCore {
   t: VxeGlobalI18n;
   _t: VxeGlobalTranslate;
 
+  config: VxeGlobalConfigMethod;
   /**
    * 已被 version 替换
    * @deprecated