ocpview-plus 1.0.8 → 1.0.10

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ocpview-plus",
-  "version": "1.0.8",
+  "version": "1.0.10",
   "title": "ocpviewPlus",
   "description": "A high quality Service UI components Library with Vue.js",
   "homepage": "",

package/src/components/poptextbox/poptextbox.vue

@@ -1,4 +1,4 @@
-<template> 
+<template>
  <div v-show="myConfig.visible" :class="classes" >
     <template v-if="multiple">
         <div  ref="myControl" class="ivu-select-selection">
@@ -33,10 +33,10 @@
            </Tooltip>
            <Icon type="ios-search" class="ivu-select-arrow"    @click.enter.stop="click"></Icon>
         </div>
-    </template> 
+    </template>
     <template v-else>
           <Input  ref="myControl" v-model="text" icon="ios-search" :size="myConfig.size" type="text" :placeholder="myConfig.placeholder"  :disabled="myConfig.readOnly" :readonly="!myConfig.allowInput" :clearable="myConfig.clearable" @on-click="click"  @keydown.enter.stop="onEnter"  @on-blur="onEnter"  @on-clear="onEnter"/>
-    </template>  
+    </template>
     <Modal v-model="popShow" :styles="queryConfig.popStyle" :width="currentWidth" :title="modeTitle" :footer-hide="footerHide" :draggable="draggable" :closable="myConfig.closable" class="efuture-model" >
         <div>
         <component :is="pop" ref="popView" :config="queryConfig" :dictData="myConfig.dictData"  @conditionAction="conditionAction" :isPop="true" @dbclick="dbclick"/></div>
@@ -52,7 +52,7 @@
             </Row>
         </div>
         </template>
-        
+
     </Modal>
 </div>
 </template>
@@ -186,7 +186,7 @@
                                 this.popShow = false;
                             }
                         }
-                        
+
                         break;
                     case 'condition_cancel':
                         this.popShow = false;
@@ -210,7 +210,7 @@
                     let data = [];
                     data.push(rows);
                     rows = data;
-                }                
+                }
                 if (this.myConfig.setDataBefore) {
                     if (isnull === 'Y') {
                         flag = this.myConfig.setDataBefore(null,this);
@@ -248,7 +248,7 @@
                         }
                         this.oldValue = this.value;
                         this.oldText = this.text;
-                    } 
+                    }
                     this.setFatherValue();
                 } else {
                     if (this.multiple) {
@@ -274,7 +274,7 @@
                         } else {
                             name = '';
                         }
-                    } 
+                    }
                 } else {
                     if (code) {
                         if (!name) {
@@ -282,7 +282,7 @@
                         }
                     } else {
                         name = '';
-                    }  
+                    }
                 }
                 let obj = {};
                 obj.code = code;
@@ -337,14 +337,14 @@
                     if (this.config.multiSelect !== undefined) {
                         this.queryConfig.multiSelect = this.config.multiSelect;
                     }
-                
+
                     if (this.config.showAll !== undefined) {
                         this.queryConfig.showAll = this.config.showAll;
                     }
                     if (this.queryConfig.popControl) {
                         if (this.queryConfig.popControl !== 'SimpleViewGrid' && this.queryConfig.popControl !== 'SimpleTree') {
                             this.footerHide = true;
-                        }  
+                        }
                     }
                     this.setSizeConfig(this.queryConfig);
                     this.queryConfig.overrideSearchParam = this.overrideSearchParam;
@@ -355,10 +355,10 @@
                             this.queryConfig.items.forEach(el => {
                                 let dictkey = el.dictkey;
                                 if (el.customDictkey) {
-                                    dictkey = el.customDictkey;      
+                                    dictkey = el.customDictkey;
                                 }
                                 if (dictkey) {
-                                    obj[dictkey] = '';  
+                                    obj[dictkey] = '';
                                 }
                             });
                         }
@@ -378,16 +378,16 @@
                     if (this.myConfig.multiple) {
                         this.multiple = true;
                     }
-                   
+
                     if(this.queryConfig.isTree) {
                         this.queryConfig.showTitle = false;
                     }
-                    
+
                     if (this.myConfig.setQueryConfig) {
                         this.myConfig.setQueryConfig(this.queryConfig);
                     }
                 }
-                
+
             },
             valueToFatherValue() {
                 let para= {};
@@ -402,7 +402,7 @@
                 } else {
                     para.value = this.value;
                     para.text  = this.text;
-                }          
+                }
                 return para;
             },
             click(){
@@ -429,6 +429,18 @@
                 }
                 if (flag) {
                     if (this.config.selectkey) {
+                        if(this.query && this.query.Config ) {
+                            const lastParam = this.query.Config.lastQueryParam;
+                            if(lastParam) {
+                                const newParam = { ...lastParam, ...this.searchParam };
+                                if( JSON.stringify(lastParam) === '{}') {
+                                    this.query.Config.lastQueryParam = newParam;
+                                }
+
+                                this.searchParam = { ...newParam };
+                                this.$refs['popView'].setSearchBeforeSearchParam(this.searchParam);
+                            }
+                        }
                         this.popShow = true;
                         if (this.myConfig.clearCondition !== false) {
                             if (this.$refs['popView'].clearCondition) {
@@ -441,7 +453,7 @@
                             this.$refs['popView'].setData([]);
                         }
 
-                    }    
+                    }
                 }
             },
             onEnter(e) {
@@ -459,7 +471,7 @@
                 if (this.myConfig.searchBefore) {
                     this.$refs['popView'].clearSearchBeforeSearchParam();
                     obj.value = this.text;
-                    flag = this.myConfig.searchBefore(this,obj); 
+                    flag = this.myConfig.searchBefore(this,obj);
                 }
                 if (flag) {
                      if (!this.text) {
@@ -475,7 +487,7 @@
                     }
                     if (this.searchParam !== undefined) {
                         this.$refs['popView'].setSearchBeforeSearchParam(this.searchParam);
-                    } 
+                    }
                     searchParam[this.queryConfig.responseCode] =  this.text;
                     let data = this.$refs['popView'].popValueChanged(searchParam);
                     if (data.length  === 0) {
@@ -506,7 +518,7 @@
                 let mktname=mktNameArray.join(',');
                 this.text=mktname;
             },
-            
+
             onToggleExpand() {
                 return this.$refs.myTreeBox.onToggleExpand();
             },
@@ -559,7 +571,7 @@
                         } else {
                             temp.label = el;
                         }
-                        selectedMultiple.push(temp);     
+                        selectedMultiple.push(temp);
                     });
                 }
                 this.selectedMultiple = selectedMultiple;
@@ -592,10 +604,17 @@
                     if (this.config.onOpenChange) {
                         this.config.onOpenChange(newValue);
                     }
+                    if(!newValue) {
+                        if(this.searchParam) {
+                            if(!this.searchParam.notfatherclean) {
+                                this.query.Config.lastQueryParam = {}
+                            }
+                        }
+                    }
                 },
                 immediate: true
             }
         }
-        
+
     };
-</script>
+</script>