@tmagic/table 1.5.13 → 1.5.14
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/dist/tmagic-table.js +1 -0
- package/dist/tmagic-table.umd.cjs +1 -0
- package/package.json +3 -3
- package/src/Table.vue +1 -1
- package/src/utils.ts +1 -1
- package/types/index.d.ts +1 -1
package/dist/tmagic-table.js
CHANGED
package/package.json
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
{
|
|
2
|
-
"version": "1.5.
|
|
2
|
+
"version": "1.5.14",
|
|
3
3
|
"name": "@tmagic/table",
|
|
4
4
|
"type": "module",
|
|
5
5
|
"sideEffects": [
|
|
@@ -44,8 +44,8 @@
|
|
|
44
44
|
"peerDependencies": {
|
|
45
45
|
"vue": ">=3.5.0",
|
|
46
46
|
"typescript": "*",
|
|
47
|
-
"@tmagic/
|
|
48
|
-
"@tmagic/
|
|
47
|
+
"@tmagic/design": "1.5.14",
|
|
48
|
+
"@tmagic/form": "1.5.14"
|
|
49
49
|
},
|
|
50
50
|
"peerDependenciesMeta": {
|
|
51
51
|
"typescript": {
|
package/src/Table.vue
CHANGED
|
@@ -84,7 +84,7 @@ const props = withDefaults(
|
|
|
84
84
|
data: any[];
|
|
85
85
|
columns?: ColumnConfig[];
|
|
86
86
|
/** 合并行或列的计算方法 */
|
|
87
|
-
spanMethod?: (
|
|
87
|
+
spanMethod?: (_data: { row: any; column: any; rowIndex: number; columnIndex: number }) => [number, number];
|
|
88
88
|
loading?: boolean;
|
|
89
89
|
/** Table 的最大高度。合法的值为数字或者单位为 px 的高度 */
|
|
90
90
|
bodyHeight?: string | number;
|
package/src/utils.ts
CHANGED
|
@@ -25,12 +25,12 @@ export const formatter = (item: ColumnConfig, row: any, data: { index: number })
|
|
|
25
25
|
|
|
26
26
|
if (item.formatter) {
|
|
27
27
|
if (item.formatter === 'datetime') {
|
|
28
|
-
// eslint-disable-next-line no-param-reassign
|
|
29
28
|
item.formatter = (value: string) => datetimeFormatter(value);
|
|
30
29
|
}
|
|
31
30
|
try {
|
|
32
31
|
return item.formatter(row[item.prop], row, data);
|
|
33
32
|
} catch (e) {
|
|
33
|
+
console.error('Formatter error:', e);
|
|
34
34
|
return row[item.prop];
|
|
35
35
|
}
|
|
36
36
|
} else {
|