@ibiz-template/runtime 0.1.21 → 0.1.22

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

@@ -0,0 +1,310 @@
+import { RuntimeError, RuntimeModelError } from '@ibiz-template/core';
+import { isNil } from 'ramda';
+import { calcDeCodeNameById } from '../../../model';
+import { ControlVO } from '../../../service';
+import { UIActionUtil } from '../../../ui-action';
+import { ButtonContainerState, UIActionButtonState } from '../../utils';
+import { DataViewControlController } from '../data-view';
+import { KanbanService } from './kanban.service';
+export class KanbanController extends DataViewControlController {
+    /**
+     * 允许调整顺序
+     * @author lxm
+     * @date 2023-09-11 04:02:39
+     * @readonly
+     * @type {boolean}
+     */
+    get enableEditOrder() {
+        return this.model.enableCardEditOrder === true;
+    }
+    /**
+     * 是否支持调整分组。
+     * @author lxm
+     * @date 2023-09-11 04:04:00
+     * @readonly
+     * @type {boolean}
+     */
+    get enableEditGroup() {
+        return this.model.enableCardEditGroup === true;
+    }
+    /**
+     * 是否允许新建
+     * @author lxm
+     * @date 2023-09-11 04:05:25
+     * @readonly
+     * @type {boolean}
+     */
+    get enableNew() {
+        return this.model.enableCardNew === true;
+    }
+    async initControlService() {
+        this.service = new KanbanService(this.model);
+        await this.service.init(this.context);
+    }
+    initState() {
+        super.initState();
+        this.state.size = this.model.pagingSize || 1000;
+        this.state.updating = false;
+        // 支持调整顺序和分组时
+        this.state.draggable = this.enableEditOrder || this.enableEditGroup;
+    }
+    /**
+     * 初始化
+     *
+     * @protected
+     * @return {*}  {Promise<void>}
+     * @memberof KanbanController
+     */
+    async onCreated() {
+        await super.onCreated();
+        await this.initGroupActionStates();
+    }
+    /**
+     * 初始化分组右侧界面行为按钮的状态
+     *
+     * @author chitanda
+     * @date 2023-08-02 17:08:04
+     * @return {*}  {Promise<void>}
+     */
+    async initGroupActionStates() {
+        var _a;
+        const { groupUIActionGroup } = this.model;
+        if (!((_a = groupUIActionGroup === null || groupUIActionGroup === void 0 ? void 0 : groupUIActionGroup.uiactionGroupDetails) === null || _a === void 0 ? void 0 : _a.length)) {
+            return;
+        }
+        const containerState = new ButtonContainerState();
+        groupUIActionGroup.uiactionGroupDetails.forEach(detail => {
+            const actionid = detail.uiactionId;
+            if (actionid) {
+                const buttonState = new UIActionButtonState(detail.id, this.context.srfappid, actionid);
+                containerState.addState(detail.id, buttonState);
+            }
+        });
+        await containerState.update();
+        this.state.groupActionGroupState = containerState;
+        this.evt.on('onSelectionChange', event => {
+            let data = event.data[0];
+            if (data && data instanceof ControlVO) {
+                data = data.getOrigin();
+            }
+            if (data) {
+                this.state.groupActionGroupState.update(data, this.model.appDataEntityId);
+            }
+        });
+    }
+    /**
+     * 本地排序items
+     * @author lxm
+     * @date 2023-09-04 09:30:55
+     * @param {IData[]} items
+     */
+    sortItems(items) {
+        const sortField = this.model.minorSortAppDEFieldId;
+        const { minorSortDir } = this.model;
+        if (!sortField) {
+            throw new RuntimeModelError(this.model, '排序属性没配置');
+        }
+        if (!minorSortDir) {
+            throw new RuntimeModelError(this.model, '排序方向没配置');
+        }
+        const isAsc = minorSortDir === 'ASC';
+        // 格式化排序属性的值
+        items.forEach(item => {
+            const sortValue = item[sortField];
+            if (isNil(sortValue)) {
+                item[sortField] = 0;
+            }
+            else {
+                const toNum = Number(sortValue);
+                if (Number.isNaN(toNum)) {
+                    throw new RuntimeError(`${item.srfmajortext}的排序属性无法转换成数值`);
+                }
+            }
+        });
+        // 排序
+        items.sort((a, b) => isAsc ? a[sortField] - b[sortField] : b[sortField] - a[sortField]);
+    }
+    async afterLoad(args, items) {
+        // 每次加载回来先本地排序，把数据的排序属性规范一下
+        this.sortItems(this.state.items);
+        return super.afterLoad(args, items);
+    }
+    handleDataGroup() {
+        if (!this.model.enableGroup || this.model.groupMode === 'NONE') {
+            throw new RuntimeError('看板部件必须开启分组');
+        }
+        return super.handleDataGroup();
+    }
+    /**
+     * 拖拽变更事件处理回调
+     * @author lxm
+     * @date 2023-09-11 04:12:58
+     * @param {IDragChangeInfo} info
+     * @return {*}  {Promise<void>}
+     */
+    async onDragChange(info) {
+        if (!this.enableEditGroup) {
+            if (info.from !== info.to) {
+                ibiz.message.warning('当前看板不允许调整分组！');
+                return;
+            }
+        }
+        const isAsc = this.model.minorSortDir === 'ASC';
+        const { from, to, fromIndex, toIndex } = info;
+        const groupField = this.model.groupAppDEFieldId;
+        const sortField = this.model.minorSortAppDEFieldId;
+        const modifiedItems = [];
+        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) {
+                ibiz.message.warning('当前看板不允许调整次序');
+                return;
+            }
+            // 只修改分组不管排序
+            const draggedItem = fromGroup.children[fromIndex];
+            draggedItem[groupField] = info.to; // 变更分组
+            return this.updateChangedItems([draggedItem]);
+        }
+        /**
+         * 获取下一个100的倍数
+         * @author lxm
+         * @date 2023-09-11 10:03:46
+         * @param {number} num
+         * @return {*}  {number}
+         */
+        const getNextSort = (num) => {
+            return num + (100 - (num % 100));
+        };
+        const originArr = [...toGroup.children];
+        const changedArr = [...toGroup.children];
+        // 计算出拖拽前和拖拽后的数组
+        const draggedItem = fromGroup.children[fromIndex];
+        if (info.from !== info.to) {
+            draggedItem[groupField] = info.to; // 变更分组
+            changedArr.splice(toIndex, 0, draggedItem);
+        }
+        else {
+            changedArr.splice(fromIndex, 1);
+            changedArr.splice(toIndex, 0, draggedItem);
+        }
+        // 前台先改值
+        const removeItems = fromGroup.children.splice(fromIndex, 1);
+        toGroup.children.splice(toIndex, 0, ...removeItems);
+        // 降序把数组反转,保证两个数组都是从小到大排
+        if (!isAsc) {
+            originArr.reverse();
+            changedArr.reverse();
+        }
+        let lastSort;
+        let cacheArr = []; // 缓存的不修改数组
+        let cacheLastSort; // 缓存不修改数组第一个元素上一个排序值
+        changedArr.forEach((item, index) => {
+            if (lastSort === undefined) {
+                // 第一次出现要调整顺序的，如果不是0用原来位置的排序值，否则使用100
+                if (item !== originArr[index]) {
+                    if (!originArr[index]) {
+                        // 从别的分组挪进来的且处于末尾时使用上一个元素的排序值的后一个100
+                        lastSort =
+                            index === 0 ? 100 : getNextSort(originArr[index - 1][sortField]);
+                    }
+                    else {
+                        lastSort = originArr[index][sortField] || 100; // 如果是0的时候给100否则用原来的
+                    }
+                    item[sortField] = lastSort;
+                    modifiedItems.push(item);
+                }
+            }
+            else {
+                // 如果当前排序值比上一个小，提升它的排序值
+                if (lastSort >= item[sortField]) {
+                    if (cacheArr.length > 0) {
+                        cacheArr.forEach(cache => {
+                            cache[sortField] = getNextSort(cacheLastSort);
+                            modifiedItems.push(cache);
+                            cacheLastSort = cache[sortField];
+                        });
+                        lastSort = cacheLastSort;
+                        cacheLastSort = 0;
+                        cacheArr = [];
+                    }
+                    item[sortField] = getNextSort(lastSort);
+                    modifiedItems.push(item);
+                }
+                else {
+                    if (cacheArr.length === 0) {
+                        cacheLastSort = lastSort;
+                    }
+                    cacheArr.push(item);
+                }
+                lastSort = item[sortField];
+            }
+        });
+        this.updateChangedItems(modifiedItems);
+    }
+    /**
+     * 批量更新修改的项，并更新后台返回的数据，然后重新计算分组和排序
+     * @author lxm
+     * @date 2023-09-11 04:13:15
+     * @param {ControlVO[]} changedItems
+     * @return {*}  {Promise<void>}
+     */
+    async updateChangedItems(changedItems) {
+        try {
+            this.state.updating = true;
+            await Promise.all(changedItems.map(async (item) => {
+                // 往上下文添加主键
+                const deName = calcDeCodeNameById(this.model.appDataEntityId);
+                const tempContext = this.context.clone();
+                tempContext[deName] = item.srfkey;
+                // 调用接口修改数据
+                const res = await this.service.updateGroup(tempContext, item);
+                // 更新完之后更新state里的数据。
+                if (res.data) {
+                    const index = this.state.items.findIndex(x => x.srfkey === item.srfkey);
+                    this.state.items.splice(index, 1, res.data);
+                }
+            }));
+        }
+        finally {
+            this.state.updating = false;
+            await this.afterLoad({}, this.state.items);
+        }
+    }
+    /**
+     * 点击新建
+     * @author lxm
+     * @date 2023-09-11 07:22:33
+     * @param {MouseEvent} event
+     * @param {(string | number)} group 分组标识
+     */
+    onClickNew(event, group) {
+        const params = Object.assign(Object.assign({}, this.params), { srfgroup: group });
+        UIActionUtil.execAndResolved('new', {
+            context: this.context,
+            params,
+            data: [],
+            view: this.view,
+            event,
+        });
+    }
+    /**
+     * 分组工具栏点击处理回调
+     * @author lxm
+     * @date 2023-09-11 04:48:06
+     * @param {IUIActionGroupDetail} detail
+     * @param {MouseEvent} event
+     * @return {*}  {Promise<void>}
+     */
+    async onGroupToolbarClick(detail, event, group) {
+        const actionId = detail.uiactionId;
+        const params = Object.assign(Object.assign({}, this.params), { srfgroup: group });
+        await UIActionUtil.execAndResolved(actionId, {
+            context: this.context,
+            params,
+            data: this.state.selectedData,
+            view: this.view,
+            event,
+        });
+    }
+}

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

