From f284d43e183da0501eddd6be4b81549b470ceeb6 Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Wed, 4 Jan 2023 17:23:18 +0800
Subject: [PATCH 1/3] =?UTF-8?q?fix(=E4=BB=AA=E8=A1=A8=E6=9D=BF):=20?=
 =?UTF-8?q?=E5=9C=A8=E7=AC=AC=E4=B8=89=E6=96=B9=E5=B9=B3=E5=8F=B0=E5=86=85?=
 =?UTF-8?q?=E7=A6=81=E6=AD=A2=E4=BD=BF=E7=94=A8=E6=96=B0Tab=E9=A2=84?=
 =?UTF-8?q?=E8=A7=88=E4=BB=A5=E5=8F=8A=E5=85=A8=E5=B1=8F=E9=A2=84=E8=A7=88?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/canvas/components/Toolbar.vue  | 10 ++++++++--
 .../src/views/panel/list/PanelViewShow.vue    | 20 ++++++++++++-------
 2 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/frontend/src/components/canvas/components/Toolbar.vue b/frontend/src/components/canvas/components/Toolbar.vue
index 994cbac5d7..2900b4b022 100644
--- a/frontend/src/components/canvas/components/Toolbar.vue
+++ b/frontend/src/components/canvas/components/Toolbar.vue
@@ -71,7 +71,10 @@
           @click="redo"
         />
       </el-tooltip>
-      <el-tooltip :content="$t('panel.fullscreen_preview')">
+      <el-tooltip
+        v-if="!isOtherPlatform"
+        :content="$t('panel.fullscreen_preview')"
+      >
         <svg-icon
           icon-class="icon_magnify_outlined"
           class="toolbar-icon-active icon16"
@@ -235,7 +238,7 @@ import { panelUpdate, removePanelCache, saveCache } from '@/api/panel/panel'
 import { getPanelAllLinkageInfo, saveLinkage } from '@/api/panel/linkage'
 import bus from '@/utils/bus'
 import { queryPanelJumpInfo } from '@/api/panel/linkJump'
