routine update

OpenAuth.Mvc/OpenAuth.Mvc.csproj

@@ -226,7 +226,6 @@
     <Content Include="userJs\flowInstances.js" />
     <Content Include="userJs\flowSchemeDesign.js" />
     <Content Include="userJs\modules.js" />
-    <Content Include="js\queryString.js" />
     <Content Include="userJs\orgs.js" />
     <Content Include="userJs\roles.js" />
     <Content Include="js\ueditor\dialogs\anchor\anchor.html" />

OpenAuth.Mvc/Views/FlowInstances/Edit.cshtml

@@ -41,7 +41,7 @@
                 </div>
 
                 <div class="layui-tab-item">
-                    <ul id="frmTree" class="ztree" style="display: inline-block; width: 180px; padding: 10px; border: 1px solid #ddd; overflow: auto;"></ul>
+                    <ul id="frmTree" class="ztree" style="width: 180px; padding: 10px; border: 1px solid #ddd; overflow: auto;"></ul>
                     <div id="flowPanel" ></div>
                     <div id="frmPreview"></div>
                 </div>
@@ -52,7 +52,6 @@
     
     <input type="hidden" lay-submit id="btnSubmit" lay-filter="formSubmit"/>
 </form>
-<script src="/js/utils.js"></script>
 <script type="text/javascript" src="/layui/layui.js"></script>
 <script type="text/javascript" src="/userJs/flowInstanceEdit.js?v2"></script>
 

OpenAuth.Mvc/js/queryString.js

@@ -1,25 +0,0 @@
-// ***********************************************************************
-// Assembly         : OpenAuth.Mvc
-// Author           : yubaolee
-// Created          : 09-04-2016
-//
-// Last Modified By : yubaolee
-// Last Modified On : 09-04-2016
-// ***********************************************************************
-// <copyright file="queryString.js" company="www.cnblogs.com/yubaolee">
-//     版权所有(C) 2015
-// </copyright>
-// <summary>解析URL中的参数</summary>
-// ***********************************************************************
-
-layui.define("jquery",function(exports){
-    var jQuery=layui.jquery;
-(function ($) {
-    $.getUrlParam = function (name) {
-        var reg = new RegExp("(^|&)" + name + "=([^&]*)(&|$)");
-        var r = window.location.search.substr(1).match(reg);
-        if (r != null) return unescape(r[2]); return null;
-    }
-})(jQuery);
-exports('queryString');
-});

OpenAuth.Mvc/js/utils.js

@@ -1,14 +1,27 @@
 
