From a14337463ea73ce52595a55c32e940d79586bd87 Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Mon, 1 Aug 2022 20:59:14 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E4=BB=AA=E8=A1=A8=E6=9D=BF-=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4=E8=BF=87=E6=BB=A4=E5=99=A8):=20=E7=B2=BE=E7=A1=AE?=
 =?UTF-8?q?=E5=88=B0=E5=B0=8F=E6=97=B6=E4=BD=86=E6=98=AF=E6=B2=A1=E6=9C=89?=
 =?UTF-8?q?=E9=9A=90=E8=97=8F=E5=88=86=E9=92=9F=E9=80=89=E6=8B=A9=E5=99=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/widget/DeWidget/DeDate.vue | 30 +++++++++++++++++--
 1 file changed, 27 insertions(+), 3 deletions(-)

diff --git a/frontend/src/components/widget/DeWidget/DeDate.vue b/frontend/src/components/widget/DeWidget/DeDate.vue
index 93ef2f6c07..9d2944983e 100644
--- a/frontend/src/components/widget/DeWidget/DeDate.vue
+++ b/frontend/src/components/widget/DeWidget/DeDate.vue
@@ -1,9 +1,9 @@
 <template>
   <el-date-picker
-    v-if="element.options!== null && element.options.attrs!==null"
+    v-if="element.options!== null && element.options.attrs!==null && show"
     ref="dateRef"
     v-model="values"
-    popper-class="coustom-date-picker"
+    :popper-class="'coustom-date-picker' + ' ' + extPoperClass"
     :type="componentType"
     :range-separator="$t(element.options.attrs.rangeSeparator)"
     :start-placeholder="$t(element.options.attrs.startPlaceholder)"
@@ -56,10 +56,17 @@ export default {
     return {
       operator: 'between',
       values: null,
-      onFocus: false
+      onFocus: false,
+      show: true
     }
   },
   computed: {
+    extPoperClass() {
+      if(this.labelFormat && this.labelFormat.includes('HH') && !this.labelFormat.includes('HH:mm')) {
+        return 'de-no-minite'
+      }
+      return ''
+    },
     defaultoptions() {
       if (!this.element || !this.element.options || !this.element.options.attrs.default) return ''
       return JSON.stringify(this.element.options.attrs.default)
@@ -118,6 +125,14 @@ export default {
       const widget = ApplicationContext.getService(this.element.serviceName)
       this.values = widget.dynamicDateFormNow(this.element)
       this.dateChange(this.values)
+    },
+    'labelFormat': function(val, old) {
+      if(val !== old) {
+        this.show = false
+        this.$nextTick(() => {
+          this.show = true
+        })
+      }
     }
   },
   created() {
@@ -285,4 +300,13 @@ export default {
     color: #409EFF;
   }
 }
+
+.de-no-minite {
+  .el-time-spinner__wrapper {
+    width: 100% !important;
+  }
+  .el-scrollbar:nth-of-type(2) {
+    display: none;
+  }
+}
 </style>