@ibiz-template/runtime 0.7.41-alpha.137 → 0.7.41-alpha.139

package/src/app-hub.ts

@@ -24,6 +24,7 @@ import { HubController } from './controller';
 import { ConfigService, MqttService } from './service';
 import { NoticeController } from './controller/notification';
 import { MicroAppConfigCenter } from './micro-app';
+import { runWithConcurrency } from './utils';
 
 /**
  * 运行时总集
@@ -856,30 +857,54 @@ export class AppHub implements IAppHubService {
    * @memberof AppHub
    */
   public async loadMainExtensionPlugin(): Promise<void> {
-    // 从 1 开始递增加载扩展插件，加载失败时终止
-    // 第一组为 ExtensionPlugin/ext，之后为 ExtensionPlugin1/ext2、ExtensionPlugin2/ext3 ...
-    let index = 1;
-    let success = true;
-    do {
+    const { enableExternalPlugin, concurrentPluginCount } =
+      ibiz.appUtil.getRuntimeDevToolConfig();
+    if (!enableExternalPlugin) {
+      return;
+    }
+    // 获取扩展插件总数
+    let pluginListLength: number = 0;
+    const res = await ibiz.net.axios({
+      method: 'get',
+      url: `${ibiz.env.baseUrl}/${ibiz.env.appId}${ibiz.env.remoteModelUrl}/extension`,
+    });
+    if (res.status === 200 && res.data) {
+      pluginListLength = Number(res.data);
+    }
+    if (pluginListLength === 0) return;
+    // 构建任务列表
+    const pluginTasks = Array.from({ length: pluginListLength }, (_, i) => {
+      const index = i + 1;
       const suffix = index === 1 ? '' : `${index}`;
       const targetUrl = `${ibiz.env.baseUrl}/${ibiz.env.appId}${ibiz.env.remoteModelUrl}/ext${suffix}`;
-      try {
-        await ibiz.plugin.loadPlugin({
-          runtimeObject: true,
-          rtobjectName: `ExtensionPlugin${suffix}`,
-          rtobjectRepo: targetUrl,
-        } as IAppPFPluginRef);
-        index += 1;
-        success = true;
-      } catch (error) {
-        ibiz.log.warn(
-          ibiz.i18n.t('runtime.hub.noExtensionPlugin', {
-            targetUrl,
-          }),
-        );
-        success = false;
-      }
-    } while (success);
+      return async (): Promise<{ ok: boolean; data: IData }> => {
+        try {
+          await ibiz.plugin.loadPlugin({
+            runtimeObject: true,
+            rtobjectName: `ExtensionPlugin${suffix}`,
+            rtobjectRepo: targetUrl,
+          } as IAppPFPluginRef);
+
+          return { ok: true, data: { index, targetUrl } };
+        } catch (error) {
+          return { ok: false, data: { index, targetUrl, error } };
+        }
+      };
+    });
+    // 并发执行任务
+    const results = await runWithConcurrency(
+      pluginTasks,
+      concurrentPluginCount || 1,
+    );
+    // 处理结果
+    const errorResults = results.filter(result => !result?.ok);
+    if (errorResults && errorResults.length > 0) {
+      ibiz.log.warn(
+        ibiz.i18n.t('runtime.hub.noExtensionPlugin', {
+          targetUrl: errorResults[0].data?.targetUrl || 'Unknown',
+        }),
+      );
+    }
   }
 
   /**
@@ -889,6 +914,10 @@ export class AppHub implements IAppHubService {
    * @memberof AppHub
    */
   public async loadSubExtensionPlugin(appId: string): Promise<void> {
+    const { enableExternalPlugin } = ibiz.appUtil.getRuntimeDevToolConfig();
+    if (!enableExternalPlugin) {
+      return;
+    }
     const targetUrl = `${ibiz.env.baseUrl}/${ibiz.env.appId}${ibiz.env.remoteModelUrl}/subapps/${appId}/ext`;
     try {
       await ibiz.plugin.loadPlugin({

package/src/config/global-config.ts

@@ -141,6 +141,7 @@ export class GlobalConfig implements IGlobalConfig {
     aiAutoQuestion: true,
     asyncImport: false,
     aiTopicStorageMode: 'DEFAULT',
+    aiInputPlaceholder: '',
   };
 
   // 全局分页流布局配置

package/src/de-logic/de-logic-context.ts

@@ -1,5 +1,6 @@
+import { isArray } from 'lodash-es';
 import { DELogicParam } from './de-logic-param/de-logic-param';
-import { IDeLogicContext, IDeLogicParams } from '../interface';
+import { IDeLogicContext } from '../interface';
 
 /**
  * 实体逻辑执行上下文
@@ -18,6 +19,14 @@ export class DELogicContext implements IDeLogicContext {
    */
   lastReturn: unknown;
 
+  /**
+   * 实体逻辑执行参数
+   * @author lxm
+   * @date 2023-10-16 02:22:31
+   * @type {{ context: IContext; data: IData[]; params: IParams }}
+   */
+  parameters: { context: IContext; data: IData[]; params: IParams };
+
   /**
    * 上下文
    */
@@ -51,13 +60,17 @@ export class DELogicContext implements IDeLogicContext {
    * @date 2023-03-24 09:15:14
    * @param {Map<string, DELogicParam>} deLogicParams 实体逻辑参数集合
    * @param {IContext} context 上下文
-   * @param {IData} data 数据对象
+   * @param {IData | IData[]} data 数据对象
    * @param {IParams} params 视图参数
    */
   constructor(
     private deLogicParams: Map<string, DELogicParam>,
-    public parameters: IDeLogicParams,
-  ) {}
+    context: IContext,
+    data: IData | IData[],
+    params: IParams,
+  ) {
+    this.parameters = { context, data: isArray(data) ? data : [data], params };
+  }
 
   /**
    * 重置实体逻辑参数

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

@@ -1,6 +1,5 @@
 /* eslint-disable no-await-in-loop */
-import { IBizContext, RuntimeModelError } from '@ibiz-template/core';
-import { clone } from 'ramda';
+import { RuntimeModelError } from '@ibiz-template/core';
 import { IAppDELogic, IAppDataEntity } from '@ibiz/model-core';
 import { ScriptFactory, ScriptFunction } from '../utils';
 import { DELogicContext } from './de-logic-context';
@@ -124,13 +123,11 @@ export class DELogic implements IDeLogic {
    * @memberof DELogic
    */
   async exec(parameters: IDeLogicParams): Promise<unknown> {
-    // 克隆传入应用上下文参数和视图参数
-    parameters.context = IBizContext.create(parameters.context);
-    parameters.params = clone(parameters.params || {});
+    const { context, params, data } = parameters;
     if (this.scriptFn) {
-      return this.scriptFn.exec({ ...parameters });
+      return this.scriptFn.exec({ context, data, params });
     }
-    const ctx = new DELogicContext(this.params, parameters);
+    const ctx = new DELogicContext(this.params, context, data, params);
     this.initLogicParams(ctx);
     const { startDELogicNodeId } = this.model;
     if (startDELogicNodeId && this.nodes.has(startDELogicNodeId)) {

package/src/de-logic/index.ts

@@ -45,7 +45,7 @@ export async function execDELogic(
   const deLogic = deLogicMap.get(deDELogic)!;
   const result = await deLogic.exec({
     context,
-    data: Array.isArray(data) ? data : [data],
+    data,
     params,
   });
   ibiz.log.debug(

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/common/i-api-de-logic-params.ts

@@ -1,3 +1,4 @@
+import { IApiData } from '@ibiz-template/core';
 import { IApiLogicParams } from './i-api-logic-params';
 
 /**
@@ -5,4 +6,11 @@ import { IApiLogicParams } from './i-api-logic-params';
  * @export
  * @interface IApiDELogicParams
  */
-export interface IApiDeLogicParams extends IApiLogicParams {}
+export interface IApiDeLogicParams extends IApiLogicParams {
+  /**
+   * @description 数据集合
+   * @type {(IApiData | IApiData[])}
+   * @memberof IApiDeLogicParams
+   */
+  data: IApiData | IApiData[];
+}

package/src/interface/api/common/i-api-logic-params.ts

@@ -1,4 +1,4 @@
-import { IApiContext, IApiData, IApiParams } from '@ibiz-template/core';
+import { IApiContext, IApiParams } from '@ibiz-template/core';
 
 /**
  * @description 逻辑通用参数接口
@@ -19,11 +19,4 @@ export interface IApiLogicParams {
    * @memberof IApiLogicParams
    */
   params: IApiParams;
-
-  /**
-   * @description 数据集合
-   * @type {IApiData[]}
-   * @memberof IApiLogicParams
-   */
-  data: IApiData[];
 }

package/src/interface/api/common/i-api-ui-logic-params.ts

@@ -1,3 +1,4 @@
+import { IApiData } from '@ibiz-template/core';
 import { IApiControlController, IApiViewController } from '../controller';
 import { IApiLogicParams } from './i-api-logic-params';
 
@@ -34,4 +35,11 @@ export interface IApiUILogicParams extends IApiLogicParams {
    * @memberof IApiUILogicParams
    */
   noWaitRoute?: boolean;
+
+  /**
+   * @description 数据集合
+   * @type {IApiData[]}
+   * @memberof IApiLogicParams
+   */
+  data: IApiData[];
 }

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/de-logic/i-de-logic-context.ts

@@ -6,4 +6,11 @@ import { ILogicContext } from '../common';
  * @interface IDeLogicContext
  * @extends {ILogicContext}
  */
-export interface IDeLogicContext extends ILogicContext {}
+export interface IDeLogicContext extends ILogicContext {
+  /**
+   * @description 实体逻辑执行参数
+   * @type {{ context: IContext; data: IData[]; params: IParams }}
+   * @memberof IDeLogicContext
+   */
+  parameters: { context: IContext; data: IData[]; params: IParams };
+}

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/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;
+}