Merge branch 'revert-76a4385f' into 'main_dev'

perf(src/views): 优化调用第三方api接口

See merge request yunteng/thingskit-view!263

@@ -143,10 +143,8 @@ export const customRequest = async (request: RequestConfigType) => {
     requestParamsBodyType,
     requestParamsBodyType,
     requestOriginUrl,
     requestOriginUrl,
     requestVerificationToken,
     requestVerificationToken,
-    pondRequestOriginUrl,
-    pondRequestGlobalTokenKey,
-    pondRequestGlobalTokenSuffix,
-    
+    requestTokenKey,
+    requestTokenSuffix
   } = request as ExtraRequestConfigType
   } = request as ExtraRequestConfigType
   let { requestUrl } = request as ExtraRequestConfigType
   let { requestUrl } = request as ExtraRequestConfigType
   const { Header, Body } = requestParams
   const { Header, Body } = requestParams
@@ -171,7 +169,7 @@ export const customRequest = async (request: RequestConfigType) => {
     {
     {
       url:
       url:
         requestHttpType === RequestHttpEnum.GET.toUpperCase() ? requestUrl : `${requestUrl}?${objConvertQuery(Params)}`,
         requestHttpType === RequestHttpEnum.GET.toUpperCase() ? requestUrl : `${requestUrl}?${objConvertQuery(Params)}`,
-      baseURL: requestVerificationToken ? pondRequestOriginUrl : getOriginUrl(requestOriginUrl!),
+      baseURL: requestVerificationToken ? '' : getOriginUrl(requestOriginUrl!), // 如果是第三方接口，则无需添加baseURL
       method: requestHttpType,
       method: requestHttpType,
       params: requestHttpType === RequestHttpEnum.GET.toUpperCase() ? Params : null,
       params: requestHttpType === RequestHttpEnum.GET.toUpperCase() ? Params : null,
       data: body,
       data: body,
@@ -182,8 +180,8 @@ export const customRequest = async (request: RequestConfigType) => {
       apiUrl: '',
       apiUrl: '',
       withShareToken: isShareMode(),
       withShareToken: isShareMode(),
       withThirdTokenString: requestVerificationToken,
       withThirdTokenString: requestVerificationToken,
-      withThirdTokenKey: pondRequestGlobalTokenKey,
-      withThirdTokenPrefix: pondRequestGlobalTokenSuffix
+      withThirdTokenKey: requestTokenKey,
+      withThirdTokenPrefix: requestTokenSuffix
     }
     }
   )
   )
   //ft
   //ft

 import {ref, toRefs, toRaw, watch} from 'vue'
 import {ref, toRefs, toRaw, watch} from 'vue'
 import type VChart from 'vue-echarts'
 import type VChart from 'vue-echarts'
+import {useChartDataPondFetch} from '@/hooks/'
 import {CreateComponentType, ChartFrameEnum, CreateComponentGroupType} from '@/packages/index.d'
 import {CreateComponentType, ChartFrameEnum, CreateComponentGroupType} from '@/packages/index.d'
 import {useChartEditStore} from '@/store/modules/chartEditStore/chartEditStore'
 import {useChartEditStore} from '@/store/modules/chartEditStore/chartEditStore'
 import {isPreview, intervalUnitHandle} from '@/utils'
 import {isPreview, intervalUnitHandle} from '@/utils'
 import {setOption} from '@/packages/public/chart'
 import {setOption} from '@/packages/public/chart'
 import {useChartDataSocket} from './useChartDataSocket'
 import {useChartDataSocket} from './useChartDataSocket'
-import {customRequest, customThirdInterfaceRequest, thirdInterfaceRequest} from '@/api/external/customRequest'
+import {customRequest} from '@/api/external/customRequest'
 import {useFilterFn} from './useFilterFn'
 import {useFilterFn} from './useFilterFn'
 import {RequestContentTypeEnum} from '@/enums/external/httpEnum'
 import {RequestContentTypeEnum} from '@/enums/external/httpEnum'
 import dayjs from 'dayjs'
 import dayjs from 'dayjs'
-import { RequestDataPondItemType } from '@/store/modules/chartEditStore/chartEditStore.d'
-import { convertToCascadingData, findItemByLabel } from '@/utils/external/utils'
-import { CascaderOption } from 'naive-ui'
 
 
 
 
 // 获取类型
 // 获取类型
@@ -94,38 +92,6 @@ export const useChartDataFetch = (
                         (toRaw(targetComponent.request).requestParams.Params.startTs as unknown as number) = startTs as unknown as number
                         (toRaw(targetComponent.request).requestParams.Params.startTs as unknown as number) = startTs as unknown as number
                         (toRaw(targetComponent.request).requestParams.Params.endTs as unknown as number) = endTs as unknown as number
                         (toRaw(targetComponent.request).requestParams.Params.endTs as unknown as number) = endTs as unknown as number
                     } 
                     } 
-                    //处理过期
-                    const findCurrentPond = () => {
-                        return chartEditStore.getRequestGlobalConfig.requestDataPond.find((pondItem: RequestDataPondItemType) => 
-                            pondItem.dataPondId === targetComponent?.request?.requestDataPondId && targetComponent.request.thirdTokenIsExp)
-                    }
-                    const handleExecuteRequest = async () => {
-                        try {
-                        if(findCurrentPond()?.dataPondRequestConfig?.pondRequestOriginUrl){
-                            const originUrlString = findCurrentPond()?.dataPondRequestConfig?.pondRequestOriginUrl
-                            const requestUrlString = findCurrentPond()?.dataPondRequestConfig?.pondRequestUrl
-                            const body = findCurrentPond()?.dataPondRequestConfig?.pondRequestParams!['Body']['json']
-                            const request = {
-                                requestOriginUrl: `${originUrlString}${requestUrlString}`,
-                                body
-                            }
-                            const res = await customThirdInterfaceRequest(request as unknown as thirdInterfaceRequest)
-                            const resOptions = convertToCascadingData(res) as unknown as CascaderOption[]
-                            const findLabel = findItemByLabel(resOptions, targetComponent.request.thirdSelectCascaderLabel as string)
-                            if(findLabel) {
-                                targetComponent.request.requestVerificationToken = findLabel?.value
-                            }
-                        }
-                        } catch (e) {
-                          console.error(e)
-                        }
-                    }
-                      // 定时时间
-                    const time = targetInterval && targetInterval.value ? targetInterval.value : globalRequestInterval.value
-                    // 单位
-                    const unit = targetInterval && targetInterval.value ? targetUnit.value : globalUnit.value
-                    setInterval(handleExecuteRequest, intervalUnitHandle(time, unit))
-                    //
                     const res = await customRequest(toRaw(targetComponent.request))
                     const res = await customRequest(toRaw(targetComponent.request))
                     if (res) {
                     if (res) {
                         try {
                         try {
@@ -160,8 +126,6 @@ export const useChartDataFetch = (
                 const unit = targetInterval && targetInterval.value ? targetUnit.value : globalUnit.value
                 const unit = targetInterval && targetInterval.value ? targetUnit.value : globalUnit.value
                 // 开启轮询
                 // 开启轮询
                 if (time) fetchInterval = setInterval(fetchFn, intervalUnitHandle(time, unit))
                 if (time) fetchInterval = setInterval(fetchFn, intervalUnitHandle(time, unit))
-
-                
             }
             }
             // eslint-disable-next-line no-empty
             // eslint-disable-next-line no-empty
         } catch (error) {
         } catch (error) {

@@ -41,29 +41,7 @@ export const requestConfig: RequestConfigType = {
     },
     },
     Header: {},
     Header: {},
     Params: {}
     Params: {}
-  },
-  pondRequestOriginUrl: '',
-  pondRequestInterval: 0,
-  pondRequestIntervalUnit: '',
-  pondRequestGlobalTokenSuffix: '',
-  pondRequestGlobalTokenKey: '',
-  pondRequestHttpType: RequestHttpEnum.GET,
-  pondRequestContentType: RequestContentTypeEnum.DEFAULT,
-  pondRequestUrl:'',
-  pondRequestSQLContent: {
-    sql: ''
-  },
-  pondRequestParamsBodyType: RequestBodyEnum.NONE,
-  pondRequestParams: {
-    "Body": {
-        "form-data": {},
-        "x-www-form-urlencoded": {},
-          "json": "",
-        "xml": ""
-      },
-    "Header": {},
-    "Params": {}
-   }
+  }
 }
 }
 
 
 // 单实例类
 // 单实例类

