lxm--日历搜索表单，快速分组，快速搜索--fix1

@CONTROL/日历部件/CONTROL-BASE.vue.ftl

@@ -337,6 +337,9 @@ FullCalendar,
             Object.assign(arg,{query : fetchInfo.query});
         }
         Object.assign(arg,{viewparams:this.viewparams});
+        const parentdata: any = {};
+        this.$emit('beforeload', parentdata);
+        Object.assign(arg, parentdata);
         // 处理events数据
         let _this = this;
         let handleEvents = ()=>{

@CONTROL/日历部件/CONTROL.html.ftl

@@ -3,6 +3,7 @@
   <#if view.getViewType() == 'DECALENDAREXPVIEW'>
     :isSelectFirstDefault="true"
   </#if>
+    @beforeload="onBeforeLoad($event)" 
 </#assign>
 <#ibizinclude>
 ../@MACRO/HTML/DEFAULT.html.ftl

@VIEW/实体日历视图/VIEW-BASE.vue.ftl

@@ -47,10 +47,37 @@ import  ${srfclassname('${appCounter.getCodeName()}')}CounterService  from '@/co
     public onSearch($event: any): void {
         const refs: any = this.$refs;
         if (refs.calendar) {
-            refs.calendar.load({});
+            refs.calendar.refresh();
         }
     }
 
+    /**
+     * calendar 的 beforeload 事件
+     *
+     * @param {*} arg
+     * @memberof ${srfclassname('${view.name}')}
+     */
+    public onBeforeLoad(arg: any){
+        if (this.viewparams && Object.keys(thisparams).length > 0) {
+            Object.assign(arg, this.viewparams);
+        }
+        if (this.getSearchForm() && this.isExpandSearchForm) {
+            Object.assign(arg, this.getSearchForm().getData());
+        }
+        if (this && !this.isExpandSearchForm) {
+            Object.assign(arg, { query: this.query });
+        }
+        // 快速分组和快速搜索栏
+        let otherQueryParam:any = {};
+        if(this && this.qucikGroupData){
+            Object.assign(otherQueryParam,this.qucikGroupData);
+        }
+        if(this && this.qucikFormData){
+            Object.assign(otherQueryParam,this.qucikFormData);
+        }
+        Object.assign(arg,{viewparams:otherQueryParam});
+    }
+
     <#if view.getPSSysCounterRef() ?? && view.getPSSysCounterRef().getPSAppCounter()??>
     <#assign appCounter = view.getPSSysCounterRef().getPSAppCounter() />
     /**
@@ -134,8 +161,8 @@ import  ${srfclassname('${appCounter.getCodeName()}')}CounterService  from '@/co
                             const key = (value.substring(1, value.length - 1)).toLowerCase();
                             if (this.context[key]) {
                                 value = this.context[key];
-                            } else if(this.viewparams[key]){
-                                value = this.viewparams[key];
+                            } else if(thisparams[key]){
+                                value = thisparams[key];
                             }
                         }
                         item.data[name] = value;

@VIEW/实体日历视图（部件视图）/VIEW-BASE.vue.ftl

@@ -77,10 +77,37 @@ import  ${srfclassname('${appCounter.getCodeName()}')}CounterService  from '@/co
     public onSearch($event: any): void {
         const refs: any = this.$refs;
         if (refs.calendar) {
-            refs.calendar.load({});
+            refs.calendar.refresh();
         }
     }
 
+    /**
+     * calendar 的 beforeload 事件
+     *
+     * @param {*} arg
+     * @memberof ${srfclassname('${view.name}')}
+     */
+    public onBeforeLoad(arg: any){
+        if (this.viewparams && Object.keys(thisparams).length > 0) {
+            Object.assign(arg, this.viewparams);
+        }
+        if (this.getSearchForm() && this.isExpandSearchForm) {
+            Object.assign(arg, this.getSearchForm().getData());
+        }
+        if (this && !this.isExpandSearchForm) {
+            Object.assign(arg, { query: this.query });
+        }
+        // 快速分组和快速搜索栏
+        let otherQueryParam:any = {};
+        if(this && this.qucikGroupData){
+            Object.assign(otherQueryParam,this.qucikGroupData);
+        }
+        if(this && this.qucikFormData){
+            Object.assign(otherQueryParam,this.qucikFormData);
+        }
+        Object.assign(arg,{viewparams:otherQueryParam});
+    }
+
     <#if view.getPSSysCounterRef() ?? && view.getPSSysCounterRef().getPSAppCounter()??>
     <#assign appCounter = view.getPSSysCounterRef().getPSAppCounter() />
     /**