lsm/OpenAuth.Net
1
0
Fork 0
mirror of https://gitee.com/dotnetchina/OpenAuth.Net.git synced 2026-04-07 09:32:57 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

更新域名

Browse Source 
fix issue #I3ZCIX 可以控制流程审批过程中表单项是否可写
This commit is contained in:
yubaolee
2021-07-22 19:33:55 +08:00
parent 154583889a
commit c7acca904a
38 changed files with 131 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
OpenAuth.Mvc/Controllers/CategoriesController.cs
View File

@@ -1,4 +1,5 @@
using System;
using System.Collections.Generic;
using System.Threading.Tasks;
using Infrastructure;
using Microsoft.AspNetCore.Mvc;
@@ -87,8 +88,18 @@ namespace OpenAuth.Mvc.Controllers
/// <returns></returns>
public string AllTypes()
{
var data = _categoryTypeApp.AllTypes();
return JsonHelper.Instance.Serialize(data);
var resp = new Response<List<CategoryTypeResp>>();
try
{
resp.Result = _categoryTypeApp.AllTypes().MapToList<CategoryTypeResp>();
}
catch (Exception e)
{
resp.Code = 500;
resp.Message = e.Message;
}
return JsonHelper.Instance.Serialize(resp);
}
}

2
OpenAuth.Mvc/Controllers/ErrorController.cs
View File

@@ -7,7 +7,7 @@
// Last Modified On : 07-24-2018
// ***********************************************************************
// <copyright file="ErrorController.cs" company="OpenAuth.Mvc">
// Copyright (c) http://www.openauth.me. All rights reserved.
// Copyright (c) http://www.openauth.net.cn. All rights reserved.
// </copyright>
// <summary>
// 异常处理页面

2
OpenAuth.Mvc/Controllers/UserSessionController.cs
View File

@@ -7,7 +7,7 @@
// Last Modified On : 07-04-2018
// ***********************************************************************
// <copyright file="UserSessionController.cs" company="OpenAuth.Mvc">
// Copyright (c) http://www.openauth.me. All rights reserved.
// Copyright (c) http://www.openauth.net.cn. All rights reserved.
// </copyright>
// <summary>
// 获取登录用户的全部信息

2
OpenAuth.Mvc/Test/UserSessionControllerTest.cs
View File

@@ -7,7 +7,7 @@
// Last Modified On : 07-02-2018
// ***********************************************************************
// <copyright file="UserSessionControllerTest.cs" company="OpenAuth.Mvc">
// Copyright (c) http://www.openauth.me. All rights reserved.
// Copyright (c) http://www.openauth.net.cn. All rights reserved.
// </copyright>
// <summary>
// 测试加载用户菜单

4
OpenAuth.Mvc/Views/Categories/Index.cshtml
View File

@@ -24,7 +24,7 @@
<div class="layui-form-item">
<label class="layui-form-label">类型标识</label>
<div class="layui-input-block">
<input type="text" name="Id" v-model="tmp.Id" required lay-verify="required"
<input type="text" name="Id" v-model="tmp.Id"
placeholder="请输入类型标识" autocomplete="off" class="layui-input">
</div>
</div>
@@ -63,4 +63,4 @@
</div>
<script type="text/javascript" src="/layui/layui.js"></script>
<script type="text/javascript" src="/userJs/categories.js?v=1.5.1"></script>
<script type="text/javascript" src="/userJs/categories.js?v=3.2"></script>

10
OpenAuth.Mvc/Views/Home/Main.cshtml
View File

