Merge branch 'master' of https://e.coding.net/yilidev/yilipalkaifa/apps

com.actionsoft.apps.coe.pal.datamigration/src/com/actionsoft/apps/coe/pal/datamigration/web/DataMigrationWeb.java

@@ -11,7 +11,9 @@ import com.actionsoft.apps.coe.pal.datamigration.model.po.WordField;
 import com.actionsoft.apps.coe.pal.datamigration.util.ExcelUtil;
 import com.actionsoft.apps.coe.pal.datamigration.util.ShapeUtil;
 import com.actionsoft.apps.coe.pal.datamigration.util.WordUtil;
+import com.actionsoft.apps.coe.pal.pal.method.cache.PALMethodCache;
 import com.actionsoft.apps.coe.pal.pal.method.model.PALMethodAttributeModel;
+import com.actionsoft.apps.coe.pal.pal.method.model.PALMethodModel;
 import com.actionsoft.apps.coe.pal.pal.repository.PALRepositoryAPIManager;
 import com.actionsoft.apps.coe.pal.pal.repository.PALRepositoryQueryAPIManager;
 import com.actionsoft.apps.coe.pal.pal.repository.dao.CoeProcessLevelDaoFacotory;
@@ -52,6 +54,7 @@ import com.actionsoft.sdk.local.SDK;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import org.apache.commons.lang.StringUtils;
 import org.dom4j.Document;
 
 import java.io.File;
@@ -1732,7 +1735,21 @@ public class DataMigrationWeb extends ActionWeb {
                 }
                 if (array.size() > 0) {
                     //特殊处理表头
-                    array.getJSONObject(0).put("id", "table_head");
+                    PALMethodAttributeModel attributeModel = null;
+                    List<PALMethodAttributeModel> attributes = PALMethodCache.getPALMethodModelById(importModel.getMethodId()).getAttributes();
+                    for (PALMethodAttributeModel attribute : attributes) {
+                        if (attribute.getType().equals(importProperty.getPropertyId())){
+                            attributeModel = attribute;
+                        }
+                    }
+                    if (null == attributeModel || StringUtils.isEmpty(attributeModel.getRef())){
+                        array.getJSONObject(0).put("id", "table_head");
+                    }else{
+                        JSONObject attrRef = JSON.parseObject(attributeModel.getRef());
+                        array.getJSONObject(0).put("id", "table_head");
+                        array.getJSONObject(0).put("id", attrRef.get("firstColumn"));
+                        array.getJSONObject(0).put("id", attrRef.get("secondColumn"));
+                    }
                 }
                 object.put("table", array);
                 //更新数据库值

com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/web/CoeProcessLevelWeb.java

@@ -2656,11 +2656,15 @@ public class CoeProcessLevelWeb extends ActionWeb {
 
 				JSONObject table = JSON.parseObject(jsonValue);
 				int subTableSize = 0;
-				JSONArray subTable = table.getJSONArray("table");
-				if (null != subTable){
-					subTableSize = subTable.size();
+				if (null != table){
+					JSONArray subTable = table.getJSONArray("table");
+					if (null != subTable){
+						subTableSize = subTable.size();
+					}
 				}
 				String tableInput = subTableSize > 1 ? "请查看" : "请输入";
+				String attrRef = attributeModel.getRef();
+				JSONObject refValue = JSON.parseObject(attrRef);
 
 
 				input = "<span class=\"awsui-input-wrapper\"  onclick=\"showTableDialog($(this),"+ ( StringUtils.isEmpty(jsonValue) ? new JSONObject() : jsonValue.replace("\"","'") )+",'" + id + "')\">"

com.actionsoft.apps.coe.pal/template/page/main.htm

@@ -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-0ba0316e.d3570084.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/css/chunk-b0787fd8.99d767d8.css rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/css/chunk-b9b8e2d8.de12d1d4.css rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-055385ac.1997663e.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-0ba0316e.f1a28476.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-2d0ab156.9f17ed75.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.cfa51ace.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-2d216d3a.04d93109.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-2d224b23.e5c50290.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-2d224ef1.814c17e3.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-4def56c4.720b1ccf.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-4e7e9573.a31638f3.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-5a76c238.dc28cd20.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-5ca06e36.10aa8e65.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-6f1c20e8.e41186ae.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-8cb92970.f36e2de6.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-b0787fd8.74128c50.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-b9b8e2d8.669e032d.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.24b9fd48.css rel=preload as=style><link href=../apps/com.actionsoft.apps.coe.pal/main/js/app.0a3d99e0.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.24b9fd48.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.0a3d99e0.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-293145f2.3f40aa8d.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/css/chunk-ea44dd1e.daa5e0d2.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-293145f2.dd19b8f0.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-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/js/chunk-ea44dd1e.89909b05.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.6a5ab7f2.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.6a5ab7f2.js></script></body></html>

com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/main/js/chunk-2d0ab156.9f17ed75.js

@@ -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}}]);

