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

fix file

Browse Source
This commit is contained in:
zhal 2022-07-20 18:44:58 +08:00
commit db4a62e202
8 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
com.actionsoft.apps.coe.pal.cooperation/template/page/main.htm
View File

@ -1,4 +1,4 @@
<!DOCTYPE html><html lang=en><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,initial-scale=1"><link rel=icon href=../apps/com.actionsoft.apps.coe.pal.cooperation/main/favicon.ico><title>com.actionsoft.apps.coe.pal.cooperation</title><script src=../commons/awsui/js/icon.array.js></script><script>const settingParam = <#settingParam>; <!DOCTYPE html><html lang=en><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,initial-scale=1"><link rel=icon href=../apps/com.actionsoft.apps.coe.pal.cooperation/main/favicon.ico><title>com.actionsoft.apps.coe.pal.cooperation</title><script src=../commons/awsui/js/icon.array.js></script><script>const settingParam = <#settingParam>;
const axiosBaseUrl = "./"; const axiosBaseUrl = "./";
const production = true;</script><script>var mainPage = "<#mainPage>"; const production = true;</script><script>var mainPage = "<#mainPage>";
var isManage = <#isManage>;</script><link href=../apps/com.actionsoft.apps.coe.pal.cooperation/main/css/chunk-36a984ec.af1b75cb.css rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal.cooperation/main/css/chunk-3b89005a.64aaea91.css rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal.cooperation/main/css/chunk-3fc8dcbc.8047f46f.css rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal.cooperation/main/js/chunk-2d224ef1.6edc6518.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal.cooperation/main/js/chunk-36a984ec.5e9597ac.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal.cooperation/main/js/chunk-3a9b7577.1c8372d8.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal.cooperation/main/js/chunk-3b89005a.e5894864.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal.cooperation/main/js/chunk-3fc8dcbc.e2e08289.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal.cooperation/main/css/app.57e8682f.css rel=preload as=style><link href=../apps/com.actionsoft.apps.coe.pal.cooperation/main/js/app.fd258702.js rel=preload as=script><link href=../apps/com.actionsoft.apps.coe.pal.cooperation/main/js/chunk-vendors.54a27270.js rel=preload as=script><link href=../apps/com.actionsoft.apps.coe.pal.cooperation/main/css/app.57e8682f.css rel=stylesheet></head><body style=margin:0;><div id=app></div><script src=../apps/com.actionsoft.apps.coe.pal.cooperation/main/js/chunk-vendors.54a27270.js></script><script src=../apps/com.actionsoft.apps.coe.pal.cooperation/main/js/app.fd258702.js></script></body></html> var isManage = <#isManage>;</script><link href=../apps/com.actionsoft.apps.coe.pal.cooperation/main/css/chunk-36a984ec.af1b75cb.css rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal.cooperation/main/css/chunk-3fc8dcbc.8047f46f.css rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal.cooperation/main/css/chunk-d74632f4.1488969e.css rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal.cooperation/main/js/chunk-2d224ef1.6edc6518.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal.cooperation/main/js/chunk-36a984ec.5e9597ac.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal.cooperation/main/js/chunk-3a9b7577.1c8372d8.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal.cooperation/main/js/chunk-3fc8dcbc.e2e08289.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal.cooperation/main/js/chunk-d74632f4.63b738a2.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal.cooperation/main/css/app.57e8682f.css rel=preload as=style><link href=../apps/com.actionsoft.apps.coe.pal.cooperation/main/js/app.d0cf21b9.js rel=preload as=script><link href=../apps/com.actionsoft.apps.coe.pal.cooperation/main/js/chunk-vendors.54a27270.js rel=preload as=script><link href=../apps/com.actionsoft.apps.coe.pal.cooperation/main/css/app.57e8682f.css rel=stylesheet></head><body style=margin:0;><div id=app></div><script src=../apps/com.actionsoft.apps.coe.pal.cooperation/main/js/chunk-vendors.54a27270.js></script><script src=../apps/com.actionsoft.apps.coe.pal.cooperation/main/js/app.d0cf21b9.js></script></body></html>