@@ -79,9 +79,9 @@
</p>
<p>
<a href="https://gitee.com/yubaolee/OpenAuth.Core" target="_blank" class="layui-btn layui-btn-xs layui-btn-danger">项目地址</a>
<a class="layui-btn layui-btn-xs" target="_blank" href="http://doc.openauth.me">在线文档</a>
<a class="layui-btn layui-btn-xs layui-btn-danger" target="_blank" href="http://demo.openauth.me:1803">企业版/高级版入口</a>
<a class="layui-btn layui-btn-xs layui-btn-danger" target="_blank" href="http://demo.openauth.me:1804">企业版H5入口（请使用移动模式或者直接手机查看）</a>
<a class="layui-btn layui-btn-xs" target="_blank" href="http://doc.openauth.net.cn">在线文档</a>
<a class="layui-btn layui-btn-xs layui-btn-danger" target="_blank" href="http://demo.openauth.net.cn:1803">企业版/高级版入口</a>
<a class="layui-btn layui-btn-xs layui-btn-danger" target="_blank" href="http://demo.openauth.net.cn:1804">企业版H5入口（请使用移动模式或者直接手机查看）</a>
<span style="color: #f00;">注：【本框架遵循LGPL开源协议，企业单位如商用请联系作者授权，谢谢】</span>
</p>
<p>技术交流QQ群：484498493【已满】 &nbsp; &nbsp; 626433139【已满】 &nbsp;&nbsp; 566344079</p>
@@ -94,7 +94,7 @@
<p>* 【新增】增加在swagger界面查看接口调用时间及SQL执行时间</p>
<p>
* 【新增】支持同时配置多个类型数据库的连接字符串：
详见:<a href="http://doc.openauth.me/core/multidbs.html" target="_blank" class="layui-btn layui-btn-xs layui-btn-danger">http://doc.openauth.me/core/multidbs.html</a>
详见:<a href="http://doc.openauth.net.cn/core/multidbs.html" target="_blank" class="layui-btn layui-btn-xs layui-btn-danger">http://doc.openauth.net.cn/core/multidbs.html</a>
</p>
<p>* 【新增】增加swagger接口分组</p>
<p>* 【新增】增加流程召回功能</p>
@@ -130,7 +130,7 @@
<p>* 【优化】流程处理页面展示</p>
<p>* 【优化】流程支持角色审批</p>
<p>* 【新增】集成IdentityServer4，实现基于OAuth2的登录体系</p>
<p>* 【新增】建立三方对接规范，已有系统可以无缝对接流程引擎，请参考官方<a href="http://doc.openauth.me/thirdparty" target="_top">对接说明</a></p>
<p>* 【新增】建立三方对接规范，已有系统可以无缝对接流程引擎，请参考官方<a href="http://doc.openauth.net.cn/thirdparty" target="_top">对接说明</a></p>
</div>
<div class="layui-elem-quote layui-quote-nm">

2
OpenAuth.Mvc/appsettings.Production.json
View File

@@ -10,7 +10,7 @@
"OpenAuthDBContext": "server=127.0.0.1;user id=root;database=openauthdb;password=000000" //my sql
},
"AppSetting": {
"IdentityServerUrl": "http://demo.openauth.me:12796", //IdentityServer服务器地址。如果为空，则不启用OAuth认证
"IdentityServerUrl": "http://demo.openauth.net.cn:12796", //IdentityServer服务器地址。如果为空，则不启用OAuth认证
// "IdentityServerUrl": "", //IdentityServer服务器地址。如果为空，则不启用OAuth认证
"SSOPassport": "http://localhost:52789",
"Version": "demo",

5
OpenAuth.Mvc/wwwroot/userJs/categories.js
View File

@@ -78,6 +78,11 @@ layui.config({
},
mounted(){
form.render();
var _this = this;
layui.droptree("/Categories/AllTypes", "#TypeName", "#TypeId", false,function (ids, names) {
_this.tmp.TypeName = ids;
_this.tmp.TypeId = names;
});
}
});
}else{

2
OpenAuth.Mvc/wwwroot/userJs/flowInstanceEdit.js
View File

@@ -95,7 +95,7 @@
if (data.Result.FrmType == 0) {
$("#frmPreview").html(data.Result.Html);
} else {
$("#frmPreview").html('复杂表单暂时只能在<a href="http://demo.openauth.me:1803">企业版</a>查看，开源版预计会在以后的开源版本中发布');
$("#frmPreview").html('复杂表单暂时只能在<a href="http://demo.openauth.net.cn:1803">企业版</a>查看，开源版预计会在以后的开源版本中发布');
}
}
});

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

