@ibiz-template/runtime 0.7.41-alpha.9 → 0.7.41-alpha.91

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

@@ -2,32 +2,35 @@
 /* eslint-disable no-restricted-globals */
 /* eslint-disable no-nested-ternary */
 /* eslint-disable prefer-destructuring */
-import { DataTypes, RuntimeError, RuntimeModelError, } from '@ibiz-template/core';
-import { clone, isNil } from 'ramda';
-import { calcDeCodeNameById } from '../../../model';
+import { clone, RuntimeError, isElementSame, RuntimeModelError, } from '@ibiz-template/core';
+import { getParentTextAppDEFieldId } from '../../../model';
 import { DataViewControlController } from '../data-view';
 import { KanbanService } from './kanban.service';
 import { UIActionUtil } from '../../../ui-action';
 export class KanbanController extends DataViewControlController {
     /**
-     * 允许调整顺序
-     * @author lxm
-     * @date 2023-09-11 04:02:39
+     * @description 是否支持全屏
      * @readonly
      * @type {boolean}
+     * @memberof KanbanController
      */
-    get enableEditOrder() {
-        return this.model.enableCardEditOrder === true;
+    get enableFullScreen() {
+        if (this.controlParams.enablefullscreen)
+            return (this.controlParams.enablefullscreen === 'true' ||
+                this.controlParams.enablefullscreen === true);
+        return ibiz.config.kanban.enableFullScreen;
     }
     /**
-     * 是否支持调整分组。
-     * @author lxm
-     * @date 2023-09-11 04:04:00
+     * @description 是否支持分组隐藏
      * @readonly
      * @type {boolean}
+     * @memberof KanbanController
      */
-    get enableEditGroup() {
-        return this.model.enableCardEditGroup === true;
+    get enableGroupHidden() {
+        if (this.controlParams.enablegrouphidden)
+            return (this.controlParams.enablegrouphidden === 'true' ||
+                this.controlParams.enablegrouphidden === true);
+        return ibiz.config.kanban.enableGroupHidden;
     }
     /**
      * @description 拖拽模式
@@ -62,13 +65,9 @@ export class KanbanController extends DataViewControlController {
     initState() {
         super.initState();
         this.state.size = this.model.pagingSize || 1000;
-        this.state.updating = false;
         this.state.batching = false;
         this.state.selectGroupKey = '';
-        this.state.readonly = !!(this.context.srfreadonly === true || this.context.srfreadonly === 'true');
-        // 支持调整顺序和分组时
-        this.state.draggable = this.enableEditOrder || this.enableEditGroup;
-        this.state.lanes = [];
+        this.state.swimlanes = [];
     }
     /**
      * 初始化
@@ -89,54 +88,7 @@ export class KanbanController extends DataViewControlController {
      * @memberof KanbanController
      */
     async execGroup(_arg, _params) { }
-    /**
-     * 本地排序items
-     * @author lxm
-     * @date 2023-09-04 09:30:55
-     * @param {IData[]} items
-     */
-    sortItems(items) {
-        var _a;
-        const sortField = this.model.minorSortAppDEFieldId;
-        const { minorSortDir } = this.model;
-        if (!sortField) {
-            this.state.draggable = false;
-            ibiz.log.warn(ibiz.i18n.t('runtime.controller.control.kanban.sortingProperties'));
-            return;
-        }
-        if (!minorSortDir) {
-            this.state.draggable = false;
-            ibiz.log.warn(ibiz.i18n.t('runtime.controller.control.kanban.sortDirection'));
-            return;
-        }
-        const sortFieldItem = (_a = this.dataEntity.appDEFields) === null || _a === void 0 ? void 0 : _a.find(_item => _item.codeName === sortField);
-        if (!sortFieldItem || !DataTypes.isNumber(sortFieldItem.stdDataType)) {
-            this.state.draggable = false;
-            ibiz.log.warn(ibiz.i18n.t('runtime.controller.control.kanban.invalidSortType'));
-            return;
-        }
-        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(ibiz.i18n.t('runtime.controller.control.grid.convertedValue', {
-                        srfmajortext: item.srfmajortext,
-                    }));
-                }
-            }
-        });
-        // 排序
-        items.sort((a, b) => isAsc ? a[sortField] - b[sortField] : b[sortField] - a[sortField]);
-    }
     async afterLoad(args, items) {
-        // 每次加载回来先本地排序，把数据的排序属性规范一下
-        this.sortItems(this.state.items);
         super.afterLoad(args, items);
         this.handleLaneData();
         return items;
@@ -170,7 +122,7 @@ export class KanbanController extends DataViewControlController {
      * @description 点击新建并设置设置选中分组
      * @param {MouseEvent} event
      * @param {(string | number)} group 分组
-     * @param {IKanbanLane} [lane] 泳道
+     * @param {IKanbanSwimlane} [lane] 泳道
      * @memberof KanbanController
      */
     onClickNew(event, group, lane) {
@@ -214,7 +166,7 @@ export class KanbanController extends DataViewControlController {
      * @param {IData} item
      * @param {MouseEvent} event
      * @param {IKanbanGroupState} group
-     * @param {IKanbanLane} [lane]
+     * @param {IKanbanSwimlane} [lane]
      * @returns {*}  {Promise<void>}
      * @memberof KanbanController
      */
@@ -245,11 +197,10 @@ export class KanbanController extends DataViewControlController {
      * @memberof KanbanController
      */
     async handleLaneData() {
-        var _a;
         const { swimlaneCodeListId, swimlaneAppDEFieldId } = this.model;
         if (!swimlaneAppDEFieldId)
             return;
-        let lanes = [];
+        let swimlanes = [];
         const unclassified = {
             count: 0,
             key: undefined,
@@ -260,7 +211,7 @@ export class KanbanController extends DataViewControlController {
         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 => {
+            swimlanes = codeListItems.map(item => {
                 var _a;
                 return {
                     count: 0,
@@ -270,7 +221,7 @@ export class KanbanController extends DataViewControlController {
                 };
             });
             items.forEach(item => {
-                const lane = lanes.find(l => { var _a; return l.key === ((_a = item[swimlaneAppDEFieldId]) === null || _a === void 0 ? void 0 : _a.toLowerCase()); });
+                const lane = swimlanes.find(l => { var _a; return l.key === ((_a = item[swimlaneAppDEFieldId]) === null || _a === void 0 ? void 0 : _a.toLowerCase()); });
                 if (lane) {
                     lane.count += 1;
                 }
@@ -281,18 +232,16 @@ export class KanbanController extends DataViewControlController {
             });
         }
         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;
+            const textDEFieldId = getParentTextAppDEFieldId(swimlaneAppDEFieldId, this.dataEntity) ||
+                swimlaneAppDEFieldId;
             items.forEach(item => {
                 if (item[swimlaneAppDEFieldId]) {
-                    const lane = lanes.find(l => l.key === item[swimlaneAppDEFieldId]);
+                    const lane = swimlanes.find(l => l.key === item[swimlaneAppDEFieldId]);
                     if (lane) {
                         lane.count += 1;
                     }
                     else {
-                        lanes.push({
+                        swimlanes.push({
                             count: 1,
                             isExpand: true,
                             key: item[swimlaneAppDEFieldId],
@@ -308,8 +257,8 @@ export class KanbanController extends DataViewControlController {
         }
         // 将未分类移动到最后
         if (unclassified.count)
-            lanes.push(unclassified);
-        this.state.lanes = lanes;
+            swimlanes.push(unclassified);
+        this.state.swimlanes = swimlanes;
     }
     /**
      * 处理代码表分组
@@ -349,194 +298,44 @@ export class KanbanController extends DataViewControlController {
         this.state.groups = groups;
     }
     /**
-     * 拖拽变更事件处理回调
-     * @author lxm
-     * @date 2023-09-11 04:12:58
+     * @description 拖拽变更
      * @param {IDragChangeInfo} info
-     * @return {*}  {Promise<void>}
+     * @returns {*}  {Promise<void>}
+     * @memberof KanbanController
      */
     async onDragChange(info) {
-        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, fromLane, toLane } = info;
-        const { groupAppDEFieldId, minorSortAppDEFieldId, moveControlAction, laneAppDEFieldId = 'testname', } = this.model;
-        const groupField = groupAppDEFieldId;
-        const sortField = minorSortAppDEFieldId;
+        if (!this.enableEditGroup && from !== to)
+            return ibiz.message.warning(ibiz.i18n.t('runtime.controller.common.md.adjustmentsGroup'));
+        if (!this.enableEditOrder && from === to && fromLane === toLane)
+            return ibiz.message.warning(ibiz.i18n.t('runtime.controller.common.md.noAllowReorder'));
+        const { groupAppDEFieldId = '', moveControlAction, swimlaneAppDEFieldId, minorSortAppDEFieldId, } = this.model;
         const fromGroup = this.state.groups.find(x => x.key === from);
         const toGroup = this.state.groups.find(x => x.key === to);
-        if (!this.enableEditOrder) {
-            if (from === to && fromLane === toLane) {
-                ibiz.message.warning(ibiz.i18n.t('runtime.controller.control.kanban.noAllowReorder'));
-                return;
-            }
-            // 只修改分组不管排序
-            const draggedItem = fromGroup.children[fromIndex];
-            // 变更分组
-            draggedItem[groupField] = to;
-            // 变更泳道
-            if (laneAppDEFieldId)
-                draggedItem[laneAppDEFieldId] = toLane;
-            return this.updateChangedItems([draggedItem]);
-        }
-        const originArr = [...toGroup.children];
-        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'));
-        }
-        this.state.updating = true;
-        // 计算移动数据,目标分组指定位置存在数据，则添加到目标分组指定位置之前，若没有，则添加到当前分组数据排序值最大的后面
-        const computeMoveData = (_fromIndex, _toIndex, _draggedItem, targetArray, isCrossGroup) => {
-            let moveData = {};
-            const targetItem = targetArray[_toIndex];
-            if (!targetItem) {
-                let tempArray = [];
-                if (targetArray.length > 0) {
-                    tempArray = targetArray;
-                }
-                if (tempArray.length > 0) {
-                    const maxItem = tempArray.reduce((prev, curr) => {
-                        const sortCondition = prev[sortField] > curr[sortField];
-                        if (sortCondition &&
-                            prev[this.dataEntity.keyAppDEFieldId] !== _draggedItem.srfkey) {
-                            return prev;
-                        }
-                        if (!sortCondition &&
-                            curr[this.dataEntity.keyAppDEFieldId] !== _draggedItem.srfkey) {
-                            return curr;
-                        }
-                        return prev;
-                    });
-                    if (maxItem &&
-                        maxItem[this.dataEntity.keyAppDEFieldId] !== _draggedItem.srfkey) {
-                        moveData = {
-                            srftargetkey: maxItem.srfkey,
-                            srfmovetype: 'MOVEAFTER',
-                        };
-                    }
-                }
-            }
-            else {
-                moveData = {
-                    srftargetkey: targetItem.srfkey,
-                    srfmovetype: _toIndex < targetArray.length - 1
-                        ? 'MOVEBEFORE'
-                        : isCrossGroup
-                            ? 'MOVEBEFORE'
-                            : 'MOVEAFTER',
-                };
-            }
-            return moveData;
-        };
-        // 拖拽数据
         const draggedItem = clone(fromGroup.children[fromIndex]);
-        // 前台先改值
-        const removeItems = fromGroup.children.splice(fromIndex, 1);
-        toGroup.children.splice(toIndex, 0, ...removeItems);
-        if (info.from !== info.to) {
-            // 变更分组
-            draggedItem[groupField] = info.to;
-            // 存在移动数据行为，先变更分组再变更排序
-            const app = ibiz.hub.getApp(this.model.appId);
-            const deName = calcDeCodeNameById(this.model.appDataEntityId);
-            const tempContext = this.context.clone();
-            tempContext[deName] = draggedItem.srfkey;
-            try {
-                await app.deService.exec(this.model.appDataEntityId, 'update', tempContext, draggedItem);
-                const index = this.state.items.findIndex(x => x.srfkey === draggedItem[this.dataEntity.keyAppDEFieldId]);
-                if (index !== -1) {
-                    this.state.items.splice(index, 1, draggedItem);
-                }
-            }
-            catch (error) {
-                this.state.updating = false;
-                throw new RuntimeModelError(this.model, ibiz.i18n.t('runtime.controller.common.md.changeGroupError'));
-            }
+        // 分组变更
+        if (from !== to && groupAppDEFieldId)
+            draggedItem[groupAppDEFieldId] = to;
+        // 泳道变更
+        if (fromLane !== toLane && swimlaneAppDEFieldId)
+            draggedItem[swimlaneAppDEFieldId] = to;
+        // 仅变更分组
+        if (!this.enableEditOrder) {
+            await this.updateChangedItems([draggedItem]);
         }
-        // 移动排序
-        const params = computeMoveData(fromIndex, toIndex, draggedItem, originArr, info.from !== info.to);
-        try {
-            const { ok, result } = await this.moveOrderItem(draggedItem, params);
-            if (ok) {
-                // 通知实体数据变更
-                this.emitDEDataChange('update', draggedItem);
-                // 返回空数组不做处理，非空数组同步界面数据,无数据界面重刷新
-                if (Array.isArray(result) && result.length > 0) {
-                    result.forEach(item => {
-                        const index = this.state.items.findIndex(x => x.srfkey === item[this.dataEntity.keyAppDEFieldId]);
-                        if (index !== -1) {
-                            this.state.items[index][sortField] = item[sortField];
-                        }
-                    });
-                }
-                else {
-                    await this.refresh();
-                }
+        else {
+            // 排序变更
+            if (!minorSortAppDEFieldId)
+                throw new RuntimeModelError(this.model, ibiz.i18n.t('runtime.controller.common.md.sortingProperties'));
+            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'));
+            // 存在移动数据行为，先变更分组或泳道再变更排序
+            if (from !== to || fromLane !== toLane) {
+                await this.updateChangedItems([draggedItem]);
             }
-        }
-        catch (error) {
-            this.state.updating = false;
-            this.actionNotification(`MOVEERROR`, {
-                error: error,
-            });
-        }
-        finally {
-            await this.afterLoad({}, this.state.items);
-            this.state.updating = false;
-        }
-    }
-    /**
-     * 移动并排序数据
-     *
-     * @author tony001
-     * @date 2024-06-17 15:06:22
-     * @param {IData} draggedItem
-     * @param {IData} moveMeta
-     * @return {*}  {Promise<ControlVO[]>}
-     */
-    async moveOrderItem(draggedItem, moveMeta) {
-        const deName = calcDeCodeNameById(this.model.appDataEntityId);
-        const tempContext = this.context.clone();
-        tempContext[deName] = draggedItem.srfkey;
-        if (!moveMeta.srftargetkey || !moveMeta.srfmovetype) {
-            ibiz.log.error(ibiz.i18n.t('runtime.controller.common.md.computeMoveMetaError'));
-            return { ok: false };
-        }
-        const res = await this.service.moveOrderItem(tempContext, draggedItem, moveMeta);
-        return { ok: true, result: res.data };
-    }
-    /**
-     * 批量更新修改的项，并更新后台返回的数据，然后重新计算分组和排序
-     * @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.ok) {
-                    // 通知实体数据变更
-                    this.emitDEDataChange('update', 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);
+            const params = this.computeMoveDataParam(fromIndex, toIndex, draggedItem, toGroup.children, info.from !== info.to);
+            await this.moveOrderItem(draggedItem, params);
         }
     }
     /**
@@ -593,9 +392,8 @@ export class KanbanController extends DataViewControlController {
      * @memberof KanbanController
      */
     setSelectGroup(key) {
-        if (!this.state.batching) {
+        if (!this.state.batching)
             this.state.selectGroupKey = key;
-        }
     }
     /**
      * 设置分组控制器
@@ -688,4 +486,34 @@ export class KanbanController extends DataViewControlController {
             group.selectedData = [];
         });
     }
+    /**
+     * @description 设置选中
+     * @param {IData[]} selection
+     * @param {boolean} [isEmit=true]
+     * @memberof KanbanController
+     */
+    setSelection(selection, isEmit = true) {
+        const { selectedData } = this.state;
+        // 检查新的选中数据和旧的是否一致，不一致才变更。
+        if (!isElementSame(selectedData, selection)) {
+            this.state.selectedData = selection;
+            if (isEmit) {
+                this._evt.emit('onSelectionChange', {
+                    data: selection,
+                });
+            }
+        }
+        // 根据数据计算工具栏权限和状态
+        const data = selection === null || selection === void 0 ? void 0 : selection[0];
+        const batchtoolbar = this.view.getController(`${this.model.name}_batchtoolbar_${this.state.selectGroupKey}`);
+        const quicktoolbar = this.view.getController(`${this.model.name}_quicktoolbar_${this.state.selectGroupKey}`);
+        batchtoolbar === null || batchtoolbar === void 0 ? void 0 : batchtoolbar.calcButtonState(data, this.model.appDataEntityId, {
+            view: this.view,
+            ctrl: this,
+        });
+        quicktoolbar === null || quicktoolbar === void 0 ? void 0 : quicktoolbar.calcButtonState(data, this.model.appDataEntityId, {
+            view: this.view,
+            ctrl: this,
+        });
+    }
 }

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

@@ -1,6 +1,4 @@
-import { IHttpResponse } from '@ibiz-template/core';
 import { IDEKanban } from '@ibiz/model-core';
-import { ControlVO } from '../../../service';
 import { DataViewControlService } from '../data-view';
 /**
  * 看板（kanban）部件服务
@@ -10,25 +8,5 @@ import { DataViewControlService } from '../data-view';
  * @extends {MDControlService<IDEDataView>}
  */
 export declare class KanbanService extends DataViewControlService<IDEKanban> {
-    /**
-     * 更新分组数据
-     *
-     * @author lxm
-     * @date 2022-09-07 19:09:11
-     * @param {IContext} context 上下文
-     * @param {ControlVO} data 数据
-     * @returns {*}
-     */
-    updateGroup(context: IContext, data: ControlVO): Promise<IHttpResponse<ControlVO>>;
-    /**
-     * 移动并排序数据
-     *
-     * @author tony001
-     * @date 2024-06-16 12:06:02
-     * @param {IContext} context
-     * @param {ControlVO} data
-     * @return {*}  {Promise<IHttpResponse<ControlVO[]>>}
-     */
-    moveOrderItem(context: IContext, data: ControlVO, args: IData): Promise<IHttpResponse<ControlVO[]>>;
 }
 //# sourceMappingURL=kanban.service.d.ts.map

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

@@ -1 +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;AAE7C,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,QAAQ,EACjB,IAAI,EAAE,SAAS,GACd,OAAO,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC;IAQpC;;;;;;;;OAQG;IACG,aAAa,CACjB,OAAO,EAAE,QAAQ,EACjB,IAAI,EAAE,SAAS,EACf,IAAI,EAAE,KAAK,GACV,OAAO,CAAC,aAAa,CAAC,SAAS,EAAE,CAAC,CAAC;CAUvC"}
+{"version":3,"file":"kanban.service.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/kanban/kanban.service.ts"],"names":[],"mappings":"AAAA,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;CAAG"}

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

@@ -1,4 +1,3 @@
-import { clone } from 'ramda';
 import { DataViewControlService } from '../data-view';
 /**
  * 看板（kanban）部件服务
@@ -8,39 +7,4 @@ import { DataViewControlService } from '../data-view';
  * @extends {MDControlService<IDEDataView>}
  */
 export class KanbanService extends DataViewControlService {
-    /**
-     * 更新分组数据
-     *
-     * @author lxm
-     * @date 2022-09-07 19:09:11
-     * @param {IContext} 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;
-    }
-    /**
-     * 移动并排序数据
-     *
-     * @author tony001
-     * @date 2024-06-16 12:06:02
-     * @param {IContext} context
-     * @param {ControlVO} data
-     * @return {*}  {Promise<IHttpResponse<ControlVO[]>>}
-     */
-    async moveOrderItem(context, data, args) {
-        const moveAction = this.model.moveControlAction.appDEMethodId;
-        const params = clone(data.getOrigin());
-        Object.assign(params, args);
-        let res = await this.exec(moveAction, context, params, {
-            srfupdateitem: true,
-        });
-        res = this.handleResponse(res);
-        return res;
-    }
 }