npm - @ibiz-template/runtime - Versions diffs - 0.7.41-alpha.5 → 0.7.41-alpha.7 - Mend

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

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (74) hide show

package/out/controller/control/tree/tree.controller.d.ts CHANGED Viewed

@@ -3,7 +3,7 @@ import { IDETBUIActionItem, IDETree, IDETreeNode } from '@ibiz/model-core';
 import { ITreeState, ITreeEvent, ITreeController, MDCtrlLoadParams, ITreeNodeData, IApiNewTreeNodeParams } from '../../../interface';
 import { MDControlController } from '../../common';
 import { ContextMenuController } from '../context-menu';
-import { TreeService } from './tree.service';
+import { LoadMoreInfoItem, TreeService } from './tree.service';
 import { ControllerEvent } from '../../utils';
 import { AppCounter } from '../../../service';
 export type DropNodeRS = {
@@ -121,7 +121,7 @@ export declare class TreeController<T extends IDETree = IDETree, S extends ITree
      * @returns {*}
      * @memberof TreeController
      */
-    loadNodes(parentNode?: ITreeNodeData): Promise<ITreeNodeData[]>;
+    loadNodes(parentNode?: ITreeNodeData, isLoadMore?: boolean): Promise<ITreeNodeData[]>;
     /**
      * loadNodes加载完子数据之后的处理
      * @author lxm
@@ -330,5 +330,20 @@ export declare class TreeController<T extends IDETree = IDETree, S extends ITree
      * @return {*}  {Promise<void>}
      */
     createDeNodeData(nodeDatas: IData[]): Promise<void>;
+    /**
+     * @description 获取加载更多信息项
+     * @param {string} id
+     * @returns {*}  {(LoadMoreInfoItem[] | undefined)}
+     * @memberof TreeController
+     */
+    getLoadMoreInfoItems(id: string): LoadMoreInfoItem[] | undefined;
+    /**
+     * @description 获取加载更多最终节点数据
+     * @param {ITreeNodeData} parentNode
+     * @param {boolean} hasQuery
+     * @returns {*}  {ITreeNodeData[]}
+     * @memberof TreeController
+     */
+    getLoadMoreNodes(parentNode: ITreeNodeData, hasQuery: boolean): ITreeNodeData[];
 }
 //# sourceMappingURL=tree.controller.d.ts.map

package/out/controller/control/tree/tree.controller.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"tree.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/tree/tree.controller.ts"],"names":[],"mappings":"AAGA,OAAO,EACL,cAAc,EAIf,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EACL,iBAAiB,EAEjB,OAAO,EAEP,WAAW,EACZ,MAAM,kBAAkB,CAAC;AAG1B,OAAO,EACL,UAAU,EACV,UAAU,EACV,eAAe,EACf,gBAAgB,EAChB,aAAa,EACb,qBAAqB,EACtB,MAAM,oBAAoB,CAAC;AAE5B,OAAO,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AACnD,OAAO,EAAE,qBAAqB,EAAE,MAAM,iBAAiB,CAAC;AACxD,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;~~AAE7C~~,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAC9C,OAAO,EAAE,UAAU,EAAyB,MAAM,kBAAkB,CAAC;AAErE,MAAM,MAAM,UAAU,GAAG;IACvB,aAAa,EAAE,MAAM,CAAC;IACtB,aAAa,EAAE,MAAM,CAAC;IACtB,iBAAiB,EAAE,MAAM,CAAC;CAC3B,CAAC;AAEF;;;;;;;;GAQG;AACH,qBAAa,cAAc,CACvB,CAAC,SAAS,OAAO,GAAG,OAAO,EAC3B,CAAC,SAAS,UAAU,GAAG,UAAU,EACjC,CAAC,SAAS,UAAU,GAAG,UAAU,CAEnC,SAAQ,mBAAmB,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CACnC,YAAW,eAAe,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;IAE3B,OAAO,EAAE,WAAW,CAAC;IAE7B,SAAS,KAAK,IAAI,IAAI,eAAe,CAAC,UAAU,CAAC,CAEhD;IAED;;;;;OAKG;IACH,YAAY,EAAE;QAAE,CAAC,CAAC,EAAE,MAAM,GAAG,qBAAqB,CAAA;KAAE,CAAM;IAE1D;;;;;OAKG;IACH,iBAAiB,EAAE,OAAO,CAAS;IAEnC;;;;OAIG;IACH,WAAW,4BAAmC;IAE9C;;;;OAIG;IACH,gBAAgB,EAAE;QAChB,CAAC,CAAC,EAAE,MAAM,GAAG;YACX;;eAEG;YACH,mBAAmB,CAAC,EAAE,iBAAiB,CAAC;YACxC,iBAAiB,EAAE,OAAO,CAAC;SAC5B,CAAC;KACH,CAAM;IAEP;;;;;OAKG;IACH,OAAO,CAAC,EAAE,UAAU,CAAC;IAErB,SAAS,CAAC,SAAS,IAAI,IAAI;cAWX,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IA6B1C;;;;;OAKG;cACa,eAAe,IAAI,OAAO,CAAC,IAAI,CAAC;cA8ChC,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC;IAO5C;;;;;;OAMG;cACa,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC;IAK5C;;;;;;OAMG;cACa,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC;IAY5C;;;;;OAKG;IACH,SAAS,CAAC,eAAe,IAAI,IAAI;IAiCjC;;;;;OAKG;IACH,SAAS,CAAC,2BAA2B,IAAI,IAAI;IA6B7C;;;;;OAKG;IACG,IAAI,CAAC,IAAI,GAAE,gBAAqB,GAAG,OAAO,CAAC,aAAa,EAAE,CAAC;IA+B3D,cAAc,CAAC,WAAW,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC;IAQ7D;;;;;;OAMG;IACG,SAAS,~~CAAC~~,UAAU,CAAC,EAAE,aAAa,~~GAAG~~,OAAO,CAAC,aAAa,EAAE,CAAC;~~IA6DrE~~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~~CAoB1D~~"}
1	+ {"version":3,"file":"tree.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/tree/tree.controller.ts"],"names":[],"mappings":"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"}

