@ibiz-template/runtime 0.7.41-alpha.136 → 0.7.41-alpha.138

package/src/de-logic/de-logic-node/debug-param-node/debug-param-node.ts

@@ -6,10 +6,10 @@ import { DELogicNode } from '../de-logic-node';
 /**
  * @description 调试逻辑参数节点
  * @export
- * @class DebugParamNode
+ * @class DebugParamDELogicNode
  * @extends {DELogicNode}
  */
-export class DebugParamNode extends DELogicNode {
+export class DebugParamDELogicNode extends DELogicNode {
   declare model: IDEDebugParamLogic;
 
   async exec(ctx: DELogicContext): Promise<void> {

package/src/de-logic/de-logic-node/end-node/end-node.ts

@@ -9,10 +9,10 @@ import { DELogicNode } from '../de-logic-node';
  * @author lxm
  * @date 2023-02-09 21:02:00
  * @export
- * @class EndNode
+ * @class EndDELogicNode
  * @extends {DELogicNode}
  */
-export class EndNode extends DELogicNode {
+export class EndDELogicNode extends DELogicNode {
   declare model: IDEEndLogic;
 
   async exec(ctx: DELogicContext): Promise<void> {

package/src/de-logic/de-logic-node/index.ts

@@ -1,14 +1,14 @@
-export { DEActionNode } from './de-action-node/de-action-node';
-export { StartNode } from './start-node/start-node';
-export { EndNode } from './end-node/end-node';
-export { PrepareParamNode } from './prepare-param-node/prepare-param-node';
+export { DEActionDELogicNode } from './de-action-node/de-action-node';
+export { StartDELogicNode } from './start-node/start-node';
+export { EndDELogicNode } from './end-node/end-node';
+export { PrepareParamDELogicNode } from './prepare-param-node/prepare-param-node';
 export { DELogicNode } from './de-logic-node';
-export { DataSetNode } from './data-set-node/data-set-node';
-export { BindParamNode } from './bind-param-node/bind-param-node';
-export { ResetParamNode } from './reset-param-node/reset-param-node';
-export { RenewParamNode } from './renew-param-node/renew-param-node';
-export { CopyParamNode } from './copy-param-node/copy-param-node';
-export { SortParamNode } from './sort-param-node/sort-param-node';
-export { AppendParamNode } from './append-param-node/append-param-node';
-export { DebugParamNode } from './debug-param-node/debug-param-node';
-export { ThrowExceptionNode } from './throw-exception-node/throw-exception-node';
+export { DataSetDELogicNode } from './data-set-node/data-set-node';
+export { BindParamDELogicNode } from './bind-param-node/bind-param-node';
+export { ResetParamDELogicNode } from './reset-param-node/reset-param-node';
+export { RenewParamDELogicNode } from './renew-param-node/renew-param-node';
+export { CopyParamDELogicNode } from './copy-param-node/copy-param-node';
+export { SortParamDELogicNode } from './sort-param-node/sort-param-node';
+export { AppendParamDELogicNode } from './append-param-node/append-param-node';
+export { DebugParamDELogicNode } from './debug-param-node/debug-param-node';
+export { ThrowExceptionDELogicNode } from './throw-exception-node/throw-exception-node';

package/src/de-logic/de-logic-node/prepare-param-node/prepare-param-node.ts

@@ -11,10 +11,10 @@ import { DELogicNode } from '../de-logic-node';
  * @author lxm
  * @date 2023-02-09 21:02:20
  * @export
- * @class PrepareParamNode
+ * @class PrepareParamDELogicNode
  * @extends {DELogicNode}
  */
-export class PrepareParamNode extends DELogicNode {
+export class PrepareParamDELogicNode extends DELogicNode {
   async exec(ctx: DELogicContext): Promise<void> {
     const nodeParams = this.model.delogicNodeParams;
     if (nodeParams?.length) {

package/src/de-logic/de-logic-node/renew-param-node/renew-param-node.ts

@@ -9,10 +9,10 @@ import { DELogicNode } from '../de-logic-node';
  * @author lxm
  * @date 2023-02-09 21:02:20
  * @export
- * @class RenewParamNode
+ * @class RenewParamDELogicNode
  * @extends {DELogicNode}
  */
-export class RenewParamNode extends DELogicNode {
+export class RenewParamDELogicNode extends DELogicNode {
   declare model: IDERenewParamLogic;
 
   async exec(ctx: DELogicContext): Promise<void> {

package/src/de-logic/de-logic-node/reset-param-node/reset-param-node.ts

@@ -9,10 +9,10 @@ import { DELogicNode } from '../de-logic-node';
  * @author lxm
  * @date 2023-02-09 21:02:20
  * @export
- * @class ResetParamNode
+ * @class ResetParamDELogicNode
  * @extends {DELogicNode}
  */
-export class ResetParamNode extends DELogicNode {
+export class ResetParamDELogicNode extends DELogicNode {
   declare model: IDEResetParamLogic;
 
   async exec(ctx: DELogicContext): Promise<void> {

package/src/de-logic/de-logic-node/sort-param-node/sort-param-node.ts

@@ -10,9 +10,9 @@ import { DELogicNode } from '../de-logic-node';
  * @date 2023-02-09 21:02:20
  * @export
  * @class SortParamNode
- * @extends {DELogicNode}
+ * @extends {DELogicDELogicNode}
  */
-export class SortParamNode extends DELogicNode {
+export class SortParamDELogicNode extends DELogicNode {
   declare model: IDESortParamLogic;
 
   async exec(ctx: DELogicContext): Promise<void> {

package/src/de-logic/de-logic-node/start-node/start-node.ts

@@ -7,10 +7,10 @@ import { DELogicNode } from '../de-logic-node';
  * @author lxm
  * @date 2023-02-09 21:02:30
  * @export
- * @class StartNode
+ * @class StartDELogicNode
  * @extends {DELogicNode}
  */
-export class StartNode extends DELogicNode {
+export class StartDELogicNode extends DELogicNode {
   async exec(_ctx: DELogicContext): Promise<void> {
     // 启动节点，无任何操作
     ibiz.log.debug(

package/src/de-logic/de-logic-node/throw-exception-node/throw-exception-node.ts

@@ -9,10 +9,10 @@ import { DELogicNode } from '../de-logic-node';
  * @author lxm
  * @date 2023-02-09 21:02:00
  * @export
- * @class ThrowExceptionNode
+ * @class ThrowExceptionDELogicNode
  * @extends {DELogicNode}
  */
-export class ThrowExceptionNode extends DELogicNode {
+export class ThrowExceptionDELogicNode extends DELogicNode {
   declare model: IDEThrowExceptionLogic;
 
   async exec(_ctx: DELogicContext): Promise<void> {

package/src/de-logic/index.ts

@@ -6,6 +6,9 @@ import { IDELogicProvider } from '../interface';
 import { getDELogicProvider } from '../register';
 import { filterFieldLogics, findDELogic } from '../model';
 
+export * from './de-logic-node';
+export { DELogic } from './de-logic';
+
 /**
  * 实体处理逻辑实例缓存
  */

package/src/de-logic/provider.ts

@@ -5,19 +5,19 @@ import {
 } from '../register';
 import { DELogic } from './de-logic';
 import {
-  EndNode,
-  StartNode,
-  DataSetNode,
-  DEActionNode,
-  SortParamNode,
-  BindParamNode,
-  CopyParamNode,
-  RenewParamNode,
-  ResetParamNode,
-  DebugParamNode,
-  AppendParamNode,
-  PrepareParamNode,
-  ThrowExceptionNode,
+  EndDELogicNode,
+  StartDELogicNode,
+  DataSetDELogicNode,
+  DEActionDELogicNode,
+  SortParamDELogicNode,
+  BindParamDELogicNode,
+  CopyParamDELogicNode,
+  RenewParamDELogicNode,
+  ResetParamDELogicNode,
+  DebugParamDELogicNode,
+  AppendParamDELogicNode,
+  PrepareParamDELogicNode,
+  ThrowExceptionDELogicNode,
 } from './de-logic-node';
 
 /**
@@ -33,51 +33,54 @@ export function presetDELogicProvider(): void {
   // 注册界面逻辑节点
   registerDELogicNodeProvider(
     'BEGIN',
-    (node: IDELogicNode) => new StartNode(node),
+    (node: IDELogicNode) => new StartDELogicNode(node),
+  );
+  registerDELogicNodeProvider(
+    'END',
+    (node: IDELogicNode) => new EndDELogicNode(node),
   );
-  registerDELogicNodeProvider('END', (node: IDELogicNode) => new EndNode(node));
   registerDELogicNodeProvider(
     'DEACTION',
-    (node: IDELogicNode) => new DEActionNode(node),
+    (node: IDELogicNode) => new DEActionDELogicNode(node),
   );
   registerDELogicNodeProvider(
     'PREPAREPARAM',
-    (node: IDELogicNode) => new PrepareParamNode(node),
+    (node: IDELogicNode) => new PrepareParamDELogicNode(node),
   );
   registerDELogicNodeProvider(
     'RESETPARAM',
-    (node: IDELogicNode) => new ResetParamNode(node),
+    (node: IDELogicNode) => new ResetParamDELogicNode(node),
   );
   registerDELogicNodeProvider(
     'COPYPARAM',
-    (node: IDELogicNode) => new CopyParamNode(node),
+    (node: IDELogicNode) => new CopyParamDELogicNode(node),
   );
   registerDELogicNodeProvider(
     'BINDPARAM',
-    (node: IDELogicNode) => new BindParamNode(node),
+    (node: IDELogicNode) => new BindParamDELogicNode(node),
   );
   registerDELogicNodeProvider(
     'DEBUGPARAM',
-    (node: IDELogicNode) => new DebugParamNode(node),
+    (node: IDELogicNode) => new DebugParamDELogicNode(node),
   );
   registerDELogicNodeProvider(
     'APPENDPARAM',
-    (node: IDELogicNode) => new AppendParamNode(node),
+    (node: IDELogicNode) => new AppendParamDELogicNode(node),
   );
   registerDELogicNodeProvider(
     'SORTPARAM',
-    (node: IDELogicNode) => new SortParamNode(node),
+    (node: IDELogicNode) => new SortParamDELogicNode(node),
   );
   registerDELogicNodeProvider(
     'RENEWPARAM',
-    (node: IDELogicNode) => new RenewParamNode(node),
+    (node: IDELogicNode) => new RenewParamDELogicNode(node),
   );
   registerDELogicNodeProvider(
     'DEDATASET',
-    (node: IDELogicNode) => new DataSetNode(node),
+    (node: IDELogicNode) => new DataSetDELogicNode(node),
   );
   registerDELogicNodeProvider(
     'THROWEXCEPTION',
-    (node: IDELogicNode) => new ThrowExceptionNode(node),
+    (node: IDELogicNode) => new ThrowExceptionDELogicNode(node),
   );
 }

package/src/interface/api/common/global-config/i-api-global-common-config.ts

@@ -316,4 +316,11 @@ export interface IApiGlobalCommonConfig {
    * @memberof IApiGlobalCommonConfig
    */
   aiTopicStorageMode: 'DEFAULT' | 'REMOTESESSION';
+
+  /**
+   * @description AI输入框空白占位
+   * @type {''}
+   * @memberof IApiGlobalCommonConfig
+   */
+  aiInputPlaceholder: '';
 }

package/src/interface/api/util/i-api-app-util.ts

@@ -277,4 +277,11 @@ export interface IApiAppUtil {
    * @memberof IApiAppUtil
    */
   resolveI18nText(text: string): string;
+
+  /**
+   * @description 获取运行时开发工具配置
+   * @returns {*}  {IApiData}
+   * @memberof IApiAppUtil
+   */
+  getRuntimeDevToolConfig(): IApiData;
 }

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

@@ -138,6 +138,20 @@ export interface IAppDEService extends IApiAppDEService {
     data: IData,
   ): Promise<IHttpResponse>;
 
+  /**
+   * @description 调整 AI 聊天会话方向
+   * @param {IContext} context
+   * @param {IParams} params
+   * @param {IData} data
+   * @returns {*}  {Promise<IHttpResponse>}
+   * @memberof IAppDEService
+   */
+  aiChatSupplement(
+    context: IContext,
+    params: IParams,
+    data: IData,
+  ): Promise<IHttpResponse>;
+
   /**
    * @description 创建当前数据对象实例
    * @param {(IData[] | IDataEntity[] | IData | IDataEntity)} data

package/src/interface/util/i-app-util/i-app-util.ts

@@ -1,3 +1,4 @@
+import { IDevToolConfig } from '@ibiz-template/core';
 import { IApiAiChatParam, IApiAppUtil } from '../../api';
 
 /**
@@ -14,4 +15,11 @@ export interface IAiChatParam extends IApiAiChatParam {}
  * @interface IAppUtil
  * @extends {IApiAppUtil}
  */
-export interface IAppUtil extends IApiAppUtil {}
+export interface IAppUtil extends IApiAppUtil {
+  /**
+   * @description 获取运行时开发工具配置
+   * @returns {*}  {IDevToolConfig}
+   * @memberof IAppUtil
+   */
+  getRuntimeDevToolConfig(): IDevToolConfig;
+}

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

@@ -523,6 +523,27 @@ export class DEService implements IAppDEService {
     return app.net.post(path, data, { srfactag: 'AIChat', ...params });
   }
 
+  /**
+   * @description 调整 AI 聊天会话方向
+   * @param {IContext} context
+   * @param {IParams} [params={}]
+   * @param {IData} [data={}]
+   * @returns {*}  {Promise<IHttpResponse>}
+   * @memberof DEService
+   */
+  aiChatSupplement(
+    context: IContext,
+    params: IParams = {},
+    data: IData = {},
+  ): Promise<IHttpResponse> {
+    const app = ibiz.hub.getApp(this.model.appId);
+    const srfkey = context[this.model.codeName!.toLowerCase()];
+    const curPath = `/${this.model.deapicodeName2}/ssechatcompletion/supplement${srfkey ? `/${srfkey}` : ''}`;
+    const resPath = calcResPath(context, this.model);
+    const path = resPath ? `/${resPath}${curPath}` : `${curPath}`;
+    return app.net.post(path, data, { srfactag: 'AIChat', ...params });
+  }
+
   /**
    * 计算 AI 请求路径
    *

package/src/ui-action/provider/front-ui-action-provider.ts

@@ -76,7 +76,13 @@ export class FrontUIActionProvider extends UIActionProviderBase {
           resultContext.srfnavctrlid = xdataControl.ctrlId;
         }
         //  解析自定义 视图 option 参数
-        const options = this.handleViewOptionParams(resultParams);
+        const options = this.handleViewOptionParams(resultParams) || {};
+        if (
+          options.modalOption &&
+          Object.keys(options.modalOption).length > 0
+        ) {
+          Object.assign(options, { ...options.modalOption });
+        }
         const res: IModalData | undefined = await ibiz.commands.execute(
           OpenAppViewCommand.TAG,
           frontPSAppView,

package/src/ui-logic/index.ts

@@ -4,6 +4,7 @@ import { IUILogicParams, IUILogicProvider } from '../interface';
 import { getUILogicProvider } from '../register';
 
 export * from './ui-logic-node';
+export { UILogic } from './ui-logic';
 
 /**
  * 界面逻辑实例缓存

package/src/utils/index.ts

@@ -37,6 +37,7 @@ export * from './date-util';
 export { ChangeTracker } from './change-tracker/change-tracker';
 export { ViewShellHooks } from './view-shell-hooks/view-shell-hooks';
 export { WaterMarkUtil } from './water-mark-util/water-mark-util';
+export { runWithConcurrency } from './task-util/task-util';
 export * from './map-util/map-util';
 export * from './wechat-util/wechat-util';
 export * from './json-util/json-util';

package/src/utils/task-util/task-util.ts

@@ -0,0 +1,45 @@
+/* eslint-disable no-plusplus */
+/**
+ * 并发控制函数
+ * @param tasks 需要执行的任务数组
+ * @param concurrency 最大并发数量
+ * @returns 所有任务执行结果的数组（保持与输入顺序一致）
+ */
+export async function runWithConcurrency<T>(
+  tasks: (() => Promise<T>)[],
+  concurrency: number,
+): Promise<T[]> {
+  const results: T[] = new Array(tasks.length);
+  // 使用 Map 记录正在执行的任务，防止重复领取
+  const executing = new Map<number, Promise<void>>();
+  let currentIndex = 0;
+
+  const runTask = async (index: number): Promise<void> => {
+    try {
+      const data = await tasks[index]();
+      results[index] = data;
+    } finally {
+      // 任务完成后，从执行池中移除
+      executing.delete(index);
+    }
+  };
+
+  // 只要还有待处理的任务，就持续调度
+  while (currentIndex < tasks.length) {
+    // 如果当前并发数已满，等待最先完成的一个任务
+    if (executing.size >= concurrency) {
+      await Promise.race(executing.values());
+      continue;
+    }
+
+    // 领取任务并加入执行池
+    const index = currentIndex++;
+    const taskPromise = runTask(index);
+    executing.set(index, taskPromise);
+  }
+
+  // 等待所有剩余的执行中任务完成
+  await Promise.all(executing.values());
+
+  return results;
+}