File tree Expand file tree Collapse file tree 2 files changed +16
-2
lines changed Expand file tree Collapse file tree 2 files changed +16
-2
lines changed Original file line number Diff line number Diff line change @@ -320,23 +320,29 @@ export default defineComponent({
320
320
sendRequest (url , formData );
321
321
} else if (props .detail .paramType == " route" ) {
322
322
// 路由参数,将参数拼接到url中
323
+ let params: any = {};
323
324
state .paramFormData .forEach ((item ) => {
324
325
const placeholderKeys = [
325
326
` :${item .name } ` ,
326
327
` <${item .name }> ` ,
327
328
` <${item .name }?> ` ,
328
329
` [:${item .name }] ` ,
329
330
];
331
+ let isReplace = false ;
330
332
for (let i = 0 ; i < placeholderKeys .length ; i ++ ) {
331
333
const key = placeholderKeys [i ];
332
334
if (url .indexOf (key ) > - 1 ) {
333
335
const reg = new RegExp (key , " g" );
334
336
const value: any = item .default ;
335
337
url = url .replace (reg , value );
338
+ isReplace = true ;
336
339
}
337
340
}
341
+ if (! isReplace ) {
342
+ params [item .name ] = item .default ;
343
+ }
338
344
});
339
- sendRequest (url );
345
+ sendRequest (url , params );
340
346
} else if (state .paramCode as string ) {
341
347
try {
342
348
const paramJson = eval (" (" + state .paramCode + " )" );
@@ -365,7 +371,7 @@ export default defineComponent({
365
371
});
366
372
}
367
373
// 合并全局请求参数
368
- if (globalParams && globalParams .params && globalParams .params .length ) {
374
+ if (data && globalParams && globalParams .params && globalParams .params .length ) {
369
375
globalParams .params .forEach ((item ) => {
370
376
if (! data [item .name ]) {
371
377
data [item .name ] = item .value ;
Original file line number Diff line number Diff line change 63
63
defaultExpandAllRows
64
64
childrenColumnName =" children"
65
65
>
66
+ <template #rowDesc =" { text , record } " >
67
+ <div >
68
+ <span v-html =" textToHtml(text)" ></span >  ;  ;
69
+ <a v-if =" record.md || record.mdRef" @click =" onShowMdDetail(record)" >{{
70
+ t("common.view")
71
+ }}</a >
72
+ </div >
73
+ </template >
66
74
</Table >
67
75
</div >
68
76
</div >
You can’t perform that action at this time.
0 commit comments