diff --git a/o2web/source/x_component_portal_PortalExplorer/Main.js b/o2web/source/x_component_portal_PortalExplorer/Main.js index 9accabe1ee602593275010ad02a0a9b89bf161b1..e237d46d5c701bd8cdd317bd475877f008b28df2 100644 --- a/o2web/source/x_component_portal_PortalExplorer/Main.js +++ b/o2web/source/x_component_portal_PortalExplorer/Main.js @@ -54,6 +54,7 @@ MWF.xApplication.portal.PortalExplorer.Main = new Class({ this.createApplicationItem(json.data, "top"); }.bind(this)); + this.reloadApplicationCategoryList(true); this.notice(this.lp.application.createApplicationSuccess, "success"); }.bind(this)); }else{ diff --git a/o2web/source/x_component_process_ApplicationExplorer/Main.js b/o2web/source/x_component_process_ApplicationExplorer/Main.js index c03a2d50df4e8cbb2a6c1e1213c57ce5d53270b6..1a7c971abb07cd079439729af67d1fddcc929bf6 100644 --- a/o2web/source/x_component_process_ApplicationExplorer/Main.js +++ b/o2web/source/x_component_process_ApplicationExplorer/Main.js @@ -292,6 +292,7 @@ MWF.xApplication.process.ApplicationExplorer.Main = new Class({ //this.applications.push(application); }.bind(this)); + this.reloadApplicationCategoryList(true); this.notice(this.lp.application.createApplicationSuccess, "success"); // this.app.processConfig(); }.bind(this)); @@ -319,7 +320,7 @@ MWF.xApplication.process.ApplicationExplorer.Main = new Class({ var size = this.content.getSize(); var topSize = this.topNode.getComputedSize(); var bottomSize = this.bottomNode.getComputedSize(); - var pt = this.contentArea.getStyle("padding-top").toInt() || 0;; + var pt = this.contentArea.getStyle("padding-top").toInt() || 0; var pb = this.contentArea.getStyle("padding-bottom").toInt() || 0; var h = size.y-topSize.totalHeight-bottomSize.totalHeight-pt-pb; @@ -355,7 +356,7 @@ MWF.xApplication.process.ApplicationExplorer.Main = new Class({ } e.stopPropagation(); }, - loadApplicationCategoryList: function(){ + loadApplicationCategoryList: function( currentCategoryName, noRefreshContent ){ if (this.control.canCreate){ this.restActions.listApplicationCategory(function(json){ @@ -370,9 +371,29 @@ MWF.xApplication.process.ApplicationExplorer.Main = new Class({ }.bind(this)); if (this.categoryAreaNode.getScrollSize().y>this.categoryAreaNode.getSize().y) this.createCategoryExpandButton(); + + if( currentCategoryName ){ + var itemList = this.categoryAreaNode.getElements("div.o2_process_AppExp_categoryItem"); + if( itemList.length > 0 ){ + for( var i=0; i=size.y) item.inject(this.categoryAreaNode, "top"); this.category = item; - this.loadApplicationList(item); + if( !noRefreshContent ){ + this.loadApplicationList(item); + } }, getApplicationDimension: function(){ @@ -534,6 +557,7 @@ MWF.xApplication.process.ApplicationExplorer.Main = new Class({ var complete = function(){ if (doCount == readyCount){ + _self.reloadApplicationCategoryList( true ); if (errorText){ _self.app.notice(errorText, "error"); } diff --git a/o2web/source/x_component_process_FormDesigner/Module/Form/form.html b/o2web/source/x_component_process_FormDesigner/Module/Form/form.html index 04894478c3217e7a7d5c42e9f68f6cc5d1932c6f..06c4b91262e5119f3220c716cf1c1171b891c2e5 100644 --- a/o2web/source/x_component_process_FormDesigner/Module/Form/form.html +++ b/o2web/source/x_component_process_FormDesigner/Module/Form/form.html @@ -112,7 +112,7 @@
-
+
diff --git a/o2web/source/x_component_process_FormDesigner/Property.js b/o2web/source/x_component_process_FormDesigner/Property.js index c2438001a8b00abe490aeb0824c5df9766f5604f..fc3054f4f6d7e6d023363bffdc1bd6dd21803200 100644 --- a/o2web/source/x_component_process_FormDesigner/Property.js +++ b/o2web/source/x_component_process_FormDesigner/Property.js @@ -1562,6 +1562,7 @@ debugger; "noDelete": false, "noCode": true, "noReadShow": true, + "target" : node.get("data-target"), "noEditShow": true, "onChange": function(){ this.data[name] = actionEditor.data; diff --git a/o2web/source/x_component_process_FormDesigner/widget/ActionsEditor.js b/o2web/source/x_component_process_FormDesigner/widget/ActionsEditor.js index 0cf321d9f469ef0acfdf6d8fa52d34ac8128996c..6a49852871769b09bc6d29026a6fbf39d972bd4e 100644 --- a/o2web/source/x_component_process_FormDesigner/widget/ActionsEditor.js +++ b/o2web/source/x_component_process_FormDesigner/widget/ActionsEditor.js @@ -91,6 +91,7 @@ MWF.xApplication.process.FormDesigner.widget.ActionsEditor = new Class({ }).inject(this.actionTitleArea); this.restoreActionButtonButton.addEvent("click", function(){ + debugger; this.restoreButtonAction(); }.bind(this)); } @@ -100,6 +101,19 @@ MWF.xApplication.process.FormDesigner.widget.ActionsEditor = new Class({ if( !this.defaultTools ){ MWF.getJSON( this.options.systemToolsAddress, function(tools){ this.defaultTools = tools; + if( this.options.target && this.options.target === "mobileForm" ){ + this.defaultTools.push({ + "type": "MWFToolBarButton", + "img": "read.png", + "title": "标记为已阅", + "action": "readedWork", + "text": "已阅", + "id": "action_readed", + "control": "allowReadProcessing", + "condition": "", + "read": true + }); + } }.bind(this), false); } this.defaultTools.each( function( tool ){ diff --git a/o2web/source/x_component_query_QueryExplorer/Main.js b/o2web/source/x_component_query_QueryExplorer/Main.js index a54b358ab3fe964440001466c697450ee187b0bc..9d3b5c3c52822b2859f0c4c3f936e537c2f21186 100644 --- a/o2web/source/x_component_query_QueryExplorer/Main.js +++ b/o2web/source/x_component_query_QueryExplorer/Main.js @@ -56,6 +56,7 @@ MWF.xApplication.query.QueryExplorer.Main = new Class({ this.createApplicationItem(json.data, "top"); }.bind(this)); + this.reloadApplicationCategoryList(true); this.notice(this.lp.application.createApplicationSuccess, "success"); }.bind(this)); }else{ @@ -100,6 +101,7 @@ MWF.xApplication.query.QueryExplorer.Main = new Class({ var complete = function(){ if (doCount == readyCount){ + _self.reloadApplicationCategoryList( true ); if (errorText){ _self.app.notice(errorText, "error"); }