yuandq/yili-apps
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
349 Commits 13 Branches 0 Tags 449 MiB
master
Commit Graph

212 Commits

Author SHA1 Message Date
mrs_12345@163.com
5b418056e8 流程发布自适应画布大小 2022-07-08 19:37:51 +08:00
mrs_12345@163.com
fa0d386fa5 设计器数据属性表格类型多表格显示与保存bug解决 2022-07-08 18:12:46 +08:00
anhc
237b52c8a0 新增小组角色dao方法添加字段 2022-07-08 18:06:52 +08:00
zhal
147f234613 增加图标 2022-07-08 16:40:11 +08:00
mrs_12345@163.com
cd217f11df 流程发布缩略图与页面大小调整 2022-07-08 15:19:22 +08:00
zhal
435905235f 回复代码 2022-07-08 13:37:28 +08:00
zhal
83226d20bc 修改流程架构 2022-07-08 13:12:18 +08:00
zhal
83b03331e9 Merge branch 'master' of https://e.coding.net/yilidev/yilipalkaifa/apps 2022-07-08 12:25:55 +08:00
mrs_12345@163.com
4d5b66e0f8 设计器文件属性表格类型字段重复 2022-07-08 11:52:53 +08:00
zhal
d74a69fd3b Merge branch 'master' of https://e.coding.net/yilidev/yilipalkaifa/apps 2022-07-08 11:26:26 +08:00
zhal
de8249544a 组织图标显示 2022-07-08 11:22:29 +08:00
chengli
ecac7d4466 Merge remote-tracking branch 'origin/master' 2022-07-08 11:21:39 +08:00
chengli
f89954553f js文件处理 2022-07-08 11:21:09 +08:00
qinoy
67a7951527 伊利项目-增加审批中状态补提文件 2022-07-08 11:10:51 +08:00
qinoy
0902239d1b 伊利项目-增加审批中状态 2022-07-08 10:46:06 +08:00
chengli
747eaccbcc js文件处理 2022-07-08 10:41:03 +08:00
zhal
26354aea07 压缩代码 2022-07-08 10:29:47 +08:00
chengli
038810e31e 上传附件按钮 2022-07-07 22:40:54 +08:00
chengli
5e9dad9823 处理制度条款样式 2022-07-07 22:36:38 +08:00
chengli
d01c69fb4d Merge remote-tracking branch 'origin/master' 2022-07-07 21:45:13 +08:00
chengli
eef12a84aa 导入附件制度 2022-07-07 21:43:02 +08:00
446052889@qq.com
0d29684ecb 提交 2022-07-07 20:57:17 +08:00
mrs_12345@163.com
b12595875c 设计器表格类型换行显示 2022-07-07 20:24:00 +08:00
446052889@qq.com
2af24dff46 形状属性tab切换错误问题 2022-07-07 19:11:04 +08:00
chengli
4d526a3cd2 Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	com.actionsoft.apps.coe.pal.datamigration/src/com/actionsoft/apps/coe/pal/datamigration/util/htmltodocx/HtmlToWord.java
 2022-07-07 18:21:08 +08:00
chengli
2130075e31 制度导入时 将正文存为富文本 富文本窗口调大 2022-07-07 18:20:20 +08:00
zhal
d733d7bd40 流程代码 2022-07-07 17:54:54 +08:00
anhc
b54b65bc53 新版权限小组角色查询方式调整 2022-07-07 17:22:21 +08:00
zhal
5c5bfd37b9 质量校验代码 2022-07-07 17:01:08 +08:00
zhal
f9554796cf 流程阅览超链接代码 2022-07-07 16:59:03 +08:00
翟林帆
6dc3bba68b Merge branch 'master' of https://e.coding.net/yilidev/yilipalkaifa/apps 2022-07-07 15:34:13 +08:00
zhal
6514facb8c 增加图形放大缩小功能，优化新建角色模型代码 2022-07-07 15:32:31 +08:00
翟林帆
c9c5256947 Merge remote-tracking branch 'origin/master' 2022-07-07 15:15:54 +08:00
翟林帆
6d5308528b Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	com.actionsoft.apps.coe.pal.datamigration/src/com/actionsoft/apps/coe/pal/datamigration/DataMigrationController.java
#	com.actionsoft.apps.coe.pal.datamigration/src/com/actionsoft/apps/coe/pal/datamigration/util/htmltodocx/Test.java
#	com.actionsoft.apps.coe.pal.datamigration/src/com/actionsoft/apps/coe/pal/datamigration/util/readtable/ReadTable.java
#	com.actionsoft.apps.coe.pal.datamigration/src/com/actionsoft/apps/coe/pal/datamigration/util/readtable/WordTableAttrFile.java
 2022-07-07 15:15:51 +08:00
