vxe-table 4.20.5 → 4.20.7

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 (177) hide show
  1. package/dist/all.esm.js +81 -42
  2. package/dist/style.css +1 -1
  3. package/dist/style.min.css +1 -1
  4. package/es/{iconfont.1784367605558.ttf → iconfont.1784868296497.ttf} +0 -0
  5. package/es/iconfont.1784868296497.woff +0 -0
  6. package/es/iconfont.1784868296497.woff2 +0 -0
  7. package/es/index.css +1 -1
  8. package/es/index.min.css +1 -1
  9. package/es/locale/lang/ar-EG.js +1 -1
  10. package/es/locale/lang/de-DE.js +1 -1
  11. package/es/locale/lang/en-US.js +1 -1
  12. package/es/locale/lang/es-ES.js +1 -1
  13. package/es/locale/lang/fr-FR.js +1 -1
  14. package/es/locale/lang/hu-HU.js +1 -1
  15. package/es/locale/lang/hy-AM.js +1 -1
  16. package/es/locale/lang/id-ID.js +1 -1
  17. package/es/locale/lang/it-IT.js +1 -1
  18. package/es/locale/lang/ja-JP.js +1 -1
  19. package/es/locale/lang/ko-KR.js +1 -1
  20. package/es/locale/lang/ms-MY.js +1 -1
  21. package/es/locale/lang/nb-NO.js +1 -1
  22. package/es/locale/lang/pt-BR.js +1 -1
  23. package/es/locale/lang/ru-RU.js +1 -1
  24. package/es/locale/lang/th-TH.js +1 -1
  25. package/es/locale/lang/ug-CN.js +1 -1
  26. package/es/locale/lang/uk-UA.js +1 -1
  27. package/es/locale/lang/uz-UZ.js +1 -1
  28. package/es/locale/lang/vi-VN.js +1 -1
  29. package/es/locale/lang/zh-CHT.js +1 -1
  30. package/es/locale/lang/zh-CN.js +1 -1
  31. package/es/style.css +1 -1
  32. package/es/style.min.css +1 -1
  33. package/es/table/module/custom/panel.js +2 -2
  34. package/es/table/module/export/hook.js +69 -31
  35. package/es/table/module/export/util.js +1 -1
  36. package/es/table/src/table.js +4 -3
  37. package/es/table/style.css +43 -22
  38. package/es/table/style.min.css +1 -1
  39. package/es/ui/index.js +2 -2
  40. package/es/ui/src/dom.js +3 -0
  41. package/es/ui/src/log.js +2 -2
  42. package/es/vxe-table/style.css +43 -22
  43. package/es/vxe-table/style.min.css +1 -1
  44. package/lib/{iconfont.1784367605558.ttf → iconfont.1784868296497.ttf} +0 -0
  45. package/lib/iconfont.1784868296497.woff +0 -0
  46. package/lib/iconfont.1784868296497.woff2 +0 -0
  47. package/lib/index.css +1 -1
  48. package/lib/index.min.css +1 -1
  49. package/lib/index.umd.js +89 -41
  50. package/lib/index.umd.min.js +1 -1
  51. package/lib/locale/lang/ar-EG.js +1 -1
  52. package/lib/locale/lang/ar-EG.min.js +1 -1
  53. package/lib/locale/lang/ar-EG.umd.js +1 -1
  54. package/lib/locale/lang/de-DE.js +1 -1
  55. package/lib/locale/lang/de-DE.min.js +1 -1
  56. package/lib/locale/lang/de-DE.umd.js +1 -1
  57. package/lib/locale/lang/en-US.js +1 -1
  58. package/lib/locale/lang/en-US.min.js +1 -1
  59. package/lib/locale/lang/en-US.umd.js +1 -1
  60. package/lib/locale/lang/es-ES.js +1 -1
  61. package/lib/locale/lang/es-ES.min.js +1 -1
  62. package/lib/locale/lang/es-ES.umd.js +1 -1
  63. package/lib/locale/lang/fr-FR.js +1 -1
  64. package/lib/locale/lang/fr-FR.min.js +1 -1
  65. package/lib/locale/lang/fr-FR.umd.js +1 -1
  66. package/lib/locale/lang/hu-HU.js +1 -1
  67. package/lib/locale/lang/hu-HU.min.js +1 -1
  68. package/lib/locale/lang/hu-HU.umd.js +1 -1
  69. package/lib/locale/lang/hy-AM.js +1 -1
  70. package/lib/locale/lang/hy-AM.min.js +1 -1
  71. package/lib/locale/lang/hy-AM.umd.js +1 -1
  72. package/lib/locale/lang/id-ID.js +1 -1
  73. package/lib/locale/lang/id-ID.min.js +1 -1
  74. package/lib/locale/lang/id-ID.umd.js +1 -1
  75. package/lib/locale/lang/it-IT.js +1 -1
  76. package/lib/locale/lang/it-IT.min.js +1 -1
  77. package/lib/locale/lang/it-IT.umd.js +1 -1
  78. package/lib/locale/lang/ja-JP.js +1 -1
  79. package/lib/locale/lang/ja-JP.min.js +1 -1
  80. package/lib/locale/lang/ja-JP.umd.js +1 -1
  81. package/lib/locale/lang/ko-KR.js +1 -1
  82. package/lib/locale/lang/ko-KR.min.js +1 -1
  83. package/lib/locale/lang/ko-KR.umd.js +1 -1
  84. package/lib/locale/lang/ms-MY.js +1 -1
  85. package/lib/locale/lang/ms-MY.min.js +1 -1
  86. package/lib/locale/lang/ms-MY.umd.js +1 -1
  87. package/lib/locale/lang/nb-NO.js +1 -1
  88. package/lib/locale/lang/nb-NO.min.js +1 -1
  89. package/lib/locale/lang/nb-NO.umd.js +1 -1
  90. package/lib/locale/lang/pt-BR.js +1 -1
  91. package/lib/locale/lang/pt-BR.min.js +1 -1
  92. package/lib/locale/lang/pt-BR.umd.js +1 -1
  93. package/lib/locale/lang/ru-RU.js +1 -1
  94. package/lib/locale/lang/ru-RU.min.js +1 -1
  95. package/lib/locale/lang/ru-RU.umd.js +1 -1
  96. package/lib/locale/lang/th-TH.js +1 -1
  97. package/lib/locale/lang/th-TH.min.js +1 -1
  98. package/lib/locale/lang/th-TH.umd.js +1 -1
  99. package/lib/locale/lang/ug-CN.js +1 -1
  100. package/lib/locale/lang/ug-CN.min.js +1 -1
  101. package/lib/locale/lang/ug-CN.umd.js +1 -1
  102. package/lib/locale/lang/uk-UA.js +1 -1
  103. package/lib/locale/lang/uk-UA.min.js +1 -1
  104. package/lib/locale/lang/uk-UA.umd.js +1 -1
  105. package/lib/locale/lang/uz-UZ.js +1 -1
  106. package/lib/locale/lang/uz-UZ.min.js +1 -1
  107. package/lib/locale/lang/uz-UZ.umd.js +1 -1
  108. package/lib/locale/lang/vi-VN.js +1 -1
  109. package/lib/locale/lang/vi-VN.min.js +1 -1
  110. package/lib/locale/lang/vi-VN.umd.js +1 -1
  111. package/lib/locale/lang/zh-CHT.js +1 -1
  112. package/lib/locale/lang/zh-CHT.min.js +1 -1
  113. package/lib/locale/lang/zh-CHT.umd.js +1 -1
  114. package/lib/locale/lang/zh-CN.js +1 -1
  115. package/lib/locale/lang/zh-CN.min.js +1 -1
  116. package/lib/locale/lang/zh-CN.umd.js +1 -1
  117. package/lib/style.css +1 -1
  118. package/lib/style.min.css +1 -1
  119. package/lib/table/module/custom/panel.js +2 -2
  120. package/lib/table/module/custom/panel.min.js +1 -1
  121. package/lib/table/module/export/hook.js +75 -32
  122. package/lib/table/module/export/hook.min.js +1 -1
  123. package/lib/table/module/export/util.js +1 -1
  124. package/lib/table/module/export/util.min.js +1 -1
  125. package/lib/table/src/table.js +2 -1
  126. package/lib/table/src/table.min.js +1 -1
  127. package/lib/table/style/style.css +43 -22
  128. package/lib/table/style/style.min.css +1 -1
  129. package/lib/ui/index.js +2 -2
  130. package/lib/ui/index.min.js +1 -1
  131. package/lib/ui/src/dom.js +4 -0
  132. package/lib/ui/src/dom.min.js +1 -1
  133. package/lib/ui/src/log.js +2 -2
  134. package/lib/ui/src/log.min.js +1 -1
  135. package/lib/vxe-table/style/style.css +43 -22
  136. package/lib/vxe-table/style/style.min.css +1 -1
  137. package/package.json +2 -2
  138. package/packages/locale/lang/ar-EG.ts +1 -1
  139. package/packages/locale/lang/de-DE.ts +1 -1
  140. package/packages/locale/lang/en-US.ts +1 -1
  141. package/packages/locale/lang/es-ES.ts +1 -1
  142. package/packages/locale/lang/fr-FR.ts +1 -1
  143. package/packages/locale/lang/hu-HU.ts +1 -1
  144. package/packages/locale/lang/hy-AM.ts +1 -1
  145. package/packages/locale/lang/id-ID.ts +1 -1
  146. package/packages/locale/lang/it-IT.ts +1 -1
  147. package/packages/locale/lang/ja-JP.ts +1 -1
  148. package/packages/locale/lang/ko-KR.ts +1 -1
  149. package/packages/locale/lang/ms-MY.ts +1 -1
  150. package/packages/locale/lang/nb-NO.ts +1 -1
  151. package/packages/locale/lang/pt-BR.ts +1 -1
  152. package/packages/locale/lang/ru-RU.ts +1 -1
  153. package/packages/locale/lang/th-TH.ts +1 -1
  154. package/packages/locale/lang/ug-CN.ts +1 -1
  155. package/packages/locale/lang/uk-UA.ts +1 -1
  156. package/packages/locale/lang/uz-UZ.ts +1 -1
  157. package/packages/locale/lang/vi-VN.ts +1 -1
  158. package/packages/locale/lang/zh-CHT.ts +1 -1
  159. package/packages/locale/lang/zh-CN.ts +1 -1
  160. package/packages/table/module/custom/panel.ts +2 -2
  161. package/packages/table/module/export/hook.ts +71 -31
  162. package/packages/table/module/export/util.ts +1 -1
  163. package/packages/table/src/table.ts +4 -3
  164. package/packages/ui/index.ts +1 -1
  165. package/packages/ui/src/dom.ts +4 -0
  166. package/packages/ui/src/log.ts +1 -1
  167. package/styles/components/icon.scss +5 -1
  168. package/styles/components/table.scss +1 -1
  169. package/styles/helpers/baseMixin.scss +16 -5
  170. package/styles/icon/iconfont.ttf +0 -0
  171. package/styles/icon/iconfont.woff +0 -0
  172. package/styles/icon/iconfont.woff2 +0 -0
  173. package/styles/theme/base.scss +1 -0
  174. package/es/iconfont.1784367605558.woff +0 -0
  175. package/es/iconfont.1784367605558.woff2 +0 -0
  176. package/lib/iconfont.1784367605558.woff +0 -0
  177. package/lib/iconfont.1784367605558.woff2 +0 -0
