byt-ui 0.1.10 → 0.1.12

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.
@@ -155816,7 +155816,10 @@ module.exports = function inspect_(obj, options, depth, seen) {
155816
155816
  if (typeof window !== 'undefined' && obj === window) {
155817
155817
  return '{ [object Window] }';
155818
155818
  }
155819
- if (obj === __webpack_require__.g) {
155819
+ if (
155820
+ (typeof globalThis !== 'undefined' && obj === globalThis)
155821
+ || (typeof __webpack_require__.g !== 'undefined' && obj === __webpack_require__.g)
155822
+ ) {
155820
155823
  return '{ [object globalThis] }';
155821
155824
  }
155822
155825
  if (!isDate(obj) && !isRegExp(obj)) {
@@ -176166,7 +176169,7 @@ class Minio {
176166
176169
  });
176167
176170
  });
176168
176171
  }
176169
- upload(file, bucketName, fileName) {
176172
+ putObject(file, bucketName, fileName) {
176170
176173
  return new Promise((resolve, reject) => {
176171
176174
  const metaData = {
176172
176175
  'Content-Type': file.type
@@ -176200,13 +176203,35 @@ class Minio {
176200
176203
  await this.minioMakeBucket(bucketName);
176201
176204
  }
176202
176205
  return new Promise((resolve, reject) => {
176203
- this.upload(file, bucketName, fileName).then(res => {
176206
+ this.putObject(file, bucketName, fileName).then(res => {
176204
176207
  resolve(res);
176205
176208
  }).catch(err => {
176206
176209
  reject(err);
176207
176210
  });
176208
176211
  });
176209
176212
  }
176213
+ upload(file, bucketName = 'public', unHodeName = true) {
176214
+ // file:文件
176215
+ // bucketName:桶名
176216
+ // unHodeName:是否保留原文件名,默认不保留
176217
+ // 上传图片至minio
176218
+ const {
176219
+ name
176220
+ } = file;
176221
+ const suffix = name.match(/\.[a-zA-Z\d]+$/i);
176222
+ const fileName = unHodeName ? `${new Date().getTime()}${suffix[0]}` : name;
176223
+ return new Promise((resolve, reject) => {
176224
+ this.uploadToMinio({
176225
+ file,
176226
+ bucketName,
176227
+ fileName
176228
+ }).then(() => {
176229
+ resolve(`/minio/${bucketName}/${fileName}`);
176230
+ }).catch(err => {
176231
+ reject(err);
176232
+ });
176233
+ });
176234
+ }
176210
176235
  }
176211
176236
  /* harmony default export */ __webpack_exports__["default"] = ({
176212
176237
  install(Vue, options = {}) {
@@ -180206,9 +180231,8 @@ class request_Request {
180206
180231
  if (token && !isToken) {
180207
180232
  config.headers['Authorization'] = `Bearer ${token}`; // token
180208
180233
  }
180209
- if (TENANT_ID) {
180210
- config.headers['TENANT-ID'] = TENANT_ID; // 租户ID
180211
- }
180234
+ config.headers['TENANT-ID'] = TENANT_ID || this.getQueryString('TENANT-ID') || ''; // 租户ID
180235
+
180212
180236
  return config;
180213
180237
  }, error => {
180214
180238
  return Promise.reject(error);
@@ -180258,6 +180282,14 @@ class request_Request {
180258
180282
  return Promise.reject(new Error(error));
180259
180283
  });
180260
180284
  }
180285
+ getQueryString(name) {
180286
+ const reg = new RegExp(`(^|&)${name}=([^&]*)(&|$)`, 'i');
180287
+ const r = window.location.search.substr(1).match(reg);
180288
+ if (r != null) {
180289
+ return decodeURIComponent(r[2]);
180290
+ }
180291
+ return null;
180292
+ }
180261
180293
  setMethods() {
180262
180294
  this._methods.forEach(v => {
180263
180295
  this.request[v] = ({
@@ -183518,7 +183550,7 @@ function generatePropagationContext() {
183518
183550
  //# sourceMappingURL=scope.js.map
183519
183551
 
183520
183552
  ;// CONCATENATED MODULE: ./node_modules/@sentry/core/esm/version.js
183521
- const SDK_VERSION = '7.117.0';
183553
+ const SDK_VERSION = '7.118.0';
183522
183554
 
183523
183555
 
183524
183556
  //# sourceMappingURL=version.js.map
@@ -215670,12 +215702,14 @@ Object.defineProperty(exports, "__esModule", ({
215670
215702
  }));
215671
215703
  exports["default"] = exports.VxeButtonGroup = exports.ButtonGroup = void 0;
215672
215704
  var _group = _interopRequireDefault(__webpack_require__(55562));
215705
+ var _vXETable = _interopRequireDefault(__webpack_require__(97080));
215673
215706
  function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
215674
215707
  var VxeButtonGroup = exports.VxeButtonGroup = Object.assign(_group.default, {
215675
215708
  install: function install(Vue) {
215676
215709
  Vue.component(_group.default.name, _group.default);
215677
215710
  }
215678
215711
  });
215712
+ _vXETable.default.component(_group.default);
215679
215713
  var ButtonGroup = exports.ButtonGroup = VxeButtonGroup;
215680
215714
  var _default = exports["default"] = VxeButtonGroup;
215681
215715
 
@@ -215692,12 +215726,14 @@ Object.defineProperty(exports, "__esModule", ({
215692
215726
  }));
215693
215727
  exports["default"] = exports.VxeButton = exports.Button = void 0;
215694
215728
  var _button = _interopRequireDefault(__webpack_require__(33409));
215729
+ var _vXETable = _interopRequireDefault(__webpack_require__(97080));
215695
215730
  function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
215696
215731
  var VxeButton = exports.VxeButton = Object.assign(_button.default, {
215697
215732
  install: function install(Vue) {
215698
215733
  Vue.component(_button.default.name, _button.default);
215699
215734
  }
215700
215735
  });
215736
+ _vXETable.default.component(_button.default);
215701
215737
  var Button = exports.Button = VxeButton;
215702
215738
  var _default = exports["default"] = VxeButton;
215703
215739
 
@@ -216258,12 +216294,14 @@ Object.defineProperty(exports, "__esModule", ({
216258
216294
  }));
216259
216295
  exports["default"] = exports.VxeCheckboxGroup = exports.CheckboxGroup = void 0;
216260
216296
  var _group = _interopRequireDefault(__webpack_require__(71363));
216297
+ var _vXETable = _interopRequireDefault(__webpack_require__(97080));
216261
216298
  function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
216262
216299
  var VxeCheckboxGroup = exports.VxeCheckboxGroup = Object.assign(_group.default, {
216263
216300
  install: function install(Vue) {
216264
216301
  Vue.component(_group.default.name, _group.default);
216265
216302
  }
216266
216303
  });
216304
+ _vXETable.default.component(_group.default);
216267
216305
  var CheckboxGroup = exports.CheckboxGroup = VxeCheckboxGroup;
216268
216306
  var _default = exports["default"] = VxeCheckboxGroup;
216269
216307
 
@@ -216280,12 +216318,14 @@ Object.defineProperty(exports, "__esModule", ({
216280
216318
  }));
216281
216319
  exports["default"] = exports.VxeCheckbox = exports.Checkbox = void 0;
216282
216320
  var _checkbox = _interopRequireDefault(__webpack_require__(66375));
216321
+ var _vXETable = _interopRequireDefault(__webpack_require__(97080));
216283
216322
  function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
216284
216323
  var VxeCheckbox = exports.VxeCheckbox = Object.assign(_checkbox.default, {
216285
216324
  install: function install(Vue) {
216286
216325
  Vue.component(_checkbox.default.name, _checkbox.default);
216287
216326
  }
216288
216327
  });
216328
+ _vXETable.default.component(_checkbox.default);
216289
216329
  var Checkbox = exports.Checkbox = VxeCheckbox;
216290
216330
  var _default = exports["default"] = VxeCheckbox;
216291
216331
 
@@ -216559,6 +216599,7 @@ Object.defineProperty(exports, "__esModule", ({
216559
216599
  }));
216560
216600
  exports["default"] = exports.VxeColgroup = exports.Colgroup = void 0;
216561
216601
  var _group = _interopRequireDefault(__webpack_require__(99506));
216602
+ var _vXETable = _interopRequireDefault(__webpack_require__(97080));
216562
216603
  function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
216563
216604
  var VxeColgroup = exports.VxeColgroup = Object.assign(_group.default, {
216564
216605
  install: function install(Vue) {
@@ -216567,6 +216608,7 @@ var VxeColgroup = exports.VxeColgroup = Object.assign(_group.default, {
216567
216608
  Vue.component('VxeTableColgroup', _group.default);
216568
216609
  }
216569
216610
  });
216611
+ _vXETable.default.component(_group.default);
216570
216612
  var Colgroup = exports.Colgroup = VxeColgroup;
216571
216613
  var _default = exports["default"] = VxeColgroup;
216572
216614
 
@@ -216583,6 +216625,7 @@ Object.defineProperty(exports, "__esModule", ({
216583
216625
  }));
216584
216626
  exports["default"] = exports.VxeColumn = exports.Column = void 0;
216585
216627
  var _column = _interopRequireDefault(__webpack_require__(71387));
216628
+ var _vXETable = _interopRequireDefault(__webpack_require__(97080));
216586
216629
  function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
216587
216630
  var VxeColumn = exports.VxeColumn = Object.assign(_column.default, {
216588
216631
  install: function install(Vue) {
@@ -216591,6 +216634,7 @@ var VxeColumn = exports.VxeColumn = Object.assign(_column.default, {
216591
216634
  Vue.component('VxeTableColumn', _column.default);
216592
216635
  }
216593
216636
  });
216637
+ _vXETable.default.component(_column.default);
216594
216638
  var Column = exports.Column = VxeColumn;
216595
216639
  var _default = exports["default"] = VxeColumn;
216596
216640
 
@@ -216625,7 +216669,7 @@ var _default = exports["default"] = VxeTableCustomModule;
216625
216669
  /***/ }),
216626
216670
 
216627
216671
  /***/ 5091:
216628
- /***/ (function(__unused_webpack_module, exports) {
216672
+ /***/ (function(__unused_webpack_module, exports, __webpack_require__) {
216629
216673
 
216630
216674
  "use strict";
216631
216675
 
@@ -216634,6 +216678,8 @@ Object.defineProperty(exports, "__esModule", ({
216634
216678
  value: true
216635
216679
  }));
216636
216680
  exports["default"] = void 0;
216681
+ var _xeUtils = _interopRequireDefault(__webpack_require__(78982));
216682
+ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
216637
216683
  var _default = exports["default"] = {
216638
216684
  methods: {
216639
216685
  _openCustom: function _openCustom() {
@@ -216641,9 +216687,26 @@ var _default = exports["default"] = {
216641
216687
  var initStore = this.initStore,
216642
216688
  customStore = this.customStore,
216643
216689
  collectColumn = this.collectColumn;
216690
+ var sortMaps = {};
216691
+ var fixedMaps = {};
216692
+ var visibleMaps = {};
216693
+ _xeUtils.default.eachTree(collectColumn, function (column) {
216694
+ var colid = column.getKey();
216695
+ column.renderFixed = column.fixed;
216696
+ column.renderVisible = column.visible;
216697
+ column.renderResizeWidth = column.renderWidth;
216698
+ sortMaps[colid] = column.renderSortNumber;
216699
+ fixedMaps[colid] = column.fixed;
216700
+ visibleMaps[colid] = column.visible;
216701
+ }, {
216702
+ children: 'children'
216703
+ });
216704
+ customStore.oldSortMaps = sortMaps;
216705
+ customStore.oldFixedMaps = fixedMaps;
216706
+ customStore.oldVisibleMaps = visibleMaps;
216707
+ this.customColumnList = collectColumn.slice(0);
216644
216708
  customStore.visible = true;
216645
216709
  initStore.custom = true;
216646
- this.customColumnList = collectColumn.slice(0);
216647
216710
  this.checkCustomStatus();
216648
216711
  this.calcMaxHeight();
216649
216712
  return this.$nextTick().then(function () {
@@ -216662,20 +216725,14 @@ var _default = exports["default"] = {
216662
216725
  return this.$nextTick();
216663
216726
  },
216664
216727
  calcMaxHeight: function calcMaxHeight() {
216665
- var $refs = this.$refs,
216728
+ var $el = this.$el,
216666
216729
  customStore = this.customStore;
216667
- var customWrapperElem = $refs.customWrapper ? $refs.customWrapper.$el : null;
216668
- var headElem = $refs.tableHeader ? $refs.tableHeader.$el : null;
216669
- var bodyElem = $refs.tableBody ? $refs.tableBody.$el : null;
216670
216730
  // 判断面板不能大于表格高度
216671
216731
  var tableHeight = 0;
216672
- if (headElem) {
216673
- tableHeight += headElem.clientHeight;
216674
- }
216675
- if (bodyElem) {
216676
- tableHeight += bodyElem.clientHeight;
216732
+ if ($el) {
216733
+ tableHeight = $el.clientHeight - 30;
216677
216734
  }
216678
- customStore.maxHeight = Math.max(0, customWrapperElem ? Math.min(customWrapperElem.clientHeight, tableHeight - 80) : 0);
216735
+ customStore.maxHeight = Math.max(4, tableHeight);
216679
216736
  },
216680
216737
  checkCustomStatus: function checkCustomStatus() {
216681
216738
  var customStore = this.customStore,
@@ -216685,12 +216742,12 @@ var _default = exports["default"] = {
216685
216742
  customStore.isAll = collectColumn.every(function (column) {
216686
216743
  return (checkMethod ? !checkMethod({
216687
216744
  column: column
216688
- }) : false) || column.visible;
216745
+ }) : false) || column.renderVisible;
216689
216746
  });
216690
216747
  customStore.isIndeterminate = !customStore.isAll && collectColumn.some(function (column) {
216691
216748
  return (!checkMethod || checkMethod({
216692
216749
  column: column
216693
- })) && (column.visible || column.halfVisible);
216750
+ })) && (column.renderVisible || column.halfVisible);
216694
216751
  });
216695
216752
  },
216696
216753
  emitCustomEvent: function emitCustomEvent(type, evnt) {
@@ -216769,16 +216826,21 @@ function updateDropHint(_vm, evnt) {
216769
216826
  dragHintEl.style.left = "".concat(Math.min(wrapperEl.clientWidth - wrapperEl.scrollLeft - dragHintEl.clientWidth - 16, evnt.clientX - wrapperRect.x), "px");
216770
216827
  }
216771
216828
  }
216772
- function renderSimplePanel(h, _vm) {
216773
- var $xetable = _vm.$xetable,
216829
+ var renderSimplePanel = function renderSimplePanel(h, _vm) {
216830
+ var _e = _vm._e,
216831
+ $xetable = _vm.$xetable,
216774
216832
  customStore = _vm.customStore;
216775
- var customOpts = $xetable.customOpts,
216776
- customColumnList = $xetable.customColumnList,
216833
+ var customColumnList = $xetable.customColumnList,
216834
+ customOpts = $xetable.customOpts,
216777
216835
  isMaxFixedColumn = $xetable.isMaxFixedColumn;
216778
216836
  var maxHeight = customStore.maxHeight;
216779
216837
  var checkMethod = customOpts.checkMethod,
216780
216838
  visibleMethod = customOpts.visibleMethod,
216781
- trigger = customOpts.trigger;
216839
+ allowVisible = customOpts.allowVisible,
216840
+ allowSort = customOpts.allowSort,
216841
+ allowFixed = customOpts.allowFixed,
216842
+ trigger = customOpts.trigger,
216843
+ placement = customOpts.placement;
216782
216844
  var colVNs = [];
216783
216845
  var customWrapperOns = {};
216784
216846
  // hover 触发
@@ -216791,7 +216853,7 @@ function renderSimplePanel(h, _vm) {
216791
216853
  column: column
216792
216854
  }) : true;
216793
216855
  if (isVisible) {
216794
- var isChecked = column.visible;
216856
+ var isChecked = column.renderVisible;
216795
216857
  var isIndeterminate = column.halfVisible;
216796
216858
  var isColGroup = column.children && column.children.length;
216797
216859
  var colTitle = formatText(column.getTitle(), 1);
@@ -216800,16 +216862,26 @@ function renderSimplePanel(h, _vm) {
216800
216862
  }) : false;
216801
216863
  colVNs.push(h('li', {
216802
216864
  key: column.id,
216865
+ attrs: {
216866
+ colid: column.id
216867
+ },
216803
216868
  class: ['vxe-table-custom--option', "level--".concat(column.level), {
216804
216869
  'is--group': isColGroup
216805
- }]
216806
- }, [h('div', {
216807
- title: colTitle,
216870
+ }],
216871
+ on: {
216872
+ dragstart: _vm.sortDragstartEvent,
216873
+ dragend: _vm.sortDragendEvent,
216874
+ dragover: _vm.sortDragoverEvent
216875
+ }
216876
+ }, [allowVisible ? h('div', {
216808
216877
  class: ['vxe-table-custom--checkbox-option', {
216809
216878
  'is--checked': isChecked,
216810
216879
  'is--indeterminate': isIndeterminate,
216811
216880
  'is--disabled': isDisabled
216812
216881
  }],
216882
+ attrs: {
216883
+ title: _conf.default.i18n('vxe.custom.setting.colVisible')
216884
+ },
216813
216885
  on: {
216814
216886
  click: function click() {
216815
216887
  if (!isDisabled) {
@@ -216819,17 +216891,33 @@ function renderSimplePanel(h, _vm) {
216819
216891
  }
216820
216892
  }, [h('span', {
216821
216893
  class: ['vxe-checkbox--icon', isIndeterminate ? _conf.default.icon.TABLE_CHECKBOX_INDETERMINATE : isChecked ? _conf.default.icon.TABLE_CHECKBOX_CHECKED : _conf.default.icon.TABLE_CHECKBOX_UNCHECKED]
216822
- }), h('span', {
216823
- class: 'vxe-checkbox--label'
216824
- }, colTitle)]), !parent && customOpts.allowFixed ? h('div', {
216894
+ })]) : _e(), allowSort && column.level === 1 ? h('div', {
216895
+ class: 'vxe-table-custom--sort-option'
216896
+ }, [h('span', {
216897
+ class: 'vxe-table-custom--sort-btn',
216898
+ attrs: {
216899
+ title: _conf.default.i18n('vxe.custom.setting.sortHelpTip')
216900
+ },
216901
+ on: {
216902
+ mousedown: _vm.sortMousedownEvent,
216903
+ mouseup: _vm.sortMouseupEvent
216904
+ }
216905
+ }, [h('i', {
216906
+ class: _conf.default.icon.TABLE_CUSTOM_SORT
216907
+ })])]) : _e(), h('div', {
216908
+ class: 'vxe-table-custom--checkbox-label',
216909
+ attrs: {
216910
+ title: colTitle
216911
+ }
216912
+ }, colTitle), !parent && allowFixed ? h('div', {
216825
216913
  class: 'vxe-table-custom--fixed-option'
216826
216914
  }, [h('span', {
216827
- class: ['vxe-table-custom--fixed-left-option', column.fixed === 'left' ? _conf.default.icon.TOOLBAR_TOOLS_FIXED_LEFT_ACTIVED : _conf.default.icon.TOOLBAR_TOOLS_FIXED_LEFT, {
216828
- 'is--checked': column.fixed === 'left',
216829
- 'is--disabled': isMaxFixedColumn && !column.fixed
216915
+ class: ['vxe-table-custom--fixed-left-option', column.renderFixed === 'left' ? _conf.default.icon.TOOLBAR_TOOLS_FIXED_LEFT_ACTIVE : _conf.default.icon.TOOLBAR_TOOLS_FIXED_LEFT, {
216916
+ 'is--checked': column.renderFixed === 'left',
216917
+ 'is--disabled': isMaxFixedColumn && !column.renderFixed
216830
216918
  }],
216831
216919
  attrs: {
216832
- title: _conf.default.i18n(column.fixed === 'left' ? 'vxe.toolbar.cancelFixed' : 'vxe.toolbar.fixedLeft')
216920
+ title: _conf.default.i18n(column.renderFixed === 'left' ? 'vxe.toolbar.cancelFixed' : 'vxe.toolbar.fixedLeft')
216833
216921
  },
216834
216922
  on: {
216835
216923
  click: function click() {
@@ -216837,33 +216925,36 @@ function renderSimplePanel(h, _vm) {
216837
216925
  }
216838
216926
  }
216839
216927
  }), h('span', {
216840
- class: ['vxe-table-custom--fixed-right-option', column.fixed === 'right' ? _conf.default.icon.TOOLBAR_TOOLS_FIXED_RIGHT_ACTIVED : _conf.default.icon.TOOLBAR_TOOLS_FIXED_RIGHT, {
216841
- 'is--checked': column.fixed === 'right',
216842
- 'is--disabled': isMaxFixedColumn && !column.fixed
216928
+ class: ['vxe-table-custom--fixed-right-option', column.renderFixed === 'right' ? _conf.default.icon.TOOLBAR_TOOLS_FIXED_RIGHT_ACTIVE : _conf.default.icon.TOOLBAR_TOOLS_FIXED_RIGHT, {
216929
+ 'is--checked': column.renderFixed === 'right',
216930
+ 'is--disabled': isMaxFixedColumn && !column.renderFixed
216843
216931
  }],
216844
216932
  attrs: {
216845
- title: _conf.default.i18n(column.fixed === 'right' ? 'vxe.toolbar.cancelFixed' : 'vxe.toolbar.fixedRight')
216933
+ title: _conf.default.i18n(column.renderFixed === 'right' ? 'vxe.toolbar.cancelFixed' : 'vxe.toolbar.fixedRight')
216846
216934
  },
216847
216935
  on: {
216848
216936
  click: function click() {
216849
216937
  _vm.changeFixedOption(column, 'right');
216850
216938
  }
216851
216939
  }
216852
- })]) : null]));
216940
+ })]) : _e()]));
216853
216941
  }
216854
216942
  });
216855
216943
  var isAllChecked = customStore.isAll;
216856
216944
  var isAllIndeterminate = customStore.isIndeterminate;
216857
216945
  return h('div', {
216858
216946
  key: 'simple',
216859
- class: ['vxe-table-custom-wrapper', {
216947
+ class: ['vxe-table-custom-wrapper', "placement--".concat(placement), {
216860
216948
  'is--active': customStore.visible
216861
- }]
216862
- }, [h('ul', {
216949
+ }],
216950
+ style: maxHeight && !['left', 'right'].includes(placement) ? {
216951
+ maxHeight: "".concat(maxHeight, "px")
216952
+ } : {}
216953
+ }, customStore.visible ? [h('ul', {
216863
216954
  class: 'vxe-table-custom--header'
216864
216955
  }, [h('li', {
216865
216956
  class: 'vxe-table-custom--option'
216866
- }, [h('div', {
216957
+ }, [allowVisible ? h('div', {
216867
216958
  class: ['vxe-table-custom--checkbox-option', {
216868
216959
  'is--checked': isAllChecked,
216869
216960
  'is--indeterminate': isAllIndeterminate
@@ -216878,42 +216969,63 @@ function renderSimplePanel(h, _vm) {
216878
216969
  class: ['vxe-checkbox--icon', isAllIndeterminate ? _conf.default.icon.TABLE_CHECKBOX_INDETERMINATE : isAllChecked ? _conf.default.icon.TABLE_CHECKBOX_CHECKED : _conf.default.icon.TABLE_CHECKBOX_UNCHECKED]
216879
216970
  }), h('span', {
216880
216971
  class: 'vxe-checkbox--label'
216881
- }, _conf.default.i18n('vxe.toolbar.customAll'))])])]), h('ul', {
216972
+ }, _conf.default.i18n('vxe.toolbar.customAll'))]) : h('span', {
216973
+ class: 'vxe-checkbox--label'
216974
+ }, _conf.default.i18n('vxe.table.customTitle'))])]), h('div', {
216975
+ ref: 'bodyElemRef',
216976
+ class: 'vxe-table-custom--list-wrapper'
216977
+ }, [h('transition-group', {
216882
216978
  class: 'vxe-table-custom--body',
216883
- style: maxHeight ? {
216884
- maxHeight: "".concat(maxHeight, "px")
216885
- } : {},
216979
+ props: {
216980
+ name: 'vxe-table-custom--list',
216981
+ tag: 'ul'
216982
+ },
216886
216983
  on: customWrapperOns
216887
- }, colVNs), customOpts.showFooter ? h('div', {
216984
+ }, colVNs), h('div', {
216985
+ ref: 'dragHintElemRef',
216986
+ class: 'vxe-table-custom-popup--drag-hint'
216987
+ }, _conf.default.i18n('vxe.custom.cstmDragTarget', [_vm.dragColumn ? _vm.dragColumn.getTitle() : '']))]), customOpts.showFooter ? h('div', {
216888
216988
  class: 'vxe-table-custom--footer'
216889
216989
  }, [h('button', {
216890
216990
  class: 'btn--reset',
216891
216991
  on: {
216892
216992
  click: _vm.resetCustomEvent
216893
216993
  }
216894
- }, customOpts.resetButtonText || _conf.default.i18n('vxe.toolbar.customRestore')), h('button', {
216994
+ }, customOpts.resetButtonText || _conf.default.i18n('vxe.table.customRestore')), customOpts.immediate ? _e() : h('button', {
216995
+ class: 'btn--cancel',
216996
+ on: {
216997
+ click: _vm.cancelCustomEvent
216998
+ }
216999
+ }, customOpts.resetButtonText || _conf.default.i18n('vxe.table.customCancel')), h('button', {
216895
217000
  class: 'btn--confirm',
216896
217001
  on: {
216897
217002
  click: _vm.confirmCustomEvent
216898
217003
  }
216899
- }, customOpts.confirmButtonText || _conf.default.i18n('vxe.toolbar.customConfirm'))]) : null]);
216900
- }
216901
- function renderPopupPanel(h, _vm) {
216902
- var $xetable = _vm.$xetable,
217004
+ }, customOpts.confirmButtonText || _conf.default.i18n('vxe.table.customConfirm'))]) : null] : []);
217005
+ };
217006
+ var renderPopupPanel = function renderPopupPanel(h, _vm) {
217007
+ var _e = _vm._e,
217008
+ $xetable = _vm.$xetable,
216903
217009
  customStore = _vm.customStore;
216904
217010
  var customOpts = $xetable.customOpts,
216905
217011
  customColumnList = $xetable.customColumnList,
216906
217012
  columnOpts = $xetable.columnOpts,
216907
217013
  isMaxFixedColumn = $xetable.isMaxFixedColumn;
216908
- var checkMethod = customOpts.checkMethod,
217014
+ var modalOptions = customOpts.modalOptions,
217015
+ allowVisible = customOpts.allowVisible,
217016
+ allowSort = customOpts.allowSort,
217017
+ allowFixed = customOpts.allowFixed,
217018
+ allowResizable = customOpts.allowResizable,
217019
+ checkMethod = customOpts.checkMethod,
216909
217020
  visibleMethod = customOpts.visibleMethod;
217021
+ var modalOpts = Object.assign({}, modalOptions);
216910
217022
  var trVNs = [];
216911
217023
  _xeUtils.default.eachTree(customColumnList, function (column, index, items, path, parent) {
216912
217024
  var isVisible = visibleMethod ? visibleMethod({
216913
217025
  column: column
216914
217026
  }) : true;
216915
217027
  if (isVisible) {
216916
- var isChecked = column.visible;
217028
+ var isChecked = column.renderVisible;
216917
217029
  var isIndeterminate = column.halfVisible;
216918
217030
  var colTitle = formatText(column.getTitle(), 1);
216919
217031
  var isColGroup = column.children && column.children.length;
@@ -216922,56 +217034,75 @@ function renderPopupPanel(h, _vm) {
216922
217034
  }) : false;
216923
217035
  trVNs.push(h('tr', {
216924
217036
  key: column.id,
216925
- class: ["vxe-table-custom-popup--row level--".concat(column.level), {
216926
- 'is--group': isColGroup
216927
- }],
216928
217037
  attrs: {
216929
217038
  colid: column.id
216930
217039
  },
217040
+ class: ["vxe-table-custom-popup--row level--".concat(column.level), {
217041
+ 'is--group': isColGroup
217042
+ }],
216931
217043
  on: {
216932
217044
  dragstart: _vm.sortDragstartEvent,
216933
217045
  dragend: _vm.sortDragendEvent,
216934
217046
  dragover: _vm.sortDragoverEvent
216935
217047
  }
216936
- }, [h('td', {
217048
+ }, [allowVisible ? h('td', {
217049
+ class: 'vxe-table-custom-popup--column-item col--visible'
217050
+ }, [h('div', {
217051
+ class: ['vxe-table-custom--checkbox-option', {
217052
+ 'is--checked': isChecked,
217053
+ 'is--indeterminate': isIndeterminate,
217054
+ 'is--disabled': isDisabled
217055
+ }],
217056
+ attrs: {
217057
+ title: _conf.default.i18n('vxe.custom.setting.colVisible')
217058
+ },
217059
+ on: {
217060
+ click: function click() {
217061
+ if (!isDisabled) {
217062
+ _vm.changeCheckboxOption(column);
217063
+ }
217064
+ }
217065
+ }
217066
+ }, [h('span', {
217067
+ class: ['vxe-checkbox--icon', isIndeterminate ? _conf.default.icon.TABLE_CHECKBOX_INDETERMINATE : isChecked ? _conf.default.icon.TABLE_CHECKBOX_CHECKED : _conf.default.icon.TABLE_CHECKBOX_UNCHECKED]
217068
+ })])]) : _e(), allowSort ? h('td', {
216937
217069
  class: 'vxe-table-custom-popup--column-item col--sort'
216938
217070
  }, [column.level === 1 ? h('span', {
216939
217071
  class: 'vxe-table-custom-popup--column-sort-btn',
217072
+ attrs: {
217073
+ title: _conf.default.i18n('vxe.custom.setting.sortHelpTip')
217074
+ },
216940
217075
  on: {
216941
217076
  mousedown: _vm.sortMousedownEvent,
216942
217077
  mouseup: _vm.sortMouseupEvent
216943
217078
  }
216944
217079
  }, [h('i', {
216945
- class: 'vxe-icon-sort'
216946
- })]) : null]), h('td', {
217080
+ class: _conf.default.icon.TABLE_CUSTOM_SORT
217081
+ })]) : h('span', '-')]) : _e(), h('td', {
216947
217082
  class: 'vxe-table-custom-popup--column-item col--name'
216948
217083
  }, [h('div', {
216949
217084
  class: 'vxe-table-custom-popup--name',
216950
217085
  attrs: {
216951
217086
  title: colTitle
216952
217087
  }
216953
- }, colTitle)]), h('td', {
216954
- class: 'vxe-table-custom-popup--column-item col--visible'
216955
- }, [h('div', {
216956
- class: ['vxe-table-custom--checkbox-option', {
216957
- 'is--checked': isChecked,
216958
- 'is--indeterminate': isIndeterminate,
216959
- 'is--disabled': isDisabled
216960
- }],
217088
+ }, colTitle)]), allowResizable ? h('td', {
217089
+ class: 'vxe-table-custom-popup--column-item col--resizable'
217090
+ }, [!isChecked || column.children && column.children.length ? h('span', '-') : h('vxe-input', {
217091
+ props: {
217092
+ type: 'integer',
217093
+ min: 40,
217094
+ value: column.renderResizeWidth
217095
+ },
216961
217096
  on: {
216962
- click: function click() {
216963
- if (!isDisabled) {
216964
- _vm.changeCheckboxOption(column);
216965
- }
217097
+ modelValue: function modelValue(value) {
217098
+ column.renderResizeWidth = Math.max(40, Number(value));
216966
217099
  }
216967
217100
  }
216968
- }, [h('span', {
216969
- class: ['vxe-checkbox--icon', isIndeterminate ? _conf.default.icon.TABLE_CHECKBOX_INDETERMINATE : isChecked ? _conf.default.icon.TABLE_CHECKBOX_CHECKED : _conf.default.icon.TABLE_CHECKBOX_UNCHECKED]
216970
- })])]), h('td', {
217101
+ })]) : _e(), allowFixed ? h('td', {
216971
217102
  class: 'vxe-table-custom-popup--column-item col--fixed'
216972
- }, [!parent && customOpts.allowFixed ? h('vxe-radio-group', {
217103
+ }, [parent ? h('span', '-') : h('vxe-radio-group', {
216973
217104
  props: {
216974
- value: column.fixed || '',
217105
+ value: column.renderFixed || '',
216975
217106
  type: 'button',
216976
217107
  size: 'mini',
216977
217108
  options: [{
@@ -216989,25 +217120,26 @@ function renderPopupPanel(h, _vm) {
216989
217120
  },
216990
217121
  on: {
216991
217122
  input: function input(value) {
216992
- column.fixed = value;
216993
- },
216994
- change: function change() {
216995
- _vm.changePopupFixedOption(column);
216996
- }
217123
+ column.renderFixed = value;
217124
+ } // onChange () {
217125
+ // changePopupFixedOption(column)
217126
+ // }
216997
217127
  }
216998
- }) : null])]));
217128
+ })]) : _e()]));
216999
217129
  }
217000
217130
  });
217131
+ var isAllChecked = customStore.isAll;
217132
+ var isAllIndeterminate = customStore.isIndeterminate;
217001
217133
  return h('vxe-modal', {
217002
217134
  key: 'popup',
217003
217135
  props: {
217136
+ className: ['vxe-table-custom-popup-wrapper', 'vxe-table--ignore-clear', modalOpts.className || ''].join(' '),
217004
217137
  value: customStore.visible,
217005
- title: _conf.default.i18n('vxe.custom.cstmTitle'),
217006
- className: 'vxe-table-custom-popup-wrapper vxe-table--ignore-clear',
217007
- width: '40vw',
217008
- minWidth: 520,
217009
- height: '50vh',
217010
- minHeight: 300,
217138
+ title: modalOpts.title || _conf.default.i18n('vxe.custom.cstmTitle'),
217139
+ width: modalOpts.width || '50vw',
217140
+ minWidth: modalOpts.minWidth || 700,
217141
+ height: modalOpts.height || '50vh',
217142
+ minHeight: modalOpts.minHeight || 400,
217011
217143
  mask: true,
217012
217144
  lockView: true,
217013
217145
  showFooter: true,
@@ -217027,24 +217159,47 @@ function renderPopupPanel(h, _vm) {
217027
217159
  class: 'vxe-table-custom-popup--body'
217028
217160
  }, [h('div', {
217029
217161
  class: 'vxe-table-custom-popup--table-wrapper'
217030
- }, [h('table', {}, [h('colgroup', {}, [h('col', {
217162
+ }, [h('table', {}, [h('colgroup', {}, [allowVisible ? h('col', {
217031
217163
  style: {
217032
217164
  width: '80px'
217033
217165
  }
217034
- }), h('col'), h('col', {
217166
+ }) : _e(), allowSort ? h('col', {
217035
217167
  style: {
217036
217168
  width: '80px'
217037
217169
  }
217038
- }), h('col', {
217170
+ }) : _e(), h('col', {
217171
+ style: {
217172
+ minWidth: '120px'
217173
+ }
217174
+ }), allowResizable ? h('col', {
217175
+ style: {
217176
+ width: '140px'
217177
+ }
217178
+ }) : _e(), allowFixed ? h('col', {
217039
217179
  style: {
217040
217180
  width: '200px'
217041
217181
  }
217042
- })]), h('thead', {}, [h('tr', {}, [h('th', {}, [h('span', {
217182
+ }) : _e()]), h('thead', {}, [h('tr', {}, [allowVisible ? h('th', {}, [h('div', {
217183
+ class: ['vxe-table-custom--checkbox-option', {
217184
+ 'is--checked': isAllChecked,
217185
+ 'is--indeterminate': isAllIndeterminate
217186
+ }],
217187
+ attrs: {
217188
+ title: _conf.default.i18n('vxe.table.allTitle')
217189
+ },
217190
+ on: {
217191
+ click: _vm.allCustomEvent
217192
+ }
217193
+ }, [h('span', {
217194
+ class: ['vxe-checkbox--icon', isAllIndeterminate ? _conf.default.icon.TABLE_CHECKBOX_INDETERMINATE : isAllChecked ? _conf.default.icon.TABLE_CHECKBOX_CHECKED : _conf.default.icon.TABLE_CHECKBOX_UNCHECKED]
217195
+ }), h('span', {
217196
+ class: 'vxe-checkbox--label'
217197
+ }, _conf.default.i18n('vxe.toolbar.customAll'))])]) : _e(), allowSort ? h('th', {}, [h('span', {
217043
217198
  class: 'vxe-table-custom-popup--table-sort-help-title'
217044
217199
  }, _conf.default.i18n('vxe.custom.setting.colSort')), h('vxe-tooltip', {
217045
217200
  props: {
217046
217201
  enterable: true,
217047
- content: '点击并拖动图标可以调整列的排序'
217202
+ content: _conf.default.i18n('vxe.custom.setting.sortHelpTip')
217048
217203
  },
217049
217204
  scopedSlots: {
217050
217205
  default: function _default() {
@@ -217053,7 +217208,7 @@ function renderPopupPanel(h, _vm) {
217053
217208
  });
217054
217209
  }
217055
217210
  }
217056
- })]), h('th', {}, _conf.default.i18n('vxe.custom.setting.colTitle')), h('th', {}, _conf.default.i18n('vxe.custom.setting.colVisible')), h('th', {}, _conf.default.i18n('vxe.custom.setting.colFixed', [columnOpts.maxFixedSize || 0]))])]), h('transition-group', {
217211
+ })]) : _e(), h('th', {}, _conf.default.i18n('vxe.custom.setting.colTitle')), allowResizable ? h('th', {}, _conf.default.i18n('vxe.custom.setting.colResizable')) : _e(), allowFixed ? h('th', {}, _conf.default.i18n('vxe.custom.setting.colFixed', [columnOpts.maxFixedSize || 0])) : _e()])]), h('transition-group', {
217057
217212
  class: 'vxe-table-custom--body',
217058
217213
  props: {
217059
217214
  tag: 'tbody',
@@ -217072,7 +217227,7 @@ function renderPopupPanel(h, _vm) {
217072
217227
  content: customOpts.resetButtonText || _conf.default.i18n('vxe.custom.cstmRestore')
217073
217228
  },
217074
217229
  on: {
217075
- click: _vm.resetPopupCustomEvent
217230
+ click: _vm.resetCustomEvent
217076
217231
  }
217077
217232
  }), h('vxe-button', {
217078
217233
  props: {
@@ -217093,7 +217248,7 @@ function renderPopupPanel(h, _vm) {
217093
217248
  }
217094
217249
  }
217095
217250
  });
217096
- }
217251
+ };
217097
217252
  var _default2 = exports["default"] = {
217098
217253
  name: 'VxeTableCustomPanel',
217099
217254
  props: {
@@ -217140,23 +217295,101 @@ var _default2 = exports["default"] = {
217140
217295
  }
217141
217296
  }, 300);
217142
217297
  },
217298
+ getStoreData: function getStoreData() {
217299
+ return {};
217300
+ },
217301
+ handleSaveStore: function handleSaveStore(type) {
217302
+ var $xetable = this.$xetable;
217303
+ var id = $xetable.id,
217304
+ customOpts = $xetable.customOpts;
217305
+ var storage = customOpts.storage,
217306
+ updateStore = customOpts.updateStore;
217307
+ if (storage && id && updateStore) {
217308
+ updateStore({
217309
+ id: id,
217310
+ type: type,
217311
+ storeData: $xetable.getCustomStoreData()
217312
+ });
217313
+ }
217314
+ },
217143
217315
  confirmCustomEvent: function confirmCustomEvent(evnt) {
217144
217316
  var $xetable = this.$xetable;
217317
+ var customOpts = $xetable.customOpts,
217318
+ customColumnList = $xetable.customColumnList;
217319
+ var allowVisible = customOpts.allowVisible,
217320
+ allowSort = customOpts.allowSort,
217321
+ allowFixed = customOpts.allowFixed,
217322
+ allowResizable = customOpts.allowResizable;
217323
+ _xeUtils.default.eachTree(customColumnList, function (column, index, items, path, parent) {
217324
+ if (!parent) {
217325
+ if (allowSort) {
217326
+ var sortIndex = index + 1;
217327
+ column.renderSortNumber = sortIndex;
217328
+ }
217329
+ if (allowFixed) {
217330
+ column.fixed = column.renderFixed;
217331
+ }
217332
+ }
217333
+ if (allowResizable) {
217334
+ if (column.renderVisible && (!column.children || column.children.length)) {
217335
+ if (column.renderResizeWidth !== column.renderWidth) {
217336
+ column.resizeWidth = column.renderResizeWidth;
217337
+ column.renderWidth = column.renderResizeWidth;
217338
+ }
217339
+ }
217340
+ }
217341
+ if (allowVisible) {
217342
+ column.visible = column.renderVisible;
217343
+ }
217344
+ });
217145
217345
  $xetable.closeCustom();
217146
217346
  $xetable.emitCustomEvent('confirm', evnt);
217347
+ this.handleSaveStore('confirm');
217147
217348
  },
217148
217349
  cancelCustomEvent: function cancelCustomEvent(evnt) {
217149
217350
  var $xetable = this.$xetable;
217351
+ var customStore = $xetable.customStore,
217352
+ customOpts = $xetable.customOpts,
217353
+ customColumnList = $xetable.customColumnList;
217354
+ var oldSortMaps = customStore.oldSortMaps,
217355
+ oldFixedMaps = customStore.oldFixedMaps,
217356
+ oldVisibleMaps = customStore.oldVisibleMaps;
217357
+ var allowVisible = customOpts.allowVisible,
217358
+ allowSort = customOpts.allowSort,
217359
+ allowFixed = customOpts.allowFixed,
217360
+ allowResizable = customOpts.allowResizable;
217361
+ _xeUtils.default.eachTree(customColumnList, function (column) {
217362
+ var colid = column.getKey();
217363
+ var visible = !!oldVisibleMaps[colid];
217364
+ var fixed = oldFixedMaps[colid] || '';
217365
+ if (allowVisible) {
217366
+ column.renderVisible = visible;
217367
+ column.visible = visible;
217368
+ }
217369
+ if (allowFixed) {
217370
+ column.renderFixed = fixed;
217371
+ column.fixed = fixed;
217372
+ }
217373
+ if (allowSort) {
217374
+ column.renderSortNumber = oldSortMaps[colid] || 0;
217375
+ }
217376
+ if (allowResizable) {
217377
+ column.renderResizeWidth = column.renderWidth;
217378
+ }
217379
+ }, {
217380
+ children: 'children'
217381
+ });
217150
217382
  $xetable.closeCustom();
217151
217383
  $xetable.emitCustomEvent('cancel', evnt);
217152
217384
  },
217153
- resetCustomEvent: function resetCustomEvent(evnt) {
217385
+ handleResetCustomEvent: function handleResetCustomEvent(evnt) {
217154
217386
  var $xetable = this.$xetable;
217155
217387
  $xetable.resetColumn(true);
217156
217388
  $xetable.closeCustom();
217157
217389
  $xetable.emitCustomEvent('reset', evnt);
217390
+ this.handleSaveStore('reset');
217158
217391
  },
217159
- resetPopupCustomEvent: function resetPopupCustomEvent(evnt) {
217392
+ resetCustomEvent: function resetCustomEvent(evnt) {
217160
217393
  var _this = this;
217161
217394
  if (_vXETable.default.modal) {
217162
217395
  _vXETable.default.modal.confirm({
@@ -217165,7 +217398,23 @@ var _default2 = exports["default"] = {
217165
217398
  escClosable: true
217166
217399
  }).then(function (type) {
217167
217400
  if (type === 'confirm') {
217168
- _this.resetCustomEvent(evnt);
217401
+ _this.handleResetCustomEvent(evnt);
217402
+ }
217403
+ });
217404
+ } else {
217405
+ this.handleResetCustomEvent(evnt);
217406
+ }
217407
+ },
217408
+ resetPopupCustomEvent: function resetPopupCustomEvent(evnt) {
217409
+ var _this2 = this;
217410
+ if (_vXETable.default.modal) {
217411
+ _vXETable.default.modal.confirm({
217412
+ content: _conf.default.i18n('vxe.custom.cstmConfirmRestore'),
217413
+ className: 'vxe-table--ignore-clear',
217414
+ escClosable: true
217415
+ }).then(function (type) {
217416
+ if (type === 'confirm') {
217417
+ _this2.resetCustomEvent(evnt);
217169
217418
  }
217170
217419
  });
217171
217420
  } else {
@@ -217194,9 +217443,9 @@ var _default2 = exports["default"] = {
217194
217443
  changeCheckboxOption: function changeCheckboxOption(column) {
217195
217444
  var $xetable = this.$xetable;
217196
217445
  var customOpts = $xetable.customOpts;
217197
- var isChecked = !column.visible;
217446
+ var isChecked = !column.renderVisible;
217198
217447
  _xeUtils.default.eachTree([column], function (item) {
217199
- item.visible = isChecked;
217448
+ item.renderVisible = isChecked;
217200
217449
  item.halfVisible = false;
217201
217450
  });
217202
217451
  this.handleOptionCheck(column);
@@ -217208,21 +217457,23 @@ var _default2 = exports["default"] = {
217208
217457
  changeFixedOption: function changeFixedOption(column, colFixed) {
217209
217458
  var $xetable = this.$xetable;
217210
217459
  var isMaxFixedColumn = $xetable.isMaxFixedColumn;
217211
- if (column.fixed === colFixed) {
217212
- $xetable.clearColumnFixed(column);
217460
+ if (column.renderFixed === colFixed) {
217461
+ column.renderFixed = '';
217462
+ // $xeTable.clearColumnFixed(column)
217213
217463
  } else {
217214
- if (!isMaxFixedColumn || column.fixed) {
217215
- $xetable.setColumnFixed(column, colFixed);
217464
+ if (!isMaxFixedColumn || column.renderFixed) {
217465
+ column.renderFixed = colFixed;
217466
+ // $xeTable.setColumnFixed(column, colFixed)
217216
217467
  }
217217
217468
  }
217218
217469
  },
217219
- changePopupFixedOption: function changePopupFixedOption(column) {
217220
- var $xetable = this.$xetable;
217221
- var isMaxFixedColumn = $xetable.isMaxFixedColumn;
217222
- if (!isMaxFixedColumn) {
217223
- $xetable.setColumnFixed(column, column.fixed);
217224
- }
217225
- },
217470
+ // changePopupFixedOption (column) {
217471
+ // const { $xetable } = this
217472
+ // const { isMaxFixedColumn } = $xetable
217473
+ // if (!isMaxFixedColumn) {
217474
+ // $xetable.setColumnFixed(column, column.fixed)
217475
+ // }
217476
+ // },
217226
217477
  allCustomEvent: function allCustomEvent() {
217227
217478
  var $xetable = this.$xetable,
217228
217479
  customStore = this.customStore;
@@ -217234,7 +217485,7 @@ var _default2 = exports["default"] = {
217234
217485
  if (!checkMethod || checkMethod({
217235
217486
  column: column
217236
217487
  })) {
217237
- column.visible = isAll;
217488
+ column.renderVisible = isAll;
217238
217489
  column.halfVisible = false;
217239
217490
  }
217240
217491
  });
@@ -217313,8 +217564,6 @@ var _default2 = exports["default"] = {
217313
217564
  }
217314
217565
  removeClass(trEl, 'active--drag-target');
217315
217566
  removeClass(trEl, 'active--drag-origin');
217316
- // 更新顺序
217317
- this.updateColumnSort();
217318
217567
  },
217319
217568
  sortDragoverEvent: function sortDragoverEvent(evnt) {
217320
217569
  var $xetable = this.$xetable,
@@ -217335,15 +217584,6 @@ var _default2 = exports["default"] = {
217335
217584
  this.prevDropTrEl = trEl;
217336
217585
  }
217337
217586
  updateDropHint(this, evnt);
217338
- },
217339
- updateColumnSort: function updateColumnSort() {
217340
- var $xetable = this.$xetable;
217341
- var customColumnList = $xetable.customColumnList;
217342
- // 更新顺序
217343
- customColumnList.forEach(function (column, index) {
217344
- var sortIndex = index + 1;
217345
- column.renderSortNumber = sortIndex;
217346
- });
217347
217587
  }
217348
217588
  }
217349
217589
  };
@@ -217922,7 +218162,7 @@ var _default = exports["default"] = {
217922
218162
  var row = params.row,
217923
218163
  column = params.column;
217924
218164
  var editRender = column.editRender;
217925
- var cell = params.cell = params.cell || this.getCell(row, column);
218165
+ var cell = params.cell = params.cell || this.getCellElement(row, column);
217926
218166
  var beforeEditMethod = editOpts.beforeEditMethod || editOpts.activeMethod;
217927
218167
  if (cell && (0, _utils.isEnableConf)(editConfig) && (0, _utils.isEnableConf)(editRender)) {
217928
218168
  // 激活编辑
@@ -218130,10 +218370,10 @@ var _default = exports["default"] = {
218130
218370
  autoselect = editRender.autoselect;
218131
218371
  var inputElem;
218132
218372
  if (!autofocus && compRender) {
218133
- autofocus = compRender.autofocus;
218373
+ autofocus = compRender.tableAutofocus || compRender.autofocus;
218134
218374
  }
218135
218375
  if (!autoselect && compRender) {
218136
- autoselect = compRender.autoselect;
218376
+ autoselect = compRender.tableAutoSelect || compRender.autoselect;
218137
218377
  }
218138
218378
  // 如果指定了聚焦 class
218139
218379
  if (_xeUtils.default.isFunction(autofocus)) {
@@ -218192,7 +218432,7 @@ var _default = exports["default"] = {
218192
218432
  var column = _xeUtils.default.isString(fieldOrColumn) ? this.getColumnByField(fieldOrColumn) : fieldOrColumn;
218193
218433
  if (row && column && (0, _utils.isEnableConf)(editConfig) && (0, _utils.isEnableConf)(column.editRender)) {
218194
218434
  return this.scrollToRow(row, true).then(function () {
218195
- var cell = _this8.getCell(row, column);
218435
+ var cell = _this8.getCellElement(row, column);
218196
218436
  if (cell) {
218197
218437
  _this8.handleActived({
218198
218438
  row: row,
@@ -218219,7 +218459,7 @@ var _default = exports["default"] = {
218219
218459
  if (row && column && editOpts.trigger !== 'manual') {
218220
218460
  var rowIndex = this.findRowIndexOf(tableData, row);
218221
218461
  if (rowIndex > -1) {
218222
- var cell = this.getCell(row, column);
218462
+ var cell = this.getCellElement(row, column);
218223
218463
  var params = {
218224
218464
  row: row,
218225
218465
  rowIndex: rowIndex,
@@ -218312,7 +218552,7 @@ var _default = exports["default"] = {
218312
218552
  column = selected.column;
218313
218553
  this.reColSdCls();
218314
218554
  if (row && column) {
218315
- var cell = this.getCell(row, column);
218555
+ var cell = this.getCellElement(row, column);
218316
218556
  if (cell) {
218317
218557
  _dom.default.addClass(cell, 'col--selected');
218318
218558
  }
@@ -219126,7 +219366,7 @@ function getLabelData($xetable, opts, columns, datas) {
219126
219366
  if (!bodyExportMethod && renderOpts && renderOpts.name) {
219127
219367
  var compConf = _vXETable.default.renderer.get(renderOpts.name);
219128
219368
  if (compConf) {
219129
- bodyExportMethod = compConf.exportMethod || compConf.cellExportMethod;
219369
+ bodyExportMethod = compConf.tableExportMethod || compConf.exportMethod || compConf.cellExportMethod;
219130
219370
  }
219131
219371
  }
219132
219372
  if (!bodyExportMethod) {
@@ -219169,7 +219409,7 @@ function getLabelData($xetable, opts, columns, datas) {
219169
219409
  htmlCellElem.innerHTML = cellValue;
219170
219410
  cellValue = htmlCellElem.innerText.trim();
219171
219411
  } else {
219172
- var cell = $xetable.getCell(row, column);
219412
+ var cell = $xetable.getCellElement(row, column);
219173
219413
  if (cell) {
219174
219414
  cellValue = cell.innerText.trim();
219175
219415
  }
@@ -219236,7 +219476,7 @@ function getLabelData($xetable, opts, columns, datas) {
219236
219476
  htmlCellElem.innerHTML = cellValue;
219237
219477
  cellValue = htmlCellElem.innerText.trim();
219238
219478
  } else {
219239
- var cell = $xetable.getCell(row, column);
219479
+ var cell = $xetable.getCellElement(row, column);
219240
219480
  if (cell) {
219241
219481
  cellValue = cell.innerText.trim();
219242
219482
  }
@@ -219275,30 +219515,36 @@ function getHeaderTitle($xetable, opts, column) {
219275
219515
  $table: $xetable
219276
219516
  }) : (opts.original ? column.property : column.getTitle()) || '';
219277
219517
  }
219278
- function getFooterCellValue($xetable, opts, items, column) {
219518
+ function getFooterCellValue($xetable, opts, row, column) {
219279
219519
  var columnOpts = $xetable.columnOpts;
219280
219520
  var renderOpts = column.editRender || column.cellRender;
219281
219521
  var footLabelMethod = column.footerExportMethod;
219282
219522
  if (!footLabelMethod && renderOpts && renderOpts.name) {
219283
219523
  var compConf = _vXETable.default.renderer.get(renderOpts.name);
219284
219524
  if (compConf) {
219285
- footLabelMethod = compConf.footerExportMethod || compConf.footerCellExportMethod;
219525
+ footLabelMethod = compConf.tableFooterExportMethod || compConf.footerExportMethod || compConf.footerCellExportMethod;
219286
219526
  }
219287
219527
  }
219288
219528
  if (!footLabelMethod) {
219289
219529
  footLabelMethod = columnOpts.footerExportMethod;
219290
219530
  }
219291
219531
  var _columnIndex = $xetable.getVTColumnIndex(column);
219292
- var cellValue = footLabelMethod ? footLabelMethod({
219293
- $table: $xetable,
219294
- items: items,
219295
- itemIndex: _columnIndex,
219296
- row: items,
219297
- _columnIndex: _columnIndex,
219298
- column: column,
219299
- options: opts
219300
- }) : _xeUtils.default.toValueString(items[_columnIndex]);
219301
- return cellValue;
219532
+ if (footLabelMethod) {
219533
+ return footLabelMethod({
219534
+ $table: $xetable,
219535
+ items: row,
219536
+ itemIndex: _columnIndex,
219537
+ row: row,
219538
+ _columnIndex: _columnIndex,
219539
+ column: column,
219540
+ options: opts
219541
+ });
219542
+ }
219543
+ // 兼容老模式
219544
+ if (_xeUtils.default.isArray(row)) {
219545
+ return _xeUtils.default.toValueString(row[_columnIndex]);
219546
+ }
219547
+ return _xeUtils.default.get(row, column.field);
219302
219548
  }
219303
219549
  function getFooterData(opts, footerTableData) {
219304
219550
  var footerFilterMethod = opts.footerFilterMethod;
@@ -219352,9 +219598,9 @@ function toCsv($xetable, opts, columns, datas) {
219352
219598
  if (opts.isFooter) {
219353
219599
  var footerTableData = $xetable.footerTableData;
219354
219600
  var footers = getFooterData(opts, footerTableData);
219355
- footers.forEach(function (rows) {
219601
+ footers.forEach(function (row) {
219356
219602
  content += columns.map(function (column) {
219357
- return toTxtCellLabel(getFooterCellValue($xetable, opts, rows, column));
219603
+ return toTxtCellLabel(getFooterCellValue($xetable, opts, row, column));
219358
219604
  }).join(',') + enterSymbol;
219359
219605
  });
219360
219606
  }
@@ -219375,9 +219621,9 @@ function toTxt($xetable, opts, columns, datas) {
219375
219621
  if (opts.isFooter) {
219376
219622
  var footerTableData = $xetable.footerTableData;
219377
219623
  var footers = getFooterData(opts, footerTableData);
219378
- footers.forEach(function (rows) {
219624
+ footers.forEach(function (row) {
219379
219625
  content += columns.map(function (column) {
219380
- return toTxtCellLabel(getFooterCellValue($xetable, opts, rows, column));
219626
+ return toTxtCellLabel(getFooterCellValue($xetable, opts, row, column));
219381
219627
  }).join(',') + enterSymbol;
219382
219628
  });
219383
219629
  }
@@ -219548,11 +219794,11 @@ function toHtml($xetable, opts, columns, datas) {
219548
219794
  var footers = getFooterData(opts, footerTableData);
219549
219795
  if (footers.length) {
219550
219796
  tables.push('<tfoot>');
219551
- footers.forEach(function (rows) {
219797
+ footers.forEach(function (row) {
219552
219798
  tables.push("<tr>".concat(columns.map(function (column) {
219553
219799
  var footAlign = column.footerAlign || column.align || allFooterAlign || allAlign;
219554
219800
  var classNames = hasEllipsis($xetable, column, 'showOverflow', allColumnOverflow) ? ['col--ellipsis'] : [];
219555
- var cellValue = getFooterCellValue($xetable, opts, rows, column);
219801
+ var cellValue = getFooterCellValue($xetable, opts, row, column);
219556
219802
  if (footAlign) {
219557
219803
  classNames.push("col--".concat(footAlign));
219558
219804
  }
@@ -219584,9 +219830,9 @@ function toXML($xetable, opts, columns, datas) {
219584
219830
  if (opts.isFooter) {
219585
219831
  var footerTableData = $xetable.footerTableData;
219586
219832
  var footers = getFooterData(opts, footerTableData);
219587
- footers.forEach(function (rows) {
219833
+ footers.forEach(function (row) {
219588
219834
  xml += "<Row>".concat(columns.map(function (column) {
219589
- return "<Cell><Data ss:Type=\"String\">".concat(getFooterCellValue($xetable, opts, rows, column), "</Data></Cell>");
219835
+ return "<Cell><Data ss:Type=\"String\">".concat(getFooterCellValue($xetable, opts, row, column), "</Data></Cell>");
219590
219836
  }).join(''), "</Row>");
219591
219837
  });
219592
219838
  }
@@ -219953,6 +220199,7 @@ function handleImport($xetable, content, opts) {
219953
220199
  }
219954
220200
  }
219955
220201
  function handleFileImport($xetable, file, opts) {
220202
+ var importOpts = $xetable.importOpts;
219956
220203
  var importMethod = opts.importMethod,
219957
220204
  afterImportMethod = opts.afterImportMethod;
219958
220205
  var _UtilTools$parseFile = _utils.default.parseFile(file),
@@ -219960,7 +220207,7 @@ function handleFileImport($xetable, file, opts) {
219960
220207
  filename = _UtilTools$parseFile.filename;
219961
220208
 
219962
220209
  // 检查类型,如果为自定义导出,则不需要校验类型
219963
- if (!importMethod && !_xeUtils.default.includes(_vXETable.default.globalConfs.importTypes, type)) {
220210
+ if (!importMethod && !_xeUtils.default.includes(_xeUtils.default.keys(importOpts._typeMaps), type)) {
219964
220211
  if (opts.message !== false) {
219965
220212
  // 检测弹窗模块
219966
220213
  if (false) {}
@@ -220183,7 +220430,8 @@ function handleExportAndPrint($xetable, options, isPrint) {
220183
220430
  treeConfig = $xetable.treeConfig,
220184
220431
  mergeList = $xetable.mergeList,
220185
220432
  isGroup = $xetable.isGroup,
220186
- exportParams = $xetable.exportParams;
220433
+ exportParams = $xetable.exportParams,
220434
+ exportOpts = $xetable.exportOpts;
220187
220435
  var selectRecords = $xetable.getCheckboxRecords();
220188
220436
  var hasFooter = !!footerTableData.length;
220189
220437
  var hasTree = treeConfig;
@@ -220192,7 +220440,7 @@ function handleExportAndPrint($xetable, options, isPrint) {
220192
220440
  message: true,
220193
220441
  isHeader: true
220194
220442
  }, options);
220195
- var types = defOpts.types || _vXETable.default.globalConfs.exportTypes;
220443
+ var types = defOpts.types || _xeUtils.default.keys(exportOpts._typeMaps);
220196
220444
  var modes = defOpts.modes;
220197
220445
  var checkMethod = customOpts.checkMethod;
220198
220446
  var exportColumns = collectColumn.slice(0);
@@ -220452,7 +220700,7 @@ var _default = exports["default"] = {
220452
220700
  }
220453
220701
 
220454
220702
  // 检查类型,如果为自定义导出,则不需要校验类型
220455
- if (!opts.exportMethod && !_xeUtils.default.includes(_vXETable.default.globalConfs.exportTypes, type)) {
220703
+ if (!opts.exportMethod && !_xeUtils.default.includes(_xeUtils.default.keys(exportOpts._typeMaps), type)) {
220456
220704
  if (false) {}
220457
220705
  var params = {
220458
220706
  status: false
@@ -220531,11 +220779,12 @@ var _default = exports["default"] = {
220531
220779
  },
220532
220780
  _importData: function _importData(options) {
220533
220781
  var _this2 = this;
220782
+ var importOpts = this.importOpts;
220534
220783
  var opts = Object.assign({
220535
- types: _vXETable.default.globalConfs.importTypes
220784
+ types: _xeUtils.default.keys(importOpts._typeMaps)
220536
220785
  // beforeImportMethod: null,
220537
220786
  // afterImportMethod: null
220538
- }, this.importOpts, options);
220787
+ }, importOpts, options);
220539
220788
  var beforeImportMethod = opts.beforeImportMethod,
220540
220789
  afterImportMethod = opts.afterImportMethod;
220541
220790
  if (beforeImportMethod) {
@@ -220589,12 +220838,31 @@ var _default = exports["default"] = {
220589
220838
  }
220590
220839
  });
220591
220840
  },
220841
+ _getPrintHtml: function _getPrintHtml(options) {
220842
+ var printOpts = this.printOpts;
220843
+ var opts = Object.assign({
220844
+ original: false
220845
+ // beforePrintMethod
220846
+ }, printOpts, options, {
220847
+ type: 'html',
220848
+ download: false,
220849
+ remote: false,
220850
+ print: true
220851
+ });
220852
+ return this.exportData(opts).then(function (_ref4) {
220853
+ var content = _ref4.content;
220854
+ return {
220855
+ html: content
220856
+ };
220857
+ });
220858
+ },
220592
220859
  _openImport: function _openImport(options) {
220860
+ var importOpts = this.importOpts;
220593
220861
  var defOpts = Object.assign({
220594
220862
  mode: 'insert',
220595
220863
  message: true,
220596
- types: _vXETable.default.globalConfs.importTypes
220597
- }, options, this.importOpts);
220864
+ types: _xeUtils.default.keys(importOpts._typeMaps)
220865
+ }, options, importOpts);
220598
220866
  var types = defOpts.types;
220599
220867
  var isTree = !!this.getTreeStatus();
220600
220868
  if (isTree) {
@@ -220754,7 +221022,7 @@ var _default = exports["default"] = {
220754
221022
  filterMultiple = column.filterMultiple,
220755
221023
  filterRender = column.filterRender;
220756
221024
  var compConf = filterRender ? _vXETable.default.renderer.get(filterRender.name) : null;
220757
- var filterRecoverMethod = column.filterRecoverMethod || (compConf ? compConf.filterRecoverMethod : null);
221025
+ var filterRecoverMethod = column.filterRecoverMethod || (compConf ? compConf.tableFilterRecoverMethod || compConf.filterRecoverMethod : null);
220758
221026
  var _DomTools$getDomNode = _dom.default.getDomNode(),
220759
221027
  visibleWidth = _DomTools$getDomNode.visibleWidth;
220760
221028
  Object.assign(filterStore, {
@@ -220939,7 +221207,7 @@ var _default = exports["default"] = {
220939
221207
  filterRender = column.filterRender;
220940
221208
  if (filters) {
220941
221209
  var compConf = filterRender ? _vXETable.default.renderer.get(filterRender.name) : null;
220942
- var filterResetMethod = column.filterResetMethod || (compConf ? compConf.filterResetMethod : null);
221210
+ var filterResetMethod = column.filterResetMethod || (compConf ? compConf.tableFilterResetMethod || compConf.filterResetMethod : null);
220943
221211
  filters.forEach(function (item) {
220944
221212
  item._checked = false;
220945
221213
  item.checked = false;
@@ -221013,7 +221281,6 @@ exports["default"] = void 0;
221013
221281
  var _conf = _interopRequireDefault(__webpack_require__(56895));
221014
221282
  var _vXETable = _interopRequireDefault(__webpack_require__(97080));
221015
221283
  var _utils = _interopRequireDefault(__webpack_require__(87794));
221016
- var _xeUtils = _interopRequireDefault(__webpack_require__(78982));
221017
221284
  var _vn = __webpack_require__(34623);
221018
221285
  function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
221019
221286
  var _default = exports["default"] = {
@@ -221036,7 +221303,7 @@ var _default = exports["default"] = {
221036
221303
  column = filterStore.column;
221037
221304
  var filterRender = column ? column.filterRender : null;
221038
221305
  var compConf = filterRender ? _vXETable.default.renderer.get(filterRender.name) : null;
221039
- var filterClassName = compConf ? compConf.filterClassName : '';
221306
+ var filterClassName = compConf ? compConf.tableFilterClassName || compConf.filterClassName : '';
221040
221307
  return h('div', {
221041
221308
  class: ['vxe-table--filter-wrapper', 'filter--prevent-default', compConf && compConf.className ? compConf.className : '', _utils.default.getClass(filterClassName, Object.assign({
221042
221309
  $panel: this,
@@ -221059,6 +221326,7 @@ var _default = exports["default"] = {
221059
221326
  multiple = filterStore.multiple,
221060
221327
  maxHeight = filterStore.maxHeight;
221061
221328
  var slots = column.slots;
221329
+ var rtFilter = compConf ? compConf.renderTableFilter || compConf.renderFilter : null;
221062
221330
  if (slots && slots.filter) {
221063
221331
  return [h('div', {
221064
221332
  class: 'vxe-table--filter-template'
@@ -221066,10 +221334,10 @@ var _default = exports["default"] = {
221066
221334
  $panel: this,
221067
221335
  context: this
221068
221336
  }, args), h))];
221069
- } else if (compConf && compConf.renderFilter) {
221337
+ } else if (rtFilter) {
221070
221338
  return [h('div', {
221071
221339
  class: 'vxe-table--filter-template'
221072
- }, (0, _vn.getSlotVNs)(compConf.renderFilter.call($xetable, h, filterRender, Object.assign({
221340
+ }, (0, _vn.getSlotVNs)(rtFilter.call($xetable, h, filterRender, Object.assign({
221073
221341
  $panel: this,
221074
221342
  context: this
221075
221343
  }, args))))];
@@ -221134,7 +221402,7 @@ var _default = exports["default"] = {
221134
221402
  var filterRender = column.filterRender;
221135
221403
  var compConf = filterRender ? _vXETable.default.renderer.get(filterRender.name) : null;
221136
221404
  var isDisabled = !hasCheckOption && !filterStore.isAllSelected && !filterStore.isIndeterminate;
221137
- return multiple && (!compConf || (_xeUtils.default.isBoolean(compConf.showFilterFooter) ? compConf.showFilterFooter !== false : compConf.isFooter !== false)) ? [h('div', {
221405
+ return multiple(compConf ? !(compConf.showTableFilterFooter === false || compConf.showFilterFooter === false || compConf.isFooter === false) : true) ? [h('div', {
221138
221406
  class: 'vxe-table--filter-footer'
221139
221407
  }, [h('button', {
221140
221408
  class: {
@@ -221230,12 +221498,14 @@ Object.defineProperty(exports, "__esModule", ({
221230
221498
  }));
221231
221499
  exports["default"] = exports.VxeFormGather = exports.FormGather = void 0;
221232
221500
  var _formGather = _interopRequireDefault(__webpack_require__(63577));
221501
+ var _vXETable = _interopRequireDefault(__webpack_require__(97080));
221233
221502
  function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
221234
221503
  var VxeFormGather = exports.VxeFormGather = Object.assign(_formGather.default, {
221235
221504
  install: function install(Vue) {
221236
221505
  Vue.component(_formGather.default.name, _formGather.default);
221237
221506
  }
221238
221507
  });
221508
+ _vXETable.default.component(_formGather.default);
221239
221509
  var FormGather = exports.FormGather = VxeFormGather;
221240
221510
  var _default = exports["default"] = VxeFormGather;
221241
221511
 
@@ -221252,12 +221522,14 @@ Object.defineProperty(exports, "__esModule", ({
221252
221522
  }));
221253
221523
  exports["default"] = exports.VxeFormItem = exports.FormItem = void 0;
221254
221524
  var _formItem = _interopRequireDefault(__webpack_require__(78749));
221525
+ var _vXETable = _interopRequireDefault(__webpack_require__(97080));
221255
221526
  function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
221256
221527
  var VxeFormItem = exports.VxeFormItem = Object.assign(_formItem.default, {
221257
221528
  install: function install(Vue) {
221258
221529
  Vue.component(_formItem.default.name, _formItem.default);
221259
221530
  }
221260
221531
  });
221532
+ _vXETable.default.component(_formItem.default);
221261
221533
  var FormItem = exports.FormItem = VxeFormItem;
221262
221534
  var _default = exports["default"] = VxeFormItem;
221263
221535
 
@@ -221274,12 +221546,14 @@ Object.defineProperty(exports, "__esModule", ({
221274
221546
  }));
221275
221547
  exports["default"] = exports.VxeForm = exports.Form = void 0;
221276
221548
  var _form = _interopRequireDefault(__webpack_require__(47321));
221549
+ var _vXETable = _interopRequireDefault(__webpack_require__(97080));
221277
221550
  function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
221278
221551
  var VxeForm = exports.VxeForm = Object.assign(_form.default, {
221279
221552
  install: function install(Vue) {
221280
221553
  Vue.component(_form.default.name, _form.default);
221281
221554
  }
221282
221555
  });
221556
+ _vXETable.default.component(_form.default);
221283
221557
  var Form = exports.Form = VxeForm;
221284
221558
  var _default = exports["default"] = VxeForm;
221285
221559
 
@@ -221355,12 +221629,12 @@ var VxeFormConfigItem = {
221355
221629
  titleClassName = item.titleClassName,
221356
221630
  titleStyle = item.titleStyle;
221357
221631
  var compConf = (0, _utils.isEnableConf)(itemRender) ? _vXETable.default.renderer.get(itemRender.name) : null;
221358
- var itemClassName = compConf ? compConf.itemClassName : '';
221359
- var itemStyle = compConf ? compConf.itemStyle : null;
221360
- var itemContentClassName = compConf ? compConf.itemContentClassName : '';
221361
- var itemContentStyle = compConf ? compConf.itemContentStyle : null;
221362
- var itemTitleClassName = compConf ? compConf.itemTitleClassName : '';
221363
- var itemTitleStyle = compConf ? compConf.itemTitleStyle : null;
221632
+ var itemClassName = compConf ? compConf.formItemClassName || compConf.itemClassName : '';
221633
+ var itemStyle = compConf ? compConf.formItemStyle || compConf.itemStyle : null;
221634
+ var itemContentClassName = compConf ? compConf.formItemContentClassName || compConf.itemContentClassName : '';
221635
+ var itemContentStyle = compConf ? compConf.formItemContentStyle || compConf.itemContentStyle : null;
221636
+ var itemTitleClassName = compConf ? compConf.formItemTitleClassName || compConf.itemTitleClassName : '';
221637
+ var itemTitleStyle = compConf ? compConf.formItemTitleStyle || compConf.itemTitleStyle : null;
221364
221638
  var span = item.span || $xeform.span;
221365
221639
  var align = item.align || $xeform.align;
221366
221640
  var titleAlign = _xeUtils.default.eqNull(item.titleAlign) ? allTitleAlign : item.titleAlign;
@@ -221409,10 +221683,11 @@ var VxeFormConfigItem = {
221409
221683
  }
221410
221684
  }
221411
221685
  var contentVNs = [];
221686
+ var rfiContent = compConf ? compConf.renderFormItemContent || compConf.renderItemContent : null;
221412
221687
  if (slots && slots.default) {
221413
221688
  contentVNs = $xeform.callSlot(slots.default, params, h);
221414
- } else if (compConf && compConf.renderItemContent) {
221415
- contentVNs = (0, _vn.getSlotVNs)(compConf.renderItemContent.call($xeform, h, itemRender, params));
221689
+ } else if (rfiContent) {
221690
+ contentVNs = (0, _vn.getSlotVNs)(rfiContent.call($xeform, h, itemRender, params));
221416
221691
  } else if (compConf && compConf.renderItem) {
221417
221692
  contentVNs = (0, _vn.getSlotVNs)(compConf.renderItem.call($xeform, h, itemRender, params));
221418
221693
  } else if (field) {
@@ -221621,12 +221896,12 @@ var renderItem = function renderItem(h, _vm, item, slots) {
221621
221896
  titleClassName = item.titleClassName,
221622
221897
  titleStyle = item.titleStyle;
221623
221898
  var compConf = (0, _utils.isEnableConf)(itemRender) ? _vXETable.default.renderer.get(itemRender.name) : null;
221624
- var itemClassName = compConf ? compConf.itemClassName : '';
221625
- var itemStyle = compConf ? compConf.itemStyle : null;
221626
- var itemContentClassName = compConf ? compConf.itemContentClassName : '';
221627
- var itemContentStyle = compConf ? compConf.itemContentStyle : null;
221628
- var itemTitleClassName = compConf ? compConf.itemTitleClassName : '';
221629
- var itemTitleStyle = compConf ? compConf.itemTitleStyle : null;
221899
+ var itemClassName = compConf ? compConf.formItemClassName || compConf.itemClassName : '';
221900
+ var itemStyle = compConf ? compConf.formItemStyle || compConf.itemStyle : null;
221901
+ var itemContentClassName = compConf ? compConf.formItemContentClassName || compConf.itemContentClassName : '';
221902
+ var itemContentStyle = compConf ? compConf.formItemContentStyle || compConf.itemContentStyle : null;
221903
+ var itemTitleClassName = compConf ? compConf.formItemTitleClassName || compConf.itemTitleClassName : '';
221904
+ var itemTitleStyle = compConf ? compConf.formItemTitleStyle || compConf.itemTitleStyle : null;
221630
221905
  var span = item.span || _vm.span;
221631
221906
  var align = item.align || _vm.align;
221632
221907
  var titleAlign = _xeUtils.default.eqNull(item.titleAlign) ? allTitleAlign : item.titleAlign;
@@ -221660,10 +221935,11 @@ var renderItem = function renderItem(h, _vm, item, slots) {
221660
221935
  }
221661
221936
  }
221662
221937
  var contentVNs = [];
221938
+ var rfiContent = compConf ? compConf.renderFormItemContent || compConf.renderItemContent : null;
221663
221939
  if (slots && slots.default) {
221664
221940
  contentVNs = _vm.callSlot(slots.default, params, h);
221665
- } else if (compConf && compConf.renderItemContent) {
221666
- contentVNs = (0, _vn.getSlotVNs)(compConf.renderItemContent.call(_vm, h, itemRender, params));
221941
+ } else if (rfiContent) {
221942
+ contentVNs = (0, _vn.getSlotVNs)(rfiContent.call(_vm, h, itemRender, params));
221667
221943
  } else if (compConf && compConf.renderItem) {
221668
221944
  contentVNs = (0, _vn.getSlotVNs)(compConf.renderItem.call(_vm, h, itemRender, params));
221669
221945
  } else if (field) {
@@ -222127,8 +222403,9 @@ var _default2 = exports["default"] = {
222127
222403
  itemRender = item.itemRender;
222128
222404
  if ((0, _utils.isEnableConf)(itemRender)) {
222129
222405
  var compConf = _vXETable.default.renderer.get(itemRender.name);
222130
- if (compConf && compConf.itemResetMethod) {
222131
- compConf.itemResetMethod({
222406
+ var fiResetMethod = compConf ? compConf.formItemResetMethod || compConf.itemResetMethod : null;
222407
+ if (compConf && fiResetMethod) {
222408
+ fiResetMethod({
222132
222409
  data: data,
222133
222410
  field: field,
222134
222411
  property: field,
@@ -222544,9 +222821,10 @@ function renderTitle(h, _vm, item) {
222544
222821
  })
222545
222822
  }, [renderPrefixIcon(h, titlePrefix)]) : renderPrefixIcon(h, titlePrefix));
222546
222823
  }
222824
+ var rfiTitle = compConf ? compConf.renderFormItemTitle || compConf.renderItemTitle : null;
222547
222825
  titVNs.push(h('span', {
222548
222826
  class: 'vxe-form--item-title-label'
222549
- }, compConf && compConf.renderItemTitle ? (0, _vn.getSlotVNs)(compConf.renderItemTitle(itemRender, params)) : slots && slots.title ? _vm.callSlot(slots.title, params, h) : (0, _utils.getFuncText)(item.title)));
222827
+ }, rfiTitle ? (0, _vn.getSlotVNs)(rfiTitle(itemRender, params)) : slots && slots.title ? _vm.callSlot(slots.title, params, h) : (0, _utils.getFuncText)(item.title)));
222550
222828
  contVNs.push(h('div', {
222551
222829
  class: 'vxe-form--item-title-content'
222552
222830
  }, titVNs));
@@ -222665,8 +222943,9 @@ function isActivetem($xeform, formItem) {
222665
222943
  return visible;
222666
222944
  }
222667
222945
  var compConf = (0, _utils.isEnableConf)(itemRender) ? _vXETable.default.renderer.get(itemRender.name) : null;
222668
- if (!visibleMethod && compConf && compConf.itemVisibleMethod) {
222669
- visibleMethod = compConf.itemVisibleMethod;
222946
+ var fiVisibleMethod = compConf ? compConf.formItemVisibleMethod || compConf.itemVisibleMethod : null;
222947
+ if (!visibleMethod && fiVisibleMethod) {
222948
+ visibleMethod = fiVisibleMethod;
222670
222949
  }
222671
222950
  if (!visibleMethod) {
222672
222951
  return true;
@@ -222733,6 +223012,7 @@ var VxeGrid = exports.VxeGrid = Object.assign(_grid.default, {
222733
223012
  Vue.component(_grid.default.name, _grid.default);
222734
223013
  }
222735
223014
  });
223015
+ _vXETable.default.component(_grid.default);
222736
223016
  var Grid = exports.Grid = VxeGrid;
222737
223017
  var _default = exports["default"] = VxeGrid;
222738
223018
 
@@ -224021,12 +224301,14 @@ Object.defineProperty(exports, "__esModule", ({
224021
224301
  }));
224022
224302
  exports["default"] = exports.VxeIcon = exports.Icon = void 0;
224023
224303
  var _icon = _interopRequireDefault(__webpack_require__(59279));
224304
+ var _vXETable = _interopRequireDefault(__webpack_require__(97080));
224024
224305
  function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
224025
224306
  var VxeIcon = exports.VxeIcon = Object.assign(_icon.default, {
224026
224307
  install: function install(Vue) {
224027
224308
  Vue.component(_icon.default.name, _icon.default);
224028
224309
  }
224029
224310
  });
224311
+ _vXETable.default.component(_icon.default);
224030
224312
  var Icon = exports.Icon = VxeIcon;
224031
224313
  var _default = exports["default"] = VxeIcon;
224032
224314
 
@@ -224112,12 +224394,14 @@ Object.defineProperty(exports, "__esModule", ({
224112
224394
  }));
224113
224395
  exports["default"] = exports.VxeInput = exports.Input = void 0;
224114
224396
  var _input = _interopRequireDefault(__webpack_require__(55613));
224397
+ var _vXETable = _interopRequireDefault(__webpack_require__(97080));
224115
224398
  function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
224116
224399
  var VxeInput = exports.VxeInput = Object.assign(_input.default, {
224117
224400
  install: function install(Vue) {
224118
224401
  Vue.component(_input.default.name, _input.default);
224119
224402
  }
224120
224403
  });
224404
+ _vXETable.default.component(_input.default);
224121
224405
  var Input = exports.Input = VxeInput;
224122
224406
  var _default = exports["default"] = VxeInput;
224123
224407
 
@@ -226812,7 +227096,7 @@ var _default = exports["default"] = {
226812
227096
  }
226813
227097
  params.columnIndex = targetColumnIndex;
226814
227098
  params.column = targetColumn;
226815
- params.cell = this.getCell(params.row, params.column);
227099
+ params.cell = this.getCellElement(params.row, params.column);
226816
227100
  if (editConfig) {
226817
227101
  if (editOpts.trigger === 'click' || editOpts.trigger === 'dblclick') {
226818
227102
  if (editOpts.mode === 'row') {
@@ -226902,7 +227186,7 @@ var _default = exports["default"] = {
226902
227186
  params.column = visibleColumn[params.columnIndex];
226903
227187
  }
226904
227188
  this.scrollToRow(params.row, params.column).then(function () {
226905
- params.cell = _this3.getCell(params.row, params.column);
227189
+ params.cell = _this3.getCellElement(params.row, params.column);
226906
227190
  _this3.handleSelected(params, evnt);
226907
227191
  });
226908
227192
  },
@@ -227128,12 +227412,14 @@ Object.defineProperty(exports, "__esModule", ({
227128
227412
  }));
227129
227413
  exports["default"] = exports.VxeList = exports.List = void 0;
227130
227414
  var _list = _interopRequireDefault(__webpack_require__(43369));
227415
+ var _vXETable = _interopRequireDefault(__webpack_require__(97080));
227131
227416
  function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
227132
227417
  var VxeList = exports.VxeList = Object.assign(_list.default, {
227133
227418
  install: function install(Vue) {
227134
227419
  Vue.component(_list.default.name, _list.default);
227135
227420
  }
227136
227421
  });
227422
+ _vXETable.default.component(_list.default);
227137
227423
  var List = exports.List = VxeList;
227138
227424
  var _default = exports["default"] = VxeList;
227139
227425
 
@@ -227513,12 +227799,14 @@ Object.defineProperty(exports, "__esModule", ({
227513
227799
  }));
227514
227800
  exports["default"] = exports.VxeLoading = exports.Loading = void 0;
227515
227801
  var _loading = _interopRequireDefault(__webpack_require__(65909));
227802
+ var _vXETable = _interopRequireDefault(__webpack_require__(97080));
227516
227803
  function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
227517
227804
  var VxeLoading = exports.VxeLoading = Object.assign(_loading.default, {
227518
227805
  install: function install(Vue) {
227519
227806
  Vue.component(_loading.default.name, _loading.default);
227520
227807
  }
227521
227808
  });
227809
+ _vXETable.default.component(_loading.default);
227522
227810
  var Loading = exports.Loading = VxeLoading;
227523
227811
  var _default = exports["default"] = VxeLoading;
227524
227812
 
@@ -227634,7 +227922,7 @@ var _default = exports["default"] = {
227634
227922
  table: {
227635
227923
  emptyText: '暂无数据',
227636
227924
  allTitle: '全选/取消',
227637
- seqTitle: '#',
227925
+ seqTitle: '序号',
227638
227926
  confirmFilter: '筛选',
227639
227927
  resetFilter: '重置',
227640
227928
  allFilter: '全部',
@@ -227649,7 +227937,8 @@ var _default = exports["default"] = {
227649
227937
  customTitle: '列设置',
227650
227938
  customAll: '全部',
227651
227939
  customConfirm: '确认',
227652
- customRestore: '重置',
227940
+ customCancel: '取消',
227941
+ customRestore: '恢复默认',
227653
227942
  maxFixedCol: '最大冻结列的数量不能超过 {0} 个'
227654
227943
  },
227655
227944
  grid: {
@@ -227705,6 +227994,7 @@ var _default = exports["default"] = {
227705
227994
  colSort: '排序',
227706
227995
  sortHelpTip: '点击并拖动图标可以调整列的排序',
227707
227996
  colTitle: '标题',
227997
+ colResizable: '列宽(像素)',
227708
227998
  colVisible: '是否显示',
227709
227999
  colFixed: '冻结列(最多 {0} 列)',
227710
228000
  fixedLeft: '左侧',
@@ -228322,7 +228612,7 @@ var _default = exports["default"] = {
228322
228612
  column = params.column;
228323
228613
  if (keyboard && row && column) {
228324
228614
  _this.scrollToRow(row, column).then(function () {
228325
- var cell = _this.getCell(row, column);
228615
+ var cell = _this.getCellElement(row, column);
228326
228616
  var _DomTools$getAbsolute2 = _dom.default.getAbsolutePos(cell),
228327
228617
  boundingTop = _DomTools$getAbsolute2.boundingTop,
228328
228618
  boundingLeft = _DomTools$getAbsolute2.boundingLeft;
@@ -228684,6 +228974,7 @@ var VxeModal = exports.VxeModal = Object.assign(_modal.default, {
228684
228974
  }
228685
228975
  }
228686
228976
  });
228977
+ _vXETable.default.component(_modal.default);
228687
228978
  var Modal = exports.Modal = VxeModal;
228688
228979
  var _default = exports["default"] = VxeModal;
228689
228980
 
@@ -229825,12 +230116,14 @@ Object.defineProperty(exports, "__esModule", ({
229825
230116
  }));
229826
230117
  exports["default"] = exports.VxeOptgroup = exports.Optgroup = void 0;
229827
230118
  var _optgroup = _interopRequireDefault(__webpack_require__(11474));
230119
+ var _vXETable = _interopRequireDefault(__webpack_require__(97080));
229828
230120
  function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
229829
230121
  var VxeOptgroup = exports.VxeOptgroup = Object.assign(_optgroup.default, {
229830
230122
  install: function install(Vue) {
229831
230123
  Vue.component(_optgroup.default.name, _optgroup.default);
229832
230124
  }
229833
230125
  });
230126
+ _vXETable.default.component(_optgroup.default);
229834
230127
  var Optgroup = exports.Optgroup = VxeOptgroup;
229835
230128
  var _default = exports["default"] = VxeOptgroup;
229836
230129
 
@@ -229847,12 +230140,14 @@ Object.defineProperty(exports, "__esModule", ({
229847
230140
  }));
229848
230141
  exports["default"] = exports.VxeOption = exports.Option = void 0;
229849
230142
  var _option = _interopRequireDefault(__webpack_require__(90916));
230143
+ var _vXETable = _interopRequireDefault(__webpack_require__(97080));
229850
230144
  function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
229851
230145
  var VxeOption = exports.VxeOption = Object.assign(_option.default, {
229852
230146
  install: function install(Vue) {
229853
230147
  Vue.component(_option.default.name, _option.default);
229854
230148
  }
229855
230149
  });
230150
+ _vXETable.default.component(_option.default);
229856
230151
  var Option = exports.Option = VxeOption;
229857
230152
  var _default = exports["default"] = VxeOption;
229858
230153
 
@@ -229869,12 +230164,14 @@ Object.defineProperty(exports, "__esModule", ({
229869
230164
  }));
229870
230165
  exports["default"] = exports.VxePager = exports.Pager = void 0;
229871
230166
  var _pager = _interopRequireDefault(__webpack_require__(2469));
230167
+ var _vXETable = _interopRequireDefault(__webpack_require__(97080));
229872
230168
  function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
229873
230169
  var VxePager = exports.VxePager = Object.assign(_pager.default, {
229874
230170
  install: function install(Vue) {
229875
230171
  Vue.component(_pager.default.name, _pager.default);
229876
230172
  }
229877
230173
  });
230174
+ _vXETable.default.component(_pager.default);
229878
230175
  var Pager = exports.Pager = VxePager;
229879
230176
  var _default = exports["default"] = VxePager;
229880
230177
 
@@ -229993,6 +230290,12 @@ var _default2 = exports["default"] = {
229993
230290
  }
229994
230291
  },
229995
230292
  className: [String, Function],
230293
+ pageSizePlacement: {
230294
+ type: String,
230295
+ default: function _default() {
230296
+ return _conf.default.pager.pageSizePlacement;
230297
+ }
230298
+ },
229996
230299
  // 自定义图标
229997
230300
  iconPrevPage: String,
229998
230301
  iconJumpPrev: String,
@@ -230111,7 +230414,7 @@ var _default2 = exports["default"] = {
230111
230414
  renderEnd: function renderEnd(h) {
230112
230415
  return h('button', {
230113
230416
  class: ['vxe-pager--prev-btn', {
230114
- 'is--disabled': this.currentPage <= 1
230417
+ 'is--disabled': this.currentPage >= this.pageCount
230115
230418
  }],
230116
230419
  attrs: {
230117
230420
  type: 'button',
@@ -230217,7 +230520,7 @@ var _default2 = exports["default"] = {
230217
230520
  class: 'vxe-pager--sizes',
230218
230521
  props: {
230219
230522
  value: this.pageSize,
230220
- placement: 'top',
230523
+ placement: this.pageSizePlacement,
230221
230524
  transfer: this.transfer,
230222
230525
  options: this.sizeList
230223
230526
  },
@@ -230436,12 +230739,14 @@ Object.defineProperty(exports, "__esModule", ({
230436
230739
  }));
230437
230740
  exports["default"] = exports.VxePulldown = exports.Pulldown = void 0;
230438
230741
  var _pulldown = _interopRequireDefault(__webpack_require__(42547));
230742
+ var _vXETable = _interopRequireDefault(__webpack_require__(97080));
230439
230743
  function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
230440
230744
  var VxePulldown = exports.VxePulldown = Object.assign(_pulldown.default, {
230441
230745
  install: function install(Vue) {
230442
230746
  Vue.component(_pulldown.default.name, _pulldown.default);
230443
230747
  }
230444
230748
  });
230749
+ _vXETable.default.component(_pulldown.default);
230445
230750
  var Pulldown = exports.Pulldown = VxePulldown;
230446
230751
  var _default = exports["default"] = VxePulldown;
230447
230752
 
@@ -230781,12 +231086,14 @@ Object.defineProperty(exports, "__esModule", ({
230781
231086
  }));
230782
231087
  exports["default"] = exports.VxeRadioButton = exports.RadioButton = void 0;
230783
231088
  var _button = _interopRequireDefault(__webpack_require__(38580));
231089
+ var _vXETable = _interopRequireDefault(__webpack_require__(97080));
230784
231090
  function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
230785
231091
  var VxeRadioButton = exports.VxeRadioButton = Object.assign(_button.default, {
230786
231092
  install: function install(Vue) {
230787
231093
  Vue.component(_button.default.name, _button.default);
230788
231094
  }
230789
231095
  });
231096
+ _vXETable.default.component(_button.default);
230790
231097
  var RadioButton = exports.RadioButton = VxeRadioButton;
230791
231098
  var _default = exports["default"] = VxeRadioButton;
230792
231099
 
@@ -230803,12 +231110,14 @@ Object.defineProperty(exports, "__esModule", ({
230803
231110
  }));
230804
231111
  exports["default"] = exports.VxeRadioGroup = exports.RadioGroup = void 0;
230805
231112
  var _group = _interopRequireDefault(__webpack_require__(13137));
231113
+ var _vXETable = _interopRequireDefault(__webpack_require__(97080));
230806
231114
  function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
230807
231115
  var VxeRadioGroup = exports.VxeRadioGroup = Object.assign(_group.default, {
230808
231116
  install: function install(Vue) {
230809
231117
  Vue.component(_group.default.name, _group.default);
230810
231118
  }
230811
231119
  });
231120
+ _vXETable.default.component(_group.default);
230812
231121
  var RadioGroup = exports.RadioGroup = VxeRadioGroup;
230813
231122
  var _default = exports["default"] = VxeRadioGroup;
230814
231123
 
@@ -230825,12 +231134,14 @@ Object.defineProperty(exports, "__esModule", ({
230825
231134
  }));
230826
231135
  exports["default"] = exports.VxeRadio = exports.Radio = void 0;
230827
231136
  var _radio = _interopRequireDefault(__webpack_require__(95429));
231137
+ var _vXETable = _interopRequireDefault(__webpack_require__(97080));
230828
231138
  function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
230829
231139
  var VxeRadio = exports.VxeRadio = Object.assign(_radio.default, {
230830
231140
  install: function install(Vue) {
230831
231141
  Vue.component(_radio.default.name, _radio.default);
230832
231142
  }
230833
231143
  });
231144
+ _vXETable.default.component(_radio.default);
230834
231145
  var Radio = exports.Radio = VxeRadio;
230835
231146
  var _default = exports["default"] = VxeRadio;
230836
231147
 
@@ -231228,6 +231539,7 @@ exports["default"] = exports.VxeSelect = exports.Select = void 0;
231228
231539
  var _select = _interopRequireDefault(__webpack_require__(51485));
231229
231540
  var _option = _interopRequireDefault(__webpack_require__(90916));
231230
231541
  var _optgroup = _interopRequireDefault(__webpack_require__(11474));
231542
+ var _vXETable = _interopRequireDefault(__webpack_require__(97080));
231231
231543
  function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
231232
231544
  var VxeSelect = exports.VxeSelect = Object.assign(_select.default, {
231233
231545
  Option: _option.default,
@@ -231238,6 +231550,7 @@ var VxeSelect = exports.VxeSelect = Object.assign(_select.default, {
231238
231550
  Vue.component(_optgroup.default.name, _optgroup.default);
231239
231551
  }
231240
231552
  });
231553
+ _vXETable.default.component(_select.default);
231241
231554
  var Select = exports.Select = VxeSelect;
231242
231555
  var _default = exports["default"] = VxeSelect;
231243
231556
 
@@ -232531,12 +232844,14 @@ Object.defineProperty(exports, "__esModule", ({
232531
232844
  }));
232532
232845
  exports["default"] = exports.VxeSwitch = exports.Switch = void 0;
232533
232846
  var _switch = _interopRequireDefault(__webpack_require__(93265));
232847
+ var _vXETable = _interopRequireDefault(__webpack_require__(97080));
232534
232848
  function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
232535
232849
  var VxeSwitch = exports.VxeSwitch = Object.assign(_switch.default, {
232536
232850
  install: function install(Vue) {
232537
232851
  Vue.component(_switch.default.name, _switch.default);
232538
232852
  }
232539
232853
  });
232854
+ _vXETable.default.component(_switch.default);
232540
232855
  var Switch = exports.Switch = VxeSwitch;
232541
232856
  var _default = exports["default"] = VxeSwitch;
232542
232857
 
@@ -232753,6 +233068,7 @@ var VxeTable = exports.VxeTable = Object.assign(_table.default, {
232753
233068
  Vue.component(_body.default.name, _body.default);
232754
233069
  }
232755
233070
  });
233071
+ _vXETable.default.component(_table.default);
232756
233072
  var Table = exports.Table = VxeTable;
232757
233073
  var _default = exports["default"] = VxeTable;
232758
233074
 
@@ -232884,8 +233200,8 @@ function renderColumn(h, _vm, $xetable, seq, rowid, fixedType, rowLevel, row, ro
232884
233200
  var rowHeight = rowOpts.height;
232885
233201
  var renderOpts = editRender || cellRender;
232886
233202
  var compConf = renderOpts ? _vXETable.default.renderer.get(renderOpts.name) : null;
232887
- var compCellClassName = compConf ? compConf.cellClassName : '';
232888
- var compCellStyle = compConf ? compConf.cellStyle : '';
233203
+ var compCellClassName = compConf ? compConf.tableCellClassName || compConf.cellClassName : '';
233204
+ var compCellStyle = compConf ? compConf.tableCellStyle || compConf.cellStyle : '';
232889
233205
  var showAllTip = tooltipOpts.showAll || tooltipOpts.enabled;
232890
233206
  var columnIndex = $xetable.getColumnIndex(column);
232891
233207
  var _columnIndex = $xetable.getVTColumnIndex(column);
@@ -233179,7 +233495,8 @@ function renderRows(h, _vm, $xetable, fixedType, tableData, tableColumn) {
233179
233495
  })));
233180
233496
  // 如果行被展开了
233181
233497
  if (isExpandRow) {
233182
- var expandHeight = expandOpts.height;
233498
+ var expandHeight = expandOpts.height,
233499
+ padding = expandOpts.padding;
233183
233500
  var cellStyle = {};
233184
233501
  if (expandHeight) {
233185
233502
  cellStyle.height = "".concat(expandHeight, "px");
@@ -233201,7 +233518,9 @@ function renderRows(h, _vm, $xetable, fixedType, tableData, tableColumn) {
233201
233518
  $rowIndex: $rowIndex
233202
233519
  };
233203
233520
  rows.push(h('tr', {
233204
- class: 'vxe-body--expanded-row',
233521
+ class: ['vxe-body--expanded-row', {
233522
+ 'is--padding': padding
233523
+ }],
233205
233524
  key: "expand_".concat(rowid),
233206
233525
  style: rowStyle ? _xeUtils.default.isFunction(rowStyle) ? rowStyle(expandParams) : rowStyle : null,
233207
233526
  on: trOn
@@ -233778,8 +234097,9 @@ function getFooterContent(h, params) {
233778
234097
  }
233779
234098
  if (renderOpts) {
233780
234099
  var compConf = _vXETable.default.renderer.get(renderOpts.name);
233781
- if (compConf && compConf.renderFooter) {
233782
- return (0, _vn.getSlotVNs)(compConf.renderFooter.call($table, h, renderOpts, params));
234100
+ var rtFooter = compConf ? compConf.renderTableFooter || compConf.renderFooter : null;
234101
+ if (rtFooter) {
234102
+ return (0, _vn.getSlotVNs)(rtFooter.call($table, h, renderOpts, params));
233783
234103
  }
233784
234104
  }
233785
234105
  // 兼容老模式
@@ -233866,8 +234186,9 @@ var Cell = exports.Cell = {
233866
234186
  }
233867
234187
  if (renderOpts) {
233868
234188
  var compConf = _vXETable.default.renderer.get(renderOpts.name);
233869
- if (compConf && compConf.renderHeader) {
233870
- return (0, _vn.getSlotVNs)(renderTitleContent(h, params, compConf.renderHeader.call($table, h, renderOpts, params)));
234189
+ var rtHeader = compConf ? compConf.renderTableHeader || compConf.renderHeader : null;
234190
+ if (rtHeader) {
234191
+ return (0, _vn.getSlotVNs)(renderTitleContent(h, params, rtHeader.call($table, h, renderOpts, params)));
233871
234192
  }
233872
234193
  }
233873
234194
  return renderTitleContent(h, params, _utils.default.formatText(column.getTitle(), 1));
@@ -233887,10 +234208,12 @@ var Cell = exports.Cell = {
233887
234208
  return $table.callSlot(slots.default, params, h);
233888
234209
  }
233889
234210
  if (renderOpts) {
233890
- var funName = editRender ? 'renderCell' : 'renderDefault';
233891
234211
  var compConf = _vXETable.default.renderer.get(renderOpts.name);
233892
- if (compConf && compConf[funName]) {
233893
- return (0, _vn.getSlotVNs)(compConf[funName].call($table, h, renderOpts, Object.assign({
234212
+ var rtDefault = compConf ? compConf.renderTableDefault || compConf.renderDefault : null;
234213
+ var rtCell = compConf ? compConf.renderTableCell || compConf.renderCell : null;
234214
+ var renderFn = editRender ? rtCell : rtDefault;
234215
+ if (renderFn) {
234216
+ return (0, _vn.getSlotVNs)(renderFn.call($table, h, renderOpts, Object.assign({
233894
234217
  $type: editRender ? 'edit' : 'cell'
233895
234218
  }, params)));
233896
234219
  }
@@ -233953,7 +234276,6 @@ var Cell = exports.Cell = {
233953
234276
  }
233954
234277
  if (!trigger || trigger === 'default') {
233955
234278
  on.click = function (evnt) {
233956
- evnt.stopPropagation();
233957
234279
  $table.triggerTreeExpandEvent(evnt, params);
233958
234280
  };
233959
234281
  }
@@ -234034,7 +234356,6 @@ var Cell = exports.Cell = {
234034
234356
  on = {
234035
234357
  click: function click(evnt) {
234036
234358
  if (!isDisabled && isVisible) {
234037
- evnt.stopPropagation();
234038
234359
  $table.triggerRadioRowEvent(evnt, params);
234039
234360
  }
234040
234361
  }
@@ -234095,7 +234416,6 @@ var Cell = exports.Cell = {
234095
234416
  on = {
234096
234417
  click: function click(evnt) {
234097
234418
  if (!isAllCheckboxDisabled) {
234098
- evnt.stopPropagation();
234099
234419
  $table.triggerCheckAllEvent(evnt, !isAllCheckboxSelected);
234100
234420
  }
234101
234421
  }
@@ -234158,7 +234478,6 @@ var Cell = exports.Cell = {
234158
234478
  on = {
234159
234479
  click: function click(evnt) {
234160
234480
  if (!isDisabled && isVisible) {
234161
- evnt.stopPropagation();
234162
234481
  $table.triggerCheckRowEvent(evnt, params, !isChecked);
234163
234482
  }
234164
234483
  }
@@ -234234,7 +234553,6 @@ var Cell = exports.Cell = {
234234
234553
  on = {
234235
234554
  click: function click(evnt) {
234236
234555
  if (!isDisabled && isVisible) {
234237
- evnt.stopPropagation();
234238
234556
  $table.triggerCheckRowEvent(evnt, params, !isChecked);
234239
234557
  }
234240
234558
  }
@@ -234319,7 +234637,6 @@ var Cell = exports.Cell = {
234319
234637
  }],
234320
234638
  on: {
234321
234639
  click: function click(evnt) {
234322
- evnt.stopPropagation();
234323
234640
  $table.triggerRowExpandEvent(evnt, params);
234324
234641
  }
234325
234642
  }
@@ -234339,8 +234656,9 @@ var Cell = exports.Cell = {
234339
234656
  }
234340
234657
  if (contentRender) {
234341
234658
  var compConf = _vXETable.default.renderer.get(contentRender.name);
234342
- if (compConf && compConf.renderExpand) {
234343
- return (0, _vn.getSlotVNs)(compConf.renderExpand.call($table, h, contentRender, params));
234659
+ var rtExpand = compConf ? compConf.renderTableExpand || compConf.renderExpand : null;
234660
+ if (rtExpand) {
234661
+ return (0, _vn.getSlotVNs)(rtExpand.call($table, h, contentRender, params));
234344
234662
  }
234345
234663
  }
234346
234664
  return [];
@@ -234505,12 +234823,13 @@ var Cell = exports.Cell = {
234505
234823
  editRender = column.editRender,
234506
234824
  formatter = column.formatter;
234507
234825
  var compConf = _vXETable.default.renderer.get(editRender.name);
234826
+ var rtEdit = compConf ? compConf.renderTableEdit || compConf.renderEdit : null;
234508
234827
  if (isEdit) {
234509
234828
  if (slots && slots.edit) {
234510
234829
  return $table.callSlot(slots.edit, params, h);
234511
234830
  }
234512
- if (compConf && compConf.renderEdit) {
234513
- return (0, _vn.getSlotVNs)(compConf.renderEdit.call($table, h, editRender, Object.assign({
234831
+ if (rtEdit) {
234832
+ return (0, _vn.getSlotVNs)(rtEdit.call($table, h, editRender, Object.assign({
234514
234833
  $type: 'edit'
234515
234834
  }, params)));
234516
234835
  }
@@ -234813,8 +235132,11 @@ var ColumnInfo = exports.ColumnInfo = /*#__PURE__*/function () {
234813
235132
  renderSortNumber: 0,
234814
235133
  // 用于记录自定义列顺序
234815
235134
 
235135
+ renderFixed: '',
235136
+ renderVisible: false,
234816
235137
  renderWidth: 0,
234817
235138
  renderHeight: 0,
235139
+ renderResizeWidth: 0,
234818
235140
  resizeWidth: 0,
234819
235141
  renderLeft: 0,
234820
235142
  renderArgs: [],
@@ -235619,16 +235941,16 @@ function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return
235619
235941
  function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
235620
235942
  function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
235621
235943
  function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
235944
+ function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
235945
+ function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
235946
+ function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
235947
+ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
235622
235948
  function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
235623
235949
  function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
235950
+ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
235624
235951
  function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
235625
235952
  function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
235626
- function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
235627
- function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
235628
- function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
235629
235953
  function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
235630
- function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
235631
- function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
235632
235954
  function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
235633
235955
  function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
235634
235956
  function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
@@ -236166,6 +236488,21 @@ var Methods = {
236166
236488
  return _this6.recalculate();
236167
236489
  });
236168
236490
  },
236491
+ /**
236492
+ * 修改行数据
236493
+ */
236494
+ setRow: function setRow(rows, record) {
236495
+ if (record) {
236496
+ var rest = rows;
236497
+ if (!_xeUtils.default.isArray(rows)) {
236498
+ rest = [rows];
236499
+ }
236500
+ rest.forEach(function (item) {
236501
+ return Object.assign(item, record);
236502
+ });
236503
+ }
236504
+ return this.$nextTick();
236505
+ },
236169
236506
  /**
236170
236507
  * 局部加载行数据并恢复到初始状态
236171
236508
  * 对于行数据需要局部更改的场景中可能会用到
@@ -236771,6 +237108,72 @@ var Methods = {
236771
237108
  }
236772
237109
  return this.$nextTick();
236773
237110
  },
237111
+ getCellElement: function getCellElement(row, fieldOrColumn) {
237112
+ var column = (0, _util.handleFieldOrColumn)(this, fieldOrColumn);
237113
+ if (!column) {
237114
+ return null;
237115
+ }
237116
+ var $refs = this.$refs;
237117
+ var rowid = (0, _util.getRowid)(this, row);
237118
+ var bodyElem = null;
237119
+ if (column) {
237120
+ bodyElem = $refs["".concat(column.fixed || 'table', "Body")] || $refs.tableBody;
237121
+ }
237122
+ if (bodyElem && bodyElem.$el) {
237123
+ return bodyElem.$el.querySelector(".vxe-body--row[rowid=\"".concat(rowid, "\"] .").concat(column.id));
237124
+ }
237125
+ return null;
237126
+ },
237127
+ getCellLabel: function getCellLabel(row, fieldOrColumn) {
237128
+ var column = (0, _util.handleFieldOrColumn)(this, fieldOrColumn);
237129
+ if (!column) {
237130
+ return null;
237131
+ }
237132
+ var formatter = column.formatter;
237133
+ var cellValue = _utils.default.getCellValue(row, column);
237134
+ var cellLabel = cellValue;
237135
+ if (formatter) {
237136
+ var rest, formatData;
237137
+ var fullAllDataRowMap = this.fullAllDataRowMap;
237138
+ var colid = column.id;
237139
+ var cacheFormat = fullAllDataRowMap.has(row);
237140
+ if (cacheFormat) {
237141
+ rest = fullAllDataRowMap.get(row);
237142
+ formatData = rest.formatData;
237143
+ if (!formatData) {
237144
+ formatData = fullAllDataRowMap.get(row).formatData = {};
237145
+ }
237146
+ if (rest && formatData[colid]) {
237147
+ if (formatData[colid].value === cellValue) {
237148
+ return formatData[colid].label;
237149
+ }
237150
+ }
237151
+ }
237152
+ var formatParams = {
237153
+ cellValue: cellValue,
237154
+ row: row,
237155
+ rowIndex: this.getRowIndex(row),
237156
+ column: column,
237157
+ columnIndex: this.getColumnIndex(column)
237158
+ };
237159
+ if (_xeUtils.default.isString(formatter)) {
237160
+ var gFormatOpts = _formats.formats.get(formatter);
237161
+ cellLabel = gFormatOpts && gFormatOpts.cellFormatMethod ? gFormatOpts.cellFormatMethod(formatParams) : '';
237162
+ } else if (_xeUtils.default.isArray(formatter)) {
237163
+ var _gFormatOpts = _formats.formats.get(formatter[0]);
237164
+ cellLabel = _gFormatOpts && _gFormatOpts.cellFormatMethod ? _gFormatOpts.cellFormatMethod.apply(_gFormatOpts, [formatParams].concat(_toConsumableArray(formatter.slice(1)))) : '';
237165
+ } else {
237166
+ cellLabel = formatter(formatParams);
237167
+ }
237168
+ if (formatData) {
237169
+ formatData[colid] = {
237170
+ value: cellValue,
237171
+ label: cellLabel
237172
+ };
237173
+ }
237174
+ }
237175
+ return cellLabel;
237176
+ },
236774
237177
  /**
236775
237178
  * 检查是否为临时行数据
236776
237179
  * @param {Row} row 行对象
@@ -236827,6 +237230,13 @@ var Methods = {
236827
237230
  var columns = this.visibleColumn;
236828
237231
  return _xeUtils.default.isUndefined(columnIndex) ? columns.slice(0) : columns[columnIndex];
236829
237232
  },
237233
+ /**
237234
+ * 根据列获取列的唯一主键
237235
+ */
237236
+ getColid: function getColid(fieldOrColumn) {
237237
+ var column = (0, _util.handleFieldOrColumn)(this, fieldOrColumn);
237238
+ return column ? column.id : null;
237239
+ },
236830
237240
  /**
236831
237241
  * 根据列的唯一主键获取列
236832
237242
  * @param {String} colid 列主键
@@ -237009,8 +237419,8 @@ var Methods = {
237009
237419
  filterRender = column.filterRender,
237010
237420
  field = column.field;
237011
237421
  var compConf = filterRender ? _vXETable.default.renderer.get(filterRender.name) : null;
237012
- var compFilterMethod = compConf && compConf.renderFilter ? compConf.filterMethod : null;
237013
- var defaultFilterMethod = compConf ? compConf.defaultFilterMethod : null;
237422
+ var compFilterMethod = compConf && compConf.renderFilter ? compConf.tableFilterMethod || compConf.filterMethod : null;
237423
+ var defaultFilterMethod = compConf ? compConf.defaultTableFilterMethod || compConf.defaultFilterMethod : null;
237014
237424
  var cellValue = _utils.default.getCellValue(row, column);
237015
237425
  if (filterMethod) {
237016
237426
  return itemList.some(function (item) {
@@ -237426,6 +237836,7 @@ var Methods = {
237426
237836
  })) {
237427
237837
  column.visible = column.defaultVisible;
237428
237838
  }
237839
+ column.renderResizeWidth = column.renderWidth;
237429
237840
  });
237430
237841
  if (opts.resizable) {
237431
237842
  this.saveCustomResizable(true);
@@ -237449,8 +237860,7 @@ var Methods = {
237449
237860
  this.clearCopyCellArea();
237450
237861
  }
237451
237862
  }
237452
- this.saveCustomVisible();
237453
- this.saveCustomSort();
237863
+ this.saveCustomStore();
237454
237864
  this.analyColumnWidth();
237455
237865
  return this.refreshColumn(true);
237456
237866
  },
@@ -237461,13 +237871,19 @@ var Methods = {
237461
237871
  var id = this.id,
237462
237872
  customConfig = this.customConfig,
237463
237873
  customOpts = this.customOpts;
237464
- var storage = customOpts.storage;
237874
+ var storage = customOpts.storage,
237875
+ restoreStore = customOpts.restoreStore;
237465
237876
  var isAllStorage = storage === true;
237466
237877
  var storageOpts = isAllStorage ? {} : Object.assign({}, storage || {});
237467
237878
  var isCustomResizable = isAllStorage || storageOpts.resizable;
237468
237879
  var isCustomVisible = isAllStorage || storageOpts.visible;
237469
237880
  var isCustomFixed = isAllStorage || storageOpts.fixed;
237470
237881
  var isCustomSort = isAllStorage || storageOpts.sort;
237882
+ if (storage && id && restoreStore) {
237883
+ restoreStore({
237884
+ id: id
237885
+ });
237886
+ }
237471
237887
  if (customConfig && (isCustomResizable || isCustomVisible || isCustomFixed || isCustomSort)) {
237472
237888
  var customMap = {};
237473
237889
  if (!id) {
@@ -237657,6 +238073,71 @@ var Methods = {
237657
238073
  localStorage.setItem(visibleStorageKey, _xeUtils.default.toJSONString(columnVisibleStorageMap));
237658
238074
  }
237659
238075
  },
238076
+ getCustomStoreData: function getCustomStoreData() {
238077
+ var id = this.id,
238078
+ collectColumn = this.collectColumn,
238079
+ customOpts = this.customOpts;
238080
+ var checkMethod = customOpts.checkMethod;
238081
+ var resizableData = {};
238082
+ var sortData = {};
238083
+ var visibleData = {};
238084
+ var fixedData = {};
238085
+ var storeData = {
238086
+ resizableData: resizableData,
238087
+ sortData: sortData,
238088
+ visibleData: visibleData,
238089
+ fixedData: fixedData
238090
+ };
238091
+ if (!id) {
238092
+ (0, _log.errLog)('vxe.error.reqProp', ['id']);
238093
+ return storeData;
238094
+ }
238095
+ _xeUtils.default.eachTree(collectColumn, function (column, index, items, path, parent) {
238096
+ // 排序只支持一级
238097
+ if (!parent) {
238098
+ collectColumn.forEach(function (column) {
238099
+ var colKey = column.getKey();
238100
+ if (colKey) {
238101
+ sortData[colKey] = column.renderSortNumber;
238102
+ }
238103
+ });
238104
+ }
238105
+ if (column.resizeWidth) {
238106
+ var colKey = column.getKey();
238107
+ if (colKey) {
238108
+ resizableData[colKey] = column.renderWidth;
238109
+ }
238110
+ }
238111
+ if (column.fixed && column.fixed !== column.defaultFixed) {
238112
+ var _colKey2 = column.getKey();
238113
+ if (_colKey2) {
238114
+ fixedData[_colKey2] = column.fixed;
238115
+ }
238116
+ }
238117
+ if (!checkMethod || checkMethod({
238118
+ column: column
238119
+ })) {
238120
+ if (!column.visible && column.defaultVisible) {
238121
+ var _colKey3 = column.getKey();
238122
+ if (_colKey3) {
238123
+ visibleData[_colKey3] = false;
238124
+ }
238125
+ } else if (column.visible && !column.defaultVisible) {
238126
+ var _colKey4 = column.getKey();
238127
+ if (_colKey4) {
238128
+ visibleData[_colKey4] = true;
238129
+ }
238130
+ }
238131
+ }
238132
+ });
238133
+ return storeData;
238134
+ },
238135
+ saveCustomStore: function saveCustomStore() {
238136
+ this.saveCustomVisible();
238137
+ this.saveCustomSort();
238138
+ this.saveCustomFixed();
238139
+ this.saveCustomResizable();
238140
+ },
237660
238141
  saveCustomResizable: function saveCustomResizable(isReset) {
237661
238142
  var id = this.id,
237662
238143
  collectColumn = this.collectColumn,
@@ -237708,11 +238189,9 @@ var Methods = {
237708
238189
  columnWidthStorage = _xeUtils.default.isPlainObject(columnSortStorageMap[id]) ? columnSortStorageMap[id] : {};
237709
238190
  // 排序只支持一级
237710
238191
  collectColumn.forEach(function (column) {
237711
- if (column.sortNumber !== column.renderSortNumber) {
237712
- var colKey = column.getKey();
237713
- if (colKey) {
237714
- columnWidthStorage[colKey] = column.renderSortNumber;
237715
- }
238192
+ var colKey = column.getKey();
238193
+ if (colKey) {
238194
+ columnWidthStorage[colKey] = column.renderSortNumber;
237716
238195
  }
237717
238196
  });
237718
238197
  }
@@ -238617,7 +239096,7 @@ var Methods = {
238617
239096
  var selected = editStore.selected,
238618
239097
  actived = editStore.actived;
238619
239098
  var keyCode = evnt.keyCode;
238620
- var isBack = keyCode === 8;
239099
+ var hasBackspaceKey = keyCode === 8;
238621
239100
  var isTab = keyCode === 9;
238622
239101
  var isEnter = keyCode === 13;
238623
239102
  var isEsc = keyCode === 27;
@@ -238744,12 +239223,12 @@ var Methods = {
238744
239223
  } else if (actived.row || actived.column) {
238745
239224
  _this29.moveTabSelected(actived.args, hasShiftKey, evnt);
238746
239225
  }
238747
- } else if (keyboardConfig && (isDel || (treeConfig && (rowOpts.isCurrent || highlightCurrentRow) && currentRow ? isBack && keyboardOpts.isArrow : isBack))) {
239226
+ } else if (keyboardConfig && (treeConfig || (0, _utils.isEnableConf)(editConfig)) && (isDel || (treeConfig && (rowOpts.isCurrent || highlightCurrentRow) && currentRow ? hasBackspaceKey && keyboardOpts.isArrow : hasBackspaceKey))) {
238748
239227
  if (!isEditStatus) {
238749
239228
  var delMethod = keyboardOpts.delMethod,
238750
239229
  backMethod = keyboardOpts.backMethod;
238751
239230
  // 如果是删除键
238752
- if (keyboardOpts.isDel && (selected.row || selected.column)) {
239231
+ if (keyboardOpts.isDel && (0, _utils.isEnableConf)(editConfig) && (selected.row || selected.column)) {
238753
239232
  var delPaqrams = {
238754
239233
  row: selected.row,
238755
239234
  rowIndex: _this29.getRowIndex(selected.row),
@@ -238762,7 +239241,7 @@ var Methods = {
238762
239241
  } else {
238763
239242
  setCellValue(selected.row, selected.column, null);
238764
239243
  }
238765
- if (isBack) {
239244
+ if (hasBackspaceKey) {
238766
239245
  if (backMethod) {
238767
239246
  backMethod({
238768
239247
  row: selected.row,
@@ -238779,7 +239258,7 @@ var Methods = {
238779
239258
  _this29.updateFooter();
238780
239259
  }
238781
239260
  _this29.emitEvent('cell-delete-value', delPaqrams, evnt);
238782
- } else if (isBack && keyboardOpts.isArrow && treeConfig && (rowOpts.isCurrent || highlightCurrentRow) && currentRow) {
239261
+ } else if (hasBackspaceKey && keyboardOpts.isArrow && treeConfig && (rowOpts.isCurrent || highlightCurrentRow) && currentRow) {
238783
239262
  // 如果树形表格回退键关闭当前行返回父节点
238784
239263
  var _XEUtils$findTree = _xeUtils.default.findTree(_this29.afterFullData, function (item) {
238785
239264
  return item === currentRow;
@@ -239388,8 +239867,12 @@ var Methods = {
239388
239867
  handleToggleCheckRowEvent: function handleToggleCheckRowEvent(evnt, params) {
239389
239868
  var selectCheckboxMaps = this.selectCheckboxMaps,
239390
239869
  checkboxOpts = this.checkboxOpts;
239391
- var checkField = checkboxOpts.checkField;
239870
+ var checkField = checkboxOpts.checkField,
239871
+ trigger = checkboxOpts.trigger;
239392
239872
  var row = params.row;
239873
+ if (trigger === 'manual') {
239874
+ return;
239875
+ }
239393
239876
  var value = false;
239394
239877
  if (checkField) {
239395
239878
  value = !_xeUtils.default.get(row, checkField);
@@ -239405,8 +239888,13 @@ var Methods = {
239405
239888
  triggerCheckRowEvent: function triggerCheckRowEvent(evnt, params, value) {
239406
239889
  var checkboxOpts = this.checkboxOpts,
239407
239890
  afterFullData = this.afterFullData;
239408
- var checkMethod = checkboxOpts.checkMethod;
239891
+ var checkMethod = checkboxOpts.checkMethod,
239892
+ trigger = checkboxOpts.trigger;
239409
239893
  var row = params.row;
239894
+ if (trigger === 'manual') {
239895
+ return;
239896
+ }
239897
+ evnt.stopPropagation();
239410
239898
  if (checkboxOpts.isShiftKey && evnt.shiftKey && !this.treeConfig) {
239411
239899
  var checkboxRecords = this.getCheckboxRecords();
239412
239900
  if (checkboxRecords.length) {
@@ -239851,23 +240339,36 @@ var Methods = {
239851
240339
  }
239852
240340
  }
239853
240341
  },
240342
+ handleCheckAllEvent: function handleCheckAllEvent(evnt, value) {
240343
+ this.handleCheckedAllCheckboxRow(value);
240344
+ if (evnt) {
240345
+ this.emitEvent('checkbox-all', {
240346
+ records: this.getCheckboxRecords(),
240347
+ reserves: this.getCheckboxReserveRecords(),
240348
+ indeterminates: this.getCheckboxIndeterminateRecords(),
240349
+ checked: value
240350
+ }, evnt);
240351
+ }
240352
+ },
239854
240353
  /**
239855
240354
  * 多选,选中所有事件
239856
240355
  */
239857
240356
  triggerCheckAllEvent: function triggerCheckAllEvent(evnt, value) {
239858
- this.handleCheckedAllCheckboxRow(value);
239859
- this.emitEvent('checkbox-all', {
239860
- records: this.getCheckboxRecords(),
239861
- reserves: this.getCheckboxReserveRecords(),
239862
- indeterminates: this.getCheckboxIndeterminateRecords(),
239863
- checked: value
239864
- }, evnt);
240357
+ var checkboxOpts = this.checkboxOpts;
240358
+ var trigger = checkboxOpts.trigger;
240359
+ if (trigger === 'manual') {
240360
+ return;
240361
+ }
240362
+ if (evnt) {
240363
+ evnt.stopPropagation();
240364
+ }
240365
+ this.handleCheckAllEvent(evnt, value);
239865
240366
  },
239866
240367
  /**
239867
240368
  * 多选,切换所有行的选中状态
239868
240369
  */
239869
240370
  toggleAllCheckboxRow: function toggleAllCheckboxRow() {
239870
- this.triggerCheckAllEvent(null, !this.isAllSelected);
240371
+ this.handleCheckAllEvent(null, !this.isAllSelected);
239871
240372
  return this.$nextTick();
239872
240373
  },
239873
240374
  /**
@@ -239935,6 +240436,11 @@ var Methods = {
239935
240436
  var oldValue = this.selectRadioRow,
239936
240437
  radioOpts = this.radioOpts;
239937
240438
  var row = params.row;
240439
+ var trigger = radioOpts.trigger;
240440
+ if (trigger === 'manual') {
240441
+ return;
240442
+ }
240443
+ evnt.stopPropagation();
239938
240444
  var newValue = row;
239939
240445
  var isChange = oldValue !== newValue;
239940
240446
  if (isChange) {
@@ -240614,7 +241120,12 @@ var Methods = {
240614
241120
  rowExpandLazyLoadedMaps = this.rowExpandLazyLoadedMaps,
240615
241121
  column = this.expandColumn;
240616
241122
  var row = params.row;
240617
- var lazy = expandOpts.lazy;
241123
+ var lazy = expandOpts.lazy,
241124
+ trigger = expandOpts.trigger;
241125
+ if (trigger === 'manual') {
241126
+ return;
241127
+ }
241128
+ evnt.stopPropagation();
240618
241129
  var rowid = (0, _util.getRowid)(this, row);
240619
241130
  if (!lazy || !rowExpandLazyLoadedMaps[rowid]) {
240620
241131
  var expanded = !this.isRowExpandByRow(row);
@@ -240940,7 +241451,12 @@ var Methods = {
240940
241451
  treeExpandLazyLoadedMaps = this.treeExpandLazyLoadedMaps;
240941
241452
  var row = params.row,
240942
241453
  column = params.column;
240943
- var lazy = treeOpts.lazy;
241454
+ var lazy = treeOpts.lazy,
241455
+ trigger = treeOpts.trigger;
241456
+ if (trigger === 'manual') {
241457
+ return;
241458
+ }
241459
+ evnt.stopPropagation();
240944
241460
  var rowid = (0, _util.getRowid)(this, row);
240945
241461
  if (!lazy || !treeExpandLazyLoadedMaps[rowid]) {
240946
241462
  var expanded = !this.isTreeExpandByRow(row);
@@ -241650,7 +242166,7 @@ var Methods = {
241650
242166
  var type = 'change';
241651
242167
  if (_this57.hasCellRules) {
241652
242168
  if (_this57.hasCellRules(type, row, column)) {
241653
- var cell = _this57.getCell(row, column);
242169
+ var cell = _this57.getCellElement(row, column);
241654
242170
  if (cell) {
241655
242171
  return _this57.validCellRules(type, row, column, cellValue).then(function () {
241656
242172
  if (customVal && validStore.visible) {
@@ -241811,63 +242327,12 @@ var Methods = {
241811
242327
  /*************************
241812
242328
  * Publish methods
241813
242329
  *************************/
242330
+ /**
242331
+ * 已废弃,被 getCellElement 替换
242332
+ * @deprecated
242333
+ */
241814
242334
  getCell: function getCell(row, column) {
241815
- var $refs = this.$refs;
241816
- var rowid = (0, _util.getRowid)(this, row);
241817
- var bodyElem = null;
241818
- if (column) {
241819
- bodyElem = $refs["".concat(column.fixed || 'table', "Body")] || $refs.tableBody;
241820
- }
241821
- if (bodyElem && bodyElem.$el) {
241822
- return bodyElem.$el.querySelector(".vxe-body--row[rowid=\"".concat(rowid, "\"] .").concat(column.id));
241823
- }
241824
- return null;
241825
- },
241826
- getCellLabel: function getCellLabel(row, column) {
241827
- var formatter = column.formatter;
241828
- var cellValue = _utils.default.getCellValue(row, column);
241829
- var cellLabel = cellValue;
241830
- if (formatter) {
241831
- var rest, formatData;
241832
- var fullAllDataRowMap = this.fullAllDataRowMap;
241833
- var colid = column.id;
241834
- var cacheFormat = fullAllDataRowMap.has(row);
241835
- if (cacheFormat) {
241836
- rest = fullAllDataRowMap.get(row);
241837
- formatData = rest.formatData;
241838
- if (!formatData) {
241839
- formatData = fullAllDataRowMap.get(row).formatData = {};
241840
- }
241841
- if (rest && formatData[colid]) {
241842
- if (formatData[colid].value === cellValue) {
241843
- return formatData[colid].label;
241844
- }
241845
- }
241846
- }
241847
- var formatParams = {
241848
- cellValue: cellValue,
241849
- row: row,
241850
- rowIndex: this.getRowIndex(row),
241851
- column: column,
241852
- columnIndex: this.getColumnIndex(column)
241853
- };
241854
- if (_xeUtils.default.isString(formatter)) {
241855
- var gFormatOpts = _formats.formats.get(formatter);
241856
- cellLabel = gFormatOpts && gFormatOpts.cellFormatMethod ? gFormatOpts.cellFormatMethod(formatParams) : '';
241857
- } else if (_xeUtils.default.isArray(formatter)) {
241858
- var _gFormatOpts = _formats.formats.get(formatter[0]);
241859
- cellLabel = _gFormatOpts && _gFormatOpts.cellFormatMethod ? _gFormatOpts.cellFormatMethod.apply(_gFormatOpts, [formatParams].concat(_toConsumableArray(formatter.slice(1)))) : '';
241860
- } else {
241861
- cellLabel = formatter(formatParams);
241862
- }
241863
- if (formatData) {
241864
- formatData[colid] = {
241865
- value: cellValue,
241866
- label: cellLabel
241867
- };
241868
- }
241869
- }
241870
- return cellLabel;
242335
+ return this.getCellElement(row, column);
241871
242336
  },
241872
242337
  findRowIndexOf: function findRowIndexOf(list, row) {
241873
242338
  var _this64 = this;
@@ -241893,7 +242358,7 @@ var Methods = {
241893
242358
  };
241894
242359
 
241895
242360
  // Module methods
241896
- var funcs = 'setFilter,openFilter,clearFilter,getCheckedFilters,closeMenu,setActiveCellArea,getActiveCellArea,getCellAreas,clearCellAreas,copyCellArea,cutCellArea,pasteCellArea,getCopyCellArea,getCopyCellAreas,clearCopyCellArea,setCellAreas,openFNR,openFind,openReplace,closeFNR,getSelectedCell,clearSelected,insert,insertAt,insertNextAt,remove,removeCheckboxRow,removeRadioRow,removeCurrentRow,getRecordset,getInsertRecords,getRemoveRecords,getUpdateRecords,clearEdit,clearActived,getEditRecord,getActiveRecord,isEditByRow,isActiveByRow,setEditRow,setActiveRow,setEditCell,setActiveCell,setSelectCell,clearValidate,fullValidate,validate,openExport,openPrint,exportData,openImport,importData,saveFile,readFile,importByFile,print,openCustom,closeCustom'.split(',');
242361
+ var funcs = 'setFilter,openFilter,clearFilter,getCheckedFilters,closeMenu,setActiveCellArea,getActiveCellArea,getCellAreas,clearCellAreas,copyCellArea,cutCellArea,pasteCellArea,getCopyCellArea,getCopyCellAreas,clearCopyCellArea,setCellAreas,openFNR,openFind,openReplace,closeFNR,getSelectedCell,clearSelected,insert,insertAt,insertNextAt,remove,removeCheckboxRow,removeRadioRow,removeCurrentRow,getRecordset,getInsertRecords,getRemoveRecords,getUpdateRecords,clearEdit,clearActived,getEditRecord,getActiveRecord,isEditByRow,isActiveByRow,setEditRow,setActiveRow,setEditCell,setActiveCell,setSelectCell,clearValidate,fullValidate,validate,openExport,openPrint,getPrintHtml,exportData,openImport,importData,saveFile,readFile,importByFile,print,openCustom,closeCustom'.split(',');
241897
242362
  funcs.forEach(function (name) {
241898
242363
  Methods[name] = function () {
241899
242364
  if (false) {}
@@ -242402,7 +242867,10 @@ var _default2 = exports["default"] = {
242402
242867
  activeBtn: false,
242403
242868
  activeWrapper: false,
242404
242869
  visible: false,
242405
- maxHeight: 0
242870
+ maxHeight: 0,
242871
+ oldSortMaps: {},
242872
+ oldFixedMaps: {},
242873
+ oldVisibleMaps: {}
242406
242874
  },
242407
242875
  // 当前选中的筛选列
242408
242876
  filterStore: {
@@ -243610,12 +244078,14 @@ Object.defineProperty(exports, "__esModule", ({
243610
244078
  }));
243611
244079
  exports["default"] = exports.VxeTextarea = exports.Textarea = void 0;
243612
244080
  var _textarea = _interopRequireDefault(__webpack_require__(30457));
244081
+ var _vXETable = _interopRequireDefault(__webpack_require__(97080));
243613
244082
  function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
243614
244083
  var VxeTextarea = exports.VxeTextarea = Object.assign(_textarea.default, {
243615
244084
  install: function install(Vue) {
243616
244085
  Vue.component(_textarea.default.name, _textarea.default);
243617
244086
  }
243618
244087
  });
244088
+ _vXETable.default.component(_textarea.default);
243619
244089
  var Textarea = exports.Textarea = VxeTextarea;
243620
244090
  var _default = exports["default"] = VxeTextarea;
243621
244091
 
@@ -243918,12 +244388,14 @@ Object.defineProperty(exports, "__esModule", ({
243918
244388
  }));
243919
244389
  exports["default"] = exports.VxeToolbar = exports.Toolbar = void 0;
243920
244390
  var _toolbar = _interopRequireDefault(__webpack_require__(36801));
244391
+ var _vXETable = _interopRequireDefault(__webpack_require__(97080));
243921
244392
  function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
243922
244393
  var VxeToolbar = exports.VxeToolbar = Object.assign(_toolbar.default, {
243923
244394
  install: function install(Vue) {
243924
244395
  Vue.component(_toolbar.default.name, _toolbar.default);
243925
244396
  }
243926
244397
  });
244398
+ _vXETable.default.component(_toolbar.default);
243927
244399
  var Toolbar = exports.Toolbar = VxeToolbar;
243928
244400
  var _default = exports["default"] = VxeToolbar;
243929
244401
 
@@ -244786,7 +245258,7 @@ exports.warnLog = void 0;
244786
245258
  var _conf = _interopRequireDefault(__webpack_require__(56895));
244787
245259
  function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
244788
245260
  function getLog(message, params) {
244789
- return "[vxe-table v".concat("3.8.7", "] ", _conf.default.i18n(message, params));
245261
+ return "[vxe-table v".concat("3.8.8", "] ", _conf.default.i18n(message, params));
244790
245262
  }
244791
245263
  function outLog(type) {
244792
245264
  return function (message, params) {
@@ -245067,6 +245539,7 @@ var VxeTooltip = exports.VxeTooltip = Object.assign(_tooltip.default, {
245067
245539
  Vue.component(_tooltip.default.name, _tooltip.default);
245068
245540
  }
245069
245541
  });
245542
+ _vXETable.default.component(_tooltip.default);
245070
245543
  var Tooltip = exports.Tooltip = VxeTooltip;
245071
245544
  var _default = exports["default"] = VxeTooltip;
245072
245545
 
@@ -245460,17 +245933,25 @@ var _exportNames = {
245460
245933
  config: true,
245461
245934
  setIcon: true,
245462
245935
  globalStore: true,
245463
- VXETable: true,
245464
- VxeUI: true
245936
+ getComponent: true,
245937
+ component: true,
245938
+ version: true,
245939
+ tableVersion: true,
245940
+ VxeUI: true,
245941
+ VXETable: true
245465
245942
  };
245466
245943
  exports.VxeUI = exports.VXETable = void 0;
245467
245944
  exports._t = _t;
245468
- exports.setConfig = exports.globalStore = exports.globalConfs = exports["default"] = exports.config = void 0;
245945
+ exports.component = component;
245946
+ exports["default"] = exports.config = void 0;
245947
+ exports.getComponent = getComponent;
245948
+ exports.setConfig = exports.globalStore = exports.globalConfs = void 0;
245469
245949
  exports.setIcon = setIcon;
245470
245950
  exports.setup = void 0;
245471
245951
  exports.t = t;
245952
+ exports.tableVersion = void 0;
245472
245953
  exports.use = use;
245473
- exports.v = void 0;
245954
+ exports.version = exports.v = void 0;
245474
245955
  var _xeUtils = _interopRequireDefault(__webpack_require__(78982));
245475
245956
  var _domZindex = _interopRequireDefault(__webpack_require__(40092));
245476
245957
  var _conf = _interopRequireDefault(__webpack_require__(56895));
@@ -245536,6 +246017,17 @@ Object.keys(_formats).forEach(function (key) {
245536
246017
  });
245537
246018
  var _validators = __webpack_require__(70514);
245538
246019
  var _theme = __webpack_require__(21200);
246020
+ Object.keys(_theme).forEach(function (key) {
246021
+ if (key === "default" || key === "__esModule") return;
246022
+ if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
246023
+ if (key in exports && exports[key] === _theme[key]) return;
246024
+ Object.defineProperty(exports, key, {
246025
+ enumerable: true,
246026
+ get: function get() {
246027
+ return _theme[key];
246028
+ }
246029
+ });
246030
+ });
245539
246031
  var _utils = __webpack_require__(87794);
245540
246032
  var _log = __webpack_require__(45561);
245541
246033
  function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -245550,11 +246042,11 @@ function use(Plugin, options) {
245550
246042
  /* eslint-disable @typescript-eslint/no-use-before-define */
245551
246043
  if (Plugin && Plugin.install) {
245552
246044
  if (installedPlugins.indexOf(Plugin) === -1) {
245553
- Plugin.install(VXETable, options);
246045
+ Plugin.install(VxeUI, options);
245554
246046
  installedPlugins.push(Plugin);
245555
246047
  }
245556
246048
  }
245557
- return VXETable;
246049
+ return VxeUI;
245558
246050
  }
245559
246051
 
245560
246052
  /**
@@ -245564,18 +246056,19 @@ function reg(key) {
245564
246056
  /* eslint-disable @typescript-eslint/no-use-before-define */
245565
246057
  // 检测安装顺序是否正确
245566
246058
  if (false) {}
245567
- VXETable["_".concat(key)] = 1;
245568
- }
245569
- function getExportOrImpotType(types, flag) {
245570
- var rest = [];
245571
- _xeUtils.default.objectEach(types, function (val, type) {
245572
- if (val === 0 || val === flag) {
245573
- rest.push(type);
245574
- }
245575
- });
245576
- return rest;
246059
+ VxeUI["_".concat(key)] = 1;
245577
246060
  }
245578
246061
 
246062
+ // function getExportOrImpotType (types, flag) {
246063
+ // const rest = []
246064
+ // XEUtils.objectEach(types, (val, type) => {
246065
+ // if (val === 0 || val === flag) {
246066
+ // rest.push(type)
246067
+ // }
246068
+ // })
246069
+ // return rest
246070
+ // }
246071
+
245579
246072
  /**
245580
246073
  * 全局参数设置
245581
246074
  */
@@ -245589,7 +246082,7 @@ var setConfig = exports.setConfig = function setConfig(options) {
245589
246082
  }
245590
246083
  _xeUtils.default.merge(_conf.default, options);
245591
246084
  }
245592
- return VXETable;
246085
+ return VxeUI;
245593
246086
  };
245594
246087
  var VXETableConfig = /*#__PURE__*/function () {
245595
246088
  function VXETableConfig() {
@@ -245620,7 +246113,7 @@ var VXETableConfig = /*#__PURE__*/function () {
245620
246113
  }, {
245621
246114
  key: "exportTypes",
245622
246115
  get: function get() {
245623
- return getExportOrImpotType(_conf.default.export.types, 1);
246116
+ return _xeUtils.default.keys(_conf.default.table.exportConfig._typeMaps);
245624
246117
  }
245625
246118
 
245626
246119
  /**
@@ -245629,7 +246122,7 @@ var VXETableConfig = /*#__PURE__*/function () {
245629
246122
  }, {
245630
246123
  key: "importTypes",
245631
246124
  get: function get() {
245632
- return getExportOrImpotType(_conf.default.export.types, 2);
246125
+ return _xeUtils.default.keys(_conf.default.table.importConfig._typeMaps);
245633
246126
  }
245634
246127
  }]);
245635
246128
  }(); // 已废弃
@@ -245663,12 +246156,24 @@ function setIcon(options) {
245663
246156
  if (options) {
245664
246157
  Object.assign(_conf.default.icon, options);
245665
246158
  }
245666
- return VXETable;
246159
+ return VxeUI;
245667
246160
  }
245668
246161
  var globalStore = exports.globalStore = {};
245669
- var VXETable = exports.VXETable = {
246162
+ var components = {};
246163
+ function getComponent(name) {
246164
+ return components[name] || null;
246165
+ }
246166
+ function component(comp) {
246167
+ if (comp && comp.name) {
246168
+ components[comp.name] = comp;
246169
+ }
246170
+ }
246171
+ var version = exports.version = "3.8.8";
246172
+ var tableVersion = exports.tableVersion = version;
246173
+ var VxeUI = exports.VxeUI = {
245670
246174
  v: v,
245671
- version: "3.8.7",
246175
+ version: version,
246176
+ tableVersion: tableVersion,
245672
246177
  reg: reg,
245673
246178
  use: use,
245674
246179
  setConfig: setConfig,
@@ -245682,14 +246187,18 @@ var VXETable = exports.VXETable = {
245682
246187
  validators: _validators.validators,
245683
246188
  t: t,
245684
246189
  _t: _t,
246190
+ setTheme: _theme.setTheme,
246191
+ getTheme: _theme.getTheme,
246192
+ getComponent: getComponent,
246193
+ component: component,
245685
246194
  // 已废弃
245686
246195
  config: config,
245687
246196
  setup: setup,
245688
246197
  globalConfs: globalConfs
245689
246198
  };
245690
- var VxeUI = exports.VxeUI = VXETable;
246199
+ var VXETable = exports.VXETable = VxeUI;
245691
246200
  (0, _theme.setTheme)('light');
245692
- var _default = exports["default"] = VXETable;
246201
+ var _default = exports["default"] = VxeUI;
245693
246202
 
245694
246203
  /***/ }),
245695
246204
 
@@ -245836,8 +246345,12 @@ var _default = exports["default"] = {
245836
246345
  // visibleMethod () {}
245837
246346
  // },
245838
246347
  customConfig: {
246348
+ allowVisible: true,
246349
+ allowResizable: true,
245839
246350
  allowFixed: true,
245840
- showFooter: true
246351
+ allowSort: true,
246352
+ showFooter: true,
246353
+ placement: 'topRight'
245841
246354
  // storage: false,
245842
246355
  // checkMethod () {}
245843
246356
  },
@@ -245873,7 +246386,12 @@ var _default = exports["default"] = {
245873
246386
  showAsterisk: true
245874
246387
  },
245875
246388
  importConfig: {
245876
- _typeMaps: {},
246389
+ _typeMaps: {
246390
+ csv: 1,
246391
+ html: 1,
246392
+ xml: 1,
246393
+ txt: 1
246394
+ },
245877
246395
  modes: ['insert', 'covering']
245878
246396
  },
245879
246397
  exportConfig: {
@@ -245939,11 +246457,12 @@ var _default = exports["default"] = {
245939
246457
  TABLE_EXPAND_LOADED: iconPrefix + 'spinner roll',
245940
246458
  TABLE_EXPAND_OPEN: iconPrefix + 'arrow-right rotate90',
245941
246459
  TABLE_EXPAND_CLOSE: iconPrefix + 'arrow-right',
245942
- TABLE_CHECKBOX_CHECKED: iconPrefix + 'checkbox-checked',
246460
+ TABLE_CHECKBOX_CHECKED: iconPrefix + 'checkbox-checked-fill',
245943
246461
  TABLE_CHECKBOX_UNCHECKED: iconPrefix + 'checkbox-unchecked',
245944
- TABLE_CHECKBOX_INDETERMINATE: iconPrefix + 'checkbox-indeterminate',
245945
- TABLE_RADIO_CHECKED: iconPrefix + 'radio-checked',
246462
+ TABLE_CHECKBOX_INDETERMINATE: iconPrefix + 'checkbox-indeterminate-fill',
246463
+ TABLE_RADIO_CHECKED: iconPrefix + 'radio-checked-fill',
245946
246464
  TABLE_RADIO_UNCHECKED: iconPrefix + 'radio-unchecked',
246465
+ TABLE_CUSTOM_SORT: iconPrefix + 'drag-handle',
245947
246466
  // button
245948
246467
  BUTTON_DROPDOWN: iconPrefix + 'arrow-down',
245949
246468
  BUTTON_LOADING: iconPrefix + 'spinner roll',
@@ -245987,9 +246506,9 @@ var _default = exports["default"] = {
245987
246506
  TOOLBAR_TOOLS_MINIMIZE: iconPrefix + 'minimize',
245988
246507
  TOOLBAR_TOOLS_CUSTOM: iconPrefix + 'custom-column',
245989
246508
  TOOLBAR_TOOLS_FIXED_LEFT: iconPrefix + 'fixed-left',
245990
- TOOLBAR_TOOLS_FIXED_LEFT_ACTIVED: iconPrefix + 'fixed-left-fill',
246509
+ TOOLBAR_TOOLS_FIXED_LEFT_ACTIVE: iconPrefix + 'fixed-left-fill',
245991
246510
  TOOLBAR_TOOLS_FIXED_RIGHT: iconPrefix + 'fixed-right',
245992
- TOOLBAR_TOOLS_FIXED_RIGHT_ACTIVED: iconPrefix + 'fixed-right-fill',
246511
+ TOOLBAR_TOOLS_FIXED_RIGHT_ACTIVE: iconPrefix + 'fixed-right-fill',
245993
246512
  // form
245994
246513
  FORM_PREFIX: iconPrefix + 'question-circle-fill',
245995
246514
  FORM_SUFFIX: iconPrefix + 'question-circle-fill',
@@ -246040,6 +246559,7 @@ var _default = exports["default"] = {
246040
246559
  leaveDelay: 300
246041
246560
  },
246042
246561
  pager: {
246562
+ pageSizePlacement: 'top'
246043
246563
  // size: null,
246044
246564
  // autoHidden: false,
246045
246565
  // perfect: true,
@@ -247439,6 +247959,7 @@ var _default = exports["default"] = Store;
247439
247959
  Object.defineProperty(exports, "__esModule", ({
247440
247960
  value: true
247441
247961
  }));
247962
+ exports.getTheme = getTheme;
247442
247963
  exports.setTheme = setTheme;
247443
247964
  var _conf = _interopRequireDefault(__webpack_require__(56895));
247444
247965
  function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -247447,6 +247968,7 @@ function setTheme(name) {
247447
247968
  if (!theme || theme === 'default') {
247448
247969
  theme = 'light';
247449
247970
  }
247971
+ _conf.default.theme = theme;
247450
247972
  if (typeof document !== 'undefined') {
247451
247973
  var documentElement = document.documentElement;
247452
247974
  if (documentElement) {
@@ -247454,6 +247976,9 @@ function setTheme(name) {
247454
247976
  }
247455
247977
  }
247456
247978
  }
247979
+ function getTheme() {
247980
+ return _conf.default.theme;
247981
+ }
247457
247982
 
247458
247983
  /***/ }),
247459
247984
 
@@ -247747,7 +248272,7 @@ var _default = exports["default"] = {
247747
248272
  });
247748
248273
  };
247749
248274
  var posAndFinish = function posAndFinish() {
247750
- firstErrParams.cell = _this2.getCell(firstErrParams.row, firstErrParams.column);
248275
+ firstErrParams.cell = _this2.getCellElement(firstErrParams.row, firstErrParams.column);
247751
248276
  _dom.default.scrollToView(firstErrParams.cell);
247752
248277
  _this2.handleValidError(firstErrParams).then(finish);
247753
248278
  };