-
+import { inOtherPlatform } from '@/utils/index'
 export default {
   name: 'Toolbar',
   props: {
@@ -274,6 +277,9 @@ export default {
     editControlButton() {
       return this.linkageSettingStatus || this.mobileLayoutStatus
     },
+    isOtherPlatform() {
+      return inOtherPlatform()
+    },
     ...mapState([
       'componentData',
       'canvasStyleData',
diff --git a/frontend/src/views/panel/list/PanelViewShow.vue b/frontend/src/views/panel/list/PanelViewShow.vue
index 6dc17bda49..ce238dea27 100644
--- a/frontend/src/views/panel/list/PanelViewShow.vue
+++ b/frontend/src/views/panel/list/PanelViewShow.vue
@@ -17,7 +17,7 @@
         style="border-bottom: 1px solid;border-bottom-color:#E6E6E6;"
       >
         <div style="height: 100%;">
-          <share-head/>
+          <share-head />
         </div>
       </el-row>
       <el-row
@@ -76,7 +76,7 @@
               width="400"
               trigger="click"
             >
-              <panel-detail-info/>
+              <panel-detail-info />
               <i
                 slot="reference"
                 class="el-icon-warning-outline icon-class"
@@ -98,7 +98,10 @@
               </de-btn>
             </span>
 
-            <span v-if="showType !== 1" style="float: right;margin-right: 10px">
+            <span
+              v-if="showType !== 1"
+              style="float: right;margin-right: 10px"
+            >
               <de-btn
                 secondary
                 @click="share"
@@ -108,7 +111,7 @@
             </span>
 
             <span
-              v-if="panelInfo.status==='publish'"
+              v-if="panelInfo.status==='publish' && !isOtherPlatform"
               style="float: right;margin-right: 10px"
             >
               <de-btn
@@ -141,7 +144,7 @@
                   class="de-card-dropdown"
                 >
                   <el-dropdown-item
-                    v-if="panelInfo.status==='publish'"
+                    v-if="panelInfo.status==='publish' && !isOtherPlatform"
                     @click.native="newTab"
                   >
                     <svg-icon
@@ -181,8 +184,8 @@
                   </el-dropdown-item>
 
                   <el-dropdown
-                    style="width: 100%"
                     v-if="hasDataPermission('export',panelInfo.privileges)&&panelInfo.status==='publish'"
+                    style="width: 100%"
                     trigger="hover"
                     placement="right-start"
                   >
@@ -388,7 +391,7 @@ import PanelDetailInfo from '@/views/panel/list/common/PanelDetailInfo'
 import AppExportForm from '@/views/panel/list/AppExportForm'
 import GrantAuth from '../grantAuth'
 import msgCfm from '@/components/msgCfm/index'
-
+import { inOtherPlatform } from '@/utils/index'
 export default {
   name: 'PanelViewShow',
   components: { AppExportForm, PanelDetailInfo, Preview, SaveToTemplate, PDFPreExport, ShareHead, GrantAuth },
@@ -446,6 +449,9 @@ export default {
     panelInfo() {
       return this.$store.state.panel.panelInfo
     },
+    isOtherPlatform() {
+      return inOtherPlatform()
+    },
     ...mapState([
       'componentData',
       'canvasStyleData',

From 119e9067fab56aa456abc06863e03a7c5fcc65d9 Mon Sep 17 00:00:00 2001
From: dataeaseShu <106045316+dataeaseShu@users.noreply.github.com>
Date: Wed, 4 Jan 2023 17:37:43 +0800
Subject: [PATCH 2/3] =?UTF-8?q?fix:=20=E6=96=B0=E5=BB=BAhive=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E6=BA=90-=E5=BF=85=E5=A1=AB=E9=A1=B9=E5=85=A8?=
 =?UTF-8?q?=E9=83=A8=E4=B8=BA=E7=A9=BA-=E7=82=B9=E5=87=BB=E6=A0=A1?=
 =?UTF-8?q?=E9=AA=8C=E6=88=96=E4=BF=9D=E5=AD=98=E6=8C=89=E9=92=AE-?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E5=90=8D=E7=A7=B0=E6=97=A0=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/views/system/datasource/DsFormContent.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/frontend/src/views/system/datasource/DsFormContent.vue b/frontend/src/views/system/datasource/DsFormContent.vue
index 057deb2716..04945fdf61 100644
--- a/frontend/src/views/system/datasource/DsFormContent.vue
+++ b/frontend/src/views/system/datasource/DsFormContent.vue
@@ -964,6 +964,7 @@ export default {
           status = valid
         })
       }
+      this.$refs.dsForm.validate()
       if (!status) {
         return
       }

From 5d7da59142922dd6664b2c9df9100a0d6f3d114b Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Wed, 4 Jan 2023 17:52:43 +0800
Subject: [PATCH 3/3] =?UTF-8?q?fix(=E8=A7=86=E5=9B=BE):=20=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=E8=A7=86=E5=9B=BE=E7=BF=BB=E9=A1=B5=E6=8F=90=E7=A4=BA?=
 =?UTF-8?q?=E9=98=B2=E6=AD=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/chart/components/ChartComponent.vue  | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/frontend/src/views/chart/components/ChartComponent.vue b/frontend/src/views/chart/components/ChartComponent.vue
index 6b5057a14f..46c9c1ec02 100644
--- a/frontend/src/views/chart/components/ChartComponent.vue
+++ b/frontend/src/views/chart/components/ChartComponent.vue
@@ -332,12 +332,14 @@ export default {
         })
         return
       }
-      if (this.canvasStyleData.panel.themeColor === 'dark') {
-        chart_option.legend['pageIconColor'] = '#ffffff'
-        chart_option.legend['pageIconInactiveColor'] = '#8c8c8c'
-      } else {
-        chart_option.legend['pageIconColor'] = '#000000'
-        chart_option.legend['pageIconInactiveColor'] = '#8c8c8c'
+      if (chart_option.legend) {
+        if (this.canvasStyleData.panel.themeColor === 'dark') {
+          chart_option.legend['pageIconColor'] = '#ffffff'
+          chart_option.legend['pageIconInactiveColor'] = '#8c8c8c'
+        } else {
+          chart_option.legend['pageIconColor'] = '#000000'
+          chart_option.legend['pageIconInactiveColor'] = '#8c8c8c'
+        }
       }
       this.myEcharts(chart_option)
       this.$nextTick(() => (this.linkageActive()))