n20-common-lib 3.0.41 → 3.0.43
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
|
@@ -65,7 +65,12 @@
|
|
|
65
65
|
</div>
|
|
66
66
|
</div>
|
|
67
67
|
</el-button>
|
|
68
|
-
<
|
|
68
|
+
<div class="flex-box flex-v">
|
|
69
|
+
<el-button icon="v3-icon-filter" class="m-r-s botton" @click="multiple = !multiple">{{
|
|
70
|
+
'筛选' | $lc
|
|
71
|
+
}}</el-button>
|
|
72
|
+
<slot name="rightContent"></slot>
|
|
73
|
+
</div>
|
|
69
74
|
</div>
|
|
70
75
|
</div>
|
|
71
76
|
<cl-advanced-filter
|
|
@@ -85,6 +90,9 @@
|
|
|
85
90
|
@change="changeFn"
|
|
86
91
|
@refresh="getFilterList"
|
|
87
92
|
>
|
|
93
|
+
<div slot="prefix">
|
|
94
|
+
<slot name="prefix"></slot>
|
|
95
|
+
</div>
|
|
88
96
|
<!-- 使用作用域插槽传递 searchValue -->
|
|
89
97
|
<template v-for="filter in filterList.filter((item) => item.type === 'slot')" #[filter.slotName]="{ model }">
|
|
90
98
|
<slot
|
|
@@ -94,6 +102,9 @@
|
|
|
94
102
|
:input="(val) => (searchValue[filter.value] = val)"
|
|
95
103
|
></slot>
|
|
96
104
|
</template>
|
|
105
|
+
<div slot="suffix">
|
|
106
|
+
<slot name="suffix"></slot>
|
|
107
|
+
</div>
|
|
97
108
|
</cl-advanced-filter>
|
|
98
109
|
<cl-dialog
|
|
99
110
|
v-drag
|
|
@@ -218,7 +229,7 @@ export default {
|
|
|
218
229
|
isAdd: false,
|
|
219
230
|
form: { userNo: sessionStorage.getItem('userNo'), pageNo: this.filterId },
|
|
220
231
|
|
|
221
|
-
multiple:
|
|
232
|
+
multiple: false,
|
|
222
233
|
// 保存的筛选字段
|
|
223
234
|
checkData: [],
|
|
224
235
|
key: 0,
|
|
@@ -269,7 +280,17 @@ export default {
|
|
|
269
280
|
}
|
|
270
281
|
}
|
|
271
282
|
},
|
|
272
|
-
watch: {
|
|
283
|
+
watch: {
|
|
284
|
+
initialValue: {
|
|
285
|
+
handler(newVal) {
|
|
286
|
+
// 当 initialValue 发生变化时，更新 searchValue
|
|
287
|
+
// 保留 slot 类型的字段默认值，合并新的 initialValue 值
|
|
288
|
+
this.searchValue = { ...this.getInitialSearchValue, ...newVal }
|
|
289
|
+
},
|
|
290
|
+
deep: true,
|
|
291
|
+
immediate: false
|
|
292
|
+
}
|
|
293
|
+
},
|
|
273
294
|
created() {},
|
|
274
295
|
mounted() {
|
|
275
296
|
// 默认勾选全部
|