可以正常发起流程

2025-04-05 17:38:01 +08:00 · 2018-03-24 09:56:32 +08:00 · 2018-03-24 09:56:32 +08:00 · 99dd110885
commit 99dd110885
parent 0a42c651aa
17 changed files with 144 additions and 58 deletions
--- a/OpenAuth.App/FormApp.cs
+++ b/OpenAuth.App/FormApp.cs
@ -1,4 +1,5 @@
-using OpenAuth.App.Request;
+using Infrastructure;
+using OpenAuth.App.Request;
 using OpenAuth.App.Response;
 using OpenAuth.Repository.Domain;

@ -43,9 +44,10 @@ namespace OpenAuth.App
            Repository.ExecuteSql(FormUtil.GetSql(obj));
        }

-        public Form FindSingle(string id)
+        public FormResp FindSingle(string id)
        {
-            return Repository.FindSingle(u => u.Id == id);
+            var form =  Get(id);
+            return form.MapTo<FormResp>();
        }

    }
--- a/OpenAuth.App/FormUtil.cs
+++ b/OpenAuth.App/FormUtil.cs
@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.Text;
 using Infrastructure;
 using Newtonsoft.Json.Linq;
+using OpenAuth.App.Response;
 using OpenAuth.Repository.Domain;

 namespace OpenAuth.App
@ -71,7 +72,7 @@ namespace OpenAuth.App
 	 * 
 	 * 功能:  html 
 	 */
