File tree Expand file tree Collapse file tree 2 files changed +15
-3
lines changed Expand file tree Collapse file tree 2 files changed +15
-3
lines changed Original file line number Diff line number Diff line change @@ -280,7 +280,15 @@ export default defineComponent({
280
280
const globalParams = state .globalParams ;
281
281
if (globalParams && globalParams .headers && globalParams .headers .length ) {
282
282
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
+ });
284
292
if (globalParamFind && globalParamFind .value ) {
285
293
item .default = globalParamFind .value ;
286
294
}
@@ -323,7 +331,11 @@ export default defineComponent({
323
331
const globalParams = state .globalParams ;
324
332
if (globalParams && globalParams .params && globalParams .params .length ) {
325
333
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
+ );
327
339
if (globalParamFind && globalParamFind .value ) {
328
340
item .default = globalParamFind .value ;
329
341
}
Original file line number Diff line number Diff line change @@ -156,7 +156,7 @@ export default defineComponent({
156
156
width: 100 ,
157
157
customRender : (e : any ) => {
158
158
const { text } = e ;
159
- return text ? ` ${text } ` : " " ;
159
+ return typeof text == " boolean " ? ` ${text } ` : text ;
160
160
},
161
161
},
162
162
{
You can’t perform that action at this time.
0 commit comments