From 53e7b9c16ca675194b909adbdc0152797eab27bf Mon Sep 17 00:00:00 2001 From: yujh Date: Mon, 6 Jan 2025 15:17:53 +0800 Subject: [PATCH] =?UTF-8?q?=E6=98=AF=E5=90=A6=E5=85=B3=E9=94=AE=E8=8A=82?= =?UTF-8?q?=E7=82=B9=E5=A2=9E=E5=8A=A0=E8=A7=92=E6=A0=87=E9=80=BB=E8=BE=91?= =?UTF-8?q?=EF=BC=8C=E4=BB=A3=E7=A0=81=E4=BF=AE=E5=A4=8D=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E9=81=8D=E5=8E=86=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../designer/extend/js/designer.extend.link.js | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/lib/designer/extend/js/designer.extend.link.js b/com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/lib/designer/extend/js/designer.extend.link.js index ba82defe..188c6030 100755 --- a/com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/lib/designer/extend/js/designer.extend.link.js +++ b/com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/lib/designer/extend/js/designer.extend.link.js @@ -2291,7 +2291,12 @@ function updateAttributeById(objId, va, shapeId) { } ]; - shape.dataAttributes[13]["dataShowConfig"].config = dataArray; + shape.dataAttributes.forEach(function(attribute) { + if(attribute.attributesJsonArray){ + attribute["dataShowConfig"].config = dataArray; + } + }); + }else if(isCriticalControlPoint === "否"){ var dataArray = [ { @@ -2302,7 +2307,12 @@ function updateAttributeById(objId, va, shapeId) { } ]; - shape.dataAttributes[13]["dataShowConfig"].config = dataArray; + shape.dataAttributes.forEach(function(attribute) { + if(attribute.attributesJsonArray){ + attribute["dataShowConfig"].config = dataArray; + } + }); + } Model.update(shape); } @@ -4110,9 +4120,6 @@ function getBooleanSelectOptions(booleanValues, shapeId) { if (selectedData != null && selectedData != '') { $("#attribute_name_input_" + objId).val(selectedData[0]).trigger("change"); } - $obj.on("select2:select", function (e) { - alert(1); - }); $obj.off("select2:close").on("select2:close", function (e) { // var type = this.id.substring(this.id.lastIndexOf('_')+1); var type = this.id.substr('attribute_name_input_'.length);