Merge remote-tracking branch 'core/dev' into dev

@CONTROL/日历部件/SERVICE.ts.ftl

@@ -37,24 +37,24 @@
      */
     public async search(itemType: string, context: any = {}, data: any = {}, isLoading?: boolean): Promise<HttpResponse> {
         let item: any = {};
-        data = this.handleRequestData('', context, data);
-        await this.onBeforeAction('', context, data, isLoading);
-        this.model.itemType = itemType;
         try {
 <#if ctrl.getPSSysCalendarItems()??>
-            item = {
     <#list ctrl.getPSSysCalendarItems() as calendarItem>
         <#if calendarItem.getPSAppDataEntity()?? && calendarItem.getPSDEDataSet()??>
             <#assign _appde = calendarItem.getPSAppDataEntity() />
             <#assign deDataSet = calendarItem.getPSDEDataSet() />
+            this.model.itemType = '${calendarItem.getItemType()?lower_case}';
+            const _${calendarItem.getItemType()?lower_case}_data =  this.handleRequestData('', context, data);
+            await this.onBeforeAction('', context, _${calendarItem.getItemType()?lower_case}_data, isLoading);
+            item = {
                 <#if _appde.getId() == appde.getId()>
-                ...{ ${calendarItem.getItemType()?lower_case}: await this.loadDEDataSet('Fetch${deDataSet.getCodeName()}', context, data, '${calendarItem.getItemType()?lower_case}') },
+                ...{ ${calendarItem.getItemType()?lower_case}: await this.loadDEDataSet('Fetch${deDataSet.getCodeName()}', context, _${calendarItem.getItemType()?lower_case}_data, '${calendarItem.getItemType()?lower_case}') },
                 <#else>
-                ...{ ${calendarItem.getItemType()?lower_case}: await this.loadDEDataSet('Fetch${deDataSet.getCodeName()}', context, data, '${calendarItem.getItemType()?lower_case}') },
+                ...{ ${calendarItem.getItemType()?lower_case}: await this.loadDEDataSet('Fetch${deDataSet.getCodeName()}', context, _${calendarItem.getItemType()?lower_case}_data, '${calendarItem.getItemType()?lower_case}', '${_appde.getCodeName()?lower_case}') },
                 </#if>
+            };
         </#if>
     </#list>
-            };
 </#if>
         } catch (response) {
             await this.onAfterAction('', context, response);