package/out/controller/control/tree/tree.controller.js CHANGED Viewed

@@ -8,7 +8,7 @@ import { UIActionUtil } from '../../../ui-action';
 import { MDControlController } from '../../common';
 import { ContextMenuController } from '../context-menu';
 import { TreeService } from './tree.service';
-import { calcDeCodeNameById, getChildNodeRSs } from '../../../model';
+import { calcDeCodeNameById, getChildNodeRSs, getTreeNode, } from '../../../model';
 import { CounterService, Srfuf } from '../../../service';
 /**
  * 树部件控制器
@@ -270,7 +270,7 @@ export class TreeController extends MDControlController {
      * @returns {*}
      * @memberof TreeController
      */
-    async loadNodes(parentNode) {
+    async loadNodes(parentNode, isLoadMore = false) {
         const params = await this.getFetchParams();
         const hasQuery = !!params.query;
         this.state.isLoading = true;
@@ -281,6 +281,7 @@ export class TreeController extends MDControlController {
                 context: this.context.clone(),
                 params,
                 hasQuery,
+                isLoadMore,
                 ctrl: this,
                 view: this.view,
                 defaultExpandedKeys: this.state.expandedKeys,
@@ -319,9 +320,19 @@ export class TreeController extends MDControlController {
         }
         // 有父节点绑定到父节点数据上，无父节点替换rootNodes
         if (parentNode) {
-            parentNode._children = nodes;
+            if (isLoadMore) {
+                parentNode._children = this.getLoadMoreNodes(parentNode, hasQuery);
+            }
+            else {
+                parentNode._children = nodes;
+            }
         }
         else {
+            if (isLoadMore) {
+                nodes.forEach(node => {
+                    node._children = this.getLoadMoreNodes(node, hasQuery);
+                });
+            }
             this.state.rootNodes = nodes;
         }
         await this.afterLoadNodes(nodes);
@@ -927,4 +938,69 @@ export class TreeController extends MDControlController {
             }
         }));
     }
+    /**
+     * @description 获取加载更多信息项
+     * @param {string} id
+     * @returns {*}  {(LoadMoreInfoItem[] | undefined)}
+     * @memberof TreeController
+     */
+    getLoadMoreInfoItems(id) {
+        return this.service.loadMoreMap[id];
+    }
+    /**
+     * @description 获取加载更多最终节点数据
+     * @param {ITreeNodeData} parentNode
+     * @param {boolean} hasQuery
+     * @returns {*}  {ITreeNodeData[]}
+     * @memberof TreeController
+     */
+    getLoadMoreNodes(parentNode, hasQuery) {
+        const items = [];
+        const infoItems = this.getLoadMoreInfoItems(parentNode._id);
+        if (infoItems) {
+            const childNodeRSs = getChildNodeRSs(this.model, {
+                parentId: parentNode._nodeId,
+                hasQuery,
+            });
+            childNodeRSs === null || childNodeRSs === void 0 ? void 0 : childNodeRSs.forEach(item => {
+                const nodeModel = getTreeNode(this.model, item.childDETreeNodeId);
+                if (!nodeModel) {
+                    return;
+                }
+                const infoItem = infoItems.find(_item => _item.nodeModelId === nodeModel.id);
+                if (!infoItem) {
+                    return;
+                }
+                items.push(...(infoItem.items || []));
+            });
+        }
+        const targetNodes = [];
+        items.forEach((child) => {
+            var _a;
+            const targetNode = (_a = this.model.detreeNodes) === null || _a === void 0 ? void 0 : _a.find((item) => {
+                return item.id === child._nodeId;
+            });
+            // 开启了排除重复值,并且配置了标识属性
+            if (targetNode &&
+                targetNode.distinctMode &&
+                targetNode.idAppDEFieldId) {
+                // 同批次数据排重
+                const index = targetNodes.findIndex((item) => {
+                    var _a, _b;
+                    const id = targetNode.idAppDEFieldId;
+                    if (id) {
+                        return ((_a = item._deData) === null || _a === void 0 ? void 0 : _a[id]) === ((_b = child._deData) === null || _b === void 0 ? void 0 : _b[id]);
+                    }
+                    return false;
+                });
+                if (index < 0) {
+                    targetNodes.push(child);
+                }
+            }
+            else {
+                targetNodes.push(child);
+            }
+        });
+        return targetNodes;
+    }
 }

package/out/controller/control/tree/tree.service.d.ts CHANGED Viewed

