From 727bd19462e49af21412ab008e96237c29ce0cfb Mon Sep 17 00:00:00 2001 From: zhal <15900249928@163.com> Date: Thu, 14 Jul 2022 11:22:03 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=B2=97=E4=BD=8D=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../lib/designer/scripts/diagraming/designer.core.js | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/lib/designer/scripts/diagraming/designer.core.js b/com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/lib/designer/scripts/diagraming/designer.core.js index e8b8e92d..1e599eef 100755 --- a/com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/lib/designer/scripts/diagraming/designer.core.js +++ b/com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/lib/designer/scripts/diagraming/designer.core.js @@ -4533,8 +4533,6 @@ var Designer = { //判断如果岗位多个数据,...显示 by zhaolei if (jjj.value != "") { debugger; - if(jj.value!=undefined){ - if (jj.value.indexOf(',') > -1){ var lenth = jjj.value.match(/,/g).length; if (lenth >= 2) { var index1 = jjj.value.indexOf(","); @@ -4543,10 +4541,9 @@ var Designer = { } else { l += jjj.value; } + }else{ l += jjj.value; - } - } } } else { From 5cc09e7db91ac18b574877a875c0e5dbb84e3b0e Mon Sep 17 00:00:00 2001 From: anhc <3442943606@qq.com> Date: Thu, 14 Jul 2022 15:02:25 +0800 Subject: [PATCH 2/2] =?UTF-8?q?pal=20=E5=BA=94=E7=94=A8vue=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../template/page/main.htm | 2 +- .../{app.634e376c.css => app.b58aa8df.css} | 2 +- ...70273e.css => chunk-03c6285a.7d5e2b5a.css} | 0 ...861d84.css => chunk-0df035f6.e83dbaa2.css} | 0 ...caea12.css => chunk-21453108.a3fd01d3.css} | 0 ...b5de63.css => chunk-23a660f0.0ecc4095.css} | 0 .../main/css/chunk-532765fe.0cca68dd.css | 1 - ...2e96af.css => chunk-62973164.df722ecd.css} | 2 +- ...1c4dc9.css => chunk-79148172.dc3e7967.css} | 0 ...811566.css => chunk-7f2e89b2.e0cd2ccf.css} | 0 ...467910.css => chunk-b158b92a.fe2f3f84.css} | 0 .../main/css/chunk-bb3b9f20.f7f4b256.css | 1 + ...ont.1c1408b5.svg => iconfont.71026185.svg} | 0 ...5fd.svg => iconfont.ce1b01d3.ce1b01d3.svg} | 0 .../js/{app.7019d6cd.js => app.5b0b673e.js} | 4 +- ...07c16352.js => chunk-03c6285a.ad686911.js} | 2 +- ...5d555915.js => chunk-0df035f6.5d5601d8.js} | 2 +- .../main/js/chunk-18ba0bf3.d0d27872.js | 1 - .../main/js/chunk-21453108.ee636e90.js | 1 + .../main/js/chunk-23a660f0.a0811617.js | 1 + ...ca03ae9d.js => chunk-2d0ab156.128f137a.js} | 2 +- ...3038704d.js => chunk-2d0f078a.b230933d.js} | 2 +- ...3ebfc816.js => chunk-2d212b99.1061dc70.js} | 2 +- ...96ada280.js => chunk-2d216d3a.7474d207.js} | 2 +- ...e62adedc.js => chunk-2d224b23.5d50ea7e.js} | 2 +- ...44cb7f2b.js => chunk-2d224ef1.3618651e.js} | 2 +- .../main/js/chunk-3178e2bf.e4bd60ae.js | 1 + .../main/js/chunk-3a9b7577.1c8372d8.js | 1 + .../main/js/chunk-532765fe.9bb04323.js | 1 - .../main/js/chunk-5ca06e36.c64d879b.js | 1 - .../main/js/chunk-604dda2c.97f6b8da.js | 1 - .../main/js/chunk-62973164.e58c040a.js | 1 + .../main/js/chunk-6c83edf4.93b8726a.js | 1 - .../main/js/chunk-79148172.6e616cff.js | 1 + .../main/js/chunk-7f2e89b2.005521e6.js | 1 + .../main/js/chunk-866d5568.463c2fdd.js | 1 - .../main/js/chunk-9d1e04c4.ddede9a0.js | 1 - .../main/js/chunk-b158b92a.011e3ae6.js | 1 + .../main/js/chunk-bb3b9f20.90babfc9.js | 1 + .../main/js/chunk-bf7921b8.1d6eee48.js | 1 - .../main/js/chunk-f3e4ff48.6d7f9787.js | 1 - .../main/js/chunk-vendors.54a27270.js | 38 +++++++++++++++++++ .../main/js/chunk-vendors.bd2b52b4.js | 38 ------------------- 43 files changed, 61 insertions(+), 61 deletions(-) rename com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/main/css/{app.634e376c.css => app.b58aa8df.css} (99%) rename com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/main/css/{chunk-1fd5b92a.9170273e.css => chunk-03c6285a.7d5e2b5a.css} (100%) rename com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/main/css/{chunk-3a7599c6.bb861d84.css => chunk-0df035f6.e83dbaa2.css} (100%) rename com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/main/css/{chunk-9d1e04c4.d1caea12.css => chunk-21453108.a3fd01d3.css} (100%) rename com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/main/css/{chunk-18ba0bf3.b9b5de63.css => chunk-23a660f0.0ecc4095.css} (100%) delete mode 100644 com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/main/css/chunk-532765fe.0cca68dd.css rename com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/main/css/{chunk-604dda2c.3d2e96af.css => chunk-62973164.df722ecd.css} (89%) rename com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/main/css/{chunk-f3e4ff48.721c4dc9.css => chunk-79148172.dc3e7967.css} (100%) rename com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/main/css/{chunk-866d5568.59811566.css => chunk-7f2e89b2.e0cd2ccf.css} (100%) rename com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/main/css/{chunk-6c83edf4.6c467910.css => chunk-b158b92a.fe2f3f84.css} (100%) create mode 100644 com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/main/css/chunk-bb3b9f20.f7f4b256.css rename com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/main/img/{iconfont.1c1408b5.svg => iconfont.71026185.svg} (100%) rename com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/main/img/{iconfont.ce1b01d3.7c0515fd.svg => iconfont.ce1b01d3.ce1b01d3.svg} (100%) rename com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/main/js/{app.7019d6cd.js => app.5b0b673e.js} (99%) rename com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/main/js/{chunk-1fd5b92a.07c16352.js => chunk-03c6285a.ad686911.js} (97%) rename com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/main/js/{chunk-3a7599c6.5d555915.js => chunk-0df035f6.5d5601d8.js} (98%) delete mode 100644 com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/main/js/chunk-18ba0bf3.d0d27872.js create mode 100644 com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/main/js/chunk-21453108.ee636e90.js create mode 100644 com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/main/js/chunk-23a660f0.a0811617.js rename com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/main/js/{chunk-2d0ab156.ca03ae9d.js => chunk-2d0ab156.128f137a.js} (82%) rename com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/main/js/{chunk-2d0f078a.3038704d.js => chunk-2d0f078a.b230933d.js} (90%) rename com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/main/js/{chunk-2d0b25b0.3ebfc816.js => chunk-2d212b99.1061dc70.js} (99%) rename com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/main/js/{chunk-2d216d3a.96ada280.js => chunk-2d216d3a.7474d207.js} (91%) rename com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/main/js/{chunk-2d224b23.e62adedc.js => chunk-2d224b23.5d50ea7e.js} (84%) rename com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/main/js/{chunk-2d224ef1.44cb7f2b.js => chunk-2d224ef1.3618651e.js} (90%) create mode 100644 com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/main/js/chunk-3178e2bf.e4bd60ae.js create mode 100644 com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/main/js/chunk-3a9b7577.1c8372d8.js delete mode 100644 com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/main/js/chunk-532765fe.9bb04323.js delete mode 100644 com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/main/js/chunk-5ca06e36.c64d879b.js delete mode 100644 com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/main/js/chunk-604dda2c.97f6b8da.js create mode 100644 com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/main/js/chunk-62973164.e58c040a.js delete mode 100644 com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/main/js/chunk-6c83edf4.93b8726a.js create mode 100644 com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/main/js/chunk-79148172.6e616cff.js create mode 100644 com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/main/js/chunk-7f2e89b2.005521e6.js delete mode 100644 com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/main/js/chunk-866d5568.463c2fdd.js delete mode 100644 com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/main/js/chunk-9d1e04c4.ddede9a0.js create mode 100644 com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/main/js/chunk-b158b92a.011e3ae6.js create mode 100644 com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/main/js/chunk-bb3b9f20.90babfc9.js delete mode 100644 com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/main/js/chunk-bf7921b8.1d6eee48.js delete mode 100644 com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/main/js/chunk-f3e4ff48.6d7f9787.js create mode 100644 com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/main/js/chunk-vendors.54a27270.js delete mode 100644 com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/main/js/chunk-vendors.bd2b52b4.js diff --git a/com.actionsoft.apps.coe.pal/template/page/main.htm b/com.actionsoft.apps.coe.pal/template/page/main.htm index b1f79fcf..0cd745f0 100644 --- a/com.actionsoft.apps.coe.pal/template/page/main.htm +++ b/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";