routine update

OpenAuth.App/FormUtil.cs

@@ -111,10 +111,10 @@ namespace OpenAuth.App
             if (value == null)
                 value = item.GetValue("value") == null ? "" : item.GetValue("value").ToString();
             string style =item.GetValue("style") == null ? "" : item.GetValue("style").ToString();
-            string temp_html =  string.Format(temp, value, name, style);
+            string tempHtml =  string.Format(temp, value, name, style);
-            if("view"==(action))
+            if("view"==action)
                 return string.Format(temp_view,style,value);
-            return temp_html;
+            return tempHtml;
         }
 	
         //TextArea
@@ -182,7 +182,7 @@ namespace OpenAuth.App
                 temp_html += string.Format(temp, name, cvalue, Ischecked, cvalue);
             }
 		
-            if("view"==(action))
+            if("view"==action)
                 return string.Format(temp_view," ",cvalue_);
             return temp_html;
         }

OpenAuth.Mvc/Controllers/FlowInstancesController.cs

@@ -38,11 +38,24 @@ namespace OpenAuth.Mvc.Controllers
             return View();
         }
 
+        /// <summary>
+        /// 编辑
+        /// </summary>
+        /// <returns></returns>
         public ActionResult Edit()
         {
             return View();
         }
 
+        /// <summary>
+        /// 进度详情
+        /// </summary>
+        /// <returns></returns>
+        public ActionResult Detail()
+        {
+            return View();
+        }
+
         public ActionResult Verification()
         {
             return View();

OpenAuth.Mvc/OpenAuth.Mvc.csproj

@@ -198,6 +198,7 @@
     <Content Include="js\utils.js" />
     <Content Include="layui\css\modules\laydate\default\font.css" />
     <Content Include="userJs\assignRole.js" />
+    <Content Include="userJs\flowinstanceDetail.js" />
     <Content Include="userJs\verification.js" />
     <Content Include="userJs\flowInstanceEdit.js" />
     <Content Include="userJs\flowInstanceWait.js" />
@@ -642,6 +643,7 @@
     <Content Include="Views\FlowInstances\Disposed.cshtml" />
     <Content Include="Views\FlowInstances\Wait.cshtml" />
     <Content Include="Views\RoleManager\Assign.cshtml" />
+    <Content Include="Views\FlowInstances\Detail.cshtml" />
   </ItemGroup>
   <ItemGroup>
     <Folder Include="layui\lay\modules\mobile\" />

OpenAuth.Mvc/Views/FlowInstances/Detail.cshtml

@@ -0,0 +1,31 @@
+
+@section header
+{
+    <link rel="stylesheet" href="/css/treetable.css" />
+    <link href="/js/flow/GooFlow.css" rel="stylesheet" />
+    <link href="/css/formpreview.css" rel="stylesheet" />
+}
+
+<form class="layui-form " action="" id="formEdit">
+
+    <div class="layui-tab layui-tab-brief" lay-filter="tab">
+        <ul class="layui-tab-title">
+            <li class="layui-this">流程信息</li>
+            <li>表单信息</li>
+        </ul>
+
+        <div class="layui-tab-content">
+            <div class="layui-tab-item layui-show">
+                <div id="flowPanel"></div>
+            </div>
+
+            <div class="layui-tab-item">
+                <div id="frmPreview" style="min-height: 600px"></div>
+            </div>
+
+        </div>
+    </div>
+</form>
+<script type="text/javascript" src="/layui/layui.js"></script>
+<script type="text/javascript" src="/userJs/flowinstanceDetail.js?v2"></script>
+

OpenAuth.Mvc/js/index.js

@@ -186,11 +186,6 @@ layui.config({
 			}
 		}
 	});
-	$(document).on('keydown', function() {
-		if(event.keyCode == 13) {
-			$("#unlock").click();
-		}
-	});
 
 	//手机设备的简单适配
 	var treeMobile = $('.site-tree-mobile'),

OpenAuth.Mvc/userJs/flowInstanceDisposed.js

@@ -88,8 +88,8 @@
                 type: 2,
                 area: ['800px', '600px'], //宽高
                 maxmin: true, //开启最大化最小化按钮
-                title: '处理流程',
+                title: '进度详情',
-                content: ['/flowInstances/Verification?id=' + data[0].Id, 'no'],
+                content: ['/flowInstances/detail?id=' + data[0].Id, 'no'],
                 btn: ['关闭'],
                 yes: function (index) {
                     layer.close(index);

OpenAuth.Mvc/userJs/flowInstanceWait.js

@@ -118,8 +118,8 @@
                type: 2,
                area: ['800px', '600px'], //宽高
                maxmin: true, //开启最大化最小化按钮
-               title: '处理流程',
+               title: '进度详情',
-               content: ['/flowInstances/Verification?id=' + data[0].Id, 'no'],
+               content: ['/flowInstances/detail?id=' + data[0].Id, 'no'],
                btn: ['关闭'],
                yes: function (index) {
                    layer.close(index);

OpenAuth.Mvc/userJs/flowInstances.js

@@ -147,8 +147,8 @@
                 type: 2,
                 area: ['800px', '600px'], //宽高
                 maxmin: true, //开启最大化最小化按钮
-                title: '处理流程',
+                title: '进度详情',
-                content: ['/flowInstances/Verification?id=' + data[0].Id, 'no'],
+                content: ['/flowInstances/detail?id=' + data[0].Id, 'no'],
                 btn: ['关闭'],
                 yes: function (index) {
                     layer.close(index);

OpenAuth.Mvc/userJs/flowinstanceDetail.js

@@ -0,0 +1,35 @@
+layui.config({
+    base: "/js/"
+}).use(['form', 'vue', 'ztree', 'layer', 'utils', 'element', 'jquery', 'droptree', 'openauth', 'flow/gooflow', 'flowlayout'], function () {
+    var form = layui.form, element = layui.element,
+		layer = (top == undefined || top.layer === undefined )? layui.layer : top.layer,
+        $ = layui.jquery;
+    var openauth = layui.openauth;
+    var index = layer.getFrameIndex(window.name); //获取窗口索引
+
+    var id = $.getUrlParam("id");   //ID
+    var flowDesignPanel;
+   
+    $.getJSON('/FlowInstances/get?id=' + id,
+        function (data) {
+            var obj = data.Result;
+            var schemeContent = JSON.parse(obj.SchemeContent);
+            flowDesignPanel = $('#flowPanel').flowdesign({
+                haveTool: false
+                , isprocessing: true
+                , activityId: obj.ActivityId
+                , nodeData: schemeContent.nodes
+                , flowcontent:schemeContent
+            });
+
+            $("#frmPreview").html(data.Result.FrmDataHtml);
+            flowDesignPanel.reinitSize($(window).width() - 30, $(window).height() - 100);
+        });
+
+    $(window).resize(function() {
+        flowDesignPanel.reinitSize($(window).width()-30, $(window).height()-100);
+    });
+
+    //让层自适应iframe
+     //layer.iframeAuto(index);
+})