@ibiz-template/runtime 0.7.17 → 0.7.18

package/out/controller/control/chart/generator/base-series-generator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"base-series-generator.d.ts","sourceRoot":"","sources":["../../../../../src/controller/control/chart/generator/base-series-generator.ts"],"names":[],"mappings":"AACA,OAAO,EAEL,cAAc,EACf,MAAM,kBAAkB,CAAC;AAO1B,OAAO,KAAK,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAE5D,OAAO,EACL,qBAAqB,EAEtB,MAAM,2BAA2B,CAAC;AACnC,OAAO,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AASnD,cAAc;AACd,MAAM,MAAM,UAAU,GAAG;IACvB;;OAEG;IACH,KAAK,EAAE,MAAM,CAAC;IAEd;;;;;OAKG;IACH,SAAS,CAAC,EAAE,UAAU,CAAC;CACxB,CAAC;AACF,sBAAsB;AACtB,MAAM,MAAM,WAAW,GAAG,GAAG,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;AAElD,sBAAsB;AACtB,MAAM,MAAM,SAAS,GAAG,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC;AAEpD,eAAO,MAAM,aAAa,mBAAmB,CAAC;AAE9C,qBAAa,mBAAmB,CAAC,CAAC,SAAS,cAAc,GAAG,cAAc;IAiG/D,KAAK,EAAE,CAAC;IACf,SAAS,CAAC,cAAc,EAAE,qBAAqB;IAjGjD;;;;;OAKG;IACH,YAAY,EAAE,MAAM,CAAC;IAErB;;;;;OAKG;IACH,UAAU,EAAE,MAAM,CAAC;IAEnB;;;;;OAKG;IACH,UAAU,CAAC,EAAE,MAAM,CAAC;IAEpB;;;;;OAKG;IACH,UAAU,CAAC,EAAE,MAAM,CAAC;IAEpB;;;;;OAKG;IACH,UAAU,CAAC,EAAE,MAAM,CAAC;IAEpB;;;;;OAKG;IACH,UAAU,EAAE,MAAM,CAAC;IAEnB;;;;;OAKG;IACH,SAAS,CAAC,EAAE,SAAS,CAAC;IAEtB;;;;;OAKG;IACH,YAAY,EAAE,UAAU,EAAE,CAAM;IAEhC;;;;;OAKG;IACH,aAAa,EAAE,YAAY,CAAM;IAEjC;;;;;OAKG;IACH,eAAe,CAAC,EAAE,YAAY,CAAC;IAE/B;;;;;OAKG;IACH,oBAAoB,EAAE,OAAO,CAAQ;IAErC;;;;;;OAMG;gBAEM,KAAK,EAAE,CAAC,EACL,cAAc,EAAE,qBAAqB;IAqCjD;;;;OAIG;IACH,SAAS,CAAC,iBAAiB,IAAI,YAAY;IAmB3C;;;;;;;;;;;OAWG;IACH,YAAY,CACV,WAAW,EAAE,MAAM,GAAG,SAAS,EAC/B,GAAG,EAAE,MAAM,GAAG,SAAS,EACvB,SAAS,GAAE,OAAe,GACzB,MAAM,GAAG,SAAS;IAkBrB;;;;;OAKG;IACH,SAAS,CAAC,gBAAgB,CACxB,SAAS,EAAE,SAAS,EACpB,MAAM,EAAE,KAAK,EACb,OAAO,EAAE,MAAM,EACf,KAAK,EAAE,MAAM,GACZ,IAAI;IAYP;;;;;;OAMG;IACH,SAAS,CAAC,aAAa,CAAC,IAAI,EAAE,KAAK,EAAE,GAAG,SAAS;IAwFjD;;;;;;;OAOG;IACH,SAAS,CAAC,eAAe,CAAC,SAAS,EAAE,SAAS,GAAG,YAAY,EAAE;IAuB/D;;;;;;;OAOG;IAEH,SAAS,CAAC,cAAc,CAAC,WAAW,EAAE,WAAW,GAAG,GAAG;IAQvD;;;;;;OAMG;IACH,UAAU,CAAC,IAAI,EAAE,KAAK,EAAE,GAAG,YAAY,EAAE,GAAG,YAAY;IAOxD;;;;;;OAMG;IACH,oBAAoB,CAAC,MAAM,EAAE,cAAc,GAAG,KAAK,GAAG,SAAS;IAO/D;;;;;OAKG;IACH,cAAc,CAAC,IAAI,EAAE,KAAK,EAAE,GAAG,KAAK,EAAE;IAmDtC;;;;;;OAMG;IACH,YAAY,CAAC,IAAI,EAAE,SAAS,GAAG,IAAI;IA+BnC;;;;;;OAMG;IACH,WAAW,CAAC,IAAI,EAAE,SAAS,GAAG,IAAI;CAgInC"}
+{"version":3,"file":"base-series-generator.d.ts","sourceRoot":"","sources":["../../../../../src/controller/control/chart/generator/base-series-generator.ts"],"names":[],"mappings":"AACA,OAAO,EAEL,cAAc,EACf,MAAM,kBAAkB,CAAC;AAO1B,OAAO,KAAK,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAE5D,OAAO,EACL,qBAAqB,EAEtB,MAAM,2BAA2B,CAAC;AACnC,OAAO,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AASnD,cAAc;AACd,MAAM,MAAM,UAAU,GAAG;IACvB;;OAEG;IACH,KAAK,EAAE,MAAM,CAAC;IAEd;;;;;OAKG;IACH,SAAS,CAAC,EAAE,UAAU,CAAC;CACxB,CAAC;AACF,sBAAsB;AACtB,MAAM,MAAM,WAAW,GAAG,GAAG,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;AAElD,sBAAsB;AACtB,MAAM,MAAM,SAAS,GAAG,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC;AAEpD,eAAO,MAAM,aAAa,mBAAmB,CAAC;AAE9C,qBAAa,mBAAmB,CAAC,CAAC,SAAS,cAAc,GAAG,cAAc;IAiG/D,KAAK,EAAE,CAAC;IACf,SAAS,CAAC,cAAc,EAAE,qBAAqB;IAjGjD;;;;;OAKG;IACH,YAAY,EAAE,MAAM,CAAC;IAErB;;;;;OAKG;IACH,UAAU,EAAE,MAAM,CAAC;IAEnB;;;;;OAKG;IACH,UAAU,CAAC,EAAE,MAAM,CAAC;IAEpB;;;;;OAKG;IACH,UAAU,CAAC,EAAE,MAAM,CAAC;IAEpB;;;;;OAKG;IACH,UAAU,CAAC,EAAE,MAAM,CAAC;IAEpB;;;;;OAKG;IACH,UAAU,EAAE,MAAM,CAAC;IAEnB;;;;;OAKG;IACH,SAAS,CAAC,EAAE,SAAS,CAAC;IAEtB;;;;;OAKG;IACH,YAAY,EAAE,UAAU,EAAE,CAAM;IAEhC;;;;;OAKG;IACH,aAAa,EAAE,YAAY,CAAM;IAEjC;;;;;OAKG;IACH,eAAe,CAAC,EAAE,YAAY,CAAC;IAE/B;;;;;OAKG;IACH,oBAAoB,EAAE,OAAO,CAAQ;IAErC;;;;;;OAMG;gBAEM,KAAK,EAAE,CAAC,EACL,cAAc,EAAE,qBAAqB;IAqCjD;;;;OAIG;IACH,SAAS,CAAC,iBAAiB,IAAI,YAAY;IAmB3C;;;;;;;;;;;OAWG;IACH,YAAY,CACV,WAAW,EAAE,MAAM,GAAG,SAAS,EAC/B,GAAG,EAAE,MAAM,GAAG,SAAS,EACvB,SAAS,GAAE,OAAe,GACzB,MAAM,GAAG,SAAS;IAkBrB;;;;;OAKG;IACH,SAAS,CAAC,gBAAgB,CACxB,SAAS,EAAE,SAAS,EACpB,MAAM,EAAE,KAAK,EACb,OAAO,EAAE,MAAM,EACf,KAAK,EAAE,MAAM,GACZ,IAAI;IAcP;;;;;;OAMG;IACH,SAAS,CAAC,aAAa,CAAC,IAAI,EAAE,KAAK,EAAE,GAAG,SAAS;IAwFjD;;;;;;;OAOG;IACH,SAAS,CAAC,eAAe,CAAC,SAAS,EAAE,SAAS,GAAG,YAAY,EAAE;IAuB/D;;;;;;;OAOG;IAEH,SAAS,CAAC,cAAc,CAAC,WAAW,EAAE,WAAW,GAAG,GAAG;IAQvD;;;;;;OAMG;IACH,UAAU,CAAC,IAAI,EAAE,KAAK,EAAE,GAAG,YAAY,EAAE,GAAG,YAAY;IAOxD;;;;;;OAMG;IACH,oBAAoB,CAAC,MAAM,EAAE,cAAc,GAAG,KAAK,GAAG,SAAS;IAO/D;;;;;OAKG;IACH,cAAc,CAAC,IAAI,EAAE,KAAK,EAAE,GAAG,KAAK,EAAE;IAmDtC;;;;;;OAMG;IACH,YAAY,CAAC,IAAI,EAAE,SAAS,GAAG,IAAI;IA+BnC;;;;;;OAMG;IACH,WAAW,CAAC,IAAI,EAAE,SAAS,GAAG,IAAI;CAgInC"}

