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

package/out/controller/control/calendar/calendar.controller.js

@@ -5,6 +5,7 @@ import { CalendarService } from './calendar.service';
 import { calcDeCodeNameById, getViewLogics } from '../../../model';
 import { ContextMenuController } from '../context-menu';
 import { UIActionUtil } from '../../../ui-action';
+import { Srfuf } from '../../../service';
 /**
  * 日历部件控制器
  *
@@ -25,6 +26,34 @@ export class CalendarController extends MDControlController {
          * @type {{ [p: string]: ContextMenuController }}
          */
         this.contextMenus = {};
+        /**
+         * @description 时光轴时间戳格式化串
+         * @type {string}
+         * @memberof CalendarController
+         */
+        this.timelineCaptionFormat = 'YYYY-MM-DD';
+    }
+    /**
+     * @description 获取加载更多信息数据
+     * @readonly
+     * @type {{
+     *       [modelId: string]: ILoadMoreItem;
+     *     }}
+     * @memberof CalendarController
+     */
+    get loadMoreItems() {
+        return this.service.loadMore;
+    }
+    /**
+     * @description 分组时间属性
+     * @readonly
+     * @type {('beginTime' | 'endTime')} 开始时间 | 结束时间
+     * @memberof CalendarController
+     */
+    get groupTimeField() {
+        if (this.controlParams.grouptimefield)
+            return this.controlParams.grouptimefield;
+        return 'beginTime';
     }
     /**
      * 初始化状态
@@ -35,8 +64,15 @@ export class CalendarController extends MDControlController {
      * @memberof CalendarController
      */
     initState() {
+        var _a, _b, _c, _d;
         super.initState();
-        this.state.selectedDate = new Date();
+        // 初始化默认时间 配置控件参数时指定值格式为： YYYY-MM-DD 示例： 2025-01-01
+        if ((_b = (_a = this.model.controlParam) === null || _a === void 0 ? void 0 : _a.ctrlParams) === null || _b === void 0 ? void 0 : _b.DEFAULTDATETIME) {
+            this.state.selectedDate = new Date((_d = (_c = this.model.controlParam) === null || _c === void 0 ? void 0 : _c.ctrlParams) === null || _d === void 0 ? void 0 : _d.DEFAULTDATETIME);
+        }
+        else {
+            this.state.selectedDate = new Date();
+        }
         this.state.size = 1000;
         this.state.legends = [];
         this.state.groups = [];
@@ -53,17 +89,22 @@ export class CalendarController extends MDControlController {
      * @memberof CalendarController
      */
     async onCreated() {
-        var _a, _b, _c;
+        var _a, _b, _c, _d, _e;
         await super.onCreated();
+        // 初始化时间轴标题格式,默认值为YYYY-MM-DD
+        if ((_b = (_a = this.model.controlParam) === null || _a === void 0 ? void 0 : _a.ctrlParams) === null || _b === void 0 ? void 0 : _b.TIMELINECAPTIONFORMAT) {
+            this.timelineCaptionFormat =
+                this.model.controlParam.ctrlParams.TIMELINECAPTIONFORMAT;
+        }
         this.state.showDetail =
-            ((_b = (_a = this.model.controlParam) === null || _a === void 0 ? void 0 : _a.ctrlParams) === null || _b === void 0 ? void 0 : _b.SHOWDETAIL) ||
+            ((_d = (_c = this.model.controlParam) === null || _c === void 0 ? void 0 : _c.ctrlParams) === null || _d === void 0 ? void 0 : _d.SHOWDETAIL) ||
                 this.controlParams.showdetail === 'true' ||
                 false;
         this.service = new CalendarService(this.model);
         await this.service.init(this.context);
         this.initViewScheduler();
         this.initCalendarLegends();
-        (_c = this.model.sysCalendarItems) === null || _c === void 0 ? void 0 : _c.forEach((item) => {
+        (_e = this.model.sysCalendarItems) === null || _e === void 0 ? void 0 : _e.forEach((item) => {
             var _a, _b;
             if ((_b = (_a = item.decontextMenu) === null || _a === void 0 ? void 0 : _a.detoolbarItems) === null || _b === void 0 ? void 0 : _b.length) {
                 this.contextMenus[item.decontextMenu.id] = new ContextMenuController(item.decontextMenu, this.context, this.params, this.ctx);
@@ -73,28 +114,17 @@ export class CalendarController extends MDControlController {
         await Promise.all(Object.values(this.contextMenus).map(menu => menu.created()));
     }
     /**
-     * 执行行为
-     *
+     * @description 执行行为
      * @param {string} uiActionId
-     * @param {ICalendarItemData} calendatData
+     * @param {ICalendarItemData} data
      * @param {MouseEvent} event
      * @param {string} appId
-     * @return {*}  {Promise<void>}
+     * @returns {*}  {Promise<void>}
      * @memberof CalendarController
      */
-    async doUIAction(uiActionId, calendatData, event, appId) {
+    async doUIAction(uiActionId, item, event, appId) {
         const eventArgs = this.getEventArgs();
-        const data = calendatData.deData;
-        const { sysCalendarItems } = this.model;
-        const targetCalendarItem = sysCalendarItems === null || sysCalendarItems === void 0 ? void 0 : sysCalendarItems.find((item) => {
-            return item.id === calendatData.itemType;
-        });
-        if (targetCalendarItem &&
-            targetCalendarItem.textAppDEFieldId &&
-            !data.srfmajortext) {
-            data.srfmajortext = data[targetCalendarItem.textAppDEFieldId];
-        }
-        const result = await UIActionUtil.exec(uiActionId, Object.assign(Object.assign({}, eventArgs), { data: [data], context: this.context.clone(), params: this.params, event }), appId);
+        const result = await UIActionUtil.exec(uiActionId, Object.assign(Object.assign({}, eventArgs), { data: [item.deData], context: this.context.clone(), params: this.params, event }), appId);
         if (result.closeView) {
             this.view.closeView();
         }
@@ -169,42 +199,70 @@ export class CalendarController extends MDControlController {
         this._evt.emit('onActive', {
             data: item ? [item] : [],
         });
-        if (!item) {
+        if (!item)
             return;
-        }
-        await this.openData(item);
+        await this.openData(item.deData);
     }
     /**
-     * 打开编辑数据视图
-     *
-     * @param {ICalendarItemData} item
-     * @memberof CalendarService
+     * @description 打开编辑数据视图
+     * @param {IData} item
+     * @param {MouseEvent} [event]
+     * @returns {*}  {Promise<IUIActionResult>}
+     * @memberof CalendarController
      */
-    async openData(item) {
-        var _a, _b, _c;
+    async openData(item, event) {
+        var _a;
+        const calendarItem = this.getItemModelByKey(item.srfkey);
+        if (!calendarItem)
+            throw new RuntimeError(ibiz.i18n.t('runtime.controller.control.calendar.noFoundModel'));
         // 添加选中数据的主键
         const context = this.context.clone();
-        const deName = ((_b = (_a = item.deData) === null || _a === void 0 ? void 0 : _a.srfdecodename) === null || _b === void 0 ? void 0 : _b.toLowerCase()) ||
-            calcDeCodeNameById(this.model.appDataEntityId);
-        context[deName.toLowerCase()] = item.deData.srfkey;
-        const result = await ((_c = this.viewScheduler) === null || _c === void 0 ? void 0 : _c.triggerCustom(`${item.itemType.toLowerCase()}_opendata`, {
+        const deName = calcDeCodeNameById(calendarItem.appDataEntityId);
+        context[deName.toLowerCase()] = item.srfkey;
+        context.srfnavctrlid = this.ctrlId;
+        const result = await ((_a = this.viewScheduler) === null || _a === void 0 ? void 0 : _a.triggerCustom(`${calendarItem.itemType.toLowerCase()}_opendata`, {
+            event,
             context,
             params: this.params,
-            data: [item.deData],
-            event: undefined,
+            data: [item],
             view: this.view,
             ctrl: this,
         }));
-        if (result === -1) {
-            throw new RuntimeModelError(this.model, ibiz.i18n.t('runtime.controller.control.calendar.missingViewLogic', {
-                itemType: item.itemType.toLowerCase(),
+        if (result === -1)
+            throw new RuntimeModelError(calendarItem, ibiz.i18n.t('runtime.controller.common.md.logicOpendata', {
+                itemType: calendarItem.itemType.toLowerCase(),
             }));
-        }
-        else {
-            return {
-                cancel: result ? result.ok : true,
-            };
-        }
+        return {
+            cancel: result ? result.ok : true,
+        };
+    }
+    /**
+     * @description 打开新建编辑视图
+     * @param {IData} item
+     * @returns {*}  {Promise<IUIActionResult>}
+     * @memberof CalendarController
+     */
+    async newData(item, event) {
+        var _a;
+        const calendarItem = this.getItemModelByKey(item.srfkey);
+        if (!calendarItem)
+            throw new RuntimeError(ibiz.i18n.t('runtime.controller.control.calendar.noFoundModel'));
+        const context = this.context.clone();
+        context.srfnavctrlid = this.ctrlId;
+        const result = await ((_a = this.viewScheduler) === null || _a === void 0 ? void 0 : _a.triggerCustom(`${calendarItem.itemType.toLowerCase()}_newdata`, {
+            event,
+            context: this.context,
+            params: this.params,
+            view: this.view,
+            ctrl: this,
+        }));
+        if (result === -1)
+            throw new RuntimeModelError(calendarItem, ibiz.i18n.t('runtime.controller.common.md.logicNewdata', {
+                itemType: calendarItem.itemType.toLowerCase(),
+            }));
+        return {
+            cancel: result ? result.ok : true,
+        };
     }
     /**
      * 计算表格展示模式
@@ -245,6 +303,7 @@ export class CalendarController extends MDControlController {
             return [];
         }
         const isInitialLoad = args.isInitialLoad === true;
+        let isLoadMore = args.isLoadMore === true;
         // *查询参数处理
         const { context } = this.handlerAbilityParams(args);
         const params = await this.getFetchParams(args === null || args === void 0 ? void 0 : args.viewParam);
@@ -253,11 +312,18 @@ export class CalendarController extends MDControlController {
             const { srfstartdate } = params;
             this.state.selectedDate = new Date(srfstartdate);
         }
+        else if (calendarStyle === 'TIMELINE' && isInitialLoad) {
+            // 初始化加载时间轴时标记加载更多
+            isLoadMore = true;
+        }
         // *发起请求
         await this.startLoading();
         let items;
         try {
-            items = await this.service.search(context, params);
+            items = await this.service.search(context, params, {
+                isLoadMore,
+                sortField: this.groupTimeField,
+            });
         }
         finally {
             await this.endLoading();
@@ -279,7 +345,7 @@ export class CalendarController extends MDControlController {
      * @memberof CalendarController
      */
     async afterLoad(args, items) {
-        await super.afterLoad(args, items);
+        super.afterLoad(args, items);
         this.sortItems(this.state.items);
         this.calcShowMode(this.state.items);
         await this.handleDataGroup();
@@ -412,7 +478,7 @@ export class CalendarController extends MDControlController {
             resultParams.sort = sortQuery;
         }
         // *请求参数处理
-        await this._evt.emit('onBeforeLoad', undefined);
+        await this._evt.emit('onBeforeLoad', { params: resultParams });
         // 合并搜索条件参数，这些参数在onBeforeLoad监听里由外部填入
         Object.assign(resultParams, Object.assign({}, this.state.searchParams));
         // 有size才给page和size。size默认值给0就不传分页和大小
@@ -485,4 +551,70 @@ export class CalendarController extends MDControlController {
     setSelectDate(date) {
         this.state.selectedDate = date;
     }
+    /**
+     * @description 根据数据主键获取日历项模型
+     * @param {string} key
+     * @returns {*}  {(ISysCalendarItem | undefined)}
+     * @memberof CalendarController
+     */
+    getItemModelByKey(key) {
+        var _a;
+        const item = this.state.items.find(_item => _item.srfkey === key);
+        return (_a = this.model.sysCalendarItems) === null || _a === void 0 ? void 0 : _a.find(sysItem => sysItem.itemType === (item === null || item === void 0 ? void 0 : item.itemType));
+    }
+    /**
+     * @description 处理项删除
+     * @param {ICalendarItemData} item 日历项
+     * @param {IContext} context 上下文
+     * @param {IParams} params 视图参数
+     * @returns {*}  {Promise<boolean>}
+     * @memberof CalendarController
+     */
+    async handleItemRemove(item, context, params) {
+        let needRefresh = false;
+        const calendarItem = this.getItemModelByKey(item.srfkey);
+        if (!calendarItem)
+            throw new RuntimeError(ibiz.i18n.t('runtime.controller.control.calendar.noFoundModel'));
+        if (calendarItem.appDataEntityId && item.srfuf !== Srfuf.CREATE) {
+            // 删除后台的数据
+            const deName = calcDeCodeNameById(calendarItem.appDataEntityId);
+            const tempContext = context.clone();
+            tempContext[deName] = item.srfkey;
+            await this.service.removeItem(calendarItem.appDataEntityId, tempContext, params, calendarItem.removeAppDEActionId);
+            needRefresh = true;
+        }
+        return needRefresh;
+    }
+    /**
+     * @description 跳转第一页
+     * @returns {*}  {Promise<IData[]>}
+     * @memberof CalendarController
+     */
+    async goToFirstPage() {
+        return [];
+    }
+    /**
+     * @description 跳转上一页
+     * @returns {*}  {Promise<IData[]>}
+     * @memberof CalendarController
+     */
+    async goToPreviousPage() {
+        return [];
+    }
+    /**
+     * @description 跳转下一页
+     * @returns {*}  {Promise<IData[]>}
+     * @memberof CalendarController
+     */
+    async goToNextPage() {
+        return [];
+    }
+    /**
+     * @description 跳转最后一页
+     * @returns {*}  {Promise<IData[]>}
+     * @memberof CalendarController
+     */
+    async goToLastPage() {
+        return [];
+    }
 }

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

@@ -1,6 +1,51 @@
+import { IHttpResponse } from '@ibiz-template/core';
 import { ISysCalendar } from '@ibiz/model-core';
 import { ICalendarItemData } from '../../../interface';
 import { MDControlService } from '../../../service';
+/**
+ * @description 更多数据项
+ * @interface ILoadMoreItem
+ */
+export interface ILoadMoreItem {
+    /**
+     * @description 当前页
+     * @type {number}
+     * @memberof ILoadMoreItem
+     */
+    curPage: number;
+    /**
+     * @description 总页数
+     * @type {number}
+     * @memberof ILoadMoreItem
+     */
+    totalPage: number;
+    /**
+     * @description 日历项数据
+     * @type {ICalendarItemData[]}
+     * @memberof ILoadMoreItem
+     */
+    items: ICalendarItemData[];
+}
+/**
+ * @description 日历查询配置
+ * @export
+ * @interface CalendarFetchOpts
+ */
+export interface CalendarFetchOpts {
+    /**
+     * @description 是否加载更多
+     * - 时间轴类型日历默认启用
+     * @type {boolean}
+     * @memberof CalendarFetchOpts
+     */
+    isLoadMore?: boolean;
+    /**
+     * @description 排序属性
+     * @type {('beginTime' | 'endTime')}
+     * @memberof CalendarFetchOpts
+     */
+    sortField: 'beginTime' | 'endTime';
+}
 /**
  * 日历部件服务
  *
@@ -11,25 +56,45 @@ import { MDControlService } from '../../../service';
  * @extends {MDControlService<ISysCalendar>}
  */
 export declare class CalendarService extends MDControlService<ISysCalendar> {
+    /**
+     * @description 加载更多信息数据
+     * @type {{
+     *     [modelId: string]: ILoadMoreItem;
+     *   }}
+     * @memberof CalendarService
+     */
+    loadMore: {
+        [modelId: string]: ILoadMoreItem;
+    };
+    /**
+     * @description 删除单条数据
+     * @param {string} appDataEntityId 实体标识
+     * @param {IContext} context 上下文
+     * @param {IParams} [params={}] 视图参数
+     * @param {string} [removeAppDEActionId='remove'] 删除实体行为标识
+     * @returns {*}  {Promise<IHttpResponse>}
+     * @memberof CalendarService
+     */
+    removeItem(appDataEntityId: string, context: IContext, params?: IParams, removeAppDEActionId?: string): Promise<IHttpResponse>;
     /**
      * 执行查询多条数据的方法
      *
      * @author zk
      * @date 2023-08-08 10:08:47
      * @param {IContext} context
-     * @param {IParams} [params={}]
+     * @param {IParams} params
      * @return {*}  Promise<ICalendarItemData[]>
      * @memberof CalendarService
      */
-    search(context: IContext, params?: IParams): Promise<ICalendarItemData[]>;
+    search(context: IContext, params: IParams, opts?: CalendarFetchOpts): Promise<ICalendarItemData[]>;
     /**
-     * 设置日历项配置
-     *
-     * @author zk
-     * @date 2023-08-08 06:08:14
+     * @description 设置日历项配置
+     * @private
      * @param {IData[]} items
      * @param {number} index
-     * @return {*}  {ICalendarItemData[]}
+     * @param {number} totalPage
+     * @param {boolean} [isLoadMore=false]
+     * @returns {*}  {ICalendarItemData[]}
      * @memberof CalendarService
      */
     private setCalendarConfigData;
@@ -58,12 +123,12 @@ export declare class CalendarService extends MDControlService<ISysCalendar> {
      */
     private getSearchConds;
     /**
-     * 处理请求参数
-     *
+     * @description 处理请求参数
      * @private
      * @param {ISysCalendarItem} item
      * @param {IParams} params
-     * @return {*}  {IParams}
+     * @param {CalendarFetchOpts} [opts]
+     * @returns {*}  {IParams}
      * @memberof CalendarService
      */
     private handleRequestParams;

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

@@ -1 +1 @@
-{"version":3,"file":"calendar.service.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/calendar/calendar.service.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAoB,MAAM,kBAAkB,CAAC;AAElE,OAAO,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AACvD,OAAO,EAAE,gBAAgB,EAAoB,MAAM,kBAAkB,CAAC;AAEtE;;;;;;;;GAQG;AACH,qBAAa,eAAgB,SAAQ,gBAAgB,CAAC,YAAY,CAAC;IACjE;;;;;;;;;OASG;IACG,MAAM,CACV,OAAO,EAAE,QAAQ,EACjB,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,iBAAiB,EAAE,CAAC;IAgC/B;;;;;;;;;OASG;IACH,OAAO,CAAC,qBAAqB;IAqB7B;;;;;;;;;;;;OAYG;YACW,KAAK;IAiBnB;;;;;;;;OAQG;IACH,OAAO,CAAC,cAAc;IAkEtB;;;;;;;;OAQG;IACH,OAAO,CAAC,mBAAmB;CAe5B"}
+{"version":3,"file":"calendar.service.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/calendar/calendar.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAgB,MAAM,qBAAqB,CAAC;AAClE,OAAO,EAAE,YAAY,EAAoB,MAAM,kBAAkB,CAAC;AAElE,OAAO,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AACvD,OAAO,EAAE,gBAAgB,EAAoB,MAAM,kBAAkB,CAAC;AACtE;;;GAGG;AACH,MAAM,WAAW,aAAa;IAC5B;;;;OAIG;IACH,OAAO,EAAE,MAAM,CAAC;IAChB;;;;OAIG;IACH,SAAS,EAAE,MAAM,CAAC;IAClB;;;;OAIG;IACH,KAAK,EAAE,iBAAiB,EAAE,CAAC;CAC5B;AAED;;;;GAIG;AACH,MAAM,WAAW,iBAAiB;IAChC;;;;;OAKG;IACH,UAAU,CAAC,EAAE,OAAO,CAAC;IAErB;;;;OAIG;IACH,SAAS,EAAE,WAAW,GAAG,SAAS,CAAC;CACpC;AAED;;;;;;;;GAQG;AACH,qBAAa,eAAgB,SAAQ,gBAAgB,CAAC,YAAY,CAAC;IACjE;;;;;;OAMG;IACH,QAAQ,EAAE;QACR,CAAC,OAAO,EAAE,MAAM,GAAG,aAAa,CAAC;KAClC,CAAM;IAEP;;;;;;;;OAQG;IACG,UAAU,CACd,eAAe,EAAE,MAAM,EACvB,OAAO,EAAE,QAAQ,EACjB,MAAM,GAAE,OAAY,EACpB,mBAAmB,GAAE,MAAiB,GACrC,OAAO,CAAC,aAAa,CAAC;IAWzB;;;;;;;;;OASG;IACG,MAAM,CACV,OAAO,EAAE,QAAQ,EACjB,MAAM,EAAE,OAAO,EACf,IAAI,CAAC,EAAE,iBAAiB,GACvB,OAAO,CAAC,iBAAiB,EAAE,CAAC;IAqC/B;;;;;;;;;OASG;IACH,OAAO,CAAC,qBAAqB;IAuC7B;;;;;;;;;;;;OAYG;YACW,KAAK;IAiBnB;;;;;;;;OAQG;IACH,OAAO,CAAC,cAAc;IAkEtB;;;;;;;;OAQG;IACH,OAAO,CAAC,mBAAmB;CA+B5B"}

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

@@ -11,48 +11,71 @@ import { MDControlService, CalendarItemData } from '../../../service';
  * @extends {MDControlService<ISysCalendar>}
  */
 export class CalendarService extends MDControlService {
+    constructor() {
+        super(...arguments);
+        /**
+         * @description 加载更多信息数据
+         * @type {{
+         *     [modelId: string]: ILoadMoreItem;
+         *   }}
+         * @memberof CalendarService
+         */
+        this.loadMore = {};
+    }
+    /**
+     * @description 删除单条数据
+     * @param {string} appDataEntityId 实体标识
+     * @param {IContext} context 上下文
+     * @param {IParams} [params={}] 视图参数
+     * @param {string} [removeAppDEActionId='remove'] 删除实体行为标识
+     * @returns {*}  {Promise<IHttpResponse>}
+     * @memberof CalendarService
+     */
+    async removeItem(appDataEntityId, context, params = {}, removeAppDEActionId = 'remove') {
+        const res = await this.app.deService.exec(appDataEntityId, removeAppDEActionId, context, undefined, params);
+        return res;
+    }
     /**
      * 执行查询多条数据的方法
      *
      * @author zk
      * @date 2023-08-08 10:08:47
      * @param {IContext} context
-     * @param {IParams} [params={}]
+     * @param {IParams} params
      * @return {*}  Promise<ICalendarItemData[]>
      * @memberof CalendarService
      */
-    async search(context, params = {}) {
+    async search(context, params, opts) {
         const { sysCalendarItems } = this.model;
-        if (!sysCalendarItems) {
+        if (!sysCalendarItems)
             return [];
-        }
         const promises = sysCalendarItems.map(async (item) => {
             const fetchAction = item.appDEDataSetId || 'fetchdefault';
             const tempContext = context.clone();
-            const tempParams = this.handleRequestParams(item, params);
-            if (item.maxSize) {
-                tempParams.size = item.maxSize;
-            }
+            const tempParams = this.handleRequestParams(item, params, opts);
             return this.exec2(fetchAction, tempContext, tempParams, undefined, item.appDataEntityId);
         });
         const resArray = await Promise.all(promises);
         // 二维数组
         const twoDimensionalArray = resArray.map((res, index) => {
-            return this.setCalendarConfigData(res.data, index);
+            var _a;
+            return this.setCalendarConfigData(res.data, index, Number((_a = res.headers) === null || _a === void 0 ? void 0 : _a['x-total-pages']) || 0, opts === null || opts === void 0 ? void 0 : opts.isLoadMore);
         });
         return twoDimensionalArray.flat();
     }
     /**
-     * 设置日历项配置
-     *
-     * @author zk
-     * @date 2023-08-08 06:08:14
+     * @description 设置日历项配置
+     * @private
      * @param {IData[]} items
      * @param {number} index
-     * @return {*}  {ICalendarItemData[]}
+     * @param {number} totalPage
+     * @param {boolean} [isLoadMore=false]
+     * @returns {*}  {ICalendarItemData[]}
      * @memberof CalendarService
      */
-    setCalendarConfigData(items, index) {
+    setCalendarConfigData(items, index, totalPage, isLoadMore = false) {
+        var _a;
+        var _b;
         const { sysCalendarItems } = this.model;
         if (!sysCalendarItems) {
             throw new RuntimeError(ibiz.i18n.t('runtime.controller.control.calendar.noFoundModel'));
@@ -61,9 +84,25 @@ export class CalendarService extends MDControlService {
         if (!calendarItem) {
             throw new RuntimeError(ibiz.i18n.t('runtime.controller.control.calendar.noFoundModel'));
         }
-        return items.map(item => {
+        const itemType = calendarItem.itemType;
+        (_a = (_b = this.loadMore)[itemType]) !== null && _a !== void 0 ? _a : (_b[itemType] = {
+            curPage: 0,
+            totalPage: 0,
+            items: [],
+        });
+        const moreData = this.loadMore[itemType];
+        moreData.totalPage = totalPage;
+        const data = items.map(item => {
             return new CalendarItemData(calendarItem, item);
         });
+        if (isLoadMore) {
+            moreData.curPage += 1;
+            moreData.items.push(...data);
+        }
+        else {
+            moreData.items = [...data];
+        }
+        return [...moreData.items];
     }
     /**
      * 执行方法实体方法（通过实体id和方法名）
@@ -157,15 +196,17 @@ export class CalendarService extends MDControlService {
         ];
     }
     /**
-     * 处理请求参数
-     *
+     * @description 处理请求参数
      * @private
      * @param {ISysCalendarItem} item
      * @param {IParams} params
-     * @return {*}  {IParams}
+     * @param {CalendarFetchOpts} [opts]
+     * @returns {*}  {IParams}
      * @memberof CalendarService
      */
-    handleRequestParams(item, params) {
+    handleRequestParams(item, params, opts) {
+        var _a;
+        var _b, _c;
         const tempParams = clone(params);
         const { srfstartdate, srfenddate } = tempParams;
         if (srfstartdate && srfenddate) {
@@ -173,8 +214,22 @@ export class CalendarService extends MDControlService {
                 searchconds: this.getSearchConds(item, params),
             });
         }
+        const { maxSize, itemType, endTimeAppDEFieldId, beginTimeAppDEFieldId } = item;
         delete tempParams.srfstartdate;
         delete tempParams.srfenddate;
+        tempParams.size = maxSize || 1000;
+        if (opts) {
+            const { isLoadMore, sortField } = opts;
+            if (isLoadMore) {
+                (_a = (_b = this.loadMore)[_c = itemType]) !== null && _a !== void 0 ? _a : (_b[_c] = {
+                    curPage: 0,
+                    totalPage: 0,
+                    items: [],
+                });
+                tempParams.page = this.loadMore[itemType].curPage;
+            }
+            tempParams.sort = `${sortField === 'beginTime' ? beginTimeAppDEFieldId === null || beginTimeAppDEFieldId === void 0 ? void 0 : beginTimeAppDEFieldId.toLowerCase() : endTimeAppDEFieldId === null || endTimeAppDEFieldId === void 0 ? void 0 : endTimeAppDEFieldId.toLowerCase()},desc`;
+        }
         return tempParams;
     }
 }

package/out/controller/control/caption-bar/caption-bar.controller.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"caption-bar.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/caption-bar/caption-bar.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC/C,OAAO,EACL,gBAAgB,EAChB,gBAAgB,EAChB,qBAAqB,EACtB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AAGjD;;;;;;;;GAQG;AACH,qBAAa,oBACX,SAAQ,iBAAiB,CAAC,WAAW,EAAE,gBAAgB,EAAE,gBAAgB,CACzE,YAAW,qBAAqB;IAEhC,SAAS,CAAC,SAAS,IAAI,IAAI;cAOX,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAmB1C;;;;;OAKG;IACH,kBAAkB,IAAI,IAAI;CAQ3B"}
+{"version":3,"file":"caption-bar.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/caption-bar/caption-bar.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC/C,OAAO,EACL,gBAAgB,EAChB,gBAAgB,EAChB,qBAAqB,EACtB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AAGjD;;;;;;;;GAQG;AACH,qBAAa,oBACX,SAAQ,iBAAiB,CAAC,WAAW,EAAE,gBAAgB,EAAE,gBAAgB,CACzE,YAAW,qBAAqB;IAEhC,SAAS,CAAC,SAAS,IAAI,IAAI;cAOX,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAyB1C;;;;;OAKG;IACH,kBAAkB,IAAI,IAAI;CAQ3B"}

package/out/controller/control/caption-bar/caption-bar.controller.js

@@ -20,7 +20,15 @@ export class CaptionBarController extends ControlController {
         await super.onCreated();
         this.view.evt.on('onViewInfoChange', ({ caption: _caption, dataInfo }) => {
             const { showDataInfoBar } = this.view.model;
-            this.state.caption = `${this.view.model.caption}${showDataInfoBar && dataInfo ? `-${dataInfo}` : ''}`;
+            if (ibiz.config.view.onlyShowDataInfo && showDataInfoBar && dataInfo) {
+                this.state.caption = dataInfo;
+            }
+            else if (!ibiz.config.view.enableDataInfoBar) {
+                this.state.caption = `${this.view.model.caption}`;
+            }
+            else {
+                this.state.caption = `${this.view.model.caption}${showDataInfoBar && dataInfo ? `-${dataInfo}` : ''}`;
+            }
             this.setBrowserTabTitle();
         });
         this.view.evt.on('onDataChange', ({ dataArg }) => {

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

@@ -92,6 +92,12 @@ export declare class ChartController extends MDControlController<IDEChart, IChar
      * @memberof ChartController
      */
     handleMultipleSerieGridData(): void;
+    spanMethod(data: {
+        row: IData;
+        column: IData;
+        rowIndex: number;
+        columnIndex: number;
+    }): number[];
     /**
      * 计算表格数据
      *
@@ -125,6 +131,30 @@ export declare class ChartController extends MDControlController<IDEChart, IChar
      * @date 2023-06-09 09:37:25
      */
     resizeChart(): void;
+    /**
+     * @description 跳转第一页
+     * @returns {*}  {Promise<IData[]>}
+     * @memberof ChartController
+     */
+    goToFirstPage(): Promise<IData[]>;
+    /**
+     * @description 跳转上一页
+     * @returns {*}  {Promise<IData[]>}
+     * @memberof ChartController
+     */
+    goToPreviousPage(): Promise<IData[]>;
+    /**
+     * @description 跳转下一页
+     * @returns {*}  {Promise<IData[]>}
+     * @memberof ChartController
+     */
+    goToNextPage(): Promise<IData[]>;
+    /**
+     * @description 跳转最后一页
+     * @returns {*}  {Promise<IData[]>}
+     * @memberof ChartController
+     */
+    goToLastPage(): Promise<IData[]>;
     protected onDestroyed(): Promise<void>;
 }
 //# sourceMappingURL=chart.controller.d.ts.map