lw-cdp-ui 1.2.52 → 1.2.53
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.
|
@@ -6,11 +6,11 @@
|
|
|
6
6
|
:data-index="index">
|
|
7
7
|
<span>
|
|
8
8
|
{{ item.label }}
|
|
9
|
-
<el-tooltip v-if="item.tips"
|
|
9
|
+
<el-tooltip v-if="item.tips"
|
|
10
|
+
placement="top">
|
|
10
11
|
<template #content>
|
|
11
|
-
<span style="max-width: 300px; display: inline-block;"
|
|
12
|
-
|
|
13
|
-
</span>
|
|
12
|
+
<span style="max-width: 300px; display: inline-block;"
|
|
13
|
+
v-html="item.tips"></span>
|
|
14
14
|
</template>
|
|
15
15
|
<el-icon><el-icon-question-filled /></el-icon>
|
|
16
16
|
</el-tooltip>
|
|
@@ -27,7 +27,12 @@
|
|
|
27
27
|
{{ item.label }}
|
|
28
28
|
<el-tooltip v-if="item.tips"
|
|
29
29
|
:raw-content="item?.rawContent"
|
|
30
|
+
placement="top"
|
|
30
31
|
:content="item.tips">
|
|
32
|
+
<template #content>
|
|
33
|
+
<span style="max-width: 300px; display: inline-block;"
|
|
34
|
+
v-html="item.tips"></span>
|
|
35
|
+
</template>
|
|
31
36
|
<el-icon><el-icon-question-filled /></el-icon>
|
|
32
37
|
</el-tooltip>
|
|
33
38
|
</template>
|
|
@@ -224,7 +229,8 @@
|
|
|
224
229
|
</slot>
|
|
225
230
|
</template>
|
|
226
231
|
<div v-if="item.message"
|
|
227
|
-
class="el-form-item-msg"
|
|
232
|
+
class="el-form-item-msg"
|
|
233
|
+
v-html="item.message"></div>
|
|
228
234
|
</el-form-item>
|
|
229
235
|
</template>
|
|
230
236
|
|
|
@@ -259,8 +265,8 @@ export default {
|
|
|
259
265
|
},
|
|
260
266
|
watch: {
|
|
261
267
|
item: {
|
|
262
|
-
handler(val) {
|
|
263
|
-
this.objItem = val
|
|
268
|
+
handler(val, oldVal) {
|
|
269
|
+
this.objItem = { ...val, ...this.objItem }
|
|
264
270
|
},
|
|
265
271
|
immediate: true,
|
|
266
272
|
deep: true
|
|
@@ -7,8 +7,8 @@
|
|
|
7
7
|
v-model="value"
|
|
8
8
|
style="width: 100%"
|
|
9
9
|
type="datetimerange"
|
|
10
|
-
:start-placeholder="$t('lwSearch.dateRange.startPlaceholder')"
|
|
11
|
-
:end-placeholder="$t('lwSearch.dateRange.endPlaceholder')"
|
|
10
|
+
:start-placeholder="item.startPlaceholder || $t('lwSearch.dateRange.startPlaceholder')"
|
|
11
|
+
:end-placeholder="item.endPlaceholder || $t('lwSearch.dateRange.endPlaceholder')"
|
|
12
12
|
:default-time="item.defaultTime || defaultTime(0)"
|
|
13
13
|
size="">
|
|
14
14
|
</el-date-picker>
|