tianheng-ui 0.1.19 → 0.1.21
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/package.json
CHANGED
@@ -198,7 +198,7 @@ export const basicComponents = [
|
|
198
198
|
width: "100%",
|
199
199
|
labelWidth: 100,
|
200
200
|
isLabelWidth: false,
|
201
|
-
defaultValue: "
|
201
|
+
defaultValue: "",
|
202
202
|
placeholder: "",
|
203
203
|
startPlaceholder: "",
|
204
204
|
endPlaceholder: "",
|
@@ -236,7 +236,9 @@ export const basicComponents = [
|
|
236
236
|
clearable: true,
|
237
237
|
placeholder: "",
|
238
238
|
startPlaceholder: "",
|
239
|
+
startField:'',
|
239
240
|
endPlaceholder: "",
|
241
|
+
endField:'',
|
240
242
|
type: "date",
|
241
243
|
format: "yyyy-MM-dd",
|
242
244
|
timestamp: false,
|
@@ -64,27 +64,27 @@
|
|
64
64
|
</el-select>
|
65
65
|
</el-form-item>
|
66
66
|
|
67
|
-
<
|
68
|
-
label="开始时间占位内容"
|
67
|
+
<template
|
69
68
|
v-if="
|
70
69
|
['datetimerange', 'daterange', 'monthrange'].includes(
|
71
70
|
widget.options.type
|
72
71
|
)
|
73
72
|
"
|
74
73
|
>
|
75
|
-
<el-
|
76
|
-
|
74
|
+
<el-form-item label="开始时间占位内容">
|
75
|
+
<el-input v-model="widget.options.startPlaceholder"></el-input>
|
76
|
+
</el-form-item>
|
77
|
+
<el-form-item label="开始时间字段标识">
|
78
|
+
<el-input v-model="widget.options.startField"></el-input>
|
79
|
+
</el-form-item>
|
77
80
|
|
78
|
-
|
79
|
-
|
80
|
-
|
81
|
-
|
82
|
-
|
83
|
-
|
84
|
-
|
85
|
-
>
|
86
|
-
<el-input v-model="widget.options.endPlaceholder"></el-input>
|
87
|
-
</el-form-item>
|
81
|
+
<el-form-item label="结束时间占位内容">
|
82
|
+
<el-input v-model="widget.options.endPlaceholder"></el-input>
|
83
|
+
</el-form-item>
|
84
|
+
<el-form-item label="结束时间字段标识">
|
85
|
+
<el-input v-model="widget.options.endField"></el-input>
|
86
|
+
</el-form-item>
|
87
|
+
</template>
|
88
88
|
</template>
|
89
89
|
|
90
90
|
<el-form-item label="操作属性">
|
@@ -31,7 +31,7 @@ import WidgetTools from "./WidgetTools.vue";
|
|
31
31
|
import WidgetTable from "./widgetTable.vue";
|
32
32
|
import WidgetConfig from "./widgetConfig.vue";
|
33
33
|
import { deepClone, deepMerge } from "./util/index";
|
34
|
-
import {
|
34
|
+
import { baseConfig } from "./custom/config";
|
35
35
|
export default {
|
36
36
|
name: "ThTableMaking",
|
37
37
|
components: { WidgetTools, WidgetTable, WidgetConfig },
|
@@ -39,7 +39,7 @@ export default {
|
|
39
39
|
config: {
|
40
40
|
type: Object,
|
41
41
|
default: () => {
|
42
|
-
return deepClone(
|
42
|
+
return deepClone(baseConfig);
|
43
43
|
}
|
44
44
|
},
|
45
45
|
fields: Array,
|
@@ -88,7 +88,7 @@ export default {
|
|
88
88
|
},
|
89
89
|
data() {
|
90
90
|
return {
|
91
|
-
tableConfig: this.
|
91
|
+
tableConfig: this.config,
|
92
92
|
client: "monitor"
|
93
93
|
};
|
94
94
|
},
|