Merge branch 'master-500-dev-xwx' into 'master-500-dev'

拓补视图-【1093】-新增数据无法保存



See merge request !1007

@@ -144,98 +144,96 @@ layui.define(['form', 'admin', 'layer', 'common', 'sessions', 'xmSelect', 'resli
         //保存
         $("#jgraph-form-save-id").on("click", function (e, flag) {
             //当flag为true,为保存并设计，当flag为false时，为保存
-            form.on('submit(form-grapheditor)', function () {
-                var topoTitle = $("#jgraph_topo_name").val();
-                if (!topoTitle) {
-                    layer.msg('请输入拓扑名称！', {icon: 7, time: 3000});
-                    return false;
-                }
-                //获取Users值
-                var userflag = 0;
-                //新增时必须用户授权包换登录用户的
-                if (id) {
-                    userflag = 1;
-                }
-                var userNow = localStorage.getItem("lgn");
-                var topoUsers = [];
-                var selectedUsers = xmSelectUsers.getValue();
-                if (selectedUsers != null && selectedUsers.length > 0) {
-                    $.each(selectedUsers, function (i, v) {
-                        if (v.value == userNow) {
-                            userflag = 1;
-                        }
-                        topoUsers.push(v.value + "#" + v.name);
-                    });
-                }
-                if (userflag == 0) {
-                    layer.msg('保存失败,用户权限必须包含当前登录账户!', {icon: 2, time: 3000});
-                    return false;
-                }
-                //获取Roles值
-                var topoRoles = [];
-                var isExistAdmin = false;
-                var selectedRoles = xmSelectRoles.getValue();
-                if (selectedRoles != null && selectedRoles.length > 0) {
-                    $.each(selectedRoles, function (i, v) {
-                        topoRoles.push(v.value + "#" + v.roleName);
-                        if (v.code == 'ADMIN') {
-                            isExistAdmin = true;
-                        }
-                    });
-                }
-                // 必须要选管理员
-                if (!isExistAdmin) {
-                    layer.msg('保存失败,角色必须包含当管理员权限（ADMIN）!', {icon: 2, time: 3000});
-                    return false;
-                }
+            var topoTitle = $("#jgraph_topo_name").val();
+            if (!topoTitle) {
+                layer.msg('请输入拓扑名称！', {icon: 7, time: 3000});
+                return false;
+            }
+            //获取Users值
+            var userflag = 0;
+            //新增时必须用户授权包换登录用户的
+            if (id) {
+                userflag = 1;
+            }
+            var userNow = localStorage.getItem("lgn");
+            var topoUsers = [];
+            var selectedUsers = xmSelectUsers.getValue();
+            if (selectedUsers != null && selectedUsers.length > 0) {
+                $.each(selectedUsers, function (i, v) {
+                    if (v.value == userNow) {
+                        userflag = 1;
+                    }
+                    topoUsers.push(v.value + "#" + v.name);
+                });
+            }
+            if (userflag == 0) {
+                layer.msg('保存失败,用户权限必须包含当前登录账户!', {icon: 2, time: 3000});
+                return false;
+            }
+            //获取Roles值
+            var topoRoles = [];
+            var isExistAdmin = false;
+            var selectedRoles = xmSelectRoles.getValue();
+            if (selectedRoles != null && selectedRoles.length > 0) {
+                $.each(selectedRoles, function (i, v) {
+                    topoRoles.push(v.value + "#" + v.roleName);
+                    if (v.code == 'ADMIN') {
+                        isExistAdmin = true;
+                    }
+                });
+            }
+            // 必须要选管理员
+            if (!isExistAdmin) {
+                layer.msg('保存失败,角色必须包含当管理员权限（ADMIN）!', {icon: 2, time: 3000});
+                return false;
+            }
 
 
-                var targetId = '';
-                var topoType = $("#jgraph-topo_type").val();//拓扑类型
-                if (topoType && topoType === '1') {//业务拓扑
-                    targetId = bizId;
-                }
-                if (topoType && topoType === '2') {//资源拓扑
-                    targetId = $("#jgraph-topo_resid").val();
-                }
-                if (topoType && topoType === '4') {//机房拓扑
-                    targetId = $("#jgraph-topo_room").val();
-                }
-                var jtopo = {
-                    topoName: topoTitle, //拓扑名称
-                    jtopoId: $("#jgraph-topoId").val(),
-                    isDefault: $('input[name="isDefault"]:checked').val(), //是否默认，0否 1是
-                    topoType: topoType,
-                    targetId: targetId,
-                    userIds: topoUsers.toString(),
-                    roleIds: topoRoles.toString(),
-                    remark: $("#jgraph_remark").val(),
-                };
-                admin.req({
-                    url: common.domainName + '/api-web/mxgraph/save?access_token=' + access_token
-                    , type: 'post'
-                    , async: false
-                    , contentType: "application/json;charset=UTF-8"//指定消息请求类型
-                    , data: JSON.stringify(jtopo)
-                }).done(function (res) {
-                    if (res.success) {
-                        layer.msg('保存成功', {icon: 1, time: 2000}, function () {
-                            layer.closeAll()
-                            if (flag) {
-                                if (!id) {
-                                    id = res.str;
-                                }
-                                //http://192.168.0.247:8085
-                                var url = common.graphEditorOrigin + "/jgraph/grapheditor/index.html?access_token=" + access_token + '&id=' + id;
-                                window.open(url);
+            var targetId = '';
+            var topoType = $("#jgraph-topo_type").val();//拓扑类型
+            if (topoType && topoType === '1') {//业务拓扑
+                targetId = bizId;
+            }
+            if (topoType && topoType === '2') {//资源拓扑
+                targetId = $("#jgraph-topo_resid").val();
+            }
+            if (topoType && topoType === '4') {//机房拓扑
+                targetId = $("#jgraph-topo_room").val();
+            }
+            var jtopo = {
+                topoName: topoTitle, //拓扑名称
+                jtopoId: $("#jgraph-topoId").val(),
+                isDefault: $('input[name="isDefault"]:checked').val(), //是否默认，0否 1是
+                topoType: topoType,
+                targetId: targetId,
+                userIds: topoUsers.toString(),
+                roleIds: topoRoles.toString(),
+                remark: $("#jgraph_remark").val(),
+            };
+            admin.req({
+                url: common.domainName + '/api-web/mxgraph/save?access_token=' + access_token
+                , type: 'post'
+                , async: false
+                , contentType: "application/json;charset=UTF-8"//指定消息请求类型
+                , data: JSON.stringify(jtopo)
+            }).done(function (res) {
+                if (res.success) {
+                    layer.msg('保存成功', {icon: 1, time: 2000}, function () {
+                        layer.closeAll()
+                        if (flag) {
+                            if (!id) {
+                                id = res.str;
                             }
-                        });
-                    } else {
-                        layer.msg('拓扑保存失败，请与管理员联系！', {icon: 7, time: 3000});
-                    }
-                });
-                return false;//必须要写，解决禁用submit提交，ajax方法才能正确执行，且表单不会自动刷新
-            })
+                            //http://192.168.0.247:8085
+                            var url = common.graphEditorOrigin + "/jgraph/grapheditor/index.html?access_token=" + access_token + '&id=' + id;
+                            window.open(url);
+                        }
+                    });
+                } else {
+                    layer.msg('拓扑保存失败，请与管理员联系！', {icon: 7, time: 3000});
+                }
+            });
+            return false;//必须要写，解决禁用submit提交，ajax方法才能正确执行，且表单不会自动刷新
             form.render();
         });
         renderGraphTopoInfo();