@@ -0,0 +1,24 @@
+import { IHttpResponse } from '@ibiz-template/core';
+import { IDEKanban } from '@ibiz/model-core';
+import { ControlVO } from '../../../service';
+import { DataViewControlService } from '../data-view';
+/**
+ * 看板（kanban）部件服务
+ *
+ * @export
+ * @class DataViewControlService
+ * @extends {MDControlService<IDEDataView>}
+ */
+export declare class KanbanService extends DataViewControlService<IDEKanban> {
+    /**
+     * 更新分组数据
+     *
+     * @author lxm
+     * @date 2022-09-07 19:09:11
+     * @param {IParams} context 上下文
+     * @param {ControlVO} data 数据
+     * @returns {*}
+     */
+    updateGroup(context: IParams, data: ControlVO): Promise<IHttpResponse<ControlVO>>;
+}
+//# sourceMappingURL=kanban.service.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"kanban.service.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/kanban/kanban.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACpD,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAC7C,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAC7C,OAAO,EAAE,sBAAsB,EAAE,MAAM,cAAc,CAAC;AAEtD;;;;;;GAMG;AACH,qBAAa,aAAc,SAAQ,sBAAsB,CAAC,SAAS,CAAC;IAClE;;;;;;;;OAQG;IACG,WAAW,CACf,OAAO,EAAE,OAAO,EAChB,IAAI,EAAE,SAAS,GACd,OAAO,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC;CAOrC"}

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

