vxe-table 3.8.6-beta.2 → 3.8.6

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -1164,15 +1164,15 @@ var _default2 = exports.default = {
1164
1164
  }
1165
1165
  }
1166
1166
  if (this.autoResize) {
1167
- var handleWarpperResize = this.resizeOpts.refreshDelay ? _xeUtils.default.throttle(function () {
1167
+ var handleWrapperResize = this.resizeOpts.refreshDelay ? _xeUtils.default.throttle(function () {
1168
1168
  return _this12.recalculate(true);
1169
1169
  }, this.resizeOpts.refreshDelay, {
1170
1170
  leading: true,
1171
1171
  trailing: true
1172
1172
  }) : null;
1173
- var resizeObserver = (0, _resize.createResizeEvent)(handleWarpperResize ? function () {
1173
+ var resizeObserver = (0, _resize.createResizeEvent)(handleWrapperResize ? function () {
1174
1174
  if (_this12.autoResize) {
1175
- requestAnimationFrame(handleWarpperResize);
1175
+ requestAnimationFrame(handleWrapperResize);
1176
1176
  }
1177
1177
  } : function () {
1178
1178
  if (_this12.autoResize) {
package/lib/tools/log.js CHANGED
@@ -9,7 +9,7 @@ exports.warnLog = void 0;
9
9
  var _conf = _interopRequireDefault(require("../v-x-e-table/src/conf"));
10
10
  function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
11
11
  function getLog(message, params) {
12
- return "[vxe-table v".concat("3.8.6-beta.2", "] ", _conf.default.i18n(message, params));
12
+ return "[vxe-table v".concat("3.8.6", "] ", _conf.default.i18n(message, params));
13
13
  }
14
14
  function outLog(type) {
15
15
  return function (message, params) {
@@ -1 +1 @@
1
- "use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.errLog=void 0,exports.getLog=getLog,exports.warnLog=void 0;var _conf=_interopRequireDefault(require("../v-x-e-table/src/conf"));function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}function getLog(e,o){return"[vxe-table v".concat("3.8.6-beta.2","] ",_conf.default.i18n(e,o))}function outLog(r){return function(e,o){e=getLog(e,o);return console[r](e),e}}var warnLog=exports.warnLog=outLog("warn"),errLog=exports.errLog=outLog("error");
1
+ "use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.errLog=void 0,exports.getLog=getLog,exports.warnLog=void 0;var _conf=_interopRequireDefault(require("../v-x-e-table/src/conf"));function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}function getLog(e,o){return"[vxe-table v".concat("3.8.6","] ",_conf.default.i18n(e,o))}function outLog(r){return function(e,o){e=getLog(e,o);return console[r](e),e}}var warnLog=exports.warnLog=outLog("warn"),errLog=exports.errLog=outLog("error");
@@ -188,14 +188,14 @@ function _t(key, args) {
188
188
  return key ? _xeUtils.default.toValueString(_conf.default.translate ? _conf.default.translate(key, args) : key) : '';
189
189
  }
190
190
  var v = exports.v = 'v3';
191
- var setup = exports.setup = _config.config;
191
+ var setup = exports.setup = _config.setConfig;
192
192
  var globalStore = exports.globalStore = {};
193
193
  var VXETable = exports.VXETable = {
194
194
  v: v,
195
- version: "3.8.6-beta.2",
195
+ version: "3.8.6",
196
196
  reg: reg,
197
197
  use: use,
198
- setup: setup,
198
+ setConfig: _config.setConfig,
199
199
  globalStore: globalStore,
200
200
  interceptor: _interceptor.interceptor,
201
201
  renderer: _renderer.renderer,
@@ -206,7 +206,8 @@ var VXETable = exports.VXETable = {
206
206
  t: t,
207
207
  _t: _t,
208
208
  // 已废弃
209
- config: _config.config,
209
+ config: _config.setConfig,
210
+ setup: setup,
210
211
  globalConfs: globalConfs
211
212
  };
212
213
  (0, _theme.setTheme)(globalStore);
@@ -1 +1 @@
1
- "use strict";Object.defineProperty(exports,"__esModule",{value:!0});var _exportNames={use:!0,globalConfs:!0,t:!0,_t:!0,v:!0,setup:!0,globalStore:!0,VXETable:!0},_xeUtils=(exports.VXETable=void 0,exports._t=_t,exports.setup=exports.globalStore=exports.globalConfs=exports.default=void 0,exports.t=t,exports.use=use,exports.v=void 0,_interopRequireDefault(require("xe-utils"))),_conf=_interopRequireDefault(require("../v-x-e-table/src/conf")),_interceptor=require("./src/interceptor"),_renderer=(Object.keys(_interceptor).forEach(function(e){"default"===e||"__esModule"===e||Object.prototype.hasOwnProperty.call(_exportNames,e)||e in exports&&exports[e]===_interceptor[e]||Object.defineProperty(exports,e,{enumerable:!0,get:function(){return _interceptor[e]}})}),require("./src/renderer")),_commands=(Object.keys(_renderer).forEach(function(e){"default"===e||"__esModule"===e||Object.prototype.hasOwnProperty.call(_exportNames,e)||e in exports&&exports[e]===_renderer[e]||Object.defineProperty(exports,e,{enumerable:!0,get:function(){return _renderer[e]}})}),require("./src/commands")),_menus=(Object.keys(_commands).forEach(function(e){"default"===e||"__esModule"===e||Object.prototype.hasOwnProperty.call(_exportNames,e)||e in exports&&exports[e]===_commands[e]||Object.defineProperty(exports,e,{enumerable:!0,get:function(){return _commands[e]}})}),require("./src/menus")),_formats=(Object.keys(_menus).forEach(function(e){"default"===e||"__esModule"===e||Object.prototype.hasOwnProperty.call(_exportNames,e)||e in exports&&exports[e]===_menus[e]||Object.defineProperty(exports,e,{enumerable:!0,get:function(){return _menus[e]}})}),require("./src/formats")),_validators=(Object.keys(_formats).forEach(function(e){"default"===e||"__esModule"===e||Object.prototype.hasOwnProperty.call(_exportNames,e)||e in exports&&exports[e]===_formats[e]||Object.defineProperty(exports,e,{enumerable:!0,get:function(){return _formats[e]}})}),require("./src/validators")),_config=require("./src/config"),_theme=(Object.keys(_config).forEach(function(e){"default"===e||"__esModule"===e||Object.prototype.hasOwnProperty.call(_exportNames,e)||e in exports&&exports[e]===_config[e]||Object.defineProperty(exports,e,{enumerable:!0,get:function(){return _config[e]}})}),require("./src/theme")),_utils=require("../tools/utils"),_log=require("../tools/log");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}function _typeof(e){return(_typeof="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"==typeof Symbol&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e})(e)}function _classCallCheck(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}function _defineProperties(e,t){for(var r=0;r<t.length;r++){var o=t[r];o.enumerable=o.enumerable||!1,o.configurable=!0,"value"in o&&(o.writable=!0),Object.defineProperty(e,_toPropertyKey(o.key),o)}}function _createClass(e,t,r){return t&&_defineProperties(e.prototype,t),r&&_defineProperties(e,r),Object.defineProperty(e,"prototype",{writable:!1}),e}function _toPropertyKey(e){e=_toPrimitive(e,"string");return"symbol"==_typeof(e)?e:e+""}function _toPrimitive(e,t){if("object"!=_typeof(e)||!e)return e;var r=e[Symbol.toPrimitive];if(void 0===r)return("string"===t?String:Number)(e);r=r.call(e,t||"default");if("object"!=_typeof(r))return r;throw new TypeError("@@toPrimitive must return a primitive value.")}var installedPlugins=[];function use(e,t){return e&&e.install&&-1===installedPlugins.indexOf(e)&&(e.install(VXETable,t),installedPlugins.push(e)),VXETable}function reg(e){"development"===process.env.NODE_ENV&&VXETable.Table&&(0,_log.errLog)("vxe.error.useErr",[e]),VXETable["_".concat(e)]=1}function getExportOrImpotType(e,r){var o=[];return _xeUtils.default.objectEach(e,function(e,t){0!==e&&e!==r||o.push(t)}),o}var VXETableConfig=function(){return _createClass(function e(){_classCallCheck(this,e)},[{key:"zIndex",get:function(){return _utils.UtilTools.getLastZIndex()}},{key:"nextZIndex",get:function(){return _utils.UtilTools.nextZIndex()}},{key:"exportTypes",get:function(){return getExportOrImpotType(_conf.default.export.types,1)}},{key:"importTypes",get:function(){return getExportOrImpotType(_conf.default.export.types,2)}}])}(),globalConfs=exports.globalConfs=new VXETableConfig;function t(e,t){return _conf.default.i18n(e,t)}function _t(e,t){return e?_xeUtils.default.toValueString(_conf.default.translate?_conf.default.translate(e,t):e):""}var v=exports.v="v3",setup=exports.setup=_config.config,globalStore=exports.globalStore={},VXETable=exports.VXETable={v:v,version:"3.8.6-beta.2",reg:reg,use:use,setup:setup,globalStore:globalStore,interceptor:_interceptor.interceptor,renderer:_renderer.renderer,commands:_commands.commands,formats:_formats.formats,menus:_menus.menus,validators:_validators.validators,t:t,_t:_t,config:_config.config,globalConfs:globalConfs},_default=((0,_theme.setTheme)(globalStore),exports.default=VXETable);
1
+ "use strict";Object.defineProperty(exports,"__esModule",{value:!0});var _exportNames={use:!0,globalConfs:!0,t:!0,_t:!0,v:!0,setup:!0,globalStore:!0,VXETable:!0},_xeUtils=(exports.VXETable=void 0,exports._t=_t,exports.setup=exports.globalStore=exports.globalConfs=exports.default=void 0,exports.t=t,exports.use=use,exports.v=void 0,_interopRequireDefault(require("xe-utils"))),_conf=_interopRequireDefault(require("../v-x-e-table/src/conf")),_interceptor=require("./src/interceptor"),_renderer=(Object.keys(_interceptor).forEach(function(e){"default"===e||"__esModule"===e||Object.prototype.hasOwnProperty.call(_exportNames,e)||e in exports&&exports[e]===_interceptor[e]||Object.defineProperty(exports,e,{enumerable:!0,get:function(){return _interceptor[e]}})}),require("./src/renderer")),_commands=(Object.keys(_renderer).forEach(function(e){"default"===e||"__esModule"===e||Object.prototype.hasOwnProperty.call(_exportNames,e)||e in exports&&exports[e]===_renderer[e]||Object.defineProperty(exports,e,{enumerable:!0,get:function(){return _renderer[e]}})}),require("./src/commands")),_menus=(Object.keys(_commands).forEach(function(e){"default"===e||"__esModule"===e||Object.prototype.hasOwnProperty.call(_exportNames,e)||e in exports&&exports[e]===_commands[e]||Object.defineProperty(exports,e,{enumerable:!0,get:function(){return _commands[e]}})}),require("./src/menus")),_formats=(Object.keys(_menus).forEach(function(e){"default"===e||"__esModule"===e||Object.prototype.hasOwnProperty.call(_exportNames,e)||e in exports&&exports[e]===_menus[e]||Object.defineProperty(exports,e,{enumerable:!0,get:function(){return _menus[e]}})}),require("./src/formats")),_validators=(Object.keys(_formats).forEach(function(e){"default"===e||"__esModule"===e||Object.prototype.hasOwnProperty.call(_exportNames,e)||e in exports&&exports[e]===_formats[e]||Object.defineProperty(exports,e,{enumerable:!0,get:function(){return _formats[e]}})}),require("./src/validators")),_config=require("./src/config"),_theme=(Object.keys(_config).forEach(function(e){"default"===e||"__esModule"===e||Object.prototype.hasOwnProperty.call(_exportNames,e)||e in exports&&exports[e]===_config[e]||Object.defineProperty(exports,e,{enumerable:!0,get:function(){return _config[e]}})}),require("./src/theme")),_utils=require("../tools/utils"),_log=require("../tools/log");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}function _typeof(e){return(_typeof="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"==typeof Symbol&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e})(e)}function _classCallCheck(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}function _defineProperties(e,t){for(var r=0;r<t.length;r++){var o=t[r];o.enumerable=o.enumerable||!1,o.configurable=!0,"value"in o&&(o.writable=!0),Object.defineProperty(e,_toPropertyKey(o.key),o)}}function _createClass(e,t,r){return t&&_defineProperties(e.prototype,t),r&&_defineProperties(e,r),Object.defineProperty(e,"prototype",{writable:!1}),e}function _toPropertyKey(e){e=_toPrimitive(e,"string");return"symbol"==_typeof(e)?e:e+""}function _toPrimitive(e,t){if("object"!=_typeof(e)||!e)return e;var r=e[Symbol.toPrimitive];if(void 0===r)return("string"===t?String:Number)(e);r=r.call(e,t||"default");if("object"!=_typeof(r))return r;throw new TypeError("@@toPrimitive must return a primitive value.")}var installedPlugins=[];function use(e,t){return e&&e.install&&-1===installedPlugins.indexOf(e)&&(e.install(VXETable,t),installedPlugins.push(e)),VXETable}function reg(e){"development"===process.env.NODE_ENV&&VXETable.Table&&(0,_log.errLog)("vxe.error.useErr",[e]),VXETable["_".concat(e)]=1}function getExportOrImpotType(e,r){var o=[];return _xeUtils.default.objectEach(e,function(e,t){0!==e&&e!==r||o.push(t)}),o}var VXETableConfig=function(){return _createClass(function e(){_classCallCheck(this,e)},[{key:"zIndex",get:function(){return _utils.UtilTools.getLastZIndex()}},{key:"nextZIndex",get:function(){return _utils.UtilTools.nextZIndex()}},{key:"exportTypes",get:function(){return getExportOrImpotType(_conf.default.export.types,1)}},{key:"importTypes",get:function(){return getExportOrImpotType(_conf.default.export.types,2)}}])}(),globalConfs=exports.globalConfs=new VXETableConfig;function t(e,t){return _conf.default.i18n(e,t)}function _t(e,t){return e?_xeUtils.default.toValueString(_conf.default.translate?_conf.default.translate(e,t):e):""}var v=exports.v="v3",setup=exports.setup=_config.setConfig,globalStore=exports.globalStore={},VXETable=exports.VXETable={v:v,version:"3.8.6",reg:reg,use:use,setConfig:_config.setConfig,globalStore:globalStore,interceptor:_interceptor.interceptor,renderer:_renderer.renderer,commands:_commands.commands,formats:_formats.formats,menus:_menus.menus,validators:_validators.validators,t:t,_t:_t,config:_config.setConfig,setup:setup,globalConfs:globalConfs},_default=((0,_theme.setTheme)(globalStore),exports.default=VXETable);
@@ -3,7 +3,8 @@
3
3
  Object.defineProperty(exports, "__esModule", {
4
4
  value: true
5
5
  });
6
- exports.config = config;
6
+ exports.config = void 0;
7
+ exports.setConfig = setConfig;
7
8
  var _conf = _interopRequireDefault(require("./conf"));
8
9
  var _domZindex = _interopRequireDefault(require("dom-zindex"));
9
10
  var _xeUtils = _interopRequireDefault(require("xe-utils"));
@@ -12,7 +13,7 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
12
13
  /**
13
14
  * 全局参数设置
14
15
  */
15
- function config(options) {
16
+ function setConfig(options) {
16
17
  if (options) {
17
18
  if (options.theme) {
18
19
  (0, _theme.setTheme)(options);
@@ -22,4 +23,5 @@ function config(options) {
22
23
  }
23
24
  }
24
25
  return _xeUtils.default.merge(_conf.default, options);
25
- }
26
+ }
27
+ var config = exports.config = setConfig;
@@ -1 +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&&(e.theme&&(0,_theme.setTheme)(e),e.zIndex)&&_domZindex.default.setCurrent(e.zIndex),_xeUtils.default.merge(_conf.default,e)}
1
+ "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 CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "vxe-table",
3
- "version": "3.8.6-beta.2",
3
+ "version": "3.8.6",
4
4
  "description": "一个基于 vue 的 PC 端表单/表格组件,支持增删改查、虚拟列表、虚拟树、懒加载、快捷菜单、数据校验、树形结构、打印导出、表单渲染、数据分页、弹窗、自定义模板、渲染器、JSON 配置式...",
5
5
  "scripts": {
6
6
  "update": "npm install --legacy-peer-deps",
@@ -15,11 +15,11 @@ function updateDropHint (_vm, evnt) {
15
15
  return
16
16
  }
17
17
  if (dragHintEl) {
18
- const warpperEl = bodyEl.parentNode
19
- const warpperRect = warpperEl.getBoundingClientRect()
18
+ const wrapperEl = bodyEl.parentNode
19
+ const wrapperRect = wrapperEl.getBoundingClientRect()
20
20
  dragHintEl.style.display = 'block'
21
- dragHintEl.style.top = `${Math.min(warpperEl.clientHeight - warpperEl.scrollTop - dragHintEl.clientHeight, evnt.clientY - warpperRect.y)}px`
22
- dragHintEl.style.left = `${Math.min(warpperEl.clientWidth - warpperEl.scrollLeft - dragHintEl.clientWidth - 16, evnt.clientX - warpperRect.x)}px`
21
+ dragHintEl.style.top = `${Math.min(wrapperEl.clientHeight - wrapperEl.scrollTop - dragHintEl.clientHeight, evnt.clientY - wrapperRect.y)}px`
22
+ dragHintEl.style.left = `${Math.min(wrapperEl.clientWidth - wrapperEl.scrollLeft - dragHintEl.clientWidth - 16, evnt.clientX - wrapperRect.x)}px`
23
23
  }
24
24
  }
25
25
 
@@ -409,6 +409,9 @@ export default {
409
409
  if (this.toolbarConfig && !XEUtils.isObject(this.toolbarConfig)) {
410
410
  warnLog('vxe.error.errProp', [`grid.toolbar-config=${this.toolbarConfig}`, 'grid.toolbar-config={}'])
411
411
  }
412
+ // if (proxyOpts.props) {
413
+ // warnLog('vxe.error.delProp', ['proxy-config.props', 'proxy-config.response'])
414
+ // }
412
415
  }
413
416
  this.initPages()
414
417
  GlobalEvent.on(this, 'keydown', this.handleGlobalKeydownEvent)
@@ -524,8 +527,9 @@ export default {
524
527
  * @param {String/Object} code 字符串或对象
525
528
  */
526
529
  commitProxy (proxyTarget, ...args) {
527
- const { $refs, toolbar, toolbarConfig, toolbarOpts, proxyOpts, tablePage, pagerConfig, editRules, formData, isMsg, validConfig } = this
528
- const { beforeQuery, afterQuery, beforeDelete, afterDelete, beforeSave, afterSave, ajax = {}, props: proxyProps = {} } = proxyOpts
530
+ const { $refs, toolbar, toolbarConfig, toolbarOpts, proxyOpts, tablePage, pagerConfig, editRules, formData, isMsg, validConfig, pagerOpts } = this
531
+ const { beforeQuery, afterQuery, beforeDelete, afterDelete, beforeSave, afterSave, ajax = {} } = proxyOpts
532
+ const resConfigs = proxyOpts.response || proxyOpts.props || {}
529
533
  const $xetable = $refs.xTable
530
534
  let button
531
535
  let code
@@ -633,17 +637,20 @@ export default {
633
637
  .then(rest => {
634
638
  this.tableLoading = false
635
639
  if (rest) {
636
- if (isEnableConf(pagerConfig)) {
637
- const total = XEUtils.get(rest, proxyProps.total || 'page.total') || 0
640
+ if (pagerConfig && isEnableConf(pagerOpts)) {
641
+ const totalProp = resConfigs.total
642
+ const total = (XEUtils.isFunction(totalProp) ? totalProp({ data: rest, $grid: this }) : XEUtils.get(rest, totalProp || 'page.total')) || 0
638
643
  tablePage.total = XEUtils.toNumber(total)
639
- this.tableData = XEUtils.get(rest, proxyProps.result || 'result') || []
644
+ const resultProp = resConfigs.result
645
+ this.tableData = (XEUtils.isFunction(resultProp) ? resultProp({ data: rest, $grid: this }) : XEUtils.get(rest, resultProp || 'result')) || []
640
646
  // 检验当前页码,不能超出当前最大页数
641
647
  const pageCount = Math.max(Math.ceil(total / tablePage.pageSize), 1)
642
648
  if (tablePage.currentPage > pageCount) {
643
649
  tablePage.currentPage = pageCount
644
650
  }
645
651
  } else {
646
- this.tableData = (proxyProps.list ? XEUtils.get(rest, proxyProps.list) : rest) || []
652
+ const listProp = resConfigs.list
653
+ this.tableData = (listProp ? (XEUtils.isFunction(listProp) ? listProp({ data: rest, $grid: this }) : XEUtils.get(rest, listProp)) : rest) || []
647
654
  }
648
655
  } else {
649
656
  this.tableData = []
@@ -822,10 +829,11 @@ export default {
822
829
  return this.$nextTick()
823
830
  },
824
831
  getRespMsg (rest, defaultMsg) {
825
- const { props: proxyProps = {} } = this.proxyOpts
832
+ const { proxyOpts } = this
833
+ const resConfigs = proxyOpts.response || proxyOpts.props || {}
826
834
  let msg
827
- if (rest && proxyProps.message) {
828
- msg = XEUtils.get(rest, proxyProps.message)
835
+ if (rest && resConfigs.message) {
836
+ msg = XEUtils.get(rest, resConfigs.message)
829
837
  }
830
838
  return msg || GlobalConfig.i18n(defaultMsg)
831
839
  },
@@ -969,10 +969,10 @@ export default {
969
969
  }
970
970
  }
971
971
  if (this.autoResize) {
972
- const handleWarpperResize = this.resizeOpts.refreshDelay ? XEUtils.throttle(() => this.recalculate(true), this.resizeOpts.refreshDelay, { leading: true, trailing: true }) : null
973
- const resizeObserver = createResizeEvent(handleWarpperResize ? () => {
972
+ const handleWrapperResize = this.resizeOpts.refreshDelay ? XEUtils.throttle(() => this.recalculate(true), this.resizeOpts.refreshDelay, { leading: true, trailing: true }) : null
973
+ const resizeObserver = createResizeEvent(handleWrapperResize ? () => {
974
974
  if (this.autoResize) {
975
- requestAnimationFrame(handleWarpperResize)
975
+ requestAnimationFrame(handleWrapperResize)
976
976
  }
977
977
  } : () => {
978
978
  if (this.autoResize) {
@@ -6,7 +6,7 @@ import { commands } from './src/commands'
6
6
  import { menus } from './src/menus'
7
7
  import { formats } from './src/formats'
8
8
  import { validators } from './src/validators'
9
- import { config } from './src/config'
9
+ import { setConfig } from './src/config'
10
10
  import { setTheme } from './src/theme'
11
11
  import { UtilTools } from '../tools/utils'
12
12
  import { errLog } from '../tools/log'
@@ -90,7 +90,7 @@ export function _t (key, args) {
90
90
  }
91
91
 
92
92
  export const v = 'v3'
93
- export const setup = config
93
+ export const setup = setConfig
94
94
 
95
95
  export const globalStore = {}
96
96
 
@@ -99,7 +99,7 @@ export const VXETable = {
99
99
  version: process.env.VUE_APP_VXE_TABLE_VERSION,
100
100
  reg,
101
101
  use,
102
- setup,
102
+ setConfig,
103
103
  globalStore,
104
104
  interceptor,
105
105
  renderer,
@@ -111,7 +111,8 @@ export const VXETable = {
111
111
  _t,
112
112
 
113
113
  // 已废弃
114
- config,
114
+ config: setConfig,
115
+ setup,
115
116
  globalConfs
116
117
  }
117
118
 
@@ -6,7 +6,7 @@ import { setTheme } from './theme'
6
6
  /**
7
7
  * 全局参数设置
8
8
  */
9
- export function config (options) {
9
+ export function setConfig (options) {
10
10
  if (options) {
11
11
  if (options.theme) {
12
12
  setTheme(options)
@@ -17,3 +17,5 @@ export function config (options) {
17
17
  }
18
18
  return XEUtils.merge(GlobalConfig, options)
19
19
  }
20
+
21
+ export const config = setConfig
package/types/grid.d.ts CHANGED
@@ -103,11 +103,11 @@ export interface GridProxyConfig {
103
103
  sort?: boolean;
104
104
  filter?: boolean;
105
105
  form?: boolean;
106
- props?: {
107
- list?: string;
108
- result?: string;
109
- total?: string;
110
- message?: string;
106
+ response?: {
107
+ list?: string | null | ((params: { data: any }) => any[])
108
+ result?: string | ((params: { data: any }) => any[])
109
+ total?: string | ((params: { data: any }) => number)
110
+ message?: string | ((params: { data: any }) => string)
111
111
  };
112
112
  ajax?: {
113
113
  query?(params: { page: GridProxyQueryPageParams, sort: GridProxyQuerySortParams, filters: GridProxyQueryFiltersParams[], form: any }, ...args: any[]): Promise<any>;
@@ -115,6 +115,33 @@ export interface GridProxyConfig {
115
115
  save?(params: { body: { insertRecords: any[], updateRecords: any[], removeRecords: any[], pendingRecords: any[] } }, ...args: any[]): Promise<any>;
116
116
  }
117
117
  [key: string]: any;
118
+
119
+ /**
120
+ * 已废弃,请使用 proxy-config.response
121
+ * @deprecated
122
+ */
123
+ props?: {
124
+ /**
125
+ * 已废弃,请使用 proxy-config.response.list
126
+ * @deprecated
127
+ */
128
+ list?: string | null
129
+ /**
130
+ * 已废弃,请使用 proxy-config.response.result
131
+ * @deprecated
132
+ */
133
+ result?: string
134
+ /**
135
+ * 已废弃,请使用 proxy-config.response.total
136
+ * @deprecated
137
+ */
138
+ total?: string
139
+ /**
140
+ * 已废弃,请使用 proxy-config.response.message
141
+ * @deprecated
142
+ */
143
+ message?: string
144
+ }
118
145
  }
119
146
 
120
147
  export interface GridPagerConfig extends PagerOptions {
@@ -1,5 +1,3 @@
1
- import Vue from 'vue'
2
-
3
1
  import { ModalController } from '../modal'
4
2
  import { SaveFileFunction, ReadFileFunction, PrintFunction } from '../module/export'
5
3
 
@@ -27,6 +25,7 @@ export interface VxeGlobalStore {
27
25
  export const globalStore: VxeGlobalStore
28
26
 
29
27
  export const config: VxeGlobalConfigMethod
28
+ export const setConfig: VxeGlobalConfigMethod
30
29
  export const interceptor: VxeGlobalInterceptor
31
30
  export const renderer: VxeGlobalRenderer
32
31
  export const commands: VxeGlobalCommands
@@ -63,7 +62,7 @@ export interface VXETableCore {
63
62
  /**
64
63
  * 设置全局参数/获取所有参数
65
64
  */
66
- config: VxeGlobalConfigMethod;
65
+ setConfig: VxeGlobalConfigMethod;
67
66
  /**
68
67
  * 读取内部数据
69
68
  */
@@ -120,6 +119,7 @@ export interface VXETableCore {
120
119
  t: VxeGlobalI18n;
121
120
  _t: VxeGlobalTranslate;
122
121
 
122
+ config: VxeGlobalConfigMethod;
123
123
  /**
124
124
  * 已被 version 替换
125
125
  * @deprecated