vxe-table 3.8.19 → 3.8.21

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 (65) hide show
  1. package/lib/custom/src/panel.js +2 -1
  2. package/lib/custom/src/panel.min.js +1 -1
  3. package/lib/edit/src/mixin.js +11 -11
  4. package/lib/edit/src/mixin.min.js +1 -1
  5. package/lib/export/src/mixin.js +15 -9
  6. package/lib/export/src/mixin.min.js +1 -1
  7. package/lib/form/src/form-config-item.js +16 -6
  8. package/lib/form/src/form-config-item.min.js +1 -1
  9. package/lib/form/src/form-item.js +24 -6
  10. package/lib/form/src/form-item.min.js +1 -1
  11. package/lib/form/src/form.js +24 -10
  12. package/lib/form/src/form.min.js +1 -1
  13. package/lib/form/src/util.js +2 -0
  14. package/lib/form/src/util.min.js +1 -1
  15. package/lib/form/style/style.css +6 -4
  16. package/lib/form/style/style.min.css +1 -1
  17. package/lib/grid/src/grid.js +17 -12
  18. package/lib/grid/src/grid.min.js +1 -1
  19. package/lib/icon/style/style.css +1 -1
  20. package/lib/icon/style/style.min.css +1 -1
  21. package/lib/index.css +1 -1
  22. package/lib/index.umd.js +285 -184
  23. package/lib/index.umd.min.js +1 -1
  24. package/lib/input/src/input.js +2 -1
  25. package/lib/input/src/input.min.js +1 -1
  26. package/lib/style.css +1 -1
  27. package/lib/style.min.css +1 -1
  28. package/lib/table/src/methods.js +77 -42
  29. package/lib/table/src/methods.min.js +1 -1
  30. package/lib/table/src/table.js +9 -4
  31. package/lib/table/src/table.min.js +1 -1
  32. package/lib/textarea/src/textarea.js +4 -1
  33. package/lib/textarea/src/textarea.min.js +1 -1
  34. package/lib/tools/log.js +1 -1
  35. package/lib/tools/log.min.js +1 -1
  36. package/lib/v-x-e-table/index.js +1 -1
  37. package/lib/v-x-e-table/index.min.js +1 -1
  38. package/lib/v-x-e-table/src/conf.js +2 -1
  39. package/lib/v-x-e-table/src/conf.min.js +1 -1
  40. package/lib/v-x-e-table/src/renderer.js +78 -78
  41. package/lib/v-x-e-table/src/renderer.min.js +1 -1
  42. package/lib/vxe-form/style/style.css +6 -4
  43. package/lib/vxe-form/style/style.min.css +1 -1
  44. package/package.json +1 -1
  45. package/packages/custom/src/panel.js +2 -1
  46. package/packages/edit/src/mixin.js +11 -10
  47. package/packages/export/src/mixin.js +11 -7
  48. package/packages/form/src/form-config-item.js +14 -7
  49. package/packages/form/src/form-item.js +22 -7
  50. package/packages/form/src/form.js +14 -10
  51. package/packages/form/src/util.js +2 -0
  52. package/packages/grid/src/grid.js +14 -9
  53. package/packages/input/src/input.js +2 -1
  54. package/packages/table/src/methods.js +67 -30
  55. package/packages/table/src/table.js +6 -2
  56. package/packages/textarea/src/textarea.js +4 -1
  57. package/packages/v-x-e-table/src/conf.js +2 -1
  58. package/packages/v-x-e-table/src/renderer.js +78 -78
  59. package/styles/form.scss +6 -4
  60. /package/lib/icon/style/{iconfont.1723091290878.ttf → iconfont.1724212116436.ttf} +0 -0
  61. /package/lib/icon/style/{iconfont.1723091290878.woff → iconfont.1724212116436.woff} +0 -0
  62. /package/lib/icon/style/{iconfont.1723091290878.woff2 → iconfont.1724212116436.woff2} +0 -0
  63. /package/lib/{iconfont.1723091290878.ttf → iconfont.1724212116436.ttf} +0 -0
  64. /package/lib/{iconfont.1723091290878.woff → iconfont.1724212116436.woff} +0 -0
  65. /package/lib/{iconfont.1723091290878.woff2 → iconfont.1724212116436.woff2} +0 -0
package/lib/index.umd.js CHANGED
@@ -11408,7 +11408,8 @@ var iconPrefix = 'vxe-icon-';
11408
11408
  tooltipConfig: {
11409
11409
  enterable: true
11410
11410
  },
11411
- titleAsterisk: true
11411
+ titleAsterisk: true,
11412
+ padding: true
11412
11413
  },