@@ -0,0 +1,26 @@
+import { DataViewControlService } from '../data-view';
+/**
+ * 看板（kanban）部件服务
+ *
+ * @export
+ * @class DataViewControlService
+ * @extends {MDControlService<IDEDataView>}
+ */
+export class KanbanService extends DataViewControlService {
+    /**
+     * 更新分组数据
+     *
+     * @author lxm
+     * @date 2022-09-07 19:09:11
+     * @param {IParams} context 上下文
+     * @param {ControlVO} data 数据
+     * @returns {*}
+     */
+    async updateGroup(context, data) {
+        var _a;
+        const updateAction = ((_a = this.model.updateGroupControlAction) === null || _a === void 0 ? void 0 : _a.appDEMethodId) || 'update';
+        let res = await this.exec(updateAction, context, data.getOrigin());
+        res = this.handleResponse(res);
+        return res;
+    }
+}

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

@@ -1 +1 @@
-{"version":3,"file":"list.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/list/list.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAC3C,OAAO,EACL,UAAU,EACV,UAAU,EACV,eAAe,EACf,kBAAkB,EAClB,gBAAgB,EAGjB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AACnD,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAE7C,qBAAa,cACX,SAAQ,mBAAmB,CAAC,OAAO,EAAE,UAAU,EAAE,UAAU,CAC3D,YAAW,eAAe;IAElB,OAAO,EAAE,WAAW,CAAC;IAE7B,SAAS,CAAC,SAAS,IAAI,IAAI;cAKX,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAO1C;;;;;;;OAOG;IACH,OAAO,CAAC,GAAG,CAAC,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,KAAK,GAAG,MAAM,GAAG,IAAI;IAenD;;;;;;;;OAQG;IACH,SAAS,KAAK,sBAAsB,IAAI,kBAAkB,GAAG,SAAS,CAKrE;IAED;;;;;;;;OAQG;IACH,SAAS,KAAK,sBAAsB,IAAI,kBAAkB,GAAG,SAAS,CAKrE;IAED;;;;;;;OAOG;IACH,YAAY,CAAC,SAAS,EAAE,KAAK,EAAE,GAAG,IAAI;IAatC;;;;;OAKG;IACG,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;IAMzB,SAAS,CAAC,IAAI,EAAE,gBAAgB,EAAE,KAAK,EAAE,KAAK,EAAE,GAAG,OAAO,CAAC,KAAK,EAAE,CAAC;IAKzE;;;;;;;OAOG;IACH,OAAO,CAAC,KAAK,EAAE,KAAK,EAAE,GAAG,IAAI;IAI7B;;;;;;;OAOG;IACH,UAAU,IAAI,KAAK,EAAE;IAIrB;;;;OAIG;cACa,eAAe,IAAI,OAAO,CAAC,IAAI,CAAC;IAWhD;;;;OAIG;IACH,SAAS,CAAC,eAAe,IAAI,IAAI;IAqBjC;;;;OAIG;cACa,mBAAmB,IAAI,OAAO,CAAC,IAAI,CAAC;CAkCrD"}
+{"version":3,"file":"list.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/list/list.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAC3C,OAAO,EACL,UAAU,EACV,UAAU,EACV,eAAe,EACf,kBAAkB,EAClB,gBAAgB,EAGjB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AACnD,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAE7C,qBAAa,cACX,SAAQ,mBAAmB,CAAC,OAAO,EAAE,UAAU,EAAE,UAAU,CAC3D,YAAW,eAAe;IAElB,OAAO,EAAE,WAAW,CAAC;IAE7B,SAAS,CAAC,SAAS,IAAI,IAAI;cAKX,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAO1C;;;;;;;OAOG;IACH,OAAO,CAAC,GAAG,CAAC,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,KAAK,GAAG,MAAM,GAAG,IAAI;IAenD;;;;;;;;OAQG;IACH,SAAS,KAAK,sBAAsB,IAAI,kBAAkB,GAAG,SAAS,CAKrE;IAED;;;;;;;;OAQG;IACH,SAAS,KAAK,sBAAsB,IAAI,kBAAkB,GAAG,SAAS,CAKrE;IAED;;;;;;;OAOG;IACH,YAAY,CAAC,SAAS,EAAE,KAAK,EAAE,GAAG,IAAI;IAatC;;;;;OAKG;IACG,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;IAMzB,SAAS,CAAC,IAAI,EAAE,gBAAgB,EAAE,KAAK,EAAE,KAAK,EAAE,GAAG,OAAO,CAAC,KAAK,EAAE,CAAC;IAKzE;;;;;;;OAOG;IACH,OAAO,CAAC,KAAK,EAAE,KAAK,EAAE,GAAG,IAAI;IAI7B;;;;;;;OAOG;IACH,UAAU,IAAI,KAAK,EAAE;IAIrB;;;;OAIG;cACa,eAAe,IAAI,OAAO,CAAC,IAAI,CAAC;IAWhD;;;;OAIG;IACH,SAAS,CAAC,eAAe,IAAI,IAAI;IAsBjC;;;;OAIG;cACa,mBAAmB,IAAI,OAAO,CAAC,IAAI,CAAC;CAoCrD"}

