Merge pull request #13590 from dataease/pr@dev-v2_st

feat(系统设置): 顶部导航适配

core/core-frontend/src/config/axios/service.ts

@@ -15,6 +15,7 @@ import { useLinkStoreWithOut } from '@/store/modules/link'
 import { config } from './config'
 import { configHandler } from './refresh'
 import { isMobile } from '@/utils/utils'
+import { useRequestStoreWithOut } from '@/store/modules/request'
 
 type AxiosErrorWidthLoading<T> = T & {
   config: {
@@ -33,6 +34,7 @@ const { result_code } = config
 import { useCache } from '@/hooks/web/useCache'
 
 const { wsCache } = useCache()
+const requestStore = useRequestStoreWithOut()
 const embeddedStore = useEmbedded()
 const basePath = import.meta.env.VITE_API_BASEPATH
 
@@ -203,6 +205,10 @@ service.interceptors.response.use(
     }
   },
   (error: AxiosErrorWidthLoading<AxiosError>) => {
+    if (error.message?.includes('timeout of')) {
+      requestStore.resetLoadingMap()
+    }
+
     if (!error?.response) {
       return Promise.reject(error)
     }

core/core-frontend/src/layout/components/DesktopSetting.vue

@@ -1,21 +1,117 @@
 <script lang="ts" setup>
 import iconSetting from '@/assets/svg/icon-setting.svg'
+import TopDocCard from '@/layout/components/TopDocCard.vue'
+import copilot from '@/assets/svg/copilot.svg'
+import LangSelector from '@/layout/components/LangSelector.vue'
+import topEnterpriseTrial from '@/assets/svg/top-enterprise-trial.svg'
+import topHelpDoc from '@/assets/svg/top-help-doc.svg'
+import topProductBbs from '@/assets/svg/top-product-bbs.svg'
+import topTechnology from '@/assets/svg/top-technology.svg'
 import { useRouter } from 'vue-router'
+import TopDesktopCard from './TopDesktopCard.vue'
+import icon_right_outlined from '@/assets/svg/icon_right_outlined.svg'
+import dvAi from '@/assets/svg/dv-ai.svg'
+import AiComponent from '@/layout/components/AiComponent.vue'
+import dvPreviewDownload from '@/assets/svg/dv-preview-download.svg'
+import ToolboxCfg from './ToolboxCfg.vue'
+import { findBaseParams } from '@/api/aiComponent'
+import icon_more_outlined from '@/assets/svg/icon_more_outlined.svg'
+import msgNotice from '@/assets/svg/msg-notice.svg'
+import { usePermissionStore } from '@/store/modules/permission'
 import { useAppearanceStoreWithOut } from '@/store/modules/appearance'
-import { computed } from 'vue'
+import { msgCountApi } from '@/api/msg'
+import { computed, ref, onMounted } from 'vue'
+import { useEmitt } from '@/hooks/web/useEmitt'
 
+const aiBaseUrl = ref('https://maxkb.fit2cloud.com/ui/chat/2ddd8b594ce09dbb?mode=embed')
+const showToolbox = ref(false)
+
+const badgeCount = ref('0')
+const permissionStore = usePermissionStore()
 const appearanceStore = useAppearanceStoreWithOut()
 const navigateBg = computed(() => appearanceStore.getNavigateBg)
+const help = computed(() => appearanceStore.getHelp)
+const cardInfoList = [
+  { name: '帮助文档', url: help.value || 'https://dataease.io/docs/v2/', icon: topHelpDoc },
+  { name: '产品论坛', url: 'https://bbs.fit2cloud.com/c/de/6', icon: topProductBbs },
+  {
+    name: '技术博客',
+    url: 'https://blog.fit2cloud.com/categories/dataease',
+    icon: topTechnology
+  },
+  { name: '企业版试用', url: 'https://jinshuju.net/f/TK5TTd', icon: topEnterpriseTrial }
+]
 const { push, resolve } = useRouter()
 const redirectUser = () => {
   const sysMenu = resolve('/sys-setting')
   const kidPath = sysMenu.matched[0].children[0].path
   push(`${sysMenu.path}/${kidPath}`)
 }
+const msgNoticePush = () => {
+  push('/msg/msg-fill')
+}
+const initShowToolbox = () => {
+  showToolbox.value = permissionStore.getRouters.some(route => route.path === '/toolbox')
+}
+const downloadClick = params => {
+  useEmitt().emitter.emit('data-export-center', params)
+}
+const initAiBase = async () => {
+  await findBaseParams().then(rsp => {
+    const params = rsp.data
+    if (params && params['ai.baseUrl']) {
+      aiBaseUrl.value = params['ai.baseUrl']
+    } else {
+      aiBaseUrl.value = null
+    }
+  })
+}
+
+const handleCopilotClick = () => {
+  push('/copilot/index')
+}
+
+const handleAiClick = () => {
+  useEmitt().emitter.emit('aiComponentChange')
+}
+onMounted(() => {
+  initShowToolbox()
+  initAiBase()
+  msgCountApi().then(res => {
+    badgeCount.value = (res?.data > 99 ? '99+' : res?.data) || '0'
+  })
+})
 </script>
 
 <template>
-  <el-tooltip class="box-item" effect="dark" content="系统设置" placement="top">
+  <ToolboxCfg v-if="showToolbox" />
+  <el-tooltip effect="dark" :content="$t('data_export.export_center')" placement="bottom">
+    <el-icon
+      style="margin-left: 10px"
+      class="preview-download_icon"
+      :class="navigateBg === 'light' && 'is-light-setting'"
+    >
+      <Icon><dvPreviewDownload @click="downloadClick" class="svg-icon" /></Icon>
+    </el-icon>
+  </el-tooltip>
+  <el-tooltip effect="dark" :content="$t('v_query.msg_center')" placement="bottom">
+    <el-badge
+      style="margin-left: 10px"
+      :hidden="[0, '0'].includes(badgeCount)"
+      :value="badgeCount"
+      class="ed-badge_custom"
+    >
+      <el-icon class="preview-download_icon" :class="navigateBg === 'light' && 'is-light-setting'">
+        <Icon><msgNotice @click="msgNoticePush" class="svg-icon" /></Icon>
+      </el-icon>
+    </el-badge>
+  </el-tooltip>
+  <el-tooltip
+    class="box-item"
+    effect="dark"
+    :content="$t('commons.system_setting')"
+    placement="top"
+  >
     <div
       class="sys-setting in-iframe-setting"
       :class="{
@@ -23,12 +119,90 @@ const redirectUser = () => {
       }"
     >
       <el-icon @click="redirectUser">
-        <Icon class="icon-setting" name="icon-setting"
-          ><iconSetting class="svg-icon icon-setting"
-        /></Icon>
+        <Icon><iconSetting class="svg-icon icon-setting" /></Icon>
       </el-icon>
     </div>
   </el-tooltip>
+
+  <el-popover
+    popper-class="popper-class_ai-copilot"
+    placement="bottom-end"
+    :width="224"
+    trigger="hover"
+  >
+    <template #default>
+      <div>
+        <div class="card-content_desk">
+          <TopDesktopCard
+            v-if="aiBaseUrl && appearanceStore.getShowAi"
+            @openBlank="handleAiClick"
+            :cardInfo="{
+              icon: dvAi,
+              name: $t('commons.assistant')
+            }"
+          ></TopDesktopCard>
+          <TopDesktopCard
+            v-if="appearanceStore.getShowCopilot"
+            @openBlank="handleCopilotClick"
+            :cardInfo="{
+              icon: copilot,
+              name: 'Copilot'
+            }"
+          ></TopDesktopCard>
+        </div>
+        <div class="border-top">
+          <el-popover
+            :teleported="false"
+            popper-class="popper-class_ai-copilot"
+            placement="left-start"
+            :width="224"
+            trigger="click"
+            ><template #default>
+              <div style="display: flex; padding: 8px; flex-wrap: wrap">
+                <top-doc-card
+                  :span="12"
+                  v-for="(item, index) in cardInfoList"
+                  :key="index"
+                  :card-info="item"
+                ></top-doc-card>
+              </div>
+            </template>
+            <template #reference
+              ><div class="item-select_info">
+                {{ $t('commons.help_center') }}
+                <el-icon style="font-size: 16px">
+                  <Icon><icon_right_outlined></icon_right_outlined></Icon>
+                </el-icon></div></template
+          ></el-popover>
+          <el-popover
+            :teleported="false"
+            popper-class="popper-class_ai-copilot"
+            placement="left-start"
+            :width="224"
+            trigger="click"
+            ><template #default>
+              <div style="padding: 8px 0">
+                <LangSelector />
+              </div>
+            </template>
+            <template #reference>
+              <div class="item-select_info">
+                {{ $t('commons.language') }}
+                <el-icon style="font-size: 16px">
+                  <Icon><icon_right_outlined></icon_right_outlined></Icon>
+                </el-icon>
+              </div> </template
+          ></el-popover>
+        </div>
+      </div>
+    </template>
+    <template #reference>
+      <el-icon class="preview-download_icon" :class="navigateBg === 'light' && 'is-light-setting'">
+        <Icon><icon_more_outlined class="svg-icon" /></Icon>
+      </el-icon>
+    </template>
+  </el-popover>
+  <ai-component v-if="aiBaseUrl && appearanceStore.getShowAi" :base-url="aiBaseUrl"></ai-component>
 </template>
 
 <style lang="less" scoped>
