@ibiz-template/runtime 0.5.3-beta.4 → 0.5.3-beta.6

package/out/controller/control/tree-grid-ex/tree-grid-ex.controller.js

@@ -1,8 +1,14 @@
-import { recursiveIterate } from '@ibiz-template/core';
+import { RuntimeError, awaitTimeout, recursiveIterate, } from '@ibiz-template/core';
+import { clone } from 'ramda';
 import { getTreeGridExColumnProvider } from '../../../register';
 import { TreeGridExService } from './tree-grid-ex.service';
 import { TreeController } from '../tree/tree.controller';
 import { TreeGridExRowState } from './tree-grid-ex-row.state';
+import { Srfuf } from '../../../service';
+import { calcDeCodeNameById } from '../../../model';
+import { TreeGridExNotifyState } from '../../constant';
+import { handleAllSettled } from '../../../utils';
+import { getDefaultValue, isValueChange } from '../../utils';
 /**
  * 树表格（增强）部件控制器
  *
@@ -53,6 +59,9 @@ export class TreeGridExController extends TreeController {
          */
         this.uaColumns = {};
     }
+    get _evt() {
+        return this.evt;
+    }
     /**
      * 是否有配置宽度自适应列
      *
@@ -72,11 +81,23 @@ export class TreeGridExController extends TreeController {
     get overflowMode() {
         return ibiz.config.grid.overflowMode;
     }
+    /**
+     * 允许使用行编辑
+     * @author lxm
+     * @date 2023-08-17 02:52:07
+     * @readonly
+     * @type {boolean}
+     */
+    get allowRowEdit() {
+        return this.state.rowEditOpen;
+    }
     initState() {
         super.initState();
         this.state.columnStates = [];
         this.state.rootNodes = [];
         this.state.rows = {};
+        // this.state.rowEditOpen = false;
+        this.state.rowEditOpen = true;
     }
     async onCreated() {
         await super.onCreated();
@@ -209,4 +230,220 @@ export class TreeGridExController extends TreeController {
             convertColumnCaption(this.model.detreeColumns);
         }
     }