11413
11414
  input: {
11414
11415
  // size: null,
@@ -11520,7 +11521,7 @@ var es_array_concat = __webpack_require__(8706);
11520
11521
 
11521
11522
 
11522
11523
  function getLog(message, params) {
11523
- return "[vxe-table v".concat("3.8.19", "] ").concat(conf.i18n(message, params));
11524
+ return "[vxe-table v".concat("3.8.21", "] ").concat(conf.i18n(message, params));
11524
11525
  }
11525
11526
  function outLog(type) {
11526
11527
  return function (message, params) {
@@ -12510,25 +12511,25 @@ function oldFormItemRadioAndCheckboxRender(h, renderOpts, params) {
12510
12511
  */
12511
12512
  var renderMap = {
12512
12513
  input: {
12513
- autofocus: 'input',
12514
- renderEdit: nativeEditRender,
12515
- renderDefault: nativeEditRender,
12516
- renderFilter: nativeFilterRender,
12517
- defaultFilterMethod: handleInputFilterMethod,
12518
- renderItemContent: nativeItemRender
12514
+ tableAutofocus: 'input',
12515
+ renderTableEdit: nativeEditRender,
12516
+ renderTableDefault: nativeEditRender,
12517
+ renderTableFilter: nativeFilterRender,
12518
+ defaultTableFilterMethod: handleInputFilterMethod,
12519
+ renderFormItemContent: nativeItemRender
12519
12520
  },
12520
12521
  textarea: {
12521
- autofocus: 'textarea',
12522
- renderEdit: nativeEditRender,
12523
- renderItemContent: nativeItemRender
12522
+ tableAutofocus: 'textarea',
12523
+ renderTableEdit: nativeEditRender,
12524
+ renderFormItemContent: nativeItemRender
12524
12525
  },
12525
12526
  select: {
12526
- renderEdit: nativeSelectEditRender,
12527
- renderDefault: nativeSelectEditRender,
12528
- renderCell: function renderCell(h, renderOpts, params) {
12527
+ renderTableEdit: nativeSelectEditRender,
12528
+ renderTableDefault: nativeSelectEditRender,
12529
+ renderTableCell: function renderTableCell(h, renderOpts, params) {
12529
12530
  return getCellLabelVNs(h, renderOpts, params, getSelectCellValue(renderOpts, params));
12530
12531
  },
12531
- renderFilter: function renderFilter(h, renderOpts, params) {
12532
+ renderTableFilter: function renderTableFilter(h, renderOpts, params) {
12532
12533
  var column = params.column;
12533
12534
  return column.filters.map(function (option, oIndex) {
12534
12535
  return h('select', {
@@ -12539,20 +12540,20 @@ var renderMap = {
12539
12540
  }, renderOpts.optionGroups ? renderNativeOptgroups(h, renderOpts, params, renderNativeOptions) : renderNativeOptions(h, renderOpts.options, renderOpts, params));
12540
12541
  });
12541
12542
  },
12542
- defaultFilterMethod: handleFilterMethod,
12543
- renderItemContent: function renderItemContent(h, renderOpts, params) {
12543
+ defaultTableFilterMethod: handleFilterMethod,
12544
+ renderFormItemContent: function renderFormItemContent(h, renderOpts, params) {
12544
12545
  return [h('select', {
12545
12546
  class: 'vxe-default-select',
12546
12547
  attrs: getNativeAttrs(renderOpts),
12547
12548
  on: getNativeItemOns(renderOpts, params)
12548
12549
  }, renderOpts.optionGroups ? renderNativeOptgroups(h, renderOpts, params, renderNativeFormOptions) : renderNativeFormOptions(h, renderOpts.options, renderOpts, params))];
12549
12550
  },
12550
- cellExportMethod: handleExportSelectMethod
12551
+ tableExportMethod: handleExportSelectMethod
12551
12552
  },
12552
12553
  VxeInput: {
12553
- autofocus: '.vxe-input--inner',
12554
- renderEdit: defaultEditRender,
12555
- renderCell: function renderCell(h, renderOpts, params) {
12554
+ tableAutofocus: '.vxe-input--inner',
12555
+ renderTableEdit: defaultEditRender,
12556
+ renderTableCell: function renderTableCell(h, renderOpts, params) {
12556
12557
  var _renderOpts$props2 = renderOpts.props,
12557
12558
  props = _renderOpts$props2 === void 0 ? {} : _renderOpts$props2;
12558
12559
  var row = params.row,
@@ -12575,22 +12576,22 @@ var renderMap = {
12575
12576
  }
12576
12577
  return getCellLabelVNs(h, renderOpts, params, cellValue);
12577
12578
  },
12578
- renderDefault: defaultEditRender,
12579
- renderFilter: defaultFilterRender,
12580
- defaultFilterMethod: handleInputFilterMethod,
12581
- renderItemContent: defaultItemRender
12579
+ renderTableDefault: defaultEditRender,
12580
+ renderTableFilter: defaultFilterRender,
12581
+ defaultTableFilterMethod: handleInputFilterMethod,
12582
+ renderFormItemContent: defaultItemRender
12582
12583
  },
12583
12584
  VxeTextarea: {
12584
- autofocus: '.vxe-textarea--inner',
12585
- renderItemContent: defaultItemRender
12585
+ tableAutofocus: '.vxe-textarea--inner',
12586
+ renderFormItemContent: defaultItemRender
12586
12587
  },
12587
12588
  VxeButton: {
12588
- renderDefault: defaultCellRender,
12589
- renderItemContent: defaultFormItemRender
12589
+ renderTableDefault: defaultCellRender,
12590
+ renderFormItemContent: defaultFormItemRender
12590
12591
  },
12591
12592
  VxeButtonGroup: {
12592
- renderDefault: defaultCellRender,
12593
- renderItemContent: function renderItemContent(h, renderOpts, params) {
12593
+ renderTableDefault: defaultCellRender,
12594
+ renderFormItemContent: function renderFormItemContent(h, renderOpts, params) {
12594
12595
  var options = renderOpts.options;
12595
12596
  var data = params.data,
12596
12597
  property = params.property;
@@ -12605,13 +12606,13 @@ var renderMap = {
12605
12606
  }
12606
12607
  },
12607
12608
  VxeSelect: {
12608
- autofocus: '.vxe-input--inner',
12609
- renderEdit: defaultSelectEditRender,
12610
- renderDefault: defaultSelectEditRender,
12611
- renderCell: function renderCell(h, renderOpts, params) {
12609
+ tableAutofocus: '.vxe-input--inner',
12610
+ renderTableEdit: defaultSelectEditRender,
12611
+ renderTableDefault: defaultSelectEditRender,
12612
+ renderTableCell: function renderTableCell(h, renderOpts, params) {
12612
12613
  return getCellLabelVNs(h, renderOpts, params, getSelectCellValue(renderOpts, params));
12613
12614
  },
12614
- renderFilter: function renderFilter(h, renderOpts, params) {
12615
+ renderTableFilter: function renderTableFilter(h, renderOpts, params) {
12615
12616
  var column = params.column;
12616
12617
  var options = renderOpts.options,
12617
12618
  optionProps = renderOpts.optionProps,
@@ -12633,8 +12634,8 @@ var renderMap = {
12633
12634
  });
12634
12635
  });
12635
12636
  },
12636
- defaultFilterMethod: handleFilterMethod,
12637
- renderItemContent: function renderItemContent(h, renderOpts, params) {
12637
+ defaultTableFilterMethod: handleFilterMethod,
12638
+ renderFormItemContent: function renderFormItemContent(h, renderOpts, params) {
12638
12639
  var data = params.data,
12639
12640
  property = params.property;
12640
12641
  var options = renderOpts.options,
@@ -12653,35 +12654,35 @@ var renderMap = {
12653
12654
  nativeOn: getNativeOns(renderOpts, params)
12654
12655
  })];
12655
12656
  },
12656
- cellExportMethod: handleExportSelectMethod
12657
+ tableExportMethod: handleExportSelectMethod
12657
12658
  },
12658
12659
  VxeRadio: {
12659
- autofocus: '.vxe-radio--input',
12660
- renderItemContent: defaultFormItemRender
12660
+ tableAutofocus: '.vxe-radio--input',
12661
+ renderFormItemContent: defaultFormItemRender
12661
12662
  },
12662
12663
  VxeRadioGroup: {
12663
- autofocus: '.vxe-radio--input',
12664
- renderItemContent: formItemRadioAndCheckboxRender
12664
+ tableAutofocus: '.vxe-radio--input',
12665
+ renderFormItemContent: formItemRadioAndCheckboxRender
12665
12666
  },
12666
12667
  VxeCheckbox: {
12667
- autofocus: '.vxe-checkbox--input',
12668
- renderItemContent: defaultFormItemRender
12668
+ tableAutofocus: '.vxe-checkbox--input',
12669
+ renderFormItemContent: defaultFormItemRender
12669
12670
  },
12670
12671
  VxeCheckboxGroup: {
12671
- autofocus: '.vxe-checkbox--input',
12672
- renderItemContent: formItemRadioAndCheckboxRender
12672
+ tableAutofocus: '.vxe-checkbox--input',
12673
+ renderFormItemContent: formItemRadioAndCheckboxRender
12673
12674
  },
12674
12675
  VxeSwitch: {
12675
- autofocus: '.vxe-switch--button',
12676
- renderEdit: defaultEditRender,
12677
- renderDefault: defaultEditRender,
12678
- renderItemContent: defaultItemRender
12676
+ tableAutofocus: '.vxe-switch--button',
12677
+ renderTableEdit: defaultEditRender,
12678
+ renderTableDefault: defaultEditRender,
12679
+ renderFormItemContent: defaultItemRender
12679
12680
  },
12680
12681
  // 以下已废弃
12681
12682
  $input: {
12682
- autofocus: '.vxe-input--inner',
12683
- renderEdit: oldEditRender,
12684
- renderCell: function renderCell(h, renderOpts, params) {
12683
+ tableAutofocus: '.vxe-input--inner',
12684
+ renderTableEdit: oldEditRender,
12685
+ renderTableCell: function renderTableCell(h, renderOpts, params) {
12685
12686
  var _renderOpts$props3 = renderOpts.props,
12686
12687
  props = _renderOpts$props3 === void 0 ? {} : _renderOpts$props3;
12687
12688
  var row = params.row,
@@ -12703,31 +12704,31 @@ var renderMap = {
12703
12704
  }
12704
12705
  return getCellLabelVNs(h, renderOpts, params, cellValue);
12705
12706
  },
12706
- renderDefault: oldEditRender,
12707
- renderFilter: oldFilterRender,
12708
- defaultFilterMethod: handleInputFilterMethod,
12709
- renderItemContent: oldItemRender
12707
+ renderTableDefault: oldEditRender,
12708
+ renderTableFilter: oldFilterRender,
12709
+ defaultTableFilterMethod: handleInputFilterMethod,
12710
+ renderFormItemContent: oldItemRender
12710
12711
  },
12711
12712
  $textarea: {
12712
- autofocus: '.vxe-textarea--inner',
12713
- renderItemContent: oldItemRender
12713
+ tableAutofocus: '.vxe-textarea--inner',
12714
+ renderFormItemContent: oldItemRender
12714
12715
  },
12715
12716
  $button: {
12716
- renderDefault: oldButtonEditRender,
12717
- renderItemContent: oldButtonItemRender
12717
+ renderTableDefault: oldButtonEditRender,
12718
+ renderFormItemContent: oldButtonItemRender
12718
12719
  },
12719
12720
  $buttons: {
12720
- renderDefault: oldButtonsEditRender,
12721
- renderItemContent: oldButtonsItemRender
12721
+ renderTableDefault: oldButtonsEditRender,
12722
+ renderFormItemContent: oldButtonsItemRender
12722
12723
  },
12723
12724
  $select: {
12724
- autofocus: '.vxe-input--inner',
12725
- renderEdit: oldSelectEditRender,
12726
- renderDefault: oldSelectEditRender,
12727
- renderCell: function renderCell(h, renderOpts, params) {
12725
+ tableAutofocus: '.vxe-input--inner',
12726
+ renderTableEdit: oldSelectEditRender,
12727
+ renderTableDefault: oldSelectEditRender,
12728
+ renderTableCell: function renderTableCell(h, renderOpts, params) {
12728
12729
  return getCellLabelVNs(h, renderOpts, params, getSelectCellValue(renderOpts, params));
12729
12730
  },
12730
- renderFilter: function renderFilter(h, renderOpts, params) {
12731
+ renderTableFilter: function renderTableFilter(h, renderOpts, params) {
12731
12732
  var column = params.column;
12732
12733
  var options = renderOpts.options,
12733
12734
  optionProps = renderOpts.optionProps,
@@ -12749,8 +12750,8 @@ var renderMap = {
12749
12750
  });
12750
12751
  });
12751
12752
  },
12752
- defaultFilterMethod: handleFilterMethod,
12753
- renderItemContent: function renderItemContent(h, renderOpts, params) {
12753
+ defaultTableFilterMethod: handleFilterMethod,
12754
+ renderFormItemContent: function renderFormItemContent(h, renderOpts, params) {
12754
12755
  var data = params.data,
12755
12756
  property = params.property;
12756
12757
  var options = renderOpts.options,
@@ -12769,21 +12770,21 @@ var renderMap = {
12769
12770
  nativeOn: getNativeOns(renderOpts, params)
12770
12771
  })];
12771
12772
  },
12772
- cellExportMethod: handleExportSelectMethod
12773
+ tableExportMethod: handleExportSelectMethod
12773
12774
  },
12774
12775
  $radio: {
12775
- autofocus: '.vxe-radio--input',
12776
- renderItemContent: oldFormItemRadioAndCheckboxRender
12776
+ tableAutofocus: '.vxe-radio--input',
12777
+ renderFormItemContent: oldFormItemRadioAndCheckboxRender
12777
12778
  },
12778
12779
  $checkbox: {
12779
- autofocus: '.vxe-checkbox--input',
12780
- renderItemContent: oldFormItemRadioAndCheckboxRender
12780
+ tableAutofocus: '.vxe-checkbox--input',
12781
+ renderFormItemContent: oldFormItemRadioAndCheckboxRender
12781
12782
  },
12782
12783
  $switch: {
12783
- autofocus: '.vxe-switch--button',
12784
- renderEdit: oldEditRender,
12785
- renderDefault: oldEditRender,
12786
- renderItemContent: oldItemRender
12784
+ tableAutofocus: '.vxe-switch--button',
12785
+ renderTableEdit: oldEditRender,
12786
+ renderTableDefault: oldEditRender,
12787
+ renderFormItemContent: oldItemRender
12787
12788
  }
12788
12789
  // 以上已废弃
12789
12790
  };
@@ -13224,7 +13225,7 @@ function component(comp) {
13224
13225
  components[comp.name] = comp;
13225
13226
  }
13226
13227
  }
13227
- var version = "3.8.19";
13228
+ var version = "3.8.21";
13228
13229
  var tableVersion = version;
13229
13230
  var VxeUI = {
13230
13231
  v: v,
@@ -18026,6 +18027,11 @@ var Methods = {
18026
18027
  var fullColumnFieldData = this.fullColumnFieldData;
18027
18028
  return fullColumnFieldData[field] ? fullColumnFieldData[field].column : null;
18028
18029
  },
18030
+ getParentColumn: function getParentColumn(fieldOrColumn) {
18031
+ var fullColumnIdData = this.fullColumnIdData;
18032
+ var column = handleFieldOrColumn(this, fieldOrColumn);
18033
+ return column && column.parentId && fullColumnIdData[column.parentId] ? fullColumnIdData[column.parentId].column : null;
18034
+ },
18029
18035
  /**
18030
18036
  * 获取当前表格的列
18031
18037
  * 收集到的全量列、全量表头列、处理条件之后的全量表头列、当前渲染中的表头列
@@ -18956,6 +18962,7 @@ var Methods = {
18956
18962
  var resizeList = [];
18957
18963
  var pxList = [];
18958
18964
  var pxMinList = [];
18965
+ var autoMinList = [];
18959
18966
  var scaleList = [];
18960
18967
  var scaleMinList = [];
18961
18968
  var autoList = [];
@@ -18978,6 +18985,8 @@ var Methods = {
18978
18985
  scaleList.push(column);
18979
18986
  } else if (dom.isPx(column.minWidth)) {
18980
18987
  pxMinList.push(column);
18988
+ } else if (column.minWidth === 'auto') {
18989
+ autoMinList.push(column);
18981
18990
  } else if (dom.isScale(column.minWidth)) {
18982
18991
  scaleMinList.push(column);
18983
18992
  } else {
@@ -18989,6 +18998,7 @@ var Methods = {
18989
18998
  resizeList: resizeList,
18990
18999
  pxList: pxList,
18991
19000
  pxMinList: pxMinList,
19001
+ autoMinList: autoMinList,
18992
19002
  scaleList: scaleList,
18993
19003
  scaleMinList: scaleMinList,
18994
19004
  autoList: autoList,
@@ -19074,11 +19084,11 @@ var Methods = {
19074
19084
  var cellStyle = getComputedStyle(firstCellEl);
19075
19085
  paddingSize = Math.floor(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(cellStyle.paddingLeft) + external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(cellStyle.paddingRight)) + 2;
19076
19086
  }
19077
- var colWidth = column.renderAutoWidth - paddingSize + 2;
19087
+ var colWidth = column.renderAutoWidth - paddingSize;
19078
19088
  external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().arrayEach(cellElList, function (cellEl) {
19079
19089
  var labelEl = cellEl.firstChild;
19080
19090
  if (labelEl) {
19081
- colWidth = Math.max(colWidth, labelEl.offsetWidth);
19091
+ colWidth = Math.max(colWidth, Math.ceil(labelEl.offsetWidth) + 4);
19082
19092
  }
19083
19093
  });
19084
19094
  column.renderAutoWidth = colWidth + paddingSize;
@@ -19109,6 +19119,7 @@ var Methods = {
19109
19119
  var resizeList = columnStore.resizeList,
19110
19120
  pxMinList = columnStore.pxMinList,
19111
19121
  pxList = columnStore.pxList,
19122
+ autoMinList = columnStore.autoMinList,
19112
19123
  scaleList = columnStore.scaleList,
19113
19124
  scaleMinList = columnStore.scaleMinList,
19114
19125
  autoList = columnStore.autoList,
@@ -19119,6 +19130,12 @@ var Methods = {
19119
19130
  tableWidth += minWidth;
19120
19131
  column.renderWidth = minWidth;
19121
19132
  });
19133
+ // 最小自适应
19134
+ autoMinList.forEach(function (column) {
19135
+ var scaleWidth = Math.max(60, external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toInteger(column.renderAutoWidth));
19136
+ tableWidth += scaleWidth;
19137
+ column.renderWidth = scaleWidth;
19138
+ });
19122
19139
  // 最小百分比
19123
19140
  scaleMinList.forEach(function (column) {
19124
19141
  var scaleWidth = Math.floor(parseInt(column.minWidth) * meanWidth);
@@ -19150,10 +19167,10 @@ var Methods = {
19150
19167
  column.renderWidth = width;
19151
19168
  });
19152
19169
  remainWidth -= tableWidth;
19153
- meanWidth = remainWidth > 0 ? Math.floor(remainWidth / (scaleMinList.length + pxMinList.length + remainList.length)) : 0;
19170
+ meanWidth = remainWidth > 0 ? Math.floor(remainWidth / (scaleMinList.length + pxMinList.length + autoMinList.length + remainList.length)) : 0;
19154
19171
  if (fit) {
19155
19172
  if (remainWidth > 0) {
19156
- scaleMinList.concat(pxMinList).forEach(function (column) {
19173
+ scaleMinList.concat(pxMinList).concat(autoMinList).forEach(function (column) {
19157
19174
  tableWidth += meanWidth;
19158
19175
  column.renderWidth += meanWidth;
19159
19176
  });
@@ -19172,7 +19189,7 @@ var Methods = {
19172
19189
  * 偏移量算法
19173
19190
  * 如果所有列足够放的情况下,从最后动态列开始分配
19174
19191
  */
19175
- var dynamicList = scaleList.concat(scaleMinList).concat(pxMinList).concat(remainList);
19192
+ var dynamicList = scaleList.concat(scaleMinList).concat(pxMinList).concat(autoMinList).concat(remainList);
19176
19193
  var dynamicSize = dynamicList.length - 1;
19177
19194
  if (dynamicSize > 0) {
19178
19195
  var odiffer = bodyWidth - tableWidth;
@@ -19780,7 +19797,7 @@ var Methods = {
19780
19797
  var isUpArrow = keyCode === 38;
19781
19798
  var isRightArrow = keyCode === 39;
19782
19799
  var isDwArrow = keyCode === 40;
19783
- var isDel = keyCode === 46;
19800
+ var hasDeleteKey = keyCode === 46;
19784
19801
  var isF2 = keyCode === 113;
19785
19802
  var isContextMenu = keyCode === 93;
19786
19803
  var hasMetaKey = evnt.metaKey;
@@ -19791,6 +19808,7 @@ var Methods = {
19791
19808
  var operCtxMenu = isCtxMenu && ctxMenuStore.visible && (isEnter || isSpacebar || operArrow);
19792
19809
  var isEditStatus = isEnableConf(editConfig) && actived.column && actived.row;
19793
19810
  var childrenField = treeOpts.children || treeOpts.childrenField;
19811
+ var beforeEditMethod = editOpts.beforeEditMethod || editOpts.activeMethod;
19794
19812
  var params;
19795
19813
  if (filterStore.visible) {
19796
19814
  if (isEsc) {
@@ -19898,25 +19916,43 @@ var Methods = {
19898
19916
  } else if (actived.row || actived.column) {
19899
19917
  _this31.moveTabSelected(actived.args, hasShiftKey, evnt);
19900
19918
  }
19901
- } else if (keyboardConfig && (treeConfig || isEnableConf(editConfig)) && (isDel || (treeConfig && (rowOpts.isCurrent || highlightCurrentRow) && currentRow ? hasBackspaceKey && keyboardOpts.isArrow : hasBackspaceKey))) {
19919
+ } else if (keyboardConfig && keyboardOpts.isDel && hasDeleteKey && isEnableConf(editConfig) && (selected.row || selected.column)) {
19920
+ // 如果是删除键
19902
19921
  if (!isEditStatus) {
19903
- var delMethod = keyboardOpts.delMethod,
19904
- backMethod = keyboardOpts.backMethod;
19922
+ var delMethod = keyboardOpts.delMethod;
19923
+ var delPaqrams = {
19924
+ row: selected.row,
19925
+ rowIndex: _this31.getRowIndex(selected.row),
19926
+ column: selected.column,
19927
+ columnIndex: _this31.getColumnIndex(selected.column),
19928
+ $table: _this31
19929
+ };
19930
+ // 是否被禁用
19931
+ if (!beforeEditMethod || beforeEditMethod(params)) {
19932
+ if (delMethod) {
19933
+ delMethod(delPaqrams);
19934
+ } else {
19935
+ setCellValue(selected.row, selected.column, null);
19936
+ }
19937
+ // 如果按下 del 键,更新表尾数据
19938
+ _this31.updateFooter();
19939
+ _this31.emitEvent('cell-delete-value', delPaqrams, evnt);
19940
+ }
19941
+ }
19942
+ } else if (hasBackspaceKey && keyboardConfig && keyboardOpts.isBack && isEnableConf(editConfig) && (selected.row || selected.column)) {
19943
+ if (!isEditStatus) {
19944
+ var backMethod = keyboardOpts.backMethod;
19905
19945
  // 如果是删除键
19906
19946
  if (keyboardOpts.isDel && isEnableConf(editConfig) && (selected.row || selected.column)) {
19907
- var delPaqrams = {
19947
+ var _delPaqrams = {
19908
19948
  row: selected.row,
19909
19949
  rowIndex: _this31.getRowIndex(selected.row),
19910
19950
  column: selected.column,
19911
19951
  columnIndex: _this31.getColumnIndex(selected.column),
19912
19952
  $table: _this31
19913
19953
  };
19914
- if (delMethod) {
19915
- delMethod(delPaqrams);
19916
- } else {
19917
- setCellValue(selected.row, selected.column, null);
19918
- }
19919
- if (hasBackspaceKey) {
19954
+ // 是否被禁用
19955
+ if (!beforeEditMethod || beforeEditMethod(params)) {
19920
19956
  if (backMethod) {
19921
19957
  backMethod({
19922
19958
  row: selected.row,
@@ -19926,35 +19962,35 @@ var Methods = {
19926
19962
  $table: _this31
19927
19963
  });
19928
19964
  } else {
19965
+ setCellValue(selected.row, selected.column, null);
19929
19966
  _this31.handleActived(selected.args, evnt);
19930
19967
  }
19931
- } else if (isDel) {
19932
- // 如果按下 del 键,更新表尾数据
19933
- _this31.updateFooter();
19934
- }
19935
- _this31.emitEvent('cell-delete-value', delPaqrams, evnt);
19936
- } else if (hasBackspaceKey && keyboardOpts.isArrow && treeConfig && (rowOpts.isCurrent || highlightCurrentRow) && currentRow) {
19937
- // 如果树形表格回退键关闭当前行返回父节点
19938
- var _XEUtils$findTree = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().findTree(_this31.afterFullData, function (item) {
19939
- return item === currentRow;
19940
- }, {
19941
- children: childrenField
19942
- }),
19943
- parentRow = _XEUtils$findTree.parent;
19944
- if (parentRow) {
19945
- evnt.preventDefault();
19946
- params = {
19947
- $table: _this31,
19948
- row: parentRow
19949
- };
19950
- _this31.setTreeExpand(parentRow, false).then(function () {
19951
- return _this31.scrollToRow(parentRow);
19952
- }).then(function () {
19953
- return _this31.triggerCurrentRowEvent(evnt, params);
19954
- });
19968
+ _this31.emitEvent('cell-backspace-value', _delPaqrams, evnt);
19955
19969
  }
19956
19970
  }
19957
19971
  }
19972
+ } else if (hasBackspaceKey && keyboardConfig && treeConfig && keyboardOpts.isBack && (rowOpts.isCurrent || highlightCurrentRow) && currentRow) {
19973
+ // 如果树形表格回退键关闭当前行返回父节点
19974
+ var _XEUtils$findTree = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().findTree(_this31.afterTreeFullData, function (item) {
19975
+ return item === currentRow;
19976
+ }, {
19977
+ children: childrenField
19978
+ }),
19979
+ parentRow = _XEUtils$findTree.parent;
19980
+ if (parentRow) {
19981
+ evnt.preventDefault();
19982
+ params = {
19983
+ $table: _this31,
19984
+ row: parentRow,
19985
+ rowIndex: _this31.getRowIndex(parentRow),
19986
+ $rowIndex: _this31.getVMRowIndex(parentRow)
19987
+ };
19988
+ _this31.setTreeExpand(parentRow, false).then(function () {
19989
+ return _this31.scrollToRow(parentRow);
19990
+ }).then(function () {
19991
+ return _this31.triggerCurrentRowEvent(evnt, params);
19992
+ });
19993
+ }
19958
19994
  } else if (keyboardConfig && keyboardOpts.isEdit && !hasCtrlKey && !hasMetaKey && (isSpacebar || keyCode >= 48 && keyCode <= 57 || keyCode >= 65 && keyCode <= 90 || keyCode >= 96 && keyCode <= 111 || keyCode >= 186 && keyCode <= 192 || keyCode >= 219 && keyCode <= 222)) {
19959
19995
  var editMethod = keyboardOpts.editMethod;
19960
19996
  // 启用编辑后,空格键功能将失效
@@ -19963,8 +19999,8 @@ var Methods = {
19963
19999
  // }
19964
20000
  // 如果是按下非功能键之外允许直接编辑
19965
20001
  if (selected.column && selected.row && isEnableConf(selected.column.editRender)) {
19966
- var beforeEditMethod = editOpts.beforeEditMethod || editOpts.activeMethod;
19967
- if (!beforeEditMethod || beforeEditMethod(_objectSpread2(_objectSpread2({}, selected.args), {}, {
20002
+ var _beforeEditMethod = editOpts.beforeEditMethod || editOpts.activeMethod;
20003
+ if (!_beforeEditMethod || _beforeEditMethod(_objectSpread2(_objectSpread2({}, selected.args), {}, {
19968
20004
  $table: _this31,
19969
20005
  $grid: _this31.$xegrid
19970
20006
  }))) {
@@ -23622,6 +23658,7 @@ function handleUupdateResize(_vm) {
23622
23658
  resizeList: [],
23623
23659
  pxList: [],
23624
23660
  pxMinList: [],
23661
+ autoMinList: [],
23625
23662
  scaleList: [],
23626
23663
  scaleMinList: [],
23627
23664
  autoList: [],
@@ -23878,10 +23915,11 @@ function handleUupdateResize(_vm) {
23878
23915
  return Object.assign({}, conf.table.customConfig, this.customConfig);
23879
23916
  },
23880
23917
  autoWidthColumnList: function autoWidthColumnList() {
23881
- var visibleColumn = this.visibleColumn;
23882
- return visibleColumn.filter(function (column) {
23883
- return column.width === 'auto';
23884
- });
23918
+ var tableColumn = this.tableColumn,
23919
+ visibleColumn = this.visibleColumn;
23920
+ return tableColumn.length || visibleColumn.length ? visibleColumn.filter(function (column) {
23921
+ return column.width === 'auto' || column.minWidth === 'auto';
23922
+ }) : [];
23885
23923
  },
23886
23924
  fixedColumnSize: function fixedColumnSize() {
23887
23925
  var collectColumn = this.collectColumn;
@@ -24240,6 +24278,9 @@ function handleUupdateResize(_vm) {
24240
24278
  var currLoading = this._isLoading || loading;
24241
24279
  return h('div', {
24242
24280
  class: ['vxe-table', 'vxe-table--render-default', "tid_".concat(tId), vSize ? "size--".concat(vSize) : '', "border--".concat(tableBorder), (_ref = {}, _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_ref, "valid-msg--".concat(validOpts.msgMode), !!editRules), 'vxe-editable', !!editConfig), 'old-cell-valid', editRules && conf.cellVaildMode === 'obsolete'), 'cell--highlight', highlightCell), 'cell--selected', mouseConfig && mouseOpts.selected), 'cell--area', mouseConfig && mouseOpts.area), 'row--highlight', rowOpts.isHover || highlightHoverRow), 'column--highlight', columnOpts.isHover || highlightHoverColumn), 'checkbox--range', checkboxOpts.range), 'column--calc', isCalcColumn), _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_ref, 'is--header', showHeader), 'is--footer', showFooter), 'is--group', isGroup), 'is--tree-line', treeConfig && (treeOpts.showLine || treeOpts.line)), 'is--fixed-left', leftList.length), 'is--fixed-right', rightList.length), 'is--animat', !!this.animat), 'is--round', this.round), 'is--stripe', !treeConfig && stripe), 'is--loading', currLoading), _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_ref, 'is--empty', !currLoading && !tableData.length), 'is--scroll-y', overflowY), 'is--scroll-x', overflowX), 'is--virtual-x', scrollXLoad), 'is--virtual-y', scrollYLoad))],
24281
+ attrs: {
24282
+ spellcheck: false
24283
+ },
24243
24284
  on: {
24244
24285
  keydown: this.keydownEvent
24245
24286
  }
@@ -26198,26 +26239,26 @@ function handleInsertRowAt(_vm, records, row, isInsertNextRow) {
26198
26239
  var editRender = column.editRender;
26199
26240
  if (isEnableConf(editRender)) {
26200
26241
  var compRender = v_x_e_table.renderer.get(editRender.name);
26201
- var autofocus = editRender.autofocus,
26202
- autoselect = editRender.autoselect;
26242
+ var autoFocus = editRender.autofocus || editRender.autoFocus;
26243
+ var autoSelect = editRender.autoSelect || editRender.autoselect;
26203
26244
  var inputElem;
26204
- if (!autofocus && compRender) {
26205
- autofocus = compRender.tableAutofocus || compRender.autofocus;
26245
+ if (!autoFocus && compRender) {
26246
+ autoFocus = compRender.tableAutoFocus || compRender.tableAutofocus || compRender.autoFocus || compRender.autofocus;
26206
26247
  }
26207
- if (!autoselect && compRender) {
26208
- autoselect = compRender.tableAutoSelect || compRender.autoselect;
26248
+ if (!autoSelect && compRender) {
26249
+ autoSelect = compRender.tableAutoSelect || compRender.autoSelect || compRender.autoselect;
26209
26250
  }
26210
26251
  // 如果指定了聚焦 class
26211
- if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(autofocus)) {
26212
- inputElem = autofocus.call(this, params);
26213
- } else if (autofocus) {
26214
- inputElem = cell.querySelector(autofocus);
26252
+ if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(autoFocus)) {
26253
+ inputElem = autoFocus.call(this, params);
26254
+ } else if (autoFocus) {
26255
+ inputElem = cell.querySelector(autoFocus);
26215
26256
  if (inputElem) {
26216
26257
  inputElem.focus();
26217
26258
  }
26218
26259
  }
26219
26260
  if (inputElem) {
26220
- if (autoselect) {
26261
+ if (autoSelect) {
26221
26262
  inputElem.select();
26222
26263
  } else {
26223
26264
  // 保持一致行为,光标移到末端
@@ -28947,7 +28988,8 @@ function renderExtraSuffixIcon(h, _vm) {
28947
28988
  maxlength: inpMaxlength,
28948
28989
  readonly: inpReadonly,
28949
28990
  disabled: disabled,
28950
- autocomplete: autoComplete || autocomplete
28991
+ autocomplete: autoComplete || autocomplete,
28992
+ spellcheck: false
28951
28993
  },
28952
28994
  on: {
28953
28995
  keydown: this.keydownEvent,
@@ -32209,7 +32251,7 @@ function hasTreeChildren($xetable, row) {
32209
32251
  var childrenField = treeOpts.children || treeOpts.childrenField;
32210
32252
  return row[childrenField] && row[childrenField].length > 0;
32211
32253
  }
32212
- function getSeq($xetable, row, $rowIndex, column, $columnIndex) {
32254
+ function getSeq($xetable, cellValue, row, $rowIndex, column, $columnIndex) {
32213
32255
  var seqOpts = $xetable.seqOpts;
32214
32256
  var seqMethod = seqOpts.seqMethod || column.seqMethod;
32215
32257
  if (seqMethod) {
@@ -32222,7 +32264,7 @@ function getSeq($xetable, row, $rowIndex, column, $columnIndex) {
32222
32264
  $columnIndex: $columnIndex
32223
32265
  });
32224
32266
  }
32225
- return $xetable.getRowSeq(row);
32267
+ return cellValue;
32226
32268
  }
32227
32269
  function defaultFilterExportColumn(column) {
32228
32270
  return column.property || ['seq', 'checkbox', 'radio'].indexOf(column.type) > -1;
@@ -32289,10 +32331,13 @@ function getLabelData($xetable, opts, columns, datas) {
32289
32331
  } else {
32290
32332
  switch (column.type) {
32291
32333
  case 'seq':
32292
- cellValue = mode === 'all' ? path.map(function (num, i) {
32293
- return i % 2 === 0 ? Number(num) + 1 : '.';
32294
- }).join('') : getSeq($xetable, row, $rowIndex, column, $columnIndex);
32295
- break;
32334
+ {
32335
+ var seqValue = path.map(function (num, i) {
32336
+ return i % 2 === 0 ? Number(num) + 1 : '.';
32337
+ }).join('');
32338
+ cellValue = mode === 'all' ? seqValue : getSeq($xetable, seqValue, row, $rowIndex, column, $columnIndex);
32339
+ break;
32340
+ }
32296
32341
  case 'checkbox':
32297
32342
  cellValue = toBooleanValue($xetable.isCheckedByCheckboxRow(row));
32298
32343
  _item._checkboxLabel = checkboxOpts.labelField ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(row, checkboxOpts.labelField) : '';
@@ -32345,7 +32390,7 @@ function getLabelData($xetable, opts, columns, datas) {
32345
32390
  if (!exportLabelMethod && renderOpts && renderOpts.name) {
32346
32391
  var compConf = v_x_e_table.renderer.get(renderOpts.name);
32347
32392
  if (compConf) {
32348
- exportLabelMethod = compConf.exportMethod || compConf.cellExportMethod;
32393
+ exportLabelMethod = compConf.tableExportMethod || compConf.exportMethod || compConf.cellExportMethod;
32349
32394
  }
32350
32395
  }
32351
32396
  if (exportLabelMethod) {
@@ -32358,8 +32403,11 @@ function getLabelData($xetable, opts, columns, datas) {
32358
32403
  } else {
32359
32404
  switch (column.type) {
32360
32405
  case 'seq':
32361
- cellValue = mode === 'all' ? $rowIndex + 1 : getSeq($xetable, row, $rowIndex, column, $columnIndex);
32362
- break;
32406
+ {
32407
+ var seqValue = $rowIndex + 1;
32408
+ cellValue = mode === 'all' ? seqValue : getSeq($xetable, seqValue, row, $rowIndex, column, $columnIndex);
32409
+ break;
32410
+ }
32363
32411
  case 'checkbox':
32364
32412
  cellValue = toBooleanValue($xetable.isCheckedByCheckboxRow(row));
32365
32413
  item._checkboxLabel = checkboxOpts.labelField ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(row, checkboxOpts.labelField) : '';
@@ -35404,7 +35452,8 @@ var renderPopupPanel = function renderPopupPanel(h, _vm) {
35404
35452
  }, conf.i18n('vxe.custom.setting.colSort')), h('vxe-tooltip', {
35405
35453
  props: {
35406
35454
  enterable: true,
35407
- content: conf.i18n('vxe.custom.setting.sortHelpTip')
35455
+ content: conf.i18n('vxe.custom.setting.sortHelpTip'),
35456
+ popupClassName: 'vxe-table--ignore-clear'
35408
35457
  },
35409
35458
  scopedSlots: {
35410
35459
  default: function _default() {
@@ -36524,13 +36573,11 @@ Object.keys(packages_table.methods).forEach(function (name) {
36524
36573
  }
36525
36574
  },
36526
36575
  created: function created() {
36527
- var data = this.data,
36528
- formOpts = this.formOpts,
36529
- proxyOpts = this.proxyOpts,
36530
- proxyConfig = this.proxyConfig;
36531
- if (proxyConfig && (data || proxyOpts.form && formOpts.data)) {
36532
- errLog('vxe.error.errConflicts', ['grid.data', 'grid.proxy-config']);
36533
- }
36576
+ // const { data, formOpts, proxyOpts, proxyConfig } = this
36577
+ // if (proxyConfig && (data || (proxyOpts.form && formOpts.data))) {
36578
+ // errLog('vxe.error.errConflicts', ['grid.data', 'grid.proxy-config'])
36579
+ // }
36580
+
36534
36581
  if (false) {}
36535
36582
  this.initPages();
36536
36583
  GlobalEvent.on(this, 'keydown', this.handleGlobalKeydownEvent);
@@ -36622,7 +36669,7 @@ Object.keys(packages_table.methods).forEach(function (name) {
36622
36669
  formOpts = this.formOpts;
36623
36670
  if (proxyConfig) {
36624
36671
  if (isEnableConf(formConfig) && proxyOpts.form && formOpts.items) {
36625
- var formData = {};
36672
+ var fData = {};
36626
36673
  formOpts.items.forEach(function (item) {
36627
36674
  var field = item.field,
36628
36675
  itemRender = item.itemRender;
@@ -36638,10 +36685,10 @@ Object.keys(packages_table.methods).forEach(function (name) {
36638
36685
  itemValue = defaultValue;
36639
36686
  }
36640
36687
  }
36641
- formData[field] = itemValue;
36688
+ fData[field] = itemValue;
36642
36689
  }
36643
36690
  });
36644
- this.formData = formData;
36691
+ this.formData = fData;
36645
36692
  }
36646
36693
  if (!proxyInited && proxyOpts.autoLoad !== false) {
36647
36694
  this.proxyInited = true;
@@ -36677,7 +36724,6 @@ Object.keys(packages_table.methods).forEach(function (name) {
36677
36724
  tablePage = this.tablePage,
36678
36725
  pagerConfig = this.pagerConfig,
36679
36726
  editRules = this.editRules,
36680
- formData = this.formData,
36681
36727
  isRespMsg = this.isRespMsg,
36682
36728
  isActiveMsg = this.isActiveMsg,
36683
36729
  validConfig = this.validConfig,
@@ -36692,6 +36738,7 @@ Object.keys(packages_table.methods).forEach(function (name) {
36692
36738
  ajax = _proxyOpts$ajax === void 0 ? {} : _proxyOpts$ajax;
36693
36739
  var resConfigs = proxyOpts.response || proxyOpts.props || {};
36694
36740
  var $xetable = $refs.xTable;
36741
+ var formData = this.getFormData();
36695
36742
  var button;
36696
36743
  var code;
36697
36744
  if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isString(proxyTarget)) {
@@ -37120,6 +37167,13 @@ Object.keys(packages_table.methods).forEach(function (name) {
37120
37167
  }
37121
37168
  return Promise.resolve();
37122
37169
  },
37170
+ getFormData: function getFormData() {
37171
+ var proxyConfig = this.proxyConfig,
37172
+ proxyOpts = this.proxyOpts,
37173
+ formOpts = this.formOpts,
37174
+ formData = this.formData;
37175
+ return proxyConfig && isEnableConf(proxyOpts) && proxyOpts.form ? formData : formOpts.data;
37176
+ },
37123
37177
  getFormItems: function getFormItems(itemIndex) {
37124
37178
  var formConfig = this.formConfig,
37125
37179
  formOpts = this.formOpts;
@@ -37337,7 +37391,7 @@ Object.keys(packages_table.methods).forEach(function (name) {
37337
37391
  return {
37338
37392
  data: this.tableData,
37339
37393
  filter: this.filterData,
37340
- form: this.formData,
37394
+ form: this.getFormData(),
37341
37395
  sort: sortData.length ? sortData[0] : {},
37342
37396
  sorts: sortData,
37343
37397
  pager: this.tablePage,
@@ -39001,7 +39055,10 @@ var autoTxtElem;
39001
39055
  attrs.placeholder = getFuncText(placeholder);
39002
39056
  }
39003
39057
  return h('div', {
39004
- class: ['vxe-textarea', className, _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty({}, "size--".concat(vSize), vSize), 'is--autosize', autosize), 'is--disabled', disabled), 'def--rows', !external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eqNull(rows)), 'def--cols', !external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eqNull(cols))]
39058
+ class: ['vxe-textarea', className, _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty({}, "size--".concat(vSize), vSize), 'is--autosize', autosize), 'is--disabled', disabled), 'def--rows', !external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eqNull(rows)), 'def--cols', !external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eqNull(cols))],
39059
+ attrs: {
39060
+ spellcheck: false
39061
+ }
39005
39062
  }, [h('textarea', {
39006
39063
  ref: 'textarea',
39007
39064
  class: 'vxe-textarea--inner',
@@ -40258,6 +40315,8 @@ var ItemConfig = /*#__PURE__*/function () {
40258
40315
  titleAlign: item.titleAlign,
40259
40316
  titleWidth: item.titleWidth,
40260
40317
  titleColon: item.titleColon,
40318
+ vertical: item.vertical,
40319
+ padding: item.padding,
40261
40320
  titleAsterisk: item.titleAsterisk,
40262
40321
  titlePrefix: item.titlePrefix,
40263
40322
  titleSuffix: item.titleSuffix,
@@ -40478,12 +40537,14 @@ var VxeFormConfigItem = {
40478
40537
  readonly = $xeform.readonly,
40479
40538
  collapseAll = $xeform.collapseAll,
40480
40539
  validOpts = $xeform.validOpts,
40540
+ allTitleBold = $xeform.titleBold,
40481
40541
  allTitleAlign = $xeform.titleAlign,
40482
40542
  allTitleWidth = $xeform.titleWidth,
40483
40543
  allTitleColon = $xeform.titleColon,
40484
40544
  allTitleAsterisk = $xeform.titleAsterisk,
40485
40545
  allTitleOverflow = $xeform.titleOverflow,
40486
- allVertical = $xeform.vertical;
40546
+ allVertical = $xeform.vertical,
40547
+ allPadding = $xeform.padding;
40487
40548
  var slots = item.slots,
40488
40549
  title = item.title,
40489
40550
  folding = item.folding,
@@ -40496,6 +40557,7 @@ var VxeFormConfigItem = {
40496
40557
  className = item.className,
40497
40558
  titleOverflow = item.titleOverflow,
40498
40559
  vertical = item.vertical,
40560
+ padding = item.padding,
40499
40561
  children = item.children,
40500
40562
  showTitle = item.showTitle,
40501
40563
  contentClassName = item.contentClassName,
@@ -40511,12 +40573,14 @@ var VxeFormConfigItem = {
40511
40573
  var itemTitleStyle = compConf ? compConf.formItemTitleStyle || compConf.itemTitleStyle : null;
40512
40574
  var span = item.span || $xeform.span;
40513
40575
  var align = item.align || $xeform.align;
40576
+ var itemPadding = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eqNull(padding) ? allPadding : padding;
40577
+ var itemVertical = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eqNull(vertical) ? allVertical : vertical;
40578
+ var titleBold = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eqNull(item.titleBold) ? allTitleBold : item.titleBold;
40514
40579
  var titleAlign = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eqNull(item.titleAlign) ? allTitleAlign : item.titleAlign;
40515
- var titleWidth = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eqNull(item.titleWidth) ? allTitleWidth : item.titleWidth;
40580
+ var titleWidth = itemVertical ? null : external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eqNull(item.titleWidth) ? allTitleWidth : item.titleWidth;
40516
40581
  var titleColon = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eqNull(item.titleColon) ? allTitleColon : item.titleColon;
40517
40582
  var titleAsterisk = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eqNull(item.titleAsterisk) ? allTitleAsterisk : item.titleAsterisk;
40518
- var itemOverflow = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isUndefined(titleOverflow) || external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isNull(titleOverflow) ? allTitleOverflow : titleOverflow;
40519
- var itemVertical = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isUndefined(vertical) || external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isNull(vertical) ? allVertical : vertical;
40583
+ var itemOverflow = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eqNull(titleOverflow) ? allTitleOverflow : titleOverflow;
40520
40584
  var ovEllipsis = itemOverflow === 'ellipsis';
40521
40585
  var ovTitle = itemOverflow === 'title';
40522
40586
  var ovTooltip = itemOverflow === true || itemOverflow === 'tooltip';
@@ -40531,7 +40595,8 @@ var VxeFormConfigItem = {
40531
40595
  $form: $xeform,
40532
40596
  $grid: $xeform.xegrid
40533
40597
  };
40534
- var isRequired;
40598
+ var isRequired = false;
40599
+ var isValid = false;
40535
40600
  if (visible === false) {
40536
40601
  return _e();
40537
40602
  }
@@ -40552,7 +40617,8 @@ var VxeFormConfigItem = {
40552
40617
  }
40553
40618
  if (!readonly && rules) {
40554
40619
  var itemRules = rules[field];
40555
- if (itemRules) {
40620
+ if (itemRules && itemRules.length) {
40621
+ isValid = true;
40556
40622
  isRequired = itemRules.some(function (rule) {
40557
40623
  return rule.required;
40558
40624
  });
@@ -40579,8 +40645,11 @@ var VxeFormConfigItem = {
40579
40645
  class: ['vxe-form--item', item.id, span ? "vxe-form--item-col_".concat(span, " is--span") : null, className ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(className) ? className(params) : className : '', itemClassName ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(itemClassName) ? itemClassName(params) : itemClassName : '', {
40580
40646
  'is--title': title,
40581
40647
  'is--colon': titleColon,
40648
+ 'is--bold': titleBold,
40649
+ 'is--padding': itemPadding,
40582
40650
  'is--vertical': itemVertical,
40583
40651
  'is--asterisk': titleAsterisk,
40652
+ 'is--valid': isValid,
40584
40653
  'is--required': isRequired,
40585
40654
  'is--hidden': folding && collapseAll,
40586
40655
  'is--active': isActivetem($xeform, item),
@@ -40740,6 +40809,12 @@ function getResetValue(value, resetValue) {
40740
40809
  return conf.form.align;
40741
40810
  }
40742
40811
  },
40812
+ titleBold: {
40813
+ type: String,
40814
+ default: function _default() {
40815
+ return conf.form.titleBold;
40816
+ }
40817
+ },
40743
40818
  titleAlign: {
40744
40819
  type: String,
40745
40820
  default: function _default() {
@@ -40772,6 +40847,12 @@ function getResetValue(value, resetValue) {
40772
40847
  type: Boolean,
40773
40848
  default: null
40774
40849
  },
40850
+ padding: {
40851
+ type: Boolean,
40852
+ default: function _default() {
40853
+ return conf.form.padding;
40854
+ }
40855
+ },
40775
40856
  className: [String, Function],
40776
40857
  disabled: Boolean,
40777
40858
  readonly: Boolean,
@@ -40863,6 +40944,9 @@ function getResetValue(value, resetValue) {
40863
40944
  data: data,
40864
40945
  $form: this
40865
40946
  }) : className : '', _defineProperty(_defineProperty({}, "size--".concat(vSize), vSize), 'is--loading', loading)],
40947
+ attrs: {
40948
+ spellcheck: false
40949
+ },
40866
40950
  on: {
40867
40951
  submit: this.submitEvent,
40868
40952
  reset: this.resetEvent
@@ -41116,10 +41200,12 @@ function getResetValue(value, resetValue) {
41116
41200
  return this.$nextTick();
41117
41201
  }
41118
41202
  var fields = [];
41119
- if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(fieldOrItem)) {
41120
- fields = fieldOrItem;
41121
- } else {
41122
- fields = [fieldOrItem];
41203
+ if (fieldOrItem) {
41204
+ if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(fieldOrItem)) {
41205
+ fields = fieldOrItem;
41206
+ } else {
41207
+ fields = [fieldOrItem];
41208
+ }
41123
41209
  }
41124
41210
  return this.beginValidate(fields.map(function (field) {
41125
41211
  return handleFieldOrItem(_this6, field);
@@ -41315,13 +41401,10 @@ function getResetValue(value, resetValue) {
41315
41401
  if (!i) {
41316
41402
  dom.scrollToView($el.querySelector(".".concat(item.id)));
41317
41403
  }
41404
+ var autoFocus = itemRender.autoFocus || itemRender.autofocus || (compConf ? compConf.formItemAutoFocus : null);
41318
41405
  // 如果指定了聚焦 class
41319
- if (itemRender.autofocus) {
41320
- inputElem = $el.querySelector(".".concat(item.id, " ").concat(itemRender.autofocus));
41321
- }
41322
- // 渲染器的聚焦处理
41323
- if (!inputElem && compConf && compConf.autofocus) {
41324
- inputElem = $el.querySelector(".".concat(item.id, " ").concat(compConf.autofocus));
41406
+ if (autoFocus) {
41407
+ inputElem = $el.querySelector(".".concat(item.id, " ").concat(autoFocus));
41325
41408
  }
41326
41409
  if (inputElem) {
41327
41410
  inputElem.focus();
@@ -41397,6 +41480,10 @@ var form_item_props = {
41397
41480
  size: String,
41398
41481
  span: [String, Number],
41399
41482
  align: String,
41483
+ titleBold: {
41484
+ type: Boolean,
41485
+ default: null
41486
+ },
41400
41487
  titleAlign: {
41401
41488
  type: String,
41402
41489
  default: null
@@ -41421,6 +41508,10 @@ var form_item_props = {
41421
41508
  type: Boolean,
41422
41509
  default: null
41423
41510
  },
41511
+ padding: {
41512
+ type: Boolean,
41513
+ default: null
41514
+ },
41424
41515
  className: [String, Function],
41425
41516
  contentClassName: [String, Function],
41426
41517
  contentStyle: [Object, Function],
@@ -41459,12 +41550,14 @@ var renderItem = function renderItem(h, _vm, item, slots) {
41459
41550
  readonly = _vm.readonly,
41460
41551
  collapseAll = _vm.collapseAll,
41461
41552
  validOpts = _vm.validOpts,
41553
+ allTitleBold = _vm.titleBold,
41462
41554
  allTitleAlign = _vm.titleAlign,
41463
41555
  allTitleWidth = _vm.titleWidth,
41464
41556
  allTitleColon = _vm.titleColon,
41465
41557
  allTitleAsterisk = _vm.titleAsterisk,
41466
41558
  allTitleOverflow = _vm.titleOverflow,
41467
- allVertical = _vm.vertical;
41559
+ allVertical = _vm.vertical,
41560
+ allPadding = _vm.padding;
41468
41561
  var title = item.title,
41469
41562
  folding = item.folding,
41470
41563
  visible = item.visible,
@@ -41476,6 +41569,7 @@ var renderItem = function renderItem(h, _vm, item, slots) {
41476
41569
  className = item.className,
41477
41570
  titleOverflow = item.titleOverflow,
41478
41571
  vertical = item.vertical,
41572
+ padding = item.padding,
41479
41573
  showTitle = item.showTitle,
41480
41574
  contentClassName = item.contentClassName,
41481
41575
  contentStyle = item.contentStyle,
@@ -41490,12 +41584,14 @@ var renderItem = function renderItem(h, _vm, item, slots) {
41490
41584
  var itemTitleStyle = compConf ? compConf.formItemTitleStyle || compConf.itemTitleStyle : null;
41491
41585
  var span = item.span || _vm.span;
41492
41586
  var align = item.align || _vm.align;
41587
+ var itemPadding = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eqNull(padding) ? allPadding : padding;
41588
+ var itemVertical = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eqNull(vertical) ? allVertical : vertical;
41589
+ var titleBold = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eqNull(item.titleBold) ? allTitleBold : item.titleBold;
41493
41590
  var titleAlign = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eqNull(item.titleAlign) ? allTitleAlign : item.titleAlign;
41494
- var titleWidth = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eqNull(item.titleWidth) ? allTitleWidth : item.titleWidth;
41591
+ var titleWidth = itemVertical ? null : external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eqNull(item.titleWidth) ? allTitleWidth : item.titleWidth;
41495
41592
  var titleColon = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eqNull(item.titleColon) ? allTitleColon : item.titleColon;
41496
41593
  var titleAsterisk = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eqNull(item.titleAsterisk) ? allTitleAsterisk : item.titleAsterisk;
41497
- var itemOverflow = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isUndefined(titleOverflow) || external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isNull(titleOverflow) ? allTitleOverflow : titleOverflow;
41498
- var itemVertical = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isUndefined(vertical) || external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isNull(vertical) ? allVertical : vertical;
41594
+ var itemOverflow = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eqNull(titleOverflow) ? allTitleOverflow : titleOverflow;
41499
41595
  var ovEllipsis = itemOverflow === 'ellipsis';
41500
41596
  var ovTitle = itemOverflow === 'title';
41501
41597
  var ovTooltip = itemOverflow === true || itemOverflow === 'tooltip';
@@ -41510,13 +41606,15 @@ var renderItem = function renderItem(h, _vm, item, slots) {
41510
41606
  $form: _vm,
41511
41607
  $grid: _vm.xegrid
41512
41608
  };
41513
- var isRequired;
41609
+ var isRequired = false;
41610
+ var isValid = false;
41514
41611
  if (visible === false) {
41515
41612
  return _e();
41516
41613
  }
41517
41614
  if (!readonly && rules) {
41518
41615
  var itemRules = rules[field];
41519
- if (itemRules) {
41616
+ if (itemRules && itemRules.length) {
41617
+ isValid = true;
41520
41618
  isRequired = itemRules.some(function (rule) {
41521
41619
  return rule.required;
41522
41620
  });
@@ -41543,8 +41641,11 @@ var renderItem = function renderItem(h, _vm, item, slots) {
41543
41641
  class: ['vxe-form--item', item.id, span ? "vxe-col--".concat(span, " is--span") : '', className ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(className) ? className(params) : className : '', itemClassName ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(itemClassName) ? itemClassName(params) : itemClassName : '', {
41544
41642
  'is--title': title,
41545
41643
  'is--colon': titleColon,
41644
+ 'is--bold': titleBold,
41645
+ 'is--padding': itemPadding,
41546
41646
  'is--vertical': itemVertical,
41547
41647
  'is--asterisk': titleAsterisk,
41648
+ 'is--valid': isValid,
41548
41649
  'is--required': isRequired,
41549
41650
  'is--hidden': folding && collapseAll,
41550
41651
  'is--active': isActivetem(_vm, item),