update

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

@@ -102,12 +102,16 @@ GanttElastic,
                 straight: false
             },
             columns: [
+                <#if ctrl.getPSDETreeColumns()??>
+                <#list ctrl.getPSDETreeColumns() as column>
                 {
-                    label: '名称',
-                    value: 'label',
+                    label: '${column.getCaption()}',
+                    value: '<#if column.getName() == "begin">start<#else>${column.getName()}</#if>',
                     expander: true,
-                    width: 150
-                }
+                    width: <#if column.getWidth() gt 0>${column.getWidth()}<#else>100</#if>
+                },
+                </#list>
+                </#if>
             ]
         }
     };
@@ -306,11 +310,11 @@ GanttElastic,
         let view: any = {};
         let _context: any = Object.assign({},this.context);
         switch(data.itemType) {
-<#if ctrl.getPSSysGanttItems()??>
-  <#list ctrl.getPSSysGanttItems() as ganttItem>
+<#if ctrl.getPSDETreeNodes()??>
+  <#list ctrl.getPSDETreeNodes() as ganttItem>
     <#if ganttItem.getPSAppDataEntity()??>
       <#assign _appde = ganttItem.getPSAppDataEntity() />
-            case "${ganttItem.getItemType()}":
+            case "${ganttItem.getNodeType()}":
                 _context.${_appde.getCodeName()?lower_case} = event.${_appde.getCodeName()?lower_case};
                 view = this.getEditView("${_appde.getCodeName()?lower_case}");
                 break;

@CONTROL/甘特图部件/CONTROL.html.ftl

 <#assign content>
     :showBusyIndicator="${ctrl.isShowBusyIndicator()?c}"
-  <#if view.getViewType() == 'DECALENDAREXPVIEW'>
-    :isSelectFirstDefault="true"
-  </#if>
 </#assign>
 <#ibizinclude>
 ../@MACRO/HTML/DEFAULT.html.ftl

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

@@ -48,6 +48,9 @@
           {
             name: 'itemType',
           },
+          {
+            name: 'parentId'
+          },
           {
             name: 'query',
             prop: 'query',
@@ -55,33 +58,24 @@
       ];
       switch(this.itemType){
     <#--  甘特项实体映射  -->
-<#if ctrl.getPSSysGanttItems()??>
-  <#list ctrl.getPSSysGanttItems() as ganttItem>
-    <#if ganttItem.getPSAppDataEntity()??>
-      <#assign appDataEntity = ganttItem.getPSAppDataEntity() />
-          case "${ganttItem.getItemType()}":
+<#if ctrl.getPSDETreeNodes()??>
+  <#list ctrl.getPSDETreeNodes() as ganttItem>
+    <#if ganttItem.getTreeNodeType() == "DE">
+          case "${ganttItem.getNodeType()}":
               dataItems = [...dataItems,
+                  <#if ganttItem.getIdPSAppDEField()??>
                   {
                     name: 'id',
-                    prop: '${appDataEntity.getKeyPSAppDEField().getCodeName()?lower_case}'
-                  },
-                  {
-                    name: 'label',
-                    prop: '${appDataEntity.getMajorPSAppDEField().getCodeName()?lower_case}'
-                  },
-                  {
-                    name:'start',
-                    prop:'${ganttItem.getBeginTimePSDEField().getCodeName()?lower_case}'
+                    prop: '${ganttItem.getIdPSAppDEField().getCodeName()?lower_case}'
                   },
+                  </#if>
+                  <#if ganttItem.getPSDETreeNodeDataItems()??>
+                  <#list ganttItem.getPSDETreeNodeDataItems() as dataItem>
                   {
-                    name:'end',
-                    prop:'${ganttItem.getEndTimePSDEField().getCodeName()?lower_case}'
+                    name: '<#if dataItem.getName() == 'begin'>start<#else>${dataItem.getName()?lower_case}</#if>',
+                    prop: '<#if dataItem.getPSDEField()??>${dataItem.getPSDEField().getCodeName()?lower_case}</#if>'
                   },
-                  <#if ganttItem.getPIdPSAppDEField()??>
-                  {
-                    name: 'parentId',
-                    prop: '${ganttItem.getPIdPSAppDEField().getCodeName()?lower_case}'
-                  }
+                  </#list>
                   </#if>
               ];
               break;