From 7da6e356db843a9ffd7d345682745689dfcf28bf Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Thu, 5 Sep 2024 10:36:09 +0800
Subject: [PATCH 1/2] =?UTF-8?q?refactor(=E4=BB=AA=E8=A1=A8=E6=9D=BF):=20?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=85=AC=E5=85=B1=E9=93=BE=E6=8E=A5=E6=93=8D?=
 =?UTF-8?q?=E4=BD=9C=E6=8C=89=E9=92=AE=E6=8E=A7=E5=88=B6=E9=80=89=E9=A1=B9?=
 =?UTF-8?q?#11631?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../canvas/components/editor/Preview.vue      |  5 ++-
 .../src/components/canvas/utils/utils.js      |  1 +
 core/frontend/src/lang/en.js                  |  2 ++
 core/frontend/src/lang/tw.js                  |  2 ++
 core/frontend/src/lang/zh.js                  |  2 ++
 core/frontend/src/views/panel/panel.js        |  1 +
 .../panelStyle/OverallSetting.vue             | 32 ++++++++++++++++++-
 7 files changed, 43 insertions(+), 2 deletions(-)

diff --git a/core/frontend/src/components/canvas/components/editor/Preview.vue b/core/frontend/src/components/canvas/components/editor/Preview.vue
index 2c3867c7e4..1a1baf08d7 100644
--- a/core/frontend/src/components/canvas/components/editor/Preview.vue
+++ b/core/frontend/src/components/canvas/components/editor/Preview.vue
@@ -16,7 +16,7 @@
       @back-to-top="backToTop"
     />
     <link-opt-bar
-      v-if="canvasId==='canvas-main'"
+      v-if="linkOptBarShow"
       ref="link-opt-bar"
       :terminal="terminal"
       :canvas-style-data="canvasStyleData"
