ocpview-plus 1.1.3 → 1.1.5

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(){
@@ -431,12 +431,24 @@
                     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;
+                            if (this.query?.Config) {
+                                const lastParam = this.query.Config.lastQueryParam || {};  // 始终记住前一次的参数
+                                const currentParam = this.searchParam || {};               // 当前的参数
+
+                                let finalParam = currentParam;
+
+                                // 只有 lastflag = "1" 时才合并记录的旧参数
+                                if (currentParam.lastflag === "1") {
+                                    finalParam = { ...lastParam, ...currentParam };  // 当前参数优先覆盖旧参数
                                 }
-                                this.searchParam = { ...newParam };
+
+                                // 无论是否合并，都要记录当前的最终 searchParam 作为下一次的 lastQueryParam
+                                this.query.Config.lastQueryParam = { ...finalParam };
+
+                                // 更新 this.searchParam
+                                this.searchParam = finalParam;
+
+                                // 传递给 popView
                                 this.$refs['popView'].setSearchBeforeSearchParam(this.searchParam);
                             }
                         }
@@ -452,7 +464,7 @@
                             this.$refs['popView'].setData([]);
                         }
 
-                    }    
+                    }
                 }
             },
             onEnter(e) {
@@ -470,7 +482,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) {
@@ -486,7 +498,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) {
@@ -517,7 +529,7 @@
                 let mktname=mktNameArray.join(',');
                 this.text=mktname;
             },
-            
+
             onToggleExpand() {
                 return this.$refs.myTreeBox.onToggleExpand();
             },
@@ -570,7 +582,7 @@
                         } else {
                             temp.label = el;
                         }
-                        selectedMultiple.push(temp);     
+                        selectedMultiple.push(temp);
                     });
                 }
                 this.selectedMultiple = selectedMultiple;
@@ -607,6 +619,6 @@
                 immediate: true
             }
         }
-        
+
     };
-</script>
+</script>

package/src/components/upload/billimport.vue

@@ -46,12 +46,12 @@
                     <template #content>
                     <div>{{filename}}</div>
                     </template>
-                </Poptip>
+                </Poptip>   
             </Col>
             <Col>
                  <Upload ref="upload"
                     :before-upload="handleUpload"
-                    accept=".xlsx,.xls"
+                    accept=".xlsx,.xls" 
                     :format="myConfig.fileType"
                     :on-format-error="handleFormatError"
                     :on-success="handleSuccess"
@@ -77,7 +77,7 @@
         </RadioGroup>
     </Modal>
     </template>
-
+      
   </div>
 </template>
 <script>
@@ -168,22 +168,7 @@
                 } else {
                     let temp  = this.url +'&param=' +encodeURI(JSON.stringify(param));
                     window.open(temp,'_self');
-                }
-            },
-            setExportDownUrl(url,param) {
-                /*if (url) {
-                    url = url.replace('rest', 'exportTemplate');
-                }*/
-                let self = this;
-                this.url = this.getResturl(url,null,{},self);
-                if (this.myConfig.typeData.length > 1) {
-                    this.param = param;
-                    this.type = this.myConfig.typeData[0].code;
-                    this.showUpload = true;
-                } else {
-                    let temp  = this.url +'&param=' +encodeURI(JSON.stringify(param));
-                    window.open(temp,'_self');
-                }
+                } 
             },
             handleUpload (file) {
                 if (!this.checkFormat(file)) {
@@ -229,7 +214,7 @@
                     this.$emit('importSuccess',res);
                 }
                 this.loading = false;
-
+               
             },
             downTemplate() {
                 if (this.type) {
@@ -240,7 +225,7 @@
                         window.open(temp,'_self');
                         this.showUpload = false;
                     }
-
+                    
                 }
             }
         }

package/src/index.js

@@ -20,7 +20,7 @@ import {
 import TextBox from './components/textbox';
 import RichTextBox from './components/richtextbox';
 import { NumberBox, NumberRangeBox,NumberBoxV1 } from './components/numberbox';
-import { DateBox, DateRangeBox } from './components/datebox';
+import { DateBox, DateRangeBox,DateBoxV1 } from './components/datebox';
 import TimePicBox from './components/timebox';
 import PopTextBox from './components/poptextbox';
 import { ControlBox, ControlBase} from './components/base';
@@ -175,7 +175,8 @@ const components = {
    wRichTextBox,
    mBillListDetails,
    NumberBoxV1,
-   mListDetailsV2
+   mListDetailsV2,
+   DateBoxV1
 };
 
 const iview = {