-
+
diff --git a/com.actionsoft.apps.coe.pal/template/page/pal.pl.repository.designer.view.portal.mobile.html b/com.actionsoft.apps.coe.pal/template/page/pal.pl.repository.designer.view.portal.mobile.html
index 48967f8b..da0c8693 100644
--- a/com.actionsoft.apps.coe.pal/template/page/pal.pl.repository.designer.view.portal.mobile.html
+++ b/com.actionsoft.apps.coe.pal/template/page/pal.pl.repository.designer.view.portal.mobile.html
@@ -1059,7 +1059,7 @@
-
+
diff --git a/com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/js/coe.team.pal.designer.js b/com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/js/coe.team.pal.designer.js
index 46fbfc02..e4765f86 100644
--- a/com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/js/coe.team.pal.designer.js
+++ b/com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/js/coe.team.pal.designer.js
@@ -100,60 +100,63 @@ $(function() {
},
success: function (msg, textStatus, jqXHR) {
/*if(msg.result == "ok") {*/
- $.ajax({
- type: "POST",
- url: "./jd",
- data: {
- sid: CLB.sid,
- cmd: "com.actionsoft.apps.coe.pal_repository_process_define_save",
- uuid: ruuid,
- define: awsui.encode(obj),
- teamId: $("#teamId").val(),
- BPMInstanceName: BPMInstanceName,
- messages: messageArray
- },
- success: function (msg, textStatus, jqXHR) {
- if(msg.result == "ok") {
- $.simpleAlert("close");
- messageArrayForSave = {};
- $("#saving_tip").css("color", "rgb(26, 164, 125)");
- $("#saving_tip").text("保存成功");
- recordShapeText();// 记录最新的节点及其文本text
- //更多属性的处理，当节点处理完成后再处理更多属性
- if (saveAttributesJson.length > 0 || removeAttributeJson.length > 0){
- $.ajax({
- type : "POST",
- url : "./jd",
- data : {
- sid : encodeURI(CLB.sid),
- cmd : "com.actionsoft.apps.coe.pal_pl_repository_more_attribute_save",
- wsId : $("#wsId").val(),
- uuid : ruuid,
- attributesJson : JSON.stringify(saveAttributesJson),
- removeAttributeJson : JSON.stringify(removeAttributeJson)
- },
- success:function(r) {
- saveAttributesJson = [];
- removeAttributeJson = [];
- },
- error:function(r) {
- }
- });
- }
- $.simpleAlert("保存成功", "ok");
- //保存结束时间戳
- //var saveEndTime = new Date().getTime();
- //console.log("流程保存时间：", (saveEndTime - saveStartTime) + "毫秒");
- } else {
- $.simpleAlert("close");
- $.simpleAlert(msg.data.desc, 'error', 2000);
- }
- },
- error: function (jqXHR, textStatus, errorThrown) {
+
+ $.ajax({
+ type: "POST",
+ url: "./jd",
+ data: {
+ sid: CLB.sid,
+ cmd: "com.actionsoft.apps.coe.pal_repository_process_define_save",
+ uuid: ruuid,
+ define: awsui.encode(obj),
+ teamId: $("#teamId").val(),
+ BPMInstanceName: BPMInstanceName,
+ messages: messageArray
+ },
+ success: function (msg, textStatus, jqXHR) {
+ if(msg.result == "ok") {
$.simpleAlert("close");
- $.simpleAlert('保存失败', 'error', 1500);
+ messageArrayForSave = {};
+ $("#saving_tip").css("color", "rgb(26, 164, 125)");
+ $("#saving_tip").text("保存成功");
+ recordShapeText();// 记录最新的节点及其文本text
+ //更多属性的处理，当节点处理完成后再处理更多属性
+ if (saveAttributesJson.length > 0 || removeAttributeJson.length > 0){
+ $.ajax({
+ type : "POST",
+ url : "./jd",
+ data : {
+ sid : encodeURI(CLB.sid),
+ cmd : "com.actionsoft.apps.coe.pal_pl_repository_more_attribute_save",
+ wsId : $("#wsId").val(),
+ uuid : ruuid,
+ attributesJson : JSON.stringify(saveAttributesJson),
+ removeAttributeJson : JSON.stringify(removeAttributeJson)
+ },
+ success:function(r) {
+ saveAttributesJson = [];
+ removeAttributeJson = [];
+ },
+ error:function(r) {
+ }
+ });
+ }
+ $.simpleAlert("保存成功", "ok");
+ //保存结束时间戳
+ //var saveEndTime = new Date().getTime();
+ //console.log("流程保存时间：", (saveEndTime - saveStartTime) + "毫秒");
+ } else {
+ $.simpleAlert("close");
+ $.simpleAlert(msg.data.desc, 'error', 2000);
}
- });
+ },
+ error: function (jqXHR, textStatus, errorThrown) {
+ $.simpleAlert("close");
+ $.simpleAlert('保存失败', 'error', 1500);
+ }
+ });
+
+
/*} else {
$.simpleAlert("close");
var result = msg.data;
diff --git a/com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/lib/designer/extend/js/designer.extend.link.framework.js b/com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/lib/designer/extend/js/designer.extend.link.framework.js
index a044ab47..9837ae5e 100644
--- a/com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/lib/designer/extend/js/designer.extend.link.framework.js
+++ b/com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/lib/designer/extend/js/designer.extend.link.framework.js
@@ -1493,8 +1493,8 @@ function getPrivateAttributeHtml(attributesJsonArray, tbodyId, shape) {
constr = '
'
+ ' | ' + objName + requiredSpan + ' | '
+ ' '
- + ' '
- + ' '
+ + ' '
+ + ' '
+ ' |
';
} else if (objType == "select" || objType == "select_m") {
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 aef1ebce..bf7438a4 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
@@ -1494,7 +1494,7 @@ function getPrivateAttributeHtml(attributesJsonArray, tbodyId, shape) {
constr = ''
+ ' | ' + objName + requiredSpan + ' | '
+ ' '
- + ' '
+ + ' '
+ ' '
+ ' |
';
@@ -3133,6 +3133,13 @@ function getRelevanceShapeNameByShapeId(objIds, shapeId) {
}
}
}
+ //判断如果为岗位/角色，鼠标悬浮显示
+ if(objId=="post"){
+ $("input[objid='" + objId + "']").attr('title', shapeNames.join(","));
+ }
+ if(objId=="role"){
+ $("input[objid='" + objId + "']").attr('title', shapeNames.join(","));
+ }
$("input[objid='" + objId + "']").val(shapeNames.join(","));
$("input[objid_shapeId='" + objId + "']").val(shapeRelationValue.join(","));
$("input[objid_shapeId='" + objId + "']").attr('ref', JSON.stringify(ref));
diff --git a/com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/lib/designer/extend/js/designer.extend.link.view.portal.js b/com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/lib/designer/extend/js/designer.extend.link.view.portal.js
index aef15dd4..c3cf5086 100755
--- a/com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/lib/designer/extend/js/designer.extend.link.view.portal.js
+++ b/com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/lib/designer/extend/js/designer.extend.link.view.portal.js
@@ -5,7 +5,7 @@ var selectedShapes = [];
var linkType; // 链接类型：custom：自定义链接；file：文件链接
$(document).ready(function() {
showPainting();
-
+ showByType();
setTimeout(function() {
Designer.hotkey.init();// 解决快捷健绑定不成功
DesignerCopyPaste.changeTitleListen();
@@ -15,6 +15,19 @@ $(document).ready(function() {
}, 1000);
});
+
+/**
+ * //制度的活动属性改为条款，表单去掉活动属性
+ */
+function showByType() {
+ if(methodId=="data.form"){
+ $("#processAttr").hide();
+ }else if(methodId=="control.policy"){
+ $("#processAttr").text("条款");
+ }
+}
+
+
/**
* 兼容1024*768画布显示
*
diff --git a/com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/lib/designer/extend/js/designer.extend.link.view.portal.mobile.js b/com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/lib/designer/extend/js/designer.extend.link.view.portal.mobile.js
index 03363e3d..70e1998d 100644
--- a/com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/lib/designer/extend/js/designer.extend.link.view.portal.mobile.js
+++ b/com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/lib/designer/extend/js/designer.extend.link.view.portal.mobile.js
@@ -5,7 +5,7 @@ var selectedShapes = [];
var linkType; // 链接类型：custom：自定义链接；file：文件链接
$(document).ready(function() {
showPainting();
-
+ showByType();
setTimeout(function() {
Designer.hotkey.init();// 解决快捷健绑定不成功
DesignerCopyPaste.changeTitleListen();
@@ -17,6 +17,20 @@ $(document).ready(function() {
//changeArributeByShape('portalAttrShow')
});
+
+
+/**
+ * //制度的活动属性改为条款，表单去掉活动属性
+ */
+function showByType() {
+ if(methodId=="data.form"){
+ $("#processAttr").hide();
+ }else if(methodId=="control.policy"){
+ $("#processAttr").text("条款");
+ }
+}
+
+
/**
* 兼容1024*768画布显示
*