Merge branch 'hotfix/cms_appinfo' into 'master'

Merge of hotfix/cms_appinfo 修复内容管理栏目修改后重新打开显示修改前数据的问题 to master

See merge request o2oa/o2oa!1183

o2web/source/x_component_cms_ColumnManager/Main.js

@@ -145,11 +145,15 @@ MWF.xApplication.cms.ColumnManager.Main = new Class({
         }.bind(this));
     },
     getColumn: function(success, failure){
+        // if( this.options.column && o2.typeOf(this.options.column)==="object" ){
+        //         //     if (success) success();
+        //         //     return;
+        //         // }
+        var columnId;
         if( this.options.column && o2.typeOf(this.options.column)==="object" ){
-            if (success) success();
-            return;
+            columnId = this.options.column.id;
         }
-        var columnId = this.options.columnId;
+        if( !columnId )columnId = this.options.columnId;
         if( !columnId )columnId = this.status && this.status.column;
         if( !columnId ){
             if (failure) failure();