package/out/controller/control/chart/generator/base-series-generator.js

@@ -131,9 +131,11 @@ export class BaseSeriesGenerator {
     prepareChartData(groupData, deData, catalog, group) {
         var _a;
         if (this.groupField) {
+            deData[`${this.groupField}_value`] = deData[this.groupField];
             Object.assign(deData, { [this.groupField]: group });
         }
         if (this.catalogField) {
+            deData[`${this.catalogField}_value`] = deData[this.catalogField];
             Object.assign(deData, { [this.catalogField]: catalog });
         }
         const tempChartData = new ChartData(deData, this.model, catalog, group);

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

@@ -4,7 +4,6 @@ import { IGanttController, IGanttEvent, IGanttNodeData, IGanttState, IGanttStyle
 import { GanttService } from './gantt.service';
 import { TreeGridExController, TreeGridExRowState } from '../tree-grid-ex';
 import { GanttDataSetNodeData } from '../../../service';
-import { ControllerEvent } from '../../utils';
 import { ViewLogicScheduler } from '../../../logic-scheduler';
 /**
  * 甘特图控制器
@@ -25,7 +24,6 @@ export declare class GanttController extends TreeGridExController<IDEGantt, IGan
      * @memberof GanttController
      */
     viewScheduler?: ViewLogicScheduler;
-    protected get _evt(): ControllerEvent<IGanttEvent>;
     /**
      * 初始化状态
      *
@@ -105,12 +103,12 @@ export declare class GanttController extends TreeGridExController<IDEGantt, IGan
         srfkey?: string;
     }, refreshParent?: boolean): Promise<void>;
     /**
-     * 处理已展开节点子节点数据
+     * 处理默认展开
      *
      * @param {ITreeNodeData[]} data 子节点数据
      * @return {*}  {Promise<void>}
      */
-    handleDefaultExpandNodes(data: IGanttNodeData[]): Promise<boolean>;
+    handleDefaultExpandNodes(data: IGanttNodeData[]): Promise<void>;
     /**
      * 打开编辑数据视图
      *
@@ -173,6 +171,16 @@ export declare class GanttController extends TreeGridExController<IDEGantt, IGan
      * @memberof GanttController
      */
     newRow(args?: MDCtrlLoadParams): Promise<void>;
+    /**
+     * 处理节点拖入事件
+     *
+     * @param {IGanttNodeData} draggingNode 拖动节点
+     * @param {IGanttNodeData} dropNode 目标节点
+     * @param {('inner' | 'prev' | 'next')} dropType 拖放类型
+     * @return {*}  {Promise<void>}
+     * @memberof GanttController
+     */
+    onNodeDrop(draggingNode: IGanttNodeData, dropNode: IGanttNodeData, dropType: 'inner' | 'prev' | 'next'): Promise<void>;
     protected onDEDataChange(msg: IPortalMessage): void;
 }
 //# sourceMappingURL=gantt.controller.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"gantt.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/gantt/gantt.controller.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"gantt.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/gantt/gantt.controller.ts"],"names":[],"mappings":"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"}

package/out/controller/control/gantt/gantt.controller.js

@@ -17,9 +17,6 @@ import { isValueChange } from '../../utils';
  * @implements {IGanttController}
  */
 export class GanttController extends TreeGridExController {
-    get _evt() {
-        return this.evt;
-    }
     /**
      * 初始化状态
      *
@@ -96,7 +93,7 @@ export class GanttController extends TreeGridExController {
         if (item._nodeType === 'DE') {
             await this.onNodeDataActive(nodeParams);
         }
-        return this._evt.emit('onActive', Object.assign(Object.assign({}, nodeParams), { nodeData: item }));
+        return this.evt.emit('onActive', Object.assign(Object.assign({}, nodeParams), { nodeData: item }));
     }
     /**
      * 节点数据激活
@@ -125,12 +122,7 @@ export class GanttController extends TreeGridExController {
             }));
             const children = this.model.rootVisible ? nodes : nodes[0]._children;
             if (children) {
-                const state = await this.handleDefaultExpandNodes(children);
-                if (state) {
-                    this._evt.emit('onDefaultExpand', {
-                        nodes: children,
-                    });
-                }
+                await this.handleDefaultExpandNodes(children);
             }
         }, {
             key: 'refresh',
@@ -162,34 +154,28 @@ export class GanttController extends TreeGridExController {
         }
         const targetNode = (refreshParent ? currentNode._parent : currentNode);
         const nodes = (await this.loadNodes(targetNode));
-        const state = await this.handleDefaultExpandNodes(nodes);
-        if (state) {
-            this._evt.emit('onDefaultExpand', {
-                nodes,
-            });
-        }
-        this._evt.emit('onAfterRefreshParent', {
+        await this.handleDefaultExpandNodes(nodes);
+        this.evt.emit('onAfterRefreshParent', {
             parentNode: targetNode,
             children: nodes,
         });
     }
     /**
-     * 处理已展开节点子节点数据
+     * 处理默认展开
      *
      * @param {ITreeNodeData[]} data 子节点数据
      * @return {*}  {Promise<void>}
      */
     async handleDefaultExpandNodes(data) {
-        let state = false;
         for (let i = 0; i < data.length; i++) {
             const nodeData = data[i];
             if (this.state.expandedKeys.includes(nodeData._id)) {
-                state = true;
-                const nodes = (await this.loadNodes(nodeData));
+                const key = nodeData.srfkey ? 'srfkey' : '_id';
+                const currentNode = this.state.items.find(item => item[key] === nodeData[key]);
+                const nodes = (await this.loadNodes(currentNode));
                 await this.handleDefaultExpandNodes(nodes);
             }
         }
-        return state;
     }
     /**
      * 打开编辑数据视图
@@ -316,7 +302,7 @@ export class GanttController extends TreeGridExController {
             res = await app.deService.exec(appDataEntityId, isCreate ? 'create' : 'update', tempContext, nodeData._deData);
         }
         catch (error) {
-            await this._evt.emit('onSaveError', undefined);
+            await this.evt.emit('onSaveError', undefined);
             this.actionNotification(`${isCreate ? 'CREATE' : 'UPDATE'}ERROR`, {
                 error: error,
                 data: rowState.data,
@@ -327,7 +313,7 @@ export class GanttController extends TreeGridExController {
         rowState.data._deData = res.data;
         rowState.modified = false;
         this.gridStateNotify(rowState, TreeGridExNotifyState.SAVE);
-        await this._evt.emit('onSaveSuccess', undefined);
+        await this.evt.emit('onSaveSuccess', undefined);
     }
     /**
      * 删除
@@ -351,7 +337,7 @@ export class GanttController extends TreeGridExController {
                 return;
             }
         }
-        await this._evt.emit('onBeforeRemove', undefined);
+        await this.evt.emit('onBeforeRemove', undefined);
         await this.startLoading();
         let needRefresh = false;
         let refreshNode;
@@ -392,7 +378,7 @@ export class GanttController extends TreeGridExController {
             }
         }
         catch (error) {
-            await this._evt.emit('onRemoveError', undefined);
+            await this.evt.emit('onRemoveError', undefined);
             this.actionNotification('REMOVEERROR', {
                 error: error,
                 data,
@@ -403,7 +389,7 @@ export class GanttController extends TreeGridExController {
             await this.endLoading();
         }
         this.state.selectedData = [];
-        await this._evt.emit('onRemoveSuccess', undefined);
+        await this.evt.emit('onRemoveSuccess', undefined);
     }
     /**
      * 后台删除结束后界面删除逻辑
@@ -506,10 +492,106 @@ export class GanttController extends TreeGridExController {
                 if (editShowMode === 'row') {
                     this.switchRowEdit(rowState, true);
                 }
-                this._evt.emit('onNewRow', { row: parentRow });
+                this.evt.emit('onNewRow', { row: parentRow });
                 this.actionNotification('GETDRAFTSUCCESS', { data: draftData });
             }
         }
     }
+    /**
+     * 处理节点拖入事件
+     *
+     * @param {IGanttNodeData} draggingNode 拖动节点
+     * @param {IGanttNodeData} dropNode 目标节点
+     * @param {('inner' | 'prev' | 'next')} dropType 拖放类型
+     * @return {*}  {Promise<void>}
+     * @memberof GanttController
+     */
+    async onNodeDrop(draggingNode, dropNode, dropType) {
+        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;
+        let orderNodeModel = this.getNodeModel(dropNode._nodeId);
+        // * 处理切换父节点
+        if (dropType === 'inner' ||
+            ((_a = dropNode._parent) === null || _a === void 0 ? void 0 : _a._id) !== ((_b = draggingNode._parent) === null || _b === void 0 ? void 0 : _b._id)) {
+            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);
+            }
+            // 更改父节点
+            draggingNode._parent = dropInNode;
+            // 修改指向的节点模型
+            draggingNode._nodeId = orderNodeModel.id;
+        }
+        // *处理排序
+        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;
+            };
+            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);
+                        }
+                    }
+                }
+                else {
+                    if (lastSort >= getSort(deData)) {
+                        deData[sortField] = getNextSort(lastSort);
+                        modifiedNodeDatas.push(item);
+                    }
+                    // 更新上一个排序值
+                    lastSort = getSort(deData);
+                }
+            });
+        }
+        await this.updateDeNodeData(modifiedNodeDatas);
+    }
     onDEDataChange(msg) { }
 }

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":"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"}
+{"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

@@ -540,7 +540,8 @@ export class TreeController extends MDControlController {
         const draggingNodeModel = this.getNodeModel(draggingNode._nodeId);
         // * 移入的情况
         if (type === 'inner') {
-            return !!this.findDropNodeRS(dropNode._nodeId, draggingNodeModel.appDataEntityId);
+            const nodeModel = this.getNodeModel(dropNode._nodeId);
+            return (!!this.findDropNodeRS(dropNode._nodeId, draggingNodeModel.appDataEntityId) && !!(nodeModel === null || nodeModel === void 0 ? void 0 : nodeModel.allowDrop));
         }
         // * 前后的情况
         // 父相同的情况下,就是排序，看当前节点是否能排序

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

@@ -1,4 +1,4 @@
-import { IGanttNodeData, ITreeGridExRowState } from '../../state';
+import { ITreeGridExRowState } from '../../state';
 import { EventBase } from '../argument';
 import { ITreeGridExEvent } from './i-tree-grid-ex.event';
 /**
@@ -11,6 +11,15 @@ import { ITreeGridExEvent } from './i-tree-grid-ex.event';
  * @extends {IMDControlEvent}
  */
 export interface IGanttEvent extends ITreeGridExEvent {
+    /**
+     * 新建行
+     *
+     * @type {({
+     *     event: { row: ITreeGridExRowState } & EventBase;
+     *     emitArgs: { row: ITreeGridExRowState };
+     *   })}
+     * @memberof IGanttEvent
+     */
     onNewRow: {
         event: {
             row: ITreeGridExRowState;
@@ -19,13 +28,5 @@ export interface IGanttEvent extends ITreeGridExEvent {
             row: ITreeGridExRowState;
         };
     };
-    onDefaultExpand: {
-        event: {
-            nodes: IGanttNodeData[];
-        } & EventBase;
-        emitArgs: {
-            nodes: IGanttNodeData[];
-        };
-    };
 }
 //# sourceMappingURL=i-gantt.event.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"i-gantt.event.d.ts","sourceRoot":"","sources":["../../../../../src/interface/controller/event/control/i-gantt.event.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,mBAAmB,EAAE,MAAM,aAAa,CAAC;AAClE,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AACxC,OAAO,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAE1D;;;;;;;;GAQG;AACH,MAAM,WAAW,WAAY,SAAQ,gBAAgB;IACnD,QAAQ,EAAE;QACR,KAAK,EAAE;YAAE,GAAG,EAAE,mBAAmB,CAAA;SAAE,GAAG,SAAS,CAAC;QAChD,QAAQ,EAAE;YAAE,GAAG,EAAE,mBAAmB,CAAA;SAAE,CAAC;KACxC,CAAC;IAEF,eAAe,EAAE;QACf,KAAK,EAAE;YAAE,KAAK,EAAE,cAAc,EAAE,CAAA;SAAE,GAAG,SAAS,CAAC;QAC/C,QAAQ,EAAE;YAAE,KAAK,EAAE,cAAc,EAAE,CAAA;SAAE,CAAC;KACvC,CAAC;CACH"}
+{"version":3,"file":"i-gantt.event.d.ts","sourceRoot":"","sources":["../../../../../src/interface/controller/event/control/i-gantt.event.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,aAAa,CAAC;AAClD,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AACxC,OAAO,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAE1D;;;;;;;;GAQG;AACH,MAAM,WAAW,WAAY,SAAQ,gBAAgB;IACnD;;;;;;;;OAQG;IACH,QAAQ,EAAE;QACR,KAAK,EAAE;YAAE,GAAG,EAAE,mBAAmB,CAAA;SAAE,GAAG,SAAS,CAAC;QAChD,QAAQ,EAAE;YAAE,GAAG,EAAE,mBAAmB,CAAA;SAAE,CAAC;KACxC,CAAC;CACH"}

package/out/utils/file-util/file-util.d.ts

@@ -62,5 +62,25 @@ export declare class FileUtil {
      * @memberof FileUtil
      */
     getFileName(response: IHttpResponse<IData>): string;
+    /**
+     * 选择文件并上传
+     *
+     * @param {IContext} context
+     * @param {IParams} params
+     * @param {IData} data
+     * @param {IData} [option={}]
+     * @return {*}  {Promise<IData[]>}
+     * @memberof FileUtil
+     */
+    chooseFileAndUpload(context: IContext, params: IParams, data: IData, option?: IData): Promise<IData[]>;
+    /**
+     * 选择文件
+     *
+     * @param {string} [accept='']
+     * @param {boolean} [multiple=false]
+     * @return {*}  {Promise<FileList>}
+     * @memberof FileUtil
+     */
+    chooseFile(accept?: string, multiple?: boolean): Promise<FileList>;
 }
 //# sourceMappingURL=file-util.d.ts.map

package/out/utils/file-util/file-util.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"file-util.d.ts","sourceRoot":"","sources":["../../../src/utils/file-util/file-util.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,aAAa,EAGd,MAAM,qBAAqB,CAAC;AAI7B,qBAAa,QAAQ;IACnB;;;;;;;;;OASG;IACH,SAAS,CAAC,aAAa,CACrB,GAAG,EAAE,MAAM,EACX,OAAO,EAAE,QAAQ,EACjB,UAAU,CAAC,EAAE,MAAM,GAClB,MAAM;IAWT;;;;;;;;;;;;;;;;;OAiBG;IACH,iBAAiB,CACf,OAAO,EAAE,QAAQ,EACjB,MAAM,EAAE,OAAO,EACf,IAAI,GAAE,KAAU,EAChB,WAAW,GAAE,KAAU,GACtB;QACD,SAAS,EAAE,MAAM,CAAC;QAClB,WAAW,EAAE,MAAM,CAAC;KACrB;IA0BD;;;;;;;OAOG;IACG,YAAY,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAuB7D;;;;;;;;;;OAUG;IACG,UAAU,CACd,SAAS,EAAE,MAAM,EACjB,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,KAAK,GACb,OAAO,CAAC,KAAK,CAAC;IAiBjB;;;;;;OAMG;IACH,WAAW,CAAC,QAAQ,EAAE,aAAa,CAAC,KAAK,CAAC,GAAG,MAAM;CAkBpD"}
+{"version":3,"file":"file-util.d.ts","sourceRoot":"","sources":["../../../src/utils/file-util/file-util.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,aAAa,EAGd,MAAM,qBAAqB,CAAC;AAK7B,qBAAa,QAAQ;IACnB;;;;;;;;;OASG;IACH,SAAS,CAAC,aAAa,CACrB,GAAG,EAAE,MAAM,EACX,OAAO,EAAE,QAAQ,EACjB,UAAU,CAAC,EAAE,MAAM,GAClB,MAAM;IAWT;;;;;;;;;;;;;;;;;OAiBG;IACH,iBAAiB,CACf,OAAO,EAAE,QAAQ,EACjB,MAAM,EAAE,OAAO,EACf,IAAI,GAAE,KAAU,EAChB,WAAW,GAAE,KAAU,GACtB;QACD,SAAS,EAAE,MAAM,CAAC;QAClB,WAAW,EAAE,MAAM,CAAC;KACrB;IA0BD;;;;;;;OAOG;IACG,YAAY,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAuB7D;;;;;;;;;;OAUG;IACG,UAAU,CACd,SAAS,EAAE,MAAM,EACjB,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,KAAK,GACb,OAAO,CAAC,KAAK,CAAC;IAiBjB;;;;;;OAMG;IACH,WAAW,CAAC,QAAQ,EAAE,aAAa,CAAC,KAAK,CAAC,GAAG,MAAM;IAmBnD;;;;;;;;;OASG;IACG,mBAAmB,CACvB,OAAO,EAAE,QAAQ,EACjB,MAAM,EAAE,OAAO,EACf,IAAI,EAAE,KAAK,EACX,MAAM,GAAE,KAAU,GACjB,OAAO,CAAC,KAAK,EAAE,CAAC;IAiBnB;;;;;;;OAOG;IACH,UAAU,CACR,MAAM,GAAE,MAAW,EACnB,QAAQ,GAAE,OAAe,GACxB,OAAO,CAAC,QAAQ,CAAC;CAuBrB"}

package/out/utils/file-util/file-util.js

@@ -1,5 +1,6 @@
-import { RuntimeError, downloadFileFromBlob, } from '@ibiz-template/core';
+import { CoreConst, RuntimeError, downloadFileFromBlob, } from '@ibiz-template/core';
 import qs from 'qs';
+import { getCookie } from 'qx-util';
 import { convertNavData } from '../nav-params/nav-params';
 export class FileUtil {
     /**
@@ -138,4 +139,54 @@ export class FileUtil {
         }
         return fileName;
     }
+    /**
+     * 选择文件并上传
+     *
+     * @param {IContext} context
+     * @param {IParams} params
+     * @param {IData} data
+     * @param {IData} [option={}]
+     * @return {*}  {Promise<IData[]>}
+     * @memberof FileUtil
+     */
+    async chooseFileAndUpload(context, params, data, option = {}) {
+        const { accept, multiple } = option;
+        const urls = ibiz.util.file.calcFileUpDownUrl(context, params, data);
+        const files = await ibiz.util.file.chooseFile(accept, multiple);
+        const promises = [];
+        const headers = { Authorization: `Bearer ${getCookie(CoreConst.TOKEN)}` };
+        for (let i = 0; i < files.length; i++) {
+            const promise = await ibiz.util.file.fileUpload(urls.uploadUrl, files[i], headers);
+            promises.push(promise);
+        }
+        return Promise.all(promises);
+    }
+    /**
+     * 选择文件
+     *
+     * @param {string} [accept='']
+     * @param {boolean} [multiple=false]
+     * @return {*}  {Promise<FileList>}
+     * @memberof FileUtil
+     */
+    chooseFile(accept = '', multiple = false) {
+        return new Promise(resolve => {
+            // 创建 input 元素
+            const inputElement = document.createElement('input');
+            inputElement.type = 'file';
+            inputElement.accept = accept;
+            inputElement.multiple = multiple;
+            inputElement.webkitdirectory = false;
+            // 添加事件监听器，处理文件上传逻辑
+            inputElement.addEventListener('change', (e) => {
+                resolve(e.target.files);
+            });
+            // 将 input 元素添加到页面中
+            document.body.appendChild(inputElement);
+            // 执行文件上传操作
+            inputElement.click();
+            // 方法结束后销毁 input 元素
+            document.body.removeChild(inputElement);
+        });
+    }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ibiz-template/runtime",
-  "version": "0.7.17",
+  "version": "0.7.18",
   "description": "控制器包",
   "type": "module",
   "main": "out/index.js",
@@ -35,7 +35,7 @@
     "animejs": "^3.2.2"
   },
   "devDependencies": {
-    "@ibiz-template/core": "^0.7.17",
+    "@ibiz-template/core": "^0.7.18",
     "@ibiz/model-core": "^0.1.27",
     "@types/animejs": "^3.1.12",
     "@types/path-browserify": "^1.0.2",
@@ -66,5 +66,5 @@
     "qx-util": "^0.4.8",
     "ramda": "^0.29.0"
   },
-  "gitHead": "cf1ed3520a2a7b2fd63972101cfc90f9b0995ca5"
+  "gitHead": "7a8d05d5668ec1305c292c6150d64c1739cd4e3e"
 }