From 9056ff5acb3ac1db859bcecf9e275bf96c386c0d Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Tue, 4 Jan 2022 10:55:36 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=20=E4=BF=AE=E6=94=B9timePick?=
 =?UTF-8?q?=E7=BB=84=E4=BB=B6=20=E6=97=B6=E9=97=B4=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E4=B8=8D=E5=AF=B9=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/common/bottomBox/tabs/endpointQuery.vue    | 4 ++--
 .../components/common/bottomBox/tabs/endpointQueryTab.vue | 4 ++--
 nezha-fronted/src/components/common/multipleTime.vue      | 2 +-
 .../src/components/common/myDatePicker/src/picker.vue     | 4 ++--
 .../src/components/common/rightBox/alertSilenceBox.vue    | 4 ++--
 nezha-fronted/src/components/common/timePicker.vue        | 2 +-
 .../src/components/page/config/system/apiKeyTable.vue     | 4 ++--
 nezha-fronted/src/main.js                                 | 8 ++++++++
 8 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/endpointQuery.vue b/nezha-fronted/src/components/common/bottomBox/tabs/endpointQuery.vue
index c35c68f11..8cbd7dcb7 100644
--- a/nezha-fronted/src/components/common/bottomBox/tabs/endpointQuery.vue
+++ b/nezha-fronted/src/components/common/bottomBox/tabs/endpointQuery.vue
@@ -30,8 +30,8 @@
             clearable
             :time-arrow-control="true"
             placeholder="Moment"
-            :value-format="endpointQueryTime"
-            :format="endpointQueryTime"
+            :value-format="timeFormatStrToDatePickFormat(endpointQueryTime)"
+            :format="timeFormatStrToDatePickFormat(endpointQueryTime)"
           >
           </my-date-picker><button @click="changeTime(10)" class="nz-btn nz-btn-size-normal nz-btn-style-light change-time-height nz-input-group-append"><i class="el-icon-d-arrow-right"></i></button>
           </div>
diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/endpointQueryTab.vue b/nezha-fronted/src/components/common/bottomBox/tabs/endpointQueryTab.vue
index 0e8f199f8..a86e996cc 100644
--- a/nezha-fronted/src/components/common/bottomBox/tabs/endpointQueryTab.vue
+++ b/nezha-fronted/src/components/common/bottomBox/tabs/endpointQueryTab.vue
@@ -40,8 +40,8 @@
           clearable
           :time-arrow-control="true"
           placeholder="Moment"
-          :value-format="endpointQueryTabTime"
-          :format="endpointQueryTabTime"
+          :value-format="timeFormatStrToDatePickFormat(endpointQueryTabTime)"
+          :format="timeFormatStrToDatePickFormat(endpointQueryTabTime)"
           @change="pickTime"
         >
           </my-date-picker><button @click="changeTime(10)" class="nz-btn nz-btn-size-normal nz-btn-style-light change-time-height nz-input-group-append"><i class="el-icon-d-arrow-right"></i></button>
diff --git a/nezha-fronted/src/components/common/multipleTime.vue b/nezha-fronted/src/components/common/multipleTime.vue
index 9f82b7dfa..a450500e7 100644
--- a/nezha-fronted/src/components/common/multipleTime.vue
+++ b/nezha-fronted/src/components/common/multipleTime.vue
@@ -4,7 +4,7 @@
     <transition>
       <div v-show="showDropdown" id="panel-calender" class="calendar">
         <my-date-picker prefix-icon=" " size="mini" ref="calendar"
-                        :format="multipleTime" class="panel-time-picker-hidden" @change="dateChange" v-model="startTime" type="datetime"
+                        :format="timeFormatStrToDatePickFormat(multipleTime)" class="panel-time-picker-hidden" @change="dateChange" v-model="startTime" type="datetime"
                         popper-class="panel-time-picker-popper"
                         align="right">
         </my-date-picker>
