diff --git a/OpenAuth.App/FormUtil.cs b/OpenAuth.App/FormUtil.cs
index 0de6c5cf..87376935 100644
--- a/OpenAuth.App/FormUtil.cs
+++ b/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);
- if("view"==(action))
+ string tempHtml = string.Format(temp, value, name, style);
+ 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;
}
diff --git a/OpenAuth.Mvc/Controllers/FlowInstancesController.cs b/OpenAuth.Mvc/Controllers/FlowInstancesController.cs
index 862d1c6c..b9dbbd4c 100644
--- a/OpenAuth.Mvc/Controllers/FlowInstancesController.cs
+++ b/OpenAuth.Mvc/Controllers/FlowInstancesController.cs
@@ -38,11 +38,24 @@ namespace OpenAuth.Mvc.Controllers
return View();
}
+ ///
+ /// 编辑
+ ///
+ ///
public ActionResult Edit()
{
return View();
}
+ ///
+ /// 进度详情
+ ///
+ ///
+ public ActionResult Detail()
+ {
+ return View();
+ }
+
public ActionResult Verification()
{
return View();
diff --git a/OpenAuth.Mvc/OpenAuth.Mvc.csproj b/OpenAuth.Mvc/OpenAuth.Mvc.csproj
index 039ed575..31bf4e28 100644
--- a/OpenAuth.Mvc/OpenAuth.Mvc.csproj
+++ b/OpenAuth.Mvc/OpenAuth.Mvc.csproj
@@ -198,6 +198,7 @@
+
@@ -642,6 +643,7 @@
+
diff --git a/OpenAuth.Mvc/Views/FlowInstances/Detail.cshtml b/OpenAuth.Mvc/Views/FlowInstances/Detail.cshtml
new file mode 100644
index 00000000..d4d6d528
--- /dev/null
+++ b/OpenAuth.Mvc/Views/FlowInstances/Detail.cshtml
@@ -0,0 +1,31 @@
+
+@section header
+{
+
+
+
+}
+
+
+
+
+
diff --git a/OpenAuth.Mvc/js/index.js b/OpenAuth.Mvc/js/index.js
index d3f6f4fc..70030e6b 100644
--- a/OpenAuth.Mvc/js/index.js
+++ b/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'),
diff --git a/OpenAuth.Mvc/userJs/flowInstanceDisposed.js b/OpenAuth.Mvc/userJs/flowInstanceDisposed.js
index 8d09abb6..e7fb9d55 100644
--- a/OpenAuth.Mvc/userJs/flowInstanceDisposed.js
+++ b/OpenAuth.Mvc/userJs/flowInstanceDisposed.js
@@ -88,8 +88,8 @@
type: 2,
area: ['800px', '600px'], //宽高
maxmin: true, //开启最大化最小化按钮
- title: '处理流程',
- content: ['/flowInstances/Verification?id=' + data[0].Id, 'no'],
+ title: '进度详情',
+ content: ['/flowInstances/detail?id=' + data[0].Id, 'no'],
btn: ['关闭'],
yes: function (index) {
layer.close(index);
diff --git a/OpenAuth.Mvc/userJs/flowInstanceWait.js b/OpenAuth.Mvc/userJs/flowInstanceWait.js
index 22c69e86..cec038f4 100644
--- a/OpenAuth.Mvc/userJs/flowInstanceWait.js
+++ b/OpenAuth.Mvc/userJs/flowInstanceWait.js
@@ -118,8 +118,8 @@
type: 2,
area: ['800px', '600px'], //宽高
maxmin: true, //开启最大化最小化按钮
- title: '处理流程',
- content: ['/flowInstances/Verification?id=' + data[0].Id, 'no'],
+ title: '进度详情',
+ content: ['/flowInstances/detail?id=' + data[0].Id, 'no'],
btn: ['关闭'],
yes: function (index) {
layer.close(index);
diff --git a/OpenAuth.Mvc/userJs/flowInstances.js b/OpenAuth.Mvc/userJs/flowInstances.js
index 8f8ac68a..f3faa475 100644
--- a/OpenAuth.Mvc/userJs/flowInstances.js
+++ b/OpenAuth.Mvc/userJs/flowInstances.js
@@ -147,8 +147,8 @@
type: 2,
area: ['800px', '600px'], //宽高
maxmin: true, //开启最大化最小化按钮
- title: '处理流程',
- content: ['/flowInstances/Verification?id=' + data[0].Id, 'no'],
+ title: '进度详情',
+ content: ['/flowInstances/detail?id=' + data[0].Id, 'no'],
btn: ['关闭'],
yes: function (index) {
layer.close(index);
diff --git a/OpenAuth.Mvc/userJs/flowinstanceDetail.js b/OpenAuth.Mvc/userJs/flowinstanceDetail.js
new file mode 100644
index 00000000..fa5c41f2
--- /dev/null
+++ b/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);
+})
\ No newline at end of file