com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/main/js/chunk-2d0ab156.e3edaaa6.js

@@ -0,0 +1 @@
+(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-2d0ab156"],{1485:function(a,t,e){"use strict";e.r(t);var i=function(){var a=this,t=a.$createElement,e=a._self._c||t;return e("div",{staticStyle:{width:"100%",height:"100%"}},[e("iframe",{staticStyle:{border:"0"},attrs:{id:"iframe",width:"100%",height:"100%",name:"iframe",src:a.src}})])},n=[],s={name:"MappingManagement",data(){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,i,n,!1,null,"56fd105e",null);t["default"]=p.exports}}]);

com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/main/js/chunk-2d0f078a.9e10275b.js

@@ -0,0 +1 @@
+(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-2d0f078a"],{"9d09":function(t,e,i){"use strict";i.r(e);var s=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}})])},n=[],a={name:"BPMOrg",data(){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(){return this.$store.getters.getTopMainHeightFn}},watch:{listenTopMainHeight:function(t,e){this.mainHeight=parseInt(this.$store.getters.getTopMainHeightFn)-4+"px"}}},r=a,o=i("cba8"),h=Object(o["a"])(r,s,n,!1,null,"2280cc48",null);e["default"]=h.exports}}]);

com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/main/js/chunk-2d0f078a.cfa51ace.js

@@ -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}}]);

com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/main/js/chunk-2d216d3a.04d93109.js

@@ -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}}]);

com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/main/js/chunk-2d216d3a.99234111.js

@@ -0,0 +1 @@
+(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-2d216d3a"],{c3b6:function(t,e,i){"use strict";i.r(e);var a=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}})])},n=[],s={name:"cooperationCreate",data(){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(){return this.$store.getters.getTopMainHeightFn}},watch:{listenTopMainHeight:function(t,e){this.mainHeight=parseInt(this.$store.getters.getTopMainHeightFn)-4+"px"}}},r=s,o=i("cba8"),c=Object(o["a"])(r,a,n,!1,null,"6a826a48",null);e["default"]=c.exports}}]);

com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/main/js/chunk-2d224b23.135c5954.js

@@ -0,0 +1 @@
+(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-2d224b23"],{e0df:function(t,e,i){"use strict";i.r(e);var a=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}})])},n=[],s={name:"CooperationUpdate",data(){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(){return this.$store.getters.getTopMainHeightFn}},watch:{listenTopMainHeight:function(t,e){this.mainHeight=parseInt(this.$store.getters.getTopMainHeightFn)-4+"px"}}},o=s,r=i("cba8"),p=Object(r["a"])(o,a,n,!1,null,"543345d8",null);e["default"]=p.exports}}]);

com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/main/js/chunk-2d224b23.e5c50290.js

@@ -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}}]);

com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/main/js/chunk-2d224ef1.7eee62fe.js

@@ -1 +1 @@
-(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}}]);
+(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=[],d=t("a18c"),o=t("0f08"),i=t("4360");o["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}),d["a"].replace("/"))}));var r={data(){return{dwList:[]}},methods:{},mounted(){}},c=r,u=t("cba8"),l=Object(u["a"])(c,n,a,!1,null,null,null);s["default"]=l.exports}}]);