vxe-table 3.21.22 → 3.21.23

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.
Files changed (172) hide show
  1. package/es/{iconfont.1782890276645.ttf → iconfont.1783046294821.ttf} +0 -0
  2. package/es/iconfont.1783046294821.woff +0 -0
  3. package/es/iconfont.1783046294821.woff2 +0 -0
  4. package/es/index.css +1 -1
  5. package/es/index.min.css +1 -1
  6. package/es/locale/lang/ar-EG.js +12 -3
  7. package/es/locale/lang/de-DE.js +12 -3
  8. package/es/locale/lang/en-US.js +16 -7
  9. package/es/locale/lang/es-ES.js +12 -3
  10. package/es/locale/lang/fr-FR.js +12 -3
  11. package/es/locale/lang/hu-HU.js +12 -3
  12. package/es/locale/lang/hy-AM.js +12 -3
  13. package/es/locale/lang/id-ID.js +12 -3
  14. package/es/locale/lang/it-IT.js +11 -2
  15. package/es/locale/lang/ja-JP.js +12 -3
  16. package/es/locale/lang/ko-KR.js +12 -3
  17. package/es/locale/lang/ms-MY.js +12 -3
  18. package/es/locale/lang/nb-NO.js +12 -3
  19. package/es/locale/lang/pt-BR.js +12 -3
  20. package/es/locale/lang/ru-RU.js +12 -3
  21. package/es/locale/lang/th-TH.js +12 -3
  22. package/es/locale/lang/ug-CN.js +12 -3
  23. package/es/locale/lang/uk-UA.js +12 -3
  24. package/es/locale/lang/uz-UZ.js +12 -3
  25. package/es/locale/lang/vi-VN.js +11 -2
  26. package/es/locale/lang/zh-CHT.js +14 -5
  27. package/es/locale/lang/zh-CN.js +14 -5
  28. package/es/style.css +1 -1
  29. package/es/style.min.css +1 -1
  30. package/es/table/module/custom/mixin.js +84 -13
  31. package/es/table/module/custom/panel.js +485 -312
  32. package/es/table/src/columnInfo.js +13 -7
  33. package/es/table/src/methods.js +100 -59
  34. package/es/table/src/util.js +31 -1
  35. package/es/table/style.css +96 -49
  36. package/es/table/style.min.css +1 -1
  37. package/es/ui/index.js +16 -4
  38. package/es/ui/src/log.js +1 -1
  39. package/es/vxe-table/style.css +96 -49
  40. package/es/vxe-table/style.min.css +1 -1
  41. package/lib/{iconfont.1782890276645.ttf → iconfont.1783046294821.ttf} +0 -0
  42. package/lib/iconfont.1783046294821.woff +0 -0
  43. package/lib/iconfont.1783046294821.woff2 +0 -0
  44. package/lib/index.css +1 -1
  45. package/lib/index.min.css +1 -1
  46. package/lib/index.umd.js +557 -194
  47. package/lib/index.umd.min.js +1 -1
  48. package/lib/locale/lang/ar-EG.js +12 -3
  49. package/lib/locale/lang/ar-EG.min.js +1 -1
  50. package/lib/locale/lang/ar-EG.umd.js +12 -3
  51. package/lib/locale/lang/de-DE.js +12 -3
  52. package/lib/locale/lang/de-DE.min.js +1 -1
  53. package/lib/locale/lang/de-DE.umd.js +12 -3
  54. package/lib/locale/lang/en-US.js +16 -7
  55. package/lib/locale/lang/en-US.min.js +1 -1
  56. package/lib/locale/lang/en-US.umd.js +16 -7
  57. package/lib/locale/lang/es-ES.js +12 -3
  58. package/lib/locale/lang/es-ES.min.js +1 -1
  59. package/lib/locale/lang/es-ES.umd.js +12 -3
  60. package/lib/locale/lang/fr-FR.js +12 -3
  61. package/lib/locale/lang/fr-FR.min.js +1 -1
  62. package/lib/locale/lang/fr-FR.umd.js +12 -3
  63. package/lib/locale/lang/hu-HU.js +12 -3
  64. package/lib/locale/lang/hu-HU.min.js +1 -1
  65. package/lib/locale/lang/hu-HU.umd.js +12 -3
  66. package/lib/locale/lang/hy-AM.js +12 -3
  67. package/lib/locale/lang/hy-AM.min.js +1 -1
  68. package/lib/locale/lang/hy-AM.umd.js +12 -3
  69. package/lib/locale/lang/id-ID.js +12 -3
  70. package/lib/locale/lang/id-ID.min.js +1 -1
  71. package/lib/locale/lang/id-ID.umd.js +12 -3
  72. package/lib/locale/lang/it-IT.js +11 -2
  73. package/lib/locale/lang/it-IT.min.js +1 -1
  74. package/lib/locale/lang/it-IT.umd.js +11 -2
  75. package/lib/locale/lang/ja-JP.js +12 -3
  76. package/lib/locale/lang/ja-JP.min.js +1 -1
  77. package/lib/locale/lang/ja-JP.umd.js +12 -3
  78. package/lib/locale/lang/ko-KR.js +12 -3
  79. package/lib/locale/lang/ko-KR.min.js +1 -1
  80. package/lib/locale/lang/ko-KR.umd.js +12 -3
  81. package/lib/locale/lang/ms-MY.js +12 -3
  82. package/lib/locale/lang/ms-MY.min.js +1 -1
  83. package/lib/locale/lang/ms-MY.umd.js +12 -3
  84. package/lib/locale/lang/nb-NO.js +12 -3
  85. package/lib/locale/lang/nb-NO.min.js +1 -1
  86. package/lib/locale/lang/nb-NO.umd.js +12 -3
  87. package/lib/locale/lang/pt-BR.js +12 -3
  88. package/lib/locale/lang/pt-BR.min.js +1 -1
  89. package/lib/locale/lang/pt-BR.umd.js +12 -3
  90. package/lib/locale/lang/ru-RU.js +12 -3
  91. package/lib/locale/lang/ru-RU.min.js +1 -1
  92. package/lib/locale/lang/ru-RU.umd.js +12 -3
  93. package/lib/locale/lang/th-TH.js +12 -3
  94. package/lib/locale/lang/th-TH.min.js +1 -1
  95. package/lib/locale/lang/th-TH.umd.js +12 -3
  96. package/lib/locale/lang/ug-CN.js +12 -3
  97. package/lib/locale/lang/ug-CN.min.js +1 -1
  98. package/lib/locale/lang/ug-CN.umd.js +12 -3
  99. package/lib/locale/lang/uk-UA.js +12 -3
  100. package/lib/locale/lang/uk-UA.min.js +1 -1
  101. package/lib/locale/lang/uk-UA.umd.js +12 -3
  102. package/lib/locale/lang/uz-UZ.js +12 -3
  103. package/lib/locale/lang/uz-UZ.min.js +1 -1
  104. package/lib/locale/lang/uz-UZ.umd.js +12 -3
  105. package/lib/locale/lang/vi-VN.js +11 -2
  106. package/lib/locale/lang/vi-VN.min.js +1 -1
  107. package/lib/locale/lang/vi-VN.umd.js +11 -2
  108. package/lib/locale/lang/zh-CHT.js +14 -5
  109. package/lib/locale/lang/zh-CHT.min.js +1 -1
  110. package/lib/locale/lang/zh-CHT.umd.js +14 -5
  111. package/lib/locale/lang/zh-CN.js +14 -5
  112. package/lib/locale/lang/zh-CN.min.js +1 -1
  113. package/lib/locale/lang/zh-CN.umd.js +14 -5
  114. package/lib/style.css +1 -1
  115. package/lib/style.min.css +1 -1
  116. package/lib/table/module/custom/mixin.js +91 -11
  117. package/lib/table/module/custom/mixin.min.js +1 -1
  118. package/lib/table/module/custom/panel.js +376 -158
  119. package/lib/table/module/custom/panel.min.js +1 -1
  120. package/lib/table/src/columnInfo.js +16 -6
  121. package/lib/table/src/columnInfo.min.js +1 -1
  122. package/lib/table/src/methods.js +9 -8
  123. package/lib/table/src/methods.min.js +1 -1
  124. package/lib/table/src/util.js +35 -1
  125. package/lib/table/src/util.min.js +1 -1
  126. package/lib/table/style/style.css +96 -49
  127. package/lib/table/style/style.min.css +1 -1
  128. package/lib/ui/index.js +16 -4
  129. package/lib/ui/index.min.js +1 -1
  130. package/lib/ui/src/log.js +1 -1
  131. package/lib/ui/src/log.min.js +1 -1
  132. package/lib/vxe-table/style/style.css +96 -49
  133. package/lib/vxe-table/style/style.min.css +1 -1
  134. package/package.json +2 -2
  135. package/packages/locale/lang/ar-EG.ts +12 -3
  136. package/packages/locale/lang/de-DE.ts +12 -3
  137. package/packages/locale/lang/en-US.ts +16 -7
  138. package/packages/locale/lang/es-ES.ts +12 -3
  139. package/packages/locale/lang/fr-FR.ts +12 -3
  140. package/packages/locale/lang/hu-HU.ts +12 -3
  141. package/packages/locale/lang/hy-AM.ts +12 -3
  142. package/packages/locale/lang/id-ID.ts +12 -3
  143. package/packages/locale/lang/it-IT.ts +11 -2
  144. package/packages/locale/lang/ja-JP.ts +12 -3
  145. package/packages/locale/lang/ko-KR.ts +12 -3
  146. package/packages/locale/lang/ms-MY.ts +12 -3
  147. package/packages/locale/lang/nb-NO.ts +12 -3
  148. package/packages/locale/lang/pt-BR.ts +12 -3
  149. package/packages/locale/lang/ru-RU.ts +12 -3
  150. package/packages/locale/lang/th-TH.ts +12 -3
  151. package/packages/locale/lang/ug-CN.ts +12 -3
  152. package/packages/locale/lang/uk-UA.ts +12 -3
  153. package/packages/locale/lang/uz-UZ.ts +12 -3
  154. package/packages/locale/lang/vi-VN.ts +11 -2
  155. package/packages/locale/lang/zh-CHT.ts +14 -5
  156. package/packages/locale/lang/zh-CN.ts +14 -5
  157. package/packages/table/module/custom/mixin.ts +85 -14
  158. package/packages/table/module/custom/panel.ts +538 -307
  159. package/packages/table/src/columnInfo.ts +13 -7
  160. package/packages/table/src/methods.ts +116 -60
  161. package/packages/table/src/util.ts +34 -1
  162. package/packages/ui/index.ts +15 -3
  163. package/styles/components/icon.scss +29 -2
  164. package/styles/components/table-module/custom.scss +88 -67
  165. package/styles/icon/iconfont.ttf +0 -0
  166. package/styles/icon/iconfont.woff +0 -0
  167. package/styles/icon/iconfont.woff2 +0 -0
  168. package/styles/theme/base.scss +11 -0
  169. package/es/iconfont.1782890276645.woff +0 -0
  170. package/es/iconfont.1782890276645.woff2 +0 -0
  171. package/lib/iconfont.1782890276645.woff +0 -0
  172. package/lib/iconfont.1782890276645.woff2 +0 -0
