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

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

@@ -41,6 +41,7 @@
 <#if ctrl.getPSSysCalendarItems()??>
     <#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}';
@@ -89,9 +90,9 @@
                 break;
             <#else>
             case "${calendarItem.getItemType()}":
-                context _service: any = await this.getService('${_appde.getCodeName()?lower_case}');
-                if (_service && _service[${_deAction.getCodeName()}] && _service[${_deAction.getCodeName()}] instanceof Function) {
-                    response = await _service[${_deAction.getCodeName()}](context, data);
+                const _service: any = await this.getService('${_appde.getCodeName()?lower_case}');
+                if (_service && _service['${_deAction.getCodeName()}'] && _service['${_deAction.getCodeName()}'] instanceof Function) {
+                    response = await _service['${_deAction.getCodeName()}'](context, data);
                 }
                 break;
             </#if>
@@ -132,9 +133,9 @@
                 break;
             <#else>
             case "${calendarItem.getItemType()}":
-                context _service: any = await this.getService('${_appde.getCodeName()?lower_case}');
-                if (_service && _service[${_deAction.getCodeName()}] && _service[${_deAction.getCodeName()}] instanceof Function) {
-                    response = await _service[${_deAction.getCodeName()}](context, data);
+                const _service: any = await this.getService('${_appde.getCodeName()?lower_case}');
+                if (_service && _service['${_deAction.getCodeName()}'] && _service['${_deAction.getCodeName()}'] instanceof Function) {
+                    response = await _service['${_deAction.getCodeName()}'](context, data);
                 }
                 break;
             </#if>