diff --git a/nezha-fronted/src/components/common/myDatePicker/src/picker.vue b/nezha-fronted/src/components/common/myDatePicker/src/picker.vue
index 770675cef..89a82eed3 100644
--- a/nezha-fronted/src/components/common/myDatePicker/src/picker.vue
+++ b/nezha-fronted/src/components/common/myDatePicker/src/picker.vue
@@ -109,13 +109,13 @@ const NewPopper = {
 const DEFAULT_FORMATS = {
   date: 'yyyy-MM-dd',
   month: 'yyyy-MM',
-  datetime: 'YYYY-MM-DD HH:mm:ss',
+  datetime: 'yyyy-MM-dd HH:mm:ss',
   time: 'HH:mm:ss',
   week: 'yyyywWW',
   timerange: 'HH:mm:ss',
   daterange: 'yyyy-MM-dd',
   monthrange: 'yyyy-MM',
-  datetimerange: 'YYYY-MM-DD HH:mm:ss',
+  datetimerange: 'yyyy-MM-dd HH:mm:ss',
   year: 'yyyy'
 }
 const HAVE_TRIGGER_TYPES = [
diff --git a/nezha-fronted/src/components/common/rightBox/alertSilenceBox.vue b/nezha-fronted/src/components/common/rightBox/alertSilenceBox.vue
index 6eb6821d3..0550c725f 100644
--- a/nezha-fronted/src/components/common/rightBox/alertSilenceBox.vue
+++ b/nezha-fronted/src/components/common/rightBox/alertSilenceBox.vue
@@ -38,7 +38,7 @@
               <div class="datepicker-box">
                 <span class="datepicker-title">{{ $t("overall.startTime") }}</span>
                 <my-date-picker ref="calendar" v-model="editAlertSilence.startAt" :clearable="false" :placeholder="$t('dashboard.panel.startTime')"
-                                align="right" class=" " :format="alertSilenceTime"
+                                align="right" class=" " :format="timeFormatStrToDatePickFormat(alertSilenceTime)"
                                 popper-class="panel-time-picker-popper right-box-select-top"
                                 prefix-icon=" "
                                 size="mini"
@@ -50,7 +50,7 @@
               <div class="datepicker-box">
                 <span class="datepicker-title">{{ $t("overall.endTime") }}</span>
                 <my-date-picker ref="calendar" v-model="editAlertSilence.endAt" :clearable="false" :placeholder="$t('dashboard.panel.startTime')"
-                                align="right" class=" " :format="alertSilenceTime"
+                                align="right" class=" " :format="timeFormatStrToDatePickFormat(alertSilenceTime)"
                                 popper-class="panel-time-picker-popper right-box-select-top"
                                 prefix-icon=" "
                                 size="mini"
diff --git a/nezha-fronted/src/components/common/timePicker.vue b/nezha-fronted/src/components/common/timePicker.vue
index cd9c3261b..3c17a95cc 100644
--- a/nezha-fronted/src/components/common/timePicker.vue
+++ b/nezha-fronted/src/components/common/timePicker.vue
@@ -1,7 +1,7 @@
 <template>
   <div id="panel-calender" :class="{'calendar--small': size === 'small'}" class="calendar">
     <my-date-picker prefix-icon=" " class="panel-time-picker-hidden " size="mini" ref="calendar"
-                    :format="timePicker" @change="dateChange" v-model="searchTime" type="datetimerange"
+                    :format="timeFormatStrToDatePickFormat(timePicker)" @change="dateChange" v-model="searchTime" type="datetimerange"
                     popper-class="panel-time-picker-popper time-picker-popover__select-top"
                     :default-time="['00:00:00', '23:59:59']"
                     :range-separator="$t('dashboard.panel.to')"
diff --git a/nezha-fronted/src/components/page/config/system/apiKeyTable.vue b/nezha-fronted/src/components/page/config/system/apiKeyTable.vue
index 760dbc7f1..a604e699a 100644
--- a/nezha-fronted/src/components/page/config/system/apiKeyTable.vue
+++ b/nezha-fronted/src/components/page/config/system/apiKeyTable.vue
@@ -55,8 +55,8 @@
                   style="width: 100%;"
                   v-model="scope.row[item.prop]"
                   prefix-icon=" " size="small" ref="calendar"
-                  :format="apiKeyTableTime"
-                  :value-format="apiKeyTableTime"
+                  :format="timeFormatStrToDatePickFormat(apiKeyTableTime)"
+                  :value-format="timeFormatStrToDatePickFormat(apiKeyTableTime)"
                   type="datetime"
                   popper-class="item-system-table right-public-box-dropdown-top right-box-select-top"
                   :picker-options="pickerOptions"
diff --git a/nezha-fronted/src/main.js b/nezha-fronted/src/main.js
index eee55b0b0..433df1a74 100644
--- a/nezha-fronted/src/main.js
+++ b/nezha-fronted/src/main.js
@@ -161,6 +161,14 @@ Vue.mixin({
     translation (key) {
       return i18n.t(key)
     },
+    timeFormatStrToDatePickFormat (str) {
+      // str.replace(//)
+      const reg = /Y/g
+      str = str.replace(reg, 'y')
+      const reg1 = /D/g
+      str = str.replace(reg1, 'd')
+      return str
+    },
     copyRow (row, rightBoxValKey, idKey = 'id', show = false, format, callback) {
       /*
       row 表格当前行