优化样式

OpenAuth.Mvc/Views/FlowInstances/Detail.cshtml

@@ -8,7 +8,7 @@
 
 <form class="layui-form " action="" id="formEdit">
 
-    <div class="layui-tab layui-tab-brief" lay-filter="tab">
+    <div class="layui-tab layui-tab-brief" lay-filter="tab" style="margin: 0px">
         <ul class="layui-tab-title">
             <li class="layui-this">流程信息</li>
             <li>表单信息</li>

OpenAuth.Mvc/Views/FlowInstances/Disposed.cshtml

@@ -6,12 +6,12 @@
 </blockquote>
 
 <div class="layui-row">
-    <div class="layui-col-xs3">
+    <div class="layui-col-xs2">
         <ul id="tree" class="ztree"
             style="padding: 2px; border: 1px solid #ddd; overflow: auto;">
         </ul>
     </div>
-    <div class="layui-col-xs9">
+    <div class="layui-col-xs10">
         <table class="layui-table"
                lay-data="{height: 'full-80', page:true, id:'mainList'}"
                lay-filter="list" lay-size="sm">

OpenAuth.Mvc/Views/FlowInstances/Edit.cshtml

@@ -15,7 +15,7 @@
     <input type="hidden" id="FrmData" name="FrmData" v-model="FrmData" />
 
     <div class="layui-row">
-        <div class="layui-tab layui-tab-brief" lay-filter="tab">
+        <div class="layui-tab layui-tab-brief" lay-filter="tab" style="margin: 0px">
             <ul class="layui-tab-title">
                 <li class="layui-this">基本信息</li>
                 <li>选择流程模板</li>
@@ -52,11 +52,26 @@
 
                     <div class="layui-row">
                         <div class="layui-col-xs3">
-                            <ul id="frmTree" class="ztree" style="padding: 10px; border: 1px solid #ddd; overflow: auto;"></ul>
+                            <ul id="frmTree" class="ztree"
+                                style="padding: 2px; border: 1px solid #ddd; overflow: auto;"></ul>
+                        </div>
+                        <div class="layui-col-xs9 layui-col-space10">
+                            <div class="layui-row">
+                                <fieldset class="layui-elem-field">
+                                    <legend>申请内容</legend>
+                                    <div class="layui-field-box">
+                                        <div id="frmPreview"></div>
+                                    </div>
+                                </fieldset>
+                            </div>
+                            <div class="layui-row">
+                                <fieldset class="layui-elem-field">
+                                    <legend>流程预览</legend>
+                                    <div class="layui-field-box">
+                                        <div id="flowPanel"></div>
+                                    </div>
+                                </fieldset>
                             </div>
-                        <div class="layui-col-xs9">
-                            <div class="layui-row"><div id="flowPanel"></div></div>
-                            <div class="layui-row"><div id="frmPreview"></div></div>
                         </div>
                     </div>
                 </div>

OpenAuth.Mvc/Views/FlowInstances/Index.cshtml

@@ -6,12 +6,12 @@
 </blockquote>
 
 <div class="layui-row">
-    <div class="layui-col-xs3">
+    <div class="layui-col-xs2">
         <ul id="tree" class="ztree"
             style="padding: 2px; border: 1px solid #ddd; overflow: auto;">
         </ul>
     </div>
-    <div class="layui-col-xs9">
+    <div class="layui-col-xs10">
         <table class="layui-table"
                lay-data="{height: 'full-80', page:true, id:'mainList'}"
                lay-filter="list" lay-size="sm">

OpenAuth.Mvc/Views/FlowInstances/Verification.cshtml

@@ -9,7 +9,7 @@
 <form class="layui-form " action="" id="formEdit">
     <div class="layui-row ">
         <div class="layui-col-xs8">
-            <div class="layui-tab layui-tab-brief" lay-filter="tab">
+            <div class="layui-tab layui-tab-brief" lay-filter="tab" style="margin: 0px">
                 <ul class="layui-tab-title">
                     <li class="layui-this">流程信息</li>
                     <li>表单信息</li>

