From 67739f07140393d54ae23d9e55881b36c6b60cc5 Mon Sep 17 00:00:00 2001
From: xieyonghong <18010623010@163.com>
Date: Tue, 14 Mar 2023 16:57:31 +0800
Subject: [PATCH] =?UTF-8?q?update:=20proSearch=E6=B7=BB=E5=8A=A0class?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.vue                                   |  7 +++++-
 src/components/Search/Search.vue              |  1 +
 src/main.ts                                   |  4 ++++
 .../Save/components/DropdownButton/Time.vue   | 23 ++++++++++---------
 .../Save/components/ParamsDropdown/index.vue  |  2 +-
 tsconfig.json                                 |  1 +
 vite.config.ts                                |  2 +-
 7 files changed, 26 insertions(+), 14 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index 02bc5677..b61b8ee9 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,8 +1,13 @@
 <template>
-  <router-view />
+  <ConfigProvider :locale='zhCN'>
+    <router-view />
+  </ConfigProvider>
 </template>
 
 <script setup lang="ts">
+import { ConfigProvider } from 'jetlinks-ui-components'
+import zhCN from 'jetlinks-ui-components/es/locale/zh_CN';
+
 </script>
 
 <style scoped>
diff --git a/src/components/Search/Search.vue b/src/components/Search/Search.vue
index 1409f2ea..7cd240dc 100644
--- a/src/components/Search/Search.vue
+++ b/src/components/Search/Search.vue
@@ -5,6 +5,7 @@
     :request='saveSearchHistory'
     :historyRequest='getSearchHistory'
     :columns='columns'
+    :class='props.class'
     @search='searchSubmit'
   />
 </template> 
diff --git a/src/main.ts b/src/main.ts
index 26791d52..4cc48040 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -5,6 +5,10 @@ import components from './components'
 import router from './router'
 import './style.less'
 
+import dayjs from 'dayjs';
+import 'dayjs/locale/zh-cn';
+dayjs.locale('zh-cn');
+
 const app = createApp(App)
 
 app.use(store)
diff --git a/src/views/rule-engine/Scene/Save/components/DropdownButton/Time.vue b/src/views/rule-engine/Scene/Save/components/DropdownButton/Time.vue
index e3044a21..1b56cb4b 100644
--- a/src/views/rule-engine/Scene/Save/components/DropdownButton/Time.vue
+++ b/src/views/rule-engine/Scene/Save/components/DropdownButton/Time.vue
@@ -1,12 +1,11 @@
 <template>
   <div class='dropdown-time-picker'>
     <j-time-picker
-      v-if='type === "time"'
+      v-if='!_type'
       open
-      class='manual-time-picker'
       v-model:value='myValue'
+      class='manual-time-picker'
       :format='myFormat'
-      :valueFormat='myFormat'
       :getPopupContainer='getPopupContainer'
       popupClassName='manual-time-picker-popup'
       @change='change'
@@ -17,7 +16,6 @@
       class='manual-time-picker'
       v-model:value='myValue'
       :format='myFormat'
-      :valueFormat='myFormat'
       :getPopupContainer='getPopupContainer'
       popupClassName='manual-time-picker-popup'
       @change='change'
@@ -26,7 +24,7 @@
 </template>
 
 <script setup lang='ts' name='DropdownTime'>
-import dayjs from 'dayjs'
+import dayjs, { Dayjs } from 'dayjs'
 
 type Emit = {
   (e: 'update:value', value: string) : void
@@ -44,23 +42,26 @@ const props = defineProps({
   },
   format: {
     type: String,
-    default: ''
+    default: undefined
   }
 })
 
 const emit = defineEmits<Emit>()
 const myFormat = props.format || ( props.type === 'time' ? 'HH:mm:ss' : 'YYYY-MM-DD HH:mm:ss')
-const myValue = ref(props.value || dayjs(new Date()).format(myFormat))
+const myValue = ref<Dayjs>(dayjs(props.value || new Date(), myFormat))
 
 const getPopupContainer = (trigger: HTMLElement) => {
   return trigger?.parentNode || document.body
 }
 
-const change = (e: string) => {
-  myValue.value = e
-  emit('update:value', e)
-  emit('change', e)
+const change = (e: Dayjs) => {
+  emit('update:value', e.format(myFormat))
+  emit('change', e.format(myFormat))
 }
+
+const _type = computed(() => {
+  return props.value?.includes('-')
+})
 </script>
 
 <style lang='less'>
diff --git a/src/views/rule-engine/Scene/Save/components/ParamsDropdown/index.vue b/src/views/rule-engine/Scene/Save/components/ParamsDropdown/index.vue
index e716654b..199ab95d 100644
--- a/src/views/rule-engine/Scene/Save/components/ParamsDropdown/index.vue
+++ b/src/views/rule-engine/Scene/Save/components/ParamsDropdown/index.vue
@@ -28,7 +28,7 @@
                 @change='timeChange'
               />
               <DropdownMenus
-                v-if='["select","enum", "boolean"].includes(item.component)'
+                v-else-if='["select","enum", "boolean"].includes(item.component)'
                 :options='["metric", "upper"].includes(item.key) ?  metricOption : options'
                 @click='onSelect'
               />
diff --git a/tsconfig.json b/tsconfig.json
index e9e42eed..b9ec6070 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -21,6 +21,7 @@
       "layouts/*": ["./src/layouts/*"],
       "store/*": ["./src/store/*"],
       "style/*": ["./src/style/*"],
+      "jetlinks-ui-components/es": ["./node_modules/jetlinks-ui-components/es/*"]
     },
     "types": ["ant-design-vue/typings/global", "vite/client"],
     "suppressImplicitAnyIndexErrors": true
diff --git a/vite.config.ts b/vite.config.ts
index 6fbe3e01..f501aee1 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -114,7 +114,7 @@ export default defineConfig(({ mode}) => {
           }
       },
       optimizeDeps: {
-          include: ['pinia', 'vue-router', 'axios', 'lodash-es', '@vueuse/core', 'echarts'],
+          include: ['pinia', 'vue-router', 'axios', 'lodash-es', '@vueuse/core', 'echarts', 'dayjs'],
       }
   }
 })