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

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

@@ -1,22 +1,60 @@
-import { RuntimeModelError, isElementSame } from '@ibiz-template/core';
-import { clone, isNil } from 'ramda';
+/* eslint-disable no-nested-ternary */
+import { clone, DataTypes, isElementSame, RuntimeModelError, } from '@ibiz-template/core';
+import { isNil, isNotNil } from 'ramda';
 import { createUUID, isBoolean } from 'qx-util';
 import { ControlVO } from '../../../service';
 import { UIActionUtil } from '../../../ui-action';
 import { MDControlController } from '../../common';
-import { formatDate, UIActionButtonState, ButtonContainerState, } from '../../utils';
+import { UIActionButtonState, ButtonContainerState, } from '../../utils';
 import { DataViewControlService } from './data-view.service';
+import { calcDeCodeNameById, getAllUIActionItems, getParentTextAppDEFieldId, } from '../../../model';
+import { formatDateByScale } from '../../../utils';
 export class DataViewControlController extends MDControlController {
     /**
-     * 是否允许新建
-     * @author lxm
-     * @date 2023-09-11 04:05:25
+     * @description 是否允许新建
      * @readonly
      * @type {boolean}
+     * @memberof DataViewControlController
      */
     get enableNew() {
         return this.model.enableCardNew === true;
     }
+    /**
+     * @description 是否允许调整顺序
+     * @readonly
+     * @type {boolean}
+     * @memberof DataViewControlController
+     */
+    get enableEditOrder() {
+        return this.model.enableCardEditOrder === true;
+    }
+    /**
+     * @description 是否支持调整分组
+     * @readonly
+     * @type {boolean}
+     * @memberof DataViewControlController
+     */
+    get enableEditGroup() {
+        return this.model.enableCardEditGroup === true;
+    }
+    /**
+     * @description 启用分组
+     * @readonly
+     * @type {boolean}
+     * @memberof DataViewControlController
+     */
+    get enableGroup() {
+        return this.model.groupMode !== 'NONE';
+    }
+    /**
+     * @description 分组时是否显示分组锚点导航
+     * @readonly
+     * @type {boolean}
+     * @memberof DataViewControlController
+     */
+    get showGroupAnchor() {
+        return this.enableGroup && this.controlParams.showgroupanchor === 'true';
+    }
     /**
      * 初始化State
      *
@@ -29,9 +67,33 @@ export class DataViewControlController extends MDControlController {
         this.state.size = this.model.pagingSize || 20;
         this.state.singleSelect = this.model.singleSelect === true;
         this.state.sortItems = [];
+        this.state.updating = false;
         this.state.collapseKeys = [];
         const { enablePagingBar } = this.model;
         this.state.enablePagingBar = enablePagingBar;
+        this.state.readonly = !!(this.context.srfreadonly === true || this.context.srfreadonly === 'true');
+        this.state.draggable = this.enableEditOrder || this.enableEditGroup;
+        this.state.uaState = {};
+        this.initSortDelistItems();
+    }
+    /**
+     * @description 初始化排序配置项集合
+     * @protected
+     * @memberof DataViewControlController
+     */
+    initSortDelistItems() {
+        var _a;
+        const sortDelistItems = [];
+        (_a = this.model.dedataViewItems) === null || _a === void 0 ? void 0 : _a.forEach((item) => {
+            var _a, _b;
+            if (item.enableSort) {
+                sortDelistItems.push({
+                    value: item.id,
+                    label: ibiz.i18n.t(((_a = item === null || item === void 0 ? void 0 : item.capLanguageRes) === null || _a === void 0 ? void 0 : _a.lanResTag) || '', item.caption || ((_b = item === null || item === void 0 ? void 0 : item.capLanguageRes) === null || _b === void 0 ? void 0 : _b.defaultContent)),
+                });
+            }
+        });
+        this.state.sortDelistItems = sortDelistItems;
     }
     /**
      * 初始化
@@ -66,12 +128,12 @@ export class DataViewControlController extends MDControlController {
     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)) {
+        if (!((_a = groupUIActionGroup === null || groupUIActionGroup === void 0 ? void 0 : groupUIActionGroup.uiactionGroupDetails) === null || _a === void 0 ? void 0 : _a.length))
             return;
-        }
         this.state.groups.forEach(async (group) => {
             const containerState = new ButtonContainerState();
-            groupUIActionGroup.uiactionGroupDetails.forEach(detail => {
+            const actions = getAllUIActionItems(groupUIActionGroup.uiactionGroupDetails);
+            actions.forEach(detail => {
                 const actionid = detail.uiactionId;
                 if (actionid) {
                     const buttonState = new UIActionButtonState(detail.id, this.context.srfappid, actionid, detail);
@@ -92,9 +154,8 @@ export class DataViewControlController extends MDControlController {
     async onRowClick(_data) {
         var _a;
         const data = this.state.items.find(item => item.srfkey === _data.srfkey);
-        if (!data) {
+        if (!data)
             return;
-        }
         super.onRowClick(data);
         const { groupAppDEFieldId } = this.model;
         if (groupAppDEFieldId) {
@@ -194,59 +255,55 @@ export class DataViewControlController extends MDControlController {
         });
     }
     async afterLoad(args, items) {
+        super.afterLoad(args, items);
+        // 每次加载回来先本地排序，把数据的排序属性规范一下
+        this.sortItems(this.state.items);
         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 details = this.getOptItemModel();
+        if (details.length)
+            await Promise.all(items.map(async (item) => {
+                const containerState = new ButtonContainerState();
+                const actions = getAllUIActionItems(details);
+                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;
+            }));
     }
     /**
      * 行为点击
@@ -324,8 +381,7 @@ export class DataViewControlController extends MDControlController {
      * @memberof DataViewControlController
      */
     async handleAutoGroup() {
-        var _a;
-        const { groupAppDEFieldId, groupCodeListId } = this.model;
+        const { groupAppDEFieldId, groupCodeListId, groupTextAppDEFieldId } = this.model;
         // 自动分组且存在代码表时，使用代码表做一次转换
         let codeList = [];
         if (groupCodeListId) {
@@ -334,10 +390,9 @@ export class DataViewControlController extends MDControlController {
         }
         if (groupAppDEFieldId) {
             const { items } = this.state;
-            // 判断分组属性是否为外键值
-            const deRss = (_a = this.dataEntity.minorAppDERSs) === null || _a === void 0 ? void 0 : _a.find(rss => rss.parentAppDEFieldId === groupAppDEFieldId);
-            // 获取外键值文本属性
-            const textDEFieldId = deRss === null || deRss === void 0 ? void 0 : deRss.parentTextAppDEFieldId;
+            const textDEFieldId = getParentTextAppDEFieldId(groupAppDEFieldId, this.dataEntity) ||
+                groupTextAppDEFieldId ||
+                groupAppDEFieldId;
             const dateFormat = this.groupDateFormat[0];
             const groupMap = new Map();
             const unclassified = {
@@ -347,10 +402,10 @@ export class DataViewControlController extends MDControlController {
             };
             items.forEach((item) => {
                 // 如果有外键值文本属性，则根据外键值文本属性分组
-                let groupVal = item[textDEFieldId || groupAppDEFieldId];
+                let groupVal = item[textDEFieldId];
                 // 特殊处理日期格式化
                 if (dateFormat)
-                    groupVal = formatDate(groupVal, dateFormat);
+                    groupVal = formatDateByScale(groupVal, dateFormat);
                 // 分组无值默认归为未分类
                 if (isNil(groupVal)) {
                     unclassified.children.push(item);
@@ -445,7 +500,10 @@ export class DataViewControlController extends MDControlController {
      * @param {(string | number)} group 分组标识
      */
     onClickNew(event, group) {
-        const params = Object.assign(Object.assign({}, this.params), { srfgroup: group });
+        const params = Object.assign({}, this.params);
+        if (isNotNil(group)) {
+            Object.assign(params, { srfgroup: group });
+        }
         UIActionUtil.execAndResolved('new', {
             context: this.context,
             params,
@@ -522,8 +580,8 @@ export class DataViewControlController extends MDControlController {
         }
     }
     /**
-     * @description 切换分组折叠
-     * @param {IData} [params={}]
+     * @description 切换折叠，其中tag表示操作指定分组标识，若不传则操作当前卡片的所有分组展开状态，expand表示是否展开，若不传则基于当前分组状态取反
+     * @param {{ tag?: string; expand?: boolean }} [params={}]
      * @memberof DataViewControlController
      */
     changeCollapse(params = {}) {
@@ -546,4 +604,214 @@ export class DataViewControlController extends MDControlController {
             this.state.collapseKeys = this.state.groups.map(x => x.key.toString());
         }
     }
+    /**
+     * @description 本地排序items(用于拖拽数据完成后的前端数据排序)
+     * @param {IData[]} items
+     * @returns {*}  {void}
+     * @memberof DataViewControlController
+     */
+    sortItems(items) {
+        var _a, _b;
+        const { minorSortAppDEFieldId, minorSortDir } = this.model;
+        if (!minorSortAppDEFieldId || !minorSortDir)
+            return;
+        const sortField = (_b = (_a = this.dataEntity) === null || _a === void 0 ? void 0 : _a.appDEFields) === null || _b === void 0 ? void 0 : _b.find(_item => _item.codeName === minorSortAppDEFieldId);
+        if (!sortField || !DataTypes.isNumber(sortField.stdDataType)) {
+            ibiz.log.warn(ibiz.i18n.t('runtime.controller.common.md.invalidSortType'));
+            return;
+        }
+        const isAsc = minorSortDir === 'ASC';
+        // 格式化排序属性的值
+        items.forEach(item => {
+            const sortValue = item[minorSortAppDEFieldId];
+            if (isNil(sortValue))
+                item[minorSortAppDEFieldId] = 0;
+        });
+        // 排序
+        items.sort((a, b) => isAsc
+            ? a[minorSortAppDEFieldId] - b[minorSortAppDEFieldId]
+            : b[minorSortAppDEFieldId] - a[minorSortAppDEFieldId]);
+    }
+    /**
+     * @description 计算移动数据参数
+     * @protected
+     * @param {number} fromIndex 变更前的索引位置
+     * @param {number} toIndex 变更后的索引位置
+     * @param {IData} draggedItem 拖拽数据项
+     * @param {IData[]} targetArray 数据集
+     * @param {boolean} isCrossGroup 是否切换分组
+     * @returns {*}  {IData}
+     * @memberof DataViewControlController
+     */
+    computeMoveDataParam(fromIndex, toIndex, draggedItem, targetArray, isCrossGroup) {
+        let moveData = {};
+        const { minorSortAppDEFieldId } = this.model;
+        if (!minorSortAppDEFieldId)
+            return 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[minorSortAppDEFieldId] > curr[minorSortAppDEFieldId];
+                    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;
+    }
+    /**
+     * @description 移动并排序数据
+     * @param {ControlVO} draggedItem
+     * @param {IData} moveMeta
+     * @returns {*}  {Promise<void>}
+     * @memberof DataViewControlController
+     */
+    async moveOrderItem(draggedItem, moveMeta) {
+        try {
+            this.state.updating = true;
+            const { minorSortAppDEFieldId } = this.model;
+            if (!minorSortAppDEFieldId)
+                return ibiz.log.error(ibiz.i18n.t('runtime.controller.common.md.sortingProperties'));
+            const deName = calcDeCodeNameById(this.model.appDataEntityId);
+            const tempContext = this.context.clone();
+            tempContext[deName] = draggedItem.srfkey;
+            if (!moveMeta.srftargetkey || !moveMeta.srfmovetype)
+                return ibiz.log.error(ibiz.i18n.t('runtime.controller.common.md.computeMoveMetaError'));
+            const res = await this.service.moveOrderItem(tempContext, draggedItem, moveMeta);
+            if (res.ok) {
+                // 通知实体数据变更
+                this.emitDEDataChange('update', res.data);
+                res.data.forEach(_item => {
+                    const item = this.state.items.find(x => x.srfkey === _item.srfkey);
+                    if (item)
+                        item[minorSortAppDEFieldId] = _item[minorSortAppDEFieldId];
+                });
+                await this.afterLoad({}, this.state.items);
+            }
+        }
+        finally {
+            this.state.updating = false;
+        }
+    }
+    /**
+     * @description 批量更新修改项
+     * @param {ControlVO[]} changedItems
+     * @returns {*}  {Promise<void>}
+     * @memberof DataViewControlController
+     */
+    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.update(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);
+        }
+    }
+    /**
+     * @description 拖拽变更
+     * @param {IDragChangeInfo} info
+     * @returns {*}  {Promise<void>}
+     * @memberof DataViewControlController
+     */
+    async onDragChange(info) {
+        const { from, to, fromIndex, toIndex } = info;
+        if (!this.enableEditGroup && from !== to)
+            return ibiz.message.warning(ibiz.i18n.t('runtime.controller.common.md.adjustmentsGroup'));
+        if (!this.enableEditOrder && from === to)
+            return ibiz.message.warning(ibiz.i18n.t('runtime.controller.common.md.noAllowReorder'));
+        const { groupAppDEFieldId, moveControlAction, minorSortAppDEFieldId } = this.model;
+        const fromGroup = this.state.groups.find(x => x.key === from);
+        const toGroup = this.state.groups.find(x => x.key === to);
+        const draggedItem = clone((fromGroup === null || fromGroup === void 0 ? void 0 : fromGroup.children[fromIndex]) || this.state.items[fromIndex]);
+        // 分组变更
+        if (from !== to && groupAppDEFieldId)
+            draggedItem[groupAppDEFieldId] = to;
+        // 仅变更分组
+        if (!this.enableEditOrder) {
+            await this.updateChangedItems([draggedItem]);
+        }
+        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) {
+                await this.updateChangedItems([draggedItem]);
+            }
+            const originArr = (toGroup === null || toGroup === void 0 ? void 0 : toGroup.children) || this.state.items;
+            const params = this.computeMoveDataParam(fromIndex, toIndex, draggedItem, originArr, info.from !== info.to);
+            await this.moveOrderItem(draggedItem, params);
+        }
+    }
+    /**
+     * @description 新建行
+     * @param {MDCtrlLoadParams} [args={}]
+     * @returns {*}  {Promise<void>}
+     * @memberof DataViewControlController
+     */
+    async newRow(args = {}) {
+        try {
+            const res = await this.service.getDraft(this.context, this.params);
+            if (res.ok && res.data) {
+                // 加载完后续处理
+                this.state.items.unshift(res.data);
+                await this.afterLoad(args, this.state.items);
+                this.actionNotification('GETDRAFTSUCCESS', { data: res.data });
+            }
+        }
+        catch (error) {
+            this.actionNotification('GETDRAFTERROR', {
+                error: error,
+            });
+            throw error;
+        }
+    }
 }

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

@@ -1,5 +1,6 @@
 import { IDEDataView } from '@ibiz/model-core';
-import { MDControlService } from '../../../service';
+import { IHttpResponse } from '@ibiz-template/core';
+import { ControlVO, MDControlService } from '../../../service';
 /**
  * 数据视图（卡片）部件服务
  *
@@ -8,6 +9,15 @@ import { MDControlService } from '../../../service';
  * @extends {MDControlService<IDEDataView>}
  */
 export declare class DataViewControlService<T extends IDEDataView = IDEDataView> extends MDControlService<T> {
+    /**
+     * @description 移动并排序数据
+     * @param {IContext} context
+     * @param {ControlVO} data
+     * @param {IData} args
+     * @returns {*}  {Promise<IHttpResponse<ControlVO[]>>}
+     * @memberof DataViewControlService
+     */
+    moveOrderItem(context: IContext, data: ControlVO, args: IData): Promise<IHttpResponse<ControlVO[]>>;
     /**
      * 初始化属性映射
      *

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

@@ -1 +1 @@
-{"version":3,"file":"data-view.service.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/data-view/data-view.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC/C,OAAO,EAAE,gBAAgB,EAAc,MAAM,kBAAkB,CAAC;AAEhE;;;;;;GAMG;AACH,qBAAa,sBAAsB,CACjC,CAAC,SAAS,WAAW,GAAG,WAAW,CACnC,SAAQ,gBAAgB,CAAC,CAAC,CAAC;IAC3B;;;;OAIG;IACH,aAAa,IAAI,IAAI;CAqBtB"}
+{"version":3,"file":"data-view.service.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/data-view/data-view.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC/C,OAAO,EAAE,aAAa,EAAS,MAAM,qBAAqB,CAAC;AAC3D,OAAO,EAAE,SAAS,EAAE,gBAAgB,EAAc,MAAM,kBAAkB,CAAC;AAE3E;;;;;;GAMG;AACH,qBAAa,sBAAsB,CACjC,CAAC,SAAS,WAAW,GAAG,WAAW,CACnC,SAAQ,gBAAgB,CAAC,CAAC,CAAC;IAC3B;;;;;;;OAOG;IACG,aAAa,CACjB,OAAO,EAAE,QAAQ,EACjB,IAAI,EAAE,SAAS,EACf,IAAI,EAAE,KAAK,GACV,OAAO,CAAC,aAAa,CAAC,SAAS,EAAE,CAAC,CAAC;IAWtC;;;;OAIG;IACH,aAAa,IAAI,IAAI;CAqBtB"}

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

@@ -1,3 +1,4 @@
+import { clone } from '@ibiz-template/core';
 import { MDControlService, UIMapField } from '../../../service';
 /**
  * 数据视图（卡片）部件服务
@@ -7,6 +8,24 @@ import { MDControlService, UIMapField } from '../../../service';
  * @extends {MDControlService<IDEDataView>}
  */
 export class DataViewControlService extends MDControlService {
+    /**
+     * @description 移动并排序数据
+     * @param {IContext} context
+     * @param {ControlVO} data
+     * @param {IData} args
+     * @returns {*}  {Promise<IHttpResponse<ControlVO[]>>}
+     * @memberof DataViewControlService
+     */
+    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;
+    }
     /**
      * 初始化属性映射
      *

package/out/controller/control/exp-bar/calendar-exp-bar.controller.d.ts

@@ -1,8 +1,8 @@
 import { ICalendarExpBar, ISysCalendarItem } from '@ibiz/model-core';
-import { ICalendarExpBarState, ICalendarExpBarEvent, ICalendarExpBarController, ICalendarController, ICalendarItemData, INavViewMsg } from '../../../interface';
+import { INavViewMsg, ICalendarItemData, ICalendarController, ICalendarExpBarState, ICalendarExpBarEvent, ICalendarExpBarController } from '../../../interface';
 import { ExpBarControlController } from './exp-bar.controller';
 /**
- * 树导航栏控制器
+ * 日历导航栏控制器
  *
  * @export
  * @class CalendarExpBarController
@@ -17,10 +17,16 @@ export declare class CalendarExpBarController extends ExpBarControlController<IC
      * @date 2023-07-10 03:07:53
      * @memberof ExpBarControlController
      */
-    navKeyName: string;
+    navKeyName: 'navId';
     protected getCalendarItemModel(itemTypeName: string): ISysCalendarItem | undefined;
     get xDataController(): ICalendarController;
     navBySrfnav(): void;
+    /**
+     * @description 根据栈数据导航
+     * - 特殊处理仅使用开始时间绘制的日历
+     * @memberof CalendarExpBarController
+     */
+    navDataByStack(): void;
     /**
      *  获取导航视图
      *

package/out/controller/control/exp-bar/calendar-exp-bar.controller.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"calendar-exp-bar.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/exp-bar/calendar-exp-bar.controller.ts"],"names":[],"mappings":"AACA,OAAO,EACL,eAAe,EAEf,gBAAgB,EACjB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EACL,oBAAoB,EACpB,oBAAoB,EACpB,yBAAyB,EACzB,mBAAmB,EACnB,iBAAiB,EACjB,WAAW,EACZ,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,uBAAuB,EAAE,MAAM,sBAAsB,CAAC;AAE/D;;;;;;;GAOG;AACH,qBAAa,wBACX,SAAQ,uBAAuB,CAC7B,eAAe,EACf,oBAAoB,EACpB,oBAAoB,CAEtB,YAAW,yBAAyB;IAEpC;;;;;;OAMG;IACH,UAAU,SAAW;IAErB,SAAS,CAAC,oBAAoB,CAC5B,YAAY,EAAE,MAAM,GACnB,gBAAgB,GAAG,SAAS;IAQ/B,IAAI,eAAe,IAAI,mBAAmB,CAWzC;IAEM,WAAW,IAAI,IAAI;IAa1B;;;;;;;;OAQG;IACI,aAAa,CAAC,IAAI,EAAE,iBAAiB,GAAG,WAAW;CAwB3D"}
+{"version":3,"file":"calendar-exp-bar.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/exp-bar/calendar-exp-bar.controller.ts"],"names":[],"mappings":"AAEA,OAAO,EAEL,eAAe,EACf,gBAAgB,EACjB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EACL,WAAW,EACX,iBAAiB,EACjB,mBAAmB,EACnB,oBAAoB,EACpB,oBAAoB,EACpB,yBAAyB,EAC1B,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,uBAAuB,EAAE,MAAM,sBAAsB,CAAC;AAG/D;;;;;;;GAOG;AACH,qBAAa,wBACX,SAAQ,uBAAuB,CAC7B,eAAe,EACf,oBAAoB,EACpB,oBAAoB,CAEtB,YAAW,yBAAyB;IAEpC;;;;;;OAMG;IACH,UAAU,EAAE,OAAO,CAAW;IAE9B,SAAS,CAAC,oBAAoB,CAC5B,YAAY,EAAE,MAAM,GACnB,gBAAgB,GAAG,SAAS;IAK/B,IAAI,eAAe,IAAI,mBAAmB,CAUzC;IAEM,WAAW,IAAI,IAAI;IAW1B;;;;OAIG;IACH,cAAc,IAAI,IAAI;IA6BtB;;;;;;;;OAQG;IACI,aAAa,CAAC,IAAI,EAAE,iBAAiB,GAAG,WAAW;CA0B3D"}

package/out/controller/control/exp-bar/calendar-exp-bar.controller.js

@@ -1,7 +1,9 @@
+/* eslint-disable @typescript-eslint/prefer-as-const */
 import { RuntimeModelError } from '@ibiz-template/core';
 import { ExpBarControlController } from './exp-bar.controller';
+import { compareDateEqualByScale } from '../../../utils';
 /**
- * 树导航栏控制器
+ * 日历导航栏控制器
  *
  * @export
  * @class CalendarExpBarController
@@ -22,30 +24,51 @@ export class CalendarExpBarController extends ExpBarControlController {
     }
     getCalendarItemModel(itemTypeName) {
         const { sysCalendarItems } = this.XDataModel;
-        if (!sysCalendarItems) {
-            return undefined;
-        }
-        return sysCalendarItems.find(item => item.itemType === itemTypeName);
+        return sysCalendarItems === null || sysCalendarItems === void 0 ? void 0 : sysCalendarItems.find(item => item.itemType === itemTypeName);
     }
     get xDataController() {
         const controller = this.view.getController(this.model.xdataControlName);
-        if (!controller) {
+        if (!controller)
             throw new RuntimeModelError(this.model, ibiz.i18n.t('runtime.controller.control.expBar.unableMore', {
                 xdataControlName: this.model.xdataControlName,
             }));
-        }
         return controller;
     }
     navBySrfnav() {
         var _a;
         const selectItem = (_a = this.xDataController) === null || _a === void 0 ? void 0 : _a.state.items.find(item => item.navId === this.state.srfnav);
         super.navBySrfnav();
-        if (!selectItem) {
+        if (!selectItem)
             return;
-        }
         const date = new Date(selectItem.beginTime);
         this.xDataController.setSelectDate(date);
     }
+    /**
+     * @description 根据栈数据导航
+     * - 特殊处理仅使用开始时间绘制的日历
+     * @memberof CalendarExpBarController
+     */
+    navDataByStack() {
+        var _a;
+        const { controlParams, state, model } = this.xDataController;
+        const calendarStyle = (_a = model.calendarStyle) === null || _a === void 0 ? void 0 : _a.toLowerCase();
+        const items = state.items.filter(item => {
+            if ((calendarStyle === 'month' && controlParams.showmode !== 'daterange') ||
+                calendarStyle === 'user')
+                return compareDateEqualByScale(item.beginTime, state.selectedDate, calendarStyle === 'user' ? 'week' : 'month');
+            return true;
+        });
+        const navData = this.navStack
+            .map(nav => items.find(item => nav[this.navKeyName] === item[this.navKeyName]))
+            .find(item => item !== undefined) || items[0];
+        if (navData) {
+            this.xDataController.setActive(navData);
+            this.xDataController.setSelection([navData]);
+        }
+        else {
+            this.clearNavigation();
+        }
+    }
     /**
      *  获取导航视图
      *
@@ -66,12 +89,14 @@ export class CalendarExpBarController extends ExpBarControlController {
                 context,
                 params,
                 viewId: itemModel.navAppViewId,
+                isCache: this.isCache,
             };
         }
         return {
             key: item.navId,
             context: this.context,
             params: this.params,
+            isCache: this.isCache,
         };
     }
 }