@ibiz-template/runtime 0.5.5 → 0.5.7-alpha.0

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

@@ -1 +1 @@
-{"version":3,"file":"tree-data-set-node-data.d.ts","sourceRoot":"","sources":["../../../../src/service/vo/tree-node-data/tree-data-set-node-data.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,kBAAkB,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AAG3E,OAAO,EAAE,KAAK,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAG1D,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAMhD;;;;;;;GAOG;AACH,qBAAa,mBAAoB,SAAQ,YAAa,YAAW,aAAa;IACpE,KAAK,EAAE,MAAM,CAAC;IAEd,GAAG,EAAE,MAAM,CAAC;IAEZ,MAAM,EAAE,MAAM,CAAC;IAEf,OAAO,EAAE,KAAK,CAAC;IAEvB;;;;OAIG;IACK,KAAK,EAAE,MAAM,mBAAmB,CAAC;gBAGvC,KAAK,EAAE,kBAAkB,EACzB,cAAc,EAAE,aAAa,GAAG,SAAS,EACzC,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;IA4KH,SAAS,CAAC,QAAQ,CAAC,KAAK,EAAE,kBAAkB,GAAG,KAAK,GAAG,SAAS;IAiBhE;;;;;;;OAOG;IACH,SAAS,CAAC,kBAAkB,CAC1B,QAAQ,EAAE,mBAAmB,GAC5B,MAAM,GAAG,SAAS;IAYrB;;;;;;;OAOG;IACH,SAAS,CAAC,YAAY,CAAC,KAAK,EAAE,kBAAkB,GAAG,MAAM,GAAG,SAAS;CAStE"}
+{"version":3,"file":"tree-data-set-node-data.d.ts","sourceRoot":"","sources":["../../../../src/service/vo/tree-node-data/tree-data-set-node-data.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,kBAAkB,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AAG3E,OAAO,EAAE,KAAK,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAG1D,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAMhD;;;;;;;GAOG;AACH,qBAAa,mBAAoB,SAAQ,YAAa,YAAW,aAAa;IACpE,KAAK,EAAE,MAAM,CAAC;IAEd,GAAG,EAAE,MAAM,CAAC;IAEZ,MAAM,EAAE,MAAM,CAAC;IAEf,OAAO,EAAE,KAAK,CAAC;IAEvB;;;;OAIG;IACK,KAAK,EAAE,MAAM,mBAAmB,CAAC;gBAGvC,KAAK,EAAE,kBAAkB,EACzB,cAAc,EAAE,aAAa,GAAG,SAAS,EACzC,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;IAoMH,SAAS,CAAC,QAAQ,CAAC,KAAK,EAAE,kBAAkB,GAAG,KAAK,GAAG,SAAS;IAiBhE;;;;;;;OAOG;IACH,SAAS,CAAC,kBAAkB,CAC1B,QAAQ,EAAE,mBAAmB,GAC5B,MAAM,GAAG,SAAS;IAYrB;;;;;;;OAOG;IACH,SAAS,CAAC,YAAY,CAAC,KAAK,EAAE,kBAAkB,GAAG,MAAM,GAAG,SAAS;CAStE"}

package/out/service/vo/tree-node-data/tree-data-set-node-data.js

@@ -33,8 +33,16 @@ export class TreeDataSetNodeData extends TreeNodeData {
         Object.defineProperty(this, '_text', {
             get() {
                 return model.textAppDEFieldId
-                    ? data[model.textAppDEFieldId]
-                    : data.srfmajortext;
+                    ? this._deData[model.textAppDEFieldId]
+                    : this._deData.srfmajortext;
+            },
+            set(v) {
+                if (model.textAppDEFieldId) {
+                    this._deData[model.textAppDEFieldId] = v;
+                }
+                else {
+                    this._deData.srfmajortext = v;
+                }
             },
             enumerable: true,
             configurable: true,
@@ -42,7 +50,17 @@ export class TreeDataSetNodeData extends TreeNodeData {
         // value值
         Object.defineProperty(this, '_value', {
             get() {
-                return model.idAppDEFieldId ? data[model.idAppDEFieldId] : data.srfkey;
+                return model.idAppDEFieldId
+                    ? this._deData[model.idAppDEFieldId]
+                    : this._deData.srfkey;
+            },
+            set(v) {
+                if (model.idAppDEFieldId) {
+                    this._deData[model.idAppDEFieldId] = v;
+                }
+                else {
+                    this._deData.srfkey = v;
+                }
             },
             enumerable: true,
             configurable: true,
@@ -85,6 +103,9 @@ export class TreeDataSetNodeData extends TreeNodeData {
                 nodeColumnKeyMap.set(columnKey, dataItemKey);
             }
         });
+        /** 预置属性映射 */
+        const presetItemMap = new Map();
+        presetItemMap.set('srfuf', 'srfuf');
         /**
          * 获取对应key最终映射的实体属性字段，undefined就是没有映射实体属性
          * @author lxm
@@ -105,6 +126,10 @@ export class TreeDataSetNodeData extends TreeNodeData {
             if (Object.prototype.hasOwnProperty.call(this._deData, key)) {
                 return key;
             }
+            // 预置属性映射，用于返回srfuf等get属性
+            if (presetItemMap.has(key)) {
+                return presetItemMap.get(key);
+            }
         };
         /**
          * 获取对应属性的默认值，纯显示用的

package/out/types.d.ts

@@ -1,7 +1,7 @@
 import { I18n } from '@ibiz-template/core/src/interface';
 import { EngineFactory } from './engine';
 import { GlobalUtil } from './global';
-import { IMessageUtil, INotificationUtil, IOpenViewUtil, IModalUtil, IConfirmUtil, ILoadingUtil, IPluginFactory, IOverlayController, IGlobalConfig, IAppHubService, IAuthService, IAsyncActionService, IPlatformProvider } from './interface';
+import { IMessageUtil, INotificationUtil, IOpenViewUtil, IModalUtil, IConfirmUtil, ILoadingUtil, IPluginFactory, IOverlayController, IGlobalConfig, IAppHubService, IAuthService, IAsyncActionService, IPlatformProvider, IInternalMessageService } from './interface';
 import { LogicSchedulerCenter } from './logic-scheduler';
 import { RegisterCenter } from './register/register-center';
 import { UIDomainManager } from './utils';
@@ -116,6 +116,14 @@ declare module '@ibiz-template/core' {
          * @type {IAuthService}
          */
         asyncAction: IAsyncActionService;
+        /**
+         * 站内信服务
+         *
+         * @author chitanda
+         * @date 2022-07-20 10:07:33
+         * @type {IAuthService}
+         */
+        internalMessage: IInternalMessageService;
         /**
          * 引擎工厂
          * @author lxm

package/out/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,mCAAmC,CAAC;AACzD,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AACzC,OAAO,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AACtC,OAAO,EACL,YAAY,EACZ,iBAAiB,EACjB,aAAa,EACb,UAAU,EACV,YAAY,EACZ,YAAY,EACZ,cAAc,EACd,kBAAkB,EAClB,aAAa,EACb,cAAc,EACd,YAAY,EACZ,mBAAmB,EACnB,iBAAiB,EAClB,MAAM,aAAa,CAAC;AACrB,OAAO,EAAE,oBAAoB,EAAE,MAAM,mBAAmB,CAAC;AACzD,OAAO,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAC5D,OAAO,EAAE,eAAe,EAAE,MAAM,SAAS,CAAC;AAE1C,OAAO,QAAQ,qBAAqB,CAAC;IACnC,UAAU,OAAO;QACf;;;;;;WAMG;QACH,OAAO,EAAE,YAAY,CAAC;QAEtB;;;;;;WAMG;QACH,GAAG,EAAE,cAAc,CAAC;QAEpB;;;;;;;WAOG;QACH,KAAK,EAAE,UAAU,CAAC;QAElB;;;;;;;WAOG;QACH,OAAO,EAAE,YAAY,CAAC;QAEtB;;;;;;;WAOG;QACH,OAAO,EAAE,YAAY,CAAC;QAEtB;;;;;;;WAOG;QACH,YAAY,EAAE,iBAAiB,CAAC;QAEhC;;;;;;;WAOG;QACH,QAAQ,EAAE,aAAa,CAAC;QAExB;;;;;;WAMG;QACH,OAAO,EAAE,kBAAkB,CAAC;QAE5B;;;;;;WAMG;QACH,MAAM,EAAE,cAAc,CAAC;QAEvB;;;;;;WAMG;QACH,QAAQ,EAAE,cAAc,CAAC;QAEzB;;;;;;WAMG;QACH,MAAM,EAAE,aAAa,CAAC;QAEtB;;;;;;WAMG;QACH,IAAI,EAAE,YAAY,CAAC;QAEnB;;;;;;WAMG;QACH,WAAW,EAAE,mBAAmB,CAAC;QAEjC;;;;;WAKG;QACH,MAAM,EAAE,aAAa,CAAC;QAEtB;;;;;;WAMG;QACH,IAAI,EAAE,UAAU,CAAC;QAEjB;;;;;;WAMG;QACH,IAAI,EAAE,IAAI,CAAC;QAEX;;;;;WAKG;QACH,SAAS,EAAE,oBAAoB,CAAC;QAEhC;;;;;;;WAOG;QACH,QAAQ,EAAE,iBAAiB,CAAC;QAE5B;;;;;;WAMG;QACH,eAAe,EAAE,eAAe,CAAC;KAClC;IAED,UAAU,YAAY;QACpB;;;;;;;WAOG;QACH,YAAY,CAAC,EAAE,aAAa,CAAC;KAC9B;CACF"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,mCAAmC,CAAC;AACzD,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AACzC,OAAO,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AACtC,OAAO,EACL,YAAY,EACZ,iBAAiB,EACjB,aAAa,EACb,UAAU,EACV,YAAY,EACZ,YAAY,EACZ,cAAc,EACd,kBAAkB,EAClB,aAAa,EACb,cAAc,EACd,YAAY,EACZ,mBAAmB,EACnB,iBAAiB,EACjB,uBAAuB,EACxB,MAAM,aAAa,CAAC;AACrB,OAAO,EAAE,oBAAoB,EAAE,MAAM,mBAAmB,CAAC;AACzD,OAAO,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAC5D,OAAO,EAAE,eAAe,EAAE,MAAM,SAAS,CAAC;AAE1C,OAAO,QAAQ,qBAAqB,CAAC;IACnC,UAAU,OAAO;QACf;;;;;;WAMG;QACH,OAAO,EAAE,YAAY,CAAC;QAEtB;;;;;;WAMG;QACH,GAAG,EAAE,cAAc,CAAC;QAEpB;;;;;;;WAOG;QACH,KAAK,EAAE,UAAU,CAAC;QAElB;;;;;;;WAOG;QACH,OAAO,EAAE,YAAY,CAAC;QAEtB;;;;;;;WAOG;QACH,OAAO,EAAE,YAAY,CAAC;QAEtB;;;;;;;WAOG;QACH,YAAY,EAAE,iBAAiB,CAAC;QAEhC;;;;;;;WAOG;QACH,QAAQ,EAAE,aAAa,CAAC;QAExB;;;;;;WAMG;QACH,OAAO,EAAE,kBAAkB,CAAC;QAE5B;;;;;;WAMG;QACH,MAAM,EAAE,cAAc,CAAC;QAEvB;;;;;;WAMG;QACH,QAAQ,EAAE,cAAc,CAAC;QAEzB;;;;;;WAMG;QACH,MAAM,EAAE,aAAa,CAAC;QAEtB;;;;;;WAMG;QACH,IAAI,EAAE,YAAY,CAAC;QAEnB;;;;;;WAMG;QACH,WAAW,EAAE,mBAAmB,CAAC;QAEjC;;;;;;WAMG;QACH,eAAe,EAAE,uBAAuB,CAAC;QAEzC;;;;;WAKG;QACH,MAAM,EAAE,aAAa,CAAC;QAEtB;;;;;;WAMG;QACH,IAAI,EAAE,UAAU,CAAC;QAEjB;;;;;;WAMG;QACH,IAAI,EAAE,IAAI,CAAC;QAEX;;;;;WAKG;QACH,SAAS,EAAE,oBAAoB,CAAC;QAEhC;;;;;;;WAOG;QACH,QAAQ,EAAE,iBAAiB,CAAC;QAE5B;;;;;;WAMG;QACH,eAAe,EAAE,eAAe,CAAC;KAClC;IAED,UAAU,YAAY;QACpB;;;;;;;WAOG;QACH,YAAY,CAAC,EAAE,aAAa,CAAC;KAC9B;CACF"}

package/out/ui-logic/ui-logic-node/debug-param-node/debug-param-node.js

@@ -16,6 +16,6 @@ export class DebugParamNode extends UILogicNode {
             throw new RuntimeModelError(this.model, '缺少目标参数对象配置');
         }
         const param = ctx.params[dstDEUILogicParamId];
-        ibiz.log.debug(`逻辑节点${name}操作参数值:`, param);
+        ibiz.log.info(`逻辑节点${name}操作参数值:`, param);
     }
 }

package/out/utils/view-stack/view-stack.d.ts

@@ -1,5 +1,6 @@
 import { IAppView } from '@ibiz/model-core';
-import { IViewController, IViewEvent, IViewStack, IViewState } from '../../interface';
+import { QXEvent } from 'qx-util';
+import { IViewController, IViewEvent, IViewStack, IViewStackEvent, IViewState } from '../../interface';
 /**
  * 视图堆栈
  *
@@ -12,11 +13,12 @@ export declare class ViewStack implements IViewStack {
     private stackMap;
     private stack;
     private activeStack;
+    evt: QXEvent<IViewStackEvent>;
     add(id: string, view: IViewController<IAppView, IViewState, IViewEvent>): void;
     remove(id: string): void;
     getActives(): IViewController[];
-    active(_id: string): void;
-    deactivate(_id: string): void;
+    active(id: string): void;
+    deactivate(id: string): void;
     /**
      * 重新计算激活视图堆栈
      *

package/out/utils/view-stack/view-stack.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"view-stack.d.ts","sourceRoot":"","sources":["../../../src/utils/view-stack/view-stack.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAC5C,OAAO,EACL,eAAe,EACf,UAAU,EACV,UAAU,EACV,UAAU,EACX,MAAM,iBAAiB,CAAC;AAEzB;;;;;;;GAOG;AACH,qBAAa,SAAU,YAAW,UAAU;IAC1C,OAAO,CAAC,QAAQ,CAA2C;IAE3D,OAAO,CAAC,KAAK,CAAyB;IAEtC,OAAO,CAAC,WAAW,CAAyB;IAE5C,GAAG,CACD,EAAE,EAAE,MAAM,EACV,IAAI,EAAE,eAAe,CAAC,QAAQ,EAAE,UAAU,EAAE,UAAU,CAAC,GACtD,IAAI;IAMP,MAAM,CAAC,EAAE,EAAE,MAAM,GAAG,IAAI;IASxB,UAAU,IAAI,eAAe,EAAE;IAI/B,MAAM,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI;IAIzB,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI;IAI7B;;;;;;OAMG;IACH,SAAS,CAAC,sBAAsB,IAAI,IAAI;CAGzC"}
+{"version":3,"file":"view-stack.d.ts","sourceRoot":"","sources":["../../../src/utils/view-stack/view-stack.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAC5C,OAAO,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AAClC,OAAO,EACL,eAAe,EACf,UAAU,EACV,UAAU,EACV,eAAe,EACf,UAAU,EACX,MAAM,iBAAiB,CAAC;AAEzB;;;;;;;GAOG;AACH,qBAAa,SAAU,YAAW,UAAU;IAC1C,OAAO,CAAC,QAAQ,CAA2C;IAE3D,OAAO,CAAC,KAAK,CAAyB;IAEtC,OAAO,CAAC,WAAW,CAAyB;IAE5C,GAAG,EAAE,OAAO,CAAC,eAAe,CAAC,CAAiB;IAE9C,GAAG,CACD,EAAE,EAAE,MAAM,EACV,IAAI,EAAE,eAAe,CAAC,QAAQ,EAAE,UAAU,EAAE,UAAU,CAAC,GACtD,IAAI;IAQP,MAAM,CAAC,EAAE,EAAE,MAAM,GAAG,IAAI;IAWxB,UAAU,IAAI,eAAe,EAAE;IAI/B,MAAM,CAAC,EAAE,EAAE,MAAM,GAAG,IAAI;IASxB,UAAU,CAAC,EAAE,EAAE,MAAM,GAAG,IAAI;IAS5B;;;;;;OAMG;IACH,SAAS,CAAC,sBAAsB,IAAI,IAAI;CAGzC"}

package/out/utils/view-stack/view-stack.js

@@ -1,3 +1,4 @@
+import { QXEvent } from 'qx-util';
 /**
  * 视图堆栈
  *
@@ -11,11 +12,14 @@ export class ViewStack {
         this.stackMap = new Map();
         this.stack = [];
         this.activeStack = [];
+        this.evt = new QXEvent();
     }
     add(id, view) {
         this.stack.push(view);
         this.stackMap.set(id, view);
         this.recalculateActiveStack();
+        this.evt.emit('add', view);
+        this.evt.emit('change', { type: 'add', view });
     }
     remove(id) {
         const view = this.stackMap.get(id);
@@ -23,16 +27,28 @@ export class ViewStack {
             this.stack.splice(this.stack.indexOf(view), 1);
             this.stackMap.delete(id);
             this.recalculateActiveStack();
+            this.evt.emit('remove', view);
+            this.evt.emit('change', { type: 'remove', view });
         }
     }
     getActives() {
         return this.activeStack;
     }
-    active(_id) {
-        this.recalculateActiveStack();
+    active(id) {
+        const view = this.stackMap.get(id);
+        if (view) {
+            this.recalculateActiveStack();
+            this.evt.emit('active', view);
+            this.evt.emit('change', { type: 'active', view });
+        }
     }
-    deactivate(_id) {
-        this.recalculateActiveStack();
+    deactivate(id) {
+        const view = this.stackMap.get(id);
+        if (view) {
+            this.recalculateActiveStack();
+            this.evt.emit('deactivate', view);
+            this.evt.emit('change', { type: 'deactivate', view });
+        }
     }
     /**
      * 重新计算激活视图堆栈

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ibiz-template/runtime",
-  "version": "0.5.5",
+  "version": "0.5.7-alpha.0",
   "description": "控制器包",
   "type": "module",
   "main": "out/index.js",
@@ -23,14 +23,15 @@
     "lint:fix": "eslint --fix 'src/**/*.ts'",
     "publish:next": "npm run build && npm publish --access public --tag=next --registry=https://registry.npmjs.org/",
     "publish:dev": "npm run build && npm publish --access public --tag=dev --registry=https://registry.npmjs.org/",
+    "publish:alpha": "npm run build && npm publish --access public --tag=alpha --registry=https://registry.npmjs.org/",
     "publish:beta": "npm run build && npm publish --access public --tag=beta --registry=https://registry.npmjs.org/",
     "publish:npm": "npm run build && npm publish --access public --registry=https://registry.npmjs.org/"
   },
   "author": "chitanda",
   "license": "MIT",
   "devDependencies": {
-    "@ibiz-template/core": "^0.5.3",
-    "@ibiz/model-core": "^0.1.5",
+    "@ibiz-template/core": "^0.5.7-alpha.0",
+    "@ibiz/model-core": "^0.1.6",
     "@types/path-browserify": "^1.0.2",
     "@types/qs": "^6.9.11",
     "@types/systemjs": "^6.13.5",
@@ -47,7 +48,7 @@
   },
   "peerDependencies": {
     "@ibiz-template/core": "^0.5.0-beta.0",
-    "@ibiz/model-core": "^0.1.5",
+    "@ibiz/model-core": "^0.1.6",
     "async-validator": "^4.2.5",
     "dayjs": "^1.11.7",
     "echarts": "^5.4.3",
@@ -59,5 +60,5 @@
     "qx-util": "^0.4.8",
     "ramda": "^0.29.0"
   },
-  "gitHead": "d576ffdb2391399e913e71473a2e54eb4d6c0791"
+  "gitHead": "d334b6bfb6f0869076ab2d09f9d959885eef71dc"
 }

package/src/command/app/open-app-view/open-app-view.ts

@@ -80,11 +80,14 @@ export class OpenAppViewCommand {
     }
     switch (viewOpenMode) {
       case 'INDEXVIEWTAB':
+      case 'INDEXVIEWTAB_POPUP':
         if (opts.noWaitRoute) {
           this.openIndexViewTab(appView, context, params);
           return { ok: true };
         }
         return this.openIndexViewTab(appView, context, params);
+      case 'INDEXVIEWTAB_POPUPMODAL':
+        return this.openIndexViewTabByModal(appView, context, params);
       case 'POPUP':
         throw new ModelError(appView, '未支持的视图打开模式: POPUP');
       case 'POPUPMODAL':
@@ -123,6 +126,25 @@ export class OpenAppViewCommand {
     return ibiz.openView.root(appView.id, context, params);
   }
 
+  /**
+   * 模态路由打开视图，路由拼接于当前视图路由后。再由特殊解析呈现
+   *
+   * @author chitanda
+   * @date 2024-01-23 11:01:07
+   * @protected
+   * @param {IViewConfig} appView
+   * @param {IContext} context
+   * @param {IParams} [params={}]
+   * @return {*}  {Promise<IModalData>}
+   */
+  protected openIndexViewTabByModal(
+    appView: IViewConfig,
+    context: IContext,
+    params: IParams = {},
+  ): Promise<IModalData> {
+    return ibiz.openView.rootByModal(appView.id, context, params);
+  }
+
   /**
    * 模态窗口打开
    *

package/src/constant/index.ts

@@ -1,8 +1,9 @@
 export { ControlType } from './control-type';
-export { ViewType } from './view-type';
-export { ViewMode } from './view-mode';
-export { SysUIActionTag } from './sys-uiaction-tag';
-export { ViewCallTag } from './view-call-tag';
-export { ValueOP } from './value-op';
 export { PlatformType } from './platform-type';
+export { RouteConst } from './route';
 export * from './studio-event';
+export { SysUIActionTag } from './sys-uiaction-tag';
+export { ValueOP } from './value-op';
+export { ViewCallTag } from './view-call-tag';
+export { ViewMode } from './view-mode';
+export { ViewType } from './view-type';

package/src/constant/route.ts

@@ -0,0 +1,15 @@
+/* eslint-disable no-shadow */
+/**
+ * 路由相关静态变量
+ *
+ * @author chitanda
+ * @date 2024-01-23 21:01:41
+ * @export
+ * @enum {number}
+ */
+export enum RouteConst {
+  /**
+   * 路由模态标识
+   */
+  ROUTE_MODAL_TAG = 'route-modal',
+}

package/src/controller/control/tree/tree.controller.ts

@@ -561,8 +561,14 @@ export class TreeController<
     context: IContext;
     params: IParams;
   } {
+    let tempData = null;
+    if (nodeData._nodeType === 'DE') {
+      tempData = nodeData;
+    } else {
+      tempData = { ...nodeData, ...(nodeData._deData || {}) };
+    }
     return {
-      data: [{ ...nodeData, ...(nodeData._deData || {}) }],
+      data: [tempData],
       context: Object.assign(this.context.clone(), nodeData._context || {}),
       params: { ...this.params, ...(nodeData._params || {}) },
     };
@@ -935,11 +941,10 @@ export class TreeController<
     if (!model.allowEditText) {
       throw new RuntimeModelError(model, '树节点没有配置编辑模式：名称');
     }
-    if (!nodeData._deData) {
+    if (nodeData._nodeType !== 'DE') {
       throw new RuntimeError('不是实体树节点数据');
     }
     nodeData._text = text;
-    nodeData._deData[model.textAppDEFieldId!] = text;
     await this.updateDeNodeData([nodeData]);
   }
 }

package/src/controller/control/tree/tree.service.ts

@@ -5,6 +5,7 @@ import {
   IDETreeDataSetNode,
   IDETreeNode,
   IDETreeNodeRS,
+  IDETreeStaticNode,
 } from '@ibiz/model-core';
 import { ITreeNodeData } from '../../../interface';
 import {
@@ -156,6 +157,17 @@ export class TreeService<
 
     // 根据类型查询节点数据
     let result: ITreeNodeData[] = [];
+
+    // 通过统一资源标识计算权限
+    if ((nodeModel as IDETreeStaticNode).accessKey) {
+      const permitted = this.app.authority.calcByResCode(
+        (nodeModel as IDETreeStaticNode).accessKey!,
+      );
+      if (!permitted) {
+        return result;
+      }
+    }
+
     switch (nodeModel.treeNodeType) {
       case 'STATIC':
         {

package/src/install.ts

@@ -3,6 +3,7 @@ import { RegisterCenter } from './register/register-center';
 import { installCommand } from './command';
 import {
   AsyncActionService,
+  InternalMessageService,
   presetAppCounterProvider,
   presetDEMethodProvider,
   V7AuthService,
@@ -37,6 +38,8 @@ export function install(): void {
   ibiz.auth = new V7AuthService();
   // 挂载异步操作服务
   ibiz.asyncAction = new AsyncActionService();
+  // 挂载站内信服务
+  ibiz.internalMessage = new InternalMessageService();
   // 挂载引擎工厂
   ibiz.engine = new EngineFactory();
   // 挂载界面域管理

package/src/interface/provider/i-internal-message.provider.ts

@@ -0,0 +1,30 @@
+import { IInternalMessage } from '@ibiz-template/core';
+
+/**
+ * 站内信适配器的接口
+ *
+ * @author lxm
+ * @date 2022-09-19 19:09:10
+ * @export
+ * @interface IInternalMessageProvider
+ */
+export interface IInternalMessageProvider {
+  /**
+   * 绘制组件
+   * @author lxm
+   * @date 2022-09-20 10:09:50
+   * @type {unknown}
+   */
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  component: any;
+
+  /**
+   * 点击事件
+   * @author lxm
+   * @date 2024-01-15 12:47:22
+   * @param {IInternalMessage} asyncAction
+   * @param {MouseEvent} event
+   * @return {*}  {boolean} 返回是否隐藏消息popover
+   */
+  onClick(asyncAction: IInternalMessage, event: MouseEvent): boolean;
+}

package/src/interface/provider/index.ts

@@ -18,3 +18,4 @@ export type {
 } from './i-de-method.provider';
 export type { ITreeGridExColumnProvider } from './i-tree-grid-ex-column.provider';
 export type { IAppMenuItemProvider } from './i-app-menu-item.provider';
+export type { IInternalMessageProvider } from './i-internal-message.provider';

package/src/interface/service/service/i-internal-message.service.ts

@@ -0,0 +1,29 @@
+import { IHttpResponse, IInternalMessage } from '@ibiz-template/core';
+
+/**
+ * 站内信消息服务
+ *
+ * @author lxm
+ * @date 2024-01-23 02:12:01
+ * @export
+ * @interface IInternalMessageService
+ */
+export interface IInternalMessageService {
+  /**
+   * 获取站内信的集合
+   * @author lxm
+   * @date 2023-11-15 10:55:25
+   * @param {IParams} [params={}]
+   * @return {*}  {Promise<IHttpResponse<IInternalMessage[]>>}
+   */
+  fetch(params?: IParams): Promise<IHttpResponse<IInternalMessage[]>>;
+
+  /**
+   * 获取单条站内信
+   * @author lxm
+   * @date 2023-11-15 10:57:08
+   * @param {string} actionID
+   * @return {*}  {Promise<IHttpResponse<IInternalMessage[]>>}
+   */
+  get(actionID: string): Promise<IHttpResponse<IInternalMessage[]>>;
+}

package/src/interface/service/service/index.ts

@@ -5,3 +5,4 @@ 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';
+export type { IInternalMessageService } from './i-internal-message.service';

package/src/interface/util/i-open-view-util/i-open-view-util.ts

@@ -36,6 +36,22 @@ export interface IOpenViewUtil {
     params?: IParams,
   ): Promise<IModalData>;
 
+  /**
+   * 打开顶级视图(包含路由跳转后使用模态打开视图)
+   *
+   * @author chitanda
+   * @date 2024-01-23 11:01:32
+   * @param {string} appViewId
+   * @param {IContext} context
+   * @param {IParams} [params]
+   * @return {*}  {Promise<IModalData>}
+   */
+  rootByModal(
+    appViewId: string,
+    context: IContext,
+    params?: IParams,
+  ): Promise<IModalData>;
+
   /**
    * 打开模态视图
    *

package/src/interface/util/i-view-stack/i-view-stack.ts

@@ -1,5 +1,17 @@
+import { QXEvent } from 'qx-util';
 import { IViewController } from '../../controller';
 
+export interface IViewStackEvent {
+  add: (view: IViewController) => void;
+  remove: (view: IViewController) => void;
+  active: (view: IViewController) => void;
+  deactivate: (view: IViewController) => void;
+  change: (msg: {
+    type: 'add' | 'remove' | 'active' | 'deactivate';
+    view: IViewController;
+  }) => void;
+}
+
 /**
  * 视图堆栈
  *
@@ -9,6 +21,16 @@ import { IViewController } from '../../controller';
  * @interface IViewStack
  */
 export interface IViewStack {
+  /**
+   * 事件
+   *
+   * @author chitanda
+   * @date 2023-09-05 16:09:58
+   * @protected
+   * @type {QXEvent<MessageCenterEvent>}
+   */
+  evt: QXEvent<IViewStackEvent>;
+
   /**
    * 添加视图堆栈信息
    *

package/src/interface/util/index.ts

@@ -15,4 +15,4 @@ export type { IOverlayController } from './i-overlay-controller/i-overlay-contro
 export type { IOverlayPopoverContainer } from './i-overlay-popover-container/i-overlay-popover-container';
 export type { IScriptFunctionOpts } from './script/i-script-function';
 export type { IExcelUtil } from './i-excel-util/i-excel-util';
-export type { IViewStack } from './i-view-stack/i-view-stack';
+export type { IViewStack, IViewStackEvent } from './i-view-stack/i-view-stack';

package/src/register/helper/index.ts

@@ -13,3 +13,4 @@ export * from './platform-register';
 export * from './de-method-register';
 export * from './tree-grid-ex-column-register';
 export * from './app-menu-item-register';
+export * from './internal-message-register';

package/src/register/helper/internal-message-register.ts

@@ -0,0 +1,52 @@
+import { IInternalMessage, RuntimeError } from '@ibiz-template/core';
+import { IInternalMessageProvider } from '../../interface';
+
+/** 界面行为适配器前缀 */
+export const INTERNAL_MESSAGE_PROVIDER_PREFIX = 'INTERNAL_MESSAGE';
+
+/**
+ * 注册界面行为适配器
+ * @author lxm
+ * @date 2023-05-06 09:14:16
+ * @export
+ * @param {string} key
+ * @param {() => IInternalMessageProvider} callback 生成界面行为适配器的回调
+ */
+export function registerInternalMessageProvider(
+  key: string,
+  callback: () => IInternalMessageProvider,
+): void {
+  ibiz.register.register(
+    `${INTERNAL_MESSAGE_PROVIDER_PREFIX}_${key}`,
+    callback,
+  );
+}
+
+function getProvider(key: string): IInternalMessageProvider | undefined {
+  return ibiz.register.get(
+    `${INTERNAL_MESSAGE_PROVIDER_PREFIX}_${key}`,
+  ) as IInternalMessageProvider;
+}
+
+/**
+ * 获取界面行为适配器
+ * @author lxm
+ * @date 2023-05-06 09:29:23
+ * @export
+ * @param {IAppView} model
+ * @return {*}  {Promise<IInternalMessageProvider>}
+ */
+export function getInternalMessageProvider(
+  msg: IInternalMessage,
+): IInternalMessageProvider {
+  const provider: IInternalMessageProvider | undefined = getProvider(
+    msg.message_type || 'DEFAULT',
+  );
+
+  // 找异步操作类型
+  if (!provider) {
+    throw new RuntimeError(`找不站内信类型${msg.message_type}对应的适配器`);
+  } else {
+    return provider;
+  }
+}

package/src/service/service/index.ts

@@ -8,3 +8,4 @@ export * from './authority';
 export { V7AuthService } from './auth/v7-auth.service';
 export { AsyncActionService } from './async-action/async-action.service';
 export * from './entity/method';
+export { InternalMessageService } from './internal-message/internal-message.service';

package/src/service/service/internal-message/internal-message.service.ts

@@ -0,0 +1,69 @@
+import { IHttpResponse, IInternalMessage } from '@ibiz-template/core';
+import { isNil } from 'ramda';
+import { IInternalMessageService } from '../../../interface';
+
+export class InternalMessageService implements IInternalMessageService {
+  /**
+   * 基础路径
+   * @author lxm
+   * @date 2024-01-23 02:06:47
+   */
+  baseUrl = '/extension/internal_messages';
+
+  /**
+   * 获取站内信的集合
+   * @author lxm
+   * @date 2023-11-15 10:55:25
+   * @param {IParams} [params={}]
+   * @return {*}  {Promise<IHttpResponse<IInternalMessage[]>>}
+   */
+  async fetch(
+    params: IParams = {},
+  ): Promise<IHttpResponse<IInternalMessage[]>> {
+    // const res = await ibiz.net.post(
+    //   `${this.baseUrl}/fetch_cur_receiver`,
+    //   params,
+    // );
+    const res: IData = {
+      ok: true,
+    };
+    if (res.headers) {
+      if (res.headers['x-page']) {
+        res.page = Number(res.headers['x-page']);
+      }
+      if (res.headers['x-per-page']) {
+        res.size = Number(res.headers['x-per-page']);
+      }
+      if (res.headers['x-total']) {
+        res.total = Number(res.headers['x-total']);
+      }
+    }
+    if (isNil(res.data)) {
+      res.data = [];
+    }
+
+    res.page = params.page;
+    res.total = 34;
+    res.data = Array.from({ length: params.size }, (_, i) => ({
+      id: i + 1,
+      status: 'RECEIVED',
+      title: `标题${i + 1}`,
+      content: `内容${i + 1}长内容`,
+      short_content: `内容${i + 1}短内容`,
+      create_time: new Date().toISOString(),
+    }));
+    return res as IHttpResponse<IInternalMessage[]>;
+  }
+
+  /**
+   * 获取单条站内信
+   * @author lxm
+   * @date 2023-11-15 10:57:08
+   * @param {string} messageId
+   * @return {*}  {Promise<IHttpResponse<IInternalMessage[]>>}
+   */
+  async get(messageId: string): Promise<IHttpResponse<IInternalMessage[]>> {
+    const res = await ibiz.net.get(`${this.baseUrl}/${messageId}`);
+    return res as IHttpResponse<IInternalMessage[]>;
+  }
+}