@@ -52,6 +52,43 @@ export interface TreeFetchOpts {
      * @memberof TreeFetchOpts
      */
     ctrl?: ITreeController;
+    /**
+     * @description 是否加载更多
+     * @type {boolean}
+     * @memberof TreeFetchOpts
+     */
+    isLoadMore?: boolean;
+}
+/**
+ * @description 加载更多信息项
+ * @export
+ * @interface LoadMoreInfoItem
+ */
+export interface LoadMoreInfoItem {
+    /**
+     * @description 节点模型id
+     * @type {string}
+     * @memberof LoadMoreInfoItem
+     */
+    nodeModelId: string;
+    /**
+     * @description 当前页
+     * @type {number}
+     * @memberof LoadMoreInfoItem
+     */
+    curPage: number;
+    /**
+     * @description 总页数
+     * @type {number}
+     * @memberof LoadMoreInfoItem
+     */
+    totalPage: number;
+    /**
+     * @description 节点数据
+     * @type {TreeDataSetNodeData[]}
+     * @memberof LoadMoreInfoItem
+     */
+    items: TreeDataSetNodeData[];
 }
 /**
  * 树部件服务
@@ -62,6 +99,16 @@ export interface TreeFetchOpts {
  * @extends {MDControlService<IDETree>}
  */
 export declare class TreeService<T extends IDETree = IDETree> extends MDControlService<T> {
+    /**
+     * @description 加载更多信息项映射
+     * @type {{
+     *     [parentDataId: string]: LoadMoreInfoItem[];
+     *   }}
+     * @memberof TreeService
+     */
+    loadMoreMap: {
+        [parentDataId: string]: LoadMoreInfoItem[];
+    };
     /**
      * 获取子节点数据
      *
@@ -222,5 +269,33 @@ export declare class TreeService<T extends IDETree = IDETree> extends MDControlS
      * @param {IModel} nodeModel 方法名
      */
     calcStaticExpand(nodeModel: IModel): boolean;
+    /**
+     * @description 初始化分页参数
+     * @param {IDETreeDataSetNode} nodeModel
+     * @param {(ITreeNodeData | undefined)} parentNodeData
+     * @param {TreeFetchOpts} opts
+     * @param {IParams} params
+     * @memberof TreeService
+     */
+    initPageParams(nodeModel: IDETreeDataSetNode, parentNodeData: ITreeNodeData | undefined, opts: TreeFetchOpts, params: IParams): void;
+    /**
+     * @description 更新分页节点数据
+     * @param {IDETreeDataSetNode} nodeModel
+     * @param {(ITreeNodeData | undefined)} parentNodeData
+     * @param {TreeFetchOpts} opts
+     * @param {(string | undefined)} dataSourceType
+     * @param {TreeDataSetNodeData[]} nodeDatas
+     * @memberof TreeService
+     */
+    updatePageItems(nodeModel: IDETreeDataSetNode, parentNodeData: ITreeNodeData | undefined, opts: TreeFetchOpts, dataSourceType: string | undefined, nodeDatas: TreeDataSetNodeData[]): void;
+    /**
+     * @description 更新分页信息
+     * @param {IDETreeDataSetNode} nodeModel
+     * @param {(ITreeNodeData | undefined)} parentNodeData
+     * @param {TreeFetchOpts} opts
+     * @param {number} totalPage
+     * @memberof TreeService
+     */
+    updatePageInfo(nodeModel: IDETreeDataSetNode, parentNodeData: ITreeNodeData | undefined, opts: TreeFetchOpts, totalPage: number): void;
 }
 //# sourceMappingURL=tree.service.d.ts.map

