From b9146cc28a1c1e981d9301d9fb0c88c9e084ef40 Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Thu, 23 May 2024 13:51:11 +0800
Subject: [PATCH] =?UTF-8?q?feat(X-Pack):=20=E5=AF=BC=E8=88=AA=E6=A0=8F?=
 =?UTF-8?q?=E5=8F=B3=E4=BE=A7=E9=83=A8=E5=88=86=E6=8C=89=E9=92=AE=E5=8F=AF?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=98=BE=E9=9A=90=20#9483?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/layout/components/AccountOperator.vue |  5 +++-
 .../src/layout/components/Header.vue          | 23 +++++++++++++++----
 .../src/layout/components/SystemCfg.vue       | 13 ++++++++++-
 .../src/store/modules/appearance.ts           | 19 +++++++++++++++
 core/core-frontend/src/utils/utils.ts         | 17 ++++++++++++++
 de-xpack                                      |  2 +-
 6 files changed, 71 insertions(+), 8 deletions(-)

diff --git a/core/core-frontend/src/layout/components/AccountOperator.vue b/core/core-frontend/src/layout/components/AccountOperator.vue
index 6a65a60fd9..8a5c1b069a 100644
--- a/core/core-frontend/src/layout/components/AccountOperator.vue
+++ b/core/core-frontend/src/layout/components/AccountOperator.vue
@@ -25,6 +25,9 @@ interface LinkItem {
   method?: string
 }
 const linkList = ref([{ id: 5, label: t('common.about'), method: 'toAbout' }] as LinkItem[])
+if (!appearanceStore.getShowAbout) {
+  linkList.value.splice(0, 1)
+}
 
 const inPlatformClient = computed(() => !!wsCache.get('de-platform-client'))
 
@@ -118,7 +121,7 @@ if (uid.value === '1') {
   <el-popover
     ref="popoverRef"
     :virtual-ref="buttonRef"
-    trigger="hover"
+    trigger="click"
     title=""
     virtual-triggering
     placement="bottom-start"
diff --git a/core/core-frontend/src/layout/components/Header.vue b/core/core-frontend/src/layout/components/Header.vue
index fa30c44ff5..edeb8cf4ad 100644
--- a/core/core-frontend/src/layout/components/Header.vue
+++ b/core/core-frontend/src/layout/components/Header.vue
@@ -18,6 +18,7 @@ import AiComponent from '@/layout/components/AiComponent.vue'
 import { useEmitt } from '@/hooks/web/useEmitt'
 import { findBaseParams } from '@/api/aiComponent'
 import AiTips from '@/layout/components/AiTips.vue'
+
 const appearanceStore = useAppearanceStoreWithOut()
 const { push } = useRouter()
 const route = useRoute()
@@ -39,6 +40,7 @@ const activeIndex = computed(() => {
   }
   return route.path
 })
+
 const permissionStore = usePermissionStore()
 
 const routers: any[] = formatRoute(permissionStore.getRoutersNotHidden as AppCustomRouteRecordRaw[])
