ztxkui 10.0.15 → 10.0.17
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.
|
@@ -376,13 +376,13 @@ function getNewColumns(basicConfig, editableConfig, dynamicConfig, otherConfig)
|
|
|
376
376
|
_column.render = function (text, record, index) {
|
|
377
377
|
var value = text;
|
|
378
378
|
if (text == null || text === '')
|
|
379
|
-
|
|
379
|
+
return '— —';
|
|
380
380
|
else if (_column.dateFormat)
|
|
381
381
|
return dayjs(text).format(_column.dateFormat);
|
|
382
382
|
if (_column.precision)
|
|
383
383
|
value = exactRound(text, _column.precision);
|
|
384
384
|
if (_column.thousand)
|
|
385
|
-
value = toThousand(
|
|
385
|
+
value = toThousand(value);
|
|
386
386
|
return value;
|
|
387
387
|
};
|
|
388
388
|
}
|
|
@@ -434,19 +434,19 @@ function Table(props) {
|
|
|
434
434
|
var size = _a.size;
|
|
435
435
|
var _newColumns = __spreadArray([], (newColumns || []));
|
|
436
436
|
_newColumns[index] = __assign(__assign({}, _newColumns[index]), { width: size.width });
|
|
437
|
-
|
|
438
|
-
|
|
439
|
-
if (Array.isArray(_columns)) {
|
|
440
|
-
|
|
441
|
-
|
|
442
|
-
|
|
443
|
-
|
|
444
|
-
|
|
445
|
-
|
|
446
|
-
|
|
447
|
-
|
|
448
|
-
}
|
|
449
|
-
var catchColumns =
|
|
437
|
+
// const leftArr: ColumnsType<RecordType> = [];
|
|
438
|
+
// const rightArr: ColumnsType<RecordType> = [];
|
|
439
|
+
// if (Array.isArray(_columns)) {
|
|
440
|
+
// _columns.forEach((column) => {
|
|
441
|
+
// if (column.fixed === 'left') {
|
|
442
|
+
// leftArr.push(column);
|
|
443
|
+
// }
|
|
444
|
+
// if (column.fixed === 'right') {
|
|
445
|
+
// rightArr.push(column);
|
|
446
|
+
// }
|
|
447
|
+
// });
|
|
448
|
+
// }
|
|
449
|
+
var catchColumns = dynamicColumns.map(function (item) {
|
|
450
450
|
var column = _newColumns.find(function (column) {
|
|
451
451
|
return (column.dataIndex && column.dataIndex === item.dataIndex) ||
|
|
452
452
|
(column.key && column.key === item.key);
|
|
@@ -471,7 +471,7 @@ function Table(props) {
|
|
|
471
471
|
}
|
|
472
472
|
};
|
|
473
473
|
}, [
|
|
474
|
-
_columns,
|
|
474
|
+
// _columns,
|
|
475
475
|
dynamicColumns,
|
|
476
476
|
newColumns,
|
|
477
477
|
refreshColumnsHandle,
|