package/out/controller/control/tree/tree.service.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"tree.service.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/tree/tree.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAc,MAAM,qBAAqB,CAAC;AAChE,OAAO,EACL,OAAO,EACP,mBAAmB,EACnB,kBAAkB,EAClB,WAAW,EACX,aAAa,EAEd,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAEL,eAAe,EACf,aAAa,EACb,eAAe,EAChB,MAAM,oBAAoB,CAAC;AAQ5B,OAAO,EACL,gBAAgB,EAEhB,mBAAmB,EACnB,oBAAoB,EAErB,MAAM,kBAAkB,CAAC;AAI1B,MAAM,WAAW,aAAa;IAC5B;;;;;OAKG;IACH,QAAQ,EAAE,OAAO,CAAC;IAClB;;;;;OAKG;IACH,OAAO,EAAE,QAAQ,CAAC;IAClB;;;;;OAKG;IACH,MAAM,EAAE,OAAO,CAAC;IAChB;;;;;OAKG;IACH,mBAAmB,CAAC,EAAE,MAAM,EAAE,CAAC;IAC/B;;;;;OAKG;IACH,IAAI,CAAC,EAAE,OAAO,CAAC;IACf;;;;;OAKG;IACH,IAAI,CAAC,EAAE,eAAe,CAAC;IACvB;;;;;OAKG;IACH,IAAI,CAAC,EAAE,eAAe,CAAC;~~CACxB~~;AAED;;;;;;;GAOG;AACH,qBAAa,WAAW,CACtB,CAAC,SAAS,OAAO,GAAG,OAAO,CAC3B,SAAQ,gBAAgB,CAAC,CAAC,CAAC;IAC3B;;;;;;;OAOG;IACG,eAAe,CACnB,cAAc,EAAE,aAAa,GAAG,SAAS,EACzC,IAAI,EAAE,aAAa,GAClB,OAAO,CAAC,aAAa,EAAE,GAAG,SAAS,CAAC;IA8CvC;;;;;;;;;;OAUG;cACa,oBAAoB,CAClC,SAAS,EAAE,WAAW,EACtB,MAAM,EAAE,aAAa,GAAG,SAAS,EACjC,cAAc,EAAE,aAAa,GAAG,SAAS,EACzC,IAAI,EAAE,aAAa,GAClB,OAAO,CAAC,aAAa,EAAE,CAAC;IAyF3B;;;;;;;;OAQG;cACa,iBAAiB,CAC/B,SAAS,EAAE,WAAW,EACtB,MAAM,EAAE,aAAa,GAAG,SAAS,EACjC,cAAc,EAAE,aAAa,GAAG,SAAS,EACzC,IAAI,EAAE,aAAa,GAClB,OAAO,CAAC,aAAa,CAAC;IAezB;;;;;;;OAOG;IACH,qBAAqB,CACnB,MAAM,EAAE,aAAa,EACrB,cAAc,EAAE,aAAa,GAAG,SAAS,EACzC,IAAI,EAAE,aAAa,GAClB;QACD,OAAO,EAAE,QAAQ,CAAC;QAClB,MAAM,EAAE,OAAO,CAAC;QAChB,UAAU,EAAE,OAAO,CAAC;QACpB,SAAS,EAAE,OAAO,CAAC;KACpB;IA+DD;;;;;;;;OAQG;cACa,cAAc,CAC5B,SAAS,EAAE,kBAAkB,EAC7B,MAAM,EAAE,aAAa,GAAG,SAAS,EACjC,cAAc,EAAE,aAAa,GAAG,SAAS,EACzC,IAAI,EAAE,aAAa,GAClB,OAAO,CAAC,mBAAmB,EAAE,CAAC;~~IAmGjC~~;;;;;;;;;;OAUG;cACa,sBAAsB,CACpC,SAAS,EAAE,kBAAkB,EAC7B,cAAc,EAAE,aAAa,GAAG,SAAS,EACzC,IAAI,EAAE,aAAa,GAClB,OAAO,CAAC,KAAK,EAAE,CAAC;IAkCnB;;;;;;;;;;OAUG;cACa,sBAAsB,CACpC,SAAS,EAAE,kBAAkB,EAC7B,cAAc,EAAE,aAAa,GAAG,SAAS,EACzC,IAAI,EAAE,aAAa,GAClB,OAAO,CAAC,KAAK,EAAE,CAAC;IAuBnB;;;;;;;;;;OAUG;cACa,uBAAuB,CACrC,SAAS,EAAE,kBAAkB,EAC7B,cAAc,EAAE,aAAa,GAAG,SAAS,EACzC,IAAI,EAAE,aAAa,GAClB,OAAO,CAAC,KAAK,EAAE,CAAC;IA2BnB;;;;;;;;;OASG;cACa,wBAAwB,CACtC,SAAS,EAAE,kBAAkB,EAC7B,cAAc,EAAE,aAAa,GAAG,SAAS,EACzC,IAAI,EAAE,aAAa,GAClB,OAAO,CAAC,KAAK,EAAE,CAAC;IAkBnB;;;;;;;;;OASG;cACa,yBAAyB,CACvC,SAAS,EAAE,kBAAkB,EAC7B,cAAc,EAAE,aAAa,GAAG,SAAS,EACzC,IAAI,EAAE,aAAa,GAClB,OAAO,CAAC,KAAK,EAAE,CAAC;~~IAkBnB~~;;;;;;;OAOG;cACa,oBAAoB,CAClC,SAAS,EAAE,mBAAmB,EAC9B,MAAM,EAAE,aAAa,GAAG,SAAS,EACjC,cAAc,EAAE,aAAa,GAAG,SAAS,EACzC,IAAI,EAAE,aAAa,GAClB,OAAO,CAAC,oBAAoB,EAAE,CAAC;~~IAkClC~~;;;;;;;;OAQG;IACG,UAAU,CACd,eAAe,EAAE,MAAM,EACvB,OAAO,EAAE,QAAQ,EACjB,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,aAAa,CAAC;IAazB;;;;;;;;;OASG;IACG,gBAAgB,CACpB,eAAe,EAAE,MAAM,EACvB,UAAU,EAAE,MAAM,EAClB,OAAO,EAAE,QAAQ,EACjB,IAAI,CAAC,EAAE,KAAK,EACZ,MAAM,CAAC,EAAE,OAAO,GACf,OAAO,CAAC,aAAa,CAAC;IAazB;;;;;;;OAOG;IACH,UAAU,CAAC,SAAS,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO;IAKrD;;;;;;OAMG;IACH,gBAAgB,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO;~~CAI7C~~"}
1	+ {"version":3,"file":"tree.service.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/tree/tree.service.ts"],"names":[],"mappings":"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"}

package/out/controller/control/tree/tree.service.js CHANGED Viewed

