From 2f9bccf65fa51f3847c73b988c57303fec051274 Mon Sep 17 00:00:00 2001
From: dataeaseShu <tong.shu@fit2cloud.com>
Date: Wed, 4 Sep 2024 14:37:21 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E6=95=B0=E6=8D=AE=E9=9B=86):=20=E7=BC=96?=
 =?UTF-8?q?=E8=BE=91=E6=95=B0=E6=8D=AE=E9=9B=86-=E5=85=B3=E8=81=94?=
 =?UTF-8?q?=E8=A1=A8-=E6=9C=AA=E5=85=B3=E8=81=94=E8=AE=A1=E7=AE=97?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5-=E7=A1=AE=E8=AE=A4=E6=97=B6=E6=8F=90?=
 =?UTF-8?q?=E7=A4=BA=E5=BC=B9=E7=AA=97-=E6=9C=AA=E6=AD=A3=E7=A1=AE?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E8=AE=A1=E7=AE=97=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/store/modules/appearance.ts           |  2 +-
 .../modules/data-visualization/dvMain.ts      |  4 ++-
 .../components/CustomColorStyleSelect.vue     | 10 ++++--
 .../chart/components/editor/util/chart.ts     |  4 +--
 .../views/chart/components/views/index.vue    |  5 ++-
 .../src/views/dashboard/index.vue             |  2 +-
 .../src/views/system/font/UploadDetail.vue    |  1 +
 .../src/views/system/font/index.vue           | 33 +++++++++----------
 .../data/dataset/form/DatasetUnion.vue        |  5 ++-
 .../visualized/data/dataset/form/index.vue    |  9 +++--
 10 files changed, 46 insertions(+), 29 deletions(-)

