vxe-table 4.2.6-beta.3 → 4.2.6

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (113) hide show
  1. package/README.md +1 -1
  2. package/README.zh-TW.md +0 -4
  3. package/es/edit/src/hook.js +2 -2
  4. package/es/export/src/export-panel.js +19 -19
  5. package/es/export/src/import-panel.js +9 -9
  6. package/es/filter/src/hook.js +5 -5
  7. package/es/form/src/form-item.js +1 -1
  8. package/es/form/src/render.js +1 -1
  9. package/es/grid/src/grid.js +12 -8
  10. package/es/input/src/input.js +19 -16
  11. package/es/locale/lang/en-US.js +2 -0
  12. package/es/locale/lang/ja-JP.js +2 -0
  13. package/es/locale/lang/zh-CN.js +2 -0
  14. package/es/locale/lang/zh-TC.js +2 -0
  15. package/es/menu/src/hooks.js +0 -6
  16. package/es/select/src/select.js +145 -15
  17. package/es/select/style.css +17 -3
  18. package/es/style.css +1 -1
  19. package/es/style.min.css +1 -1
  20. package/es/table/src/body.js +1 -1
  21. package/es/table/src/cell.js +3 -3
  22. package/es/table/src/columnInfo.js +1 -1
  23. package/es/table/src/table.js +59 -47
  24. package/es/table/src/util.js +2 -2
  25. package/es/toolbar/style.css +11 -9
  26. package/es/tools/log.js +1 -1
  27. package/es/v-x-e-table/index.js +1 -1
  28. package/es/v-x-e-table/src/conf.js +2 -2
  29. package/lib/edit/src/hook.js +2 -2
  30. package/lib/filter/src/hook.js +8 -5
  31. package/lib/filter/src/hook.min.js +1 -1
  32. package/lib/form/src/form-item.js +1 -0
  33. package/lib/form/src/form-item.min.js +1 -1
  34. package/lib/form/src/render.js +1 -0
  35. package/lib/form/src/render.min.js +1 -1
  36. package/lib/grid/src/grid.js +16 -11
  37. package/lib/grid/src/grid.min.js +1 -1
  38. package/lib/index.umd.js +327 -123
  39. package/lib/index.umd.min.js +1 -1
  40. package/lib/input/src/input.js +21 -18
  41. package/lib/input/src/input.min.js +1 -1
  42. package/lib/locale/lang/en-US.js +2 -0
  43. package/lib/locale/lang/en-US.min.js +1 -1
  44. package/lib/locale/lang/en-US.umd.js +2 -0
  45. package/lib/locale/lang/ja-JP.js +2 -0
  46. package/lib/locale/lang/ja-JP.min.js +1 -1
  47. package/lib/locale/lang/ja-JP.umd.js +2 -0
  48. package/lib/locale/lang/zh-CN.js +2 -0
  49. package/lib/locale/lang/zh-CN.min.js +1 -1
  50. package/lib/locale/lang/zh-CN.umd.js +2 -0
  51. package/lib/locale/lang/zh-HK.min.js +1 -1
  52. package/lib/locale/lang/zh-HK.umd.js +2 -0
  53. package/lib/locale/lang/zh-MO.min.js +1 -1
  54. package/lib/locale/lang/zh-MO.umd.js +2 -0
  55. package/lib/locale/lang/zh-TC.js +2 -0
  56. package/lib/locale/lang/zh-TC.min.js +1 -1
  57. package/lib/locale/lang/zh-TC.umd.js +2 -0
  58. package/lib/locale/lang/zh-TW.min.js +1 -1
  59. package/lib/locale/lang/zh-TW.umd.js +2 -0
  60. package/lib/menu/src/hooks.js +0 -6
  61. package/lib/select/src/select.js +194 -16
  62. package/lib/select/src/select.min.js +1 -1
  63. package/lib/select/style/style.css +17 -3
  64. package/lib/select/style/style.min.css +1 -1
  65. package/lib/style.css +1 -1
  66. package/lib/style.min.css +1 -1
  67. package/lib/table/src/body.js +1 -1
  68. package/lib/table/src/body.min.js +1 -1
  69. package/lib/table/src/cell.js +3 -3
  70. package/lib/table/src/cell.min.js +1 -1
  71. package/lib/table/src/columnInfo.js +1 -1
  72. package/lib/table/src/columnInfo.min.js +1 -1
  73. package/lib/table/src/table.js +66 -51
  74. package/lib/table/src/table.min.js +1 -1
  75. package/lib/table/src/util.js +2 -2
  76. package/lib/table/src/util.min.js +1 -1
  77. package/lib/toolbar/style/style.css +11 -9
  78. package/lib/toolbar/style/style.min.css +1 -1
  79. package/lib/tools/log.js +1 -1
  80. package/lib/tools/log.min.js +1 -1
  81. package/lib/v-x-e-table/index.js +1 -1
  82. package/lib/v-x-e-table/index.min.js +1 -1
  83. package/lib/v-x-e-table/src/conf.js +2 -2
  84. package/lib/v-x-e-table/src/conf.min.js +1 -1
  85. package/package.json +1 -1
  86. package/packages/edit/src/hook.ts +2 -2
  87. package/packages/export/src/export-panel.ts +19 -19
  88. package/packages/export/src/import-panel.ts +9 -9
  89. package/packages/filter/src/hook.ts +7 -7
  90. package/packages/form/src/form-item.ts +1 -1
  91. package/packages/form/src/render.ts +1 -1
  92. package/packages/grid/src/grid.ts +15 -9
  93. package/packages/input/src/input.ts +19 -16
  94. package/packages/locale/lang/en-US.ts +2 -0
  95. package/packages/locale/lang/ja-JP.ts +2 -0
  96. package/packages/locale/lang/zh-CN.ts +2 -0
  97. package/packages/locale/lang/zh-TC.ts +2 -0
  98. package/packages/menu/src/hooks.ts +0 -6
  99. package/packages/select/src/select.ts +146 -16
  100. package/packages/table/src/body.ts +1 -1
  101. package/packages/table/src/cell.ts +3 -3
  102. package/packages/table/src/columnInfo.ts +1 -1
  103. package/packages/table/src/table.ts +61 -49
  104. package/packages/table/src/util.ts +4 -4
  105. package/packages/v-x-e-table/src/conf.ts +2 -2
  106. package/styles/select.scss +24 -5
  107. package/styles/toolbar.scss +9 -5
  108. package/styles/variable.scss +0 -4
  109. package/types/form-item.d.ts +16 -1
  110. package/types/form.d.ts +1 -1
  111. package/types/input.d.ts +4 -0
  112. package/types/select.d.ts +19 -4
  113. package/types/table.d.ts +2 -0
