@ibiz-template/runtime 0.7.26 → 0.7.27

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

@@ -1 +1 @@
-{"version":3,"file":"tree.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/tree/tree.controller.ts"],"names":[],"mappings":"AACA,OAAO,EACL,cAAc,EAIf,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EACL,iBAAiB,EAEjB,OAAO,EAEP,WAAW,EACZ,MAAM,kBAAkB,CAAC;AAE1B,OAAO,EACL,UAAU,EACV,UAAU,EACV,eAAe,EACf,gBAAgB,EAChB,aAAa,EACd,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;cAUX,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;cAyD1B,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;IA6BjC;;;;;OAKG;IACH,SAAS,CAAC,2BAA2B,IAAI,IAAI;IA6B7C;;;;;OAKG;IACG,IAAI,CAAC,IAAI,GAAE,gBAAqB,GAAG,OAAO,CAAC,aAAa,EAAE,CAAC;IAsB3D,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;IAgCrE;;;;;;OAMG;IACG,cAAc,CAAC,KAAK,EAAE,aAAa,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAe3D;;;;;;OAMG;IACG,eAAe,CACnB,QAAQ,EAAE,aAAa,EACvB,KAAK,EAAE,UAAU,GAChB,OAAO,CAAC,IAAI,CAAC;IA4ChB;;;;;;OAMG;IACH,cAAc,CAAC,QAAQ,EAAE,aAAa,EAAE,QAAQ,EAAE,OAAO,GAAG,IAAI;IAYhE;;;;;;OAMG;IACG,iBAAiB,CAAC,QAAQ,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC;IAM/D,SAAS,CAAC,IAAI,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC;IAK7C,YAAY,CAAC,SAAS,EAAE;QAAE,GAAG,EAAE,MAAM,CAAA;KAAE,EAAE,GAAG,IAAI;IAWhD;;;;;;OAMG;IACH,YAAY,CAAC,EAAE,EAAE,MAAM,GAAG,WAAW,GAAG,SAAS;IAIjD;;;;;;OAMG;IACH,WAAW,CAAC,GAAG,EAAE,MAAM,GAAG,aAAa,GAAG,SAAS;IAQnD;;;;;;;;;;OAUG;IACG,UAAU,CACd,UAAU,EAAE,MAAM,EAClB,QAAQ,EAAE,aAAa,EACvB,KAAK,EAAE,UAAU,EACjB,KAAK,EAAE,MAAM,GACZ,OAAO,CAAC,IAAI,CAAC;IAiChB;;;;;;OAMG;IACH,SAAS,CAAC,iBAAiB,CAAC,QAAQ,EAAE,aAAa,GAAG;QACpD,IAAI,EAAE,KAAK,EAAE,CAAC;QACd,OAAO,EAAE,QAAQ,CAAC;QAClB,MAAM,EAAE,OAAO,CAAC;KACjB;IAcD;;;;;;;OAOG;IACH,gBAAgB,CAAC,KAAK,EAAE,aAAa,EAAE,GAAG,MAAM,EAAE;IAoBlD;;;;;;;OAOG;IACG,mBAAmB,CACvB,QAAQ,EAAE;QAAE,GAAG,CAAC,EAAE,MAAM,CAAC;QAAC,MAAM,CAAC,EAAE,MAAM,CAAA;KAAE,EAC3C,aAAa,UAAQ,GACpB,OAAO,CAAC,IAAI,CAAC;IAmCV,eAAe,CAAC,UAAU,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IA2B1D;;;;;;OAMG;IACH,aAAa,CAAC,YAAY,EAAE,aAAa,GAAG,OAAO;IAKnD;;;;;;;;OAQG;IACH,aAAa,CACX,YAAY,EAAE,aAAa,EAC3B,QAAQ,EAAE,aAAa,EACvB,IAAI,EAAE,OAAO,GAAG,MAAM,GAAG,MAAM,GAC9B,OAAO;IAgCV;;;;;;;;;OASG;IACH,SAAS,CAAC,cAAc,CACtB,QAAQ,EAAE,MAAM,EAChB,eAAe,EAAE,MAAM,GACtB,UAAU,GAAG,SAAS;IAKzB;;;;;;;;OAQG;IACG,UAAU,CACd,YAAY,EAAE,aAAa,EAC3B,QAAQ,EAAE,aAAa,EACvB,QAAQ,EAAE,OAAO,GAAG,MAAM,GAAG,MAAM,GAClC,OAAO,CAAC,IAAI,CAAC;IA2IhB;;;;;;;OAOG;IACG,gBAAgB,CAAC,SAAS,EAAE,aAAa,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IA+BjE;;;;;;;OAOG;IACG,cAAc,CAAC,QAAQ,EAAE,aAAa,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAoB1E;;;;;OAKG;IACG,gBAAgB,CACpB,IAAI,EAAE,KAAK,EACX,OAAO,EAAE,QAAQ,EACjB,MAAM,EAAE,OAAO,GACd,OAAO,CAAC,OAAO,CAAC;IAsBnB;;;;;;;;OAQG;IACH,SAAS,CAAC,cAAc,CAAC,GAAG,EAAE,cAAc,GAAG,IAAI;CA4BpD"}
+{"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

@@ -580,118 +580,57 @@ export class TreeController extends MDControlController {
      * @return {*}  {Promise<void>}
      */
     async onNodeDrop(draggingNode, dropNode, dropType) {
-        var _a, _b, _c;
+        var _a, _b;
         if (dropType === 'inner' &&
             !dropNode._leaf &&
             dropNode._children === undefined) {
             await this.expandNodeByKey([dropNode._id]);
         }
-        /** 修改的树节点数据 */
-        const modifiedNodeDatas = [];
         const draggingNodeModel = this.getNodeModel(draggingNode._nodeId);
         const dropInNode = dropType === 'inner' ? dropNode : dropNode._parent;
-        const isChangedParent = (dropNode === null || dropNode === void 0 ? void 0 : dropNode._id) !== ((_a = draggingNode._parent) === null || _a === void 0 ? void 0 : _a._id);
+        const isChangedParent = ((_a = dropNode._parent) === null || _a === void 0 ? void 0 : _a._id) !== ((_b = draggingNode._parent) === null || _b === void 0 ? void 0 : _b._id);
         let orderNodeModel = this.getNodeModel(dropNode._nodeId);
         // * 处理切换父节点
-        if (dropType === 'inner' ||
-            ((_b = dropNode._parent) === null || _b === void 0 ? void 0 : _b._id) !== ((_c = draggingNode._parent) === null || _c === void 0 ? void 0 : _c._id)) {
+        if (dropType === 'inner' || isChangedParent) {
             const dropNodeRs = this.findDropNodeRS(dropInNode._nodeId, draggingNodeModel.appDataEntityId);
             if (dropNodeRs) {
                 // 修改关系属性的值为父节点的主键和树节点id
                 draggingNode._deData[dropNodeRs.pickupDEFName] = dropInNode._value;
-                modifiedNodeDatas.push(draggingNode);
                 orderNodeModel = this.getNodeModel(dropNodeRs.childDETreeNodeId);
             }
-        }
-        // *修改节点数据
-        // 所有情况都先从原来的父的子集合里删除自己
-        const originArr = draggingNode._parent._children;
-        originArr.splice(originArr.indexOf(draggingNode), 1);
-        if (dropType === 'inner') {
-            // 移入时放到最后
-            if (!dropNode._children) {
-                dropNode._children = [];
-                dropNode._leaf = true;
-                this.state.expandedKeys.push(dropNode._id);
-            }
-            dropNode._children.push(draggingNode);
-        }
-        else {
-            // 非插入时，放入指定节点前后
-            let insertIndex = dropInNode._children.indexOf(dropNode);
-            if (dropType === 'next') {
-                insertIndex += 1;
-            }
-            dropInNode._children.splice(insertIndex, 0, draggingNode);
-        }
-        //* 变更父节点后的，拖动节点调整
-        if (dropType === 'inner' || isChangedParent) {
             // 更改父节点
             draggingNode._parent = dropInNode;
             // 修改指向的节点模型
             draggingNode._nodeId = orderNodeModel.id;
             // 维护拖拽的节点和其子孙的展开，维护拖入节点的展开
             this.state.expandedKeys = this.calcExpandedKeys([dropInNode]);
+            await this.updateDeNodeData([draggingNode]);
         }
-        // *处理排序
-        const { sortAppDEFieldId, sortDir, allowOrder } = orderNodeModel;
-        if (allowOrder === true) {
-            // 有排序属性才处理排序
-            if (!sortAppDEFieldId) {
-                throw new RuntimeModelError(orderNodeModel, ibiz.i18n.t('runtime.controller.control.tree.sortAttribute'));
-            }
-            const sortField = sortAppDEFieldId.toLowerCase();
-            const isAsc = sortDir === 'ASC';
-            const changedArr = [...dropInNode._children];
-            // 降序把数组反转,保证两个数组都是从小到大排
-            if (!isAsc) {
-                changedArr.reverse();
-            }
-            /**
-             * 获取下一个100的倍数
-             * @author lxm
-             * @date 2023-09-11 10:03:46
-             * @param {number} num
-             * @return {*}  {number}
-             */
-            const getNextSort = (num) => {
-                return num + (100 - (num % 100));
-            };
-            const getSort = (deData) => {
-                return deData[sortField] || 0;
+        // 移动排序
+        const { moveAppDEActionId, appDataEntityId, allowOrder } = orderNodeModel;
+        if (!moveAppDEActionId) {
+            throw new RuntimeModelError(this.model, ibiz.i18n.t('runtime.controller.common.md.noMoveDataCconfig'));
+        }
+        if (dropType !== 'inner' && allowOrder) {
+            const moveParams = {
+                srftargetkey: dropNode.srfkey,
+                srfmovetype: dropType === 'prev' ? 'MOVEBEFORE' : 'MOVEAFTER',
             };
-            let lastSort;
-            changedArr.forEach((item, index) => {
-                const deData = item._deData;
-                if (lastSort === undefined) {
-                    // 第一次出现要调整顺序的时候一定是从拖拽节点开始
-                    if (item === draggingNode) {
-                        // 如果时第一个，则排序值为100
-                        if (index === 0) {
-                            lastSort = 100;
-                        }
-                        else {
-                            // 最后一个时，把前一个的排序值加100
-                            lastSort = getNextSort(getSort(changedArr[index - 1]._deData));
-                        }
-                        deData[sortField] = lastSort;
-                        // 修改父的时候可能已经加入进去了
-                        if (modifiedNodeDatas.indexOf(item) === -1) {
-                            modifiedNodeDatas.push(item);
-                        }
-                    }
+            const app = ibiz.hub.getApp(this.context.srfappid);
+            const deName = calcDeCodeNameById(appDataEntityId);
+            const tempContext = this.context.clone();
+            tempContext[deName] = draggingNode.srfkey;
+            const res = await app.deService.exec(appDataEntityId, moveAppDEActionId, tempContext, moveParams);
+            if (res.ok) {
+                if (isChangedParent) {
+                    await this.refreshNodeChildren(draggingNode, true);
+                    await this.refreshNodeChildren(dropInNode);
                 }
                 else {
-                    if (lastSort >= getSort(deData)) {
-                        deData[sortField] = getNextSort(lastSort);
-                        modifiedNodeDatas.push(item);
-                    }
-                    // 更新上一个排序值
-                    lastSort = getSort(deData);
+                    await this.refreshNodeChildren(dropInNode);
                 }
-            });
+            }
         }
-        await this.updateDeNodeData(modifiedNodeDatas);
         // *通知界面修改移入的父节点的子节点数据
         this._evt.emit('onAfterNodeDrop', { isChangedParent });
     }

package/out/interface/controller/event/control/i-chart.event.d.ts

@@ -1,3 +1,4 @@
+import { EventBase } from '../argument';
 import { IMDControlEvent } from './i-md-control.event';
 /**
  * 图表部件事件
@@ -8,5 +9,14 @@ import { IMDControlEvent } from './i-md-control.event';
  * @interface IMDControlEvent
  */
 export interface IChartEvent extends IMDControlEvent {
+    /**
+     * 更新之前
+     *
+     * @author lxm
+     */
+    onBeforeUpdate: {
+        event: EventBase;
+        emitArgs: undefined;
+    };
 }
 //# sourceMappingURL=i-chart.event.d.ts.map

package/out/interface/controller/event/control/i-chart.event.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"i-chart.event.d.ts","sourceRoot":"","sources":["../../../../../src/interface/controller/event/control/i-chart.event.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAEvD;;;;;;;GAOG;AACH,MAAM,WAAW,WAAY,SAAQ,eAAe;CAAG"}
+{"version":3,"file":"i-chart.event.d.ts","sourceRoot":"","sources":["../../../../../src/interface/controller/event/control/i-chart.event.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AACxC,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAEvD;;;;;;;GAOG;AACH,MAAM,WAAW,WAAY,SAAQ,eAAe;IAClD;;;;OAIG;IACH,cAAc,EAAE;QACd,KAAK,EAAE,SAAS,CAAC;QACjB,QAAQ,EAAE,SAAS,CAAC;KACrB,CAAC;CACH"}

package/out/interface/controller/event/control/i-edit-form.event.d.ts

@@ -97,5 +97,31 @@ export interface IEditFormEvent extends IFormEvent {
         event: EventBase;
         emitArgs: PartialWithObject<EditFormEvent, EventBase>;
     };
+    /**
+     * 多数据部件删除
+     *
+     * @type {{
+     *     event: EventBase;
+     *     emitArgs: PartialWithObject<EditFormEvent, EventBase>;
+     *   }}
+     * @memberof IEditFormEvent
+     */
+    onMDCtrlRemove: {
+        event: EventBase;
+        emitArgs: PartialWithObject<EditFormEvent, EventBase>;
+    };
+    /**
+     * 多数据部件新建
+     *
+     * @type {{
+     *     event: EventBase;
+     *     emitArgs: PartialWithObject<EditFormEvent, EventBase>;
+     *   }}
+     * @memberof IEditFormEvent
+     */
+    onMDCtrlNew: {
+        event: EventBase;
+        emitArgs: PartialWithObject<EditFormEvent, EventBase>;
+    };
 }
 //# sourceMappingURL=i-edit-form.event.d.ts.map

package/out/interface/controller/event/control/i-edit-form.event.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"i-edit-form.event.d.ts","sourceRoot":"","sources":["../../../../../src/interface/controller/event/control/i-edit-form.event.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AACxD,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AACxC,OAAO,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAE5C,MAAM,WAAW,aAAc,SAAQ,SAAS;IAC9C;;OAEG;IACH,IAAI,EAAE,KAAK,CAAC;CACb;AAED;;;;;;;GAOG;AACH,MAAM,WAAW,cAAe,SAAQ,UAAU;IAChD;;;;OAIG;IACH,YAAY,EAAE;QACZ,KAAK,EAAE,SAAS,CAAC;QACjB,QAAQ,EAAE,iBAAiB,CAAC,aAAa,EAAE,SAAS,CAAC,CAAC;KACvD,CAAC;IAEF;;;;OAIG;IACH,aAAa,EAAE;QACb,KAAK,EAAE,SAAS,CAAC;QACjB,QAAQ,EAAE,iBAAiB,CAAC,aAAa,EAAE,SAAS,CAAC,CAAC;KACvD,CAAC;IAEF;;;;OAIG;IACH,WAAW,EAAE;QACX,KAAK,EAAE,SAAS,CAAC;QACjB,QAAQ,EAAE,iBAAiB,CAAC,aAAa,EAAE,SAAS,CAAC,CAAC;KACvD,CAAC;IAEF;;;;OAIG;IACH,YAAY,EAAE;QACZ,KAAK,EAAE,SAAS,CAAC;QACjB,QAAQ,EAAE,iBAAiB,CAAC,aAAa,EAAE,SAAS,CAAC,CAAC;KACvD,CAAC;IAEF;;;;OAIG;IACH,aAAa,EAAE;QACb,KAAK,EAAE,SAAS,CAAC;QACjB,QAAQ,EAAE,iBAAiB,CAAC,aAAa,EAAE,SAAS,CAAC,CAAC;KACvD,CAAC;IAEF;;;;OAIG;IACH,WAAW,EAAE;QACX,KAAK,EAAE,SAAS,CAAC;QACjB,QAAQ,EAAE,iBAAiB,CAAC,aAAa,EAAE,SAAS,CAAC,CAAC;KACvD,CAAC;IAEF;;;;OAIG;IACH,cAAc,EAAE;QACd,KAAK,EAAE,SAAS,CAAC;QACjB,QAAQ,EAAE,iBAAiB,CAAC,aAAa,EAAE,SAAS,CAAC,CAAC;KACvD,CAAC;IAEF;;;;OAIG;IACH,eAAe,EAAE;QACf,KAAK,EAAE,SAAS,CAAC;QACjB,QAAQ,EAAE,iBAAiB,CAAC,aAAa,EAAE,SAAS,CAAC,CAAC;KACvD,CAAC;IAEF;;;;OAIG;IACH,aAAa,EAAE;QACb,KAAK,EAAE,SAAS,CAAC;QACjB,QAAQ,EAAE,iBAAiB,CAAC,aAAa,EAAE,SAAS,CAAC,CAAC;KACvD,CAAC;CACH"}
+{"version":3,"file":"i-edit-form.event.d.ts","sourceRoot":"","sources":["../../../../../src/interface/controller/event/control/i-edit-form.event.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AACxD,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AACxC,OAAO,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAE5C,MAAM,WAAW,aAAc,SAAQ,SAAS;IAC9C;;OAEG;IACH,IAAI,EAAE,KAAK,CAAC;CACb;AAED;;;;;;;GAOG;AACH,MAAM,WAAW,cAAe,SAAQ,UAAU;IAChD;;;;OAIG;IACH,YAAY,EAAE;QACZ,KAAK,EAAE,SAAS,CAAC;QACjB,QAAQ,EAAE,iBAAiB,CAAC,aAAa,EAAE,SAAS,CAAC,CAAC;KACvD,CAAC;IAEF;;;;OAIG;IACH,aAAa,EAAE;QACb,KAAK,EAAE,SAAS,CAAC;QACjB,QAAQ,EAAE,iBAAiB,CAAC,aAAa,EAAE,SAAS,CAAC,CAAC;KACvD,CAAC;IAEF;;;;OAIG;IACH,WAAW,EAAE;QACX,KAAK,EAAE,SAAS,CAAC;QACjB,QAAQ,EAAE,iBAAiB,CAAC,aAAa,EAAE,SAAS,CAAC,CAAC;KACvD,CAAC;IAEF;;;;OAIG;IACH,YAAY,EAAE;QACZ,KAAK,EAAE,SAAS,CAAC;QACjB,QAAQ,EAAE,iBAAiB,CAAC,aAAa,EAAE,SAAS,CAAC,CAAC;KACvD,CAAC;IAEF;;;;OAIG;IACH,aAAa,EAAE;QACb,KAAK,EAAE,SAAS,CAAC;QACjB,QAAQ,EAAE,iBAAiB,CAAC,aAAa,EAAE,SAAS,CAAC,CAAC;KACvD,CAAC;IAEF;;;;OAIG;IACH,WAAW,EAAE;QACX,KAAK,EAAE,SAAS,CAAC;QACjB,QAAQ,EAAE,iBAAiB,CAAC,aAAa,EAAE,SAAS,CAAC,CAAC;KACvD,CAAC;IAEF;;;;OAIG;IACH,cAAc,EAAE;QACd,KAAK,EAAE,SAAS,CAAC;QACjB,QAAQ,EAAE,iBAAiB,CAAC,aAAa,EAAE,SAAS,CAAC,CAAC;KACvD,CAAC;IAEF;;;;OAIG;IACH,eAAe,EAAE;QACf,KAAK,EAAE,SAAS,CAAC;QACjB,QAAQ,EAAE,iBAAiB,CAAC,aAAa,EAAE,SAAS,CAAC,CAAC;KACvD,CAAC;IAEF;;;;OAIG;IACH,aAAa,EAAE;QACb,KAAK,EAAE,SAAS,CAAC;QACjB,QAAQ,EAAE,iBAAiB,CAAC,aAAa,EAAE,SAAS,CAAC,CAAC;KACvD,CAAC;IAEF;;;;;;;;OAQG;IACH,cAAc,EAAE;QACd,KAAK,EAAE,SAAS,CAAC;QACjB,QAAQ,EAAE,iBAAiB,CAAC,aAAa,EAAE,SAAS,CAAC,CAAC;KACvD,CAAC;IACF;;;;;;;;OAQG;IACH,WAAW,EAAE;QACX,KAAK,EAAE,SAAS,CAAC;QACjB,QAAQ,EAAE,iBAAiB,CAAC,aAAa,EAAE,SAAS,CAAC,CAAC;KACvD,CAAC;CACH"}

package/out/interface/controller/state/view/i-pickup-tree-view.state.d.ts

@@ -25,5 +25,13 @@ export interface IPickupTreeViewState extends ITreeViewState {
      * @type {IData[]}
      */
     selectedData: IData[];
+    /**
+     * 在多选的情况下，树节点是否严格的遵循父子不互相关联
+     *
+     * @author zhanghengfeng
+     * @date 2024-07-01 14:07:56
+     * @type {boolean}
+     */
+    checkStrictly?: boolean;
 }
 //# sourceMappingURL=i-pickup-tree-view.state.d.ts.map

package/out/interface/controller/state/view/i-pickup-tree-view.state.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"i-pickup-tree-view.state.d.ts","sourceRoot":"","sources":["../../../../../src/interface/controller/state/view/i-pickup-tree-view.state.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAErD;;;;;;;;GAQG;AACH,MAAM,WAAW,oBAAqB,SAAQ,cAAc;IAC1D;;;;;;;OAOG;IACH,YAAY,EAAE,OAAO,CAAC;IAEtB;;;;;OAKG;IACH,YAAY,EAAE,KAAK,EAAE,CAAC;CACvB"}
+{"version":3,"file":"i-pickup-tree-view.state.d.ts","sourceRoot":"","sources":["../../../../../src/interface/controller/state/view/i-pickup-tree-view.state.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAErD;;;;;;;;GAQG;AACH,MAAM,WAAW,oBAAqB,SAAQ,cAAc;IAC1D;;;;;;;OAOG;IACH,YAAY,EAAE,OAAO,CAAC;IAEtB;;;;;OAKG;IACH,YAAY,EAAE,KAAK,EAAE,CAAC;IAEtB;;;;;;OAMG;IACH,aAAa,CAAC,EAAE,OAAO,CAAC;CACzB"}

package/out/interface/provider/model-loader.provider.d.ts

@@ -119,9 +119,9 @@ export interface ModelLoaderProvider {
      * @author tony001
      * @date 2024-06-27 17:06:28
      * @param {IData} data
-     * @param {('APP' | 'VIEW' | 'CTRL' | 'APPENTITY')} type
+     * @param {('APP' | 'VIEW' | 'CTRL' | 'APPENTITY' | 'APPBIREPORT')} type
      * @return {*}  {(Promise<IData | undefined>)}
      */
-    translationModelToDsl(data: IData, type: 'APP' | 'VIEW' | 'CTRL' | 'APPENTITY'): Promise<IModel | undefined>;
+    translationModelToDsl(data: IData, type: 'APP' | 'VIEW' | 'CTRL' | 'APPENTITY' | 'APPBIREPORT'): Promise<IModel | undefined>;
 }
 //# sourceMappingURL=model-loader.provider.d.ts.map

package/out/interface/provider/model-loader.provider.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"model-loader.provider.d.ts","sourceRoot":"","sources":["../../../src/interface/provider/model-loader.provider.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,UAAU,EACV,YAAY,EACZ,YAAY,EACZ,cAAc,EACd,QAAQ,EACR,YAAY,EACZ,UAAU,EACX,MAAM,kBAAkB,CAAC;AAE1B;;;;;;;GAOG;AACH,MAAM,WAAW,mBAAmB;IAClC;;;;;;;OAOG;IACH,OAAO,CAAC,EAAE,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;IAEvC;;;;;OAKG;IACH,MAAM,CAAC,EAAE,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,YAAY,CAAC,CAAC;IAE3C;;;;;;;OAOG;IACH,YAAY,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,GAAG,SAAS,CAAC,CAAC;IAE7D;;;;;;;;OAQG;IACH,UAAU,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC;IAE/D;;;;;;;;;OASG;IACH,WAAW,CACT,KAAK,EAAE,MAAM,EACb,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,OAAO,GACd,OAAO,CAAC,QAAQ,CAAC,CAAC;IAErB;;;;;;;;OAQG;IACH,gBAAgB,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,cAAc,CAAC,CAAC;IAErE;;;;;;;;OAQG;IACH,0BAA0B,CACxB,KAAK,EAAE,MAAM,EACb,QAAQ,EAAE,MAAM,GACf,OAAO,CAAC,cAAc,CAAC,CAAC;IAE3B;;;;;;;OAOG;IACH,WAAW,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAAC;IAEnD;;;;;;;;OAQG;IACH,eAAe,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,YAAY,EAAE,CAAC,CAAC;IAEvE;;;;;;;;OAQG;IACH,gBAAgB,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,UAAU,EAAE,CAAC,CAAC;IAEtE;;;;;;;;OAQG;IACH,eAAe,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,YAAY,EAAE,CAAC,CAAC;IAEvE;;;;;;;;OAQG;IACH,qBAAqB,CACnB,IAAI,EAAE,KAAK,EACX,IAAI,EAAE,KAAK,GAAG,MAAM,GAAG,MAAM,GAAG,WAAW,GAC1C,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAAC;CAChC"}
+{"version":3,"file":"model-loader.provider.d.ts","sourceRoot":"","sources":["../../../src/interface/provider/model-loader.provider.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,UAAU,EACV,YAAY,EACZ,YAAY,EACZ,cAAc,EACd,QAAQ,EACR,YAAY,EACZ,UAAU,EACX,MAAM,kBAAkB,CAAC;AAE1B;;;;;;;GAOG;AACH,MAAM,WAAW,mBAAmB;IAClC;;;;;;;OAOG;IACH,OAAO,CAAC,EAAE,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;IAEvC;;;;;OAKG;IACH,MAAM,CAAC,EAAE,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,YAAY,CAAC,CAAC;IAE3C;;;;;;;OAOG;IACH,YAAY,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,GAAG,SAAS,CAAC,CAAC;IAE7D;;;;;;;;OAQG;IACH,UAAU,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC;IAE/D;;;;;;;;;OASG;IACH,WAAW,CACT,KAAK,EAAE,MAAM,EACb,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,OAAO,GACd,OAAO,CAAC,QAAQ,CAAC,CAAC;IAErB;;;;;;;;OAQG;IACH,gBAAgB,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,cAAc,CAAC,CAAC;IAErE;;;;;;;;OAQG;IACH,0BAA0B,CACxB,KAAK,EAAE,MAAM,EACb,QAAQ,EAAE,MAAM,GACf,OAAO,CAAC,cAAc,CAAC,CAAC;IAE3B;;;;;;;OAOG;IACH,WAAW,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAAC;IAEnD;;;;;;;;OAQG;IACH,eAAe,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,YAAY,EAAE,CAAC,CAAC;IAEvE;;;;;;;;OAQG;IACH,gBAAgB,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,UAAU,EAAE,CAAC,CAAC;IAEtE;;;;;;;;OAQG;IACH,eAAe,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,YAAY,EAAE,CAAC,CAAC;IAEvE;;;;;;;;OAQG;IACH,qBAAqB,CACnB,IAAI,EAAE,KAAK,EACX,IAAI,EAAE,KAAK,GAAG,MAAM,GAAG,MAAM,GAAG,WAAW,GAAG,aAAa,GAC1D,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAAC;CAChC"}

package/out/utils/bi-report-util/bi-report-util.d.ts

@@ -1,3 +1,4 @@
+import { IDEReportPanel } from '@ibiz/model-core';
 import { IModalData, IReportPanelController } from '../../interface';
 /**
  * 打开设计界面参数
@@ -46,7 +47,7 @@ export declare class BIReportUtil {
      */
     openDesignPage(context: IContext, params: IParams, data: designPageParam): Promise<IModalData>;
     /**
-     * 报表数据转化配置数据
+     * 实体报表数据转化配置数据
      *
      * @author tony001
      * @date 2024-06-30 11:06:00
@@ -54,6 +55,36 @@ export declare class BIReportUtil {
      * @param {IData} data
      * @return {*}  {IData}
      */
-    private translateReportToConfig;
+    translateDEReportToConfig(data: IData): Promise<IData>;
+    /**
+     * 报表面板数据转化配置界面数据
+     *
+     * @param {IDEReportPanel} model
+     * @return {*}  {Promise<IData>}
+     * @memberof BIReportUtil
+     */
+    translateReportPanelToConfig(model: IDEReportPanel): Promise<IData>;
+    /**
+     * 指定参数数据转化为应用BI报表数据
+     *
+     * @param {{
+     *     reportTag: string;
+     *     selectChartType: string;
+     *     selectCubeId: string;
+     *     caption: string;
+     *     data: IData;
+     *     style: IData;
+     *   }} arg
+     * @return {*}  {Promise<IData>}
+     * @memberof BIReportUtil
+     */
+    translateDataToAppBIReport(arg: {
+        reportTag: string;
+        selectChartType: string;
+        selectCubeId: string;
+        caption: string;
+        data: IData;
+        style: IData;
+    }): Promise<IData>;
 }
 //# sourceMappingURL=bi-report-util.d.ts.map

package/out/utils/bi-report-util/bi-report-util.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"bi-report-util.d.ts","sourceRoot":"","sources":["../../../src/utils/bi-report-util/bi-report-util.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,UAAU,EAAE,sBAAsB,EAAE,MAAM,iBAAiB,CAAC;AAErE;;;;;;;GAOG;AACH,MAAM,WAAW,eAAe;IAC9B;;;;;;OAMG;IACH,IAAI,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAErB;;;;;;OAMG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC;IAElB;;;;;;OAMG;IACH,WAAW,CAAC,EAAE,sBAAsB,CAAC;CACtC;AAED,qBAAa,YAAY;IACvB;;;;;;;;;OASG;IACG,cAAc,CAClB,OAAO,EAAE,QAAQ,EACjB,MAAM,EAAE,OAAO,EACf,IAAI,EAAE,eAAe,GACpB,OAAO,CAAC,UAAU,CAAC;IA0CtB;;;;;;;;OAQG;IACH,OAAO,CAAC,uBAAuB;CAgDhC"}
+{"version":3,"file":"bi-report-util.d.ts","sourceRoot":"","sources":["../../../src/utils/bi-report-util/bi-report-util.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAE,UAAU,EAAE,sBAAsB,EAAE,MAAM,iBAAiB,CAAC;AAErE;;;;;;;GAOG;AACH,MAAM,WAAW,eAAe;IAC9B;;;;;;OAMG;IACH,IAAI,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAErB;;;;;;OAMG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC;IAElB;;;;;;OAMG;IACH,WAAW,CAAC,EAAE,sBAAsB,CAAC;CACtC;AAED,qBAAa,YAAY;IACvB;;;;;;;;;OASG;IACG,cAAc,CAClB,OAAO,EAAE,QAAQ,EACjB,MAAM,EAAE,OAAO,EACf,IAAI,EAAE,eAAe,GACpB,OAAO,CAAC,UAAU,CAAC;IA0CtB;;;;;;;;OAQG;IACG,yBAAyB,CAAC,IAAI,EAAE,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC;IAuE5D;;;;;;OAMG;IACG,4BAA4B,CAAC,KAAK,EAAE,cAAc,GAAG,OAAO,CAAC,KAAK,CAAC;IAgFzE;;;;;;;;;;;;;OAaG;IACG,0BAA0B,CAAC,GAAG,EAAE;QACpC,SAAS,EAAE,MAAM,CAAC;QAClB,eAAe,EAAE,MAAM,CAAC;QACxB,YAAY,EAAE,MAAM,CAAC;QACrB,OAAO,EAAE,MAAM,CAAC;QAChB,IAAI,EAAE,KAAK,CAAC;QACZ,KAAK,EAAE,KAAK,CAAC;KACd,GAAG,OAAO,CAAC,KAAK,CAAC;CAqEnB"}

package/out/utils/bi-report-util/bi-report-util.js

@@ -23,7 +23,7 @@ export class BIReportUtil {
                 Object.assign(tempContext, { pssysbireport: data.reportId });
                 const res = await app.deService.exec('pssysbireport', 'get', tempContext, params);
                 if (res.data) {
-                    config = this.translateReportToConfig(res.data);
+                    config = await this.translateDEReportToConfig(res.data);
                 }
             }
             catch (error) {
@@ -48,7 +48,7 @@ export class BIReportUtil {
         return result;
     }
     /**
-     * 报表数据转化配置数据
+     * 实体报表数据转化配置数据
      *
      * @author tony001
      * @date 2024-06-30 11:06:00
@@ -56,7 +56,7 @@ export class BIReportUtil {
      * @param {IData} data
      * @return {*}  {IData}
      */
-    translateReportToConfig(data) {
+    async translateDEReportToConfig(data) {
         const config = {};
         let biReportUIModel = {};
         if (data.bireportuimodel) {
@@ -65,7 +65,9 @@ export class BIReportUtil {
         config.selectChartType = (biReportUIModel === null || biReportUIModel === void 0 ? void 0 : biReportUIModel.selectChartType) || 'NUMBER';
         config.reportTag = 'bi_report';
         config.selectCubeId = data.pssysbicubeid;
+        config.selectedSchemeId = data.pssysbischemeid;
         const biReportItems = {};
+        const extendDimension = (biReportUIModel === null || biReportUIModel === void 0 ? void 0 : biReportUIModel.extendDimension) || [];
         if (data.pssysbireportitems && data.pssysbireportitems.length > 0) {
             data.pssysbireportitems.forEach((item) => {
                 var _a, _b;
@@ -78,18 +80,35 @@ export class BIReportUtil {
                         pssysbicubemeasureid: item.pssysbicubemeasureid,
                         pssysbicubeid: item.pssysbicubeid,
                         codename: (_a = item.pssysbicubemeasureid) === null || _a === void 0 ? void 0 : _a.split('.').pop(),
+                        pssysbicubemeasurename: item.pssysbicubemeasurename,
                     });
                 }
                 if (item.birepitemtype === 'DIMENSION') {
                     if (!biReportItems.dimension) {
                         biReportItems.dimension = [];
                     }
-                    biReportItems.dimension.push({
-                        pssysbischemeid: item.pssysbischemeid,
-                        pssysbicubedimensionid: item.pssysbicubedimensionid,
-                        pssysbicubeid: item.pssysbicubeid,
-                        codename: (_b = item.pssysbicubedimensionid) === null || _b === void 0 ? void 0 : _b.split('.').pop(),
-                    });
+                    if (extendDimension.length > 0 && !biReportItems.extendDimension) {
+                        biReportItems.extendDimension = [];
+                    }
+                    const codename = (_b = item.pssysbicubedimensionid) === null || _b === void 0 ? void 0 : _b.split('.').pop();
+                    if (extendDimension.includes(codename)) {
+                        biReportItems.extendDimension.push({
+                            pssysbischemeid: item.pssysbischemeid,
+                            pssysbicubedimensionid: item.pssysbicubedimensionid,
+                            pssysbicubeid: item.pssysbicubeid,
+                            codename,
+                            pssysbicubedimensionname: item.pssysbicubedimensionname,
+                        });
+                    }
+                    else {
+                        biReportItems.dimension.push({
+                            pssysbischemeid: item.pssysbischemeid,
+                            pssysbicubedimensionid: item.pssysbicubedimensionid,
+                            pssysbicubeid: item.pssysbicubeid,
+                            codename,
+                            pssysbicubedimensionname: item.pssysbicubedimensionname,
+                        });
+                    }
                 }
             });
         }
@@ -102,7 +121,172 @@ export class BIReportUtil {
         if (biReportUIModel.style) {
             Object.assign(propertyData, { style: biReportUIModel.style });
         }
+        // 识别filter
+        if (biReportUIModel.filter) {
+            propertyData.data.filter = biReportUIModel.filter;
+        }
         config.propertyData = propertyData;
         return config;
     }
+    /**
+     * 报表面板数据转化配置界面数据
+     *
+     * @param {IDEReportPanel} model
+     * @return {*}  {Promise<IData>}
+     * @memberof BIReportUtil
+     */
+    async translateReportPanelToConfig(model) {
+        const config = {};
+        const biReportDatas = {};
+        const { appDEReport } = model;
+        const propertyData = {
+            data: biReportDatas,
+        };
+        config.reportTag = appDEReport.id;
+        const tempAppBISchemeId = appDEReport.appBISchemeId.split('.').pop();
+        config.selectedSchemeId = tempAppBISchemeId;
+        const { name, appBICubeId, appBIReportDimensions, appBIReportMeasures, reportUIModel, } = appDEReport.appBIReport;
+        propertyData.caption = name;
+        config.selectCubeId = `${tempAppBISchemeId}.${appBICubeId}`;
+        let extendDimension = [];
+        if (reportUIModel) {
+            const reportUIModelObj = JSON.parse(reportUIModel);
+            config.selectChartType = reportUIModelObj.selectChartType;
+            propertyData.style = reportUIModelObj.style;
+            // 识别filter
+            propertyData.data.filter = reportUIModelObj.filter;
+            // 识别用户参数
+            if (reportUIModelObj.extendDimension) {
+                extendDimension = reportUIModelObj.extendDimension;
+            }
+        }
+        else {
+            config.selectChartType = 'NUMBER';
+        }
+        if (appBIReportMeasures && appBIReportMeasures.length > 0) {
+            appBIReportMeasures.forEach((measure) => {
+                if (!biReportDatas.measure) {
+                    biReportDatas.measure = [];
+                }
+                biReportDatas.measure.push({
+                    pssysbischemeid: tempAppBISchemeId,
+                    pssysbicubemeasureid: `${tempAppBISchemeId}.${appBICubeId}.${measure.measureTag}`,
+                    pssysbicubemeasurename: measure.measureName,
+                    pssysbicubeid: `${tempAppBISchemeId}.${appBICubeId}`,
+                    codename: measure.measureTag,
+                });
+            });
+        }
+        if (appBIReportDimensions && appBIReportDimensions.length > 0) {
+            appBIReportDimensions.forEach((dimension) => {
+                if (!biReportDatas.dimension) {
+                    biReportDatas.dimension = [];
+                }
+                if (extendDimension.length > 0 && !biReportDatas.extendDimension) {
+                    biReportDatas.extendDimension = [];
+                }
+                if (extendDimension.includes(dimension.dimensionTag)) {
+                    biReportDatas.extendDimension.push({
+                        pssysbischemeid: tempAppBISchemeId,
+                        pssysbicubedimensionid: `${tempAppBISchemeId}.${appBICubeId}.${dimension.dimensionTag}`,
+                        pssysbicubedimensionname: dimension.dimensionName,
+                        pssysbicubeid: `${tempAppBISchemeId}.${appBICubeId}`,
+                        codename: dimension.dimensionTag,
+                        pscodelistid: dimension.appCodeListId,
+                    });
+                }
+                else {
+                    biReportDatas.dimension.push({
+                        pssysbischemeid: tempAppBISchemeId,
+                        pssysbicubedimensionid: `${tempAppBISchemeId}.${appBICubeId}.${dimension.dimensionTag}`,
+                        pssysbicubedimensionname: dimension.dimensionName,
+                        pssysbicubeid: `${tempAppBISchemeId}.${appBICubeId}`,
+                        codename: dimension.dimensionTag,
+                        pscodelistid: dimension.appCodeListId,
+                    });
+                }
+            });
+        }
+        config.propertyData = propertyData;
+        return config;
+    }
+    /**
+     * 指定参数数据转化为应用BI报表数据
+     *
+     * @param {{
+     *     reportTag: string;
+     *     selectChartType: string;
+     *     selectCubeId: string;
+     *     caption: string;
+     *     data: IData;
+     *     style: IData;
+     *   }} arg
+     * @return {*}  {Promise<IData>}
+     * @memberof BIReportUtil
+     */
+    async translateDataToAppBIReport(arg) {
+        const { reportTag, selectChartType, selectCubeId, caption, data, style } = arg;
+        const app = ibiz.hub.getApp(ibiz.env.appId);
+        const targetData = {
+            pssysbireportitems: [],
+            pssysbischemeid: selectCubeId.split('.')[0],
+            pssysbicubeid: selectCubeId,
+            bireportuimodel: JSON.stringify({
+                selectChartType,
+                style,
+                filter: data === null || data === void 0 ? void 0 : data.filter,
+            }),
+            pssysappid: app.model.codeName,
+            bireporttag: reportTag,
+            pssysbireportname: caption,
+            validflag: 1,
+        };
+        if (data && data.measure) {
+            data.measure.forEach((measure) => {
+                const tempMeasure = {
+                    birepitemtype: 'MEASURE',
+                    pssysbischemeid: measure.pssysbischemeid,
+                    pssysbicubemeasureid: measure.pssysbicubemeasureid,
+                    pssysbicubeid: measure.pssysbicubeid,
+                    pssysbicubename: measure.pssysbicubename,
+                    pssysbicubemeasurename: measure.pssysbicubemeasurename,
+                    validflag: 1,
+                };
+                targetData.pssysbireportitems.push(tempMeasure);
+            });
+        }
+        if (data && data.dimension) {
+            data.dimension.forEach((dimension) => {
+                const tempDimension = {
+                    birepitemtype: 'DIMENSION',
+                    pssysbischemeid: dimension.pssysbischemeid,
+                    pssysbicubedimensionid: dimension.pssysbicubedimensionid,
+                    pssysbicubeid: dimension.pssysbicubeid,
+                    pssysbicubename: dimension.pssysbicubename,
+                    pssysbicubedimensionname: dimension.pssysbicubedimensionname,
+                    validflag: 1,
+                };
+                targetData.pssysbireportitems.push(tempDimension);
+            });
+        }
+        if (data && data.extendDimension) {
+            const extendDimension = [];
+            data.extendDimension.forEach((dimension) => {
+                extendDimension.push(dimension.codename);
+                const tempDimension = {
+                    birepitemtype: 'DIMENSION',
+                    pssysbischemeid: dimension.pssysbischemeid,
+                    pssysbicubedimensionid: dimension.pssysbicubedimensionid,
+                    pssysbicubeid: dimension.pssysbicubeid,
+                    pssysbicubename: dimension.pssysbicubename,
+                    pssysbicubedimensionname: dimension.pssysbicubedimensionname,
+                    validflag: 1,
+                };
+                targetData.pssysbireportitems.push(tempDimension);
+            });
+            const uiModel = JSON.parse(targetData.bireportuimodel);
+            targetData.bireportuimodel = JSON.stringify(Object.assign(Object.assign({}, uiModel), { extendDimension }));
+        }
+        return targetData;
+    }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ibiz-template/runtime",
-  "version": "0.7.26",
+  "version": "0.7.27",
   "description": "控制器包",
   "type": "module",
   "main": "out/index.js",
@@ -35,8 +35,8 @@
     "animejs": "^3.2.2"
   },
   "devDependencies": {
-    "@ibiz-template/core": "^0.7.26",
-    "@ibiz/model-core": "^0.1.40",
+    "@ibiz-template/core": "^0.7.27",
+    "@ibiz/model-core": "^0.1.42",
     "@types/animejs": "^3.1.12",
     "@types/path-browserify": "^1.0.2",
     "@types/qs": "^6.9.11",
@@ -54,7 +54,7 @@
   },
   "peerDependencies": {
     "@ibiz-template/core": "^0.6.0",
-    "@ibiz/model-core": "^0.1.40",
+    "@ibiz/model-core": "^0.1.42",
     "async-validator": "^4.2.5",
     "dayjs": "^1.11.7",
     "echarts": "^5.4.3",
@@ -66,5 +66,5 @@
     "qx-util": "^0.4.8",
     "ramda": "^0.29.0"
   },
-  "gitHead": "65a116f6b6484e872125c8d4b30175a63f7fd17c"
+  "gitHead": "1af3989d7522bd74fb35963534644eb364d87af0"
 }