@@ -196,10 +196,6 @@ export interface RequestGlobalConfigType extends RequestPublicConfigType {
   requestTokenKey?: string
   requestTokenKey?: string
   // 请求头里的Token前缀
   // 请求头里的Token前缀
   requestTokenSuffix?: string,
   requestTokenSuffix?: string,
-  // 全局配置Token前缀
-  requestGlobalTokenSuffix?: string,
-  // 全局配置Token键
-  requestGlobalTokenKey?: string,
 }
 }
 
 
 // 单个图表请求配置
 // 单个图表请求配置
@@ -222,34 +218,12 @@ export interface RequestConfigType extends RequestPublicConfigType {
   requestSQLContent: {
   requestSQLContent: {
     sql: string
     sql: string
   }
   }
-
    // Token
    // Token
    requestVerificationToken?: string
    requestVerificationToken?: string
    // 请求头里的Token键
    // 请求头里的Token键
    requestTokenKey?: string
    requestTokenKey?: string
    // 请求头里的Token前缀
    // 请求头里的Token前缀
    requestTokenSuffix?: string
    requestTokenSuffix?: string
-   pondRequestOriginUrl?: string
-   pondRequestInterval?: number
-   pondRequestIntervalUnit?: string
-   pondRequestGlobalTokenSuffix?: string
-   pondRequestGlobalTokenKey?: string
-   pondRequestGlobalCascaderOption?: Recordable
-   pondRequestGlobalCascaderKey?: string
-   pondRequestHttpType?: string
-   pondRequestInterval?: number
-   pondRequestIntervalUnit?: string
-   pondRequestContentType?: number
-   pondRequestHttpType?: string
-   pondRequestParams?: RequestParams
-   pondRequestParamsBodyType?: RequestBodyEnum
-   pondRequestUrl?: string
-   pondRequestSQLContent?: {
-    sql: string
-  }
-  thirdTokenIsExp?: boolean
-  thirdSelectCascaderLabel?: string
-  publicInterfaceSelectId?: string
 }
 }
 
 
 // Store 类型
 // Store 类型

@@ -11,7 +11,6 @@ import { ContentTypeEnum, RequestEnum } from '@/enums/external/httpEnum';
 import omit from 'lodash/omit';
 import omit from 'lodash/omit';
 import cloneDeep from 'lodash/cloneDeep';
 import cloneDeep from 'lodash/cloneDeep';
 import { useUserStore } from '@/store/external/modules/user';
 import { useUserStore } from '@/store/external/modules/user';
-import { useTargetData } from '@/views/chart/ContentConfigurations/components/hooks/useTargetData.hook';
 
 
 export * from './axiosTransform';
 export * from './axiosTransform';
 
 
