Просмотр исходного кода

Merge branch 'test_g' of United_Software/k_online_ui into test

Jack Zhou 4 месяцев назад
Родитель
Сommit
6e4e828d72

+ 5 - 3
src/components/DateRange/src/DateRange.vue

@@ -15,10 +15,12 @@ onMounted(() => {
   emitter.on('clearTag', (tag: any) => {
     if (tag.includes('ETD')) {
       clearDateStart()
-    } else if (tag.includes('ETA')) {
+    }
+    if (tag.includes('ETA')) {
+      clearDateEnd()
+    }
+    if (tag.includes('Creation Time')) {
       clearDateEnd()
-    } else {
-      clearDateCreation()
     }
   })
   emitter.on('clearDaterangeObj', () => {

+ 2 - 0
src/components/DateRange/src/components/CalendarDate.vue

@@ -32,6 +32,8 @@ watch(
         current[0] ? dayjs(current[0]).format(valueFormatDate) : '',
         current[1] ? dayjs(current[1]).format(valueFormatDate) : ''
       ]
+    } else {
+      ETDDate.value  = []
     }
   },
   { immediate: true, deep: true }

+ 3 - 0
src/styles/vxeTable.scss

@@ -177,3 +177,6 @@ div.vxe-table--context-menu-wrapper {
 .vxe-tooltip--content {
   color: #f0f1f3;
 }
+.vxe-tooltip--wrapper.theme--dark {
+  z-index: 9999 !important;
+}