Skip to content

Commit 898c160

Browse files
committed
修正boolean类型显示异常,修正多应用同样的全局参数取值不正确问题
1 parent 11905db commit 898c160

File tree

2 files changed

+15
-3
lines changed

2 files changed

+15
-3
lines changed

src/views/apiDetail/debug/Index.vue

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -280,7 +280,15 @@ export default defineComponent({
280280
const globalParams = state.globalParams;
281281
if (globalParams && globalParams.headers && globalParams.headers.length) {
282282
return data.map((item) => {
283-
const globalParamFind = globalParams.headers.find((p) => p.name === item.name);
283+
const globalParamFind = globalParams.headers.find((p) => {
284+
if (
285+
p.name === item.name &&
286+
(!p.appKey || p.appKey === "global" || p.appKey === state.appKey)
287+
) {
288+
return true;
289+
}
290+
return false;
291+
});
284292
if (globalParamFind && globalParamFind.value) {
285293
item.default = globalParamFind.value;
286294
}
@@ -323,7 +331,11 @@ export default defineComponent({
323331
const globalParams = state.globalParams;
324332
if (globalParams && globalParams.params && globalParams.params.length) {
325333
res = data.map((item) => {
326-
const globalParamFind = globalParams.params.find((p) => p.name === item.name);
334+
const globalParamFind = globalParams.params.find(
335+
(p) =>
336+
p.name === item.name &&
337+
(!p.appKey || p.appKey === "global" || p.appKey === state.appKey)
338+
);
327339
if (globalParamFind && globalParamFind.value) {
328340
item.default = globalParamFind.value;
329341
}

src/views/apiDetail/tableTab.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ export default defineComponent({
156156
width: 100,
157157
customRender: (e: any) => {
158158
const { text } = e;
159-
return text ? `${text}` : "";
159+
return typeof text == "boolean" ? `${text}` : text;
160160
},
161161
},
162162
{

0 commit comments

Comments
 (0)