From f31eb4efbc2b44e7eb811f621cd26398a8abcf82 Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Wed, 3 Nov 2021 17:44:20 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E5=88=B7=E6=96=B0=E6=97=B6=E9=97=B4?=
 =?UTF-8?q?=E5=8F=AF=E4=BB=A5=E9=80=89=E6=8B=A9=E5=8D=95=E4=BD=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/canvas/components/Editor/Preview.vue |  6 +++++-
 .../components/canvas/custom-component/UserView.vue |  2 +-
 frontend/src/components/canvas/utils/style.js       |  3 ++-
 .../SubjectSetting/PanelStyle/PanelRefreshTime.vue  | 13 +++++++++++--
 frontend/src/views/panel/edit/index.vue             |  8 ++++++--
 frontend/src/views/panel/list/PanelList.vue         |  4 +++-
 frontend/src/views/panel/panel.js                   |  4 +++-
 7 files changed, 31 insertions(+), 9 deletions(-)

diff --git a/frontend/src/components/canvas/components/Editor/Preview.vue b/frontend/src/components/canvas/components/Editor/Preview.vue
index f3c481b03f..4bb6f4d3fd 100644
--- a/frontend/src/components/canvas/components/Editor/Preview.vue
+++ b/frontend/src/components/canvas/components/Editor/Preview.vue
@@ -175,7 +175,11 @@ export default {
       this.timer && clearInterval(this.timer)
       let refreshTime = 300000
       if (this.canvasStyleData.refreshTime && this.canvasStyleData.refreshTime > 0) {
-        refreshTime = this.canvasStyleData.refreshTime * 1000
+        if (this.canvasStyleData.refreshUnit === 'second') {
+          refreshTime = this.canvasStyleData.refreshTime * 1000
+        } else {
+          refreshTime = this.canvasStyleData.refreshTime * 60000
+        }
       }
       this.timer = setInterval(() => {
         this.searchCount++
diff --git a/frontend/src/components/canvas/custom-component/UserView.vue b/frontend/src/components/canvas/custom-component/UserView.vue
index 15d84015e8..554ab6ec1e 100644
--- a/frontend/src/components/canvas/custom-component/UserView.vue
+++ b/frontend/src/components/canvas/custom-component/UserView.vue
@@ -1,6 +1,6 @@
 <template>
   <div
-    v-loading="requestStatus==='waiting'"
+    v-loading="canvasStyleData.refreshViewLoading&&requestStatus==='waiting'"
     :class="[
       {
         ['active']: active
diff --git a/frontend/src/components/canvas/utils/style.js b/frontend/src/components/canvas/utils/style.js
index a9a498fed1..92b7462833 100644
--- a/frontend/src/components/canvas/utils/style.js
+++ b/frontend/src/components/canvas/utils/style.js
@@ -63,8 +63,9 @@ export function getComponentRotatedStyle(style) {
 
 export function colorRgb(color, opacity) {
   var reg = /^#([0-9a-fA-f]{3}|[0-9a-fA-f]{6})$/
-  var sColor = color.toLowerCase()
+  var sColor = color
   if (sColor && reg.test(sColor)) {
+    sColor = sColor.toLowerCase()
     if (sColor.length === 4) {
       var sColorNew = '#'
       for (var i = 1; i < 4; i += 1) {
diff --git a/frontend/src/views/panel/SubjectSetting/PanelStyle/PanelRefreshTime.vue b/frontend/src/views/panel/SubjectSetting/PanelStyle/PanelRefreshTime.vue
index 67344bb1f0..305428228a 100644
--- a/frontend/src/views/panel/SubjectSetting/PanelStyle/PanelRefreshTime.vue
+++ b/frontend/src/views/panel/SubjectSetting/PanelStyle/PanelRefreshTime.vue
@@ -7,8 +7,17 @@
         trigger="click"
       >
         <el-col>
-          <el-form ref="colorForm" label-width="80px" size="mini">
-            <el-form-item :label="$t('panel.second')" class="form-item form-item-slider">
+          <el-form ref="colorForm" label-width="110px" size="mini">
+            <el-form-item :label="'视图加载提示'" class="form-item form-item-slider">
+              <el-checkbox v-model="canvasStyleData.refreshViewLoading" @change="onChangePanelStyle" />
+            </el-form-item>
+            <el-form-item :label="'刷新时间单位'" class="form-item form-item-slider">
+              <el-radio-group v-model="canvasStyleData.refreshUnit" @change="onChangePanelStyle">
+                <el-radio label="second">秒</el-radio>
+                <el-radio label="minute">分</el-radio>
+              </el-radio-group>
+            </el-form-item>
+            <el-form-item :label="'刷新时间频率'" class="form-item form-item-slider">
               <el-slider v-model="canvasStyleData.refreshTime" show-input :show-input-controls="false" input-size="mini" :min="1" :max="3600" @change="onChangePanelStyle" />
             </el-form-item>
           </el-form>
diff --git a/frontend/src/views/panel/edit/index.vue b/frontend/src/views/panel/edit/index.vue
index 12f3477610..1a66c84aa1 100644
--- a/frontend/src/views/panel/edit/index.vue
+++ b/frontend/src/views/panel/edit/index.vue
@@ -422,7 +422,9 @@ export default {
         this.$store.commit('setComponentData', this.resetID(componentDatas))
         // this.$store.commit('setComponentData', this.resetID(JSON.parse(componentDataTemp)))
         const temp = JSON.parse(canvasStyleDataTemp)
-        temp.refreshTime = (temp.refreshTime || 300)
+        temp.refreshTime = (temp.refreshTime || 5)
+        temp.refreshViewLoading = (temp.refreshViewLoading || false)
+        temp.refreshUnit = (temp.refreshUnit || 'minute')
 
         this.$store.commit('setCanvasStyle', temp)
         // 清空临时画布数据
@@ -443,7 +445,9 @@ export default {
           this.$store.commit('setComponentData', this.resetID(componentDatas))
           //   this.$store.commit('setComponentData', this.resetID(JSON.parse(response.data.panelData)))
           const panelStyle = JSON.parse(response.data.panelStyle)
-          panelStyle.refreshTime = (panelStyle.refreshTime || 300)
+          panelStyle.refreshTime = (panelStyle.refreshTime || 5)
+          panelStyle.refreshViewLoading = (panelStyle.refreshViewLoading || false)
+          panelStyle.refreshUnit = (panelStyle.refreshUnit || 'minute')
 
           this.$store.commit('setCanvasStyle', panelStyle)
           this.$store.commit('recordSnapshot', 'init')// 记录快照
diff --git a/frontend/src/views/panel/list/PanelList.vue b/frontend/src/views/panel/list/PanelList.vue
index 2748b32e50..2b075a26b6 100644
--- a/frontend/src/views/panel/list/PanelList.vue
+++ b/frontend/src/views/panel/list/PanelList.vue
@@ -631,7 +631,9 @@ export default {
           this.$store.commit('setComponentData', this.resetID(componentDatas))
           //   this.$store.commit('setComponentData', sourceInfo.type === 'custom' ? sourceInfo : this.resetID(sourceInfo))
           const temp = JSON.parse(response.data.panelStyle)
-          temp.refreshTime = (temp.refreshTime || 300)
+          temp.refreshTime = (temp.refreshTime || 5)
+          temp.refreshViewLoading = (temp.refreshViewLoading || false)
+          temp.refreshUnit = (temp.refreshUnit || 'minute')
 
           this.$store.commit('setCanvasStyle', temp)
           this.$store.dispatch('panel/setPanelInfo', data)
diff --git a/frontend/src/views/panel/panel.js b/frontend/src/views/panel/panel.js
index 4760c847af..1b1cb4b213 100644
--- a/frontend/src/views/panel/panel.js
+++ b/frontend/src/views/panel/panel.js
@@ -20,7 +20,9 @@ export const CANVAS_STYLE = {
   auxiliaryMatrix: true,
   openCommonStyle: true,
   panel: DEFAULT_PANEL_STYLE,
-  refreshTime: 300 // 仪表板刷新时间 默认300秒
+  refreshViewLoading: true, // 仪表板视图loading提示
+  refreshUnit: 'minute', // 仪表板刷新时间带外 默认 分钟
+  refreshTime: 5 // 仪表板刷新时间 默认5分钟
 }
 
 export const DEFAULT_COMMON_CANVAS_STYLE_STRING = {