diff --git a/src/components/common/echartCard/commonFilterChart.vue b/src/components/common/echartCard/commonFilterChart.vue
index 1bd1f4b0..bdbc1c9d 100644
--- a/src/components/common/echartCard/commonFilterChart.vue
+++ b/src/components/common/echartCard/commonFilterChart.vue
@@ -173,7 +173,13 @@ const hasFilterField = ref(false);
watch(
() => formData.value,
(newVal) => {
- hasFilterField.value = Object.values({ ...newVal, ...props.extraFilters }).some((item) => item);
+ hasFilterField.value = Object.values({ ...newVal, ...props.extraFilters }).some((item) => {
+ // 排除空数组、空字符串、null、undefined和0
+ if (Array.isArray(item)) {
+ return item.length > 0;
+ }
+ return Boolean(item);
+ });
},
{ deep: true, immediate: true }
);
diff --git a/src/components/common/uploadList/index.vue b/src/components/common/uploadList/index.vue
index 6ced5fce..aadfe2dd 100644
--- a/src/components/common/uploadList/index.vue
+++ b/src/components/common/uploadList/index.vue
@@ -3,7 +3,17 @@
-
+
+
+ 清空列表
+
@@ -85,6 +95,9 @@ emitter.on('ADD_UPLOAD_FILE', (addData: any) => {
}
taskStatusObj[data.uploadTaskId][data.businessId] = data.status;
initFun(addData);
+ if (!userCloseFlag.value) {
+ listVisible.value = true;
+ }
}
});
@@ -213,6 +226,10 @@ const openFun = () => {
listVisible.value = true;
};
+const emptyFun = () => {
+ listData.value = [];
+};
+
const removeFun = (index: any) => {
listData.value.splice(index, 1);
};
@@ -276,6 +293,20 @@ const initDragFun = () => {
el.style.top = y + 'px';
}
};
+
+const userCloseFlag = ref(false);
+let userCloseTimeOut: any = null;
+const closeFun = () => {
+ userCloseFlag.value = true;
+ if (userCloseTimeOut) {
+ clearTimeout(userCloseTimeOut);
+ userCloseTimeOut = null;
+ }
+ userCloseTimeOut = setTimeout(() => {
+ userCloseFlag.value = false;
+ // 用户自己关闭弹框后，20s内不会自动打开列表
+ }, 20000);
+};