+    async save(nodeData) {
+        if (this.state.isSimple) {
+            ibiz.log.debug('简单模式，不保存');
+            return;
+        }
+        if (nodeData._nodeType !== 'DE') {
+            throw new RuntimeError('非实体节点数据不能保存');
+        }
+        const rowState = this.state.rows[nodeData._uuid];
+        if (!rowState) {
+            throw new RuntimeError('行数据不存在');
+        }
+        if (!rowState.modified) {
+            ibiz.log.debug('值没有发生改变');
+            return;
+        }
+        // const isValid = await this.validate(rowState);
+        // if (!isValid) {
+        //   throw new RuntimeError('行数据校验不通过，保存取消');
+        // }
+        // 如果数据正在处理中，则延迟保存
+        if (rowState.processing) {
+            await awaitTimeout(500, this.save.bind(this), [nodeData]);
+            return;
+        }
+        const nodeModel = this.getNodeModel(nodeData._nodeId);
+        const { appDataEntityId } = nodeModel;
+        const isCreate = nodeData._deData.srfuf === Srfuf.CREATE;
+        if (isCreate) {
+            throw new RuntimeError('暂不支持新建');
+        }
+        const methodAction = 'update'; // todo补了模型从模型取
+        // 处理接口
+        const deName = calcDeCodeNameById(appDataEntityId);
+        const tempContext = this.context.clone();
+        tempContext[deName] = nodeData._deData.srfkey;
+        const app = ibiz.hub.getApp(this.context.srfappid);
+        let res;
+        try {
+            res = await app.deService.exec(appDataEntityId, methodAction, tempContext, nodeData._deData);
+        }
+        catch (error) {
+            await this._evt.emit('onSaveError', undefined);
+            this.actionNotification(`${isCreate ? 'CREATE' : 'UPDATE'}ERROR`, {
+                error: error,
+                data: rowState.data,
+            });
+            throw error;
+        }
+        // 后续处理
+        rowState.data._deData = res.data;
+        rowState.modified = false;
+        this.gridStateNotify(rowState, TreeGridExNotifyState.SAVE);
+        await this._evt.emit('onSaveSuccess', undefined);
+    }
+    async saveAll() {
+        const needSaveData = Object.values(this.state.rows)
+            .filter(row => row.modified)
+            .map(row => row.data);
+        if (!needSaveData.length) {
+            return;
+        }
+        await handleAllSettled(needSaveData.map(data => {
+            return this.save(data);
+        }));
+    }
+    /**
+     * 树表格状态变更通知
+     *
+     * @author lxm
+     * @date 2022-09-20 18:09:07
+     */
+    gridStateNotify(row, state) {
+        // 通知表格编辑列
+        Object.values(this.columns).forEach(column => {
+            column.gridStateNotify(row, state);
+        });
+    }
+    /**
+     * 设置行属性的值
+     *
+     * @author lxm
+     * @date 2022-08-24 10:08:40
+     * @param {GridRowState} row 行状态控制器
+     * @param {unknown} value 要设置的值
+     * @param {string} name 要设置的表单数据的属性名称
+     */
+    async setRowValue(row, name, value) {
+        if (Object.prototype.hasOwnProperty.call(row.data, name) &&
+            !isValueChange(row.data[name], value)) {
+            // `表格行数据里没有属性${name}或者${name}的值未发生改变`
+            return;
+        }
+        // 改变值
+        row.data[name] = value;
+        row.modified = true;
+        row.processing = true;
+        try {
+            await this.dataChangeNotify(row, [name]);
+            // await this._evt.emit('onGridDataChange', {
+            //   data: this.state.rows.map(_row => {
+            //     return _row.data;
+            //   }),
+            // });
+        }
+        finally {
+            row.processing = false;
+        }
+    }
+    /**
+     * 通知所有表格编辑项成员表格编辑项数据变更
+     *
+     * @author lxm
+     * @date 2022-09-20 22:09:49
+     * @param {GridRowState} row 行数据
+     * @param {string[]} names 更新的属性
+     */
+    async dataChangeNotify(row, names) {
+        // 通知所有编辑项去处理编辑项相关逻辑
+        await handleAllSettled(Object.values(this.columns).map(async (column) => {
+            return column.dataChangeNotify(row, names);
+        }));
+    }
+    async toggleRowEdit() {
+        this.state.rowEditOpen = !this.state.rowEditOpen;
+    }
+    /**
+     * 计算默认值并返回一个对象，对象里的属性就是要填充的默认值
+     * 没有的属性就是不需要填充默认值的属性
+     * @author lxm
+     * @date 2023-09-18 04:01:06
+     * @param {IData} data
+     * @param {boolean} isCreate
+     * @return {*}  {IData}
+     */
+    calcDefaultValue(data, isCreate) {
+        const result = {};
+        Object.values(this.fieldColumns).forEach(c => {
+            const nodeColumn = c.nodeColumnControllerMap.get(data._nodeId);
+            if (!nodeColumn || !nodeColumn.nodeEditItem) {
+                return;
+            }
+            const { createDV, createDVT, updateDV, updateDVT } = nodeColumn.nodeEditItem;
+            const valueType = isCreate ? createDVT : updateDVT;
+            const defaultValue = isCreate ? createDV : updateDV;
+            const defaultVal = getDefaultValue({
+                name: c.name,
+                valueType,
+                defaultValue,
+                valueFormat: nodeColumn.valueFormat,
+            }, { data, context: this.context, params: this.params });
+            if (defaultVal !== undefined) {
+                result[c.name] = defaultVal;
+            }
+        });
+        return result;
+    }
+    /**
+     * 切换单行的编辑状态
+     * @author lxm
+     * @date 2023-08-08 06:45:54
+     * @param {GridRowState} row
+     * @param {boolean} [editable]
+     */
+    async switchRowEdit(row, editable, isSave = true) {
+        if (!this.allowRowEdit) {
+            return;
+        }
+        if (row.data._nodeType !== 'DE') {
+            return;
+        }
+        const toState = editable === undefined ? !row.showRowEdit : editable;
+        // 一样的状态不处理
+        if (row.showRowEdit === toState) {
+            return;
+        }
+        if (toState === false) {
+            // * 处理关闭行编辑
+            if (isSave) {
+                // 校验并保存
+                await this.save(row.data);
+            }
+            else if (row.data._deData.srfuf === Srfuf.CREATE) {
+                // 新建的行取消时删除这一行的数据
+                row.showRowEdit = false;
+                this._evt.emit('onRowEditChange', { row });
+                return this.remove({ data: [row.data], silent: true });
+            }
+            else if (row.cacheData) {
+                // 取消的时候，还原编辑前的数据
+                row.data = row.cacheData;
+                delete row.cacheData;
+            }
+        }
+        else {
+            // * 处理显示行编辑
+            // 如果已经有一行处于行编辑了，不开起另一行。
+            const editingRow = Object.values(this.state.rows).find(item => item.showRowEdit);
+            if (editingRow) {
+                throw new RuntimeError('同时只能有一行开启行编辑');
+            }
+            if (row.data._deData.srfuf === Srfuf.UPDATE) {
+                // 打开时先缓存一下
+                row.cacheData = clone(row.data);
+                // 填充更新默认值
+                const defaultVal = this.calcDefaultValue(row.data, false);
+                Object.assign(row.data, defaultVal);
+            }
+        }
+        // 修改行的编辑状态和编辑列的编辑状态。
+        row.showRowEdit = toState;
+        Object.values(this.fieldColumns).forEach(column => {
+            row.editColStates[column.name].editable = toState;
+        });
+        this._evt.emit('onRowEditChange', { row });
+    }
 }

package/out/interface/common/i-app-hub-service/i-app-hub-service.d.ts

