From 9bdf643ed2fb73275a18944d0e10992b556d8f3a Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Wed, 27 Mar 2024 11:28:12 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E8=BF=87=E6=BB=A4=E7=BB=84=E4=BB=B6):=20?=
 =?UTF-8?q?=E6=97=A5=E6=9C=9F=E5=8A=A8=E6=80=81=E7=BB=84=E4=BB=B6=E7=BC=96?=
 =?UTF-8?q?=E8=BE=91=E7=8A=B6=E6=80=81=E9=80=BB=E8=BE=91=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/widget/deWidget/DeDate.vue | 26 +++++++++----------
 core/frontend/src/views/panel/edit/index.vue  | 21 ++++++++-------
 2 files changed, 25 insertions(+), 22 deletions(-)

diff --git a/core/frontend/src/components/widget/deWidget/DeDate.vue b/core/frontend/src/components/widget/deWidget/DeDate.vue
index 483daba105..aed842e12e 100644
--- a/core/frontend/src/components/widget/deWidget/DeDate.vue
+++ b/core/frontend/src/components/widget/deWidget/DeDate.vue
@@ -67,8 +67,8 @@
 <script>
 import { ApplicationContext } from '@/utils/ApplicationContext'
 import { timeSection } from '@/utils'
-import dayjs from "dayjs";
-import { getThisStart, getLastStart, getAround } from "@/views/panel/filter/filterMain/time-format-dayjs.js";
+import dayjs from 'dayjs'
+import { getThisStart, getLastStart, getAround } from '@/views/panel/filter/filterMain/time-format-dayjs.js'
 import bus from '@/utils/bus'
 import customInput from '@/components/widget/deWidget/customInput'
 import { dateMap, years, seconds } from '@/components/widget/deWidget/serviceNameFn'
@@ -299,10 +299,10 @@ export default {
                 regularOrTrends === 'fixed'
                   ? regularOrTrendsValue[1]
                   : getAround(
-                      relativeToCurrentTypeRange,
-                      aroundRange === 'f' ? 'subtract' : 'add',
-                      timeNumRange
-                    )
+                    relativeToCurrentTypeRange,
+                    aroundRange === 'f' ? 'subtract' : 'add',
+                    timeNumRange
+                  )
               return (
                 timeStamp < +new Date(startTime) - 1000 ||
                 timeStamp > +new Date(endTime) ||
@@ -312,7 +312,7 @@ export default {
           },
           onPick: ({ minDate }) => {
             this.startWindowTime = +new Date(minDate)
-          },
+          }
         }
       }
       return null
@@ -352,7 +352,7 @@ export default {
     },
     'defaultoptions': function(val, old) {
       if (!this.element.options.attrs.default.isDynamic) {
-        this.values = this.fillValueDerfault()
+        this.values = this.fillValueDerfault(false)
         this.dateChange(this.values)
         return
       }
@@ -471,10 +471,10 @@ export default {
     },
     loadInit() {
       this.clearTime()
-      if (this.refreshHandler()) {
-        return
-      }
       const existLastValidFilters = this.$store.state.lastValidFilters && this.$store.state.lastValidFilters[this.element.id]
+      if (this.element.options.attrs.default?.isDynamic && !existLastValidFilters) {
+        return this.refreshHandler()
+      }
       if (this.element.options.value || existLastValidFilters) {
         this.values = this.fillValueDerfault()
         this.dateChange(this.values)
@@ -623,9 +623,9 @@ export default {
         return timeSection(parseFloat(value), this.componentType || this.element.options.attrs.type, this.labelFormat)
       }
     },
-    fillValueDerfault() {
+    fillValueDerfault(useLastFilter = true) {
       let defaultV = this.element.options.value === null ? '' : this.element.options.value.toString()
-      if (this.inDraw) {
+      if (this.inDraw && useLastFilter) {
         let lastFilters = null
         if (this.$store.state.lastValidFilters) {
           lastFilters = this.$store.state.lastValidFilters[this.element.id]
diff --git a/core/frontend/src/views/panel/edit/index.vue b/core/frontend/src/views/panel/edit/index.vue
index 3feb4e5fdc..bbf086c3d7 100644
--- a/core/frontend/src/views/panel/edit/index.vue
+++ b/core/frontend/src/views/panel/edit/index.vue
@@ -15,7 +15,10 @@
       </el-col>
     </el-header>
     <de-container>
-      <de-aside-container close class="ms-aside-container">
+      <de-aside-container
+        close
+        class="ms-aside-container"
+      >
         <div
           v-show="showAside"
           style="width: 60px; left: 0px; top: 0px; bottom: 0px;  position: absolute"
@@ -1346,10 +1349,10 @@ export default {
           regularOrTrends === 'fixed'
             ? regularOrTrendsValue[1]
             : getAround(
-                relativeToCurrentTypeRange,
-                aroundRange === 'f' ? 'subtract' : 'add',
-                timeNumRange
-              )
+              relativeToCurrentTypeRange,
+              aroundRange === 'f' ? 'subtract' : 'add',
+              timeNumRange
+            )
         return (
           startWindowTime < +new Date(startTime) - 1000 ||
           timeStamp > +new Date(endTime) ||
@@ -1363,12 +1366,12 @@ export default {
         const { value, attrs } = this.currentFilterCom.options
         if (!!value && attrs.setTimeRange) {
           const [startWindowTime, timeStamp] = attrs.default.isDynamic ? ApplicationContext.getService('timeDateRangeWidget').dynamicDateFormNow(this.currentFilterCom) : value.split(',')
-          if(this.isInRange(attrs, +startWindowTime, dayjs(+timeStamp)
+          if (this.isInRange(attrs, +startWindowTime, dayjs(+timeStamp)
             .startOf('day')
             .valueOf())) {
-              this.openMessageSuccess(this.$t('time.filter_range'), 'error')
-              return
-            }
+            this.openMessageSuccess(this.$t('time.filter_range'), 'error')
+            return
+          }
         }
       }
       if (this.editType !== 'update') {