@@ -47,7 +47,7 @@
if (data.Result.FrmType == 0) {
_this.frmPreview = data.Result.Html
} else {
_this.frmPreview = '复杂表单暂时只能在<a href="http://demo.openauth.me:1803">企业版</a>查看，开源版预计会在以后的开源版本中发布'
_this.frmPreview = '复杂表单暂时只能在<a href="http://demo.openauth.net.cn:1803">企业版</a>查看，开源版预计会在以后的开源版本中发布'
}
});
}

2
OpenAuth.Mvc/wwwroot/userJs/flowSchemePreview.js
View File

@@ -58,7 +58,7 @@
if (data.Result.FrmType == 0) {
$("#frmPreview").html(data.Result.Html);
} else {
$("#frmPreview").html("复杂表单暂时只能在<a href='http://demo.openauth.me:1803'>企业版</a>查看，开源版预计会在以后的开源版本中发布");
$("#frmPreview").html("复杂表单暂时只能在<a href='http://demo.openauth.net.cn:1803'>企业版</a>查看，开源版预计会在以后的开源版本中发布");
}
});
});

2
OpenAuth.Mvc/wwwroot/userJs/flowinstanceDetail.js
View File

@@ -51,7 +51,7 @@
if (data.Result.FrmType == 0) {
$("#frmPreview").html(data.Result.FrmPreviewHtml);
} else {
$("#frmPreview").html("复杂表单暂时只能在<a href='http://demo.openauth.me:1803'>企业版</a>查看，开源版预计会在以后的开源版本中发布");
$("#frmPreview").html("复杂表单暂时只能在<a href='http://demo.openauth.net.cn:1803'>企业版</a>查看，开源版预计会在以后的开源版本中发布");
}
flowDesignPanel.reinitSize($(window).width() - 30, $(window).height() - 120);

2
OpenAuth.Mvc/wwwroot/userJs/formEdit.js
View File

@@ -278,7 +278,7 @@
if (obj.FrmType === 0) {
ue.setContent(obj.Content);
} else {
ue.setContent("复杂表单暂时只能在<a href='http://demo.openauth.me:1803'>企业版</a>查看，开源版预计会在以后的开源版本中发布");
ue.setContent("复杂表单暂时只能在<a href='http://demo.openauth.net.cn:1803'>企业版</a>查看，开源版预计会在以后的开源版本中发布");
}
}, 500);
});

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

@@ -10,7 +10,7 @@
if (data.Result.FrmType == 0) {
$("#content").html(data.Result.Html);
} else {
$("#content").html("复杂表单暂时只能在<a href='http://demo.openauth.me:1803'>企业版</a>查看，开源版预计会在以后的开源版本中发布");
$("#content").html("复杂表单暂时只能在<a href='http://demo.openauth.net.cn:1803'>企业版</a>查看，开源版预计会在以后的开源版本中发布");
}
});

2
OpenAuth.Mvc/wwwroot/userJs/verification.js
View File

@@ -26,7 +26,7 @@
if (data.Result.FrmType == 0) {
$("#frmPreview").html(data.Result.FrmPreviewHtml);
} else {
$("#frmPreview").html("复杂表单暂时只能在<a href='http://demo.openauth.me:1803'>企业版</a>查看，开源版预计会在以后的开源版本中发布");
$("#frmPreview").html("复杂表单暂时只能在<a href='http://demo.openauth.net.cn:1803'>企业版</a>查看，开源版预计会在以后的开源版本中发布");
}
//让层自适应iframe