vsyswin-ui 0.2.71 → 0.2.72
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/lib/vsyswin-ui.common.js +58 -54
- package/lib/vsyswin-ui.common.js.map +1 -1
- package/lib/vsyswin-ui.umd.js +58 -54
- package/lib/vsyswin-ui.umd.js.map +1 -1
- package/lib/vsyswin-ui.umd.min.js +7 -7
- package/lib/vsyswin-ui.umd.min.js.map +1 -1
- package/package.json +1 -1
- package/packages/search-bar/src/search-bar.vue +8 -4
package/package.json
CHANGED
|
@@ -391,7 +391,10 @@ export default {
|
|
|
391
391
|
function clickHandler(e) {
|
|
392
392
|
// 这里判断点击的元素是否是本身,是本身,则返回
|
|
393
393
|
if (el.contains(e.target)) {
|
|
394
|
-
|
|
394
|
+
const btnsBox = el.querySelector('.syswin-searchbar-container__listBtns') // 点击右侧的按钮时也要隐藏所有条件面板
|
|
395
|
+
if (!btnsBox.contains(e.target)) {
|
|
396
|
+
return false
|
|
397
|
+
}
|
|
395
398
|
}
|
|
396
399
|
// 判断指令中是否绑定了函数
|
|
397
400
|
if (binding.expression) {
|
|
@@ -415,7 +418,7 @@ export default {
|
|
|
415
418
|
saveToLocal: {
|
|
416
419
|
// 搜索条件保存到本地
|
|
417
420
|
type: Boolean,
|
|
418
|
-
default:
|
|
421
|
+
default: false
|
|
419
422
|
},
|
|
420
423
|
searchList: {
|
|
421
424
|
type: Array,
|
|
@@ -837,7 +840,7 @@ export default {
|
|
|
837
840
|
// 先清空所有标签
|
|
838
841
|
currentSearchList.forEach((ele) => {
|
|
839
842
|
ele.itemList.forEach((item) => {
|
|
840
|
-
item.isActive =
|
|
843
|
+
item.isActive = ['daterange', 'monthrange'].includes(item.type) && (item.value = null)
|
|
841
844
|
})
|
|
842
845
|
})
|
|
843
846
|
|
|
@@ -854,7 +857,8 @@ export default {
|
|
|
854
857
|
v.id === ele.id && ['daterange', 'monthrange'].includes(v.type) && (v.value = ele.value)
|
|
855
858
|
} else {
|
|
856
859
|
// 单选
|
|
857
|
-
v.isActive = v.id === ele.id
|
|
860
|
+
v.isActive = v.id === ele.id
|
|
861
|
+
v.id === ele.id && [('daterange', 'monthrange')].includes(v.type) && (v.value = v.id === ele.id ? ele.value : null)
|
|
858
862
|
}
|
|
859
863
|
} else if (v.type === 'slot') {
|
|
860
864
|
v.setValue && v.setValue({ value: ele.value, name: ele.name, ...ele })
|