@@ -382,6 +382,9 @@ export default {
     }
   },
   computed: {
+    linkOptBarShow() {
+      return this.canvasId==='canvas-main' && this.canvasStyleData.showPublicLinkButton
+    },
     screenShotStatues() {
       return this.exporting || this.screenShot || this.backScreenShot
     },
diff --git a/core/frontend/src/components/canvas/utils/utils.js b/core/frontend/src/components/canvas/utils/utils.js
index 2d8b8a6534..4c09049880 100644
--- a/core/frontend/src/components/canvas/utils/utils.js
+++ b/core/frontend/src/components/canvas/utils/utils.js
@@ -94,6 +94,7 @@ export function panelDataPrepare(componentData, componentStyle, callback) {
   componentStyle.refreshUnit = (componentStyle.refreshUnit || 'minute')
   componentStyle.refreshViewEnable = (componentStyle.refreshViewEnable === undefined ? true : componentStyle.refreshViewEnable)
   componentStyle.refreshBrowserEnable = (componentStyle.refreshBrowserEnable || false)
+  componentStyle.showPublicLinkButton = (componentStyle.showPublicLinkButton === undefined ? true : componentStyle.showPublicLinkButton)
   componentStyle.refreshBrowserTime = (componentStyle.refreshBrowserTime || 5)
   componentStyle.aidedDesign = (componentStyle.aidedDesign || deepCopy(AIDED_DESIGN))
   componentStyle.pdfPageLine = (componentStyle.pdfPageLine || deepCopy(PAGE_LINE_DESIGN))
diff --git a/core/frontend/src/lang/en.js b/core/frontend/src/lang/en.js
index 7738bc3c28..6764dc5008 100644
--- a/core/frontend/src/lang/en.js
+++ b/core/frontend/src/lang/en.js
@@ -2399,7 +2399,9 @@ export default {
     theme_color_light: 'Light',
     refresh_frequency: 'Refresh Frequency',
     refresh_browser_frequency: 'Refresh Browser',
+    public_link_button_show: 'Show Public Link Button',
     refresh_browser_tips: 'Only public links are effective',
+    public_link_button_tips: 'Only public links are effective',
     card_color_matching: 'Card Color Matching',
     table_color_matching: 'Table Color Matching',
     background_color: 'Background Color',
diff --git a/core/frontend/src/lang/tw.js b/core/frontend/src/lang/tw.js
index 4814e4daf2..466cf44667 100644
--- a/core/frontend/src/lang/tw.js
+++ b/core/frontend/src/lang/tw.js
@@ -2392,7 +2392,9 @@ export default {
     theme_color_light: '淺色',
     refresh_frequency: '刷新頻率',
     refresh_browser_frequency: '瀏覽器刷新',
+    public_link_button_show: '顯示公共鏈接操作按鈕',
     refresh_browser_tips: '僅公共鏈接生效',
+    public_link_button_tips: '僅公共鏈接生效',
     card_color_matching: '卡片配色',
     table_color_matching: '表格配色',
     background_color: '背景顏色',
diff --git a/core/frontend/src/lang/zh.js b/core/frontend/src/lang/zh.js
index 0ba6f16e07..70508fc6fa 100644
--- a/core/frontend/src/lang/zh.js
+++ b/core/frontend/src/lang/zh.js
@@ -2393,7 +2393,9 @@ export default {
     theme_color_light: '浅色',
     refresh_frequency: '刷新频率',
     refresh_browser_frequency: '浏览器刷新',
+    public_link_button_show: '显示公共链接操作按钮',
     refresh_browser_tips: '仅公共链接生效',
+    public_link_button_tips: '仅公共链接生效',
     card_color_matching: '卡片配色',
     table_color_matching: '表格配色',
     background_color: '背景颜色',
diff --git a/core/frontend/src/views/panel/panel.js b/core/frontend/src/views/panel/panel.js
index ceee9e86bc..5be122f857 100644
--- a/core/frontend/src/views/panel/panel.js
+++ b/core/frontend/src/views/panel/panel.js
@@ -82,6 +82,7 @@ export const CANVAS_STYLE = {
   refreshUnit: 'minute', // 仪表板刷新时间带外 默认 分钟
   refreshTime: 5, // 仪表板刷新时间 默认5分钟
   refreshBrowserEnable: false, // 开启视图刷新（默认关闭）
+  showPublicLinkButton: true, // 开启公共链接按钮（默认开启）
   refreshBrowserTime: 5, // 仪表板刷新时间 默认5分钟(浏览器刷新仅保留分钟)
   themeId: 'system_1', // 当前所选主题ID 默认系统主题1
   chartInfo: PANEL_CHART_INFO
diff --git a/core/frontend/src/views/panel/subjectSetting/panelStyle/OverallSetting.vue b/core/frontend/src/views/panel/subjectSetting/panelStyle/OverallSetting.vue
index de730b1f61..7a1ade5068 100644
--- a/core/frontend/src/views/panel/subjectSetting/panelStyle/OverallSetting.vue
+++ b/core/frontend/src/views/panel/subjectSetting/panelStyle/OverallSetting.vue
@@ -126,7 +126,7 @@
           </el-input>
         </el-row>
       </el-row>
-      <el-row class="margin-top20 margin-bottom20">
+      <el-row class="margin-top20">
         <el-row class="custom-item-text-row">
           <span class="custom-item-text bl">
             {{ $t('panel.panel_view_result_show') }}
@@ -182,6 +182,36 @@
           </el-row>
         </el-row>
       </el-row>
+
+      <el-row class="margin-top20 margin-bottom20">
+        <el-row class="custom-item-text-row">
+          <span class="custom-item-text el-input-refresh-browser-inner bl">
+            <el-checkbox
+              v-model="overallSettingForm.showPublicLinkButton"
+              class="el-input-refresh-browser"
+              @change="themeChange"
+            >{{ $t('panel.public_link_button_show') }}
+            </el-checkbox>
+            <span class="custom-item-text bl">
+              <span>
+                <el-tooltip
+                  class="item"
+                  effect="dark"
+                  placement="bottom"
+                >
+                  <div slot="content">
+                    {{ $t('panel.public_link_button_tips') }}
+                  </div>
+                  <i
+                    class="el-icon-info"
+                    style="cursor: pointer;"
+                  />
+                </el-tooltip>
+              </span>
+            </span>
+          </span>
+        </el-row>
+      </el-row>
     </el-col>
   </div>
 </template>

From 40c51a8542dce6c38a29be39f8c5a280ee8659bb Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Thu, 5 Sep 2024 10:41:08 +0800
Subject: [PATCH 2/2] =?UTF-8?q?style(=E4=BB=AA=E8=A1=A8=E6=9D=BF):=20?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../panel/subjectSetting/panelStyle/OverallSetting.vue | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/core/frontend/src/views/panel/subjectSetting/panelStyle/OverallSetting.vue b/core/frontend/src/views/panel/subjectSetting/panelStyle/OverallSetting.vue
index 7a1ade5068..f9a3887ce5 100644
--- a/core/frontend/src/views/panel/subjectSetting/panelStyle/OverallSetting.vue
+++ b/core/frontend/src/views/panel/subjectSetting/panelStyle/OverallSetting.vue
@@ -93,7 +93,7 @@
               @change="themeChange"
             >{{ $t('panel.refresh_browser_frequency') }}
             </el-checkbox>
-            <span class="custom-item-text bl">
+            <span class="custom-item-text bl margin-left4">
               <span>
                 <el-tooltip
                   class="item"
@@ -130,7 +130,7 @@
         <el-row class="custom-item-text-row">
           <span class="custom-item-text bl">
             {{ $t('panel.panel_view_result_show') }}
-            <span>
+            <span class="margin-left4">
               <el-tooltip
                 class="item"
                 effect="dark"
@@ -192,7 +192,7 @@
               @change="themeChange"
             >{{ $t('panel.public_link_button_show') }}
             </el-checkbox>
-            <span class="custom-item-text bl">
+            <span class="custom-item-text bl margin-left4">
               <span>
                 <el-tooltip
                   class="item"
@@ -390,6 +390,10 @@ export default {
   margin-left: 32px;
 }
 
+.margin-left4 {
+  margin-left: 4px;
+}
+
 .bl {
   justify-content: flex-start;
   display: flex;