@@ -109,16 +111,27 @@ onMounted(() => {
     </el-menu>
     <div class="operate-setting" v-if="!desktop">
       <XpackComponent jsname="c3dpdGNoZXI=" />
-      <el-icon style="margin: 0 10px" class="ai-icon" v-if="aiBaseUrl && !showOverlay">
+      <el-icon
+        style="margin: 0 10px"
+        class="ai-icon"
+        v-if="aiBaseUrl && !showOverlay && appearanceStore.getShowAi"
+      >
         <Icon name="dv-ai" @click="handleAiClick" />
       </el-icon>
-      <ai-tips @confirm="aiTipsConfirm" v-if="showOverlay" class="ai-icon-tips"></ai-tips>
+      <ai-tips
+        @confirm="aiTipsConfirm"
+        v-if="showOverlay && appearanceStore.getShowAi"
+        class="ai-icon-tips"
+      />
       <ToolboxCfg v-if="showToolbox" />
-      <TopDoc />
+      <TopDoc v-if="appearanceStore.getShowDoc" />
       <SystemCfg v-if="showSystem" />
       <AccountOperator />
-      <ai-component v-if="aiBaseUrl" :base-url="aiBaseUrl"></ai-component>
-      <div v-if="showOverlay" class="overlay"></div>
+      <ai-component
+        v-if="aiBaseUrl && appearanceStore.getShowAi"
+        :base-url="aiBaseUrl"
+      ></ai-component>
+      <div v-if="showOverlay && appearanceStore.getShowAi" class="overlay"></div>
     </div>
   </el-header>
 </template>
diff --git a/core/core-frontend/src/layout/components/SystemCfg.vue b/core/core-frontend/src/layout/components/SystemCfg.vue
index 3384a258cf..9e85e8a4f2 100644
--- a/core/core-frontend/src/layout/components/SystemCfg.vue
+++ b/core/core-frontend/src/layout/components/SystemCfg.vue
@@ -2,8 +2,10 @@
 import { useRouter } from 'vue-router'
 import { useAppearanceStoreWithOut } from '@/store/modules/appearance'
 import { computed } from 'vue'
+
 const appearanceStore = useAppearanceStoreWithOut()
 const navigateBg = computed(() => appearanceStore.getNavigateBg)
+const showDoc = computed(() => appearanceStore.getShowDoc)
 const { push, resolve } = useRouter()
 const redirectUser = () => {
   const sysMenu = resolve('/system')
@@ -14,7 +16,13 @@ const redirectUser = () => {
 
 <template>
   <el-tooltip class="box-item" effect="dark" content="组织管理中心" placement="top">
-    <div class="sys-setting" :class="{ 'is-light-setting': navigateBg && navigateBg === 'light' }">
+    <div
+      class="sys-setting"
+      :class="{
+        'is-light-setting': navigateBg && navigateBg === 'light',
+        'in-iframe-setting': !showDoc
+      }"
+    >
       <el-icon @click="redirectUser">
         <Icon class="icon-setting" name="icon-setting" />
       </el-icon>
@@ -35,6 +43,9 @@ const redirectUser = () => {
     background-color: #1e2738;
   }
 }
+.in-iframe-setting {
+  margin-left: 10px !important;
+}
 .is-light-setting {
   &:hover {
     background-color: var(--ed-menu-hover-bg-color) !important;
diff --git a/core/core-frontend/src/store/modules/appearance.ts b/core/core-frontend/src/store/modules/appearance.ts
index d849eb3e28..f7954baf59 100644
--- a/core/core-frontend/src/store/modules/appearance.ts
+++ b/core/core-frontend/src/store/modules/appearance.ts
@@ -6,12 +6,16 @@ import colorFunctions from 'less/lib/less/functions/color.js'
 import colorTree from 'less/lib/less/tree/color.js'
 const basePath = import.meta.env.VITE_API_BASEPATH
 const baseUrl = basePath + '/appearance/image/'
+import { isBtnShow } from '@/utils/utils'
 interface AppearanceState {
   themeColor?: string
   customColor?: string
   navigateBg?: string
   navigate?: string
   help?: string
+  showAi?: string
+  showDoc?: string
+  showAbout?: string
   bg?: string
   login?: string
   slogan?: string
@@ -33,6 +37,9 @@ export const useAppearanceStore = defineStore('appearanceStore', {
       navigateBg: '',
       navigate: '',
       help: '',
+      showDoc: '0',
+      showAi: '0',
+      showAbout: '0',
       bg: '',
       login: '',
       slogan: '',
@@ -106,6 +113,15 @@ export const useAppearanceStore = defineStore('appearanceStore', {
     },
     getCommunity(): boolean {
       return this.community
+    },
+    getShowAi(): boolean {
+      return isBtnShow(this.showAi)
+    },
+    getShowDoc(): boolean {
+      return isBtnShow(this.showDoc)
+    },
+    getShowAbout(): boolean {
+      return isBtnShow(this.showAbout)
     }
   },
   actions: {
@@ -160,6 +176,9 @@ export const useAppearanceStore = defineStore('appearanceStore', {
       }
       this.navigate = data.navigate
       this.help = data.help
+      this.showAi = data.showAi
+      this.showDoc = data.showDoc
+      this.showAbout = data.showAbout
       this.navigateBg = data.navigateBg
       this.themeColor = data.themeColor
       this.customColor = data.customColor
diff --git a/core/core-frontend/src/utils/utils.ts b/core/core-frontend/src/utils/utils.ts
index 75630a07f8..09b1534275 100644
--- a/core/core-frontend/src/utils/utils.ts
+++ b/core/core-frontend/src/utils/utils.ts
@@ -106,7 +106,24 @@ export const cleanPlatformFlag = () => {
   wsCache.delete(platformKey)
   return false
 }
+export const isInIframe = () => {
+  try {
+    return window.top !== window.self
+  } catch (error) {
+    console.error(error)
+    return true
+  }
+}
 
+export const isBtnShow = (val: string) => {
+  if (!val || val === '0') {
+    return true
+  } else if (val === '1') {
+    return false
+  } else {
+    return !isInIframe()
+  }
+}
 export function isMobile() {
   return (
     navigator.userAgent.match(
diff --git a/de-xpack b/de-xpack
index cb5bf055a1..b8cde42ed5 160000
--- a/de-xpack
+++ b/de-xpack
@@ -1 +1 @@
-Subproject commit cb5bf055a1d173157fb1c291aba95710e47e6c10
+Subproject commit b8cde42ed5b9ff0bcc23f5138a944c086a236f5a