Merge branch 'dev_g' of United_Software/k_online_ui into dev

src/components/DateRange/src/DateRange.vue

@@ -194,10 +194,24 @@ const daterangedata = ref()
 daterangedata.value = []
 let daterangeObj2: any = {}
 const DateRangeChange = (val: any) => {
-  const date1 = moment(String(val.data[0])).format('MMM-DD-YYYY')
-  const date2 = moment(String(val.data[1])).format('MMM-DD-YYYY')
-  daterangeObj[val.title] = date1 + ' To ' + date2
-  daterangeObj2[val.title] = val
+  if (val.data != null) {
+    const date1 = moment(String(val.data[0])).format('MMM-DD-YYYY')
+    const date2 = moment(String(val.data[1])).format('MMM-DD-YYYY')
+    daterangeObj[val.title] = date1 + ' To ' + date2
+    daterangeObj2[val.title] = val
+  } else {
+    delete daterangeObj[val.title]
+    delete daterangeObj2[val.title]
+    if (val.title == 'ETD') {
+      DateStart.value = []
+    } else if (val.title == 'ETA') {
+      DateEnd.value = []
+    } else {
+      DateCreation.value = []
+      AddDateType.value = []
+      DateType.value = ''
+    }
+  }
 }
 const emit = defineEmits(['DateRangeSearch', 'clearDaterangeTags', 'defaultDate'])
 const DateRangeSearch = () => {

src/components/DateRange/src/components/CalendarDate.vue

@@ -134,4 +134,11 @@ const handlePanelChange = (value: any, mode: any) => {
   margin-bottom: 4px;
   color: var(--color-neutral-2);
 }
+.iconfont_icon {
+  margin-right: 0;
+}
+.iconfont {
+  width: 14px;
+  height: 14px;
+}
 </style>

src/styles/Antdui.scss

@@ -69,7 +69,4 @@
   }
  .ant-picker-dropdown .ant-picker-date-panel .ant-picker-content th {
   color: var(--color-neutral-3);
- }
-.ant-picker .ant-picker-clear {
-  inset-inline-end: 14px;
  }