package/out/controller/control/list/list.controller.js

@@ -148,6 +148,7 @@ export class ListController extends MDControlController {
             childrenMap.forEach((value, key) => {
                 groups.push({
                     caption: key,
+                    key,
                     children: [...value],
                 });
             });
@@ -171,6 +172,7 @@ export class ListController extends MDControlController {
                 const value = items.filter((item) => item[groupAppDEFieldId] === codeListItem.value);
                 groups.push({
                     caption: codeListItem.text,
+                    key: codeListItem.value,
                     children: [...value],
                 });
                 keys.push(codeListItem.value);
@@ -179,6 +181,7 @@ export class ListController extends MDControlController {
             if (otherGroup.length > 0) {
                 groups.push({
                     caption: '其他',
+                    key: '其他',
                     children: [...otherGroup],
                 });
             }

package/out/controller/control/list/list.service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"list.service.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/list/list.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAC3C,OAAO,EAAE,gBAAgB,EAAc,MAAM,kBAAkB,CAAC;AAEhE;;;;;;;GAOG;AACH,qBAAa,WAAY,SAAQ,gBAAgB,CAAC,OAAO,CAAC;IACxD;;;;;OAKG;IACH,aAAa,IAAI,IAAI;CAoBtB"}
+{"version":3,"file":"list.service.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/list/list.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAC3C,OAAO,EAAE,gBAAgB,EAAc,MAAM,kBAAkB,CAAC;AAEhE;;;;;;;GAOG;AACH,qBAAa,WAAY,SAAQ,gBAAgB,CAAC,OAAO,CAAC;IACxD;;;;;OAKG;IACH,aAAa,IAAI,IAAI;CAqBtB"}

package/out/controller/control/list/list.service.js

@@ -27,6 +27,7 @@ export class ListService extends MDControlService {
                 const deFieldKey = deField.toLowerCase();
                 mapField = new UIMapField(uiKey, deFieldKey, {
                     isOriginField: true,
+                    dataType: item.dataType,
                 });
             }
             else {

package/out/controller/control/md-ctrl/md-ctrl.service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"md-ctrl.service.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/md-ctrl/md-ctrl.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAChD,OAAO,EAAE,gBAAgB,EAAc,MAAM,kBAAkB,CAAC;AAEhE;;;;;;;;GAQG;AACH,qBAAa,aAAc,SAAQ,gBAAgB,CAAC,YAAY,CAAC;IAC/D;;;;;OAKG;IACH,aAAa,IAAI,IAAI;CAoBtB"}
+{"version":3,"file":"md-ctrl.service.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/md-ctrl/md-ctrl.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAChD,OAAO,EAAE,gBAAgB,EAAc,MAAM,kBAAkB,CAAC;AAEhE;;;;;;;;GAQG;AACH,qBAAa,aAAc,SAAQ,gBAAgB,CAAC,YAAY,CAAC;IAC/D;;;;;OAKG;IACH,aAAa,IAAI,IAAI;CAqBtB"}

package/out/controller/control/md-ctrl/md-ctrl.service.js

@@ -28,6 +28,7 @@ export class MDCtrlService extends MDControlService {
                 const deFieldKey = deField.toLowerCase();
                 mapField = new UIMapField(uiKey, deFieldKey, {
                     isOriginField: true,
+                    dataType: item.dataType,
                 });
             }
             else {

package/out/controller/control/pickup-view-panel/pickup-view-panel.controller.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"pickup-view-panel.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/pickup-view-panel/pickup-view-panel.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AACtE,OAAO,EACL,qBAAqB,EACrB,qBAAqB,EACrB,0BAA0B,EAC1B,eAAe,EACf,oBAAoB,EACpB,oBAAoB,EACrB,MAAM,oBAAoB,CAAC;AAE5B,OAAO,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AAEjD;;;;;;;GAOG;AACH,qBAAa,yBACX,SAAQ,iBAAiB,CACvB,kBAAkB,EAClB,qBAAqB,EACrB,qBAAqB,CAEvB,YAAW,0BAA0B;IAErC;;;;;OAKG;IACH,SAAS,EAAG,eAAe,CACzB,cAAc,EACd,oBAAoB,EACpB,oBAAoB,CACrB,CAAC;IAEF;;;;;;OAMG;cACa,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAO1C;;;;OAIG;IACH,YAAY,IAAI,IAAI;IAoBpB;;;;;OAKG;IACH,YAAY,CACV,IAAI,EAAE,eAAe,CACnB,cAAc,EACd,oBAAoB,EACpB,oBAAoB,CACrB,GACA,IAAI;IAqBP;;;;;;;OAOG;IACG,eAAe,IAAI,OAAO,CAAC,KAAK,EAAE,CAAC;IAKzC;;;;;;;OAOG;IACG,UAAU,IAAI,OAAO,CAAC,KAAK,EAAE,CAAC;CAIrC"}
+{"version":3,"file":"pickup-view-panel.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/pickup-view-panel/pickup-view-panel.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AAEtE,OAAO,EACL,qBAAqB,EACrB,qBAAqB,EACrB,0BAA0B,EAC1B,eAAe,EACf,oBAAoB,EACpB,oBAAoB,EACrB,MAAM,oBAAoB,CAAC;AAE5B,OAAO,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AAEjD;;;;;;;GAOG;AACH,qBAAa,yBACX,SAAQ,iBAAiB,CACvB,kBAAkB,EAClB,qBAAqB,EACrB,qBAAqB,CAEvB,YAAW,0BAA0B;IAErC;;;;;OAKG;IACH,SAAS,EAAG,eAAe,CACzB,cAAc,EACd,oBAAoB,EACpB,oBAAoB,CACrB,CAAC;IAEF;;;;;;OAMG;cACa,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAO1C;;;;OAIG;IACH,YAAY,IAAI,IAAI;IAoBpB;;;;;OAKG;IACH,YAAY,CACV,IAAI,EAAE,eAAe,CACnB,cAAc,EACd,oBAAoB,EACpB,oBAAoB,CACrB,GACA,IAAI;IAqBP;;;;;;;OAOG;IACG,eAAe,IAAI,OAAO,CAAC,KAAK,EAAE,CAAC;IAKzC;;;;;;;OAOG;IACG,UAAU,IAAI,OAAO,CAAC,KAAK,EAAE,CAAC;CAIrC"}

package/out/controller/control/pickup-view-panel/pickup-view-panel.controller.js

@@ -1,3 +1,4 @@
+import { ViewCallTag } from '../../../constant';
 import { convertNavData } from '../../../utils';
 import { ControlController } from '../../common';
 /**
@@ -75,7 +76,7 @@ export class PickupViewPanelController extends ControlController {
      * @memberof PickupViewPanelController
      */
     async getSelectedData() {
-        const items = await this.embedView.call('GetData');
+        const items = await this.embedView.call(ViewCallTag.GET_DATA);
         return items;
     }
     /**
@@ -87,7 +88,7 @@ export class PickupViewPanelController extends ControlController {
      * @memberof PickupViewPanelController
      */
     async getAllData() {
-        const items = await this.embedView.call('GetAllData');
+        const items = await this.embedView.call(ViewCallTag.GET_ALL_DATA);
         return items;
     }
 }

package/out/controller/control/toolbar/toolbar.controllerr.js

@@ -1,5 +1,5 @@
 import { recursiveIterate } from '@ibiz-template/core';
-import { ViewMode } from '../../../constant';
+import { ViewCallTag, ViewMode } from '../../../constant';
 import { ControlVO } from '../../../service';
 import { UIActionUtil } from '../../../ui-action';
 import { ControlController } from '../../common';
@@ -38,7 +38,7 @@ export class ToolbarController extends ControlController {
         // 执行界面行为
         if (item.itemType === 'DEUIACTION') {
             const actionId = item.uiactionId;
-            const res = await this.ctx.view.call('GetData');
+            const res = await this.ctx.view.call(ViewCallTag.GET_DATA);
             const data = res || [];
             const args = this.getEventArgs();
             args.params = Object.assign(param, args.params);

package/out/controller/ctx/ctx.d.ts

@@ -38,6 +38,14 @@ export declare class CTX<V extends IViewController = IViewController> {
      * @type {V}
      */
     view: V;
+    /**
+     * 是否已经销毁
+     *
+     * @author chitanda
+     * @date 2023-09-11 11:09:57
+     * @protected
+     */
+    protected isDestroyed: boolean;
     /**
      * CTX事件
      * @author lxm

package/out/controller/ctx/ctx.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ctx.d.ts","sourceRoot":"","sources":["../../../src/controller/ctx/ctx.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AAClC,OAAO,EAAE,WAAW,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAC;AAC1E,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAEvC,KAAK,QAAQ,GAAG;IACd;;;;OAIG;IACH,UAAU,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;IACnC;;;;OAIG;IACH,UAAU,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,CAAC,EAAE,WAAW,KAAK,IAAI,CAAC;CACpD,CAAC;AAEF;;;;;;GAMG;AACH,qBAAa,GAAG,CAAC,CAAC,SAAS,eAAe,GAAG,eAAe;IAuCvC,MAAM,CAAC;IAtC1B;;;;;OAKG;IACH,KAAK,EAAE,QAAQ,CAAC;IAEhB;;;;;OAKG;IACH,IAAI,EAAG,CAAC,CAAC;IAET;;;;;OAKG;IACH,QAAQ,CAAC,GAAG,oBAA+B;IAE3C;;;;;OAKG;IACH,SAAS,CAAC,cAAc,kIAAkC;IAE1D;;;;;OAKG;gBACgB,MAAM,CAAC,yKAAK;IAI/B;;;;;;OAMG;IACG,IAAI,CAAC,UAAU,EAAE,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;IAMxC;;;;OAIG;IACH,OAAO,IAAI,IAAI;IAMf;;;;;;OAMG;IACG,QAAQ,CAAC,SAAS,EAAE,QAAQ,CAAC,QAAQ,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;IAI5D;;;;OAIG;IACH,YAAY,IAAI,IAAI;IAIpB;;;;OAIG;IACH,UAAU,IAAI,IAAI;IAIlB;;;;;;OAMG;IACH,kBAAkB,CAAC,IAAI,EAAE,MAAM,EAAE,CAAC,EAAE,WAAW,GAAG,IAAI;IAKtD;;;;;;;OAOG;IACH,aAAa,CAAC,IAAI,EAAE,MAAM,EAAE,SAAS,UAAQ,GAAG,WAAW,GAAG,SAAS;IASvE;;;;;;;OAOG;IACH,UAAU,IAAI,eAAe;CAS9B"}
+{"version":3,"file":"ctx.d.ts","sourceRoot":"","sources":["../../../src/controller/ctx/ctx.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AAClC,OAAO,EAAE,WAAW,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAC;AAC1E,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAEvC,KAAK,QAAQ,GAAG;IACd;;;;OAIG;IACH,UAAU,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;IACnC;;;;OAIG;IACH,UAAU,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,CAAC,EAAE,WAAW,KAAK,IAAI,CAAC;CACpD,CAAC;AAEF;;;;;;GAMG;AACH,qBAAa,GAAG,CAAC,CAAC,SAAS,eAAe,GAAG,eAAe;IAgDvC,MAAM,CAAC;IA/C1B;;;;;OAKG;IACH,KAAK,EAAE,QAAQ,CAAC;IAEhB;;;;;OAKG;IACH,IAAI,EAAG,CAAC,CAAC;IAET;;;;;;OAMG;IACH,SAAS,CAAC,WAAW,UAAS;IAE9B;;;;;OAKG;IACH,QAAQ,CAAC,GAAG,oBAA+B;IAE3C;;;;;OAKG;IACH,SAAS,CAAC,cAAc,kIAAkC;IAE1D;;;;;OAKG;gBACgB,MAAM,CAAC,yKAAK;IAI/B;;;;;;OAMG;IACG,IAAI,CAAC,UAAU,EAAE,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;IAMxC;;;;OAIG;IACH,OAAO,IAAI,IAAI;IAOf;;;;;;OAMG;IACG,QAAQ,CAAC,SAAS,EAAE,QAAQ,CAAC,QAAQ,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;IAI5D;;;;OAIG;IACH,YAAY,IAAI,IAAI;IAIpB;;;;OAIG;IACH,UAAU,IAAI,IAAI;IAOlB;;;;;;OAMG;IACH,kBAAkB,CAAC,IAAI,EAAE,MAAM,EAAE,CAAC,EAAE,WAAW,GAAG,IAAI;IAKtD;;;;;;;OAOG;IACH,aAAa,CAAC,IAAI,EAAE,MAAM,EAAE,SAAS,UAAQ,GAAG,WAAW,GAAG,SAAS;IASvE;;;;;;;OAOG;IACH,UAAU,IAAI,eAAe;CAS9B"}

package/out/controller/ctx/ctx.js

@@ -17,6 +17,14 @@ export class CTX {
      */
     constructor(parent) {
         this.parent = parent;
+        /**
+         * 是否已经销毁
+         *
+         * @author chitanda
+         * @date 2023-09-11 11:09:57
+         * @protected
+         */
+        this.isDestroyed = false;
         /**
          * CTX事件
          * @author lxm
@@ -54,6 +62,7 @@ export class CTX {
         this.controllersMap.clear();
         this.view = null;
         this.state = null;
+        this.isDestroyed = true;
     }
     /**
      * 修改上下文环境状态
@@ -79,6 +88,9 @@ export class CTX {
      * @date 2023-03-27 01:59:35
      */
     endLoading() {
+        if (this.isDestroyed) {
+            return;
+        }
         this.view.endLoading();
     }
     /**

package/out/de-logic/utils/handle-src-val.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"handle-src-val.d.ts","sourceRoot":"","sources":["../../../src/de-logic/utils/handle-src-val.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAErD,KAAK,YAAY,GAAG;IAClB;;OAEG;IACH,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB;;OAEG;IACH,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB;;OAEG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB;;OAEG;IACH,iBAAiB,CAAC,EAAE,MAAM,CAAC;CAC5B,CAAC;AAEF;;;;;;;;GAQG;AACH,wBAAgB,YAAY,CAC1B,GAAG,EAAE,cAAc,EACnB,YAAY,EAAE,YAAY,GACzB,OAAO,CA+CT"}
+{"version":3,"file":"handle-src-val.d.ts","sourceRoot":"","sources":["../../../src/de-logic/utils/handle-src-val.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAErD,KAAK,YAAY,GAAG;IAClB;;OAEG;IACH,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB;;OAEG;IACH,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB;;OAEG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB;;OAEG;IACH,iBAAiB,CAAC,EAAE,MAAM,CAAC;CAC5B,CAAC;AAEF;;;;;;;;GAQG;AACH,wBAAgB,YAAY,CAC1B,GAAG,EAAE,cAAc,EACnB,YAAY,EAAE,YAAY,GACzB,OAAO,CAiDT"}

package/out/de-logic/utils/handle-src-val.js

@@ -30,12 +30,14 @@ export function handleSrcVal(ctx, srcValParams) {
         // 直接值
         case 'SRCVALUE':
             return srcValue;
-        // 视图参数
-        case 'VIEWPARAM':
+        case 'WEBCONTEXT': // 网页请求上下文
+        case 'VIEWPARAM': // 视图参数
             value = ctx.viewParams;
             break;
-        // 应用上下文
-        case 'APPDATA':
+        case 'APPLICATION': // 系统全局对象
+        case 'SESSION': // 用户全局对象
+        case 'APPDATA': // 应用上下文
+        case 'DATACONTEXT': // 数据上下文
             value = ctx.context;
             break;
         // 当前环境参数

package/out/engine/view-base.engine.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"view-base.engine.d.ts","sourceRoot":"","sources":["../../src/engine/view-base.engine.ts"],"names":[],"mappings":"AACA,OAAO,EACL,eAAe,EACf,kBAAkB,EAClB,0BAA0B,EAC3B,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAElD;;;;;;GAMG;AACH,qBAAa,cAAe,YAAW,WAAW;IAmEpC,SAAS,CAAC,IAAI,EAAE,eAAe;IAlE3C;;;;;;;OAOG;IACH,SAAS,KAAK,OAAO,IAAI,kBAAkB,GAAG,SAAS,CAEtD;IAED;;;;;;;OAOG;IACH,SAAS,KAAK,WAAW,IAAI,kBAAkB,GAAG,SAAS,CAE1D;IAED;;;;;;;OAOG;IACH,SAAS,KAAK,YAAY,IAAI,kBAAkB,GAAG,SAAS,CAE3D;IAED;;;;;;;OAOG;IACH,SAAS,KAAK,aAAa,IAAI,kBAAkB,GAAG,SAAS,CAE5D;IAED;;;;;;;OAOG;IACH,SAAS,KAAK,eAAe,IAAI,0BAA0B,GAAG,SAAS,CAEtE;IAED;;;;;OAKG;gBACmB,IAAI,EAAE,eAAe;IAIrC,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAK1B,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAyB1B,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC;IAI5B,IAAI,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,KAAK,GAAG,OAAO,CAAC,KAAK,GAAG,IAAI,GAAG,SAAS,CAAC;IAOzE;;;;;OAKG;IACH,SAAS,CAAC,aAAa,IAAI,IAAI;IAI/B;;;;;OAKG;IACH,SAAS,CAAC,OAAO,IAAI,KAAK,EAAE;IAI5B;;;;;;;OAOG;IACH,SAAS,CAAC,qBAAqB,IAAI,OAAO;IAgD1C;;;;;;OAMG;IACH,SAAS,CAAC,qBAAqB,IAAI,OAAO;IAW1C;;;;;OAKG;IACG,cAAc,IAAI,OAAO,CAAC,IAAI,CAAC;CAuBtC"}
+{"version":3,"file":"view-base.engine.d.ts","sourceRoot":"","sources":["../../src/engine/view-base.engine.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,eAAe,EACf,kBAAkB,EAClB,0BAA0B,EAC3B,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAElD;;;;;;GAMG;AACH,qBAAa,cAAe,YAAW,WAAW;IAmEpC,SAAS,CAAC,IAAI,EAAE,eAAe;IAlE3C;;;;;;;OAOG;IACH,SAAS,KAAK,OAAO,IAAI,kBAAkB,GAAG,SAAS,CAEtD;IAED;;;;;;;OAOG;IACH,SAAS,KAAK,WAAW,IAAI,kBAAkB,GAAG,SAAS,CAE1D;IAED;;;;;;;OAOG;IACH,SAAS,KAAK,YAAY,IAAI,kBAAkB,GAAG,SAAS,CAE3D;IAED;;;;;;;OAOG;IACH,SAAS,KAAK,aAAa,IAAI,kBAAkB,GAAG,SAAS,CAE5D;IAED;;;;;;;OAOG;IACH,SAAS,KAAK,eAAe,IAAI,0BAA0B,GAAG,SAAS,CAEtE;IAED;;;;;OAKG;gBACmB,IAAI,EAAE,eAAe;IAIrC,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAK1B,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAyB1B,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC;IAI5B,IAAI,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,KAAK,GAAG,OAAO,CAAC,KAAK,GAAG,IAAI,GAAG,SAAS,CAAC;IAOzE;;;;;OAKG;IACH,SAAS,CAAC,aAAa,IAAI,IAAI;IAI/B;;;;;OAKG;IACH,SAAS,CAAC,OAAO,IAAI,KAAK,EAAE;IAI5B;;;;;;;OAOG;IACH,SAAS,CAAC,qBAAqB,IAAI,OAAO;IAgD1C;;;;;;OAMG;IACH,SAAS,CAAC,qBAAqB,IAAI,OAAO;IAW1C;;;;;OAKG;IACG,cAAc,IAAI,OAAO,CAAC,IAAI,CAAC;CAuBtC"}

package/out/engine/view-base.engine.js

@@ -1,4 +1,5 @@
 import { RuntimeError } from '@ibiz-template/core';
+import { ViewCallTag } from '../constant';
 /**
  * 视图引擎基类
  * @author lxm
@@ -103,7 +104,7 @@ export class ViewEngineBase {
         // 子类重写
     }
     async call(key, _args) {
-        if (key === 'GetData') {
+        if (key === ViewCallTag.GET_DATA) {
             return this.getData();
         }
         return undefined;

package/out/interface/controller/controller/common/i-drag-change-info.d.ts

@@ -0,0 +1,38 @@
+/**
+ * 拖拽变更信息
+ * @author lxm
+ * @date 2023-08-30 04:23:41
+ * @export
+ * @interface IDragChangeInfo
+ */
+export interface IDragChangeInfo {
+    /**
+     * 变更前的分组标识
+     * @author lxm
+     * @date 2023-08-30 04:24:25
+     * @type {string}
+     */
+    from: string | number;
+    /**
+     * 变更后的分组标识
+     * @author lxm
+     * @date 2023-08-30 04:24:45
+     * @type {string}
+     */
+    to: string | number;
+    /**
+     * 变更前的索引位置
+     * @author lxm
+     * @date 2023-08-30 04:25:02
+     * @type {number}
+     */
+    fromIndex: number;
+    /**
+     * 变更后的索引位置
+     * @author lxm
+     * @date 2023-08-30 04:24:53
+     * @type {number}
+     */
+    toIndex: number;
+}
+//# sourceMappingURL=i-drag-change-info.d.ts.map

package/out/interface/controller/controller/common/i-drag-change-info.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"i-drag-change-info.d.ts","sourceRoot":"","sources":["../../../../../src/interface/controller/controller/common/i-drag-change-info.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AACH,MAAM,WAAW,eAAe;IAC9B;;;;;OAKG;IACH,IAAI,EAAE,MAAM,GAAG,MAAM,CAAC;IAEtB;;;;;OAKG;IACH,EAAE,EAAE,MAAM,GAAG,MAAM,CAAC;IAEpB;;;;;OAKG;IACH,SAAS,EAAE,MAAM,CAAC;IAElB;;;;;OAKG;IACH,OAAO,EAAE,MAAM,CAAC;CACjB"}

package/out/interface/controller/controller/common/i-drag-change-info.js

@@ -0,0 +1 @@
+export {};

package/out/interface/controller/controller/common/index.d.ts

@@ -1,2 +1,3 @@
 export * from './i-enforceable.controller';
+export * from './i-drag-change-info';
 //# sourceMappingURL=index.d.ts.map

package/out/interface/controller/controller/common/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/interface/controller/controller/common/index.ts"],"names":[],"mappings":"AAAA,cAAc,4BAA4B,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/interface/controller/controller/common/index.ts"],"names":[],"mappings":"AAAA,cAAc,4BAA4B,CAAC;AAC3C,cAAc,sBAAsB,CAAC"}

package/out/interface/controller/controller/common/index.js

@@ -1 +1,2 @@
 export * from './i-enforceable.controller';
+export * from './i-drag-change-info';

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

@@ -9,7 +9,7 @@ import { IMDControlController } from './i-md-control.controller';
  * @interface IDataViewControlController
  * @extends {IMDControlController<IDEDataView, IDataViewControlState, IDataViewControlEvent>}
  */
-export interface IDataViewControlController extends IMDControlController<IDEDataView, IDataViewControlState, IDataViewControlEvent> {
+export interface IDataViewControlController<T extends IDEDataView = IDEDataView, S extends IDataViewControlState = IDataViewControlState, E extends IDataViewControlEvent = IDataViewControlEvent> extends IMDControlController<T, S, E> {
     /**
      * 加载更多
      *