@@ -116,8 +115,6 @@ export class VAxios {
     this.axiosInstance.interceptors.request.use(async (config: AxiosRequestConfig) => {
     this.axiosInstance.interceptors.request.use(async (config: AxiosRequestConfig) => {
       // If cancel repeat request is turned on, then cancel repeat request is prohibited
       // If cancel repeat request is turned on, then cancel repeat request is prohibited
       const userStore = useUserStore();
       const userStore = useUserStore();
-      const { targetData } = useTargetData()
-
       // if (userStore && (userStore.jwtToken || userStore.shareJwtToken)) {
       // if (userStore && (userStore.jwtToken || userStore.shareJwtToken)) {
       if (userStore) {
       if (userStore) {
         try {
         try {
@@ -128,7 +125,7 @@ export class VAxios {
           const res = jwt_decode(withThirdTokenString) as Recordable;
           const res = jwt_decode(withThirdTokenString) as Recordable;
           const currentTime = (new Date().getTime() + (config.timeout || 0)) / 1000;
           const currentTime = (new Date().getTime() + (config.timeout || 0)) / 1000;
           if (currentTime >= res?.exp) {
           if (currentTime >= res?.exp) {
-            targetData.value.request.thirdTokenIsExp = true
+            window['$message'].warning('第三方平台Token已经失效，请您重新返回设计页面点击执行请求获取最新Token')
            }
            }
           } else {
           } else {
           //此平台逻辑
           //此平台逻辑

@@ -65,19 +65,3 @@ export const convertToCascadingData = (obj: Recordable): cascadingData[] => {
   }
   }
   return result
   return result
 }
 }
-
-// 递归查找
-export const findItemByLabel = (list:Recordable[], label:string) :Recordable | null => {
-  let res = list.find((item) => item.label == label) as Recordable | null;
-  if (res) {
-      return res;
-  } else {
-      for (let i = 0; i < list.length; i++) {
-          if (list[i].children instanceof Array && list[i].children.length > 0) {
-              res = findItemByLabel(list[i].children, label);
-              if (res) return res;
-          }
-      }
-      return null;
-  }
-};

@@ -101,7 +101,7 @@ watch(
 )
 )
 
 
 // 打开/编辑
 // 打开/编辑
-const openPond = (isEditFlag = false) => {
+const openPond = (isEditFlag: boolean = false) => {
   isEdit.value = !!isEditFlag
   isEdit.value = !!isEditFlag
   requestShow.value = true
   requestShow.value = true
 }
 }

@@ -41,14 +41,6 @@
         编辑配置
         编辑配置
       </n-button>
       </n-button>
     </setting-item-box>
     </setting-item-box>
-    <setting-item-box name="配置">
-      <setting-item name="Token前缀">
-          <n-input :disabled="editDisabled" v-model:value.trim="requestGlobalTokenSuffix" type="text" placeholder="例如：Bearer" />
-      </setting-item>
-      <setting-item name="Token键值">
-          <n-input :disabled="editDisabled" v-model:value.trim="requestGlobalTokenKey" type="text" placeholder="例如：Token" />
-      </setting-item>
-    </setting-item-box>
     <!-- table 内容体 -->
     <!-- table 内容体 -->
     <n-collapse-transition :show="showTable">
     <n-collapse-transition :show="showTable">
       <request-global-header-table :editDisabled="editDisabled"></request-global-header-table>
       <request-global-header-table :editDisabled="editDisabled"></request-global-header-table>
@@ -77,13 +69,13 @@ import { ref, toRefs, computed } from 'vue'
 import { useDesignStore } from '@/store/modules/designStore/designStore'
 import { useDesignStore } from '@/store/modules/designStore/designStore'
 import { SettingItemBox, SettingItem } from '@/components/Pages/ChartItemSetting'
 import { SettingItemBox, SettingItem } from '@/components/Pages/ChartItemSetting'
 import { useTargetData } from '@/views/chart/ContentConfigurations/components/hooks/useTargetData.hook'
 import { useTargetData } from '@/views/chart/ContentConfigurations/components/hooks/useTargetData.hook'
-import { selectTimeOptions } from '@/views/chart/ContentConfigurations/components/ChartData/index.d'
+import { selectTypeOptions, selectTimeOptions } from '@/views/chart/ContentConfigurations/components/ChartData/index.d'
 import { RequestGlobalHeaderTable } from '../RequestGlobalHeaderTable'
 import { RequestGlobalHeaderTable } from '../RequestGlobalHeaderTable'
 import { icon } from '@/plugins'
 import { icon } from '@/plugins'
 
 
 const { PencilIcon, ChevronDownOutlineIcon, ChevronUpOutlineIcon } = icon.ionicons5
 const { PencilIcon, ChevronDownOutlineIcon, ChevronUpOutlineIcon } = icon.ionicons5
 const { chartEditStore } = useTargetData()
 const { chartEditStore } = useTargetData()
-const { requestOriginUrl, requestInterval, requestIntervalUnit, requestGlobalTokenSuffix, requestGlobalTokenKey } = toRefs(chartEditStore.getRequestGlobalConfig)
+const { requestOriginUrl, requestInterval, requestIntervalUnit } = toRefs(chartEditStore.getRequestGlobalConfig)
 const editDisabled = ref(true)
 const editDisabled = ref(true)
 
 
 const designStore = useDesignStore()
 const designStore = useDesignStore()

-<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>

-import ChartDataDisplay from './index.vue'
-
-export { ChartDataDisplay }

-<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="pondRequestHttpType || '暂无'" :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="pondRequestOriginUrl || '暂无'" :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="pondRequestUrl || '暂无'"
-              :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,
-  pondRequestOriginUrl,
-  pondRequestUrl,
-  pondRequestHttpType
-} = 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>

-import ChartDataPondControl from './index.vue'
-
-export { ChartDataPondControl }

-<template>
-  <n-modal class="go-chart-data-pond-control"  v-model:show="modelShowRef" :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-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 '../../../RequestModal/PondDataRequest.vue'
-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 { RequestBodyEnum, RequestContentTypeEnum, RequestDataTypeEnum, RequestHttpEnum } from '@/enums/httpEnum'
-import { icon } from '@/plugins'
-import { getUUID, goDialog } from '@/utils'
-import { cloneDeep } from 'lodash'
-
-const props = 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 modelShowRef = 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(() => props.modelShow, (newValue) => {
-  if (newValue) {
-    modelShowRef.value = true
-  } else {
-    modelShowRef.value = false
-  }
-})
-
-const cacheEditData = ref<RequestDataPondItemType>()
-
-watch(
-  () => pondData.value,
-  newValue => {
-    loading.value = true
-    editData.value = newValue
-    cacheEditData.value = editData.value
-    nextTick(() => {
-      loading.value = false
-    })
-  },
-  {
-    immediate: true
-  }
-)
-
-// 打开/编辑
-const openPond = (isEditFlag = false) => {
-  isEdit.value = !!isEditFlag
-  requestShow.value = true
-  editData.value = cacheEditData.value || {
-    dataPondId: getUUID(),
-    dataPondName: getUUID(),
-    dataPondRequestConfig: {
-    requestDataPondId: '',
-    requestInterval: 0,
-    requestDataType: RequestDataTypeEnum.AJAX,
-    requestHttpType: RequestHttpEnum.GET,
-    requestUrl: '',
-    requestContentType: RequestContentTypeEnum.DEFAULT,
-    requestParamsBodyType: RequestBodyEnum.NONE,
-    requestSQLContent: {
-      sql: ''
-    },
-    requestVerificationToken: '',
-    requestTokenKey: '',
-    requestTokenSuffix: '',
-    requestParams: {
-      "Body": {
-          "form-data": {},
-          "x-www-form-urlencoded": {},
-            "json": "",
-          "xml": ""
-        },
-      "Header": {},
-      "Params": {}
-     },  
-    pondRequestOriginUrl: '',
-    pondRequestInterval: 0,
-    pondRequestIntervalUnit: '',
-    pondRequestGlobalTokenSuffix: '',
-    pondRequestGlobalTokenKey: '',
-    pondRequestHttpType:'',
-    pondRequestUrl:'',
-    pondRequestContentType:RequestContentTypeEnum.DEFAULT,
-    pondRequestSQLContent: {
-      sql: ''
-    },
-    pondRequestParamsBodyType: RequestBodyEnum.NONE,
-    pondRequestParams: {
-      "Body": {
-          "form-data": {},
-          "x-www-form-urlencoded": {},
-            "json": "",
-          "xml": ""
-        },
-      "Header": {},
-      "Params": {}
-     }
-    }
-  } as unknown as RequestDataPondItemType
-}
-
-// 创建
-const createPond = () => {
-  const id = getUUID()
-  editData.value = {
-    dataPondId: id,
-    dataPondName: id,
-    dataPondRequestConfig: cloneDeep({ ...requestConfig, requestDataType: RequestDataTypeEnum.Pond })
-  }
-  cacheEditData.value =  editData.value
-  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)
-}
-</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>

-import ChartDataPondList from './index.vue'
-
-export { ChartDataPondList }

-<template>
-  <div class="go-chart-data-pond-list">
-    <n-timeline class="pond-item-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.pondRequestUrl || '暂无' }}
-                </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;
-  .pond-item-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>

-import ChartDataPond from './index.vue'
-
-export { ChartDataPond }

-<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 { ChartDataMatchingAndShow } from '../ChartDataMatchingAndShow'
-import { newFunctionHandle } from '@/utils'
-import { useTargetData } from '../../../../hooks/useTargetData.hook'
-
-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: Recordable) => {
-    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(targetData.value.request), toRaw(chartEditStore.getRequestGlobalConfig))
-    loading.value = false
-    if (res) {
-      if (!res?.data && !targetData.value.filter) {
-        window['$message'].warning('您的数据不符合默认格式，请配置过滤器！')
-        showMatching.value = true
-        return
-      }
-      targetData.value.option.dataset = newFunctionHandle(res?.data, res, targetData.value.filter)
-      showMatching.value = true
-      return
-    }
-    window['$message'].warning('没有拿到返回值，请检查接口！')
-  } catch (error) {
-    console.error(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>

@@ -4,7 +4,6 @@ import { icon } from '@/plugins'
 import { useDesignStore } from '@/store/modules/designStore/designStore'
 import { useDesignStore } from '@/store/modules/designStore/designStore'
 import { SettingItemBox } from '@/components/Pages/ChartItemSetting'
 import { SettingItemBox } from '@/components/Pages/ChartItemSetting'
 import { ChartDataMatchingAndShow } from '../../../external/components/ChartDataMatchingAndShow'
 import { ChartDataMatchingAndShow } from '../../../external/components/ChartDataMatchingAndShow'
-import { ChartDataPondControl } from '../ChartDataPond/components/ChartDataPondControl'
 import { useTargetData } from '../../../../hooks/useTargetData.hook'
 import { useTargetData } from '../../../../hooks/useTargetData.hook'
 import { NButton, NSelect, NTooltip, NIcon, SelectOption } from 'naive-ui'
 import { NButton, NSelect, NTooltip, NIcon, SelectOption } from 'naive-ui'
 import { RequestInfoPanel } from '../RequestInfoPanel'
 import { RequestInfoPanel } from '../RequestInfoPanel'
@@ -94,11 +93,6 @@ watchEffect(() => {
 onBeforeUnmount(() => {
 onBeforeUnmount(() => {
   lastFilter = null
   lastFilter = null
 })
 })
-
-const controlModel = ref(false)
-
-const handleOpenChartDataPondModal = () => controlModel.value = true
-
 </script>
 </script>
 
 
 <template>
 <template>
@@ -107,10 +101,6 @@ const handleOpenChartDataPondModal = () => controlModel.value = true
       <NSelect v-model:value="selectedRequestType" :options="getApiRequestType" />
       <NSelect v-model:value="selectedRequestType" :options="getApiRequestType" />
     </SettingItemBox>
     </SettingItemBox>
 
 
-    <SettingItemBox v-if="selectedRequestType === RequestDataTypeEnum.AJAX" name="全局配置" :alone="true">
-      <NButton @click="handleOpenChartDataPondModal" type="success">配置</NButton>
-    </SettingItemBox>
-
     <RequestInfoPanel @clickPanel="handleClickPanel" />
     <RequestInfoPanel @clickPanel="handleClickPanel" />
 
 
     <SettingItemBox :alone="true">
     <SettingItemBox :alone="true">
@@ -142,8 +132,6 @@ const handleOpenChartDataPondModal = () => controlModel.value = true
     <go-skeleton :load="loading" :repeat="3"></go-skeleton>
     <go-skeleton :load="loading" :repeat="3"></go-skeleton>
 
 
     <RequestModal ref="requestModal" />
     <RequestModal ref="requestModal" />
-
-    <chart-data-pond-control v-model:modelShow="controlModel" @sendHandle="sendHandle"></chart-data-pond-control>
   </div>
   </div>
 </template>
 </template>
 
 

@@ -99,7 +99,6 @@ const handleSelectedInterfaceChange = async (_value: string, option: PublicInter
   const { filter } = option
   const { filter } = option
   const { targetData } = useTargetData()
   const { targetData } = useTargetData()
   targetData.value.filter = filter ?? 'return res'
   targetData.value.filter = filter ?? 'return res'
-  targetData.value.request.publicInterfaceSelectId = option.id as string
   //ft
   //ft
   setDynamicFormValue(option as unknown as ExtraRequestConfigType)
   setDynamicFormValue(option as unknown as ExtraRequestConfigType)
 }
 }
@@ -155,7 +154,7 @@ const getConfigurationData = () => {
 
 
 const setConfigurationData = async (request: ExtraRequestConfigType) => {
 const setConfigurationData = async (request: ExtraRequestConfigType) => {
   await getPublicInterfaceList()
   await getPublicInterfaceList()
-  const { requestDataPondId, requestParams, requestParamsBodyType, requestContentType, requestHttpType, requestIntervalUnit, requestInterval, publicInterfaceSelectId } = request
+  const { requestDataPondId, requestParams, requestParamsBodyType, requestContentType, requestHttpType, requestIntervalUnit, requestInterval } = request
   const { Header } = requestParams
   const { Header } = requestParams
   /**
   /**
    * ft 修改
    * ft 修改
@@ -163,8 +162,7 @@ const setConfigurationData = async (request: ExtraRequestConfigType) => {
    * 源代码 selectedPublicInterface.value = requestDataPondId
    * 源代码 selectedPublicInterface.value = requestDataPondId
    * 修改后代码 selectedPublicInterface.value = publicInterfaceList.value.find(it=>it.id === requestDataPondId)?.id||''
    * 修改后代码 selectedPublicInterface.value = publicInterfaceList.value.find(it=>it.id === requestDataPondId)?.id||''
    */
    */
-  console.log(publicInterfaceList.value)
-  selectedPublicInterface.value = publicInterfaceList.value.find(it => it.id === publicInterfaceSelectId)?.id || ''
+  selectedPublicInterface.value = publicInterfaceList.value.find(it => it.id === requestDataPondId)?.id || ''
   //ft
   //ft
   requestContentTypeRef.value = requestContentType
   requestContentTypeRef.value = requestContentType
   requestHttpTypeRef.value = requestHttpType
   requestHttpTypeRef.value = requestHttpType

@@ -14,27 +14,23 @@ import {
   NTag,
   NTag,
   NTooltip,
   NTooltip,
   SelectOption,
   SelectOption,
-  NDivider,
-  CascaderOption,
-  NCascader,
+  NCascader
 } from 'naive-ui'
 } from 'naive-ui'
-import { computed, onMounted, reactive, ref, unref } from 'vue'
+import { computed, ref, unref, onMounted, reactive } from 'vue'
 import GlobalParamsConfiguration from './GlobalParamsConfiguration.vue'
 import GlobalParamsConfiguration from './GlobalParamsConfiguration.vue'
 import { ChevronDown, ChevronUp } from '@vicons/carbon'
 import { ChevronDown, ChevronUp } from '@vicons/carbon'
 import { useDesignStore } from '@/store/modules/designStore/designStore'
 import { useDesignStore } from '@/store/modules/designStore/designStore'
 import { selectTimeOptions } from '../../../index.d'
 import { selectTimeOptions } from '../../../index.d'
 import { useTargetData } from '../../../../hooks/useTargetData.hook'
 import { useTargetData } from '../../../../hooks/useTargetData.hook'
 import { RequestDataTypeEnum, RequestHttpIntervalEnum } from '@/enums/httpEnum'
 import { RequestDataTypeEnum, RequestHttpIntervalEnum } from '@/enums/httpEnum'
-import { RequestDataPondItemType } from '@/store/modules/chartEditStore/chartEditStore.d'
-import { convertToCascadingData } from '@/utils/external/utils'
+import { TokenNameEnum, TokenEnum } from '@/enums/external/tokenEnum'
 import { customThirdInterfaceRequest, thirdInterfaceRequest } from '@/api/external/customRequest'
 import { customThirdInterfaceRequest, thirdInterfaceRequest } from '@/api/external/customRequest'
+import { CascaderOption } from 'naive-ui'
+import { convertToCascadingData } from '@/utils/external/utils'
 
 
 const { PencilIcon } = icon.ionicons5
 const { PencilIcon } = icon.ionicons5
-
 const designStore = useDesignStore()
 const designStore = useDesignStore()
-
 const editDisabled = ref(false)
 const editDisabled = ref(false)
-
 const collapseHeaderTable = ref(false)
 const collapseHeaderTable = ref(false)
 
 
 const { targetData, chartEditStore } = useTargetData()
 const { targetData, chartEditStore } = useTargetData()
@@ -43,41 +39,15 @@ const handleCollapse = () => {
   collapseHeaderTable.value = !unref(collapseHeaderTable)
   collapseHeaderTable.value = !unref(collapseHeaderTable)
 }
 }
 
 
-const requestDataPondLength = computed(()=>chartEditStore.getRequestGlobalConfig.requestDataPond.length)
-
 // 颜色
 // 颜色
 const themeColor = computed(() => {
 const themeColor = computed(() => {
   return designStore.getAppTheme
   return designStore.getAppTheme
 })
 })
 
 
-const selectGlobalPondValue = ref('')
-
-const cacheSelectOption = ref<Recordable>({
-  dataPondRequestConfig:{
-    pondRequestOriginUrl:'',
-    pondRequestUrl:'',
-    pondRequestHttpType:'',
-    pondRequestParams: {
-      "Body": {
-        "form-data": {},
-        "x-www-form-urlencoded": {},
-        "json": "",
-        "xml": ""
-      },
-      "Header": {},
-      "Params": {}
-    }, 
-    requestVerificationToken:'',
-  }
-})
+//第三方接口相关代码
+const verifiationValue = ref(TokenEnum.DEFAULT_TOKEN)
 
 
-const selectGlobalPondOptions = computed(() => {
-  return chartEditStore.getRequestGlobalConfig.requestDataPond.map(dataPond=>({
-    value:dataPond.dataPondId,
-    label:dataPond.dataPondName,
-    ...dataPond
-  }))
-})
+const tokenString = ref('')
 
 
 const getTokenString = ref()
 const getTokenString = ref()
 
 
@@ -92,53 +62,76 @@ const cascaderConfig = reactive({
   showPath: true
   showPath: true
 })
 })
 
 
-const handleResCascader = (value: string | number, options: Recordable) => {
-  targetData.value.request.thirdSelectCascaderLabel = options.label
-  getTokenString.value = value as string | number
-  targetData.value.request.requestVerificationToken = value as string
-  targetData.value.request.requestDataType = RequestDataTypeEnum.AJAX
-}
+const requestTokenSuffix = ref('Bearer')
 
 
-const findCurrentPond = () => {
-  return selectGlobalPondOptions.value.find((pondItem: RequestDataPondItemType & {label: string, value: string}) => pondItem.dataPondId === targetData.value?.request?.requestDataPondId)
-}
+const requestTokenKey = ref('Token')
 
 
-const handleSelectGlobalPond = (_:string, options:RequestDataPondItemType & {label: string, value: string}) => {
-  cacheSelectOption.value = options
-  targetData.value.request = options.dataPondRequestConfig
-  targetData.value.request.requestDataPondId = options.dataPondId
-  getTokenString.value =''
+//验证方式
+const verificationMethods = [
+  {
+    label: TokenNameEnum.DEFAULT_TOKEN,
+    value: TokenEnum.DEFAULT_TOKEN
+  },
+  {
+    label: TokenNameEnum.TOKEN_STRING,
+    value: TokenEnum.TOKEN_STRING
+  },
+  {
+    label: TokenNameEnum.NO_VERIFICATION,
+    value: TokenEnum.NO_VERIFICATION
+  }
+]
+
+const hasDefaultToken = (value: string[]) => value.includes(TokenEnum.DEFAULT_TOKEN)
+
+const hasTokenString = (value: string[]) => value.includes(TokenEnum.TOKEN_STRING)
+
+const handleVerificationUpdate = (value: string) => {
+  chartEditStore.getRequestGlobalConfig.requestVerificationMethods = value
+  hasTokenString([value])
+  hasDefaultToken([value])
+  resValue.value = null
   resOptions.value = []
   resOptions.value = []
-  resValue.value=null
-  handleExecuteRequest()
+  getTokenString.value = ''
+  requestTokenKey.value = ''
+  requestTokenSuffix.value = ''
+}
+
+const handleResCascader = (value: string | number) => {
+  getTokenString.value = value as string | number
+  chartEditStore.getRequestGlobalConfig.requestVerificationToken = value as string
+  targetData.value.request.requestVerificationToken = value as string
+  targetData.value.request.requestDataType = RequestDataTypeEnum.AJAX
 }
 }
 
 
 //执行请求获取三方Token
 //执行请求获取三方Token
 const handleExecuteRequest = async () => {
 const handleExecuteRequest = async () => {
   try {
   try {
-    const originUrlString =  cacheSelectOption.value?.dataPondRequestConfig?.pondRequestOriginUrl
-    const requestUrlString = cacheSelectOption.value?.dataPondRequestConfig?.pondRequestUrl
-    const body = cacheSelectOption.value?.dataPondRequestConfig?.pondRequestParams['Body']['json']
-    if(originUrlString && requestUrlString){
-      const request = {
-        requestOriginUrl: `${originUrlString}${requestUrlString}`,
-        body
-      }
-      const res = await customThirdInterfaceRequest(request as unknown as thirdInterfaceRequest)
-      resOptions.value = convertToCascadingData(res) as unknown as CascaderOption[]
+    const request = {
+      requestOriginUrl: chartEditStore.getRequestGlobalConfig.requestOriginUrl,
+      body: chartEditStore.getRequestGlobalConfig.requestParams.Header
     }
     }
+    const res = await customThirdInterfaceRequest(request as thirdInterfaceRequest)
+    resOptions.value = convertToCascadingData(res) as unknown as CascaderOption[]
+    chartEditStore.getRequestGlobalConfig.requestVerificationMethods = verifiationValue.value
+    chartEditStore.getRequestGlobalConfig.requestVerificationToken = resValue.value as string
+    chartEditStore.getRequestGlobalConfig.requestTokenKey = requestTokenKey.value
+    chartEditStore.getRequestGlobalConfig.requestTokenSuffix = requestTokenSuffix.value
+    //存储到当前组件的请求对象里
+    targetData.value.request.requestTokenSuffix = requestTokenSuffix.value
+    targetData.value.request.requestTokenKey = requestTokenKey.value
   } catch (e) {
   } catch (e) {
     getTokenString.value = JSON.stringify(e) as string
     getTokenString.value = JSON.stringify(e) as string
   }
   }
 }
 }
 
 
-onMounted(()=>{
-  getTokenString.value = targetData.value?.request?.requestVerificationToken
-  selectGlobalPondValue.value = findCurrentPond()?.dataPondId as string
-  cacheSelectOption.value = findCurrentPond() as RequestDataPondItemType
-  resValue.value = targetData.value?.request?.thirdSelectCascaderLabel
-  handleExecuteRequest()
+onMounted(() => {
+  getTokenString.value = chartEditStore.getRequestGlobalConfig.requestVerificationToken
+  verifiationValue.value = chartEditStore.getRequestGlobalConfig.requestVerificationMethods || TokenEnum.DEFAULT_TOKEN
+  requestTokenKey.value = chartEditStore.getRequestGlobalConfig.requestTokenKey!
+  requestTokenSuffix.value = chartEditStore.getRequestGlobalConfig.requestTokenSuffix!
 })
 })
+//
 </script>
 </script>
 
 
 <template>
 <template>
@@ -146,7 +139,7 @@ onMounted(()=>{
     <template #header>
     <template #header>
       <NTag type="info">全局公共配置</NTag>
       <NTag type="info">全局公共配置</NTag>
     </template>
     </template>
-    <NSpace v-if="requestDataPondLength<=0"  vertical>
+    <NSpace vertical>
       <SettingItemBox
       <SettingItemBox
         name="服务"
         name="服务"
         :itemRightStyle="{
         :itemRightStyle="{
@@ -195,56 +188,43 @@ onMounted(()=>{
           编辑配置
           编辑配置
         </NButton>
         </NButton>
       </SettingItemBox>
       </SettingItemBox>
+      <!-- 针对第三方接口 -->
+      <SettingItemBox
+        name="验证方式"
+        :itemRightStyle="{
+          gridTemplateColumns: '5fr 2fr 1fr'
+        }"
+      >
+        <n-radio-group v-model:value="verifiationValue" name="radiogroup" @update:value="handleVerificationUpdate">
+          <n-space>
+            <n-radio
+              v-for="verificationItem in verificationMethods"
+              :key="verificationItem.value"
+              :value="verificationItem.value"
+            >
+              {{ verificationItem.label }}
+            </n-radio>
+          </n-space>
+        </n-radio-group>
+      </SettingItemBox>
+      <SettingItemBox v-if="hasDefaultToken([verifiationValue])" name="配置">
+        <SettingItem name="Token前缀">
+          <n-input v-model:value.trim="requestTokenSuffix" type="text" placeholder="例如：Bearer" />
+        </SettingItem>
+        <SettingItem name="Token键">
+          <n-input v-model:value.trim="requestTokenKey" type="text" placeholder="例如：X-Authorization" />
+        </SettingItem>
+      </SettingItemBox>
       <NCollapseTransition :show="collapseHeaderTable">
       <NCollapseTransition :show="collapseHeaderTable">
-        <GlobalParamsConfiguration />
-      </NCollapseTransition>
-      <section class="arrow">
-        <NTooltip>
-          <template #trigger>
-            <NIcon @click="handleCollapse" size="30">
-              <ChevronDown v-show="!collapseHeaderTable" />
-              <ChevronUp v-show="collapseHeaderTable" />
-            </NIcon>
-          </template>
-          <span>{{ collapseHeaderTable ? '收起' : '展开' }}</span>
-        </NTooltip>
-      </section>
-    </NSpace>
-    <div v-else>
-      <NSelect
-        v-model:value="selectGlobalPondValue"
-        placeholder="请选择全局公共配置"
-        class="select-time-options"
-        size="small"
-        clearable
-        :options="selectGlobalPondOptions"
-        @update:value="handleSelectGlobalPond"
+        <GlobalParamsConfiguration v-if="hasDefaultToken([verifiationValue])" />
+        <n-input
+          v-else-if="hasTokenString([verifiationValue])"
+          v-model:value="tokenString"
+          type="text"
+          placeholder="请输入令牌字符串"
         />
         />
-        <NDivider />
-        <SettingItemBox name="配置信息" v-if="selectGlobalPondValue" :itemRightStyle="{
-           gridTemplateColumns: '5fr 2fr 1fr'
-        }">
-           <SettingItem name="源地址">
-              <NInput
-                v-model:value="cacheSelectOption.dataPondRequestConfig.pondRequestOriginUrl"
-                disabled
-            ></NInput>
-           </SettingItem>
-           <SettingItem name="url地址">
-              <NInput
-                v-model:value="cacheSelectOption.dataPondRequestConfig.pondRequestUrl"
-                disabled
-            ></NInput>
-           </SettingItem>
-           <SettingItem name="请求方式">
-              <NInput
-                v-model:value="cacheSelectOption.dataPondRequestConfig.pondRequestHttpType"
-                disabled
-            ></NInput>
-           </SettingItem>
-        </SettingItemBox>
-        <NDivider />
-        <div style="margin:0 70px" v-if="selectGlobalPondValue">
+        <n-empty v-else description="无"> </n-empty>
+        <div style="margin-top: 10px">
           <n-space vertical>
           <n-space vertical>
             <n-button type="primary" @click="handleExecuteRequest">执行请求</n-button>
             <n-button type="primary" @click="handleExecuteRequest">执行请求</n-button>
             <NCascader
             <NCascader
@@ -268,7 +248,20 @@ onMounted(()=>{
             />
             />
           </n-space>
           </n-space>
         </div>
         </div>
-    </div>
+        <!-- 针对第三方接口 -->
+      </NCollapseTransition>
+      <section class="arrow">
+        <NTooltip>
+          <template #trigger>
+            <NIcon @click="handleCollapse" size="30">
+              <ChevronDown v-show="!collapseHeaderTable" />
+              <ChevronUp v-show="collapseHeaderTable" />
+            </NIcon>
+          </template>
+          <span>{{ collapseHeaderTable ? '收起' : '展开' }}</span>
+        </NTooltip>
+      </section>
+    </NSpace>
   </NCard>
   </NCard>
 </template>
 </template>
 
 

-<template>
-  <n-modal
-    class="go-chart-data-request"
-    v-model:show="modelShowRef"
-    :mask-closable="false"
-    :closeOnEsc="true"
-    :onEsc="onEsc"
-  >
-    <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>
-             <PondPublicConfiguration ref="pondPublicConfigurationRef" />
-             <NDivider />
-             <PondRequestConfiguration ref="pondRequestConfigurationRef" />
-          </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, watch, onMounted, nextTick } from 'vue'
-import { RequestDataPondItemType } from '@/store/modules/chartEditStore/chartEditStore.d'
-import { goDialog } from '@/utils'
-import PondPublicConfiguration from './PondPublicConfiguration.vue'
-import PondRequestConfiguration from './PondRequestConfiguration.vue'
-import { merge } from 'lodash'
-import { useTargetData } from '../../../../hooks/useTargetData.hook'
-
-const props = defineProps({
-  modelShow: Boolean,
-  targetDataRequest: Object as PropType<RequestDataPondItemType>,
-})
-
-const { targetData } = useTargetData()
-
-const pondPublicConfigurationRef = ref<InstanceType<typeof PondPublicConfiguration>>()
-
-const pondRequestConfigurationRef = ref<InstanceType<typeof PondRequestConfiguration>>()
-
-const emit = defineEmits(['update:modelShow', 'editSaveHandle'])
-
-const inputInstRef = ref()
-
-const modelShowRef = ref(false)
-
-watch(
-  () => props.modelShow,
-  newValue => {
-    modelShowRef.value = newValue
-    if(newValue) {
-      nextTick(() => {
-        pondPublicConfigurationRef?.value?.setConfigurationData(props.targetDataRequest?.dataPondRequestConfig as unknown as RequestDataPondItemType)
-        pondRequestConfigurationRef?.value?.setConfigurationData(props.targetDataRequest?.dataPondRequestConfig as unknown as RequestDataPondItemType)
-      })
-    }
-  }
-)
-
-const closeHandle = () => {
-  emit('update:modelShow', false)
-}
-
-const closeAndSendHandle = () => {
-  if (!props.targetDataRequest?.dataPondName) {
-    window.$message.warning('请在左下角输入名称！')
-    inputInstRef.value?.focus()
-    return
-  }
-  const pondPublicData = pondPublicConfigurationRef?.value?.getConfigurationData()
-  const pondRequestData = pondRequestConfigurationRef?.value?.getConfigurationData()
-  merge(props.targetDataRequest.dataPondRequestConfig, pondRequestData, pondPublicData)
-  goDialog({
-    message: '保存内容将同步修改所有使用此接口的组件, 是否继续?',
-    isMaskClosable: true,
-    transformOrigin: 'center',
-    onPositiveCallback: () => {
-      emit('update:modelShow', false)
-      emit('editSaveHandle', props.targetDataRequest)
-    }
-  })
-}
-
-const onEsc = () => {
-  closeHandle()
-}
-
-onMounted(()=>{
-  pondPublicConfigurationRef?.value?.setConfigurationData(targetData.value.request)
-})
-</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>

-<script lang="ts" setup name="PondPublicConfiguration">
-import { SettingItem, SettingItemBox } from '@/components/Pages/ChartItemSetting'
-import { icon } from '@/plugins'
-import {
-  NButton,
-  NCard,
-  NCollapseTransition,
-  NIcon,
-  NInput,
-  NInputGroup,
-  NInputNumber,
-  NSelect,
-  NSpace,
-  NTag,
-  NTooltip,
-  SelectOption,
-} from 'naive-ui'
-import { computed, ref, unref } from 'vue'
-import GlobalParamsConfiguration from './GlobalParamsConfiguration.vue'
-import { ChevronDown, ChevronUp } from '@vicons/carbon'
-import { useDesignStore } from '@/store/modules/designStore/designStore'
-import { selectTimeOptions } from '../../../index.d'
-import { RequestHttpIntervalEnum } from '@/enums/httpEnum'
-
-const { PencilIcon } = icon.ionicons5
-
-const designStore = useDesignStore()
-
-const editDisabled = ref(false)
-
-const collapseHeaderTable = ref(false)
-
-const pondRequestOriginUrlRef= ref('')
-
-const pondRequestIntervalRef = ref()
-
-const pondRequestIntervalUnitRef = ref('')
-
-const pondRequestGlobalTokenSuffixRef = ref('')
-
-const pondRequestGlobalTokenKeyRef = ref('')
-
-const handleCollapse = () => {
-  collapseHeaderTable.value = !unref(collapseHeaderTable)
-}
-
-// 颜色
-const themeColor = computed(() => {
-  return designStore.getAppTheme
-})
-
-const getConfigurationData = (): Recordable => {
-  return {
-    pondRequestOriginUrl: unref(pondRequestOriginUrlRef),
-    pondRequestInterval: unref(pondRequestIntervalRef),
-    pondRequestIntervalUnit: unref(pondRequestIntervalUnitRef),
-    pondRequestGlobalTokenSuffix: unref(pondRequestGlobalTokenSuffixRef),
-    pondRequestGlobalTokenKey: unref(pondRequestGlobalTokenKeyRef),
-  }
-}
-
-const setConfigurationData = (request: Recordable) => {
-  const { pondRequestOriginUrl, pondRequestInterval, pondRequestIntervalUnit, pondRequestGlobalTokenSuffix, pondRequestGlobalTokenKey } = request
-  pondRequestOriginUrlRef.value = pondRequestOriginUrl
-  pondRequestIntervalRef.value = pondRequestInterval
-  pondRequestIntervalUnitRef.value = pondRequestIntervalUnit
-  pondRequestGlobalTokenSuffixRef.value = pondRequestGlobalTokenSuffix
-  pondRequestGlobalTokenKeyRef.value = pondRequestGlobalTokenKey
-}
-
-defineExpose({
-  getConfigurationData,
-  setConfigurationData
-})
-</script>
-
-<template>
-  <NCard>
-    <template #header>
-      <NTag type="info">全局公共配置</NTag>
-    </template>
-    <NSpace vertical>
-      <SettingItemBox
-        name="服务"
-        :itemRightStyle="{
-          gridTemplateColumns: '5fr 2fr 1fr'
-        }"
-      >
-        <!-- 源地址 -->
-        <SettingItem name="前置 URL">
-          <NInput
-            v-model:value="pondRequestOriginUrlRef"
-            default-value="http://127.0.0.1"
-            :disabled="editDisabled"
-            size="small"
-            placeholder="例:http://127.0.0.1" 
-          ></NInput>
-        </SettingItem>
-        <SettingItem name="更新间隔，为 0 只会初始化">
-          <NInputGroup>
-            <NInputNumber
-              v-model:value="pondRequestIntervalRef"
-              class="select-time-number"
-              size="small"
-              min="0"
-              :show-button="false"
-              :disabled="editDisabled"
-              placeholder="请输入数字"
-            >
-            </NInputNumber>
-            <!-- 单位 -->
-            <NSelect
-              v-model:value="pondRequestIntervalUnitRef"
-              class="select-time-options"
-              size="small"
-              :default-value="RequestHttpIntervalEnum.SECOND"
-              :options="selectTimeOptions as SelectOption[]"
-              :disabled="editDisabled"
-            />
-          </NInputGroup>
-        </SettingItem>
-        <NButton v-show="editDisabled" type="primary" ghost @click="editDisabled = false">
-          <template #icon>
-            <NIcon>
-              <PencilIcon />
-            </NIcon>
-          </template>
-          编辑配置
-        </NButton>
-      </SettingItemBox>
-      <!-- 针对第三方接口 -->
-      <SettingItemBox name="配置">
-        <SettingItem name="Token前缀">
-          <n-input v-model:value.trim="pondRequestGlobalTokenSuffixRef" type="text" placeholder="例如：Bearer" />
-        </SettingItem>
-        <SettingItem name="Token键值">
-          <n-input v-model:value.trim="pondRequestGlobalTokenKeyRef" type="text" placeholder="例如：Token" />
-        </SettingItem>
-      </SettingItemBox>
-      <NCollapseTransition :show="collapseHeaderTable">
-        <GlobalParamsConfiguration />
-        <!-- 针对第三方接口 -->
-      </NCollapseTransition>
-      <section class="arrow">
-        <NTooltip>
-          <template #trigger>
-            <NIcon @click="handleCollapse" size="30">
-              <ChevronDown v-show="!collapseHeaderTable" />
-              <ChevronUp v-show="collapseHeaderTable" />
-            </NIcon>
-          </template>
-          <span>{{ collapseHeaderTable ? '收起' : '展开' }}</span>
-        </NTooltip>
-      </section>
-    </NSpace>
-  </NCard>
-</template>
-
-<style lang="scss" scoped>
-.arrow {
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  cursor: pointer;
-
-  &:hover {
-    color: v-bind('themeColor');
-  }
-}
-</style>

-<script setup lang="ts">
-import { NInput, NInputNumber, NInputGroup, NSelect, SelectOption, NTabs, NTabPane } from 'naive-ui'
-import { SettingItem, SettingItemBox } from '@/components/Pages/ChartItemSetting'
-import { selectTimeOptions, selectTypeOptions } from '../../../index.d'
-import {
-  RequestBodyEnum,
-  RequestContentTypeEnum,
-  RequestHttpEnum,
-  RequestHttpIntervalEnum,
-  RequestParams
-} from '@/enums/httpEnum'
-import { ref, unref } from 'vue'
-import DefaultRequestContent from './DefaultRequestContent.vue'
-import SqlConfiguration from './SqlConfiguration.vue'
-
-const pondRequestContentTypeRef = ref(RequestContentTypeEnum.DEFAULT)
-
-const pondRequestHttpTypeRef = ref(RequestHttpEnum.GET)
-
-const pondRequestIntervalRef = ref<number | undefined>(20)
-
-const pondRequestIntervalUnitRef = ref(RequestHttpIntervalEnum.SECOND)
-
-const pondRequestSQLContentRef = ref('select * from where')
-
-const pondRequestParamsRef = ref({
-  Header: {},
-  Params: {},
-  Body: { 'form-data': {}, json: '', 'x-www-form-urlencoded': {}, xml: '' }
-} as RequestParams)
-
-const pondRequestParamsBodyTypeRef = ref(RequestBodyEnum.NONE)
-
-const pondRequestUrlRef = ref<string>()
-
-const getConfigurationData = (): Recordable => {
-  return {
-    pondRequestInterval: unref(pondRequestIntervalRef),
-    pondRequestIntervalUnit: unref(pondRequestIntervalUnitRef),
-    pondRequestHttpType: unref(pondRequestHttpTypeRef),
-    pondRequestUrl: unref(pondRequestUrlRef),
-    pondRequestContentType: unref(pondRequestContentTypeRef),
-    pondRequestSQLContent: unref(pondRequestSQLContentRef),
-    pondRequestParamsBodyType: unref(pondRequestParamsBodyTypeRef),
-    pondRequestParams: unref(pondRequestParamsRef)
-  }
-}
-
-const setConfigurationData = (request: Recordable) => {
-  const {
-    pondRequestInterval,
-    pondRequestIntervalUnit,
-    pondRequestHttpType,
-    pondRequestUrl,
-    pondRequestContentType,
-    pondRequestSQLContent,
-    pondRequestParamsBodyType,
-    pondRequestParams
-  } = request
-  pondRequestIntervalRef.value = pondRequestInterval
-  pondRequestIntervalUnitRef.value = pondRequestIntervalUnit
-  pondRequestHttpTypeRef.value = pondRequestHttpType
-  pondRequestUrlRef.value = pondRequestUrl
-  pondRequestContentTypeRef.value = pondRequestContentType
-  pondRequestSQLContentRef.value = pondRequestSQLContent
-  pondRequestParamsBodyTypeRef.value = pondRequestParamsBodyType
-  pondRequestParamsRef.value = pondRequestParams
-}
-
-defineExpose({
-  getConfigurationData,
-  setConfigurationData
-})
-</script>
-
-<template>
-  <SettingItemBox
-    name="地址"
-    :itemRightStyle="{
-      gridTemplateColumns: '5fr 2fr 1fr'
-    }"
-  >
-    <SettingItem name="请求方式 & URL地址">
-      <NInputGroup>
-        <NSelect
-          v-model:value="pondRequestHttpTypeRef"
-          style="width: 150px"
-          size="small"
-          :options="(selectTypeOptions as SelectOption[])"
-        />
-        <NInput
-          v-model:value="pondRequestUrlRef"
-          class="select-time-number"
-          size="small"
-          min="0"
-          :show-button="false"
-          placeholder="请输入URL地址"
-        />
-      </NInputGroup>
-    </SettingItem>
-    <SettingItem name="更新间隔，为 0 只会初始化">
-      <NInputGroup>
-        <NInputNumber
-          v-model:value="pondRequestIntervalRef"
-          class="select-time-number"
-          size="small"
-          min="0"
-          :show-button="false"
-          placeholder="请输入数字"
-        />
-        <!-- 单位 -->
-        <NSelect
-          v-model:value="pondRequestIntervalUnitRef"
-          class="select-time-options"
-          size="small"
-          :options="(selectTimeOptions as SelectOption[])"
-        />
-      </NInputGroup>
-    </SettingItem>
-  </SettingItemBox>
-  <SettingItemBox name="选择方式">
-    <NTabs v-model:value="pondRequestContentTypeRef" type="segment" size="small">
-      <NTabPane :name="RequestContentTypeEnum.DEFAULT" tab="普通请求" />
-      <NTabPane :name="RequestContentTypeEnum.SQL" tab="SQL请求" />
-    </NTabs>
-  </SettingItemBox>
-  <SettingItemBox>
-    <DefaultRequestContent
-      v-if="pondRequestContentTypeRef === RequestContentTypeEnum.DEFAULT"
-      v-model:value="pondRequestParamsRef"
-      v-model:request-params-body-type="pondRequestParamsBodyTypeRef"
-    />
-    <SqlConfiguration
-      v-model:value="pondRequestSQLContentRef"
-      v-if="pondRequestContentTypeRef === RequestContentTypeEnum.SQL"
-    />
-  </SettingItemBox>
-</template>

@@ -35,7 +35,7 @@ const openModal = async (flag = true, type: RequestDataTypeEnum) => {
   requestDataType.value = type
   requestDataType.value = type
   showModal.value = flag
   showModal.value = flag
   await nextTick()
   await nextTick()
-  console.log(unref(selectTarget)!.request)
+
   unref(componentConfigurationEl as any)?.setConfigurationData(unref(selectTarget)!.request || {})
   unref(componentConfigurationEl as any)?.setConfigurationData(unref(selectTarget)!.request || {})
   unref(publicInterfaceFormEl as any)?.setConfigurationData(unref(selectTarget)!.request || {})
   unref(publicInterfaceFormEl as any)?.setConfigurationData(unref(selectTarget)!.request || {})
 }
 }
@@ -85,19 +85,20 @@ const sendHandle = async () => {
   }
   }
 }
 }
 
 
+const setRequestKey = (value: Recordable, key: string) => {
+  value[key] =
+    targetData.value.request.requestDataType === RequestDataTypeEnum.AJAX
+      ? (targetData.value.request as unknown as Recordable)[key] ||
+        (chartEditStore.getRequestGlobalConfig as unknown as Recordable)[key]
+      : null
+}
+
 const handleSaveAction = async () => {
 const handleSaveAction = async () => {
   if (!(await validate())) return
   if (!(await validate())) return
-  let value = getResult()
-  value.pondRequestGlobalTokenKey = targetData.value.request.pondRequestGlobalTokenKey
-  value.pondRequestGlobalTokenSuffix = targetData.value.request.pondRequestGlobalTokenSuffix
-  value.pondRequestInterval = targetData.value.request.pondRequestInterval
-  value.pondRequestIntervalUnit=  targetData.value.request.pondRequestIntervalUnit
-  value.pondRequestOriginUrl=  targetData.value.request.pondRequestOriginUrl
-  value.requestVerificationToken =  targetData.value.request.requestVerificationToken
-  value.requestDataPondId =  targetData.value.request.requestDataPondId
-  value.thirdSelectCascaderLabel =  targetData.value.request.thirdSelectCascaderLabel
-  value.requestDataType = targetData.value.request.requestDataType
-  value.publicInterfaceSelectId = targetData.value.request.publicInterfaceSelectId
+  const value = getResult()
+  setRequestKey(value, 'requestTokenSuffix')
+  setRequestKey(value, 'requestTokenKey')
+  setRequestKey(value, 'requestVerificationToken')
   if (unref(selectTarget)) {
   if (unref(selectTarget)) {
     chartEditStore.updateComponentList(chartEditStore.fetchTargetIndex(), {
     chartEditStore.updateComponentList(chartEditStore.fetchTargetIndex(), {
       ...unref(selectTarget)!,
       ...unref(selectTarget)!,