From c41fb2a31baf5464773934020f95662ca127b2c7 Mon Sep 17 00:00:00 2001 From: "mrs_12345@163.com" Date: Wed, 6 Jul 2022 20:15:45 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E8=AE=A1=E5=99=A8=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E5=B1=9E=E6=80=A7=E6=97=B6=E9=97=B4=E9=80=89=E6=8B=A9=E5=99=A8?= =?UTF-8?q?=E4=BD=8D=E7=BD=AEbug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pal/repository/web/CoeProcessLevelWeb.java | 2 +- .../template/page/pal.pl.repository.designer.htm | 5 +++-- .../designer/extend/js/designer.extend.link.js | 15 +++++++++------ 3 files changed, 13 insertions(+), 9 deletions(-) diff --git a/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/web/CoeProcessLevelWeb.java b/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/web/CoeProcessLevelWeb.java index f4b19e45..701d7b44 100755 --- a/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/web/CoeProcessLevelWeb.java +++ b/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/web/CoeProcessLevelWeb.java @@ -2646,7 +2646,7 @@ public class CoeProcessLevelWeb extends ActionWeb { event = "readonly='readonly' data-value="+ dataArr +" groupPath=\"" + attributeModel.getGroupPath() + "\" ref="+ refObj +" onclick=\"openRelationAwsorgDialog($(this))\""; input = ""; } else if("DateTimePicker".equals(type)) { - input = "" + ""; + input = "" + ""; }else if ("table".equals(type)){ JSONObject table = JSON.parseObject(jsonValue); diff --git a/com.actionsoft.apps.coe.pal/template/page/pal.pl.repository.designer.htm b/com.actionsoft.apps.coe.pal/template/page/pal.pl.repository.designer.htm index 00cb8179..fe64efd8 100755 --- a/com.actionsoft.apps.coe.pal/template/page/pal.pl.repository.designer.htm +++ b/com.actionsoft.apps.coe.pal/template/page/pal.pl.repository.designer.htm @@ -928,7 +928,8 @@
-
+ +
@@ -1155,7 +1156,7 @@ -
+
文件属性
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 69374804..e774df8a 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 @@ -1117,7 +1117,6 @@ function getLinkFileValue(treeNode) { // 数属性tab页面效果js function selectAttrTabTag(showContent, selfObj) { - debugger; // 操作标签 var tag = $("#tabUlContainer li"); var taglength = tag.length; @@ -1303,7 +1302,7 @@ function noPermissionMsg(){ // 属性的动态切换 function attributeShowTabContent(currentShape) { - debugger; + // 属性弹出层显示的内容 var shape = Utils.getSelected()[0]; if (!shape) { @@ -1443,7 +1442,6 @@ function getPrivateAttributeHtml(attributesJsonArray, tbodyId, shape) { + '
' + obj.value + '
' + ' '; if ((!objReadonly && objType == "string") || (!objReadonly && objType == "list") || (!objReadonly && objType == "link")) { - debugger; // 目前支持到文本的输入 ,需求定下了再改 constr = '' + ' ' + objName + requiredSpan + '' @@ -1941,7 +1939,6 @@ function showEditButton(obj) { var inputUpdate = false; function saveInputContent(obj,value) { - debugger; // 按钮 // $(obj).siblings("span::contains('...')").hide(); inputUpdate = true; @@ -2777,10 +2774,16 @@ function setDivHeight() {/* } function changeArributeByShape() { - debugger; if (Utils.getSelected()[0] == null) { $("#dock_content_attribute").hide(); $("#attr_no_more_attribute_id").show(); + var iframeDocument=$("#file_attribute")[0].contentWindow.document; + var body = $(iframeDocument).find('body') + var pickerNum = $(body).find('input[name="dateTimePicker"]').length + if (pickerNum > 0) { + var height = $(body).find('#frmMain').height() + 300 + $("#file_attribute").height(height) + } } else { // 属性弹出层显示的内容 var shape = Utils.getSelected()[0]; @@ -3426,7 +3429,7 @@ function getRelevanceAwsOrgNameByShapeId(objIds, shapeId) { // 形状关联弹窗 function openRelationDig(obj,value) { - debugger; + var shapeRelationValue = $("input[objid_shapeId='" + $(obj).attr("objid") + "']").val(); var ref = $("input[objid_shapeId='" + $(obj).attr("objid") + "']").attr("ref"); // shape file shapeAndFile var relationShapeIds = '';