@ibiz-template/runtime 0.7.41-alpha.10 → 0.7.41-alpha.100

package/out/controller/control/app-menu/app-menu.controller.d.ts

@@ -1,8 +1,8 @@
 import { IAppMenu, IAppMenuItem } from '@ibiz/model-core';
-import { IAppMenuState, IAppMenuEvent, IAppMenuController, IAppService, IAppMenuItemProvider } from '../../../interface';
+import { IAppService, IAppMenuState, IAppMenuEvent, IAppMenuController, IAppMenuItemProvider } from '../../../interface';
+import { CTX } from '../../ctx';
 import { AppCounter } from '../../../service';
 import { ControlController } from '../../common';
-import { CTX } from '../../ctx';
 import { CustomAppMenuController } from './custom-app-menu.controller';
 /**
  * 应用菜单控制器
@@ -39,6 +39,12 @@ export declare class AppMenuController extends ControlController<IAppMenu, IAppM
      * @memberof AppMenuController
      */
     customController: CustomAppMenuController | null;
+    /**
+     * @description 计数器对象
+     * @type {AppCounter}
+     * @memberof AppMenuController
+     */
+    counter?: AppCounter;
     /**
      * 自定义配置
      *
@@ -54,8 +60,34 @@ export declare class AppMenuController extends ControlController<IAppMenu, IAppM
      * @memberof AppMenuController
      */
     get routeDepth(): number | undefined;
+    /**
+     * @description 控制移动端每行显示的菜单项个数，当前菜单为图标菜单时生效
+     * @readonly
+     * @type {number}
+     * @memberof AppMenuController
+     */
+    get columnNum(): number;
+    /**
+     * @description 控制移动端定制按钮在屏幕中的位置，当前菜单为图标菜单、列表菜单时生效
+     * @readonly
+     * @type {('LEFTSTART'
+     *     | 'LEFT'
+     *     | 'LEFTEND'
+     *     | 'RIGHT'
+     *     | 'RIGHTSTART'
+     *     | 'RIGHTEND')}
+     * @memberof AppMenuController
+     */
+    get customizedAlign(): 'LEFTSTART' | 'LEFT' | 'LEFTEND' | 'RIGHT' | 'RIGHTSTART' | 'RIGHTEND';
     constructor(model: IAppMenu, context: IContext, params: IParams, ctx: CTX);
     protected onCreated(): Promise<void>;
+    /**
+     * @description 生命周期-加载完成
+     * @protected
+     * @returns {*}  {Promise<void>}
+     * @memberof AppMenuController
+     */
+    protected onMounted(): Promise<void>;
     /**
      * 加载自定义菜单模型
      *
@@ -64,12 +96,70 @@ export declare class AppMenuController extends ControlController<IAppMenu, IAppM
      * @memberof AppMenuController
      */
     private loadCustomMenusModel;
+    /**
+     * @description 保存自定义菜单模型
+     * @param {Array<{ id: string; order: number; hidden: boolean }>} items 有权限的菜单项集合
+     * @returns {*}  {Promise<void>}
+     * @memberof AppMenuController
+     */
+    saveMobCustomMenusModel(items: Array<{
+        id: string;
+        order: number;
+        hidden: boolean;
+    }>): Promise<void>;
+    /**
+     * @description 计数器对象数据改变
+     * @param {IData} data
+     * @memberof AppMenuController
+     */
+    onCounterChange(data: IData): void;
+    /**
+     * @description 初始化计数器对象
+     * @returns {*}  {void}
+     * @memberof AppMenuController
+     */
+    initCounter(): void;
     /**
      * 初始化移动端菜单项
      *
      * @memberof AppMenuController
      */
     initMobMenuItems(): void;
