handleRequestData 逻辑调整

src/ibiz-core/control-service/control-service-base.ts

@@ -283,7 +283,7 @@ export class ControlServiceBase {
      * @returns {*}
      * @memberof ControlServiceBase
      */
-    protected handleRequestData(action: string, context: any = {}, data: any = {}): any {
+    protected handleRequestData(action: string, context: any = {}, data: any = {}, isMerge:boolean = false): any {
         if (!this.model || !Util.isFunction(this.model.getDataItems)) {
             return data;
         }
@@ -293,6 +293,9 @@ export class ControlServiceBase {
         }
         const dataItems: any[] = this.model.getDataItems();
         const requestData: any = {};
+        if(isMerge && (data && data.viewparams)){
+            Object.assign(requestData,data.viewparams);
+        }
         dataItems.forEach((item: any) => {
             if (item && item.dataType && Object.is(item.dataType, 'FONTKEY')) {
                 if (item && item.prop) {