@ibiz-template/runtime 0.2.1 → 0.2.4

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

@@ -155,6 +155,11 @@ export class FormDetailController<T extends IDEFormDetail = IDEFormDetail>
     // 计算动态控制逻辑
     this.calcDynamicLogic(names);
 
+    // 计算显示，禁用，必填状态
+    this.calcDetailDisabled(this.data);
+    this.calcDetailVisible(this.data);
+    this.calcDetailRequired(this.data);
+
     // 计算动态样式表
     this.calcDynaClass(this.data);
   }
@@ -165,9 +170,14 @@ export class FormDetailController<T extends IDEFormDetail = IDEFormDetail>
    * @author lxm
    * @date 2022-09-20 18:09:07
    */
-  async formStateNotify(state: FormNotifyState): Promise<void> {
+  async formStateNotify(_state: FormNotifyState): Promise<void> {
     // 计算动态控制逻辑
-    this.calcDynamicLogic([], state);
+    this.calcDynamicLogic([], true);
+
+    // 计算显示，禁用，必填状态
+    this.calcDetailDisabled(this.data);
+    this.calcDetailVisible(this.data);
+    this.calcDetailRequired(this.data);
 
     // 计算动态样式表
     this.calcDynaClass(this.data);
@@ -180,10 +190,10 @@ export class FormDetailController<T extends IDEFormDetail = IDEFormDetail>
    * @date 2022-09-20 19:09:20
    * @protected
    * @param {string[]} names 变更的属性集合
-   * @param {FormNotifyState} [state] 表单通知状态
+   * @param {boolean} [mustCalc=false] 是否强制计算一遍动态逻辑
    * @returns {*}  {void}
    */
-  protected calcDynamicLogic(names: string[], state?: FormNotifyState): void {
+  protected calcDynamicLogic(names: string[], mustCalc: boolean = false): void {
     // 逻辑优化，当父容器存在且为不显示时，不去计算自己的动态逻辑
     if (this.parent && !this.parent.state.visible) {
       return;
@@ -193,21 +203,21 @@ export class FormDetailController<T extends IDEFormDetail = IDEFormDetail>
     this.model.defdgroupLogics?.forEach(logic => {
       const relatedNames = logic.relatedDetailNames || [];
       // name是动态逻辑涉及到的时或state存在时
-      if (state || isOverlap(relatedNames, names)) {
+      if (mustCalc || isOverlap(relatedNames, names)) {
         try {
           const ok = verifyFormGroupLogic(this.form.data, logic);
           switch (logic.logicCat) {
             // 动态空输入，不满足则必填
             case 'ITEMBLANK':
-              this.state.required = !ok;
+              this.dynaLogicResult.required = !ok;
               break;
             // 动态启用，满足则启用
             case 'ITEMENABLE':
-              this.state.disabled = !ok;
+              this.dynaLogicResult.disabled = !ok;
               break;
             // 动态显示，满足则显示
             case 'PANELVISIBLE':
-              this.state.visible = ok;
+              this.dynaLogicResult.visible = ok;
               break;
             default:
           }
@@ -250,4 +260,88 @@ export class FormDetailController<T extends IDEFormDetail = IDEFormDetail>
       }
     }
   }
+
+  /**
+   * 计算项的禁用状态
+   *
+   * @param {IData} data
+   */
+  calcDetailDisabled(data: IData): void {
+    let enable = !this.dynaLogicResult.disabled;
+
+    // 上层计算为启用时计算预定义项启用逻辑
+    if (enable && this.form.scheduler) {
+      const itemEnable = this.form.scheduler.triggerItemEnable(this.model.id!, {
+        data: [data],
+      });
+      if (itemEnable !== undefined) {
+        enable = itemEnable;
+      }
+    }
+
+    // 修改state
+    this.state.disabled = !enable;
+  }
+
+  /**
+   * 计算项的显示状态
+   *
+   * @param {IData} data
+   */
+  calcDetailVisible(data: IData): void {
+    let { visible } = this.dynaLogicResult;
+
+    // 上层计算为显示时计算预定义项显示逻辑
+    if (visible && this.form.scheduler) {
+      const itemVIsible = this.form.scheduler.triggerItemVisible(
+        this.model.id!,
+        {
+          data: [data],
+        },
+      );
+      if (itemVIsible !== undefined) {
+        visible = itemVIsible;
+      }
+    }
+
+    // 修改state
+    this.state.visible = visible;
+  }
+
+  /**
+   * 计算项的必填状态
+   *
+   * @param {IData} data
+   */
+  calcDetailRequired(data: IData): void {
+    let allowEmpty = !this.dynaLogicResult.required;
+
+    // 上层计算为启用时计算预定义项空输入逻辑
+    if (allowEmpty && this.form.scheduler) {
+      const itemAllowEmpty = this.form.scheduler.triggerItemBlank(
+        this.model.id!,
+        {
+          data: [data],
+        },
+      );
+      if (itemAllowEmpty !== undefined) {
+        allowEmpty = itemAllowEmpty;
+      }
+    }
+
+    // 修改state
+    this.state.required = !allowEmpty;
+  }
+
+  /**
+   * 动态逻辑结果
+   * @author lxm
+   * @date 2023-09-21 03:36:37
+   * @protected
+   */
+  protected dynaLogicResult = {
+    visible: true,
+    disabled: false,
+    required: false,
+  };
 }

package/src/controller/control/form/form-detail/form-group-panel/form-group-panel.controller.ts

@@ -57,8 +57,8 @@ export class FormGroupPanelController<
     await this.initActionStates();
   }
 
-  async formStateNotify(state: FormNotifyState): Promise<void> {
-    super.calcDynamicLogic([], state);
+  async formStateNotify(_state: FormNotifyState): Promise<void> {
+    super.calcDynamicLogic([], true);
     // 只在加载后台数据之后，更新界面行为组状态
     if (this.state.actionGroupState) {
       this.state.actionGroupState.update(this.form.data.getOrigin());

package/src/controller/control/form/form-detail/form-item/form-item.controller.ts

@@ -292,10 +292,10 @@ export class FormItemController
     }
   }
 
-  protected calcDynamicLogic(names: string[], state?: FormNotifyState): void {
+  protected calcDynamicLogic(names: string[], mustCalc: boolean = false): void {
     // 隐藏表单项不计算动态逻辑
     if (!this.model.hidden) {
-      super.calcDynamicLogic(names, state);
+      super.calcDynamicLogic(names, mustCalc);
     }
   }
 

package/src/interface/service/i-data-entity/i-data-entity.ts

@@ -1,3 +1,5 @@
+import { Srfuf } from '../../../service';
+
 /**
  * 应用数据实体接口
  *
@@ -35,7 +37,7 @@ export interface IDataEntity {
    * @date 2023-05-16 17:05:23
    * @type {string}
    */
-  srfkeyfile: string;
+  srfkeyfield: string;
 
   /**
    * 实体主文本属性
@@ -44,7 +46,7 @@ export interface IDataEntity {
    * @date 2023-05-16 17:05:30
    * @type {string}
    */
-  srfmajorfile: string;
+  srfmajorfield: string;
 
   /**
    * 实体主键值
@@ -55,6 +57,15 @@ export interface IDataEntity {
    */
   srfkey: string;
 
+  /**
+   * 临时实体主键值
+   *
+   * @author chitanda
+   * @date 2023-05-16 17:05:42
+   * @type {string}
+   */
+  tempsrfkey: string;
+
   /**
    * 实体主文本值
    *
@@ -64,6 +75,15 @@ export interface IDataEntity {
    */
   srfmajortext: string;
 
+  /**
+   * 是否是新建数据，0为新建
+   *
+   * @author lxm
+   * @date 2022-09-06 22:09:24
+   * @type {Srfuf}
+   */
+  srfuf: Srfuf;
+
   /**
    * 提供当前数据克隆操作，返回克隆后的当前实例
    *

package/src/interface/service/service/i-app-de.service.ts

@@ -102,4 +102,20 @@ export interface IAppDEService {
     params?: IParams,
     data?: IData,
   ): Promise<void>;
+
+  /**
+   * 获取 AI 聊天会话历史记录
+   *
+   * @author chitanda
+   * @date 2023-10-26 14:10:40
+   * @param {IParams} context
+   * @param {IParams} [params]
+   * @param {IData} [data]
+   * @return {*}  {Promise<IHttpResponse>}
+   */
+  aiChatHistory(
+    context: IParams,
+    params?: IParams,
+    data?: IData,
+  ): Promise<IHttpResponse>;
 }

package/src/logic-scheduler/scheduler/control-logic-scheduler.ts

@@ -17,9 +17,9 @@ export class ControlLogicScheduler extends LogicScheduler {
       item => item.triggerType !== 'APPVIEWENGINE',
     );
     filterLogics.forEach(logic => {
-      // 部件事件的部件名称在itemName上，统一写到ctrlName,与视图逻辑保持一致。
+      // 部件事件的部件名称在itemName上，当itemName没有时说明是部件自身触发此时名称在logicTag上，统一写到ctrlName,与视图逻辑保持一致。
       if (logic.triggerType === 'CTRLEVENT') {
-        (logic as IData).ctrlName = logic.itemName;
+        (logic as IData).ctrlName = logic.itemName || logic.logicTag;
       }
     });
     super(filterLogics as ISchedulerLogic[]);

package/src/logic-scheduler/trigger/timer-trigger.ts

@@ -1,4 +1,4 @@
-import { RuntimeError } from '@ibiz-template/core';
+import { RuntimeError, RuntimeModelError } from '@ibiz-template/core';
 import { LogicTrigger } from './logic-trigger';
 
 /**
@@ -15,6 +15,9 @@ export class TimerTrigger extends LogicTrigger {
   protected timer: number | null = null;
 
   start(): void {
+    if (!this.logic.timer) {
+      throw new RuntimeModelError(this.logic, '定时器缺少定时间隔');
+    }
     this.timer = setInterval(() => {
       if (!this.scheduler.defaultParamsCb) {
         throw new RuntimeError('定时器缺少默认参数回调');

package/src/model/view/view.ts

@@ -53,5 +53,13 @@ export function getViewEngines(view: IAppView): IAppViewEngine[] {
   if (viewLayoutPanel) {
     appViewEngines.push(...(viewLayoutPanel.appViewEngines || []));
   }
-  return appViewEngines;
+  return appViewEngines.filter(engine => {
+    switch (engine.engineCat) {
+      case 'CTRL':
+        ibiz.log.warn(`未支持的引擎分类：${engine.engineType}`);
+        return false;
+      default:
+        return true;
+    }
+  });
 }

package/src/service/app-data-entity/app-data-entity.ts

@@ -4,6 +4,7 @@
 import { IAppDataEntity } from '@ibiz/model-core';
 import { clone, isNil } from 'ramda';
 import { DataTypes } from '@ibiz-template/core';
+import { createUUID } from 'qx-util';
 import { Srfuf } from '../constant';
 import { findModelChild } from '../../model';
 import { IDataEntity } from '../../interface';
@@ -27,18 +28,18 @@ export class AppDataEntity implements IDataEntity {
 
   declare srfdecodename: string;
 
-  declare srfkeyfile: string;
+  declare srfkeyfield: string;
 
-  declare srfmajorfile: string;
+  declare srfmajorfield: string;
 
   declare srfkey: string;
 
-  declare srfsourcekey: string;
-
   declare srfmajortext: string;
 
+  declare tempsrfkey: string;
+
   get srfuf(): Srfuf {
-    return this.srfkey ? Srfuf.UPDATE : Srfuf.CREATE;
+    return this.srfkey === this.tempsrfkey ? Srfuf.UPDATE : Srfuf.CREATE;
   }
 
   /**
@@ -50,7 +51,6 @@ export class AppDataEntity implements IDataEntity {
    * @param {(IData | AppDataEntity)} data
    */
   constructor(entity: IAppDataEntity, data: IData | AppDataEntity) {
-    let _srfkey: unknown;
     Object.defineProperty(this, '_entity', {
       enumerable: false,
       configurable: true,
@@ -71,26 +71,20 @@ export class AppDataEntity implements IDataEntity {
         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: unknown) {
-          _srfkey = val;
-        },
-        get() {
-          return this._data[key] || _srfkey;
-        },
-      });
-      Object.defineProperty(this, 'srfsourcekey', {
         set(val: unknown) {
           this._data[key] = val;
         },
@@ -105,9 +99,11 @@ export class AppDataEntity implements IDataEntity {
       entity.appDEFields || [],
       entity.majorAppDEFieldId!,
     );
+
+    // 主文本属性相关
     if (majorAppField) {
       const major = majorAppField.codeName!.toLowerCase();
-      Object.defineProperty(this, 'srfmajorfile', {
+      Object.defineProperty(this, 'srfmajorfield', {
         get() {
           return major;
         },
@@ -123,6 +119,15 @@ export class AppDataEntity implements IDataEntity {
     } 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/src/service/service/control/control.service.ts

@@ -1,6 +1,5 @@
-import { IHttpResponse } from '@ibiz-template/core';
+import { IHttpResponse, clone } from '@ibiz-template/core';
 import { IControl } from '@ibiz/model-core';
-import { clone } from 'ramda';
 import { ControlVO } from '../../vo/control.vo';
 import { UIMapField } from '../../vo/ui-map-field';
 import { Application } from '../../../application';

package/src/service/service/entity/de.service.ts

@@ -221,19 +221,43 @@ export class DEService implements IAppDEService {
   }
 
   /**
-   * 计算请求路径
+   * 获取 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> {
+    const app = ibiz.hub.getApp(this.model.appId);
+    const path = this.calcSsePath(context, true);
+    return app.net.post(path, data, { srfactag: 'AIChat', ...params });
+  }
+
+  /**
+   * 计算 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 = false,
+  ): string {
     const srfkey = context[this.model.codeName!.toLowerCase()];
     const curPath = `/${this.model.codeName2!.toLowerCase()}/ssechatcompletion${
-      srfkey ? `/${srfkey}` : ''
-    }`;
+      isHistories ? '/histories' : ''
+    }${srfkey ? `/${srfkey}` : ''}`;
     const resPath = calcResPath(context, this.model);
     return resPath + curPath;
   }

package/src/service/vo/control.vo.ts

@@ -1,7 +1,19 @@
+import { createUUID } from 'qx-util';
 import { clone, isNil } from 'ramda';
 import { Srfuf } from '../constant';
 import { UIMapField } from './ui-map-field';
 
+const BuildInKeys = [
+  'srfkey',
+  'srfmajortext',
+  'srfmajorfield',
+  'srfkeyfield',
+  'tempsrfkey',
+  'srfuf',
+  'srfdeid',
+  'srfdecodename',
+];
+
 /**
  * 部件UI显示层数据转换
  *
@@ -50,7 +62,16 @@ export class ControlVO {
    * @date 2022-09-07 19:09:42
    * @type {string}
    */
-  declare srfkey: string;
+  declare srfkey?: string;
+
+  /**
+   * 临时主键
+   *
+   * @author lxm
+   * @date 2022-09-07 19:09:42
+   * @type {string}
+   */
+  declare tempsrfkey: string;
 
   /**
    * 主信息
@@ -59,7 +80,7 @@ export class ControlVO {
    * @date 2022-09-07 19:09:42
    * @type {string}
    */
-  declare srfmajortext: string;
+  declare srfmajortext?: string;
 
   /**
    * 实体模型标识
@@ -86,7 +107,7 @@ export class ControlVO {
    * @date 2022-09-07 19:09:42
    * @type {string}
    */
-  declare srfkeyfile: string;
+  declare srfkeyfield: string;
 
   /**
    * 实体主信息属性
@@ -95,7 +116,7 @@ export class ControlVO {
    * @date 2022-09-07 19:09:42
    * @type {string}
    */
-  declare srfmajorfile: string;
+  declare srfmajorfield: string;
 
   /**
    * Creates an instance of ControlVO.
@@ -108,6 +129,7 @@ export class ControlVO {
     $origin: IData = {},
     $dataUIMap: Map<string, UIMapField> = new Map(),
   ) {
+    // 自身的属性
     Object.defineProperty(this, '$origin', {
       enumerable: false,
       configurable: true,
@@ -120,64 +142,88 @@ export class ControlVO {
       value: $dataUIMap || new Map(),
     });
 
-    Object.defineProperty(this, 'srfuf', {
-      get() {
-        if (isNil(this.$origin.srfuf)) {
-          return this.srfkey ? Srfuf.UPDATE : Srfuf.CREATE;
-        }
-        return this.$origin.srfuf;
-      },
-      enumerable: false,
-      configurable: true,
-    });
-
-    Object.defineProperty(this, 'srfkey', {
-      get() {
-        return this.$origin.srfkey;
-      },
-      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,
+    // 可读写的预置属性,主键属性和主文本属性
+    ['srfkey', 'srfmajortext'].forEach(key => {
+      if (Object.prototype.hasOwnProperty.call(this.$origin, key)) {
+        Object.defineProperty(this, key, {
+          get() {
+            return this.$origin.srfkey;
+          },
+          set(val: unknown) {
+            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: unknown) {
+            this.$origin[dataKey] = val;
+          },
+          enumerable: false,
+          configurable: true,
+        });
+      } else {
+        Object.defineProperty(this, key, {
+          enumerable: false,
+          configurable: true,
+          writable: true,
+          value: null,
+        });
+      }
     });
 
-    Object.defineProperty(this, 'srfdecodename', {
-      get() {
-        return this.$origin.srfdecodename;
-      },
-      enumerable: false,
-      configurable: true,
-    });
+    // tempsrfkey临时主键
+    if (Object.prototype.hasOwnProperty.call(this.$origin, 'tempsrfkey')) {
+      // $origin有的操作$origin的属性
+      Object.defineProperty(this, 'tempsrfkey', {
+        get() {
+          return this.$origin.tempsrfkey;
+        },
+        set(val: unknown) {
+          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,
+      });
+    }
 
-    Object.defineProperty(this, 'srfkeyfile', {
+    // srfuf纯计算属性，不可修改
+    Object.defineProperty(this, 'srfuf', {
       get() {
-        return this.$origin.srfkeyfile;
+        if (Object.prototype.hasOwnProperty.call(this.$origin, 'srfuf')) {
+          return this.$origin.srfuf;
+        }
+        return this.srfkey === this.tempsrfkey ? Srfuf.UPDATE : Srfuf.CREATE;
       },
       enumerable: false,
       configurable: true,
     });
 
-    Object.defineProperty(this, 'srfmajorfile', {
-      get() {
-        return this.$origin.srfmajorfile;
+    // 只读的预置属性
+    ['srfdeid', 'srfdecodename', 'srfkeyfield', 'srfmajorfield'].forEach(
+      key => {
+        Object.defineProperty(this, key, {
+          get() {
+            return this.$origin[key];
+          },
+          enumerable: false,
+          configurable: true,
+        });
       },
-      enumerable: false,
-      configurable: true,
-    });
+    );
 
     // 先转换映射的属性
     this.$dataUIMap.forEach((mapField, key) => {
@@ -213,8 +259,8 @@ export class ControlVO {
     mapField?: UIMapField,
   ): void {
     const isOriginField = mapField ? mapField.isOriginField : true;
-    // srfuf和srfkey不做处理
-    if (uiKey === 'srfuf') {
+    //  预置的属性不做处理
+    if (BuildInKeys.includes(uiKey)) {
       return;
     }
 
@@ -227,10 +273,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的走它的转换