From e4f2cdede637911c7de4fce6dbaf7fa6767737d3 Mon Sep 17 00:00:00 2001
From: sudoooooo <zjbbabybaby@gmail.com>
Date: Tue, 24 Sep 2024 15:48:39 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BC=98=E5=8C=96=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E5=86=85=E5=AE=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../template/surveyTemplate/templateBase.json |   2 +-
 web/public/imgs/icons/upload.png              | Bin 340 -> 0 bytes
 web/src/common/utils/applySkinConfig.ts       |  21 ----------------
 .../components/CooperModify/MemberList.vue    |   2 +-
 .../components/CooperModify/MemberSelect.vue  |   2 +-
 .../components/CooperModify/ModifyDialog.vue  |   3 +--
 .../CooperModify/OperationSelect.vue          |   2 +-
 web/src/management/components/LeftMenu.vue    |   2 +-
 web/src/management/config/skinPresets.js      |   4 +--
 web/src/management/pages/edit/index.vue       |  23 +++++++++++++++---
 .../edit/modules/skinModule/CatalogPanel.vue  |   4 +--
 .../pages/edit/setterConfig/skinConfig.js     |  10 ++++----
 .../pages/list/components/BaseList.vue        |   2 +-
 .../pages/list/components/SliderBar.vue       |   4 +--
 .../pages/list/components/SpaceList.vue       |   2 +-
 .../pages/list/components/SpaceModify.vue     |   2 +-
 web/src/management/pages/list/index.vue       |   2 +-
 web/src/management/router/index.ts            |   2 +-
 web/src/management/stores/edit.ts             |   2 +-
 web/src/management/stores/workSpace.ts        |   8 ++----
 .../management/utils/{types => }/workSpace.ts |  14 +++++------
 .../materials/setters/widgets/TabsSetter.vue  |   2 +-
 .../setters/widgets/UploadSingleFile.vue      |   4 +--
 web/src/render/App.vue                        |  23 +++++++++++++++---
 24 files changed, 75 insertions(+), 67 deletions(-)
 delete mode 100644 web/public/imgs/icons/upload.png
 delete mode 100644 web/src/common/utils/applySkinConfig.ts
 rename web/src/management/utils/{types => }/workSpace.ts (100%)

diff --git a/server/src/modules/survey/template/surveyTemplate/templateBase.json b/server/src/modules/survey/template/surveyTemplate/templateBase.json
index 0bfc6543..0a2bc4c4 100644
--- a/server/src/modules/survey/template/surveyTemplate/templateBase.json
+++ b/server/src/modules/survey/template/surveyTemplate/templateBase.json
@@ -50,7 +50,7 @@
     "skinColor": "#4a4c5b",
     "inputBgColor": "#ffffff",
     "backgroundConf": {
-      "color": "#ffffff",
+      "color": "#b8dbff",
       "type": "color",
       "image": ""
     },
