@oinone/kunlun-vue-admin-base 6.2.1 → 6.2.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/dist/oinone-kunlun-vue-admin-base.css +1 -1
- package/dist/oinone-kunlun-vue-admin-base.esm.js +10 -7
- package/dist/oinone-kunlun-vue-admin-base.scss +1 -1
- package/dist/types/src/field/form/float/Plat.vue.d.ts +2 -2
- package/dist/types/src/view/table/TableWidget.d.ts +4 -1
- package/package.json +9 -9
- package/src/view/table/DefaultTable.vue +4 -2
- package/src/view/table/TableWidget.ts +6 -5
|
@@ -47,7 +47,7 @@ declare const _default: import("vue").DefineComponent<{
|
|
|
47
47
|
default: boolean;
|
|
48
48
|
};
|
|
49
49
|
layout: {
|
|
50
|
-
type: PropType<import("@oinone/kunlun-vue-ui-
|
|
50
|
+
type: PropType<import("@oinone/kunlun-vue-ui-antd").FormLayout>;
|
|
51
51
|
};
|
|
52
52
|
label: {
|
|
53
53
|
type: (BooleanConstructor | StringConstructor)[];
|
|
@@ -141,7 +141,7 @@ declare const _default: import("vue").DefineComponent<{
|
|
|
141
141
|
default: boolean;
|
|
142
142
|
};
|
|
143
143
|
layout: {
|
|
144
|
-
type: PropType<import("@oinone/kunlun-vue-ui-
|
|
144
|
+
type: PropType<import("@oinone/kunlun-vue-ui-antd").FormLayout>;
|
|
145
145
|
};
|
|
146
146
|
label: {
|
|
147
147
|
type: (BooleanConstructor | StringConstructor)[];
|
|
@@ -18,7 +18,10 @@ export declare class TableWidget<Props extends TableWidgetProps = TableWidgetPro
|
|
|
18
18
|
protected get checkbox(): boolean;
|
|
19
19
|
protected get lineHeight(): number | undefined;
|
|
20
20
|
protected get minLineHeight(): number | undefined;
|
|
21
|
-
|
|
21
|
+
/**
|
|
22
|
+
* 表格行高是否自适应，默认开启
|
|
23
|
+
*/
|
|
24
|
+
protected get autoLineHeight(): boolean;
|
|
22
25
|
protected get enableSequence(): boolean;
|
|
23
26
|
protected get defaultPageSize(): number;
|
|
24
27
|
protected get activeCount(): number | undefined;
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@oinone/kunlun-vue-admin-base",
|
|
3
|
-
"version": "6.2.
|
|
3
|
+
"version": "6.2.2",
|
|
4
4
|
"main": "index.ts",
|
|
5
5
|
"scripts": {
|
|
6
6
|
"prebuild": "rimraf dist",
|
|
@@ -14,13 +14,13 @@
|
|
|
14
14
|
"doc": "typedoc --out docs src/index.ts"
|
|
15
15
|
},
|
|
16
16
|
"dependencies": {
|
|
17
|
-
"@oinone/kunlun-vue-admin-layout": "6.2.
|
|
18
|
-
"@oinone/kunlun-vue-router": "6.2.
|
|
19
|
-
"@oinone/kunlun-vue-ui": "6.2.
|
|
20
|
-
"@oinone/kunlun-vue-ui-antd": "6.2.
|
|
21
|
-
"@oinone/kunlun-vue-ui-common": "6.2.
|
|
22
|
-
"@oinone/kunlun-vue-ui-el": "6.2.
|
|
23
|
-
"@oinone/kunlun-vue-widget": "6.2.
|
|
17
|
+
"@oinone/kunlun-vue-admin-layout": "6.2.2",
|
|
18
|
+
"@oinone/kunlun-vue-router": "6.2.2",
|
|
19
|
+
"@oinone/kunlun-vue-ui": "6.2.2",
|
|
20
|
+
"@oinone/kunlun-vue-ui-antd": "6.2.2",
|
|
21
|
+
"@oinone/kunlun-vue-ui-common": "6.2.2",
|
|
22
|
+
"@oinone/kunlun-vue-ui-el": "6.2.2",
|
|
23
|
+
"@oinone/kunlun-vue-widget": "6.2.2",
|
|
24
24
|
"@wangeditor/editor": "5.1.23",
|
|
25
25
|
"@wangeditor/editor-for-vue": "5.1.11",
|
|
26
26
|
"@wangeditor/plugin-upload-attachment": "1.1.0",
|
|
@@ -61,5 +61,5 @@
|
|
|
61
61
|
"element-plus": ">=2.2.17",
|
|
62
62
|
"vue": ">=3.2.40"
|
|
63
63
|
},
|
|
64
|
-
"gitHead": "
|
|
64
|
+
"gitHead": "2b4c0c7911626c105ca71c2d41e54af470e2e079"
|
|
65
65
|
}
|
|
@@ -515,10 +515,14 @@ export default defineComponent({
|
|
|
515
515
|
|
|
516
516
|
rows.forEach((row, index) => {
|
|
517
517
|
const height = row.clientHeight;
|
|
518
|
+
row.style.height = 'auto';
|
|
518
519
|
|
|
519
520
|
const leftFixedRow = leftFixedRows[index];
|
|
520
521
|
const rightFixedRow = rightFixedRows[index];
|
|
521
522
|
|
|
523
|
+
leftFixedRow && (leftFixedRow.style.height = 'auto');
|
|
524
|
+
rightFixedRow && (rightFixedRow.style.height = 'auto');
|
|
525
|
+
|
|
522
526
|
const maxHeight = Math.max(
|
|
523
527
|
height || 0,
|
|
524
528
|
leftFixedRow?.clientHeight || 0,
|
|
@@ -589,8 +593,6 @@ export default defineComponent({
|
|
|
589
593
|
if (v && v.length) {
|
|
590
594
|
nextTick(() => {
|
|
591
595
|
calcTableColumnHeight();
|
|
592
|
-
|
|
593
|
-
stop();
|
|
594
596
|
});
|
|
595
597
|
}
|
|
596
598
|
},
|
|
@@ -114,11 +114,12 @@ export class TableWidget<Props extends TableWidgetProps = TableWidgetProps> exte
|
|
|
114
114
|
return undefined;
|
|
115
115
|
}
|
|
116
116
|
|
|
117
|
+
/**
|
|
118
|
+
* 表格行高是否自适应，默认开启
|
|
119
|
+
*/
|
|
117
120
|
@Widget.Reactive()
|
|
118
|
-
protected get autoLineHeight(): boolean
|
|
119
|
-
const autoLineHeight = Optional.ofNullable(this.getDsl().autoLineHeight)
|
|
120
|
-
.map(BooleanHelper.toBoolean)
|
|
121
|
-
.orElse(undefined);
|
|
121
|
+
protected get autoLineHeight(): boolean {
|
|
122
|
+
const autoLineHeight = Optional.ofNullable(this.getDsl().autoLineHeight).map(BooleanHelper.toBoolean).orElse(true);
|
|
122
123
|
|
|
123
124
|
if (typeof autoLineHeight === 'boolean') {
|
|
124
125
|
return autoLineHeight;
|
|
@@ -128,7 +129,7 @@ export class TableWidget<Props extends TableWidgetProps = TableWidgetProps> exte
|
|
|
128
129
|
return this.tableConfig.autoLineHeight;
|
|
129
130
|
}
|
|
130
131
|
|
|
131
|
-
return
|
|
132
|
+
return true;
|
|
132
133
|
}
|
|
133
134
|
|
|
134
135
|
@Widget.Reactive()
|