@@ -12,6 +12,17 @@ import { execDELogicAction } from '../../../de-logic';
  * @extends {MDControlService<IDETree>}
  */
 export class TreeService extends MDControlService {
+    constructor() {
+        super(...arguments);
+        /**
+         * @description 加载更多信息项映射
+         * @type {{
+         *     [parentDataId: string]: LoadMoreInfoItem[];
+         *   }}
+         * @memberof TreeService
+         */
+        this.loadMoreMap = {};
+    }
     /**
      * 获取子节点数据
      *
@@ -205,6 +216,7 @@ export class TreeService extends MDControlService {
             };
         // 设置查询长度
         params.size = nodeModel.maxSize || 1000;
+        this.initPageParams(nodeModel, parentNodeData, opts, params);
         // 排序属性
         if (nodeModel.sortAppDEFieldId) {
             Object.assign(params, {
@@ -258,6 +270,7 @@ export class TreeService extends MDControlService {
                     defaultExpand,
                 });
             });
+            this.updatePageItems(nodeModel, parentNodeData, opts, dataSourceType, nodeDatas);
             return nodeDatas;
         }
         return [];
@@ -399,12 +412,14 @@ export class TreeService extends MDControlService {
      * @memberof TreeService
      */
     async getDENodeDatasByDEDataset(nodeModel, parentNodeData, opts) {
+        var _a;
         const { appDEDataSetId, appDataEntityId } = nodeModel;
         const { context, params } = opts;
         let result = [];
         if (appDEDataSetId && appDataEntityId) {
             const response = await this.app.deService.exec(appDataEntityId, appDEDataSetId, context, params);
             if (response.ok && response.data) {
+                this.updatePageInfo(nodeModel, parentNodeData, opts, Number((_a = response.headers) === null || _a === void 0 ? void 0 : _a['x-total-pages']) || 0);
                 result = response.data;
             }
         }
@@ -434,14 +449,25 @@ export class TreeService extends MDControlService {
         const items = await this.app.codeList.get(nodeModel.codeListId, context, params);
         if (items.length) {
             const nodeDatas = items.map((item, index) => {
-                const defaultExpand = this.calcExpand(nodeModel, index);
-                return new TreeCodeListNodeData(nodeModel, parentNodeData, {
-                    data: item,
-                    leaf: !!opts.leaf,
-                    navContext,
-                    navParams,
-                    defaultExpand,
-                });
+                // 处理多层级代码表，递归填充子节点数据
+                const fillChildren = (codeListItem, parent, i) => {
+                    var _a;
+                    const defaultExpand = this.calcExpand(nodeModel, i);
+                    const node = new TreeCodeListNodeData(nodeModel, parent, {
+                        data: codeListItem,
+                        leaf: !!opts.leaf && !((_a = codeListItem.children) === null || _a === void 0 ? void 0 : _a.length),
+                        navContext,
+                        navParams,
+                        defaultExpand,
+                    });
+                    if (codeListItem.children && codeListItem.children.length) {
+                        node._children = codeListItem.children.map((child, j) => {
+                            return fillChildren(child, node, j);
+                        });
+                    }
+                    return node;
+                };
+                return fillChildren(item, parentNodeData, index);
             });
             return nodeDatas;
         }
@@ -500,4 +526,115 @@ export class TreeService extends MDControlService {
         const { expandFirstOnly, expanded } = nodeModel;
         return !!expanded || !!expandFirstOnly;
     }
+    /**
+     * @description 初始化分页参数
+     * @param {IDETreeDataSetNode} nodeModel
+     * @param {(ITreeNodeData | undefined)} parentNodeData
+     * @param {TreeFetchOpts} opts
+     * @param {IParams} params
+     * @memberof TreeService
+     */
+    initPageParams(nodeModel, parentNodeData, opts, params) {
+        if (nodeModel.enablePaging && nodeModel.pagingSize) {
+            params.size = nodeModel.pagingSize;
+        }
+        if (parentNodeData) {
+            if (!this.loadMoreMap[parentNodeData._id]) {
+                this.loadMoreMap[parentNodeData._id] = [];
+            }
+            if (opts.isLoadMore) {
+                let info = this.loadMoreMap[parentNodeData._id].find(item => item.nodeModelId === nodeModel.id);
+                if (!info) {
+                    info = {
+                        nodeModelId: nodeModel.id,
+                        curPage: 0,
+                        totalPage: 0,
+                        items: [],
+                    };
+                    this.loadMoreMap[parentNodeData._id].push(info);
+                }
+                params.page = info.curPage + 1;
+            }
+            else {
+                const index = this.loadMoreMap[parentNodeData._id].findIndex(item => item.nodeModelId === nodeModel.id);
+                if (index === -1) {
+                    this.loadMoreMap[parentNodeData._id].push({
+                        nodeModelId: nodeModel.id,
+                        curPage: 0,
+                        totalPage: 0,
+                        items: [],
+                    });
+                }
+                else {
+                    this.loadMoreMap[parentNodeData._id][index] = {
+                        nodeModelId: nodeModel.id,
+                        curPage: 0,
+                        totalPage: 0,
+                        items: [],
+                    };
+                }
+            }
+        }
+    }
+    /**
+     * @description 更新分页节点数据
+     * @param {IDETreeDataSetNode} nodeModel
+     * @param {(ITreeNodeData | undefined)} parentNodeData
+     * @param {TreeFetchOpts} opts
+     * @param {(string | undefined)} dataSourceType
+     * @param {TreeDataSetNodeData[]} nodeDatas
+     * @memberof TreeService
+     */
+    updatePageItems(nodeModel, parentNodeData, opts, dataSourceType, nodeDatas) {
+        if (parentNodeData) {
+            if (!this.loadMoreMap[parentNodeData._id]) {
+                this.loadMoreMap[parentNodeData._id] = [];
+            }
+            let info = this.loadMoreMap[parentNodeData._id].find(item => item.nodeModelId === nodeModel.id);
+            if (!info) {
+                info = {
+                    nodeModelId: nodeModel.id,
+                    curPage: 0,
+                    totalPage: 0,
+                    items: [],
+                };
+                this.loadMoreMap[parentNodeData._id].push(info);
+            }
+            if (dataSourceType === 'DEDATASET' && opts.isLoadMore) {
+                info.items.push(...nodeDatas);
+            }
+            else {
+                info.items = [...nodeDatas];
+            }
+        }
+    }
+    /**
+     * @description 更新分页信息
+     * @param {IDETreeDataSetNode} nodeModel
+     * @param {(ITreeNodeData | undefined)} parentNodeData
+     * @param {TreeFetchOpts} opts
+     * @param {number} totalPage
+     * @memberof TreeService
+     */
+    updatePageInfo(nodeModel, parentNodeData, opts, totalPage) {
+        if (parentNodeData && nodeModel.enablePaging && nodeModel.pagingSize) {
+            if (!this.loadMoreMap[parentNodeData._id]) {
+                this.loadMoreMap[parentNodeData._id] = [];
+            }
+            let info = this.loadMoreMap[parentNodeData._id].find(item => item.nodeModelId === nodeModel.id);
+            if (!info) {
+                info = {
+                    nodeModelId: nodeModel.id,
+                    curPage: 0,
+                    totalPage: 0,
+                    items: [],
+                };
+                this.loadMoreMap[parentNodeData._id].push(info);
+            }
+            if (opts.isLoadMore) {
+                info.curPage += 1;
+            }
+            info.totalPage = totalPage;
+        }
+    }
 }

package/out/controller/utils/util/util.d.ts CHANGED Viewed

@@ -49,4 +49,19 @@ export declare function formatSeparator(type: string, items: IData[] | undefined
  * @returns {*}  {string}
  */
 export declare function formatDate(val: string, format: 'year' | 'quarter' | 'month' | 'week' | 'day'): string;
+/**
+ * @description 获取某年的总周数
+ * @param {number} year 年份
+ * @returns {*}  {number}
+ */
+export declare function getWeeksInYear(year: number): number;
+/**
+ * @description 生成年周数组
+ * @export
+ * @param {string} minYearWeek 最小年周
+ * @param {string} maxYearWeek 最大年周
+ * @param {number} [paddingWeeks=0] 前后范围
+ * @returns {*}  {string[]}
+ */
+export declare function generateYearWeekRange(minYearWeek: string, maxYearWeek: string, paddingWeeks?: number): string[];
 //# sourceMappingURL=util.d.ts.map

package/out/controller/utils/util/util.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"util.d.ts","sourceRoot":"","sources":["../../../../src/controller/utils/util/util.ts"],"names":[],"mappings":"~~AAIA~~,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAE7C;;;;;;;;;;GAUG;AACH,wBAAgB,aAAa,CAAC,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO,GAAG,OAAO,CAKtE;AAED;;;;;;;;;GASG;AACH,wBAAgB,aAAa,CAC3B,IAAI,EAAE,KAAK,GAAG,SAAS,GAAG,KAAK,EAAE,GAAG,SAAS,EAAE,GAC9C,KAAK,GAAG,SAAS,CAMnB;AAED;;;;;;GAMG;AACH,wBAAgB,WAAW,CACzB,KAAK,EAAE,KAAK,EAAE,EACd,UAAU,GAAE,MAAmB,GAC9B,KAAK,EAAE,CAaT;AAED;;;;;;;;;GASG;AACH,wBAAgB,eAAe,CAC7B,IAAI,EAAE,MAAM,EACZ,KAAK,EAAE,KAAK,EAAE,GAAG,SAAS,EAC1B,KAAK,EAAE,KAAK,GAAG,SAAS,EACxB,IAAI,CAAC,EAAE,KAAK,EAAE,GAAG,SAAS,GACzB,MAAM,EAAE,CAyGV;AAED;;;;;;GAMG;AACH,wBAAgB,UAAU,CACxB,GAAG,EAAE,MAAM,EACX,MAAM,EAAE,MAAM,GAAG,SAAS,GAAG,OAAO,GAAG,MAAM,GAAG,KAAK,GACpD,MAAM,~~CA2BR~~"}
1	+ {"version":3,"file":"util.d.ts","sourceRoot":"","sources":["../../../../src/controller/utils/util/util.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAE7C;;;;;;;;;;GAUG;AACH,wBAAgB,aAAa,CAAC,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO,GAAG,OAAO,CAKtE;AAED;;;;;;;;;GASG;AACH,wBAAgB,aAAa,CAC3B,IAAI,EAAE,KAAK,GAAG,SAAS,GAAG,KAAK,EAAE,GAAG,SAAS,EAAE,GAC9C,KAAK,GAAG,SAAS,CAMnB;AAED;;;;;;GAMG;AACH,wBAAgB,WAAW,CACzB,KAAK,EAAE,KAAK,EAAE,EACd,UAAU,GAAE,MAAmB,GAC9B,KAAK,EAAE,CAaT;AAED;;;;;;;;;GASG;AACH,wBAAgB,eAAe,CAC7B,IAAI,EAAE,MAAM,EACZ,KAAK,EAAE,KAAK,EAAE,GAAG,SAAS,EAC1B,KAAK,EAAE,KAAK,GAAG,SAAS,EACxB,IAAI,CAAC,EAAE,KAAK,EAAE,GAAG,SAAS,GACzB,MAAM,EAAE,CAyGV;AAED;;;;;;GAMG;AACH,wBAAgB,UAAU,CACxB,GAAG,EAAE,MAAM,EACX,MAAM,EAAE,MAAM,GAAG,SAAS,GAAG,OAAO,GAAG,MAAM,GAAG,KAAK,GACpD,MAAM,CAyBR;AAED;;;;GAIG;AACH,wBAAgB,cAAc,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAInD;AAED;;;;;;;GAOG;AACH,wBAAgB,qBAAqB,CACnC,WAAW,EAAE,MAAM,EACnB,WAAW,EAAE,MAAM,EACnB,YAAY,SAAI,GACf,MAAM,EAAE,CA0CV"}

package/out/controller/utils/util/util.js CHANGED Viewed

@@ -1,3 +1,4 @@
+/* eslint-disable no-plusplus */
 /* eslint-disable no-case-declarations */
 /* eslint-disable no-restricted-globals */
 import { isNil } from 'ramda';
@@ -184,20 +185,18 @@ export function formatDate(val, format) {
     if (!val || isNaN(date.getTime()))
         return value;
     const year = dayjs(date).year();
-    const month = dayjs(date).month() + 1;
     switch (format) {
         case 'year':
             value = `${year}`;
             break;
         case 'quarter':
-            value = `${year} ${Math.ceil(month / 3)}${ibiz.i18n.t('runtime.controller.utils.util.quarter')}`;
+            value = `${year} ${dayjs(date).quarter()}${ibiz.i18n.t('runtime.controller.utils.util.quarter')}`;
             break;
         case 'month':
-            value = `${year} ${month}${ibiz.i18n.t('runtime.controller.utils.util.month')}`;
+            value = `${year} ${dayjs(date).month() + 1}${ibiz.i18n.t('runtime.controller.utils.util.month')}`;
             break;
         case 'week':
-            const week = dayjs(date).week();
-            value = `${year} ${week}${ibiz.i18n.t('runtime.controller.utils.util.week')}`;
+            value = `${year} ${dayjs(date).week()}${ibiz.i18n.t('runtime.controller.utils.util.week')}`;
             break;
         case 'day':
             value = dayjs(date).format('YYYY-MM-DD');
@@ -207,3 +206,56 @@ export function formatDate(val, format) {
     }
     return value;
 }
+/**
+ * @description 获取某年的总周数
+ * @param {number} year 年份
+ * @returns {*}  {number}
+ */
+export function getWeeksInYear(year) {
+    const lastDayOfYear = dayjs(`${year}-12-31`);
+    const week = lastDayOfYear.isoWeek();
+    return week === 1 ? 52 : week;
+}
+/**
+ * @description 生成年周数组
+ * @export
+ * @param {string} minYearWeek 最小年周
+ * @param {string} maxYearWeek 最大年周
+ * @param {number} [paddingWeeks=0] 前后范围
+ * @returns {*}  {string[]}
+ */
+export function generateYearWeekRange(minYearWeek, maxYearWeek, paddingWeeks = 0) {
+    // 1. 解析最小和最大年周
+    const [minYear, minWeek] = minYearWeek.split('-').map(Number);
+    const [maxYear, maxWeek] = maxYearWeek.split('-').map(Number);
+    // 2. 计算起始年周（minYearWeek - paddingWeeks）
+    let startYear = minYear;
+    let startWeek = minWeek - paddingWeeks;
+    while (startWeek < 1) {
+        startYear--;
+        startWeek += getWeeksInYear(startYear);
+    }
+    // 3. 计算结束年周（maxYearWeek + paddingWeeks）
+    let endYear = maxYear;
+    let endWeek = maxWeek + paddingWeeks;
+    const maxWeeksInEndYear = getWeeksInYear(endYear);
+    if (endWeek > maxWeeksInEndYear) {
+        endWeek -= maxWeeksInEndYear;
+        endYear++;
+    }
+    // 4. 生成从 startYear-startWeek 到 endYear-endWeek 的所有年周
+    const yearWeeks = [];
+    let currentYear = startYear;
+    let currentWeek = startWeek;
+    while (currentYear < endYear ||
+        (currentYear === endYear && currentWeek <= endWeek)) {
+        yearWeeks.push(`${currentYear}-${currentWeek}`);
+        currentWeek++;
+        const weeksInCurrentYear = getWeeksInYear(currentYear);
+        if (currentWeek > weeksInCurrentYear) {
+            currentYear++;
+            currentWeek = 1;
+        }
+    }
+    return yearWeeks;
+}

package/out/engine/md-view.engine.d.ts CHANGED Viewed

@@ -80,7 +80,7 @@ export declare class MDViewEngine extends ViewEngineBase {
         params?: IParams;
     }): Promise<IUIActionResult>;
     /**
-     * 打开编辑数据视图
+     * 打开新建数据视图
      *
      * @author lxm
      * @date 2022-09-01 18:09:19

package/out/engine/md-view.engine.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"md-view.engine.d.ts","sourceRoot":"","sources":["../../src/engine/md-view.engine.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,mBAAmB,EAA2B,MAAM,kBAAkB,CAAC;AAGhF,OAAO,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AAC/C,OAAO,EACL,YAAY,EACZ,YAAY,EACZ,oBAAoB,EACpB,kBAAkB,EAClB,oBAAoB,EACpB,gBAAgB,EAChB,SAAS,EACT,eAAe,EACf,kBAAkB,EACnB,MAAM,cAAc,CAAC;AAEtB,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAEpD;;;;;;;GAOG;AACH,qBAAa,YAAa,SAAQ,cAAc;IAC9C,UAAkB,IAAI,EAAE,cAAc,CACpC,mBAAmB,EACnB,YAAY,EACZ,YAAY,CACb,CAAC;IAEF;;;;;;OAMG;IACH,IAAI,gBAAgB,IAAI,MAAM,CAE7B;IAED;;;;;;;OAOG;IACH,SAAS,KAAK,UAAU,IAAI,kBAAkB,GAAG,SAAS,CAEzD;IAED;;;;;OAKG;IACH,SAAS,KAAK,YAAY,IAAI,oBAAoB,CAEjD;IAED;;;;;;OAMG;IACH,SAAS,KAAK,YAAY,IAAI,oBAAoB,CAIjD;IAEK,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAkC1B,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAiGhC;;;;;OAKG;IACH,mBAAmB,IAAI,IAAI;IAQ3B;;;;;;;OAOG;cACa,aAAa,CAAC,KAAK,EAAE,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC;IAQxD,IAAI,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,GAAG,OAAO,CAAC,KAAK,GAAG,IAAI,GAAG,SAAS,CAAC;IAsCrE,SAAS,CAAC,OAAO,IAAI,KAAK,EAAE;IAI5B;;;;;;;;OAQG;cACa,QAAQ,CAAC,IAAI,EAAE;QAC7B,IAAI,EAAE,KAAK,EAAE,CAAC;QACd,KAAK,CAAC,EAAE,UAAU,CAAC;QACnB,OAAO,CAAC,EAAE,QAAQ,CAAC;QACnB,MAAM,CAAC,EAAE,OAAO,CAAC;KAClB,GAAG,OAAO,CAAC,eAAe,CAAC;~~IAkC5B~~;;;;;;;;OAQG;cACa,OAAO,CAAC,IAAI,EAAE;QAC5B,IAAI,EAAE,KAAK,EAAE,CAAC;QACd,KAAK,CAAC,EAAE,UAAU,CAAC;QACnB,QAAQ,CAAC,EAAE,OAAO,CAAC;KACpB,GAAG,OAAO,CAAC,eAAe,CAAC;~~IAsC5B~~;;;;;;OAMG;cACa,MAAM,CAAC,IAAI,CAAC,EAAE,kBAAkB,GAAG,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC;IAI5E;;;;;OAKG;cACa,IAAI,CAAC,IAAI,GAAE,gBAAqB,GAAG,OAAO,CAAC,IAAI,CAAC;IAIhE;;;;;OAKG;cACa,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAIxC;;;;;OAKG;cACa,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAIvC;;;;;OAKG;IACH,SAAS,CAAC,eAAe,IAAI,OAAO;IAqBpC;;;;;OAKG;cACa,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAI3C;;;;;;OAMG;cACa,UAAU,CAAC,IAAI,EAAE;QAAE,KAAK,EAAE,UAAU,CAAA;KAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAItE;;;;;;OAMG;IACG,IAAI,CAAC,IAAI,EAAE;QAAE,IAAI,EAAE,KAAK,EAAE,CAAC;QAAC,KAAK,CAAC,EAAE,UAAU,CAAA;KAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAItE;;;;;;;;OAQG;IACH,SAAS,CAAC,qBAAqB,IAAI,OAAO;IAO1C;;;;;;;;OAQG;IACH,SAAS,CAAC,wBAAwB,IAAI,OAAO;IAkB7C;;;;;;;OAOG;IACH,qBAAqB,IAAI,MAAM,EAAE;CAWlC"}
1	+ {"version":3,"file":"md-view.engine.d.ts","sourceRoot":"","sources":["../../src/engine/md-view.engine.ts"],"names":[],"mappings":"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"}

package/out/engine/md-view.engine.js CHANGED Viewed

@@ -249,13 +249,19 @@ export class MDViewEngine extends ViewEngineBase {
             throw new RuntimeModelError(this.view.model, ibiz.i18n.t('runtime.engine.logicOpendata'));
         }
         else {
+            if (result.ok && result.data && result.data.length > 0) {
+                this.view.evt.emit('onDataChange', {
+                    data: result.data,
+                    actionType: 'EDIT',
+                });
+            }
             return {
                 cancel: result ? !result.ok : true,
             };
         }
     }
     /**
-     * 打开编辑数据视图
+     * 打开新建数据视图
      *
      * @author lxm
      * @date 2022-09-01 18:09:19
@@ -285,6 +291,12 @@ export class MDViewEngine extends ViewEngineBase {
             throw new RuntimeModelError(this.view.model, ibiz.i18n.t('runtime.engine.logicNewdata'));
         }
         else {
+            if (result.ok && result.data && result.data.length > 0) {
+                this.view.evt.emit('onDataChange', {
+                    data: result.data,
+                    actionType: 'NEW',
+                });
+            }
             return {
                 cancel: result ? !result.ok : true,
             };