@@ -52,4 +226,52 @@ const redirectUser = () => {
     background-color: #1f23291a !important;
   }
 }
+.preview-download_icon {
+  padding: 5px;
+  height: 28px;
+  width: 28px;
+  border-radius: 4px;
+  overflow: hidden;
+  cursor: pointer;
+  &:hover {
+    background-color: #1e2738;
+  }
+  &.is-light-setting {
+    &:hover {
+      background-color: var(--ed-menu-hover-bg-color) !important;
+    }
+  }
+}
+</style>
+<style lang="less">
+.popper-class_ai-copilot {
+  padding: 0 !important;
+
+  .card-content_desk {
+    display: flex;
+    justify-content: space-between;
+    padding: 12px 12px 8px;
+  }
+  .border-top {
+    border-top: 1px solid #1f232926;
+    padding-top: 4px;
+    padding-bottom: 8px;
+  }
+  .item-select_info {
+    cursor: pointer;
+    height: 40px;
+    padding: 9px 11px;
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    color: #1f2329;
+    .ed-icon {
+      color: #8f959e;
+    }
+
+    &:hover {
+      background: #1f23291a;
+    }
+  }
+}
 </style>

core/core-frontend/src/layout/components/TopDesktopCard.vue

@@ -0,0 +1,56 @@
+<script lang="ts" setup>
+defineProps({
+  cardInfo: {
+    type: Object,
+    default() {
+      return {
+        name: '',
+        icon: ''
+      }
+    }
+  }
+})
+const emits = defineEmits(['openBlank'])
+const openBlank = () => {
+  emits('openBlank')
+}
+</script>
+
+<template>
+  <div class="doc-card" @click="openBlank">
+    <div class="base-show">
+      <Icon><component class="svg-icon item-top-icon" :is="cardInfo.icon"></component></Icon>
+    </div>
+    <div class="base-show show-content">{{ cardInfo.name }}</div>
+  </div>
+</template>
+
+<style lang="less" scoped>
+.doc-card {
+  padding: 8px 0;
+  width: 96px;
+  height: 66px;
+  cursor: pointer;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  &:hover,
+  &:active {
+    background-color: #1f23291a;
+    border-radius: 4px;
+  }
+}
+
+.show-content {
+  font-size: 14px;
+  color: #1f2329;
+  line-height: 22px;
+  font-weight: 400;
+  margin-top: 4px;
+}
+
+.item-top-icon {
+  width: 24px;
+  height: 24px;
+}
+</style>

