diff --git a/OpenAuth.Mvc/OpenAuth.Mvc.csproj b/OpenAuth.Mvc/OpenAuth.Mvc.csproj
index a4dea333..9ee828e2 100644
--- a/OpenAuth.Mvc/OpenAuth.Mvc.csproj
+++ b/OpenAuth.Mvc/OpenAuth.Mvc.csproj
@@ -226,7 +226,6 @@
-
diff --git a/OpenAuth.Mvc/Views/FlowInstances/Edit.cshtml b/OpenAuth.Mvc/Views/FlowInstances/Edit.cshtml
index b90b2bde..34c25135 100644
--- a/OpenAuth.Mvc/Views/FlowInstances/Edit.cshtml
+++ b/OpenAuth.Mvc/Views/FlowInstances/Edit.cshtml
@@ -41,7 +41,7 @@
@@ -52,7 +52,6 @@
-
diff --git a/OpenAuth.Mvc/js/queryString.js b/OpenAuth.Mvc/js/queryString.js
deleted file mode 100644
index 77ee6600..00000000
--- a/OpenAuth.Mvc/js/queryString.js
+++ /dev/null
@@ -1,25 +0,0 @@
-// ***********************************************************************
-// Assembly : OpenAuth.Mvc
-// Author : yubaolee
-// Created : 09-04-2016
-//
-// Last Modified By : yubaolee
-// Last Modified On : 09-04-2016
-// ***********************************************************************
-//
-// 版权所有(C) 2015
-//
-// 解析URL中的参数
-// ***********************************************************************
-
-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');
-});
\ No newline at end of file
diff --git a/OpenAuth.Mvc/js/utils.js b/OpenAuth.Mvc/js/utils.js
index 22b702d3..13ac429c 100644
--- a/OpenAuth.Mvc/js/utils.js
+++ b/OpenAuth.Mvc/js/utils.js
@@ -1,14 +1,27 @@
-//把name/value的数组转为obj对象
-function arrayToObj(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;
+layui.define("jquery", function (exports) {
+ var jQuery = layui.jquery,
+ $ = layui.jquery;
+
+ //获取url的参数值
+ $.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;
}
- }
- return result;
-}
\ No newline at end of file
+
+ //把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');
+});
\ No newline at end of file
diff --git a/OpenAuth.Mvc/userJs/assign.js b/OpenAuth.Mvc/userJs/assign.js
index ace75dd3..bdcc9f06 100644
--- a/OpenAuth.Mvc/userJs/assign.js
+++ b/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;
diff --git a/OpenAuth.Mvc/userJs/flowInstanceEdit.js b/OpenAuth.Mvc/userJs/flowInstanceEdit.js
index d0ca1cbf..7d7fe9f7 100644
--- a/OpenAuth.Mvc/userJs/flowInstanceEdit.js
+++ b/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);
}
});
diff --git a/OpenAuth.Mvc/userJs/flowSchemeDesign.js b/OpenAuth.Mvc/userJs/flowSchemeDesign.js
index 97f522ce..477f898d 100644
--- a/OpenAuth.Mvc/userJs/flowSchemeDesign.js
+++ b/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,
diff --git a/OpenAuth.Mvc/userJs/nodeInfo.js b/OpenAuth.Mvc/userJs/nodeInfo.js
index 34ced571..084be08d 100644
--- a/OpenAuth.Mvc/userJs/nodeInfo.js
+++ b/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;
diff --git a/OpenAuth.Mvc/userJs/preview.js b/OpenAuth.Mvc/userJs/preview.js
index 808d101a..91703bee 100644
--- a/OpenAuth.Mvc/userJs/preview.js
+++ b/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,
diff --git a/OpenAuth.Repository/Mapping/FlowInstanceMap.cs b/OpenAuth.Repository/Mapping/FlowInstanceMap.cs
index 44e673c3..6222730c 100644
--- a/OpenAuth.Repository/Mapping/FlowInstanceMap.cs
+++ b/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")
diff --git a/OpenAuth.Repository/Mapping/FormMap.cs b/OpenAuth.Repository/Mapping/FormMap.cs
index 1b25168f..9b6e44b1 100644
--- a/OpenAuth.Repository/Mapping/FormMap.cs
+++ b/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")
diff --git a/OpenAuth.UnitTest/TestWorkflow.cs b/OpenAuth.UnitTest/TestWorkflow.cs
index 5a972dae..4a7d7ee2 100644
--- a/OpenAuth.UnitTest/TestWorkflow.cs
+++ b/OpenAuth.UnitTest/TestWorkflow.cs
@@ -1,32 +1,32 @@
-using System;
-using Infrastructure;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-using OpenAuth.App;
-using OpenAuth.Repository.Domain;
-
-namespace OpenAuth.UnitTest
-{
- [TestClass]
- public class TestWorkflow :TestBase
- {
- private FlowSchemeApp _app;
- private FlowInstanceApp _runApp;
-
- public TestWorkflow()
- {
- _app = AutofacExt.GetFromFac();
- _runApp = AutofacExt.GetFromFac();
- }
-
- ///
- /// 测试流程
- /// 李玉宝于2017-01-20 9:59:11
- ///
- [TestMethod]
- public void AddProcessInstance()
- {
-
- }
-
- }
-}
+using System;
+using Infrastructure;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using OpenAuth.App;
+using OpenAuth.Repository.Domain;
+
+namespace OpenAuth.UnitTest
+{
+ [TestClass]
+ public class TestWorkflow :TestBase
+ {
+ private FlowSchemeApp _app;
+ private FlowInstanceApp _runApp;
+
+ public TestWorkflow()
+ {
+ _app = AutofacExt.GetFromFac();
+ _runApp = AutofacExt.GetFromFac();
+ }
+
+ ///
+ /// 测试流程
+ /// 李玉宝于2017-01-20 9:59:11
+ ///
+ [TestMethod]
+ public void AddProcessInstance()
+ {
+
+ }
+
+ }
+}