@@ -1170,8 +1170,8 @@ export default defineVxeComponent({
1170
1170
  immediate: false,
1171
1171
  disabled: isHidden,
1172
1172
  modelValue: column.renderResizeWidth,
1173
- min: customMinWidth || undefined,
1174
- max: customMaxWidth || undefined,
1173
+ min: customMinWidth || 0,
1174
+ max: customMaxWidth || 9999,
1175
1175
  'onUpdate:modelValue'(value) {
1176
1176
  const width = Math.max(0, Number(value));
1177
1177
  column.renderResizeWidth = width;
@@ -112,7 +112,7 @@ function toTxtCellLabel(val) {
112
112
  if (/[",\s\n]/.test(val)) {
113
113
  return `"${val.replace(/"/g, '""')}"`;
114
114
  }
115
- return val;
115
+ return XEUtils.eqNull(val) ? '' : val;
116
116
  }
117
117
  function getElementsByTagName(elem, qualifiedName) {
118
118
  return elem.getElementsByTagName(qualifiedName);
@@ -1190,19 +1190,21 @@ hooks.add('tableExportModule', {
1190
1190
  return false;
1191
1191
  });
1192
1192
  };
1193
- const handleFilterFields = (exportOpts, column, includeFields, excludeFields) => {
1194
- if (excludeFields) {
1195
- if (XEUtils.includes(excludeFields, column.field)) {
1196
- return false;
1197
- }
1193
+ const handleFilterFields = (exportOpts, column, includeFields, includeFdMaps, excludeFdMaps, extraFdMaps) => {
1194
+ const { field } = column;
1195
+ if (excludeFdMaps[field]) {
1196
+ return false;
1198
1197
  }
1199
1198
  if (includeFields) {
1200
- if (XEUtils.includes(includeFields, column.field)) {
1199
+ if (includeFdMaps[field]) {
1201
1200
  return true;
1202
1201
  }
1203
1202
  return false;
1204
1203
  }
1205
- return exportOpts.original ? !!column.field : defaultFilterExportColumn(column);
1204
+ if (extraFdMaps[field]) {
1205
+ return true;
1206
+ }
1207
+ return exportOpts.original ? !!field : defaultFilterExportColumn(column);
1206
1208
  };
1207
1209
  const handleExportAndPrint = (options, isPrint) => {
1208
1210
  const $xeGrid = $xeTable.xeGrid;
@@ -1239,7 +1241,7 @@ hooks.add('tableExportModule', {
1239
1241
  const modes = defOpts.modes || [];
1240
1242
  const checkMethod = customOpts.checkMethod;
1241
1243
  const exportColumns = collectColumn.slice(0);
1242
- const { columns, excludeFields, includeFields } = defOpts;
1244
+ const { columns, excludeFields, includeFields, extraFields } = defOpts;
1243
1245
  // 处理类型
1244
1246
  const typeList = types.map((value) => {
1245
1247
  return {
@@ -1259,22 +1261,47 @@ hooks.add('tableExportModule', {
1259
1261
  label: getI18n(`vxe.export.modes.${item}`)
1260
1262
  };
1261
1263
  });
1264
+ const excludeFdMaps = {};
1265
+ if (excludeFields && excludeFields.length) {
1266
+ excludeFields.forEach(field => {
1267
+ excludeFdMaps[field] = 1;
1268
+ });
1269
+ }
1270
+ const includeFdMaps = {};
1271
+ if (includeFields && includeFields.length) {
1272
+ includeFields.forEach(field => {
1273
+ includeFdMaps[field] = 1;
1274
+ });
1275
+ }
1276
+ const extraFdMaps = {};
1277
+ if (extraFields) {
1278
+ extraFields.forEach(field => {
1279
+ extraFdMaps[field] = 1;
1280
+ });
1281
+ }
1262
1282
  // 默认选中
1263
- XEUtils.eachTree(exportColumns, (column, index, items, path, parent) => {
1283
+ // 优先级 columns > excludeFields > (includeFields || extraFields)
1284
+ XEUtils.eachTree(exportColumns, (column, index, items, path, parentColumn) => {
1264
1285
  const isColGroup = column.children && column.children.length > 0;
1265
1286
  let isChecked = false;
1287
+ const isExtraChecked = extraFdMaps[column.field];
1266
1288
  if (columns && columns.length) {
1267
1289
  isChecked = handleFilterColumns(defOpts, column, columns);
1268
1290
  }
1269
1291
  else if (excludeFields || includeFields) {
1270
- isChecked = handleFilterFields(defOpts, column, includeFields, excludeFields);
1292
+ isChecked = handleFilterFields(defOpts, column, includeFields, includeFdMaps, excludeFdMaps, extraFdMaps);
1271
1293
  }
1272
1294
  else {
1273
- isChecked = column.visible && (isColGroup || defaultFilterExportColumn(column));
1295
+ if (isExtraChecked) {
1296
+ isChecked = true;
1297
+ }
1298
+ else {
1299
+ isChecked = column.visible && (isColGroup || defaultFilterExportColumn(column));
1300
+ }
1274
1301
  }
1275
1302
  column.checked = isChecked;
1276
1303
  column.halfChecked = false;
1277
- column.disabled = (parent && parent.disabled) || (checkMethod ? !checkMethod({ $table: $xeTable, column }) : false);
1304
+ column.disabled = (parentColumn && parentColumn.disabled) || (checkMethod ? !checkMethod({ $table: $xeTable, column }) : false);
1278
1305
  });
1279
1306
  // 更新条件
1280
1307
  exportStore.columns = exportColumns;
@@ -1385,30 +1412,54 @@ hooks.add('tableExportModule', {
1385
1412
  warnLog('vxe.error.delProp', ['isAllExpand', 'isTreeAllExpanded']);
1386
1413
  opts.isTreeAllExpanded = opts.isAllExpand;
1387
1414
  }
1388
- let { filename, sheetName, type, mode, columns, original, columnFilterMethod, beforeExportMethod, includeFields, excludeFields } = opts;
1415
+ let { filename, sheetName, type, mode, columns, columnFilterMethod, beforeExportMethod, includeFields, excludeFields, extraFields } = opts;
1389
1416
  let groups = [];
1390
1417
  const selectRecords = $xeTable.getCheckboxRecords();
1391
1418
  if (!mode) {
1392
1419
  mode = selectRecords.length ? 'selected' : 'current';
1393
1420
  }
1421
+ const excludeFdMaps = {};
1422
+ if (excludeFields && excludeFields.length) {
1423
+ excludeFields.forEach(field => {
1424
+ excludeFdMaps[field] = 1;
1425
+ });
1426
+ }
1427
+ const includeFdMaps = {};
1428
+ if (includeFields && includeFields.length) {
1429
+ includeFields.forEach(field => {
1430
+ includeFdMaps[field] = 1;
1431
+ });
1432
+ }
1433
+ const extraFdMaps = {};
1434
+ if (extraFields) {
1435
+ extraFields.forEach(field => {
1436
+ extraFdMaps[field] = 1;
1437
+ });
1438
+ }
1394
1439
  let isCustomCol = false;
1395
1440
  let customCols = [];
1396
1441
  if (columns && columns.length) {
1397
1442
  isCustomCol = true;
1398
- customCols = columns;
1443
+ customCols = XEUtils.searchTree(columns, () => true, { children: 'children', mapChildren: 'childNodes', original: true });
1399
1444
  }
1400
1445
  else {
1401
1446
  customCols = XEUtils.searchTree(collectColumn, column => {
1402
1447
  const isColGroup = column.children && column.children.length > 0;
1403
1448
  let isChecked = false;
1449
+ const isExtraChecked = extraFdMaps[column.field];
1404
1450
  if (columns && columns.length) {
1405
1451
  isChecked = handleFilterColumns(opts, column, columns);
1406
1452
  }
1407
1453
  else if (excludeFields || includeFields) {
1408
- isChecked = handleFilterFields(opts, column, includeFields, excludeFields);
1454
+ isChecked = handleFilterFields(opts, column, includeFields, includeFdMaps, excludeFdMaps, extraFdMaps);
1409
1455
  }
1410
1456
  else {
1411
- isChecked = column.visible && (isColGroup || defaultFilterExportColumn(column));
1457
+ if (isExtraChecked) {
1458
+ isChecked = true;
1459
+ }
1460
+ else {
1461
+ isChecked = column.visible && (isColGroup || defaultFilterExportColumn(column));
1462
+ }
1412
1463
  }
1413
1464
  return isChecked;
1414
1465
  }, { children: 'children', mapChildren: 'childNodes', original: true });
@@ -1416,20 +1467,7 @@ hooks.add('tableExportModule', {
1416
1467
  const handleOptions = Object.assign({}, opts, { filename: '', sheetName: '', _columnConfs: columns });
1417
1468
  // 如果设置源数据,则默认导出设置了字段的列
1418
1469
  if (!isCustomCol && !columnFilterMethod) {
1419
- columnFilterMethod = ({ column }) => {
1420
- if (excludeFields) {
1421
- if (XEUtils.includes(excludeFields, column.field)) {
1422
- return false;
1423
- }
1424
- }
1425
- if (includeFields) {
1426
- if (XEUtils.includes(includeFields, column.field)) {
1427
- return true;
1428
- }
1429
- return false;
1430
- }
1431
- return original ? !!column.field : defaultFilterExportColumn(column);
1432
- };
1470
+ columnFilterMethod = ({ column }) => handleFilterFields(handleOptions, column, includeFields, includeFdMaps, excludeFdMaps, extraFdMaps);
1433
1471
  handleOptions.columnFilterMethod = columnFilterMethod;
1434
1472
  }
1435
1473
  if (customCols) {
@@ -1,5 +1,5 @@
1
1
  // 默认导出或打印的 HTML 样式
2
- const defaultHtmlStyle = 'body{padding:0;color:rgba(0,0,0,0.7);font-family:"Microsoft YaHei",微软雅黑,"MicrosoftJhengHei",华文细黑,STHeiti,MingLiu;}body *{-webkit-box-sizing:border-box;box-sizing:border-box;}.vxe-table{border-collapse:collapse;text-align:left;border-spacing:0;}.vxe-table.is--default-width,.vxe-table.is--auto-width{width:100%;}.vxe-table.is--scale-width{table-layout:fixed;}.vxe-table,.vxe-table th,.vxe-table td,.vxe-table td{word-break:break-all;border-color:#D0D0D0;border-style:solid;border-width:0;}.border--default,.border--full,.border--outer{border-top-width:1px;}.border--default,.border--full,.border--outer{border-left-width:1px}.border--outer,.border--default th,.border--default td,.border--full th,.border--full td,.border--outer th,.border--inner th,.border--inner td{border-bottom-width:1px;}.border--default,.border--outer,.border--full th,.border--full td{border-right-width:1px;}.border--default th,.border--full th,.border--outer th{background-color:#f8f8f9;}.vxe-table td>div,.vxe-table th>div{padding:0.5em 0.4em;}.col--center{text-align:center;}.col--right{text-align:right;}.vxe-table .col--ellipsis>div{overflow:hidden;text-overflow:ellipsis;white-space:nowrap;word-break:break-all;}.vxe-table--tree-node{text-align:left;}.vxe-table--tree-node-wrapper{position:relative;}.vxe-table--tree-icon-wrapper{position:absolute;top:50%;width:1em;height:1em;text-align:center;-webkit-transform:translateY(-50%);transform:translateY(-50%);-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;cursor:pointer;}.vxe-table--tree-unfold-icon,.vxe-table--tree-fold-icon{position:absolute;width:0;height:0;border-style:solid;border-width:0.5em;border-right-color:transparent;border-bottom-color:transparent;}.vxe-table--tree-unfold-icon{left:.3em;top:0;border-left-color:#939599;border-top-color:transparent;}.vxe-table--tree-fold-icon{left:0;top:.3em;border-left-color:transparent;border-top-color:#939599;}.vxe-table--tree-cell{display:block;padding-left:1.5em;}.vxe-table input[type="checkbox"]{margin:0;}.vxe-table input[type="checkbox"],.vxe-table input[type="radio"],.vxe-table input[type="checkbox"]+span,.vxe-table input[type="radio"]+span{vertical-align:middle;padding-left:0.4em}';
2
+ const defaultHtmlStyle = 'body{padding:0;color:rgba(0,0,0,0.7);font-family:"Microsoft YaHei",微软雅黑,"MicrosoftJhengHei",华文细黑,STHeiti,MingLiu}body *{-webkit-box-sizing:border-box;box-sizing:border-box}.vxe-table{border-collapse:collapse;text-align:left;border-spacing:0}.vxe-table.is--default-width,.vxe-table.is--auto-width{width:100%}.vxe-table.is--scale-width{table-layout:fixed}.vxe-table,.vxe-table th,.vxe-table td,.vxe-table td{white-space:pre-line;word-break:break-all;border-color:#D0D0D0;border-style:solid;border-width:0}.border--default,.border--full,.border--outer{border-top-width:1px}.border--default,.border--full,.border--outer{border-left-width:1px}.border--outer,.border--default th,.border--default td,.border--full th,.border--full td,.border--outer th,.border--inner th,.border--inner td{border-bottom-width:1px}.border--default,.border--outer,.border--full th,.border--full td{border-right-width:1px}.border--default th,.border--full th,.border--outer th{background-color:#f8f8f9}.vxe-table td>div,.vxe-table th>div{padding:0.5em 0.4em}.col--center{text-align:center}.col--right{text-align:right}.vxe-table .col--ellipsis>div{overflow:hidden;text-overflow:ellipsis;white-space:nowrap;word-break:break-all}.vxe-table--tree-node{text-align:left}.vxe-table--tree-node-wrapper{position:relative}.vxe-table--tree-icon-wrapper{position:absolute;top:50%;width:1em;height:1em;text-align:center;-webkit-transform:translateY(-50%);transform:translateY(-50%);-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;cursor:pointer}.vxe-table--tree-unfold-icon,.vxe-table--tree-fold-icon{position:absolute;width:0;height:0;border-style:solid;border-width:0.5em;border-right-color:transparent;border-bottom-color:transparent}.vxe-table--tree-unfold-icon{left:.3em;top:0;border-left-color:#939599;border-top-color:transparent}.vxe-table--tree-fold-icon{left:0;top:.3em;border-left-color:transparent;border-top-color:#939599}.vxe-table--tree-cell{display:block;padding-left:1.5em}.vxe-table input[type="checkbox"]{margin:0}.vxe-table input[type="checkbox"],.vxe-table input[type="radio"],.vxe-table input[type="checkbox"]+span,.vxe-table input[type="radio"]+span{vertical-align:middle;padding-left:0.4em}';
3
3
  export function getExportBlobByContent(content, options) {
4
4
  return new Blob([content], { type: `text/${options.type};charset=utf-8;` });
5
5
  }
@@ -590,15 +590,16 @@ export default defineVxeComponent({
590
590
  const { extraFields, includeFields, excludeFields } = editDirtyOpts;
591
591
  const kpFields = [];
592
592
  if (updateColFlag) {
593
- if (includeFields && includeFields.length) {
594
- return includeFields;
595
- }
593
+ // 优先级 excludeFields > (includeFields || extraFields)
596
594
  const excludeFdMaps = {};
597
595
  if (excludeFields && excludeFields.length) {
598
596
  excludeFields.forEach(field => {
599
597
  excludeFdMaps[field] = 1;
600
598
  });
601
599
  }
600
+ if (includeFields && includeFields.length) {
601
+ return excludeFields && excludeFields.length ? includeFields.filter(field => !excludeFdMaps[field]) : includeFields;
602
+ }
602
603
  const addFdMaps = {};
603
604
  if (extraFields && extraFields.length) {
604
605
  extraFields.forEach(field => {
@@ -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,d09GMgABAAAAABLUAAsAAAAAKEgAABKDAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHFQGYACJWgq2JKt4ATYCJAOBNAtcAAQgBYVHB4UCG/whZQRsHACxLStI9v+fEjgZIsUv2Op2obBNa6acqbecU1NT5w7B7gKr1+UlBoHpxEyU/m1uYfXjYe2OsM3yxvGP5caBZmoKmvqfiK/VWISG0ibabDMVNyuv/yxPvKafO5QS+nDvmg2tdOORaJTGI08Y9zafcyEg5vYzw4fZmYZEJjE8bfMfHKHgO0IwjigDI8ECLIxVXWA0wiIC5g/jh1EsAxfpMlxUul8u40MA3PJ6hQP5gSPuFwjL8oEOoxGPf4Eup+WV7q9pVTgz9v0/PJpSUaUZWVrZ+si7ymp1jaBUgMJQCAlhmUzqNCnwIAXYvfu1tP1IOHcLFRC9SKu0WnLSbEXDP28FwLeTAAEEbX6evn6YXtgXPQpBD9TY+CEG/n9d7dsJItKRwwl6wU8/c9imoOgpmvdeMvLy3iwkaHYWGUFCkAmeXUysolLLoBk0QaWj44uW/G2/1b9pf1/+7kO5qefWoeC/SVShU3/GZr8HDtenZyRTbMzc/XwbDKo+vsL22Zv3PXTRgj1MTNrVcGa1xTe65yUOFoc0NXlpGve+seCQEPbwCvwZVW9/mmYESUR6plf31PYOd9PSDSHXSu7Jym8huHmAAuTgXrEh4RGetVNk0bvBSta/tTjY4CkDU/4ytYlgogxkUWq0ceaoUr1c2qP9+vsF6qey6lNBFZ1+8e6zOx7/6/U3bXt/fb8sNbxtf7vQc8ElfGxJ9gn/Vd/Tov5t24qX9mR+cnjfkvQX8Ork99MiH2AnFdqbOukr1QYaExdDhUyuo7K2dbAx0prpCpztzC0srfRc3RyN3QfhP7xYgqVQX3UgZCbdEU0B7BAfUEQiQEAYYIuiAGM0EHBEFkAHlQKqaDSgjsYCumgcoIHmAEaoCnBG9YAecgEqaA+ghPYBymg/oIn+BtRwFLDEQwFrPAuwx/sAVngBoI9XAAb4acAEfwdoEXcDjHgccCL+B9gQewBT4kvAjPgKMCe+BizI0gBtsj2AC9lewJVfX8CB/2WAIakecCM1AO6kNkCO1A7IkxZWogDw0O7xBvgA5TvVH2iIDYaDvFAgQCyWWaCIlVBEkIJIGAtZyQAl43SpSEazNC4PlJ7yf3oQyvky2co+UoUAGhWJpHyGPCL7MLwUCqnSx4l9fQPEvE3sTZtXLIb5nbe3VsTqoGxAZFkssThpFKCIL5ZC7d2clQLtfEYLiPSN/PaalpFVrU6GURlcJoiVli9Su1IZhCPyuJYKx7OUXNKgaL9KImK9JpTKcWqNiK9oSclhKxYvLHYEKCAtri1KhFhNuEKtBhPF9QTX2YVajyAEl68HqrTEk7rTU/rSTBol1xBLpNeqs4tWnl/vk70rdnNAD2+/sf//iePwcpm6rtojUxJF+mRaoksrmqtKrpmY3Ib+jFi3S43EQBFmQUhtHOUmULu0kHKl1xcetFtwRdepTPVIybThXp1aLNHl10wD+Hpkhi4aEcluIbjeSDopMI47t9KrL1priXRLlJmycsUo5HknYVFmK9uhu6K1TbZQWmMhT/XhlSOOwuLzuhp+3ygbSbg2WRw+HJ4rSccYlWZdtUEs/b8NIBmnDea5MlWjGcBHKpCGfhptYezS9q5E7eZANA5vcS7PsFWRCLJdlXx894WSdKd6sotw62SMQrK7zXF74m6cbNOUGuhoIXhJgBgdQRjo9vart24TEvy3wFwIomkI+SzawJRJziRGZyKFrF3e5TIfYWuLJaW3R6a6PiyYTB/qFiTRFXaWISilIjiwlQFiBjExBlNFg7h+ptVCd1CHTAsA2cbYoxLGjRBiEnox34WoLXVI2/WGaoRpABCBw2lt4tBGkm0M5fTxSvMEF0v1iJocrWeBRFpbS0n4lOonQ4C27G6g5PTVpABPiJa5PsyGUHX7DYn0oeoMJupsYVBlQRbkvg7UzFIzkto8OS2KhRWkMgN4eAgh6s+eBcucDrAt0LcUCxWgl1odaa04xWlOKGIvL+2cHNV2aXW9OjfbZYtpNQ+1aVgIqdRoJAwAiNEH93lZ+gRtxYb05wZid4yqpuUydxxAagvvubC5hlWjKheqkVVbFvpS5D7EdbO9Dvn/PxeGIRiG46gMBsZ7kPSbngOtp4IeJr6kHaeD9BFj7+QLfp7MiD8AYO6oIXb2G/jIn3Mc5pf/uqjw34u+bC7Tm1GDnkC7IvSMUUEB5UAYg0UOFC4d5QnGQodehzwsqK2xvTFL7ilcKF5GuuAbi6quO3hO4eKdpckeuQJ8ZJVl0tkujYTT9TLxtZmgojnEvXeW6yE+OE/InOKeftDSmmeI0r0ouCc+mUksOy34RL9wL8YhBsoIz9akOnmszWyRa9MHazMDeLPTXLcWWrncQM1xLvR5XmsVesmgl9/oVVzkCmeWS2ulO4KaObV+5My6g829mSuoI2rPbJvjOFrcyW05xSlfPfBXhuFYF5CC5MOJyj0f3jzNcan2ivNq3eXC2kuOy3VXnVfsZmK0FbuU8JRCXGvqNJNsVKWVnEMa8BssDb82gHjxIbAgb4bGJfzazKSkKAvlQ8TkxkEuBZ3ugtrdGxwb99Tt27wc+DhdeV9lLHOVCa4IW4RFnbXX1GRNz3Z25AFIK1d0cUe3ruiixlRqLEVfwQYjxCptkK21nTHRsX71rPZ1yMTXSfH245O0cyCrnWyVtPm3hVK7Iqg2Gm1JaBu3AwMQLa5pBMGp3SHC9ytxG9WVfkA7aGStaJUMOBI31eOrem0XE1Y70cLlNpVQS00ut07StqcXJFtnrQbAISbWJxDbmSpOYFba8OaQ3dsLI5eEk60czg6sleb0p7CtLaEo4PhguOuBHMJKrkgjWzs5uEPsSqpEer2McCXGx7xeaSsdRk1DyE6TRnOGtN584s39PcVbc8+s21vHR/SbW9xbzZKy1OXWd+6EiK1RoT38KQu8tCEvtyJ9g+i22qewd32+eiIXXVxA/Flv+9Yvhc5nCwL643yrbMD/GL0Y5czPUxfXwgLfv0VxBdg8Tz2/ab2jcg8KkYLcSHN7RLqmMSw3rDFXy4/RUzodNdyjKd1w66WBbnmZVDZi5RA2nZ25fYRE1g7xLa6nTwAGM+VDoKQFcB3Olv20CaohhaohgGqUEn0BeVZGwbh9ymnKff6hz4REECF8thP73t8BUQKLiYJxxHP4AczSg5sVw5Kz/AN8Dk4sybnSvMMSfaJeArRN5s1zif9LEhJ1TXSJCeGeG4BkkAEk2YnZEth2zAM7g3np57V7FmdR5hcAxrKZM402Q0WFwWacOaXCVJaSbDXaZkw2WlNKS1OsxskzbEZrckqZqQIgT83O+c5vJ6JZEa6ZrwlfocasfGf6/MDYUDajkYnjwRWY/rRY3EqbYq8lb4xxK0neRjjy9vJIpTsvDwSlE6RcZm3g6XiblKjxoLYc23Bb9YcNYT26BdXzTpgRGtnP+8a3p52pBtXwuFGn95el8aVfvJuymiz7Z6+sTp5e9mVDs2XZym9RvrYB1cuy0QZeFuxPRWS7gpQtaYlc7kSdbUqVvG26iVxuIk8n0/G6idIaaU2wbrSMwU5gHFxdVAiF2GJA1USNqTotgipMAItcBJjw9TypXaqSzcT+Na3sTVOFIOBPPzucwOnhTH1zHpPBZCod2h9S/SNAilMxgEEw+jBwxsPN94P6size5DlkYRQOZXSSFyUA2Hl/k9c4svtDjYzKYUd7n+cohveoLz49Ed0fq2Vkjpd2jgPfHG8AMkcWRxdEpg3JGBp2AavEys0DsweWasfHTOdNRotyy3oVP+ZNQyfnFvcuHRczTM3cnmq36Ii4OEJHXdBZ4nAi3qK7QOmKeITzTQgi7mW270bdCXqXPEu2PiHBrpvE5YLEI3WoDiWYSnbgNIHqpGiM6qWygyaqDiWGz/KvUPVLQCZezff+RdVEpKfru7unjRmjyzDnbDOmuJTZSleKMVcAlEjGjOEmq9FoNQ1/a1THthqHm94ia7rn2j6t/GbZufs2+gkToRpTw0TNpGc6sP43Boot2oNpp2oZeRHhvfuEk7aH94lUjjumzr5J2gx7HYMhZK9jN9Qx2BfvSbObTMM7o058fB3LJVQEVn8Jl9llEdkmSEdzkK3lAlueXpQyzyMATeCuHrfA3zMqHNvQyMuRE3JcntMb9ngt8HL40SBFK3BQnfVEex7BSX4d/rZXJOlxSmNwVEY6SNCYVypSr8pjwtVUxUr5wYDwXrvn0sVBgxwOH59BAwGjwjBz6F/mIWGGD8XK4f2MkhjTyIZRplENRpMk+o4wHkmbI0Ye7j75ptS5xlHGNc8Ei1GGRJcXZQKeqCkVhtLk5FJDxT9GoLv7CsM/nmnYw7R2Kn5aheKRySTaPRV/AfsD+vl4Pa+rtvdsu9+0XrNru0DClouLT3NRnr8dnG2c3WvdbDsxOx29p/qBLXdm9wqL+aTAxu2DPRhABVtVtP3RIxemlrQflzMHrEaixlzwTaj9KCQ18uOc5sVcIOzmNqiSnNuhKkyFao/b/eetqYvdjgoxIQptJUK4jdwgWrwNFUhUIiqUCFChZvftsXW58MfgBuIPp+VpzSEhZm2h2I05REsd17dPqC00T/EFDCsZ7YLIyOOBMyey+R0LF+7la/EpSMd8MHCAqSr5qNwJaRgNbjSbp5ptfNxoh+rjOGXmRwggl0bpBV7X1bduVQcKAquPHj3VtV1pgdPv368Gw3o0tFyFQGrYeo2Rn0vrO1rDzwU72vphFvFOxxfXqgU5eOhTjTkslPHuAPPmjR2bm7tTQukF4sz3IIBlZ/v2tWLlgbJVYi0tmNXUyrG/S7BK7yAr9hOgOoAWWP2S9BsqHiYm/ObO9SPwhKF+5Nw5HwxFxKTfy/2lwEcQKPBx+yg3hHzQFeebWBFSkRiibW3hQhyRFNk3UnhewEbMSvE5MSru/tP63gpSliNoNuxkksxbp3QnzJYA3vjoLYSR24T/1q19DvVSPXyxzWpFvGTBR8b/jdT15IlbojkMjEfpnfIMOMPdNVvELBM/2H+JwdvrrLIKhdYq5zk+erZnSBkzs6vL3QYNgt9boOjl9OkzZuwbBNZ+Gj5i5IhwoeKA+5QhCRkYHjEAmbTylPvuGyFnHGz5XWCAbV3urswy5pCesyj/XJVTaLUKnVV7eYxL+x+ImWWi2e6uGTBD3jknYy8/20vg/9Q0qhoLJUlASjvuO5+jPULjDIJbech8D76hI86IwG/unnKvnDQQiQhHBiQZ3KcOKITjODDv1mmh2o16RDsnHNzBY0CYIUM+6iajA2vzPFLdz/5mz+HjSCYAnhtnEC0Anh0/If0N8dZFJDx15HAcehjCM8QznUiiePAYkiW+i1YgEeKBI4hZPHoQSUudu86LXksjRFpdkxE9bnoRGWgdb0B8eVY/gnLnQ0i6YZ2+hyQVwY5i8eRexPB1VzYh0QAAgFTScdQf/Rr9+eKrTJCCmu5EpPQrr2RKE5i5SdV51tF4+t88d/6VPqqJ1t39CJ9mx5sWM+jRqg1c1YLyf7SbgR+ukfzp+P2/WfHvtoO6f52nRxnPueZPBF7opBQN+B9Zrmnoz8iLeeI7n7UClQ1d+uUFcgPaR/kFm3QAcOSNAPhP2Wihv81M+sYmGuVTCpHo2DQSgu+RwKi5kpi4+kosfB8kjgjwYC5fX3nRLgAQ4vdJolH6I9Gh/pYQSv9DjIYpEpNfryiLVbNO4iAb9scV0uFjBi1gVb1T3hA6zy/rLYiuA9An+xaaHDT7LRZ+y4/AyROq8+rMf8pzQOA8iqR1cyHilGPq1LOvZ4MQSEWmSzBStSJxtVw6VuDKUNd7jAFNAEup7bQ+PYMgZxdrW2CYWi1Yiw2jb4nRyGTfNI65TJh+xBZLPH3mlHOVsxTCc4apFtsQmp5NGxemcJRCGU/uKM+QAYJsESWyb3QJGKLSpjCjlSVanYvLquKT3QxmYFwvUXryqDyEKqSmG6ZlO+5fIIt+imZYjhcczT8CWVE1vcFoMlusNrvD6XJ7vD5/6f0JRDw2Q6E418y0SWWOhZWw8ZQ4qUmEugMdfIOlARTg4ivBlLeyuL1BACfXWFtPZUbTgvkMtnQ+hJtodzVtWQXHJlCCWcOUY+6fbLLWIUOaamvLlOtR2ug4SsQyRSotUxyB9XLtS7ghnkpheTYBuPDDPKNk1SuUks9skT3K9VIsQtKHJqe6XVRpKOQOjys/3cJoBukCPrNxyyimUnPli4DnwuUQkmEAnHUe/dzDHq7cKkxcRoQwy84WSNtpeqrYnqS9FXihCUMELYVl3ZStRhvgLhe7RwsCnP0QLU0vm+SI0sfOb2tEqiH7rbSg+YktZyyzVy7e9B4AAAA=") format("woff2");
547
547
  }
548
548
  @keyframes rollCircle {
549
549
  0% {
@@ -599,6 +599,10 @@
599
599
  color: var(--vxe-ui-status-error-color);
600
600
  }
601
601
 
602
+ .vxe-table-icon-setting:before {
603
+ content: "\e8b8";
604
+ }
605
+
602
606
  .vxe-table-icon-top:before {
603
607
  content: "\e614";
604
608
  }
@@ -951,8 +955,12 @@
951
955
  height: 2.8em;
952
956
  }
953
957
 
958
+ .vxe-table-custom--checkbox-option {
959
+ cursor: pointer;
960
+ }
954
961
  .vxe-table-custom--checkbox-option .vxe-checkbox--icon {
955
962
  font-size: 1.22em;
963
+ transition: all 0.2s ease-in-out;
956
964
  }
957
965
  .vxe-table-custom--checkbox-option .vxe-checkbox--icon {
958
966
  color: var(--vxe-ui-input-border-color);
@@ -968,15 +976,15 @@
968
976
  .vxe-table-custom--checkbox-option.is--checked .vxe-checkbox--icon, .vxe-table-custom--checkbox-option.is--indeterminate .vxe-checkbox--icon {
969
977
  color: var(--vxe-ui-font-primary-color);
970
978
  }
971
- .vxe-table-custom--checkbox-option:not(.is--disabled) {
972
- cursor: pointer;
973
- }
974
979
  .vxe-table-custom--checkbox-option:not(.is--disabled):hover .vxe-checkbox--icon {
975
980
  color: var(--vxe-ui-font-primary-color);
976
981
  }
977
982
  .vxe-table-custom--checkbox-option.is--hidden {
978
983
  cursor: default;
979
984
  }
985
+ .vxe-table-custom--checkbox-option.is--readonly {
986
+ cursor: auto;
987
+ }
980
988
  .vxe-table-custom--checkbox-option.is--disabled {
981
989
  color: var(--vxe-ui-font-disabled-color);
982
990
  cursor: not-allowed;
@@ -985,7 +993,7 @@
985
993
  color: var(--vxe-ui-input-disabled-color);
986
994
  }
987
995
  .vxe-table-custom--checkbox-option .vxe-checkbox--label {
988
- padding-left: 0.5em;
996
+ padding-left: 0.4em;
989
997
  vertical-align: middle;
990
998
  }
991
999
 
@@ -1530,8 +1538,12 @@
1530
1538
  border-color: var(--vxe-ui-font-primary-color);
1531
1539
  }
1532
1540
 
1541
+ .vxe-table-export--panel-column-option {
1542
+ cursor: pointer;
1543
+ }
1533
1544
  .vxe-table-export--panel-column-option .vxe-checkbox--icon {
1534
1545
  font-size: 1.22em;
1546
+ transition: all 0.2s ease-in-out;
1535
1547
  }
1536
1548
  .vxe-table-export--panel-column-option .vxe-checkbox--icon {
1537
1549
  color: var(--vxe-ui-input-border-color);
@@ -1547,15 +1559,15 @@
1547
1559
  .vxe-table-export--panel-column-option.is--checked .vxe-checkbox--icon, .vxe-table-export--panel-column-option.is--indeterminate .vxe-checkbox--icon {
1548
1560
  color: var(--vxe-ui-font-primary-color);
1549
1561
  }
1550
- .vxe-table-export--panel-column-option:not(.is--disabled) {
1551
- cursor: pointer;
1552
- }
1553
1562
  .vxe-table-export--panel-column-option:not(.is--disabled):hover .vxe-checkbox--icon {
1554
1563
  color: var(--vxe-ui-font-primary-color);
1555
1564
  }
1556
1565
  .vxe-table-export--panel-column-option.is--hidden {
1557
1566
  cursor: default;
1558
1567
  }
1568
+ .vxe-table-export--panel-column-option.is--readonly {
1569
+ cursor: auto;
1570
+ }
1559
1571
  .vxe-table-export--panel-column-option.is--disabled {
1560
1572
  color: var(--vxe-ui-font-disabled-color);
1561
1573
  cursor: not-allowed;
@@ -1564,7 +1576,7 @@
1564
1576
  color: var(--vxe-ui-input-disabled-color);
1565
1577
  }
1566
1578
  .vxe-table-export--panel-column-option .vxe-checkbox--label {
1567
- padding-left: 0.5em;
1579
+ padding-left: 0.4em;
1568
1580
  vertical-align: middle;
1569
1581
  }
1570
1582
 
@@ -1673,8 +1685,12 @@
1673
1685
  cursor: not-allowed;
1674
1686
  }
1675
1687
 
1688
+ .vxe-table--filter-option {
1689
+ cursor: pointer;
1690
+ }
1676
1691
  .vxe-table--filter-option .vxe-checkbox--icon {
1677
1692
  font-size: 1.22em;
1693
+ transition: all 0.2s ease-in-out;
1678
1694
  }
1679
1695
  .vxe-table--filter-option .vxe-checkbox--icon {
1680
1696
  color: var(--vxe-ui-input-border-color);
@@ -1690,15 +1706,15 @@
1690
1706
  .vxe-table--filter-option.is--checked .vxe-checkbox--icon, .vxe-table--filter-option.is--indeterminate .vxe-checkbox--icon {
1691
1707
  color: var(--vxe-ui-font-primary-color);
1692
1708
  }
1693
- .vxe-table--filter-option:not(.is--disabled) {
1694
- cursor: pointer;
1695
- }
1696
1709
  .vxe-table--filter-option:not(.is--disabled):hover .vxe-checkbox--icon {
1697
1710
  color: var(--vxe-ui-font-primary-color);
1698
1711
  }
1699
1712
  .vxe-table--filter-option.is--hidden {
1700
1713
  cursor: default;
1701
1714
  }
1715
+ .vxe-table--filter-option.is--readonly {
1716
+ cursor: auto;
1717
+ }
1702
1718
  .vxe-table--filter-option.is--disabled {
1703
1719
  color: var(--vxe-ui-font-disabled-color);
1704
1720
  cursor: not-allowed;
@@ -1707,7 +1723,7 @@
1707
1723
  color: var(--vxe-ui-input-disabled-color);
1708
1724
  }
1709
1725
  .vxe-table--filter-option .vxe-checkbox--label {
1710
- padding-left: 0.5em;
1726
+ padding-left: 0.4em;
1711
1727
  vertical-align: middle;
1712
1728
  }
1713
1729
 
@@ -3337,6 +3353,7 @@
3337
3353
  }
3338
3354
  .vxe-table--render-default .vxe-cell--radio .vxe-radio--icon {
3339
3355
  font-size: 1.26em;
3356
+ transition: all 0.2s ease-in-out;
3340
3357
  }
3341
3358
  .vxe-table--render-default .vxe-cell--radio .vxe-radio--icon {
3342
3359
  color: var(--vxe-ui-input-border-color);
@@ -3353,12 +3370,12 @@
3353
3370
  .vxe-table--render-default .vxe-cell--radio.is--checked .vxe-radio--icon {
3354
3371
  color: var(--vxe-ui-font-primary-color);
3355
3372
  }
3356
- .vxe-table--render-default .vxe-cell--radio:not(.is--disabled) {
3357
- cursor: pointer;
3358
- }
3359
3373
  .vxe-table--render-default .vxe-cell--radio:not(.is--disabled):hover .vxe-radio--icon {
3360
3374
  color: var(--vxe-ui-font-primary-color);
3361
3375
  }
3376
+ .vxe-table--render-default .vxe-cell--radio.is--readonly {
3377
+ cursor: auto;
3378
+ }
3362
3379
  .vxe-table--render-default .vxe-cell--radio.is--disabled {
3363
3380
  color: var(--vxe-ui-font-disabled-color);
3364
3381
  cursor: not-allowed;
@@ -3367,11 +3384,15 @@
3367
3384
  color: var(--vxe-ui-input-disabled-color);
3368
3385
  }
3369
3386
  .vxe-table--render-default .vxe-cell--radio .vxe-radio--label {
3370
- padding-left: 0.5em;
3387
+ padding-left: 0.4em;
3371
3388
  vertical-align: middle;
3372
3389
  }
3390
+ .vxe-table--render-default .vxe-cell--checkbox {
3391
+ cursor: pointer;
3392
+ }
3373
3393
  .vxe-table--render-default .vxe-cell--checkbox .vxe-checkbox--icon {
3374
3394
  font-size: 1.22em;
3395
+ transition: all 0.2s ease-in-out;
3375
3396
  }
3376
3397
  .vxe-table--render-default .vxe-cell--checkbox .vxe-checkbox--icon {
3377
3398
  color: var(--vxe-ui-input-border-color);
@@ -3387,15 +3408,15 @@
3387
3408
  .vxe-table--render-default .vxe-cell--checkbox.is--checked .vxe-checkbox--icon, .vxe-table--render-default .vxe-cell--checkbox.is--indeterminate .vxe-checkbox--icon {
3388
3409
  color: var(--vxe-ui-font-primary-color);
3389
3410
  }
3390
- .vxe-table--render-default .vxe-cell--checkbox:not(.is--disabled) {
3391
- cursor: pointer;
3392
- }
3393
3411
  .vxe-table--render-default .vxe-cell--checkbox:not(.is--disabled):hover .vxe-checkbox--icon {
3394
3412
  color: var(--vxe-ui-font-primary-color);
3395
3413
  }
3396
3414
  .vxe-table--render-default .vxe-cell--checkbox.is--hidden {
3397
3415
  cursor: default;
3398
3416
  }
3417
+ .vxe-table--render-default .vxe-cell--checkbox.is--readonly {
3418
+ cursor: auto;
3419
+ }
3399
3420
  .vxe-table--render-default .vxe-cell--checkbox.is--disabled {
3400
3421
  color: var(--vxe-ui-font-disabled-color);
3401
3422
  cursor: not-allowed;
@@ -3404,7 +3425,7 @@
3404
3425
  color: var(--vxe-ui-input-disabled-color);
3405
3426
  }
3406
3427
  .vxe-table--render-default .vxe-cell--checkbox .vxe-checkbox--label {
3407
- padding-left: 0.5em;
3428
+ padding-left: 0.4em;
3408
3429
  vertical-align: middle;
3409
3430
  }
3410
3431
  .vxe-table--render-default .fixed--hidden {
@@ -3826,7 +3847,7 @@
3826
3847
  width: 100%;
3827
3848
  position: absolute;
3828
3849
  left: 50%;
3829
- font-size: 12px;
3850
+ font-size: var(--vxe-ui-table-validate-error-font-size);
3830
3851
  line-height: 1em;
3831
3852
  transform: translate(-50%, -2px);
3832
3853
  text-align: left;