From 6ccf5b261d3e365a39da66102228e3550d40e915 Mon Sep 17 00:00:00 2001
From: songlh <song.lhlh@gmail.com>
Date: Sat, 14 Sep 2024 17:26:33 +0800
Subject: [PATCH 1/2] fix(ui): employeeTreeSelect display error

---
 .../src/views/setting/components/employeeTreeSelect.vue    | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/cmdb-ui/src/views/setting/components/employeeTreeSelect.vue b/cmdb-ui/src/views/setting/components/employeeTreeSelect.vue
index ccd4cd4..35942bf 100644
--- a/cmdb-ui/src/views/setting/components/employeeTreeSelect.vue
+++ b/cmdb-ui/src/views/setting/components/employeeTreeSelect.vue
@@ -71,10 +71,9 @@ export default {
       type: Boolean,
       default: false,
     },
-    // eslint-disable-next-line vue/require-default-prop
     otherOptions: {
       type: Array,
-      defualt: () => [],
+      default: () => [],
     }
   },
   data() {
@@ -105,8 +104,8 @@ export default {
     employeeTreeSelectOption() {
       return formatOption(
         [
-          ..._.cloneDeep(this.allTreeDepAndEmp),
-          ..._.cloneDeep(this.otherOptions)
+          ..._.cloneDeep((Array.isArray(this.allTreeDepAndEmp) ? this.allTreeDepAndEmp : [])),
+          ..._.cloneDeep((Array.isArray(this.otherOptions) ? this.otherOptions : []))
         ],
         this.idType,
         false,

From 26f0a65ae46199a82eba72cea08bdcfab7d25435 Mon Sep 17 00:00:00 2001
From: songlh <song.lhlh@gmail.com>
Date: Sat, 14 Sep 2024 17:27:57 +0800
Subject: [PATCH 2/2] fix(ui): operation history search expand error

---
 .../modules/cmdb/views/operation_history/modules/ciTable.vue    | 2 +-
 .../modules/cmdb/views/operation_history/modules/searchForm.vue | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/cmdb-ui/src/modules/cmdb/views/operation_history/modules/ciTable.vue b/cmdb-ui/src/modules/cmdb/views/operation_history/modules/ciTable.vue
index 58e1dba..108649c 100644
--- a/cmdb-ui/src/modules/cmdb/views/operation_history/modules/ciTable.vue
+++ b/cmdb-ui/src/modules/cmdb/views/operation_history/modules/ciTable.vue
@@ -45,7 +45,7 @@
         </template>
       </vxe-column>
       <vxe-column field="type_id" width="100px" :title="$t('cmdb.ciType.ciType')"></vxe-column>
-      <vxe-column field="show_attr_value" width="100px" :title="$t('cmdb.ciType.show')"></vxe-column>
+      <vxe-column field="show_attr_value" width="100px" :title="$t('cmdb.ci.instance')"></vxe-column>
       <vxe-column field="operate_type" width="89px" :title="$t('operation')">
         <template #header="{ column }">
           <span>{{ column.title }}</span>
diff --git a/cmdb-ui/src/modules/cmdb/views/operation_history/modules/searchForm.vue b/cmdb-ui/src/modules/cmdb/views/operation_history/modules/searchForm.vue
index 5702c1b..4951388 100644
--- a/cmdb-ui/src/modules/cmdb/views/operation_history/modules/searchForm.vue
+++ b/cmdb-ui/src/modules/cmdb/views/operation_history/modules/searchForm.vue
@@ -85,7 +85,7 @@
                 @change="onChange"
                 format="YYYY-MM-DD HH:mm"
                 :placeholder="[$t('cmdb.history.startTime'), $t('cmdb.history.endTime')]"
-                v-else-if="valueTypeMap[item.value_type] == 'date' || valueTypeMap[item.value_type] == 'datetime'"
+                v-else-if="item.value_type === '3'"
                 :show-time="{
                   hideDisabledOptions: true,
                   defaultValue: [moment('00:00:00', 'HH:mm:ss'), moment('23:59:59', 'HH:mm:ss')],