2
com.actionsoft.apps.coe.pal.cooperation/web/com.actionsoft.apps.coe.pal.cooperation/main/css/chunk-3b89005a.64aaea91.css → com.actionsoft.apps.coe.pal.cooperation/web/com.actionsoft.apps.coe.pal.cooperation/main/css/chunk-d74632f4.1488969e.css
View File

@ -1 +1 @@
#manageMain[data-v-ac2e0a1e] .awsui-dialog__body{padding-top:5px}#manageMain[data-v-ac2e0a1e] .awsui-icon-picker-box1{border-radius:15%}.team-item-div[data-v-ac2e0a1e]{height:46px;padding:6px 0 4px 0}.team-item-icon-div[data-v-ac2e0a1e]{position:relative;top:5px;width:32px;height:32px;line-height:32px;vertical-align:middle;text-align:center;border-radius:15%}.team-item-text-div[data-v-ac2e0a1e]{margin-left:7px;position:relative;top:12px}.team-item-text-div div[data-v-ac2e0a1e]{width:170px}.team-item-text-div div p[data-v-ac2e0a1e]{width:160px;overflow:hidden;white-space:nowrap;text-overflow:ellipsis}.inline-block[data-v-ac2e0a1e]{display:inline-block}.cursor-pointer[data-v-ac2e0a1e]{cursor:pointer}.general-bgcolor-hover:hover .icon-drag[data-v-ac2e0a1e]{display:inline}.general-bgcolor-hover .icon-drag[data-v-ac2e0a1e]{display:none}.general-bgcolor-hover:hover .operate-icon-display[data-v-ac2e0a1e]{display:inline}.general-bgcolor-hover .operate-icon-display[data-v-ac2e0a1e]{display:none}.general-bgcolor-hover:hover .team-item-text-div p[data-v-ac2e0a1e]{color:#4e7ff9!important}.team-item-div-checked[data-v-ac2e0a1e]{color:#4e7ff9}.icon-team-div[data-v-ac2e0a1e]{position:absolute;right:40px;top:45px;z-index:2;height:70px;width:70px;line-height:70px;display:inline-block}.icon-team[data-v-ac2e0a1e]{color:#fff;font-size:52px}.required-logo[data-v-ac2e0a1e] label{margin-left:10px}#palRepositoryTree[data-v-dbb2ca8e] .el-dialog__body{padding:10px 20px;color:#606266;font-size:14px;word-break:break-all}#palRepositoryTree[data-v-dbb2ca8e] .el-input__inner{border-radius:0}#palRepositoryTree[data-v-dbb2ca8e] .el-tree--highlight-current .el-tree-node.is-current>.el-tree-node__content{background-color:#f5f7fa;color:#4e7ff9}#palRepositoryTree[data-v-dbb2ca8e] .el-tree--highlight-current .el-tree-node.is-current>.el-tree-node__content .awsui-iconfont{color:#4e7ff9!important}.tree[data-v-dbb2ca8e]{overflow:auto;width:432px;height:300px}#palRepositoryTree[data-v-dbb2ca8e] .el-tree{min-width:100%;display:inline-block!important}#roleManage[data-v-5b5b40a9] .awsui-dialog__body{margin:0 16px}#roleManage[data-v-5b5b40a9] .role_data_perm_textarea textarea{cursor:pointer}.text-overflow-hidden[data-v-5b5b40a9]{overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.general-bgcolor-hover:hover .operate-icon-display[data-v-5b5b40a9]{display:inline}.general-bgcolor-hover .operate-icon-display[data-v-5b5b40a9]{display:none}#manageList[data-v-46f4ad1a] .awsui-main{padding:0 20px!important}#tableMain[data-v-46f4ad1a] .hideCheckBoxCell .el-checkbox__input{visibility:hidden}#tableMain[data-v-46f4ad1a] .el-table__header-wrapper .el-checkbox,#tableMain[data-v-46f4ad1a] .el-table__row .operate-icon-display{display:none}#tableMain[data-v-46f4ad1a] .el-table__row:hover .operate-icon-display,.inline-block[data-v-46f4ad1a]{display:inline-block}.team-icon-div[data-v-46f4ad1a]{text-align:center;border-radius:15%}.text-overflow-hidden[data-v-46f4ad1a]{overflow:hidden;text-overflow:ellipsis;white-space:nowrap}#manage[data-v-eb099fd6] .awsui-aside,#manage[data-v-eb099fd6] .awsui-main{padding:0} #manageMain[data-v-ac2e0a1e] .awsui-dialog__body{padding-top:5px}#manageMain[data-v-ac2e0a1e] .awsui-icon-picker-box1{border-radius:15%}.team-item-div[data-v-ac2e0a1e]{height:46px;padding:6px 0 4px 0}.team-item-icon-div[data-v-ac2e0a1e]{position:relative;top:5px;width:32px;height:32px;line-height:32px;vertical-align:middle;text-align:center;border-radius:15%}.team-item-text-div[data-v-ac2e0a1e]{margin-left:7px;position:relative;top:12px}.team-item-text-div div[data-v-ac2e0a1e]{width:170px}.team-item-text-div div p[data-v-ac2e0a1e]{width:160px;overflow:hidden;white-space:nowrap;text-overflow:ellipsis}.inline-block[data-v-ac2e0a1e]{display:inline-block}.cursor-pointer[data-v-ac2e0a1e]{cursor:pointer}.general-bgcolor-hover:hover .icon-drag[data-v-ac2e0a1e]{display:inline}.general-bgcolor-hover .icon-drag[data-v-ac2e0a1e]{display:none}.general-bgcolor-hover:hover .operate-icon-display[data-v-ac2e0a1e]{display:inline}.general-bgcolor-hover .operate-icon-display[data-v-ac2e0a1e]{display:none}.general-bgcolor-hover:hover .team-item-text-div p[data-v-ac2e0a1e]{color:#4e7ff9!important}.team-item-div-checked[data-v-ac2e0a1e]{color:#4e7ff9}.icon-team-div[data-v-ac2e0a1e]{position:absolute;right:40px;top:45px;z-index:2;height:70px;width:70px;line-height:70px;display:inline-block}.icon-team[data-v-ac2e0a1e]{color:#fff;font-size:52px}.required-logo[data-v-ac2e0a1e] label{margin-left:10px}#palRepositoryTree[data-v-dbb2ca8e] .el-dialog__body{padding:10px 20px;color:#606266;font-size:14px;word-break:break-all}#palRepositoryTree[data-v-dbb2ca8e] .el-input__inner{border-radius:0}#palRepositoryTree[data-v-dbb2ca8e] .el-tree--highlight-current .el-tree-node.is-current>.el-tree-node__content{background-color:#f5f7fa;color:#4e7ff9}#palRepositoryTree[data-v-dbb2ca8e] .el-tree--highlight-current .el-tree-node.is-current>.el-tree-node__content .awsui-iconfont{color:#4e7ff9!important}.tree[data-v-dbb2ca8e]{overflow:auto;width:432px;height:300px}#palRepositoryTree[data-v-dbb2ca8e] .el-tree{min-width:100%;display:inline-block!important}.allGroup[data-v-e049102a]{display:flex}.allGroup .processAll[data-v-e049102a]{margin-left:5px}.allGroup .actionGroup[data-v-e049102a]{flex:1;text-align:right;padding-right:1px}#roleManage[data-v-5b5b40a9] .awsui-dialog__body{margin:0 16px}#roleManage[data-v-5b5b40a9] .role_data_perm_textarea textarea{cursor:pointer}.text-overflow-hidden[data-v-5b5b40a9]{overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.general-bgcolor-hover:hover .operate-icon-display[data-v-5b5b40a9]{display:inline}.general-bgcolor-hover .operate-icon-display[data-v-5b5b40a9]{display:none}#manageList[data-v-1de625d3] .awsui-main{padding:0 20px!important}#tableMain[data-v-1de625d3] .hideCheckBoxCell .el-checkbox__input{visibility:hidden}#tableMain[data-v-1de625d3] .el-table__header-wrapper .el-checkbox,#tableMain[data-v-1de625d3] .el-table__row .operate-icon-display{display:none}#tableMain[data-v-1de625d3] .el-table__row:hover .operate-icon-display,.inline-block[data-v-1de625d3]{display:inline-block}.team-icon-div[data-v-1de625d3]{text-align:center;border-radius:15%}.text-overflow-hidden[data-v-1de625d3]{overflow:hidden;text-overflow:ellipsis;white-space:nowrap}#manage[data-v-eb099fd6] .awsui-aside,#manage[data-v-eb099fd6] .awsui-main{padding:0}

