Merge branch 'dev' into feat_theme

src/components/DateRange/src/DateRange.vue

@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import emitter from '@/utils/bus'
-import { ref, computed, onMounted, onBeforeMount } from 'vue'
+import { ref, watch, onMounted, onBeforeMount } from 'vue'
 import IconDropDown from '@/components/IconDropDown'
 import CalendarDate from './components/CalendarDate.vue'
 import moment from 'moment'
@@ -249,13 +249,13 @@ const DateRangeSearch = () => {
   emit('DateRangeSearch', daterangeObj, daterangeObj2)
   Date_visible.value = false
 }
-const CalendarTitle = computed(() => {
-  if (DateType.value == 'undefined') {
-    return 'Date Range'
-  } else {
-    return DateType.value
+const CalendarTitle = ref('Date Range')
+watch(
+  () => DateType.value,
+  (current) => {
+    CalendarTitle.value = current
   }
-})
+)
 // 清除
 const clearrest = () => {
   emit('clearDaterangeTags')
@@ -281,6 +281,7 @@ const clearDateCreation = () => {
   DateCreation.value = []
   AddDateType.value = []
   DateType.value = ''
+  CalendarTitle.value = 'Date Range'
   delete daterangeObj['Creation Time']
   delete daterangeObj2['Creation Time']
 }

src/components/MoreFilters/src/MoreFilters.vue

@@ -894,30 +894,30 @@ const changeAutoSelectVal = (val: any, value: any, boolaen: any) => {
 const emit = defineEmits(['MoreFiltersSearch', 'clearMoreFiltersTags', 'defaultMorefilters'])
 const SearchMore = () => {
   if (AddDatePlaceType.value.length) {
-    for (let i = 0; i < AddDatePlaceType.value.length; i++) {
-      if (AddDatePlaceType.value[i].placesType != '') {
-        if (isError.value || isError.value == undefined) {
-          // 传数据给父组件
-          emit('MoreFiltersSearch', MoreFiltersObj, MoreFiltersObj2)
-          drawer.value = false
-        }
-      } else {
+    const isDateType = AddDatePlaceType.value.some((element) => element.placesType != '')
+    if (isDateType) {
+      if (!isError.value && isError.value != undefined) {
+        // 传数据给父组件
         emit('MoreFiltersSearch', MoreFiltersObj, MoreFiltersObj2)
         drawer.value = false
       }
+    } else {
+      // 传数据给父组件
+      emit('MoreFiltersSearch', MoreFiltersObj, MoreFiltersObj2)
+      drawer.value = false
     }
   } else if (AddDateType.value.length) {
-    for (let i = 0; i < AddDateType.value.length; i++) {
-      if (AddDateType.value[i].partyType != '') {
-        if (isError.value || isError.value == undefined) {
-          // 传数据给父组件
-          emit('MoreFiltersSearch', MoreFiltersObj, MoreFiltersObj2)
-          drawer.value = false
-        }
-      } else {
+    const isDateType = AddDateType.value.some((element) => element.partyType != '')
+    if (isDateType) {
+      if (!isError.value && isError.value != undefined) {
+        // 传数据给父组件
         emit('MoreFiltersSearch', MoreFiltersObj, MoreFiltersObj2)
         drawer.value = false
       }
+    } else {
+      // 传数据给父组件
+      emit('MoreFiltersSearch', MoreFiltersObj, MoreFiltersObj2)
+      drawer.value = false
     }
   } else {
     // 传数据给父组件