core/core-frontend/src/locales/en.ts

@@ -2265,6 +2265,9 @@ Scatter chart (bubble) chart: {a} (series name), {b} (data name), {c} (value arr
     day_limit: 'Days cannot be less than 1 and greater than 31'
   },
   commons: {
+    language: 'language',
+    help_center: 'Help Center',
+    assistant: 'Assistant',
     test_connect: 'Test connection',
     consanguinity: 'blood relationship',
     collapse_navigation: 'Collapse navigation',

core/core-frontend/src/locales/tw.ts

@@ -2214,6 +2214,9 @@ export default {
     day_limit: '天不能小於1，大於31'
   },
   commons: {
+    language: '語言',
+    help_center: '幫助中心',
+    assistant: '小助手',
     test_connect: '測試連線',
     consanguinity: '血緣關係',
     collapse_navigation: '收起導航',

core/core-frontend/src/locales/zh-CN.ts

@@ -2216,6 +2216,9 @@ export default {
     day_limit: '天不能小于1，大于31'
   },
   commons: {
+    language: '语言',
+    help_center: '帮助中心',
+    assistant: '小助手',
     test_connect: '测试连接',
     consanguinity: '血缘关系',
     collapse_navigation: '收起导航',

core/core-frontend/src/store/modules/request.ts

@@ -24,6 +24,11 @@ export const useRequestStore = defineStore('request', {
     setLoadingMap(value: object) {
       this.loadingMap = value
     },
+    resetLoadingMap() {
+      for (const key in this.loadingMap) {
+        this.loadingMap[key] = 0
+      }
+    },
     addLoading(key: string) {
       if (Object.prototype.hasOwnProperty.call(this.loadingMap, key)) {
         const map = this.loadingMap