Merge branch 'master' of https://e.coding.net/yilidev/yilipalkaifa/apps
This commit is contained in:
anhc
commit
0e15d1696e
@ -3,7 +3,7 @@
|
||||
<app xmlns="http://www.actionsoft.com.cn/app">
|
||||
<name>流程图(EPC)建模方法</name>
|
||||
<version>1.0</version>
|
||||
<buildNo>28</buildNo>
|
||||
<buildNo>29</buildNo>
|
||||
<developer id="776cca9a287c8b4d63b9cad216aa3859" tablePrefix="ACT" url="http://www.actionsoft.com.cn">北京炎黄盈动科技发展有限责任公司</developer>
|
||||
<productId>4f3b2bbb813615ff2a9416e0817565c1</productId>
|
||||
<categoryVisible>false</categoryVisible>
|
||||
|
||||
Binary file not shown.
@ -3,7 +3,7 @@
|
||||
<app xmlns="http://www.actionsoft.com.cn/app">
|
||||
<name>PAL数据迁移</name>
|
||||
<version>1.0</version>
|
||||
<buildNo>2</buildNo>
|
||||
<buildNo>11</buildNo>
|
||||
<developer id="776cca9a287c8b4d63b9cad216aa3859" tablePrefix="ACT" url="http://www.actionsoft.com.cn">北京炎黄盈动科技发展有限责任公司</developer>
|
||||
<categoryVisible>false</categoryVisible>
|
||||
<description><![CDATA[数据迁移]]></description>
|
||||
|
||||
@ -22,7 +22,7 @@
|
||||
const production = true;
|
||||
const devUserInfo = {};
|
||||
</script>
|
||||
<script type="module" crossorigin src="../apps/com.actionsoft.apps.coe.pal.datamigration/main/js/entry-index-d9e943fe.js"></script>
|
||||
<script type="module" crossorigin src="../apps/com.actionsoft.apps.coe.pal.datamigration/main/js/entry-index-3c31c3f8.js"></script>
|
||||
<link rel="stylesheet" href="../apps/com.actionsoft.apps.coe.pal.datamigration/main/assets/asset-style-929fa14b.css">
|
||||
</head>
|
||||
<body style="margin:0;">
|
||||
|
||||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
Binary file not shown.
File diff suppressed because one or more lines are too long
@ -5,5 +5,6 @@
|
||||
<attribute key="YiliChagePerson" title="应用负责人" type="string" value="" desc="" isRequired="false" ref="" readonly="false" groupPath="baseAttribute" scope="%,*" isValid="true"/>
|
||||
<attribute key="DBA_A" title="DBA(A)" type="string" value="" desc="DBA1(A)" isRequired="false" ref="" readonly="false" groupPath="baseAttribute" scope="%,*" isValid="true"/>
|
||||
<attribute key="DBA_B" title="DBA(B)" type="string" value="" desc="DBA(B)" isRequired="false" ref="" readonly="false" groupPath="baseAttribute" scope="%,*" isValid="true"/>
|
||||
<attribute key="itsystem_type" title="类型" type="string" value="" desc="类型" isRequired="false" ref="" readonly="false" groupPath="baseAttribute" scope="%,*" isValid="true"/>
|
||||
<attribute key="itsystem_type" title="类型" type="string" value="" desc="类型" isRequired="false" ref="" readonly="false" groupPath="baseAttribute" scope="%,*" isValid="true"/>
|
||||
<attribute key="otherName" title="别名" type="string" value="" desc="别名" isRequired="false" ref="" readonly="false" groupPath="baseAttribute" scope="*" isValid="true"/>
|
||||
</attributes>
|
||||
|
||||
@ -2900,12 +2900,37 @@ public class CoEPALController {
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 创建空白模板
|
||||
* @param me
|
||||
* @param wsId
|
||||
* @param teamId
|
||||
* @param category
|
||||
* @param method
|
||||
* @param parentId
|
||||
* @param container
|
||||
* @param securityLevel
|
||||
* @param name
|
||||
* @return
|
||||
*/
|
||||
@Mapping("com.actionsoft.apps.coe.pal_processlevel_repository_create_save_Designer")
|
||||
public String saveCreatePalProcessLevelRepositoryDesigner(UserContext me, String wsId, String teamId, String category, String method, String parentId, String container,Integer securityLevel,String name) {
|
||||
CoeProcessLevelWeb web = new CoeProcessLevelWeb(me);
|
||||
return web.saveCreatePalProcessLevelRepositoryDesigner(wsId, teamId, category, method, parentId, container,securityLevel,name);
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取路径
|
||||
* @param me
|
||||
* @param parentId
|
||||
* @return
|
||||
*/
|
||||
@Mapping("com.actionsoft.apps.coe.getArchitecturePath")
|
||||
public String getArchitecturePath(UserContext me, String parentId) {
|
||||
CoeProcessLevelWeb web = new CoeProcessLevelWeb(me);
|
||||
return web.getArchitecturePath(parentId);
|
||||
}
|
||||
|
||||
/**
|
||||
* 校验重名功能
|
||||
* @param me
|
||||
|
||||
@ -510,15 +510,6 @@ public class CoeCooperationAPIManager {
|
||||
return new CoeCooperationRoleDao().getCooperationRoleByUser(teamId, userId);
|
||||
}
|
||||
|
||||
/**
|
||||
* 查询指定id的角色
|
||||
* @param roleId
|
||||
* @return
|
||||
*/
|
||||
public CoeCooperationRoleModel queryCooperationRole(String roleId) {
|
||||
return new CoeCooperationRoleDao().getInstance(roleId);
|
||||
}
|
||||
|
||||
/**
|
||||
* 查询小组下的所有角色
|
||||
* 按照管理员/设计人员/浏览人员+剩余角色创建时间倒序排序
|
||||
|
||||
@ -8006,13 +8006,22 @@ public class CoeProcessLevelWeb extends ActionWeb {
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
return ro.toString();
|
||||
}
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* 保存空白模板
|
||||
* @param wsId
|
||||
* @param teamId
|
||||
* @param category
|
||||
* @param method
|
||||
* @param parentId
|
||||
* @param container
|
||||
* @param securityLevel
|
||||
* @param name
|
||||
* @return
|
||||
*/
|
||||
public String saveCreatePalProcessLevelRepositoryDesigner(String wsId, String teamId, String category, String method, String parentId, String container,Integer securityLevel,String name){
|
||||
ResponseObject ro = ResponseObject.newOkResponse();
|
||||
PALRepository coeProcessLevel = CoeProcessLevelDaoFacotory.createCoeProcessLevel();
|
||||
@ -8117,26 +8126,33 @@ public class CoeProcessLevelWeb extends ActionWeb {
|
||||
CoEOpLogAPI.auditOkOp(_uc, CoEOpLogConst.MODULE_CATEGORY_REPOSITORY, CoEOpLogConst.OP_CREATE, CoEOpLogConst.INFO_REPOSITORY_CREATE);
|
||||
}
|
||||
|
||||
return ro.toString();
|
||||
}
|
||||
|
||||
/***************************************************获取当前文件位置 byzhaolei**********************************************/
|
||||
|
||||
/**
|
||||
* 获取路径
|
||||
* @param parentId
|
||||
* @return
|
||||
*/
|
||||
public String getArchitecturePath(String parentId){
|
||||
ResponseObject ro = ResponseObject.newOkResponse();
|
||||
JSONArray repositoryPathData = CoeProcessLevelUtil.getRepositoryPath(parentId);
|
||||
// 获取当前文件路径
|
||||
StringBuffer sb = new StringBuffer();
|
||||
if(repositoryPathData.size()>0){
|
||||
for(int i=0;i<repositoryPathData.size();i++){
|
||||
String name2=((JSONObject) repositoryPathData.get(i)).getString("name");
|
||||
sb.append(name2).append("\\");
|
||||
String name=((JSONObject) repositoryPathData.get(i)).getString("name");
|
||||
sb.append(name).append("\\");
|
||||
}
|
||||
}
|
||||
|
||||
String keywordStr = sb.deleteCharAt(sb.length() - 1).toString();//去掉最后一个逗号
|
||||
ro.put("repositoryPathData",keywordStr);
|
||||
|
||||
return ro.toString();
|
||||
}
|
||||
|
||||
|
||||
|
||||
/**
|
||||
*校验是否存在重复标题
|
||||
* @param title
|
||||
|
||||
@ -13,4 +13,4 @@
|
||||
var mainType = "<#mainType>";
|
||||
var uid = "<#uid>";
|
||||
var wHref = "./w";
|
||||
var jdHref = "./jd";</script><link href=../apps/com.actionsoft.apps.coe.pal/main/css/chunk-055385ac.e55cad48.css rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/css/chunk-0afe55bf.4778a8ec.css rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/css/chunk-0ba0316e.d3570084.css rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/css/chunk-1cf2c888.d77cd146.css rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/css/chunk-4def56c4.ef0a5aa8.css rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/css/chunk-4e7e9573.38619268.css rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/css/chunk-5a76c238.283a9f57.css rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/css/chunk-6f1c20e8.c5c7126f.css rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/css/chunk-8cb92970.adde4cab.css rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-055385ac.00905b6d.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-0afe55bf.b357fae1.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-0ba0316e.688f76dc.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-1cf2c888.6cc6d796.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-2d0ab156.4806769f.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-2d0b25b0.416cbd4d.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-2d0f078a.177d1eb1.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-2d216d3a.60b5daee.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-2d224b23.aa0a1486.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-2d224ef1.e0c4eebc.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-4def56c4.b7c9006f.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-4e7e9573.53d1c82e.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-5a76c238.44d7b7f6.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-5ca06e36.b040a926.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-6f1c20e8.96211ef7.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-8cb92970.328ebf72.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-bf7921b8.4686146e.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/css/app.8c8bd95f.css rel=preload as=style><link href=../apps/com.actionsoft.apps.coe.pal/main/js/app.4583b8e6.js rel=preload as=script><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-vendors.30b385c5.js rel=preload as=script><link href=../apps/com.actionsoft.apps.coe.pal/main/css/app.8c8bd95f.css rel=stylesheet></head><body style=margin:0;><div id=app></div><script src=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-vendors.30b385c5.js></script><script src=../apps/com.actionsoft.apps.coe.pal/main/js/app.4583b8e6.js></script></body></html>
|
||||
var jdHref = "./jd";</script><link href=../apps/com.actionsoft.apps.coe.pal/main/css/chunk-055385ac.e55cad48.css rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/css/chunk-0ba0316e.d3570084.css rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/css/chunk-1cf2c888.32b22b48.css rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/css/chunk-3002a7ae.6be74f48.css rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/css/chunk-4def56c4.ef0a5aa8.css rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/css/chunk-4e7e9573.38619268.css rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/css/chunk-5a76c238.283a9f57.css rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/css/chunk-6f1c20e8.c5c7126f.css rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/css/chunk-8cb92970.adde4cab.css rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-055385ac.212b1e7f.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-0ba0316e.a3ac659b.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-1cf2c888.9466d4da.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-2d0ab156.e3edaaa6.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-2d0b25b0.3ebfc816.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-2d0f078a.9e10275b.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-2d216d3a.99234111.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-2d224b23.135c5954.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-2d224ef1.7eee62fe.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-3002a7ae.7f06c305.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-4def56c4.66811286.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-4e7e9573.db603cfd.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-5a76c238.27830c12.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-5ca06e36.1dd1e85a.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-6f1c20e8.c979e2d7.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-8cb92970.9380bd91.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-bf7921b8.1d6eee48.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/css/app.b58aa8df.css rel=preload as=style><link href=../apps/com.actionsoft.apps.coe.pal/main/js/app.33eda233.js rel=preload as=script><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-vendors.16b2cce8.js rel=preload as=script><link href=../apps/com.actionsoft.apps.coe.pal/main/css/app.b58aa8df.css rel=stylesheet></head><body style=margin:0;><div id=app></div><script src=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-vendors.16b2cce8.js></script><script src=../apps/com.actionsoft.apps.coe.pal/main/js/app.33eda233.js></script></body></html>
|
||||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
|
Before Width: | Height: | Size: 158 KiB |
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
@ -1 +0,0 @@
|
||||
(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-2d0ab156"],{1485:function(t,a,e){"use strict";e.r(a);var n=function(){var t=this,a=t.$createElement,e=t._self._c||a;return e("div",{staticStyle:{width:"100%",height:"100%"}},[e("iframe",{staticStyle:{border:"0"},attrs:{id:"iframe",width:"100%",height:"100%",name:"iframe",src:t.src}})])},i=[],s={name:"MappingManagement",data:function(){return{src:"./w?sid="+this.$store.state.sessionId+"&cmd=com.actionsoft.apps.coe.pal.mappingmanagement_main_page&dataType="+this.$route.params.dataType}}},r=s,c=e("cba8"),p=Object(c["a"])(r,n,i,!1,null,"56fd105e",null);a["default"]=p.exports}}]);
|
||||
File diff suppressed because one or more lines are too long
@ -1 +0,0 @@
|
||||
(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-2d0f078a"],{"9d09":function(t,e,i){"use strict";i.r(e);var n=function(){var t=this,e=t.$createElement,i=t._self._c||e;return i("div",{style:{width:"100%",height:t.mainHeight}},[i("iframe",{staticStyle:{border:"0"},attrs:{id:"orgIframe",width:"100%",height:parseInt(t.mainHeight)-4+"px",name:"orgIframe",src:t.src}})])},s=[],a={name:"BPMOrg",data:function(){return{src:"./w?sid="+this.$store.state.sessionId+"&cmd=com.actionsoft.apps.coe.pal_average_user_org",mainHeight:parseInt(this.$store.getters.getTopMainHeightFn)-4+"px"}},computed:{listenTopMainHeight:function(){return this.$store.getters.getTopMainHeightFn}},watch:{listenTopMainHeight:function(t,e){this.mainHeight=parseInt(this.$store.getters.getTopMainHeightFn)-4+"px"}}},r=a,o=i("cba8"),c=Object(o["a"])(r,n,s,!1,null,"2280cc48",null);e["default"]=c.exports}}]);
|
||||
@ -1 +0,0 @@
|
||||
(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-2d216d3a"],{c3b6:function(t,e,i){"use strict";i.r(e);var n=function(){var t=this,e=t.$createElement,i=t._self._c||e;return i("div",{style:{width:"100%",height:t.mainHeight},attrs:{id:"cooperation"}},[i("iframe",{staticStyle:{border:"0"},attrs:{id:"coopIframe",width:"100%",height:parseInt(t.mainHeight)-4+"px",name:"coopIframe",src:t.src}})])},a=[],o={name:"cooperationCreate",data:function(){return{src:wHref+"?sid="+this.$store.state.sessionId+"&mainPage=create&cmd=com.actionsoft.apps.coe.pal.cooperation_main",mainHeight:parseInt(this.$store.getters.getTopMainHeightFn)-4+"px"}},computed:{listenTopMainHeight:function(){return this.$store.getters.getTopMainHeightFn}},watch:{listenTopMainHeight:function(t,e){this.mainHeight=parseInt(this.$store.getters.getTopMainHeightFn)-4+"px"}}},s=o,r=i("cba8"),c=Object(r["a"])(s,n,a,!1,null,"6a826a48",null);e["default"]=c.exports}}]);
|
||||
@ -1 +0,0 @@
|
||||
(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-2d224b23"],{e0df:function(t,e,i){"use strict";i.r(e);var n=function(){var t=this,e=t.$createElement,i=t._self._c||e;return i("div",{style:{width:"100%",height:t.mainHeight},attrs:{id:"cooperationUpdate"}},[i("iframe",{staticStyle:{border:"0"},attrs:{id:"coopIframe",width:"100%",height:parseInt(t.mainHeight)-4+"px",name:"coopIframe",src:t.src}})])},a=[],o={name:"CooperationUpdate",data:function(){return{src:wHref+"?sid="+this.$store.state.sessionId+"&mainPage=update&cmd=com.actionsoft.apps.coe.pal.cooperation_main",mainHeight:parseInt(this.$store.getters.getTopMainHeightFn)-4+"px"}},computed:{listenTopMainHeight:function(){return this.$store.getters.getTopMainHeightFn}},watch:{listenTopMainHeight:function(t,e){this.mainHeight=parseInt(this.$store.getters.getTopMainHeightFn)-4+"px"}}},s=o,r=i("cba8"),p=Object(r["a"])(s,n,a,!1,null,"543345d8",null);e["default"]=p.exports}}]);
|
||||
@ -1 +0,0 @@
|
||||
(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-2d224ef1"],{e1f5:function(e,s,t){"use strict";t.r(s);var n=function(){var e=this,s=e.$createElement,t=e._self._c||s;return t("div",{staticClass:"devGetSession"},[e._v(" 正在获取session ")])},a=[],o=t("a18c"),d=t("0f08"),i=t("4360");d["a"].post({url:"jd",data:{userid:devUserInfo.userid,pwd:devUserInfo.pwd,lang:"cn",cmd:"com.actionsoft.apps.getsession.get",deviceType:"pc"}}).then((function(e){"error"==e.result?alert("获取session错误："+e.msg):(i["a"].commit("edit",{sessionId:e.data.sid}),o["a"].replace("/"))}));var c={data:function(){return{dwList:[]}},methods:{},mounted:function(){}},r=c,u=t("cba8"),l=Object(u["a"])(r,n,a,!1,null,null,null);s["default"]=l.exports}}]);
|
||||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
Loading…
Reference in New Issue
Block a user