diff --git a/core/core-frontend/src/store/modules/appearance.ts b/core/core-frontend/src/store/modules/appearance.ts
index 6c4015ff96..a7e1352caf 100644
--- a/core/core-frontend/src/store/modules/appearance.ts
+++ b/core/core-frontend/src/store/modules/appearance.ts
@@ -31,7 +31,7 @@ interface AppearanceState {
   showDemoTips?: boolean
   demoTipsContent?: string
   community: boolean
-  fontList: Array<{ name: string; id: string }>
+  fontList: Array<{ name: string; id: string; isDefault: boolean }>
 }
 const { wsCache } = useCache()
 export const useAppearanceStore = defineStore('appearanceStore', {
diff --git a/core/core-frontend/src/store/modules/data-visualization/dvMain.ts b/core/core-frontend/src/store/modules/data-visualization/dvMain.ts
index 044cc207ff..d9b9a195c2 100644
--- a/core/core-frontend/src/store/modules/data-visualization/dvMain.ts
+++ b/core/core-frontend/src/store/modules/data-visualization/dvMain.ts
@@ -23,7 +23,7 @@ import {
 } from '@/custom-component/component-list'
 import { get, set } from 'lodash-es'
 import { viewFieldTimeTrans } from '@/utils/viewUtils'
-import { isMainCanvas } from '@/utils/canvasUtils'
+import { useAppearanceStoreWithOut } from '@/store/modules/appearance'
 
 export const dvMainStore = defineStore('dataVisualization', {
   state: () => {
@@ -410,6 +410,7 @@ export const dvMainStore = defineStore('dataVisualization', {
         componentData.push(component)
         this.setCurComponent({ component: component, index: componentData.length - 1 })
       }
+      const currentFont = useAppearanceStoreWithOut().fontList.find(ele => ele.isDefault)
       //如果当前的组件是UserView 图表，则想canvasView中增加一项 UserView ID 和componentID保持一致
       if (component.component === 'UserView') {
         const defaultConfig = JSON.parse(JSON.stringify(BASE_VIEW_CONFIG))
@@ -436,6 +437,7 @@ export const dvMainStore = defineStore('dataVisualization', {
           newView = chartViewInstance.setupDefaultOptions(newView)
           newView['title'] = component.name
         }
+        currentFont && (newView.customStyle.text.fontFamily = currentFont.name)
         this.canvasViewInfo[component.id] = newView
       }
       if (component.component === 'VQuery') {
diff --git a/core/core-frontend/src/views/chart/components/editor/editor-style/components/CustomColorStyleSelect.vue b/core/core-frontend/src/views/chart/components/editor/editor-style/components/CustomColorStyleSelect.vue
index 7cf6665475..79e070c770 100644
--- a/core/core-frontend/src/views/chart/components/editor/editor-style/components/CustomColorStyleSelect.vue
+++ b/core/core-frontend/src/views/chart/components/editor/editor-style/components/CustomColorStyleSelect.vue
@@ -147,11 +147,17 @@ const setupSeriesColor = () => {
   }
 }
 
+const flag = ref(1)
+
 const switchSeriesColor = (seriesColor, index) => {
   seriesColorPickerRef.value?.hide()
   seriesColorState.curSeriesColor = cloneDeep(seriesColor)
   seriesColorState.curColorIndex = index
-  seriesColorState.seriesColorPickerId = '#series-color-picker-' + seriesColor.id
+  const id = '#series-color-picker-' + seriesColor.id + `-${flag.value}`
+  if (document.querySelectorAll(id).length > 1) {
+    flag.value = 2
+  }
+  seriesColorState.seriesColorPickerId = '#series-color-picker-' + seriesColor.id + `-${flag.value}`
   nextTick(() => {
     seriesColorPickerRef.value?.show()
   })
@@ -462,7 +468,7 @@ const colorItemBorderColor = (index, state) => {
           class="color-list-item"
         >
           <div
-            :id="`series-color-picker-${item.id}`"
+            :id="`series-color-picker-${item.id}-${flag}`"
             :class="{
               active: item.id === seriesColorState.curSeriesColor?.id
             }"
diff --git a/core/core-frontend/src/views/chart/components/editor/util/chart.ts b/core/core-frontend/src/views/chart/components/editor/util/chart.ts
index 5a46206f23..1f377fe823 100644
--- a/core/core-frontend/src/views/chart/components/editor/util/chart.ts
+++ b/core/core-frontend/src/views/chart/components/editor/util/chart.ts
@@ -434,7 +434,7 @@ export const DEFAULT_TITLE_STYLE: ChartTextStyle = {
   remarkShow: false,
   remark: '',
   remarkBackgroundColor: '#ffffff',
-  fontFamily: 'Microsoft YaHei',
+  fontFamily: '',
   letterSpace: '0',
   fontShadow: false
 }
@@ -483,7 +483,7 @@ export const DEFAULT_TITLE_STYLE_BASE: ChartTextStyle = {
   isBolder: true,
   remarkShow: false,
   remark: '',
-  fontFamily: 'Microsoft YaHei',
+  fontFamily: '',
   letterSpace: '0',
   fontShadow: false,
   color: '',
diff --git a/core/core-frontend/src/views/chart/components/views/index.vue b/core/core-frontend/src/views/chart/components/views/index.vue
index 42788c9481..4ff271bf23 100644
--- a/core/core-frontend/src/views/chart/components/views/index.vue
+++ b/core/core-frontend/src/views/chart/components/views/index.vue
@@ -277,10 +277,13 @@ const initTitle = () => {
           CHART_FONT_FAMILY_MAP[ele.name] = ele.name
         })
       }
-
       state.title_class.fontFamily = customStyle.text.fontFamily
         ? CHART_FONT_FAMILY_MAP[customStyle.text.fontFamily]
         : DEFAULT_TITLE_STYLE.fontFamily
+      if (!CHART_FONT_FAMILY_MAP[customStyle.text.fontFamily]) {
+        state.title_class.fontFamily = appearanceStore.fontList.find(ele => ele.isDefault)?.name
+        customStyle.text.fontFamily = state.title_class.fontFamily
+      }
       appearanceStore.setCurrentFont(state.title_class.fontFamily)
       state.title_class.letterSpacing =
         (customStyle.text.letterSpace
diff --git a/core/core-frontend/src/views/dashboard/index.vue b/core/core-frontend/src/views/dashboard/index.vue
index a53e0cf7f2..62564b16f6 100644
--- a/core/core-frontend/src/views/dashboard/index.vue
+++ b/core/core-frontend/src/views/dashboard/index.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { computed, nextTick, onMounted, onUnmounted, reactive, ref } from 'vue'
+import { computed, nextTick, onMounted, onUnmounted, reactive, ref, watch } from 'vue'
 import { dvMainStoreWithOut } from '@/store/modules/data-visualization/dvMain'
 import { storeToRefs } from 'pinia'
 import findComponent from '../../utils/components'
diff --git a/core/core-frontend/src/views/system/font/UploadDetail.vue b/core/core-frontend/src/views/system/font/UploadDetail.vue
index 4e42f86187..a3dbece1ee 100644
--- a/core/core-frontend/src/views/system/font/UploadDetail.vue
+++ b/core/core-frontend/src/views/system/font/UploadDetail.vue
@@ -95,6 +95,7 @@ const uploadFail = response => {
 const emits = defineEmits(['finish'])
 const cancel = () => {
   Object.assign(ruleForm, cloneDeep(defaultForm))
+  ruleFormRef.value.clearValidate()
   state.fileList = null
   dialogVisible.value = false
 }
diff --git a/core/core-frontend/src/views/system/font/index.vue b/core/core-frontend/src/views/system/font/index.vue
index f522ebf2ed..9a10cc5513 100644
--- a/core/core-frontend/src/views/system/font/index.vue
+++ b/core/core-frontend/src/views/system/font/index.vue
@@ -1,8 +1,13 @@
 <script lang="ts" setup>
 import { onMounted, ref, computed } from 'vue'
 import UploadDetail from './UploadDetail.vue'
-import { deleteById, edit, list, defaultFont } from '@/api/font'
+import { useAppearanceStoreWithOut } from '@/store/modules/appearance'
+import { deleteById, edit, defaultFont } from '@/api/font'
 import { ElMessage, ElMessageBox } from 'element-plus-secondary'
+import { cloneDeep } from 'lodash-es'
+
+const appearanceStore = useAppearanceStoreWithOut()
+
 const fontKeyword = ref('')
 const fontList = ref([])
 const basePath = import.meta.env.VITE_API_BASEPATH
@@ -13,15 +18,11 @@ const uploadFont = (title, type, item) => {
   uploadDetail.value.init(title, type, item)
 }
 
-const listFont = () => {
+const listFont = async () => {
   loading.value = true
-  list({})
-    .then(res => {
-      fontList.value = res
-    })
-    .finally(() => {
-      loading.value = false
-    })
+  await appearanceStore.setFontList()
+  fontList.value = cloneDeep(appearanceStore.fontList)
+  loading.value = false
 }
 
 const fontListComputed = computed(() => {
@@ -96,16 +97,12 @@ const getDefaultFont = () => {
     )
   })
 }
-const uploadFilish = () => {
+const uploadFilish = async () => {
   loading.value = true
-  list({})
-    .then(res => {
-      fontList.value = res
-      getDefaultFont()
-    })
-    .finally(() => {
-      loading.value = false
-    })
+  await appearanceStore.setFontList()
+  fontList.value = cloneDeep(appearanceStore.fontList)
+  loading.value = false
+  getDefaultFont()
 }
 
 onMounted(() => {
diff --git a/core/core-frontend/src/views/visualized/data/dataset/form/DatasetUnion.vue b/core/core-frontend/src/views/visualized/data/dataset/form/DatasetUnion.vue
index aea7f7766b..ae0caeb65f 100644
--- a/core/core-frontend/src/views/visualized/data/dataset/form/DatasetUnion.vue
+++ b/core/core-frontend/src/views/visualized/data/dataset/form/DatasetUnion.vue
@@ -352,7 +352,10 @@ const confirmEditUnion = () => {
   if (!!ids.length) {
     const idArr = allfields.value.reduce((pre, next) => {
       if (next.extField === 2) {
-        const idMap = next.originName.match(/\[(.+?)\]/g)
+        let idMap = next.originName.match(/\[(.+?)\]/g)
+        idMap = idMap.filter(
+          itx => !next.params?.map(element => element.id).includes(itx.slice(1, -1))
+        )
         const result = idMap.map(itm => {
           return itm.slice(1, -1)
         })
diff --git a/core/core-frontend/src/views/visualized/data/dataset/form/index.vue b/core/core-frontend/src/views/visualized/data/dataset/form/index.vue
index 676be8424b..d006443b0f 100644
--- a/core/core-frontend/src/views/visualized/data/dataset/form/index.vue
+++ b/core/core-frontend/src/views/visualized/data/dataset/form/index.vue
@@ -459,7 +459,11 @@ const delFieldByIdFake = (arr, fakeAllfields) => {
     fakeAllfields = fakeAllfields.filter(ele => {
       if (ele.extField !== 2) return true
       const idMap = ele.originName.match(/\[(.+?)\]/g)
-      if (!idMap) return true
+      if (
+        !idMap ||
+        idMap.every(itx => ele.params?.map(element => element.id).includes(itx.slice(1, -1)))
+      )
+        return true
       const result = idMap.every(itm => {
         const id = itm.slice(1, -1)
         return allfieldsId.includes(id)
@@ -478,7 +482,8 @@ const deleteField = item => {
   let tip = ''
   const idArr = allfields.value.reduce((pre, next) => {
     if (next.extField !== 2) return pre
-    const idMap = next.originName.match(/\[(.+?)\]/g) || []
+    let idMap = next.originName.match(/\[(.+?)\]/g) || []
+    idMap = idMap.filter(itx => !next.params?.map(element => element.id).includes(itx.slice(1, -1)))
     const result = idMap.map(itm => {
       return itm.slice(1, -1)
     })