@ibiz-template/runtime 0.2.1 → 0.2.4

package/out/service/app-data-entity/app-data-entity.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"app-data-entity.d.ts","sourceRoot":"","sources":["../../../src/service/app-data-entity/app-data-entity.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAGlD,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AAEpC,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAE9C;;;;;;;GAOG;AACH,qBAAa,aAAc,YAAW,WAAW;IAC/C,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,GAAG,CAAC;IAE5B,UAAkB,KAAK,EAAE,KAAK,CAAC;IAE/B,UAAkB,OAAO,EAAE,cAAc,CAAC;IAElC,OAAO,EAAE,MAAM,CAAC;IAEhB,aAAa,EAAE,MAAM,CAAC;IAEtB,UAAU,EAAE,MAAM,CAAC;IAEnB,YAAY,EAAE,MAAM,CAAC;IAErB,MAAM,EAAE,MAAM,CAAC;IAEf,YAAY,EAAE,MAAM,CAAC;IAErB,YAAY,EAAE,MAAM,CAAC;IAE7B,IAAI,KAAK,IAAI,KAAK,CAEjB;IAED;;;;;;;OAOG;gBACS,MAAM,EAAE,cAAc,EAAE,IAAI,EAAE,KAAK,GAAG,aAAa;IA6E/D;;;;;;OAMG;IACH,SAAS,CAAC,gBAAgB,IAAI,IAAI;IAgClC;;;;;;OAMG;IACH,KAAK,IAAI,aAAa;IAMtB;;;;;;;OAOG;IACH,MAAM,CAAC,IAAI,EAAE,KAAK,GAAG,aAAa,GAAG,aAAa;IASlD;;;;;;;;OAQG;IACH,SAAS,CAAC,UAAU,CAAC,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,GAAG,SAAS,GAAG,OAAO;CAyB5E"}
+{"version":3,"file":"app-data-entity.d.ts","sourceRoot":"","sources":["../../../src/service/app-data-entity/app-data-entity.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAIlD,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AAEpC,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAE9C;;;;;;;GAOG;AACH,qBAAa,aAAc,YAAW,WAAW;IAC/C,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,GAAG,CAAC;IAE5B,UAAkB,KAAK,EAAE,KAAK,CAAC;IAE/B,UAAkB,OAAO,EAAE,cAAc,CAAC;IAElC,OAAO,EAAE,MAAM,CAAC;IAEhB,aAAa,EAAE,MAAM,CAAC;IAEtB,WAAW,EAAE,MAAM,CAAC;IAEpB,aAAa,EAAE,MAAM,CAAC;IAEtB,MAAM,EAAE,MAAM,CAAC;IAEf,YAAY,EAAE,MAAM,CAAC;IAErB,UAAU,EAAE,MAAM,CAAC;IAE3B,IAAI,KAAK,IAAI,KAAK,CAEjB;IAED;;;;;;;OAOG;gBACS,MAAM,EAAE,cAAc,EAAE,IAAI,EAAE,KAAK,GAAG,aAAa;IAiF/D;;;;;;OAMG;IACH,SAAS,CAAC,gBAAgB,IAAI,IAAI;IAgClC;;;;;;OAMG;IACH,KAAK,IAAI,aAAa;IAMtB;;;;;;;OAOG;IACH,MAAM,CAAC,IAAI,EAAE,KAAK,GAAG,aAAa,GAAG,aAAa;IASlD;;;;;;;;OAQG;IACH,SAAS,CAAC,UAAU,CAAC,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,GAAG,SAAS,GAAG,OAAO;CAyB5E"}

package/out/service/app-data-entity/app-data-entity.js

@@ -1,5 +1,6 @@
 import { clone, isNil } from 'ramda';
 import { DataTypes } from '@ibiz-template/core';
+import { createUUID } from 'qx-util';
 import { Srfuf } from '../constant';
 import { findModelChild } from '../../model';
 /**
@@ -12,7 +13,7 @@ import { findModelChild } from '../../model';
  */
 export class AppDataEntity {
     get srfuf() {
-        return this.srfkey ? Srfuf.UPDATE : Srfuf.CREATE;
+        return this.srfkey === this.tempsrfkey ? Srfuf.UPDATE : Srfuf.CREATE;
     }
     /**
      * Creates an instance of AppDataEntity.
@@ -23,7 +24,6 @@ export class AppDataEntity {
      * @param {(IData | AppDataEntity)} data
      */
     constructor(entity, data) {
-        let _srfkey;
         Object.defineProperty(this, '_entity', {
             enumerable: false,
             configurable: true,
@@ -44,23 +44,16 @@ export class AppDataEntity {
                 return entity.codeName;
             },
         });
+        // 主键属性相关
         const keyAppField = findModelChild(entity.appDEFields || [], entity.keyAppDEFieldId);
         if (keyAppField) {
             const key = keyAppField.codeName.toLowerCase();
-            Object.defineProperty(this, 'srfkeyfile', {
+            Object.defineProperty(this, 'srfkeyfield', {
                 get() {
                     return key;
                 },
             });
             Object.defineProperty(this, 'srfkey', {
-                set(val) {
-                    _srfkey = val;
-                },
-                get() {
-                    return this._data[key] || _srfkey;
-                },
-            });
-            Object.defineProperty(this, 'srfsourcekey', {
                 set(val) {
                     this._data[key] = val;
                 },
@@ -73,9 +66,10 @@ export class AppDataEntity {
             ibiz.log.warn(`实体[${entity.codeName}]未配置主键字段`);
         }
         const majorAppField = findModelChild(entity.appDEFields || [], entity.majorAppDEFieldId);
+        // 主文本属性相关
         if (majorAppField) {
             const major = majorAppField.codeName.toLowerCase();
-            Object.defineProperty(this, 'srfmajorfile', {
+            Object.defineProperty(this, 'srfmajorfield', {
                 get() {
                     return major;
                 },
@@ -92,6 +86,13 @@ export class AppDataEntity {
         else {
             ibiz.log.warn(`实体[${entity.codeName}]未配置主文本字段`);
         }
+        // 设置临时主键
+        Object.defineProperty(this, 'tempsrfkey', {
+            enumerable: false,
+            configurable: true,
+            writable: true,
+            value: isNil(this.srfkey) ? createUUID() : this.srfkey,
+        });
         this.defineProperties();
     }
     /**

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

@@ -1 +1 @@
-{"version":3,"file":"control.service.d.ts","sourceRoot":"","sources":["../../../../src/service/service/control/control.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACpD,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAE5C,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAChD,OAAO,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AACnD,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAEnD,qBAAa,cAAc,CAAC,CAAC,SAAS,QAAQ,GAAG,QAAQ;IACvD,GAAG,EAAG,WAAW,CAAC;IAElB;;;;;;OAMG;IACH,QAAQ,CAAC,KAAK,EAAE,CAAC,CAAC;IAElB;;;;;;;OAOG;IACH,SAAS,0BAAiC;IAE1C;;;;;OAKG;gBACS,KAAK,EAAE,CAAC;IAIpB;;;;;;OAMG;IACG,IAAI,CAAC,OAAO,CAAC,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC;IAK7C;;;;;OAKG;IACH,SAAS,CAAC,aAAa,IAAI,IAAI;IAE/B;;;;;;;;;OASG;IACG,IAAI,CACR,UAAU,EAAE,MAAM,EAClB,OAAO,EAAE,OAAO,EAChB,IAAI,CAAC,EAAE,KAAK,EACZ,MAAM,CAAC,EAAE,OAAO,GACf,OAAO,CAAC,aAAa,CAAC;IAWzB;;;;;;;OAOG;IACH,cAAc,CAAC,GAAG,EAAE,aAAa,GAAG,aAAa;IAKjD;;;;;;;OAOG;IACH,QAAQ,CAAC,UAAU,EAAE,KAAK,GAAG,SAAS;CAGvC"}
+{"version":3,"file":"control.service.d.ts","sourceRoot":"","sources":["../../../../src/service/service/control/control.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAS,MAAM,qBAAqB,CAAC;AAC3D,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAC5C,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAChD,OAAO,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AACnD,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAEnD,qBAAa,cAAc,CAAC,CAAC,SAAS,QAAQ,GAAG,QAAQ;IACvD,GAAG,EAAG,WAAW,CAAC;IAElB;;;;;;OAMG;IACH,QAAQ,CAAC,KAAK,EAAE,CAAC,CAAC;IAElB;;;;;;;OAOG;IACH,SAAS,0BAAiC;IAE1C;;;;;OAKG;gBACS,KAAK,EAAE,CAAC;IAIpB;;;;;;OAMG;IACG,IAAI,CAAC,OAAO,CAAC,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC;IAK7C;;;;;OAKG;IACH,SAAS,CAAC,aAAa,IAAI,IAAI;IAE/B;;;;;;;;;OASG;IACG,IAAI,CACR,UAAU,EAAE,MAAM,EAClB,OAAO,EAAE,OAAO,EAChB,IAAI,CAAC,EAAE,KAAK,EACZ,MAAM,CAAC,EAAE,OAAO,GACf,OAAO,CAAC,aAAa,CAAC;IAWzB;;;;;;;OAOG;IACH,cAAc,CAAC,GAAG,EAAE,aAAa,GAAG,aAAa;IAKjD;;;;;;;OAOG;IACH,QAAQ,CAAC,UAAU,EAAE,KAAK,GAAG,SAAS;CAGvC"}

package/out/service/service/control/control.service.js

@@ -1,4 +1,4 @@
-import { clone } from 'ramda';
+import { clone } from '@ibiz-template/core';
 import { ControlVO } from '../../vo/control.vo';
 export class ControlService {
     /**

package/out/service/service/entity/de.service.d.ts

@@ -113,14 +113,26 @@ export declare class DEService implements IAppDEService {
      */
     aiChatSse(onmessage: (data: IPortalAsyncAction) => void, context: IParams, params?: IParams, data?: IData): Promise<void>;
     /**
-     * 计算请求路径
+     * 获取 AI 聊天会话历史记录
      *
      * @author chitanda
-     * @date 2023-10-12 11:10:56
+     * @date 2023-10-26 14:10:58
+     * @param {IParams} context
+     * @param {IParams} [params={}]
+     * @param {IData} [data={}]
+     * @return {*}  {Promise<IHttpResponse>}
+     */
+    aiChatHistory(context: IParams, params?: IParams, data?: IData): Promise<IHttpResponse>;
+    /**
+     * 计算 AI 请求路径
+     *
+     * @author chitanda
+     * @date 2023-10-26 14:10:25
      * @protected
      * @param {IParams} context
+     * @param {boolean} [isHistories=false]
      * @return {*}  {string}
      */
-    protected calcSsePath(context: IParams): string;
+    protected calcSsePath(context: IParams, isHistories?: boolean): string;
 }
 //# sourceMappingURL=de.service.d.ts.map

package/out/service/service/entity/de.service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"de.service.d.ts","sourceRoot":"","sources":["../../../../src/service/service/entity/de.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAgB,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAChE,OAAO,EACL,aAAa,EACb,kBAAkB,EAGnB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,OAAO,EAAe,MAAM,aAAa,CAAC;AACnD,OAAO,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAC;AACjE,OAAO,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AACzC,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAInD,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACnD,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAGzD;;;;;;;GAOG;AACH,qBAAa,SAAU,YAAW,aAAa;IAsDjC,SAAS,CAAC,KAAK,EAAE,cAAc;IArD3C;;;;;;OAMG;IACH,QAAQ,CAAC,WAAW,EAAE,aAAa,CAAC;IAEpC;;;;;;OAMG;IACH,QAAQ,CAAC,EAAE,EAAE,eAAe,CAAC;IAE7B;;;;;;OAMG;IACH,QAAQ,CAAC,IAAI,EAAE,WAAW,CAAC;IAE3B;;;;;;;OAOG;IACH,SAAS,CAAC,QAAQ,CAAC,SAAS,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAa;IAE9D;;;;;;OAMG;IACH,QAAQ,CAAC,KAAK,EAAE,OAAO,CAAiB;IAExC;;;;;;OAMG;gBACmB,KAAK,EAAE,cAAc;IAU3C;;;;;;;;;OASG;IACH,SAAS,CAAC,SAAS,CAAC,EAAE,EAAE,MAAM,EAAE,MAAM,GAAE,OAAe,GAAG,MAAM;IA6BhE;;;;;;;;;;OAUG;IACH,IAAI,CACF,EAAE,EAAE,MAAM,EACV,OAAO,EAAE,OAAO,EAChB,MAAM,CAAC,EAAE,KAAK,GAAG,KAAK,EAAE,EACxB,OAAO,CAAC,EAAE,OAAO,GAChB,OAAO,CAAC,aAAa,CAAC;IAQzB;;;;;;;;;;OAUG;IACH,MAAM,CACJ,EAAE,EAAE,MAAM,EACV,OAAO,EAAE,OAAO,EAChB,MAAM,CAAC,EAAE,KAAK,GAAG,KAAK,EAAE,EACxB,OAAO,GAAE,OAAY,GACpB,OAAO,CAAC,aAAa,CAAC;IAQzB;;;;;;;;;;OAUG;IACH,SAAS,CACP,SAAS,EAAE,CAAC,IAAI,EAAE,kBAAkB,KAAK,IAAI,EAC7C,OAAO,EAAE,OAAO,EAChB,MAAM,GAAE,OAAY,EACpB,IAAI,GAAE,KAAU,GACf,OAAO,CAAC,IAAI,CAAC;IA6BhB;;;;;;;;OAQG;IACH,SAAS,CAAC,WAAW,CAAC,OAAO,EAAE,OAAO,GAAG,MAAM;CAQhD"}
+{"version":3,"file":"de.service.d.ts","sourceRoot":"","sources":["../../../../src/service/service/entity/de.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAgB,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAChE,OAAO,EACL,aAAa,EACb,kBAAkB,EAGnB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,OAAO,EAAe,MAAM,aAAa,CAAC;AACnD,OAAO,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAC;AACjE,OAAO,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AACzC,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAInD,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACnD,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAGzD;;;;;;;GAOG;AACH,qBAAa,SAAU,YAAW,aAAa;IAsDjC,SAAS,CAAC,KAAK,EAAE,cAAc;IArD3C;;;;;;OAMG;IACH,QAAQ,CAAC,WAAW,EAAE,aAAa,CAAC;IAEpC;;;;;;OAMG;IACH,QAAQ,CAAC,EAAE,EAAE,eAAe,CAAC;IAE7B;;;;;;OAMG;IACH,QAAQ,CAAC,IAAI,EAAE,WAAW,CAAC;IAE3B;;;;;;;OAOG;IACH,SAAS,CAAC,QAAQ,CAAC,SAAS,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAa;IAE9D;;;;;;OAMG;IACH,QAAQ,CAAC,KAAK,EAAE,OAAO,CAAiB;IAExC;;;;;;OAMG;gBACmB,KAAK,EAAE,cAAc;IAU3C;;;;;;;;;OASG;IACH,SAAS,CAAC,SAAS,CAAC,EAAE,EAAE,MAAM,EAAE,MAAM,GAAE,OAAe,GAAG,MAAM;IA6BhE;;;;;;;;;;OAUG;IACH,IAAI,CACF,EAAE,EAAE,MAAM,EACV,OAAO,EAAE,OAAO,EAChB,MAAM,CAAC,EAAE,KAAK,GAAG,KAAK,EAAE,EACxB,OAAO,CAAC,EAAE,OAAO,GAChB,OAAO,CAAC,aAAa,CAAC;IAQzB;;;;;;;;;;OAUG;IACH,MAAM,CACJ,EAAE,EAAE,MAAM,EACV,OAAO,EAAE,OAAO,EAChB,MAAM,CAAC,EAAE,KAAK,GAAG,KAAK,EAAE,EACxB,OAAO,GAAE,OAAY,GACpB,OAAO,CAAC,aAAa,CAAC;IAQzB;;;;;;;;;;OAUG;IACH,SAAS,CACP,SAAS,EAAE,CAAC,IAAI,EAAE,kBAAkB,KAAK,IAAI,EAC7C,OAAO,EAAE,OAAO,EAChB,MAAM,GAAE,OAAY,EACpB,IAAI,GAAE,KAAU,GACf,OAAO,CAAC,IAAI,CAAC;IA6BhB;;;;;;;;;OASG;IACH,aAAa,CACX,OAAO,EAAE,OAAO,EAChB,MAAM,GAAE,OAAY,EACpB,IAAI,GAAE,KAAU,GACf,OAAO,CAAC,aAAa,CAAC;IAMzB;;;;;;;;;OASG;IACH,SAAS,CAAC,WAAW,CACnB,OAAO,EAAE,OAAO,EAChB,WAAW,GAAE,OAAe,GAC3B,MAAM;CAQV"}

package/out/service/service/entity/de.service.js

@@ -154,17 +154,33 @@ export class DEService {
         });
     }
     /**
-     * 计算请求路径
+     * 获取 AI 聊天会话历史记录
      *
      * @author chitanda
-     * @date 2023-10-12 11:10:56
+     * @date 2023-10-26 14:10:58
+     * @param {IParams} context
+     * @param {IParams} [params={}]
+     * @param {IData} [data={}]
+     * @return {*}  {Promise<IHttpResponse>}
+     */
+    aiChatHistory(context, params = {}, data = {}) {
+        const app = ibiz.hub.getApp(this.model.appId);
+        const path = this.calcSsePath(context, true);
+        return app.net.post(path, data, Object.assign({ srfactag: 'AIChat' }, params));
+    }
+    /**
+     * 计算 AI 请求路径
+     *
+     * @author chitanda
+     * @date 2023-10-26 14:10:25
      * @protected
      * @param {IParams} context
+     * @param {boolean} [isHistories=false]
      * @return {*}  {string}
      */
-    calcSsePath(context) {
+    calcSsePath(context, isHistories = false) {
         const srfkey = context[this.model.codeName.toLowerCase()];
-        const curPath = `/${this.model.codeName2.toLowerCase()}/ssechatcompletion${srfkey ? `/${srfkey}` : ''}`;
+        const curPath = `/${this.model.codeName2.toLowerCase()}/ssechatcompletion${isHistories ? '/histories' : ''}${srfkey ? `/${srfkey}` : ''}`;
         const resPath = calcResPath(context, this.model);
         return resPath + curPath;
     }

package/out/service/vo/control.vo.d.ts

@@ -43,7 +43,15 @@ export declare class ControlVO {
      * @date 2022-09-07 19:09:42
      * @type {string}
      */
-    srfkey: string;
+    srfkey?: string;
+    /**
+     * 临时主键
+     *
+     * @author lxm
+     * @date 2022-09-07 19:09:42
+     * @type {string}
+     */
+    tempsrfkey: string;
     /**
      * 主信息
      *
@@ -51,7 +59,7 @@ export declare class ControlVO {
      * @date 2022-09-07 19:09:42
      * @type {string}
      */
-    srfmajortext: string;
+    srfmajortext?: string;
     /**
      * 实体模型标识
      *
@@ -75,7 +83,7 @@ export declare class ControlVO {
      * @date 2022-09-07 19:09:42
      * @type {string}
      */
-    srfkeyfile: string;
+    srfkeyfield: string;
     /**
      * 实体主信息属性
      *
@@ -83,7 +91,7 @@ export declare class ControlVO {
      * @date 2022-09-07 19:09:42
      * @type {string}
      */
-    srfmajorfile: string;
+    srfmajorfield: string;
     /**
      * Creates an instance of ControlVO.
      * @author lxm

package/out/service/vo/control.vo.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"control.vo.d.ts","sourceRoot":"","sources":["../../../src/service/vo/control.vo.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AACpC,OAAO,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAE5C;;;;;;;GAOG;AACH,qBAAa,SAAS;IAEpB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,GAAG,CAAC;IAE5B;;;;;;;OAOG;IACK,OAAO,EAAE,KAAK,CAAC;IAEvB;;;;;;;OAOG;IACK,UAAU,EAAE,GAAG,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;IAE5C;;;;;;OAMG;IACK,KAAK,EAAE,KAAK,CAAC;IAErB;;;;;;OAMG;IACK,MAAM,EAAE,MAAM,CAAC;IAEvB;;;;;;OAMG;IACK,YAAY,EAAE,MAAM,CAAC;IAE7B;;;;;;OAMG;IACK,OAAO,EAAE,MAAM,CAAC;IAExB;;;;;;OAMG;IACK,aAAa,EAAE,MAAM,CAAC;IAE9B;;;;;;OAMG;IACK,UAAU,EAAE,MAAM,CAAC;IAE3B;;;;;;OAMG;IACK,YAAY,EAAE,MAAM,CAAC;IAE7B;;;;;;OAMG;gBAED,OAAO,GAAE,KAAU,EACnB,UAAU,GAAE,GAAG,CAAC,MAAM,EAAE,UAAU,CAAa;IAyFjD;;;;;;;;;;;OAWG;IACH,OAAO,CAAC,YAAY;IAwCpB;;;;;;OAMG;IACH,SAAS,IAAI,KAAK;IAIlB;;;;;;OAMG;IACH,SAAS,CAAC,IAAI,EAAE,KAAK,GAAG,SAAS,GAAG,IAAI;IAIxC;;;;;;OAMG;IACH,KAAK,IAAI,SAAS;CAQnB"}
+{"version":3,"file":"control.vo.d.ts","sourceRoot":"","sources":["../../../src/service/vo/control.vo.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AACpC,OAAO,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAa5C;;;;;;;GAOG;AACH,qBAAa,SAAS;IAEpB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,GAAG,CAAC;IAE5B;;;;;;;OAOG;IACK,OAAO,EAAE,KAAK,CAAC;IAEvB;;;;;;;OAOG;IACK,UAAU,EAAE,GAAG,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;IAE5C;;;;;;OAMG;IACK,KAAK,EAAE,KAAK,CAAC;IAErB;;;;;;OAMG;IACK,MAAM,CAAC,EAAE,MAAM,CAAC;IAExB;;;;;;OAMG;IACK,UAAU,EAAE,MAAM,CAAC;IAE3B;;;;;;OAMG;IACK,YAAY,CAAC,EAAE,MAAM,CAAC;IAE9B;;;;;;OAMG;IACK,OAAO,EAAE,MAAM,CAAC;IAExB;;;;;;OAMG;IACK,aAAa,EAAE,MAAM,CAAC;IAE9B;;;;;;OAMG;IACK,WAAW,EAAE,MAAM,CAAC;IAE5B;;;;;;OAMG;IACK,aAAa,EAAE,MAAM,CAAC;IAE9B;;;;;;OAMG;gBAED,OAAO,GAAE,KAAU,EACnB,UAAU,GAAE,GAAG,CAAC,MAAM,EAAE,UAAU,CAAa;IAkHjD;;;;;;;;;;;OAWG;IACH,OAAO,CAAC,YAAY;IAqCpB;;;;;;OAMG;IACH,SAAS,IAAI,KAAK;IAIlB;;;;;;OAMG;IACH,SAAS,CAAC,IAAI,EAAE,KAAK,GAAG,SAAS,GAAG,IAAI;IAIxC;;;;;;OAMG;IACH,KAAK,IAAI,SAAS;CAQnB"}

package/out/service/vo/control.vo.js

@@ -1,5 +1,16 @@
+import { createUUID } from 'qx-util';
 import { clone, isNil } from 'ramda';
 import { Srfuf } from '../constant';
+const BuildInKeys = [
+    'srfkey',
+    'srfmajortext',
+    'srfmajorfield',
+    'srfkeyfield',
+    'tempsrfkey',
+    'srfuf',
+    'srfdeid',
+    'srfdecodename',
+];
 /**
  * 部件UI显示层数据转换
  *
@@ -17,6 +28,7 @@ export class ControlVO {
      * @param {Map<string, string>} dataUIMap 转换映射map，key为转换后的属性，value为映射字段描述信息
      */
     constructor($origin = {}, $dataUIMap = new Map()) {
+        // 自身的属性
         Object.defineProperty(this, '$origin', {
             enumerable: false,
             configurable: true,
@@ -27,57 +39,85 @@ export class ControlVO {
             configurable: true,
             value: $dataUIMap || new Map(),
         });
+        // 可读写的预置属性,主键属性和主文本属性
+        ['srfkey', 'srfmajortext'].forEach(key => {
+            if (Object.prototype.hasOwnProperty.call(this.$origin, key)) {
+                Object.defineProperty(this, key, {
+                    get() {
+                        return this.$origin.srfkey;
+                    },
+                    set(val) {
+                        this.$origin.srfkey = val;
+                    },
+                    enumerable: false,
+                    configurable: true,
+                });
+            }
+            else if (this.$dataUIMap.has(key)) {
+                const { dataKey } = this.$dataUIMap.get(key);
+                Object.defineProperty(this, key, {
+                    get() {
+                        return this.$origin[dataKey];
+                    },
+                    set(val) {
+                        this.$origin[dataKey] = val;
+                    },
+                    enumerable: false,
+                    configurable: true,
+                });
+            }
+            else {
+                Object.defineProperty(this, key, {
+                    enumerable: false,
+                    configurable: true,
+                    writable: true,
+                    value: null,
+                });
+            }
+        });
+        // tempsrfkey临时主键
+        if (Object.prototype.hasOwnProperty.call(this.$origin, 'tempsrfkey')) {
+            // $origin有的操作$origin的属性
+            Object.defineProperty(this, 'tempsrfkey', {
+                get() {
+                    return this.$origin.tempsrfkey;
+                },
+                set(val) {
+                    this.$origin.tempsrfkey = val;
+                },
+                enumerable: false,
+                configurable: true,
+            });
+        }
+        else {
+            // $$origin没有的自己赋值
+            Object.defineProperty(this, 'tempsrfkey', {
+                enumerable: false,
+                configurable: true,
+                writable: true,
+                value: isNil(this.srfkey) ? createUUID() : this.srfkey,
+            });
+        }
+        // srfuf纯计算属性，不可修改
         Object.defineProperty(this, 'srfuf', {
             get() {
-                if (isNil(this.$origin.srfuf)) {
-                    return this.srfkey ? Srfuf.UPDATE : Srfuf.CREATE;
+                if (Object.prototype.hasOwnProperty.call(this.$origin, 'srfuf')) {
+                    return this.$origin.srfuf;
                 }
-                return this.$origin.srfuf;
-            },
-            enumerable: false,
-            configurable: true,
-        });
-        Object.defineProperty(this, 'srfkey', {
-            get() {
-                return this.$origin.srfkey;
+                return this.srfkey === this.tempsrfkey ? Srfuf.UPDATE : Srfuf.CREATE;
             },
             enumerable: false,
             configurable: true,
         });
-        Object.defineProperty(this, 'srfmajortext', {
-            get() {
-                return this.$origin.srfmajortext;
-            },
-            enumerable: false,
-            configurable: true,
-        });
-        Object.defineProperty(this, 'srfdeid', {
-            get() {
-                return this.$origin.srfdeid;
-            },
-            enumerable: false,
-            configurable: true,
-        });
-        Object.defineProperty(this, 'srfdecodename', {
-            get() {
-                return this.$origin.srfdecodename;
-            },
-            enumerable: false,
-            configurable: true,
-        });
-        Object.defineProperty(this, 'srfkeyfile', {
-            get() {
-                return this.$origin.srfkeyfile;
-            },
-            enumerable: false,
-            configurable: true,
-        });
-        Object.defineProperty(this, 'srfmajorfile', {
-            get() {
-                return this.$origin.srfmajorfile;
-            },
-            enumerable: false,
-            configurable: true,
+        // 只读的预置属性
+        ['srfdeid', 'srfdecodename', 'srfkeyfield', 'srfmajorfield'].forEach(key => {
+            Object.defineProperty(this, key, {
+                get() {
+                    return this.$origin[key];
+                },
+                enumerable: false,
+                configurable: true,
+            });
         });
         // 先转换映射的属性
         this.$dataUIMap.forEach((mapField, key) => {
@@ -107,8 +147,8 @@ export class ControlVO {
      */
     linkProperty(uiKey, dataKey, mapField) {
         const isOriginField = mapField ? mapField.isOriginField : true;
-        // srfuf和srfkey不做处理
-        if (uiKey === 'srfuf') {
+        //  预置的属性不做处理
+        if (BuildInKeys.includes(uiKey)) {
             return;
         }
         // 后台数据存在$origin里，其他存在ControlVo上
@@ -118,10 +158,7 @@ export class ControlVO {
                 enumerable: true,
                 configurable: true,
                 get() {
-                    // srfkey 视图id优先，拿不到实体属性则拿界面属性(前端id)
-                    return uiKey === 'srfkey'
-                        ? this.$origin[dataKey] || this.$origin[uiKey]
-                        : this.$origin[dataKey];
+                    return this.$origin[dataKey];
                 },
                 set(val) {
                     // 有mapField的走它的转换

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ibiz-template/runtime",
-  "version": "0.2.1",
+  "version": "0.2.4",
   "description": "控制器包",
   "type": "module",
   "main": "out/index.js",
@@ -29,7 +29,7 @@
   "author": "chitanda",
   "license": "MIT",
   "devDependencies": {
-    "@ibiz-template/core": "^0.2.0",
+    "@ibiz-template/core": "^0.2.4",
     "@ibiz/model-core": "^0.0.19",
     "@types/path-browserify": "^1.0.0",
     "@types/qs": "^6.9.8",
@@ -59,5 +59,5 @@
     "qx-util": "^0.4.8",
     "ramda": "^0.29.0"
   },
-  "gitHead": "a065b45d8a31003cad44151fc9663c41deb310ab"
+  "gitHead": "6aac74058a5bb708860cb9d40afe5640e53662e4"
 }

package/src/controller/common/base.controller.ts

@@ -126,12 +126,12 @@ export class BaseController<
     // 登记自身
     this.mountCounter.enroll(SELF_KEY);
     await this.onCreated();
-    this.state.isCreated = true;
     this.force(() => {
       this.mountSelf();
     });
+    await this._evt.emit('onCreated', undefined);
+    this.state.isCreated = true;
     ibiz.log.debug(`${this.constructor.name}:${this.name} onCreated`);
-    this._evt.emit('onCreated', undefined);
   }
 
   /**
@@ -178,9 +178,9 @@ export class BaseController<
    */
   protected async mounted(): Promise<void> {
     await this.onMounted();
+    await this._evt.emit('onMounted', undefined);
     this.state.isMounted = true;
     ibiz.log.debug(`${this.constructor.name}:${this.name} onMounted`);
-    this._evt.emit('onMounted', undefined);
   }
 
   /**
@@ -200,9 +200,9 @@ export class BaseController<
    */
   async destroyed(): Promise<void> {
     await this.onDestroyed();
+    await this._evt.emit('onDestroyed', undefined);
     this.state.isDestroyed = true;
     ibiz.log.debug(`${this.constructor.name}:${this.name} onDestroyed`);
-    await this._evt.emit('onDestroyed', undefined);
     this.evt.destroy();
   }
 

package/src/controller/common/control/control.controller.ts

@@ -145,6 +145,17 @@ export class ControlController<
     this.handleControlParams();
     // 部件逻辑初始化
     this.initControlScheduler(this.model.controlLogics);
+
+    // 监听部件所有事件触发部件逻辑
+    if (this.scheduler?.hasControlEventTrigger) {
+      this._evt.onAll((eventName, event) => {
+        this.scheduler!.triggerControlEvent(
+          event.targetName,
+          event.eventName,
+          event,
+        );
+      });
+    }
   }
 
   protected async onMounted(): Promise<void> {

package/src/controller/common/view/view.controller.ts

@@ -177,6 +177,8 @@ export class ViewController<
         const ins = ibiz.engine.getEngine(engine, this);
         if (ins) {
           this.engines.push(ins);
+        } else {
+          ibiz.log.warn(`未找到视图引擎实现：`, engine);
         }
       });
     } else {

package/src/controller/control/form/edit-form/edit-form.controller.ts

@@ -7,6 +7,7 @@ import {
 } from '@ibiz-template/core';
 import { IAppDEEditView, IDEEditForm } from '@ibiz/model-core';
 import { debounce } from 'lodash-es';
+import { createUUID } from 'qx-util';
 import { clone } from 'ramda';
 import {
   IEditFormState,
@@ -160,7 +161,9 @@ export class EditFormController
       await this.endLoading();
     }
 
-    res.data.$origin.srfsourcekey = undefined;
+    // 清空主键，重置临时主键
+    res.data.srfkey = undefined;
+    res.data.tempsrfkey = createUUID();
 
     this.state.modified = false;
     this.state.data = res.data;
@@ -260,9 +263,11 @@ export class EditFormController
     } finally {
       await this.endLoading();
     }
-    // 保存结束后的事件
+
+    // 保存结束后合并修改临时主键
     if (res.data) {
       mergeInLeft(this.data, res.data);
+      this.data.tempsrfkey = this.data.srfkey;
     }
     this.state.modified = false;
     await this.evt.emit('onSaveSuccess', undefined);

package/src/controller/control/form/form/form.controller.ts

@@ -1,6 +1,6 @@
 /* eslint-disable no-param-reassign */
-import { debounceAndAsyncMerge } from '@ibiz-template/core';
-import { IDEForm, IDEFormDetail } from '@ibiz/model-core';
+import { debounceAndAsyncMerge, recursiveIterate } from '@ibiz-template/core';
+import { IControlLogic, IDEForm, IDEFormDetail } from '@ibiz/model-core';
 import {
   IFormState,
   IFormEvent,
@@ -272,4 +272,28 @@ export abstract class FormController<
   ): void {
     super.actionNotification(tag, { data: this.data, ...(opts || {}) });
   }
+
+  /**
+   * 初始化部件逻辑调度器
+   * @author lxm
+   * @date 2023-08-21 11:53:37
+   * @param {IControlLogic[]} logics
+   * @return {*}  {void}
+   */
+  protected initControlScheduler(logics: IControlLogic[] = []): void {
+    const actualLogics = [...logics];
+    // 遍历所有的项，如果有逻辑的话加入
+    recursiveIterate(
+      this.model,
+      (item: IDEFormDetail) => {
+        if (item.controlLogics) {
+          actualLogics.push(...item.controlLogics);
+        }
+      },
+      {
+        childrenFields: ['deformPages', 'deformTabPages', 'deformDetails'],
+      },
+    );
+    super.initControlScheduler(actualLogics);
+  }
 }