zhal
3ce583eb42 数据迁移代码 2022-07-07 12:25:33 +08:00
zhal
798b56d6bf 优化质量校验代码 2022-07-06 23:26:18 +08:00
shangguochao
cb34360976 打包部署测试环境 2022-07-06 21:54:51 +08:00
zhal
ca23230e06 评论回复代码 2022-07-06 21:40:53 +08:00
anhc
74ff2c8222 method缓存获取小组用户权限数据方法修改 2022-07-06 20:37:43 +08:00
mrs_12345@163.com
60e400e8cc 快捷调整间距(暂停) 2022-07-06 20:35:13 +08:00
mrs_12345@163.com
c41fb2a31b 设计器文件属性时间选择器位置bug修复 2022-07-06 20:15:45 +08:00
shangguochao
ee65540361 Merge branch 'master' of https://e.coding.net/yilidev/yilipalkaifa/apps 
# Conflicts:
#	com.actionsoft.apps.coe.pal/lib/com.actionsoft.apps.coe.pal.jar
 2022-07-06 20:03:51 +08:00
shangguochao
8e73127472 测试环境打包 2022-07-06 20:00:16 +08:00
anhc
20f07ce697 method缓存获取小区用户权限数据方法调整 2022-07-06 17:44:45 +08:00
446052889@qq.com
1e5300663a 必填校验逻辑改为后端处理 2022-07-06 17:26:58 +08:00
anhc
c90a483aed 修改小组新增文件接口默认赋值权限 2022-07-06 17:22:31 +08:00
qinoy
ba084184b5 伊利项目-设计器页面版本差异查看 2022-07-06 16:23:21 +08:00
翟林帆
b24da3a557 Merge remote-tracking branch 'origin/master' 2022-07-06 10:17:52 +08:00
翟林帆
df6107eb37 Merge branch 'datamigration-word' of https://e.coding.net/yilidev/yilipalkaifa/apps 
 Conflicts:
	com.actionsoft.apps.coe.pal.datamigration/src/com/actionsoft/apps/coe/pal/datamigration/DataMigrationController.java
	com.actionsoft.apps.coe.pal.datamigration/src/com/actionsoft/apps/coe/pal/datamigration/util/htmltodocx/HtmlUtils.java
	com.actionsoft.apps.coe.pal.datamigration/src/com/actionsoft/apps/coe/pal/datamigration/util/htmltodocx/Test.java
	com.actionsoft.apps.coe.pal.datamigration/web/com.actionsoft.apps.coe.pal.datamigration/action.xml
 2022-07-06 10:16:22 +08:00
anhc
524cd4a96c 新增文件接口中调整权限赋予位置，用户权限缓存补充对隐藏角色权限 2022-07-06 10:01:21 +08:00
chengli
d101790c41 富文本编辑第一版代码。 2022-07-05 23:36:19 +08:00
zhal
ea50f67f11 定时同步组织代码 2022-07-05 22:52:53 +08:00
zhal
ca1d50da37 定时同步组织代码 2022-07-05 22:51:14 +08:00
anhc
db8b5e6f30 打开设计页面接口内容权限控制调整 2022-07-05 21:25:26 +08:00
shangguochao
a620b40a07 Merge branch 'master' of https://e.coding.net/yilidev/yilipalkaifa/apps 
# Conflicts:
#	com.actionsoft.apps.coe.pal/lib/com.actionsoft.apps.coe.pal.jar
 2022-07-05 21:20:49 +08:00
