Commit Graph

426 Commits

Author SHA1 Message Date
yubao
2c2e5cd179 把有些东西写到极致 2017-12-08 23:31:52 +08:00
yubao
9ae57bab41 check bugs 2017-12-08 06:33:47 +08:00
yubao
89d646bb04 统一注入代码 2017-12-08 05:49:00 +08:00
yubaolee
38cb16d9e7 越来越顺了~~ 2017-11-30 17:47:41 +08:00
yubaolee
c026f263f8 增加分类管理 2017-11-29 21:32:55 +08:00
yubaolee
b7a72f62c0 每一次都是大放血 2017-11-29 20:49:14 +08:00
yubaolee
e36664d5f6 ru 2017-11-29 18:26:36 +08:00
yubaolee
3fa7422f5a RU 2017-11-29 10:35:25 +08:00
yubao
c860101747 ru 2017-11-29 00:48:51 +08:00
yubao
6a3fa6fd3d 这是有史以来最艰难的一次提交,不生则死! 2017-11-28 23:54:49 +08:00
yubao
9c37623d7f ru 2017-10-31 00:44:23 +08:00
yubao
45a08aaf41 org manager 2017-10-27 00:26:06 +08:00
yubaolee
c617a3ecdb ru 2017-10-12 16:38:46 +08:00
yubaolee
54eac35dbc update layui to 2.1.5 2017-10-12 09:24:57 +08:00
yubaolee
0659eb84c1 调整结构 2017-10-11 16:19:34 +08:00
yubao
0186153921 调整数据结构 2017-09-08 00:29:48 +08:00
yubao
1b6dd92edb ru 2017-09-06 23:57:10 +08:00
yubaolee
068e6f600f 完成用户管理,layui弹出有问题 2017-09-06 17:32:35 +08:00
yubaolee
184e2f6bb7 check vue doesn't observe OrganizationIds 2017-09-05 15:29:52 +08:00
yubao
e77280210e 更换vue为1.x版本 2017-09-04 23:23:38 +08:00
yubao
f66e8f1d1e 引入vue 2017-09-03 23:21:49 +08:00
yubao
3184479120 完成用户添加,删除,批量删除 2017-09-03 00:21:03 +08:00
yubao
7a2a909edd 调整droptree;
提取通用方法openauth.js
2017-09-02 14:32:24 +08:00
yubaolee@163.com
2a5a165776 ru 2017-09-01 18:48:19 +08:00
yubaolee@163.com
a9218167a5 用户可以正常添加 2017-09-01 18:36:25 +08:00
yubao
376076b30f ru 2017-09-01 01:24:10 +08:00
yubao
d19eee3c36 修改添加用户对话框 2017-09-01 00:47:44 +08:00
yubaolee
2f2aedc432 complete user list 2017-08-31 19:54:12 +08:00
yubaolee
d88668def1 引入ztree 2017-08-31 19:23:29 +08:00
yubaolee
15a9697ed0 ru 2017-08-31 17:29:07 +08:00
yubaolee
5b8ef27b7a ru 2017-08-31 16:59:19 +08:00
yubao
08c5f7823f 静态table置入 2017-08-30 23:44:43 +08:00
yubao
a83f8ce6d0 layui 2.10 2017-08-30 22:41:02 +08:00
yubaolee
84eb63c288 add need files 2017-08-30 18:17:58 +08:00
yubaolee
31e870a41c 重构左侧导航 2017-08-30 18:16:06 +08:00
yubaolee
c37164b5a8 ru 2017-08-30 17:15:05 +08:00
yubaolee
c1e84d7334 layui 2.02 2017-08-30 16:49:28 +08:00
四少爷
fb62293083 MySQL支持
Signed-off-by: 四少爷 <sex@jermey.cn>
2017-06-29 14:52:43 +08:00
yubaolee
80466217a0 routine update 2017-06-03 01:03:23 +08:00
yubaolee
ddb5b3424c routine update 2017-06-03 01:01:24 +08:00
yubaolee
ab5adb343d 优化流程中选择用户列表 2017-06-01 00:07:01 +08:00
yubaolee
f0e0ec09ce 常规优化 2017-05-07 20:26:00 +08:00
yubaolee
96a9ee6bd2 优化autofac注入方式,Controller使用属性注入 2017-03-24 15:35:52 +08:00
yubaolee
9122bec093 修复bug 2017-03-22 00:09:03 +08:00
yubaolee
48d9062258 修复流程表单中文件上传BUG 2017-03-12 22:46:55 +08:00
yubaolee
dc9af8b8ea 去掉草稿 2017-03-10 00:09:33 +08:00
yubaolee
ed37dae1a0 check bug 2017-03-07 09:11:57 +08:00
yubaolee
3f5eece334 check issue #26 2017-03-06 17:02:50 +08:00
yubaolee
1030f0e3f1 check bugs 2017-03-03 17:52:55 +08:00
yubaolee
631b42c89e check bugs 2017-03-01 11:48:25 +08:00
yubaolee
91dfa83e6f check bugs 2017-02-28 16:51:07 +08:00
yubaolee
02742c5ad4 add flow run user 2017-02-27 18:56:02 +08:00
yubaolee
3657cb2add 模块添加按钮 2017-02-08 09:15:49 +08:00
yubaolee
833914199e check issue #22 2017-02-08 08:37:57 +08:00
yubaolee
0a6e2a54a7 update icon 2017-02-07 19:38:53 +08:00
yubaolee
3283d96f69 update flow css 2017-02-07 17:24:37 +08:00
yubaolee
f5b7095d17 bug fix 2017-02-07 14:06:02 +08:00
yubaolee
031a49f118 3.0 全新的工作流 2017-02-07 13:58:34 +08:00
yubaolee
ba7f1869f7 调整JS结构 2017-02-07 13:42:27 +08:00
yubaolee
6922fea076 routine update 2017-02-07 12:29:11 +08:00
yubaolee
cb7ab591c6 routine update 2017-02-07 11:51:24 +08:00
yubaolee
7a5084b6e1 修复表单设计bug 2017-02-07 11:36:26 +08:00
yubaolee
25ab9739a0 可以编辑表单 2017-02-06 23:17:51 +08:00
yubaolee
1d87bc4262 删除无用的JS 2017-02-06 19:47:00 +08:00
yubaolee
9feeb453d1 优化流程节点显示 2017-02-06 19:11:21 +08:00
yubaolee
03622e25e7 合并流程运行代码 2017-02-06 18:28:36 +08:00
yubaolee
16dae39eae 优化流程审核 2017-02-06 18:02:52 +08:00
yubaolee
893e1e0c87 优化审核 2017-02-06 14:52:43 +08:00
yubaolee
4abf45e41a 表单设计 2017-02-06 00:12:11 +08:00
yubaolee
39ce179b49 可以正常审核 2017-02-04 17:53:22 +08:00
yubaolee
957f0beda8 流程审核 2017-01-24 18:51:27 +08:00
yubaolee
f0f32036f9 修复删除流程模版,列表分页问题,添加模版预览功能 2017-01-24 16:04:17 +08:00
yubaolee
4bd51b0264 routine update 2017-01-23 23:07:49 +08:00
yubaolee
2900d52bc3 routine update 2017-01-23 18:25:24 +08:00
yubaolee
550c511be1 routine update 2017-01-23 13:48:27 +08:00
yubaolee
60375d9c52 routine update 2017-01-23 13:47:37 +08:00
yubaolee
0ae929c87a 流程设计列表 2017-01-20 18:01:23 +08:00
yubaolee
b9a849e3ea 删除workflowengine.net 2017-01-20 17:49:45 +08:00
yubaolee
b46729b31d 完成流程实例列表/详情、流程模版添加 2017-01-20 16:51:30 +08:00
yubaolee
7bf9aa6c34 flow ui 2017-01-13 20:15:33 +08:00
yubaolee
60b21be147 flow ui 2017-01-13 19:26:36 +08:00
yubaolee
feaa4c36c2 flowui 2017-01-12 19:55:16 +08:00
yubaolee
966681a82f flow ui 2017-01-12 19:48:01 +08:00
yubaolee
85b10e8877 flow ui 2017-01-12 19:24:52 +08:00
yubaolee
21b37f77cf flow ui 2017-01-12 19:16:37 +08:00
yubaolee
a3bdcf83ec Merge branch 'master' of https://git.oschina.net/ly.bing/OpenAuth.Net into newui 2016-12-21 15:03:37 +08:00
yubaolee
4475cf8886 check #23 2016-12-01 00:49:12 +08:00
yubaolee
b3b0174430 delete release/obj 2016-11-02 19:26:38 +08:00
yubaolee
07a3da8995 update ErrorController 2016-11-01 17:14:51 +08:00
yubaolee
da22a8992e routine update 2016-10-31 11:43:49 +08:00
yubaolee
9db1645bfb routine update 2016-10-31 11:03:28 +08:00
yubaolee
80fdc3ff97 routine update 2016-10-29 23:02:39 +08:00
yubaolee
74d8682311 routine update 2016-10-29 22:41:52 +08:00
yubaolee
ddc311b38e routine update 2016-10-29 22:27:39 +08:00
yubaolee
ff0d85310c amplify login 2016-10-28 19:02:02 +08:00
yubaolee
dc10cc57ad routine update 2016-10-28 15:23:13 +08:00
yubaolee
cf0dbf16a3 routine update 2016-10-27 17:04:09 +08:00
yubaolee
c12466e8f3 delete workflow 2016-10-27 16:55:38 +08:00
yubaolee
b1ee459c9e routine update 2016-10-27 16:46:42 +08:00
yubaolee
956137ac3a routine update 2016-10-27 16:32:36 +08:00
yubaolee
fb28ea5488 routine update 2016-10-27 16:05:15 +08:00
yubaolee
be47dc50ea routine update 2016-10-27 15:14:32 +08:00
yubaolee
53f7fe403b login页面,navbar优化 2016-10-24 17:16:16 +08:00
yubaolee
e9f6336536 update ui 2016-10-21 18:18:58 +08:00
yubaolee
b3a7afc32b 完成分配 2016-10-21 00:33:35 +08:00
yubaolee
de50581f8b 完成分配菜单 2016-10-20 16:47:35 +08:00
yubaolee
5d2569dddd 完成用户分配模块 2016-10-19 10:03:24 +08:00
yubaolee
3b99938df1 分配模块 2016-10-18 17:34:41 +08:00
yubaolee
023b76efda 分配按钮样式调整 2016-10-18 14:19:25 +08:00
yubaolee
5c069f2361 完成菜单管理 2016-10-18 11:11:51 +08:00
yubaolee
26c11376f1 完成列表 2016-10-17 15:04:30 +08:00
yubaolee
e514779974 routine update 2016-10-17 11:43:56 +08:00
yubaolee
df75ea7fb0 Merge branch 'newui' of https://git.oschina.net/yubaolee/OpenAuth.Net into newui 2016-10-17 08:38:09 +08:00
yubaolee
e078ea62bf add navbar 2016-10-17 08:37:53 +08:00
yubaolee
36d77b17f6 修改界面,重构授权代码 2016-10-17 00:20:55 +08:00
yubaolee
43c44d30af 完成用户列表/资源列表改造 2016-10-15 01:27:39 +08:00
yubaolee
62f3885380 优化机构管理删除 2016-10-14 17:50:44 +08:00
yubaolee
8fca8cb00e add Blank.cshtml 2016-10-14 17:10:16 +08:00
yubaolee
7f7c0f891a 完成分类列表处理 2016-10-14 17:03:18 +08:00
yubaolee
9606a71f72 采用ACE界面 2016-10-14 11:22:16 +08:00
yubaolee
007c901002 汉化 2016-09-29 10:29:39 +08:00
yubaolee
72bc3cbc09 汉化 2016-09-29 10:11:36 +08:00
yubaolee
ebccd85545 Merge branch 'newui' 2016-09-29 10:10:41 +08:00
yubaolee
65696e2751 流程汉化 2016-09-29 10:08:01 +08:00
yubaolee
2bb6da86cf 支持多流程模板 2016-09-28 17:21:59 +08:00
yubaolee
d730ab5bdb Merge branch 'newui' 2016-09-28 17:19:39 +08:00
yubaolee
f001e83c33 完善单元测试 2016-09-22 15:38:43 +08:00
yubaolee
5385d4e03e check issue #17 2016-09-19 20:47:06 +08:00
yubaolee
5996d6b5f7 提交申请时,可以选择流程模板 2016-09-16 18:05:57 +08:00
yubaolee
6938bffb22 Merge branch 'workflow' 2016-09-14 16:21:53 +08:00
yubaolee
bf1121f24b 完成流程模板列表 2016-09-14 16:11:46 +08:00
yubaolee
e7aa36e83a Merge branch 'workflow' 2016-09-12 09:41:49 +08:00
yubaolee
e430b2716d delete demo config in web.config 2016-09-09 17:51:33 +08:00
yubaolee
b4f02ff7d3 调整删除时http提交方式 2016-09-08 16:20:31 +08:00
yubaolee
a274030625 check words 2016-09-07 19:53:26 +08:00
yubaolee
7aff8036ef fix bugs 2016-09-07 18:57:58 +08:00
yubaolee
c8dec703a7 完成流程列表 2016-09-07 16:58:08 +08:00
yubaolee
0c82f7b8c3 增加流程状态转换列表 2016-09-07 11:11:34 +08:00
yubaolee
96e8eec1e7 fix css bugs 2016-09-06 10:55:55 +08:00
yubaolee
d5d476bae4 流程跳转 2016-09-05 20:07:10 +08:00
yubaolee
8f2ae61905 增加workflow数据库初始脚本 2016-09-05 00:09:46 +08:00
yubaolee
56d5ea0e8a 更改PDM文件
删除为用户分配可见机构(本身有机构功能)
删除为角色分配机构(本身有机构多对多功能)
2016-09-04 23:34:16 +08:00
yubaolee
d5a6ffe3b8 调整流程详情显示效果
添加DataGrid数据格式
2016-09-04 01:15:43 +08:00
yubaolee
574f5f9e1f 全面修改Id为Guid类型,为2.0版做准备 2016-09-02 18:05:17 +08:00
yubaolee
ba897b1d88 延长登陆时间 2016-08-30 20:02:08 +08:00
yubaolee
04d69e065e 不能分配角色的BUG 2016-08-30 19:08:36 +08:00
yubaolee
26225ad305 Merge branch 'master' of https://git.oschina.net/yubaolee/OpenAuth.Net 2016-08-30 15:30:06 +08:00
yubaolee
5d24487ba9 优化token 2016-08-30 15:17:07 +08:00
kuaigoumanzhu
ece6a57d6e 操作失误修改了数据库登录密码 2016-08-27 00:36:59 +08:00
kuaigoumanzhu
35d76eb2b1 修复下边框遮盖问题 2016-08-27 00:34:58 +08:00
kuaigoumanzhu
78092c1aa5 下边框遮盖问题 2016-08-27 00:29:44 +08:00
yubaolee
b31ea86fc3 workflowengine.net 结构调整 2016-08-22 16:11:46 +08:00
yubaolee
aabd344ec9 routine update 2016-07-19 15:18:45 +08:00
yubaolee
0aa470a8ca 修复分页导航undefined问题 2016-07-19 15:02:40 +08:00
yubaolee
3dea7d00f0 调整部分代码结构 2016-07-19 11:44:48 +08:00
yubaolee
860af2a0f9 紧急修复因SSO功能造成的某些页面访问失败 2016-07-14 00:14:24 +08:00
yubaolee
5f08a59f27 修改部分文件结构,完善第三方登陆功能 2016-07-12 12:28:54 +08:00
yubaolee
994ab81ebb check some bugs 2016-07-11 18:21:26 +08:00
yubaolee
35ebe1d3d0 system账号登陆异常 2016-07-08 19:44:56 +08:00
yubaolee
781ae8900d v1.2版,全面实现SSO登陆 2016-07-08 18:51:48 +08:00
yubaolee
032bc20e1e 增加SSO逻辑 2016-07-08 11:28:38 +08:00
yubaolee
38eec363d7 修复模块菜单不受分级控制的BUG 2016-05-27 12:39:14 +08:00
yubaolee
fbdd6163a2 v1.1 实现用户分级授权,得到权限的用户只能在自己的权限范围内再进一步操作 2016-05-27 00:58:36 +08:00
yubaolee
ef6a274ac6 check javascript bugs 2016-05-26 23:01:07 +08:00
yubaolee
855f97df7d 全面修正分级授权,去掉Anonymous,采用Authenticate进行授权 2016-05-26 20:10:22 +08:00
yubaolee
b3c6df2931 check javascript bugs 2016-05-26 14:58:18 +08:00
yubaolee
aa6b31d474 check javascript bugs 2016-05-26 11:46:57 +08:00
yubaolee
0c8399cbc4 check js bugs 2016-05-26 10:30:15 +08:00
yubaolee
40666863d9 1 增加UnitWork
2 修改UnitTest项目为C# 6.0
2016-04-29 16:26:09 +08:00
yubaolee
6181f9dd47 增加演示版本支持,在web.config中配置即可;
增加自定义出差处理,参考ErrorController
2016-04-25 11:53:21 +08:00
yubaolee
3037c3b1f6 check bugs: git.cshtml/menuheader.cshtml 生成操作改为“内容" 2016-04-22 16:52:12 +08:00
yubaolee
2de1fb6433 1.0正式版
修复beta版未能解决的BUG;
全面修改页面结构,采用面向对象JS开发;
优化进出库管理示例,对资源的应用更加清晰;
完整的SQL初始数据;
2016-04-21 15:48:38 +08:00
yubaolee
2d13810c82 1 check issue #12
2 修改登录为Identity认证方式
2016-04-21 10:54:05 +08:00
yubaolee
9c8b6f8629 全面完成前端模块化! 2016-04-20 16:33:27 +08:00
yubaolee
0738c84535 完成菜单分配JS模块化 2016-04-18 23:36:40 +08:00
yubaolee
2c521e3244 修复datagrid高度问题
发布新的初始数据,主要是前端模块化后统一了add()/edit()/del()等函数名称
2016-04-17 23:49:53 +08:00
yubaolee
40ffa5f1e8 完成资源分配前端模块化处理 2016-04-17 23:16:58 +08:00
yubaolee
2f0a9a3719 完成所有主列表JS模块化 2016-04-16 23:25:00 +08:00
yubaolee
25bb5bf07c add js module 2016-04-15 17:54:01 +08:00
yubaolee
fa4b890965 优化部分JS前端模块,后期统一按此结构调整 2016-04-15 17:49:21 +08:00
yubaolee
587726951b 修复用户分配角色的BUG 2016-04-13 14:56:34 +08:00
yubaolee
0786ea0420 routine update 2016-04-12 00:08:21 +08:00
yubaolee
1cb473d9ac routine update 2016-04-12 00:06:06 +08:00
yubaolee
d54062bc0b 全面调整JS文件结构,为模块化前端做准备 2016-04-11 23:46:33 +08:00
yubaolee
4ced496da9 调整文件结构,为全面优化javascript代码做准备 2016-04-06 23:28:27 +08:00
yubaolee
38e2628b15 增加mysql支持 2016-04-01 17:12:33 +08:00
yubaolee
068e6a4bac 修复因iframe造成的分页导航显示问题 2016-02-18 17:33:40 +08:00
yubaolee
f63159dc07 修改支持iframe,这样后台多navtab时,就不用为每个dom定义ID了!!!! 2016-02-02 16:32:26 +08:00
yubaolee
2968b52c2a 修改支持iframe,这样后台多navtab时,就不用为每个dom定义ID了!!!! 2016-02-02 15:30:46 +08:00
yubaolee
6de2bf4ea2 更新B-JUI到1.3版本 2016-01-17 11:29:46 +08:00
yubaolee
ca609fb9be check issue #7
修复添加按钮时不输入描述时异常BUG
2016-01-14 17:30:29 +08:00
yubaolee
ab3fc27301 1.0 beta版
1 完成进出库实例Stock;
2 全面实现组织数据分离,参考Stock实例;
3 全新的基于CodeSmith EF生成机制;
4 全面完成菜单授权;
5 增加Anonymous机制,可以灵活控制Action是否需要权限控制;
2016-01-08 12:53:48 +08:00
yubaolee
5317e07ae5 check issue #6 2016-01-07 15:55:53 +08:00
yubaolee
f0b42e83d4 1 完成用户部门权限分配处理,可以为用户分配可见部门,如果没有任何可见部门,则只能查看自己有关的数据;
2 完善进出库实例;
3 添加CodeSmith生成EF DbContext Entity Mapping;
2016-01-07 11:47:43 +08:00
yubaolee
c2099cd337 check issue #5 2016-01-05 22:47:38 +08:00
yubaolee
e744456a95 紧急修复因修复#3造成的乱码问题,在WINDOWS下面必需使用带BOM的UTF-8编码! 2016-01-05 17:14:10 +08:00
yubaolee
942f606a2b check issue #3 2016-01-05 10:03:35 +08:00
yubaolee
7cc293c121 check Issues #1 2016-01-02 23:16:22 +08:00
yubaolee
935f5e5cc1 完成资源授权,元旦节正式发布1.0版,敬请期待! 2015-12-22 15:04:15 +08:00
yubaolee
f853bd13b7 修改用户分配角色操作界面 2015-12-22 11:55:54 +08:00