Merge branch 'master-fetch-dev' into master-fetch

build/constant.ts

@@ -7,7 +7,7 @@ export const prefix = `monaco-editor/esm/vs`
 // chunk 警告大小
 export const chunkSizeWarningLimit = 2000
 
-// 禁用 brotli 压缩大小报告A
+// 禁用 brotliSize 压缩大小报告
 export const brotliSize = false
 
 // 分包

pnpm-lock.yaml

@@ -3074,7 +3074,7 @@ packages:
       source-map: 0.6.1
       wordwrap: 1.0.0
     optionalDependencies:
-      uglify-js: 3.16.0
+      uglify-js: 3.17.4
     dev: true
 
   /hard-rejection/2.1.0:
@@ -5014,8 +5014,8 @@ packages:
     hasBin: true
     dev: true
 
-  /uglify-js/3.16.0:
+  /uglify-js/3.17.4:
-    resolution: {integrity: sha512-FEikl6bR30n0T3amyBh3LoiBdqHRy/f4H80+My34HOesOKyHfOsxAPAxOoqC0JUnC1amnO0IwkYC3sko51caSw==}
+    resolution: {integrity: sha512-T9q82TJI9e/C1TAxYvfb16xO120tMVFZrGA3f9/P4424DNu6ypK103y0GPFVa17yotwSyZW5iYXgjYHkGrJW/g==}
     engines: {node: '>=0.8.0'}
     hasBin: true
     requiresBuild: true

src/api/axios.ts

@@ -1,4 +1,4 @@
-import axios, { AxiosResponse, AxiosRequestConfig } from 'axios'
+import axios, { AxiosResponse, AxiosRequestConfig, Axios } from 'axios'
 import { ResultEnum, ModuleTypeEnum } from "@/enums/httpEnum"
 import { PageEnum, ErrorPageNameMap } from "@/enums/pageEnum"
 import { StorageEnum } from '@/enums/storageEnum'
@@ -8,10 +8,20 @@ import { redirectErrorPage, getLocalStorage, routerTurnByName, isPreview } from
 import { fetchAllowList } from './axios.config'
 import includes from 'lodash/includes'
 