4
com.actionsoft.apps.coe.pal.cooperation/web/com.actionsoft.apps.coe.pal.cooperation/main/js/app.fd258702.js → com.actionsoft.apps.coe.pal.cooperation/web/com.actionsoft.apps.coe.pal.cooperation/main/js/app.d0cf21b9.js
View File

File diff suppressed because one or more lines are too long

8
com.actionsoft.apps.coe.pal.cooperation/web/com.actionsoft.apps.coe.pal.cooperation/main/js/chunk-3b89005a.e5894864.js
View File

File diff suppressed because one or more lines are too long

8
com.actionsoft.apps.coe.pal.cooperation/web/com.actionsoft.apps.coe.pal.cooperation/main/js/chunk-d74632f4.63b738a2.js Normal file
View File

File diff suppressed because one or more lines are too long

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

Binary file not shown.

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

@ -569,7 +569,7 @@ public class ArisXmlImportRun {
attrNumberObj.put("scope", attributeModel.getScope()); attrNumberObj.put("scope", attributeModel.getScope());
attrNumberObj.put("name", attributeModel.getTitle()); attrNumberObj.put("name", attributeModel.getTitle());
attrNumberObj.put("id", attributeModel.getKey()); attrNumberObj.put("id", attributeModel.getKey());
attrNumberObj.put("textarea", attributeModel.getType()); attrNumberObj.put("type", attributeModel.getType());
attrNumberObj.put("groupPath", attributeModel.getGroupPath()); attrNumberObj.put("groupPath", attributeModel.getGroupPath());
attrNumberObj.put("desc", attributeModel.getDesc()); attrNumberObj.put("desc", attributeModel.getDesc());
@ -600,7 +600,7 @@ public class ArisXmlImportRun {
attrDescObj.put("scope", attributeModel.getScope()); attrDescObj.put("scope", attributeModel.getScope());
attrDescObj.put("name", attributeModel.getTitle()); attrDescObj.put("name", attributeModel.getTitle());
attrDescObj.put("id", attributeModel.getKey()); attrDescObj.put("id", attributeModel.getKey());
attrDescObj.put("textarea", attributeModel.getType()); attrDescObj.put("type", attributeModel.getType());
attrDescObj.put("groupPath", attributeModel.getGroupPath()); attrDescObj.put("groupPath", attributeModel.getGroupPath());
attrDescObj.put("desc", attributeModel.getDesc()); attrDescObj.put("desc", attributeModel.getDesc());

4
com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/designer/util/ShapeUtil.java
View File

@ -129,6 +129,10 @@ public class ShapeUtil {
if( !jsonObj.containsKey("groupPath") || UtilString.isEmpty(jsonObj.getString("groupPath")) ) { if( !jsonObj.containsKey("groupPath") || UtilString.isEmpty(jsonObj.getString("groupPath")) ) {
continue; //排除组 continue; //排除组
} }
//特殊处理key为textarea 实际应为type的异常
if (!jsonObj.containsKey("type")&&jsonObj.containsKey("textarea")){
jsonObj.put("type",jsonObj.get("textarea"));
}
if( !jsonObj.containsKey("type") || UtilString.isEmpty(jsonObj.getString("type")) ) { if( !jsonObj.containsKey("type") || UtilString.isEmpty(jsonObj.getString("type")) ) {
continue; //排除无type的 continue; //排除无type的
} }