提交 4daa21c3 编写于 作者: U unknown

修复流程表单人员卡片无职务的问题,首页会议结束事件不正确的问题、脚本编辑器缩放的问题

上级 51dbe325
......@@ -239,8 +239,11 @@ o2.widget.O2Identity = new Class({
o2.widget.O2Person = new Class({
Extends: o2.widget.O2Identity,
options: {
"lazy": true
},
getPersonData: function(){
if (!this.data.distinguishedName){
if (!this.data.distinguishedName || !this.data.dutys ){
this.action.actions = {"getPerson": {"uri": "/jaxrs/person/{id}"}};
this.action.invoke({"name": "getPerson", "async": false, "parameter": {"id": (this.data.id || this.data.name)}, "success": function(json){
this.data = json.data;
......
......@@ -135,7 +135,7 @@ MWF.xApplication.Homepage.MeetingContent.MeetingInvited = new Class({
var start = (new Date()).parse(d.startTime);
var completed = (new Date()).parse(d.completedTime);
var startStr = start.format("%Y-%m-%d %H:%M");
var completedStr = start.format("%H:%M");
var completedStr = completed.format("%H:%M");
timeNode.set("html", this.app.lp.meetingTime+": <span style='color: #999999'>"+startStr+" - "+completedStr+"<span>");
var locationNode = new Element("div.o2_homepage_meeting_item_location").inject(inforArea);
......@@ -248,7 +248,7 @@ MWF.xApplication.Homepage.MeetingContent.Meeting = new Class({
var start = (new Date()).parse(d.startTime);
var completed = (new Date()).parse(d.completedTime);
var startStr = start.format("%Y-%m-%d %H:%M");
var completedStr = start.format("%H:%M");
var completedStr = completed.format("%H:%M");
timeNode.set("html", this.app.lp.meetingTime+": <span style='color: #999999'>"+startStr+" - "+completedStr+"<span>");
var locationNode = new Element("div.o2_homepage_meeting_item_location").inject(inforArea);
......
......@@ -111,6 +111,9 @@ MWF.xApplication.process.ProcessDesigner.widget.ScriptText = new Class({
this.scriptReferenceMenu.menu.showIm(e);
},
maxSize: function() {
var areaSize = this.areaNode.getSize();
this.originAreaWidth = areaSize.x;
this.originAreaHeight = areaSize.y;
if (!this.options.maxObj){
this.areaNode.setStyles({
"width": "100%",
......@@ -155,7 +158,13 @@ MWF.xApplication.process.ProcessDesigner.widget.ScriptText = new Class({
returnSize: function(){
this.areaNode.setStyles(this.css.areaNode);
this.areaNode.inject(this.node);
if (this.options.height) this.areaNode.setStyle("height", ""+this.options.height+"px");
this.areaNode.setStyle("width", ""+this.originAreaWidth+"px");
if (this.options.height) {
this.areaNode.setStyle("height", ""+this.options.height+"px");
}else{
this.areaNode.setStyle("height", ""+this.originAreaHeight+"px");
}
this.resizeEditor();
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册