diff --git a/frontend/src/api/panel/panel.js b/frontend/src/api/panel/panel.js
index 5b9be4774f..9d5d7198c6 100644
--- a/frontend/src/api/panel/panel.js
+++ b/frontend/src/api/panel/panel.js
@@ -3,6 +3,8 @@ import { panelInit } from '@/components/canvas/utils/utils'
 import { getPanelAllLinkageInfo } from '@/api/panel/linkage'
 import { queryPanelJumpInfo } from '@/api/panel/linkJump'
 import store from '@/store'
+import { $error } from '@/utils/message'
+import i18n from '@/lang'
 
 export function deleteSubject(id) {
   return request({
@@ -157,30 +159,34 @@ export function initPanelData(panelId, useCache = false, callback) {
   const queryMethod = useCache ? findUserCacheRequest : findOne
   // 加载视图数据
   queryMethod(panelId).then(response => {
-    // 初始化视图data和style 数据
-    panelInit(JSON.parse(response.data.panelData), JSON.parse(response.data.panelStyle))
-    // 设置当前仪表板全局信息
-    store.dispatch('panel/setPanelInfo', {
-      id: response.data.id,
-      name: response.data.name,
-      privileges: response.data.privileges,
-      sourcePanelName: response.data.sourcePanelName,
-      status: response.data.status,
-      createBy: response.data.createBy,
-      createTime: response.data.createTime,
-      creatorName: response.data.creatorName,
-      updateBy: response.data.updateBy,
-      updateName: response.data.updateName,
-      updateTime: response.data.updateTime
-    })
-    // 刷新联动信息
-    getPanelAllLinkageInfo(panelId).then(rsp => {
-      store.commit('setNowPanelTrackInfo', rsp.data)
-    })
-    // 刷新跳转信息
-    queryPanelJumpInfo(panelId).then(rsp => {
-      store.commit('setNowPanelJumpInfo', rsp.data)
-    })
+    if (response.data) {
+      // 初始化视图data和style 数据
+      panelInit(JSON.parse(response.data.panelData), JSON.parse(response.data.panelStyle))
+      // 设置当前仪表板全局信息
+      store.dispatch('panel/setPanelInfo', {
+        id: response.data.id,
+        name: response.data.name,
+        privileges: response.data.privileges,
+        sourcePanelName: response.data.sourcePanelName,
+        status: response.data.status,
+        createBy: response.data.createBy,
+        createTime: response.data.createTime,
+        creatorName: response.data.creatorName,
+        updateBy: response.data.updateBy,
+        updateName: response.data.updateName,
+        updateTime: response.data.updateTime
+      })
+      // 刷新联动信息
+      getPanelAllLinkageInfo(panelId).then(rsp => {
+        store.commit('setNowPanelTrackInfo', rsp.data)
+      })
+      // 刷新跳转信息
+      queryPanelJumpInfo(panelId).then(rsp => {
+        store.commit('setNowPanelJumpInfo', rsp.data)
+      })
+    } else {
+      $error(i18n.t('panel.panel_get_data_error'))
+    }
     callback(response)
   })
 }
diff --git a/frontend/src/api/panel/shareProxy.js b/frontend/src/api/panel/shareProxy.js
index f171f73429..5b63589da5 100644
--- a/frontend/src/api/panel/shareProxy.js
+++ b/frontend/src/api/panel/shareProxy.js
@@ -1,32 +1,38 @@
 import request from '@/utils/request'
 import { panelInit } from '@/components/canvas/utils/utils'
 import store from '@/store'
+import { $error } from '@/utils/message'
+import i18n from '@/lang'
 
 export function proxyInitPanelData(panelId, proxy, callback) {
   // 加载视图数据
   findOne(panelId, proxy).then(response => {
-    // 初始化视图data和style 数据
-    panelInit(JSON.parse(response.data.panelData), JSON.parse(response.data.panelStyle))
-    // 设置当前仪表板全局信息
-    store.dispatch('panel/setPanelInfo', {
-      id: response.data.id,
-      name: response.data.name,
-      privileges: response.data.privileges,
-      proxy: proxy.userId,
-      status: response.data.status,
-      createBy: response.data.createBy,
-      createTime: response.data.createTime,
-      updateBy: response.data.updateBy,
-      updateTime: response.data.updateTime
-    })
-    // 刷新联动信息
-    getPanelAllLinkageInfo(panelId, proxy).then(rsp => {
-      store.commit('setNowPanelTrackInfo', rsp.data)
-    })
-    // 刷新跳转信息
-    queryPanelJumpInfo(panelId, proxy).then(rsp => {
-      store.commit('setNowPanelJumpInfo', rsp.data)
-    })
+    if (response.data) {
+      // 初始化视图data和style 数据
+      panelInit(JSON.parse(response.data.panelData), JSON.parse(response.data.panelStyle))
+      // 设置当前仪表板全局信息
+      store.dispatch('panel/setPanelInfo', {
+        id: response.data.id,
+        name: response.data.name,
+        privileges: response.data.privileges,
+        proxy: proxy.userId,
+        status: response.data.status,
+        createBy: response.data.createBy,
+        createTime: response.data.createTime,
+        updateBy: response.data.updateBy,
+        updateTime: response.data.updateTime
+      })
+      // 刷新联动信息
+      getPanelAllLinkageInfo(panelId, proxy).then(rsp => {
+        store.commit('setNowPanelTrackInfo', rsp.data)
+      })
+      // 刷新跳转信息
+      queryPanelJumpInfo(panelId, proxy).then(rsp => {
+        store.commit('setNowPanelJumpInfo', rsp.data)
+      })
+    } else {
+      $error(i18n.t('panel.panel_get_data_error'))
+    }
     callback && callback(response)
   })
 }
diff --git a/frontend/src/components/canvas/components/Editor/PreviewEject.vue b/frontend/src/components/canvas/components/Editor/PreviewEject.vue
index da63010bb5..3595c0c13d 100644
--- a/frontend/src/components/canvas/components/Editor/PreviewEject.vue
+++ b/frontend/src/components/canvas/components/Editor/PreviewEject.vue
@@ -6,7 +6,7 @@
   >
     <Preview
       v-if="!dataLoading"
-      :component-data="componentData"
+      :component-data="mainCanvasComponentData"
       :canvas-style-data="canvasStyleData"
       :back-screen-shot="backScreenShot"
       :panel-info="panelInfo"
@@ -22,11 +22,13 @@ import { queryTargetPanelJumpInfo } from '@/api/panel/linkJump'
 import { proxyInitPanelData } from '@/api/panel/shareProxy'
 import { getOuterParamsInfo } from '@/api/panel/outerParams'
 import { mapState } from 'vuex'
+import { getNowCanvasComponentData } from '@/components/canvas/utils/utils'
 
 export default {
   components: { Preview },
   data() {
     return {
+      canvasId: 'canvas-main',
       dataLoading: false,
       backScreenShot: false,
       mainHeight: '100vh!important',
@@ -34,6 +36,9 @@ export default {
     }
   },
   computed: {
+    mainCanvasComponentData() {
+      return getNowCanvasComponentData(this.canvasId)
+    },
     bgStyle() {
       if (this.backScreenShot) {
         return { height: this.mainHeight }
diff --git a/frontend/src/components/canvas/components/Editor/PreviewFullScreen.vue b/frontend/src/components/canvas/components/Editor/PreviewFullScreen.vue
index 736c06bbf0..15575b4d2c 100644
--- a/frontend/src/components/canvas/components/Editor/PreviewFullScreen.vue
+++ b/frontend/src/components/canvas/components/Editor/PreviewFullScreen.vue
@@ -7,7 +7,7 @@
     >
       <Preview
         v-if="fullscreen"
-        :component-data="componentData"
+        :component-data="mainCanvasComponentData"
         :canvas-style-data="canvasStyleData"
         :panel-info="panelInfo"
         :in-screen="!fullscreen"
@@ -21,21 +21,25 @@
 import Preview from './Preview'
 import bus from '@/utils/bus'
 import { mapState } from 'vuex'
+import { getNowCanvasComponentData } from '@/components/canvas/utils/utils'
 
 export default {
   components: { Preview },
   data() {
     return {
+      canvasId: 'canvas-main',
       fullscreen: false
     }
   },
   computed: {
+    mainCanvasComponentData() {
+      return getNowCanvasComponentData(this.canvasId)
+    },
     panelInfo() {
       return this.$store.state.panel.panelInfo
     },
     ...mapState([
-      'canvasStyleData',
-      'componentData'
+      'canvasStyleData'
     ])
   },
   mounted() {
diff --git a/frontend/src/lang/en.js b/frontend/src/lang/en.js
index ab8f8dd355..8b64712e90 100644
--- a/frontend/src/lang/en.js
+++ b/frontend/src/lang/en.js
@@ -1858,6 +1858,7 @@ export default {
     sure_bt: 'Confirm'
   },
   panel: {
+    panel_get_data_error: 'Failed to obtain panel information. The panel may have been deleted. Please check the panel status',
     panel_no_save_tips: 'There are unsaved panel',
     panel_cache_use_tips: 'It was checked that the last dashboard could not be saved normally. Do you want to use the panel that was not saved last time?',
     template_name_tips: "Panel\'s name should not be null",
diff --git a/frontend/src/lang/tw.js b/frontend/src/lang/tw.js
index 157d0d45f6..18cf860b47 100644
--- a/frontend/src/lang/tw.js
+++ b/frontend/src/lang/tw.js
@@ -137,14 +137,14 @@ export default {
     unlock: '解鎖',
     unlock_success: '解鎖成功',
 
-    uninstall: '卸载',
+    uninstall: '卸載',
 
-    no_result: '没有找到相关内容',
+    no_result: '沒有找到相關內容',
     manage_member: '管理成員',
     user_confirm_remove_cancel: '確定將該用戶從角色中移除嗎?',
     confirm_remove_cancel: '確定刪除該角色嗎?',
     default_value: '默認值',
-    params_value: '参数值',
+    params_value: '參數值',
     publish: '發布',
     input_role_name: '請輸入角色名稱',
     unpublished: '取消發布',
@@ -411,8 +411,8 @@ export default {
     minute: '分鐘',
     day: '天',
     by_task_name: '通過任務名稱搜索',
-    delete_this_task: '確定删除該任務嗎？',
-    all_read_successfully: '全部已讀成功全部已读成功',
+    delete_this_task: '確定刪除該任務嗎？',
+    all_read_successfully: '全部已讀成功全部已讀成功',
     message_receiving_management: '消息接收管理',
     upload_failed: '上傳失敗',
     is_not_supported: '檔案格式不支持',
@@ -436,7 +436,7 @@ export default {
     view_tasks: '查看任務',
     no_classification: '暫無分類',
     no_template: '暫無模版',
-    data_set_required: '數据集必填',
+    data_set_required: '數據集必填',
     unread_message: '未讀消息',
     read_message: '已讀消息',
     all_messages: '全部消息',
@@ -507,25 +507,25 @@ export default {
     database: '資料庫',
     selected: '已選：',
     table: '表',
-    no_dataset_click: '暫無數据集，點擊',
+    no_dataset_click: '暫無數據集，點擊',
     create: '新建',
     new_folder_first: '請先新建資料夾',
-    on_the_left: '請在左側選擇數据集',
+    on_the_left: '請在左側選擇數據集',
     expression_syntax_error: '欄位運算式語法錯誤',
     create_dashboard: '創建儀表板',
     cannot_be_empty: 'SQL不能為空',
     data_reference: '數據參攷',
-    want_to_replace: '替換可能會影響自定義數据集、關聯數据集、儀表板等，是否替換？',
+    want_to_replace: '替換可能會影響自定義數據集、關聯數據集、儀表板等，是否替換？',
     replace_the_data: '確定替換數據嗎？',
     append_successfully: '追加成功',
-    already_exists: '數据集名稱已存在',
-    edit_dataset: '編輯數据集',
+    already_exists: '數據集名稱已存在',
+    edit_dataset: '編輯數據集',
     convert_to_indicator: '轉換為名額',
     convert_to_dimension: '轉換為維度',
     left_to_edit: '選中左側的資料表可進行編輯',
-    cannot_be_duplicate: '數据集名稱不允許重複',
-    set_saved_successfully: '數据集保存成功',
-    to_start_using: '瀏覽您的數据庫，表和列的內容。 選擇一個數据庫即可開始使用。',
+    cannot_be_duplicate: '數據集名稱不允許重複',
+    set_saved_successfully: '數據集保存成功',
+    to_start_using: '瀏覽您的數據庫，表和列的內容。 選擇一個數據庫即可開始使用。',
     to_run_query: '點擊運行査詢',
     the_running_results: '即可查看運行結果'
   },
@@ -619,7 +619,7 @@ export default {
     please_choose_member: '請選擇成員',
     search_by_name: '根據名稱搜索',
     modify_personal_info: '修改個人信息',
-    edit_password: '重置密码',
+    edit_password: '重置密碼',
     edit_information: '編輯信息',
     input_name: '請輸入名稱',
     input_email: '請輸入郵箱',
@@ -651,7 +651,7 @@ export default {
     input_phone: '請輸入電話號碼',
     input_roles: '請選擇角色',
     select_users: '請選擇用戶',
-    select_gender: '請選擇性别',
+    select_gender: '請選擇性別',
     special_characters_are_not_supported: '不支持特殊字符',
     mobile_number_format_is_incorrect: '手機號碼格式不正確',
     email_format_is_incorrect: '郵箱格式不正確',
@@ -866,7 +866,7 @@ export default {
     no_more_than: '大小不超過',
     request_timeout: '請求超時時間',
     message_retention_time: '消息保留時間',
-    ds_check_time: '数据源檢測時間間隔',
+    ds_check_time: '數據源檢測時間間隔',
     test_mail_recipient: '僅用來作為測試郵件收件人',
     to_enable_tsl: '如果SMTP埠是587，通常需要啟用TSL',
     to_enable_ssl: '如果SMTP埠是465，通常需要啟用SSL',
@@ -879,7 +879,7 @@ export default {
     copy_secondary_icon: '適用場景：二級標題、二級文案、二級圖標',
     radio_checkbox_unchecked: '適用場景：輸入框引導語、輔助文案、提示文案、三級圖標、radio、checkbox未選中態',
     button_background_color: '適用場景：禁用文案、禁用圖標、禁用按鈕背景色',
-    scenario_component_stroking: '适用场景：组件描边',
+    scenario_component_stroking: '適用場景：組件描邊',
     background_header_background: '適用場景：頁面背景、表頭背景',
     main_background: '主背景',
     content_background: '內容背景',
@@ -897,16 +897,16 @@ export default {
     subject_name: '主題名稱',
     template_name: '模版名稱',
     search_keywords: '搜索關鍵字',
-    delete_this_topic: '確定删除該主題嗎？',
+    delete_this_topic: '確定刪除該主題嗎？',
     network_error: '網絡錯誤',
     to_overwrite_them: '當前分類存在相同名稱模版，是否覆蓋？',
     import_succeeded: '導入成功',
     name_already_exists_type: '分類名稱已存在',
     rename_succeeded: '重命名成功',
     the_same_category: '同一分類下，該模版名稱已存在',
-    delete_this_template: '確定删除該模版嗎？',
-    also_be_deleted: '删除後，該分類中所有的模版也將被删除。',
-    delete_this_category: '確定删除該分類嗎？',
+    delete_this_template: '確定刪除該模版嗎？',
+    also_be_deleted: '刪除後，該分類中所有的模版也將被刪除。',
+    delete_this_category: '確定刪除該分類嗎？',
     edit_template: '編輯模版',
     edit_classification: '編輯分類',
     classification_name: '分類名稱',
@@ -925,8 +925,8 @@ export default {
     margin_model_relative: '相對',
     margin_placeholder: '請輸入0-100數字',
     margin_absolute_placeholder: '請輸入0-40數字',
-    rich_text_view_result_tips: '富文本只选取第一条结果',
-    rich_text_view: '富文本视图',
+    rich_text_view_result_tips: '富文本只選取第一條結果',
+    rich_text_view: '富文本視圖',
     view_reset: '視圖重置',
     view_reset_tips: '放棄對視圖的修改？',
     export_img: '導出圖片',
@@ -1046,7 +1046,7 @@ export default {
     circle: '圓形',
     label: '標簽',
     label_position: '標簽位置',
-    label_reserve_decimal_count: '保留小数',
+    label_reserve_decimal_count: '保留小數',
     label_bg: '標簽背景',
     label_shadow: '標簽陰影',
     label_shadow_color: '陰影顏色',
@@ -1344,7 +1344,7 @@ export default {
     slider_fill_bg: '選中背景',
     slider_text_color: '字體顏色',
     chart_no_senior: '當前圖表類型暫無高級配置，敬請期待',
-    chart_no_properties: '當前圖表類型暫無样式配置.',
+    chart_no_properties: '當前圖表類型暫無樣式配置.',
     assist_line: '輔助線',
     field_fixed: '固定值',
     line_type_dotted: '點',
@@ -1434,7 +1434,7 @@ export default {
     summary_not_empty: '聚合方式不能為空',
     reserve_zero: '取整',
     reserve_one: '一位',
-    reserve_two: '两位',
+    reserve_two: '兩位',
     proportion: '佔比',
     label_content: '標籤展示',
     percent: '占比',
@@ -1772,11 +1772,11 @@ export default {
     please_input_initial_pool_size: '請輸入初始連接數',
     please_input_min_pool_size: '請輸入最小連接數',
     please_input_max_pool_size: '請輸入最大連接數',
-    please_input_max_idle_time: '請輸入最大空闲(秒)',
+    please_input_max_idle_time: '請輸入最大空閑(秒)',
     please_input_acquire_increment: '請輸入增長數',
     please_input_query_timeout: '請輸入查詢超時',
-    please_input_connect_timeout: '請输輸入連接超時(秒)',
-    no_less_then_0: '高级设置中的参数不能小於零',
+    please_input_connect_timeout: '請輸輸入連接超時(秒)',
+    no_less_then_0: '高級設置中的參數不能小於零',
     port_no_less_then_0: '端口不能小於零',
     priority: '高級設置',
     data_mode: '數據模式',
@@ -1834,20 +1834,20 @@ export default {
     no_data_table: '暫無資料表',
     on_the_left: '請在左側選擇資料來源',
     table_name: '表名稱',
-    create_dataset: '創建數据集',
+    create_dataset: '創建數據集',
     field_description: '欄位描述',
     table_description: '表描述',
     relational_database: '關係型數據庫',
     non_relational_database: '非關係型數據庫',
     all: '所有',
     other: '其他',
-    this_data_source: '確定删除該資料來源嗎？',
-    cannot_be_deleted: '4個數据集正在使用此資料來源，無法删除',
-    delete_this_item: '是否要删除此項？',
+    this_data_source: '確定刪除該資料來源嗎？',
+    cannot_be_deleted: '4個數據集正在使用此資料來源，無法刪除',
+    delete_this_item: '是否要刪除此項？',
     can_be_uploaded: '僅支持上傳JAR格式的檔案',
     query_timeout: '査詢超時',
     add_data_source: '添加資料來源',
-    delete_this_driver: '確定删除該驅動嗎？',
+    delete_this_driver: '確定刪除該驅動嗎？',
     basic_info: '基本信息'
   },
   pblink: {
@@ -1858,39 +1858,40 @@ export default {
     sure_bt: '確定'
   },
   panel: {
-    panel_no_save_tips: '存在未保存的仪表板',
-    panel_cache_use_tips: '检查到上次有仪表板未能正常保存，是否使用上次未保存的仪表板？',
-    template_name_tips: '仪表板名称必填',
-    panel_background_item: '自定义仪表板背景',
-    panel_background_image_tips: '当前支持.jpeg,.jpg,.png,.gif文件,大小不要超过15M',
-    reUpload: '重新上传',
-    create_by: '创建人',
-    create_time: '创建时间',
+    panel_get_data_error: '獲取儀表板信息失敗，儀表板可能已經被刪除，請檢查儀表板狀態',
+    panel_no_save_tips: '存在未保存的儀表板',
+    panel_cache_use_tips: '檢查到上次有儀表板未能正常保存，是否使用上次未保存的儀表板？',
+    template_name_tips: '儀表板名稱必填',
+    panel_background_item: '自定義儀表板背景',
+    panel_background_image_tips: '當前支持.jpeg,.jpg,.png,.gif文件,大小不要超過15M',
+    reUpload: '重新上傳',
+    create_by: '創建人',
+    create_time: '創建時間',
     update_by: '最近修改人',
-    update_time: '最近修改时间',
-    target_url: '目标URL',
-    target_url_tips: '可以点击字段用来拼接URL或者参数',
-    select_world: '点击选择字段',
-    template_market: '模板市场',
-    template_preview: '预览模板',
-    apply: '应用',
-    apply_this_template: '应用此模板',
-    market_network_tips: '查看模板市场模板需要服务器与模板市场(https://dataease.io/templates)连通，请检查网络...',
-    enter_name_tips: '请输入仪表板名称',
-    name: '名称',
-    apply_template: '应用模板',
-    enter_template_name_tips: '搜索模板名称',
-    pic_adaptation: '适应组件',
-    pic_equiratio: '等比适应',
+    update_time: '最近修改時間',
+    target_url: '目標URL',
+    target_url_tips: '可以點擊字段用來拼接URL或者參數',
+    select_world: '點擊選擇字段',
+    template_market: '模板市場',
+    template_preview: '預覽模板',
+    apply: '應用',
+    apply_this_template: '應用此模板',
+    market_network_tips: '查看模板市場模板需要服務器與模板市場(https://dataease.io/templates)連通，請檢查網絡...',
+    enter_name_tips: '請輸入儀表板名稱',
+    name: '名稱',
+    apply_template: '應用模板',
+    enter_template_name_tips: '搜索模板名稱',
+    pic_adaptation: '適應組件',
+    pic_equiratio: '等比適應',
     pic_original: '原始尺寸',
-    pic_size: '图片尺寸',
-    web_addr: '网页地址',
-    stream_media_info: '流媒体信息',
-    video_info: '视频信息',
-    title_position: '标题位置',
-    tab_inner_style: 'tab内部样式',
+    pic_size: '圖片尺寸',
+    web_addr: '網頁地址',
+    stream_media_info: '流媒體信息',
+    video_info: '視頻信息',
+    title_position: '標題位置',
+    tab_inner_style: 'tab內部樣式',
     data_format: '日期格式',
-    border_color: '边框颜色',
+    border_color: '邊框顏色',
     theme_change_warn: '主題更換',
     theme_change_tips: '更換主題將會覆蓋視圖相關主題屬性建議提前備份,是否繼續更換？',
     theme_color_change_warn: '主題色更換',
@@ -1985,7 +1986,7 @@ export default {
     sys_template: '繫統模闆',
     user_template: '用戶模闆',
     add_category: '添加分類',
-    add_app_category: '添加应用分類',
+    add_app_category: '添加應用分類',
     filter_keywords: '輸入關鍵字進行過濾',
     dashboard_theme: '儀表闆主題',
     table: '表格',
@@ -2005,7 +2006,7 @@ export default {
     export_to_panel: '導出爲模闆',
     export_to_pdf: '導出爲PDF',
     export_to_img: '導出爲圖片',
-    export_to_app: '導出爲应用',
+    export_to_app: '導出爲應用',
     preview: '預覽',
     fullscreen_preview: '全屏預覽',
     new_tab_preview: '新Tab頁預覽',
@@ -2070,8 +2071,8 @@ export default {
     fontWeight: '字體粗細',
     lineHeight: '行高',
     letterSpacing: '字間距',
-    padding: '内间距',
-    margin: '外间距',
+    padding: '內間距',
+    margin: '外間距',
     textAlign: '左右對齊',
     opacity: '不透明度',
     verticalAlign: '上下對齊',
@@ -2099,7 +2100,7 @@ export default {
     jump: '跳轉',
     cancel_linkage: '取消聯動',
     switch_picture: '更換圖片',
-    select_field: '选择视图字段',
+    select_field: '選擇視圖字段',
     remove_all_linkage: '清除所有聯動',
     exit_un_march_linkage_field: '存在未匹配聯動關繫的字段',
     details: '詳情',
@@ -2201,7 +2202,7 @@ export default {
     themeDark: '深色',
     themeCustom: '自定義',
     openHomePage: '顯示首頁',
-    openMarketPage: '显示模板市场',
+    openMarketPage: '顯示模板市場',
     mobileBG: '移動端登錄頁背景',
     helpLink: '幫助文檔鏈接',
     homeLink: '首頁鏈接',
@@ -2211,12 +2212,12 @@ export default {
     webFormat: '請輸入以[https://或http://]開頭的正確網址'
   },
   auth: {
-    no_item_selected: '请在左侧选择组织、角色或用户',
-    no_resource_selected: '请在左侧选择资源',
-    search_pre: '通过',
-    search_suf: '名称来搜索',
-    separate_auth: '单独授权',
-    auth_extent_tips: '继承自以下组织或角色的权限:',
+    no_item_selected: '請在左側選擇組織、角色或用戶',
+    no_resource_selected: '請在左側選擇資源',
+    search_pre: '通過',
+    search_suf: '名稱來搜索',
+    separate_auth: '單獨授權',
+    auth_extent_tips: '繼承自以下組織或角色的權限:',
     authConfig: '按用戶配置權限',
     sourceConfig: '按資源配置權限',
     authQuickConfig: '權限快捷配置',
@@ -2577,7 +2578,7 @@ export default {
     email: '郵箱：',
     tel: '電話：',
     web: '網址：',
-    apply: '免费试用申请',
+    apply: '免費試用申請',
     more: '更多',
     weChat_official_account: '微信公眾號',
     technical_group: '技術交流群',
diff --git a/frontend/src/lang/zh.js b/frontend/src/lang/zh.js
index c06059cd49..6684f597f7 100644
--- a/frontend/src/lang/zh.js
+++ b/frontend/src/lang/zh.js
@@ -1858,6 +1858,7 @@ export default {
     sure_bt: '确定'
   },
   panel: {
+    panel_get_data_error: '获取仪表板信息失败，仪表板可能已经被删除，请检查仪表板状态',
     panel_no_save_tips: '存在未保存的仪表板',
     panel_cache_use_tips: '检查到上次有仪表板未能正常保存，是否使用上次未保存的仪表板？',
     template_name_tips: '仪表板名称必填',
diff --git a/frontend/src/views/link/view/index.vue b/frontend/src/views/link/view/index.vue
index b6594b6714..ad862d15fb 100644
--- a/frontend/src/views/link/view/index.vue
+++ b/frontend/src/views/link/view/index.vue
@@ -2,7 +2,7 @@
   <div style="width: 100%;height: 100vh;background-color: #f7f8fa">
     <Preview
       v-if="show"
-      :component-data="componentData"
+      :component-data="mainCanvasComponentData"
       :canvas-style-data="canvasStyleData"
       :panel-info="panelInfo"
     />
@@ -15,7 +15,7 @@ import { uuid } from 'vue-uuid'
 import Preview from '@/components/canvas/components/Editor/Preview'
 import { getPanelAllLinkageInfo } from '@/api/panel/linkage'
 import { queryPanelJumpInfo, queryTargetPanelJumpInfo } from '@/api/panel/linkJump'
-import { panelInit } from '@/components/canvas/utils/utils'
+import { getNowCanvasComponentData, panelInit } from '@/components/canvas/utils/utils'
 import { getOuterParamsInfo } from '@/api/panel/outerParams'
 import { mapState } from 'vuex'
 
@@ -34,14 +34,17 @@ export default {
   },
   data() {
     return {
+      canvasId: 'canvas-main',
       show: false,
       panelInfo: {}
     }
   },
   computed: {
+    mainCanvasComponentData() {
+      return getNowCanvasComponentData(this.canvasId)
+    },
     ...mapState([
-      'canvasStyleData',
-      'componentData'
+      'canvasStyleData'
     ])
   },
   created() {
diff --git a/frontend/src/views/panel/LinkJumpSet/index.vue b/frontend/src/views/panel/LinkJumpSet/index.vue
index 0ecd09a6e5..b8caf5df85 100644
--- a/frontend/src/views/panel/LinkJumpSet/index.vue
+++ b/frontend/src/views/panel/LinkJumpSet/index.vue
@@ -503,9 +503,15 @@ export default {
   methods: {
     init() {
       const chartDetails = JSON.parse(this.panelViewDetailsInfo[this.viewId])
-      const checkAllAxisStr = chartDetails.xaxis + chartDetails.xaxisExt + chartDetails.yaxis + chartDetails.yaxisExt + chartDetails.drillFields
+      let checkAllAxisStr = chartDetails.xaxis + chartDetails.xaxisExt + chartDetails.yaxis + chartDetails.yaxisExt + chartDetails.drillFields
       let checkJumpStr
-      if (chartDetails.type === 'table-pivot') {
+      // 堆叠图的可选参数分两种情况 1.如果有堆叠项 则指标只有第一个可选 2.如果没有堆叠项泽所有指标都可以选
+      if (chartDetails.type.indexOf('stack') > -1 && chartDetails.extStack.length > 2) {
+        const yaxisArray = JSON.parse(chartDetails.yaxis)
+        const yaxisNew = yaxisArray.length > 0 ? JSON.stringify(yaxisArray[0]) : '[]'
+        checkAllAxisStr = chartDetails.xaxis + chartDetails.xaxisExt + yaxisNew + chartDetails.yaxisExt + chartDetails.drillFields
+        checkJumpStr = checkAllAxisStr
+      } else if (chartDetails.type === 'table-pivot') {
         checkJumpStr = chartDetails.yaxis + chartDetails.yaxisExt + chartDetails.drillFields
       } else if (chartDetails.type === 'table-info') {
         checkJumpStr = chartDetails.xaxis + chartDetails.drillFields
diff --git a/frontend/src/views/panel/ViewSelect/multiplexing.vue b/frontend/src/views/panel/ViewSelect/multiplexing.vue
index 23de8ede10..2012a9da11 100644
--- a/frontend/src/views/panel/ViewSelect/multiplexing.vue
+++ b/frontend/src/views/panel/ViewSelect/multiplexing.vue
@@ -16,7 +16,7 @@
     <de-main-container>
       <Preview
         v-if="selectedPanel"
-        :component-data="componentData"
+        :component-data="mainCanvasComponentData"
         :canvas-style-data="canvasStyleData"
         :panel-info="panelInfo"
         :show-position="showPosition"
@@ -41,7 +41,7 @@ import DeMainContainer from '@/components/dataease/DeMainContainer'
 import DeContainer from '@/components/dataease/DeContainer'
 import DeAsideContainer from '@/components/dataease/DeAsideContainer'
 import { findOne } from '@/api/panel/panel'
-import { deepCopy, panelDataPrepare } from '@/components/canvas/utils/utils'
+import { deepCopy, getNowCanvasComponentData, panelDataPrepare } from '@/components/canvas/utils/utils'
 import Preview from '@/components/canvas/components/Editor/Preview'
 import MultiplexingView from '@/views/panel/ViewSelect/multiplexingView'
 import { DEFAULT_COMMON_CANVAS_STYLE_STRING } from '@/views/panel/panel'
@@ -59,6 +59,7 @@ export default {
   },
   data() {
     return {
+      canvasId: 'canvas-main',
       showPosition: 'multiplexing',
       activeName: 'PanelList',
       viewLoading: false,
@@ -72,6 +73,11 @@ export default {
       panelInfo: {}
     }
   },
+  computed: {
+    mainCanvasComponentData() {
+      return getNowCanvasComponentData(this.canvasId)
+    }
+  },
   watch: {
 
   },
diff --git a/frontend/src/views/panel/edit/index.vue b/frontend/src/views/panel/edit/index.vue
index 94544d3db5..ac92de88cb 100644
--- a/frontend/src/views/panel/edit/index.vue
+++ b/frontend/src/views/panel/edit/index.vue
@@ -362,7 +362,7 @@
         :panel-info="panelInfo"
         :show-type="canvasStyleData.selfAdaption?'full':'width'"
         :canvas-style-data="canvasStyleData"
-        :component-data="componentData"
+        :component-data="mainCanvasComponentData"
         show-position="edit"
       />
     </fullscreen>
diff --git a/frontend/src/views/system/sysParam/BasicSetting.vue b/frontend/src/views/system/sysParam/BasicSetting.vue
index bd1944aaea..29bbd1353f 100644
--- a/frontend/src/views/system/sysParam/BasicSetting.vue
+++ b/frontend/src/views/system/sysParam/BasicSetting.vue
@@ -424,7 +424,7 @@ export default {
         return
       }
       if (this.formInline.dsCheckIntervalType === 'hour') {
-        const pattern = '^([1-9]|[1-2][0-3])$'
+        const pattern = '^([1-9]|[1][1-9]|[1-2][0-3])$'
         if (!new RegExp(pattern).test(this.formInline.dsCheckInterval)) {
           this.$message({ message: this.$t('cron.hour_limit'), type: 'warning', showClose: true })
           this.formInline.dsCheckInterval = 1