Merge branch release/21.7.8 of zentao/zentaopms (#13070)

lib/zin/wg/docapp/js/v1.js

@@ -95,16 +95,18 @@ function getZentaoListProps(type, blockID, props)
     const zentaoListLang = getLang('zentaoList');
     const exportUrl = `${location.origin}${$.createLink('doc', 'ajaxExportZentaoList', `blockID=${blockID}`)}`;
     const title = [(zentaoListLang ? zentaoListLang[type] : type), getLang('list')].join(config.clientLang.includes('zh') ? '' : ' ');
-    return $.extend(
+    const fetcher = `${location.origin}${$.createLink('doc', 'zentaoList', `type=${type}&blockID=${blockID}`)}`;
+    return $.extend({}, props,
     {
         title: title,
-        fetcher: $.createLink('doc', 'zentaoList', `type=${type}&blockID=${blockID}`),
+        fetcher: fetcher,
         clearBeforeLoad: false
     }, type === 'gantt' ? {
+        fetcher: fetcher,
         export: [{type: 'link', props: {text: title, href: exportUrl}}]
     } : {
         exportUrl: exportUrl,
-    }, props);
+    });
 }
 
 /* 更新禅道列表。*/
@@ -2343,8 +2345,8 @@ function handleImportDocSnapshot(snapshot)
     const fixUrl = (url, method, paramList) =>
     {
         const link = $.parseLink(url, 'auto');
-        if(link.requestType.toUpperCase() === requestType || method.toLowerCase() !== link.methodName.toLowerCase()) return url;
-        return $.createLink('doc', method, paramList.map((p, i) => [p, link.vars[i][1]]));
+        if(link.requestType.toUpperCase() === requestType || method.toLowerCase() !== link.methodName.toLowerCase()) return url
+        return `${location.origin}${$.createLink('doc', method, paramList.map((p, i) => [p, link.vars[i][1]]))}`;
     };
     /* Fix custom block with fetcher in difference request type. */
     forEachBlock(snapshot.blocks.children, block =>