@ibiz-template/runtime 0.5.6 → 0.5.7-alpha.1

package/out/register/helper/internal-message-register.d.ts

@@ -0,0 +1,23 @@
+import { IInternalMessage } from '@ibiz-template/core';
+import { IInternalMessageProvider } from '../../interface';
+/** 界面行为适配器前缀 */
+export declare const INTERNAL_MESSAGE_PROVIDER_PREFIX = "INTERNAL_MESSAGE";
+/**
+ * 注册界面行为适配器
+ * @author lxm
+ * @date 2023-05-06 09:14:16
+ * @export
+ * @param {string} key
+ * @param {() => IInternalMessageProvider} callback 生成界面行为适配器的回调
+ */
+export declare function registerInternalMessageProvider(key: string, callback: () => IInternalMessageProvider): void;
+/**
+ * 获取界面行为适配器
+ * @author lxm
+ * @date 2023-05-06 09:29:23
+ * @export
+ * @param {IAppView} model
+ * @return {*}  {Promise<IInternalMessageProvider>}
+ */
+export declare function getInternalMessageProvider(msg: IInternalMessage): IInternalMessageProvider;
+//# sourceMappingURL=internal-message-register.d.ts.map

package/out/register/helper/internal-message-register.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"internal-message-register.d.ts","sourceRoot":"","sources":["../../../src/register/helper/internal-message-register.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAgB,MAAM,qBAAqB,CAAC;AACrE,OAAO,EAAE,wBAAwB,EAAE,MAAM,iBAAiB,CAAC;AAE3D,gBAAgB;AAChB,eAAO,MAAM,gCAAgC,qBAAqB,CAAC;AAEnE;;;;;;;GAOG;AACH,wBAAgB,+BAA+B,CAC7C,GAAG,EAAE,MAAM,EACX,QAAQ,EAAE,MAAM,wBAAwB,GACvC,IAAI,CAKN;AAQD;;;;;;;GAOG;AACH,wBAAgB,0BAA0B,CACxC,GAAG,EAAE,gBAAgB,GACpB,wBAAwB,CAW1B"}

package/out/register/helper/internal-message-register.js

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

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":"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"}
+{"version":3,"file":"de-action.d.ts","sourceRoot":"","sources":["../../../../../src/service/service/entity/method/de-action.ts"],"names":[],"mappings":"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"}

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

@@ -212,10 +212,10 @@ export class DEActionMethod extends Method {
             const addData = this.createEntity(entity);
             let resultData;
             if (isArray(addData)) {
-                resultData = await Promise.all(addData.map(item => this.service.local.add(context, this.attach(context, item))));
+                resultData = await Promise.all(addData.map(item => this.service.local.add(context, this.attach(context, item), false)));
             }
             else {
-                resultData = await this.service.local.add(context, this.attach(context, addData));
+                resultData = await this.service.local.add(context, this.attach(context, addData), false);
             }
             return new HttpResponse(resultData);
         }
