@ibiz-template/runtime 0.7.41-alpha.7 → 0.7.41-alpha.8

package/out/controller/common/editor/editor.controller.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"editor.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/common/editor/editor.controller.ts"],"names":[],"mappings":"AACA,OAAO,EACL,OAAO,EAGR,MAAM,kBAAkB,CAAC;AAI1B,OAAO,EACL,eAAe,EACf,iBAAiB,EACjB,kBAAkB,EAClB,0BAA0B,EAC3B,MAAM,+BAA+B,CAAC;AAIvC;;;;;;;GAOG;AACH,qBAAa,gBAAgB,CAAC,CAAC,SAAS,OAAO,GAAG,OAAO,CACvD,YAAW,iBAAiB;IAE5B;;;;;;OAMG;IACH,QAAQ,CAAC,KAAK,EAAE,CAAC,CAAC;IAElB;;;;;;OAMG;IACH,QAAQ,CAAC,KAAK,EAAE,KAAK,CAAM;IAE3B;;;;;;OAMG;IACH,QAAQ,CAAC,OAAO,EAAG,QAAQ,CAAC;IAE5B;;;;;;OAMG;IACH,QAAQ,CAAC,MAAM,EAAG,OAAO,CAAC;IAE1B;;;;;OAKG;IACH,QAAQ,CAAC,MAAM,EAAE,0BAA0B,CAAC;IAE5C;;;;;OAKG;IACI,WAAW,SAAM;IAExB;;;;;OAKG;IACI,YAAY,EAAE,KAAK,CAAM;IAEhC;;;;;OAKG;IACI,WAAW,EAAE,KAAK,CAAM;IAE/B;;;;;;OAMG;IACH,IAAI,QAAQ,IAAI,OAAO,CAEtB;IAED;;;;;;OAMG;IACH,IAAI,WAAW,IAAI,MAAM,GAAG,SAAS,CAEpC;IAED;;;;;;OAMG;IACH,IAAI,QAAQ,IAAI,MAAM,GAAG,SAAS,CAEjC;IAED;;;;;;OAMG;IACH,IAAI,WAAW,IAAI,MAAM,CAexB;IAED;;;;;;OAMG;IACH,IAAI,oBAAoB,IAAI,OAAO,CAGlC;IAED;;;;;OAKG;IACH,IAAI,IAAI,IAAI,eAAe,CAO1B;IAED;;;;;;OAMG;IACH,IAAI,IAAI,IAAI,kBAAkB,CAO7B;IAED;;;;;OAKG;gBACS,KAAK,EAAE,CAAC,EAAE,MAAM,EAAE,0BAA0B;IAOxD;;;;;;OAMG;IACG,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;cAIX,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IA8CvC;;;;;;OAMG;IACI,kBAAkB,CACvB,IAAI,EAAE,KAAK,EACX,OAAO,EAAE,QAAQ,EACjB,MAAM,EAAE,OAAO,GACd;QAAE,OAAO,EAAE,QAAQ,CAAC;QAAC,MAAM,EAAE,OAAO,CAAA;KAAE;IAgBzC;;;;;;;OAOG;IACH,KAAK,CAAC,KAAK,EAAE,MAAM,GAAG,KAAK,GAAG,KAAK,EAAE,GAAG,SAAS;IASjD;;;;;;;OAOG;IACH,SAAS,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO;IAIjC;;;;;;OAMG;IACH,WAAW,CAAC,KAAK,GAAE,OAAY,GAAG,MAAM;CAqBzC"}
+{"version":3,"file":"editor.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/common/editor/editor.controller.ts"],"names":[],"mappings":"AACA,OAAO,EACL,OAAO,EAGR,MAAM,kBAAkB,CAAC;AAI1B,OAAO,EACL,eAAe,EACf,iBAAiB,EACjB,kBAAkB,EAClB,0BAA0B,EAC3B,MAAM,+BAA+B,CAAC;AAIvC;;;;;;;GAOG;AACH,qBAAa,gBAAgB,CAAC,CAAC,SAAS,OAAO,GAAG,OAAO,CACvD,YAAW,iBAAiB;IAE5B;;;;;;OAMG;IACH,QAAQ,CAAC,KAAK,EAAE,CAAC,CAAC;IAElB;;;;;;OAMG;IACH,QAAQ,CAAC,KAAK,EAAE,KAAK,CAAM;IAE3B;;;;;;OAMG;IACH,QAAQ,CAAC,OAAO,EAAG,QAAQ,CAAC;IAE5B;;;;;;OAMG;IACH,QAAQ,CAAC,MAAM,EAAG,OAAO,CAAC;IAE1B;;;;;OAKG;IACH,QAAQ,CAAC,MAAM,EAAE,0BAA0B,CAAC;IAE5C;;;;;OAKG;IACI,WAAW,SAAM;IAExB;;;;;OAKG;IACI,YAAY,EAAE,KAAK,CAAM;IAEhC;;;;;OAKG;IACI,WAAW,EAAE,KAAK,CAAM;IAE/B;;;;;;OAMG;IACH,IAAI,QAAQ,IAAI,OAAO,CAEtB;IAED;;;;;;OAMG;IACH,IAAI,WAAW,IAAI,MAAM,GAAG,SAAS,CAEpC;IAED;;;;;;OAMG;IACH,IAAI,QAAQ,IAAI,MAAM,GAAG,SAAS,CAEjC;IAED;;;;;;OAMG;IACH,IAAI,WAAW,IAAI,MAAM,CAkBxB;IAED;;;;;;OAMG;IACH,IAAI,oBAAoB,IAAI,OAAO,CAGlC;IAED;;;;;OAKG;IACH,IAAI,IAAI,IAAI,eAAe,CAO1B;IAED;;;;;;OAMG;IACH,IAAI,IAAI,IAAI,kBAAkB,CAO7B;IAED;;;;;OAKG;gBACS,KAAK,EAAE,CAAC,EAAE,MAAM,EAAE,0BAA0B;IAOxD;;;;;;OAMG;IACG,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;cAIX,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IA8CvC;;;;;;OAMG;IACI,kBAAkB,CACvB,IAAI,EAAE,KAAK,EACX,OAAO,EAAE,QAAQ,EACjB,MAAM,EAAE,OAAO,GACd;QAAE,OAAO,EAAE,QAAQ,CAAC;QAAC,MAAM,EAAE,OAAO,CAAA;KAAE;IAgBzC;;;;;;;OAOG;IACH,KAAK,CAAC,KAAK,EAAE,MAAM,GAAG,KAAK,GAAG,KAAK,EAAE,GAAG,SAAS;IASjD;;;;;;;OAOG;IACH,SAAS,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO;IAIjC;;;;;;OAMG;IACH,WAAW,CAAC,KAAK,GAAE,OAAY,GAAG,MAAM;CAqBzC"}

