update

@CONTROL/甘特图部件/CONTROL-BASE.vue.ftl

@@ -390,11 +390,11 @@ FullCalendar,
         let _context: any = Object.assign({},this.context);
         let itemType = event.itemType;
         switch(itemType) {
-<#if ctrl.getPSSysCalendarItems()??>
-  <#list ctrl.getPSSysCalendarItems() as calendarItem>
-    <#if calendarItem.getPSAppDataEntity()??>
-      <#assign _appde = calendarItem.getPSAppDataEntity() />
-            case "${calendarItem.getItemType()}":
+<#if ctrl.getPSSysGanttItems()??>
+  <#list ctrl.getPSSysGanttItems() as ganttItem>
+    <#if ganttItem.getPSAppDataEntity()??>
+      <#assign _appde = ganttItem.getPSAppDataEntity() />
+            case "${ganttItem.getItemType()}":
                 _context.${_appde.getCodeName()?lower_case} = event.${_appde.getCodeName()?lower_case};
                 view = this.getEditView("${_appde.getCodeName()?lower_case}");
                 break;
@@ -462,11 +462,11 @@ FullCalendar,
         arg.end = this.$util.dateFormat($event.event.end);
         let itemType = $event.event._def.extendedProps.itemType;
         switch(itemType) {
-<#if ctrl.getPSSysCalendarItems()??>
-  <#list ctrl.getPSSysCalendarItems() as calendarItem>
-    <#if calendarItem.getPSAppDataEntity()??>
-      <#assign _appde = calendarItem.getPSAppDataEntity() />
-            case "${calendarItem.getItemType()}":
+<#if ctrl.getPSSysGanttItems()??>
+  <#list ctrl.getPSSysGanttItems() as ganttItem>
+    <#if ganttItem.getPSAppDataEntity()??>
+      <#assign _appde = ganttItem.getPSAppDataEntity() />
+            case "${ganttItem.getItemType()}":
                 arg.${_appde.getCodeName()?lower_case} = $event.event._def.extendedProps.${_appde.getCodeName()?lower_case};
                 _context.${_appde.getCodeName()?lower_case} = $event.event._def.extendedProps.${_appde.getCodeName()?lower_case};
                 break;

@CONTROL/甘特图部件/MODEL.ts.ftl

@@ -55,11 +55,11 @@
       ];
       switch(this.itemType){
     <#--  日历项实体映射  -->
-<#if ctrl.getPSSysCalendarItems()??>
-  <#list ctrl.getPSSysCalendarItems() as calendarItem>
-    <#if calendarItem.getPSAppDataEntity()??>
-      <#assign appDataEntity = calendarItem.getPSAppDataEntity() />
-          case "${calendarItem.getItemType()}":
+<#if ctrl.getPSSysGanttItems()??>
+  <#list ctrl.getPSSysGanttItems() as ganttItem>
+    <#if ganttItem.getPSAppDataEntity()??>
+      <#assign appDataEntity = ganttItem.getPSAppDataEntity() />
+          case "${ganttItem.getItemType()}":
               dataItems = [...dataItems,
                   {
                     name: '${appDataEntity.getCodeName()?lower_case}',
@@ -71,11 +71,11 @@
                   },
                   {
                     name:'start',
-                    prop:'${calendarItem.getBeginTimePSDEField().getCodeName()?lower_case}'
+                    prop:'${ganttItem.getBeginTimePSDEField().getCodeName()?lower_case}'
                   },
                   {
                     name:'end',
-                    prop:'${calendarItem.getEndTimePSDEField().getCodeName()?lower_case}'
+                    prop:'${ganttItem.getEndTimePSDEField().getCodeName()?lower_case}'
                   },
               ];
               break;

@CONTROL/甘特图部件/SERVICE.ts.ftl

 <#assign import_block>
-<#if ctrl.getPSSysCalendarItems()??>
-  <#list ctrl.getPSSysCalendarItems() as calendarItem>
-    <#if calendarItem.getPSAppDataEntity()??>
-      <#assign _appde = calendarItem.getPSAppDataEntity() />
+<#if ctrl.getPSSysGanttItems()??>
+  <#list ctrl.getPSSysGanttItems() as ganttItem>
+    <#if ganttItem.getPSAppDataEntity()??>
+      <#assign _appde = ganttItem.getPSAppDataEntity() />
       <#if _appde.getId() != appde.getId()>
       <#if !P.exists("importService", _appde.getId(), "")>
 import ${srfclassname('${_appde.getCodeName()}')}Service from '@/service/${srffilepath2(_appde.getCodeName())}/${srffilepath2(_appde.getCodeName())}-service';
@@ -16,10 +16,10 @@ import ${srfclassname('${_appde.getCodeName()}')}Service from '@/service/${srffi
 ../@MACRO/SERVICE/SERVICE_HEADER.ts.ftl
 </#ibizinclude>
 
-<#if ctrl.getPSSysCalendarItems()??>
-  <#list ctrl.getPSSysCalendarItems() as calendarItem>
-    <#if calendarItem.getPSAppDataEntity()??>
-      <#assign _appde = calendarItem.getPSAppDataEntity() />
+<#if ctrl.getPSSysGanttItems()??>
+  <#list ctrl.getPSSysGanttItems() as ganttItem>
+    <#if ganttItem.getPSAppDataEntity()??>
+      <#assign _appde = ganttItem.getPSAppDataEntity() />
       <#if _appde.getId() != appde.getId()>
       <#if !P.exists("importService2", _appde.getId(), "")>
     /**
@@ -43,13 +43,13 @@ import ${srfclassname('${_appde.getCodeName()}')}Service from '@/service/${srffi
      * @memberof ${srfclassname('${ctrl.codeName}')}
      */
     public eventsConfig: any[] = [
-<#if ctrl.getPSSysCalendarItems()??>
-  <#list ctrl.getPSSysCalendarItems() as calendarItem>
+<#if ctrl.getPSSysGanttItems()??>
+  <#list ctrl.getPSSysGanttItems() as ganttItem>
         {
-          itemName : '${calendarItem.getName()}',
-          itemType : '${calendarItem.getItemType()}',
-          color : '${calendarItem.getBKColor()}',
-          textColor : '${calendarItem.getColor()}',
+          itemName : '${ganttItem.getName()}',
+          itemType : '${ganttItem.getItemType()}',
+          color : '${ganttItem.getBKColor()}',
+          textColor : '${ganttItem.getColor()}',
         },
   </#list>
 </#if>
@@ -71,17 +71,17 @@ import ${srfclassname('${_appde.getCodeName()}')}Service from '@/service/${srffi
         return new Promise((resolve: any, reject: any) => {
             let promises:any = [];
             let tempRequest:any;
-<#if ctrl.getPSSysCalendarItems()??>
-  <#list ctrl.getPSSysCalendarItems() as calendarItem>
-    <#if calendarItem.getPSAppDataEntity()?? && calendarItem.getPSDEDataSet()??>
-      <#assign _appde = calendarItem.getPSAppDataEntity() />
-      <#assign deDataSet = calendarItem.getPSDEDataSet() />
+<#if ctrl.getPSSysGanttItems()??>
+  <#list ctrl.getPSSysGanttItems() as ganttItem>
+    <#if ganttItem.getPSAppDataEntity()?? && ganttItem.getPSDEDataSet()??>
+      <#assign _appde = ganttItem.getPSAppDataEntity() />
+      <#assign deDataSet = ganttItem.getPSDEDataSet() />
       <#if !P.exists("importService3", _appde.getId() + deDataSet.getCodeName(), "")>
         <#if _appde.getId() == appde.getId()>
-            tempRequest = this.handleRequestData(action,context,data,true,"${calendarItem.getItemType()}");
+            tempRequest = this.handleRequestData(action,context,data,true,"${ganttItem.getItemType()}");
             promises.push(this.appEntityService.Fetch${deDataSet.getCodeName()}(tempRequest.context, tempRequest.data, isloading));
         <#else>
-            tempRequest = this.handleRequestData(action,context,data,true,"${calendarItem.getItemType()}");
+            tempRequest = this.handleRequestData(action,context,data,true,"${ganttItem.getItemType()}");
             promises.push(this.${_appde.getCodeName()?lower_case}Service.Fetch${deDataSet.getCodeName()}(tempRequest.context, tempRequest.data, isloading));
         </#if>
       </#if>
@@ -134,18 +134,18 @@ import ${srfclassname('${_appde.getCodeName()}')}Service from '@/service/${srffi
             let result: any;
             let tempRequest:any;
             switch(itemType) {
-<#if ctrl.getPSSysCalendarItems()??>
-  <#list ctrl.getPSSysCalendarItems() as calendarItem>
-    <#if calendarItem.getPSAppDataEntity()??>
-      <#assign _appde = calendarItem.getPSAppDataEntity() />
+<#if ctrl.getPSSysGanttItems()??>
+  <#list ctrl.getPSSysGanttItems() as ganttItem>
+    <#if ganttItem.getPSAppDataEntity()??>
+      <#assign _appde = ganttItem.getPSAppDataEntity() />
         <#if _appde.getId() == appde.getId()>
-                case "${calendarItem.getItemType()}":
-                    tempRequest = this.handleRequestData("",context,data,false,"${calendarItem.getItemType()}");
+                case "${ganttItem.getItemType()}":
+                    tempRequest = this.handleRequestData("",context,data,false,"${ganttItem.getItemType()}");
                     result = this.appEntityService.Update(tempRequest.context, tempRequest.data, isloading);
                     break;
         <#else>
-                case "${calendarItem.getItemType()}":
-                    tempRequest = this.handleRequestData("",context,data,false,"${calendarItem.getItemType()}");
+                case "${ganttItem.getItemType()}":
+                    tempRequest = this.handleRequestData("",context,data,false,"${ganttItem.getItemType()}");
                     result = this.${_appde.getCodeName()?lower_case}Service.Update(tempRequest.context, tempRequest.data, isloading);
                     break;
         </#if>