@@ -81,11 +81,12 @@ export interface IAppHubService {
      * 设置应用视图所属应用，兼容识别视图 codeName 或 id
      *
      * @author chitanda
-     * @date 2023-04-23 15:04:56
+     * @date 2024-01-15 15:01:39
      * @param {string} tag
-     * @param {string} [appId=ibiz.env.appId]
+     * @param {string} [appId]
+     * @param {number} [priority]
      */
-    setAppView(tag: string, appId?: string): void;
+    setAppView(tag: string, appId?: string, priority?: number): void;
     /**
      * 应用视图是否已注册
      *

package/out/interface/common/i-app-hub-service/i-app-hub-service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"i-app-hub-service.d.ts","sourceRoot":"","sources":["../../../../src/interface/common/i-app-hub-service/i-app-hub-service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,QAAQ,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAC1E,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AACvC,OAAO,EAAE,mBAAmB,EAAE,MAAM,gBAAgB,CAAC;AACrD,OAAO,EAAE,iBAAiB,EAAE,MAAM,8CAA8C,CAAC;AACjF,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAE,aAAa,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AAC9D,OAAO,EAAE,WAAW,EAAE,MAAM,gCAAgC,CAAC;AAE7D;;;;;;;GAOG;AACH,MAAM,WAAW,cAAc;IAC7B;;;;;;OAMG;IACH,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC;IAE1B;;;;;;OAMG;IACH,QAAQ,CAAC,UAAU,EAAE,cAAc,CAAC;IAEpC;;;;;;OAMG;IACH,WAAW,EAAE,cAAc,CAAC;IAE5B;;;;;;OAMG;IACH,uBAAuB,EAAE,MAAM,CAAC;IAEhC;;;;OAIG;IACH,MAAM,EAAE,iBAAiB,CAAC;IAE1B;;;;;;OAMG;IACH,2BAA2B,CAAC,QAAQ,EAAE,mBAAmB,GAAG,IAAI,CAAC;IAEjE;;;;;;OAMG;IACH,eAAe,CAAC,KAAK,EAAE,QAAQ,GAAG,IAAI,CAAC;IAEvC;;;;;;;OAOG;IACH,qBAAqB,CAAC,KAAK,EAAE,cAAc,EAAE,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IAElE;;;;;;;OAOG;IACH,UAAU,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAE9C;;;;;;;OAOG;IACH,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;IAEjC;;;;;;;OAOG;IACH,WAAW,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAAC;IAEnD;;;;;;;OAOG;IACH,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC;IAE3C;;;;;;;;;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,EAAE,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,cAAc,CAAC,CAAC;IAEtE;;;;;;;OAOG;IACH,WAAW,CAAC,KAAK,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,WAAW,CAAC,CAAC;IAElD;;;;;;;OAOG;IACH,MAAM,CAAC,GAAG,CAAC,EAAE,MAAM,GAAG,YAAY,GAAG,WAAW,CAAC;IAEjD;;;;;;OAMG;IACH,UAAU,IAAI,WAAW,EAAE,CAAC;IAE5B;;;;;;;;;OASG;IACH,eAAe,CACb,KAAK,EAAE,MAAM,EACb,QAAQ,EAAE,MAAM,EAChB,OAAO,EAAE,QAAQ,GAChB,OAAO,CAAC,aAAa,CAAC,CAAC;IAE1B;;;;OAIG;IACH,KAAK,IAAI,IAAI,CAAC;CACf"}
+{"version":3,"file":"i-app-hub-service.d.ts","sourceRoot":"","sources":["../../../../src/interface/common/i-app-hub-service/i-app-hub-service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,QAAQ,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAC1E,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AACvC,OAAO,EAAE,mBAAmB,EAAE,MAAM,gBAAgB,CAAC;AACrD,OAAO,EAAE,iBAAiB,EAAE,MAAM,8CAA8C,CAAC;AACjF,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAE,aAAa,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AAC9D,OAAO,EAAE,WAAW,EAAE,MAAM,gCAAgC,CAAC;AAE7D;;;;;;;GAOG;AACH,MAAM,WAAW,cAAc;IAC7B;;;;;;OAMG;IACH,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC;IAE1B;;;;;;OAMG;IACH,QAAQ,CAAC,UAAU,EAAE,cAAc,CAAC;IAEpC;;;;;;OAMG;IACH,WAAW,EAAE,cAAc,CAAC;IAE5B;;;;;;OAMG;IACH,uBAAuB,EAAE,MAAM,CAAC;IAEhC;;;;OAIG;IACH,MAAM,EAAE,iBAAiB,CAAC;IAE1B;;;;;;OAMG;IACH,2BAA2B,CAAC,QAAQ,EAAE,mBAAmB,GAAG,IAAI,CAAC;IAEjE;;;;;;OAMG;IACH,eAAe,CAAC,KAAK,EAAE,QAAQ,GAAG,IAAI,CAAC;IAEvC;;;;;;;OAOG;IACH,qBAAqB,CAAC,KAAK,EAAE,cAAc,EAAE,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IAElE;;;;;;;;OAQG;IACH,UAAU,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAEjE;;;;;;;OAOG;IACH,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;IAEjC;;;;;;;OAOG;IACH,WAAW,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAAC;IAEnD;;;;;;;OAOG;IACH,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC;IAE3C;;;;;;;;;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,EAAE,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,cAAc,CAAC,CAAC;IAEtE;;;;;;;OAOG;IACH,WAAW,CAAC,KAAK,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,WAAW,CAAC,CAAC;IAElD;;;;;;;OAOG;IACH,MAAM,CAAC,GAAG,CAAC,EAAE,MAAM,GAAG,YAAY,GAAG,WAAW,CAAC;IAEjD;;;;;;OAMG;IACH,UAAU,IAAI,WAAW,EAAE,CAAC;IAE5B;;;;;;;;;OASG;IACH,eAAe,CACb,KAAK,EAAE,MAAM,EACb,QAAQ,EAAE,MAAM,EAChB,OAAO,EAAE,QAAQ,GAChB,OAAO,CAAC,aAAa,CAAC,CAAC;IAE1B;;;;OAIG;IACH,KAAK,IAAI,IAAI,CAAC;CACf"}

package/out/interface/controller/controller/control/i-tree-grid-ex.controller.d.ts

@@ -1,6 +1,6 @@
 import { IDETreeGridEx } from '@ibiz/model-core';
 import { ITreeGridExEvent } from '../../event';
-import { ITreeGridExState } from '../../state';
+import { ITreeGridExState, ITreeNodeData } from '../../state';
 import { ITreeController } from './i-tree.controller';
 /**
  * 树表格(增强)部件控制器
@@ -12,5 +12,27 @@ import { ITreeController } from './i-tree.controller';
  * @extends {ITreeController<T, S, E>}
  */
 export interface ITreeGridExController<T extends IDETreeGridEx = IDETreeGridEx, S extends ITreeGridExState = ITreeGridExState, E extends ITreeGridExEvent = ITreeGridExEvent> extends ITreeController<T, S, E> {
+    /**
+     * 保存单条数据
+     *
+     * @author zk
+     * @date 2023-07-31 02:07:52
+     * @memberof IGridController
+     */
+    save(data: ITreeNodeData): Promise<void>;
+    /**
+     * 保存表格所有数据
+     *
+     * @author zk
+     * @date 2023-07-31 02:07:52
+     * @memberof IGridController
+     */
+    saveAll(): Promise<void>;
+    /**
+     * 切换表格的行编辑开启关闭状态
+     * @author lxm
+     * @date 2023-08-16 10:18:14
+     */
+    toggleRowEdit(): void;
 }
 //# sourceMappingURL=i-tree-grid-ex.controller.d.ts.map

package/out/interface/controller/controller/control/i-tree-grid-ex.controller.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"i-tree-grid-ex.controller.d.ts","sourceRoot":"","sources":["../../../../../src/interface/controller/controller/control/i-tree-grid-ex.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACjD,OAAO,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAC/C,OAAO,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAC/C,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAEtD;;;;;;;;GAQG;AACH,MAAM,WAAW,qBAAqB,CACpC,CAAC,SAAS,aAAa,GAAG,aAAa,EACvC,CAAC,SAAS,gBAAgB,GAAG,gBAAgB,EAC7C,CAAC,SAAS,gBAAgB,GAAG,gBAAgB,CAC7C,SAAQ,eAAe,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;CAAG"}
+{"version":3,"file":"i-tree-grid-ex.controller.d.ts","sourceRoot":"","sources":["../../../../../src/interface/controller/controller/control/i-tree-grid-ex.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACjD,OAAO,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAC/C,OAAO,EAAE,gBAAgB,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAC9D,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAEtD;;;;;;;;GAQG;AACH,MAAM,WAAW,qBAAqB,CACpC,CAAC,SAAS,aAAa,GAAG,aAAa,EACvC,CAAC,SAAS,gBAAgB,GAAG,gBAAgB,EAC7C,CAAC,SAAS,gBAAgB,GAAG,gBAAgB,CAC7C,SAAQ,eAAe,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;IAChC;;;;;;OAMG;IACH,IAAI,CAAC,IAAI,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAEzC;;;;;;OAMG;IACH,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IAEzB;;;;OAIG;IACH,aAAa,IAAI,IAAI,CAAC;CACvB"}

package/out/interface/controller/event/control/i-tree-grid-ex.event.d.ts

@@ -1,3 +1,5 @@
+import { ITreeGridExRowState } from '../../state';
+import { EventBase } from '../argument';
 import { ITreeEvent } from './i-tree.event';
 /**
  * 树表格(增强)部件事件
@@ -9,5 +11,20 @@ import { ITreeEvent } from './i-tree.event';
  * @extends {IMDControlEvent}
  */
 export interface ITreeGridExEvent extends ITreeEvent {
+    /**
+     * 表格行编辑切换事件
+     * @author lxm
+     * @date 2023-03-26 06:15:06
+     * @param {emitArgs} undefined
+     * @return {*}  {Promise<void>}
+     */
+    onRowEditChange: {
+        event: {
+            row: ITreeGridExRowState;
+        } & EventBase;
+        emitArgs: {
+            row: ITreeGridExRowState;
+        };
+    };
 }
 //# sourceMappingURL=i-tree-grid-ex.event.d.ts.map

package/out/interface/controller/event/control/i-tree-grid-ex.event.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"i-tree-grid-ex.event.d.ts","sourceRoot":"","sources":["../../../../../src/interface/controller/event/control/i-tree-grid-ex.event.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAE5C;;;;;;;;GAQG;AACH,MAAM,WAAW,gBAAiB,SAAQ,UAAU;CAAG"}
+{"version":3,"file":"i-tree-grid-ex.event.d.ts","sourceRoot":"","sources":["../../../../../src/interface/controller/event/control/i-tree-grid-ex.event.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,aAAa,CAAC;AAClD,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AACxC,OAAO,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAE5C;;;;;;;;GAQG;AACH,MAAM,WAAW,gBAAiB,SAAQ,UAAU;IAClD;;;;;;OAMG;IACH,eAAe,EAAE;QACf,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/interface/controller/state/control/i-tree-grid-ex.state.d.ts

@@ -30,6 +30,13 @@ export interface ITreeGridExState extends ITreeState {
     rows: {
         [p: string]: ITreeGridExRowState;
     };
+    /**
+     * 开启表格行编辑
+     * @author lxm
+     * @date 2023-08-17 02:38:18
+     * @type {boolean}
+     */
+    rowEditOpen: boolean;
 }
 /**
  * 树表格(增强)行状态
@@ -47,14 +54,65 @@ export interface ITreeGridExRowState {
      */
     data: ITreeNodeData;
     /**
-     * 操作列状态(p是操作列的标识)
+     * 错误信息集合，p是对应属性名称
+     *
+     * @author lxm
+     * @date 2022-09-06 15:09:54
+     * @type {({ [p: string]: string | null })}
+     */
+    errors: {
+        [p: string]: string | null;
+    };
+    /**
+     * 可能是以下两种类型状态
+     * - 操作列按钮状态（p是操作列的标识）
+     * - 属性列的内置界面行为组状态(p是属性列的标识)
      *
      * @author lxm
      * @date 2022-09-07 22:09:38
      * @type {({ [p: string]: IButtonContainerState  })}
      */
-    uaColStates: {
+    columnActionsStates: {
         [p: string]: IButtonContainerState;
     };
+    /**
+     * 编辑列的状态
+     *
+     * @author lxm
+     * @date 2022-09-20 15:09:58
+     * @type {({ [p: string]: { disabled: boolean } })}
+     */
+    editColStates: {
+        [p: string]: {
+            disabled: boolean;
+            readonly: boolean;
+            editable: boolean;
+            required: boolean;
+        };
+    };
+    /**
+     * 是否显示行编辑
+     *
+     * @author lxm
+     * @date 2022-09-05 22:09:23
+     * @type {boolean}
+     */
+    showRowEdit: boolean;
+    /**
+     * 是否被修改过
+     *
+     * @author lxm
+     * @date 2022-11-02 22:11:33
+     * @type {boolean}
+     */
+    modified: boolean;
+    /**
+     * 是否正在处理中(动态控制，值规则，表单项更新等逻辑中)
+     * @author lxm
+     * @date 2023-03-06 08:00:22
+     * @type {boolean}
+     * @memberof GridRowState
+     */
+    processing: boolean;
 }
 //# sourceMappingURL=i-tree-grid-ex.state.d.ts.map

package/out/interface/controller/state/control/i-tree-grid-ex.state.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"i-tree-grid-ex.state.d.ts","sourceRoot":"","sources":["../../../../../src/interface/controller/state/control/i-tree-grid-ex.state.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAAE,MAAM,cAAc,CAAC;AACrD,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAC9C,OAAO,EAAE,aAAa,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAE3D;;;;;;;;GAQG;AACH,MAAM,WAAW,gBAAiB,SAAQ,UAAU;IAClD;;;;;;;OAOG;IACH,YAAY,EAAE,YAAY,EAAE,CAAC;IAE7B;;;;;;OAMG;IACH,IAAI,EAAE;QAAE,CAAC,CAAC,EAAE,MAAM,GAAG,mBAAmB,CAAA;KAAE,CAAC;CAC5C;AAED;;;;;;GAMG;AACH,MAAM,WAAW,mBAAmB;IAClC;;;;;OAKG;IACH,IAAI,EAAE,aAAa,CAAC;IAEpB;;;;;;OAMG;IACH,WAAW,EAAE;QAAE,CAAC,CAAC,EAAE,MAAM,GAAG,qBAAqB,CAAA;KAAE,CAAC;CACrD"}
+{"version":3,"file":"i-tree-grid-ex.state.d.ts","sourceRoot":"","sources":["../../../../../src/interface/controller/state/control/i-tree-grid-ex.state.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAAE,MAAM,cAAc,CAAC;AACrD,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAC9C,OAAO,EAAE,aAAa,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAE3D;;;;;;;;GAQG;AACH,MAAM,WAAW,gBAAiB,SAAQ,UAAU;IAClD;;;;;;;OAOG;IACH,YAAY,EAAE,YAAY,EAAE,CAAC;IAE7B;;;;;;OAMG;IACH,IAAI,EAAE;QAAE,CAAC,CAAC,EAAE,MAAM,GAAG,mBAAmB,CAAA;KAAE,CAAC;IAE3C;;;;;OAKG;IACH,WAAW,EAAE,OAAO,CAAC;CACtB;AAED;;;;;;GAMG;AACH,MAAM,WAAW,mBAAmB;IAClC;;;;;OAKG;IACH,IAAI,EAAE,aAAa,CAAC;IAEpB;;;;;;OAMG;IACH,MAAM,EAAE;QAAE,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAAA;KAAE,CAAC;IAEvC;;;;;;;;OAQG;IACH,mBAAmB,EAAE;QAAE,CAAC,CAAC,EAAE,MAAM,GAAG,qBAAqB,CAAA;KAAE,CAAC;IAE5D;;;;;;OAMG;IACH,aAAa,EAAE;QACb,CAAC,CAAC,EAAE,MAAM,GAAG;YACX,QAAQ,EAAE,OAAO,CAAC;YAClB,QAAQ,EAAE,OAAO,CAAC;YAClB,QAAQ,EAAE,OAAO,CAAC;YAClB,QAAQ,EAAE,OAAO,CAAC;SACnB,CAAC;KACH,CAAC;IAEF;;;;;;OAMG;IACH,WAAW,EAAE,OAAO,CAAC;IAErB;;;;;;OAMG;IACH,QAAQ,EAAE,OAAO,CAAC;IAElB;;;;;;OAMG;IACH,UAAU,EAAE,OAAO,CAAC;CACrB"}

package/out/interface/provider/i-async-action.provider.d.ts

@@ -18,10 +18,11 @@ export interface IAsyncActionProvider {
     /**
      * 点击事件
      * @author lxm
-     * @date 2023-11-14 09:30:39
+     * @date 2024-01-15 12:47:22
      * @param {IPortalAsyncAction} asyncAction
      * @param {MouseEvent} event
+     * @return {*}  {boolean} 返回是否隐藏消息popover
      */
-    onClick(asyncAction: IPortalAsyncAction, event: MouseEvent): void;
+    onClick(asyncAction: IPortalAsyncAction, event: MouseEvent): boolean;
 }
 //# sourceMappingURL=i-async-action.provider.d.ts.map

package/out/interface/provider/i-async-action.provider.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"i-async-action.provider.d.ts","sourceRoot":"","sources":["../../../src/interface/provider/i-async-action.provider.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AAEzD;;;;;;;GAOG;AACH,MAAM,WAAW,oBAAoB;IACnC;;;;;OAKG;IAEH,SAAS,EAAE,GAAG,CAAC;IAEf;;;;;;OAMG;IACH,OAAO,CAAC,WAAW,EAAE,kBAAkB,EAAE,KAAK,EAAE,UAAU,GAAG,IAAI,CAAC;CACnE"}
+{"version":3,"file":"i-async-action.provider.d.ts","sourceRoot":"","sources":["../../../src/interface/provider/i-async-action.provider.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AAEzD;;;;;;;GAOG;AACH,MAAM,WAAW,oBAAoB;IACnC;;;;;OAKG;IAEH,SAAS,EAAE,GAAG,CAAC;IAEf;;;;;;;OAOG;IACH,OAAO,CAAC,WAAW,EAAE,kBAAkB,EAAE,KAAK,EAAE,UAAU,GAAG,OAAO,CAAC;CACtE"}

package/out/register/helper/app-menu-item-register.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"app-menu-item-register.d.ts","sourceRoot":"","sources":["../../../src/register/helper/app-menu-item-register.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAEhD,OAAO,EAAE,oBAAoB,EAAE,MAAM,iBAAiB,CAAC;AAEvD,iBAAiB;AACjB,eAAO,MAAM,2BAA2B,gBAAgB,CAAC;AAEzD;;;;;;;;GAQG;AACH,wBAAgB,2BAA2B,CACzC,GAAG,EAAE,MAAM,EACX,QAAQ,EAAE,MAAM,oBAAoB,GACnC,IAAI,CAEN;AAQD;;;;;;;;GAQG;AACH,wBAAsB,sBAAsB,CAC1C,KAAK,EAAE,YAAY,GAClB,OAAO,CAAC,oBAAoB,GAAG,SAAS,CAAC,CAwB3C"}
+{"version":3,"file":"app-menu-item-register.d.ts","sourceRoot":"","sources":["../../../src/register/helper/app-menu-item-register.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAEhD,OAAO,EAAE,oBAAoB,EAAE,MAAM,iBAAiB,CAAC;AAEvD,iBAAiB;AACjB,eAAO,MAAM,2BAA2B,gBAAgB,CAAC;AAEzD;;;;;;;;GAQG;AACH,wBAAgB,2BAA2B,CACzC,GAAG,EAAE,MAAM,EACX,QAAQ,EAAE,MAAM,oBAAoB,GACnC,IAAI,CAEN;AAQD;;;;;;;;GAQG;AACH,wBAAsB,sBAAsB,CAC1C,KAAK,EAAE,YAAY,GAClB,OAAO,CAAC,oBAAoB,GAAG,SAAS,CAAC,CAoB3C"}

package/out/register/helper/app-menu-item-register.js

@@ -43,10 +43,5 @@ export async function getAppMenuItemProvider(model) {
     }
     // 找应用菜单项类型
     provider = getProvider(itemType);
-    if (!provider) {
-        ibiz.log.error(`找不到应用菜单项类型${itemType}对应的适配器`);
-    }
-    else {
-        return provider;
-    }
+    return provider;
 }

package/out/register/helper/panel-item-register.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"panel-item-register.d.ts","sourceRoot":"","sources":["../../../src/register/helper/panel-item-register.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,UAAU,EAEX,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,kBAAkB,EAAE,MAAM,iBAAiB,CAAC;AAGrD,gBAAgB;AAChB,eAAO,MAAM,yBAAyB,cAAc,CAAC;AAErD;;;;;;;GAOG;AACH,wBAAgB,yBAAyB,CACvC,GAAG,EAAE,MAAM,EACX,QAAQ,EAAE,MAAM,kBAAkB,GACjC,IAAI,CAKN;AAQD;;;;;;;GAOG;AACH,wBAAsB,oBAAoB,CACxC,KAAK,EAAE,UAAU,GAChB,OAAO,CAAC,kBAAkB,GAAG,SAAS,CAAC,CAiEzC"}
+{"version":3,"file":"panel-item-register.d.ts","sourceRoot":"","sources":["../../../src/register/helper/panel-item-register.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,UAAU,EAEX,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,kBAAkB,EAAE,MAAM,iBAAiB,CAAC;AAGrD,gBAAgB;AAChB,eAAO,MAAM,yBAAyB,cAAc,CAAC;AAErD;;;;;;;GAOG;AACH,wBAAgB,yBAAyB,CACvC,GAAG,EAAE,MAAM,EACX,QAAQ,EAAE,MAAM,kBAAkB,GACjC,IAAI,CAKN;AAQD;;;;;;;GAOG;AACH,wBAAsB,oBAAoB,CACxC,KAAK,EAAE,UAAU,GAChB,OAAO,CAAC,kBAAkB,GAAG,SAAS,CAAC,CAuEzC"}

package/out/register/helper/panel-item-register.js

@@ -26,7 +26,7 @@ function getProvider(key) {
 export async function getPanelItemProvider(model) {
     var _a;
     let provider;
-    const { itemType, sysPFPluginId, appId } = model;
+    const { itemType, sysPFPluginId, appId, controlRenders } = model;
     // 找插件适配器
     if (sysPFPluginId) {
         const pluginKey = await getPluginRegisterKey(sysPFPluginId, appId);
@@ -40,42 +40,48 @@ export async function getPanelItemProvider(model) {
             return provider;
         }
     }
-    // 特殊容器类型
-    if (itemType === 'CONTAINER') {
-        const predefinedType = model.predefinedType || 'DEFAULT';
-        const key = `CONTAINER_${predefinedType}`;
-        provider = getProvider(key);
-        if (!provider) {
-            ibiz.log.error(`找不到面板容器预置类型为${predefinedType}的适配器，注册key为${key}`);
-        }
-        else {
-            return provider;
-        }
+    if (controlRenders && controlRenders.length > 0) {
+        // 默认预定义 绘制器
+        provider = getProvider('PREDEFINE_RENDER');
     }
-    // 特殊直接内容类型
-    if (itemType === 'RAWITEM') {
-        const predefinedType = ((_a = model.rawItem) === null || _a === void 0 ? void 0 : _a.predefinedType) || 'DEFAULT';
-        const key = `RAWITEM_${predefinedType}`;
-        provider = getProvider(key);
-        if (!provider) {
-            ibiz.log.error(`找不到面板成员直接内容预置类型为${predefinedType}的适配器，注册key为${key}`);
-        }
-        else {
-            return provider;
+    else {
+        // 特殊容器类型
+        if (itemType === 'CONTAINER') {
+            const predefinedType = model.predefinedType || 'DEFAULT';
+            const key = `CONTAINER_${predefinedType}`;
+            provider = getProvider(key);
+            if (!provider) {
+                ibiz.log.error(`找不到面板容器预置类型为${predefinedType}的适配器，注册key为${key}`);
+            }
+            else {
+                return provider;
+            }
         }
-    }
-    if (itemType === 'FIELD') {
-        const { editor } = model;
-        if (editor && editor.predefinedType) {
-            const key = `FIELD_${editor.predefinedType.toUpperCase()}`;
+        // 特殊直接内容类型
+        if (itemType === 'RAWITEM') {
+            const predefinedType = ((_a = model.rawItem) === null || _a === void 0 ? void 0 : _a.predefinedType) || 'DEFAULT';
+            const key = `RAWITEM_${predefinedType}`;
             provider = getProvider(key);
-            if (provider) {
+            if (!provider) {
+                ibiz.log.error(`找不到面板成员直接内容预置类型为${predefinedType}的适配器，注册key为${key}`);
+            }
+            else {
                 return provider;
             }
         }
+        if (itemType === 'FIELD') {
+            const { editor } = model;
+            if (editor && editor.predefinedType) {
+                const key = `FIELD_${editor.predefinedType.toUpperCase()}`;
+                provider = getProvider(key);
+                if (provider) {
+                    return provider;
+                }
+            }
+        }
+        // 找面板成员类型
+        provider = getProvider(itemType);
     }
-    // 找面板成员类型
-    provider = getProvider(itemType);
     if (!provider) {
         ibiz.log.error(`找不到面板成员类型${itemType}对应的适配器`);
     }

package/out/service/dto/method.dto.d.ts

@@ -17,15 +17,6 @@ export declare class MethodDto {
     protected app?: IAppService;
     protected fields: IAppDEMethodDTOField[];
     protected dtoMap: Map<string, MethodDto>;
-    /**
-     * 当前 DTO 是否已经计算过关系相关逻辑
-     *
-     * @link this.calcRs
-     * @author chitanda
-     * @date 2023-12-26 16:12:18
-     * @protected
-     */
-    protected isCalcRs: boolean;
     /**
      * Creates an instance of MethodDto.
      * @author lxm

package/out/service/dto/method.dto.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"method.dto.d.ts","sourceRoot":"","sources":["../../../src/service/dto/method.dto.ts"],"names":[],"mappings":"AACA,OAAO,EACL,cAAc,EACd,eAAe,EACf,oBAAoB,EACrB,MAAM,kBAAkB,CAAC;AAI1B,OAAO,EAAE,aAAa,EAAE,WAAW,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAM1E;;;;;;;GAOG;AACH,qBAAa,SAAS;IA4BlB,SAAS,CAAC,OAAO,EAAE,aAAa;IAChC,SAAS,CAAC,MAAM,EAAE,cAAc;IAChC,SAAS,CAAC,WAAW,CAAC;IACtB,SAAS,CAAC,GAAG,CAAC;IACd,SAAS,CAAC,UAAU,CAAC;IA/BvB,SAAS,CAAC,GAAG,CAAC,EAAE,WAAW,CAAC;IAE5B,SAAS,CAAC,MAAM,EAAG,oBAAoB,EAAE,CAAC;IAE1C,SAAS,CAAC,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,SAAS,CAAC,CAAa;IAErD;;;;;;;OAOG;IACH,SAAS,CAAC,QAAQ,UAAS;IAE3B;;;;;;;;;OASG;gBAES,OAAO,EAAE,aAAa,EACtB,MAAM,EAAE,cAAc,EACtB,WAAW,CAAC,qBAAS,EACrB,GAAG,CAAC,6BAAiB,EACrB,UAAU,CAAC,qBAAS;IAUhC;;;;;OAKG;IACH,OAAO,CAAC,qBAAqB;IAQ7B;;;;;OAKG;IACH,OAAO,CAAC,qBAAqB;IAS7B;;;;;;;;OAQG;IACG,GAAG,CACP,OAAO,EAAE,QAAQ,EACjB,IAAI,EAAE,KAAK,EACX,MAAM,GAAE,OAAe,GACtB,OAAO,CAAC,KAAK,CAAC;IA0FjB;;;;;;;;OAQG;IACG,IAAI,CAAC,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,OAAO,CAAC,WAAW,EAAE,CAAC;IAgDpE;;;;;;;;;OASG;cACa,MAAM,CAAC,OAAO,EAAE,QAAQ,EAAE,KAAK,GAAE,MAAU,GAAG,OAAO,CAAC,IAAI,CAAC;IA6B3E;;;;;;;;;OASG;cACa,WAAW,CACzB,OAAO,EAAE,QAAQ,EACjB,KAAK,EAAE,oBAAoB,GAC1B,OAAO,CAAC,SAAS,CAAC;CAsBtB"}
+{"version":3,"file":"method.dto.d.ts","sourceRoot":"","sources":["../../../src/service/dto/method.dto.ts"],"names":[],"mappings":"AACA,OAAO,EACL,cAAc,EACd,eAAe,EACf,oBAAoB,EACrB,MAAM,kBAAkB,CAAC;AAI1B,OAAO,EAAE,aAAa,EAAE,WAAW,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAM1E;;;;;;;GAOG;AACH,qBAAa,SAAS;IAkBlB,SAAS,CAAC,OAAO,EAAE,aAAa;IAChC,SAAS,CAAC,MAAM,EAAE,cAAc;IAChC,SAAS,CAAC,WAAW,CAAC;IACtB,SAAS,CAAC,GAAG,CAAC;IACd,SAAS,CAAC,UAAU,CAAC;IArBvB,SAAS,CAAC,GAAG,CAAC,EAAE,WAAW,CAAC;IAE5B,SAAS,CAAC,MAAM,EAAG,oBAAoB,EAAE,CAAC;IAE1C,SAAS,CAAC,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,SAAS,CAAC,CAAa;IAErD;;;;;;;;;OASG;gBAES,OAAO,EAAE,aAAa,EACtB,MAAM,EAAE,cAAc,EACtB,WAAW,CAAC,qBAAS,EACrB,GAAG,CAAC,6BAAiB,EACrB,UAAU,CAAC,qBAAS;IAUhC;;;;;OAKG;IACH,OAAO,CAAC,qBAAqB;IAQ7B;;;;;OAKG;IACH,OAAO,CAAC,qBAAqB;IAS7B;;;;;;;;OAQG;IACG,GAAG,CACP,OAAO,EAAE,QAAQ,EACjB,IAAI,EAAE,KAAK,EACX,MAAM,GAAE,OAAe,GACtB,OAAO,CAAC,KAAK,CAAC;IA0FjB;;;;;;;;OAQG;IACG,IAAI,CAAC,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,OAAO,CAAC,WAAW,EAAE,CAAC;IAqDpE;;;;;;;;;OASG;cACa,MAAM,CAAC,OAAO,EAAE,QAAQ,EAAE,KAAK,GAAE,MAAU,GAAG,OAAO,CAAC,IAAI,CAAC;IA4B3E;;;;;;;;;OASG;cACa,WAAW,CACzB,OAAO,EAAE,QAAQ,EACjB,KAAK,EAAE,oBAAoB,GAC1B,OAAO,CAAC,SAAS,CAAC;CAsBtB"}