Browse Source

Merge branch 'fix/CMS.list_error' into 'develop'

Merge of fix/[选择组件]修改复合选择组件的title为中文 to develop

See merge request o2oa/o2oa!369
蔡祥熠 5 năm trước cách đây
mục cha
commit
e2857598ac

+ 1 - 1
o2web/source/x_component_Selector/MultipleSelector.js

@@ -9,7 +9,7 @@ MWF.xApplication.Selector.MultipleSelector = new Class({
         "style": "default",
         "types" : [],
         "count": 0,
-        "title": "Select",
+        "title": MWF.xApplication.Selector.LP.multiSelectTitle,
         "groups": [], //选person, group, role 时的范围
         "roles": [], //选选person, group, role 时的范围
         "units": [], //选 company, department, duty, identity 时的范围

+ 1 - 0
o2web/source/x_component_Selector/lp/en.js

@@ -1,5 +1,6 @@
 MWF.xApplication.Selector.LP = MWF.SelectorLP = {
     "title": "Select",
+    "multiSelectTitle": "Select",
     "selectPerson": "Select Person",
     "selectIdentity": "Select Identity",
     "selectUnit": "Select Unit",

+ 1 - 0
o2web/source/x_component_Selector/lp/zh-cn.js

@@ -1,5 +1,6 @@
 MWF.xApplication.Selector.LP = MWF.SelectorLP = {
     "title": "选择",
+    "multiSelectTitle": "选择",
     "selectPerson": "选择人员",
     "selectIdentity": "选择身份",
     "selectUnit": "选择组织",

+ 1 - 1
o2web/source/x_component_Selector/package.js

@@ -6,7 +6,7 @@ MWF.O2Selector = new Class({
     options: {
         "count": 0,
         "type": "person",
-        "title": "Select Person",
+        "title": MWF.xApplication.Selector.LP.multiSelectTitle,
         "groups": [],
         "roles": [],
         "units": [],

+ 2 - 1
o2web/source/x_component_cms_Index/Newer.js

@@ -491,7 +491,8 @@ MWF.xApplication.cms.Index.Newer = new Class({
                 "readonly" :false,
                 "documentId": id,
                 "appId": appId,
-                "postPublish" : function(){
+                "onPostPublish" : function(){
+                    debugger;
                     if(_self.view && _self.view.reload )_self.view.reload();
                     this.fireEvent( "postPublish" );
                 }.bind(this)

+ 10 - 1
o2web/source/x_component_cms_Module/Main.js

@@ -226,7 +226,16 @@ MWF.xApplication.cms.Module.Main = new Class({
 						//if(this.options.columnData.ignoreTitle===undefined) this.options.columnData.ignoreTitle = false;
 
 						this.creater = new MWF.xApplication.cms.Index.Newer( this.options.columnData, null, this, this.view, {
-							restrictToColumn : true
+							restrictToColumn : true,
+							onPostPublish : function () {
+								debugger;
+								try{
+									if(this.view && this.view.reload){
+										this.view.reload();
+									}
+								}catch (e) {
+								}
+							}.bind(this)
 							//ignoreTitle : this.options.columnData.ignoreTitle,
 							//latest : this.options.columnData.latest
 						});

+ 6 - 1
o2web/source/x_component_query_ViewDesigner/widget/ViewFilter.js

@@ -396,7 +396,12 @@ MWF.xApplication.query.ViewDesigner.widget.ViewFilter = new Class({
         formulaSelectorIdList.each( function(id) {
             var el = this.inputAreaNode.getElement( id );
             if( !el )return;
-            el.setStyle("display", availableInputArray.contains(id) ? "block" : "none" );
+            if( availableInputArray.contains(id) ){
+                el.setStyle("display", "block");
+            }else{
+                el.getElements("input").set("checked", false);
+                el.setStyle("display", "none");
+            }
         }.bind(this));
 
         var viewFilterValue2Area, viewFilterValueTitleArea;