Procházet zdrojové kódy

Merge branch 'fix/Selector.select_category' into 'develop'

Merge of fix/[流程管理]修复弹出选择器有些时候不能取消选择分类的问题 to develop

See merge request o2oa/o2oa!889
蔡祥熠 před 5 roky
rodič
revize
68fad37541

+ 2 - 2
o2web/source/x_component_MinderEditor/MainMenu.js

@@ -365,8 +365,8 @@ MWF.xApplication.MinderEditor.MainMenu = new Class({
             this.app.openRenameDialog();
             this.hide();
         }.bind(this) );
-        this.createActionNode( actionArea, "download", "导出", "将文件导出到本地", function(){
-            this.app.openExportDialog();
+        this.createActionNode( actionArea, "download", "导出", "将文件以图片形式导出到本地", function(){
+            // this.app.openExportDialog();
             this.hide();
         }.bind(this));
 

+ 2 - 2
o2web/source/x_component_MinderEditor/RuntimeInEditMode.js

@@ -280,8 +280,8 @@ MWF.xApplication.MinderEditor.Clipboard = new Class({
                                     pidx--;
                                     pnode = nodes[pidx];
                                 }
-                            };
-                        };
+                            }
+                        }
                         var str = encode(nodes);
                         clipBoardEvent.clipboardData.setData('text/plain', str);
                     }

+ 1 - 0
o2web/source/x_component_Template/Selector/Custom.js

@@ -86,6 +86,7 @@ MWF.xApplication.Template.Selector.Custom = new Class({
                     // if ( (item.subItemList && item.subItemList.length > 0) || item.subCategoryList && item.subCategoryList.length > 0 ) {
                     if( this.options.categorySelectable ){
                         var category = this._newItemCategorySelectable(item, this, this.itemAreaNode);
+                        this.items.push(category);
                         this.categorys.push( category );
                     }else{
                         var category = this._newItemCategory(item, this, this.itemAreaNode);