Merge branch 'master-v32-xwx' into 'master'

拓补视图默认查询非默认拓补



See merge request !848

@@ -491,6 +491,9 @@ layui.define(['common','sessions','commonDetail','mxClient','cascader'], functio
             admin.req({
             admin.req({
                 url: common.domainName + '/api-web/mxgraph/getPage'
                 url: common.domainName + '/api-web/mxgraph/getPage'
                 , type: "get"
                 , type: "get"
+                , data: {
+                    isDefault:1
+                }
                 , done: function (data) {
                 , done: function (data) {
                     var topolist = data.data;
                     var topolist = data.data;
                     if(topolist != null && topolist.length > 0){
                     if(topolist != null && topolist.length > 0){
@@ -712,7 +715,7 @@ layui.define(['common','sessions','commonDetail','mxClient','cascader'], functio
 
 
         //拓扑树组件渲染
         //拓扑树组件渲染
         $.ajax({
         $.ajax({
-            url: common.domainName + '/api-web/mxgraph/getPageByTree?access_token=' + accessToken,
+            url: common.domainName + '/api-web/mxgraph/getPageByTree?isDefault=1&access_token=' + accessToken,
             type: 'get',
             type: 'get',
             success: function (res) {
             success: function (res) {
                 if (res && res.data) {
                 if (res && res.data) {
@@ -736,4 +739,4 @@ layui.define(['common','sessions','commonDetail','mxClient','cascader'], functio
         })
         })
 
 
     });
     });
-});
+});