OpenAuth.Mvc/Views/FlowInstances/Wait.cshtml

@@ -6,12 +6,12 @@
 </blockquote>
 
 <div class="layui-row">
-    <div class="layui-col-xs3">
+    <div class="layui-col-xs2">
         <ul id="tree" class="ztree"
             style="padding: 2px; border: 1px solid #ddd; overflow: auto;">
         </ul>
     </div>
-    <div class="layui-col-xs9">
+    <div class="layui-col-xs10">
         <table class="layui-table"
                lay-data="{height: 'full-80', page:true, id:'mainList'}"
                lay-filter="list" lay-size="sm">

OpenAuth.Mvc/Views/FlowSchemes/Design.cshtml

@@ -10,7 +10,7 @@
     <input type="hidden" name="Id" v-model="Id" />
 
     <div class="layui-row">
-        <div class="layui-tab layui-tab-brief" lay-filter="tab">
+        <div class="layui-tab layui-tab-brief" lay-filter="tab" style="margin: 0px">
             <ul class="layui-tab-title">
                 <li class="layui-this">基本信息</li>
                 <li>选择表单</li>

OpenAuth.Mvc/Views/FlowSchemes/Index.cshtml

@@ -6,12 +6,12 @@
 </blockquote>
 
 <div class="layui-row">
-    <div class="layui-col-xs3">
+    <div class="layui-col-xs2">
         <ul id="tree" class="ztree"
             style="padding: 2px; border: 1px solid #ddd; overflow: auto;">
         </ul>
      </div>
-    <div class="layui-col-xs9">
+    <div class="layui-col-xs10">
         <table class="layui-table"
                lay-data="{height: 'full-80', page:true, id:'mainList'}"
                lay-filter="list" lay-size="sm">

OpenAuth.Mvc/Views/FlowSchemes/NodeInfo.cshtml

@@ -5,7 +5,7 @@
 
 <form class="layui-form" action="" id="formEdit">
     <div class="layui-row">
-        <div class="layui-tab layui-tab-brief" lay-filter="tab">
+        <div class="layui-tab layui-tab-brief" lay-filter="tab" style="margin: 0px">
             <ul class="layui-tab-title">
                 <li class="layui-this">基本信息</li>
                 <li>执行人</li>

OpenAuth.Mvc/Views/Forms/Edit.cshtml

@@ -14,7 +14,7 @@
     <input type="hidden" name="Fields" id="Fields" value="0">
 
     <div class="layui-row">
-        <div class="layui-tab layui-tab-brief" lay-filter="tab">
+        <div class="layui-tab layui-tab-brief" lay-filter="tab" style="margin: 0px">
             <ul class="layui-tab-title">
                 <li class="layui-this">基本信息</li>
                 <li>表单设计</li>

OpenAuth.Mvc/Views/Forms/index.cshtml

@@ -7,11 +7,11 @@
 
 
 <div class="layui-row">
-    <div class="layui-col-xs3">
+    <div class="layui-col-xs2">
         <ul id="tree" class="ztree"
             style="padding: 2px; border: 1px solid #ddd; overflow: auto;"></ul>
     </div>
-    <div class="layui-col-xs9">
+    <div class="layui-col-xs10">
         <table class="layui-table"
                lay-data="{height: 'full-80', page:true, id:'mainList'}"
                lay-filter="list" lay-size="sm">

OpenAuth.Mvc/Views/ModuleManager/Index.cshtml

@@ -42,7 +42,7 @@
         </script>
     </div>
     
-    <div class="layui-col-xs3">
+    <div class="layui-col-xs">
         <!--菜单列表-->
         <table class="layui-table"
                lay-data="{height: 'full-80', id:'menuList'}"

OpenAuth.Mvc/Views/OrgManager/Index.cshtml

@@ -6,12 +6,12 @@
 </blockquote>
 
 <div class="layui-row">
