Commit Graph

80 Commits

Author SHA1 Message Date
chengli
c6e415f77d 挂载附件 2022-07-08 15:25:32 +08:00
chengli
10fb583051 制度和表单批量~~ 2022-07-07 22:37:23 +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
4d8384704b 路径空格问题 2022-07-07 21:00:53 +08:00
54cc4495ae 流程代码 2022-07-07 20:06:06 +08:00
c80ddca95a 多文件上传代码 2022-07-07 20:05:42 +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
d733d7bd40 流程代码 2022-07-07 17:54:54 +08:00
f9554796cf 流程阅览超链接代码 2022-07-07 16:59:03 +08:00
anhc
028be0161a 修复流程导入日志文件名称过长问题 2022-07-07 16:27:11 +08:00
anhc
cb3b5ac448 修复流程导入日志文件名称过长问题 2022-07-07 16:22:32 +08:00
anhc
3a30f17591 补充被merge掉代码 2022-07-07 16:20:49 +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
3ce583eb42 数据迁移代码 2022-07-07 12:25:33 +08:00
446052889@qq.com
27e5af45a6 角色模型中ext2填充流程id 2022-07-07 11:33:49 +08:00
3596dbf5d7 制度,表单多文件上传 2022-07-07 11:06:53 +08:00
anhc
f2ad3a081d IT系统图导入获取数据属性列表方法修改 2022-07-07 10:39:15 +08:00
anhc
a94b875ddb 批量导入日志完善 2022-07-07 09:35:46 +08:00
anhc
7e7dbfbaca 批量流程导入接口加入日志输出 2022-07-07 00:22:14 +08:00
shangguochao
cb34360976 打包部署测试环境 2022-07-06 21:54:51 +08:00
chengli
eebb95441c Merge remote-tracking branch 'origin/master' 2022-07-06 21:35:45 +08:00
chengli
b8c92ee62a 处理表单模型生成时 无属性值得情况。 2022-07-06 21:35:32 +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
2261f14fe9 修改流程属性Word导入接口为批量导入 2022-07-06 15:28:12 +08:00
shangguochao
673e9c89bf 删除不必要文件 2022-07-06 15:26:34 +08:00
qinoy
c25b10ca22 word文件导入批量上传前端修改 2022-07-06 15:09:47 +08:00
chengli
0e902ea525 表单属性解析相关代码 2022-07-06 14:27:02 +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
0938985027 Word解析工具内容调整 2022-07-06 10:13:54 +08:00
chengli
d101790c41 富文本编辑第一版代码。 2022-07-05 23:36:19 +08:00
shangguochao
b51e0692b1 打包同步测试环境 2022-07-05 21:18:20 +08:00
446052889@qq.com
24947ddcb7 导入模型是角色图形状间距缩小 2022-07-05 18:54:42 +08:00
446052889@qq.com
7b4863ca65 aris数据迁移IT系统别名映射调整 2022-07-05 18:13:01 +08:00
shangguochao
c92421bf9e Merge branch 'master' of https://e.coding.net/yilidev/yilipalkaifa/apps 2022-07-05 17:04:19 +08:00
shangguochao
32370b8d7f 补充vue文件 2022-07-05 17:04:11 +08:00
446052889@qq.com
a57502c9f0 活动描述导入不显示 2022-07-05 16:21:12 +08:00
shangguochao
50690d3dae 本地打包升级测试环境 2022-07-05 10:57:45 +08:00
34f9eae515 质量校验代码 2022-07-04 23:03:34 +08:00
chengli
7bfc017dad 处理相关冲突 2022-07-04 21:19:57 +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
446052889@qq.com
5afbe8fc3b Aris流程导入停止后删除其缓存 2022-07-04 18:23:19 +08:00
shangguochao
044300a218 数据迁移校验问题修正 2022-07-04 18:15:04 +08:00
shangguochao
2cabd75966 数据迁移校验图形属性时问题修改 2022-07-04 17:42:56 +08:00
446052889@qq.com
21db306e90 打包 2022-07-04 15:33:42 +08:00
446052889@qq.com
1847e995ef 数据迁移应用前端调整 2022-07-04 13:38:32 +08:00