+    /**
+     * @description 检查移动端菜单项是否有效（可显示）
+     * @private
+     * @param {IAppMenuItem} menuItem 待检查的移动端菜单项
+     * @returns {*}  {boolean}
+     * @memberof AppMenuController
+     */
+    isMobMenuItemValid(menuItem: IAppMenuItem): boolean;
+    /**
+     * @description 计算移动端菜单经过权限计算后可显示的菜单项集合
+     * @private
+     * @param {IAppMenuItem[]} items 原始菜单项数组
+     * @param {boolean} [needRecursive] 是否需要递归处理子项
+     * @returns {*}  {IAppMenuItem[]}
+     * @memberof AppMenuController
+     */
+    private calcMobAuthedMenuItems;
+    /**
+     * @description 计算移动端自定义模式下可见的菜单项
+     * @private
+     * @param {IAppMenuItem[]} items 原始菜单项数组
+     * @param {IData} [idMap] 菜单项ID映射表
+     * @returns {*}  {IAppMenuItem[]}
+     * @memberof AppMenuController
+     */
+    private calcMobCustomVisibleItems;
+    /**
+     * @description 计算移动端自定义模式下菜单项的排序
+     * @private
+     * @param {IAppMenuItem[]} items
+     * @param {IData} [idMap]
+     * @returns {*}  {IAppMenuItem[]}
+     * @memberof AppMenuController
+     */
+    private calcMobCustomSorteItems;
     /**
      * 初始化菜单项的适配器
      * @author lxm
@@ -120,18 +210,29 @@ export declare class AppMenuController extends ControlController<IAppMenu, IAppM
      */
     getCounter(id: string): AppCounter | null;
     /**
-     * 转换各类多语言
-     *
-     * @date 2023-05-18 02:57:00
+     * @description 转换各类多语言
      * @protected
+     * @memberof AppMenuController
      */
     protected convertMultipleLanguages(): void;
     /**
-     * 获取默认打开视图
-     *
-     * @return {*}  {(string | undefined)}
+     * @description 获取默认打开菜单项
+     * @returns {*}  {(IAppMenuItem | undefined)}
+     * @memberof AppMenuController
+     */
+    getDefaultOpenMenuItem(): IAppMenuItem | undefined;
+    /**
+     * @description 获取默认打开视图
+     * @returns {*}  {(string | undefined)}
      * @memberof AppMenuController
      */
     getDefaultOpenView(): string | undefined;
+    /**
+     * @description 生命周期-销毁完成
+     * @protected
+     * @returns {*}  {Promise<void>}
+     * @memberof AppMenuController
+     */
+    protected onDestroyed(): Promise<void>;
 }
 //# sourceMappingURL=app-menu.controller.d.ts.map

package/out/controller/control/app-menu/app-menu.controller.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"app-menu.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/app-menu/app-menu.controller.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,QAAQ,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAE1D,OAAO,EACL,aAAa,EACb,aAAa,EACb,kBAAkB,EAClB,WAAW,EACX,oBAAoB,EACrB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AAEjD,OAAO,EAAE,GAAG,EAAE,MAAM,WAAW,CAAC;AAChC,OAAO,EAAE,uBAAuB,EAAE,MAAM,8BAA8B,CAAC;AAEvE;;;;;;;;GAQG;AACH,qBAAa,iBACX,SAAQ,iBAAiB,CAAC,QAAQ,EAAE,aAAa,EAAE,aAAa,CAChE,YAAW,kBAAkB;IAE7B,GAAG,EAAG,WAAW,CAAC;IAElB,SAAS,CAAC,SAAS,IAAI,IAAI;IAM3B;;;;;OAKG;IACH,eAAe,EAAG,YAAY,EAAE,CAAC;IAEjC;;;;;OAKG;IACH,aAAa,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,oBAAoB,CAAA;KAAE,CAAM;IAE5D;;;;;OAKG;IACH,gBAAgB,EAAE,uBAAuB,GAAG,IAAI,CAAQ;IAExD;;;;;OAKG;IACI,WAAW,EAAE,KAAK,EAAE,CAAM;IAEjC;;;;;;OAMG;IACH,IAAI,UAAU,IAAI,MAAM,GAAG,SAAS,CAEnC;gBAEW,KAAK,EAAE,QAAQ,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,EAAE,GAAG;cAQzD,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAmB1C;;;;;;OAMG;YACW,oBAAoB;IASlC;;;;OAIG;IACH,gBAAgB,IAAI,IAAI;IAyBxB;;;;;;OAMG;cACa,wBAAwB,IAAI,OAAO,CAAC,IAAI,CAAC;IAWzD;;;;;;;OAOG;IACG,eAAe,CACnB,EAAE,EAAE,MAAM,EACV,KAAK,CAAC,EAAE,UAAU,EAClB,QAAQ,GAAE,OAAc,EACxB,IAAI,GAAE,KAAU,GACf,OAAO,CAAC,IAAI,CAAC;IAmDhB;;;;;;OAMG;IAEH,iBAAiB,CAAC,IAAI,EAAE,YAAY,GAAG;QACrC,OAAO,EAAE,OAAO,CAAC;QACjB,SAAS,EAAE,OAAO,CAAC;KACpB;IAwBD;;;;;OAKG;IACH,SAAS,CAAC,eAAe,IAAI,IAAI;IAcjC;;;;;OAKG;IACH,WAAW,IAAI,YAAY,EAAE;IAI7B;;;;;OAKG;IACH,UAAU,CAAC,EAAE,EAAE,MAAM,GAAG,UAAU,GAAG,IAAI;IAQzC;;;;;OAKG;IACH,SAAS,CAAC,wBAAwB,IAAI,IAAI;IAmB1C;;;;;OAKG;IACH,kBAAkB,IAAI,MAAM,GAAG,SAAS;CAQzC"}
+{"version":3,"file":"app-menu.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/app-menu/app-menu.controller.ts"],"names":[],"mappings":"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"}

