Merge branch 'perf/third-interface-05-23' into 'main_dev'

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

See merge request yunteng/thingskit-view!265

@@ -159,4 +159,7 @@ export const getAlarmList = (params?: object) =>
   defHttp.get({
   defHttp.get({
     url: Api.ALARM_LIST,
     url: Api.ALARM_LIST,
     params
     params
+  },
+  {
+    withShareToken: true
   })
   })

@@ -4,6 +4,7 @@ import { RequestConfigType } from '@/store/modules/chartEditStore/chartEditStore
 import { isShareMode } from '@/views/share/hook'
 import { isShareMode } from '@/views/share/hook'
 import { customHttp } from './http'
 import { customHttp } from './http'
 import { SelectTimeAggregationFieldEnum } from '@/views/chart/ContentConfigurations/components/ChartData/external/components/SelectTImeAggregation'
 import { SelectTimeAggregationFieldEnum } from '@/views/chart/ContentConfigurations/components/ChartData/external/components/SelectTImeAggregation'
+import { useChartEditStore } from '@/store/modules/chartEditStore/chartEditStore'
 
 
 export enum ParamsType {
 export enum ParamsType {
   REQUIRED,
   REQUIRED,
@@ -146,8 +147,11 @@ export const customRequest = async (request: RequestConfigType) => {
     pondRequestOriginUrl,
     pondRequestOriginUrl,
     pondRequestGlobalTokenKey,
     pondRequestGlobalTokenKey,
     pondRequestGlobalTokenSuffix,
     pondRequestGlobalTokenSuffix,
-    
   } = request as ExtraRequestConfigType
   } = request as ExtraRequestConfigType
+  const chartEditStore = useChartEditStore()
+  
+  const {requestOriginUrl: globalRequestOriginUrl} = chartEditStore.getRequestGlobalConfig
+
   let { requestUrl } = request as ExtraRequestConfigType
   let { requestUrl } = request as ExtraRequestConfigType
   const { Header, Body } = requestParams
   const { Header, Body } = requestParams
   let { Params } = requestParams
   let { Params } = requestParams
@@ -171,7 +175,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 ? pondRequestOriginUrl : globalRequestOriginUrl ? globalRequestOriginUrl : getOriginUrl(requestOriginUrl!),
       method: requestHttpType,
       method: requestHttpType,
       params: requestHttpType === RequestHttpEnum.GET.toUpperCase() ? Params : null,
       params: requestHttpType === RequestHttpEnum.GET.toUpperCase() ? Params : null,
       data: body,
       data: body,
@@ -180,7 +184,8 @@ export const customRequest = async (request: RequestConfigType) => {
     {
     {
       joinPrefix: false,
       joinPrefix: false,
       apiUrl: '',
       apiUrl: '',
-      withShareToken: isShareMode(),
+      withToken:true,
+      withShareToken: !requestVerificationToken ? isShareMode(): false,
       withThirdTokenString: requestVerificationToken,
       withThirdTokenString: requestVerificationToken,
       withThirdTokenKey: pondRequestGlobalTokenKey,
       withThirdTokenKey: pondRequestGlobalTokenKey,
       withThirdTokenPrefix: pondRequestGlobalTokenSuffix
       withThirdTokenPrefix: pondRequestGlobalTokenSuffix

@@ -236,11 +236,10 @@ export interface RequestConfigType extends RequestPublicConfigType {
    pondRequestGlobalTokenKey?: string
    pondRequestGlobalTokenKey?: string
    pondRequestGlobalCascaderOption?: Recordable
    pondRequestGlobalCascaderOption?: Recordable
    pondRequestGlobalCascaderKey?: string
    pondRequestGlobalCascaderKey?: string
-   pondRequestHttpType?: string
+   pondRequestHttpType?: RequestHttpEnum
    pondRequestInterval?: number
    pondRequestInterval?: number
    pondRequestIntervalUnit?: string
    pondRequestIntervalUnit?: string
    pondRequestContentType?: number
    pondRequestContentType?: number
-   pondRequestHttpType?: string
    pondRequestParams?: RequestParams
    pondRequestParams?: RequestParams
    pondRequestParamsBodyType?: RequestBodyEnum
    pondRequestParamsBodyType?: RequestBodyEnum
    pondRequestUrl?: string
    pondRequestUrl?: string
@@ -250,6 +249,7 @@ export interface RequestConfigType extends RequestPublicConfigType {
   thirdTokenIsExp?: boolean
   thirdTokenIsExp?: boolean
   thirdSelectCascaderLabel?: string
   thirdSelectCascaderLabel?: string
   publicInterfaceSelectId?: string
   publicInterfaceSelectId?: string
+  thirdRequestDataPondId?: string
 }
 }
 
 
 // Store 类型
 // Store 类型

@@ -52,58 +52,58 @@
           <setting-item name="配置类型">
           <setting-item name="配置类型">
             <n-input
             <n-input
               size="small"
               size="small"
-              :placeholder="targetData && requestContentTypeObj[requestContentType]"
+              :placeholder="targetData && requestContentTypeObj[pondRequestContentType!]"
               :disabled="true"
               :disabled="true"
             ></n-input>
             ></n-input>
           </setting-item>
           </setting-item>
-          <setting-item name="body 类型" v-if="requestContentType === RequestContentTypeEnum.DEFAULT">
+          <setting-item name="body 类型" v-if="pondRequestContentType === RequestContentTypeEnum.DEFAULT">
             <n-input size="small" :placeholder="targetData && requestParamsBodyType" :disabled="true"></n-input>
             <n-input size="small" :placeholder="targetData && requestParamsBodyType" :disabled="true"></n-input>
           </setting-item>
           </setting-item>
         </setting-item-box>
         </setting-item-box>
-        <div v-if="requestContentType === RequestContentTypeEnum.DEFAULT">
+        <div v-if="pondRequestContentType === RequestContentTypeEnum.DEFAULT">
           <n-tabs type="line" animated v-model:value="tabValue">
           <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-tab v-for="item in RequestParamsTypeEnum" :key="item" :name="item" :tab="item"> {{ item }} </n-tab>
           </n-tabs>
           </n-tabs>
           <!-- 各个页面 -->
           <!-- 各个页面 -->
           <div class="go-mt-3">
           <div class="go-mt-3">
             <div v-if="tabValue !== RequestParamsTypeEnum.BODY">
             <div v-if="tabValue !== RequestParamsTypeEnum.BODY">
-              <display-table class="go-my-3" :target="requestParams[tabValue]"> </display-table>
+              <display-table class="go-my-3" :target="pondRequestParams![tabValue]"> </display-table>
             </div>
             </div>
 
 
             <!-- 选择了 body -->
             <!-- 选择了 body -->
             <div v-else>
             <div v-else>
               <!-- 为 none 时 -->
               <!-- 为 none 时 -->
-              <n-card class="go-mt-3 go-pb-3" v-if="requestParamsBodyType === RequestBodyEnum['NONE']">
+              <n-card class="go-mt-3 go-pb-3" v-if="pondRequestParamsBodyType === RequestBodyEnum['NONE']">
                 <n-text depth="3">该接口没有 Body 体</n-text>
                 <n-text depth="3">该接口没有 Body 体</n-text>
               </n-card>
               </n-card>
 
 
               <!-- 具有对象属性时 -->
               <!-- 具有对象属性时 -->
               <template
               <template
                 v-else-if="
                 v-else-if="
-                  requestParamsBodyType === RequestBodyEnum['FORM_DATA'] ||
-                  requestParamsBodyType === RequestBodyEnum['X_WWW_FORM_URLENCODED']
+                  pondRequestParamsBodyType === RequestBodyEnum['FORM_DATA'] ||
+                  pondRequestParamsBodyType === RequestBodyEnum['X_WWW_FORM_URLENCODED']
                 "
                 "
               >
               >
                 <display-table
                 <display-table
                   class="go-my-3"
                   class="go-my-3"
-                  :target="requestParams[RequestParamsTypeEnum.BODY][requestParamsBodyType]"
+                  :target="pondRequestParams![RequestParamsTypeEnum.BODY][pondRequestParamsBodyType]"
                 ></display-table>
                 ></display-table>
               </template>
               </template>
 
 
               <!-- json  -->
               <!-- json  -->
-              <template v-else-if="requestParamsBodyType === RequestBodyEnum['JSON']">
+              <template v-else-if="pondRequestParamsBodyType === RequestBodyEnum['JSON']">
                 <n-card size="small" style="padding-bottom: 7px">
                 <n-card size="small" style="padding-bottom: 7px">
                   <n-code
                   <n-code
-                    :code="requestParams[RequestParamsTypeEnum.BODY][requestParamsBodyType] || '暂无内容'"
+                    :code="pondRequestParams![RequestParamsTypeEnum.BODY][pondRequestParamsBodyType] || '暂无内容'"
                     language="json"
                     language="json"
                   ></n-code>
                   ></n-code>
                 </n-card>
                 </n-card>
               </template>
               </template>
 
 
               <!-- xml  -->
               <!-- xml  -->
-              <template v-else-if="requestParamsBodyType === RequestBodyEnum['XML']">
+              <template v-else-if="pondRequestParamsBodyType === RequestBodyEnum['XML']">
                 <n-code
                 <n-code
-                  :code="requestParams[RequestParamsTypeEnum.BODY][requestParamsBodyType] || ''"
+                  :code="pondRequestParams![RequestParamsTypeEnum.BODY][pondRequestParamsBodyType!] || ''"
                   language="html"
                   language="html"
                 ></n-code>
                 ></n-code>
               </template>
               </template>
@@ -127,7 +127,6 @@
 <script setup lang="ts">
 <script setup lang="ts">
 import { PropType, ref, toRefs } from 'vue'
 import { PropType, ref, toRefs } from 'vue'
 import { icon } from '@/plugins'
 import { icon } from '@/plugins'
-import { MonacoEditor } from '@/components/Pages/MonacoEditor'
 import { SettingItemBox, SettingItem } from '@/components/Pages/ChartItemSetting'
 import { SettingItemBox, SettingItem } from '@/components/Pages/ChartItemSetting'
 import { RequestDataPondItemType, RequestGlobalConfigType } from '@/store/modules/chartEditStore/chartEditStore.d'
 import { RequestDataPondItemType, RequestGlobalConfigType } from '@/store/modules/chartEditStore/chartEditStore.d'
 import displayTable from './displayTable.vue'
 import displayTable from './displayTable.vue'
@@ -136,8 +135,6 @@ import {
   RequestParamsTypeEnum,
   RequestParamsTypeEnum,
   SelectHttpTimeNameObj,
   SelectHttpTimeNameObj,
   RequestContentTypeEnum,
   RequestContentTypeEnum,
-  RequestBodyEnumList,
-  RequestParamsObjType
 } from '@/enums/httpEnum'
 } from '@/enums/httpEnum'
 
 
 const props = defineProps({
 const props = defineProps({
@@ -145,45 +142,28 @@ const props = defineProps({
   targetData: Object as PropType<RequestDataPondItemType>
   targetData: Object as PropType<RequestDataPondItemType>
 })
 })
 
 
-const { HelpOutlineIcon, FlashIcon, PulseIcon } = icon.ionicons5
+const { FlashIcon, PulseIcon } = icon.ionicons5
+
 const {
 const {
-  requestUrl,
   requestInterval,
   requestInterval,
-  requestHttpType,
-  requestContentType,
   requestSQLContent,
   requestSQLContent,
-  requestParams,
   requestParamsBodyType,
   requestParamsBodyType,
   requestIntervalUnit,
   requestIntervalUnit,
   pondRequestOriginUrl,
   pondRequestOriginUrl,
   pondRequestUrl,
   pondRequestUrl,
-  pondRequestHttpType
+  pondRequestHttpType,
+  pondRequestContentType,
+  pondRequestParamsBodyType,
+  pondRequestParams,
 } = toRefs((props.targetData as RequestDataPondItemType).dataPondRequestConfig)
 } = toRefs((props.targetData as RequestDataPondItemType).dataPondRequestConfig)
-const tabs = [RequestParamsTypeEnum.HEADER]
+
 const requestContentTypeObj = {
 const requestContentTypeObj = {
   [RequestContentTypeEnum.DEFAULT]: '普通请求',
   [RequestContentTypeEnum.DEFAULT]: '普通请求',
   [RequestContentTypeEnum.SQL]: 'SQL 请求'
   [RequestContentTypeEnum.SQL]: 'SQL 请求'
-}
-const tabValue = ref<RequestParamsTypeEnum>(RequestParamsTypeEnum.PARAMS)
+} as Recordable
 
 
-// 更新参数表格数据
-const updateRequestParams = (paramsObj: RequestParamsObjType) => {
-  if (tabValue.value !== RequestParamsTypeEnum.BODY) {
-    requestParams.value[tabValue.value] = paramsObj
-  }
-}
+const tabValue = ref<RequestParamsTypeEnum>(RequestParamsTypeEnum.PARAMS)
 
 
-// 更新参数表格数据
-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>
 </script>
 
 
 <style lang="scss" scoped>
 <style lang="scss" scoped>

 <template>
 <template>
-  <n-modal class="go-chart-data-pond-control"  v-model:show="modelShowRef" :mask-closable="false">
+  <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">
     <n-card :bordered="false" role="dialog" size="small" aria-modal="true" style="width: 900px; height: 650px">
       <template #header></template>
       <template #header></template>
       <template #header-extra> </template>
       <template #header-extra> </template>
@@ -57,7 +57,7 @@ import { icon } from '@/plugins'
 import { getUUID, goDialog } from '@/utils'
 import { getUUID, goDialog } from '@/utils'
 import { cloneDeep } from 'lodash'
 import { cloneDeep } from 'lodash'
 
 
-const props = defineProps({
+defineProps({
   modelShow: Boolean
   modelShow: Boolean
 })
 })
 
 
@@ -71,8 +71,6 @@ const { requestDataPond } = toRefs(chartEditStore.getRequestGlobalConfig)
 
 
 const requestShow = ref(false)
 const requestShow = ref(false)
 
 
-const modelShowRef = ref(false)
-
 const loading = ref(false)
 const loading = ref(false)
 
 
 const isEdit = ref(false)
 const isEdit = ref(false)
@@ -89,14 +87,6 @@ const pondData = computed(() => {
   return data[0]
   return data[0]
 })
 })
 
 
-watch(() => props.modelShow, (newValue) => {
-  if (newValue) {
-    modelShowRef.value = true
-  } else {
-    modelShowRef.value = false
-  }
-})
-
 const cacheEditData = ref<RequestDataPondItemType>()
 const cacheEditData = ref<RequestDataPondItemType>()
 
 
 watch(
 watch(
@@ -258,10 +248,10 @@ const deletePond = (targetData: RequestDataPondItemType) => {
 const closeHandle = () => {
 const closeHandle = () => {
   // 将所选内容赋值给对象
   // 将所选内容赋值给对象
   if (pondData.value) {
   if (pondData.value) {
-    targetData.value.request = {
-      ...toRaw(pondData.value.dataPondRequestConfig),
-      requestDataPondId: pondData.value.dataPondId
-    }
+    // targetData.value.request = {
+    //   ...toRaw(pondData.value.dataPondRequestConfig),
+    //   requestDataPondId: pondData.value.dataPondId
+    // }
   }
   }
   emit('update:modelShow', false)
   emit('update:modelShow', false)
 }
 }

@@ -18,7 +18,7 @@ import {
   CascaderOption,
   CascaderOption,
   NCascader,
   NCascader,
 } from 'naive-ui'
 } from 'naive-ui'
-import { computed, onMounted, reactive, ref, unref } from 'vue'
+import { computed, onMounted, reactive, ref, unref, watch } 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'
@@ -109,7 +109,7 @@ const handleSelectGlobalPond = (_:string, options:RequestDataPondItemType & {lab
   targetData.value.request.requestDataPondId = options.dataPondId
   targetData.value.request.requestDataPondId = options.dataPondId
   getTokenString.value =''
   getTokenString.value =''
   resOptions.value = []
   resOptions.value = []
-  resValue.value=null
+  resValue.value = null
   handleExecuteRequest()
   handleExecuteRequest()
 }
 }
 
 
@@ -126,6 +126,7 @@ const handleExecuteRequest = async () => {
       }
       }
       const res = await customThirdInterfaceRequest(request as unknown as thirdInterfaceRequest)
       const res = await customThirdInterfaceRequest(request as unknown as thirdInterfaceRequest)
       resOptions.value = convertToCascadingData(res) as unknown as CascaderOption[]
       resOptions.value = convertToCascadingData(res) as unknown as CascaderOption[]
+      resValue.value = targetData.value?.request?.thirdSelectCascaderLabel
     }
     }
   } catch (e) {
   } catch (e) {
     getTokenString.value = JSON.stringify(e) as string
     getTokenString.value = JSON.stringify(e) as string

@@ -173,11 +173,11 @@ const props = withDefaults(
 
 
 const emit = defineEmits(['update:value'])
 const emit = defineEmits(['update:value'])
 
 
-const createNewRow = () => {
-  return { id: getUUID(), result: true } as DataSource
+const createNewRow = (index?: number) => {
+  return { id: getUUID(), result: true, indexName: index, typeName: DataTypeEnum.DATA_INPUT } as DataSource
 }
 }
 
 
-const dataSource = ref<DataSource[]>([createNewRow()])
+const dataSource = ref<DataSource[]>([createNewRow(0)])
 
 
 const blurFlag = ref(false)
 const blurFlag = ref(false)
 
 
@@ -187,7 +187,7 @@ watch(
     if (target && isObject(target) && Object.keys(target).length) {
     if (target && isObject(target) && Object.keys(target).length) {
       if (blurFlag.value) return
       if (blurFlag.value) return
       dataSource.value = Object.keys(props.value || {}).map((keyName, keyIndex) => ({
       dataSource.value = Object.keys(props.value || {}).map((keyName, keyIndex) => ({
-        ...createNewRow(),
+        ...createNewRow(keyIndex),
         keyName,
         keyName,
         indexName: keyIndex,
         indexName: keyIndex,
         typeName: isArray(props.value![keyName]) ? DataTypeEnum.DATA_RANGE : DataTypeEnum.DATA_INPUT,
         typeName: isArray(props.value![keyName]) ? DataTypeEnum.DATA_RANGE : DataTypeEnum.DATA_INPUT,
@@ -207,12 +207,15 @@ const canAddRow = computed(() => {
 
 
 const handleAddRow = (record: DataSource) => {
 const handleAddRow = (record: DataSource) => {
   const index = unref(dataSource).findIndex(item => item.id === record.id)
   const index = unref(dataSource).findIndex(item => item.id === record.id)
-  unref(dataSource).splice(index + 1, 0, createNewRow())
+  unref(dataSource).splice(index + 1, 0, createNewRow(index + 1))
 }
 }
 
 
 const handleSubtractRow = (record: DataSource) => {
 const handleSubtractRow = (record: DataSource) => {
   const index = unref(dataSource).findIndex(item => item.id === record.id)
   const index = unref(dataSource).findIndex(item => item.id === record.id)
   if (unref(dataSource).length === 1) {
   if (unref(dataSource).length === 1) {
+    unref(dataSource)[0].keyName = ''
+    unref(dataSource)[0].value = ''
+    unref(dataSource)[0].dateRange = []
     emit('update:value', {})
     emit('update:value', {})
   } else {
   } else {
     unref(dataSource).splice(index, 1)
     unref(dataSource).splice(index, 1)

@@ -115,6 +115,7 @@ const onEsc = () => {
 
 
 onMounted(()=>{
 onMounted(()=>{
   pondPublicConfigurationRef?.value?.setConfigurationData(targetData.value.request)
   pondPublicConfigurationRef?.value?.setConfigurationData(targetData.value.request)
+  pondRequestConfigurationRef?.value?.setConfigurationData(targetData.value.request)
 })
 })
 </script>
 </script>