+export interface MyResponseType<T> {
+  code: ResultEnum
+  data: T
+  message: string
+}
+
+export interface MyRequestInstance extends Axios {
+  <T = any>(config: AxiosRequestConfig): Promise<MyResponseType<T>>
+}
+
 const axiosInstance = axios.create({
   baseURL: `${import.meta.env.PROD ? import.meta.env.VITE_PRO_PATH : ''}${axiosPre}`,
   timeout: ResultEnum.TIMEOUT,
-})
+}) as unknown as MyRequestInstance
 
 axiosInstance.interceptors.request.use(
   (config: AxiosRequestConfig) => {

src/api/http.ts

@@ -9,16 +9,16 @@ import {
 } from '@/enums/httpEnum'
 import type { RequestGlobalConfigType, RequestConfigType } from '@/store/modules/chartEditStore/chartEditStore.d'
 
-export const get = (url: string, params?: object) => {
+export const get = <T = any>(url: string, params?: object) => {
-  return axiosInstance({
+  return axiosInstance<T>({
     url: url,
     method: RequestHttpEnum.GET,
     params: params,
   })
 }
 
-export const post = (url: string, data?: object, headersType?: string) => {
+export const post = <T = any>(url: string, data?: object, headersType?: string) => {
-  return axiosInstance({
+  return axiosInstance<T>({
     url: url,
     method: RequestHttpEnum.POST,
     data: data,
@@ -28,8 +28,8 @@ export const post = (url: string, data?: object, headersType?: string) => {
   })
 }
 
-export const patch = (url: string, data?: object, headersType?: string) => {
+export const patch = <T = any>(url: string, data?: object, headersType?: string) => {
-  return axiosInstance({
+  return axiosInstance<T>({
     url: url,
     method: RequestHttpEnum.PATCH,
     data: data,
@@ -39,8 +39,8 @@ export const patch = (url: string, data?: object, headersType?: string) => {
   })
 }
 
-export const put = (url: string, data?: object, headersType?: ContentTypeEnum) => {
+export const put = <T = any>(url: string, data?: object, headersType?: ContentTypeEnum) => {
-  return axiosInstance({
+  return axiosInstance<T>({
     url: url,
     method: RequestHttpEnum.PUT,
     data: data,
@@ -50,8 +50,8 @@ export const put = (url: string, data?: object, headersType?: ContentTypeEnum) =
   })
 }
 
-export const del = (url: string, params?: object) => {
+export const del = <T = any>(url: string, params?: object) => {
-  return axiosInstance({
+  return axiosInstance<T>({
     url: url,
     method: RequestHttpEnum.DELETE,
     params
@@ -82,11 +82,11 @@ export const http = (type?: RequestHttpEnum) => {
 }
 const prefix = 'javascript:'
 // 对输入字符进行转义处理
-export const translateStr = (target: string | object) => {
+export const translateStr = (target: string | Record<any, any>) => {
   if (typeof target === 'string') {
     if (target.startsWith(prefix)) {
       const funcStr = target.split(prefix)[1]
-      let result;
+      let result
       try {
         result = new Function(`${funcStr}`)()
       } catch (error) {
@@ -100,8 +100,8 @@ export const translateStr = (target: string | object) => {
   }
   for (const key in target) {
     if (Object.prototype.hasOwnProperty.call(target, key)) {
-      const subTarget = (target as any)[key];
+      const subTarget = target[key]
-      (target as any)[key] = translateStr(subTarget)
+      target[key] = translateStr(subTarget)
     }
   }
   return target
@@ -116,7 +116,6 @@ export const customizeHttp = (targetParams: RequestConfigType, globalParams: Req
   if (!targetParams || !globalParams) {
     return
   }
-
   // 全局
   const {
     // 全局请求源地址

src/api/path/project.api.ts

@@ -1,84 +1,98 @@
 import { http } from '@/api/http'
 import { httpErrorHandle } from '@/utils'
 import { ContentTypeEnum, RequestHttpEnum, ModuleTypeEnum } from '@/enums/httpEnum'
+import { ProjectItem, ProjectDetail } from './project'
 
 // * 项目列表
 export const projectListApi = async (data: object) => {
-  try { 
+  try {
-    const res = await http(RequestHttpEnum.GET)(`${ModuleTypeEnum.PROJECT}/list`, data);
+    const res = await http(RequestHttpEnum.GET)<ProjectItem[]>(`${ModuleTypeEnum.PROJECT}/list`, data)
-    return res;
+    return res
   } catch {
-    httpErrorHandle();
+    httpErrorHandle()
   }
 }
 
 // * 新增项目
 export const createProjectApi = async (data: object) => {
-  try { 
+  try {
-    const res = await http(RequestHttpEnum.POST)(`${ModuleTypeEnum.PROJECT}/create`, data);
+    const res = await http(RequestHttpEnum.POST)<{
-    return res;
+      /**
+       * 项目id
+       */
+      id: number
+    }>(`${ModuleTypeEnum.PROJECT}/create`, data)
+    return res
   } catch {
-    httpErrorHandle();
+    httpErrorHandle()
   }
 }
 
 // * 获取项目
 export const fetchProjectApi = async (data: object) => {
-  try { 
+  try {
-    const res = await http(RequestHttpEnum.GET)(`${ModuleTypeEnum.PROJECT}/getData`, data);
+    const res = await http(RequestHttpEnum.GET)<ProjectDetail>(`${ModuleTypeEnum.PROJECT}/getData`, data)
-    return res;
+    return res
   } catch {
-    httpErrorHandle();
+    httpErrorHandle()
   }
 }
 
 // * 保存项目
 export const saveProjectApi = async (data: object) => {
-  try { 
+  try {
-    const res = await http(RequestHttpEnum.POST)(`${ModuleTypeEnum.PROJECT}/save/data`, data, ContentTypeEnum.FORM_URLENCODED);
+    const res = await http(RequestHttpEnum.POST)(
-    return res;
+      `${ModuleTypeEnum.PROJECT}/save/data`,
+      data,
+      ContentTypeEnum.FORM_URLENCODED
+    )
+    return res
   } catch {
-    httpErrorHandle();
+    httpErrorHandle()
   }
 }
 
 // * 修改项目基础信息
 export const updateProjectApi = async (data: object) => {
   try {
-    const res = await http(RequestHttpEnum.POST)(`${ModuleTypeEnum.PROJECT}/edit`, data);
+    const res = await http(RequestHttpEnum.POST)(`${ModuleTypeEnum.PROJECT}/edit`, data)
-    return res;
+    return res
   } catch {
-    httpErrorHandle();
+    httpErrorHandle()
   }
 }
 
-
 // * 删除项目
 export const deleteProjectApi = async (data: object) => {
-  try { 
+  try {
-    const res = await http(RequestHttpEnum.DELETE)(`${ModuleTypeEnum.PROJECT}/delete`, data);
+    const res = await http(RequestHttpEnum.DELETE)(`${ModuleTypeEnum.PROJECT}/delete`, data)
-    return res;
+    return res
   } catch {
-    httpErrorHandle();
+    httpErrorHandle()
   }
 }
 
 // * 修改发布状态 [-1未发布,1发布]
 export const changeProjectReleaseApi = async (data: object) => {
-  try { 
+  try {
-    const res = await http(RequestHttpEnum.PUT)(`${ModuleTypeEnum.PROJECT}/publish`, data);
+    const res = await http(RequestHttpEnum.PUT)(`${ModuleTypeEnum.PROJECT}/publish`, data)
-    return res;
+    return res
   } catch {
-    httpErrorHandle();
+    httpErrorHandle()
   }
 }
 
 // * 上传文件
 export const uploadFile = async (data: object) => {
-  try { 
+  try {
-    const res = await http(RequestHttpEnum.POST)(`${ModuleTypeEnum.PROJECT}/upload`, data, ContentTypeEnum.FORM_DATA);
+    const res = await http(RequestHttpEnum.POST)<{
-    return res;
+      /**
+       * 文件地址
+       */
+      fileName: string
+    }>(`${ModuleTypeEnum.PROJECT}/upload`, data, ContentTypeEnum.FORM_DATA)
+    return res
   } catch {
-    httpErrorHandle();
+    httpErrorHandle()
   }
-}
+}

src/api/path/project.d.ts

@@ -0,0 +1,39 @@
+export type ProjectItem = {
+  /**
+   * 项目 id
+   */
+  id: string
+  /**
+   * 项目名称
+   */
+  projectName: string
+  /**
+   * 项目状态:\
+   * -1: 未发布\
+   * 1: 已发布
+   */
+  state: number
+  /**
+   * 创建时间
+   */
+  createTime: string
+  /**
+   * 预览图片url
+   */
+  indexImage: string
+  /**
+   * 创建者 id
+   */
+  createUserId: string
+  /**
+   * 项目备注
+   */
+  remarks: string
+}
+
+export interface ProjectDetail extends ProjectItem {
+  /**
+   * 项目参数
+   */
+   content: string
+}

src/api/path/system.api.ts

@@ -1,33 +1,39 @@
 import { http } from '@/api/http'
 import { httpErrorHandle } from '@/utils'
 import { RequestHttpEnum, ModuleTypeEnum } from '@/enums/httpEnum'
+import { LoginResult } from './system'
 
 // * 登录
 export const loginApi = async (data: object) => {
   try {
-    const res = await http(RequestHttpEnum.POST)(`${ModuleTypeEnum.SYSTEM}/login`, data);
+    const res = await http(RequestHttpEnum.POST)<LoginResult>(`${ModuleTypeEnum.SYSTEM}/login`, data)
-    return res;
+    return res
-  } catch(err) {
+  } catch (err) {
-    httpErrorHandle();
+    httpErrorHandle()
   }
 }
 
 // * 登出
 export const logoutApi = async () => {
   try {
-    const res = await http(RequestHttpEnum.GET)(`${ModuleTypeEnum.SYSTEM}/logout`);
+    const res = await http(RequestHttpEnum.GET)(`${ModuleTypeEnum.SYSTEM}/logout`)
-    return res;
+    return res
-  } catch(err) {
+  } catch (err) {
-    httpErrorHandle();
+    httpErrorHandle()
   }
 }
 
 // * 获取 oss 上传接口
 export const ossUrlApi = async (data: object) => {
   try {
-    const res = await http(RequestHttpEnum.GET)(`${ModuleTypeEnum.SYSTEM}/getOssInfo`, data);
+    const res = await http(RequestHttpEnum.GET)<{
-    return res;
+      /**
-  } catch(err) {
+       * bucket 地址
-    httpErrorHandle();
+       */
+      bucketURL?: string
+    }>(`${ModuleTypeEnum.SYSTEM}/getOssInfo`, data)
+    return res
+  } catch (err) {
+    httpErrorHandle()
   }
-}
+}

src/api/path/system.d.ts

@@ -0,0 +1,26 @@
+export interface LoginResult {
+  token: {
+    /**
+     * token 值
+     */
+    tokenValue: string
+    /**
+     * token key
+     */
+    tokenName: string
+  }
+  userinfo: {
+    /**
+     * 昵称
+     */
+    nickname: string
+    /**
+     * 用户名
+     */
+    username: string
+    /**
+     * 用户 id
+     */
+    id: string
+  }
+}

src/components/GoSystemInfo/index.vue

@@ -42,15 +42,21 @@
 </template>
 
 <script lang="ts" setup>
+import { ref, watch } from 'vue'
 import { icon } from '@/plugins'
 
-const { HelpOutlineIcon, CloseIcon } = icon.ionicons5
+const props = defineProps({
-const emit = defineEmits(['update:modelShow'])
-
-defineProps({
   modelShow: Boolean
 })
 
+const emit = defineEmits(['update:modelShow'])
+const { HelpOutlineIcon, CloseIcon } = icon.ionicons5
+const modelShow = ref(false)
+
+watch(() => props.modelShow, (newValue) => {
+  modelShow.value = newValue
+})
+
 const closeHandle = () => {
   emit('update:modelShow', false)
 }

src/components/GoSystemSet/index.vue

@@ -69,21 +69,20 @@
 </template>
 
 <script script lang="ts" setup>
-import { reactive } from 'vue'
+import { reactive, ref, watch } from 'vue'
 import { ListType } from './index.d'
 import { useSettingStore } from '@/store/modules/settingStore/settingStore'
 import { SettingStoreEnums, ToolsStatusEnum } from '@/store/modules/settingStore/settingStore.d'
 import { icon } from '@/plugins'
 
-const { HelpOutlineIcon, CloseIcon } = icon.ionicons5
+const props = defineProps({
-
-const emit = defineEmits(['update:modelShow'])
-
-defineProps({
   modelShow: Boolean
 })
 
+const emit = defineEmits(['update:modelShow'])
+const { HelpOutlineIcon, CloseIcon } = icon.ionicons5
 const settingStore = useSettingStore()
+const modelShow = ref(false)
 
 const list = reactive<ListType[]>([
   {
@@ -168,6 +167,10 @@ const list = reactive<ListType[]>([
   }
 ])
 
+watch(() => props.modelShow, (newValue) => {
+  modelShow.value = newValue
+})
+
 const closeHandle = () => {
   emit('update:modelShow', false)
 }

src/components/Pages/ThemeColorSelect/components/ColorList.vue

@@ -99,6 +99,7 @@ const colorSelectHandle = (color: AppThemeColorType) => {
       overflow: hidden;
       border-radius: 5px;
       @extend .go-background-filter-shallow;
+      backdrop-filter: none;
     }
     &-color {
       width: 8px;

src/enums/httpEnum.ts

@@ -20,7 +20,9 @@ export enum RequestDataTypeEnum {
   // 静态数据
   STATIC = 0,
   // 请求数据
-  AJAX = 1
+  AJAX = 1,
+  // 数据池
+  Pond = 2
 }
 
 // 请求主体类型

src/hooks/useChartDataFetch.hook.ts

@@ -26,11 +26,10 @@ export const useChartDataFetch = (
 
   // 数据池
   const { addGlobalDataInterface } = useChartDataPondFetch()
-  const { requestDataPondId } = toRefs(targetComponent.request)
 
   // 组件类型
   const { chartFrame } = targetComponent.chartConfig
-  
+
   // eCharts 组件配合 vChart 库更新方式
   const echartsUpdateHandle = (dataset: any) => {
     if (chartFrame === ChartFrameEnum.ECHARTS) {
@@ -89,7 +88,6 @@ export const useChartDataFetch = (
 
         // 立即调用
         fetchFn()
-
         // 定时时间
         const time = targetInterval && targetInterval.value ? targetInterval.value : globalRequestInterval.value
         // 单位
@@ -104,8 +102,8 @@ export const useChartDataFetch = (
   }
 
   if (isPreview()) {
-    // 判断是否有数据池对应 id
+    // 判断是否是数据池类型
-    requestDataPondId
+    targetComponent.request.requestDataType === RequestDataTypeEnum.Pond
       ? addGlobalDataInterface(targetComponent, useChartEditStore, updateCallback || echartsUpdateHandle)
       : requestIntervalFn()
   }

src/hooks/useChartDataPondFetch.hook.ts

@@ -3,7 +3,7 @@ import { customizeHttp } from '@/api/http'
 import { CreateComponentType } from '@/packages/index.d'
 import { useChartEditStore } from '@/store/modules/chartEditStore/chartEditStore'
 import { RequestGlobalConfigType, RequestDataPondItemType } from '@/store/modules/chartEditStore/chartEditStore.d'
-import { newFunctionHandle } from '@/utils'
+import { newFunctionHandle, intervalUnitHandle } from '@/utils'
 
 // 获取类型
 type ChartEditStoreType = typeof useChartEditStore
@@ -24,6 +24,9 @@ const newPondItemInterval = (
   dataPondMapItem?: DataPondMapType[]
 ) => {
   if (!dataPondMapItem) return
+  let fetchInterval: any = 0
+
+  clearInterval(fetchInterval)
 
   // 请求
   const fetchFn = async () => {
@@ -48,6 +51,19 @@ const newPondItemInterval = (
 
   // 立即调用
   fetchFn()
+
+  const targetInterval = requestDataPondItem.dataPondRequestConfig.requestInterval
+  const targetUnit = requestDataPondItem.dataPondRequestConfig.requestIntervalUnit
+
+  const globalRequestInterval = requestGlobalConfig.requestInterval
+  const globalUnit = requestGlobalConfig.requestIntervalUnit
+
+  // 定时时间
+  const time = targetInterval  ? targetInterval : globalRequestInterval
+  // 单位
+  const unit = targetInterval  ? targetUnit : globalUnit
+  // 开启轮询
+  if (time) fetchInterval = setInterval(fetchFn, intervalUnitHandle(time, unit))
 }
 
 /**
@@ -64,7 +80,7 @@ export const useChartDataPondFetch = () => {
     const { requestDataPond } = chartEditStore.getRequestGlobalConfig
 
     // 组件对应的数据池 Id
-    const requestDataPondId = '111' || (targetComponent.request.requestDataPondId as string)
+    const requestDataPondId = targetComponent.request.requestDataPondId as string
     // 新增数据项
     const mittPondIdArr = mittDataPondMap.get(requestDataPondId) || []
     mittPondIdArr.push({
@@ -74,6 +90,11 @@ export const useChartDataPondFetch = () => {
     mittDataPondMap.set(requestDataPondId, mittPondIdArr)
   }
 
+  // 清除旧数据
+  const clearMittDataPondMap = () => {
+    mittDataPondMap.clear()
+  }
+
   // 初始化数据池
   const initDataPond = (requestGlobalConfig: RequestGlobalConfigType) => {
     const { requestDataPond } = requestGlobalConfig
@@ -88,6 +109,7 @@ export const useChartDataPondFetch = () => {
 
   return {
     addGlobalDataInterface,
+    clearMittDataPondMap,
     initDataPond
   }
 }

src/hooks/useSystemInit.hook.ts

@@ -10,8 +10,8 @@ export const useSystemInit = async () => {
 
   // 获取 OSS 信息的 url 地址，用来拼接展示图片的地址
   const getOssUrl = async () => {
-    const res = await ossUrlApi({}) as unknown as MyResponseType
+    const res = await ossUrlApi({})
-    if (res.code === ResultEnum.SUCCESS) {
+    if (res && res.code === ResultEnum.SUCCESS) {
       systemStore.setItem(SystemStoreEnum.FETCH_INFO, {
         OSSUrl: res.data?.bucketURL
       })

src/packages/chartConfiguration/echarts/index.ts

@@ -1,2 +1,3 @@
 export * from './axis'
-export * from './line'
+export * from './line'
+export * from './label'

src/packages/chartConfiguration/echarts/label.ts

@@ -0,0 +1,7 @@
+export const labelConfig = {
+  position: [
+    { label: '外侧', value: 'outside' },
+    { label: '内部', value: 'inside' },
+    { label: '中心', value: 'center' }
+  ]
+}

src/packages/components/Charts/Pies/PieCommon/config.vue

@@ -14,41 +14,37 @@
           <n-text>展示标签</n-text>
         </n-space>
       </SettingItem>
-      <SettingItem name="位置">
-        <n-select v-model:value="optionData.series[0].label.position" :options="[
-            { label: '外侧', value: 'outside' },
-            { label: '内部', value: 'inside' },
-            { label: '中心', value: 'center' }
-          ]" />
-      </SettingItem>
-    </SettingItemBox>
-    <setting-item-box name="标签数据">
-      <setting-item>
-        <n-select v-model:value="optionData.series[0].label.formatter" :options="[
-            { label: '数据名', value: '{b}' },
-            { label: '百分比', value: '{d}' },
-            { label: '列名:百分比', value: '{b}:{d}%' },
-          ]" />
-      </setting-item>
-    </setting-item-box>
-    <setting-item-box name="引导线">
       <setting-item>
         <n-space>
           <n-switch v-model:value="optionData.series[0].labelLine.show" size="small"></n-switch>
-          <n-text>展示引导线</n-text>
+          <n-text>引导线</n-text>
         </n-space>
       </setting-item>
-    </setting-item-box>
+      <SettingItem name="位置">
+        <n-select v-model:value="optionData.series[0].label.position" size="small" :options="labelConfig.position" />
+      </SettingItem>
+      <setting-item name="展示类型">
+        <n-select v-model:value="optionData.series[0].label.formatter" size="small" :options="labelFormatterOptions" />
+      </setting-item>
+    </SettingItemBox>
     <setting-item-box name="圆角">
       <setting-item>
         <n-space>
-          <n-input-number v-model:value="optionData.series[0].itemStyle.borderRadius" size="small" :min="0"></n-input-number>
+          <n-input-number
+            v-model:value="optionData.series[0].itemStyle.borderRadius"
+            size="small"
+            :min="0"
+          ></n-input-number>
           <n-text>圆角大小</n-text>
         </n-space>
       </setting-item>
       <setting-item>
         <n-space>
-          <n-input-number v-model:value="optionData.series[0].itemStyle.borderWidth" size="small" :min="0"></n-input-number>
+          <n-input-number
+            v-model:value="optionData.series[0].itemStyle.borderWidth"
+            size="small"
+            :min="0"
+          ></n-input-number>
           <n-text>线条宽度</n-text>
         </n-space>
       </setting-item>
@@ -61,6 +57,7 @@ import { PropType, watch } from 'vue'
 import { GlobalThemeJsonType } from '@/settings/chartThemes/index'
 import { GlobalSetting, CollapseItem, SettingItemBox, SettingItem } from '@/components/Pages/ChartItemSetting'
 import { PieTypeObject, PieTypeEnum } from './config'
+import { labelConfig } from '@/packages/chartConfiguration/echarts'
 
 const props = defineProps({
   optionData: {
@@ -82,4 +79,10 @@ const fontWeightOptions = [
     value: PieTypeObject[PieTypeEnum.ROSE]
   }
 ]
+
+const labelFormatterOptions = [
+  { label: '数据名', value: '{b}' },
+  { label: '百分比', value: '{d}' },
+  { label: '列名:百分比', value: '{b}:{d}%' }
+]
 </script>

src/packages/components/Decorates/Mores/FlipperNumber/index.ts

@@ -6,7 +6,7 @@ export const FlipperNumberConfig: ConfigType = {
   key: 'FlipperNumber',
   chartKey: 'VFlipperNumber',
   conKey: 'VCFlipperNumber',
-  title: '数字翻牌',
+  title: '数字翻牌-需动态触发',
   category: ChatCategoryEnum.MORE,
   categoryName: ChatCategoryEnumName.MORE,
   package: PackagesCategoryEnum.DECORATES,

src/packages/public/publicConfig.ts

@@ -20,7 +20,7 @@ import { chartInitConfig } from '@/settings/designSetting'
 import cloneDeep from 'lodash/cloneDeep'
 
 // 请求基础属性
-const requestConfig: RequestConfigType = {
+export const requestConfig: RequestConfigType = {
   requestDataType: RequestDataTypeEnum.STATIC,
   requestHttpType: RequestHttpEnum.GET,
   requestUrl: '',

src/plugins/naive.ts

@@ -7,6 +7,7 @@ import {
   NH2,
   NH3,
   NH4,
+  NH5,
   NCode,
   NCountdown,
   NText,
@@ -109,6 +110,7 @@ const naive = create({
     NH2,
     NH3,
     NH4,
+    NH5,
     NCode,
     NCountdown,
     NText,

src/utils/router.ts

@@ -106,8 +106,8 @@ export const reloadRoutePage = () => {
  */
 export const logout = async () => {
   try {
-    const res = await logoutApi() as unknown as MyResponseType
+    const res = await logoutApi()
-    if(res.code === ResultEnum.SUCCESS) {
+    if(res && res.code === ResultEnum.SUCCESS) {
       window['$message'].success(window['$t']('global.logout_success'))
       clearCookie(RequestHttpHeaderEnum.COOKIE)
       clearLocalStorage(StorageEnum.GO_SYSTEM_STORE)

src/views/chart/ContentCharts/components/ChartsItemBox/index.vue

@@ -1,35 +1,41 @@
 <template>
-  <div class="go-content-charts-item-box" :class="{ double: chartMode === ChartModeEnum.DOUBLE }">
+  <div class="go-content-charts-item-animation-patch">
-    <!-- 每一项组件的渲染 -->
     <div
-      class="item-box"
+      ref="contentChartsItemBoxRef"
-      v-for="(item, index) in menuOptions"
+      class="go-content-charts-item-box"
-      :key="index"
+      :class="[chartMode === ChartModeEnum.DOUBLE ? 'double' : 'single']"
-      draggable
-      @dragstart="dragStartHandle($event, item)"
-      @dragend="dragendHandle"
-      @dblclick="dblclickHandle(item)"
     >
-      <div class="list-header">
+      <!-- 每一项组件的渲染 -->
-        <mac-os-control-btn class="list-header-control-btn" :mini="true" :disabled="true"></mac-os-control-btn>
+      <div
-        <n-text class="list-header-text" depth="3">
+        class="item-box"
-          <n-ellipsis>{{ item.title }}</n-ellipsis>
+        v-for="(item, index) in menuOptions"
-        </n-text>
+        :key="index"
-      </div>
+        draggable
-      <div class="list-center go-flex-center">
+        @dragstart="dragStartHandle($event, item)"
-        <img class="list-img" v-lazy="item.image" alt="图表图片" />
+        @dragend="dragendHandle"
-      </div>
+        @dblclick="dblclickHandle(item)"
-      <div class="list-bottom">
+      >
-        <n-text class="list-bottom-text" depth="3">
+        <div class="list-header">
-          <n-ellipsis style="max-width: 90%">{{ item.title }}</n-ellipsis>
+          <mac-os-control-btn class="list-header-control-btn" :mini="true" :disabled="true"></mac-os-control-btn>
-        </n-text>
+          <n-text class="list-header-text" depth="3">
+            <n-ellipsis>{{ item.title }}</n-ellipsis>
+          </n-text>
+        </div>
+        <div class="list-center go-flex-center go-transition">
+          <img class="list-img" v-lazy="item.image" alt="图表图片" />
+        </div>
+        <div class="list-bottom">
+          <n-text class="list-bottom-text" depth="3">
+            <n-ellipsis style="max-width: 90%">{{ item.title }}</n-ellipsis>
+          </n-text>
+        </div>
       </div>
     </div>
   </div>
 </template>
 
 <script setup lang="ts">
-import { PropType, ref, Ref, computed } from 'vue'
+import { PropType, watch, ref, Ref, computed, nextTick } from 'vue'
 import { MacOsControlBtn } from '@/components/Tips/MacOsControlBtn/index'
 import { useChartEditStore } from '@/store/modules/chartEditStore/chartEditStore'
 import { EditCanvasTypeEnum } from '@/store/modules/chartEditStore/chartEditStore.d'
@@ -51,6 +57,7 @@ defineProps({
 })
 
 const chartLayoutStore = useChartLayoutStore()
+const contentChartsItemBoxRef = ref()
 
 // 组件展示状态
 const chartMode: Ref<ChartModeEnum> = computed(() => {
@@ -92,21 +99,38 @@ const dblclickHandle = async (item: ConfigType) => {
     window['$message'].warning(`图表正在研发中, 敬请期待...`)
   }
 }
+
+watch(
+  () => chartMode.value,
+  (newValue: ChartModeEnum) => {
+    if (newValue === ChartModeEnum.DOUBLE) {
+      nextTick(() => {
+        contentChartsItemBoxRef.value.classList.add('miniAnimation')
+      })
+    }
+  }
+)
 </script>
 
 <style lang="scss" scoped>
 /* 列表项宽度 */
 $itemWidth: 100%;
+$maxItemWidth: 180px;
 $halfItemWidth: 46%;
 /* 内容高度 */
 $centerHeight: 100px;
 $halfCenterHeight: 50px;
+
+@include go('content-charts-item-animation-patch') {
+  padding: 10px;
+}
+
 @include go('content-charts-item-box') {
   display: flex;
   flex-wrap: wrap;
   justify-content: space-between;
   gap: 9px;
-  padding: 10px;
+  transition: all 0.7s linear;
   .item-box {
     margin: 0;
     width: $itemWidth;
@@ -115,7 +139,6 @@ $halfCenterHeight: 50px;
     cursor: pointer;
     border: 1px solid rgba(0, 0, 0, 0);
     @include fetch-bg-color('background-color2');
-    @extend .go-transition;
     &:hover {
       @include hover-border-color('background-color4');
       .list-img {
@@ -152,7 +175,11 @@ $halfCenterHeight: 50px;
       }
     }
   }
-  /* 缩小展示 */
+  &.single {
+    .item-box {
+      @extend .go-transition;
+    }
+  }
   &.double {
     .list-header {
       padding: 2px 5px;
@@ -165,6 +192,7 @@ $halfCenterHeight: 50px;
     }
     .item-box {
       width: $halfItemWidth;
+      max-width: $maxItemWidth;
     }
     .list-center {
       height: $halfCenterHeight;
@@ -172,11 +200,24 @@ $halfCenterHeight: 50px;
       .list-img {
         height: $halfCenterHeight;
         width: auto;
+        transition: all 0.2s;
       }
     }
     .list-bottom {
       display: block;
     }
   }
+  /* 缩小展示 */
+  @keyframes miniAnimation {
+    from {
+      width: $itemWidth * 2;
+    }
+    to {
+      width: $itemWidth;
+    }
+  }
+  &.miniAnimation {
+    animation: miniAnimation 0.5s;
+  }
 }
 </style>

src/views/chart/ContentConfigurations/components/CanvasPage/index.vue

@@ -282,9 +282,9 @@ const customRequest = (options: UploadCustomRequestOptions) => {
       )
       let uploadParams = new FormData()
       uploadParams.append('object', newNameFile)
-      const uploadRes = await uploadFile(uploadParams) as unknown as MyResponseType
+      const uploadRes = await uploadFile(uploadParams)
 
-      if(uploadRes.code === ResultEnum.SUCCESS) {
+      if(uploadRes && uploadRes.code === ResultEnum.SUCCESS) {
         chartEditStore.setEditCanvasConfig(
           EditCanvasConfigEnum.BACKGROUND_IMAGE,
           `${systemStore.getFetchInfo.OSSUrl}${uploadRes.data.fileName}?time=${new Date().getTime()}`

src/views/chart/ContentConfigurations/components/ChartAnimation/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="go-chart-configurations-animations" v-if="targetData">
     <n-button
-      class="clear-btn"
+      class="clear-btn go-my-2"
       :disabled="!targetData.styles.animations.length"
       @click="clearAnimation"
     >
@@ -72,7 +72,7 @@ const addAnimation = (item: { label: string; value: string }) => {
 
 <style lang="scss" scoped>
 @include go('chart-configurations-animations') {
-  padding: 20px 10px;
+  padding: 0;
   .clear-btn {
     width: 100%;
   }

src/views/chart/ContentConfigurations/components/ChartData/components/ChartDataAjax/index.vue

@@ -12,7 +12,7 @@
           <n-input size="small" :placeholder="targetData.request.requestHttpType || '暂无'" :disabled="true"></n-input>
         </setting-item>
 
-        <setting-item name="组件间隔（高级）">
+        <setting-item name="组件间隔">
           <n-input size="small" :placeholder="`${targetData.request.requestInterval || '暂无'}`" :disabled="true">
             <template #suffix> {{ SelectHttpTimeNameObj[targetData.request.requestIntervalUnit] }} </template>
           </n-input>
@@ -41,13 +41,9 @@
         </n-input>
       </setting-item-box>
 
-      <n-space justify="end">
-        <n-text depth="3" style="font-size: 12px">更新内容请点击展示区域</n-text>
-      </n-space>
-
       <div class="edit-text" @click="requestModelHandle">
         <div class="go-absolute-center">
-          <n-button type="primary" secondary>查看更多</n-button>
+          <n-button type="primary" secondary>编辑配置</n-button>
         </div>
       </div>
     </n-card>
@@ -76,10 +72,16 @@
 
     <!-- 底部数据展示 -->
     <chart-data-matching-and-show :show="showMatching && !loading" :ajax="true"></chart-data-matching-and-show>
+
     <!-- 骨架图 -->
     <go-skeleton :load="loading" :repeat="3"></go-skeleton>
+    
     <!-- 请求配置model -->
-    <chart-data-request v-model:modelShow="requestShow" @sendHandle="sendHandle"></chart-data-request>
+    <chart-data-request
+      v-model:modelShow="requestShow"
+      :targetData="targetData"
+      @sendHandle="sendHandle"
+    ></chart-data-request>
   </div>
 </template>
 
@@ -95,7 +97,7 @@ import { http, customizeHttp } from '@/api/http'
 import { SelectHttpType } from '../../index.d'
 import { ChartDataMatchingAndShow } from '../ChartDataMatchingAndShow'
 import { useTargetData } from '../../../hooks/useTargetData.hook'
-import { isDev, newFunctionHandle } from '@/utils'
+import { newFunctionHandle } from '@/utils'
 
 const { HelpOutlineIcon, FlashIcon, PulseIcon } = icon.ionicons5
 const { targetData, chartEditStore } = useTargetData()
@@ -128,7 +130,7 @@ const sendHandle = async () => {
     const res = await customizeHttp(toRaw(targetData.value.request), toRaw(chartEditStore.getRequestGlobalConfig))
     loading.value = false
     if (res) {
-      if(!res?.data && !targetData.value.filter) window['$message'].warning('您的数据不符合默认格式，请配置过滤器！')
+      if (!res?.data && !targetData.value.filter) window['$message'].warning('您的数据不符合默认格式，请配置过滤器！')
       targetData.value.option.dataset = newFunctionHandle(res?.data, res, targetData.value.filter)
       showMatching.value = true
       return
@@ -175,7 +177,7 @@ onBeforeUnmount(() => {
       top: 0px;
       left: 0px;
       width: 325px;
-      height: 292px;
+      height: 270px;
       cursor: pointer;
       opacity: 0;
       transition: all 0.3s;

src/views/chart/ContentConfigurations/components/ChartData/components/ChartDataMatchingAndShow/index.vue

@@ -117,7 +117,7 @@ const { uploadFileListRef, customRequest, beforeUpload, download } = useFile(tar
 
 // 是否展示过滤器
 const filterShow = computed(() => {
-  return targetData.value.request.requestDataType === RequestDataTypeEnum.AJAX
+  return targetData.value.request.requestDataType !== RequestDataTypeEnum.STATIC
 })
 
 // 是支持 dataset 的图表类型

src/views/chart/ContentConfigurations/components/ChartData/components/ChartDataMonacoEditor/index.vue

@@ -34,7 +34,7 @@
   </template>
 
   <!-- 弹窗 -->
-  <n-modal class="go-chart-data-monaco-editor" v-model:show="showModal" :mask-closable="false">
+  <n-modal class="go-chart-data-monaco-editor" v-model:show="showModal" :mask-closable="false" :closeOnEsc="false">
     <n-card :bordered="false" role="dialog" size="small" aria-modal="true" style="width: 1000px; height: 600px">
       <template #header>
         <n-space>
@@ -101,7 +101,7 @@
 </template>
 
 <script lang="ts" setup>
-import { ref, computed, watch, toRefs, toRaw } from 'vue'
+import { ref, computed, watch, toRef, toRefs, toRaw, reactive } from 'vue'
 import { useTargetData } from '../../../hooks/useTargetData.hook'
 import { MonacoEditor } from '@/components/Pages/MonacoEditor'
 import { icon } from '@/plugins'
@@ -187,7 +187,10 @@ const saveFilter = () => {
 watch(
   () => showModal.value,
   (newData: boolean) => {
-    if (newData) fetchTargetData()
+    if (newData) {
+      fetchTargetData()
+      filter.value = targetData.value.filter || `return data`
+    }
   }
 )
 </script>

src/views/chart/ContentConfigurations/components/ChartData/components/ChartDataPond/components/ChartDataDisplay/displayTable.vue

@@ -0,0 +1,64 @@
+<template>
+  <n-table
+    :bordered="false"
+    :single-line="false"
+    size="small"
+    style="border-bottom-right-radius: 7px; border-bottom-left-radius: 7px"
+  >
+    <thead>
+      <tr>
+        <th>key</th>
+        <th>value</th>
+      </tr>
+    </thead>
+    <tbody>
+      <tr v-for="(item, index) in tableArray.content" :key="index">
+        <td>
+          {{ item.key || '暂无'}}
+        </td>
+        <td>
+          {{ item.value  || '暂无'}}
+        </td>
+      </tr>
+    </tbody>
+  </n-table>
+</template>
+
+<script setup lang="ts">
+import { PropType, reactive, ref, toRefs, watch } from 'vue'
+import { RequestParamsObjType } from '@/enums/httpEnum'
+import noData from '@/assets/images/canvas/noData.png'
+
+const props = defineProps({
+  target: Object as PropType<RequestParamsObjType>
+})
+
+// 默认表格
+const defaultItem = {
+  key: '',
+  value: ''
+}
+const tableArray = reactive<{
+  content: typeof defaultItem[]
+}>({ content: [] })
+
+// 监听选项
+watch(
+  () => props.target as RequestParamsObjType,
+  (target: RequestParamsObjType) => {
+    tableArray.content = []
+    for (const k in target) {
+      tableArray.content.push({
+        key: k,
+        value: target[k]
+      })
+    }
+    // 默认值
+    if (!tableArray.content.length) tableArray.content = [JSON.parse(JSON.stringify(defaultItem))]
+  },
+  {
+    immediate: true,
+    deep: true
+  }
+)
+</script>

src/views/chart/ContentConfigurations/components/ChartData/components/ChartDataPond/components/ChartDataDisplay/index.ts

@@ -0,0 +1,3 @@
+import ChartDataDisplay from './index.vue'
+
+export { ChartDataDisplay }

src/views/chart/ContentConfigurations/components/ChartData/components/ChartDataPond/components/ChartDataDisplay/index.vue

@@ -0,0 +1,191 @@
+<template>
+  <div class="go-chart-data-display">
+    <n-scrollbar style="max-height: 570px">
+      <div class="go-mr-3">
+        <div>
+          <setting-item-box name="主体信息">
+            <setting-item name="接口名称">
+              <n-input size="small" :placeholder="targetData?.dataPondName || '暂无'" :disabled="true"> </n-input>
+            </setting-item>
+            <setting-item name="接口类型">
+              <n-input size="small" :placeholder="requestHttpType || '暂无'" :disabled="true"></n-input>
+            </setting-item>
+          </setting-item-box>
+
+          <setting-item-box>
+            <setting-item name="组件间隔">
+              <n-input size="small" :placeholder="`${requestInterval || '暂无'}`" :disabled="true">
+                <template #suffix>
+                  {{ targetData && SelectHttpTimeNameObj[requestIntervalUnit] }}
+                </template>
+              </n-input>
+            </setting-item>
+            <setting-item name="全局间隔（默认）">
+              <n-input size="small" :placeholder="`${globalData?.requestInterval || '暂无'}`" :disabled="true">
+                <template #suffix> {{ globalData && SelectHttpTimeNameObj[globalData.requestIntervalUnit] }} </template>
+              </n-input>
+            </setting-item>
+          </setting-item-box>
+
+          <setting-item-box name="源地址" :alone="true">
+            <n-input size="small" :placeholder="globalData?.requestOriginUrl || '暂无'" :disabled="true">
+              <template #prefix>
+                <n-icon :component="PulseIcon" />
+              </template>
+            </n-input>
+          </setting-item-box>
+
+          <setting-item-box name="接口地址" :alone="true">
+            <n-input
+              size="small"
+              :placeholder="requestUrl || '暂无'"
+              :disabled="true"
+            >
+              <template #prefix>
+                <n-icon :component="FlashIcon" />
+              </template>
+            </n-input>
+          </setting-item-box>
+        </div>
+        <n-divider />
+        <setting-item-box name="类型">
+          <setting-item name="配置类型">
+            <n-input
+              size="small"
+              :placeholder="targetData && requestContentTypeObj[requestContentType]"
+              :disabled="true"
+            ></n-input>
+          </setting-item>
+          <setting-item name="body 类型" v-if="requestContentType === RequestContentTypeEnum.DEFAULT">
+            <n-input size="small" :placeholder="targetData && requestParamsBodyType" :disabled="true"></n-input>
+          </setting-item>
+        </setting-item-box>
+        <div v-if="requestContentType === RequestContentTypeEnum.DEFAULT">
+          <n-tabs type="line" animated v-model:value="tabValue">
+            <n-tab v-for="item in RequestParamsTypeEnum" :key="item" :name="item" :tab="item"> {{ item }} </n-tab>
+          </n-tabs>
+          <!-- 各个页面 -->
+          <div class="go-mt-3">
+            <div v-if="tabValue !== RequestParamsTypeEnum.BODY">
+              <display-table class="go-my-3" :target="requestParams[tabValue]"> </display-table>
+            </div>
+
+            <!-- 选择了 body -->
+            <div v-else>
+              <!-- 为 none 时 -->
+              <n-card class="go-mt-3 go-pb-3" v-if="requestParamsBodyType === RequestBodyEnum['NONE']">
+                <n-text depth="3">该接口没有 Body 体</n-text>
+              </n-card>
+
+              <!-- 具有对象属性时 -->
+              <template
+                v-else-if="
+                  requestParamsBodyType === RequestBodyEnum['FORM_DATA'] ||
+                  requestParamsBodyType === RequestBodyEnum['X_WWW_FORM_URLENCODED']
+                "
+              >
+                <display-table
+                  class="go-my-3"
+                  :target="requestParams[RequestParamsTypeEnum.BODY][requestParamsBodyType]"
+                ></display-table>
+              </template>
+
+              <!-- json  -->
+              <template v-else-if="requestParamsBodyType === RequestBodyEnum['JSON']">
+                <n-card size="small" style="padding-bottom: 7px">
+                  <n-code
+                    :code="requestParams[RequestParamsTypeEnum.BODY][requestParamsBodyType] || '暂无内容'"
+                    language="json"
+                  ></n-code>
+                </n-card>
+              </template>
+
+              <!-- xml  -->
+              <template v-else-if="requestParamsBodyType === RequestBodyEnum['XML']">
+                <n-code
+                  :code="requestParams[RequestParamsTypeEnum.BODY][requestParamsBodyType] || ''"
+                  language="html"
+                ></n-code>
+              </template>
+            </div>
+          </div>
+        </div>
+        <!-- SQL 请求 -->
+        <div v-else>
+          <setting-item-box name="键名">
+            <n-text>sql</n-text>
+          </setting-item-box>
+          <setting-item-box name="键值">
+            <n-code :code="requestSQLContent.sql || ''" language="sql"></n-code>
+          </setting-item-box>
+        </div>
+      </div>
+    </n-scrollbar>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { PropType, ref, toRefs } from 'vue'
+import { icon } from '@/plugins'
+import { MonacoEditor } from '@/components/Pages/MonacoEditor'
+import { SettingItemBox, SettingItem } from '@/components/Pages/ChartItemSetting'
+import { RequestDataPondItemType, RequestGlobalConfigType } from '@/store/modules/chartEditStore/chartEditStore.d'
+import displayTable from './displayTable.vue'
+import {
+  RequestBodyEnum,
+  RequestParamsTypeEnum,
+  SelectHttpTimeNameObj,
+  RequestContentTypeEnum,
+  RequestBodyEnumList,
+  RequestParamsObjType
+} from '@/enums/httpEnum'
+
+const props = defineProps({
+  globalData: Object as PropType<RequestGlobalConfigType>,
+  targetData: Object as PropType<RequestDataPondItemType>
+})
+
+const { HelpOutlineIcon, FlashIcon, PulseIcon } = icon.ionicons5
+const {
+  requestUrl,
+  requestInterval,
+  requestHttpType,
+  requestContentType,
+  requestSQLContent,
+  requestParams,
+  requestParamsBodyType,
+  requestIntervalUnit
+} = toRefs((props.targetData as RequestDataPondItemType).dataPondRequestConfig)
+
+const tabs = [RequestParamsTypeEnum.HEADER]
+const requestContentTypeObj = {
+  [RequestContentTypeEnum.DEFAULT]: '普通请求',
+  [RequestContentTypeEnum.SQL]: 'SQL 请求'
+}
+const tabValue = ref<RequestParamsTypeEnum>(RequestParamsTypeEnum.PARAMS)
+
+// 更新参数表格数据
+const updateRequestParams = (paramsObj: RequestParamsObjType) => {
+  if (tabValue.value !== RequestParamsTypeEnum.BODY) {
+    requestParams.value[tabValue.value] = paramsObj
+  }
+}
+
+// 更新参数表格数据
+const updateRequestBodyTable = (paramsObj: RequestParamsObjType) => {
+  if (
+    tabValue.value === RequestParamsTypeEnum.BODY &&
+    // 仅有两种类型有 body
+    (requestParamsBodyType.value === RequestBodyEnum.FORM_DATA ||
+      requestParamsBodyType.value === RequestBodyEnum.X_WWW_FORM_URLENCODED)
+  ) {
+    requestParams.value[RequestParamsTypeEnum.BODY][requestParamsBodyType.value] = paramsObj
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+@include go('chart-data-display') {
+  flex: 1;
+}
+</style>

src/views/chart/ContentConfigurations/components/ChartData/components/ChartDataPond/components/ChartDataPondControl/index.ts

@@ -0,0 +1,3 @@
+import ChartDataPondControl from './index.vue'
+
+export { ChartDataPondControl }

src/views/chart/ContentConfigurations/components/ChartData/components/ChartDataPond/components/ChartDataPondControl/index.vue

@@ -0,0 +1,230 @@
+<template>
+  <n-modal class="go-chart-data-pond-control" v-model:show="modelShow" :mask-closable="false">
+    <n-card :bordered="false" role="dialog" size="small" aria-modal="true" style="width: 900px; height: 650px">
+      <template #header></template>
+      <template #header-extra> </template>
+      <div class="pond-content">
+        <!-- 展示区域 -->
+        <chart-data-display
+          v-if="pondData && !loading"
+          :targetData="pondData"
+          :globalData="chartEditStore.getRequestGlobalConfig"
+        ></chart-data-display>
+        <!-- 无数据 -->
+        <div v-else class="no-data go-flex-center">
+          <img :src="noData" alt="暂无数据" />
+          <n-text :depth="3">暂未选择公共接口</n-text>
+        </div>
+        <!-- 左侧列表 -->
+        <chart-data-pond-list @createPond="createPond" @deletePond="deletePond"></chart-data-pond-list>
+      </div>
+      <!-- 底部 -->
+      <template #action>
+        <n-space justify="space-between">
+          <n-button type="info" secondary :disabled="!pondData" @click="openPond(true)">
+            编辑内容
+            <template #icon>
+              <n-icon>
+                <pencil-icon />
+              </n-icon>
+            </template>
+          </n-button>
+          <n-button type="primary" @click="closeHandle">保存 & 发送请求</n-button>
+        </n-space>
+      </template>
+    </n-card>
+  </n-modal>
+
+  <!-- 请求配置model -->
+  <pond-data-request
+    v-if="requestShow"
+    v-model:modelShow="requestShow"
+    :targetDataRequest="editData"
+    :isEdit="isEdit"
+    @editSaveHandle="saveHandle"
+  ></pond-data-request>
+</template>
+
+<script setup lang="ts">
+import { ref, toRefs, computed, nextTick, watch, toRaw } from 'vue'
+import noData from '@/assets/images/canvas/noData.png'
+import { ChartDataPondList } from '../ChartDataPondList'
+import { PondDataRequest } from '../../../ChartDataRequest'
+import { ChartDataDisplay } from '../ChartDataDisplay'
+import { requestConfig } from '@/packages/public/publicConfig'
+import { useTargetData } from '@/views/chart/ContentConfigurations/components/hooks/useTargetData.hook'
+import { RequestDataPondItemType } from '@/store/modules/chartEditStore/chartEditStore.d'
+import { RequestDataTypeEnum } from '@/enums/httpEnum'
+import { icon } from '@/plugins'
+import { getUUID, goDialog } from '@/utils'
+import { cloneDeep } from 'lodash'
+
+defineProps({
+  modelShow: Boolean
+})
+
+const emit = defineEmits(['update:modelShow', 'sendHandle'])
+const { PencilIcon } = icon.ionicons5
+const { chartEditStore, targetData } = useTargetData()
+const { requestDataPond } = toRefs(chartEditStore.getRequestGlobalConfig)
+const requestShow = ref(false)
+const loading = ref(false)
+const isEdit = ref(false)
+const editData = ref<RequestDataPondItemType>()
+
+// 所选数据池
+const pondData = computed(() => {
+  const selectId = targetData?.value?.request?.requestDataPondId
+  if (!selectId) return undefined
+  const data = requestDataPond.value.filter(item => {
+    return selectId === item.dataPondId
+  })
+  return data[0]
+})
+
+watch(
+  () => pondData.value,
+  newValue => {
+    loading.value = true
+    editData.value = newValue
+    nextTick(() => {
+      loading.value = false
+    })
+  },
+  {
+    immediate: true
+  }
+)
+
+// 打开/编辑
+const openPond = (isEditFlag: boolean = false) => {
+  isEdit.value = !!isEditFlag
+  requestShow.value = true
+}
+
+// 创建
+const createPond = () => {
+  const id = getUUID()
+  editData.value = {
+    dataPondId: id,
+    dataPondName: id,
+    dataPondRequestConfig: cloneDeep({ ...requestConfig, requestDataType: RequestDataTypeEnum.Pond })
+  }
+  openPond()
+}
+
+// 完成创建/编辑
+const saveHandle = (newData: RequestDataPondItemType) => {
+  // 走创建
+  if (isEdit.value) {
+    editSaveHandle(newData)
+  } else {
+    createSaveHandle(newData)
+  }
+  isEdit.value = false
+  requestShow.value = false
+}
+
+// 编辑保存之后
+const editSaveHandle = (newData: RequestDataPondItemType) => {
+  try {
+    const targetIndex = requestDataPond.value.findIndex(item => item.dataPondId === newData.dataPondId)
+    if (targetIndex !== -1) {
+      requestDataPond.value.splice(targetIndex, 1, newData)
+      // 修改数据池后, 修改所有关联的组件
+      chartEditStore.getComponentList.forEach(item => {
+        if (
+          item.request.requestDataType === RequestDataTypeEnum.Pond &&
+          item.request.requestDataPondId === newData.dataPondId
+        ) {
+          item.request = {
+            ...toRaw(newData.dataPondRequestConfig),
+            requestDataPondId: newData.dataPondId
+          }
+        }
+      })
+      window.$message.success('保存成功！')
+    } else {
+      window.$message.error('编辑失败，请稍后重试！')
+    }
+  } catch (error) {
+    window.$message.error('编辑失败，请稍后重试！')
+  }
+}
+
+// 创建保存成功之后
+const createSaveHandle = (newData: RequestDataPondItemType) => {
+  try {
+    if (editData.value) {
+      requestDataPond.value.unshift(newData)
+      window.$message.success('创建成功!')
+    } else {
+      window.$message.error('创建失败，请稍后重试!')
+    }
+  } catch (error) {
+    window.$message.error('创建失败，请稍后重试!')
+  }
+}
+
+// 删除数据池
+const deletePond = (targetData: RequestDataPondItemType) => {
+  goDialog({
+    message: '删除数据后，需手动处理使用改接口的组件，是否继续？',
+    isMaskClosable: true,
+    transformOrigin: 'center',
+    onPositiveCallback: () => {
+      const targetIndex = requestDataPond.value.findIndex(item => item.dataPondId === targetData.dataPondId)
+      if (targetIndex !== -1) {
+        requestDataPond.value.splice(targetIndex, 1)
+        window.$message.success('删除成功!')
+      } else {
+        window.$message.error('删除失败，请稍后重试！')
+      }
+    }
+  })
+}
+
+// 关闭
+const closeHandle = () => {
+  // 将所选内容赋值给对象
+  if (pondData.value) {
+    targetData.value.request = {
+      ...toRaw(pondData.value.dataPondRequestConfig),
+      requestDataPondId: pondData.value.dataPondId
+    }
+  }
+  emit('update:modelShow', false)
+  emit('sendHandle')
+}
+</script>
+
+<style lang="scss" scoped>
+@include go('chart-data-pond-control') {
+  /* 中间 */
+  .pond-content {
+    display: flex;
+  }
+  .no-data {
+    flex-direction: column;
+    width: 100%;
+    img {
+      width: 200px;
+    }
+  }
+  &.n-card.n-modal,
+  .n-card {
+    @extend .go-background-filter;
+  }
+  .n-card-shallow {
+    background-color: rgba(0, 0, 0, 0) !important;
+  }
+  @include deep() {
+    & > .n-card__content {
+      padding-right: 0;
+    }
+    .n-card__content {
+      padding-bottom: 5px;
+    }
+  }
+}
+</style>

src/views/chart/ContentConfigurations/components/ChartData/components/ChartDataPond/components/ChartDataPondList/index.ts

@@ -0,0 +1,3 @@
+import ChartDataPondList from './index.vue'
+
+export { ChartDataPondList }

src/views/chart/ContentConfigurations/components/ChartData/components/ChartDataPond/components/ChartDataPondList/index.vue

@@ -0,0 +1,202 @@
+<template>
+  <div class="go-chart-data-pond-list">
+    <n-timeline style="width: 20px">
+      <n-timeline-item type="info"> </n-timeline-item>
+      <n-timeline-item type="success"></n-timeline-item>
+    </n-timeline>
+    <div class="pond-item-box">
+      <!-- 新增 -->
+      <n-button class="create-btn go-py-4" ghost @click="createPond">
+        <span> 创建 </span>
+        <template #icon>
+          <n-icon>
+            <DuplicateOutlineIcon></DuplicateOutlineIcon>
+          </n-icon>
+        </template>
+      </n-button>
+      <n-divider style="margin: 10px 0"></n-divider>
+      <n-space v-if="!requestDataPond.length" justify="center">
+        <n-text class="not-layer-text" :depth="3">
+          暂无数据内容，
+          <n-a @click="createPond">立即创建</n-a>
+        </n-text>
+      </n-space>
+      <n-scrollbar style="max-height: 490px">
+        <div
+          v-for="item in requestDataPond"
+          :key="item.dataPondId"
+          :class="{ select: item.dataPondId === selectPondId }"
+          class="pond-item"
+          @click="clickHandle(item)"
+        >
+          <div class="item-content">
+            <div class="item-content-body">
+              <div>
+                <n-tag class="go-mr-1" :type="item.dataPondId === selectPondId ? 'warning' : ''" :bordered="false">
+                  名称
+                </n-tag>
+                <n-ellipsis style="max-width: 180px">
+                  {{ item.dataPondName || '暂无' }}
+                </n-ellipsis>
+              </div>
+              <div>
+                <n-tag class="go-mr-1" :type="item.dataPondId === selectPondId ? 'warning' : ''" :bordered="false">
+                  地址
+                </n-tag>
+                <n-ellipsis style="max-width: 180px">
+                  {{ item.dataPondRequestConfig.requestUrl || '暂无' }}
+                </n-ellipsis>
+              </div>
+            </div>
+            <div class="item-content-icon go-transition-quick" @click="deletePond($event, item)">
+              <n-icon>
+                <trash-icon></trash-icon>
+              </n-icon>
+            </div>
+          </div>
+          <div :class="{ 'select-modal': item.dataPondId === selectPondId }"></div>
+        </div>
+      </n-scrollbar>
+    </div>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { toRefs, computed } from 'vue'
+import { useTargetData } from '@/views/chart/ContentConfigurations/components/hooks/useTargetData.hook'
+import { useDesignStore } from '@/store/modules/designStore/designStore'
+import { RequestDataPondItemType } from '@/store/modules/chartEditStore/chartEditStore.d'
+import { icon } from '@/plugins'
+
+const emit = defineEmits(['createPond', 'deletePond'])
+
+const { DuplicateOutlineIcon, TrashIcon } = icon.ionicons5
+const designStore = useDesignStore()
+const { chartEditStore, targetData } = useTargetData()
+const { requestDataPond } = toRefs(chartEditStore.getRequestGlobalConfig)
+
+// 选中的全局数据
+const selectPondId = computed(() => {
+  return targetData.value.request.requestDataPondId
+})
+
+// 颜色
+const themeColor = computed(() => {
+  return designStore.getAppTheme
+})
+
+// 创建数据池
+const createPond = () => {
+  emit('createPond', true)
+}
+
+// 删除数据池
+const deletePond = (target: Event, targetData: RequestDataPondItemType) => {
+  target.stopPropagation()
+  target.preventDefault()
+  emit('deletePond', targetData)
+}
+
+// 选中
+const clickHandle = (item: RequestDataPondItemType) => {
+  targetData.value.request.requestDataPondId = item.dataPondId
+}
+</script>
+
+<style scoped lang="scss">
+$height: 530px;
+$listWidth: 280px;
+$centerHeight: 60px;
+$centerMiniHeight: 28px;
+$textSize: 10px;
+
+@include go('chart-data-pond-list') {
+  padding-top: 10px;
+  padding-bottom: 5px;
+  margin-right: 5px;
+  display: flex;
+  @include deep() {
+    .n-timeline > .n-timeline-item {
+      &:first-child {
+        height: $height;
+      }
+    }
+  }
+  .pond-item-box {
+    width: $listWidth;
+    position: relative;
+    .create-btn {
+      width: calc(#{$listWidth - 15px});
+      margin-right: 15px;
+    }
+    .pond-item {
+      position: relative;
+      height: $centerHeight;
+      padding: 5px;
+      margin-bottom: 10px;
+      margin-right: 15px;
+      border-radius: 5px;
+      cursor: pointer;
+      border: 1px solid rgba(0, 0, 0, 0);
+      @include fetch-bg-color('background-color3');
+      @extend .go-transition-quick;
+      &.hover,
+      &:hover {
+        @include fetch-bg-color('background-color4');
+      }
+      &:hover {
+        @include deep() {
+          .icon-item {
+            opacity: 1;
+          }
+        }
+        .item-content-icon {
+          opacity: 1 !important;
+        }
+      }
+
+      &.select {
+        border: 1px solid v-bind('themeColor');
+        background-color: rgba(0, 0, 0, 0);
+        .item-content-icon {
+          display: none;
+        }
+      }
+
+      .select-modal,
+      .item-content {
+        position: absolute;
+        top: 0;
+        left: 0;
+      }
+
+      .item-content {
+        z-index: 1;
+        display: flex;
+        justify-content: space-between;
+        align-items: center;
+        padding: 5px;
+        .item-content-body {
+          width: 230px;
+          display: flex;
+          flex-direction: column;
+          gap: 5px;
+        }
+        .item-content-icon {
+          opacity: 0;
+          height: $centerHeight;
+          line-height: $centerHeight;
+          padding-left: 5px;
+        }
+      }
+
+      .select-modal {
+        width: 100%;
+        height: 100%;
+        opacity: 0.3;
+        background-color: v-bind('themeColor');
+      }
+    }
+  }
+}
+</style>

src/views/chart/ContentConfigurations/components/ChartData/components/ChartDataPond/index.ts

@@ -0,0 +1,3 @@
+import ChartDataPond from './index.vue'
+
+export { ChartDataPond }

src/views/chart/ContentConfigurations/components/ChartData/components/ChartDataPond/index.vue

@@ -0,0 +1,185 @@
+<template>
+  <!-- 选中内容 -->
+  <div class="go-chart-data-pond">
+    <n-card class="n-card-shallow">
+      <setting-item-box name="请求名称" :alone="true">
+        <n-input size="small" :placeholder="pondData?.dataPondName || '暂无'" :disabled="true">
+          <template #prefix>
+            <n-icon :component="FishIcon" />
+          </template>
+        </n-input>
+      </setting-item-box>
+
+      <setting-item-box name="接口地址" :alone="true">
+        <n-input size="small" :placeholder="pondData?.dataPondRequestConfig.requestUrl || '暂无'" :disabled="true">
+          <template #prefix>
+            <n-icon :component="FlashIcon" />
+          </template>
+        </n-input>
+      </setting-item-box>
+
+      <div class="edit-text" @click="controlModelHandle">
+        <div class="go-absolute-center">
+          <n-button type="primary" secondary>编辑配置</n-button>
+        </div>
+      </div>
+    </n-card>
+  </div>
+
+  <setting-item-box :alone="true">
+    <template #name>
+      测试
+      <n-tooltip trigger="hover">
+        <template #trigger>
+          <n-icon size="21" :depth="3">
+            <help-outline-icon></help-outline-icon>
+          </n-icon>
+        </template>
+        默认赋值给 dataset 字段
+      </n-tooltip>
+    </template>
+    <n-button type="primary" ghost @click="sendHandle">
+      <template #icon>
+        <n-icon>
+          <flash-icon />
+        </n-icon>
+      </template>
+      发送请求
+    </n-button>
+  </setting-item-box>
+
+  <!-- 底部数据展示 -->
+  <chart-data-matching-and-show :show="showMatching && !loading" :ajax="true"></chart-data-matching-and-show>
+
+  <!-- 骨架图 -->
+  <go-skeleton :load="loading" :repeat="3"></go-skeleton>
+
+  <!-- 编辑 / 新增弹窗 -->
+  <chart-data-pond-control v-model:modelShow="controlModel" @sendHandle="sendHandle"></chart-data-pond-control>
+</template>
+
+<script setup lang="ts">
+import { ref, toRefs, toRaw, onBeforeUnmount, computed, watchEffect } from 'vue'
+import { icon } from '@/plugins'
+import { http, customizeHttp } from '@/api/http'
+import { SettingItemBox, SettingItem } from '@/components/Pages/ChartItemSetting'
+import { ChartDataPondControl } from './components/ChartDataPondControl'
+import { useDesignStore } from '@/store/modules/designStore/designStore'
+import { useTargetData } from '../../../hooks/useTargetData.hook'
+import { ChartDataMatchingAndShow } from '../ChartDataMatchingAndShow'
+import { newFunctionHandle } from '@/utils'
+
+const designStore = useDesignStore()
+const { HelpOutlineIcon, FlashIcon, PulseIcon, FishIcon } = icon.ionicons5
+const { targetData, chartEditStore } = useTargetData()
+
+const {
+  requestDataPond,
+  requestInterval: GlobalRequestInterval,
+  requestIntervalUnit: GlobalRequestIntervalUnit
+} = toRefs(chartEditStore.getRequestGlobalConfig)
+
+const loading = ref(false)
+const controlModel = ref(false)
+const showMatching = ref(false)
+
+let firstFocus = 0
+let lastFilter: any = undefined
+
+// 所选数据池
+const pondData = computed(() => {
+  const selectId = targetData.value.request.requestDataPondId
+  if (!selectId) return undefined
+  const data = requestDataPond.value.filter(item => {
+    return selectId === item.dataPondId
+  })
+  return data[0]
+})
+
+// 颜色
+const themeColor = computed(() => {
+  return designStore.getAppTheme
+})
+
+// 请求配置 model
+const controlModelHandle = () => {
+  controlModel.value = true
+}
+
+// 发送请求
+const sendHandle = async () => {
+  if (!targetData.value?.request) {
+    window.$message.warning('请选择一个公共接口！')
+    return
+  }
+  loading.value = true
+  try {
+    // const res = await customizeHttp(
+    //   toRaw(pondData.value?.dataPondRequestConfig),
+    //   toRaw(chartEditStore.getRequestGlobalConfig)
+    // )
+    const res = await customizeHttp(toRaw(targetData.value.request), toRaw(chartEditStore.getRequestGlobalConfig))
+    loading.value = false
+    if (res) {
+      if (!res?.data && !targetData.value.filter) window['$message'].warning('您的数据不符合默认格式，请配置过滤器！')
+      targetData.value.option.dataset = newFunctionHandle(res?.data, res, targetData.value.filter)
+      showMatching.value = true
+      return
+    }
+    window['$message'].warning('数据异常，请检查参数！')
+  } catch (error) {
+    loading.value = false
+    window['$message'].warning('数据异常，请检查参数！')
+  }
+}
+
+watchEffect(() => {
+  const filter = targetData.value?.filter
+  if (lastFilter !== filter && firstFocus) {
+    lastFilter = filter
+    sendHandle()
+  }
+  firstFocus++
+})
+
+onBeforeUnmount(() => {
+  lastFilter = null
+})
+</script>
+
+<style scoped lang="scss">
+@include go('chart-data-pond') {
+  position: relative;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  .n-card-shallow {
+    &.n-card {
+      @extend .go-background-filter;
+      @include deep() {
+        .n-card__content {
+          padding: 10px;
+        }
+      }
+    }
+    .edit-text {
+      position: absolute;
+      top: 0px;
+      left: 0px;
+      width: 325px;
+      height: 136px;
+      cursor: pointer;
+      opacity: 0;
+      transition: all 0.3s;
+      @extend .go-background-filter;
+      backdrop-filter: blur(2px) !important;
+    }
+    &:hover {
+      border-color: v-bind('themeColor');
+      .edit-text {
+        opacity: 1;
+      }
+    }
+  }
+}
+</style>

src/views/chart/ContentConfigurations/components/ChartData/components/ChartDataRequest/components/RequestGlobalConfig/index.vue

@@ -1,7 +1,7 @@
 <template>
   <!-- 全局配置 -->
   <n-card class="n-card-shallow">
-    <n-tag type="info" :bordered="false" style="border-radius: 5px"> 全局配置 </n-tag>
+    <n-tag type="info" :bordered="false" style="border-radius: 5px"> 全局公共配置 </n-tag>
     <setting-item-box
       name="服务"
       :itemRightStyle="{

src/views/chart/ContentConfigurations/components/ChartData/components/ChartDataRequest/components/RequestHeader/index.vue

@@ -29,7 +29,7 @@
 
           <!-- 为 none 时 -->
           <n-card class="go-mt-3 go-pb-3" v-if="requestParamsBodyType === RequestBodyEnum['NONE']">
-            <n-text depth="3">该请求没有 Body 体</n-text>
+            <n-text depth="3">该接口没有 Body 体</n-text>
           </n-card>
 
           <!-- 具有对象属性时 -->
@@ -86,13 +86,12 @@
 </template>
 
 <script setup lang="ts">
-import { ref, toRefs } from 'vue'
+import { ref, toRefs, PropType } from 'vue'
-
 import { MonacoEditor } from '@/components/Pages/MonacoEditor'
+import { RequestHeaderTable } from '../RequestHeaderTable/index'
 import { SettingItemBox, SettingItem } from '@/components/Pages/ChartItemSetting'
 import { useTargetData } from '@/views/chart/ContentConfigurations/components/hooks/useTargetData.hook'
-import { RequestHeaderTable } from '../RequestHeaderTable/index'
+import { RequestConfigType } from '@/store/modules/chartEditStore/chartEditStore.d'
-
 import {
   RequestParamsTypeEnum,
   RequestContentTypeEnum,
@@ -102,9 +101,13 @@ import {
   RequestHttpEnum
 } from '@/enums/httpEnum'
 
-const { targetData } = useTargetData()
+const props = defineProps({
+  targetDataRequest: Object as PropType<RequestConfigType>
+})
 
-const { requestHttpType, requestContentType, requestSQLContent, requestParams, requestParamsBodyType } = toRefs(targetData.value.request)
+const { requestHttpType, requestContentType, requestSQLContent, requestParams, requestParamsBodyType } = toRefs(
+  props.targetDataRequest as RequestConfigType
+)
 
 const tabValue = ref<RequestParamsTypeEnum>(RequestParamsTypeEnum.PARAMS)
 

src/views/chart/ContentConfigurations/components/ChartData/components/ChartDataRequest/components/RequestTargetConfig/index.vue

@@ -5,7 +5,7 @@
     :itemRightStyle="{
       gridTemplateColumns: '6fr 2fr'
     }"
-    style="padding-right: 25px;"
+    style="padding-right: 25px"
   >
     <template #name>
       地址
@@ -51,15 +51,16 @@
     </setting-item>
   </setting-item-box>
   <setting-item-box name="选择方式" class="go-mt-0">
-    <request-header></request-header>
+    <request-header :targetDataRequest="targetDataRequest"></request-header>
   </setting-item-box>
 </template>
 
 <script setup lang="ts">
-import { ref, toRefs } from 'vue'
+import { PropType, toRefs } from 'vue'
 import { SettingItemBox, SettingItem } from '@/components/Pages/ChartItemSetting'
 import { useTargetData } from '@/views/chart/ContentConfigurations/components/hooks/useTargetData.hook'
 import { selectTypeOptions, selectTimeOptions } from '@/views/chart/ContentConfigurations/components/ChartData/index.d'
+import { RequestConfigType } from '@/store/modules/chartEditStore/chartEditStore.d'
 import { RequestHeader } from '../RequestHeader'
 import { isDev } from '@/utils'
 import { icon } from '@/plugins'
@@ -82,10 +83,16 @@ import {
   threeEarth01Url
 } from '@/api/mock'
 
+const props = defineProps({
+  targetDataRequest: Object as PropType<RequestConfigType>
+})
+
 const { HelpOutlineIcon } = icon.ionicons5
-const { targetData, chartEditStore } = useTargetData()
+const { chartEditStore } = useTargetData()
 const { requestOriginUrl } = toRefs(chartEditStore.getRequestGlobalConfig)
-const { requestInterval, requestIntervalUnit, requestHttpType, requestUrl } = toRefs(targetData.value.request)
+const { requestInterval, requestIntervalUnit, requestHttpType, requestUrl } = toRefs(
+  props.targetDataRequest as RequestConfigType
+)
 
 const apiList = [
   {

src/views/chart/ContentConfigurations/components/ChartData/components/ChartDataRequest/index.ts

@@ -1,3 +1,4 @@
 import ChartDataRequest from './index.vue'
+import PondDataRequest from './pondIndex.vue'
 
-export { ChartDataRequest }
+export { ChartDataRequest, PondDataRequest }

src/views/chart/ContentConfigurations/components/ChartData/components/ChartDataRequest/index.vue

@@ -1,5 +1,5 @@
 <template>
-  <n-modal class="go-chart-data-request" v-model:show="modelShow" :mask-closable="false">
+  <n-modal class="go-chart-data-request" v-model:show="modelShow" :mask-closable="false" :closeOnEsc="false">
     <n-card :bordered="false" role="dialog" size="small" aria-modal="true" style="width: 1000px; height: 800px">
       <template #header></template>
       <template #header-extra> </template>
@@ -7,7 +7,7 @@
         <div class="go-pr-3">
           <n-space vertical>
             <request-global-config></request-global-config>
-            <request-target-config></request-target-config>
+            <request-target-config :target-data-request="targetData?.request"></request-target-config>
           </n-space>
         </div>
       </n-scrollbar>
@@ -17,9 +17,11 @@
           <div>
             <n-text>「 {{ chartConfig.categoryName }} 」</n-text>
             <n-text>—— </n-text>
-            <n-tag type="primary" :bordered="false" style="border-radius: 5px"> {{ requestContentTypeObj[requestContentType] }} </n-tag>
+            <n-tag type="primary" :bordered="false" style="border-radius: 5px">
+              {{ requestContentTypeObj[requestContentType] }}
+            </n-tag>
           </div>
-          <n-button type="primary" @click="closeHandle">保存 & 发送请求</n-button>
+          <n-button type="primary" @click="closeAndSendHandle"> {{ saveBtnText || '保存 & 发送请求' }}</n-button>
         </n-space>
       </template>
     </n-card>
@@ -27,31 +29,38 @@
 </template>
 
 <script script lang="ts" setup>
-import { toRefs } from 'vue'
+import { toRefs, PropType } from 'vue'
 import { RequestContentTypeEnum } from '@/enums/httpEnum'
 import { useTargetData } from '../../../hooks/useTargetData.hook'
 import { RequestGlobalConfig } from './components/RequestGlobalConfig'
 import { RequestTargetConfig } from './components/RequestTargetConfig'
 import { useSync } from '@/views/chart/hooks/useSync.hook'
+import { CreateComponentType, CreateComponentGroupType } from '@/packages/index.d'
 
+const props = defineProps({
+  modelShow: Boolean,
+  targetData: Object as PropType<CreateComponentType>,
+  saveBtnText: String || null
+})
 const emit = defineEmits(['update:modelShow', 'sendHandle'])
 
 const { targetData } = useTargetData()
 const { dataSyncUpdate } = useSync()
+
 // 解构基础配置
-const { chartConfig } = toRefs(targetData.value)
+const { chartConfig } = toRefs(props.targetData as CreateComponentType)
-const { requestContentType } = toRefs(targetData.value.request)
+const { requestContentType } = toRefs((props.targetData as CreateComponentType).request)
 const requestContentTypeObj = {
   [RequestContentTypeEnum.DEFAULT]: '普通请求',
   [RequestContentTypeEnum.SQL]: 'SQL 请求'
 }
 
-defineProps({
-  modelShow: Boolean
-})
-
 const closeHandle = () => {
   emit('update:modelShow', false)
+}
+
+const closeAndSendHandle = () => {
+  emit('update:modelShow', false)
   emit('sendHandle')
   dataSyncUpdate()
 }

src/views/chart/ContentConfigurations/components/ChartData/components/ChartDataRequest/pondIndex.vue

@@ -0,0 +1,105 @@
+<template>
+  <n-modal class="go-chart-data-request" v-model:show="modelShow" :mask-closable="false" :closeOnEsc="false">
+    <n-card :bordered="false" role="dialog" size="small" aria-modal="true" style="width: 1000px; height: 800px">
+      <template #header></template>
+      <template #header-extra> </template>
+      <n-scrollbar style="max-height: 718px">
+        <div class="go-pr-3">
+          <n-space vertical>
+            <request-global-config></request-global-config>
+            <request-target-config
+              :target-data-request="targetDataRequest?.dataPondRequestConfig"
+            ></request-target-config>
+          </n-space>
+        </div>
+      </n-scrollbar>
+      <!-- 底部 -->
+      <template #action>
+        <n-space justify="space-between">
+          <n-space v-if="targetDataRequest">
+            <n-tag  :bordered="false" type="primary">名称：</n-tag>
+            <n-input
+              v-model:value="targetDataRequest.dataPondName"
+              ref="inputInstRef"
+              type="text"
+              size="small"
+              :autofocus="true"
+              :clearable="true"
+              :minlength="1"
+              :maxlength="16"
+              placeholder="请输入名称"
+            ></n-input>
+          </n-space>
+          <span v-else></span>
+          <n-space>
+            <n-button @click="closeHandle">取消</n-button>
+            <n-button type="primary" @click="closeAndSendHandle">保存</n-button>
+          </n-space>
+        </n-space>
+      </template>
+    </n-card>
+  </n-modal>
+</template>
+
+<script script lang="ts" setup>
+import { PropType, ref, watchEffect } from 'vue'
+import { RequestContentTypeEnum } from '@/enums/httpEnum'
+import { useTargetData } from '../../../hooks/useTargetData.hook'
+import { RequestGlobalConfig } from './components/RequestGlobalConfig'
+import { RequestTargetConfig } from './components/RequestTargetConfig'
+import { RequestDataPondItemType } from '@/store/modules/chartEditStore/chartEditStore.d'
+import { useSync } from '@/views/chart/hooks/useSync.hook'
+import { goDialog } from '@/utils'
+
+const props = defineProps({
+  modelShow: Boolean,
+  targetDataRequest: Object as PropType<RequestDataPondItemType>
+})
+const emit = defineEmits(['update:modelShow', 'editSaveHandle'])
+
+const { dataSyncUpdate } = useSync()
+const pondName = ref()
+const inputInstRef = ref()
+
+const closeHandle = () => {
+  emit('update:modelShow', false)
+}
+
+const closeAndSendHandle = () => {
+  if (!props.targetDataRequest?.dataPondName) {
+    window.$message.warning('请在左下角输入名称！')
+    inputInstRef.value?.focus()
+    return
+  }
+  goDialog({
+    message: '保存内容将同步修改所有使用此接口的组件, 是否继续?',
+    isMaskClosable: true,
+    transformOrigin: 'center',
+    onPositiveCallback: () => {
+      emit('update:modelShow', false)
+      emit('editSaveHandle', props.targetDataRequest)
+      dataSyncUpdate()
+    }
+  })
+}
+</script>
+
+<style lang="scss" scoped>
+@include go('chart-data-request') {
+  &.n-card.n-modal,
+  .n-card {
+    @extend .go-background-filter;
+  }
+  .n-card-shallow {
+    background-color: rgba(0, 0, 0, 0) !important;
+  }
+  @include deep() {
+    & > .n-card__content {
+      padding-right: 0;
+    }
+    .n-card__content {
+      padding-bottom: 5px;
+    }
+  }
+}
+</style>

src/views/chart/ContentConfigurations/components/ChartData/index.d.ts

@@ -16,6 +16,7 @@ export enum TimelineTitleEnum {
 export enum SelectCreateDataEnum {
   STATIC = '静态数据',
   AJAX = '动态请求',
+  Pond = '公共接口',
 }
 
 export interface SelectCreateDataType {

src/views/chart/ContentConfigurations/components/ChartData/index.vue

@@ -3,24 +3,27 @@
     <setting-item-box name="请求方式" :alone="true">
       <n-select v-model:value="targetData.request.requestDataType" :disabled="isNotData" :options="selectOptions" />
     </setting-item-box>
-
     <!-- 静态 -->
     <chart-data-static v-if="targetData.request.requestDataType === RequestDataTypeEnum.STATIC"></chart-data-static>
-
     <!-- 动态 -->
-    <chart-data-ajax v-else></chart-data-ajax>
+    <chart-data-ajax v-if="targetData.request.requestDataType === RequestDataTypeEnum.AJAX"></chart-data-ajax>
+    <!-- 数据池 -->
+    <chart-data-pond v-if="targetData.request.requestDataType === RequestDataTypeEnum.Pond"></chart-data-pond>
   </div>
 </template>
 
 <script setup lang="ts">
 import { computed } from 'vue'
+import { loadAsyncComponent } from '@/utils'
 import { SettingItemBox } from '@/components/Pages/ChartItemSetting'
 import { useTargetData } from '../hooks/useTargetData.hook'
-import { ChartDataStatic } from './components/ChartDataStatic/index'
-import { ChartDataAjax } from './components/ChartDataAjax/index'
 import { SelectCreateDataType, SelectCreateDataEnum } from './index.d'
 import { RequestDataTypeEnum } from '@/enums/httpEnum'
 
+const ChartDataStatic = loadAsyncComponent(() => import('./components/ChartDataStatic/index.vue'))
+const ChartDataAjax = loadAsyncComponent(() => import('./components/ChartDataAjax/index.vue'))
+const ChartDataPond = loadAsyncComponent(() => import('./components/ChartDataPond/index.vue'))
+
 const { targetData } = useTargetData()
 
 // 选项
@@ -32,6 +35,10 @@ const selectOptions: SelectCreateDataType[] = [
   {
     label: SelectCreateDataEnum.AJAX,
     value: RequestDataTypeEnum.AJAX
+  },
+  {
+    label: SelectCreateDataEnum.Pond,
+    value: RequestDataTypeEnum.Pond
   }
 ]
 

src/views/chart/ContentHeader/headerRightBtn/index.vue

@@ -152,9 +152,9 @@ const sendHandle = async () => {
     id: fetchRouteParamsLocation(),
     // 反过来
     state: release.value ? -1 : 1,
-  })) as unknown as MyResponseType
+  }))
 
-  if (res.code === ResultEnum.SUCCESS) {
+  if (res && res.code === ResultEnum.SUCCESS) {
     modelShowHandle()
     if (!release.value) {
       copyPreviewPath('发布成功！已复制地址到剪贴板~', '发布成功！')

src/views/chart/ContentHeader/headerTitle/index.vue

@@ -67,8 +67,8 @@ const handleBlur = async () => {
   const res = (await updateProjectApi({
     id: fetchRouteParamsLocation(),
     projectName: title.value
-  })) as unknown as MyResponseType
+  }))
-  if (res.code === ResultEnum.SUCCESS) {
+  if (res && res.code === ResultEnum.SUCCESS) {
     dataSyncUpdate()
   } else {
     httpErrorHandle()

src/views/chart/ContentLayers/components/LayersListItem/index.vue

@@ -142,7 +142,6 @@ $textSize: 10px;
   /* 选中样式 */
   &.select {
     border: 1px solid v-bind('themeColor');
-    /* 需要设置最高级，覆盖 hover 的颜色 */
     background-color: rgba(0, 0, 0, 0);
   }
 

src/views/chart/hooks/useSync.hook.ts

@@ -224,10 +224,13 @@ export const useSync = () => {
 
   // * 数据获取
   const dataSyncFetch = async () => {
+    // FIX:重新执行dataSyncFetch需清空chartEditStore.componentList,否则会导致图层重复
+    // 切换语言等操作会导致重新执行 dataSyncFetch,此时pinia中并未清空chartEditStore.componentList，导致图层重复
+    chartEditStore.componentList = []
     chartEditStore.setEditCanvas(EditCanvasTypeEnum.SAVE_STATUS, SyncEnum.START)
     try {
-      const res = await fetchProjectApi({ projectId: fetchRouteParamsLocation() }) as unknown as MyResponseType
+      const res = await fetchProjectApi({ projectId: fetchRouteParamsLocation() })
-      if (res.code === ResultEnum.SUCCESS) {
+      if (res && res.code === ResultEnum.SUCCESS) {
         if (res.data) {
           updateStoreInfo(res.data)
           // 更新全局数据
@@ -275,9 +278,9 @@ export const useSync = () => {
         // 上传预览图
         let uploadParams = new FormData()
         uploadParams.append('object', base64toFile(canvasImage.toDataURL(), `${fetchRouteParamsLocation()}_index_preview.png`))
-        const uploadRes = await uploadFile(uploadParams) as unknown as MyResponseType
+        const uploadRes = await uploadFile(uploadParams)
         // 保存预览图
-        if(uploadRes.code === ResultEnum.SUCCESS) {
+        if(uploadRes && uploadRes.code === ResultEnum.SUCCESS) {
           await updateProjectApi({
             id: fetchRouteParamsLocation(),
             indexImage: `${systemStore.getFetchInfo.OSSUrl}${uploadRes.data.fileName}`
@@ -292,9 +295,9 @@ export const useSync = () => {
     let params = new FormData()
     params.append('projectId', projectId)
     params.append('content', JSON.stringify(chartEditStore.getStorageInfo || {}))
-    const res= await saveProjectApi(params) as unknown as MyResponseType
+    const res= await saveProjectApi(params)
 
-    if (res.code === ResultEnum.SUCCESS) {
+    if (res && res.code === ResultEnum.SUCCESS) {
       // 成功状态
       setTimeout(() => {
         chartEditStore.setEditCanvas(EditCanvasTypeEnum.SAVE_STATUS, SyncEnum.SUCCESS)

src/views/login/index.vue

@@ -207,8 +207,8 @@ const handleSubmit = async (e: Event) => {
       const res = await loginApi({
         username,
         password
-      }) as unknown as MyResponseType
+      })
-      if(res.data) {
+      if(res && res.data) {
         const { tokenValue, tokenName } = res.data.token
         const { nickname, username, id } = res.data.userinfo
 

src/views/preview/components/PreviewRenderGroup/index.vue

@@ -54,5 +54,6 @@ const props = defineProps({
 <style lang="scss" scoped>
 .chart-item {
   position: absolute;
+  overflow: hidden;
 }
 </style>

src/views/preview/components/PreviewRenderList/index.vue

@@ -47,7 +47,7 @@ import { getSizeStyle, getComponentAttrStyle, getStatusStyle } from '../../utils
 import { useLifeHandler } from '@/hooks'
 
 // 初始化数据池
-const { initDataPond } = useChartDataPondFetch()
+const { initDataPond, clearMittDataPondMap } = useChartDataPondFetch()
 
 const props = defineProps({
   localStorageInfo: {
@@ -69,6 +69,7 @@ const themeColor = computed(() => {
 })
 
 // 组件渲染结束初始化数据池
+clearMittDataPondMap()
 onMounted(() => {
   initDataPond(props.localStorageInfo.requestGlobalConfig)
 })
@@ -77,5 +78,6 @@ onMounted(() => {
 <style lang="scss" scoped>
 .chart-item {
   position: absolute;
+  overflow: hidden;
 }
 </style>

src/views/preview/utils/storage.ts

@@ -11,15 +11,13 @@ export interface ChartEditStorageType extends ChartEditStorage {
 // 根据路由 id 获取存储数据的信息
 export const getSessionStorageInfo = async () => {
   const id = fetchRouteParamsLocation()
-  const storageList: ChartEditStorageType[] = getSessionStorage(
+  const storageList: ChartEditStorageType[] = getSessionStorage(StorageEnum.GO_CHART_STORAGE_LIST)
-    StorageEnum.GO_CHART_STORAGE_LIST
+
-  )
-  
   // 是否本地预览
   if (!storageList || storageList.findIndex(e => e.id === id.toString()) === -1) {
     // 接口调用
-    const res = await fetchProjectApi({ projectId: id }) as unknown as MyResponseType
+    const res = await fetchProjectApi({ projectId: id })
-    if (res.code === ResultEnum.SUCCESS) {
+    if (res && res.code === ResultEnum.SUCCESS) {
       const { content, state } = res.data
       if (state === -1) {
         // 跳转未发布页
@@ -37,4 +35,4 @@ export const getSessionStorageInfo = async () => {
       }
     }
   }
-}
+}

src/views/project/items/components/ProjectItemsList/hooks/useData.hook.ts

@@ -1,4 +1,4 @@
-import { ref, reactive } from 'vue';
+import { ref, reactive } from 'vue'
 import { goDialog, httpErrorHandle } from '@/utils'
 import { DialogEnum } from '@/enums/pluginEnum'
 import { projectListApi, deleteProjectApi, changeProjectReleaseApi } from '@/api/path'
@@ -7,16 +7,15 @@ import { ResultEnum } from '@/enums/httpEnum'
 
 // 数据初始化
 export const useDataListInit = () => {
-
   const loading = ref(true)
 
   const paginat = reactive({
-    // 当前页数 
+    // 当前页数
     page: 1,
     // 每页值
     limit: 12,
     // 总数
-    count: 10,
+    count: 10
   })
 
   const list = ref<ChartList>([])
@@ -27,11 +26,11 @@ export const useDataListInit = () => {
     const res = await projectListApi({
       page: paginat.page,
       limit: paginat.limit
-    }) as any
+    })
-    if (res.data) {
+    if (res && res.data) {
-      const { count } = res
+      const { count } = res as any // 这里的count与data平级，不在Response结构中
       paginat.count = count
-      list.value = res.data.map((e: any) => {
+      list.value = res.data.map(e => {
         const { id, projectName, state, createTime, indexImage, createUserId } = e
         return {
           id: id,
@@ -67,11 +66,14 @@ export const useDataListInit = () => {
     goDialog({
       type: DialogEnum.DELETE,
       promise: true,
-      onPositiveCallback: () => new Promise(res => {
+      onPositiveCallback: () =>
-        res(deleteProjectApi({
+        new Promise(res => {
-          ids: cardData.id
+          res(
-        }))
+            deleteProjectApi({
-      }),
+              ids: cardData.id
+            })
+          )
+        }),
       promiseResCallback: (res: any) => {
         if (res.code === ResultEnum.SUCCESS) {
           window['$message'].success(window['$t']('global.r_delete_success'))
@@ -90,8 +92,8 @@ export const useDataListInit = () => {
       id: id,
       // [-1未发布, 1发布]
       state: !release ? 1 : -1
-    }) as unknown as MyResponseType
+    })
-    if (res.code === ResultEnum.SUCCESS) {
+    if (res && res.code === ResultEnum.SUCCESS) {
       list.value = []
       fetchList()
       // 发布 -> 未发布

src/views/project/items/index.d.ts

@@ -1,7 +1,7 @@
 export type Chartype = {
   id: number | string
   title: string // 标题
-  label: string // 标签
+  label?: string // 标签
   time: string, // 时间
   image: string, // 预览图地址
   createId: string, // 创建者

src/views/project/layout/components/ProjectLayoutCreate/components/CreateModal/index.vue

@@ -96,8 +96,8 @@ const btnHandle = async (key: string) => {
           remarks: null,
           // 图片地址
           indexImage: null,
-        }) as unknown as MyResponseType
+        })
-        if(res.code === ResultEnum.SUCCESS) {
+        if(res && res.code === ResultEnum.SUCCESS) {
           window['$message'].success(window['$t']('project.create_success'))
 
           const { id } = res.data

types/global.d.ts

@@ -11,11 +11,4 @@ interface Window {
   opener: any
 }
 
-
-declare interface MyResponseType {
-  code: number;
-  msg: string;
-  data: any;
-}
-
 declare type Recordable<T = any> = Record<string, T>