@ibiz-template/runtime 0.5.0-beta.5 → 0.5.1-beta.1

package/out/controller/control/tree-grid/tree-grid.controller.d.ts

@@ -1,5 +1,38 @@
-import { ITreeGridController } from '../../../interface';
+import { IDETreeGrid } from '@ibiz/model-core';
+import { ITreeGridController, ITreeGridEvent, ITreeGridState } from '../../../interface';
 import { GridController } from '../grid';
-export declare class TreeGridController extends GridController implements ITreeGridController {
+export declare class TreeGridController<T extends IDETreeGrid = IDETreeGrid, S extends ITreeGridState = ITreeGridState, E extends ITreeGridEvent = ITreeGridEvent> extends GridController<T, S, E> implements ITreeGridController<T, S, E> {
+    /**
+     * 树表格值属性名称
+     *
+     */
+    treeGridValueField: string;
+    /**
+     * 树表格父属性名称
+     *
+     */
+    treeGridParentField: string;
+    protected initState(): void;
+    /**
+     * 初始化方法
+     *
+     * @author lxm
+     * @date 2022-08-18 22:08:17
+     * @protected
+     * @returns {*}  {Promise<void>}
+     */
+    protected onCreated(): Promise<void>;
+    /**
+     * 初始化树表格字段
+     * @return {*}
+     * @author: zhujiamin
+     */
+    protected initTreeGridField(): void;
+    /**
+     * 切换树表格显示
+     * @return {*}
+     * @author: zhujiamin
+     */
+    switchTreeGridShow(): void;
 }
 //# sourceMappingURL=tree-grid.controller.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"tree-grid.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/tree-grid/tree-grid.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AACzD,OAAO,EAAE,cAAc,EAAE,MAAM,SAAS,CAAC;AAEzC,qBAAa,kBACX,SAAQ,cACR,YAAW,mBAAmB;CAAG"}
+{"version":3,"file":"tree-grid.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/tree-grid/tree-grid.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAsB,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAEnE,OAAO,EACL,mBAAmB,EACnB,cAAc,EACd,cAAc,EACf,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,cAAc,EAAE,MAAM,SAAS,CAAC;AAEzC,qBAAa,kBAAkB,CAC3B,CAAC,SAAS,WAAW,GAAG,WAAW,EACnC,CAAC,SAAS,cAAc,GAAG,cAAc,EACzC,CAAC,SAAS,cAAc,GAAG,cAAc,CAE3C,SAAQ,cAAc,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAC9B,YAAW,mBAAmB,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;IAEvC;;;OAGG;IACH,kBAAkB,EAAE,MAAM,CAAM;IAEhC;;;OAGG;IACH,mBAAmB,EAAE,MAAM,CAAM;IAEjC,SAAS,CAAC,SAAS,IAAI,IAAI;IAK3B;;;;;;;OAOG;cACa,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAM1C;;;;OAIG;IACH,SAAS,CAAC,iBAAiB,IAAI,IAAI;IAmBnC;;;;OAIG;IACH,kBAAkB,IAAI,IAAI;CAG3B"}

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

@@ -1,3 +1,63 @@
+import { RuntimeModelError } from '@ibiz-template/core';
 import { GridController } from '../grid';
 export class TreeGridController extends GridController {
+    constructor() {
+        super(...arguments);
+        /**
+         * 树表格值属性名称
+         *
+         */
+        this.treeGridValueField = '';
+        /**
+         * 树表格父属性名称
+         *
+         */
+        this.treeGridParentField = '';
+    }
+    initState() {
+        super.initState();
+        this.state.showTreeGrid = true;
+    }
+    /**
+     * 初始化方法
+     *
+     * @author lxm
+     * @date 2022-08-18 22:08:17
+     * @protected
+     * @returns {*}  {Promise<void>}
+     */
+    async onCreated() {
+        await super.onCreated();
+        this.initTreeGridField();
+    }
+    /**
+     * 初始化树表格字段
+     * @return {*}
+     * @author: zhujiamin
+     */
+    initTreeGridField() {
+        var _a, _b;
+        const treeGridParent = (_a = this.model.degridColumns) === null || _a === void 0 ? void 0 : _a.find((item) => {
+            return item.treeColumnMode === 4 || item.treeColumnMode === 12;
+        });
+        const treeGridValue = (_b = this.model.degridColumns) === null || _b === void 0 ? void 0 : _b.find((item) => {
+            return item.treeColumnMode === 2 || item.treeColumnMode === 3;
+        });
+        if (!treeGridParent) {
+            throw new RuntimeModelError(this.model, '树表格无值列模式');
+        }
+        if (!treeGridValue) {
+            throw new RuntimeModelError(this.model, '树表格无父值列模式');
+        }
+        this.treeGridValueField = treeGridValue.appDEFieldId.toLowerCase();
+        this.treeGridParentField = treeGridParent.appDEFieldId.toLowerCase();
+    }
+    /**
+     * 切换树表格显示
+     * @return {*}
+     * @author: zhujiamin
+     */
+    switchTreeGridShow() {
+        this.state.showTreeGrid = !this.state.showTreeGrid;
+    }
 }

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

@@ -149,5 +149,11 @@ export interface IAppHubService {
      * @return {*}  {IAppService[]}
      */
     getAllApps(): IAppService[];
+    /**
+     * 重置清空基座
+     * @author lxm
+     * @date 2024-01-03 06:46:57
+     */
+    reset(): void;
 }
 //# sourceMappingURL=i-app-hub-service.d.ts.map

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,cAAc,EAAE,MAAM,eAAe,CAAC;AAC/C,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;;;;;;;;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;CAC7B"}
+{"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,cAAc,EAAE,MAAM,eAAe,CAAC;AAC/C,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;;;;;;;;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;;;;OAIG;IACH,KAAK,IAAI,IAAI,CAAC;CACf"}

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

@@ -12,7 +12,7 @@ import { CodeListItem } from '../../../service';
  * @interface IGridController
  * @extends {IMDControlController}
  */
-export interface IGridController extends IMDControlController<IDEGrid, IGridState, IGridEvent> {
+export interface IGridController<T extends IDEGrid = IDEGrid, S extends IGridState = IGridState, E extends IGridEvent = IGridEvent> extends IMDControlController<T, S, E> {
     /**
      * 新建行
      *

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

@@ -1 +1 @@
-{"version":3,"file":"i-grid.controller.d.ts","sourceRoot":"","sources":["../../../../../src/interface/controller/controller/control/i-grid.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,YAAY,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AAC5E,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAChD,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,EAAE,aAAa,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACxD,OAAO,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AACjE,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAEhD;;;;;;;GAOG;AACH,MAAM,WAAW,eACf,SAAQ,oBAAoB,CAAC,OAAO,EAAE,UAAU,EAAE,UAAU,CAAC;IAC7D;;;;;;OAMG;IACH,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IAExB;;;;;;OAMG;IACH,IAAI,CAAC,IAAI,EAAE,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAErC;;;;;;OAMG;IACH,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IAEzB;;;;;OAKG;IACH,aAAa,IAAI,IAAI,CAAC;IAEtB;;;;;;OAMG;IACH,UAAU,CAAC,KAAK,EAAE;QAAE,KAAK,EAAE,UAAU,CAAC;QAAC,MAAM,EAAE,KAAK,CAAA;KAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAEvE;;;;;;OAMG;IACH,QAAQ,CAAC,GAAG,EAAE,aAAa,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;IAE/C;;;;;;OAMG;IACH,cAAc,CAAC,IAAI,EAAE,KAAK,GAAG,IAAI,CAAC;CACnC;AAED,UAAU,oBAAoB;IAC5B;;;;;OAKG;IACH,QAAQ,CAAC,EAAE,YAAY,CAAC;IAExB;;;;;OAKG;IACH,aAAa,CAAC,EAAE,SAAS,YAAY,EAAE,CAAC;CACzC;AAED;;;;;GAKG;AACH,MAAM,WAAW,aACf,SAAQ,iBAAiB,EACvB,oBAAoB;CAAG"}
+{"version":3,"file":"i-grid.controller.d.ts","sourceRoot":"","sources":["../../../../../src/interface/controller/controller/control/i-grid.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,YAAY,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AAC5E,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAChD,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,EAAE,aAAa,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACxD,OAAO,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AACjE,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAEhD;;;;;;;GAOG;AACH,MAAM,WAAW,eAAe,CAC9B,CAAC,SAAS,OAAO,GAAG,OAAO,EAC3B,CAAC,SAAS,UAAU,GAAG,UAAU,EACjC,CAAC,SAAS,UAAU,GAAG,UAAU,CACjC,SAAQ,oBAAoB,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;IACrC;;;;;;OAMG;IACH,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IAExB;;;;;;OAMG;IACH,IAAI,CAAC,IAAI,EAAE,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAErC;;;;;;OAMG;IACH,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IAEzB;;;;;OAKG;IACH,aAAa,IAAI,IAAI,CAAC;IAEtB;;;;;;OAMG;IACH,UAAU,CAAC,KAAK,EAAE;QAAE,KAAK,EAAE,UAAU,CAAC;QAAC,MAAM,EAAE,KAAK,CAAA;KAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAEvE;;;;;;OAMG;IACH,QAAQ,CAAC,GAAG,EAAE,aAAa,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;IAE/C;;;;;;OAMG;IACH,cAAc,CAAC,IAAI,EAAE,KAAK,GAAG,IAAI,CAAC;CACnC;AAED,UAAU,oBAAoB;IAC5B;;;;;OAKG;IACH,QAAQ,CAAC,EAAE,YAAY,CAAC;IAExB;;;;;OAKG;IACH,aAAa,CAAC,EAAE,SAAS,YAAY,EAAE,CAAC;CACzC;AAED;;;;;GAKG;AACH,MAAM,WAAW,aACf,SAAQ,iBAAiB,EACvB,oBAAoB;CAAG"}

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

@@ -1,4 +1,7 @@
+import { IDETreeGrid } from '@ibiz/model-core';
 import { IGridController } from './i-grid.controller';
+import { ITreeGridState } from '../../state';
+import { ITreeGridEvent } from '../../event';
 /**
  * 树表格部件控制器
  *
@@ -8,6 +11,13 @@ import { IGridController } from './i-grid.controller';
  * @interface ITreeGridController
  * @extends {IMDControlController<IDETreeGrid, ITreeGridState, ITreeGridEvent>}
  */
-export interface ITreeGridController extends IGridController {
+export interface ITreeGridController<T extends IDETreeGrid = IDETreeGrid, S extends ITreeGridState = ITreeGridState, E extends ITreeGridEvent = ITreeGridEvent> extends IGridController<T, S, E> {
+    /**
+     * 切换树表格显示
+     * @return {*}
+     * @author: zhujiamin
+     *
+     */
+    switchTreeGridShow(): void;
 }
 //# sourceMappingURL=i-tree-grid.controller.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"i-tree-grid.controller.d.ts","sourceRoot":"","sources":["../../../../../src/interface/controller/controller/control/i-tree-grid.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAEtD;;;;;;;;GAQG;AACH,MAAM,WAAW,mBAAoB,SAAQ,eAAe;CAAG"}
+{"version":3,"file":"i-tree-grid.controller.d.ts","sourceRoot":"","sources":["../../../../../src/interface/controller/controller/control/i-tree-grid.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC/C,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AACtD,OAAO,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAC7C,OAAO,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAE7C;;;;;;;;GAQG;AACH,MAAM,WAAW,mBAAmB,CAClC,CAAC,SAAS,WAAW,GAAG,WAAW,EACnC,CAAC,SAAS,cAAc,GAAG,cAAc,EACzC,CAAC,SAAS,cAAc,GAAG,cAAc,CACzC,SAAQ,eAAe,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;IAChC;;;;;OAKG;IACH,kBAAkB,IAAI,IAAI,CAAC;CAC5B"}

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

@@ -98,13 +98,13 @@ export interface IGanttNodeData extends ITreeNodeData {
      * @date 2023-12-11 18:12:16
      * @type {(IGanttNodeData[] | undefined)}
      */
-    children?: IGanttNodeData[] | undefined;
+    _children?: IGanttNodeData[] | undefined;
     /**
      * 父节点数据对象
      *
      * @type {IGanttNodeData}
      * @memberof IGanttNodeData
      */
-    parent?: IGanttNodeData;
+    _parent?: IGanttNodeData;
 }
 //# sourceMappingURL=i-gantt.state.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"i-gantt.state.d.ts","sourceRoot":"","sources":["../../../../../src/interface/controller/state/control/i-gantt.state.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAC1D,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAE/C;;;;;;;;GAQG;AACH,MAAM,WAAW,WAAY,SAAQ,gBAAgB;IACnD;;;;;OAKG;IACH,UAAU,EAAE,WAAW,CAAC;CACzB;AAED,MAAM,WAAW,WAAW;IAC1B;;;;;OAKG;IACH,YAAY,CAAC,EAAE,MAAM,CAAC;IAEtB;;;;;OAKG;IACH,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAED;;;;;;;GAOG;AACH,MAAM,WAAW,cAAe,SAAQ,aAAa;IACnD;;;;;;OAMG;IACH,cAAc,EAAE,MAAM,CAAC;IAEvB;;;;;;OAMG;IACH,kBAAkB,EAAE,MAAM,CAAC;IAE3B;;;;;;OAMG;IACH,gBAAgB,EAAE,MAAM,CAAC;IAEzB;;;;;;OAMG;IACH,iBAAiB,EAAE,MAAM,GAAG,MAAM,CAAC;IAEnC;;;;;;OAMG;IACH,mBAAmB,EAAE,MAAM,GAAG,MAAM,CAAC;IAErC;;;;;;OAMG;IACH,kBAAkB,EAAE,MAAM,GAAG,MAAM,CAAC;IAEpC;;;;;;OAMG;IACH,QAAQ,CAAC,EAAE,cAAc,EAAE,GAAG,SAAS,CAAC;IAExC;;;;;OAKG;IACH,MAAM,CAAC,EAAE,cAAc,CAAC;CACzB"}
+{"version":3,"file":"i-gantt.state.d.ts","sourceRoot":"","sources":["../../../../../src/interface/controller/state/control/i-gantt.state.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAC1D,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAE/C;;;;;;;;GAQG;AACH,MAAM,WAAW,WAAY,SAAQ,gBAAgB;IACnD;;;;;OAKG;IACH,UAAU,EAAE,WAAW,CAAC;CACzB;AAED,MAAM,WAAW,WAAW;IAC1B;;;;;OAKG;IACH,YAAY,CAAC,EAAE,MAAM,CAAC;IAEtB;;;;;OAKG;IACH,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAED;;;;;;;GAOG;AACH,MAAM,WAAW,cAAe,SAAQ,aAAa;IACnD;;;;;;OAMG;IACH,cAAc,EAAE,MAAM,CAAC;IAEvB;;;;;;OAMG;IACH,kBAAkB,EAAE,MAAM,CAAC;IAE3B;;;;;;OAMG;IACH,gBAAgB,EAAE,MAAM,CAAC;IAEzB;;;;;;OAMG;IACH,iBAAiB,EAAE,MAAM,GAAG,MAAM,CAAC;IAEnC;;;;;;OAMG;IACH,mBAAmB,EAAE,MAAM,GAAG,MAAM,CAAC;IAErC;;;;;;OAMG;IACH,kBAAkB,EAAE,MAAM,GAAG,MAAM,CAAC;IAEpC;;;;;;OAMG;IACH,SAAS,CAAC,EAAE,cAAc,EAAE,GAAG,SAAS,CAAC;IAEzC;;;;;OAKG;IACH,OAAO,CAAC,EAAE,cAAc,CAAC;CAC1B"}

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

@@ -9,5 +9,10 @@ import { IGridState } from './i-grid.state';
  * @extends {IMDControlState}
  */
 export interface ITreeGridState extends IGridState {
+    /**
+     * 树表格是否显示树形结构(默认为true)
+     *
+     */
+    showTreeGrid: boolean;
 }
 //# sourceMappingURL=i-tree-grid.state.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"i-tree-grid.state.d.ts","sourceRoot":"","sources":["../../../../../src/interface/controller/state/control/i-tree-grid.state.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAE5C;;;;;;;;GAQG;AACH,MAAM,WAAW,cAAe,SAAQ,UAAU;CAAG"}
+{"version":3,"file":"i-tree-grid.state.d.ts","sourceRoot":"","sources":["../../../../../src/interface/controller/state/control/i-tree-grid.state.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAE5C;;;;;;;;GAQG;AACH,MAAM,WAAW,cAAe,SAAQ,UAAU;IAChD;;;OAGG;IACH,YAAY,EAAE,OAAO,CAAC;CACvB"}

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

@@ -10,6 +10,7 @@ import { IMDControlState } from './i-md-control.state';
  */
 export interface ITreeState extends IMDControlState {
     items: ITreeNodeData[];
+    selectedData: ITreeNodeData[];
     /**
      * 树的根节点
      *
@@ -61,7 +62,7 @@ export interface ITreeState extends IMDControlState {
  * @export
  * @class ITreeNodeData
  */
-export interface ITreeNodeData extends IData {
+export interface ITreeNodeData {
     /**
      * 节点数据的唯一标识（创建的时候自动生成）
      * @author lxm
@@ -82,7 +83,7 @@ export interface ITreeNodeData extends IData {
      * @type {string}
      * @memberof ITreeNodeData
      */
-    nodeId: string;
+    _nodeId: string;
     /**
      * 节点唯一标识，在父的id上加上自身的唯一标识，用>分隔
      * 如：staticNode1>14>84847aa970ba3db7bbe00754aed3888d
@@ -90,7 +91,7 @@ export interface ITreeNodeData extends IData {
      * @type {string}
      * @memberof ITreeNodeData
      */
-    id: string;
+    _id: string;
     /**
      * 节点的值(可能是自己的主键，也可能是沿用父的值)
      * 静态节点可能没有节点值
@@ -98,21 +99,21 @@ export interface ITreeNodeData extends IData {
      * @type {string}
      * @memberof ITreeNodeData
      */
-    value?: string;
+    _value?: string;
     /**
      * 节点显示名称
      *
      * @type {string}
      * @memberof ITreeNodeData
      */
-    text: string;
+    _text: string;
     /**
      * 是否是叶子节点（没有子节点的节点）
      *
      * @type {boolean}
      * @memberof ITreeNodeData
      */
-    leaf: boolean;
+    _leaf: boolean;
     /**
      * 资源路径相关上下文参数
      * 根据节点展开的主从关系，在父的基础上附加自身的实体主键
@@ -121,62 +122,62 @@ export interface ITreeNodeData extends IData {
      * @type {IParams}
      * @memberof ITreeNodeData
      */
-    context?: IParams;
+    _context?: IParams;
     /**
      * 关系上转换的视图参数
      *
      * @type {IParams}
      * @memberof ITreeNodeData
      */
-    params?: IParams;
+    _params?: IParams;
     /**
      * 子节点集合（没有子节点则不存在）
      *
      * @type {ITreeNodeData[]}
      * @memberof ITreeNodeData
      */
-    children?: ITreeNodeData[];
+    _children?: ITreeNodeData[];
     /**
      * 父节点数据对象
      *
      * @type {ITreeNodeData}
      * @memberof ITreeNodeData
      */
-    parent?: ITreeNodeData;
+    _parent?: ITreeNodeData;
     /**
      * 实体数据
      *
      * @type {IData}
      * @memberof ITreeNodeData
      */
-    deData?: IData;
+    _deData?: IData;
     /**
-     * 实体主键
+     * 图标
      * @author lxm
-     * @date 2023-05-29 09:28:59
-     * @type {string}
+     * @date 2023-08-15 02:02:49
+     * @type {IIcon}
      */
-    srfkey?: string;
+    _icon?: IIcon;
     /**
-     * 实体主信息
+     * 节点文本的html显示
      * @author lxm
-     * @date 2023-05-29 09:29:00
+     * @date 2023-08-15 02:15:09
      * @type {string}
      */
-    srfmajortext?: string;
+    _textHtml?: string;
     /**
-     * 图标
+     * 作为实体数据时的主键
      * @author lxm
-     * @date 2023-08-15 02:02:49
-     * @type {IIcon}
+     * @date 2023-05-29 09:28:59
+     * @type {string}
      */
-    icon?: IIcon;
+    srfkey?: string;
     /**
-     * 节点文本的html显示
+     * 作为实体数据时的主信息
      * @author lxm
-     * @date 2023-08-15 02:15:09
+     * @date 2023-05-29 09:29:00
      * @type {string}
      */
-    textHtml?: string;
+    srfmajortext?: string;
 }
 //# sourceMappingURL=i-tree.state.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"i-tree.state.d.ts","sourceRoot":"","sources":["../../../../../src/interface/controller/state/control/i-tree.state.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,cAAc,CAAC;AACrC,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAEvD;;;;;;;GAOG;AACH,MAAM,WAAW,UAAW,SAAQ,eAAe;IACjD,KAAK,EAAE,aAAa,EAAE,CAAC;IAEvB;;;;;OAKG;IACH,SAAS,EAAE,aAAa,EAAE,CAAC;IAE3B;;;;;;;OAOG;IACH,mBAAmB,EAAE,MAAM,EAAE,CAAC;IAE9B;;;;;OAKG;IACH,YAAY,EAAE,MAAM,EAAE,CAAC;IAEvB;;;;;OAKG;IACH,YAAY,EAAE,OAAO,CAAC;IAEtB;;;;;OAKG;IACH,KAAK,EAAE,MAAM,CAAC;IAEd;;;;;OAKG;IACH,WAAW,EAAE,MAAM,CAAC;CACrB;AAED;;;;;GAKG;AACH,MAAM,WAAW,aAAc,SAAQ,KAAK;IAC1C;;;;;OAKG;IACH,KAAK,EAAE,MAAM,CAAC;IAEd;;;;;OAKG;IACH,SAAS,CAAC,EAAE,MAAM,CAAC;IAEnB;;;;;OAKG;IACH,MAAM,EAAE,MAAM,CAAC;IAEf;;;;;;OAMG;IACH,EAAE,EAAE,MAAM,CAAC;IAEX;;;;;;OAMG;IACH,KAAK,CAAC,EAAE,MAAM,CAAC;IAEf;;;;;OAKG;IACH,IAAI,EAAE,MAAM,CAAC;IAEb;;;;;OAKG;IACH,IAAI,EAAE,OAAO,CAAC;IAEd;;;;;;;OAOG;IACH,OAAO,CAAC,EAAE,OAAO,CAAC;IAElB;;;;;OAKG;IACH,MAAM,CAAC,EAAE,OAAO,CAAC;IAEjB;;;;;OAKG;IACH,QAAQ,CAAC,EAAE,aAAa,EAAE,CAAC;IAE3B;;;;;OAKG;IACH,MAAM,CAAC,EAAE,aAAa,CAAC;IAEvB;;;;;OAKG;IACH,MAAM,CAAC,EAAE,KAAK,CAAC;IAEf;;;;;OAKG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC;IAEhB;;;;;OAKG;IACH,YAAY,CAAC,EAAE,MAAM,CAAC;IAEtB;;;;;OAKG;IACH,IAAI,CAAC,EAAE,KAAK,CAAC;IAEb;;;;;OAKG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC;CAGnB"}
+{"version":3,"file":"i-tree.state.d.ts","sourceRoot":"","sources":["../../../../../src/interface/controller/state/control/i-tree.state.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,cAAc,CAAC;AACrC,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAEvD;;;;;;;GAOG;AACH,MAAM,WAAW,UAAW,SAAQ,eAAe;IACjD,KAAK,EAAE,aAAa,EAAE,CAAC;IAEvB,YAAY,EAAE,aAAa,EAAE,CAAC;IAE9B;;;;;OAKG;IACH,SAAS,EAAE,aAAa,EAAE,CAAC;IAE3B;;;;;;;OAOG;IACH,mBAAmB,EAAE,MAAM,EAAE,CAAC;IAE9B;;;;;OAKG;IACH,YAAY,EAAE,MAAM,EAAE,CAAC;IAEvB;;;;;OAKG;IACH,YAAY,EAAE,OAAO,CAAC;IAEtB;;;;;OAKG;IACH,KAAK,EAAE,MAAM,CAAC;IAEd;;;;;OAKG;IACH,WAAW,EAAE,MAAM,CAAC;CACrB;AAED;;;;;GAKG;AACH,MAAM,WAAW,aAAa;IAC5B;;;;;OAKG;IACH,KAAK,EAAE,MAAM,CAAC;IAEd;;;;;OAKG;IACH,SAAS,CAAC,EAAE,MAAM,CAAC;IAEnB;;;;;OAKG;IACH,OAAO,EAAE,MAAM,CAAC;IAEhB;;;;;;OAMG;IACH,GAAG,EAAE,MAAM,CAAC;IAEZ;;;;;;OAMG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC;IAEhB;;;;;OAKG;IACH,KAAK,EAAE,MAAM,CAAC;IAEd;;;;;OAKG;IACH,KAAK,EAAE,OAAO,CAAC;IAEf;;;;;;;OAOG;IACH,QAAQ,CAAC,EAAE,OAAO,CAAC;IAEnB;;;;;OAKG;IACH,OAAO,CAAC,EAAE,OAAO,CAAC;IAElB;;;;;OAKG;IACH,SAAS,CAAC,EAAE,aAAa,EAAE,CAAC;IAE5B;;;;;OAKG;IACH,OAAO,CAAC,EAAE,aAAa,CAAC;IAExB;;;;;OAKG;IACH,OAAO,CAAC,EAAE,KAAK,CAAC;IAEhB;;;;;OAKG;IACH,KAAK,CAAC,EAAE,KAAK,CAAC;IAEd;;;;;OAKG;IACH,SAAS,CAAC,EAAE,MAAM,CAAC;IAEnB;;;;;OAKG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC;IAEhB;;;;;OAKG;IACH,YAAY,CAAC,EAAE,MAAM,CAAC;CAGvB"}

package/out/interface/service/service/i-auth.service.d.ts

@@ -1,3 +1,19 @@
+export interface IAuthInfo {
+    /**
+     * 是否是匿名账户登录
+     * @author lxm
+     * @date 2024-01-03 05:25:31
+     * @type {boolean}
+     */
+    isAnonymous: boolean;
+    /**
+     * 访问令牌
+     * @author lxm
+     * @date 2024-01-03 05:30:43
+     * @type {string}
+     */
+    token: string;
+}
 /**
  * 认证服务
  *
@@ -51,5 +67,12 @@ export interface IAuthService {
      * @return {*}  {Promise<void>}
      */
     extendLogin(): Promise<void>;
+    /**
+     * 获取当前环境的权限信息（无登录则返回undefined）
+     * @author lxm
+     * @date 2024-01-03 05:31:48
+     * @return {*}  {(Promise<IAuthInfo | undefined>)}
+     */
+    getAuthInfo(): IAuthInfo | undefined;
 }
 //# sourceMappingURL=i-auth.service.d.ts.map

package/out/interface/service/service/i-auth.service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"i-auth.service.d.ts","sourceRoot":"","sources":["../../../../src/interface/service/service/i-auth.service.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AACH,MAAM,WAAW,YAAY;IAC3B;;;;;;;OAOG;IACH,WAAW,EAAE,OAAO,CAAC;IAErB;;;;;;OAMG;IACH,cAAc,IAAI,OAAO,CAAC,OAAO,CAAC,CAAC;IAEnC;;;;;;;;;OASG;IACH,KAAK,CACH,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,MAAM,EAChB,QAAQ,CAAC,EAAE,OAAO,GACjB,OAAO,CAAC,OAAO,CAAC,CAAC;IAEpB;;;;;;OAMG;IACH,MAAM,IAAI,OAAO,CAAC,OAAO,CAAC,CAAC;IAE3B;;;;;;OAMG;IACH,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CAC9B"}
+{"version":3,"file":"i-auth.service.d.ts","sourceRoot":"","sources":["../../../../src/interface/service/service/i-auth.service.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,SAAS;IACxB;;;;;OAKG;IACH,WAAW,EAAE,OAAO,CAAC;IAErB;;;;;OAKG;IACH,KAAK,EAAE,MAAM,CAAC;CACf;AAED;;;;;;;GAOG;AACH,MAAM,WAAW,YAAY;IAC3B;;;;;;;OAOG;IACH,WAAW,EAAE,OAAO,CAAC;IAErB;;;;;;OAMG;IACH,cAAc,IAAI,OAAO,CAAC,OAAO,CAAC,CAAC;IAEnC;;;;;;;;;OASG;IACH,KAAK,CACH,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,MAAM,EAChB,QAAQ,CAAC,EAAE,OAAO,GACjB,OAAO,CAAC,OAAO,CAAC,CAAC;IAEpB;;;;;;OAMG;IACH,MAAM,IAAI,OAAO,CAAC,OAAO,CAAC,CAAC;IAE3B;;;;;;OAMG;IACH,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IAE7B;;;;;OAKG;IACH,WAAW,IAAI,SAAS,GAAG,SAAS,CAAC;CACtC"}

package/out/interface/service/service/index.d.ts

@@ -1,7 +1,7 @@
 export type { IAppDeAuthorityService } from './i-app-de-authority.service';
 export type { IConfigService } from './i-config.service';
 export type { IAppDEService } from './i-app-de.service';
-export type { IAuthService } from './i-auth.service';
+export type { IAuthService, IAuthInfo } from './i-auth.service';
 export type { IFileService } from './i-file.service';
 export type { IWorkFlowService } from './i-wf.service';
 export type { IAsyncActionService } from './i-async-action.service';

package/out/interface/service/service/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/interface/service/service/index.ts"],"names":[],"mappings":"AAAA,YAAY,EAAE,sBAAsB,EAAE,MAAM,8BAA8B,CAAC;AAC3E,YAAY,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AACzD,YAAY,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACxD,YAAY,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AACrD,YAAY,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AACrD,YAAY,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AACvD,YAAY,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/interface/service/service/index.ts"],"names":[],"mappings":"AAAA,YAAY,EAAE,sBAAsB,EAAE,MAAM,8BAA8B,CAAC;AAC3E,YAAY,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AACzD,YAAY,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACxD,YAAY,EAAE,YAAY,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAChE,YAAY,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AACrD,YAAY,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AACvD,YAAY,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC"}

package/out/service/service/auth/v7-auth.service.d.ts

@@ -1,4 +1,5 @@
 import { IAuthService } from '../../../interface';
+import { IAuthInfo } from '../../../interface/service/service/i-auth.service';
 /**
  * 认证服务
  *
@@ -8,10 +9,11 @@ import { IAuthService } from '../../../interface';
  * @class AuthService
  */
 export declare class V7AuthService implements IAuthService {
-    isAnonymous: boolean;
+    get isAnonymous(): boolean;
     anonymousLogin(): Promise<boolean>;
     login(loginName: string, password: string, remember?: boolean): Promise<boolean>;
     logout(): Promise<boolean>;
     extendLogin(): Promise<void>;
+    getAuthInfo(): IAuthInfo | undefined;
 }
 //# sourceMappingURL=v7-auth.service.d.ts.map

package/out/service/service/auth/v7-auth.service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"v7-auth.service.d.ts","sourceRoot":"","sources":["../../../../src/service/service/auth/v7-auth.service.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAElD;;;;;;;GAOG;AACH,qBAAa,aAAc,YAAW,YAAY;IAChD,WAAW,UAAS;IAEd,cAAc,IAAI,OAAO,CAAC,OAAO,CAAC;IAalC,KAAK,CACT,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,MAAM,EAChB,QAAQ,CAAC,EAAE,OAAO,GACjB,OAAO,CAAC,OAAO,CAAC;IAiCb,MAAM,IAAI,OAAO,CAAC,OAAO,CAAC;IAgB1B,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC;CA2BnC"}
+{"version":3,"file":"v7-auth.service.d.ts","sourceRoot":"","sources":["../../../../src/service/service/auth/v7-auth.service.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAClD,OAAO,EAAE,SAAS,EAAE,MAAM,mDAAmD,CAAC;AAE9E;;;;;;;GAOG;AACH,qBAAa,aAAc,YAAW,YAAY;IAChD,IAAI,WAAW,IAAI,OAAO,CAEzB;IAEK,cAAc,IAAI,OAAO,CAAC,OAAO,CAAC;IAqBlC,KAAK,CACT,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,MAAM,EAChB,QAAQ,CAAC,EAAE,OAAO,GACjB,OAAO,CAAC,OAAO,CAAC;IAkCb,MAAM,IAAI,OAAO,CAAC,OAAO,CAAC;IAiB1B,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC;IAiClC,WAAW,IAAI,SAAS,GAAG,SAAS;CAUrC"}

package/out/service/service/auth/v7-auth.service.js

@@ -9,8 +9,8 @@ import { clearCookie, getCookie, setCookie } from 'qx-util';
  * @class AuthService
  */
 export class V7AuthService {
-    constructor() {
-        this.isAnonymous = false;
+    get isAnonymous() {
+        return getCookie(CoreConst.IS_ANONYMOUS) === '1';
     }
     async anonymousLogin() {
         const { anonymousUser, anonymousPwd } = ibiz.env;
@@ -20,7 +20,14 @@ export class V7AuthService {
         }
         const result = await this.login(anonymousUser, anonymousPwd);
         if (result) {
-            this.isAnonymous = true;
+            setCookie(CoreConst.IS_ANONYMOUS, '1', 0, true);
+            // 全部改成session级别的
+            const token = getCookie(CoreConst.TOKEN);
+            const expirein = getCookie(CoreConst.TOKEN_EXPIRES);
+            const remember = getCookie(CoreConst.TOKEN_REMEMBER);
+            setCookie(CoreConst.TOKEN, token, 0, true);
+            setCookie(CoreConst.TOKEN_EXPIRES, expirein, 0, true);
+            setCookie(CoreConst.TOKEN_REMEMBER, remember, 0, true);
         }
         return result;
     }
@@ -40,6 +47,7 @@ export class V7AuthService {
                 setCookie(CoreConst.TOKEN, data.token, remember ? 7 : 0, true);
                 const expiredDate = new Date().getTime() + (data.expirein || 7199) * 1000;
                 setCookie(CoreConst.TOKEN_EXPIRES, `${expiredDate}`, remember ? 7 : 0, true);
+                clearCookie(CoreConst.IS_ANONYMOUS);
             }
             return true;
         }
@@ -57,6 +65,7 @@ export class V7AuthService {
             clearCookie(CoreConst.TOKEN);
             clearCookie(CoreConst.TOKEN_EXPIRES);
             clearCookie(CoreConst.TOKEN_REMEMBER);
+            clearCookie(CoreConst.IS_ANONYMOUS);
             return true;
         }
         catch (err) {
@@ -68,6 +77,10 @@ export class V7AuthService {
         return false;
     }
     async extendLogin() {
+        if (this.isAnonymous) {
+            // 匿名登录不需要延长都是会话级的
+            return;
+        }
         const token = getCookie(CoreConst.TOKEN);
         const expirein = getCookie(CoreConst.TOKEN_EXPIRES);
         const remember = getCookie(CoreConst.TOKEN_REMEMBER);
@@ -88,4 +101,14 @@ export class V7AuthService {
             }, wait);
         }
     }
+    getAuthInfo() {
+        const token = getCookie(CoreConst.TOKEN);
+        const isAnonymous = !!getCookie(CoreConst.IS_ANONYMOUS);
+        return token
+            ? {
+                token,
+                isAnonymous,
+            }
+            : undefined;
+    }
 }

package/out/service/service/entity/method/de-action.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"de-action.d.ts","sourceRoot":"","sources":["../../../../../src/service/service/entity/method/de-action.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,YAAY,EACZ,aAAa,EAGd,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAEhD,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAClC,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAIpD;;;;;;;;GAQG;AACH,qBAAa,cAAe,SAAQ,MAAM;IAChC,MAAM,EAAE,YAAY,CAAC;IAE7B;;;;;;;OAOG;IACG,WAAW,CACf,OAAO,EAAE,QAAQ,EACjB,IAAI,EAAE,KAAK,GAAG,KAAK,EAAE,GACpB,OAAO,CAAC,KAAK,GAAG,KAAK,EAAE,CAAC;IAQrB,IAAI,CACR,OAAO,EAAE,QAAQ,EACjB,IAAI,CAAC,EAAE,KAAK,GAAG,KAAK,EAAE,EACtB,MAAM,CAAC,EAAE,OAAO,GACf,OAAO,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC;IAsF/B;;;;;;;;OAQG;IACG,MAAM,CACV,OAAO,EAAE,QAAQ,EACjB,IAAI,CAAC,EAAE,KAAK,GAAG,KAAK,EAAE,EACtB,MAAM,CAAC,EAAE,OAAO,GACf,OAAO,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC;IAatC;;;;;;;;OAQG;IACG,MAAM,CACV,OAAO,EAAE,QAAQ,EACjB,MAAM,CAAC,EAAE,OAAO,GACf,OAAO,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC;IAYtC;;;;;;;;;OASG;IACG,MAAM,CACV,OAAO,EAAE,QAAQ,EACjB,IAAI,CAAC,EAAE,KAAK,GAAG,KAAK,EAAE,EACtB,MAAM,CAAC,EAAE,OAAO,GACf,OAAO,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC;IAiBtC;;;;;;;;OAQG;IACG,GAAG,CACP,OAAO,EAAE,QAAQ,EACjB,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC;IAatC;;;;;;;;OAQG;IACG,QAAQ,CACZ,OAAO,EAAE,QAAQ,EACjB,MAAM,CAAC,EAAE,OAAO,GACf,OAAO,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;IAUhC;;;;;;;;OAQG;IACG,UAAU,CACd,OAAO,EAAE,QAAQ,EACjB,MAAM,EAAE,KAAK,GAAG,KAAK,EAAE,GACtB,OAAO,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC;IAuBtC;;;;;;;;OAQG;IACG,YAAY,CAChB,QAAQ,EAAE,OAAO,EACjB,OAAO,CAAC,EAAE,OAAO,GAChB,OAAO,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC;IAatC;;;;;;;;OAQG;IACG,UAAU,CACd,OAAO,EAAE,QAAQ,EACjB,MAAM,CAAC,EAAE,OAAO,GACf,OAAO,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC;IAmBtC;;;;;;;;OAQG;IACG,UAAU,CACd,OAAO,EAAE,QAAQ,EACjB,MAAM,EAAE,KAAK,GAAG,KAAK,EAAE,GACtB,OAAO,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC;IA0BtC;;;;;;;;OAQG;IACG,OAAO,CACX,OAAO,EAAE,QAAQ,EACjB,MAAM,CAAC,EAAE,OAAO,GACf,OAAO,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC;IAoBtC;;;;;;OAMG;IACG,eAAe,CACnB,QAAQ,EAAE,OAAO,EACjB,OAAO,CAAC,EAAE,OAAO,GAChB,OAAO,CAAC,aAAa,CAAC;IAezB;;;;;;;;;OASG;IACH,SAAS,CAAC,MAAM,CAAC,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,WAAW,GAAG,WAAW;CAiBpE"}
+{"version":3,"file":"de-action.d.ts","sourceRoot":"","sources":["../../../../../src/service/service/entity/method/de-action.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,YAAY,EACZ,aAAa,EAGd,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAEhD,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAClC,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAIpD;;;;;;;;GAQG;AACH,qBAAa,cAAe,SAAQ,MAAM;IAChC,MAAM,EAAE,YAAY,CAAC;IAE7B;;;;;;;OAOG;IACG,WAAW,CACf,OAAO,EAAE,QAAQ,EACjB,IAAI,EAAE,KAAK,GAAG,KAAK,EAAE,GACpB,OAAO,CAAC,KAAK,GAAG,KAAK,EAAE,CAAC;IAQrB,IAAI,CACR,OAAO,EAAE,QAAQ,EACjB,IAAI,CAAC,EAAE,KAAK,GAAG,KAAK,EAAE,EACtB,MAAM,CAAC,EAAE,OAAO,GACf,OAAO,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC;IAsF/B;;;;;;;;OAQG;IACG,MAAM,CACV,OAAO,EAAE,QAAQ,EACjB,IAAI,CAAC,EAAE,KAAK,GAAG,KAAK,EAAE,EACtB,MAAM,CAAC,EAAE,OAAO,GACf,OAAO,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC;IAatC;;;;;;;;OAQG;IACG,MAAM,CACV,OAAO,EAAE,QAAQ,EACjB,MAAM,CAAC,EAAE,OAAO,GACf,OAAO,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC;IAYtC;;;;;;;;;OASG;IACG,MAAM,CACV,OAAO,EAAE,QAAQ,EACjB,IAAI,CAAC,EAAE,KAAK,GAAG,KAAK,EAAE,EACtB,MAAM,CAAC,EAAE,OAAO,GACf,OAAO,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC;IAiBtC;;;;;;;;OAQG;IACG,GAAG,CACP,OAAO,EAAE,QAAQ,EACjB,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC;IAatC;;;;;;;;OAQG;IACG,QAAQ,CACZ,OAAO,EAAE,QAAQ,EACjB,MAAM,CAAC,EAAE,OAAO,GACf,OAAO,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;IAUhC;;;;;;;;OAQG;IACG,UAAU,CACd,OAAO,EAAE,QAAQ,EACjB,MAAM,EAAE,KAAK,GAAG,KAAK,EAAE,GACtB,OAAO,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC;IAuBtC;;;;;;;;OAQG;IACG,YAAY,CAChB,QAAQ,EAAE,OAAO,EACjB,OAAO,CAAC,EAAE,OAAO,GAChB,OAAO,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC;IAatC;;;;;;;;OAQG;IACG,UAAU,CACd,OAAO,EAAE,QAAQ,EACjB,MAAM,CAAC,EAAE,OAAO,GACf,OAAO,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC;IAmBtC;;;;;;;;OAQG;IACG,UAAU,CACd,OAAO,EAAE,QAAQ,EACjB,MAAM,EAAE,KAAK,GAAG,KAAK,EAAE,GACtB,OAAO,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC;IA0BtC;;;;;;;;OAQG;IACG,OAAO,CACX,OAAO,EAAE,QAAQ,EACjB,MAAM,CAAC,EAAE,OAAO,GACf,OAAO,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC;IAoBtC;;;;;;OAMG;IACG,eAAe,CACnB,QAAQ,EAAE,OAAO,EACjB,OAAO,CAAC,EAAE,OAAO,GAChB,OAAO,CAAC,aAAa,CAAC;IAezB;;;;;;;;;OASG;IACH,SAAS,CAAC,MAAM,CAAC,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,WAAW,GAAG,WAAW;CAkBpE"}

package/out/service/service/entity/method/de-action.js

@@ -257,7 +257,7 @@ export class DEActionMethod extends Method {
         try {
             let key = null;
             if (params) {
-                // key = params[this.entity.keyName];
+                key = params[this.entity.keyAppDEFieldId.toLowerCase()];
             }
             if (!key && context) {
                 key = context[this.entity.codeName.toLowerCase()];
@@ -313,7 +313,7 @@ export class DEActionMethod extends Method {
         try {
             let key = null;
             if (params) {
-                // key = params[this.entity.keyName];
+                key = params[this.entity.keyAppDEFieldId.toLowerCase()];
             }
             if (!key && context) {
                 key = context[this.entity.codeName.toLowerCase()];
@@ -370,7 +370,8 @@ export class DEActionMethod extends Method {
                 const majorLowerCodeName = majorDECodeName.toLowerCase();
                 const pickupLowerDEFName = pickupDEFName.toLowerCase();
                 const majorkey = context[majorLowerCodeName];
-                if (majorkey) {
+                // 父主键不能是自身，否则自关系的时候就改错了
+                if (majorkey && majorkey !== data.srfkey) {
                     data[pickupLowerDEFName] = majorkey;
                 }
             });

package/out/service/vo/gantt-node-data/gantt-code-list-node-data.d.ts

@@ -8,8 +8,8 @@ export declare class GanttCodeListNodeData extends TreeCodeListNodeData implemen
     prevDataItemValue: string | number;
     finishDataItemValue: string | number;
     totalDataItemValue: string | number;
-    children?: IGanttNodeData[] | undefined;
-    parent?: IGanttNodeData;
+    _children?: IGanttNodeData[] | undefined;
+    _parent?: IGanttNodeData;
     constructor(model: IDEGantt, nodeModel: IDETreeDataSetNode, parentNodeData: IGanttNodeData | undefined, opts: {
         data: CodeListItem;
         leaf: boolean;

package/out/service/vo/gantt-node-data/gantt-code-list-node-data.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"gantt-code-list-node-data.d.ts","sourceRoot":"","sources":["../../../../src/service/vo/gantt-node-data/gantt-code-list-node-data.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AAChE,OAAO,EAAE,YAAY,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAClE,OAAO,EAAE,oBAAoB,EAAE,MAAM,mBAAmB,CAAC;AAGzD,qBAAa,qBACX,SAAQ,oBACR,YAAW,cAAc;IAEzB,cAAc,EAAE,MAAM,CAAC;IAEvB,kBAAkB,EAAE,MAAM,CAAC;IAE3B,gBAAgB,EAAE,MAAM,CAAC;IAEzB,iBAAiB,EAAE,MAAM,GAAG,MAAM,CAAC;IAEnC,mBAAmB,EAAE,MAAM,GAAG,MAAM,CAAC;IAErC,kBAAkB,EAAE,MAAM,GAAG,MAAM,CAAC;IAEpC,QAAQ,CAAC,EAAE,cAAc,EAAE,GAAG,SAAS,CAAC;IAExC,MAAM,CAAC,EAAE,cAAc,CAAC;gBAGtB,KAAK,EAAE,QAAQ,EACf,SAAS,EAAE,kBAAkB,EAC7B,cAAc,EAAE,cAAc,GAAG,SAAS,EAC1C,IAAI,EAAE;QACJ,IAAI,EAAE,YAAY,CAAC;QACnB,IAAI,EAAE,OAAO,CAAC;QACd,UAAU,CAAC,EAAE,OAAO,CAAC;QACrB,SAAS,CAAC,EAAE,OAAO,CAAC;KACrB;CAmCJ"}
+{"version":3,"file":"gantt-code-list-node-data.d.ts","sourceRoot":"","sources":["../../../../src/service/vo/gantt-node-data/gantt-code-list-node-data.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AAChE,OAAO,EAAE,YAAY,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAClE,OAAO,EAAE,oBAAoB,EAAE,MAAM,mBAAmB,CAAC;AAGzD,qBAAa,qBACX,SAAQ,oBACR,YAAW,cAAc;IAEzB,cAAc,EAAE,MAAM,CAAC;IAEvB,kBAAkB,EAAE,MAAM,CAAC;IAE3B,gBAAgB,EAAE,MAAM,CAAC;IAEzB,iBAAiB,EAAE,MAAM,GAAG,MAAM,CAAC;IAEnC,mBAAmB,EAAE,MAAM,GAAG,MAAM,CAAC;IAErC,kBAAkB,EAAE,MAAM,GAAG,MAAM,CAAC;IAEpC,SAAS,CAAC,EAAE,cAAc,EAAE,GAAG,SAAS,CAAC;IAEzC,OAAO,CAAC,EAAE,cAAc,CAAC;gBAGvB,KAAK,EAAE,QAAQ,EACf,SAAS,EAAE,kBAAkB,EAC7B,cAAc,EAAE,cAAc,GAAG,SAAS,EAC1C,IAAI,EAAE;QACJ,IAAI,EAAE,YAAY,CAAC;QACnB,IAAI,EAAE,OAAO,CAAC;QACd,UAAU,CAAC,EAAE,OAAO,CAAC;QACrB,SAAS,CAAC,EAAE,OAAO,CAAC;KACrB;CAmCJ"}

package/out/service/vo/gantt-node-data/gantt-data-set-node-data.d.ts

@@ -8,8 +8,8 @@ export declare class GanttDataSetNodeData extends TreeDataSetNodeData implements
     prevDataItemValue: string | number;
     finishDataItemValue: string | number;
     totalDataItemValue: string | number;
-    children?: IGanttNodeData[] | undefined;
-    parent?: IGanttNodeData;
+    _children?: IGanttNodeData[] | undefined;
+    _parent?: IGanttNodeData;
     constructor(model: IDEGantt, nodeModel: IDETreeDataSetNode, parentNodeData: IGanttNodeData | undefined, opts: {
         data: IData;
         leaf: boolean;

package/out/service/vo/gantt-node-data/gantt-data-set-node-data.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"gantt-data-set-node-data.d.ts","sourceRoot":"","sources":["../../../../src/service/vo/gantt-node-data/gantt-data-set-node-data.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AAChE,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AACpD,OAAO,EAAE,mBAAmB,EAAE,MAAM,mBAAmB,CAAC;AAGxD,qBAAa,oBACX,SAAQ,mBACR,YAAW,cAAc;IAEzB,cAAc,EAAE,MAAM,CAAC;IAEvB,kBAAkB,EAAE,MAAM,CAAC;IAE3B,gBAAgB,EAAE,MAAM,CAAC;IAEzB,iBAAiB,EAAE,MAAM,GAAG,MAAM,CAAC;IAEnC,mBAAmB,EAAE,MAAM,GAAG,MAAM,CAAC;IAErC,kBAAkB,EAAE,MAAM,GAAG,MAAM,CAAC;IAEpC,QAAQ,CAAC,EAAE,cAAc,EAAE,GAAG,SAAS,CAAC;IAExC,MAAM,CAAC,EAAE,cAAc,CAAC;gBAGtB,KAAK,EAAE,QAAQ,EACf,SAAS,EAAE,kBAAkB,EAC7B,cAAc,EAAE,cAAc,GAAG,SAAS,EAC1C,IAAI,EAAE;QACJ,IAAI,EAAE,KAAK,CAAC;QACZ,IAAI,EAAE,OAAO,CAAC;QACd,UAAU,CAAC,EAAE,OAAO,CAAC;QACrB,SAAS,CAAC,EAAE,OAAO,CAAC;KACrB;CAmCJ"}
+{"version":3,"file":"gantt-data-set-node-data.d.ts","sourceRoot":"","sources":["../../../../src/service/vo/gantt-node-data/gantt-data-set-node-data.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AAChE,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AACpD,OAAO,EAAE,mBAAmB,EAAE,MAAM,mBAAmB,CAAC;AAGxD,qBAAa,oBACX,SAAQ,mBACR,YAAW,cAAc;IAEzB,cAAc,EAAE,MAAM,CAAC;IAEvB,kBAAkB,EAAE,MAAM,CAAC;IAE3B,gBAAgB,EAAE,MAAM,CAAC;IAEzB,iBAAiB,EAAE,MAAM,GAAG,MAAM,CAAC;IAEnC,mBAAmB,EAAE,MAAM,GAAG,MAAM,CAAC;IAErC,kBAAkB,EAAE,MAAM,GAAG,MAAM,CAAC;IAEpC,SAAS,CAAC,EAAE,cAAc,EAAE,GAAG,SAAS,CAAC;IAEzC,OAAO,CAAC,EAAE,cAAc,CAAC;gBAGvB,KAAK,EAAE,QAAQ,EACf,SAAS,EAAE,kBAAkB,EAC7B,cAAc,EAAE,cAAc,GAAG,SAAS,EAC1C,IAAI,EAAE;QACJ,IAAI,EAAE,KAAK,CAAC;QACZ,IAAI,EAAE,OAAO,CAAC;QACd,UAAU,CAAC,EAAE,OAAO,CAAC;QACrB,SAAS,CAAC,EAAE,OAAO,CAAC;KACrB;CAmCJ"}

package/out/service/vo/gantt-node-data/gantt-static-node-data.d.ts

@@ -8,8 +8,8 @@ export declare class GanttStaticNodeData extends TreeStaticNodeData implements I
     prevDataItemValue: string | number;
     finishDataItemValue: string | number;
     totalDataItemValue: string | number;
-    children?: IGanttNodeData[] | undefined;
-    parent?: IGanttNodeData;
+    _children?: IGanttNodeData[] | undefined;
+    _parent?: IGanttNodeData;
     constructor(model: IDEGantt, nodeModel: IDETreeNode, parentNodeData: IGanttNodeData | undefined, opts: {
         parentValueLevel?: number;
         leaf: boolean;

package/out/service/vo/gantt-node-data/gantt-static-node-data.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"gantt-static-node-data.d.ts","sourceRoot":"","sources":["../../../../src/service/vo/gantt-node-data/gantt-static-node-data.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AACzD,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AACpD,OAAO,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAC;AAGvD,qBAAa,mBACX,SAAQ,kBACR,YAAW,cAAc;IAEzB,cAAc,EAAE,MAAM,CAAC;IAEvB,kBAAkB,EAAE,MAAM,CAAC;IAE3B,gBAAgB,EAAE,MAAM,CAAC;IAEzB,iBAAiB,EAAE,MAAM,GAAG,MAAM,CAAC;IAEnC,mBAAmB,EAAE,MAAM,GAAG,MAAM,CAAC;IAErC,kBAAkB,EAAE,MAAM,GAAG,MAAM,CAAC;IAEpC,QAAQ,CAAC,EAAE,cAAc,EAAE,GAAG,SAAS,CAAC;IAExC,MAAM,CAAC,EAAE,cAAc,CAAC;gBAGtB,KAAK,EAAE,QAAQ,EACf,SAAS,EAAE,WAAW,EACtB,cAAc,EAAE,cAAc,GAAG,SAAS,EAC1C,IAAI,EAAE;QAAE,gBAAgB,CAAC,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,OAAO,CAAA;KAAE;CAsBrD"}
+{"version":3,"file":"gantt-static-node-data.d.ts","sourceRoot":"","sources":["../../../../src/service/vo/gantt-node-data/gantt-static-node-data.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AACzD,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AACpD,OAAO,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAC;AAGvD,qBAAa,mBACX,SAAQ,kBACR,YAAW,cAAc;IAEzB,cAAc,EAAE,MAAM,CAAC;IAEvB,kBAAkB,EAAE,MAAM,CAAC;IAE3B,gBAAgB,EAAE,MAAM,CAAC;IAEzB,iBAAiB,EAAE,MAAM,GAAG,MAAM,CAAC;IAEnC,mBAAmB,EAAE,MAAM,GAAG,MAAM,CAAC;IAErC,kBAAkB,EAAE,MAAM,GAAG,MAAM,CAAC;IAEpC,SAAS,CAAC,EAAE,cAAc,EAAE,GAAG,SAAS,CAAC;IAEzC,OAAO,CAAC,EAAE,cAAc,CAAC;gBAGvB,KAAK,EAAE,QAAQ,EACf,SAAS,EAAE,WAAW,EACtB,cAAc,EAAE,cAAc,GAAG,SAAS,EAC1C,IAAI,EAAE;QAAE,gBAAgB,CAAC,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,OAAO,CAAA;KAAE;CAsBrD"}