@@ -13,7 +13,7 @@ export class ColumnInfo {
13
13
  const $xeGrid = $xeTable.$xeGrid;
14
14
  const $xeGantt = $xeTable.$xeGantt;
15
15
  const $xeGGWrapper = $xeGrid || $xeGantt;
16
- const { type, field, width, visible, aggFunc, formatter, filterMultiple, cellRender, editRender, filterRender } = colConfs;
16
+ const { type, field, width, visible, fixed, align, headerAlign, footerAlign, aggFunc, formatter, filterMultiple, cellRender, editRender, filterRender } = colConfs;
17
17
  const colId = colConfs.colId || XEUtils.uniqueId('col_');
18
18
  const proxyOpts = $xeGrid ? $xeGrid.computeProxyOpts : null;
19
19
  const defaultVisible = XEUtils.isBoolean(visible) ? visible : true;
@@ -82,10 +82,10 @@ export class ColumnInfo {
82
82
  minWidth: colConfs.minWidth,
83
83
  maxWidth: colConfs.maxWidth,
84
84
  resizable: colConfs.resizable,
85
- fixed: colConfs.fixed,
86
- align: colConfs.align,
87
- headerAlign: colConfs.headerAlign,
88
- footerAlign: colConfs.footerAlign,
85
+ fixed,
86
+ align,
87
+ headerAlign,
88
+ footerAlign,
89
89
  showOverflow: colConfs.showOverflow,
90
90
  showHeaderOverflow: colConfs.showHeaderOverflow,
91
91
  showFooterOverflow: colConfs.showFooterOverflow,
@@ -126,7 +126,7 @@ export class ColumnInfo {
126
126
  titleHelp: colConfs.titleHelp,
127
127
  titlePrefix: colConfs.titlePrefix,
128
128
  titleSuffix: colConfs.titleSuffix,
129
- aggFunc: colConfs.aggFunc,
129
+ aggFunc,
130
130
  copyMethod: colConfs.copyMethod,
131
131
  cutMethod: colConfs.cutMethod,
132
132
  pasteMethod: colConfs.pasteMethod,
@@ -140,7 +140,10 @@ export class ColumnInfo {
140
140
  defaultParentId: null,
141
141
  halfVisible: false,
142
142
  defaultVisible: defaultVisible,
143
- defaultFixed: colConfs.fixed,
143
+ defaultFixed: fixed,
144
+ defaultAlign: align,
145
+ defaultHeaderAlign: headerAlign,
146
+ defaultFooterAlign: footerAlign,
144
147
  defaultAggFunc: colConfs.aggFunc,
145
148
  checked: false,
146
149
  halfChecked: false,
@@ -160,6 +163,9 @@ export class ColumnInfo {
160
163
  renderAggFn: '',
161
164
  renderAggDigits: null,
162
165
  renderAggFormat: null,
166
+ renderAlign: '',
167
+ renderHeaderAlign: '',
168
+ renderFooterAlign: '',
163
169
  renderFixed: '',
164
170
  renderVisible: false,
165
171
  renderWidth: defaultRenderWidth,
@@ -3,7 +3,7 @@ import { getTpImg, isPx, isScale, hasClass, addClass, removeClass, wheelScrollLe
3
3
  import { getLastZIndex, nextZIndex, hasChildrenList, getFuncText, isEnableConf, formatText, eqEmptyValue } from '../../ui/src/utils';
4
4
  import { VxeUI } from '../../ui';
5
5
  import Cell from './cell';
6
- import { getRowUniqueId, createRowId, clearTableAllStatus, getColumnList, toFilters, getRowkey, getRowid, rowToVisible, colToVisible, getCellValue, setCellValue, handleRowidOrRow, handleFieldOrColumn, toTreePathSeq, restoreScrollLocation, getRootColumn, getColReMinWidth, getColReMaxWidth, createHandleUpdateRowId, createHandleGetRowId, getRefElem, getCellRestHeight, getLastChildColumn, getRowMaxHeight } from './util';
6
+ import { getRowUniqueId, createRowId, clearTableAllStatus, getColumnList, toFilters, getRowkey, getRowid, rowToVisible, colToVisible, getCellValue, setCellValue, handleRowidOrRow, handleFieldOrColumn, toTreePathSeq, restoreScrollLocation, getRootColumn, getColReMinWidth, getColReMaxWidth, createHandleUpdateRowId, createHandleGetRowId, getRefElem, getCellRestHeight, getLastChildColumn, getRowMaxHeight, handleCustomStoreConfig } from './util';
7
7
  import { getSlotVNs } from '../../ui/src/vn';
8
8
  import { moveRowAnimateToTb, clearRowAnimate, moveColAnimateToLr, clearColAnimate } from '../../ui/src/anime';
9
9
  import { createComponentLog } from '../../ui/src/log';
@@ -31,9 +31,6 @@ function eqCellValue(newRow, oldRow, field) {
31
31
  }
32
32
  return { newValue: val1, oldValue: val2, result };
33
33
  }
34
- function hangleStorageDefaultValue(value, isAll) {
35
- return XEUtils.isBoolean(value) ? value : isAll;
36
- }
37
34
  function getNextSortOrder($xeTable, column) {
38
35
  const sortOpts = $xeTable.computeSortOpts;
39
36
  const { orders = [] } = sortOpts;
@@ -127,19 +124,18 @@ function handleCustomRestore($xeTable, storeData) {
127
124
  const internalData = $xeTable;
128
125
  const { aggregateConfig, rowGroupConfig } = props;
129
126
  const { collectColumn } = internalData;
130
- const customOpts = $xeTable.computeCustomOpts;
131
- const { storage, storeOptions } = customOpts;
132
- const isAllCustom = storage === true;
133
- const storageOpts = Object.assign({}, isAllCustom ? {} : storage || {}, storeOptions);
134
- const isCustomResizable = hangleStorageDefaultValue(storageOpts.resizable, isAllCustom);
135
- const isCustomVisible = hangleStorageDefaultValue(storageOpts.visible, isAllCustom);
136
- const isCustomFixed = hangleStorageDefaultValue(storageOpts.fixed, isAllCustom);
137
- const isCustomSort = hangleStorageDefaultValue(storageOpts.sort, isAllCustom);
138
- const isCustomAggGroup = hangleStorageDefaultValue(storageOpts.aggGroup, isAllCustom);
139
- const isCustomAggFunc = hangleStorageDefaultValue(storageOpts.aggFunc, isAllCustom);
140
- let { resizableData, sortData, visibleData, fixedData, aggGroupData, aggFuncData } = storeData;
127
+ const { isCustomAlign, isCustomHeaderAlign, isCustomFooterAlign, isCustomResizable, isCustomVisible, isCustomFixed, isCustomSort, isCustomAggGroup, isCustomAggFunc } = handleCustomStoreConfig($xeTable);
128
+ let { alignData, headerAlignData, footerAlignData, resizableData, sortData, visibleData, fixedData, aggGroupData, aggFuncData } = storeData;
141
129
  // 处理还原
142
- if ((isCustomResizable && resizableData) || (isCustomSort && sortData) || (isCustomVisible && visibleData) || (isCustomFixed && fixedData) || (isCustomAggGroup && aggGroupData) || (isCustomAggFunc && aggFuncData)) {
130
+ if ((isCustomAlign && alignData) ||
131
+ (isCustomHeaderAlign && headerAlignData) ||
132
+ (isCustomFooterAlign && footerAlignData) ||
133
+ (isCustomResizable && resizableData) ||
134
+ (isCustomSort && sortData) ||
135
+ (isCustomVisible && visibleData) ||
136
+ (isCustomFixed && fixedData) ||
137
+ (isCustomAggGroup && aggGroupData) ||
138
+ (isCustomAggFunc && aggFuncData)) {
143
139
  const sortColMaps = {};
144
140
  if (isCustomSort && sortData) {
145
141
  // 转换兼容老版本数据,即将废弃兼容
@@ -223,15 +219,19 @@ function restoreCustomStorage($xeTable) {
223
219
  const { customConfig } = props;
224
220
  const tableId = $xeTable.computeTableId;
225
221
  const customOpts = $xeTable.computeCustomOpts;
226
- const { storage, restoreStore, storeOptions } = customOpts;
227
- const isAllCustom = storage === true;
228
- const storageOpts = Object.assign({}, isAllCustom ? {} : storage || {}, storeOptions);
229
- const isCustomResizable = hangleStorageDefaultValue(storageOpts.resizable, isAllCustom);
230
- const isCustomVisible = hangleStorageDefaultValue(storageOpts.visible, isAllCustom);
231
- const isCustomFixed = hangleStorageDefaultValue(storageOpts.fixed, isAllCustom);
232
- const isCustomSort = hangleStorageDefaultValue(storageOpts.sort, isAllCustom);
233
- const isCustomAggFunc = hangleStorageDefaultValue(storageOpts.aggFunc, isAllCustom);
234
- if (storage && (customConfig ? isEnableConf(customOpts) : customOpts.enabled) && (isCustomResizable || isCustomVisible || isCustomFixed || isCustomSort || isCustomAggFunc)) {
222
+ const { storage, restoreStore } = customOpts;
223
+ const { isCustomAlign, isCustomHeaderAlign, isCustomFooterAlign, isCustomResizable, isCustomVisible, isCustomFixed, isCustomSort, isCustomAggGroup, isCustomAggFunc } = handleCustomStoreConfig($xeTable);
224
+ if (storage &&
225
+ (customConfig ? isEnableConf(customOpts) : customOpts.enabled) &&
226
+ (isCustomAlign ||
227
+ isCustomHeaderAlign ||
228
+ isCustomFooterAlign ||
229
+ isCustomResizable ||
230
+ isCustomVisible ||
231
+ isCustomFixed ||
232
+ isCustomSort ||
233
+ isCustomAggGroup ||
234
+ isCustomAggFunc)) {
235
235
  if (!tableId) {
236
236
  errLog('vxe.error.reqProp', ['id']);
237
237
  return;
@@ -6397,15 +6397,19 @@ const tableMethods = {
6397
6397
  const { customConfig } = props;
6398
6398
  const tableId = $xeTable.computeTableId;
6399
6399
  const customOpts = $xeTable.computeCustomOpts;
6400
- const { storage, restoreStore, storeOptions } = customOpts;
6401
- const isAllCustom = storage === true;
6402
- const storageOpts = Object.assign({}, isAllCustom ? {} : storage || {}, storeOptions);
6403
- const isCustomResizable = hangleStorageDefaultValue(storageOpts.resizable, isAllCustom);
6404
- const isCustomVisible = hangleStorageDefaultValue(storageOpts.visible, isAllCustom);
6405
- const isCustomFixed = hangleStorageDefaultValue(storageOpts.fixed, isAllCustom);
6406
- const isCustomAggGroup = hangleStorageDefaultValue(storageOpts.aggGroup, isAllCustom);
6407
- const isCustomSort = hangleStorageDefaultValue(storageOpts.sort, isAllCustom);
6408
- if (storage && (customConfig ? isEnableConf(customOpts) : customOpts.enabled) && (isCustomResizable || isCustomVisible || isCustomFixed || isCustomAggGroup || isCustomSort)) {
6400
+ const { storage, restoreStore } = customOpts;
6401
+ const { isCustomAlign, isCustomHeaderAlign, isCustomFooterAlign, isCustomResizable, isCustomVisible, isCustomFixed, isCustomSort, isCustomAggGroup, isCustomAggFunc } = handleCustomStoreConfig($xeTable);
6402
+ if (storage &&
6403
+ (customConfig ? isEnableConf(customOpts) : customOpts.enabled) &&
6404
+ (isCustomAlign ||
6405
+ isCustomHeaderAlign ||
6406
+ isCustomFooterAlign ||
6407
+ isCustomResizable ||
6408
+ isCustomVisible ||
6409
+ isCustomFixed ||
6410
+ isCustomSort ||
6411
+ isCustomAggGroup ||
6412
+ isCustomAggFunc)) {
6409
6413
  if (!tableId) {
6410
6414
  errLog('vxe.error.reqProp', ['id']);
6411
6415
  return;
@@ -6450,6 +6454,9 @@ const tableMethods = {
6450
6454
  if (!checkMethod || checkMethod({ $table: $xeTable, column })) {
6451
6455
  column.visible = column.defaultVisible;
6452
6456
  }
6457
+ column.align = column.defaultAlign;
6458
+ column.headerAlign = column.defaultHeaderAlign;
6459
+ column.footerAlign = column.defaultFooterAlign;
6453
6460
  column.aggFunc = column.defaultAggFunc;
6454
6461
  column.renderAggFn = column.defaultAggFunc;
6455
6462
  column.renderResizeWidth = column.renderWidth;
@@ -6495,15 +6502,11 @@ const tableMethods = {
6495
6502
  const customOpts = $xeTable.computeCustomOpts;
6496
6503
  const { isRowGroupStatus, rowGroupList } = reactData;
6497
6504
  const { fullColumnFieldData, collectColumn } = internalData;
6498
- const { storage, checkMethod, storeOptions } = customOpts;
6499
- const isAllCustom = storage === true;
6500
- const storageOpts = Object.assign({}, isAllCustom ? {} : storage || {}, storeOptions);
6501
- const isCustomResizable = hangleStorageDefaultValue(storageOpts.resizable, isAllCustom);
6502
- const isCustomVisible = hangleStorageDefaultValue(storageOpts.visible, isAllCustom);
6503
- const isCustomFixed = hangleStorageDefaultValue(storageOpts.fixed, isAllCustom);
6504
- const isCustomSort = hangleStorageDefaultValue(storageOpts.sort, isAllCustom);
6505
- const isCustomAggGroup = hangleStorageDefaultValue(storageOpts.aggGroup, isAllCustom);
6506
- const isCustomAggFunc = hangleStorageDefaultValue(storageOpts.aggFunc, isAllCustom);
6505
+ const { storage, checkMethod } = customOpts;
6506
+ const { isCustomAlign, isCustomHeaderAlign, isCustomFooterAlign, isCustomResizable, isCustomVisible, isCustomFixed, isCustomSort, isCustomAggGroup, isCustomAggFunc } = handleCustomStoreConfig($xeTable);
6507
+ const alignData = {};
6508
+ const headerAlignData = {};
6509
+ const footerAlignData = {};
6507
6510
  const resizableData = {};
6508
6511
  const sortData = [];
6509
6512
  const visibleData = {};
@@ -6511,6 +6514,9 @@ const tableMethods = {
6511
6514
  const aggGroupData = {};
6512
6515
  const aggFuncData = {};
6513
6516
  const storeData = {
6517
+ alignData: undefined,
6518
+ headerAlignData: undefined,
6519
+ footerAlignData: undefined,
6514
6520
  resizableData: undefined,
6515
6521
  sortData: undefined,
6516
6522
  visibleData: undefined,
@@ -6524,6 +6530,9 @@ const tableMethods = {
6524
6530
  }
6525
6531
  return storeData;
6526
6532
  }
6533
+ let hasAlign = 0;
6534
+ let hasHeaderAlign = 0;
6535
+ let hasFooterAlign = 0;
6527
6536
  let hasResizable = 0;
6528
6537
  let hasSort = 0;
6529
6538
  let hasFixed = 0;
@@ -6564,6 +6573,18 @@ const tableMethods = {
6564
6573
  fixedData[colKey] = column.fixed;
6565
6574
  }
6566
6575
  }
6576
+ if (isCustomAlign && column.align) {
6577
+ hasAlign = 1;
6578
+ alignData[colKey] = column.align;
6579
+ }
6580
+ if (isCustomHeaderAlign && column.headerAlign) {
6581
+ hasHeaderAlign = 1;
6582
+ headerAlignData[colKey] = column.headerAlign;
6583
+ }
6584
+ if (isCustomFooterAlign && column.footerAlign) {
6585
+ hasFooterAlign = 1;
6586
+ footerAlignData[colKey] = column.footerAlign;
6587
+ }
6567
6588
  if (isCustomResizable && column.resizeWidth) {
6568
6589
  hasResizable = 1;
6569
6590
  resizableData[colKey] = column.renderWidth;
@@ -6583,6 +6604,15 @@ const tableMethods = {
6583
6604
  aggFuncData[colKey] = column.aggFunc;
6584
6605
  }
6585
6606
  });
6607
+ if (hasAlign) {
6608
+ storeData.alignData = alignData;
6609
+ }
6610
+ if (hasHeaderAlign) {
6611
+ storeData.headerAlignData = headerAlignData;
6612
+ }
6613
+ if (hasFooterAlign) {
6614
+ storeData.footerAlignData = footerAlignData;
6615
+ }
6586
6616
  if (hasResizable) {
6587
6617
  storeData.resizableData = resizableData;
6588
6618
  }
@@ -6619,33 +6649,40 @@ const tableMethods = {
6619
6649
  const { customConfig } = props;
6620
6650
  const tableId = $xeTable.computeTableId;
6621
6651
  const customOpts = $xeTable.computeCustomOpts;
6622
- const { updateStore, storage, storeOptions } = customOpts;
6623
- const isAllCustom = storage === true;
6624
- const storageOpts = Object.assign({}, isAllCustom ? {} : storage || {}, storeOptions);
6625
- const isCustomResizable = hangleStorageDefaultValue(storageOpts.resizable, isAllCustom);
6626
- const isCustomVisible = hangleStorageDefaultValue(storageOpts.visible, isAllCustom);
6627
- const isCustomFixed = hangleStorageDefaultValue(storageOpts.fixed, isAllCustom);
6628
- const isCustomSort = hangleStorageDefaultValue(storageOpts.sort, isAllCustom);
6629
- const isCustomAggGroup = hangleStorageDefaultValue(storageOpts.aggGroup, isAllCustom);
6630
- const isCustomAggFunc = hangleStorageDefaultValue(storageOpts.aggFunc, isAllCustom);
6652
+ const { updateStore, storage } = customOpts;
6653
+ const { isCustomAlign, isCustomHeaderAlign, isCustomFooterAlign, isCustomResizable, isCustomVisible, isCustomFixed, isCustomSort, isCustomAggGroup, isCustomAggFunc } = handleCustomStoreConfig($xeTable);
6631
6654
  if (type !== 'reset') {
6655
+ // fix:修复拖动列宽,重置按钮无法点击的问题
6632
6656
  reactData.isCustomStatus = true;
6633
6657
  }
6634
- if (storage && (customConfig ? isEnableConf(customOpts) : customOpts.enabled) && (isCustomResizable || isCustomVisible || isCustomFixed || isCustomSort || isCustomAggGroup || isCustomAggFunc)) {
6658
+ if (storage &&
6659
+ (customConfig ? isEnableConf(customOpts) : customOpts.enabled) &&
6660
+ (isCustomAlign ||
6661
+ isCustomHeaderAlign ||
6662
+ isCustomFooterAlign ||
6663
+ isCustomResizable ||
6664
+ isCustomVisible ||
6665
+ isCustomFixed ||
6666
+ isCustomSort ||
6667
+ isCustomAggGroup ||
6668
+ isCustomAggFunc)) {
6635
6669
  if (!tableId) {
6636
6670
  errLog('vxe.error.reqProp', ['id']);
6637
- return this.$nextTick();
6671
+ return $xeTable.$nextTick();
6638
6672
  }
6639
6673
  const storeData = type === 'reset'
6640
6674
  ? {
6675
+ alignData: {},
6676
+ headerAlignData: {},
6677
+ footerAlignData: {},
6641
6678
  resizableData: {},
6642
- sortData: {},
6679
+ sortData: [],
6643
6680
  visibleData: {},
6644
6681
  fixedData: {},
6645
6682
  aggGroupData: {},
6646
6683
  aggFuncData: {}
6647
6684
  }
6648
- : this.getCustomStoreData();
6685
+ : $xeTable.getCustomStoreData();
6649
6686
  if (updateStore) {
6650
6687
  return updateStore({
6651
6688
  $table: $xeTable,
@@ -6658,13 +6695,17 @@ const tableMethods = {
6658
6695
  setCustomStorageMap(tableId, type === 'reset' ? null : storeData);
6659
6696
  }
6660
6697
  }
6661
- return this.$nextTick();
6698
+ return $xeTable.$nextTick();
6662
6699
  },
6663
6700
  handleUpdateDataQueue() {
6664
- this.upDataFlag++;
6701
+ const $xeTable = this;
6702
+ const reactData = $xeTable;
6703
+ reactData.upDataFlag++;
6665
6704
  },
6666
6705
  handleRefreshColumnQueue() {
6667
- this.reColumnFlag++;
6706
+ const $xeTable = this;
6707
+ const reactData = $xeTable;
6708
+ reactData.reColumnFlag++;
6668
6709
  },
6669
6710
  handleFilterOptions(column) {
6670
6711
  const $xeTable = this;
@@ -219,7 +219,8 @@ export function createReactData() {
219
219
  activeWrapper: false,
220
220
  visible: false,
221
221
  maxHeight: null,
222
- popupStyle: {},
222
+ defPopupStyle: {},
223
+ panePopupStyle: {},
223
224
  oldSortMaps: {},
224
225
  oldFixedMaps: {},
225
226
  oldVisibleMaps: {}
@@ -1011,3 +1012,32 @@ export function colToVisible($xeTable, isForce, column, row) {
1011
1012
  }
1012
1013
  return Promise.resolve();
1013
1014
  }
1015
+ function hangleBolleanDefaultValue(currVal, defVal) {
1016
+ return XEUtils.isBoolean(currVal) ? currVal : defVal;
1017
+ }
1018
+ export function handleCustomStoreConfig($xeTable) {
1019
+ const customOpts = $xeTable.computeCustomOpts;
1020
+ const { storage, storeOptions } = customOpts;
1021
+ const isAllCustom = storage === true;
1022
+ const storageOpts = Object.assign({}, isAllCustom ? {} : storage || {}, storeOptions);
1023
+ const isCustomAlign = hangleBolleanDefaultValue(storageOpts.align, isAllCustom);
1024
+ const isCustomHeaderAlign = hangleBolleanDefaultValue(storageOpts.headerAlign, isAllCustom);
1025
+ const isCustomFooterAlign = hangleBolleanDefaultValue(storageOpts.footerAlign, isAllCustom);
1026
+ const isCustomResizable = hangleBolleanDefaultValue(storageOpts.resizable, isAllCustom);
1027
+ const isCustomVisible = hangleBolleanDefaultValue(storageOpts.visible, isAllCustom);
1028
+ const isCustomFixed = hangleBolleanDefaultValue(storageOpts.fixed, isAllCustom);
1029
+ const isCustomSort = hangleBolleanDefaultValue(storageOpts.sort, isAllCustom);
1030
+ const isCustomAggGroup = hangleBolleanDefaultValue(storageOpts.aggGroup, isAllCustom);
1031
+ const isCustomAggFunc = hangleBolleanDefaultValue(storageOpts.aggFunc, isAllCustom);
1032
+ return {
1033
+ isCustomAlign,
1034
+ isCustomHeaderAlign,
1035
+ isCustomFooterAlign,
1036
+ isCustomResizable,
1037
+ isCustomVisible,
1038
+ isCustomFixed,
1039
+ isCustomSort,
1040
+ isCustomAggGroup,
1041
+ isCustomAggFunc
1042
+ };
1043
+ }
@@ -543,7 +543,7 @@
543
543
 
544
544
  @font-face {
545
545
  font-family: "vxetableiconfont";
546
- src: url("data:application/x-font-woff2;charset=utf-8;base64,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") format("woff2");
546
+ src: url("data:application/x-font-woff2;charset=utf-8;base64,d09GMgABAAAAABG8AAsAAAAAJmgAABFuAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHFQGYACJRAqybKkUATYCJAOBMAtaAAQgBYVHB4R4G3QgM6M2i7OCkf2fIBuygf5VRECnRgjs1BSztefee8/UkTp1BuhTsBkJ3vANWin5Qn8FgALldmEFAISABEQSEJHw6A/8F5otqAAAAAAAwFBKiOf1/puT5NteQB2zVNNSum9REfdOX52xtnDeszNg0rnQ5LJ0spUv36mn01+AlRXgBpHSAlTWV8I6WbMlrSdrx226PTHMXqJWpYeYLpIMvwS8dUwqmGjv8cN0CLd1lH2bzN6krR4Ws/qjGKLNg2AW+hX41XwGfiSfwVe3FLK79rFFnoguBhCdqEV63mBQ4HTXMdm7sAtOg5LICKc+KbgEwP8v9/tw0rxcJDyEjdhbLzLOnufWSv7//+ZKuzmiArtGpPjLwuy+qxEVvsJkJsl1JzMHs8UcLxRynPLelYCeR8oVd4ubIjhAYYmEqrEVwlVIWyidy7k5mPBPWwrRyWNs5oHDfetjFENszPjIh0EAe1J5xGRlxofPxeoklWBxyDT6+gLB+DKpotHFvDYQI6GZYJtnnfWyBrKeFWgr5jJY53x6+SBdXKBhpaPfUut/aYtfCn7KmGsG/TFT3jRwdg2wAnQgsWWDtO3JQdlI90iiQ+1Ff2eGzAMF1Z6YwUtYK/hJU7oqV+3UKBVSU9QCtVhtUJvVDpVSV9UN9fWz8rmFpb9lqCVimW55+vn/2wdf/rzr9e7a+2EfDnzaKSlzIsN9UfbXhR/xV1vukJjb+sYCqg332uzrhfb4zv+e100vUFkhhPlEudrhgJsj3jHutlhjgxP2BIVEBHt4+joTHernHxDoQmxcpFd8goaOAYE1gHHbAKEnrqoRpIAKaYAEpAMCUDnggNoBZmgU4IxCOsXZFAAUoAWAFmgRYIAWA9qgDYAp2gy4oh2AIUoBctBVQAq6DshANwAd0FdACVYBbLAtADtsf8AROxSwxUYAI+x0zhjYU+DMgf0HQBfcA8AF9wOwx/0ELHC/AEvcb8AK9wewpukF6EFzFXCjuQa48xsGOPE/AJjgdwAe+J2AGp8AhOCTgAh8RjtN6dO6xAf4Qu4DKOOAPigY5lgIEQRRw6BCqcO+ohpWMU6imihXEDU4IpjaALXOyoS2DdaqquaV9HpeKOl6pWYzhpVLMpFqaiprJUJKS71EbUbctG1LiFzX5na31B02iBNkgg4HIXk1gLpGKuVG7haOrrJVs1V525a2fX32ZjKPIcSdRQ+Syh01eOIwJwrQ7o8dL2QiNIs0noeQdeMSkQOzR0lCsZEryU5nxoThCRb3JIvz6MLZzvJcD1XLzAJjTLxEmyiNkagxkYjgJ4px1kmN7On8MR0m04zTHT+STYZk50pd5mR+i93WKm/SG8hnUYWLXzivFqgittbW1dtlAlrORQlg94Xuwb6ZVm6yQFFtEZd/aAtM/8e2WOQ2EDOdAQyzBVaGnXGPXt4N8UMvNH7+nmYcfY0ruYV93n4b3d9sQBUHK4bs7EDzlTFCgxPIJkkccjScaByrC8yz0z7SgnxMmOw0WaSZfHazU+uRYD8HFrNjNBpFyOaRCUKFhNbR7PRcKlm0UMhmrcaPpTNGTpb68XlBZExlZozqoSuYjbgiE8nMNqRcuZbmMAZrhUPcPTM/id1CIzI6wNzE2GJiwZkQ4nOgFYuDEA2lD7JhPeNsVx4FmBhWfdGVQ8ZIMKL0JJYrGSaoXpJIyecs7mYjOsgxj0Enm6sYs8Gw8s5gsB8lCqzNWaX7FvI51IvTJgtPof5xNuWLrptVRVVUZaodTVzpWTdWEGRNU8kjyORZoMkQFGIvn8pN9kt8H5hagtV60MpM03ySWuMkqEZ5O3zo1qMHLUfJyNkucsOyUtipQq+fF0waRLL6M8Bkp+AyoWe9iwW3N8g2XkP8ouBTsxsN4s5HYLY87iGFrulZHNOFGkc/n0krP3ygdz6Kew3sbrHyQcViuaehtz8EXUSBKlxGhVBaOoF42nxBMHg6mGAciYdxDMiuYGxdfc5PkS49C2itumY6rzx5BsPc8hSr4sz5MWp867M53YwZdzo0aSoVZpWbwEEUjjAG9j3AAT8uhJAwwteEOCpbC53am5lPFKoV7SOfipNFN48dtKVQ/eELls+yI8AwV4lMtnqG0GRyvEls9UbQ0RZi1gf6niC2tE3wlmLaNHBflBtkxF3BtOx4I9HAumDL08KsGCUYyB/jVsUzJ2NRNupclHlYlHVApx2/XuwEv9HQQ37t45VcHRTyxiGXbsgVHOUyMlMtQ8n0EsRdaWNdYFb+NC4Rfv7s3BZH6QYEoTNP0LTDA70EDHOttwCuhmHrbg9kNX3Db7Jb4kb9yjf0hrjFbs52vQus+nl+Lk/GSatGWz6GY6AtxJnOFvfdnkG0+2SQqpyGxr/v9sYkAU1Ri8d6BU4OfG2UmSL8ygl68qq4fno/sMW2ejvfIuF8S0MeszxCuvlWk2g9ppN1h4GTNEvb3drZpe1qxBQtCpYOsIFW/yFNaHmNDkJzR83kMWTCcyUcv3/iYXYUMlmFG96C39uwQ7jP1/EI3htqarUfWyu36/BTC4n/evf4fhjg+n1VwczdrAPc93pMMGRUjJtV8JUjjAXh+zxEZh4FGIIvHfE800kOMyaQ5m/ekcrpsjUZQhdwg8yNuf7jk4NcMPcS/B3oD3Tbi8xgmO3kI1yM0a3wr+PRxtzofd5Xpm0cQs18FGaTwRjpM+f+7uWzyGUqT17FigHWTOvkbRUEbx6UbzY+eQxwmMwfAIntwHgojTdmIxTDXEQMARQjuVpMgJ+aVFC3V9gm3Ovm+xSjvWjsaXv3Pr8BXQKL6YI6+hn8BioS45sXw5KD/Bt8Bo4vrrjB8DuENEpKAGu54cND4n+iYxTZlIyKdO85A4gBSYBIi0ojYPXxHlgXDO99WbSnWaYXvgNAqTo6KK1MrZZpqY4WdZwqNkZDafXNlCa2tDRWQzXrtZQmJlYVpwasJ/1Gjhr5Gs6SLA+QjJIELDdzvLojE0d5hPlaU8ZqrAdbEDdVqTQJtYI9yrxRbhIq0JYJy9uDKoSmvDwQhOEg9pLVepREN1LNudLcdG251vDthCpFNiNSVEECV2W294w/T8yFCrpQzmS2/bW/dMkv98zUmZ71pyvVjEp5LxYkjZcm/JPmQ6cjUl4aMh1Nhb0ZjzRbELs5IcrevpHUtoxWZC3ZaG8fhZI8En3uL+3y7Ar6HM1mvC2g+huKCiGGi2FhNRXjok6LoAjnwiIbLo59HO6p8xTxpnffGp33aaaX6z41ygob7N6h1k+X8iQOR2jXPpfojwCxIwV92DQ7my1nPzh9zyvHSmmrOMtaECyHPDYXTeMA7Li30aZO8fxbVzw43TrE9hyihrvqV0RP9PPvhnhQug0/i+D9cQNQNq84pCAoYUDSQP/zeBk+OKVvWt9Sv/rQdrQZKcpQZRY/QtuQ5ozirNK60EFizrZ4nZKkw8NpMvc8qQyX0xFK8nwuWZgTzjWl6fC72bYLMUVKjfxU3rrISB3ZZG8Pog5PREiE5ii3G/tphPRE5aL3wm6airqFCJ7LG0w0zj1ZbnC0HSeaSScmSp8/b6upIZNS0rdSsUZhmtAYS2VwgZCVpC+P01CUJq78s+Uq0FDvBX/Gle0929f9DGtaxt4NrljUPNyIGEZJmp6SYN0kNoIv3I37tfoJ6gQGZGUHKGwNyA4S1h0Vl980Qa9LkclcupTZshSZbsac33pmXPlopEREpCgvyoVhwRdxoY4XWK5XYa0CxZsjsPL2ooJ1egZgJrij6y1w6zHqa6fPQNP5NF/OT8+C71zzbUZEkaaUR0Ywnb1r39OuWXSs1E37QaHoccYM7+CkRBApSVkhiL/Cj1FX4gUr+BuBTOQ1uy9e6NdvxAgHh359AVst6xi+X8ORoI9BsKK8F0WExlVOr4qrmk7FESFnGHU4YQ6rPPR8142LH0ZVUavvUUqKxwqpSLlxoOe1Ui0rjYkplalfW0Y+G1bLXnOjWQ/y0+VGrCtXhGy8ijacG3Eexwako+TTUAvPGqJzbcscMsECIjdfWKwtRNBoKzgzY0jm2iG+d0iGZbW6gs23h2Qm5UQUgQ3bZnsggBR5n2jbw4dGXEzMO8YX9l8XIcaN8JNr3i4QXfxjkibHjcD/xlYoIi7tEREuQvijedGTd00M24ZgOIZAOwKDW/E9RIq3IlxCJCIYwUWErg3PC5tYCXsEdiDiUEKeX4qPT4pfybGBFB8/ZrdO2b5a3zwaE5CtYM/jBgUd8+hotHbsXrBgj6MfMXITcQcc7OeISr4LL0IGzoAbUlJaTTc8nmm76HudMPk7BNCelTMS+CgZbt40eHA9DEeOnLS0LcOj/d49Axj0U8LIkAsUDcpJnLoZMKda4pgBCvi6QR7mx9BcJoi56XjwE4k7xJd9GwaGb6qtzcjYocsZCYSn3IUAqs7k5GjwwR6ylOGzZ+Malw/Gv9bTMr5Ag/84MLgzPAzvFa4DXQa50K7DhrnSeNRAV8WwoR8EUVwUru/3lQIHrgfXweRAzwgdgSXcKUrto47ysVa1cAH2iPbM8cQOC6xZKUKXsy4oummq5qsGxC5jIWnQzFFwbip+M0wjAJ185CZCyK7h7do1z6DUUwpftGkQRBDzP2T8azyNjx+bCMkhQB1hmvlJUG+yDHHmqFzu77vIRveMHK3BMM3okWcdkTM/B6g4yRaLaS6UcSfPhs7v29v1+r39wJofcyoqKwIwwX7TSVk0q29AYB9W04qTpjufMFQHZ0/myuBci8mSrOIMeHcGcTw7eiSm0WAjR+9B2Rdv3HfhqJyHmCx6mMQ3D03aI8/yHrjVwqsevXZMk8crk7fpYd2z8hyNkLndDyPza5b5+ouM44+PnuTvm5qnAuP1kdE3G58cOducugj7birTdK70n1xWt+1GDScYq5Tf+zO9CfP5q6f+8Z3/714sluL/7lpcoyPev1a8eOJ4ZcJx91Lx4t6yxaN1qgrxcz9LEI/UicrFk0crLrp8Rxa5XURIrDw3iyXN0uxazZWnN+QhM/6EnOseq8SpvPC4nDroSSyePVj+h93cWjIF6KOZctSPdnvezLjNGKmo2Z4CyS9ZuXl9oOV9inepOJmufUXb6stmYh8rHx3OlaWn+5bjkJNty68E9d+cs7H41sfiZDTuq+3ST5TbqAnPPAr8393ofxBbtLgigX9qQoMug581Z/AUgkRDNJfo0pSicxK0/49KvgOHX2ANsDeWgf9rytz528dcj8zYIq6MSiQNGyIkHVfOBSPxRrLCgXrJGle+SPYkAFd2wIMfQEcMOyCae0USQvktaTjzTtIJ5b/LyBRDssJbOhNrUeJIyZ7uUxObA9Fy/zWCFrCqHilvCJ2nlP4QRNcB2L39CE0OmqNmCB/zK3DyhOoqOTW65jUgcBVRUr+5FnHKMXXq1cutQQikItMdGKlakXhzkTJG5Lgy1BXPMaAJYClqI6tPzyDIWUXfEDimVgveDJPIR2I0Mtk8jTPOFiZfcSVLPHvgFFdUXBYQXlMsNMOekPTUrHFtCkdRwri6o3iFDBCMSqKI4jPdAYaoaAuY0Q0XaEEuK63qz+02L2VZz1S/8USxiL6GphumZTuu5/vRLupvYGhkbGJq5v34jVlaWdvY2tk7qBydnF1c3dw91J5eEYoLmpkGqcxxyfPauEmcrUmEumUdfIOlARTgpRcvU9zK4v0DBHCyzdp6KjOaFkwPbOl8CHtoQzUNRU97xgRKMN8w5eixme3rkCHNaWvLlOvpNNBxOhHLHFJpmbCA9bL9LdkQT42o9GwCSGErVWpk/k1GrWaCyB5lpxHTEf+KyalrR1UaCrnDtdaPsWg0g4wBm/fRwKiu2nH1BUPERZdDSIYBcL7z6OdGxrB5X2/WZUQI8+VZAmk7l550HE483Crc0SxDBC1LlnVTthptgCMpVo8WBLj8QVr6XjibI/KvOT/sEG6HEjXPIsvWfaVkRTzv0o2vCA==") format("woff2");
547
547
  }
548
548
  @keyframes rollCircle {
549
549
  0% {
@@ -599,6 +599,34 @@
599
599
  color: var(--vxe-ui-status-error-color);
600
600
  }
601
601
 
602
+ .vxe-table-icon-top:before {
603
+ content: "\e614";
604
+ }
605
+
606
+ .vxe-table-icon-arrows-up:before {
607
+ content: "\f297";
608
+ }
609
+
610
+ .vxe-table-icon-arrows-down:before {
611
+ content: "\f298";
612
+ }
613
+
614
+ .vxe-table-icon-bottom:before {
615
+ content: "\f29b";
616
+ }
617
+
618
+ .vxe-table-icon-align-center:before {
619
+ content: "\e610";
620
+ }
621
+
622
+ .vxe-table-icon-align-right:before {
623
+ content: "\e6b9";
624
+ }
625
+
626
+ .vxe-table-icon-align-left:before {
627
+ content: "\e6bb";
628
+ }
629
+
602
630
  .vxe-table-icon-radio-unchecked-fill:before {
603
631
  content: "\e699";
604
632
  }
@@ -743,6 +771,27 @@
743
771
  content: "\f291";
744
772
  }
745
773
 
774
+ .vxe-table-custom-wrapper,
775
+ .vxe-table-custom-popup--body-wrapper {
776
+ --vxe-ui-table-custom-current-font-size: var(--vxe-ui-font-size-default);
777
+ --vxe-ui-table-custom-current-row-height: var(--vxe-ui-table-row-height-default);
778
+ }
779
+ .vxe-table-custom-wrapper.size--medium,
780
+ .vxe-table-custom-popup--body-wrapper.size--medium {
781
+ --vxe-ui-table-custom-current-font-size: var(--vxe-ui-font-size-medium);
782
+ --vxe-ui-table-custom-current-row-height: var(--vxe-ui-table-row-height-medium);
783
+ }
784
+ .vxe-table-custom-wrapper.size--small,
785
+ .vxe-table-custom-popup--body-wrapper.size--small {
786
+ --vxe-ui-table-custom-current-font-size: var(--vxe-ui-font-size-small);
787
+ --vxe-ui-table-custom-current-row-height: var(--vxe-ui-table-row-height-small);
788
+ }
789
+ .vxe-table-custom-wrapper.size--mini,
790
+ .vxe-table-custom-popup--body-wrapper.size--mini {
791
+ --vxe-ui-table-custom-current-font-size: var(--vxe-ui-font-size-mini);
792
+ --vxe-ui-table-custom-current-row-height: var(--vxe-ui-table-row-height-mini);
793
+ }
794
+
746
795
  .vxe-table-custom--option {
747
796
  position: relative;
748
797
  display: flex;
@@ -791,6 +840,7 @@
791
840
  text-align: left;
792
841
  background-color: var(--vxe-ui-layout-background-color);
793
842
  z-index: 19;
843
+ font-size: var(--vxe-ui-table-custom-current-font-size);
794
844
  color: var(--vxe-ui-font-color);
795
845
  border: 1px solid var(--vxe-ui-table-border-color);
796
846
  border-radius: var(--vxe-ui-border-radius);
@@ -847,8 +897,8 @@
847
897
  padding: 0;
848
898
  }
849
899
  .vxe-table-custom--panel-list > li {
850
- max-width: 28em;
851
- min-width: 18em;
900
+ max-width: var(--vxe-ui-vxe-table-custom-default-max-width);
901
+ min-width: var(--vxe-ui-vxe-table-custom-default-min-width);
852
902
  padding: 0.2em 1em 0.2em 1em;
853
903
  }
854
904
  .vxe-table-custom--panel-list > li.level--2 {
@@ -1007,6 +1057,7 @@
1007
1057
  position: relative;
1008
1058
  display: flex;
1009
1059
  flex-direction: row;
1060
+ font-size: var(--vxe-ui-table-custom-current-font-size);
1010
1061
  overflow: hidden;
1011
1062
  height: 100%;
1012
1063
  outline: 0;
@@ -1033,37 +1084,40 @@
1033
1084
  border-collapse: separate;
1034
1085
  box-sizing: border-box;
1035
1086
  }
1036
- .vxe-table-custom-popup--table-wrapper table th {
1087
+ .vxe-table-custom-popup--table-wrapper th {
1037
1088
  position: sticky;
1038
1089
  top: 0;
1039
- text-align: left;
1090
+ text-align: center;
1040
1091
  border-top: 1px solid var(--vxe-ui-table-border-color);
1041
1092
  border-bottom: 1px solid var(--vxe-ui-table-border-color);
1042
1093
  border-left: 1px solid var(--vxe-ui-table-border-color);
1043
1094
  background-color: var(--vxe-ui-table-header-background-color);
1044
1095
  z-index: 7;
1045
1096
  }
1046
- .vxe-table-custom-popup--table-wrapper table td {
1097
+ .vxe-table-custom-popup--table-wrapper th.col--title {
1098
+ text-align: left;
1099
+ }
1100
+ .vxe-table-custom-popup--table-wrapper td {
1047
1101
  border-top: 1px solid var(--vxe-ui-table-border-color);
1048
1102
  border-left: 1px solid var(--vxe-ui-table-border-color);
1049
1103
  }
1050
- .vxe-table-custom-popup--table-wrapper table tr {
1104
+ .vxe-table-custom-popup--table-wrapper tr {
1051
1105
  box-sizing: border-box;
1052
1106
  }
1053
- .vxe-table-custom-popup--table-wrapper table tr:first-child td {
1107
+ .vxe-table-custom-popup--table-wrapper tr:first-child td {
1054
1108
  border-top: 0;
1055
1109
  }
1056
- .vxe-table-custom-popup--table-wrapper table tr:hover {
1110
+ .vxe-table-custom-popup--table-wrapper tr:hover {
1057
1111
  background-color: var(--vxe-ui-table-row-hover-background-color);
1058
1112
  }
1059
- .vxe-table-custom-popup--table-wrapper table th,
1060
- .vxe-table-custom-popup--table-wrapper table td {
1061
- height: 44px;
1113
+ .vxe-table-custom-popup--table-wrapper th,
1114
+ .vxe-table-custom-popup--table-wrapper td {
1115
+ height: var(--vxe-ui-table-custom-current-row-height);
1062
1116
  padding: 0 0.6em;
1063
1117
  box-sizing: border-box;
1064
1118
  }
1065
- .vxe-table-custom-popup--table-wrapper table th:last-child,
1066
- .vxe-table-custom-popup--table-wrapper table td:last-child {
1119
+ .vxe-table-custom-popup--table-wrapper th:last-child,
1120
+ .vxe-table-custom-popup--table-wrapper td:last-child {
1067
1121
  border-right: 1px solid var(--vxe-ui-table-border-color);
1068
1122
  }
1069
1123
 
@@ -1213,35 +1267,36 @@
1213
1267
  padding-left: 192px;
1214
1268
  }
1215
1269
 
1216
- .vxe-table-custom-popup--column-item {
1270
+ .vxe-table-custom-popup--column-td {
1217
1271
  position: relative;
1218
- }
1219
- .vxe-table-custom-popup--column-item.col--visible, .vxe-table-custom-popup--column-item.col--resizable, .vxe-table-custom-popup--column-item.col--fixed {
1220
1272
  text-align: center;
1221
1273
  }
1222
- .vxe-table-custom-popup--column-item.col--resizable > .vxe-input, .vxe-table-custom-popup--column-item.col--resizable > .vxe-number-input {
1274
+ .vxe-table-custom-popup--column-td.col--name {
1275
+ text-align: left;
1276
+ }
1277
+ .vxe-table-custom-popup--column-td.col--resizable > .vxe-input, .vxe-table-custom-popup--column-td.col--resizable > .vxe-number-input {
1223
1278
  width: 100%;
1224
1279
  }
1225
1280
 
1226
- .vxe-table-custom-popup--row.active--drag-origin .vxe-table-custom-popup--column-item {
1281
+ .vxe-table-custom-popup--row.active--drag-origin .vxe-table-custom-popup--column-td {
1227
1282
  opacity: 0.5;
1228
1283
  }
1229
- .vxe-table-custom-popup--row.active--drag-target[drag-pos=top] .vxe-table-custom-popup--column-item::after {
1284
+ .vxe-table-custom-popup--row.active--drag-target[drag-pos=top] .vxe-table-custom-popup--column-td::after {
1230
1285
  display: block;
1231
1286
  top: -2px;
1232
1287
  }
1233
- .vxe-table-custom-popup--row.active--drag-target[drag-pos=bottom] .vxe-table-custom-popup--column-item::after {
1288
+ .vxe-table-custom-popup--row.active--drag-target[drag-pos=bottom] .vxe-table-custom-popup--column-td::after {
1234
1289
  display: block;
1235
1290
  bottom: -2px;
1236
1291
  }
1237
- .vxe-table-custom-popup--row:first-child[drag-pos=top] .vxe-table-custom-popup--column-item::after {
1292
+ .vxe-table-custom-popup--row:first-child[drag-pos=top] .vxe-table-custom-popup--column-td::after {
1238
1293
  top: 0;
1239
1294
  }
1240
- .vxe-table-custom-popup--row:last-child[drag-pos=bottom] .vxe-table-custom-popup--column-item::after {
1295
+ .vxe-table-custom-popup--row:last-child[drag-pos=bottom] .vxe-table-custom-popup--column-td::after {
1241
1296
  bottom: 0;
1242
1297
  }
1243
1298
 
1244
- .vxe-table-custom-popup--column-item::after {
1299
+ .vxe-table-custom-popup--column-td::after {
1245
1300
  display: none;
1246
1301
  content: "";
1247
1302
  position: absolute;
@@ -1251,7 +1306,7 @@
1251
1306
  background-color: var(--vxe-ui-font-primary-color);
1252
1307
  z-index: 12;
1253
1308
  }
1254
- .vxe-table-custom-popup--column-item:last-child::after {
1309
+ .vxe-table-custom-popup--column-td:last-child::after {
1255
1310
  width: 100%;
1256
1311
  }
1257
1312
 
@@ -1293,37 +1348,29 @@
1293
1348
  cursor: help;
1294
1349
  }
1295
1350
 
1296
- .vxe-table-custom-popup--table-col-seq {
1297
- width: 80px;
1351
+ .vxe-table-custom-popup--column-col.col--checkbox {
1352
+ width: var(--vxe-ui-vxe-table-custom-column-checkbox-width);
1298
1353
  }
1299
-
1300
- .vxe-table-custom-popup--table-col-sort {
1301
- width: 80px;
1354
+ .vxe-table-custom-popup--column-col.col--sort {
1355
+ width: var(--vxe-ui-vxe-table-custom-column-sort-width);
1302
1356
  }
1303
-
1304
- .vxe-table-custom-popup--table-col-title {
1305
- min-width: 120px;
1357
+ .vxe-table-custom-popup--column-col.col--title {
1358
+ min-width: var(--vxe-ui-vxe-table-custom-column-title-min-width);
1306
1359
  }
1307
-
1308
- .vxe-table-custom-popup--table-col-width {
1309
- width: 140px;
1360
+ .vxe-table-custom-popup--column-col.col--width {
1361
+ width: var(--vxe-ui-vxe-table-custom-column-width-width);
1310
1362
  }
1311
-
1312
- .vxe-table-custom-popup--table-col-fixed {
1313
- width: 200px;
1363
+ .vxe-table-custom-popup--column-col.col--fixed {
1364
+ width: var(--vxe-ui-vxe-table-custom-column-fixed-width);
1314
1365
  }
1315
-
1316
- .vxe-table-custom-wrapper {
1317
- font-size: var(--vxe-ui-font-size-default);
1366
+ .vxe-table-custom-popup--column-col.col--align {
1367
+ width: var(--vxe-ui-vxe-table-custom-column-align-width);
1318
1368
  }
1319
- .vxe-table-custom-wrapper.size--medium {
1320
- font-size: var(--vxe-ui-font-size-medium);
1321
- }
1322
- .vxe-table-custom-wrapper.size--small {
1323
- font-size: var(--vxe-ui-font-size-small);
1369
+ .vxe-table-custom-popup--column-col.col--header-align {
1370
+ width: var(--vxe-ui-vxe-table-custom-column-header-align-width);
1324
1371
  }
1325
- .vxe-table-custom-wrapper.size--mini {
1326
- font-size: var(--vxe-ui-font-size-mini);
1372
+ .vxe-table-custom-popup--column-col.col--footer-align {
1373
+ width: var(--vxe-ui-vxe-table-custom-column-footer-align-width);
1327
1374
  }
1328
1375
 
1329
1376
  .vxe-table-export--panel-column > ul {