From 5554f46aefebc01b2923803fd285f49a6b094100 Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Wed, 27 Nov 2024 17:06:53 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E9=83=A8=E5=88=86?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E9=9B=86=E4=B8=8B=E7=9A=84=E5=9B=BE=E7=89=87?=
 =?UTF-8?q?=E7=BB=84=E6=97=A0=E6=B3=95=E8=81=94=E5=8A=A8=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/de-app/AppExportForm.vue        |  4 ++--
 .../custom-component/picture-group/Component.vue   | 14 +++++++++-----
 .../src/custom-component/user-view/Component.vue   |  2 +-
 .../core-frontend/src/layout/components/Header.vue | 12 ++++++------
 .../src/views/common/DeResourceGroupOpt.vue        |  4 ++--
 .../src/views/data-visualization/index.vue         |  1 +
 6 files changed, 21 insertions(+), 16 deletions(-)

diff --git a/core/core-frontend/src/components/de-app/AppExportForm.vue b/core/core-frontend/src/components/de-app/AppExportForm.vue
index 313855eadb..c318738ef9 100644
--- a/core/core-frontend/src/components/de-app/AppExportForm.vue
+++ b/core/core-frontend/src/components/de-app/AppExportForm.vue
@@ -33,7 +33,7 @@
         </el-form-item>
         <el-form-item :label="t('visualization.description')" prop="description">
           <el-input
-            :placeholder="t('visualization.input_content')"
+            :placeholder="t('commons.input_content')"
             show-word-limit
             v-model="state.form.description"
             type="textarea"
@@ -44,7 +44,7 @@
     <template #footer>
       <div class="apply" style="width: 100%">
         <el-button secondary @click="close">{{ t('commons.cancel') }} </el-button>
-        <el-button type="primary" @click="downloadApp">{{ t('visualization.export') }}</el-button>
+        <el-button type="primary" @click="downloadApp">{{ t('chart.export') }}</el-button>
       </div>
     </template>
   </el-drawer>
diff --git a/core/core-frontend/src/custom-component/picture-group/Component.vue b/core/core-frontend/src/custom-component/picture-group/Component.vue
index c95e3d2afb..dade38dee4 100644
--- a/core/core-frontend/src/custom-component/picture-group/Component.vue
+++ b/core/core-frontend/src/custom-component/picture-group/Component.vue
@@ -1,16 +1,14 @@
 <template>
   <div class="pic-main">
+    <chart-error v-if="isError" :err-msg="errMsg" />
     <img
       draggable="false"
-      v-if="state.showUrl"
+      v-else-if="state.showUrl"
       :style="imageAdapter"
       :src="imgUrlTrans(state.showUrl)"
     />
     <template v-else>
-      <chart-empty-info
-        :themes="canvasStyleData.dashboard.themeColor"
-        :view-icon="view.type"
-      ></chart-empty-info>
+      <chart-empty-info :view-icon="view.type"></chart-empty-info>
     </template>
   </div>
 </template>
@@ -35,6 +33,7 @@ import { parseJson } from '@/views/chart/components/js/util'
 import { mappingColor } from '@/views/chart/components/js/panel/common/common_table'
 import { storeToRefs } from 'pinia'
 import ChartEmptyInfo from '@/views/chart/components/views/components/ChartEmptyInfo.vue'
+import ChartError from "@/views/chart/components/views/components/ChartError.vue";
 const dvMainStore = dvMainStoreWithOut()
 const { canvasViewInfo, editMode, mobileInPc, canvasStyleData } = storeToRefs(dvMainStore)
 const state = reactive({
@@ -202,12 +201,17 @@ const calcData = (viewCalc: Chart, callback) => {
   }
   if (viewCalc.tableId || viewCalc['dataFrom'] === 'template') {
     const v = JSON.parse(JSON.stringify(viewCalc))
+    v.type = 'table-info'
+    v.render = 'antv'
+    v.resultCount = 1
     getData(v)
       .then(res => {
         if (res.code && res.code !== 0) {
           isError.value = true
           errMsg.value = res.msg
         } else {
+          res.type = 'picture-group'
+          res.render = 'custom'
           state.data = res?.data
           state.viewDataInfo = res
           state.totalItems = res?.totalItems
diff --git a/core/core-frontend/src/custom-component/user-view/Component.vue b/core/core-frontend/src/custom-component/user-view/Component.vue
index b8bd60cff0..b0949f5994 100644
--- a/core/core-frontend/src/custom-component/user-view/Component.vue
+++ b/core/core-frontend/src/custom-component/user-view/Component.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { computed, toRefs, PropType, CSSProperties } from 'vue'
+import { computed, toRefs, PropType } from 'vue'
 import Chart from '@/views/chart/components/views/index.vue'
 
 const props = defineProps({
diff --git a/core/core-frontend/src/layout/components/Header.vue b/core/core-frontend/src/layout/components/Header.vue
index 5746ad8fb4..a93c68a87e 100644
--- a/core/core-frontend/src/layout/components/Header.vue
+++ b/core/core-frontend/src/layout/components/Header.vue
@@ -62,7 +62,7 @@ const routers: any[] = formatRoute(permissionStore.getRoutersNotHidden as AppCus
 const showSystem = ref(false)
 const showToolbox = ref(false)
 const showOverlay = ref(false)
-const showOverlayCopilot = ref(true)
+const showOverlayCopilot = ref(false)
 const handleSelect = (index: string) => {
   // 自定义事件
   if (isExternal(index)) {
@@ -100,11 +100,11 @@ const initAiBase = async () => {
 
 const initCopilotBase = async () => {
   const aiCopilotCheck = wsCache.get('DE-COPILOT-TIPS-CHECK')
-  if (aiCopilotCheck === 'CHECKED') {
-    showOverlayCopilot.value = false
-  } else {
-    showOverlayCopilot.value = true
-  }
+  // if (aiCopilotCheck === 'CHECKED') {
+  //   showOverlayCopilot.value = false
+  // } else {
+  //   showOverlayCopilot.value = true
+  // }
 }
 
 const aiTipsConfirm = () => {
diff --git a/core/core-frontend/src/views/common/DeResourceGroupOpt.vue b/core/core-frontend/src/views/common/DeResourceGroupOpt.vue
index 8a1b8ffcb3..fbfaa8866d 100644
--- a/core/core-frontend/src/views/common/DeResourceGroupOpt.vue
+++ b/core/core-frontend/src/views/common/DeResourceGroupOpt.vue
@@ -141,8 +141,8 @@ const optInit = (type, data: BusiTreeNode, exec, parentSelect = false) => {
   const placeholderLabel =
     data.leaf || type === 'leaf'
       ? props.curCanvasType === 'dataV'
-        ? t('visualization.screen')
-        : t('visualization.dashboard')
+        ? t('work_branch.screen')
+        : t('work_branch.dashboard')
       : t('visualization.folder')
   placeholder.value = t('visualization.input_name_tips', [placeholderLabel])
   filterText.value = ''
diff --git a/core/core-frontend/src/views/data-visualization/index.vue b/core/core-frontend/src/views/data-visualization/index.vue
index 53a00fbc16..98b96a6e66 100644
--- a/core/core-frontend/src/views/data-visualization/index.vue
+++ b/core/core-frontend/src/views/data-visualization/index.vue
@@ -342,6 +342,7 @@ const newWindowFromDiv = ref(false)
 let p = null
 const XpackLoaded = () => p(true)
 onMounted(async () => {
+  snapshotStore.initSnapShot()
   if (window.location.hash.includes('#/dvCanvas')) {
     newWindowFromDiv.value = true
   }