From 849792df422764d1942764a1ca6fae783fc60c8f Mon Sep 17 00:00:00 2001
From: zhal <15900249928@163.com>
Date: Tue, 12 Jul 2022 10:31:03 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B2=97=E4=BD=8D=E6=98=BE=E7=A4=BA=E9=83=A8?=
 =?UTF-8?q?=E7=BD=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../scripts/diagraming/designer.core.js        | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

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 47db1b2d..d66b502d 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
@@ -367,6 +367,7 @@ var Designer = {
                                                 return
                                             }
                                         }
+                                        debugger;
                                         b.attr("class", "shape_box");
                                         Designer.events.push("created", g);
                                         Model.add(g);
@@ -4058,6 +4059,7 @@ var Designer = {
             }
         },
         renderShape: function(q) {
+            debugger;
             if (q.name == "linker") {
                 this.renderLinker(q);
                 return
@@ -4505,6 +4507,7 @@ var Designer = {
             }
         },
         renderDataAttributes: function(i, k) {
+            debugger;
             $("#" + i.id).children(".attr_canvas").remove();
             if (!i.dataAttributes || i.dataAttributes.length == 0) {
                 return
@@ -4529,7 +4532,17 @@ var Designer = {
                                 l = j.name + ": "
                             }
                             if (jjj.showType == "text" || jjj.showType == "attr") {
-                                l += jjj.value
+
+                                //判断如果岗位多个数据,...显示  by zhaolei
+                                var lenth=jjj.value.match(/,/g).length;
+                                if(lenth>=2){
+                                    var index1=jjj.value.indexOf(",");
+                                    var index2=jjj.value.indexOf(",",index1+1);
+                                    l+=jjj.value.substr(0,index2)+"...";
+                                }else{
+                                    l += jjj.value
+                                }
+
                             } else {
                                 if (jjj.showType == "icon") {
                                     o = jjj.icon
@@ -4563,6 +4576,7 @@ var Designer = {
                 m(j, l, o)*/
             }
             function m(c, y, x) {
+                debugger;
                 var h = c.horizontal;
                 var I = c.vertical;
                 var H = $("<canvas id='attr_canvas_" + c.id + "' class='attr_canvas'></canvas>").appendTo($("#" + i.id));
@@ -4680,6 +4694,7 @@ var Designer = {
                             b.fillStyle = "#6666FF";
                         }
                         var tempY = a / 2 + v * 12;
+                        debugger;
                         if (tempL < D) {
                             b.fillText(y.substring(v * tempShapeWidth / (D / y.length), tempL / (D / y.length)), tempX, tempY);
                         } else {
@@ -6173,6 +6188,7 @@ var Utils = {
                     for (var au = 0; au < am.dataAttributes.length; au++) {
                         var ap = am.dataAttributes[au];
                         if (ap.type == "link" && ap.showType && ap.showType != "none") {
+                            debugger;
                             var af = i.children("#attr_canvas_" + ap.id);
                             if (af.length > 0) {
                                 var ai = af.position();