@ibiz-template/runtime 0.7.41-alpha.5 → 0.7.41-alpha.52

package/out/controller/control/form/form-detail/form-tab-panel/form-tab-panel.controller.js

@@ -1,15 +1,23 @@
-import { FormDetailController } from '../form-detail';
 import { FormTabPanelState } from './form-tab-panel.state';
+import { FormContainerController } from '../form-container';
+import { FormNotifyState } from '../../../../constant';
 /**
- * 表单分页部件控制器
- *
- * @author lxm
- * @date 2022-09-04 15:09:52
+ * @description 表单分页部件控制器
  * @export
  * @class FormTabPanelController
- * @extends {FormDetailController}
+ * @extends {FormContainerController<IDEFormTabPanel>}
+ * @implements {IApiFormTabPanelController}
  */
-export class FormTabPanelController extends FormDetailController {
+export class FormTabPanelController extends FormContainerController {
+    /**
+     * @description 缓存标识
+     * @readonly
+     * @type {string}
+     * @memberof FormTabPanelController
+     */
+    get srfcachekeytempl() {
+        return `${this.form.srfcachekeytempl}_${this.model.codeName}_${this.form.data.tempsrfkey}`;
+    }
     createState() {
         var _a;
         return new FormTabPanelState((_a = this.parent) === null || _a === void 0 ? void 0 : _a.state);
@@ -20,6 +28,42 @@ export class FormTabPanelController extends FormDetailController {
         // 初始化默认的激活分页
         this.state.activeTab = ((_a = this.model.deformTabPages) === null || _a === void 0 ? void 0 : _a[0].id) || '';
     }
+    /**
+     * @description 表单状态变更通知
+     * @param {FormNotifyState} state
+     * @returns {*}  {Promise<void>}
+     * @memberof FormTabPanelController
+     */
+    async formStateNotify(state) {
+        var _a;
+        super.formStateNotify(state);
+        if ([FormNotifyState.LOAD, FormNotifyState.DRAFT].includes(state)) {
+            const cacheTabId = localStorage.getItem(this.srfcachekeytempl);
+            if (this.form.srfCachePos && cacheTabId) {
+                const isExist = (_a = this.model.deformTabPages) === null || _a === void 0 ? void 0 : _a.some(page => page.id === cacheTabId);
+                if (isExist)
+                    this.state.activeTab = cacheTabId;
+            }
+        }
+    }
+    /**
+     * @description 初始化计数器
+     * @protected
+     * @returns {*}  {void}
+     * @memberof FormTabPanelController
+     */
+    initCounter() {
+        var _a, _b;
+        const tabPage = (_a = this.model.deformTabPages) === null || _a === void 0 ? void 0 : _a.find(_item => !!_item.appCounterRefId);
+        if (!tabPage)
+            return;
+        const { counters } = this.form;
+        const { appCounterRefId } = tabPage;
+        if (appCounterRefId) {
+            this.counter = counters[appCounterRefId];
+            (_b = this.counter) === null || _b === void 0 ? void 0 : _b.onChange(this.handleCounterChange);
+        }
+    }
     /**
      * 分页点击切换处理
      * @author lxm
@@ -29,6 +73,8 @@ export class FormTabPanelController extends FormDetailController {
      */
     onTabChange(tabId) {
         this.state.activeTab = tabId;
+        if (this.form.srfCachePos)
+            localStorage.setItem(`${this.srfcachekeytempl}`, tabId);
     }
     /**
      * @description 切换激活分页

package/out/controller/control/form/form-detail/form-tab-panel/form-tab-panel.state.d.ts

@@ -1,16 +1,17 @@
-import { FormDetailState } from '../form-detail';
+import { IApiFormTabPanelState } from '../../../../../interface';
+import { FormContainerState } from '../form-container';
 /**
- * 表单分页部件状态
- * @return {*}
- * @author: zhujiamin
- * @Date: 2023-01-04 10:26:34
+ * @description 表单分页部件状态
+ * @export
+ * @class FormTabPanelState
+ * @extends {FormContainerState}
+ * @implements {IApiFormTabPanelState}
  */
-export declare class FormTabPanelState extends FormDetailState {
+export declare class FormTabPanelState extends FormContainerState implements IApiFormTabPanelState {
     /**
-     * 当前激活的分页
-     * @author lxm
-     * @date 2024-01-17 02:05:58
+     * @description 当前激活的分页
      * @type {string}
+     * @memberof FormTabPanelState
      */
     activeTab: string;
 }

package/out/controller/control/form/form-detail/form-tab-panel/form-tab-panel.state.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"form-tab-panel.state.d.ts","sourceRoot":"","sources":["../../../../../../src/controller/control/form/form-detail/form-tab-panel/form-tab-panel.state.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AAEjD;;;;;GAKG;AACH,qBAAa,iBAAkB,SAAQ,eAAe;IACpD;;;;;OAKG;IACH,SAAS,EAAE,MAAM,CAAM;CACxB"}
+{"version":3,"file":"form-tab-panel.state.d.ts","sourceRoot":"","sources":["../../../../../../src/controller/control/form/form-detail/form-tab-panel/form-tab-panel.state.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAAE,MAAM,0BAA0B,CAAC;AACjE,OAAO,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAC;AAEvD;;;;;;GAMG;AACH,qBAAa,iBACX,SAAQ,kBACR,YAAW,qBAAqB;IAEhC;;;;OAIG;IACH,SAAS,EAAE,MAAM,CAAM;CACxB"}

package/out/controller/control/form/form-detail/form-tab-panel/form-tab-panel.state.js

@@ -1,18 +1,18 @@
-import { FormDetailState } from '../form-detail';
+import { FormContainerState } from '../form-container';
 /**
- * 表单分页部件状态
- * @return {*}
- * @author: zhujiamin
- * @Date: 2023-01-04 10:26:34
+ * @description 表单分页部件状态
+ * @export
+ * @class FormTabPanelState
+ * @extends {FormContainerState}
+ * @implements {IApiFormTabPanelState}
  */
-export class FormTabPanelState extends FormDetailState {
+export class FormTabPanelState extends FormContainerState {
     constructor() {
         super(...arguments);
         /**
-         * 当前激活的分页
-         * @author lxm
-         * @date 2024-01-17 02:05:58
+         * @description 当前激活的分页
          * @type {string}
+         * @memberof FormTabPanelState
          */
         this.activeTab = '';
     }

package/out/controller/control/form/form-detail/index.d.ts

@@ -9,4 +9,6 @@ export * from './form-rawitem/index';
 export * from './form-tab-page/index';
 export * from './form-tab-panel/index';
 export * from './form-button-list/index';
+export * from './form-iframe';
+export * from './form-container';
 //# sourceMappingURL=index.d.ts.map

package/out/controller/control/form/form-detail/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/controller/control/form/form-detail/index.ts"],"names":[],"mappings":"AAAA,cAAc,qBAAqB,CAAC;AACpC,cAAc,qBAAqB,CAAC;AACpC,cAAc,uBAAuB,CAAC;AACtC,cAAc,0BAA0B,CAAC;AACzC,cAAc,mBAAmB,CAAC;AAClC,cAAc,qBAAqB,CAAC;AACpC,cAAc,mBAAmB,CAAC;AAClC,cAAc,sBAAsB,CAAC;AACrC,cAAc,uBAAuB,CAAC;AACtC,cAAc,wBAAwB,CAAC;AACvC,cAAc,0BAA0B,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/controller/control/form/form-detail/index.ts"],"names":[],"mappings":"AAAA,cAAc,qBAAqB,CAAC;AACpC,cAAc,qBAAqB,CAAC;AACpC,cAAc,uBAAuB,CAAC;AACtC,cAAc,0BAA0B,CAAC;AACzC,cAAc,mBAAmB,CAAC;AAClC,cAAc,qBAAqB,CAAC;AACpC,cAAc,mBAAmB,CAAC;AAClC,cAAc,sBAAsB,CAAC;AACrC,cAAc,uBAAuB,CAAC;AACtC,cAAc,wBAAwB,CAAC;AACvC,cAAc,0BAA0B,CAAC;AACzC,cAAc,eAAe,CAAC;AAC9B,cAAc,kBAAkB,CAAC"}

package/out/controller/control/form/form-detail/index.js

@@ -9,3 +9,5 @@ export * from './form-rawitem/index';
 export * from './form-tab-page/index';
 export * from './form-tab-panel/index';
 export * from './form-button-list/index';
+export * from './form-iframe';
+export * from './form-container';

package/out/controller/control/form/search-form/search-form.controller.d.ts

@@ -38,6 +38,13 @@ export declare class SearchFormController extends FormController<IDESearchForm,
      * @type {ConfigService}
      */
     config: ConfigService;
+    /**
+     * @description 搜索过滤参数转换模式
+     * @readonly
+     * @type {('default' | 'searchconds')}
+     * @memberof SearchFormController
+     */
+    get convertparammode(): 'default' | 'searchconds';
     protected initState(): void;
     protected onCreated(): Promise<void>;
     /**

package/out/controller/control/form/search-form/search-form.controller.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"search-form.controller.d.ts","sourceRoot":"","sources":["../../../../../src/controller/control/form/search-form/search-form.controller.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACjD,OAAO,EACL,qBAAqB,EACrB,gBAAgB,EAChB,gBAAgB,EACjB,MAAM,uBAAuB,CAAC;AAE/B,OAAO,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AACzD,OAAO,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAC1D,OAAO,EAAE,aAAa,EAAa,MAAM,qBAAqB,CAAC;AAE/D;;;;;;;;;GASG;AACH,qBAAa,oBACX,SAAQ,cAAc,CAAC,aAAa,EAAE,gBAAgB,EAAE,gBAAgB,CACxE,YAAW,qBAAqB;IAEhC;;;;;;OAMG;IACH,OAAO,EAAG,iBAAiB,CAAC;IAE5B;;;;;;;OAOG;IACH,SAAS,CAAC,OAAO,EAAE,KAAK,CAAmB;IAE3C;;;;;OAKG;IACH,MAAM,EAAG,aAAa,CAAC;IAEvB,SAAS,CAAC,SAAS,IAAI,IAAI;cAMX,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IA2B1C;;;;;;OAMG;IACH,aAAa,CAAC,IAAI,EAAE,KAAK,GAAG,IAAI;IAiBhC;;;;;;OAMG;IACG,IAAI,IAAI,OAAO,CAAC,KAAK,CAAC;IAoB5B;;;;;;OAMG;IACH,eAAe,IAAI,OAAO;IAY1B;;;;;OAKG;IACG,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAI7B;;;;;OAKG;IACG,mBAAmB,IAAI,OAAO,CAAC,IAAI,CAAC;IAI1C;;;;;OAKG;IACG,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAK5B;;;;;;OAMG;IACG,gBAAgB,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAOtD;;;;;;OAMG;IACG,OAAO,CAAC,KAAK,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC;IAQlD;;;;;;;OAOG;IACH,SAAS,CAAC,qBAAqB,IAAI,IAAI;IAuDvC;;;;;OAKG;IACG,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAUjC;;;;;OAKG;IACG,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IASjC;;;;;;OAMG;IACG,WAAW,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAS9C;;;;;OAKG;IACH,iBAAiB,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI;IActC;;;;;OAKG;IACG,kBAAkB,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;CAUvD"}
+{"version":3,"file":"search-form.controller.d.ts","sourceRoot":"","sources":["../../../../../src/controller/control/form/search-form/search-form.controller.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACjD,OAAO,EACL,qBAAqB,EACrB,gBAAgB,EAChB,gBAAgB,EACjB,MAAM,uBAAuB,CAAC;AAE/B,OAAO,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AACzD,OAAO,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAC1D,OAAO,EAAE,aAAa,EAAa,MAAM,qBAAqB,CAAC;AAG/D;;;;;;;;;GASG;AACH,qBAAa,oBACX,SAAQ,cAAc,CAAC,aAAa,EAAE,gBAAgB,EAAE,gBAAgB,CACxE,YAAW,qBAAqB;IAEhC;;;;;;OAMG;IACH,OAAO,EAAG,iBAAiB,CAAC;IAE5B;;;;;;;OAOG;IACH,SAAS,CAAC,OAAO,EAAE,KAAK,CAAmB;IAE3C;;;;;OAKG;IACH,MAAM,EAAG,aAAa,CAAC;IAEvB;;;;;OAKG;IACH,IAAI,gBAAgB,IAAI,SAAS,GAAG,aAAa,CAKhD;IAED,SAAS,CAAC,SAAS,IAAI,IAAI;cAMX,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IA2B1C;;;;;;OAMG;IACH,aAAa,CAAC,IAAI,EAAE,KAAK,GAAG,IAAI;IAiBhC;;;;;;OAMG;IACG,IAAI,IAAI,OAAO,CAAC,KAAK,CAAC;IAqB5B;;;;;;OAMG;IACH,eAAe,IAAI,OAAO;IA+B1B;;;;;OAKG;IACG,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAI7B;;;;;OAKG;IACG,mBAAmB,IAAI,OAAO,CAAC,IAAI,CAAC;IAI1C;;;;;OAKG;IACG,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAK5B;;;;;;OAMG;IACG,gBAAgB,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAOtD;;;;;;OAMG;IACG,OAAO,CAAC,KAAK,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC;IAQlD;;;;;;;OAOG;IACH,SAAS,CAAC,qBAAqB,IAAI,IAAI;IAuDvC;;;;;OAKG;IACG,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAUjC;;;;;OAKG;IACG,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IASjC;;;;;;OAMG;IACG,WAAW,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAS9C;;;;;OAKG;IACH,iBAAiB,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI;IActC;;;;;OAKG;IACG,kBAAkB,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;CAUvD"}

package/out/controller/control/form/search-form/search-form.controller.js

@@ -3,6 +3,7 @@ import { FormNotifyState } from '../../../constant';
 import { FormController } from '../form/form.controller';
 import { SearchFormService } from './search-form.service';
 import { ConfigService, ControlVO } from '../../../../service';
+import { paramsToSearchconds } from '../../../../utils';
 /**
  * 搜索表单控制器
  *
@@ -26,6 +27,18 @@ export class SearchFormController extends FormController {
          */
         this.oldData = new ControlVO();
     }
+    /**
+     * @description 搜索过滤参数转换模式
+     * @readonly
+     * @type {('default' | 'searchconds')}
+     * @memberof SearchFormController
+     */
+    get convertparammode() {
+        if (this.controlParams.convertparammode) {
+            return this.controlParams.convertparammode;
+        }
+        return ibiz.config.searchform.convertParamMode;
+    }
     initState() {
         super.initState();
         this.state.storedFilters = [];
@@ -94,6 +107,7 @@ export class SearchFormController extends FormController {
         }
         this.state.data = res.data;
         this.state.isLoaded = true;
+        await this.evt.emit('onLoadDraftSuccess', undefined);
         this.formStateNotify(FormNotifyState.DRAFT);
         this.actionNotification('GETDRAFTSUCCESS');
         return this.data;
@@ -107,13 +121,31 @@ export class SearchFormController extends FormController {
      */
     getFilterParams() {
         const filterParams = {};
-        Object.keys(this.state.data).forEach(key => {
-            const value = this.state.data[key];
-            // 排除空值
-            if (value !== null && value !== undefined && value !== '') {
-                filterParams[key] = value;
-            }
-        });
+        if (this.convertparammode === 'searchconds') {
+            const searchconds = paramsToSearchconds(this.state.data);
+            if (searchconds.length > 0)
+                Object.assign(filterParams, {
+                    searchconds: [
+                        {
+                            condop: 'AND',
+                            condtype: 'GROUP',
+                            searchconds,
+                        },
+                    ],
+                });
+        }
+        else {
+            Object.keys(this.state.data).forEach(key => {
+                const value = this.state.data[key];
+                // 排除空值
+                if (value !== null &&
+                    value !== undefined &&
+                    value !== '' &&
+                    key !== '$srfuf') {
+                    filterParams[key] = value;
+                }
+            });
+        }
         return filterParams;
     }
     /**

package/out/controller/control/gantt/gantt.controller.d.ts

@@ -1,11 +1,10 @@
 import { IDEGantt } from '@ibiz/model-core';
 import { IPortalMessage } from '@ibiz-template/core';
-import { IColumnState, IGanttController, IGanttEvent, IGanttNodeData, IGanttState, IGanttStyle, IUIActionResult, MDCtrlLoadParams, MDCtrlRemoveParams } from '../../../interface';
+import { IGanttStyle, IGanttState, IGanttEvent, IColumnState, IGanttNodeData, IGanttController, MDCtrlLoadParams, MDCtrlRemoveParams } from '../../../interface';
 import { GanttService } from './gantt.service';
 import { TreeGridExController, TreeGridExRowState } from '../tree-grid-ex';
 import { GanttDataSetNodeData } from '../../../service';
 import { ControllerEvent } from '../../utils';
-import { ViewLogicScheduler } from '../../../logic-scheduler';
 /**
  * 甘特图控制器
  *
@@ -18,13 +17,6 @@ import { ViewLogicScheduler } from '../../../logic-scheduler';
  */
 export declare class GanttController extends TreeGridExController<IDEGantt, IGanttState, IGanttEvent> implements IGanttController {
     service: GanttService;
-    /**
-     * 视图逻辑触发器
-     *
-     * @type {ViewLogicScheduler}
-     * @memberof GanttController
-     */
-    viewScheduler?: ViewLogicScheduler;
     protected get _evt(): ControllerEvent<IGanttEvent>;
     /**
      * 初始化状态
@@ -66,14 +58,6 @@ export declare class GanttController extends TreeGridExController<IDEGantt, IGan
      * @memberof GanttController
      */
     setGanttStyle(style: IGanttStyle): void;
-    protected onCreated(): Promise<void>;
-    /**
-     * 初始化视图触发器
-     *
-     * @protected
-     * @memberof GanttController
-     */
-    protected initViewScheduler(): void;
     /**
      * 设置激活数据
      *
@@ -82,18 +66,6 @@ export declare class GanttController extends TreeGridExController<IDEGantt, IGan
      * @memberof GanttController
      */
     setActive(item: IGanttNodeData): Promise<void>;
-    /**
-     * 节点数据激活
-     *
-     * @param {IGanttNodeData} item
-     * @return {*}  {Promise<void>}
-     * @memberof GanttController
-     */
-    onNodeDataActive(nodeParams: {
-        data: IData[];
-        context: IContext;
-        params: IParams;
-    }): Promise<void>;
     /**
      * 部件刷新，走初始加载(规避预置后续刷新和通知刷新同时进行)
      *
@@ -129,17 +101,6 @@ export declare class GanttController extends TreeGridExController<IDEGantt, IGan
      * @memberof GanttController
      */
     onTreeNodeClick(_nodeData: IGanttNodeData, event: MouseEvent): Promise<void>;
-    /**
-     * 打开编辑数据视图
-     *
-     * @param {IGanttNodeData} item
-     * @memberof GanttController
-     */
-    openData({ data, context, params, }: {
-        data: IData[];
-        context: IContext;
-        params: IParams;
-    }): Promise<IUIActionResult>;
     /**
      * 设置行属性的值
      *
@@ -193,11 +154,14 @@ export declare class GanttController extends TreeGridExController<IDEGantt, IGan
     newRow(args?: MDCtrlLoadParams): Promise<void>;
     protected onDEDataChange(msg: IPortalMessage): void;
     /**
-     * @description 切换折叠
-     * @param {IData} [params={}]
+     * @description 切换折叠，其中tag表示操作指定树节点标识，若不传则操作当前树的第一层节点展开状态，expand表示是否展开，若不传则基于节点展开状态取反
+     * @param {{ tag?: string; expand?: boolean }} [params={}]
      * @memberof GanttController
      */
-    changeCollapse(params?: IData): void;
+    changeCollapse(params?: {
+        tag?: string;
+        expand?: boolean;
+    }): void;
     /**
      * 保存列状态
      *
@@ -226,5 +190,17 @@ export declare class GanttController extends TreeGridExController<IDEGantt, IGan
      * @memberof GanttController
      */
     protected mergeGridColumnStates(base: IColumnState[], cache: IColumnState[]): IColumnState[];
+    /**
+     * loadNodes加载完子数据之后的处理
+     * @param {IGanttNodeData[]} nodes 加载回来的子数据
+     * @return {*}  {Promise<void>}
+     */
+    afterLoadNodes(nodes: IGanttNodeData[]): Promise<void>;
+    /**
+     * @description 更新链接线数据
+     * @returns {*}  {Promise<void>}
+     * @memberof GanttController
+     */
+    updateLinks(): Promise<void>;
 }
 //# sourceMappingURL=gantt.controller.d.ts.map

package/out/controller/control/gantt/gantt.controller.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"gantt.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/gantt/gantt.controller.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"gantt.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/gantt/gantt.controller.ts"],"names":[],"mappings":"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"}

package/out/controller/control/gantt/gantt.controller.js

@@ -1,8 +1,8 @@
-import { awaitTimeout, RuntimeError, RuntimeModelError, } from '@ibiz-template/core';
+import { awaitTimeout, RuntimeError, recursiveIterate, } from '@ibiz-template/core';
 import { GanttService } from './gantt.service';
 import { TreeGridExController, TreeGridExRowState } from '../tree-grid-ex';
-import { Srfuf } from '../../../service';
-import { calcDeCodeNameById, getChildNodeRSs, getRootNode, } from '../../../model';
+import { Srfuf, GanttNodeLinkData, } from '../../../service';
+import { getRootNode, getChildNodeRSs, calcDeCodeNameById, } from '../../../model';
 import { TreeGridExNotifyState } from '../../constant';
 import { handleAllSettled } from '../../../utils';
 import { isValueChange } from '../../utils';
@@ -32,6 +32,8 @@ export class GanttController extends TreeGridExController {
         this.state.ganttStyle = {};
         this.state.sliderDraggable = true;
         this.state.mustShowColumns = null;
+        this.state.unit = 'day';
+        this.state.links = [];
     }
     /**
      * 部件参数解析
@@ -50,6 +52,9 @@ export class GanttController extends TreeGridExController {
         if (this.controlParams.mustshowcolumns) {
             this.state.mustShowColumns = JSON.parse(this.controlParams.mustshowcolumns);
         }
+        if (this.controlParams.unit) {
+            this.state.unit = this.controlParams.unit;
+        }
     }
     /**
      * 当数据放生变更时，若为当前应用实体数据。则多数据部件进行刷新
@@ -79,31 +84,6 @@ export class GanttController extends TreeGridExController {
     setGanttStyle(style) {
         this.state.ganttStyle = style;
     }
-    async onCreated() {
-        await super.onCreated();
-        this.initViewScheduler();
-    }
-    /**
-     * 初始化视图触发器
-     *
-     * @protected
-     * @memberof GanttController
-     */
-    initViewScheduler() {
-        const viewLogics = this.model.appViewLogics || [];
-        if (viewLogics.length !== 0) {
-            this.viewScheduler = ibiz.scheduler.createViewScheduler(viewLogics);
-            this.viewScheduler.defaultParamsCb = () => {
-                return this.getEventArgs();
-            };
-            if (this.viewScheduler.hasViewEventTrigger) {
-                // 监听视图事件触发视图事件触发器
-                this.evt.onAll((_eventName, event) => {
-                    this.viewScheduler.triggerViewEvent(event);
-                });
-            }
-        }
-    }
     /**
      * 设置激活数据
      *
@@ -114,23 +94,12 @@ export class GanttController extends TreeGridExController {
     async setActive(item) {
         const nodeParams = this.parseTreeNodeData(item);
         if (item._nodeType === 'DE') {
-            await this.onNodeDataActive(nodeParams);
+            const res = await this.openData(item);
+            if (!res.cancel)
+                this.refreshNodeChildren(item, true);
         }
         return this.evt.emit('onActive', Object.assign(Object.assign({}, nodeParams), { nodeData: item }));
     }
-    /**
-     * 节点数据激活
-     *
-     * @param {IGanttNodeData} item
-     * @return {*}  {Promise<void>}
-     * @memberof GanttController
-     */
-    async onNodeDataActive(nodeParams) {
-        const res = await this.openData(nodeParams);
-        if (!res.cancel) {
-            this.refreshNodeChildren(nodeParams.data[0], true);
-        }
-    }
     /**
      * 部件刷新，走初始加载(规避预置后续刷新和通知刷新同时进行)
      *
@@ -245,40 +214,6 @@ export class GanttController extends TreeGridExController {
             await this.setActive(nodeData);
         }
     }
-    /**
-     * 打开编辑数据视图
-     *
-     * @param {IGanttNodeData} item
-     * @memberof GanttController
-     */
-    async openData({ data, context, params, }) {
-        var _a, _b;
-        const nodeData = data[0];
-        const nodeModel = this.getNodeModel(nodeData._nodeId);
-        const { appDataEntityId } = nodeModel;
-        const deName = calcDeCodeNameById(appDataEntityId);
-        context[deName.toLowerCase()] = (_a = nodeData._deData) === null || _a === void 0 ? void 0 : _a.srfkey;
-        // 添加srfnavctrlid到上下文
-        context.srfnavctrlid = this.ctrlId;
-        const result = await ((_b = this.viewScheduler) === null || _b === void 0 ? void 0 : _b.triggerCustom(`${nodeModel.id.toLowerCase()}_opendata`, {
-            context,
-            params,
-            data,
-            event: undefined,
-            view: this.view,
-            ctrl: this,
-        }));
-        if (result === -1) {
-            throw new RuntimeModelError(nodeModel, ibiz.i18n.t('runtime.controller.control.calendar.missingViewLogic', {
-                itemType: nodeModel.id.toLowerCase(),
-            }));
-        }
-        else {
-            return {
-                cancel: result ? !result.ok : true,
-            };
-        }
-    }
     /**
      * 设置行属性的值
      *
@@ -362,7 +297,7 @@ export class GanttController extends TreeGridExController {
             return;
         }
         const nodeModel = this.getNodeModel(nodeData._nodeId);
-        const { appDataEntityId } = nodeModel;
+        const { appDataEntityId, updateAppDEActionId } = nodeModel;
         const isCreate = nodeData._deData.srfuf === Srfuf.CREATE;
         // 处理接口
         const deName = calcDeCodeNameById(appDataEntityId);
@@ -370,8 +305,9 @@ export class GanttController extends TreeGridExController {
         tempContext[deName] = nodeData._deData.srfkey;
         const app = ibiz.hub.getApp(this.context.srfappid);
         let res;
+        const updateMethodName = updateAppDEActionId || 'update';
         try {
-            res = await app.deService.exec(appDataEntityId, isCreate ? 'create' : 'update', tempContext, nodeData._deData);
+            res = await app.deService.exec(appDataEntityId, isCreate ? 'create' : updateMethodName, tempContext, nodeData._deData);
         }
         catch (error) {
             await this.evt.emit('onSaveError', undefined);
@@ -430,11 +366,12 @@ export class GanttController extends TreeGridExController {
                     const nodeModel = this.getNodeModel(item._nodeId);
                     // 新建未保存的数据直接走后续删除处理逻辑
                     if (nodeModel && item._deData.srfuf !== Srfuf.CREATE) {
-                        const { appDataEntityId } = nodeModel;
+                        const { appDataEntityId, removeAppDEActionId } = nodeModel;
                         const deName = calcDeCodeNameById(appDataEntityId);
                         tempContext[deName] = item.srfkey;
+                        const removeMethodName = removeAppDEActionId || 'remove';
                         // 删除后台的数据
-                        await app.deService.exec(appDataEntityId, 'remove', tempContext, params);
+                        await app.deService.exec(appDataEntityId, removeMethodName, tempContext, params);
                         if (!refreshNode && item._parent) {
                             const parentNodeData = this.getNodeData(item._parent._id);
                             refreshNode = parentNodeData;
@@ -582,8 +519,8 @@ export class GanttController extends TreeGridExController {
     }
     onDEDataChange(msg) { }
     /**
-     * @description 切换折叠
-     * @param {IData} [params={}]
+     * @description 切换折叠，其中tag表示操作指定树节点标识，若不传则操作当前树的第一层节点展开状态，expand表示是否展开，若不传则基于节点展开状态取反
+     * @param {{ tag?: string; expand?: boolean }} [params={}]
      * @memberof GanttController
      */
     changeCollapse(params = {}) {
@@ -689,4 +626,69 @@ export class GanttController extends TreeGridExController {
         }
         return columnStates;
     }
+    /**
+     * loadNodes加载完子数据之后的处理
+     * @param {IGanttNodeData[]} nodes 加载回来的子数据
+     * @return {*}  {Promise<void>}
+     */
+    async afterLoadNodes(nodes) {
+        await super.afterLoadNodes(nodes);
+        await this.updateLinks();
+    }
+    /**
+     * @description 更新链接线数据
+     * @returns {*}  {Promise<void>}
+     * @memberof GanttController
+     */
+    async updateLinks() {
+        const { linkdatasourcetype, linkappdataentityname, linkappdedatasetname, linknodedataname, fromdataitemname, todataitemname, } = this.controlParams;
+        let result = [];
+        const app = ibiz.hub.getApp(this.context.srfappid);
+        // 适配数据源模式
+        switch (linkdatasourcetype) {
+            case 'DEDATASET':
+                result = await this.service.getDEDatasByDEDataset({
+                    appDataEntityId: `${app.id}.${linkappdataentityname}`,
+                    appDEDataSetName: linkappdedatasetname,
+                    context: this.context,
+                    params: this.params,
+                });
+                break;
+            case 'NODEDATA':
+            default:
+                recursiveIterate({ _children: this.state.rootNodes }, (node) => {
+                    var _a, _b;
+                    if ((_b = (_a = node._deData) === null || _a === void 0 ? void 0 : _a[linknodedataname]) === null || _b === void 0 ? void 0 : _b.length) {
+                        result.push(...node._deData[linknodedataname]);
+                    }
+                }, { childrenFields: ['_children'] });
+                break;
+        }
+        // 处理links数据
+        const _links = [];
+        result.forEach(data => {
+            let fromData;
+            let toData;
+            this.state.items.find(_ganttNode => {
+                if (data[fromdataitemname] === _ganttNode._value)
+                    fromData = _ganttNode;
+                if (data[todataitemname] === _ganttNode._value)
+                    toData = _ganttNode;
+                if (fromData && toData)
+                    return true;
+                return false;
+            });
+            // 起始节点或结束节点不存在时不显示链接线
+            if (fromData && toData) {
+                _links.push(new GanttNodeLinkData({
+                    fromDataItemName: fromdataitemname,
+                    toDataItemName: todataitemname,
+                    fromData,
+                    toData,
+                    data,
+                }));
+            }
+        });
+        this.state.links = _links;
+    }
 }

package/out/controller/control/gantt/gantt.service.d.ts

@@ -84,5 +84,22 @@ export declare class GanttService extends TreeService {
      * @return {*}  {Promise<IGanttNodeData[]>}
      */
     protected getCodeListGanttNodeDatas(nodeModel: IDETreeCodeListNode, nodeRS: IDETreeNodeRS | undefined, parentNodeData: IGanttNodeData | undefined, opts: TreeFetchOpts): Promise<IGanttNodeData[]>;
+    /**
+     * @description 通过实体数据集获取实体数据
+     * @param {{
+     *     appDataEntityId: string;
+     *     appDEDataSetId: string;
+     *     context: IContext;
+     *     params: IParams;
+     *   }} opts
+     * @returns {*}  {Promise<IData[]>}
+     * @memberof GanttService
+     */
+    getDEDatasByDEDataset(opts: {
+        appDataEntityId: string;
+        appDEDataSetName: string;
+        context: IContext;
+        params: IParams;
+    }): Promise<IData[]>;
 }
 //# sourceMappingURL=gantt.service.d.ts.map