-        public static string GetHtml(Form form, string action){
+        public static string GetHtml(FormResp form, string action){
 		
            //action=action!=null && !""==(action)?action:"view";
            return GetHtml(form.ContentData, form.ContentParse, action);
--- a/OpenAuth.App/OpenAuth.App.csproj
+++ b/OpenAuth.App/OpenAuth.App.csproj
@ -120,6 +120,7 @@
    <Compile Include="Request\QueryRoleListReq.cs" />
    <Compile Include="Request\QueryFormListReq.cs" />
    <Compile Include="Request\QueryUserListReq.cs" />
+    <Compile Include="Response\FormResp.cs" />
    <Compile Include="Response\TableData.cs" />
    <Compile Include="RevelanceManagerApp.cs" />
    <Compile Include="SystemAuthService.cs" />
--- a/OpenAuth.App/Response/FormResp.cs
+++ b/OpenAuth.App/Response/FormResp.cs
@ -0,0 +1,53 @@
+//------------------------------------------------------------------------------
+// <autogenerated>
+//     This code was generated by a CodeSmith Template.
+//
+//     DO NOT MODIFY contents of this file. Changes to this
+//     file will be lost if the code is regenerated.
+//     Author:Yubao Li
+// </autogenerated>
+//------------------------------------------------------------------------------
+
+namespace OpenAuth.App.Response
+{
+    /// <summary>
+	/// 表单模板表
+	/// </summary>
+    public class FormResp 
+    {
+        /// <summary>
+	    /// 表单名称
+	    /// </summary>
+        public string Name { get; set; }
+        /// <summary>
+	    /// 字段个数
+	    /// </summary>
+        public int Fields { get; set; }
+        /// <summary>
+	    /// 表单中的字段数据
+	    /// </summary>
+        public string ContentData { get; set; }
+        /// <summary>
+	    /// 表单替换的模板 经过处理
+	    /// </summary>
+        public string ContentParse { get; set; }
+        /// <summary>
+	    /// 表单原html模板未经处理的
+	    /// </summary>
+        public string Content { get; set; }
+
+
+        /// <summary>
+	    /// 数据库名称
+	    /// </summary>
+        public string DbName { get; set; }
+        /// <summary>
+        /// 用户显示
+        /// </summary>
+        public string Html
+        {
+            get { return FormUtil.GetHtml(this, ""); }
+        }
+
+    }
+}
--- a/OpenAuth.Mvc/Controllers/FormsController.cs
+++ b/OpenAuth.Mvc/Controllers/FormsController.cs
@ -4,6 +4,7 @@ using System.Web.Mvc;
 using Infrastructure;
 using OpenAuth.App;
 using OpenAuth.App.Request;
+using OpenAuth.App.Response;
 using OpenAuth.Mvc.Models;
 using OpenAuth.Repository.Domain;

@ -25,23 +26,11 @@ namespace OpenAuth.Mvc.Controllers
            return View();
        }

-        /// <summary>
-        /// 预览表单
-        /// </summary>
-        /// <param name="id">The identifier.</param>
-        /// <returns>System.String.</returns>
-        public string PreviewData(string id)
-        {
-            var form = App.FindSingle(id);
-
-            return FormUtil.GetHtml(form, "");
-        }
-
        public string Get(string id)
        {
            try
            {
-                var result = new Response<Form>
+                var result = new Response<FormResp>
                {
                    Result = App.FindSingle(id)
                };
--- a/OpenAuth.Mvc/OpenAuth.Mvc.csproj
+++ b/OpenAuth.Mvc/OpenAuth.Mvc.csproj
@ -163,6 +163,7 @@
    <Compile Include="Properties\AssemblyInfo.cs" />
  </ItemGroup>
  <ItemGroup>
+    <Content Include="css\formpreview.css" />
    <Content Include="images\login\buttonbg.png" />
    <Content Include="images\login\cloud.png" />
    <Content Include="images\login\hand.png" />
@ -204,13 +205,11 @@
    <Content Include="css\images.css" />
    <Content Include="css\login.css" />
    <Content Include="css\main.css" />
-    <Content Include="css\message.css" />
    <Content Include="css\metroStyle\img\line_conn.png" />
    <Content Include="css\metroStyle\img\loading.gif" />
    <Content Include="css\metroStyle\img\metro.gif" />
    <Content Include="css\metroStyle\img\metro.png" />
    <Content Include="css\metroStyle\metroStyle.css" />
-    <Content Include="css\news.css" />
    <Content Include="css\treetable.css" />
    <Content Include="favicon.ico" />
    <Content Include="Global.asax" />
--- a/OpenAuth.Mvc/Views/FlowInstances/Edit.cshtml
+++ b/OpenAuth.Mvc/Views/FlowInstances/Edit.cshtml
@ -2,7 +2,8 @@
@section header
 {
    <link rel="stylesheet" href="/css/treetable.css" />
-<link href="/js/flow/GooFlow.css" rel="stylesheet" />
+    <link href="/js/flow/GooFlow.css" rel="stylesheet" />
+    <link href="/css/formpreview.css" rel="stylesheet" />
 }

 <form class="layui-form" action="" id="formEdit">
--- a/OpenAuth.Mvc/Views/FlowSchemes/Design.cshtml
+++ b/OpenAuth.Mvc/Views/FlowSchemes/Design.cshtml
@ -2,7 +2,8 @@
@section header
 {
    <link rel="stylesheet" href="/css/treetable.css" />
-<link href="/js/flow/GooFlow.css" rel="stylesheet" />
+    <link href="/js/flow/GooFlow.css" rel="stylesheet" />
+    <link href="/css/formpreview.css" rel="stylesheet" />
 }

 <form class="layui-form" action="" id="formEdit">
--- a/OpenAuth.Mvc/Views/Forms/Preview.cshtml
+++ b/OpenAuth.Mvc/Views/Forms/Preview.cshtml
@ -8,7 +8,7 @@
 <html>
 <head>
    <meta name="viewport" content="width=device-width" />
-    <link href="/js/ueditor/formdesign/bootstrap/css/bootstrap.min.css" rel="stylesheet" />
+    <link href="/js/ueditor/formdesign/bootstrap/css/bootstrap.css" rel="stylesheet" />
    <title>Preview</title>
 </head>
 <body>
--- a/OpenAuth.Mvc/Views/Home/Main.cshtml
+++ b/OpenAuth.Mvc/Views/Home/Main.cshtml
@ -91,8 +91,8 @@
    <div class="sysNotice col">
        <blockquote class="layui-elem-quote title">更新日志</blockquote>
        <div class="layui-elem-quote layui-quote-nm">
-            <h3># v4.0（颠覆） - 2017-09-20</h3>
-            <p>* 引入layui 2.10，这是有史以来最酷的Openauth.net</p>
+            <h3># v4.0（颠覆） - 2018</h3>
+            <p>* 引入最新版layui，这是有史以来最酷的Openauth.net</p>
            <p>* 全面优化数据结构</p>
            <p>* 全面优化流程引擎</p>
        </div>
--- a/OpenAuth.Mvc/css/formpreview.css
+++ b/OpenAuth.Mvc/css/formpreview.css
@ -0,0 +1,60 @@
+textarea,
+input[type="text"],
+input[type="password"],
+input[type="datetime"],
+input[type="datetime-local"],
+input[type="date"],
+input[type="month"],
+input[type="time"],
+input[type="week"],
+input[type="number"],
+input[type="email"],
+input[type="url"],
+input[type="search"],
+input[type="tel"],
+input[type="color"],
+.uneditable-input {
+    background-color: #ffffff;
+    border: 1px solid #cccccc;
+    -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
+    -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
+    box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
+    -webkit-transition: border linear 0.2s, box-shadow linear 0.2s;
+    -moz-transition: border linear 0.2s, box-shadow linear 0.2s;
+    -o-transition: border linear 0.2s, box-shadow linear 0.2s;
+    transition: border linear 0.2s, box-shadow linear 0.2s;
+}
+
+select,
+textarea,
+input[type="text"],
+input[type="password"],
+input[type="datetime"],
+input[type="datetime-local"],
+input[type="date"],
+input[type="month"],
+input[type="time"],
+input[type="week"],
+input[type="number"],
+input[type="email"],
+input[type="url"],
+input[type="search"],
+input[type="tel"],
+input[type="color"],
+.uneditable-input {
+    display: inline-block;
+    padding: 4px 6px;
+    margin-bottom: 10px;
+    font-size: 14px;
+    line-height: 20px;
+    color: #555555;
+    vertical-align: middle;
+    -webkit-border-radius: 4px;
+    -moz-border-radius: 4px;
+    border-radius: 4px;
+}
+
+
+select[leipiplugins] {
+    display: inherit !important
+}
--- a/OpenAuth.Mvc/css/message.css
+++ b/OpenAuth.Mvc/css/message.css
@ -1,14 +0,0 @@
-.selectMsg{ width:110px; margin-right: 15px; }
-
-.msg_info,.msg_time,.msg_reply,.msg_opr{min-height:50px; text-align:center;}
-.msg_info{text-align:left; position: relative; }
-.msg_info>img{ position: absolute; left:10px; top:10px; cursor:pointer; }
-.msg_info .user_info{ padding-left:55px; line-height:25px; }
-.msg_info .user_info h2{ color:#222; cursor:pointer; }
-.msg_info .user_info h2:hover{ color:#1AA094;}
-.msg_info .user_info p{ color:#8d8d8d; }
-.msg_reply{ color:#e15f63; }
-
-/*回复*/
-.replay_edit{ overflow: hidden; margin-bottom:20px; }
-.replay_edit a{margin-top: 10px; width:100px; float:right;}
--- a/OpenAuth.Mvc/css/news.css
+++ b/OpenAuth.Mvc/css/news.css
@ -1,6 +0,0 @@
-.news_search{ padding:10px 10px; }
-.layui-table,.layui-table th{ text-align:center; }
-.news_list .layui-form-switch{ margin-top:0; }
-
-/*分页*/
-#page{ text-align:right; }
--- a/OpenAuth.Mvc/js/index.js
+++ b/OpenAuth.Mvc/js/index.js
@ -226,7 +226,7 @@ layui.config({
 	        btn: ['火速围观'],
 	        moveType: 1,
 	        content: '<div style="padding:15px 20px; text-align:justify; line-height: 22px; text-indent:2em;border-bottom:1px solid #e2e2e2;">' +
-	            '<p>浴火重生，OpenAuth.Net 4.0正式上线，界面采用贤心的layui 2.10及马哥的layuicms</p>' +
+	            '<p>浴火重生，OpenAuth.Net 4.0正式上线，界面采用贤心最新版layui及马哥的layuicms</p>' +
 	            '<p>喜欢的，快快star吧！</p></div>',
 	        success: function(layero){
 				var btn = layero.find('.layui-layer-btn');
--- a/OpenAuth.Mvc/userJs/flowInstanceEdit.js
+++ b/OpenAuth.Mvc/userJs/flowInstanceEdit.js
@ -95,7 +95,7 @@
                        if (data.Code != 500) {
                            $("#FrmContentData").val(data.Result.ContentData);
                            $("#FrmContentParse").val(data.Result.ContentParse);
-                            $("#frmPreview").html(data.Result.Content);
+                            $("#frmPreview").html(data.Result.Html);
                        }
                    });

--- a/OpenAuth.Mvc/userJs/flowSchemeDesign.js
+++ b/OpenAuth.Mvc/userJs/flowSchemeDesign.js
@ -9,8 +9,8 @@
    var openauth = layui.openauth;

    var index = parent.layer.getFrameIndex(window.name); //获取窗口索引
-     var id = $.getUrlParam("id");   //ID
-    var update = (id !=null && id != '');
+    var id = $.getUrlParam("id");   //ID
+    var update = (id != null && id != '');
    //提交的URL
    var url = "/FlowSchemes/Add";

@ -43,14 +43,14 @@
            },
            callback: {
                onClick: function (event, treeId, treeNode) {
-                    $.get("/forms/previewdata?id=" + treeNode.Id, function (data) {
-                        $("#frmPreview").html(data);
+                    $.getJSON("/forms/get?id=" + treeNode.Id, function (data) {
+                        $("#frmPreview").html(data.Result.Html);
                    });
                },
                onCheck: function (event, treeId, treeNode) {
                    $("#FrmId").val(treeNode.Id);
-                    $.get("/forms/previewdata?id=" + treeNode.Id, function (data) {
-                        $("#frmPreview").html(data);
+                    $.getJSON("/forms/get?id=" + treeNode.Id, function (data) {
+                        $("#frmPreview").html(data.Result.Html);
                    });
                }
            }
@ -69,7 +69,7 @@
                    $("#menutree").html("点击预览表单效果");
                    zTreeObj.expandAll(true);
                }
-           });
+            });

        var setCheck = function (id) {    //设置已经选中的表单
            if (id == null | id == '') return;
@ -140,7 +140,6 @@
            });
    }

-
    //提交数据
    form.on('submit(formSubmit)',
        function (data) {
@ -163,8 +162,8 @@
            return false; //阻止表单跳转。
        });

-    $(window).resize(function() {
-        flowDesignPanel.reinitSize($(window).width()-30, $(window).height()-100);
+    $(window).resize(function () {
+        flowDesignPanel.reinitSize($(window).width() - 30, $(window).height() - 100);
    });

    //该函数供给父窗口确定时调用
--- a/OpenAuth.Mvc/userJs/preview.js
+++ b/OpenAuth.Mvc/userJs/preview.js
@ -7,8 +7,8 @@
        layer = layui.layer,
        $ = layui.jquery;
    var id = $.getUrlParam("id");
-    $.get("/forms/previewdata?id=" + id, function (data) {
-        $("#content").html(data);
+    $.getJSON("/forms/get?id=" + id, function (data) {
+        $("#content").html(data.Result.Html);
    });

 })