package/out/controller/control/app-menu/app-menu.controller.js

@@ -1,4 +1,4 @@
-import { findRecursiveChild, RuntimeError, RuntimeModelError, } from '@ibiz-template/core';
+import { RuntimeError, recursiveIterate, RuntimeModelError, findRecursiveChild, } from '@ibiz-template/core';
 import { AppFuncCommand } from '../../../command';
 import { ControlController } from '../../common';
 import { getAppMenuItemProvider } from '../../../register';
@@ -17,6 +17,8 @@ export class AppMenuController extends ControlController {
         super.initState();
         this.state.menuItemsState = {};
         this.state.mobMenuItems = [];
+        this.state.mobAuthedMenuItems = [];
+        this.state.counterData = {};
     }
     /**
      * 视图层级
@@ -28,6 +30,33 @@ export class AppMenuController extends ControlController {
     get routeDepth() {
         return this.view.modal.routeDepth;
     }
+    /**
+     * @description 控制移动端每行显示的菜单项个数，当前菜单为图标菜单时生效
+     * @readonly
+     * @type {number}
+     * @memberof AppMenuController
+     */
+    get columnNum() {
+        var _a;
+        return Number(((_a = this.model.userParam) === null || _a === void 0 ? void 0 : _a.columnnum) || this.controlParams.columnnum || 4);
+    }
+    /**
+     * @description 控制移动端定制按钮在屏幕中的位置，当前菜单为图标菜单、列表菜单时生效
+     * @readonly
+     * @type {('LEFTSTART'
+     *     | 'LEFT'
+     *     | 'LEFTEND'
+     *     | 'RIGHT'
+     *     | 'RIGHTSTART'
+     *     | 'RIGHTEND')}
+     * @memberof AppMenuController
+     */
+    get customizedAlign() {
+        var _a;
+        return (((_a = this.model.userParam) === null || _a === void 0 ? void 0 : _a.customizedalign) ||
+            this.controlParams.customizedalign ||
+            'RIGHTEND');
+    }
     constructor(model, context, params, ctx) {
         super(model, context, params, ctx);
         /**
@@ -73,6 +102,18 @@ export class AppMenuController extends ControlController {
             this.initMobMenuItems();
         }
     }
+    /**
+     * @description 生命周期-加载完成
+     * @protected
+     * @returns {*}  {Promise<void>}
+     * @memberof AppMenuController
+     */
+    async onMounted() {
+        var _a;
+        await super.onMounted();
+        this.initCounter();
+        (_a = this.counter) === null || _a === void 0 ? void 0 : _a.onChange(this.onCounterChange.bind(this));
+    }
     /**
      * 加载自定义菜单模型
      *
@@ -89,35 +130,172 @@ export class AppMenuController extends ControlController {
             this.saveConfigs = customConfigs;
         }
     }
+    /**
+     * @description 保存自定义菜单模型
+     * @param {Array<{ id: string; order: number; hidden: boolean }>} items 有权限的菜单项集合
+     * @returns {*}  {Promise<void>}
+     * @memberof AppMenuController
+     */
+    async saveMobCustomMenusModel(items) {
+        await this.customController.saveCustomModelData(items);
+        this.saveConfigs = items;
+        if (ibiz.env.isMob) {
+            this.state.mobAuthedMenuItems = this.calcMobCustomSorteItems(this.state.mobAuthedMenuItems);
+            this.state.mobMenuItems = this.calcMobCustomVisibleItems(this.state.mobAuthedMenuItems);
+        }
+    }
+    /**
+     * @description 计数器对象数据改变
+     * @param {IData} data
+     * @memberof AppMenuController
+     */
+    onCounterChange(data) {
+        this.state.counterData = data;
+    }
+    /**
+     * @description 初始化计数器对象
+     * @returns {*}  {void}
+     * @memberof AppMenuController
+     */
+    initCounter() {
+        if (this.state.isCounterDisabled)
+            return;
+        const { appCounterRefId } = this.model;
+        if (appCounterRefId) {
+            this.counter = this.getCounter(appCounterRefId);
+        }
+    }
     /**
      * 初始化移动端菜单项
      *
      * @memberof AppMenuController
      */
     initMobMenuItems() {
-        var _a;
+        // 是否为标准菜单
+        const isDefaultMenu = !this.model.appMenuStyle;
         // 所有可见菜单项
-        const menuItems = ((_a = this.model.appMenuItems) === null || _a === void 0 ? void 0 : _a.filter(item => item.hidden !== true &&
-            item.itemType === 'MENUITEM' &&
-            this.state.menuItemsState[item.id].visible)) || [];
+        let mobAuthedMenuItems = this.calcMobAuthedMenuItems(this.model.appMenuItems || [], isDefaultMenu);
         let mobMenuItems = [];
         if (this.model.enableCustomized) {
             if (this.saveConfigs.length > 0) {
-                this.saveConfigs.forEach(item => {
-                    const menu = menuItems.find(_item => item.id === _item.id);
-                    if (menu)
-                        mobMenuItems.push(menu);
-                });
+                mobAuthedMenuItems = this.calcMobCustomSorteItems(mobAuthedMenuItems);
+                mobMenuItems = this.calcMobCustomVisibleItems(mobAuthedMenuItems);
+            }
+            else if (isDefaultMenu) {
+                // 标准菜单最大显示4个
+                mobMenuItems = mobAuthedMenuItems.slice(0, 4);
             }
             else {
-                mobMenuItems = menuItems.slice(0, 4);
+                mobMenuItems = mobAuthedMenuItems;
             }
+            // 权限计算后的可见项
+            this.state.mobAuthedMenuItems = mobAuthedMenuItems;
         }
         else {
-            mobMenuItems = menuItems;
+            mobMenuItems = mobAuthedMenuItems;
         }
+        // 最终显示项
         this.state.mobMenuItems = mobMenuItems;
     }
+    /**
+     * @description 检查移动端菜单项是否有效（可显示）
+     * @private
+     * @param {IAppMenuItem} menuItem 待检查的移动端菜单项
+     * @returns {*}  {boolean}
+     * @memberof AppMenuController
+     */
+    isMobMenuItemValid(menuItem) {
+        return (menuItem.hidden !== true &&
+            menuItem.itemType === 'MENUITEM' &&
+            this.state.menuItemsState[menuItem.id].visible);
+    }
+    /**
+     * @description 计算移动端菜单经过权限计算后可显示的菜单项集合
+     * @private
+     * @param {IAppMenuItem[]} items 原始菜单项数组
+     * @param {boolean} [needRecursive] 是否需要递归处理子项
+     * @returns {*}  {IAppMenuItem[]}
+     * @memberof AppMenuController
+     */
+    calcMobAuthedMenuItems(items, needRecursive) {
+        const visibleItems = [];
+        items.forEach(item => {
+            var _a;
+            if (!this.isMobMenuItemValid(item))
+                return;
+            const itemData = Object.assign({}, item);
+            if (((_a = item.appMenuItems) === null || _a === void 0 ? void 0 : _a.length) && needRecursive) {
+                const childItems = this.calcMobAuthedMenuItems(item.appMenuItems, needRecursive);
+                itemData.appMenuItems = childItems;
+            }
+            visibleItems.push(itemData);
+        });
+        return visibleItems;
+    }
+    /**
+     * @description 计算移动端自定义模式下可见的菜单项
+     * @private
+     * @param {IAppMenuItem[]} items 原始菜单项数组
+     * @param {IData} [idMap] 菜单项ID映射表
+     * @returns {*}  {IAppMenuItem[]}
+     * @memberof AppMenuController
+     */
+    calcMobCustomVisibleItems(items, idMap) {
+        const customItems = [];
+        let itemIdMap = idMap;
+        if (!itemIdMap) {
+            itemIdMap = {};
+            this.saveConfigs.forEach(config => {
+                itemIdMap[config.id] = config;
+            });
+        }
+        items.forEach(item => {
+            var _a;
+            if (!itemIdMap[item.id] || itemIdMap[item.id].hidden)
+                return;
+            const itemData = Object.assign({}, item);
+            if ((_a = item.appMenuItems) === null || _a === void 0 ? void 0 : _a.length) {
+                const childItems = this.calcMobCustomVisibleItems(item.appMenuItems, itemIdMap);
+                itemData.appMenuItems = childItems;
+            }
+            customItems.push(itemData);
+        });
+        return customItems;
+    }
+    /**
+     * @description 计算移动端自定义模式下菜单项的排序
+     * @private
+     * @param {IAppMenuItem[]} items
+     * @param {IData} [idMap]
+     * @returns {*}  {IAppMenuItem[]}
+     * @memberof AppMenuController
+     */
+    calcMobCustomSorteItems(items, idMap) {
+        const customItems = [];
+        let itemIdMap = idMap;
+        if (!itemIdMap) {
+            itemIdMap = {};
+            this.saveConfigs.forEach(config => {
+                itemIdMap[config.id] = config;
+            });
+        }
+        items.forEach(item => {
+            var _a;
+            const itemData = Object.assign({}, item);
+            if ((_a = item.appMenuItems) === null || _a === void 0 ? void 0 : _a.length) {
+                const childItems = this.calcMobCustomSorteItems(item.appMenuItems, itemIdMap);
+                itemData.appMenuItems = childItems;
+            }
+            customItems.push(itemData);
+        });
+        customItems.sort((a, b) => {
+            var _a, _b;
+            const orderA = ((_a = itemIdMap[a.id]) === null || _a === void 0 ? void 0 : _a.order) || 0;
+            const orderB = ((_b = itemIdMap[b.id]) === null || _b === void 0 ? void 0 : _b.order) || 0;
+            return orderA - orderB;
+        });
+        return customItems;
+    }
     /**
      * 初始化菜单项的适配器
      * @author lxm
@@ -241,6 +419,8 @@ export class AppMenuController extends ControlController {
      * @Date: 2023-07-10 15:14:21
      */
     getCounter(id) {
+        if (this.state.isCounterDisabled)
+            return null;
         const { counters } = this.ctx.view;
         if (counters[id]) {
             return counters[id];
@@ -248,38 +428,52 @@ export class AppMenuController extends ControlController {
         return null;
     }
     /**
-     * 转换各类多语言
-     *
-     * @date 2023-05-18 02:57:00
+     * @description 转换各类多语言
      * @protected
+     * @memberof AppMenuController
      */
     convertMultipleLanguages() {
-        const convertItemCaption = (menuItems) => {
-            menuItems.forEach((item) => {
-                var _a;
-                if (item.capLanguageRes && item.capLanguageRes.lanResTag) {
-                    item.caption = ibiz.i18n.t(item.capLanguageRes.lanResTag, item.caption);
-                }
-                if ((_a = item.appMenuItems) === null || _a === void 0 ? void 0 : _a.length) {
-                    convertItemCaption(item.appMenuItems);
-                }
-            });
-        };
-        if (this.model.appMenuItems && this.model.appMenuItems.length > 0) {
-            convertItemCaption(this.model.appMenuItems);
-        }
+        recursiveIterate(this.model, (item) => {
+            var _a, _b;
+            if ((_a = item.capLanguageRes) === null || _a === void 0 ? void 0 : _a.lanResTag)
+                item.caption = ibiz.i18n.t(item.capLanguageRes.lanResTag, item.caption);
+            if ((_b = item.tooltipLanguageRes) === null || _b === void 0 ? void 0 : _b.lanResTag)
+                item.tooltip = ibiz.i18n.t(item.tooltipLanguageRes.lanResTag, item.tooltip);
+        }, {
+            childrenFields: ['appMenuItems'],
+        });
     }
     /**
-     * 获取默认打开视图
-     *
-     * @return {*}  {(string | undefined)}
+     * @description 获取默认打开菜单项
+     * @returns {*}  {(IAppMenuItem | undefined)}
+     * @memberof AppMenuController
+     */
+    getDefaultOpenMenuItem() {
+        return this.getAllItems().find(item => item.openDefault &&
+            !item.hidden &&
+            this.state.menuItemsState[item.id].visible);
+    }
+    /**
+     * @description 获取默认打开视图
+     * @returns {*}  {(string | undefined)}
      * @memberof AppMenuController
      */
     getDefaultOpenView() {
-        const menu = this.getAllItems().find(item => item.openDefault && !item.hidden);
+        const menu = this.getDefaultOpenMenuItem();
         if (!menu || !menu.appFuncId)
             return;
         const appFunc = ibiz.hub.getApp(menu.appId).getAppFunc(menu.appFuncId);
         return (appFunc === null || appFunc === void 0 ? void 0 : appFunc.appFuncType) === 'APPVIEW' ? appFunc.appViewId : undefined;
     }
+    /**
+     * @description 生命周期-销毁完成
+     * @protected
+     * @returns {*}  {Promise<void>}
+     * @memberof AppMenuController
+     */
+    async onDestroyed() {
+        await super.onDestroyed();
+        if (this.counter)
+            this.counter.destroy();
+    }
 }

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

@@ -1,7 +1,7 @@
-import { ISysCalendar } from '@ibiz/model-core';
-import { ICalendarState, ICalendarEvent, ICalendarController, MDCtrlLoadParams, ICalendarItemData, IUIActionResult } from '../../../interface';
+import { ISysCalendar, ISysCalendarItem } from '@ibiz/model-core';
+import { ICalendarState, ICalendarEvent, IUIActionResult, MDCtrlLoadParams, ICalendarItemData, ICalendarController } from '../../../interface';
 import { MDControlController } from '../../common';
-import { CalendarService } from './calendar.service';
+import { CalendarService, ILoadMoreItem } from './calendar.service';
 import { ViewLogicScheduler } from '../../../logic-scheduler';
 import { ContextMenuController } from '../context-menu';
 /**
@@ -40,6 +40,30 @@ export declare class CalendarController extends MDControlController<ISysCalendar
     contextMenus: {
         [p: string]: ContextMenuController;
     };
+    /**
+     * @description 时光轴时间戳格式化串
+     * @type {string}
+     * @memberof CalendarController
+     */
+    timelineCaptionFormat: string;
+    /**
+     * @description 获取加载更多信息数据
+     * @readonly
+     * @type {{
+     *       [modelId: string]: ILoadMoreItem;
+     *     }}
+     * @memberof CalendarController
+     */
+    get loadMoreItems(): {
+        [modelId: string]: ILoadMoreItem;
+    };
+    /**
+     * @description 分组时间属性
+     * @readonly
+     * @type {('beginTime' | 'endTime')} 开始时间 | 结束时间
+     * @memberof CalendarController
+     */
+    get groupTimeField(): 'beginTime' | 'endTime';
     /**
      * 初始化状态
      *
@@ -60,16 +84,15 @@ export declare class CalendarController extends MDControlController<ISysCalendar
      */
     protected onCreated(): Promise<void>;
     /**
-     * 执行行为
-     *
+     * @description 执行行为
      * @param {string} uiActionId
-     * @param {ICalendarItemData} calendatData
+     * @param {ICalendarItemData} data
      * @param {MouseEvent} event
      * @param {string} appId
-     * @return {*}  {Promise<void>}
+     * @returns {*}  {Promise<void>}
      * @memberof CalendarController
      */
-    doUIAction(uiActionId: string, calendatData: ICalendarItemData, event: MouseEvent, appId: string): Promise<void>;
+    doUIAction(uiActionId: string, item: ICalendarItemData, event: MouseEvent, appId: string): Promise<void>;
     /**
      * 初始化日历图例
      *
@@ -101,12 +124,20 @@ export declare class CalendarController extends MDControlController<ISysCalendar
      */
     setActive(item: ICalendarItemData): Promise<void>;
     /**
-     * 打开编辑数据视图
-     *
-     * @param {ICalendarItemData} item
-     * @memberof CalendarService
+     * @description 打开编辑数据视图
+     * @param {IData} item
+     * @param {MouseEvent} [event]
+     * @returns {*}  {Promise<IUIActionResult>}
+     * @memberof CalendarController
      */
-    openData(item: ICalendarItemData): Promise<IUIActionResult>;
+    openData(item: IData, event?: MouseEvent): Promise<IUIActionResult>;
+    /**
+     * @description 打开新建编辑视图
+     * @param {IData} item
+     * @returns {*}  {Promise<IUIActionResult>}
+     * @memberof CalendarController
+     */
+    newData(item: IData, event?: MouseEvent): Promise<IUIActionResult>;
     /**
      * 计算表格展示模式
      * @author fzh
@@ -198,5 +229,51 @@ export declare class CalendarController extends MDControlController<ISysCalendar
      * @memberof CalendarController
      */
     setSelectDate(date: Date): void;
+    /**
+     * @description 根据数据主键获取日历项模型
+     * @param {string} key
+     * @returns {*}  {(ISysCalendarItem | undefined)}
+     * @memberof CalendarController
+     */
+    getItemModelByKey(key: string): ISysCalendarItem | undefined;
+    /**
+     * @description 处理项删除
+     * @param {ICalendarItemData} item 日历项
+     * @param {IContext} context 上下文
+     * @param {IParams} params 视图参数
+     * @returns {*}  {Promise<boolean>}
+     * @memberof CalendarController
+     */
+    handleItemRemove(item: IData, context: IContext, params: IParams): Promise<boolean>;
+    /**
+     * @description 跳转第一页
+     * @returns {*}  {Promise<IData[]>}
+     * @memberof CalendarController
+     */
+    goToFirstPage(): Promise<IData[]>;
+    /**
+     * @description 跳转上一页
+     * @returns {*}  {Promise<IData[]>}
+     * @memberof CalendarController
+     */
+    goToPreviousPage(): Promise<IData[]>;
+    /**
+     * @description 跳转下一页
+     * @returns {*}  {Promise<IData[]>}
+     * @memberof CalendarController
+     */
+    goToNextPage(): Promise<IData[]>;
+    /**
+     * @description 跳转最后一页
+     * @returns {*}  {Promise<IData[]>}
+     * @memberof CalendarController
+     */
+    goToLastPage(): Promise<IData[]>;
+    /**
+     * @description 转换各类多语言
+     * @protected
+     * @memberof CalendarController
+     */
+    protected convertMultipleLanguages(): void;
 }
 //# sourceMappingURL=calendar.controller.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"calendar.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/calendar/calendar.controller.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAoB,MAAM,kBAAkB,CAAC;AAGlE,OAAO,EACL,cAAc,EACd,cAAc,EACd,mBAAmB,EACnB,gBAAgB,EAChB,iBAAiB,EAEjB,eAAe,EAEhB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AACnD,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AACrD,OAAO,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAC;AAE9D,OAAO,EAAE,qBAAqB,EAAE,MAAM,iBAAiB,CAAC;AAGxD;;;;;;;;;GASG;AACH,qBAAa,kBACX,SAAQ,mBAAmB,CAAC,YAAY,EAAE,cAAc,EAAE,cAAc,CACxE,YAAW,mBAAmB;IAE9B;;;;;;;OAOG;IACK,OAAO,EAAE,eAAe,CAAC;IAEjC;;;;;OAKG;IACH,aAAa,CAAC,EAAE,kBAAkB,CAAC;IAEnC;;;;;OAKG;IACH,YAAY,EAAE;QAAE,CAAC,CAAC,EAAE,MAAM,GAAG,qBAAqB,CAAA;KAAE,CAAM;IAE1D;;;;;;;OAOG;IACH,SAAS,CAAC,SAAS,IAAI,IAAI;IAU3B;;;;;;;;OAQG;cACa,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IA8B1C;;;;;;;;;OASG;IACG,UAAU,CACd,UAAU,EAAE,MAAM,EAClB,YAAY,EAAE,iBAAiB,EAC/B,KAAK,EAAE,UAAU,EACjB,KAAK,EAAE,MAAM,GACZ,OAAO,CAAC,IAAI,CAAC;IAmChB;;;;;OAKG;IACH,SAAS,CAAC,mBAAmB,IAAI,IAAI;IAkBrC;;;;;OAKG;IACH,SAAS,CAAC,iBAAiB,IAAI,IAAI;IAgBnC;;;;;;OAMG;cACa,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC;IAO5C;;;;;;OAMG;IACG,SAAS,CAAC,IAAI,EAAE,iBAAiB,GAAG,OAAO,CAAC,IAAI,CAAC;IAUvD;;;;;OAKG;IACG,QAAQ,CAAC,IAAI,EAAE,iBAAiB,GAAG,OAAO,CAAC,eAAe,CAAC;IAkCjE;;;;;OAKG;IACH,YAAY,CAAC,KAAK,EAAE,KAAK,GAAG,IAAI;IAoBhC;;;;;;;;OAQG;IACG,IAAI,CAAC,IAAI,GAAE,gBAAqB,GAAG,OAAO,CAAC,iBAAiB,EAAE,CAAC;IA+BrE;;;;;;;OAOG;IACG,SAAS,CAAC,IAAI,EAAE,gBAAgB,EAAE,KAAK,EAAE,KAAK,EAAE,GAAG,OAAO,CAAC,KAAK,EAAE,CAAC;IAQzE;;;;;;OAMG;cACa,eAAe,IAAI,OAAO,CAAC,IAAI,CAAC;IAsChD;;;;;;;OAOG;IACH,SAAS,CAAC,SAAS,CACjB,KAAK,EAAE,iBAAiB,EAAE,EAC1B,SAAS,GAAE,WAAW,GAAG,SAAuB,GAC/C,IAAI;IAcP;;;;;;;;;OASG;IACH,SAAS,CAAC,gBAAgB,CAAC,KAAK,EAAE,OAAO,GAAG,KAAK;IAsEjD;;;;;;;;OAQG;IACG,cAAc,CAAC,WAAW,GAAE,OAAY,GAAG,OAAO,CAAC,OAAO,CAAC;IAmCjE;;;;;;;;OAQG;IACG,UAAU,CAAC,KAAK,EAAE,iBAAiB,GAAG,OAAO,CAAC,IAAI,CAAC;IA0BzD;;;;;;OAMG;IACG,YAAY,CAAC,KAAK,EAAE,iBAAiB,GAAG,OAAO,CAAC,IAAI,CAAC;IAO3D;;;;;;;OAOG;IACH,aAAa,CAAC,IAAI,EAAE,IAAI,GAAG,IAAI;CAGhC"}
+{"version":3,"file":"calendar.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/calendar/calendar.controller.ts"],"names":[],"mappings":"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"}