Showing
4 changed files
with
16 additions
and
14 deletions
| ... | ... | @@ -102,8 +102,8 @@ const transform: AxiosTransform = { |
| 102 | 102 | } |
| 103 | 103 | } else { |
| 104 | 104 | // 第三方接口 |
| 105 | - const authenticationScheme = withThirdTokenPrefix ? withThirdTokenPrefix : null | |
| 106 | - const tokenKey = withThirdTokenKey ? withThirdTokenKey : null | |
| 105 | + const authenticationScheme = !withThirdTokenPrefix ? 'Bearer': withThirdTokenPrefix | |
| 106 | + const tokenKey = withThirdTokenKey ? withThirdTokenKey : 'X-Authorization' | |
| 107 | 107 | config.headers![tokenKey!] = withThirdTokenPrefix |
| 108 | 108 | ? `${authenticationScheme} ${withThirdTokenString}` |
| 109 | 109 | : `${withThirdTokenString}` | ... | ... |
| ... | ... | @@ -129,7 +129,7 @@ const props = defineProps({ |
| 129 | 129 | |
| 130 | 130 | const header = ref() |
| 131 | 131 | const median = ref<string[]>([]) |
| 132 | -props.optionData.dataset.dimensions.forEach(item => { | |
| 132 | +props.optionData.dataset?.dimensions?.forEach(item => { | |
| 133 | 133 | median.value.push(item.title) |
| 134 | 134 | }) |
| 135 | 135 | |
| ... | ... | @@ -138,7 +138,7 @@ watch( |
| 138 | 138 | () => props.optionData, |
| 139 | 139 | () => { |
| 140 | 140 | median.value = [] |
| 141 | - props.optionData.dataset.dimensions.forEach(item => { | |
| 141 | + props.optionData.dataset.dimensions?.forEach(item => { | |
| 142 | 142 | median.value.push(item.title) |
| 143 | 143 | }) |
| 144 | 144 | header.value = median.value.toString() |
| ... | ... | @@ -153,8 +153,10 @@ watch( |
| 153 | 153 | watch([header], ([headerNew], [headerOld]) => { |
| 154 | 154 | if (headerNew !== headerOld) { |
| 155 | 155 | headerNew.split(',').forEach((item: string, index: number) => { |
| 156 | - if (index + 1 <= props.optionData.dataset.dimensions.length) { | |
| 157 | - props.optionData.dataset.dimensions[index].title = headerNew.split(',')[index] | |
| 156 | + if(props.optionData.dataset?.dimensions) { | |
| 157 | + if (index + 1 <= props.optionData.dataset.dimensions.length) { | |
| 158 | + props.optionData.dataset.dimensions[index].title = headerNew.split(',')[index] | |
| 159 | + } | |
| 158 | 160 | } |
| 159 | 161 | }) |
| 160 | 162 | } | ... | ... |
| ... | ... | @@ -248,10 +248,10 @@ const deletePond = (targetData: RequestDataPondItemType) => { |
| 248 | 248 | const closeHandle = () => { |
| 249 | 249 | // 将所选内容赋值给对象 |
| 250 | 250 | if (pondData.value) { |
| 251 | - // targetData.value.request = { | |
| 252 | - // ...toRaw(pondData.value.dataPondRequestConfig), | |
| 253 | - // requestDataPondId: pondData.value.dataPondId | |
| 254 | - // } | |
| 251 | + targetData.value.request = { | |
| 252 | + ...toRaw(pondData.value.dataPondRequestConfig), | |
| 253 | + requestDataPondId: pondData.value.dataPondId | |
| 254 | + } | |
| 255 | 255 | } |
| 256 | 256 | emit('update:modelShow', false) |
| 257 | 257 | } | ... | ... |
| ... | ... | @@ -130,11 +130,11 @@ defineExpose({ |
| 130 | 130 | </SettingItemBox> |
| 131 | 131 | <!-- 针对第三方接口 --> |
| 132 | 132 | <SettingItemBox name="配置"> |
| 133 | - <SettingItem name="Token前缀"> | |
| 134 | - <n-input v-model:value.trim="pondRequestGlobalTokenSuffixRef" type="text" placeholder="例如:Bearer" /> | |
| 133 | + <SettingItem name="请求标头"> | |
| 134 | + <n-input v-model:value.trim="pondRequestGlobalTokenKeyRef" type="text" placeholder="默认值: X-Authorization " /> | |
| 135 | 135 | </SettingItem> |
| 136 | - <SettingItem name="Token键值"> | |
| 137 | - <n-input v-model:value.trim="pondRequestGlobalTokenKeyRef" type="text" placeholder="例如:Token" /> | |
| 136 | + <SettingItem name="Token值前缀"> | |
| 137 | + <n-input clearable v-model:value.trim="pondRequestGlobalTokenSuffixRef" type="text" placeholder="默认值:Bearer" /> | |
| 138 | 138 | </SettingItem> |
| 139 | 139 | </SettingItemBox> |
| 140 | 140 | <NCollapseTransition :show="collapseHeaderTable"> | ... | ... |