vxe-table 3.8.18 → 3.8.20
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.
- package/lib/checkbox/src/checkbox.js +1 -1
- package/lib/checkbox/src/checkbox.min.js +1 -1
- package/lib/custom/src/panel.js +2 -1
- package/lib/custom/src/panel.min.js +1 -1
- package/lib/edit/src/mixin.js +11 -11
- package/lib/edit/src/mixin.min.js +1 -1
- package/lib/export/src/mixin.js +14 -8
- package/lib/export/src/mixin.min.js +1 -1
- package/lib/form/src/form-config-item.js +16 -6
- package/lib/form/src/form-config-item.min.js +1 -1
- package/lib/form/src/form-item.js +24 -6
- package/lib/form/src/form-item.min.js +1 -1
- package/lib/form/src/form.js +24 -10
- package/lib/form/src/form.min.js +1 -1
- package/lib/form/src/util.js +2 -0
- package/lib/form/src/util.min.js +1 -1
- package/lib/form/style/style.css +6 -4
- package/lib/form/style/style.min.css +1 -1
- package/lib/grid/src/grid.js +17 -12
- package/lib/grid/src/grid.min.js +1 -1
- package/lib/icon/style/style.css +1 -1
- package/lib/icon/style/style.min.css +1 -1
- package/lib/index.css +1 -1
- package/lib/index.umd.js +175 -86
- package/lib/index.umd.min.js +1 -1
- package/lib/input/src/input.js +2 -1
- package/lib/input/src/input.min.js +1 -1
- package/lib/radio/src/radio.js +1 -1
- package/lib/radio/src/radio.min.js +1 -1
- package/lib/style.css +1 -1
- package/lib/style.min.css +1 -1
- package/lib/table/src/methods.js +21 -5
- package/lib/table/src/methods.min.js +1 -1
- package/lib/table/src/table.js +9 -4
- package/lib/table/src/table.min.js +1 -1
- package/lib/textarea/src/textarea.js +4 -1
- package/lib/textarea/src/textarea.min.js +1 -1
- package/lib/tools/log.js +1 -1
- package/lib/tools/log.min.js +1 -1
- package/lib/v-x-e-table/index.js +1 -1
- package/lib/v-x-e-table/index.min.js +1 -1
- package/lib/v-x-e-table/src/conf.js +9 -1
- package/lib/v-x-e-table/src/conf.min.js +1 -1
- package/lib/v-x-e-table/src/renderer.js +16 -16
- package/lib/v-x-e-table/src/renderer.min.js +1 -1
- package/lib/vxe-form/style/style.css +6 -4
- package/lib/vxe-form/style/style.min.css +1 -1
- package/package.json +2 -2
- package/packages/checkbox/src/checkbox.js +1 -1
- package/packages/custom/src/panel.js +2 -1
- package/packages/edit/src/mixin.js +11 -10
- package/packages/export/src/mixin.js +10 -6
- package/packages/form/src/form-config-item.js +14 -7
- package/packages/form/src/form-item.js +22 -7
- package/packages/form/src/form.js +14 -10
- package/packages/form/src/util.js +2 -0
- package/packages/grid/src/grid.js +14 -9
- package/packages/input/src/input.js +2 -1
- package/packages/radio/src/radio.js +1 -1
- package/packages/table/src/methods.js +21 -7
- package/packages/table/src/table.js +6 -2
- package/packages/textarea/src/textarea.js +4 -1
- package/packages/v-x-e-table/src/conf.js +11 -1
- package/packages/v-x-e-table/src/renderer.js +16 -16
- package/styles/form.scss +6 -4
- /package/lib/icon/style/{iconfont.1723040514481.ttf → iconfont.1724204493937.ttf} +0 -0
- /package/lib/icon/style/{iconfont.1723040514481.woff → iconfont.1724204493937.woff} +0 -0
- /package/lib/icon/style/{iconfont.1723040514481.woff2 → iconfont.1724204493937.woff2} +0 -0
- /package/lib/{iconfont.1723040514481.ttf → iconfont.1724204493937.ttf} +0 -0
- /package/lib/{iconfont.1723040514481.woff → iconfont.1724204493937.woff} +0 -0
- /package/lib/{iconfont.1723040514481.woff2 → iconfont.1724204493937.woff2} +0 -0
package/lib/index.umd.js
CHANGED
|
@@ -11299,6 +11299,13 @@ var iconPrefix = 'vxe-icon-';
|
|
|
11299
11299
|
PAGER_PREV_PAGE: iconPrefix + 'arrow-left',
|
|
11300
11300
|
PAGER_NEXT_PAGE: iconPrefix + 'arrow-right',
|
|
11301
11301
|
PAGER_JUMP_MORE: iconPrefix + 'ellipsis-h',
|
|
11302
|
+
// radio
|
|
11303
|
+
RADIO_CHECKED: iconPrefix + 'radio-checked-fill',
|
|
11304
|
+
RADIO_UNCHECKED: iconPrefix + 'radio-unchecked',
|
|
11305
|
+
// checkbox
|
|
11306
|
+
CHECKBOX_INDETERMINATE: iconPrefix + 'checkbox-indeterminate-fill',
|
|
11307
|
+
CHECKBOX_CHECKED: iconPrefix + 'checkbox-checked-fill',
|
|
11308
|
+
CHECKBOX_UNCHECKED: iconPrefix + 'checkbox-unchecked',
|
|
11302
11309
|
// input
|
|
11303
11310
|
INPUT_CLEAR: iconPrefix + 'error-circle-fill',
|
|
11304
11311
|
INPUT_PWD: iconPrefix + 'eye-fill',
|
|
@@ -11401,7 +11408,8 @@ var iconPrefix = 'vxe-icon-';
|
|
|
11401
11408
|
tooltipConfig: {
|
|
11402
11409
|
enterable: true
|
|
11403
11410
|
},
|
|
11404
|
-
titleAsterisk: true
|
|
11411
|
+
titleAsterisk: true,
|
|
11412
|
+
padding: true
|
|
11405
11413
|
},
|
|
11406
11414
|
input: {
|
|
11407
11415
|
// size: null,
|
|
@@ -11513,7 +11521,7 @@ var es_array_concat = __webpack_require__(8706);
|
|
|
11513
11521
|
|
|
11514
11522
|
|
|
11515
11523
|
function getLog(message, params) {
|
|
11516
|
-
return "[vxe-table v".concat("3.8.
|
|
11524
|
+
return "[vxe-table v".concat("3.8.20", "] ").concat(conf.i18n(message, params));
|
|
11517
11525
|
}
|
|
11518
11526
|
function outLog(type) {
|
|
11519
11527
|
return function (message, params) {
|
|
@@ -12503,7 +12511,7 @@ function oldFormItemRadioAndCheckboxRender(h, renderOpts, params) {
|
|
|
12503
12511
|
*/
|
|
12504
12512
|
var renderMap = {
|
|
12505
12513
|
input: {
|
|
12506
|
-
|
|
12514
|
+
autoFocus: 'input',
|
|
12507
12515
|
renderEdit: nativeEditRender,
|
|
12508
12516
|
renderDefault: nativeEditRender,
|
|
12509
12517
|
renderFilter: nativeFilterRender,
|
|
@@ -12511,7 +12519,7 @@ var renderMap = {
|
|
|
12511
12519
|
renderItemContent: nativeItemRender
|
|
12512
12520
|
},
|
|
12513
12521
|
textarea: {
|
|
12514
|
-
|
|
12522
|
+
autoFocus: 'textarea',
|
|
12515
12523
|
renderEdit: nativeEditRender,
|
|
12516
12524
|
renderItemContent: nativeItemRender
|
|
12517
12525
|
},
|
|
@@ -12543,7 +12551,7 @@ var renderMap = {
|
|
|
12543
12551
|
cellExportMethod: handleExportSelectMethod
|
|
12544
12552
|
},
|
|
12545
12553
|
VxeInput: {
|
|
12546
|
-
|
|
12554
|
+
autoFocus: '.vxe-input--inner',
|
|
12547
12555
|
renderEdit: defaultEditRender,
|
|
12548
12556
|
renderCell: function renderCell(h, renderOpts, params) {
|
|
12549
12557
|
var _renderOpts$props2 = renderOpts.props,
|
|
@@ -12574,7 +12582,7 @@ var renderMap = {
|
|
|
12574
12582
|
renderItemContent: defaultItemRender
|
|
12575
12583
|
},
|
|
12576
12584
|
VxeTextarea: {
|
|
12577
|
-
|
|
12585
|
+
autoFocus: '.vxe-textarea--inner',
|
|
12578
12586
|
renderItemContent: defaultItemRender
|
|
12579
12587
|
},
|
|
12580
12588
|
VxeButton: {
|
|
@@ -12598,7 +12606,7 @@ var renderMap = {
|
|
|
12598
12606
|
}
|
|
12599
12607
|
},
|
|
12600
12608
|
VxeSelect: {
|
|
12601
|
-
|
|
12609
|
+
autoFocus: '.vxe-input--inner',
|
|
12602
12610
|
renderEdit: defaultSelectEditRender,
|
|
12603
12611
|
renderDefault: defaultSelectEditRender,
|
|
12604
12612
|
renderCell: function renderCell(h, renderOpts, params) {
|
|
@@ -12649,30 +12657,30 @@ var renderMap = {
|
|
|
12649
12657
|
cellExportMethod: handleExportSelectMethod
|
|
12650
12658
|
},
|
|
12651
12659
|
VxeRadio: {
|
|
12652
|
-
|
|
12660
|
+
autoFocus: '.vxe-radio--input',
|
|
12653
12661
|
renderItemContent: defaultFormItemRender
|
|
12654
12662
|
},
|
|
12655
12663
|
VxeRadioGroup: {
|
|
12656
|
-
|
|
12664
|
+
autoFocus: '.vxe-radio--input',
|
|
12657
12665
|
renderItemContent: formItemRadioAndCheckboxRender
|
|
12658
12666
|
},
|
|
12659
12667
|
VxeCheckbox: {
|
|
12660
|
-
|
|
12668
|
+
autoFocus: '.vxe-checkbox--input',
|
|
12661
12669
|
renderItemContent: defaultFormItemRender
|
|
12662
12670
|
},
|
|
12663
12671
|
VxeCheckboxGroup: {
|
|
12664
|
-
|
|
12672
|
+
autoFocus: '.vxe-checkbox--input',
|
|
12665
12673
|
renderItemContent: formItemRadioAndCheckboxRender
|
|
12666
12674
|
},
|
|
12667
12675
|
VxeSwitch: {
|
|
12668
|
-
|
|
12676
|
+
autoFocus: '.vxe-switch--button',
|
|
12669
12677
|
renderEdit: defaultEditRender,
|
|
12670
12678
|
renderDefault: defaultEditRender,
|
|
12671
12679
|
renderItemContent: defaultItemRender
|
|
12672
12680
|
},
|
|
12673
12681
|
// 以下已废弃
|
|
12674
12682
|
$input: {
|
|
12675
|
-
|
|
12683
|
+
autoFocus: '.vxe-input--inner',
|
|
12676
12684
|
renderEdit: oldEditRender,
|
|
12677
12685
|
renderCell: function renderCell(h, renderOpts, params) {
|
|
12678
12686
|
var _renderOpts$props3 = renderOpts.props,
|
|
@@ -12702,7 +12710,7 @@ var renderMap = {
|
|
|
12702
12710
|
renderItemContent: oldItemRender
|
|
12703
12711
|
},
|
|
12704
12712
|
$textarea: {
|
|
12705
|
-
|
|
12713
|
+
autoFocus: '.vxe-textarea--inner',
|
|
12706
12714
|
renderItemContent: oldItemRender
|
|
12707
12715
|
},
|
|
12708
12716
|
$button: {
|
|
@@ -12714,7 +12722,7 @@ var renderMap = {
|
|
|
12714
12722
|
renderItemContent: oldButtonsItemRender
|
|
12715
12723
|
},
|
|
12716
12724
|
$select: {
|
|
12717
|
-
|
|
12725
|
+
autoFocus: '.vxe-input--inner',
|
|
12718
12726
|
renderEdit: oldSelectEditRender,
|
|
12719
12727
|
renderDefault: oldSelectEditRender,
|
|
12720
12728
|
renderCell: function renderCell(h, renderOpts, params) {
|
|
@@ -12765,15 +12773,15 @@ var renderMap = {
|
|
|
12765
12773
|
cellExportMethod: handleExportSelectMethod
|
|
12766
12774
|
},
|
|
12767
12775
|
$radio: {
|
|
12768
|
-
|
|
12776
|
+
autoFocus: '.vxe-radio--input',
|
|
12769
12777
|
renderItemContent: oldFormItemRadioAndCheckboxRender
|
|
12770
12778
|
},
|
|
12771
12779
|
$checkbox: {
|
|
12772
|
-
|
|
12780
|
+
autoFocus: '.vxe-checkbox--input',
|
|
12773
12781
|
renderItemContent: oldFormItemRadioAndCheckboxRender
|
|
12774
12782
|
},
|
|
12775
12783
|
$switch: {
|
|
12776
|
-
|
|
12784
|
+
autoFocus: '.vxe-switch--button',
|
|
12777
12785
|
renderEdit: oldEditRender,
|
|
12778
12786
|
renderDefault: oldEditRender,
|
|
12779
12787
|
renderItemContent: oldItemRender
|
|
@@ -13217,7 +13225,7 @@ function component(comp) {
|
|
|
13217
13225
|
components[comp.name] = comp;
|
|
13218
13226
|
}
|
|
13219
13227
|
}
|
|
13220
|
-
var version = "3.8.
|
|
13228
|
+
var version = "3.8.20";
|
|
13221
13229
|
var tableVersion = version;
|
|
13222
13230
|
var VxeUI = {
|
|
13223
13231
|
v: v,
|
|
@@ -18019,6 +18027,11 @@ var Methods = {
|
|
|
18019
18027
|
var fullColumnFieldData = this.fullColumnFieldData;
|
|
18020
18028
|
return fullColumnFieldData[field] ? fullColumnFieldData[field].column : null;
|
|
18021
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
|
+
},
|
|
18022
18035
|
/**
|
|
18023
18036
|
* 获取当前表格的列
|
|
18024
18037
|
* 收集到的全量列、全量表头列、处理条件之后的全量表头列、当前渲染中的表头列
|
|
@@ -18949,6 +18962,7 @@ var Methods = {
|
|
|
18949
18962
|
var resizeList = [];
|
|
18950
18963
|
var pxList = [];
|
|
18951
18964
|
var pxMinList = [];
|
|
18965
|
+
var autoMinList = [];
|
|
18952
18966
|
var scaleList = [];
|
|
18953
18967
|
var scaleMinList = [];
|
|
18954
18968
|
var autoList = [];
|
|
@@ -18971,6 +18985,8 @@ var Methods = {
|
|
|
18971
18985
|
scaleList.push(column);
|
|
18972
18986
|
} else if (dom.isPx(column.minWidth)) {
|
|
18973
18987
|
pxMinList.push(column);
|
|
18988
|
+
} else if (column.minWidth === 'auto') {
|
|
18989
|
+
autoMinList.push(column);
|
|
18974
18990
|
} else if (dom.isScale(column.minWidth)) {
|
|
18975
18991
|
scaleMinList.push(column);
|
|
18976
18992
|
} else {
|
|
@@ -18982,6 +18998,7 @@ var Methods = {
|
|
|
18982
18998
|
resizeList: resizeList,
|
|
18983
18999
|
pxList: pxList,
|
|
18984
19000
|
pxMinList: pxMinList,
|
|
19001
|
+
autoMinList: autoMinList,
|
|
18985
19002
|
scaleList: scaleList,
|
|
18986
19003
|
scaleMinList: scaleMinList,
|
|
18987
19004
|
autoList: autoList,
|
|
@@ -19067,11 +19084,11 @@ var Methods = {
|
|
|
19067
19084
|
var cellStyle = getComputedStyle(firstCellEl);
|
|
19068
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;
|
|
19069
19086
|
}
|
|
19070
|
-
var colWidth = column.renderAutoWidth - paddingSize
|
|
19087
|
+
var colWidth = column.renderAutoWidth - paddingSize;
|
|
19071
19088
|
external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().arrayEach(cellElList, function (cellEl) {
|
|
19072
19089
|
var labelEl = cellEl.firstChild;
|
|
19073
19090
|
if (labelEl) {
|
|
19074
|
-
colWidth = Math.max(colWidth, labelEl.offsetWidth);
|
|
19091
|
+
colWidth = Math.max(colWidth, Math.ceil(labelEl.offsetWidth) + 4);
|
|
19075
19092
|
}
|
|
19076
19093
|
});
|
|
19077
19094
|
column.renderAutoWidth = colWidth + paddingSize;
|
|
@@ -19102,6 +19119,7 @@ var Methods = {
|
|
|
19102
19119
|
var resizeList = columnStore.resizeList,
|
|
19103
19120
|
pxMinList = columnStore.pxMinList,
|
|
19104
19121
|
pxList = columnStore.pxList,
|
|
19122
|
+
autoMinList = columnStore.autoMinList,
|
|
19105
19123
|
scaleList = columnStore.scaleList,
|
|
19106
19124
|
scaleMinList = columnStore.scaleMinList,
|
|
19107
19125
|
autoList = columnStore.autoList,
|
|
@@ -19112,6 +19130,12 @@ var Methods = {
|
|
|
19112
19130
|
tableWidth += minWidth;
|
|
19113
19131
|
column.renderWidth = minWidth;
|
|
19114
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
|
+
});
|
|
19115
19139
|
// 最小百分比
|
|
19116
19140
|
scaleMinList.forEach(function (column) {
|
|
19117
19141
|
var scaleWidth = Math.floor(parseInt(column.minWidth) * meanWidth);
|
|
@@ -19143,10 +19167,10 @@ var Methods = {
|
|
|
19143
19167
|
column.renderWidth = width;
|
|
19144
19168
|
});
|
|
19145
19169
|
remainWidth -= tableWidth;
|
|
19146
|
-
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;
|
|
19147
19171
|
if (fit) {
|
|
19148
19172
|
if (remainWidth > 0) {
|
|
19149
|
-
scaleMinList.concat(pxMinList).forEach(function (column) {
|
|
19173
|
+
scaleMinList.concat(pxMinList).concat(autoMinList).forEach(function (column) {
|
|
19150
19174
|
tableWidth += meanWidth;
|
|
19151
19175
|
column.renderWidth += meanWidth;
|
|
19152
19176
|
});
|
|
@@ -19165,7 +19189,7 @@ var Methods = {
|
|
|
19165
19189
|
* 偏移量算法
|
|
19166
19190
|
* 如果所有列足够放的情况下,从最后动态列开始分配
|
|
19167
19191
|
*/
|
|
19168
|
-
var dynamicList = scaleList.concat(scaleMinList).concat(pxMinList).concat(remainList);
|
|
19192
|
+
var dynamicList = scaleList.concat(scaleMinList).concat(pxMinList).concat(autoMinList).concat(remainList);
|
|
19169
19193
|
var dynamicSize = dynamicList.length - 1;
|
|
19170
19194
|
if (dynamicSize > 0) {
|
|
19171
19195
|
var odiffer = bodyWidth - tableWidth;
|
|
@@ -23615,6 +23639,7 @@ function handleUupdateResize(_vm) {
|
|
|
23615
23639
|
resizeList: [],
|
|
23616
23640
|
pxList: [],
|
|
23617
23641
|
pxMinList: [],
|
|
23642
|
+
autoMinList: [],
|
|
23618
23643
|
scaleList: [],
|
|
23619
23644
|
scaleMinList: [],
|
|
23620
23645
|
autoList: [],
|
|
@@ -23871,10 +23896,11 @@ function handleUupdateResize(_vm) {
|
|
|
23871
23896
|
return Object.assign({}, conf.table.customConfig, this.customConfig);
|
|
23872
23897
|
},
|
|
23873
23898
|
autoWidthColumnList: function autoWidthColumnList() {
|
|
23874
|
-
var
|
|
23875
|
-
|
|
23876
|
-
|
|
23877
|
-
|
|
23899
|
+
var tableColumn = this.tableColumn,
|
|
23900
|
+
visibleColumn = this.visibleColumn;
|
|
23901
|
+
return tableColumn.length || visibleColumn.length ? visibleColumn.filter(function (column) {
|
|
23902
|
+
return column.width === 'auto' || column.minWidth === 'auto';
|
|
23903
|
+
}) : [];
|
|
23878
23904
|
},
|
|
23879
23905
|
fixedColumnSize: function fixedColumnSize() {
|
|
23880
23906
|
var collectColumn = this.collectColumn;
|
|
@@ -24233,6 +24259,9 @@ function handleUupdateResize(_vm) {
|
|
|
24233
24259
|
var currLoading = this._isLoading || loading;
|
|
24234
24260
|
return h('div', {
|
|
24235
24261
|
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))],
|
|
24262
|
+
attrs: {
|
|
24263
|
+
spellcheck: false
|
|
24264
|
+
},
|
|
24236
24265
|
on: {
|
|
24237
24266
|
keydown: this.keydownEvent
|
|
24238
24267
|
}
|
|
@@ -26191,26 +26220,26 @@ function handleInsertRowAt(_vm, records, row, isInsertNextRow) {
|
|
|
26191
26220
|
var editRender = column.editRender;
|
|
26192
26221
|
if (isEnableConf(editRender)) {
|
|
26193
26222
|
var compRender = v_x_e_table.renderer.get(editRender.name);
|
|
26194
|
-
var
|
|
26195
|
-
|
|
26223
|
+
var autoFocus = editRender.autofocus || editRender.autoFocus;
|
|
26224
|
+
var autoSelect = editRender.autoSelect || editRender.autoselect;
|
|
26196
26225
|
var inputElem;
|
|
26197
|
-
if (!
|
|
26198
|
-
|
|
26226
|
+
if (!autoFocus && compRender) {
|
|
26227
|
+
autoFocus = compRender.tableAutoFocus || compRender.tableAutofocus || compRender.autofocus;
|
|
26199
26228
|
}
|
|
26200
|
-
if (!
|
|
26201
|
-
|
|
26229
|
+
if (!autoSelect && compRender) {
|
|
26230
|
+
autoSelect = compRender.tableAutoSelect || compRender.autoselect;
|
|
26202
26231
|
}
|
|
26203
26232
|
// 如果指定了聚焦 class
|
|
26204
|
-
if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(
|
|
26205
|
-
inputElem =
|
|
26206
|
-
} else if (
|
|
26207
|
-
inputElem = cell.querySelector(
|
|
26233
|
+
if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(autoFocus)) {
|
|
26234
|
+
inputElem = autoFocus.call(this, params);
|
|
26235
|
+
} else if (autoFocus) {
|
|
26236
|
+
inputElem = cell.querySelector(autoFocus);
|
|
26208
26237
|
if (inputElem) {
|
|
26209
26238
|
inputElem.focus();
|
|
26210
26239
|
}
|
|
26211
26240
|
}
|
|
26212
26241
|
if (inputElem) {
|
|
26213
|
-
if (
|
|
26242
|
+
if (autoSelect) {
|
|
26214
26243
|
inputElem.select();
|
|
26215
26244
|
} else {
|
|
26216
26245
|
// 保持一致行为,光标移到末端
|
|
@@ -28940,7 +28969,8 @@ function renderExtraSuffixIcon(h, _vm) {
|
|
|
28940
28969
|
maxlength: inpMaxlength,
|
|
28941
28970
|
readonly: inpReadonly,
|
|
28942
28971
|
disabled: disabled,
|
|
28943
|
-
autocomplete: autoComplete || autocomplete
|
|
28972
|
+
autocomplete: autoComplete || autocomplete,
|
|
28973
|
+
spellcheck: false
|
|
28944
28974
|
},
|
|
28945
28975
|
on: {
|
|
28946
28976
|
keydown: this.keydownEvent,
|
|
@@ -30192,7 +30222,7 @@ function renderExtraSuffixIcon(h, _vm) {
|
|
|
30192
30222
|
change: this.changeEvent
|
|
30193
30223
|
}
|
|
30194
30224
|
}), h('span', {
|
|
30195
|
-
class: ['vxe-checkbox--icon', indeterminate ?
|
|
30225
|
+
class: ['vxe-checkbox--icon', indeterminate ? conf.icon.CHECKBOX_INDETERMINATE : isChecked ? conf.icon.CHECKBOX_CHECKED : conf.icon.CHECKBOX_UNCHECKED]
|
|
30196
30226
|
}), h('span', {
|
|
30197
30227
|
class: 'vxe-checkbox--label'
|
|
30198
30228
|
}, $scopedSlots.default ? $scopedSlots.default.call(this, {}) : [getFuncText(content)])]);
|
|
@@ -31895,7 +31925,7 @@ Object.keys(props).forEach(function (name) {
|
|
|
31895
31925
|
click: this.clickEvent
|
|
31896
31926
|
}
|
|
31897
31927
|
}), h('span', {
|
|
31898
|
-
class: ['vxe-radio--icon', isChecked ?
|
|
31928
|
+
class: ['vxe-radio--icon', isChecked ? conf.icon.RADIO_CHECKED : conf.icon.RADIO_UNCHECKED]
|
|
31899
31929
|
}), h('span', {
|
|
31900
31930
|
class: 'vxe-radio--label'
|
|
31901
31931
|
}, $scopedSlots.default ? $scopedSlots.default.call(this, {}) : [getFuncText(content)])]);
|
|
@@ -32202,7 +32232,7 @@ function hasTreeChildren($xetable, row) {
|
|
|
32202
32232
|
var childrenField = treeOpts.children || treeOpts.childrenField;
|
|
32203
32233
|
return row[childrenField] && row[childrenField].length > 0;
|
|
32204
32234
|
}
|
|
32205
|
-
function getSeq($xetable, row, $rowIndex, column, $columnIndex) {
|
|
32235
|
+
function getSeq($xetable, cellValue, row, $rowIndex, column, $columnIndex) {
|
|
32206
32236
|
var seqOpts = $xetable.seqOpts;
|
|
32207
32237
|
var seqMethod = seqOpts.seqMethod || column.seqMethod;
|
|
32208
32238
|
if (seqMethod) {
|
|
@@ -32215,7 +32245,7 @@ function getSeq($xetable, row, $rowIndex, column, $columnIndex) {
|
|
|
32215
32245
|
$columnIndex: $columnIndex
|
|
32216
32246
|
});
|
|
32217
32247
|
}
|
|
32218
|
-
return
|
|
32248
|
+
return cellValue;
|
|
32219
32249
|
}
|
|
32220
32250
|
function defaultFilterExportColumn(column) {
|
|
32221
32251
|
return column.property || ['seq', 'checkbox', 'radio'].indexOf(column.type) > -1;
|
|
@@ -32282,10 +32312,13 @@ function getLabelData($xetable, opts, columns, datas) {
|
|
|
32282
32312
|
} else {
|
|
32283
32313
|
switch (column.type) {
|
|
32284
32314
|
case 'seq':
|
|
32285
|
-
|
|
32286
|
-
|
|
32287
|
-
|
|
32288
|
-
|
|
32315
|
+
{
|
|
32316
|
+
var seqValue = path.map(function (num, i) {
|
|
32317
|
+
return i % 2 === 0 ? Number(num) + 1 : '.';
|
|
32318
|
+
}).join('');
|
|
32319
|
+
cellValue = mode === 'all' ? seqValue : getSeq($xetable, seqValue, row, $rowIndex, column, $columnIndex);
|
|
32320
|
+
break;
|
|
32321
|
+
}
|
|
32289
32322
|
case 'checkbox':
|
|
32290
32323
|
cellValue = toBooleanValue($xetable.isCheckedByCheckboxRow(row));
|
|
32291
32324
|
_item._checkboxLabel = checkboxOpts.labelField ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(row, checkboxOpts.labelField) : '';
|
|
@@ -32351,8 +32384,11 @@ function getLabelData($xetable, opts, columns, datas) {
|
|
|
32351
32384
|
} else {
|
|
32352
32385
|
switch (column.type) {
|
|
32353
32386
|
case 'seq':
|
|
32354
|
-
|
|
32355
|
-
|
|
32387
|
+
{
|
|
32388
|
+
var seqValue = $rowIndex + 1;
|
|
32389
|
+
cellValue = mode === 'all' ? seqValue : getSeq($xetable, seqValue, row, $rowIndex, column, $columnIndex);
|
|
32390
|
+
break;
|
|
32391
|
+
}
|
|
32356
32392
|
case 'checkbox':
|
|
32357
32393
|
cellValue = toBooleanValue($xetable.isCheckedByCheckboxRow(row));
|
|
32358
32394
|
item._checkboxLabel = checkboxOpts.labelField ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(row, checkboxOpts.labelField) : '';
|
|
@@ -35397,7 +35433,8 @@ var renderPopupPanel = function renderPopupPanel(h, _vm) {
|
|
|
35397
35433
|
}, conf.i18n('vxe.custom.setting.colSort')), h('vxe-tooltip', {
|
|
35398
35434
|
props: {
|
|
35399
35435
|
enterable: true,
|
|
35400
|
-
content: conf.i18n('vxe.custom.setting.sortHelpTip')
|
|
35436
|
+
content: conf.i18n('vxe.custom.setting.sortHelpTip'),
|
|
35437
|
+
popupClassName: 'vxe-table--ignore-clear'
|
|
35401
35438
|
},
|
|
35402
35439
|
scopedSlots: {
|
|
35403
35440
|
default: function _default() {
|
|
@@ -36517,13 +36554,11 @@ Object.keys(packages_table.methods).forEach(function (name) {
|
|
|
36517
36554
|
}
|
|
36518
36555
|
},
|
|
36519
36556
|
created: function created() {
|
|
36520
|
-
|
|
36521
|
-
|
|
36522
|
-
|
|
36523
|
-
|
|
36524
|
-
|
|
36525
|
-
errLog('vxe.error.errConflicts', ['grid.data', 'grid.proxy-config']);
|
|
36526
|
-
}
|
|
36557
|
+
// const { data, formOpts, proxyOpts, proxyConfig } = this
|
|
36558
|
+
// if (proxyConfig && (data || (proxyOpts.form && formOpts.data))) {
|
|
36559
|
+
// errLog('vxe.error.errConflicts', ['grid.data', 'grid.proxy-config'])
|
|
36560
|
+
// }
|
|
36561
|
+
|
|
36527
36562
|
if (false) {}
|
|
36528
36563
|
this.initPages();
|
|
36529
36564
|
GlobalEvent.on(this, 'keydown', this.handleGlobalKeydownEvent);
|
|
@@ -36615,7 +36650,7 @@ Object.keys(packages_table.methods).forEach(function (name) {
|
|
|
36615
36650
|
formOpts = this.formOpts;
|
|
36616
36651
|
if (proxyConfig) {
|
|
36617
36652
|
if (isEnableConf(formConfig) && proxyOpts.form && formOpts.items) {
|
|
36618
|
-
var
|
|
36653
|
+
var fData = {};
|
|
36619
36654
|
formOpts.items.forEach(function (item) {
|
|
36620
36655
|
var field = item.field,
|
|
36621
36656
|
itemRender = item.itemRender;
|
|
@@ -36631,10 +36666,10 @@ Object.keys(packages_table.methods).forEach(function (name) {
|
|
|
36631
36666
|
itemValue = defaultValue;
|
|
36632
36667
|
}
|
|
36633
36668
|
}
|
|
36634
|
-
|
|
36669
|
+
fData[field] = itemValue;
|
|
36635
36670
|
}
|
|
36636
36671
|
});
|
|
36637
|
-
this.formData =
|
|
36672
|
+
this.formData = fData;
|
|
36638
36673
|
}
|
|
36639
36674
|
if (!proxyInited && proxyOpts.autoLoad !== false) {
|
|
36640
36675
|
this.proxyInited = true;
|
|
@@ -36670,7 +36705,6 @@ Object.keys(packages_table.methods).forEach(function (name) {
|
|
|
36670
36705
|
tablePage = this.tablePage,
|
|
36671
36706
|
pagerConfig = this.pagerConfig,
|
|
36672
36707
|
editRules = this.editRules,
|
|
36673
|
-
formData = this.formData,
|
|
36674
36708
|
isRespMsg = this.isRespMsg,
|
|
36675
36709
|
isActiveMsg = this.isActiveMsg,
|
|
36676
36710
|
validConfig = this.validConfig,
|
|
@@ -36685,6 +36719,7 @@ Object.keys(packages_table.methods).forEach(function (name) {
|
|
|
36685
36719
|
ajax = _proxyOpts$ajax === void 0 ? {} : _proxyOpts$ajax;
|
|
36686
36720
|
var resConfigs = proxyOpts.response || proxyOpts.props || {};
|
|
36687
36721
|
var $xetable = $refs.xTable;
|
|
36722
|
+
var formData = this.getFormData();
|
|
36688
36723
|
var button;
|
|
36689
36724
|
var code;
|
|
36690
36725
|
if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isString(proxyTarget)) {
|
|
@@ -37113,6 +37148,13 @@ Object.keys(packages_table.methods).forEach(function (name) {
|
|
|
37113
37148
|
}
|
|
37114
37149
|
return Promise.resolve();
|
|
37115
37150
|
},
|
|
37151
|
+
getFormData: function getFormData() {
|
|
37152
|
+
var proxyConfig = this.proxyConfig,
|
|
37153
|
+
proxyOpts = this.proxyOpts,
|
|
37154
|
+
formOpts = this.formOpts,
|
|
37155
|
+
formData = this.formData;
|
|
37156
|
+
return proxyConfig && isEnableConf(proxyOpts) && proxyOpts.form ? formData : formOpts.data;
|
|
37157
|
+
},
|
|
37116
37158
|
getFormItems: function getFormItems(itemIndex) {
|
|
37117
37159
|
var formConfig = this.formConfig,
|
|
37118
37160
|
formOpts = this.formOpts;
|
|
@@ -37330,7 +37372,7 @@ Object.keys(packages_table.methods).forEach(function (name) {
|
|
|
37330
37372
|
return {
|
|
37331
37373
|
data: this.tableData,
|
|
37332
37374
|
filter: this.filterData,
|
|
37333
|
-
form: this.
|
|
37375
|
+
form: this.getFormData(),
|
|
37334
37376
|
sort: sortData.length ? sortData[0] : {},
|
|
37335
37377
|
sorts: sortData,
|
|
37336
37378
|
pager: this.tablePage,
|
|
@@ -38994,7 +39036,10 @@ var autoTxtElem;
|
|
|
38994
39036
|
attrs.placeholder = getFuncText(placeholder);
|
|
38995
39037
|
}
|
|
38996
39038
|
return h('div', {
|
|
38997
|
-
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))]
|
|
39039
|
+
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))],
|
|
39040
|
+
attrs: {
|
|
39041
|
+
spellcheck: false
|
|
39042
|
+
}
|
|
38998
39043
|
}, [h('textarea', {
|
|
38999
39044
|
ref: 'textarea',
|
|
39000
39045
|
class: 'vxe-textarea--inner',
|
|
@@ -40251,6 +40296,8 @@ var ItemConfig = /*#__PURE__*/function () {
|
|
|
40251
40296
|
titleAlign: item.titleAlign,
|
|
40252
40297
|
titleWidth: item.titleWidth,
|
|
40253
40298
|
titleColon: item.titleColon,
|
|
40299
|
+
vertical: item.vertical,
|
|
40300
|
+
padding: item.padding,
|
|
40254
40301
|
titleAsterisk: item.titleAsterisk,
|
|
40255
40302
|
titlePrefix: item.titlePrefix,
|
|
40256
40303
|
titleSuffix: item.titleSuffix,
|
|
@@ -40471,12 +40518,14 @@ var VxeFormConfigItem = {
|
|
|
40471
40518
|
readonly = $xeform.readonly,
|
|
40472
40519
|
collapseAll = $xeform.collapseAll,
|
|
40473
40520
|
validOpts = $xeform.validOpts,
|
|
40521
|
+
allTitleBold = $xeform.titleBold,
|
|
40474
40522
|
allTitleAlign = $xeform.titleAlign,
|
|
40475
40523
|
allTitleWidth = $xeform.titleWidth,
|
|
40476
40524
|
allTitleColon = $xeform.titleColon,
|
|
40477
40525
|
allTitleAsterisk = $xeform.titleAsterisk,
|
|
40478
40526
|
allTitleOverflow = $xeform.titleOverflow,
|
|
40479
|
-
allVertical = $xeform.vertical
|
|
40527
|
+
allVertical = $xeform.vertical,
|
|
40528
|
+
allPadding = $xeform.padding;
|
|
40480
40529
|
var slots = item.slots,
|
|
40481
40530
|
title = item.title,
|
|
40482
40531
|
folding = item.folding,
|
|
@@ -40489,6 +40538,7 @@ var VxeFormConfigItem = {
|
|
|
40489
40538
|
className = item.className,
|
|
40490
40539
|
titleOverflow = item.titleOverflow,
|
|
40491
40540
|
vertical = item.vertical,
|
|
40541
|
+
padding = item.padding,
|
|
40492
40542
|
children = item.children,
|
|
40493
40543
|
showTitle = item.showTitle,
|
|
40494
40544
|
contentClassName = item.contentClassName,
|
|
@@ -40504,12 +40554,14 @@ var VxeFormConfigItem = {
|
|
|
40504
40554
|
var itemTitleStyle = compConf ? compConf.formItemTitleStyle || compConf.itemTitleStyle : null;
|
|
40505
40555
|
var span = item.span || $xeform.span;
|
|
40506
40556
|
var align = item.align || $xeform.align;
|
|
40557
|
+
var itemPadding = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eqNull(padding) ? allPadding : padding;
|
|
40558
|
+
var itemVertical = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eqNull(vertical) ? allVertical : vertical;
|
|
40559
|
+
var titleBold = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eqNull(item.titleBold) ? allTitleBold : item.titleBold;
|
|
40507
40560
|
var titleAlign = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eqNull(item.titleAlign) ? allTitleAlign : item.titleAlign;
|
|
40508
|
-
var titleWidth = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eqNull(item.titleWidth) ? allTitleWidth : item.titleWidth;
|
|
40561
|
+
var titleWidth = itemVertical ? null : external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eqNull(item.titleWidth) ? allTitleWidth : item.titleWidth;
|
|
40509
40562
|
var titleColon = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eqNull(item.titleColon) ? allTitleColon : item.titleColon;
|
|
40510
40563
|
var titleAsterisk = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eqNull(item.titleAsterisk) ? allTitleAsterisk : item.titleAsterisk;
|
|
40511
|
-
var itemOverflow = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().
|
|
40512
|
-
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;
|
|
40564
|
+
var itemOverflow = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eqNull(titleOverflow) ? allTitleOverflow : titleOverflow;
|
|
40513
40565
|
var ovEllipsis = itemOverflow === 'ellipsis';
|
|
40514
40566
|
var ovTitle = itemOverflow === 'title';
|
|
40515
40567
|
var ovTooltip = itemOverflow === true || itemOverflow === 'tooltip';
|
|
@@ -40524,7 +40576,8 @@ var VxeFormConfigItem = {
|
|
|
40524
40576
|
$form: $xeform,
|
|
40525
40577
|
$grid: $xeform.xegrid
|
|
40526
40578
|
};
|
|
40527
|
-
var isRequired;
|
|
40579
|
+
var isRequired = false;
|
|
40580
|
+
var isValid = false;
|
|
40528
40581
|
if (visible === false) {
|
|
40529
40582
|
return _e();
|
|
40530
40583
|
}
|
|
@@ -40545,7 +40598,8 @@ var VxeFormConfigItem = {
|
|
|
40545
40598
|
}
|
|
40546
40599
|
if (!readonly && rules) {
|
|
40547
40600
|
var itemRules = rules[field];
|
|
40548
|
-
if (itemRules) {
|
|
40601
|
+
if (itemRules && itemRules.length) {
|
|
40602
|
+
isValid = true;
|
|
40549
40603
|
isRequired = itemRules.some(function (rule) {
|
|
40550
40604
|
return rule.required;
|
|
40551
40605
|
});
|
|
@@ -40572,8 +40626,11 @@ var VxeFormConfigItem = {
|
|
|
40572
40626
|
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 : '', {
|
|
40573
40627
|
'is--title': title,
|
|
40574
40628
|
'is--colon': titleColon,
|
|
40629
|
+
'is--bold': titleBold,
|
|
40630
|
+
'is--padding': itemPadding,
|
|
40575
40631
|
'is--vertical': itemVertical,
|
|
40576
40632
|
'is--asterisk': titleAsterisk,
|
|
40633
|
+
'is--valid': isValid,
|
|
40577
40634
|
'is--required': isRequired,
|
|
40578
40635
|
'is--hidden': folding && collapseAll,
|
|
40579
40636
|
'is--active': isActivetem($xeform, item),
|
|
@@ -40733,6 +40790,12 @@ function getResetValue(value, resetValue) {
|
|
|
40733
40790
|
return conf.form.align;
|
|
40734
40791
|
}
|
|
40735
40792
|
},
|
|
40793
|
+
titleBold: {
|
|
40794
|
+
type: String,
|
|
40795
|
+
default: function _default() {
|
|
40796
|
+
return conf.form.titleBold;
|
|
40797
|
+
}
|
|
40798
|
+
},
|
|
40736
40799
|
titleAlign: {
|
|
40737
40800
|
type: String,
|
|
40738
40801
|
default: function _default() {
|
|
@@ -40765,6 +40828,12 @@ function getResetValue(value, resetValue) {
|
|
|
40765
40828
|
type: Boolean,
|
|
40766
40829
|
default: null
|
|
40767
40830
|
},
|
|
40831
|
+
padding: {
|
|
40832
|
+
type: Boolean,
|
|
40833
|
+
default: function _default() {
|
|
40834
|
+
return conf.form.padding;
|
|
40835
|
+
}
|
|
40836
|
+
},
|
|
40768
40837
|
className: [String, Function],
|
|
40769
40838
|
disabled: Boolean,
|
|
40770
40839
|
readonly: Boolean,
|
|
@@ -40856,6 +40925,9 @@ function getResetValue(value, resetValue) {
|
|
|
40856
40925
|
data: data,
|
|
40857
40926
|
$form: this
|
|
40858
40927
|
}) : className : '', _defineProperty(_defineProperty({}, "size--".concat(vSize), vSize), 'is--loading', loading)],
|
|
40928
|
+
attrs: {
|
|
40929
|
+
spellcheck: false
|
|
40930
|
+
},
|
|
40859
40931
|
on: {
|
|
40860
40932
|
submit: this.submitEvent,
|
|
40861
40933
|
reset: this.resetEvent
|
|
@@ -41109,10 +41181,12 @@ function getResetValue(value, resetValue) {
|
|
|
41109
41181
|
return this.$nextTick();
|
|
41110
41182
|
}
|
|
41111
41183
|
var fields = [];
|
|
41112
|
-
if (
|
|
41113
|
-
|
|
41114
|
-
|
|
41115
|
-
|
|
41184
|
+
if (fieldOrItem) {
|
|
41185
|
+
if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(fieldOrItem)) {
|
|
41186
|
+
fields = fieldOrItem;
|
|
41187
|
+
} else {
|
|
41188
|
+
fields = [fieldOrItem];
|
|
41189
|
+
}
|
|
41116
41190
|
}
|
|
41117
41191
|
return this.beginValidate(fields.map(function (field) {
|
|
41118
41192
|
return handleFieldOrItem(_this6, field);
|
|
@@ -41308,13 +41382,10 @@ function getResetValue(value, resetValue) {
|
|
|
41308
41382
|
if (!i) {
|
|
41309
41383
|
dom.scrollToView($el.querySelector(".".concat(item.id)));
|
|
41310
41384
|
}
|
|
41385
|
+
var autoFocus = itemRender.autoFocus || itemRender.autofocus || (compConf ? compConf.formItemAutoFocus : null);
|
|
41311
41386
|
// 如果指定了聚焦 class
|
|
41312
|
-
if (
|
|
41313
|
-
inputElem = $el.querySelector(".".concat(item.id, " ").concat(
|
|
41314
|
-
}
|
|
41315
|
-
// 渲染器的聚焦处理
|
|
41316
|
-
if (!inputElem && compConf && compConf.autofocus) {
|
|
41317
|
-
inputElem = $el.querySelector(".".concat(item.id, " ").concat(compConf.autofocus));
|
|
41387
|
+
if (autoFocus) {
|
|
41388
|
+
inputElem = $el.querySelector(".".concat(item.id, " ").concat(autoFocus));
|
|
41318
41389
|
}
|
|
41319
41390
|
if (inputElem) {
|
|
41320
41391
|
inputElem.focus();
|
|
@@ -41390,6 +41461,10 @@ var form_item_props = {
|
|
|
41390
41461
|
size: String,
|
|
41391
41462
|
span: [String, Number],
|
|
41392
41463
|
align: String,
|
|
41464
|
+
titleBold: {
|
|
41465
|
+
type: Boolean,
|
|
41466
|
+
default: null
|
|
41467
|
+
},
|
|
41393
41468
|
titleAlign: {
|
|
41394
41469
|
type: String,
|
|
41395
41470
|
default: null
|
|
@@ -41414,6 +41489,10 @@ var form_item_props = {
|
|
|
41414
41489
|
type: Boolean,
|
|
41415
41490
|
default: null
|
|
41416
41491
|
},
|
|
41492
|
+
padding: {
|
|
41493
|
+
type: Boolean,
|
|
41494
|
+
default: null
|
|
41495
|
+
},
|
|
41417
41496
|
className: [String, Function],
|
|
41418
41497
|
contentClassName: [String, Function],
|
|
41419
41498
|
contentStyle: [Object, Function],
|
|
@@ -41452,12 +41531,14 @@ var renderItem = function renderItem(h, _vm, item, slots) {
|
|
|
41452
41531
|
readonly = _vm.readonly,
|
|
41453
41532
|
collapseAll = _vm.collapseAll,
|
|
41454
41533
|
validOpts = _vm.validOpts,
|
|
41534
|
+
allTitleBold = _vm.titleBold,
|
|
41455
41535
|
allTitleAlign = _vm.titleAlign,
|
|
41456
41536
|
allTitleWidth = _vm.titleWidth,
|
|
41457
41537
|
allTitleColon = _vm.titleColon,
|
|
41458
41538
|
allTitleAsterisk = _vm.titleAsterisk,
|
|
41459
41539
|
allTitleOverflow = _vm.titleOverflow,
|
|
41460
|
-
allVertical = _vm.vertical
|
|
41540
|
+
allVertical = _vm.vertical,
|
|
41541
|
+
allPadding = _vm.padding;
|
|
41461
41542
|
var title = item.title,
|
|
41462
41543
|
folding = item.folding,
|
|
41463
41544
|
visible = item.visible,
|
|
@@ -41469,6 +41550,7 @@ var renderItem = function renderItem(h, _vm, item, slots) {
|
|
|
41469
41550
|
className = item.className,
|
|
41470
41551
|
titleOverflow = item.titleOverflow,
|
|
41471
41552
|
vertical = item.vertical,
|
|
41553
|
+
padding = item.padding,
|
|
41472
41554
|
showTitle = item.showTitle,
|
|
41473
41555
|
contentClassName = item.contentClassName,
|
|
41474
41556
|
contentStyle = item.contentStyle,
|
|
@@ -41483,12 +41565,14 @@ var renderItem = function renderItem(h, _vm, item, slots) {
|
|
|
41483
41565
|
var itemTitleStyle = compConf ? compConf.formItemTitleStyle || compConf.itemTitleStyle : null;
|
|
41484
41566
|
var span = item.span || _vm.span;
|
|
41485
41567
|
var align = item.align || _vm.align;
|
|
41568
|
+
var itemPadding = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eqNull(padding) ? allPadding : padding;
|
|
41569
|
+
var itemVertical = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eqNull(vertical) ? allVertical : vertical;
|
|
41570
|
+
var titleBold = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eqNull(item.titleBold) ? allTitleBold : item.titleBold;
|
|
41486
41571
|
var titleAlign = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eqNull(item.titleAlign) ? allTitleAlign : item.titleAlign;
|
|
41487
|
-
var titleWidth = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eqNull(item.titleWidth) ? allTitleWidth : item.titleWidth;
|
|
41572
|
+
var titleWidth = itemVertical ? null : external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eqNull(item.titleWidth) ? allTitleWidth : item.titleWidth;
|
|
41488
41573
|
var titleColon = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eqNull(item.titleColon) ? allTitleColon : item.titleColon;
|
|
41489
41574
|
var titleAsterisk = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eqNull(item.titleAsterisk) ? allTitleAsterisk : item.titleAsterisk;
|
|
41490
|
-
var itemOverflow = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().
|
|
41491
|
-
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;
|
|
41575
|
+
var itemOverflow = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eqNull(titleOverflow) ? allTitleOverflow : titleOverflow;
|
|
41492
41576
|
var ovEllipsis = itemOverflow === 'ellipsis';
|
|
41493
41577
|
var ovTitle = itemOverflow === 'title';
|
|
41494
41578
|
var ovTooltip = itemOverflow === true || itemOverflow === 'tooltip';
|
|
@@ -41503,13 +41587,15 @@ var renderItem = function renderItem(h, _vm, item, slots) {
|
|
|
41503
41587
|
$form: _vm,
|
|
41504
41588
|
$grid: _vm.xegrid
|
|
41505
41589
|
};
|
|
41506
|
-
var isRequired;
|
|
41590
|
+
var isRequired = false;
|
|
41591
|
+
var isValid = false;
|
|
41507
41592
|
if (visible === false) {
|
|
41508
41593
|
return _e();
|
|
41509
41594
|
}
|
|
41510
41595
|
if (!readonly && rules) {
|
|
41511
41596
|
var itemRules = rules[field];
|
|
41512
|
-
if (itemRules) {
|
|
41597
|
+
if (itemRules && itemRules.length) {
|
|
41598
|
+
isValid = true;
|
|
41513
41599
|
isRequired = itemRules.some(function (rule) {
|
|
41514
41600
|
return rule.required;
|
|
41515
41601
|
});
|
|
@@ -41536,8 +41622,11 @@ var renderItem = function renderItem(h, _vm, item, slots) {
|
|
|
41536
41622
|
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 : '', {
|
|
41537
41623
|
'is--title': title,
|
|
41538
41624
|
'is--colon': titleColon,
|
|
41625
|
+
'is--bold': titleBold,
|
|
41626
|
+
'is--padding': itemPadding,
|
|
41539
41627
|
'is--vertical': itemVertical,
|
|
41540
41628
|
'is--asterisk': titleAsterisk,
|
|
41629
|
+
'is--valid': isValid,
|
|
41541
41630
|
'is--required': isRequired,
|
|
41542
41631
|
'is--hidden': folding && collapseAll,
|
|
41543
41632
|
'is--active': isActivetem(_vm, item),
|