-    <div class="layui-col-xs3">
+    <div class="layui-col-xs2">
         <ul id="tree" class="ztree"
             style="padding: 2px; border: 1px solid #ddd; overflow: auto;">
         </ul>
     </div>
-    <div class="layui-col-xs9">
+    <div class="layui-col-xs10">
         <table class="layui-table"
                lay-data="{height: 'full-80', page:true, id:'mainList'}"
                lay-filter="list" lay-size="sm">

OpenAuth.Mvc/Views/RoleManager/Index.cshtml

@@ -6,11 +6,11 @@
 </blockquote>
 
 <div class="layui-row">
-    <div class="layui-col-xs3">
+    <div class="layui-col-xs2">
         <ul id="tree" class="ztree"
             style="padding: 2px; border: 1px solid #ddd; overflow: auto;"></ul>
     </div>
-    <div class="layui-col-xs9">
+    <div class="layui-col-xs10">
         <table class="layui-table"
                lay-data="{height: 'full-80', page:true, id:'mainList'}"
                lay-filter="list" lay-size="sm">

OpenAuth.Mvc/Views/UserManager/Index.cshtml

@@ -6,12 +6,12 @@
 </blockquote>
 
     <div class="layui-row">
-        <div class="layui-col-xs3">
+        <div class="layui-col-xs2">
             <ul id="tree" class="ztree"
                 style="padding: 2px; border: 1px solid #ddd; overflow: auto;">
             </ul>
         </div>
-        <div class="layui-col-xs9">
+        <div class="layui-col-xs10">
             <table class="layui-table"
                    lay-data="{height: 'full-80', page:true, id:'mainList'}"
                    lay-filter="list" lay-size="sm">

OpenAuth.Mvc/css/main.css

@@ -8,6 +8,22 @@
 /*模拟加载层图标样式*/
 .layui-layer-dialog .layui-layer-content .layui-layer-ico16{ background-size:100% 100% !important; }
 
+.layui-header {
+    height: 50px;
+}
+
+.layui-layout-admin .layui-body {
+    top: 50px;
+}
+
+.layui-layout-admin .layui-side {
+    top: 50px;
+}
+
+.layui-nav .layui-nav-item {
+    line-height: 50px;
+}
+
 /*样式改变的过渡*/
 .showMenu .layui-body,.showMenu .layui-footer,.showMenu.layui-layout-admin .layui-side,.logo,.top_menu .layui-nav-item[pc],.component,.top_menu .layui-nav-item[mobile],.layui-nav,.layui-layout-admin .layui-main,.site-mobile .layui-side,.layui-layout-admin .layui-side,.site-mobile .site-tree-mobile,.layui-body,.layui-layout-admin .layui-footer,.layui-layout-admin .layui-side,.panel,.panel .panel_icon i{ transition: all 0.3s ease-in-out;-webkit-transition: all 0.3s ease-in-out;-o-transition: all 0.3s ease-in-out;-moz-transition: all 0.3s ease-in-out;-ms-transition: all 0.3s ease-in-out; }
 
@@ -15,11 +31,11 @@
 .showMenu.layui-layout-admin .layui-side{ left:-200px; }
 .showMenu .layui-body,.showMenu .layui-footer{ left:0; }
 .layui-layout-admin .layui-main{ margin:0; }