-//把name/value的数组转为obj对象
+layui.define("jquery", function (exports) {
-function arrayToObj(array) {
+    var jQuery = layui.jquery,
-    var result = {};
+        $ = layui.jquery;
-    for (var i = 0; i < array.length; i++) {
+
-        var field = array[i];
+        //获取url的参数值
-        if (field.name in result) {
+        $.getUrlParam = function (name) {
-            result[field.name] += ',' + field.value;
+            var reg = new RegExp("(^|&)" + name + "=([^&]*)(&|$)");
-        } else {
+            var r = window.location.search.substr(1).match(reg);
-            result[field.name] = field.value;
+            if (r != null) return unescape(r[2]); return null;
         }
-    }
+
-    return result;
+        //把name/value的数组转为obj对象
-}
+        $.arrayToObj = function(array) {
+            var result = {};
+            for (var i = 0; i < array.length; i++) {
+                var field = array[i];
+                if (field.name in result) {
+                    result[field.name] += ',' + field.value;
+                } else {
+                    result[field.name] = field.value;
+                }
+            }
+            return result;
+        }
+    exports('utils');
+});

OpenAuth.Mvc/userJs/assign.js

@@ -1,6 +1,6 @@
 layui.config({
     base: "/js/"
-}).use(['form','vue', 'ztree', 'layer', 'jquery','queryString'], function () {
+}).use(['form','vue', 'ztree', 'layer', 'jquery','utils'], function () {
     var //layer = (parent == undefined || parent.layer === undefined )? layui.layer : parent.layer,
         layer = layui.layer,
         $ = layui.jquery;

OpenAuth.Mvc/userJs/flowInstanceEdit.js

@@ -1,6 +1,6 @@
 layui.config({
     base: "/js/"
-}).use(['form', 'vue', 'ztree', 'layer', 'queryString', 'element', 'jquery', 'table', 'droptree', 'openauth', 'flow/gooflow', 'flowlayout'], function () {
+}).use(['form', 'vue', 'ztree', 'layer', 'utils', 'element', 'jquery', 'table', 'droptree', 'openauth', 'flow/gooflow', 'flowlayout'], function () {
     var form = layui.form, element = layui.element,
 		//layer = (parent == undefined || parent.layer === undefined )? layui.layer : parent.layer,
         layer = layui.layer,
@@ -97,7 +97,7 @@
                             $("#FrmContentData").val(data.Result.ContentData);
                             $("#FrmContentParse").val(data.Result.ContentParse);
                             $("#frmPreview").html(data.Result.Content);
-                            frmdata = arrayToObj(JSON.parse(data.Result.ContentData));
+                            frmdata = $.arrayToObj(JSON.parse(data.Result.ContentData));
                             $.extend(frmdata, vm.data);
                             vm = new Vue({
                                 el: "#formEdit",
@@ -121,8 +121,6 @@
                     var json = JSON.parse(data);
                     zTreeObj = $.fn.zTree.init($("#frmTree"), setting);
                     zTreeObj.addNodes(null, json.data);
-
-                    $("#menutree").html("点击预览表单效果");
                     zTreeObj.expandAll(true);
                 }
             });

OpenAuth.Mvc/userJs/flowSchemeDesign.js

@@ -1,6 +1,6 @@
 layui.config({
     base: "/js/"
-}).use(['form', 'vue', 'ztree', 'layer', 'queryString', 'element', 'jquery', 'table', 'droptree', 'openauth', 'flow/gooflow', 'flowlayout'], function () {
+}).use(['form', 'vue', 'ztree', 'layer', 'utils', 'element', 'jquery', 'table', 'droptree', 'openauth', 'flow/gooflow', 'flowlayout'], function () {
     var form = layui.form, element = layui.element,
 		//layer = (parent == undefined || parent.layer === undefined )? layui.layer : parent.layer,
         layer = layui.layer,

OpenAuth.Mvc/userJs/nodeInfo.js

@@ -1,6 +1,6 @@
 layui.config({
     base: "/js/"
-}).use(['form', 'vue', 'ztree', 'layer', 'element', 'jquery', 'queryString'], function () {
+}).use(['form', 'vue', 'ztree', 'layer', 'element', 'jquery', 'utils'], function () {
     var //layer = (parent == undefined || parent.layer === undefined )? layui.layer : parent.layer,
         layer = layui.layer,
         $ = layui.jquery;

OpenAuth.Mvc/userJs/preview.js

@@ -1,6 +1,6 @@
 layui.config({
     base: "/js/"
-}).use(['form','vue', 'layer', 'jquery', 'table','droptree','queryString'], function () {
+}).use(['form','vue', 'layer', 'jquery', 'table','droptree','utils'], function () {
     var form = layui.form,
         element = layui.element,
 		//layer = (parent == undefined || parent.layer === undefined )? layui.layer : parent.layer,

OpenAuth.Repository/Mapping/FlowInstanceMap.cs

@@ -74,11 +74,9 @@ namespace OpenAuth.Repository.Mapping
                 .IsRequired();
             Property(t => t.FrmContentData)
                 .HasColumnName("FrmContentData")
-                .HasMaxLength(16)
                 .IsOptional();
             Property(t => t.FrmContentParse)
                 .HasColumnName("FrmContentParse")
-                .HasMaxLength(16)
                 .IsOptional();
             Property(t => t.FrmId)
                 .HasColumnName("FrmId")

OpenAuth.Repository/Mapping/FormMap.cs

@@ -37,15 +37,12 @@ namespace OpenAuth.Repository.Mapping
                 .IsRequired();
             Property(t => t.ContentData)
                 .HasColumnName("ContentData")
-                .HasMaxLength(16)
                 .IsOptional();
             Property(t => t.ContentParse)
                 .HasColumnName("ContentParse")
-                .HasMaxLength(16)
                 .IsOptional();
             Property(t => t.Content)
                 .HasColumnName("Content")
-                .HasMaxLength(16)
                 .IsOptional();
             Property(t => t.SortCode)
                 .HasColumnName("SortCode")

OpenAuth.UnitTest/TestWorkflow.cs

@@ -1,32 +1,32 @@
-using System;
+using System;
-using Infrastructure;
+using Infrastructure;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
-using OpenAuth.App;
+using OpenAuth.App;
-using OpenAuth.Repository.Domain;
+using OpenAuth.Repository.Domain;
-
+
-namespace OpenAuth.UnitTest
+namespace OpenAuth.UnitTest
-{
+{
-    [TestClass]
+    [TestClass]
-    public class TestWorkflow :TestBase
+    public class TestWorkflow :TestBase
-    {
+    {
-        private FlowSchemeApp _app;
+        private FlowSchemeApp _app;
-        private FlowInstanceApp _runApp;
+        private FlowInstanceApp _runApp;
-
+
-        public TestWorkflow()
+        public TestWorkflow()
-        {
+        {
-            _app = AutofacExt.GetFromFac<FlowSchemeApp>();
+            _app = AutofacExt.GetFromFac<FlowSchemeApp>();
-            _runApp = AutofacExt.GetFromFac<FlowInstanceApp>();
+            _runApp = AutofacExt.GetFromFac<FlowInstanceApp>();
-        }
+        }
-
+
-        /// <summary>
+        /// <summary>
-        /// 测试流程
+        /// 测试流程
-        /// <para>李玉宝于2017-01-20 9:59:11</para>
+        /// <para>李玉宝于2017-01-20 9:59:11</para>
-        /// </summary>
+        /// </summary>
-        [TestMethod]
+        [TestMethod]
-        public void AddProcessInstance()
+        public void AddProcessInstance()
-        {
+        {
-            
+            
-        }
+        }
-
+
-    }
+    }
-}
+}