diff --git a/web/public/imgs/icons/upload.png b/web/public/imgs/icons/upload.png
deleted file mode 100644
index 950531ca151cd82f43ed4045af2e14c24a4ac6a2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 340
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|Tv8)E(|mmy
zw18|52FCVG1{RPKAeI7R1_tH@j10^`nh_+nfC(-uuz(rC1}QWNE&K$e_IbKEhFAzD
zCrD%*=s3-2oPI9l@7LL>svh%tzxr2HRsG7($=WEzaOuxy{?l4*|9SEfe0z9y--!Iz
zl4#6wm|;iSgmeFSt}kHAXw1lIGiVf55OkP*SmK{y4ZG&Q|MMT3b2Q&@IQ);{snWzL
zLTP?;Y_>DDd|Y{?fYI*gjVEjq87D70x3~3ZXMSUnLJyOg@62L$wF6Aa49=0F=h}=u
z6;D=Q-0k?I=afNV*I|Z-Ol)oClb4<O%WpiB;cs7qjqFm!mt77^HAGyGf_&uZ>gTe~
HDWM4fQt)pX

diff --git a/web/src/common/utils/applySkinConfig.ts b/web/src/common/utils/applySkinConfig.ts
deleted file mode 100644
index 1d489d17..00000000
--- a/web/src/common/utils/applySkinConfig.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-export default function (skinConfig: any) {
-  const root = document.documentElement
-  const { themeConf, backgroundConf, contentConf } = skinConfig
-
-  if (themeConf?.color) {
-    // 设置主题颜色
-    root.style.setProperty('--primary-color', themeConf?.color)
-  }
-
-  // 设置背景
-  const { color, type, image } = backgroundConf || {}
-  root.style.setProperty(
-    '--primary-background',
-    type === 'image' ? `url(${image}) no-repeat center / cover` : color
-  )
-
-  if (contentConf?.opacity.toString()) {
-    // 设置全局透明度
-    root.style.setProperty('--opacity', `${contentConf.opacity / 100}`)
-  }
-}
diff --git a/web/src/management/components/CooperModify/MemberList.vue b/web/src/management/components/CooperModify/MemberList.vue
index 2a5afa3c..55f4290b 100644
--- a/web/src/management/components/CooperModify/MemberList.vue
+++ b/web/src/management/components/CooperModify/MemberList.vue
@@ -16,7 +16,7 @@
 </template>
 <script lang="ts" setup>
 import { computed } from 'vue'
-import { type IMember, type ListItem } from '@/management/utils/types/workSpace'
+import { type IMember, type ListItem } from '@/management/utils/workSpace'
 import OperationSelect from './OperationSelect.vue'
 import { useWorkSpaceStore } from '@/management/stores/workSpace'
 
diff --git a/web/src/management/components/CooperModify/MemberSelect.vue b/web/src/management/components/CooperModify/MemberSelect.vue
index 2633adf0..c6a543cb 100644
--- a/web/src/management/components/CooperModify/MemberSelect.vue
+++ b/web/src/management/components/CooperModify/MemberSelect.vue
@@ -30,7 +30,7 @@ import {
   type ListItem,
   type UserRole,
   roleLabels
-} from '@/management/utils/types/workSpace'
+} from '@/management/utils/workSpace'
 import { CODE_MAP } from '@/management/api/base'
 import { useUserStore } from '@/management/stores/user'
 
diff --git a/web/src/management/components/CooperModify/ModifyDialog.vue b/web/src/management/components/CooperModify/ModifyDialog.vue
index 9748b34b..2b05f108 100644
--- a/web/src/management/components/CooperModify/ModifyDialog.vue
+++ b/web/src/management/components/CooperModify/ModifyDialog.vue
@@ -45,7 +45,7 @@ import { ElMessage } from 'element-plus'
 import 'element-plus/theme-chalk/src/message.scss'
 
 import { getPermissionList, getCollaborator, saveCollaborator } from '@/management/api/space'
-import { type IMember, SurveyPermissions } from '@/management/utils/types/workSpace'
+import { type IMember, SurveyPermissions } from '@/management/utils/workSpace'
 import { CODE_MAP } from '@/management/api/base'
 
 import MemberSelect from './MemberSelect.vue'
@@ -67,7 +67,6 @@ const formTitle = ref('协作管理')
 
 const cooperOptions = ref([])
 
-
 const fetchPermissionList = async () => {
   const res: any = await getPermissionList()
   if (res.code === CODE_MAP.SUCCESS) {
diff --git a/web/src/management/components/CooperModify/OperationSelect.vue b/web/src/management/components/CooperModify/OperationSelect.vue
index 79b9a333..03cde5a5 100644
--- a/web/src/management/components/CooperModify/OperationSelect.vue
+++ b/web/src/management/components/CooperModify/OperationSelect.vue
@@ -39,7 +39,7 @@ import { ref, computed, watch } from 'vue'
 import { ElMessageBox, type CheckboxValueType } from 'element-plus'
 
 import 'element-plus/theme-chalk/src/message-box.scss'
-import { type ListItem } from '@/management/utils/types/workSpace'
+import { type ListItem } from '@/management/utils/workSpace'
 
 const props = withDefaults(
   defineProps<{
diff --git a/web/src/management/components/LeftMenu.vue b/web/src/management/components/LeftMenu.vue
index ecae82cb..e388cb3a 100644
--- a/web/src/management/components/LeftMenu.vue
+++ b/web/src/management/components/LeftMenu.vue
@@ -34,7 +34,7 @@ import { useEditStore } from '@/management/stores/edit'
 import { useRoute } from 'vue-router'
 const route = useRoute()
 import LogoIcon from './LogoIcon.vue'
-import { SurveyPermissions } from '@/management/utils/types/workSpace.ts'
+import { SurveyPermissions } from '@/management/utils/workSpace'
 const editStore = useEditStore()
 
 const tabArr = [
diff --git a/web/src/management/config/skinPresets.js b/web/src/management/config/skinPresets.js
index a3f47ca0..8ef78ae6 100644
--- a/web/src/management/config/skinPresets.js
+++ b/web/src/management/config/skinPresets.js
@@ -1,6 +1,6 @@
 export default {
   'default-1': {
-    'skinConf.backgroundConf.color': '#90b4fa',
-    'skinConf.themeConf.color': '#FAA600'
+    'skinConf.backgroundConf.color': '#b8dbff',
+    'skinConf.themeConf.color': '#faa600'
   }
 }
diff --git a/web/src/management/pages/edit/index.vue b/web/src/management/pages/edit/index.vue
index 6f5425fa..86ccd4ad 100644
--- a/web/src/management/pages/edit/index.vue
+++ b/web/src/management/pages/edit/index.vue
@@ -19,7 +19,6 @@ import { useEditStore } from '@/management/stores/edit'
 import { useRouter, useRoute } from 'vue-router'
 import { ElMessage } from 'element-plus'
 import 'element-plus/theme-chalk/src/message.scss'
-import applySkinConfig from '@/common/utils/applySkinConfig'
 
 import LeftMenu from '@/management/components/LeftMenu.vue'
 import CommonTemplate from './components/CommonTemplate.vue'
@@ -33,8 +32,26 @@ const route = useRoute()
 
 watch(
   () => schema.skinConf,
-  (v) => {
-    applySkinConfig(v)
+  (skinConfig) => {
+    const root = document.documentElement
+    const { themeConf, backgroundConf, contentConf } = skinConfig
+
+    if (themeConf?.color) {
+      // 设置主题颜色
+      root.style.setProperty('--primary-color', themeConf?.color)
+    }
+
+    // 设置背景
+    const { color, type, image } = backgroundConf || {}
+    root.style.setProperty(
+      '--primary-background',
+      type === 'image' ? `url(${image}) no-repeat center / cover` : color
+    )
+
+    if (contentConf?.opacity.toString()) {
+      // 设置全局透明度
+      root.style.setProperty('--opacity', `${contentConf.opacity / 100}`)
+    }
   },
   {
     deep: true,
diff --git a/web/src/management/pages/edit/modules/skinModule/CatalogPanel.vue b/web/src/management/pages/edit/modules/skinModule/CatalogPanel.vue
index ac609de4..e59c5cbb 100644
--- a/web/src/management/pages/edit/modules/skinModule/CatalogPanel.vue
+++ b/web/src/management/pages/edit/modules/skinModule/CatalogPanel.vue
@@ -80,8 +80,8 @@ const changePreset = (banner: any) => {
   const name = banner.group + '-' + banner.title
   let presets = {
     'bannerConf.bannerConfig.bgImage': banner.src,
-    'skinConf.themeConf.color': '#FAA600',
-    'skinConf.backgroundConf.color': '#fff'
+    'skinConf.themeConf.color': '#faa600',
+    'skinConf.backgroundConf.color': '#f6f7f9'
   }
 
   if ((skinPresets as any)[name]) {
diff --git a/web/src/management/pages/edit/setterConfig/skinConfig.js b/web/src/management/pages/edit/setterConfig/skinConfig.js
index 4fbec3c8..b1f8c0c4 100644
--- a/web/src/management/pages/edit/setterConfig/skinConfig.js
+++ b/web/src/management/pages/edit/setterConfig/skinConfig.js
@@ -14,22 +14,22 @@ export default [
       {
         type: 'TabsSetter',
         key: 'type',
-        tabList: [
+        options: [
           {
             label: '图片(<5M)',
-            value: 'image',
+            value: 'image'
           },
           {
             label: '颜色',
-            value: 'color',
+            value: 'color'
           }
         ]
       },
       {
         label: '背景图片',
         type: 'UploadSingleFile',
-        accept: "image/*",
-        limitSize: 5,// 单位MB
+        accept: 'image/*',
+        limitSize: 5, // 单位MB
         key: 'image',
         relyFunc: (data) => {
           return data.type === 'image'
diff --git a/web/src/management/pages/list/components/BaseList.vue b/web/src/management/pages/list/components/BaseList.vue
index 915c8037..803d8b1a 100644
--- a/web/src/management/pages/list/components/BaseList.vue
+++ b/web/src/management/pages/list/components/BaseList.vue
@@ -127,7 +127,7 @@ import ToolBar from './ToolBar.vue'
 import TextSearch from './TextSearch.vue'
 import TextSelect from './TextSelect.vue'
 import TextButton from './TextButton.vue'
-import { SurveyPermissions } from '@/management/utils/types/workSpace'
+import { SurveyPermissions } from '@/management/utils/workSpace'
 
 import {
   fieldConfig,
diff --git a/web/src/management/pages/list/components/SliderBar.vue b/web/src/management/pages/list/components/SliderBar.vue
index e73d2f23..52477218 100644
--- a/web/src/management/pages/list/components/SliderBar.vue
+++ b/web/src/management/pages/list/components/SliderBar.vue
@@ -38,8 +38,8 @@
 </template>
 <script setup lang="ts">
 import { ref } from 'vue'
-import { type MenuItem } from '@/management/utils/types/workSpace'
-import { SpaceType } from '@/management/utils/types/workSpace'
+import { type MenuItem } from '@/management/utils/workSpace'
+import { SpaceType } from '@/management/utils/workSpace'
 
 const menuRef = ref()
 
diff --git a/web/src/management/pages/list/components/SpaceList.vue b/web/src/management/pages/list/components/SpaceList.vue
index 02b43443..f68b9b70 100644
--- a/web/src/management/pages/list/components/SpaceList.vue
+++ b/web/src/management/pages/list/components/SpaceList.vue
@@ -88,7 +88,7 @@ import SpaceModify from './SpaceModify.vue'
 import TextSearch from '@/management/pages/list/components/TextSearch.vue'
 import EmptyIndex from '@/management/components/EmptyIndex.vue'
 import ToolBar from './ToolBar.vue'
-import { UserRole } from '@/management/utils/types/workSpace'
+import { UserRole } from '@/management/utils/workSpace'
 import { useWorkSpaceStore } from '@/management/stores/workSpace'
 
 const showSpaceModify = ref(false)
diff --git a/web/src/management/pages/list/components/SpaceModify.vue b/web/src/management/pages/list/components/SpaceModify.vue
index 5e6dac82..67ed01a2 100644
--- a/web/src/management/pages/list/components/SpaceModify.vue
+++ b/web/src/management/pages/list/components/SpaceModify.vue
@@ -49,7 +49,7 @@ import { ElMessage } from 'element-plus'
 import 'element-plus/theme-chalk/src/message.scss'
 
 import { QOP_MAP } from '@/management/utils/constant'
-import { type IMember, type IWorkspace, UserRole } from '@/management/utils/types/workSpace'
+import { type IMember, type IWorkspace, UserRole } from '@/management/utils/workSpace'
 import { useWorkSpaceStore } from '@/management/stores/workSpace'
 
 import MemberSelect from '@/management/components/CooperModify/MemberSelect.vue'
diff --git a/web/src/management/pages/list/index.vue b/web/src/management/pages/list/index.vue
index b05a6a40..0cb95636 100644
--- a/web/src/management/pages/list/index.vue
+++ b/web/src/management/pages/list/index.vue
@@ -68,7 +68,7 @@ import SpaceList from './components/SpaceList.vue'
 import SliderBar from './components/SliderBar.vue'
 import SpaceModify from './components/SpaceModify.vue'
 import TopNav from '@/management/components/TopNav.vue'
-import { SpaceType } from '@/management/utils/types/workSpace'
+import { SpaceType } from '@/management/utils/workSpace'
 import { useWorkSpaceStore } from '@/management/stores/workSpace'
 import { useSurveyListStore } from '@/management/stores/surveyList'
 
diff --git a/web/src/management/router/index.ts b/web/src/management/router/index.ts
index 62d9649e..cdede1dc 100644
--- a/web/src/management/router/index.ts
+++ b/web/src/management/router/index.ts
@@ -5,7 +5,7 @@ import {
   type NavigationGuardNext
 } from 'vue-router'
 import type { RouteRecordRaw } from 'vue-router'
-import { SurveyPermissions } from '@/management/utils/types/workSpace'
+import { SurveyPermissions } from '@/management/utils/workSpace'
 import { analysisTypeMap } from '@/management/config/analysisConfig'
 import { ElMessage } from 'element-plus'
 import 'element-plus/theme-chalk/src/message.scss'
diff --git a/web/src/management/stores/edit.ts b/web/src/management/stores/edit.ts
index b7d8913b..63fa9372 100644
--- a/web/src/management/stores/edit.ts
+++ b/web/src/management/stores/edit.ts
@@ -4,7 +4,7 @@ import { set as _set, isNumber as _isNumber } from 'lodash-es'
 import { QUESTION_TYPE } from '@/common/typeEnum'
 import { getQuestionByType } from '@/management/utils/index'
 
-import { SurveyPermissions } from '@/management/utils/types/workSpace'
+import { SurveyPermissions } from '@/management/utils/workSpace'
 import { getCollaboratorPermissions } from '@/management/api/space'
 
 import useInitializeSchema from './composables/useInitializeSchema'
diff --git a/web/src/management/stores/workSpace.ts b/web/src/management/stores/workSpace.ts
index 15efe540..9469bc02 100644
--- a/web/src/management/stores/workSpace.ts
+++ b/web/src/management/stores/workSpace.ts
@@ -13,12 +13,8 @@ import {
   getSpaceDetail as getSpaceDetailReq
 } from '@/management/api/space'
 
-import { SpaceType } from '@/management/utils/types/workSpace'
-import {
-  type SpaceDetail,
-  type SpaceItem,
-  type IWorkspace
-} from '@/management/utils/types/workSpace'
+import { SpaceType } from '@/management/utils/workSpace'
+import { type SpaceDetail, type SpaceItem, type IWorkspace } from '@/management/utils/workSpace'
 
 import { useSurveyListStore } from './surveyList'
 
diff --git a/web/src/management/utils/types/workSpace.ts b/web/src/management/utils/workSpace.ts
similarity index 100%
rename from web/src/management/utils/types/workSpace.ts
rename to web/src/management/utils/workSpace.ts
index bcecdd97..9266d997 100644
--- a/web/src/management/utils/types/workSpace.ts
+++ b/web/src/management/utils/workSpace.ts
@@ -42,6 +42,13 @@ export type SpaceItem = Required<Omit<SpaceDetail, 'members'>> & {
   surveyTotal: number
 }
 
+export interface ICollaborator {
+  _id?: string
+  userId: string
+  username: string
+  permissions: Array<number>
+}
+
 export enum SpaceType {
   Personal = 'personal',
   Group = 'group',
@@ -58,13 +65,6 @@ export const roleLabels: Record<UserRole, string> = {
   [UserRole.Member]: '成员'
 }
 
-export interface ICollaborator {
-  _id?: string
-  userId: string
-  username: string
-  permissions: Array<number>
-}
-
 export enum SurveyPermissions {
   SurveyManage = 'SURVEY_CONF_MANAGE',
   DataManage = 'SURVEY_RESPONSE_MANAGE',
diff --git a/web/src/materials/setters/widgets/TabsSetter.vue b/web/src/materials/setters/widgets/TabsSetter.vue
index b50c0d97..a66e6343 100644
--- a/web/src/materials/setters/widgets/TabsSetter.vue
+++ b/web/src/materials/setters/widgets/TabsSetter.vue
@@ -30,7 +30,7 @@ const props = defineProps<IProps>()
 const emit = defineEmits<IEmit>()
 
 const tabList = computed(() => {
-  return props.formConfig?.tabList || []
+  return props.formConfig?.options || []
 })
 
 function handleTabClick(item: any) {
diff --git a/web/src/materials/setters/widgets/UploadSingleFile.vue b/web/src/materials/setters/widgets/UploadSingleFile.vue
index 2cbac721..bc261eb8 100644
--- a/web/src/materials/setters/widgets/UploadSingleFile.vue
+++ b/web/src/materials/setters/widgets/UploadSingleFile.vue
@@ -16,7 +16,7 @@
         :before-upload="beforeAvatarUpload"
         :on-success="onSuccess"
       >
-        <img src="/imgs/icons/upload.png" alt="上传图标" />
+        <i-ep-upload />
       </el-upload>
     </template>
   </el-input>
@@ -92,7 +92,7 @@ const beforeAvatarUpload: UploadProps['beforeUpload'] = (rawFile) => {
   box-sizing: border-box;
   .upload-img {
     .el-upload {
-      width: 80px;
+      width: 32px;
       height: 32px;
     }
   }
diff --git a/web/src/render/App.vue b/web/src/render/App.vue
index 5108916c..6a29394c 100644
--- a/web/src/render/App.vue
+++ b/web/src/render/App.vue
@@ -6,12 +6,29 @@ import { watch } from 'vue'
 import { storeToRefs } from 'pinia'
 
 import { useSurveyStore } from './stores/survey'
-import applySkinConfig from '@/common/utils/applySkinConfig';
 
 const { skinConf } = storeToRefs(useSurveyStore())
 
-watch(skinConf, (value) => {
-  applySkinConfig(value)
+watch(skinConf, (skinConfig) => {
+  const root = document.documentElement
+  const { themeConf, backgroundConf, contentConf }: any = skinConfig
+
+  if (themeConf?.color) {
+    // 设置主题颜色
+    root.style.setProperty('--primary-color', themeConf?.color)
+  }
+
+  // 设置背景
+  const { color, type, image } = backgroundConf || {}
+  root.style.setProperty(
+    '--primary-background',
+    type === 'image' ? `url(${image}) no-repeat center / cover` : color
+  )
+
+  if (contentConf?.opacity.toString()) {
+    // 设置全局透明度
+    root.style.setProperty('--opacity', `${contentConf.opacity / 100}`)
+  }
 })
 </script>
 <style lang="scss">