-.logo{ color: #fff; float: left; line-height:60px; font-size:20px; padding:0 25px; text-align: center; width:150px;}
+.logo{ color: #fff; float: left; line-height:50px; font-size:20px; padding:0 25px; text-align: center; width:150px;}
-.hideMenu{ float:left; width:20px; height:20px; margin:15px 15px 0 0; font-size:17px; text-align:center; padding:5px 5px; color:#fff; background-color:#1AA094; }
+.hideMenu{ float:left; width:20px; height:20px; margin:10px 15px 0 0; font-size:17px; text-align:center; padding:5px 5px; color:#fff; background-color:#1AA094; }
 .hideMenu:hover{ color:#fff; }
-.weather{ color:#fff; float:left; margin:15px 0 0 50px;}
+.weather{ color:#fff; float:left; margin:10px 0 0 50px;}
-.component{ float: left; width:200px; height:30px; margin-top: 15px; position: relative;}
+.component{ float: left; width:200px; height:30px; margin-top: 10px; position: relative;}
 .component .layui-input{ height:30px; line-height: 30px; font-size:12px; border:none; transition: all 0.3s; }
 .component .layui-input:focus{ background:#fff; color:#000; }
 .component .layui-form-select dl{ top:33px; background:#fff; }

OpenAuth.Mvc/js/flowlayout.js

@@ -232,6 +232,7 @@
                     "NodeDesignateType6": "发起者公司领导"
                 };
                 var _NodeConfluenceType = { "0": "所有步骤通过", "1": "一个步骤通过即可", "2": "按百分比计算" };
+                if (options.flowcontent == undefined) return;
                 $.each(options.flowcontent.nodes,
                     function (i, item) {
                         if (item.setInfo != undefined) {
@@ -339,12 +340,7 @@
                             $('#' + item.id).attr('data-content', "该节点未被设置");
                         }
                     });
-                $('.GooFlow_item').popover({ html: true });
+                //$('.GooFlow_item').popover({ html: true });
-            }
-
-            function labellingRedNode(id) {
-                $('.flow-labellingnode-red').removeClass('flow-labellingnode-red');
-                $('#' + id).addClass('flow-labellingnode-red');
             }
 
            return flowPanel;

OpenAuth.Mvc/userJs/flowInstanceEdit.js

@@ -4,8 +4,6 @@
     var form = layui.form, element = layui.element,
         layer = layui.layer,
         $ = layui.jquery;
-    var table = layui.table;
-    var openauth = layui.openauth;
     var index = layer.getFrameIndex(window.name); //获取窗口索引
      var id = $.getUrlParam("id");   //ID
     var update = (id !=null && id != '');
@@ -16,16 +14,17 @@
         el: "#formEdit"
     });
 
-    //标签切换
+    ////标签切换
-    element.on('tab(tab)', function (data) {
+    //element.on('tab(tab)', function (data) {
-        layer.iframeAuto(index);
+    //    layer.iframeAuto(index);
-    });
+    //});
 
     /*=========流程设计（begin）======================*/
     var flowDesignPanel = $('#flowPanel').flowdesign({
         height: 300,
-        widht: 300,
+        widht: $(window).width() - 250,
         haveTool: false,
+        preview:1,
         OpenNode: function (object) {
             FlowDesignObject = object;  //为NodeInfo窗口提供调用
 
@@ -111,7 +110,6 @@
         $.ajax(url,
             {
                 async: false
-
                 , success: function (data) {
                     var json = JSON.parse(data);
                     zTreeObj = $.fn.zTree.init($("#frmTree"), setting);
@@ -125,7 +123,6 @@
             var node = zTreeObj.getNodeByParam("Id", id, null);
             zTreeObj.checkNode(node, true, false);
         }
-
         return {
             setCheck: setCheck
         }
@@ -148,7 +145,6 @@
             });
     }
 
-
     //提交数据
     form.on('submit(formSubmit)',
         function (data) {
@@ -172,16 +168,13 @@
             return false; //阻止表单跳转。
         });
 
-    //$(window).resize(function() {
+    $(window).resize(function() {
-    //    flowDesignPanel.reinitSize($(window).width()-30, $(window).height()-100);
+        flowDesignPanel.reinitSize($(window).width()-250, $(window).height()-100);
-    //});
+    });
 
     //该函数供给父窗口确定时调用
     submit = function () {
         //只能用隐藏的submit btn才行，用form.submit()时data.field里没有数据
         $("#btnSubmit").click();
     }
-
-    //让层自适应iframe
-    layer.iframeAuto(index);
 })