表单服务逻辑调整

@CONTROL/@MACRO/SERVICE/FORM.ts.ftl

@@ -137,7 +137,7 @@ import ${srfclassname('${_appde.getCodeName()}')}Service from '@/service/${srffi
     @Errorlog
     public wfsubmit(action: string,context: any = {}, data: any = {}, isloading?: boolean,localdata?:any): Promise<any> {
         data = this.handleWFData(data,true);
-        context = this.handleRequestData(action,context,data).context;
+        context = this.handleRequestData(action,context,data,true).context;
         return new Promise((resolve: any, reject: any) => {
             let result: Promise<any>;
             const _appEntityService: any = this.appEntityService;
@@ -361,13 +361,16 @@ import ${srfclassname('${_appde.getCodeName()}')}Service from '@/service/${srffi
      * @param data 数据
      * @memberof ${srfclassname('${ctrl.codeName}')}Service
      */
-    public handleRequestData(action: string,context:any, data: any = {}){
+    public handleRequestData(action: string,context:any, data: any = {},isMerge:boolean = false){
         let mode: any = this.getMode();
         if (!mode && mode.getDataItems instanceof Function) {
             return data;
         }
         let formItemItems: any[] = mode.getDataItems();
         let requestData:any = {};
+        if(isMerge && (data && data.viewparams)){
+            Object.assign(requestData,data.viewparams);
+        }
         formItemItems.forEach((item:any) =>{
             if(item && item.dataType && Object.is(item.dataType,'FONTKEY')){
                 if(item && item.prop){
@@ -379,9 +382,6 @@ import ${srfclassname('${_appde.getCodeName()}')}Service from '@/service/${srffi
                 }
             }
         });
-        if(data && data.viewparams){
-            Object.assign(requestData,data.viewparams);
-        }
         let tempContext:any = JSON.parse(JSON.stringify(context));
         if(tempContext && tempContext.srfsessionid){
             tempContext.srfsessionkey = tempContext.srfsessionid;