yili/apps
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
chengli 2022-07-07 21:45:13 +08:00
commit d01c69fb4d
11 changed files with 36 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
com.actionsoft.apps.coe.pal.datamigration/lib/com.actionsoft.apps.coe.pal.datamigration.jar
View File

Binary file not shown.

2
com.actionsoft.apps.coe.pal.datamigration/src/com/actionsoft/apps/coe/pal/datamigration/aris/web/ArisXmlHandleWeb.java
View File

@ -84,7 +84,7 @@ public class ArisXmlHandleWeb {
path.add(groupMap.get(modelParent).getName()); path.add(groupMap.get(modelParent).getName());
getPath(path, groupMap.get(modelParent).getPid()); getPath(path, groupMap.get(modelParent).getPid());
} }
modelModel.setModelPath(StringUtils.join(path, "\\")); modelModel.setModelPath(StringUtils.join(path, "\\").replace(" ", ""));
} }
} }

4
com.actionsoft.apps.coe.pal.datamigration/src/com/actionsoft/apps/coe/pal/datamigration/aris/web/ArisXmlImportRun.java
View File

@ -417,7 +417,7 @@ public class ArisXmlImportRun {
propertyModels = propertyModels.stream().filter(item -> Constant.METHOD_ARIS_URL.equals(item.getPropertyId())).collect(Collectors.toList()); propertyModels = propertyModels.stream().filter(item -> Constant.METHOD_ARIS_URL.equals(item.getPropertyId())).collect(Collectors.toList());
Map<String, String> map = new HashMap<>(); Map<String, String> map = new HashMap<>();
for (PALRepositoryPropertyModel prop : propertyModels) { for (PALRepositoryPropertyModel prop : propertyModels) {
map.put(prop.getPlId(), prop.getPropertyValue()); map.put(prop.getPlId(), prop.getPropertyValue().replace(" ", ""));// 去除空格
} }
for (PALRepositoryModel model : list) { for (PALRepositoryModel model : list) {
if (map.containsKey(model.getId())) { if (map.containsKey(model.getId())) {
@ -1361,7 +1361,7 @@ public class ArisXmlImportRun {
Timestamp nowTime = new Timestamp(System.currentTimeMillis()); Timestamp nowTime = new Timestamp(System.currentTimeMillis());
PALRepositoryModelImpl model = CoeProcessLevelUtil.createPALRepositoryModel(id, UUIDGener.getUUID(), wsId, arisModel.getName(), "", orderIndex, parentId, "org", true, 1, PALRepositoryModelImpl model = CoeProcessLevelUtil.createPALRepositoryModel(id, UUIDGener.getUUID(), wsId, arisModel.getName(), "", orderIndex, parentId, "org", true, 1,
id, false, "org.role", "0", 1, null, null, uc.getUID(), uc.getUID(), nowTime, null, null, null, null, id, false, "org.role", "0", 1, null, null, uc.getUID(), uc.getUID(), nowTime, null, palModel.getId(), null, null,
null, null, null, null, null, -1); null, null, null, null, null, -1);
coeProcessLevel.insert(model); coeProcessLevel.insert(model);
LogUtil.appendLog(Constant.LOG_END + "创建与ARIS流程同名的角色图[" + arisModel.getName() + "][" + model.getId() + "]", simpleLogFile, fullLogFile); LogUtil.appendLog(Constant.LOG_END + "创建与ARIS流程同名的角色图[" + arisModel.getName() + "][" + model.getId() + "]", simpleLogFile, fullLogFile);

4
com.actionsoft.apps.coe.pal.datamigration/template/page/main.htm
View File

@ -22,8 +22,8 @@
const production = true; const production = true;
const devUserInfo = {}; const devUserInfo = {};
</script> </script>
<script type="module" crossorigin src="../apps/com.actionsoft.apps.coe.pal.datamigration/main/js/entry-index-7f6916a4.js"></script> <script type="module" crossorigin src="../apps/com.actionsoft.apps.coe.pal.datamigration/main/js/entry-index-a4c2dce7.js"></script>
<link rel="stylesheet" href="../apps/com.actionsoft.apps.coe.pal.datamigration/main/assets/asset-style-1c3bc887.css"> <link rel="stylesheet" href="../apps/com.actionsoft.apps.coe.pal.datamigration/main/assets/asset-style-76c60471.css">
</head> </head>
<body style="margin:0;"> <body style="margin:0;">
<div id="app"></div> <div id="app"></div>

2
com.actionsoft.apps.coe.pal.datamigration/web/com.actionsoft.apps.coe.pal.datamigration/main/assets/asset-style-1c3bc887.css → com.actionsoft.apps.coe.pal.datamigration/web/com.actionsoft.apps.coe.pal.datamigration/main/assets/asset-style-76c60471.css
View File

File diff suppressed because one or more lines are too long

1
com.actionsoft.apps.coe.pal.datamigration/web/com.actionsoft.apps.coe.pal.datamigration/main/js/chunck-Home-1099a5d5.js Normal file
View File

File diff suppressed because one or more lines are too long

1
com.actionsoft.apps.coe.pal.datamigration/web/com.actionsoft.apps.coe.pal.datamigration/main/js/chunck-Home-c472699b.js
View File

File diff suppressed because one or more lines are too long

2
com.actionsoft.apps.coe.pal.datamigration/web/com.actionsoft.apps.coe.pal.datamigration/main/js/entry-index-7f6916a4.js → com.actionsoft.apps.coe.pal.datamigration/web/com.actionsoft.apps.coe.pal.datamigration/main/js/entry-index-a4c2dce7.js
View File

File diff suppressed because one or more lines are too long

8
com.actionsoft.apps.coe.pal/template/page/pal.pl.repository.designer.htm
View File

@ -1199,13 +1199,13 @@
<div id="dock_content_attribute"> <div id="dock_content_attribute">
<ul id="tabUlContainer"> <ul id="tabUlContainer">
<li id="tabLiContainnerAttribute" class="selectTag"> <li id="tabLiContainnerAttribute" class="selectTag">
<a onClick="selectAttrTabTag('tagContent1',this)" href="javascript:void(0)">属性</a> <a onClick="selectAttrTabTag2('tagContent1',this)" href="javascript:void(0)">属性</a>
</li> </li>
<li> <li>
<a onClick="selectAttrTabTag('tagContent0',this)" href="javascript:void(0)">关系</a> <a onClick="selectAttrTabTag2('tagContent0',this)" href="javascript:void(0)">关系</a>
</li> </li>
<li><a onClick="selectAttrTabTag('tagContent2',this)" href="javascript:void(0)">出现</a> </li> <li><a onClick="selectAttrTabTag2('tagContent2',this)" href="javascript:void(0)">出现</a> </li>
<li><a onClick="selectAttrTabTag('tagContent3',this)" href="javascript:void(0)">关联</a> </li> <li><a onClick="selectAttrTabTag2('tagContent3',this)" href="javascript:void(0)">关联</a> </li>
</ul> </ul>
<!-- 数据属性表格 --> <!-- 数据属性表格 -->
<div id="tagContent"> <div id="tagContent">

12
com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/js/coe.pal.processlevel.create.js
View File

@ -612,7 +612,7 @@ function saveDialogTableValue(tableValue,id,dom) {
} }
function saveContent(obj) { function saveContent(obj) {
debugger; // debugger;
var sid = $("#sid").val(); var sid = $("#sid").val();
var uuid = $("#id").val(); var uuid = $("#id").val();
var id = obj.attr("id"); var id = obj.attr("id");
@ -902,10 +902,10 @@ function showTableDialog(obj,value,id) {
let str = let str =
'<tr id="' + tableList[i].id + '">' '<tr id="' + tableList[i].id + '">'
+ '<td style="width: 100px;">' + '<td style="width: 100px;">'
+ '<input class="dialog_table_input_css" value="' + tableList[i].name + '"/>' + '<textarea type="textarea" rows="5" class="dialog_table_input_css" value="' + tableList[i].name + '">' + tableList[i].name + '</textarea>'
+ '</td>' + '</td>'
+ '<td style="width: 270px;">' + '<td style="width: 270px;">'
+ '<input class="dialog_table_input_css" value="' + tableList[i].desc + '"/>' + '<textarea type="textarea" rows="5" class="dialog_table_input_css" value="' + tableList[i].desc + '">' + tableList[i].name + '</textarea>'
+ '</td>' + '</td>'
+ '<td style="width: 80px;text-align: center;" class="dialogTableDelete" onclick="removeTr(this)">删除</td>' + '<td style="width: 80px;text-align: center;" class="dialogTableDelete" onclick="removeTr(this)">删除</td>'
+'</tr>' +'</tr>'
@ -921,7 +921,7 @@ function showTableDialog(obj,value,id) {
handler : function() { handler : function() {
// let name = parent.$("#attribute-title-content1").val() // let name = parent.$("#attribute-title-content1").val()
// $("#" + id).val(name) // $("#" + id).val(name)
let inputs = parent.$('#attribute-table-content1').find('input') let inputs = parent.$('#attribute-table-content1').find('textarea')
for (let i = 1; i < parent.operateList.length; i++) { for (let i = 1; i < parent.operateList.length; i++) {
parent.operateList[i].name = inputs[2*(i-1)].value parent.operateList[i].name = inputs[2*(i-1)].value
parent.operateList[i].desc = inputs[2*(i-1) + 1].value parent.operateList[i].desc = inputs[2*(i-1) + 1].value
@ -950,8 +950,8 @@ function addTr() {
let newTrId = Date.now().toString(36) let newTrId = Date.now().toString(36)
let defaultStr = let defaultStr =
' <tr id="'+ newTrId + '">' ' <tr id="'+ newTrId + '">'
+ '<td style="width: 100px;"><input class="dialog_table_input_css" value=""/></td>' + '<td style="width: 100px;"><textarea type="textarea" rows="5" class="dialog_table_input_css" value=""></textarea></td>'
+ '<td style="width: 270px;"><input class="dialog_table_input_css" value=""/></td>' + '<td style="width: 270px;"><textarea type="textarea" rows="5" class="dialog_table_input_css" value=""></textarea></td>'
+ '<td style="width: 80px;text-align: center" class="dialogTableDelete" onclick="removeTr(this)">删除</td>' + '<td style="width: 80px;text-align: center" class="dialogTableDelete" onclick="removeTr(this)">删除</td>'
+ '</tr>' + '</tr>'
operateList.push({ id: newTrId ,name: '',desc: ''}) operateList.push({ id: newTrId ,name: '',desc: ''})

24
com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/lib/designer/extend/js/designer.extend.link.js
View File

@ -1535,7 +1535,6 @@ function getPrivateAttributeHtml(attributesJsonArray, tbodyId, shape) {
+ ' </td></tr>'; + ' </td></tr>';
} else if (!objReadonly && objType == "table") { } else if (!objReadonly && objType == "table") {
let objRef = JSON.parse(obj.ref) let objRef = JSON.parse(obj.ref)
console.log('ref',objRef)
let objTableInput = obj.value.table !== undefined && obj.value.table.length > 1 ? '请查看' : '请输入' let objTableInput = obj.value.table !== undefined && obj.value.table.length > 1 ? '请查看' : '请输入'
dialogTableList = obj.value.table == undefined ? [ { id: Utils.newId() ,name: objRef.firstColumn, desc: objRef.secondColumn} ] : obj.value.table; dialogTableList = obj.value.table == undefined ? [ { id: Utils.newId() ,name: objRef.firstColumn, desc: objRef.secondColumn} ] : obj.value.table;
constr = '<tr ' + mouseout + mouseover + ' class="tagContentTableTr">' constr = '<tr ' + mouseout + mouseover + ' class="tagContentTableTr">'
@ -2085,16 +2084,17 @@ function openTableDialog(obj,value) {
let str = let str =
'<tr id="' + dialogTableList[i].id + '">' '<tr id="' + dialogTableList[i].id + '">'
+ '<td style="width: 100px;">' + '<td style="width: 100px;">'
+ '<input class="dialog_table_input_css" value="' + dialogTableList[i].name + '"/>' + '<textarea type="textarea" rows="5" class="dialog_table_input_css" value="' + dialogTableList[i].name + '">' + dialogTableList[i].name + '</textarea>'
+ '</td>' + '</td>'
+ '<td style="width: 270px;">' + '<td style="width: 270px;">'
+ '<input class="dialog_table_input_css" value="' + dialogTableList[i].desc + '"/>' + '<textarea type="textarea" rows="5" class="dialog_table_input_css" value="' + dialogTableList[i].desc + '">' + dialogTableList[i].desc + '</textarea>'
+ '</td>' + '</td>'
+ '<td style="width: 60px;text-align: center" class="dialogTableDelete" onclick="removeTableTr(this)">删除</td>' + '<td style="width: 60px;text-align: center" class="dialogTableDelete" onclick="removeTableTr(this)">删除</td>'
+'</tr>' +'</tr>'
$('#attribute-table-content').append(str) $('#attribute-table-content').append(str)
} }
$('#attribute-add-content').append('<button onclick="addTableTr(this)">新增</button>') $('#attribute-add-content').append('<button onclick="addTableTr(this)">新增</button>')
// tableInputHeight()
$("#attribute-table-window").dialog({ $("#attribute-table-window").dialog({
draggable: true, draggable: true,
@ -2103,7 +2103,7 @@ function openTableDialog(obj,value) {
text : '确定', text : '确定',
cls : "blue", cls : "blue",
handler : function() { handler : function() {
let inputs = $('#attribute-table-content').find('input') let inputs = $('#attribute-table-content').find('textarea')
for (let i = 1; i < dialogTableList.length; i++) { for (let i = 1; i < dialogTableList.length; i++) {
dialogTableList[i].name = inputs[2*(i-1)].value dialogTableList[i].name = inputs[2*(i-1)].value
dialogTableList[i].desc = inputs[2*(i-1) +1].value dialogTableList[i].desc = inputs[2*(i-1) +1].value
@ -2124,12 +2124,24 @@ function openTableDialog(obj,value) {
}) })
} }
// function tableInputHeight() {
// var input = $("#attribute-table-content").find(".dialog_table_input_css");
// input.each(function () {
// $(this).on('input', function(){
// if(this.scrollHeight > $(this).height()) {
// var curRow = parseInt($(this).attr('rows'))
// $(this).attr('rows',curRow + 1)
// }
// });
// })
// }
function addTableTr(obj) { function addTableTr(obj) {
let newTrId = Utils.newId() let newTrId = Utils.newId()
let defaultStr = let defaultStr =
' <tr id="'+ newTrId + '">' ' <tr id="'+ newTrId + '">'
+ '<td style="width: 100px;"><input class="dialog_table_input_css" value=""/></td>' + '<td style="width: 100px;"><textarea type="textarea" rows="5" class="dialog_table_input_css" value=""></textarea></td>'
+ '<td style="width: 270px;"><input class="dialog_table_input_css" value=""/></td>' + '<td style="width: 270px;"><textarea type="textarea" rows="5" class="dialog_table_input_css" value=""></textarea></td>'
+ '<td style="width: 60px;text-align: center" class="dialogTableDelete" onclick="removeTableTr(this)">删除</td>' + '<td style="width: 60px;text-align: center" class="dialogTableDelete" onclick="removeTableTr(this)">删除</td>'
+ '</tr>' + '</tr>'
dialogTableList.push({ id: newTrId ,name: '',desc: ''}) dialogTableList.push({ id: newTrId ,name: '',desc: ''})