Merge branch 'fix/Query.view_selected_execption' into 'wrdp'

Merge of fix/Query.view_selected_execption 修复视图和查询视图选中后翻页再回到原来的界面，选中效果失效的问题 to wrdp

See merge request o2oa/o2oa!3453

o2web/source/x_component_query_Query/Viewer.js

@@ -1746,25 +1746,36 @@ MWF.xApplication.query.Query.Viewer.Item = new Class({
 
 
         //默认选中
+        var selectedFlag;
         var defaultSelectedScript = this.view.json.defaultSelectedScript || this.view.viewJson.defaultSelectedScript;
         if( !this.isSelected && defaultSelectedScript ){
             // var flag = this.view.json.select || this.view.viewJson.select ||  "none";
             // if ( flag ==="single" || flag==="multi"){
             //
             // }
-            var flag = this.view.Macro.exec( defaultSelectedScript,
+            selectedFlag = this.view.Macro.exec( defaultSelectedScript,
                 {"node" : this.node, "data" : this.data, "view": this.view, "row" : this});
-            if( flag ){
-                if( flag === "multi" || flag === "single" ){
-                    this.select( flag );
-                }else if( flag.toString() === "true" ){
+        }
+        //判断是不是在selectedItems中，用户手工选择
+        if( !this.isSelected && this.view.selectedItems.length ){
+            for(var i=0; i<this.view.selectedItems.length; i++){
+                if( this.view.selectedItems[i].data.bundle === this.data.bundle ){
+                    selectedFlag = "true";
+                    break;
+                }
+            }
+        }
+
+        if( selectedFlag ){
+            if( selectedFlag === "multi" || selectedFlag === "single" ){
+                this.select( selectedFlag );
+            }else if( selectedFlag.toString() === "true" ){
                 var f = this.view.json.select || this.view.viewJson.select ||  "none";
                 if ( f ==="single" || f==="multi"){
                     this.select();
                 }
             }
         }
-        }
 
         // Object.each(this.data.data, function(cell, k){
         //     if (this.view.hideColumns.indexOf(k)===-1){
@@ -1973,6 +1984,7 @@ MWF.xApplication.query.Query.Viewer.Item = new Class({
     },
 
     select: function(  force ){
+        debugger
         // var flag = force || this.view.json.select || this.view.viewJson.select ||  "none";
         var flag = force || this.view.getSelectFlag();
         if (this.isSelected){
@@ -1992,6 +2004,13 @@ MWF.xApplication.query.Query.Viewer.Item = new Class({
     },
 
     selected: function( from ){
+        for(var i=0; i<this.view.selectedItems.length; i++){
+            var item = this.view.selectedItems[i];
+            if( item.data.bundle === this.data.bundle ){
+                this.view.selectedItems.erase(item);
+                break;
+            }
+        }
         this.view.selectedItems.push(this);
         var viewStyles = this.view.viewJson.viewStyles;
         if( viewStyles ){
@@ -2009,7 +2028,13 @@ MWF.xApplication.query.Query.Viewer.Item = new Class({
         this.view.fireEvent("selectRow", [this]);
     },
     unSelected: function( from ){
-        this.view.selectedItems.erase(this);
+        for(var i=0; i<this.view.selectedItems.length; i++){
+            var item = this.view.selectedItems[i];
+            if( item.data.bundle === this.data.bundle ){
+                this.view.selectedItems.erase(item);
+                break;
+            }
+        }
         var viewStyles = this.view.viewJson.viewStyles;
         if( this.view.viewJson.selectBoxShow !=="always" ){
             this.selectTd.setStyles({"background": "transparent"});