@@ -395,10 +395,10 @@ export class DEActionMethod extends Method {
             const updateData = this.createEntity(entity);
             let resultData;
             if (isArray(updateData)) {
-                resultData = await Promise.all(updateData.map(item => this.service.local.update(context, this.attach(context, item))));
+                resultData = await Promise.all(updateData.map(item => this.service.local.update(context, this.attach(context, item), false)));
             }
             else {
-                resultData = await this.service.local.update(context, this.attach(context, updateData));
+                resultData = await this.service.local.update(context, this.attach(context, updateData), false);
             }
             if (resultData) {
                 return new HttpResponse(resultData);

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

@@ -8,4 +8,5 @@ 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';
 //# sourceMappingURL=index.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/service/service/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AAChE,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AACxD,OAAO,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAC3D,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAChD,OAAO,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AAChE,cAAc,WAAW,CAAC;AAC1B,cAAc,aAAa,CAAC;AAC5B,OAAO,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAC;AACvD,OAAO,EAAE,kBAAkB,EAAE,MAAM,qCAAqC,CAAC;AACzE,cAAc,iBAAiB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/service/service/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AAChE,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AACxD,OAAO,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAC3D,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAChD,OAAO,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AAChE,cAAc,WAAW,CAAC;AAC1B,cAAc,aAAa,CAAC;AAC5B,OAAO,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAC;AACvD,OAAO,EAAE,kBAAkB,EAAE,MAAM,qCAAqC,CAAC;AACzE,cAAc,iBAAiB,CAAC;AAChC,OAAO,EAAE,sBAAsB,EAAE,MAAM,6CAA6C,CAAC"}

package/out/service/service/index.js

@@ -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/out/service/service/internal-message/internal-message.service.d.ts

@@ -0,0 +1,27 @@
+import { IHttpResponse, IInternalMessage } from '@ibiz-template/core';
+import { IInternalMessageService } from '../../../interface';
+export declare class InternalMessageService implements IInternalMessageService {
+    /**
+     * 基础路径
+     * @author lxm
+     * @date 2024-01-23 02:06:47
+     */
+    baseUrl: string;
+    /**
+     * 获取站内信的集合
+     * @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} messageId
+     * @return {*}  {Promise<IHttpResponse<IInternalMessage[]>>}
+     */
+    get(messageId: string): Promise<IHttpResponse<IInternalMessage[]>>;
+}
+//# sourceMappingURL=internal-message.service.d.ts.map

package/out/service/service/internal-message/internal-message.service.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"internal-message.service.d.ts","sourceRoot":"","sources":["../../../../src/service/service/internal-message/internal-message.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAEtE,OAAO,EAAE,uBAAuB,EAAE,MAAM,oBAAoB,CAAC;AAE7D,qBAAa,sBAAuB,YAAW,uBAAuB;IACpE;;;;OAIG;IACH,OAAO,SAAkC;IAEzC;;;;;;OAMG;IACG,KAAK,CACT,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,aAAa,CAAC,gBAAgB,EAAE,CAAC,CAAC;IAoC7C;;;;;;OAMG;IACG,GAAG,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,aAAa,CAAC,gBAAgB,EAAE,CAAC,CAAC;CAIzE"}

package/out/service/service/internal-message/internal-message.service.js

@@ -0,0 +1,63 @@
+import { isNil } from 'ramda';
+export class InternalMessageService {
+    constructor() {
+        /**
+         * 基础路径
+         * @author lxm
+         * @date 2024-01-23 02:06:47
+         */
+        this.baseUrl = '/extension/internal_messages';
+    }
+    /**
+     * 获取站内信的集合
+     * @author lxm
+     * @date 2023-11-15 10:55:25
+     * @param {IParams} [params={}]
+     * @return {*}  {Promise<IHttpResponse<IInternalMessage[]>>}
+     */
+    async fetch(params = {}) {
+        // const res = await ibiz.net.post(
+        //   `${this.baseUrl}/fetch_cur_receiver`,
+        //   params,
+        // );
+        const res = {
+            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;
+    }
+    /**
+     * 获取单条站内信
+     * @author lxm
+     * @date 2023-11-15 10:57:08
+     * @param {string} messageId
+     * @return {*}  {Promise<IHttpResponse<IInternalMessage[]>>}
+     */
+    async get(messageId) {
+        const res = await ibiz.net.get(`${this.baseUrl}/${messageId}`);
+        return res;
+    }
+}

package/out/service/utils/de-cache/de-cache.d.ts

@@ -67,10 +67,11 @@ export declare class DECache {
      *
      * @param {*} context
      * @param {IDataEntity} entity
+     * @param {boolean} [ignoreDuplicate=true] 是否忽略主键重复（不忽略报错，忽略则覆盖）
      * @return {*}  {boolean}
      * @memberof EntityCache
      */
-    add(context: IContext, entity: IDataEntity): IDataEntity | null;
+    add(context: IContext, entity: IDataEntity, ignoreDuplicate?: boolean): IDataEntity | null;
     /**
      * 查找数据
      *
@@ -85,10 +86,11 @@ export declare class DECache {
      *
      * @param {IContext} context
      * @param {IDataEntity} entity
+     * @param {boolean} [ignoreDuplicate=true] 是否忽略主键重复（不忽略报错，忽略则覆盖）
      * @return {*}  {IDataEntity}
      * @memberof EntityCache
      */
-    update(context: IContext, entity: IDataEntity): IDataEntity | null;
+    update(context: IContext, entity: IDataEntity, ignoreDuplicate?: boolean): IDataEntity | null;
     /**
      * 删除数据
      *

package/out/service/utils/de-cache/de-cache.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"de-cache.d.ts","sourceRoot":"","sources":["../../../../src/service/utils/de-cache/de-cache.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAMlD,OAAO,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAG/D;;;;;;;GAOG;AACH,qBAAa,OAAO;IAoBN,SAAS,CAAC,MAAM,EAAE,cAAc;IAnB5C;;;;;;;OAOG;IACH,SAAS,KAAK,UAAU,IAAI,OAAO,CAElC;IAED;;;;;;OAMG;gBACmB,MAAM,EAAE,cAAc;IAE5C;;;;;;OAMG;IACH,QAAQ,CAAC,QAAQ,EAAE,GAAG,CAAC,MAAM,EAAE,WAAW,CAAC,CAAa;IAExD;;;;;;;OAOG;IACH,QAAQ,CAAC,QAAQ,EAAE,QAAQ,EAAE,MAAM,EAAE,WAAW,GAAG,IAAI;IAQvD;;;;;;;OAOG;IACH,WAAW,CAAC,QAAQ,EAAE,QAAQ,EAAE,MAAM,EAAE,WAAW,GAAG,IAAI;IAK1D;;;;;;;OAOG;IACH,WAAW,CAAC,QAAQ,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,GAAG,IAAI;IAKrD;;;;;;;OAOG;IACH,GAAG,CAAC,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,WAAW,GAAG,WAAW,GAAG,IAAI;IAoC/D;;;;;;;OAOG;IACH,GAAG,CAAC,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,GAAG,WAAW,GAAG,IAAI;IAY1D;;;;;;;OAOG;IACH,MAAM,CAAC,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,WAAW,GAAG,WAAW,GAAG,IAAI;IA+ClE;;;;;;;OAOG;IACH,MAAM,CAAC,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,GAAG,WAAW,GAAG,IAAI;IA2B7D;;;;;;;;OAQG;IACH,WAAW,CAAC,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,WAAW,EAAE,GAAG,WAAW,EAAE;IA8BtE;;;;;;;;OAQG;IACH,WAAW,CAAC,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,WAAW,EAAE,GAAG,WAAW,EAAE;IA4DtE;;;;;;;;OAQG;IACH,WAAW,CAAC,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,MAAM,EAAE;IAwC3D;;;;;;;;OAQG;IACH,SAAS,CAAC,QAAQ,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO;IAItD;;;;;;OAMG;IACH,OAAO,IAAI,WAAW,EAAE;IAKxB;;;;;;;OAOG;IACH,YAAY,CAAC,MAAM,GAAE,OAAY,GAAG,CAAC,CAAC,EAAE,OAAO,EAAE,CAAC,KAAK,OAAO;IAgB9D;;;;;OAKG;IACH,KAAK,IAAI,IAAI;IAOb;;;;;OAKG;IACH,SAAS,CAAC,YAAY,CAAC,IAAI,EAAE,WAAW,GAAG,IAAI;IAgB/C;;;;;;;;OAQG;IACH,SAAS,CAAC,cAAc,CAAC,OAAO,EAAE,QAAQ,GAAG,YAAY,GAAG,IAAI;CAOjE"}
+{"version":3,"file":"de-cache.d.ts","sourceRoot":"","sources":["../../../../src/service/utils/de-cache/de-cache.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAMlD,OAAO,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAG/D;;;;;;;GAOG;AACH,qBAAa,OAAO;IAoBN,SAAS,CAAC,MAAM,EAAE,cAAc;IAnB5C;;;;;;;OAOG;IACH,SAAS,KAAK,UAAU,IAAI,OAAO,CAElC;IAED;;;;;;OAMG;gBACmB,MAAM,EAAE,cAAc;IAE5C;;;;;;OAMG;IACH,QAAQ,CAAC,QAAQ,EAAE,GAAG,CAAC,MAAM,EAAE,WAAW,CAAC,CAAa;IAExD;;;;;;;OAOG;IACH,QAAQ,CAAC,QAAQ,EAAE,QAAQ,EAAE,MAAM,EAAE,WAAW,GAAG,IAAI;IAQvD;;;;;;;OAOG;IACH,WAAW,CAAC,QAAQ,EAAE,QAAQ,EAAE,MAAM,EAAE,WAAW,GAAG,IAAI;IAK1D;;;;;;;OAOG;IACH,WAAW,CAAC,QAAQ,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,GAAG,IAAI;IAKrD;;;;;;;;OAQG;IACH,GAAG,CACD,OAAO,EAAE,QAAQ,EACjB,MAAM,EAAE,WAAW,EACnB,eAAe,UAAO,GACrB,WAAW,GAAG,IAAI;IAoCrB;;;;;;;OAOG;IACH,GAAG,CAAC,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,GAAG,WAAW,GAAG,IAAI;IAY1D;;;;;;;;OAQG;IACH,MAAM,CACJ,OAAO,EAAE,QAAQ,EACjB,MAAM,EAAE,WAAW,EACnB,eAAe,UAAO,GACrB,WAAW,GAAG,IAAI;IAmDrB;;;;;;;OAOG;IACH,MAAM,CAAC,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,GAAG,WAAW,GAAG,IAAI;IA2B7D;;;;;;;;OAQG;IACH,WAAW,CAAC,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,WAAW,EAAE,GAAG,WAAW,EAAE;IA8BtE;;;;;;;;OAQG;IACH,WAAW,CAAC,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,WAAW,EAAE,GAAG,WAAW,EAAE;IA4DtE;;;;;;;;OAQG;IACH,WAAW,CAAC,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,MAAM,EAAE;IAwC3D;;;;;;;;OAQG;IACH,SAAS,CAAC,QAAQ,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO;IAItD;;;;;;OAMG;IACH,OAAO,IAAI,WAAW,EAAE;IAKxB;;;;;;;OAOG;IACH,YAAY,CAAC,MAAM,GAAE,OAAY,GAAG,CAAC,CAAC,EAAE,OAAO,EAAE,CAAC,KAAK,OAAO;IAgB9D;;;;;OAKG;IACH,KAAK,IAAI,IAAI;IAOb;;;;;OAKG;IACH,SAAS,CAAC,YAAY,CAAC,IAAI,EAAE,WAAW,GAAG,IAAI;IAgB/C;;;;;;;;OAQG;IACH,SAAS,CAAC,cAAc,CAAC,OAAO,EAAE,QAAQ,GAAG,YAAY,GAAG,IAAI;CAOjE"}

package/out/service/utils/de-cache/de-cache.js

@@ -86,14 +86,15 @@ export class DECache {
      *
      * @param {*} context
      * @param {IDataEntity} entity
+     * @param {boolean} [ignoreDuplicate=true] 是否忽略主键重复（不忽略报错，忽略则覆盖）
      * @return {*}  {boolean}
      * @memberof EntityCache
      */
-    add(context, entity) {
+    add(context, entity, ignoreDuplicate = true) {
         // 联合主键相关数据处理
         if (this.isUnionKey) {
             this.calcUnionKey(entity);
-            if (this.checkData(context, entity.srfkey)) {
+            if (ignoreDuplicate === false && this.checkData(context, entity.srfkey)) {
                 throw new RuntimeError(`新建联合主键数据失败，已有主键为${entity.srfkey}的数据`);
             }
         }
@@ -149,16 +150,19 @@ export class DECache {
      *
      * @param {IContext} context
      * @param {IDataEntity} entity
+     * @param {boolean} [ignoreDuplicate=true] 是否忽略主键重复（不忽略报错，忽略则覆盖）
      * @return {*}  {IDataEntity}
      * @memberof EntityCache
      */
-    update(context, entity) {
+    update(context, entity, ignoreDuplicate = true) {
         const oldKey = entity.srfkey;
         // 联合主键相关数据处理
         if (this.isUnionKey) {
             this.calcUnionKey(entity);
-            // 主键改变的时候，检测变更之后的主键是否已经存在
-            if (oldKey !== entity.srfkey && this.checkData(context, entity.srfkey)) {
+            // 只在临时数据的新建更新时，主键改变的时候，检测变更之后的主键是否已经存在
+            if (ignoreDuplicate === false &&
+                oldKey !== entity.srfkey &&
+                this.checkData(context, entity.srfkey)) {
                 throw new RuntimeError(`更新联合主键数据失败，已有主键为${entity.srfkey}的数据`);
             }
         }

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;IA4LH,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

@@ -103,6 +103,9 @@ export class TreeDataSetNodeData extends TreeNodeData {
                 nodeColumnKeyMap.set(columnKey, dataItemKey);
             }
         });
+        /** 预置属性映射 */
+        const presetItemMap = new Map();
+        presetItemMap.set('srfuf', 'srfuf');
         /**
          * 获取对应key最终映射的实体属性字段，undefined就是没有映射实体属性
          * @author lxm
@@ -123,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/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.6",
+  "version": "0.5.7-alpha.1",
   "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.6",
-    "@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": "87648011a5a449456d8cef6371579479c515ea0d"
+  "gitHead": "36ab25522342b07e88a7fc3eefcd0f1c8f938835"
 }

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/form/form-detail/form-item/form-item.controller.ts

@@ -17,11 +17,7 @@ import { getEditorProvider } from '../../../../../register';
 import { Srfuf } from '../../../../../service';
 import { filterValueRules } from '../../../../../utils';
 import { FormNotifyState } from '../../../../constant';
-import {
-  generateEditorRules,
-  generateRules,
-  getDefaultValue,
-} from '../../../../utils';
+import { generateEditorRules, generateRules } from '../../../../utils';
 
 export class FormItemController
   extends FormDetailController<IDEFormItem>
@@ -341,32 +337,6 @@ export class FormItemController
     });
   }
 
-  /**
-   * 设置默认值
-   *
-   * @author lxm
-   * @date 2022-09-15 22:09:52
-   * @param {boolean} isCreate 新建默认值还是更新默认值
-   */
-  setDefaultValue(isCreate: boolean, data: IData = this.data): void {
-    const { createDVT, createDV, updateDVT, updateDV } = this.model;
-    const valueType = isCreate ? createDVT : updateDVT;
-    const defaultValue = isCreate ? createDV : updateDV;
-
-    const defaultVal = getDefaultValue(
-      {
-        name: this.name,
-        valueType,
-        defaultValue,
-        valueFormat: this.model.valueFormat,
-      },
-      { data, context: this.context, params: this.params },
-    );
-    if (defaultVal !== undefined) {
-      data[this.name] = defaultVal;
-    }
-  }
-
   /**
    * 聚焦事件
    * @author lxm