vxe-table 3.6.14-beta.0 → 3.6.14-beta.2
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/README.md +1 -1
- package/lib/edit/src/mixin.js +23 -31
- package/lib/edit/src/mixin.min.js +1 -1
- package/lib/form/src/form-config-item.js +7 -2
- package/lib/form/src/form-config-item.min.js +1 -1
- package/lib/form/src/form-item.js +7 -2
- package/lib/form/src/form-item.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 +114 -91
- package/lib/index.umd.min.js +1 -1
- package/lib/select/src/select.js +8 -2
- package/lib/select/src/select.min.js +1 -1
- package/lib/style.css +1 -1
- package/lib/style.min.css +1 -1
- package/lib/table/src/body.js +5 -5
- package/lib/table/src/body.min.js +1 -1
- package/lib/table/src/methods.js +68 -46
- package/lib/table/src/methods.min.js +1 -1
- package/lib/table/src/table.js +3 -1
- package/lib/table/src/table.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/package.json +1 -1
- package/packages/edit/src/mixin.js +18 -22
- package/packages/form/src/form-config-item.js +7 -2
- package/packages/form/src/form-item.js +7 -2
- package/packages/select/src/select.js +4 -2
- package/packages/table/src/body.js +5 -5
- package/packages/table/src/methods.js +66 -35
- package/packages/table/src/table.js +3 -1
- package/types/table.d.ts +6 -0
- package/types/v-x-e-table/renderer.d.ts +11 -7
- /package/lib/icon/style/{iconfont.1682555826742.ttf → iconfont.1684560851897.ttf} +0 -0
- /package/lib/icon/style/{iconfont.1682555826742.woff → iconfont.1684560851897.woff} +0 -0
- /package/lib/icon/style/{iconfont.1682555826742.woff2 → iconfont.1684560851897.woff2} +0 -0
- /package/lib/{iconfont.1682555826742.ttf → iconfont.1684560851897.ttf} +0 -0
- /package/lib/{iconfont.1682555826742.woff → iconfont.1684560851897.woff} +0 -0
- /package/lib/{iconfont.1682555826742.woff2 → iconfont.1684560851897.woff2} +0 -0
package/lib/index.umd.js
CHANGED
|
@@ -11033,7 +11033,7 @@ var es_array_concat = __webpack_require__(2222);
|
|
|
11033
11033
|
|
|
11034
11034
|
|
|
11035
11035
|
function getLog(message, params) {
|
|
11036
|
-
return "[vxe-table v".concat("3.6.14-beta.
|
|
11036
|
+
return "[vxe-table v".concat("3.6.14-beta.2", "] ").concat(conf.i18n(message, params));
|
|
11037
11037
|
}
|
|
11038
11038
|
function outLog(type) {
|
|
11039
11039
|
return function (message, params) {
|
|
@@ -12220,7 +12220,7 @@ function _t(key, args) {
|
|
|
12220
12220
|
var v = 'v3';
|
|
12221
12221
|
var VXETable = {
|
|
12222
12222
|
v: v,
|
|
12223
|
-
version: "3.6.14-beta.
|
|
12223
|
+
version: "3.6.14-beta.2",
|
|
12224
12224
|
reg: reg,
|
|
12225
12225
|
use: use,
|
|
12226
12226
|
setup: setup,
|
|
@@ -13086,7 +13086,8 @@ function renderColumn(h, _vm, $xetable, seq, rowid, fixedType, rowLevel, row, ro
|
|
|
13086
13086
|
var rowHeight = rowOpts.height;
|
|
13087
13087
|
var renderOpts = editRender || cellRender;
|
|
13088
13088
|
var compConf = renderOpts ? v_x_e_table.renderer.get(renderOpts.name) : null;
|
|
13089
|
-
var
|
|
13089
|
+
var compCellClassName = compConf ? compConf.cellClassName : '';
|
|
13090
|
+
var compCellStyle = compConf ? compConf.cellStyle : '';
|
|
13090
13091
|
var showAllTip = tooltipOpts.showAll || tooltipOpts.enabled;
|
|
13091
13092
|
var columnIndex = $xetable.getColumnIndex(column);
|
|
13092
13093
|
var _columnIndex = $xetable.getVTColumnIndex(column);
|
|
@@ -13268,12 +13269,12 @@ function renderColumn(h, _vm, $xetable, seq, rowid, fixedType, rowLevel, row, ro
|
|
|
13268
13269
|
}
|
|
13269
13270
|
}
|
|
13270
13271
|
return h('td', {
|
|
13271
|
-
"class": ['vxe-body--column', column.id, (_ref2 = {}, _defineProperty(_ref2, "col--".concat(cellAlign), cellAlign), _defineProperty(_ref2, "col--".concat(type), type), _defineProperty(_ref2, 'col--last', $columnIndex === columns.length - 1), _defineProperty(_ref2, 'col--tree-node', treeNode), _defineProperty(_ref2, 'col--edit', isEdit), _defineProperty(_ref2, 'col--ellipsis', hasEllipsis), _defineProperty(_ref2, 'fixed--hidden', fixedHiddenColumn), _defineProperty(_ref2, 'col--dirty', isDirty), _defineProperty(_ref2, 'col--actived', editConfig && isEdit && actived.row === row && (actived.column === column || editOpts.mode === 'row')), _defineProperty(_ref2, 'col--valid-error', hasValidError), _defineProperty(_ref2, 'col--current', currentColumn === column), _ref2), utils.getClass(
|
|
13272
|
+
"class": ['vxe-body--column', column.id, (_ref2 = {}, _defineProperty(_ref2, "col--".concat(cellAlign), cellAlign), _defineProperty(_ref2, "col--".concat(type), type), _defineProperty(_ref2, 'col--last', $columnIndex === columns.length - 1), _defineProperty(_ref2, 'col--tree-node', treeNode), _defineProperty(_ref2, 'col--edit', isEdit), _defineProperty(_ref2, 'col--ellipsis', hasEllipsis), _defineProperty(_ref2, 'fixed--hidden', fixedHiddenColumn), _defineProperty(_ref2, 'col--dirty', isDirty), _defineProperty(_ref2, 'col--actived', editConfig && isEdit && actived.row === row && (actived.column === column || editOpts.mode === 'row')), _defineProperty(_ref2, 'col--valid-error', hasValidError), _defineProperty(_ref2, 'col--current', currentColumn === column), _ref2), utils.getClass(compCellClassName, params), utils.getClass(className, params), utils.getClass(allCellClassName, params)],
|
|
13272
13273
|
key: columnKey || columnOpts.useKey ? column.id : $columnIndex,
|
|
13273
13274
|
attrs: attrs,
|
|
13274
13275
|
style: Object.assign({
|
|
13275
13276
|
height: hasEllipsis && (scrollYRHeight || rowHeight) ? "".concat(scrollYRHeight || rowHeight, "px") : ''
|
|
13276
|
-
},
|
|
13277
|
+
}, external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(compCellStyle) ? compCellStyle(params) : compCellStyle, external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(cellStyle) ? cellStyle(params) : cellStyle),
|
|
13277
13278
|
on: tdOns
|
|
13278
13279
|
}, tdVNs);
|
|
13279
13280
|
}
|
|
@@ -13291,7 +13292,6 @@ function renderRows(h, _vm, $xetable, fixedType, tableData, tableColumn) {
|
|
|
13291
13292
|
editOpts = $xetable.editOpts,
|
|
13292
13293
|
treeExpandeds = $xetable.treeExpandeds,
|
|
13293
13294
|
scrollYLoad = $xetable.scrollYLoad,
|
|
13294
|
-
editStore = $xetable.editStore,
|
|
13295
13295
|
rowExpandeds = $xetable.rowExpandeds,
|
|
13296
13296
|
radioOpts = $xetable.radioOpts,
|
|
13297
13297
|
checkboxOpts = $xetable.checkboxOpts,
|
|
@@ -13347,7 +13347,7 @@ function renderRows(h, _vm, $xetable, fixedType, tableData, tableColumn) {
|
|
|
13347
13347
|
// 是否新增行
|
|
13348
13348
|
var isNewRow = false;
|
|
13349
13349
|
if (editConfig) {
|
|
13350
|
-
isNewRow =
|
|
13350
|
+
isNewRow = $xetable.isInsertByRow(row);
|
|
13351
13351
|
}
|
|
13352
13352
|
if (treeConfig && !scrollYLoad && !treeOpts.transform && treeExpandeds.length) {
|
|
13353
13353
|
rowChildren = row[treeOpts.children];
|
|
@@ -15743,8 +15743,9 @@ var Methods = {
|
|
|
15743
15743
|
treeOpts = this.treeOpts,
|
|
15744
15744
|
sYOpts = this.sYOpts;
|
|
15745
15745
|
var transform = treeOpts.transform;
|
|
15746
|
+
var allList = fullData || this.tableFullData;
|
|
15746
15747
|
// 如果gt为0,则总是启用
|
|
15747
|
-
var scrollYLoad = (transform || !treeConfig) && !!sYOpts.enabled && sYOpts.gt > -1 && (sYOpts.gt === 0 || sYOpts.gt <=
|
|
15748
|
+
var scrollYLoad = (transform || !treeConfig) && !!sYOpts.enabled && sYOpts.gt > -1 && (sYOpts.gt === 0 || sYOpts.gt <= allList.length);
|
|
15748
15749
|
this.scrollYLoad = scrollYLoad;
|
|
15749
15750
|
return scrollYLoad;
|
|
15750
15751
|
},
|
|
@@ -15787,7 +15788,9 @@ var Methods = {
|
|
|
15787
15788
|
scrollXStore.startIndex = 0;
|
|
15788
15789
|
scrollXStore.endIndex = 1;
|
|
15789
15790
|
editStore.insertList = [];
|
|
15791
|
+
editStore.insertMaps = {};
|
|
15790
15792
|
editStore.removeList = [];
|
|
15793
|
+
editStore.removeMaps = {};
|
|
15791
15794
|
var sYLoad = this.updateScrollYStatus(fullData);
|
|
15792
15795
|
this.scrollYLoad = sYLoad;
|
|
15793
15796
|
// 全量数据
|
|
@@ -16083,7 +16086,9 @@ var Methods = {
|
|
|
16083
16086
|
var tableFullColumn = this.tableFullColumn,
|
|
16084
16087
|
collectColumn = this.collectColumn,
|
|
16085
16088
|
fullColumnMap = this.fullColumnMap,
|
|
16086
|
-
showOverflow = this.showOverflow
|
|
16089
|
+
showOverflow = this.showOverflow,
|
|
16090
|
+
columnOpts = this.columnOpts,
|
|
16091
|
+
rowOpts = this.rowOpts;
|
|
16087
16092
|
var fullColumnIdData = this.fullColumnIdData = {};
|
|
16088
16093
|
var fullColumnFieldData = this.fullColumnFieldData = {};
|
|
16089
16094
|
var isGroup = collectColumn.some(hasChildrenList);
|
|
@@ -16092,6 +16097,7 @@ var Methods = {
|
|
|
16092
16097
|
var treeNodeColumn;
|
|
16093
16098
|
var checkboxColumn;
|
|
16094
16099
|
var radioColumn;
|
|
16100
|
+
var htmlColumn;
|
|
16095
16101
|
var hasFixed;
|
|
16096
16102
|
var handleFunc = function handleFunc(column, index, items, path, parent) {
|
|
16097
16103
|
var colid = column.id,
|
|
@@ -16113,6 +16119,9 @@ var Methods = {
|
|
|
16113
16119
|
if (!hasFixed && fixed) {
|
|
16114
16120
|
hasFixed = fixed;
|
|
16115
16121
|
}
|
|
16122
|
+
if (!htmlColumn && type === 'html') {
|
|
16123
|
+
htmlColumn = column;
|
|
16124
|
+
}
|
|
16116
16125
|
if (treeNode) {
|
|
16117
16126
|
if (false) {}
|
|
16118
16127
|
if (!treeNodeColumn) {
|
|
@@ -16126,6 +16135,7 @@ var Methods = {
|
|
|
16126
16135
|
}
|
|
16127
16136
|
if (false) {}
|
|
16128
16137
|
if (false) {}
|
|
16138
|
+
if (false) {}
|
|
16129
16139
|
if (isAllOverflow && column.showOverflow === false) {
|
|
16130
16140
|
isAllOverflow = false;
|
|
16131
16141
|
}
|
|
@@ -16278,47 +16288,53 @@ var Methods = {
|
|
|
16278
16288
|
},
|
|
16279
16289
|
/**
|
|
16280
16290
|
* 定义行数据中的列属性,如果不存在则定义
|
|
16281
|
-
* @param {Row}
|
|
16291
|
+
* @param {Row} records 行数据
|
|
16282
16292
|
*/
|
|
16283
|
-
defineField: function defineField(
|
|
16293
|
+
defineField: function defineField(records) {
|
|
16294
|
+
var _this13 = this;
|
|
16284
16295
|
var radioOpts = this.radioOpts,
|
|
16285
16296
|
checkboxOpts = this.checkboxOpts,
|
|
16286
16297
|
treeConfig = this.treeConfig,
|
|
16287
16298
|
treeOpts = this.treeOpts,
|
|
16288
16299
|
expandOpts = this.expandOpts;
|
|
16289
16300
|
var rowkey = getRowkey(this);
|
|
16290
|
-
|
|
16291
|
-
|
|
16292
|
-
|
|
16293
|
-
|
|
16294
|
-
|
|
16295
|
-
|
|
16296
|
-
|
|
16297
|
-
|
|
16298
|
-
|
|
16299
|
-
|
|
16300
|
-
|
|
16301
|
-
|
|
16302
|
-
|
|
16301
|
+
if (!external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(records)) {
|
|
16302
|
+
records = [records || {}];
|
|
16303
|
+
}
|
|
16304
|
+
return records.map(function (record) {
|
|
16305
|
+
_this13.tableFullColumn.forEach(function (column) {
|
|
16306
|
+
var field = column.field,
|
|
16307
|
+
editRender = column.editRender;
|
|
16308
|
+
if (field && !external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().has(record, field)) {
|
|
16309
|
+
var cellValue = null;
|
|
16310
|
+
if (editRender) {
|
|
16311
|
+
var defaultValue = editRender.defaultValue;
|
|
16312
|
+
if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(defaultValue)) {
|
|
16313
|
+
cellValue = defaultValue({
|
|
16314
|
+
column: column
|
|
16315
|
+
});
|
|
16316
|
+
} else if (!external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isUndefined(defaultValue)) {
|
|
16317
|
+
cellValue = defaultValue;
|
|
16318
|
+
}
|
|
16303
16319
|
}
|
|
16320
|
+
external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().set(record, field, cellValue);
|
|
16321
|
+
}
|
|
16322
|
+
});
|
|
16323
|
+
var otherFields = [radioOpts.labelField, checkboxOpts.checkField, checkboxOpts.labelField, expandOpts.labelField];
|
|
16324
|
+
otherFields.forEach(function (key) {
|
|
16325
|
+
if (key && eqEmptyValue(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(record, key))) {
|
|
16326
|
+
external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().set(record, key, null);
|
|
16304
16327
|
}
|
|
16305
|
-
|
|
16328
|
+
});
|
|
16329
|
+
if (treeConfig && treeOpts.lazy && external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isUndefined(record[treeOpts.children])) {
|
|
16330
|
+
record[treeOpts.children] = null;
|
|
16306
16331
|
}
|
|
16307
|
-
|
|
16308
|
-
|
|
16309
|
-
|
|
16310
|
-
if (key && eqEmptyValue(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(record, key))) {
|
|
16311
|
-
external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().set(record, key, null);
|
|
16332
|
+
// 必须有行数据的唯一主键,可以自行设置;也可以默认生成一个随机数
|
|
16333
|
+
if (eqEmptyValue(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(record, rowkey))) {
|
|
16334
|
+
external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().set(record, rowkey, getRowUniqueId());
|
|
16312
16335
|
}
|
|
16336
|
+
return record;
|
|
16313
16337
|
});
|
|
16314
|
-
if (treeConfig && treeOpts.lazy && external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isUndefined(record[treeOpts.children])) {
|
|
16315
|
-
record[treeOpts.children] = null;
|
|
16316
|
-
}
|
|
16317
|
-
// 必须有行数据的唯一主键,可以自行设置;也可以默认生成一个随机数
|
|
16318
|
-
if (eqEmptyValue(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(record, rowkey))) {
|
|
16319
|
-
external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().set(record, rowkey, getRowUniqueId());
|
|
16320
|
-
}
|
|
16321
|
-
return record;
|
|
16322
16338
|
},
|
|
16323
16339
|
/**
|
|
16324
16340
|
* 创建 data 对象
|
|
@@ -16326,15 +16342,9 @@ var Methods = {
|
|
|
16326
16342
|
* @param {Array} records 新数据
|
|
16327
16343
|
*/
|
|
16328
16344
|
createData: function createData(records) {
|
|
16329
|
-
var
|
|
16330
|
-
var treeConfig = this.treeConfig,
|
|
16331
|
-
treeOpts = this.treeOpts;
|
|
16332
|
-
var handleRrecord = function handleRrecord(record) {
|
|
16333
|
-
return _this13.defineField(Object.assign({}, record));
|
|
16334
|
-
};
|
|
16335
|
-
var rows = treeConfig ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().mapTree(records, handleRrecord, treeOpts) : records.map(handleRrecord);
|
|
16345
|
+
var _this14 = this;
|
|
16336
16346
|
return this.$nextTick().then(function () {
|
|
16337
|
-
return
|
|
16347
|
+
return _this14.defineField(records);
|
|
16338
16348
|
});
|
|
16339
16349
|
},
|
|
16340
16350
|
/**
|
|
@@ -16343,15 +16353,12 @@ var Methods = {
|
|
|
16343
16353
|
* @param {Array/Object} records 新数据
|
|
16344
16354
|
*/
|
|
16345
16355
|
createRow: function createRow(records) {
|
|
16346
|
-
var _this14 = this;
|
|
16347
16356
|
var isArr = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(records);
|
|
16348
16357
|
if (!isArr) {
|
|
16349
16358
|
records = [records];
|
|
16350
16359
|
}
|
|
16351
|
-
return this
|
|
16352
|
-
return
|
|
16353
|
-
return isArr ? rows : rows[0];
|
|
16354
|
-
});
|
|
16360
|
+
return this.createData(records).then(function (rows) {
|
|
16361
|
+
return isArr ? rows : rows[0];
|
|
16355
16362
|
});
|
|
16356
16363
|
},
|
|
16357
16364
|
/**
|
|
@@ -16438,7 +16445,9 @@ var Methods = {
|
|
|
16438
16445
|
* @param {Row} row 行对象
|
|
16439
16446
|
*/
|
|
16440
16447
|
isInsertByRow: function isInsertByRow(row) {
|
|
16441
|
-
|
|
16448
|
+
var editStore = this.editStore;
|
|
16449
|
+
var rowid = getRowid(this, row);
|
|
16450
|
+
return editStore.insertList.length && editStore.insertMaps[rowid];
|
|
16442
16451
|
},
|
|
16443
16452
|
/**
|
|
16444
16453
|
* 删除所有新增的临时数据
|
|
@@ -19722,7 +19731,7 @@ var Methods = {
|
|
|
19722
19731
|
* 判断指定列是否为筛选状态,如果为空则判断所有列
|
|
19723
19732
|
* @param {String} fieldOrColumn 字段名
|
|
19724
19733
|
*/
|
|
19725
|
-
|
|
19734
|
+
isActiveFilterByColumn: function isActiveFilterByColumn(fieldOrColumn) {
|
|
19726
19735
|
var column = handleFieldOrColumn(this, fieldOrColumn);
|
|
19727
19736
|
if (column) {
|
|
19728
19737
|
return column.filters && column.filters.some(function (option) {
|
|
@@ -19731,6 +19740,10 @@ var Methods = {
|
|
|
19731
19740
|
}
|
|
19732
19741
|
return this.getCheckedFilters().length > 0;
|
|
19733
19742
|
},
|
|
19743
|
+
// 已废弃
|
|
19744
|
+
isFilter: function isFilter(fieldOrColumn) {
|
|
19745
|
+
return this.isActiveFilterByColumn(fieldOrColumn);
|
|
19746
|
+
},
|
|
19734
19747
|
/**
|
|
19735
19748
|
* 判断展开行是否懒加载完成
|
|
19736
19749
|
* @param {Row} row 行对象
|
|
@@ -21545,7 +21558,9 @@ function handleUupdateResize(_vm) {
|
|
|
21545
21558
|
column: null
|
|
21546
21559
|
},
|
|
21547
21560
|
insertList: [],
|
|
21548
|
-
|
|
21561
|
+
insertMaps: {},
|
|
21562
|
+
removeList: [],
|
|
21563
|
+
removeMaps: {}
|
|
21549
21564
|
},
|
|
21550
21565
|
// 存放 tooltip 相关信息
|
|
21551
21566
|
tooltipStore: {
|
|
@@ -23363,8 +23378,7 @@ function insertTreeRow(_vm, newRecords, isAppend) {
|
|
|
23363
23378
|
* @param {Row} row 指定行
|
|
23364
23379
|
*/
|
|
23365
23380
|
_insertAt: function _insertAt(records, row) {
|
|
23366
|
-
var _this = this
|
|
23367
|
-
_editStore$insertList;
|
|
23381
|
+
var _this = this;
|
|
23368
23382
|
var tableFullTreeData = this.tableFullTreeData,
|
|
23369
23383
|
mergeList = this.mergeList,
|
|
23370
23384
|
afterFullData = this.afterFullData,
|
|
@@ -23380,9 +23394,9 @@ function insertTreeRow(_vm, newRecords, isAppend) {
|
|
|
23380
23394
|
if (!external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(records)) {
|
|
23381
23395
|
records = [records];
|
|
23382
23396
|
}
|
|
23383
|
-
var newRecords = records.map(function (record) {
|
|
23384
|
-
return
|
|
23385
|
-
});
|
|
23397
|
+
var newRecords = this.defineField(records.map(function (record) {
|
|
23398
|
+
return Object.assign({}, record);
|
|
23399
|
+
}));
|
|
23386
23400
|
if (!row) {
|
|
23387
23401
|
// 如果为虚拟树
|
|
23388
23402
|
if (treeConfig && transform) {
|
|
@@ -23484,13 +23498,20 @@ function insertTreeRow(_vm, newRecords, isAppend) {
|
|
|
23484
23498
|
}
|
|
23485
23499
|
}
|
|
23486
23500
|
}
|
|
23487
|
-
|
|
23501
|
+
var insertList = editStore.insertList,
|
|
23502
|
+
insertMaps = editStore.insertMaps;
|
|
23503
|
+
newRecords.forEach(function (newRow) {
|
|
23504
|
+
var rowid = getRowid(_this, newRow);
|
|
23505
|
+
insertMaps[rowid] = newRow;
|
|
23506
|
+
});
|
|
23507
|
+
insertList.unshift.apply(insertList, _toConsumableArray(newRecords));
|
|
23508
|
+
this.cacheRowMap();
|
|
23509
|
+
this.updateScrollYStatus();
|
|
23488
23510
|
this.handleTableData(treeConfig && transform);
|
|
23489
23511
|
if (!(treeConfig && transform)) {
|
|
23490
23512
|
this.updateAfterDataIndex();
|
|
23491
23513
|
}
|
|
23492
23514
|
this.updateFooter();
|
|
23493
|
-
this.cacheRowMap();
|
|
23494
23515
|
this.checkSelectionStatus();
|
|
23495
23516
|
if (this.scrollYLoad) {
|
|
23496
23517
|
this.updateScrollYSpace();
|
|
@@ -23526,7 +23547,8 @@ function insertTreeRow(_vm, newRecords, isAppend) {
|
|
|
23526
23547
|
var transform = treeOpts.transform;
|
|
23527
23548
|
var actived = editStore.actived,
|
|
23528
23549
|
removeList = editStore.removeList,
|
|
23529
|
-
insertList = editStore.insertList
|
|
23550
|
+
insertList = editStore.insertList,
|
|
23551
|
+
insertMaps = editStore.insertMaps;
|
|
23530
23552
|
var checkField = checkboxOpts.checkField;
|
|
23531
23553
|
var rest = [];
|
|
23532
23554
|
if (!rows) {
|
|
@@ -23602,10 +23624,12 @@ function insertTreeRow(_vm, newRecords, isAppend) {
|
|
|
23602
23624
|
}
|
|
23603
23625
|
// 从新增中移除已删除的数据
|
|
23604
23626
|
rows.forEach(function (row) {
|
|
23627
|
+
var rowid = getRowid(_this2, row);
|
|
23605
23628
|
var iIndex = _this2.findRowIndexOf(insertList, row);
|
|
23606
23629
|
if (iIndex > -1) {
|
|
23607
23630
|
insertList.splice(iIndex, 1);
|
|
23608
23631
|
}
|
|
23632
|
+
delete insertMaps[rowid];
|
|
23609
23633
|
});
|
|
23610
23634
|
this.handleTableData(treeConfig && transform);
|
|
23611
23635
|
if (!(treeConfig && transform)) {
|
|
@@ -23674,32 +23698,15 @@ function insertTreeRow(_vm, newRecords, isAppend) {
|
|
|
23674
23698
|
*/
|
|
23675
23699
|
_getInsertRecords: function _getInsertRecords() {
|
|
23676
23700
|
var _this6 = this;
|
|
23677
|
-
var
|
|
23678
|
-
tableFullTreeData = this.tableFullTreeData,
|
|
23679
|
-
tableFullData = this.tableFullData,
|
|
23680
|
-
treeOpts = this.treeOpts;
|
|
23701
|
+
var fullAllDataRowIdData = this.fullAllDataRowIdData;
|
|
23681
23702
|
var insertList = this.editStore.insertList;
|
|
23682
23703
|
var insertRecords = [];
|
|
23683
|
-
|
|
23684
|
-
|
|
23685
|
-
if (
|
|
23686
|
-
|
|
23687
|
-
var rowid = getRowid(_this6, row);
|
|
23688
|
-
var matchObj = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().findTree(tableFullTreeData, function (item) {
|
|
23689
|
-
return rowid === getRowid(_this6, item);
|
|
23690
|
-
}, treeOpts);
|
|
23691
|
-
if (matchObj) {
|
|
23692
|
-
insertRecords.push(row);
|
|
23693
|
-
}
|
|
23694
|
-
});
|
|
23695
|
-
} else {
|
|
23696
|
-
insertList.forEach(function (row) {
|
|
23697
|
-
if (tableFullData.indexOf(row) > -1) {
|
|
23698
|
-
insertRecords.push(row);
|
|
23699
|
-
}
|
|
23700
|
-
});
|
|
23704
|
+
insertList.forEach(function (row) {
|
|
23705
|
+
var rowid = getRowid(_this6, row);
|
|
23706
|
+
if (fullAllDataRowIdData[rowid]) {
|
|
23707
|
+
insertRecords.push(row);
|
|
23701
23708
|
}
|
|
23702
|
-
}
|
|
23709
|
+
});
|
|
23703
23710
|
return insertRecords;
|
|
23704
23711
|
},
|
|
23705
23712
|
/**
|
|
@@ -28746,13 +28753,19 @@ function renderOpts(h, _vm) {
|
|
|
28746
28753
|
});
|
|
28747
28754
|
}
|
|
28748
28755
|
},
|
|
28749
|
-
focusEvent: function focusEvent() {
|
|
28756
|
+
focusEvent: function focusEvent(evnt) {
|
|
28750
28757
|
if (!this.disabled) {
|
|
28751
28758
|
this.isActivated = true;
|
|
28752
28759
|
}
|
|
28760
|
+
this.$emit('focus', {
|
|
28761
|
+
$event: evnt
|
|
28762
|
+
});
|
|
28753
28763
|
},
|
|
28754
|
-
blurEvent: function blurEvent() {
|
|
28764
|
+
blurEvent: function blurEvent(evnt) {
|
|
28755
28765
|
this.isActivated = false;
|
|
28766
|
+
this.$emit('blur', {
|
|
28767
|
+
$event: evnt
|
|
28768
|
+
});
|
|
28756
28769
|
},
|
|
28757
28770
|
modelSearchEvent: function modelSearchEvent(value) {
|
|
28758
28771
|
this.searchValue = value;
|
|
@@ -37051,6 +37064,9 @@ var VxeFormConfigItem = {
|
|
|
37051
37064
|
children = item.children;
|
|
37052
37065
|
var compConf = isEnableConf(itemRender) ? v_x_e_table.renderer.get(itemRender.name) : null;
|
|
37053
37066
|
var itemClassName = compConf ? compConf.itemClassName : '';
|
|
37067
|
+
var itemStyle = compConf ? compConf.itemStyle : null;
|
|
37068
|
+
var itemContentClassName = compConf ? compConf.itemContentClassName : '';
|
|
37069
|
+
var itemContentStyle = compConf ? compConf.itemContentStyle : null;
|
|
37054
37070
|
var span = item.span || $xeform.span;
|
|
37055
37071
|
var align = item.align || $xeform.align;
|
|
37056
37072
|
var titleAlign = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eqNull(item.titleAlign) ? allTitleAlign : item.titleAlign;
|
|
@@ -37122,7 +37138,8 @@ var VxeFormConfigItem = {
|
|
|
37122
37138
|
'is--hidden': folding && collapseAll,
|
|
37123
37139
|
'is--active': isActivetem($xeform, item),
|
|
37124
37140
|
'is--error': showError
|
|
37125
|
-
}]
|
|
37141
|
+
}],
|
|
37142
|
+
style: external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(itemStyle) ? itemStyle(params) : itemStyle
|
|
37126
37143
|
}, [h('div', {
|
|
37127
37144
|
"class": 'vxe-form--item-inner'
|
|
37128
37145
|
}, [title || slots && slots.title ? h('div', {
|
|
@@ -37137,7 +37154,8 @@ var VxeFormConfigItem = {
|
|
|
37137
37154
|
},
|
|
37138
37155
|
on: ons
|
|
37139
37156
|
}, renderTitle(h, $xeform, item)) : null, h('div', {
|
|
37140
|
-
"class": ['vxe-form--item-content', align ? "align--".concat(align) :
|
|
37157
|
+
"class": ['vxe-form--item-content', align ? "align--".concat(align) : '', itemContentClassName ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(itemContentClassName) ? itemContentClassName(params) : itemContentClassName : ''],
|
|
37158
|
+
style: external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(itemContentStyle) ? itemContentStyle(params) : itemContentStyle
|
|
37141
37159
|
}, contentVNs.concat([collapseNode ? h('div', {
|
|
37142
37160
|
"class": 'vxe-form--item-trigger-node',
|
|
37143
37161
|
on: {
|
|
@@ -37936,6 +37954,9 @@ var renderItem = function renderItem(h, _vm, item, slots) {
|
|
|
37936
37954
|
titleOverflow = item.titleOverflow;
|
|
37937
37955
|
var compConf = isEnableConf(itemRender) ? v_x_e_table.renderer.get(itemRender.name) : null;
|
|
37938
37956
|
var itemClassName = compConf ? compConf.itemClassName : '';
|
|
37957
|
+
var itemStyle = compConf ? compConf.itemStyle : null;
|
|
37958
|
+
var itemContentClassName = compConf ? compConf.itemContentClassName : '';
|
|
37959
|
+
var itemContentStyle = compConf ? compConf.itemContentStyle : null;
|
|
37939
37960
|
var span = item.span || _vm.span;
|
|
37940
37961
|
var align = item.align || _vm.align;
|
|
37941
37962
|
var titleAlign = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eqNull(item.titleAlign) ? allTitleAlign : item.titleAlign;
|
|
@@ -37992,7 +38013,8 @@ var renderItem = function renderItem(h, _vm, item, slots) {
|
|
|
37992
38013
|
'is--hidden': folding && collapseAll,
|
|
37993
38014
|
'is--active': isActivetem(_vm, item),
|
|
37994
38015
|
'is--error': showError
|
|
37995
|
-
}]
|
|
38016
|
+
}],
|
|
38017
|
+
style: external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(itemStyle) ? itemStyle(params) : itemStyle
|
|
37996
38018
|
}, [h('div', {
|
|
37997
38019
|
"class": 'vxe-form--item-inner'
|
|
37998
38020
|
}, [title || slots && slots.title ? h('div', {
|
|
@@ -38007,7 +38029,8 @@ var renderItem = function renderItem(h, _vm, item, slots) {
|
|
|
38007
38029
|
},
|
|
38008
38030
|
on: ons
|
|
38009
38031
|
}, renderTitle(h, _vm, item)) : null, h('div', {
|
|
38010
|
-
"class": ['vxe-form--item-content', align ? "align--".concat(align) :
|
|
38032
|
+
"class": ['vxe-form--item-content', align ? "align--".concat(align) : '', itemContentClassName ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(itemContentClassName) ? itemContentClassName(params) : itemContentClassName : ''],
|
|
38033
|
+
style: external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(itemContentStyle) ? itemContentStyle(params) : itemContentStyle
|
|
38011
38034
|
}, contentVNs.concat([collapseNode ? h('div', {
|
|
38012
38035
|
"class": 'vxe-form--item-trigger-node',
|
|
38013
38036
|
on: {
|