shangguochao
b51e0692b1 打包同步测试环境 2022-07-05 21:18:20 +08:00
zhal
8dfde64abc 定时同步组织代码 2022-07-05 21:12:55 +08:00
zhal
227e2b778e Merge branch 'master' of https://e.coding.net/yilidev/yilipalkaifa/apps 2022-07-05 20:53:00 +08:00
anhc
6787b98716 针对文件详情接口添加文件控制权限flag 2022-07-05 20:52:37 +08:00
anhc
a8b8bd3ba3 根据pid获取下属子文件接口权限相关内容调整 2022-07-05 20:06:07 +08:00
zhal
fb3a52a499 定时同步组织代码 2022-07-05 18:00:56 +08:00
zhal
7c64ee6083 绩效校验 2022-07-05 17:48:47 +08:00
qinoy
d8e065f57e 补提jar包 2022-07-05 17:38:00 +08:00
qinoy
4eb8786fc9 PAL主界面资产文件列表展示版本与状态信息 2022-07-05 17:30:39 +08:00
qinoy
5c90eb3de2 PAL主界面资产文件列表展示版本与状态信息 2022-07-05 17:21:50 +08:00
anhc
095fb8ce5c 修改获取获取小组权限方法，改为使用用户权限缓存 2022-07-05 17:12:08 +08:00
anhc
af0d3a1a25 获取header权限方法更换使用用户权限缓存获取app应用权限 2022-07-05 16:54:24 +08:00
anhc
f7b73da52b 补充被merge掉的代码 2022-07-05 15:42:03 +08:00
shangguochao
c0d983516c Merge branch 'master' of https://e.coding.net/yilidev/yilipalkaifa/apps 2022-07-05 15:06:17 +08:00
shangguochao
48317b9078 IT系统图新增别名属性 2022-07-05 15:06:10 +08:00
zhal
87d534ce79 注释代码 2022-07-05 14:59:17 +08:00
shangguochao
0693b72ca6 Merge branch 'master' of https://e.coding.net/yilidev/yilipalkaifa/apps 2022-07-05 14:57:29 +08:00
zhal
b811007511 补全获取路径代码 2022-07-05 14:56:40 +08:00
zhal
6fd8444cf3 Merge branch 'master' of https://e.coding.net/yilidev/yilipalkaifa/apps 2022-07-05 14:51:53 +08:00
zhal
0ead494ffe 定时同步组织代码 2022-07-05 14:43:47 +08:00
shangguochao
90e139546f Merge branch 'master' of https://e.coding.net/yilidev/yilipalkaifa/apps 
# Conflicts:
#	com.actionsoft.apps.coe.pal/lib/com.actionsoft.apps.coe.pal.jar
 2022-07-05 14:36:14 +08:00
mrs_12345@163.com
d7c9511bce PAL设计器时间类型输入框id修改 2022-07-05 14:09:22 +08:00
zhal
2ba17f768b 解决创建默认错误数据问题 2022-07-05 13:56:32 +08:00
anhc
bc60e9abcf 小组成员dao添加用户多角色查询方法 2022-07-05 11:28:33 +08:00
anhc
b364c72041 小组api中添加查询指定roleid的角色信息 2022-07-05 11:12:00 +08:00
shangguochao
e22cee6ac4 Merge branch 'master' of https://e.coding.net/yilidev/yilipalkaifa/apps 2022-07-05 10:57:50 +08:00
shangguochao
50690d3dae 本地打包升级测试环境 2022-07-05 10:57:45 +08:00
mrs_12345@163.com
51d735e371 快捷调整间距鼠标右键菜单显示 2022-07-05 10:33:11 +08:00
zhal
c9830acae5 手动刷新数据代码 2022-07-05 10:23:27 +08:00
mrs_12345@163.com
09f9b2c4fd PAL设计器文件属性时间类型bug修复 2022-07-05 10:19:11 +08:00
zhal
e21de7c0fc 组织架构代码 2022-07-04 23:53:43 +08:00
zhal
f5d37f0d04 定时同步组织代码 2022-07-04 23:34:35 +08:00
zhal
34f9eae515 质量校验代码 2022-07-04 23:03:34 +08:00
anhc
4c910646e5 Merge branch 'master' of https://e.coding.net/yilidev/yilipalkaifa/apps 2022-07-04 21:32:57 +08:00
chengli
3c606f0981 流程属性相关代码 2022-07-04 21:32:07 +08:00
anhc
ff5c484791 角色dao查询映射添加字段 2022-07-04 21:26:22 +08:00
zhal
db668bbb63 组织架构同步代码 2022-07-04 21:24:24 +08:00
zhal
78f017178c 组织架构数据初始代码 2022-07-04 21:20:48 +08:00
chengli
1c5c532317 Merge remote-tracking branch 'origin/master' into datamigration-word 
# Conflicts:
#	com.actionsoft.apps.coe.pal.datamigration/src/com/actionsoft/apps/coe/pal/datamigration/DataMigrationController.java
#	com.actionsoft.apps.coe.pal.datamigration/src/com/actionsoft/apps/coe/pal/datamigration/util/readword/WordFinal.java
#	com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/util/CoeProcessLevelUtil.java
 2022-07-04 21:18:41 +08:00
anhc
33aaa3b6b7 批量添加小组成员方法修改，增加删除隐式用户角色api 2022-07-04 21:09:04 +08:00
chengli
9b170725e4 流程属性~相关代码 2022-07-04 21:02:19 +08:00
anhc
5b93fc8fa4 小组用户权限缓存更新获取小组下权限文件方法，增加角色下模型数据查询方法 2022-07-04 17:44:05 +08:00
anhc
19b5d9bd07 pal 小组缓存更新方法提交 2022-07-04 16:57:42 +08:00
翟林帆
3a2e463942 同步字段 2022-07-04 16:30:36 +08:00
anhc
1c7dd2743c 小组用户角色表model添加字段isUser 是否为隐藏用户角色 2022-07-04 15:48:50 +08:00