lsm/OpenAuth.Net
1
0
Fork 0
mirror of https://gitee.com/dotnetchina/OpenAuth.Net.git synced 2025-07-15 05:13:25 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

routine update

Browse Source
This commit is contained in:
yubao 2018-03-23 07:39:39 +08:00
parent 6dea67862a
commit 2c5a114d64
12 changed files with 64 additions and 85 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
OpenAuth.Mvc/OpenAuth.Mvc.csproj
View File

@ -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" />

3
OpenAuth.Mvc/Views/FlowInstances/Edit.cshtml
View File

@ -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>

25
OpenAuth.Mvc/js/queryString.js
View File

@ -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');
});

37
OpenAuth.Mvc/js/utils.js
View File

@ -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;
}
//把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');
});

2
OpenAuth.Mvc/userJs/assign.js
View File

@ -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;

6
OpenAuth.Mvc/userJs/flowInstanceEdit.js
View File

@ -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);
}
});

2
OpenAuth.Mvc/userJs/flowSchemeDesign.js
View File

@ -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,

2
OpenAuth.Mvc/userJs/nodeInfo.js
View File

@ -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;

2
OpenAuth.Mvc/userJs/preview.js
View File

@ -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,

2
OpenAuth.Repository/Mapping/FlowInstanceMap.cs
View File

@ -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")

3
OpenAuth.Repository/Mapping/FormMap.cs
View File

@ -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")

64
OpenAuth.UnitTest/TestWorkflow.cs
View File

@ -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<FlowSchemeApp>();
_runApp = AutofacExt.GetFromFac<FlowInstanceApp>();
}
/// <summary>
/// 测试流程
/// <para>李玉宝于2017-01-20 9:59:11</para>
/// </summary>
[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<FlowSchemeApp>();
_runApp = AutofacExt.GetFromFac<FlowInstanceApp>();
}
/// <summary>
/// 测试流程
/// <para>李玉宝于2017-01-20 9:59:11</para>
/// </summary>
[TestMethod]
public void AddProcessInstance()
{
}
}
}