package/out/controller/common/editor/editor.controller.js

@@ -52,6 +52,9 @@ export class EditorController {
         if (this.editorParams.triggerMode) {
             return this.editorParams.triggerMode;
         }
+        if (this.editorParams.triggermode) {
+            return this.editorParams.triggermode;
+        }
         const { form, grid, treeGrid } = this.parent;
         const control = form || grid || treeGrid;
         if (control === null || control === void 0 ? void 0 : control.controlParams.triggermode) {

package/out/controller/control/data-view/data-view.controller.d.ts

@@ -1,7 +1,7 @@
-import { IDEDataView, IDEDataViewItem, IUIActionGroupDetail } from '@ibiz/model-core';
+import { IDEDataView, IUIActionGroupDetail } from '@ibiz/model-core';
 import { CodeListItem, MDCtrlLoadParams, IApiMDGroupParams, IMDControlGroupState, IDataViewControlState, IDataViewControlEvent, IDataViewControlController } from '../../../interface';
 import { MDControlController } from '../../common';
-import { ControllerEvent, ButtonContainerState } from '../../utils';
+import { ControllerEvent } from '../../utils';
 import { DataViewControlService } from './data-view.service';
 export declare class DataViewControlController<T extends IDEDataView = IDEDataView, S extends IDataViewControlState = IDataViewControlState, E extends IDataViewControlEvent = IDataViewControlEvent> extends MDControlController<T, S, E> implements IDataViewControlController {
     /**
@@ -94,20 +94,18 @@ export declare class DataViewControlController<T extends IDEDataView = IDEDataVi
     refresh(): Promise<void>;
     afterLoad(args: MDCtrlLoadParams, items: IData[]): Promise<IData[]>;
     /**
-     * 获取操作项模型
-     *
-     * @return {*}  {(IDEDataViewItem | null)}
+     * @description 获取操作项行为集合模型
+     * @returns {*}  {IUIActionGroupDetail[]}
      * @memberof DataViewControlController
      */
-    getOptItemModel(): IDEDataViewItem | null;
+    getOptItemModel(): IUIActionGroupDetail[];
     /**
-     * 获取操作项行为
-     *
-     * @param {IData} item
-     * @return {*}
+     * @description 计算操作项状态
+     * @param {IData[]} items
+     * @returns {*}  {Promise<void>}
      * @memberof DataViewControlController
      */
-    getOptItemAction(item: IData): ButtonContainerState;
+    calcOptItemState(items: IData[]): Promise<void>;
     /**
      * 行为点击
      *

package/out/controller/control/data-view/data-view.controller.d.ts.map

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

package/out/controller/control/data-view/data-view.controller.js

@@ -32,6 +32,7 @@ export class DataViewControlController extends MDControlController {
         this.state.collapseKeys = [];
         const { enablePagingBar } = this.model;
         this.state.enablePagingBar = enablePagingBar;
+        this.state.uaState = {};
     }
     /**
      * 初始化
@@ -197,56 +198,48 @@ export class DataViewControlController extends MDControlController {
         await this.initGroupCodeListItems();
         await this.handleDataGroup();
         await this.initGroupActionStates();
+        await this.calcOptItemState(items);
         this.calcShowMode(items);
         return items;
     }
     /**
-     * 获取操作项模型
-     *
-     * @return {*}  {(IDEDataViewItem | null)}
+     * @description 获取操作项行为集合模型
+     * @returns {*}  {IUIActionGroupDetail[]}
      * @memberof DataViewControlController
      */
     getOptItemModel() {
-        let optItemModel = null;
+        const actions = [];
         const { dedataViewItems } = this.model;
-        if (dedataViewItems) {
-            for (let index = 0; index < dedataViewItems.length; index++) {
-                if (dedataViewItems[index].itemType === 'ACTIONITEM') {
-                    optItemModel = dedataViewItems[index];
-                }
+        dedataViewItems === null || dedataViewItems === void 0 ? void 0 : dedataViewItems.forEach(item => {
+            if (item.itemType === 'ACTIONITEM' &&
+                item.deuiactionGroup &&
+                item.deuiactionGroup.uiactionGroupDetails) {
+                actions.push(...item.deuiactionGroup.uiactionGroupDetails);
             }
-        }
-        return optItemModel;
+        });
+        return actions;
     }
     /**
-     * 获取操作项行为
-     *
-     * @param {IData} item
-     * @return {*}
+     * @description 计算操作项状态
+     * @param {IData[]} items
+     * @returns {*}  {Promise<void>}
      * @memberof DataViewControlController
      */
-    getOptItemAction(item) {
-        var _a;
-        const containerState = new ButtonContainerState();
-        const optItemModel = this.getOptItemModel();
-        if (optItemModel) {
-            if (!optItemModel.deuiactionGroup) {
-                throw new RuntimeModelError(this.model, ibiz.i18n.t('runtime.controller.control.dataView.noBehaviourGroup'));
-            }
-            if (!((_a = optItemModel.deuiactionGroup.uiactionGroupDetails) === null || _a === void 0 ? void 0 : _a.length)) {
-                ibiz.log.debug(ibiz.i18n.t('runtime.controller.control.dataView.noBehaviourGroupAction'));
-                return containerState;
-            }
-            optItemModel.deuiactionGroup.uiactionGroupDetails.forEach(detail => {
-                const actionid = detail.uiactionId;
-                if (actionid) {
-                    const buttonState = new UIActionButtonState(detail.id, this.context.srfappid, actionid, detail);
-                    containerState.addState(detail.id, buttonState);
-                }
-            });
-            containerState.update(this.context, item.getOrigin());
-        }
-        return containerState;
+    async calcOptItemState(items) {
+        const actions = this.getOptItemModel();
+        if (actions.length)
+            await Promise.all(items.map(async (item) => {
+                const containerState = new ButtonContainerState();
+                actions.forEach((action) => {
+                    const actionid = action.uiactionId;
+                    if (actionid) {
+                        const buttonState = new UIActionButtonState(action.id, this.context.srfappid, actionid);
+                        containerState.addState(action.id, buttonState);
+                    }
+                });
+                await containerState.update(this.context, item.getOrigin(), this.model.appDataEntityId);
+                this.state.uaState[item.srfkey] = containerState;
+            }));
     }
     /**
      * 行为点击

package/out/controller/control/form/edit-form/edit-form.service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"edit-form.service.d.ts","sourceRoot":"","sources":["../../../../../src/controller/control/form/edit-form/edit-form.service.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,aAAa,EAGd,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EACL,WAAW,EAKZ,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,SAAS,EAAc,MAAM,qBAAqB,CAAC;AAC5D,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAEnD,qBAAa,eAAe,CAC1B,CAAC,SAAS,WAAW,GAAG,WAAW,CACnC,SAAQ,WAAW,CAAC,CAAC,CAAC;IACtB;;;;;;;;OAQG;IACG,GAAG,CACP,OAAO,EAAE,QAAQ,EACjB,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC;IAgBpC;;;;;;;;OAQG;IACG,QAAQ,CACZ,OAAO,EAAE,QAAQ,EACjB,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC;IAgBpC;;;;;;;;OAQG;IACG,MAAM,CACV,OAAO,EAAE,QAAQ,EACjB,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,aAAa,CAAC;IAUzB;;;;;;;;OAQG;IACG,MAAM,CACV,OAAO,EAAE,QAAQ,EACjB,IAAI,EAAE,KAAK,GACV,OAAO,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC;IAWpC;;;;;;;;OAQG;IACG,MAAM,CACV,OAAO,EAAE,QAAQ,EACjB,IAAI,EAAE,KAAK,GACV,OAAO,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC;IAWpC;;;;;;;;OAQG;IACG,MAAM,CACV,OAAO,EAAE,QAAQ,EACjB,IAAI,EAAE,KAAK,GACV,OAAO,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC;IAkBpC;;;;;;;;;OASG;IACG,cAAc,CAClB,UAAU,EAAE,MAAM,EAClB,OAAO,EAAE,QAAQ,EACjB,IAAI,GAAE,KAAU,EAChB,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC;IAOpC;;;;;;;;;OASG;IACG,OAAO,CACX,OAAO,EAAE,QAAQ,EACjB,MAAM,EAAE,OAAO,EACf,IAAI,EAAE,KAAK,GACV,OAAO,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;IAehC;;;;;;;;;OASG;IACG,QAAQ,CACZ,OAAO,EAAE,QAAQ,EACjB,MAAM,EAAE,OAAO,EACf,IAAI,EAAE,KAAK,GACV,OAAO,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;IAuBhC;;;;;OAKG;IACH,SAAS,CAAC,aAAa,IAAI,IAAI;IA8D/B;;;;;;;OAOG;IACH,cAAc,CAAC,QAAQ,EAAE,aAAa,GAAG,aAAa,CAAC,SAAS,CAAC;CAOlE"}
+{"version":3,"file":"edit-form.service.d.ts","sourceRoot":"","sources":["../../../../../src/controller/control/form/edit-form/edit-form.service.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,aAAa,EAGd,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EACL,WAAW,EAKZ,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,SAAS,EAAc,MAAM,qBAAqB,CAAC;AAC5D,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAEnD,qBAAa,eAAe,CAC1B,CAAC,SAAS,WAAW,GAAG,WAAW,CACnC,SAAQ,WAAW,CAAC,CAAC,CAAC;IACtB;;;;;;;;OAQG;IACG,GAAG,CACP,OAAO,EAAE,QAAQ,EACjB,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC;IAgBpC;;;;;;;;OAQG;IACG,QAAQ,CACZ,OAAO,EAAE,QAAQ,EACjB,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC;IAgBpC;;;;;;;;OAQG;IACG,MAAM,CACV,OAAO,EAAE,QAAQ,EACjB,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,aAAa,CAAC;IAUzB;;;;;;;;OAQG;IACG,MAAM,CACV,OAAO,EAAE,QAAQ,EACjB,IAAI,EAAE,KAAK,GACV,OAAO,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC;IAWpC;;;;;;;;OAQG;IACG,MAAM,CACV,OAAO,EAAE,QAAQ,EACjB,IAAI,EAAE,KAAK,GACV,OAAO,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC;IAWpC;;;;;;;;OAQG;IACG,MAAM,CACV,OAAO,EAAE,QAAQ,EACjB,IAAI,EAAE,KAAK,GACV,OAAO,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC;IAkBpC;;;;;;;;;OASG;IACG,cAAc,CAClB,UAAU,EAAE,MAAM,EAClB,OAAO,EAAE,QAAQ,EACjB,IAAI,GAAE,KAAU,EAChB,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC;IAWpC;;;;;;;;;OASG;IACG,OAAO,CACX,OAAO,EAAE,QAAQ,EACjB,MAAM,EAAE,OAAO,EACf,IAAI,EAAE,KAAK,GACV,OAAO,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;IAehC;;;;;;;;;OASG;IACG,QAAQ,CACZ,OAAO,EAAE,QAAQ,EACjB,MAAM,EAAE,OAAO,EACf,IAAI,EAAE,KAAK,GACV,OAAO,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;IAuBhC;;;;;OAKG;IACH,SAAS,CAAC,aAAa,IAAI,IAAI;IA8D/B;;;;;;;OAOG;IACH,cAAc,CAAC,QAAQ,EAAE,aAAa,GAAG,aAAa,CAAC,SAAS,CAAC;CAOlE"}

package/out/controller/control/form/edit-form/edit-form.service.js

@@ -119,7 +119,11 @@ export class EditFormService extends FormService {
      * @returns {*}  {Promise<IHttpResponse<ControlVO>>}
      */
     async updateFormItem(methodName, context, data = {}, params = {}) {
-        Object.assign(params, { srfupdateitem: true });
+        var _a;
+        const { controlParam } = this.model;
+        // 识别控件动态参数ignoreupdateitem
+        const srfupdateitem = ((_a = controlParam === null || controlParam === void 0 ? void 0 : controlParam.ctrlParams) === null || _a === void 0 ? void 0 : _a.IGNOREUPDATEITEM) !== 'false';
+        Object.assign(params, { srfupdateitem });
         let res = await this.exec(methodName, context, data, params);
         res = this.handleResponse(res);
         return res;

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

@@ -1,5 +1,5 @@
 import { IDEKanban, IUIActionGroupDetail } from '@ibiz/model-core';
-import { IKanbanEvent, IKanbanState, IDragChangeInfo, MDCtrlLoadParams, IApiMDGroupParams, IKanbanController, IKanbanGroupState, IToolbarController } from '../../../interface';
+import { IKanbanLane, IKanbanEvent, IKanbanState, IDragChangeInfo, MDCtrlLoadParams, IApiMDGroupParams, IKanbanController, IKanbanGroupState, IToolbarController } from '../../../interface';
 import { ControlVO } from '../../../service';
 import { DataViewControlController } from '../data-view';
 import { KanbanService } from './kanban.service';
@@ -27,6 +27,20 @@ export declare class KanbanController extends DataViewControlController<IDEKanba
      * @type {boolean}
      */
     get enableEditGroup(): boolean;
+    /**
+     * @description 拖拽模式
+     * @readonly
+     * @type {(0 | 1 | 2 | 3)} （无 | 仅分组 | 仅泳道 | 全部）
+     * @memberof KanbanController
+     */
+    get draggableMode(): 0 | 1 | 2 | 3;
+    /**
+     * @description 获取泳道描述
+     * @readonly
+     * @type {(string | undefined)}
+     * @memberof KanbanController
+     */
+    get laneDescription(): string | undefined;
     protected initControlService(): Promise<void>;
     protected initState(): void;
     /**
@@ -62,35 +76,40 @@ export declare class KanbanController extends DataViewControlController<IDEKanba
      */
     onRowClick(_data: IData): Promise<void>;
     /**
-     * 点击新建时设置选中分组
-     *
+     * @description 点击新建并设置设置选中分组
      * @param {MouseEvent} event
-     * @param {(string | number)} group
+     * @param {(string | number)} group 分组
+     * @param {IKanbanLane} [lane] 泳道
      * @memberof KanbanController
      */
-    onClickNew(event: MouseEvent, group: string | number): void;
+    onClickNew(event: MouseEvent, group: string | number, lane?: IKanbanLane): void;
     /**
-     * 分组工具栏需设置选中分组
-     *
+     * @description 分组工具栏点击，需携带分组
      * @param {IUIActionGroupDetail} detail
      * @param {MouseEvent} event
      * @param {IKanbanGroupState} group
-     * @return {*}  {Promise<void>}
+     * @returns {*}  {Promise<void>}
      * @memberof KanbanController
      */
     onGroupToolbarClick(detail: IUIActionGroupDetail, event: MouseEvent, group: IKanbanGroupState): Promise<void>;
     /**
-     * 分组行为项点击，需携带分组标识
-     *
+     * @description 分组行为项点击, 需携带分组（有泳道时携带泳道）
      * @param {IUIActionGroupDetail} detail
      * @param {IData} item
      * @param {MouseEvent} event
      * @param {IKanbanGroupState} group
-     * @return {*}  {Promise<void>}
+     * @param {IKanbanLane} [lane]
+     * @returns {*}  {Promise<void>}
      * @memberof KanbanController
      */
-    onGroupActionClick(detail: IUIActionGroupDetail, item: IData, event: MouseEvent, group: IKanbanGroupState): Promise<void>;
+    onGroupActionClick(detail: IUIActionGroupDetail, item: IData, event: MouseEvent, group: IKanbanGroupState, lane?: IKanbanLane): Promise<void>;
     handleDataGroup(): Promise<void>;
+    /**
+     * @description 处理泳道数据
+     * @returns {*}  {Promise<void>}
+     * @memberof KanbanController
+     */
+    handleLaneData(): Promise<void>;
     /**
      * 处理代码表分组
      *

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

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

package/out/controller/control/kanban/kanban.controller.js

@@ -1,3 +1,5 @@
+/* eslint-disable @typescript-eslint/no-explicit-any */
+/* eslint-disable no-restricted-globals */
 /* eslint-disable no-nested-ternary */
 /* eslint-disable prefer-destructuring */
 import { DataTypes, RuntimeError, RuntimeModelError, } from '@ibiz-template/core';
@@ -6,7 +8,6 @@ import { calcDeCodeNameById } from '../../../model';
 import { DataViewControlController } from '../data-view';
 import { KanbanService } from './kanban.service';
 import { UIActionUtil } from '../../../ui-action';
-import { ButtonContainerState, UIActionButtonState } from '../../utils';
 export class KanbanController extends DataViewControlController {
     /**
      * 允许调整顺序
@@ -28,6 +29,32 @@ export class KanbanController extends DataViewControlController {
     get enableEditGroup() {
         return this.model.enableCardEditGroup === true;
     }
+    /**
+     * @description 拖拽模式
+     * @readonly
+     * @type {(0 | 1 | 2 | 3)} （无 | 仅分组 | 仅泳道 | 全部）
+     * @memberof KanbanController
+     */
+    get draggableMode() {
+        if (this.controlParams.draggablemode) {
+            const draggablemode = Number(this.controlParams.draggablemode);
+            if (!isNaN(draggablemode))
+                return draggablemode;
+        }
+        return 3;
+    }
+    /**
+     * @description 获取泳道描述
+     * @readonly
+     * @type {(string | undefined)}
+     * @memberof KanbanController
+     */
+    get laneDescription() {
+        var _a;
+        if (this.controlParams.lanedescription)
+            return this.controlParams.lanedescription;
+        return (_a = this.dataEntity) === null || _a === void 0 ? void 0 : _a.logicName;
+    }
     async initControlService() {
         this.service = new KanbanService(this.model);
         await this.service.init(this.context);
@@ -41,7 +68,7 @@ export class KanbanController extends DataViewControlController {
         this.state.readonly = !!(this.context.srfreadonly === true || this.context.srfreadonly === 'true');
         // 支持调整顺序和分组时
         this.state.draggable = this.enableEditOrder || this.enableEditGroup;
-        this.state.uaState = {};
+        this.state.lanes = [];
     }
     /**
      * 初始化
@@ -108,37 +135,10 @@ export class KanbanController extends DataViewControlController {
         items.sort((a, b) => isAsc ? a[sortField] - b[sortField] : b[sortField] - a[sortField]);
     }
     async afterLoad(args, items) {
-        var _a;
         // 每次加载回来先本地排序，把数据的排序属性规范一下
         this.sortItems(this.state.items);
         super.afterLoad(args, items);
-        const actions = [];
-        (_a = this.model.dedataViewItems) === null || _a === void 0 ? void 0 : _a.forEach((item) => {
-            if (item.itemType === 'ACTIONITEM') {
-                if (item.deuiactionGroup && item.deuiactionGroup.uiactionGroupDetails) {
-                    actions.push(...item.deuiactionGroup.uiactionGroupDetails);
-                }
-            }
-        });
-        if (actions && actions.length > 0) {
-            items.forEach((item) => {
-                const containerState = new ButtonContainerState();
-                actions.forEach((action) => {
-                    const actionid = action.uiactionId;
-                    if (actionid) {
-                        const buttonState = new UIActionButtonState(action.id, this.context.srfappid, actionid);
-                        containerState.addState(action.id, buttonState);
-                    }
-                });
-                this.state.uaState[item.srfkey] = containerState;
-            });
-        }
-        items.forEach((item) => {
-            if (this.state.uaState[item.srfkey] &&
-                Object.keys(this.state.uaState[item.srfkey]).length > 0) {
-                this.state.uaState[item.srfkey].update(this.context, item.getOrigin(), this.model.appDataEntityId);
-            }
-        });
+        this.handleLaneData();
         return items;
     }
     /**
@@ -167,42 +167,62 @@ export class KanbanController extends DataViewControlController {
         super.onRowClick(data);
     }
     /**
-     * 点击新建时设置选中分组
-     *
+     * @description 点击新建并设置设置选中分组
      * @param {MouseEvent} event
-     * @param {(string | number)} group
+     * @param {(string | number)} group 分组
+     * @param {IKanbanLane} [lane] 泳道
      * @memberof KanbanController
      */
-    onClickNew(event, group) {
+    onClickNew(event, group, lane) {
         this.setSelectGroup(group);
-        super.onClickNew(event, group);
+        const params = Object.assign(Object.assign({}, this.params), { srfgroup: group });
+        if (lane)
+            Object.assign(params, { srflane: lane.key });
+        UIActionUtil.execAndResolved('new', {
+            context: this.context,
+            params,
+            data: [],
+            view: this.view,
+            ctrl: this,
+            event,
+        }, this.view.model.appId);
     }
     /**
-     * 分组工具栏需设置选中分组
-     *
+     * @description 分组工具栏点击，需携带分组
      * @param {IUIActionGroupDetail} detail
      * @param {MouseEvent} event
      * @param {IKanbanGroupState} group
-     * @return {*}  {Promise<void>}
+     * @returns {*}  {Promise<void>}
      * @memberof KanbanController
      */
     async onGroupToolbarClick(detail, event, group) {
         this.setSelectGroup(group.key);
-        super.onGroupToolbarClick(detail, event, group);
+        const actionId = detail.uiactionId;
+        const params = Object.assign(Object.assign({}, this.params), { srfgroup: group.key });
+        await UIActionUtil.execAndResolved(actionId, {
+            context: this.context,
+            params,
+            data: group.selectedData || [],
+            view: this.view,
+            ctrl: this,
+            event,
+        }, detail.appId);
     }
     /**
-     * 分组行为项点击，需携带分组标识
-     *
+     * @description 分组行为项点击, 需携带分组（有泳道时携带泳道）
      * @param {IUIActionGroupDetail} detail
      * @param {IData} item
      * @param {MouseEvent} event
      * @param {IKanbanGroupState} group
-     * @return {*}  {Promise<void>}
+     * @param {IKanbanLane} [lane]
+     * @returns {*}  {Promise<void>}
      * @memberof KanbanController
      */
-    async onGroupActionClick(detail, item, event, group) {
+    async onGroupActionClick(detail, item, event, group, lane) {
         this.setSelectGroup(group.key);
         const params = Object.assign(Object.assign({}, this.params), { srfgroup: group });
+        if (lane)
+            Object.assign(params, { srflane: lane.key });
         const actionId = detail.uiactionId;
         await UIActionUtil.execAndResolved(actionId, {
             context: this.context,
@@ -219,6 +239,78 @@ export class KanbanController extends DataViewControlController {
         }
         return super.handleDataGroup();
     }
+    /**
+     * @description 处理泳道数据
+     * @returns {*}  {Promise<void>}
+     * @memberof KanbanController
+     */
+    async handleLaneData() {
+        var _a;
+        const { swimlaneCodeListId, swimlaneAppDEFieldId } = this.model;
+        if (!swimlaneAppDEFieldId)
+            return;
+        let lanes = [];
+        const unclassified = {
+            count: 0,
+            key: undefined,
+            isExpand: true,
+            caption: ibiz.i18n.t('runtime.controller.common.md.unclassified'),
+        };
+        const { items } = this.state;
+        if (swimlaneCodeListId) {
+            const app = ibiz.hub.getApp(this.context.srfappid);
+            const codeListItems = await app.codeList.get(swimlaneCodeListId, this.context, this.params);
+            lanes = codeListItems.map(item => {
+                var _a;
+                return {
+                    count: 0,
+                    isExpand: true,
+                    key: (_a = item.value) === null || _a === void 0 ? void 0 : _a.toString(),
+                    caption: item.text,
+                };
+            });
+            items.forEach(item => {
+                const lane = lanes.find(l => { var _a; return l.key === ((_a = item[swimlaneAppDEFieldId]) === null || _a === void 0 ? void 0 : _a.toLowerCase()); });
+                if (lane) {
+                    lane.count += 1;
+                }
+                else {
+                    // 代码表没有的加入到未分类中
+                    unclassified.count += 1;
+                }
+            });
+        }
+        else {
+            // 判断泳道属性是否为外键值
+            const deRss = (_a = this.dataEntity.minorAppDERSs) === null || _a === void 0 ? void 0 : _a.find(rss => rss.parentAppDEFieldId === swimlaneAppDEFieldId);
+            // 获取外键值文本属性
+            const textDEFieldId = (deRss === null || deRss === void 0 ? void 0 : deRss.parentTextAppDEFieldId) || swimlaneAppDEFieldId;
+            items.forEach(item => {
+                if (item[swimlaneAppDEFieldId]) {
+                    const lane = lanes.find(l => l.key === item[swimlaneAppDEFieldId]);
+                    if (lane) {
+                        lane.count += 1;
+                    }
+                    else {
+                        lanes.push({
+                            count: 1,
+                            isExpand: true,
+                            key: item[swimlaneAppDEFieldId],
+                            caption: item[textDEFieldId],
+                        });
+                    }
+                }
+                else {
+                    // 没有值的加入到未分类中
+                    unclassified.count += 1;
+                }
+            });
+        }
+        // 将未分类移动到最后
+        if (unclassified.count)
+            lanes.push(unclassified);
+        this.state.lanes = lanes;
+    }
     /**
      * 处理代码表分组
      *
@@ -264,30 +356,34 @@ export class KanbanController extends DataViewControlController {
      * @return {*}  {Promise<void>}
      */
     async onDragChange(info) {
-        var _a;
         if (!this.enableEditGroup) {
             if (info.from !== info.to) {
                 ibiz.message.warning(ibiz.i18n.t('runtime.controller.control.kanban.adjustmentsGroup'));
                 return;
             }
         }
-        const { from, to, fromIndex, toIndex } = info;
-        const groupField = this.model.groupAppDEFieldId;
-        const sortField = this.model.minorSortAppDEFieldId;
+        const { from, to, fromIndex, toIndex, fromLane, toLane } = info;
+        const { groupAppDEFieldId, minorSortAppDEFieldId, moveControlAction, laneAppDEFieldId = 'testname', } = this.model;
+        const groupField = groupAppDEFieldId;
+        const sortField = minorSortAppDEFieldId;
         const fromGroup = this.state.groups.find(x => x.key === from);
         const toGroup = this.state.groups.find(x => x.key === to);
         if (!this.enableEditOrder) {
-            if (info.from === info.to) {
+            if (from === to && fromLane === toLane) {
                 ibiz.message.warning(ibiz.i18n.t('runtime.controller.control.kanban.noAllowReorder'));
                 return;
             }
             // 只修改分组不管排序
             const draggedItem = fromGroup.children[fromIndex];
-            draggedItem[groupField] = info.to; // 变更分组
+            // 变更分组
+            draggedItem[groupField] = to;
+            // 变更泳道
+            if (laneAppDEFieldId)
+                draggedItem[laneAppDEFieldId] = toLane;
             return this.updateChangedItems([draggedItem]);
         }
         const originArr = [...toGroup.children];
-        const moveAction = (_a = this.model.moveControlAction) === null || _a === void 0 ? void 0 : _a.appDEMethodId;
+        const moveAction = moveControlAction === null || moveControlAction === void 0 ? void 0 : moveControlAction.appDEMethodId;
         if (!moveAction) {
             throw new RuntimeModelError(this.model, ibiz.i18n.t('runtime.controller.common.md.noMoveDataCconfig'));
         }

package/out/controller/ctx/ctx.js

@@ -132,10 +132,10 @@ export class CTX {
      * @return {*}  {IViewController}
      */
     getTopView() {
-        if (!this.parent) {
+        if (!this.parent || (this.parent && this.parent.isDestroyed)) {
             return this.view;
         }
-        if (this.view.modal.routeDepth === 2) {
+        if (this.view && this.view.modal.routeDepth === 2) {
             return this.view;
         }
         return this.parent.getTopView();

package/out/interface/api/controller/control/i-api-edit-form.controller.d.ts

@@ -31,6 +31,7 @@ export interface IApiFormSaveParams extends IApiDataAbilityParams {
  * @ctrlparams {name:emptyhiddenunit,title:无值是否隐藏,parameterType:boolean,defaultvalue:false,description:表单项无值时，其对应的值单位（如'天'、'%'等）是否隐藏,effectPlatform:web}
  * @ctrlparams {"name":"editmode","title":"编辑模式","parameterType":"'default' | 'hover'","defaultvalue":"'default'","description":"编辑模式。当值为 'hover'时，表单项显示时只显示值，不显示编辑器的外观，如输入框，下拉框等不显示边框，鼠标悬浮时才正常显示；值为 'default' 或者无值时，界面正常显示编辑器外观","effectPlatform":"web"}
  * @ctrlparams {"name":"triggermode","title":"编辑器值变更模式","parameterType":"'blur' | 'input'","defaultvalue":"'blur'","description":"该配置项用于指定编辑器触发 `emit` 事件的模式。若值为 'input'，则在输入框值变更时触发 change 事件；若值为 'blur'，则在输入框失去焦点时触发 change 事件"}
+ * @ctrlparams {"name":ignoreupdateitem,"title":忽略表单项更新响应数据关联处理,"parameterType":boolean,defaultvalue:true,"description":该配置项用于指定是否忽略表单项更新响应数据关联处理(是否忽略dto返回数据)}
  * @interface IApiEditFormController
  * @extends {IApiFormController<T, S>}
  * @template T

package/out/interface/api/controller/control/i-api-edit-form.controller.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"i-api-edit-form.controller.d.ts","sourceRoot":"","sources":["../../../../../src/interface/api/controller/control/i-api-edit-form.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC/C,OAAO,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AAC/C,OAAO,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAC7D,OAAO,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAChD,OAAO,EAAE,qBAAqB,EAAE,MAAM,wCAAwC,CAAC;AAE/E;;;;;GAKG;AACH,MAAM,WAAW,kBAAmB,SAAQ,qBAAqB;IAC/D;;;;OAIG;IACH,UAAU,CAAC,EAAE,OAAO,CAAC;IAErB;;;;OAIG;IACH,YAAY,CAAC,EAAE,OAAO,CAAC;CACxB;AAED;;;;;;;;;;;;GAYG;AACH,MAAM,WAAW,sBAAsB,CACrC,CAAC,SAAS,WAAW,GAAG,WAAW,EACnC,CAAC,SAAS,iBAAiB,GAAG,iBAAiB,CAC/C,SAAQ,kBAAkB,CAAC,CAAC,EAAE,CAAC,CAAC;IAChC;;;;;OAKG;IACH,SAAS,CAAC,IAAI,CAAC,EAAE,qBAAqB,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC;IAE3D;;;;;OAKG;IACH,IAAI,CAAC,IAAI,CAAC,EAAE,qBAAqB,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC;IAEtD;;;;;OAKG;IACH,IAAI,CAAC,IAAI,CAAC,EAAE,kBAAkB,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC;IAEnD;;;;;OAKG;IACH,MAAM,CAAC,IAAI,CAAC,EAAE,qBAAqB,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;IAEvD;;;;;OAKG;IACH,QAAQ,CAAC,IAAI,CAAC,EAAE,qBAAqB,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAEtD;;;;;OAKG;IACH,OAAO,CAAC,IAAI,CAAC,EAAE,qBAAqB,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAErD;;;;OAIG;IACH,YAAY,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IAEnC;;;;;OAKG;IACH,cAAc,CAAC,gBAAgB,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CACzD"}
+{"version":3,"file":"i-api-edit-form.controller.d.ts","sourceRoot":"","sources":["../../../../../src/interface/api/controller/control/i-api-edit-form.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC/C,OAAO,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AAC/C,OAAO,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAC7D,OAAO,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAChD,OAAO,EAAE,qBAAqB,EAAE,MAAM,wCAAwC,CAAC;AAE/E;;;;;GAKG;AACH,MAAM,WAAW,kBAAmB,SAAQ,qBAAqB;IAC/D;;;;OAIG;IACH,UAAU,CAAC,EAAE,OAAO,CAAC;IAErB;;;;OAIG;IACH,YAAY,CAAC,EAAE,OAAO,CAAC;CACxB;AAED;;;;;;;;;;;;;GAaG;AACH,MAAM,WAAW,sBAAsB,CACrC,CAAC,SAAS,WAAW,GAAG,WAAW,EACnC,CAAC,SAAS,iBAAiB,GAAG,iBAAiB,CAC/C,SAAQ,kBAAkB,CAAC,CAAC,EAAE,CAAC,CAAC;IAChC;;;;;OAKG;IACH,SAAS,CAAC,IAAI,CAAC,EAAE,qBAAqB,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC;IAE3D;;;;;OAKG;IACH,IAAI,CAAC,IAAI,CAAC,EAAE,qBAAqB,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC;IAEtD;;;;;OAKG;IACH,IAAI,CAAC,IAAI,CAAC,EAAE,kBAAkB,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC;IAEnD;;;;;OAKG;IACH,MAAM,CAAC,IAAI,CAAC,EAAE,qBAAqB,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;IAEvD;;;;;OAKG;IACH,QAAQ,CAAC,IAAI,CAAC,EAAE,qBAAqB,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAEtD;;;;;OAKG;IACH,OAAO,CAAC,IAAI,CAAC,EAAE,qBAAqB,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAErD;;;;OAIG;IACH,YAAY,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IAEnC;;;;;OAKG;IACH,cAAc,CAAC,gBAAgB,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CACzD"}

package/out/interface/api/controller/control/i-api-kanban.controller.d.ts

@@ -9,6 +9,8 @@ import { IApiDataViewControlController } from './i-api-data-view-control.control
  * @export
  * @interface IApiKanbanController
  * @extends {IApiDataViewControlController<T, S>}
+ * @ctrlparams {"name":"draggablemode","title":"拖拽模式","defaultvalue": "3","parameterType":"0 | 1 | 2 | 3","description":"该参数控制看板的拖拽能力，可选值为：0：无拖拽， 1：仅同分组，2：仅同泳道，3：全部","effectPlatform":"web"}
+ * @ctrlparams {"name":"lanedescription","title":"泳道描述","defaultvalue": "","parameterType":"string","description":"该参数用于显示泳道的描述信息，默认为实体逻辑名称","effectPlatform":"web"}
  * @template T
  * @template S
  */

package/out/interface/api/controller/control/i-api-kanban.controller.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"i-api-kanban.controller.d.ts","sourceRoot":"","sources":["../../../../../src/interface/api/controller/control/i-api-kanban.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAC7C,OAAO,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AAC/C,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAC9C,OAAO,EAAE,6BAA6B,EAAE,MAAM,sCAAsC,CAAC;AAErF;;;;;;;;;GASG;AACH,MAAM,WAAW,oBAAoB,CACnC,CAAC,SAAS,SAAS,GAAG,SAAS,EAC/B,CAAC,SAAS,eAAe,GAAG,eAAe,CAC3C,SAAQ,6BAA6B,CAAC,CAAC,EAAE,CAAC,CAAC;IAC3C;;;;;OAKG;IACH,YAAY,CAAC,SAAS,EAAE,QAAQ,GAAG,OAAO,CAAC;CAC5C"}
+{"version":3,"file":"i-api-kanban.controller.d.ts","sourceRoot":"","sources":["../../../../../src/interface/api/controller/control/i-api-kanban.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAC7C,OAAO,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AAC/C,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAC9C,OAAO,EAAE,6BAA6B,EAAE,MAAM,sCAAsC,CAAC;AAErF;;;;;;;;;;;GAWG;AACH,MAAM,WAAW,oBAAoB,CACnC,CAAC,SAAS,SAAS,GAAG,SAAS,EAC/B,CAAC,SAAS,eAAe,GAAG,eAAe,CAC3C,SAAQ,6BAA6B,CAAC,CAAC,EAAE,CAAC,CAAC;IAC3C;;;;;OAKG;IACH,YAAY,CAAC,SAAS,EAAE,QAAQ,GAAG,OAAO,CAAC;CAC5C"}

package/out/interface/common/i-modal/i-modal.d.ts

@@ -2,6 +2,9 @@ import { AsyncSeriesHook } from 'qx-util';
 import { ViewMode } from '../../../constant';
 import { IModalData } from '../i-modal-data/i-modal-data';
 type ModalHooks = {
+    preDismiss: AsyncSeriesHook<[], {
+        allowNext?: boolean;
+    }>;
     shouldDismiss: AsyncSeriesHook<[
     ], {
         allowClose?: boolean;