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

perf(src/views): 优化第三方接口 Token头配置

See merge request yunteng/thingskit-view!267

@@ -102,8 +102,8 @@ const transform: AxiosTransform = {
           }
           }
         } else {
         } else {
           // 第三方接口
           // 第三方接口
-          const authenticationScheme = withThirdTokenPrefix ? withThirdTokenPrefix : null
-          const tokenKey = withThirdTokenKey ? withThirdTokenKey : null
+          const authenticationScheme = !withThirdTokenPrefix ? 'Bearer': withThirdTokenPrefix
+          const tokenKey = withThirdTokenKey ? withThirdTokenKey : 'X-Authorization'
           config.headers![tokenKey!] = withThirdTokenPrefix
           config.headers![tokenKey!] = withThirdTokenPrefix
             ? `${authenticationScheme} ${withThirdTokenString}`
             ? `${authenticationScheme} ${withThirdTokenString}`
             : `${withThirdTokenString}`
             : `${withThirdTokenString}`

@@ -129,7 +129,7 @@ const props = defineProps({
 
 
 const header = ref()
 const header = ref()
 const median = ref<string[]>([])
 const median = ref<string[]>([])
-props.optionData.dataset.dimensions.forEach(item => {
+props.optionData.dataset?.dimensions?.forEach(item => {
   median.value.push(item.title)
   median.value.push(item.title)
 })
 })
 
 
@@ -138,7 +138,7 @@ watch(
   () => props.optionData,
   () => props.optionData,
   () => {
   () => {
     median.value = []
     median.value = []
-    props.optionData.dataset.dimensions.forEach(item => {
+    props.optionData.dataset.dimensions?.forEach(item => {
       median.value.push(item.title)
       median.value.push(item.title)
     })
     })
     header.value = median.value.toString()
     header.value = median.value.toString()
@@ -153,8 +153,10 @@ watch(
 watch([header], ([headerNew], [headerOld]) => {
 watch([header], ([headerNew], [headerOld]) => {
   if (headerNew !== headerOld) {
   if (headerNew !== headerOld) {
     headerNew.split(',').forEach((item: string, index: number) => {
     headerNew.split(',').forEach((item: string, index: number) => {
-      if (index + 1 <= props.optionData.dataset.dimensions.length) {
-        props.optionData.dataset.dimensions[index].title = headerNew.split(',')[index]
+      if(props.optionData.dataset?.dimensions) {
+        if (index + 1 <= props.optionData.dataset.dimensions.length) {
+          props.optionData.dataset.dimensions[index].title = headerNew.split(',')[index]
+        }
       }
       }
     })
     })
   }
   }

@@ -248,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)
 }
 }

@@ -130,11 +130,11 @@ defineExpose({
       </SettingItemBox>
       </SettingItemBox>
       <!-- 针对第三方接口 -->
       <!-- 针对第三方接口 -->
       <SettingItemBox name="配置">
       <SettingItemBox name="配置">
-        <SettingItem name="Token前缀">
-          <n-input v-model:value.trim="pondRequestGlobalTokenSuffixRef" type="text" placeholder="例如：Bearer" />
+        <SettingItem name="请求标头">
+          <n-input v-model:value.trim="pondRequestGlobalTokenKeyRef" type="text" placeholder="默认值: X-Authorization " />
         </SettingItem>
         </SettingItem>
-        <SettingItem name="Token键值">
-          <n-input v-model:value.trim="pondRequestGlobalTokenKeyRef" type="text" placeholder="例如：Token" />
+        <SettingItem name="Token值前缀">
+          <n-input clearable v-model:value.trim="pondRequestGlobalTokenSuffixRef" type="text" placeholder="默认值：Bearer" />
         </SettingItem>
         </SettingItem>
       </SettingItemBox>
       </SettingItemBox>
       <NCollapseTransition :show="collapseHeaderTable">
       <NCollapseTransition :show="collapseHeaderTable">