形状属性tab切换错误问题
This commit is contained in:
parent
4d526a3cd2
commit
2af24dff46
@ -99,17 +99,17 @@
|
|||||||
var type = "<#type>";
|
var type = "<#type>";
|
||||||
var chartId = "<#charId>";
|
var chartId = "<#charId>";
|
||||||
var ruuid = "<#uuid>";
|
var ruuid = "<#uuid>";
|
||||||
var definition = <#define> ;
|
var definition =; <#define> ;
|
||||||
var userId = "<#uid>";
|
var userId = "<#uid>";
|
||||||
var userName = "<#userName>";
|
var userName = "<#userName>";
|
||||||
var methodId = "<#methodId>";
|
var methodId = "<#methodId>";
|
||||||
var isPalManage = <#isPalManage>;
|
var isPalManage =; <#isPalManage>;
|
||||||
var isExistCopy=<#isExistCopy>;
|
var isExistCopy=;<#isExistCopy>;
|
||||||
var isAppearCopy=<#isAppearCopy>;
|
var isAppearCopy=;<#isAppearCopy>;
|
||||||
var isAdmin = <#isAdmin>;
|
var isAdmin =; <#isAdmin>;
|
||||||
var isCustomDefine = "<#isCustomDefine>";
|
var isCustomDefine = "<#isCustomDefine>";
|
||||||
var isLaneAttrConfig = <#isLaneAttrConfig>;
|
var isLaneAttrConfig =; <#isLaneAttrConfig>;
|
||||||
var isLaneForceRefreshShapeAttr = <#isLaneForceRefreshShapeAttr>;
|
var isLaneForceRefreshShapeAttr =; <#isLaneForceRefreshShapeAttr>;
|
||||||
//检查用户所需参数
|
//检查用户所需参数
|
||||||
var checkoutstate = "<#checkoutstate>";
|
var checkoutstate = "<#checkoutstate>";
|
||||||
var checkoutuser = "<#checkoutuser>";
|
var checkoutuser = "<#checkoutuser>";
|
||||||
@ -171,13 +171,13 @@
|
|||||||
var schemeId = "<#schemeId>";
|
var schemeId = "<#schemeId>";
|
||||||
var frmFileName = "<#processName>"; //平台的流程名称
|
var frmFileName = "<#processName>"; //平台的流程名称
|
||||||
var BPMInstanceName = "<#BPMInstanceName>"; // 节点名称
|
var BPMInstanceName = "<#BPMInstanceName>"; // 节点名称
|
||||||
var isView = <#isView>; //是否只读模式打开
|
var isView =; <#isView>; //是否只读模式打开
|
||||||
var isPublish = <#isPublish>; //是否是已发布流程(已发布流程不允许修改)
|
var isPublish =; <#isPublish>; //是否是已发布流程(已发布流程不允许修改)
|
||||||
var isStop = <#isStop>; //是否是已停用流程(已停用流程不允许修改)
|
var isStop =; <#isStop>; //是否是已停用流程(已停用流程不允许修改)
|
||||||
var isApproval = <#isApproval>;// 是否是审核中流程(审核中流程不允许修改)
|
var isApproval =; <#isApproval>;// 是否是审核中流程(审核中流程不允许修改)
|
||||||
var isAutoSave = "<#isAutoSave>"; //是否允许实时保存
|
var isAutoSave = "<#isAutoSave>"; //是否允许实时保存
|
||||||
var isMarked = <#isMarked>;// // PAL推送至BPMS,但BPMS端未分配
|
var isMarked =; <#isMarked>;// // PAL推送至BPMS,但BPMS端未分配
|
||||||
var isCorrelateBpms = <#isCorrelateBpms>;// 是否与BPM有关系的流程
|
var isCorrelateBpms =; <#isCorrelateBpms>;// 是否与BPM有关系的流程
|
||||||
var perms = "<#perms>"; //该流程权限
|
var perms = "<#perms>"; //该流程权限
|
||||||
var filePerms = "<#filePerms>"; //所有有权限的文件
|
var filePerms = "<#filePerms>"; //所有有权限的文件
|
||||||
//角色类型,owner-编辑,viewer-只读
|
//角色类型,owner-编辑,viewer-只读
|
||||||
@ -191,16 +191,16 @@
|
|||||||
var ext4 = "<#ext4>";
|
var ext4 = "<#ext4>";
|
||||||
|
|
||||||
// 帮助工具栏扩展url
|
// 帮助工具栏扩展url
|
||||||
var customHelpToolExtMenuUrl = <#customHelpToolExtMenuUrl>;
|
var customHelpToolExtMenuUrl =; <#customHelpToolExtMenuUrl>;
|
||||||
// 图形定义
|
// 图形定义
|
||||||
var methodObjectDesc = <#methodObjectDesc>;
|
var methodObjectDesc =; <#methodObjectDesc>;
|
||||||
//是否需要保存提示
|
//是否需要保存提示
|
||||||
var isSave = true;
|
var isSave = true;
|
||||||
var isNeedPutMessage = true;
|
var isNeedPutMessage = true;
|
||||||
|
|
||||||
var isCollaboration = <#isCollaborationSwitch> ? ((isView == true || isPublish == true) ? false : true) : false; //是否进行协作
|
var isCollaboration =; <#isCollaborationSwitch> ? ((isView == true || isPublish == true) ? false : true) : false; //是否进行协作
|
||||||
var sameNameCheck = <#sameNameCheck>;
|
var sameNameCheck =; <#sameNameCheck>;
|
||||||
var processOutput = <#processOutput>;
|
var processOutput =; <#processOutput>;
|
||||||
var openAppType = "<#openAppType>"; //打开设计器的app类型, 暂时用于判断留言
|
var openAppType = "<#openAppType>"; //打开设计器的app类型, 暂时用于判断留言
|
||||||
|
|
||||||
var operateType = "<#operateType>";
|
var operateType = "<#operateType>";
|
||||||
@ -216,10 +216,10 @@
|
|||||||
var processDefVersionId = "<#processDefVersionId>";
|
var processDefVersionId = "<#processDefVersionId>";
|
||||||
var processVersion = "<#processVersion>";
|
var processVersion = "<#processVersion>";
|
||||||
var selectedElementId="<#selectedElementId>"
|
var selectedElementId="<#selectedElementId>"
|
||||||
<#schema>
|
<#schema>;
|
||||||
|
|
||||||
//图形之间的关系定义json数组
|
//图形之间的关系定义json数组
|
||||||
var linkerRelationship = <#linkerRelationship> ;
|
var linkerRelationship =; <#linkerRelationship> ;
|
||||||
var isParentShow = true;
|
var isParentShow = true;
|
||||||
/* var relationObj = <#relationObj>; */
|
/* var relationObj = <#relationObj>; */
|
||||||
//visio 导入相关
|
//visio 导入相关
|
||||||
@ -233,12 +233,12 @@
|
|||||||
var BPMNLevel0 = "<#BPMNLevel0>";
|
var BPMNLevel0 = "<#BPMNLevel0>";
|
||||||
var BPMNLevel1 = "<#BPMNLevel1>";
|
var BPMNLevel1 = "<#BPMNLevel1>";
|
||||||
var BPMNLevel2 = "<#BPMNLevel2>";
|
var BPMNLevel2 = "<#BPMNLevel2>";
|
||||||
var relationShapesObject = <#relationShapes>;
|
var relationShapesObject =; <#relationShapes>;
|
||||||
var relationShapeModelObject = <#relationShapeModels>;
|
var relationShapeModelObject =; <#relationShapeModels>;
|
||||||
var moreShapeButton = "<#btnShapeStyle>";
|
var moreShapeButton = "<#btnShapeStyle>";
|
||||||
var installBatch = <#installBatch>;
|
var installBatch =; <#installBatch>;
|
||||||
|
|
||||||
var attrDefineObj = <#attrDefineObj>;
|
var attrDefineObj =; <#attrDefineObj>;
|
||||||
</script>
|
</script>
|
||||||
<!--工具js-->
|
<!--工具js-->
|
||||||
<script type='text/javascript' charset='UTF-8' src='../apps/com.actionsoft.apps.coe.pal/lib/designer/extend/js/util/map.js'></script>
|
<script type='text/javascript' charset='UTF-8' src='../apps/com.actionsoft.apps.coe.pal/lib/designer/extend/js/util/map.js'></script>
|
||||||
@ -314,7 +314,7 @@
|
|||||||
liHtml += '<li onclick="openUrl(\'helpToolExtUrl\',\''+ children[j].url +'\',{},\'_blank\')">' + children[j].name + '</li>';
|
liHtml += '<li onclick="openUrl(\'helpToolExtUrl\',\''+ children[j].url +'\',{},\'_blank\')">' + children[j].name + '</li>';
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
liHtml += '</ul>'
|
liHtml += '</ul>';
|
||||||
liHtml += '</li>';
|
liHtml += '</li>';
|
||||||
} else {// 只有第一层菜单
|
} else {// 只有第一层菜单
|
||||||
liHtml += '<li onclick="openUrl(\'helpToolExtUrl\',\''+ firstLevelObj.url +'\',{},\'_blank\')">' + firstLevelObj.name + '</li>';
|
liHtml += '<li onclick="openUrl(\'helpToolExtUrl\',\''+ firstLevelObj.url +'\',{},\'_blank\')">' + firstLevelObj.name + '</li>';
|
||||||
@ -366,7 +366,7 @@
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
//流程版本对比
|
//流程版本对比
|
||||||
var verArray = <#verArray>;
|
var verArray =; <#verArray>;
|
||||||
var verHtml = "";
|
var verHtml = "";
|
||||||
for (var i = 0; i < verArray.length; i++) {
|
for (var i = 0; i < verArray.length; i++) {
|
||||||
var tmp = verArray[i];
|
var tmp = verArray[i];
|
||||||
@ -1196,13 +1196,13 @@
|
|||||||
<div id="dock_content_attribute">
|
<div id="dock_content_attribute">
|
||||||
<ul id="tabUlContainer">
|
<ul id="tabUlContainer">
|
||||||
<li id="tabLiContainnerAttribute" class="selectTag">
|
<li id="tabLiContainnerAttribute" class="selectTag">
|
||||||
<a onClick="selectAttrTabTag('tagContent1',this)" href="javascript:void(0)">属性</a>
|
<a onClick="selectAttrTabTag2('tagContent1',this)" href="javascript:void(0)">属性</a>
|
||||||
</li>
|
</li>
|
||||||
<li>
|
<li>
|
||||||
<a onClick="selectAttrTabTag('tagContent0',this)" href="javascript:void(0)">关系</a>
|
<a onClick="selectAttrTabTag2('tagContent0',this)" href="javascript:void(0)">关系</a>
|
||||||
</li>
|
</li>
|
||||||
<li><a onClick="selectAttrTabTag('tagContent2',this)" href="javascript:void(0)">出现</a> </li>
|
<li><a onClick="selectAttrTabTag2('tagContent2',this)" href="javascript:void(0)">出现</a> </li>
|
||||||
<li><a onClick="selectAttrTabTag('tagContent3',this)" href="javascript:void(0)">关联</a> </li>
|
<li><a onClick="selectAttrTabTag2('tagContent3',this)" href="javascript:void(0)">关联</a> </li>
|
||||||
</ul>
|
</ul>
|
||||||
<!-- 数据属性表格 -->
|
<!-- 数据属性表格 -->
|
||||||
<div id="tagContent">
|
<div id="tagContent">
|
||||||
|
|||||||
@ -214,10 +214,10 @@ UI.showInsertLink = function() {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (!addr) {
|
if (!addr) {
|
||||||
addr = new Array();
|
addr = [];
|
||||||
}
|
}
|
||||||
var links_file = new Array();
|
var links_file = [];
|
||||||
var links_custom = new Array();
|
var links_custom = [];
|
||||||
for (var i = 0; i < addr.length; i++) {
|
for (var i = 0; i < addr.length; i++) {
|
||||||
var link = addr[i];
|
var link = addr[i];
|
||||||
if (link.type == "file") {
|
if (link.type == "file") {
|
||||||
@ -278,7 +278,7 @@ UI.showRiskDlg = function(){
|
|||||||
url:"./w?sid=" + $("#sid").val() + "&cmd=com.actionsoft.apps.coe.pal.risk_pal_designer_risk",
|
url:"./w?sid=" + $("#sid").val() + "&cmd=com.actionsoft.apps.coe.pal.risk_pal_designer_risk",
|
||||||
data:{"plId":ruuid, "taskId": shape.id, "taskNum": number}
|
data:{"plId":ruuid, "taskId": shape.id, "taskNum": number}
|
||||||
});
|
});
|
||||||
}
|
};
|
||||||
|
|
||||||
//流程节点的风险控制不为空,重新渲染shape
|
//流程节点的风险控制不为空,重新渲染shape
|
||||||
function renderShapeRisks(risk, control) {
|
function renderShapeRisks(risk, control) {
|
||||||
@ -330,7 +330,7 @@ UI.showImportDlg = function() {
|
|||||||
{text:'取消',handler:function(){$("#visio_import_dlg").dialog("close");}}
|
{text:'取消',handler:function(){$("#visio_import_dlg").dialog("close");}}
|
||||||
]
|
]
|
||||||
});
|
});
|
||||||
}
|
};
|
||||||
//初始化visio导入的fileupload组件
|
//初始化visio导入的fileupload组件
|
||||||
function initVisioImportFileUpload() {
|
function initVisioImportFileUpload() {
|
||||||
$("#visio_import_upfile").upfile({
|
$("#visio_import_upfile").upfile({
|
||||||
@ -518,7 +518,7 @@ function openLinkUrlRewrite(type, url, target, uuid, obj, fileName, inspected) {
|
|||||||
cmd: "com.actionsoft.apps.coe.pal_pl_repository_designer_viewer_link_perm",
|
cmd: "com.actionsoft.apps.coe.pal_pl_repository_designer_viewer_link_perm",
|
||||||
uuids: uuid,
|
uuids: uuid,
|
||||||
filePerms: filePerms
|
filePerms: filePerms
|
||||||
}
|
};
|
||||||
if (window.opener) {
|
if (window.opener) {
|
||||||
params.modelType = "used";
|
params.modelType = "used";
|
||||||
} else if (openerAppId != undefined && openerAppId != "com.actionsoft.apps.coe.pal" && openerAppId != "") {
|
} else if (openerAppId != undefined && openerAppId != "com.actionsoft.apps.coe.pal" && openerAppId != "") {
|
||||||
@ -667,7 +667,7 @@ UI.setLink = function() {
|
|||||||
for (var i = 0; i < shape.dataAttributes.length; i++) {
|
for (var i = 0; i < shape.dataAttributes.length; i++) {
|
||||||
var attr = shape.dataAttributes[i];
|
var attr = shape.dataAttributes[i];
|
||||||
if (attr.linksArray) {
|
if (attr.linksArray) {
|
||||||
linkArr = new Array();
|
linkArr = [];
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -881,7 +881,7 @@ function openLink(obj) {
|
|||||||
+ '" onclick="openLinkUrlRewrite(\''
|
+ '" onclick="openLinkUrlRewrite(\''
|
||||||
+ array_element.type + '\',\'' + array_element.url
|
+ array_element.type + '\',\'' + array_element.url
|
||||||
+ '\',\'' + array_element.target + '\',\''
|
+ '\',\'' + array_element.target + '\',\''
|
||||||
+ array_element.uuid + '\',\''
|
+ array_element.uuid + '\',\'';
|
||||||
'\',\''
|
'\',\''
|
||||||
+ array_element.name
|
+ array_element.name
|
||||||
+ '\')">'
|
+ '\')">'
|
||||||
@ -1006,7 +1006,7 @@ function deleteTheLinkNode(str, index) {
|
|||||||
function removeLinkHistoryByLink(obj) {
|
function removeLinkHistoryByLink(obj) {
|
||||||
var linkType = $("#link_dialog div.awsui-simple-tab").find("a.active").attr("tit");
|
var linkType = $("#link_dialog div.awsui-simple-tab").find("a.active").attr("tit");
|
||||||
window.top.$.mask();
|
window.top.$.mask();
|
||||||
myshapeLink = Utils.getSelected()[0]
|
myshapeLink = Utils.getSelected()[0];
|
||||||
var options = {
|
var options = {
|
||||||
title : "提示",
|
title : "提示",
|
||||||
content : "确定删除所选链接吗?",
|
content : "确定删除所选链接吗?",
|
||||||
@ -1116,7 +1116,7 @@ function getLinkFileValue(treeNode) {
|
|||||||
|
|
||||||
// 数属性tab页面效果js
|
// 数属性tab页面效果js
|
||||||
|
|
||||||
function selectAttrTabTag(showContent, selfObj) {
|
function selectAttrTabTag2(showContent, selfObj) {
|
||||||
// 操作标签
|
// 操作标签
|
||||||
var tag = $("#tabUlContainer li");
|
var tag = $("#tabUlContainer li");
|
||||||
var taglength = tag.length;
|
var taglength = tag.length;
|
||||||
@ -1261,7 +1261,7 @@ function showRelevanceShapesContent() {
|
|||||||
var obj = {
|
var obj = {
|
||||||
id: shapesObj[i].fileId,
|
id: shapesObj[i].fileId,
|
||||||
processDefId: ''
|
processDefId: ''
|
||||||
}
|
};
|
||||||
onclick = 'window.opener.openDesginer({id:\'' + shapesObj[i].fileId + '\', processDefId:\'\'})';
|
onclick = 'window.opener.openDesginer({id:\'' + shapesObj[i].fileId + '\', processDefId:\'\'})';
|
||||||
}else if (parent.openLinkUrl){
|
}else if (parent.openLinkUrl){
|
||||||
if (shapesObj[i].url){
|
if (shapesObj[i].url){
|
||||||
@ -1342,7 +1342,7 @@ function attributeShowTabContent(currentShape) {
|
|||||||
} else {
|
} else {
|
||||||
if (shape.text.length > 15) {
|
if (shape.text.length > 15) {
|
||||||
var tempText = shape.text;
|
var tempText = shape.text;
|
||||||
tempText = tempText.substring(0, 15)
|
tempText = tempText.substring(0, 15);
|
||||||
$("span[name=attribute_desc_input]").text(shape.text).attr(
|
$("span[name=attribute_desc_input]").text(shape.text).attr(
|
||||||
"awsui-qtip", shape.text);
|
"awsui-qtip", shape.text);
|
||||||
} else {
|
} else {
|
||||||
@ -1361,7 +1361,7 @@ function attributeShowTabContent(currentShape) {
|
|||||||
}
|
}
|
||||||
if (shape.text.length > 15) {
|
if (shape.text.length > 15) {
|
||||||
var tempText = shape.text;
|
var tempText = shape.text;
|
||||||
tempText = tempText.substring(0, 15)
|
tempText = tempText.substring(0, 15);
|
||||||
$("span[name=attribute_desc_input]").text(shape.text).attr(
|
$("span[name=attribute_desc_input]").text(shape.text).attr(
|
||||||
"awsui-qtip", shape.text);
|
"awsui-qtip", shape.text);
|
||||||
} else {
|
} else {
|
||||||
@ -1374,7 +1374,7 @@ function attributeShowTabContent(currentShape) {
|
|||||||
$("#dock_view_header_title").html("数据属性");
|
$("#dock_view_header_title").html("数据属性");
|
||||||
}
|
}
|
||||||
|
|
||||||
var dialogTableList = []
|
var dialogTableList = [];
|
||||||
function getPrivateAttributeHtml(attributesJsonArray, tbodyId, shape) {
|
function getPrivateAttributeHtml(attributesJsonArray, tbodyId, shape) {
|
||||||
// 属性排序
|
// 属性排序
|
||||||
var defaultMoreAttr = $('#defaultMoreAttrSort').val();
|
var defaultMoreAttr = $('#defaultMoreAttrSort').val();
|
||||||
@ -1431,7 +1431,7 @@ function getPrivateAttributeHtml(attributesJsonArray, tbodyId, shape) {
|
|||||||
objReadonly = attr.readonly;
|
objReadonly = attr.readonly;
|
||||||
objRequired = attr.readonly;
|
objRequired = attr.readonly;
|
||||||
}
|
}
|
||||||
var requiredSpan = ''
|
var requiredSpan = '';
|
||||||
if(obj.isRequired !== null && obj.isRequired) {
|
if(obj.isRequired !== null && obj.isRequired) {
|
||||||
requiredSpan = '<span style="color: #f04134;float:right">*</span>'
|
requiredSpan = '<span style="color: #f04134;float:right">*</span>'
|
||||||
}
|
}
|
||||||
@ -1532,9 +1532,9 @@ function getPrivateAttributeHtml(attributesJsonArray, tbodyId, shape) {
|
|||||||
+ ' <input type="text" id="dateTimePicker_' + obj.id + '" objid="' + obj.id + '" placeholder="请选择日期" onblur="saveInputContent(this);" value="' + obj.value + '" class="attribute_input_css" data-shapeId="' + shape.id + '"/>'
|
+ ' <input type="text" id="dateTimePicker_' + obj.id + '" objid="' + obj.id + '" placeholder="请选择日期" onblur="saveInputContent(this);" value="' + obj.value + '" class="attribute_input_css" data-shapeId="' + shape.id + '"/>'
|
||||||
+ ' </td></tr>';
|
+ ' </td></tr>';
|
||||||
} else if (!objReadonly && objType == "table") {
|
} else if (!objReadonly && objType == "table") {
|
||||||
let objRef = JSON.parse(obj.ref)
|
let objRef = JSON.parse(obj.ref);
|
||||||
console.log('ref',objRef)
|
console.log('ref',objRef);
|
||||||
let objTableInput = obj.value.table !== undefined && obj.value.table.length > 1 ? '请查看' : '请输入'
|
let objTableInput = obj.value.table !== undefined && obj.value.table.length > 1 ? '请查看' : '请输入';
|
||||||
dialogTableList = obj.value.table == undefined ? [ { id: Utils.newId() ,name: objRef.firstColumn, desc: objRef.secondColumn} ] : obj.value.table;
|
dialogTableList = obj.value.table == undefined ? [ { id: Utils.newId() ,name: objRef.firstColumn, desc: objRef.secondColumn} ] : obj.value.table;
|
||||||
constr = '<tr ' + mouseout + mouseover + ' class="tagContentTableTr">'
|
constr = '<tr ' + mouseout + mouseover + ' class="tagContentTableTr">'
|
||||||
+ ' <td>' + objName + requiredSpan + '</td>'
|
+ ' <td>' + objName + requiredSpan + '</td>'
|
||||||
@ -1598,7 +1598,7 @@ Array.prototype.unique = function(){
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
return res;
|
return res;
|
||||||
}
|
};
|
||||||
|
|
||||||
|
|
||||||
// 得到不同属性值关联的形状
|
// 得到不同属性值关联的形状
|
||||||
@ -1655,7 +1655,7 @@ Array.prototype.notDistinct = function() {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
return newArr;
|
return newArr;
|
||||||
}
|
};
|
||||||
|
|
||||||
// 删除掉关联形状
|
// 删除掉关联形状
|
||||||
function removeTrRelevanceShapes(obj) {
|
function removeTrRelevanceShapes(obj) {
|
||||||
@ -1666,7 +1666,7 @@ function removeTrRelevanceShapes(obj) {
|
|||||||
onConfirm : function() {
|
onConfirm : function() {
|
||||||
// 确定删除
|
// 确定删除
|
||||||
var shape = Utils.getSelected()[0];
|
var shape = Utils.getSelected()[0];
|
||||||
var tempArray = new Array();
|
var tempArray = [];
|
||||||
var count = 0;
|
var count = 0;
|
||||||
if (shape) {
|
if (shape) {
|
||||||
var relevanceShapes = [];
|
var relevanceShapes = [];
|
||||||
@ -1784,7 +1784,7 @@ function updateModelElementsAttribute(selectedShape, nodes) {
|
|||||||
}
|
}
|
||||||
if (arrJsontemp.length != 0) {
|
if (arrJsontemp.length != 0) {
|
||||||
var tempArr = removeShepeAttributeAndReturnDifferent(arrJsontemp, filterNotCheckedAttribute(nodes, arrJsontemp));
|
var tempArr = removeShepeAttributeAndReturnDifferent(arrJsontemp, filterNotCheckedAttribute(nodes, arrJsontemp));
|
||||||
var tempArray = new Array();
|
var tempArray = [];
|
||||||
for (var e = 0; e < tempArr.length; e++) {
|
for (var e = 0; e < tempArr.length; e++) {
|
||||||
if (tempArr[e] != 0 && tempArr[e] != "0") {
|
if (tempArr[e] != 0 && tempArr[e] != "0") {
|
||||||
removeNotCheckedAttribute(shape, tempArr[e]);
|
removeNotCheckedAttribute(shape, tempArr[e]);
|
||||||
@ -1873,7 +1873,7 @@ function removeShepeAttributeAndReturnDifferent(exitObj, newObj1) {
|
|||||||
// 删除没有选中的元素
|
// 删除没有选中的元素
|
||||||
|
|
||||||
function removeNotCheckedAttribute(shape, obj1) {
|
function removeNotCheckedAttribute(shape, obj1) {
|
||||||
var tempArray = new Array();
|
var tempArray = [];
|
||||||
var attributesJsonArray1 = [];
|
var attributesJsonArray1 = [];
|
||||||
for (var i = 0; i < shape.dataAttributes.length; i++) {
|
for (var i = 0; i < shape.dataAttributes.length; i++) {
|
||||||
var attr = shape.dataAttributes[i];
|
var attr = shape.dataAttributes[i];
|
||||||
@ -1949,7 +1949,7 @@ function saveInputContent(obj,value) {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if(value !== undefined && value.isRequired && objValue == '') {
|
if(value !== undefined && value.isRequired && objValue == '') {
|
||||||
$(obj).attr('placeholder',value.name + '不能为空')
|
$(obj).attr('placeholder',value.name + '不能为空');
|
||||||
$(obj).addClass("required_input_css");
|
$(obj).addClass("required_input_css");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@ -1991,7 +1991,7 @@ function showAttributedEditWindow(obj) {
|
|||||||
var objId = $(obj).attr("objid");
|
var objId = $(obj).attr("objid");
|
||||||
var shape = Utils.getSelected()[0];
|
var shape = Utils.getSelected()[0];
|
||||||
var windowTitle = '提示';
|
var windowTitle = '提示';
|
||||||
let objValue = {}
|
let objValue = {};
|
||||||
if (shape) {
|
if (shape) {
|
||||||
var attributesJsonArray = [];
|
var attributesJsonArray = [];
|
||||||
for (var i = 0; i < shape.dataAttributes.length; i++) {
|
for (var i = 0; i < shape.dataAttributes.length; i++) {
|
||||||
@ -2004,7 +2004,7 @@ function showAttributedEditWindow(obj) {
|
|||||||
for (var index = 0; index < attributesJsonArray.length; index++) {
|
for (var index = 0; index < attributesJsonArray.length; index++) {
|
||||||
var tempObj = attributesJsonArray[index];
|
var tempObj = attributesJsonArray[index];
|
||||||
if (tempObj.id == objId) {
|
if (tempObj.id == objId) {
|
||||||
objValue = tempObj
|
objValue = tempObj;
|
||||||
windowTitle = tempObj.name;
|
windowTitle = tempObj.name;
|
||||||
// $("#attribute-edit-title").text(tempObj.name);
|
// $("#attribute-edit-title").text(tempObj.name);
|
||||||
$("#attribute-edit-content").val(tempObj.value);
|
$("#attribute-edit-content").val(tempObj.value);
|
||||||
@ -2026,7 +2026,7 @@ function showAttributedEditWindow(obj) {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if(objValue.isRequired && str == '') {
|
if(objValue.isRequired && str == '') {
|
||||||
$("#attribute-edit-content").attr('placeholder',objValue.name + '不能为空')
|
$("#attribute-edit-content").attr('placeholder',objValue.name + '不能为空');
|
||||||
$("#attribute-edit-content").addClass("required_input_css");
|
$("#attribute-edit-content").addClass("required_input_css");
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
@ -2046,7 +2046,7 @@ function showAttributedEditWindow(obj) {
|
|||||||
|
|
||||||
// table表格
|
// table表格
|
||||||
function openTableDialog(obj,value) {
|
function openTableDialog(obj,value) {
|
||||||
let tableName = '提示'
|
let tableName = '提示';
|
||||||
let objId = $(obj).attr("objid");
|
let objId = $(obj).attr("objid");
|
||||||
let shape = Utils.getSelected()[0];
|
let shape = Utils.getSelected()[0];
|
||||||
if (shape) {
|
if (shape) {
|
||||||
@ -2066,8 +2066,8 @@ function openTableDialog(obj,value) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
$('#attribute-table-content').empty()
|
$('#attribute-table-content').empty();
|
||||||
$('#attribute-add-content').empty()
|
$('#attribute-add-content').empty();
|
||||||
var thead =
|
var thead =
|
||||||
'<tr id="' + dialogTableList[0].id + '">'
|
'<tr id="' + dialogTableList[0].id + '">'
|
||||||
+ '<td style="width: 100px;" class="dialogTableHead">'
|
+ '<td style="width: 100px;" class="dialogTableHead">'
|
||||||
@ -2077,8 +2077,8 @@ function openTableDialog(obj,value) {
|
|||||||
+ dialogTableList[0].desc
|
+ dialogTableList[0].desc
|
||||||
+ '</td>'
|
+ '</td>'
|
||||||
+ '<td style="width: 60px;" class="dialogTableHead">操作</td>'
|
+ '<td style="width: 60px;" class="dialogTableHead">操作</td>'
|
||||||
+ '</tr>'
|
+ '</tr>';
|
||||||
$('#attribute-table-content').append(thead)
|
$('#attribute-table-content').append(thead);
|
||||||
for ( let i = 1; i < dialogTableList.length; i++) {
|
for ( let i = 1; i < dialogTableList.length; i++) {
|
||||||
let str =
|
let str =
|
||||||
'<tr id="' + dialogTableList[i].id + '">'
|
'<tr id="' + dialogTableList[i].id + '">'
|
||||||
@ -2089,10 +2089,10 @@ function openTableDialog(obj,value) {
|
|||||||
+ '<input class="dialog_table_input_css" value="' + dialogTableList[i].desc + '"/>'
|
+ '<input class="dialog_table_input_css" value="' + dialogTableList[i].desc + '"/>'
|
||||||
+ '</td>'
|
+ '</td>'
|
||||||
+ '<td style="width: 60px;text-align: center" class="dialogTableDelete" onclick="removeTableTr(this)">删除</td>'
|
+ '<td style="width: 60px;text-align: center" class="dialogTableDelete" onclick="removeTableTr(this)">删除</td>'
|
||||||
+'</tr>'
|
+'</tr>';
|
||||||
$('#attribute-table-content').append(str)
|
$('#attribute-table-content').append(str)
|
||||||
}
|
}
|
||||||
$('#attribute-add-content').append('<button onclick="addTableTr(this)">新增</button>')
|
$('#attribute-add-content').append('<button onclick="addTableTr(this)">新增</button>');
|
||||||
|
|
||||||
$("#attribute-table-window").dialog({
|
$("#attribute-table-window").dialog({
|
||||||
draggable: true,
|
draggable: true,
|
||||||
@ -2101,15 +2101,15 @@ function openTableDialog(obj,value) {
|
|||||||
text : '确定',
|
text : '确定',
|
||||||
cls : "blue",
|
cls : "blue",
|
||||||
handler : function() {
|
handler : function() {
|
||||||
let inputs = $('#attribute-table-content').find('input')
|
let inputs = $('#attribute-table-content').find('input');
|
||||||
for (let i = 1; i < dialogTableList.length; i++) {
|
for (let i = 1; i < dialogTableList.length; i++) {
|
||||||
dialogTableList[i].name = inputs[2*(i-1)].value
|
dialogTableList[i].name = inputs[2*(i-1)].value;
|
||||||
dialogTableList[i].desc = inputs[2*(i-1) +1].value
|
dialogTableList[i].desc = inputs[2*(i-1) +1].value
|
||||||
}
|
}
|
||||||
let tableObj = {
|
let tableObj = {
|
||||||
name: tableName,
|
name: tableName,
|
||||||
table: dialogTableList
|
table: dialogTableList
|
||||||
}
|
};
|
||||||
updateAttributeById($(obj).attr("objid"), tableObj);
|
updateAttributeById($(obj).attr("objid"), tableObj);
|
||||||
$("#attribute-table-window").dialog('close');
|
$("#attribute-table-window").dialog('close');
|
||||||
}
|
}
|
||||||
@ -2123,21 +2123,21 @@ function openTableDialog(obj,value) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
function addTableTr(obj) {
|
function addTableTr(obj) {
|
||||||
let newTrId = Utils.newId()
|
let newTrId = Utils.newId();
|
||||||
let defaultStr =
|
let defaultStr =
|
||||||
' <tr id="'+ newTrId + '">'
|
' <tr id="'+ newTrId + '">'
|
||||||
+ '<td style="width: 100px;"><input class="dialog_table_input_css" value=""/></td>'
|
+ '<td style="width: 100px;"><input class="dialog_table_input_css" value=""/></td>'
|
||||||
+ '<td style="width: 270px;"><input class="dialog_table_input_css" value=""/></td>'
|
+ '<td style="width: 270px;"><input class="dialog_table_input_css" value=""/></td>'
|
||||||
+ '<td style="width: 60px;text-align: center" class="dialogTableDelete" onclick="removeTableTr(this)">删除</td>'
|
+ '<td style="width: 60px;text-align: center" class="dialogTableDelete" onclick="removeTableTr(this)">删除</td>'
|
||||||
+ '</tr>'
|
+ '</tr>';
|
||||||
dialogTableList.push({ id: newTrId ,name: '',desc: ''})
|
dialogTableList.push({ id: newTrId ,name: '',desc: ''});
|
||||||
$('#attribute-table-content').append(defaultStr)
|
$('#attribute-table-content').append(defaultStr)
|
||||||
}
|
}
|
||||||
|
|
||||||
function removeTableTr(obj) {
|
function removeTableTr(obj) {
|
||||||
let removeId = obj.parentNode.getAttribute('id')
|
let removeId = obj.parentNode.getAttribute('id');
|
||||||
dialogTableList.splice(dialogTableList.findIndex(item => item.id == removeId), 1)
|
dialogTableList.splice(dialogTableList.findIndex(item => item.id == removeId), 1);
|
||||||
let tr = obj.parentNode
|
let tr = obj.parentNode;
|
||||||
tr.remove()
|
tr.remove()
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -2151,7 +2151,7 @@ function updateAttributeById(objId, va, shapeId) {
|
|||||||
shape = Utils.getSelected()[0];
|
shape = Utils.getSelected()[0];
|
||||||
selectShape = shape;
|
selectShape = shape;
|
||||||
}
|
}
|
||||||
var tempArray = new Array();
|
var tempArray = [];
|
||||||
var count = 0;
|
var count = 0;
|
||||||
if (shape) {
|
if (shape) {
|
||||||
/*
|
/*
|
||||||
@ -2208,7 +2208,7 @@ function removeTrAttribute(obj) {
|
|||||||
onConfirm : function() {
|
onConfirm : function() {
|
||||||
// 确定删除
|
// 确定删除
|
||||||
var shape = Utils.getSelected()[0];
|
var shape = Utils.getSelected()[0];
|
||||||
var tempArray = new Array();
|
var tempArray = [];
|
||||||
var count = 0;
|
var count = 0;
|
||||||
if (shape) {
|
if (shape) {
|
||||||
// shape.attributesContent = $("#tagContentTable0").html();
|
// shape.attributesContent = $("#tagContentTable0").html();
|
||||||
@ -2365,8 +2365,8 @@ Designer.events.addEventListener("linkerCreated", function(linker) {
|
|||||||
* 图形创建后重写
|
* 图形创建后重写
|
||||||
*/
|
*/
|
||||||
Designer.events.addEventListener("created", function(shape) {
|
Designer.events.addEventListener("created", function(shape) {
|
||||||
let shapePosition = shape.props
|
let shapePosition = shape.props;
|
||||||
let pageSize = Model.define.page
|
let pageSize = Model.define.page;
|
||||||
if (shapePosition.x + shapePosition.w > pageSize.width - pageSize.padding) {
|
if (shapePosition.x + shapePosition.w > pageSize.width - pageSize.padding) {
|
||||||
Designer.setPageStyle({
|
Designer.setPageStyle({
|
||||||
width: shapePosition.x + shapePosition.w + pageSize.padding + 30,
|
width: shapePosition.x + shapePosition.w + pageSize.padding + 30,
|
||||||
@ -2778,10 +2778,10 @@ function changeArributeByShape() {
|
|||||||
$("#dock_content_attribute").hide();
|
$("#dock_content_attribute").hide();
|
||||||
$("#attr_no_more_attribute_id").show();
|
$("#attr_no_more_attribute_id").show();
|
||||||
var iframeDocument=$("#file_attribute")[0].contentWindow.document;
|
var iframeDocument=$("#file_attribute")[0].contentWindow.document;
|
||||||
var body = $(iframeDocument).find('body')
|
var body = $(iframeDocument).find('body');
|
||||||
var pickerNum = $(body).find('input[name="dateTimePicker"]').length
|
var pickerNum = $(body).find('input[name="dateTimePicker"]').length;
|
||||||
if (pickerNum > 0) {
|
if (pickerNum > 0) {
|
||||||
var height = $(body).find('#frmMain').height() + 300
|
var height = $(body).find('#frmMain').height() + 300;
|
||||||
$("#file_attribute").height(height)
|
$("#file_attribute").height(height)
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
@ -2835,7 +2835,7 @@ function changeArributeByShape() {
|
|||||||
var newAttrArray = [];
|
var newAttrArray = [];
|
||||||
newAttrArray = tempAttrArray.concat(attributesJsonArrayT).filter(function(v, i, arr) {
|
newAttrArray = tempAttrArray.concat(attributesJsonArrayT).filter(function(v, i, arr) {
|
||||||
return arr.indexOf(v) === arr.lastIndexOf(v);
|
return arr.indexOf(v) === arr.lastIndexOf(v);
|
||||||
});;
|
});
|
||||||
attributesJsonArrayT = tempAttrArray.concat(newAttrArray);
|
attributesJsonArrayT = tempAttrArray.concat(newAttrArray);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -2859,7 +2859,7 @@ function changeArributeByShape() {
|
|||||||
} else {
|
} else {
|
||||||
if (shape.text.length > 15) {
|
if (shape.text.length > 15) {
|
||||||
var tempText = shape.text;
|
var tempText = shape.text;
|
||||||
tempText = tempText.substring(0, 15)
|
tempText = tempText.substring(0, 15);
|
||||||
$("span[name=attribute_desc_input]").text(shape.text).attr(
|
$("span[name=attribute_desc_input]").text(shape.text).attr(
|
||||||
"awsui-qtip", shape.text);
|
"awsui-qtip", shape.text);
|
||||||
} else {
|
} else {
|
||||||
@ -3108,7 +3108,7 @@ function getRelevanceShapeNameByShapeId(objIds, shapeId) {
|
|||||||
var shapeNames = [];
|
var shapeNames = [];
|
||||||
var shapeRelationValue = [];
|
var shapeRelationValue = [];
|
||||||
var ref = shapeRefObj[objId];
|
var ref = shapeRefObj[objId];
|
||||||
var relationType = ref.type
|
var relationType = ref.type;
|
||||||
for (var j = 0; j < list.length; j++) {
|
for (var j = 0; j < list.length; j++) {
|
||||||
if (list[j].attrId == objId) {
|
if (list[j].attrId == objId) {
|
||||||
shapeNames.push(list[j].relationShapeText);
|
shapeNames.push(list[j].relationShapeText);
|
||||||
@ -3260,7 +3260,7 @@ function getAwsOrgAttributeByAttrId(shape, objId, checkedOrgList) {
|
|||||||
function saveRelevanceAwsOrgShapesTODB1(shapesObj, shapeId, shapeName, fileName, shapeGroupId, objId, shape,attributeValue) {
|
function saveRelevanceAwsOrgShapesTODB1(shapesObj, shapeId, shapeName, fileName, shapeGroupId, objId, shape,attributeValue) {
|
||||||
if (attributeValue.isRequired && shapesObj.length == 0) {
|
if (attributeValue.isRequired && shapesObj.length == 0) {
|
||||||
$("input[objid='" + objId + "']").val('');
|
$("input[objid='" + objId + "']").val('');
|
||||||
$("input[objid='" + objId + "']").attr('placeholder',attributeValue.name + '不能为空')
|
$("input[objid='" + objId + "']").attr('placeholder',attributeValue.name + '不能为空');
|
||||||
$("input[objid='" + objId + "']").addClass("required_input_css");
|
$("input[objid='" + objId + "']").addClass("required_input_css");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@ -3316,7 +3316,7 @@ function saveRelevanceAwsOrgShapesTODB1(shapesObj, shapeId, shapeName, fileName,
|
|||||||
relationShapeIds = relationShapeIds.split(",");
|
relationShapeIds = relationShapeIds.split(",");
|
||||||
}
|
}
|
||||||
//修改文件中保存的属性值
|
//修改文件中保存的属性值
|
||||||
var tempArray = new Array();
|
var tempArray = [];
|
||||||
var count = 0;
|
var count = 0;
|
||||||
var attributesJsonArray = [];
|
var attributesJsonArray = [];
|
||||||
for (var i = 0; i < shape.dataAttributes.length; i++) {
|
for (var i = 0; i < shape.dataAttributes.length; i++) {
|
||||||
@ -3682,7 +3682,7 @@ function saveRelevanceShapesTODB(shapesObj, shapeId, shapeName, fileName,
|
|||||||
//添加关联属性时,更新relationShapeModelObject的值
|
//添加关联属性时,更新relationShapeModelObject的值
|
||||||
if (attributeValue.isRequired && shapesObj.length == 0) {
|
if (attributeValue.isRequired && shapesObj.length == 0) {
|
||||||
$("input[objid='" + objId + "']").val('');
|
$("input[objid='" + objId + "']").val('');
|
||||||
$("input[objid='" + objId + "']").attr('placeholder',attributeValue.name + '不能为空')
|
$("input[objid='" + objId + "']").attr('placeholder',attributeValue.name + '不能为空');
|
||||||
$("input[objid='" + objId + "']").addClass("required_input_css");
|
$("input[objid='" + objId + "']").addClass("required_input_css");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@ -3761,7 +3761,7 @@ function saveRelevanceShapesTODB(shapesObj, shapeId, shapeName, fileName,
|
|||||||
// $("input[objid='" + objId + "']").val(shapeNames.join(","));
|
// $("input[objid='" + objId + "']").val(shapeNames.join(","));
|
||||||
// }
|
// }
|
||||||
//修改文件中保存的属性值
|
//修改文件中保存的属性值
|
||||||
var tempArray = new Array();
|
var tempArray = [];
|
||||||
var count = 0;
|
var count = 0;
|
||||||
var attributesJsonArray = [];
|
var attributesJsonArray = [];
|
||||||
for (var i = 0; i < shape.dataAttributes.length; i++) {
|
for (var i = 0; i < shape.dataAttributes.length; i++) {
|
||||||
@ -4039,7 +4039,7 @@ UI.doOutputProcess = function() {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
}
|
};
|
||||||
|
|
||||||
//导出流程手册
|
//导出流程手册
|
||||||
function outputReport() {
|
function outputReport() {
|
||||||
@ -4105,7 +4105,7 @@ UI.showImportShapeDlg = function() {
|
|||||||
],
|
],
|
||||||
onClose:delShapeFiles
|
onClose:delShapeFiles
|
||||||
});
|
});
|
||||||
}
|
};
|
||||||
|
|
||||||
var updatedShapeFileList = [];// 已上传的附件列表名称
|
var updatedShapeFileList = [];// 已上传的附件列表名称
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user