@@ -239,7 +239,7 @@ export default defineComponent({
239
239
  }
240
240
  // 如果编辑列开启显示状态
241
241
  if (!fixedHiddenColumn && editConfig && (editRender || cellRender) && (editOpts.showStatus || editOpts.showUpdateStatus)) {
242
- isDirty = $xetable.isUpdateByRow(row, column.property);
242
+ isDirty = $xetable.isUpdateByRow(row, column.field);
243
243
  }
244
244
  var tdVNs = [];
245
245
  if (fixedHiddenColumn && (allColumnOverflow ? isAllOverflow : allColumnOverflow)) {
@@ -484,7 +484,7 @@ export var Cell = {
484
484
  var treeIndeterminates = reactData.treeIndeterminates;
485
485
  var computeCheckboxOpts = $table.getComputeMaps().computeCheckboxOpts;
486
486
  var checkboxOpts = computeCheckboxOpts.value;
487
- var labelField = checkboxOpts.labelField, property = checkboxOpts.checkField, halfField = checkboxOpts.halfField, checkMethod = checkboxOpts.checkMethod, visibleMethod = checkboxOpts.visibleMethod;
487
+ var labelField = checkboxOpts.labelField, checkField = checkboxOpts.checkField, halfField = checkboxOpts.halfField, checkMethod = checkboxOpts.checkMethod, visibleMethod = checkboxOpts.visibleMethod;
488
488
  var slots = column.slots;
489
489
  var defaultSlot = slots ? slots.default : null;
490
490
  var checkboxSlot = slots ? slots.checkbox : null;
@@ -494,7 +494,7 @@ export var Cell = {
494
494
  var isDisabled = !!checkMethod;
495
495
  var ons;
496
496
  if (!isHidden) {
497
- isChecked = XEUtils.get(row, property);
497
+ isChecked = XEUtils.get(row, checkField);
498
498
  ons = {
499
499
  onClick: function (evnt) {
500
500
  if (!isDisabled && isVisible) {
@@ -702,7 +702,7 @@ export var Cell = {
702
702
  var sortable = column.sortable, filters = column.filters, editRender = column.editRender;
703
703
  var isRequired = false;
704
704
  if (editRules) {
705
- var columnRules = XEUtils.get(editRules, params.column.property);
705
+ var columnRules = XEUtils.get(editRules, column.field);
706
706
  if (columnRules) {
707
707
  isRequired = columnRules.some(function (rule) { return rule.required; });
708
708
  }
@@ -129,7 +129,7 @@ var ColumnInfo = /** @class */ (function () {
129
129
  return getFuncText(this.title || (this.type === 'seq' ? GlobalConfig.i18n('vxe.table.seqTitle') : ''));
130
130
  };
131
131
  ColumnInfo.prototype.getKey = function () {
132
- return this.property || (this.type ? "type=" + this.type : null);
132
+ return this.field || (this.type ? "type=" + this.type : null);
133
133
  };
134
134
  ColumnInfo.prototype.update = function (name, value) {
135
135
  // 不支持双向的属性
@@ -847,15 +847,15 @@ export default defineComponent({
847
847
  var radioColumn;
848
848
  var hasFixed;
849
849
  var handleFunc = function (column, index, items, path, parent) {
850
- var colid = column.id, property = column.property, fixed = column.fixed, type = column.type, treeNode = column.treeNode;
850
+ var colid = column.id, field = column.field, fixed = column.fixed, type = column.type, treeNode = column.treeNode;
851
851
  var rest = { column: column, colid: colid, index: index, items: items, parent: parent };
852
- if (property) {
852
+ if (field) {
853
853
  if (process.env.NODE_ENV === 'development') {
854
- if (fullColumnFieldData[property]) {
855
- warnLog('vxe.error.colRepet', ['field', property]);
854
+ if (fullColumnFieldData[field]) {
855
+ warnLog('vxe.error.colRepet', ['field', field]);
856
856
  }
857
857
  }
858
- fullColumnFieldData[property] = rest;
858
+ fullColumnFieldData[field] = rest;
859
859
  }
860
860
  if (!hasFixed && fixed) {
861
861
  hasFixed = fixed;
@@ -1173,7 +1173,7 @@ export default defineComponent({
1173
1173
  var filterColumns_1 = [];
1174
1174
  var orderColumns_1 = [];
1175
1175
  tableFullColumn.forEach(function (column) {
1176
- var property = column.property, sortable = column.sortable, order = column.order, filters = column.filters;
1176
+ var field = column.field, sortable = column.sortable, order = column.order, filters = column.filters;
1177
1177
  if (!allRemoteFilter && filters && filters.length) {
1178
1178
  var valueList_1 = [];
1179
1179
  var itemList_1 = [];
@@ -1188,7 +1188,7 @@ export default defineComponent({
1188
1188
  }
1189
1189
  }
1190
1190
  if (!allRemoteSort && sortable && order) {
1191
- orderColumns_1.push({ column: column, field: property, property: property, order: order, sortTime: column.sortTime });
1191
+ orderColumns_1.push({ column: column, field: field, property: field, order: order, sortTime: column.sortTime });
1192
1192
  }
1193
1193
  });
1194
1194
  if (sortMultiple && chronological && orderColumns_1.length > 1) {
@@ -1217,7 +1217,7 @@ export default defineComponent({
1217
1217
  else if (defaultFilterMethod) {
1218
1218
  return itemList.some(function (item) { return defaultFilterMethod({ value: item.value, option: item, cellValue: cellValue, row: row, column: column, $table: $xetable }); });
1219
1219
  }
1220
- return valueList.indexOf(XEUtils.get(row, column.property)) > -1;
1220
+ return valueList.indexOf(XEUtils.get(row, column.field)) > -1;
1221
1221
  });
1222
1222
  };
1223
1223
  if (treeConfig && transform) {
@@ -1732,7 +1732,7 @@ export default defineComponent({
1732
1732
  return new Promise(function (resolve) {
1733
1733
  if (loadMethod) {
1734
1734
  treeLazyLoadeds.push(row);
1735
- loadMethod({ $table: $xetable, row: row }).catch(function () { return []; }).then(function (childRecords) {
1735
+ loadMethod({ $table: $xetable, row: row }).then(function (childRecords) {
1736
1736
  rest.treeLoaded = true;
1737
1737
  XEUtils.remove(treeLazyLoadeds, function (item) { return $xetable.eqRow(item, row); });
1738
1738
  if (!XEUtils.isArray(childRecords)) {
@@ -1968,12 +1968,23 @@ export default defineComponent({
1968
1968
  nextTick()
1969
1969
  .then(function () { return tableMethods.recalculate(); })
1970
1970
  .then(function () {
1971
+ var targetScrollLeft = lastScrollLeft;
1972
+ var targetScrollTop = lastScrollTop;
1973
+ var sXOpts = computeSXOpts.value;
1974
+ var sYOpts = computeSYOpts.value;
1975
+ // 是否在更新数据之后自动滚动重置滚动条
1976
+ if (sXOpts.scrollToLeftOnChange) {
1977
+ targetScrollLeft = 0;
1978
+ }
1979
+ if (sYOpts.scrollToTopOnChange) {
1980
+ targetScrollTop = 0;
1981
+ }
1971
1982
  // 是否变更虚拟滚动
1972
1983
  if (oldScrollYLoad === sYLoad) {
1973
- restoreScrollLocation($xetable, lastScrollLeft, lastScrollTop).then(resolve);
1984
+ restoreScrollLocation($xetable, targetScrollLeft, targetScrollTop).then(resolve);
1974
1985
  }
1975
1986
  else {
1976
- setTimeout(function () { return restoreScrollLocation($xetable, lastScrollLeft, lastScrollTop).then(resolve); });
1987
+ setTimeout(function () { return restoreScrollLocation($xetable, targetScrollLeft, targetScrollTop).then(resolve); });
1977
1988
  }
1978
1989
  });
1979
1990
  });
@@ -2644,7 +2655,7 @@ export default defineComponent({
2644
2655
  else {
2645
2656
  rows.forEach(function (row) {
2646
2657
  visibleColumn.forEach(function (column) {
2647
- if (column.property) {
2658
+ if (column.field) {
2648
2659
  setCellValue(row, column, null);
2649
2660
  }
2650
2661
  });
@@ -2702,7 +2713,7 @@ export default defineComponent({
2702
2713
  return !eqCellValue(oRow, row, field);
2703
2714
  }
2704
2715
  for (var index = 0, len = visibleColumn.length; index < len; index++) {
2705
- property = visibleColumn[index].property;
2716
+ property = visibleColumn[index].field;
2706
2717
  if (property && !eqCellValue(oRow, row, property)) {
2707
2718
  return true;
2708
2719
  }
@@ -2763,15 +2774,15 @@ export default defineComponent({
2763
2774
  var treeOpts = computeTreeOpts.value;
2764
2775
  var checkboxOpts = computeCheckboxOpts.value;
2765
2776
  var transform = treeOpts.transform, children = treeOpts.children, mapChildren = treeOpts.mapChildren;
2766
- var property = checkboxOpts.checkField;
2777
+ var checkField = checkboxOpts.checkField;
2767
2778
  var rowList = [];
2768
2779
  var currTableData = isFull ? (transform ? tableFullTreeData : tableFullData) : (transform ? afterTreeFullData : afterFullData);
2769
- if (property) {
2780
+ if (checkField) {
2770
2781
  if (treeConfig) {
2771
- rowList = XEUtils.filterTree(currTableData, function (row) { return XEUtils.get(row, property); }, { children: transform ? mapChildren : children });
2782
+ rowList = XEUtils.filterTree(currTableData, function (row) { return XEUtils.get(row, checkField); }, { children: transform ? mapChildren : children });
2772
2783
  }
2773
2784
  else {
2774
- rowList = currTableData.filter(function (row) { return XEUtils.get(row, property); });
2785
+ rowList = currTableData.filter(function (row) { return XEUtils.get(row, checkField); });
2775
2786
  }
2776
2787
  }
2777
2788
  else {
@@ -2809,8 +2820,9 @@ export default defineComponent({
2809
2820
  * 根据行的唯一主键获取行
2810
2821
  * @param {String/Number} rowid 行主键
2811
2822
  */
2812
- getRowById: function (rowid) {
2823
+ getRowById: function (cellValue) {
2813
2824
  var fullDataRowIdData = internalData.fullDataRowIdData;
2825
+ var rowid = XEUtils.eqNull(cellValue) ? '' : encodeURIComponent(cellValue);
2814
2826
  return fullDataRowIdData[rowid] ? fullDataRowIdData[rowid].row : null;
2815
2827
  },
2816
2828
  /**
@@ -3003,9 +3015,9 @@ export default defineComponent({
3003
3015
  isCheckedByCheckboxRow: function (row) {
3004
3016
  var selection = reactData.selection;
3005
3017
  var checkboxOpts = computeCheckboxOpts.value;
3006
- var property = checkboxOpts.checkField;
3007
- if (property) {
3008
- return XEUtils.get(row, property);
3018
+ var checkField = checkboxOpts.checkField;
3019
+ if (checkField) {
3020
+ return XEUtils.get(row, checkField);
3009
3021
  }
3010
3022
  return $xetable.findRowIndexOf(selection, row) > -1;
3011
3023
  },
@@ -3030,7 +3042,7 @@ export default defineComponent({
3030
3042
  var afterFullData = internalData.afterFullData, checkboxReserveRowMap = internalData.checkboxReserveRowMap;
3031
3043
  var treeOpts = computeTreeOpts.value;
3032
3044
  var checkboxOpts = computeCheckboxOpts.value;
3033
- var property = checkboxOpts.checkField, reserve = checkboxOpts.reserve, checkStrictly = checkboxOpts.checkStrictly, checkMethod = checkboxOpts.checkMethod;
3045
+ var checkField = checkboxOpts.checkField, reserve = checkboxOpts.reserve, checkStrictly = checkboxOpts.checkStrictly, checkMethod = checkboxOpts.checkMethod;
3034
3046
  var selectRows = [];
3035
3047
  var beforeSelection = treeConfig ? [] : selection.filter(function (row) { return $xetable.findRowIndexOf(afterFullData, row) === -1; });
3036
3048
  if (checkStrictly) {
@@ -3041,13 +3053,13 @@ export default defineComponent({
3041
3053
  * 绑定属性方式(高性能,有污染)
3042
3054
  * 必须在行数据存在对应的属性,否则将不响应
3043
3055
  */
3044
- if (property) {
3056
+ if (checkField) {
3045
3057
  var checkValFn = function (row) {
3046
3058
  if (!checkMethod || checkMethod({ row: row })) {
3047
3059
  if (value) {
3048
3060
  selectRows.push(row);
3049
3061
  }
3050
- XEUtils.set(row, property, value);
3062
+ XEUtils.set(row, checkField, value);
3051
3063
  }
3052
3064
  };
3053
3065
  // 如果存在选中方法
@@ -3126,7 +3138,7 @@ export default defineComponent({
3126
3138
  afterFullData.forEach(function (row) { return handleCheckboxReserveRow(row, false); });
3127
3139
  }
3128
3140
  }
3129
- reactData.selection = property ? [] : beforeSelection.concat(selectRows);
3141
+ reactData.selection = checkField ? [] : beforeSelection.concat(selectRows);
3130
3142
  }
3131
3143
  reactData.treeIndeterminates = [];
3132
3144
  tablePrivateMethods.checkSelectionStatus();
@@ -3226,13 +3238,13 @@ export default defineComponent({
3226
3238
  var tableFullData = internalData.tableFullData;
3227
3239
  var treeOpts = computeTreeOpts.value;
3228
3240
  var checkboxOpts = computeCheckboxOpts.value;
3229
- var property = checkboxOpts.checkField, reserve = checkboxOpts.reserve;
3230
- if (property) {
3241
+ var checkField = checkboxOpts.checkField, reserve = checkboxOpts.reserve;
3242
+ if (checkField) {
3231
3243
  if (treeConfig) {
3232
- XEUtils.eachTree(tableFullData, function (item) { return XEUtils.set(item, property, false); }, treeOpts);
3244
+ XEUtils.eachTree(tableFullData, function (item) { return XEUtils.set(item, checkField, false); }, treeOpts);
3233
3245
  }
3234
3246
  else {
3235
- tableFullData.forEach(function (item) { return XEUtils.set(item, property, false); });
3247
+ tableFullData.forEach(function (item) { return XEUtils.set(item, checkField, false); });
3236
3248
  }
3237
3249
  }
3238
3250
  if (reserve) {
@@ -3433,9 +3445,9 @@ export default defineComponent({
3433
3445
  var sortList = [];
3434
3446
  var tableFullColumn = internalData.tableFullColumn;
3435
3447
  tableFullColumn.forEach(function (column) {
3436
- var property = column.property, order = column.order;
3448
+ var field = column.field, order = column.order;
3437
3449
  if (column.sortable && order) {
3438
- sortList.push({ column: column, field: property, property: property, order: order, sortTime: column.sortTime });
3450
+ sortList.push({ column: column, field: field, property: field, order: order, sortTime: column.sortTime });
3439
3451
  }
3440
3452
  });
3441
3453
  if (multiple && chronological && sortList.length > 1) {
@@ -3457,7 +3469,7 @@ export default defineComponent({
3457
3469
  visible: false
3458
3470
  });
3459
3471
  if (visible) {
3460
- $xetable.dispatchEvent('filter-visible', { column: column, property: column.property, filterList: $xetable.getCheckedFilters(), visible: false }, null);
3472
+ $xetable.dispatchEvent('filter-visible', { column: column, property: column.field, field: column.field, filterList: $xetable.getCheckedFilters(), visible: false }, null);
3461
3473
  }
3462
3474
  return nextTick();
3463
3475
  },
@@ -4567,8 +4579,8 @@ export default defineComponent({
4567
4579
  var checkboxOpts = computeCheckboxOpts.value;
4568
4580
  var rowkey = getRowkey($xetable);
4569
4581
  internalData.tableFullColumn.forEach(function (column) {
4570
- var property = column.property, editRender = column.editRender;
4571
- if (property && !XEUtils.has(record, property)) {
4582
+ var field = column.field, editRender = column.editRender;
4583
+ if (field && !XEUtils.has(record, field)) {
4572
4584
  var cellValue = null;
4573
4585
  if (editRender) {
4574
4586
  var defaultValue = editRender.defaultValue;
@@ -4579,7 +4591,7 @@ export default defineComponent({
4579
4591
  cellValue = defaultValue;
4580
4592
  }
4581
4593
  }
4582
- XEUtils.set(record, property, cellValue);
4594
+ XEUtils.set(record, field, cellValue);
4583
4595
  }
4584
4596
  });
4585
4597
  var otherFields = [radioOpts.labelField, checkboxOpts.checkField, checkboxOpts.labelField, expandOpts.labelField];
@@ -4861,20 +4873,20 @@ export default defineComponent({
4861
4873
  var afterFullData = internalData.afterFullData;
4862
4874
  var treeOpts = computeTreeOpts.value;
4863
4875
  var checkboxOpts = computeCheckboxOpts.value;
4864
- var property = checkboxOpts.checkField, checkStrictly = checkboxOpts.checkStrictly, checkMethod = checkboxOpts.checkMethod;
4865
- if (property) {
4876
+ var checkField = checkboxOpts.checkField, checkStrictly = checkboxOpts.checkStrictly, checkMethod = checkboxOpts.checkMethod;
4877
+ if (checkField) {
4866
4878
  if (treeConfig && !checkStrictly) {
4867
4879
  if (value === -1) {
4868
4880
  if ($xetable.findRowIndexOf(treeIndeterminates, row) === -1) {
4869
4881
  treeIndeterminates.push(row);
4870
4882
  }
4871
- XEUtils.set(row, property, false);
4883
+ XEUtils.set(row, checkField, false);
4872
4884
  }
4873
4885
  else {
4874
4886
  // 更新子节点状态
4875
4887
  XEUtils.eachTree([row], function (item) {
4876
4888
  if ($xetable.eqRow(item, row) || (!checkMethod || checkMethod({ row: item }))) {
4877
- XEUtils.set(item, property, value);
4889
+ XEUtils.set(item, checkField, value);
4878
4890
  XEUtils.remove(treeIndeterminates, function (half) { return half === item; });
4879
4891
  handleCheckboxReserveRow(row, value);
4880
4892
  }
@@ -4890,7 +4902,7 @@ export default defineComponent({
4890
4902
  parentStatus = -1;
4891
4903
  }
4892
4904
  else {
4893
- var selectItems = matchObj.items.filter(function (item) { return XEUtils.get(item, property); });
4905
+ var selectItems = matchObj.items.filter(function (item) { return XEUtils.get(item, checkField); });
4894
4906
  parentStatus = selectItems.filter(function (item) { return $xetable.findRowIndexOf(vItems_1, item) > -1; }).length === vItems_1.length ? true : (selectItems.length || value === -1 ? -1 : false);
4895
4907
  }
4896
4908
  return tablePrivateMethods.handleSelectRow({ row: matchObj.parent }, parentStatus);
@@ -4898,7 +4910,7 @@ export default defineComponent({
4898
4910
  }
4899
4911
  else {
4900
4912
  if (!checkMethod || checkMethod({ row: row })) {
4901
- XEUtils.set(row, property, value);
4913
+ XEUtils.set(row, checkField, value);
4902
4914
  handleCheckboxReserveRow(row, value);
4903
4915
  }
4904
4916
  }
@@ -5178,9 +5190,9 @@ export default defineComponent({
5178
5190
  handleToggleCheckRowEvent: function (evnt, params) {
5179
5191
  var selection = reactData.selection;
5180
5192
  var checkboxOpts = computeCheckboxOpts.value;
5181
- var property = checkboxOpts.checkField;
5193
+ var checkField = checkboxOpts.checkField;
5182
5194
  var row = params.row;
5183
- var value = property ? !XEUtils.get(row, property) : $xetable.findRowIndexOf(selection, row) === -1;
5195
+ var value = checkField ? !XEUtils.get(row, checkField) : $xetable.findRowIndexOf(selection, row) === -1;
5184
5196
  if (evnt) {
5185
5197
  tablePrivateMethods.triggerCheckRowEvent(evnt, params, value);
5186
5198
  }
@@ -5292,15 +5304,15 @@ export default defineComponent({
5292
5304
  */
5293
5305
  triggerSortEvent: function (evnt, column, order) {
5294
5306
  var sortOpts = computeSortOpts.value;
5295
- var property = column.property;
5296
- if (column.sortable) {
5307
+ var field = column.field, sortable = column.sortable;
5308
+ if (sortable) {
5297
5309
  if (!order || column.order === order) {
5298
5310
  tableMethods.clearSort(sortOpts.multiple ? column : null);
5299
5311
  }
5300
5312
  else {
5301
- tableMethods.sort({ field: property, order: order });
5313
+ tableMethods.sort({ field: field, order: order });
5302
5314
  }
5303
- var params = { column: column, property: property, order: column.order, sortList: tableMethods.getSortColumns() };
5315
+ var params = { column: column, field: field, property: field, order: column.order, sortList: tableMethods.getSortColumns() };
5304
5316
  tableMethods.dispatchEvent('sort-change', params, evnt);
5305
5317
  }
5306
5318
  },
@@ -83,10 +83,10 @@ export function toTreePathSeq(path) {
83
83
  return path.map(function (num, i) { return i % 2 === 0 ? (Number(num) + 1) : '.'; }).join('');
84
84
  }
85
85
  export function getCellValue(row, column) {
86
- return XEUtils.get(row, column.property);
86
+ return XEUtils.get(row, column.field);
87
87
  }
88
88
  export function setCellValue(row, column, value) {
89
- return XEUtils.set(row, column.property, value);
89
+ return XEUtils.set(row, column.field, value);
90
90
  }
91
91
  export function getPropClass(property, params) {
92
92
  return property ? XEUtils.isFunction(property) ? property(params) : property : '';
@@ -109,6 +109,7 @@
109
109
  display: flex;
110
110
  flex-direction: row;
111
111
  align-items: center;
112
+ padding: 0.6em 0;
112
113
  color: #606266;
113
114
  font-family: -apple-system, BlinkMacSystemFont, Segoe UI, PingFang SC, Hiragino Sans GB, Microsoft YaHei, Helvetica Neue, Helvetica, Arial, sans-serif, Apple Color Emoji, Segoe UI Emoji, Segoe UI Symbol;
114
115
  background-color: #fff; }
@@ -154,11 +155,16 @@
154
155
  display: flex;
155
156
  align-items: center;
156
157
  justify-content: center; }
158
+ .vxe-toolbar .vxe-buttons--wrapper,
157
159
  .vxe-toolbar .vxe-tools--wrapper,
158
160
  .vxe-toolbar .vxe-tools--operate {
159
161
  display: flex;
160
- flex-shrink: 0;
161
162
  align-items: center; }
163
+ .vxe-toolbar .vxe-buttons--wrapper,
164
+ .vxe-toolbar .vxe-tools--wrapper {
165
+ flex-wrap: wrap; }
166
+ .vxe-toolbar .vxe-tools--operate {
167
+ flex-shrink: 0; }
162
168
  .vxe-toolbar .vxe-custom--wrapper {
163
169
  position: relative;
164
170
  margin-left: 0.8em; }
@@ -271,22 +277,18 @@
271
277
  top: 0.38em; }
272
278
 
273
279
  .vxe-toolbar {
274
- font-size: 14px;
275
- height: 52px; }
280
+ font-size: 14px; }
276
281
  .vxe-toolbar .vxe-custom--option > .vxe-checkbox--icon {
277
282
  font-size: 16px; }
278
283
  .vxe-toolbar.size--medium {
279
- font-size: 14px;
280
- height: 50px; }
284
+ font-size: 14px; }
281
285
  .vxe-toolbar.size--medium .vxe-custom--option > .vxe-checkbox--icon {
282
286
  font-size: 15px; }
283
287
  .vxe-toolbar.size--small {
284
- font-size: 13px;
285
- height: 48px; }
288
+ font-size: 13px; }
286
289
  .vxe-toolbar.size--small .vxe-custom--option > .vxe-checkbox--icon {
287
290
  font-size: 14px; }
288
291
  .vxe-toolbar.size--mini {
289
- font-size: 12px;
290
- height: 46px; }
292
+ font-size: 12px; }
291
293
  .vxe-toolbar.size--mini .vxe-custom--option > .vxe-checkbox--icon {
292
294
  font-size: 14px; }
package/es/tools/log.js CHANGED
@@ -1,6 +1,6 @@
1
1
  import GlobalConfig from '../v-x-e-table/src/conf';
2
2
  export function getLog(message, params) {
3
- return "[vxe-table v" + "4.2.6-beta.2" + "] " + GlobalConfig.i18n(message, params);
3
+ return "[vxe-table v" + "4.2.6" + "] " + GlobalConfig.i18n(message, params);
4
4
  }
5
5
  function outLog(type) {
6
6
  return function (message, params) {
@@ -83,7 +83,7 @@ export var config = new VXETableConfig();
83
83
  export var v = 'v4';
84
84
  export var VXETable = {
85
85
  v: v,
86
- version: "4.2.6-beta.2",
86
+ version: "4.2.6",
87
87
  setup: setup,
88
88
  interceptor: interceptor,
89
89
  renderer: renderer,
@@ -255,8 +255,8 @@ var GlobalConfig = {
255
255
  // parseFormat: 'yyyy-MM-dd HH:mm:ss.SSS',
256
256
  // labelFormat: '',
257
257
  // valueFormat: '',
258
- minDate: new Date(1900, 0, 1),
259
- maxDate: new Date(2100, 0, 1),
258
+ startDate: new Date(1900, 0, 1),
259
+ endDate: new Date(2100, 0, 1),
260
260
  startDay: 1,
261
261
  selectDay: 1,
262
262
  digits: 2,
@@ -394,7 +394,7 @@ var editHook = {
394
394
  var actived = editStore.actived,
395
395
  removeList = editStore.removeList,
396
396
  insertList = editStore.insertList;
397
- var property = checkboxOpts.checkField;
397
+ var checkField = checkboxOpts.checkField;
398
398
  var rest = [];
399
399
 
400
400
  if (!rows) {
@@ -410,7 +410,7 @@ var editHook = {
410
410
  }
411
411
  }); // 如果绑定了多选属性,则更新状态
412
412
 
413
- if (!property) {
413
+ if (!checkField) {
414
414
  rows.forEach(function (row) {
415
415
  var sIndex = $xetable.findRowIndexOf(selection, row);
416
416
 
@@ -169,7 +169,8 @@ var tableFilterHook = {
169
169
 
170
170
  $xetable.dispatchEvent('filter-visible', {
171
171
  column: column,
172
- property: column.property,
172
+ field: column.field,
173
+ property: column.field,
173
174
  filterList: $xetable.getCheckedFilters(),
174
175
  visible: filterStore.visible
175
176
  }, evnt);
@@ -213,7 +214,7 @@ var tableFilterHook = {
213
214
  oldScrollYLoad = reactData.scrollYLoad;
214
215
  var filterOpts = computeFilterOpts.value;
215
216
  var column = filterStore.column;
216
- var property = column.property;
217
+ var field = column.field;
217
218
  var values = [];
218
219
  var datas = [];
219
220
  column.filters.forEach(function (item) {
@@ -231,7 +232,8 @@ var tableFilterHook = {
231
232
 
232
233
  $xetable.dispatchEvent('filter-change', {
233
234
  column: column,
234
- property: property,
235
+ field: field,
236
+ property: field,
235
237
  values: values,
236
238
  datas: datas,
237
239
  filters: filterList,
@@ -347,7 +349,7 @@ var tableFilterHook = {
347
349
  var tableFullColumn = internalData.tableFullColumn;
348
350
  var filterList = [];
349
351
  tableFullColumn.filter(function (column) {
350
- var property = column.property,
352
+ var field = column.field,
351
353
  filters = column.filters;
352
354
  var valueList = [];
353
355
  var dataList = [];
@@ -363,7 +365,8 @@ var tableFilterHook = {
363
365
  if (valueList.length) {
364
366
  filterList.push({
365
367
  column: column,
366
- property: property,
368
+ field: field,
369
+ property: field,
367
370
  values: valueList,
368
371
  datas: dataList
369
372
  });
@@ -1 +1 @@
1
- "use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var _vue=require("vue"),_xeUtils=_interopRequireDefault(require("xe-utils")),_vXETable=require("../../v-x-e-table"),_util=require("../../table/src/util"),_dom=require("../../tools/dom");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}var __assign=function(){return(__assign=Object.assign||function(e){for(var t,l=1,r=arguments.length;l<r;l++)for(var i in t=arguments[l])Object.prototype.hasOwnProperty.call(t,i)&&(e[i]=t[i]);return e}).apply(this,arguments)},tableFilterMethodKeys=["setFilter","clearFilter","getCheckedFilters"],tableFilterHook={setupTable:function(f){var s=f.reactData,a=f.internalData,e=f.getRefMaps(),_=e.refTableBody,b=e.refTableFilter,c=f.getComputeMaps().computeFilterOpts,n={checkFilterOptions:function(){var e=s.filterStore;e.isAllSelected=e.options.every(function(e){return e._checked}),e.isIndeterminate=!e.isAllSelected&&e.options.some(function(e){return e._checked})},triggerFilterEvent:function(e,d,t){var h,p,v,l,r,i,n,o=s.initStore,m=s.filterStore;m.column===d&&m.visible?m.visible=!1:(h=e.target,p=e.pageX,v=(0,_dom.getDomNode)().visibleWidth,l=d.filters,r=d.filterMultiple,i=(i=d.filterRender)?_vXETable.VXETable.renderer.get(i.name):null,n=d.filterRecoverMethod||(i?i.filterRecoverMethod:null),a._currFilterParams=t,Object.assign(m,{multiple:r,options:l,column:d,style:null}),m.options.forEach(function(e){var t=e._checked,l=e.checked;(e._checked=l)||t===l||n&&n({option:e,column:d,$table:f})}),this.checkFilterOptions(),m.visible=!0,o.filter=!0,(0,_vue.nextTick)(function(){var e=_.value.$el,t=b.value,l=t?t.$el:null,r=0,i=0,n=null,o=null;l&&(r=l.offsetWidth,i=l.offsetHeight,n=l.querySelector(".vxe-table--filter-header"),o=l.querySelector(".vxe-table--filter-footer"));var a,u,f,s=r/2,c=e.clientWidth-r-10,t={top:h.offsetTop+h.offsetParent.offsetTop+h.offsetHeight+8+"px"},l=null;i>=e.clientHeight&&(l=Math.max(60,e.clientHeight-(o?o.offsetHeight:0)-(n?n.offsetHeight:0))),"left"===d.fixed?a=h.offsetLeft+h.offsetParent.offsetLeft-s:"right"===d.fixed?u=h.offsetParent.offsetWidth-h.offsetLeft+(h.offsetParent.offsetParent.offsetWidth-h.offsetParent.offsetLeft)-d.renderWidth-s:a=h.offsetLeft+h.offsetParent.offsetLeft-s-e.scrollLeft,a?(0<(f=p+r-s+10-v)&&(a-=f),t.left=Math.min(c,Math.max(10,a))+"px"):u&&(0<(f=p+r-s+10-v)&&(u+=f),t.right=Math.max(10,u)+"px"),m.style=t,m.maxHeight=l})),f.dispatchEvent("filter-visible",{column:d,property:d.property,filterList:f.getCheckedFilters(),visible:m.visible},e)},handleClearFilter:function(e){var t,l,r;e&&(t=e.filters,l=e.filterRender,t&&(l=l?_vXETable.VXETable.renderer.get(l.name):null,r=e.filterResetMethod||(l?l.filterResetMethod:null),t.forEach(function(e){e._checked=!1,e.checked=!1,r||(e.data=_xeUtils.default.clone(e.resetValue,!0))}),r&&r({options:t,column:e,$table:f})))},confirmFilterEvent:function(e){var t=s.filterStore,l=s.scrollXLoad,r=s.scrollYLoad,i=c.value,n=t.column,o=n.property,a=[],u=[];n.filters.forEach(function(e){e.checked&&(a.push(e.value),u.push(e.data))});t=f.getCheckedFilters();i.remote||(f.handleTableData(!0),f.checkSelectionStatus()),f.dispatchEvent("filter-change",{column:n,property:o,values:a,datas:u,filters:t,filterList:t},e),f.closeFilter(),f.updateFooter().then(function(){var e=s.scrollXLoad,t=s.scrollYLoad;if(l||e||r||t)return(l||e)&&f.updateScrollXSpace(),(r||t)&&f.updateScrollYSpace(),f.refreshScroll()}).then(function(){return f.updateCellAreas(),f.recalculate(!0)}).then(function(){setTimeout(function(){return f.recalculate()},50)})}};return __assign(__assign({},{openFilter:function(e){var t=(0,_util.handleFieldOrColumn)(f,e);if(t&&t.filters){var l=a.elemStore,r=t.fixed;return f.scrollToColumn(t).then(function(){var e=l[(r||"main")+"-header-wrapper"]||l["main-header-wrapper"],e=e?e.value:null;e&&(e=e.querySelector(".vxe-header--column."+t.id+" .vxe-filter--btn"),(0,_dom.triggerEvent)(e,"click"))})}return(0,_vue.nextTick)()},setFilter:function(e,t){e=(0,_util.handleFieldOrColumn)(f,e);return e&&e.filters&&t&&(e.filters=(0,_util.toFilters)(t)),(0,_vue.nextTick)()},clearFilter:function(e){var t,l=s.filterStore,r=a.tableFullColumn,i=c.value;return e?(t=(0,_util.handleFieldOrColumn)(f,e))&&n.handleClearFilter(t):r.forEach(n.handleClearFilter),e&&t===l.column||Object.assign(l,{isAllSelected:!1,isIndeterminate:!1,style:null,options:[],column:null,multiple:!1,visible:!1}),i.remote?(0,_vue.nextTick)():f.updateData()},getCheckedFilters:function(){var e=a.tableFullColumn,n=[];return e.filter(function(e){var t=e.property,l=e.filters,r=[],i=[];l&&l.length&&(l.forEach(function(e){e.checked&&(r.push(e.value),i.push(e.data))}),r.length&&n.push({column:e,property:t,values:r,datas:i}))}),n}}),n)},setupGrid:function(e){return e.extendTableMethods(tableFilterMethodKeys)}},_default=tableFilterHook;exports.default=_default;
1
+ "use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var _vue=require("vue"),_xeUtils=_interopRequireDefault(require("xe-utils")),_vXETable=require("../../v-x-e-table"),_util=require("../../table/src/util"),_dom=require("../../tools/dom");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}var __assign=function(){return(__assign=Object.assign||function(e){for(var t,l=1,r=arguments.length;l<r;l++)for(var i in t=arguments[l])Object.prototype.hasOwnProperty.call(t,i)&&(e[i]=t[i]);return e}).apply(this,arguments)},tableFilterMethodKeys=["setFilter","clearFilter","getCheckedFilters"],tableFilterHook={setupTable:function(u){var s=u.reactData,a=u.internalData,e=u.getRefMaps(),_=e.refTableBody,b=e.refTableFilter,c=u.getComputeMaps().computeFilterOpts,n={checkFilterOptions:function(){var e=s.filterStore;e.isAllSelected=e.options.every(function(e){return e._checked}),e.isIndeterminate=!e.isAllSelected&&e.options.some(function(e){return e._checked})},triggerFilterEvent:function(e,d,t){var h,p,v,l,r,i,n,o=s.initStore,m=s.filterStore;m.column===d&&m.visible?m.visible=!1:(h=e.target,p=e.pageX,v=(0,_dom.getDomNode)().visibleWidth,l=d.filters,r=d.filterMultiple,i=(i=d.filterRender)?_vXETable.VXETable.renderer.get(i.name):null,n=d.filterRecoverMethod||(i?i.filterRecoverMethod:null),a._currFilterParams=t,Object.assign(m,{multiple:r,options:l,column:d,style:null}),m.options.forEach(function(e){var t=e._checked,l=e.checked;(e._checked=l)||t===l||n&&n({option:e,column:d,$table:u})}),this.checkFilterOptions(),m.visible=!0,o.filter=!0,(0,_vue.nextTick)(function(){var e=_.value.$el,t=b.value,l=t?t.$el:null,r=0,i=0,n=null,o=null;l&&(r=l.offsetWidth,i=l.offsetHeight,n=l.querySelector(".vxe-table--filter-header"),o=l.querySelector(".vxe-table--filter-footer"));var a,f,u,s=r/2,c=e.clientWidth-r-10,t={top:h.offsetTop+h.offsetParent.offsetTop+h.offsetHeight+8+"px"},l=null;i>=e.clientHeight&&(l=Math.max(60,e.clientHeight-(o?o.offsetHeight:0)-(n?n.offsetHeight:0))),"left"===d.fixed?a=h.offsetLeft+h.offsetParent.offsetLeft-s:"right"===d.fixed?f=h.offsetParent.offsetWidth-h.offsetLeft+(h.offsetParent.offsetParent.offsetWidth-h.offsetParent.offsetLeft)-d.renderWidth-s:a=h.offsetLeft+h.offsetParent.offsetLeft-s-e.scrollLeft,a?(0<(u=p+r-s+10-v)&&(a-=u),t.left=Math.min(c,Math.max(10,a))+"px"):f&&(0<(u=p+r-s+10-v)&&(f+=u),t.right=Math.max(10,f)+"px"),m.style=t,m.maxHeight=l})),u.dispatchEvent("filter-visible",{column:d,field:d.field,property:d.field,filterList:u.getCheckedFilters(),visible:m.visible},e)},handleClearFilter:function(e){var t,l,r;e&&(t=e.filters,l=e.filterRender,t&&(l=l?_vXETable.VXETable.renderer.get(l.name):null,r=e.filterResetMethod||(l?l.filterResetMethod:null),t.forEach(function(e){e._checked=!1,e.checked=!1,r||(e.data=_xeUtils.default.clone(e.resetValue,!0))}),r&&r({options:t,column:e,$table:u})))},confirmFilterEvent:function(e){var t=s.filterStore,l=s.scrollXLoad,r=s.scrollYLoad,i=c.value,n=t.column,o=n.field,a=[],f=[];n.filters.forEach(function(e){e.checked&&(a.push(e.value),f.push(e.data))});t=u.getCheckedFilters();i.remote||(u.handleTableData(!0),u.checkSelectionStatus()),u.dispatchEvent("filter-change",{column:n,field:o,property:o,values:a,datas:f,filters:t,filterList:t},e),u.closeFilter(),u.updateFooter().then(function(){var e=s.scrollXLoad,t=s.scrollYLoad;if(l||e||r||t)return(l||e)&&u.updateScrollXSpace(),(r||t)&&u.updateScrollYSpace(),u.refreshScroll()}).then(function(){return u.updateCellAreas(),u.recalculate(!0)}).then(function(){setTimeout(function(){return u.recalculate()},50)})}};return __assign(__assign({},{openFilter:function(e){var t=(0,_util.handleFieldOrColumn)(u,e);if(t&&t.filters){var l=a.elemStore,r=t.fixed;return u.scrollToColumn(t).then(function(){var e=l[(r||"main")+"-header-wrapper"]||l["main-header-wrapper"],e=e?e.value:null;e&&(e=e.querySelector(".vxe-header--column."+t.id+" .vxe-filter--btn"),(0,_dom.triggerEvent)(e,"click"))})}return(0,_vue.nextTick)()},setFilter:function(e,t){e=(0,_util.handleFieldOrColumn)(u,e);return e&&e.filters&&t&&(e.filters=(0,_util.toFilters)(t)),(0,_vue.nextTick)()},clearFilter:function(e){var t,l=s.filterStore,r=a.tableFullColumn,i=c.value;return e?(t=(0,_util.handleFieldOrColumn)(u,e))&&n.handleClearFilter(t):r.forEach(n.handleClearFilter),e&&t===l.column||Object.assign(l,{isAllSelected:!1,isIndeterminate:!1,style:null,options:[],column:null,multiple:!1,visible:!1}),i.remote?(0,_vue.nextTick)():u.updateData()},getCheckedFilters:function(){var e=a.tableFullColumn,n=[];return e.filter(function(e){var t=e.field,l=e.filters,r=[],i=[];l&&l.length&&(l.forEach(function(e){e.checked&&(r.push(e.value),i.push(e.data))}),r.length&&n.push({column:e,field:t,property:t,values:r,datas:i}))}),n}}),n)},setupGrid:function(e){return e.extendTableMethods(tableFilterMethodKeys)}},_default=tableFilterHook;exports.default=_default;
@@ -136,6 +136,7 @@ var _default = (0, _vue.defineComponent)({
136
136
  var itemVisibleMethod = visibleMethod;
137
137
  var params = {
138
138
  data: data,
139
+ field: field,
139
140
  property: field,
140
141
  item: item,
141
142
  $form: $xeform
@@ -1 +1 @@
1
- "use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.formItemProps=exports.default=void 0;var _vue=require("vue"),_xeUtils=_interopRequireDefault(require("xe-utils")),_conf=_interopRequireDefault(require("../../v-x-e-table/src/conf")),_vXETable=require("../../v-x-e-table"),_utils=require("../../tools/utils"),_util=require("./util"),_render=require("./render");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}var __assign=function(){return(__assign=Object.assign||function(e){for(var t,i=1,l=arguments.length;i<l;i++)for(var r in t=arguments[i])Object.prototype.hasOwnProperty.call(t,r)&&(e[r]=t[r]);return e}).apply(this,arguments)},formItemProps={title:String,field:String,span:[String,Number],align:String,titleAlign:String,titleWidth:[String,Number],titleColon:{type:Boolean,default:null},titleAsterisk:{type:Boolean,default:null},className:[String,Function],titleOverflow:{type:[Boolean,String],default:null},titlePrefix:Object,titleSuffix:Object,resetValue:{default:null},visibleMethod:Function,visible:{type:Boolean,default:null},folding:Boolean,collapseNode:Boolean,itemRender:Object};exports.formItemProps=formItemProps;var _default=(0,_vue.defineComponent)({name:"VxeFormItem",props:formItemProps,setup:function(e,t){var i=t.slots,C=(0,_vue.ref)(),l=(0,_vue.inject)("$xeform",{}),r=(0,_vue.inject)("$xeformgather",null),n=(0,_util.createItem)(l,e),o={formItem:n},t={itemConfig:n};n.slots=i,(0,_vue.provide)("$xeformiteminfo",t),(0,_vue.provide)("$xeformitem",o),(0,_vue.provide)("$xeformgather",null),(0,_util.watchItem)(e,n),(0,_vue.onMounted)(function(){(0,_util.assemItem)(l,C.value,n,r)}),(0,_vue.onUnmounted)(function(){(0,_util.destroyItem)(l,n)});return{renderVN:function(){var e=l?l.props:null;return e&&e.customLayout?function(t,e){var i=t.props,l=t.reactData,r=i.data,n=i.rules,o=i.titleOverflow,u=l.collapseAll,s=t.getComputeMaps().computeValidOpts.value,a=e.slots,f=e.title,d=e.visible,v=e.folding,m=e.visibleMethod,c=e.field,p=e.collapseNode,_=e.itemRender,g=e.showError,x=e.errRule,h=e.className,b=e.titleOverflow,I=(0,_utils.isEnableConf)(_)?_vXETable.VXETable.renderer.get(_.name):null,O=a?a.default:null,N=a?a.title:null,y=e.span||i.span,M=e.align||i.align,q=e.titleAlign||i.titleAlign,l=e.titleWidth||i.titleWidth,a=_xeUtils.default.isUndefined(b)||_xeUtils.default.isNull(b)?o:b,i="title"===a,o=!0===a||"tooltip"===a,b=i||o||"ellipsis"===a,a=m,S={data:r,property:c,item:e,$form:t},m=!1;!n||(w=n[c])&&(m=w.some(function(e){return e.required})),!a&&I&&I.itemVisibleMethod&&(a=I.itemVisibleMethod);var w=[];O?w=t.callSlot(O,S):I&&I.renderItemContent?w=I.renderItemContent(_,S):c&&(w=[""+_xeUtils.default.get(r,c)]),p&&w.push((0,_vue.h)("div",{class:"vxe-form--item-trigger-node",onClick:t.toggleCollapseEvent},[(0,_vue.h)("span",{class:"vxe-form--item-trigger-text"},u?_conf.default.i18n("vxe.form.unfolding"):_conf.default.i18n("vxe.form.folding")),(0,_vue.h)("i",{class:["vxe-form--item-trigger-icon",u?_conf.default.icon.FORM_FOLDING:_conf.default.icon.FORM_UNFOLDING]})])),x&&s.showMessage&&w.push((0,_vue.h)("div",{class:"vxe-form--item-valid",style:x.maxWidth?{width:x.maxWidth+"px"}:null},x.message));o=o?{onMouseenter:function(e){t.triggerTitleTipEvent(e,S)},onMouseleave:t.handleTitleTipLeaveEvent}:{};return(0,_vue.h)("div",{ref:C,class:["vxe-form--item",e.id,y?"vxe-col--"+y+" is--span":"",h?_xeUtils.default.isFunction(h)?h(S):h:"",{"is--title":f,"is--required":m,"is--hidden":!1===d||v&&u,"is--active":!a||a(S),"is--error":g}]},[(0,_vue.h)("div",{class:"vxe-form--item-inner"},[f||N?(0,_vue.h)("div",__assign({class:["vxe-form--item-title",q?"align--"+q:null,{"is--ellipsis":b}],style:l?{width:isNaN(l)?l:l+"px"}:null,title:i?(0,_utils.getFuncText)(f):null},o),(0,_render.renderTitle)(t,e)):null,(0,_vue.h)("div",{class:["vxe-form--item-content",M?"align--"+M:null]},w)])])}(l,n):(0,_vue.h)("div",{ref:C})}}},render:function(){return this.renderVN()}});exports.default=_default;
1
+ "use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.formItemProps=exports.default=void 0;var _vue=require("vue"),_xeUtils=_interopRequireDefault(require("xe-utils")),_conf=_interopRequireDefault(require("../../v-x-e-table/src/conf")),_vXETable=require("../../v-x-e-table"),_utils=require("../../tools/utils"),_util=require("./util"),_render=require("./render");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}var __assign=function(){return(__assign=Object.assign||function(e){for(var t,i=1,l=arguments.length;i<l;i++)for(var r in t=arguments[i])Object.prototype.hasOwnProperty.call(t,r)&&(e[r]=t[r]);return e}).apply(this,arguments)},formItemProps={title:String,field:String,span:[String,Number],align:String,titleAlign:String,titleWidth:[String,Number],titleColon:{type:Boolean,default:null},titleAsterisk:{type:Boolean,default:null},className:[String,Function],titleOverflow:{type:[Boolean,String],default:null},titlePrefix:Object,titleSuffix:Object,resetValue:{default:null},visibleMethod:Function,visible:{type:Boolean,default:null},folding:Boolean,collapseNode:Boolean,itemRender:Object};exports.formItemProps=formItemProps;var _default=(0,_vue.defineComponent)({name:"VxeFormItem",props:formItemProps,setup:function(e,t){var i=t.slots,C=(0,_vue.ref)(),l=(0,_vue.inject)("$xeform",{}),r=(0,_vue.inject)("$xeformgather",null),n=(0,_util.createItem)(l,e),o={formItem:n},t={itemConfig:n};n.slots=i,(0,_vue.provide)("$xeformiteminfo",t),(0,_vue.provide)("$xeformitem",o),(0,_vue.provide)("$xeformgather",null),(0,_util.watchItem)(e,n),(0,_vue.onMounted)(function(){(0,_util.assemItem)(l,C.value,n,r)}),(0,_vue.onUnmounted)(function(){(0,_util.destroyItem)(l,n)});return{renderVN:function(){var e=l?l.props:null;return e&&e.customLayout?function(t,e){var i=t.props,l=t.reactData,r=i.data,n=i.rules,o=i.titleOverflow,u=l.collapseAll,s=t.getComputeMaps().computeValidOpts.value,a=e.slots,f=e.title,d=e.visible,v=e.folding,m=e.visibleMethod,c=e.field,p=e.collapseNode,_=e.itemRender,g=e.showError,x=e.errRule,h=e.className,b=e.titleOverflow,I=(0,_utils.isEnableConf)(_)?_vXETable.VXETable.renderer.get(_.name):null,O=a?a.default:null,N=a?a.title:null,y=e.span||i.span,M=e.align||i.align,q=e.titleAlign||i.titleAlign,l=e.titleWidth||i.titleWidth,a=_xeUtils.default.isUndefined(b)||_xeUtils.default.isNull(b)?o:b,i="title"===a,o=!0===a||"tooltip"===a,b=i||o||"ellipsis"===a,a=m,S={data:r,field:c,property:c,item:e,$form:t},m=!1;!n||(w=n[c])&&(m=w.some(function(e){return e.required})),!a&&I&&I.itemVisibleMethod&&(a=I.itemVisibleMethod);var w=[];O?w=t.callSlot(O,S):I&&I.renderItemContent?w=I.renderItemContent(_,S):c&&(w=[""+_xeUtils.default.get(r,c)]),p&&w.push((0,_vue.h)("div",{class:"vxe-form--item-trigger-node",onClick:t.toggleCollapseEvent},[(0,_vue.h)("span",{class:"vxe-form--item-trigger-text"},u?_conf.default.i18n("vxe.form.unfolding"):_conf.default.i18n("vxe.form.folding")),(0,_vue.h)("i",{class:["vxe-form--item-trigger-icon",u?_conf.default.icon.FORM_FOLDING:_conf.default.icon.FORM_UNFOLDING]})])),x&&s.showMessage&&w.push((0,_vue.h)("div",{class:"vxe-form--item-valid",style:x.maxWidth?{width:x.maxWidth+"px"}:null},x.message));o=o?{onMouseenter:function(e){t.triggerTitleTipEvent(e,S)},onMouseleave:t.handleTitleTipLeaveEvent}:{};return(0,_vue.h)("div",{ref:C,class:["vxe-form--item",e.id,y?"vxe-col--"+y+" is--span":"",h?_xeUtils.default.isFunction(h)?h(S):h:"",{"is--title":f,"is--required":m,"is--hidden":!1===d||v&&u,"is--active":!a||a(S),"is--error":g}]},[(0,_vue.h)("div",{class:"vxe-form--item-inner"},[f||N?(0,_vue.h)("div",__assign({class:["vxe-form--item-title",q?"align--"+q:null,{"is--ellipsis":b}],style:l?{width:isNaN(l)?l:l+"px"}:null,title:i?(0,_utils.getFuncText)(f):null},o),(0,_render.renderTitle)(t,e)):null,(0,_vue.h)("div",{class:["vxe-form--item-content",M?"align--"+M:null]},w)])])}(l,n):(0,_vue.h)("div",{ref:C})}}},render:function(){return this.renderVN()}});exports.default=_default;
@@ -59,6 +59,7 @@ function renderTitle($xeform, item) {
59
59
  var compConf = (0, _utils.isEnableConf)(itemRender) ? _vXETable.VXETable.renderer.get(itemRender.name) : null;
60
60
  var params = {
61
61
  data: data,
62
+ field: field,
62
63
  property: field,
63
64
  item: item,
64
65
  $form: $xeform
@@ -1 +1 @@
1
- "use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.renderTitle=renderTitle;var _vue=require("vue"),_conf=_interopRequireDefault(require("../../v-x-e-table/src/conf")),_vXETable=require("../../v-x-e-table"),_utils=require("../../tools/utils");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}var __assign=function(){return(__assign=Object.assign||function(e){for(var t,n=1,r=arguments.length;n<r;n++)for(var i in t=arguments[n])Object.prototype.hasOwnProperty.call(t,i)&&(e[i]=t[i]);return e}).apply(this,arguments)};function renderPrefixIcon(e){return(0,_vue.h)("span",{class:"vxe-form--item-title-prefix"},[(0,_vue.h)("i",{class:e.icon||_conf.default.icon.FORM_PREFIX})])}function renderSuffixIcon(e){return(0,_vue.h)("span",{class:"vxe-form--item-title-suffix"},[(0,_vue.h)("i",{class:e.icon||_conf.default.icon.FORM_SUFFIX})])}function renderTitle(e,t){var n=e.props.data,r=e.getComputeMaps().computeTooltipOpts,i=t.slots,s=t.field,u=t.itemRender,o=t.titlePrefix,l=t.titleSuffix,a=r.value,c=(0,_utils.isEnableConf)(u)?_vXETable.VXETable.renderer.get(u.name):null,r={data:n,property:s,item:t,$form:e},n=i?i.title:null,s=[],i=[];o&&i.push(o.content||o.message?(0,_vue.h)((0,_vue.resolveComponent)("vxe-tooltip"),__assign(__assign(__assign({},a),o),{content:(0,_utils.getFuncText)(o.content||o.message)}),{default:function(){return renderPrefixIcon(o)}}):renderPrefixIcon(o)),i.push((0,_vue.h)("span",{class:"vxe-form--item-title-label"},c&&c.renderItemTitle?c.renderItemTitle(u,r):n?e.callSlot(n,r):(0,_utils.getFuncText)(t.title))),s.push((0,_vue.h)("div",{class:"vxe-form--item-title-content"},i));i=[];return l&&i.push(l.content||l.message?(0,_vue.h)((0,_vue.resolveComponent)("vxe-tooltip"),__assign(__assign(__assign({},a),l),{content:(0,_utils.getFuncText)(l.content||l.message)}),{default:function(){return renderSuffixIcon(l)}}):renderSuffixIcon(l)),s.push((0,_vue.h)("div",{class:"vxe-form--item-title-postfix"},i)),s}
1
+ "use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.renderTitle=renderTitle;var _vue=require("vue"),_conf=_interopRequireDefault(require("../../v-x-e-table/src/conf")),_vXETable=require("../../v-x-e-table"),_utils=require("../../tools/utils");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}var __assign=function(){return(__assign=Object.assign||function(e){for(var t,n=1,r=arguments.length;n<r;n++)for(var i in t=arguments[n])Object.prototype.hasOwnProperty.call(t,i)&&(e[i]=t[i]);return e}).apply(this,arguments)};function renderPrefixIcon(e){return(0,_vue.h)("span",{class:"vxe-form--item-title-prefix"},[(0,_vue.h)("i",{class:e.icon||_conf.default.icon.FORM_PREFIX})])}function renderSuffixIcon(e){return(0,_vue.h)("span",{class:"vxe-form--item-title-suffix"},[(0,_vue.h)("i",{class:e.icon||_conf.default.icon.FORM_SUFFIX})])}function renderTitle(e,t){var n=e.props.data,r=e.getComputeMaps().computeTooltipOpts,i=t.slots,s=t.field,u=t.itemRender,o=t.titlePrefix,l=t.titleSuffix,a=r.value,c=(0,_utils.isEnableConf)(u)?_vXETable.VXETable.renderer.get(u.name):null,r={data:n,field:s,property:s,item:t,$form:e},n=i?i.title:null,s=[],i=[];o&&i.push(o.content||o.message?(0,_vue.h)((0,_vue.resolveComponent)("vxe-tooltip"),__assign(__assign(__assign({},a),o),{content:(0,_utils.getFuncText)(o.content||o.message)}),{default:function(){return renderPrefixIcon(o)}}):renderPrefixIcon(o)),i.push((0,_vue.h)("span",{class:"vxe-form--item-title-label"},c&&c.renderItemTitle?c.renderItemTitle(u,r):n?e.callSlot(n,r):(0,_utils.getFuncText)(t.title))),s.push((0,_vue.h)("div",{class:"vxe-form--item-title-content"},i));i=[];return l&&i.push(l.content||l.message?(0,_vue.h)((0,_vue.resolveComponent)("vxe-tooltip"),__assign(__assign(__assign({},a),l),{content:(0,_utils.getFuncText)(l.content||l.message)}),{default:function(){return renderSuffixIcon(l)}}):renderSuffixIcon(l)),s.push((0,_vue.h)("div",{class:"vxe-form--item-title-postfix"},i)),s}