@ibiz-template/runtime 0.1.8 → 0.1.10

package/src/interface/controller/state/control/i-tree.state.ts

@@ -1,4 +1,4 @@
-import { IButtonContainerState, IIcon } from '../../common';
+import { IIcon } from '../../common';
 import { IMDControlState } from './i-md-control.state';
 
 /**
@@ -37,14 +37,6 @@ export interface ITreeState extends IMDControlState {
    * @type {string[]}
    */
   expandedKeys: string[];
-
-  /**
-   * 右键上下文菜单状态
-   * @author lxm
-   * @date 2023-08-01 04:48:11
-   * @type {{ [p: string]: IButtonContainerState }}
-   */
-  contextMenus: { [p: string]: IButtonContainerState };
 }
 
 /**

package/src/interface/controller/state/control/index.ts

@@ -31,3 +31,4 @@ export * from './i-drtab.state';
 export * from './i-dashboard.state';
 export * from './i-calendar.state';
 export * from './i-calendar-exp-bar.state';
+export * from './i-context-menu.state';

package/src/interface/controller/state/view/i-pickup-md-view.state.ts

@@ -0,0 +1,22 @@
+import { IMDViewState } from './i-md-view.state';
+
+/**
+ * 选择多数据视图UI状态
+ *
+ * @author zk
+ * @date 2023-05-25 05:05:43
+ * @export
+ * @interface IPickupMDViewState
+ * @extends {IMDViewState}
+ */
+export interface IPickupMDViewState extends IMDViewState {
+  /**
+   * 是否单选
+   *
+   * @author zk
+   * @date 2023-08-21 05:08:36
+   * @type {boolean}
+   * @memberof IPickupMDViewState
+   */
+  singleSelect: boolean;
+}

package/src/interface/controller/state/view/index.ts

@@ -35,3 +35,4 @@ export * from './i-de-portal-view.state';
 export * from './i-panel-view.state';
 export * from './i-calendar-view.state';
 export * from './i-calendar-exp-view.state';
+export * from './i-pickup-md-view.state';

package/src/interface/util/i-open-view-util/i-open-view-util.ts

@@ -1,4 +1,4 @@
-import { IModalData, IViewConfig } from '../../common';
+import { IModalData } from '../../common';
 
 /**
  * 打开视图工具类
@@ -25,13 +25,13 @@ export interface IOpenViewUtil {
    *
    * @author chitanda
    * @date 2023-07-12 21:07:51
-   * @param {IViewConfig} appView
+   * @param {string} appViewId
    * @param {IContext} context
    * @param {IParams} [params]
    * @return {*}  {Promise<IModalData>}
    */
   root(
-    appView: IViewConfig,
+    appViewId: string,
     context: IContext,
     params?: IParams,
   ): Promise<IModalData>;
@@ -41,13 +41,13 @@ export interface IOpenViewUtil {
    *
    * @author chitanda
    * @date 2022-08-16 20:08:41
-   * @param {IViewConfig} appView
+   * @param {string} appViewId
    * @param {IContext} [context]
    * @param {IParams} [params]
    * @return {*}  {Promise<IModalData>}
    */
   modal(
-    appView: IViewConfig,
+    appViewId: string,
     context: IContext,
     params?: IParams,
   ): Promise<IModalData>;
@@ -57,13 +57,13 @@ export interface IOpenViewUtil {
    *
    * @author chitanda
    * @date 2022-08-16 20:08:22
-   * @param {IViewConfig} appView
+   * @param {string} appViewId
    * @param {IContext} [context]
    * @param {IParams} [params]
    * @return {*}  {Promise<IModalData>}
    */
   popover(
-    appView: IViewConfig,
+    appViewId: string,
     event: MouseEvent,
     context: IContext,
     params?: IParams,
@@ -74,13 +74,13 @@ export interface IOpenViewUtil {
    *
    * @author chitanda
    * @date 2022-08-16 20:08:46
-   * @param {IViewConfig} appView
+   * @param {string} appViewId
    * @param {IContext} [context]
    * @param {IParams} [params]
    * @return {*}  {Promise<IModalData>}
    */
   drawer(
-    appView: IViewConfig,
+    appViewId: string,
     context: IContext,
     params?: IParams,
   ): Promise<IModalData>;
@@ -90,13 +90,13 @@ export interface IOpenViewUtil {
    *
    * @author chitanda
    * @date 2022-08-16 20:08:29
-   * @param {IViewConfig} appView
+   * @param {string} appViewId
    * @param {IContext} [context]
    * @param {IParams} [params]
    * @return {*}  {Promise<IModalData>}
    */
   custom(
-    appView: IViewConfig,
+    appViewId: string,
     context: IContext,
     params?: IParams,
   ): Promise<IModalData>;

package/src/interface/util/script/i-script-function.ts

@@ -12,7 +12,7 @@ export interface IScriptFunctionOpts {
    * @date 2023-07-25 10:46:18
    * @type {boolean}
    */
-  singleRowReturn: boolean;
+  singleRowReturn?: boolean;
 
   /**
    * 预置参数
@@ -21,4 +21,12 @@ export interface IScriptFunctionOpts {
    * @type {IParams}
    */
   presetParams?: IParams;
+
+  /**
+   * 是否是异步函数脚本
+   * @author lxm
+   * @date 2023-08-21 03:15:43
+   * @type {boolean}
+   */
+  isAsync?: boolean;
 }

package/src/logic-scheduler/executor/script-executor.ts

@@ -1,5 +1,4 @@
-import { RuntimeError } from '@ibiz-template/core';
-import { IUILogicParams } from '../../interface';
+import { IScriptFunctionOpts, IUILogicParams } from '../../interface';
 import { ScriptFactory, ScriptFunction } from '../../utils';
 import { LogicExecutor } from './logic-executor';
 
@@ -18,12 +17,12 @@ export class ScriptExecutor extends LogicExecutor {
   scriptFn?: ScriptFunction;
 
   /**
-   * 是否单行返回，脚本只是单行的且默认把值返回
+   * 初始化完成
    * @author lxm
-   * @date 2023-06-25 10:06:32
+   * @date 2023-08-21 04:27:38
    * @type {boolean}
    */
-  isRowReturn: boolean = false;
+  initialized: boolean = false;
 
   /**
    * 执行参数转换成脚本执行作用域参数
@@ -32,8 +31,9 @@ export class ScriptExecutor extends LogicExecutor {
    * @param {IUILogicParams} _executeParams
    * @return {*}  {IData[]}
    */
-  convertScriptArgs(_executeParams: IUILogicParams): IData {
-    throw new RuntimeError('未设置脚本执行参数转换方法');
+  convertScriptArgs(executeParams: IUILogicParams): IData {
+    // 默认不特殊处理的不转换
+    return executeParams;
   }
 
   /**
@@ -46,16 +46,13 @@ export class ScriptExecutor extends LogicExecutor {
   init(
     paramKeys: string[],
     convertFun: (executeParams: IUILogicParams) => IData,
+    options?: IScriptFunctionOpts,
   ): void {
     this.convertScriptArgs = convertFun;
-    let code = this.logic.scriptCode!;
-    if (this.isRowReturn) {
-      code = `return (${code})`;
-    }
+    const code = this.logic.scriptCode!;
     // eslint-disable-next-line no-new-func
-    this.scriptFn = ScriptFactory.createScriptFn(paramKeys, code, {
-      singleRowReturn: this.isRowReturn,
-    });
+    this.scriptFn = ScriptFactory.createScriptFn(paramKeys, code, options);
+    this.initialized = true;
   }
 
   // eslint-disable-next-line @typescript-eslint/no-explicit-any

package/src/logic-scheduler/trigger/item-dyna-logic-trigger.ts

@@ -16,8 +16,10 @@ export class ItemDynaLogicTrigger extends LogicTrigger {
         `预定义逻辑类型${this.type}的触发器类型只能是脚本`,
       );
     }
-    this.executor.isRowReturn = true;
-    this.executor.init(
+  }
+
+  bindScriptExecutor(executor: ScriptExecutor): void {
+    executor.init(
       ['context', 'viewparams', 'data', 'env'],
       executeParams => {
         const { context, params, data } = executeParams;
@@ -28,6 +30,10 @@ export class ItemDynaLogicTrigger extends LogicTrigger {
           env: ibiz.env,
         };
       },
+      {
+        singleRowReturn: true,
+        isAsync: false,
+      },
     );
   }
 

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

@@ -6,6 +6,7 @@ import type {
   TriggerType,
 } from '../../interface';
 import { LogicExecutor } from '../executor/logic-executor';
+import { ScriptExecutor } from '../executor/script-executor';
 import { LogicScheduler } from '../scheduler/logic-scheduler';
 
 /**
@@ -51,6 +52,24 @@ export class LogicTrigger {
    */
   bindExecutor(executor: LogicExecutor): void {
     this.executor = executor;
+    if (this.executor.type === 'SCRIPT') {
+      this.bindScriptExecutor(executor as ScriptExecutor);
+    }
+  }
+
+  /**
+   * 绑定脚本执行器
+   * @author lxm
+   * @date 2023-08-21 04:33:35
+   * @param {ScriptExecutor} executor
+   */
+  bindScriptExecutor(executor: ScriptExecutor): void {
+    if (!executor.initialized) {
+      executor.init([], executeParams => executeParams, {
+        isAsync: true,
+        singleRowReturn: false,
+      });
+    }
   }
 
   /**

package/src/model/layout/layout.ts

@@ -145,5 +145,6 @@ export function calcGridLayoutPos(
 export function calcDynaClass(expression: string, data: IData): string[] {
   return ScriptFactory.execScriptFn({ data }, expression, {
     singleRowReturn: true,
+    isAsync: false,
   }) as string[];
 }

package/src/register/helper/common-register.ts

@@ -0,0 +1,28 @@
+/**
+ * 获取插件的注册唯一标识
+ * @author lxm
+ * @date 2023-08-23 11:04:04
+ * @export
+ * @param {string} pluginId
+ * @param {string} [appId]
+ * @return {*}  {string}
+ */
+export async function getPluginRegisterKey(
+  pluginId: string,
+  appId?: string,
+): Promise<string | undefined> {
+  const app = ibiz.hub.getApp(appId);
+
+  const plugin = app.model.appPFPluginRefs?.find(
+    item => item.pluginCode!.toLowerCase() === pluginId,
+  );
+
+  if (!plugin) {
+    ibiz.log.error(`找不到${pluginId}的插件模型`);
+    return;
+  }
+
+  await ibiz.plugin.loadPlugin(plugin);
+
+  return `${plugin.pluginType}_${plugin.pluginCode}`;
+}

package/src/register/helper/control-register.ts

@@ -1,5 +1,6 @@
 import { IControl } from '@ibiz/model-core';
 import { IControlProvider } from '../../interface';
+import { getPluginRegisterKey } from './common-register';
 
 /** 部件适配器前缀 */
 export const CONTROL_PROVIDER_PREFIX = 'CONTROL';
@@ -37,7 +38,21 @@ export async function getControlProvider(
   model: IControl,
 ): Promise<IControlProvider | undefined> {
   let provider: IControlProvider | undefined;
-  const { controlType, controlStyle } = model as Required<IControl>;
+  const { controlType, controlStyle, sysPFPluginId, appId } =
+    model as Required<IControl>;
+
+  // 找插件适配器
+  if (sysPFPluginId) {
+    const pluginKey = await getPluginRegisterKey(sysPFPluginId, appId);
+    if (pluginKey) {
+      provider = getProvider(pluginKey);
+    }
+    if (!provider) {
+      ibiz.log.error(`找不到部件插件${pluginKey}对应的适配器`);
+    } else {
+      return provider;
+    }
+  }
 
   // 再找部件类型和部件样式
   if (controlStyle && controlStyle !== 'DEFAULT') {
@@ -48,17 +63,17 @@ export async function getControlProvider(
         `找不到部件类型：[${controlType}]的部件样式：[${controlStyle}]对应的适配器`,
         model,
       );
+    } else {
+      return provider;
     }
   }
 
   // 找部件类型
-  if (!provider) {
-    provider = getProvider(controlType);
-  }
+  provider = getProvider(controlType);
 
   if (!provider) {
     ibiz.log.error(`找不到部件类型${controlType}对应的适配器`);
+  } else {
+    return provider;
   }
-
-  return provider;
 }

package/src/register/helper/editor-register.ts

@@ -1,5 +1,6 @@
 import { IEditor } from '@ibiz/model-core';
 import { IEditorProvider } from '../../interface';
+import { getPluginRegisterKey } from './common-register';
 
 /** 编辑器适配器前缀 */
 export const EDITOR_PROVIDER_PREFIX = 'EDITOR';
@@ -37,9 +38,22 @@ export async function getEditorProvider(
   model: IEditor,
 ): Promise<IEditorProvider | undefined> {
   let provider: IEditorProvider | undefined;
-  const { editorType, editorStyle, predefinedType } =
+  const { editorType, editorStyle, predefinedType, sysPFPluginId, appId } =
     model as Required<IEditor>;
 
+  // 找插件适配器
+  if (sysPFPluginId) {
+    const pluginKey = await getPluginRegisterKey(sysPFPluginId, appId);
+    if (pluginKey) {
+      provider = getProvider(pluginKey);
+    }
+    if (!provider) {
+      ibiz.log.error(`找不到编辑器插件${pluginKey}对应的适配器`);
+    } else {
+      return provider;
+    }
+  }
+
   // 再找编辑器类型和编辑器样式
   if (editorStyle && editorStyle !== 'DEFAULT') {
     const key = `${editorType}_${editorStyle}`;
@@ -49,6 +63,8 @@ export async function getEditorProvider(
         `找不到编辑器类型：[${editorType}]的编辑器样式：[${editorStyle}]对应的适配器`,
         model,
       );
+    } else {
+      return provider;
     }
   }
 
@@ -64,17 +80,16 @@ export async function getEditorProvider(
         `找不到编辑器类型：[${editorType}]的预置类型：[${predefinedType}]对应的适配器`,
         model,
       );
+    } else {
+      return provider;
     }
   }
 
   // 找编辑器类型
-  if (!provider) {
-    provider = getProvider(editorType);
-  }
-
+  provider = getProvider(editorType);
   if (!provider) {
     ibiz.log.error(`找不到编辑器类型${editorType}对应的适配器`);
+  } else {
+    return provider;
   }
-
-  return provider;
 }

package/src/register/helper/form-detail-register.ts

@@ -1,5 +1,6 @@
 import { IDEFormDetail } from '@ibiz/model-core';
 import { IFormDetailProvider } from '../../interface';
+import { getPluginRegisterKey } from './common-register';
 
 /** 表单成员适配器前缀 */
 export const FORMDETAIL_PROVIDER_PREFIX = 'FORMDETAIL';
@@ -37,15 +38,26 @@ export async function getFormDetailProvider(
   model: IDEFormDetail,
 ): Promise<IFormDetailProvider | undefined> {
   let provider: IFormDetailProvider | undefined;
-  const { detailType } = model as Required<IDEFormDetail>;
+  const { detailType, sysPFPluginId, appId } = model as Required<IDEFormDetail>;
 
-  // 找表单成员类型
-  if (!provider) {
-    provider = getProvider(detailType);
+  // 找插件适配器
+  if (sysPFPluginId) {
+    const pluginKey = await getPluginRegisterKey(sysPFPluginId, appId);
+    if (pluginKey) {
+      provider = getProvider(pluginKey);
+    }
+    if (!provider) {
+      ibiz.log.error(`找不到表单成员插件${pluginKey}对应的适配器`);
+    } else {
+      return provider;
+    }
   }
+
+  // 找表单成员类型
+  provider = getProvider(detailType);
   if (!provider) {
     ibiz.log.error(`找不到表单成员类型${detailType}对应的适配器`);
+  } else {
+    return provider;
   }
-
-  return provider;
 }

package/src/register/helper/grid-column-register.ts

@@ -1,5 +1,6 @@
 import { IDEGridColumn } from '@ibiz/model-core';
 import { IGridColumnProvider } from '../../interface';
+import { getPluginRegisterKey } from './common-register';
 
 /** 表格列适配器前缀 */
 export const GRIDCOLUMN_PROVIDER_PREFIX = 'GRIDCOLUMN';
@@ -37,16 +38,28 @@ export async function getGridColumnProvider(
   model: IDEGridColumn,
 ): Promise<IGridColumnProvider | undefined> {
   let provider: IGridColumnProvider | undefined;
-  const { columnType, enableRowEdit } = model as Required<IDEGridColumn>;
+  const { columnType, enableRowEdit, sysPFPluginId, appId } =
+    model as Required<IDEGridColumn>;
+
+  // 找插件适配器
+  if (sysPFPluginId) {
+    const pluginKey = await getPluginRegisterKey(sysPFPluginId, appId);
+    if (pluginKey) {
+      provider = getProvider(pluginKey);
+    }
+    if (!provider) {
+      ibiz.log.error(`找不到表格列插件${pluginKey}对应的适配器`);
+    } else {
+      return provider;
+    }
+  }
 
   const key = enableRowEdit ? `${columnType!}_EDIT` : columnType!;
   // 找表格列类型
-  if (!provider) {
-    provider = getProvider(key);
-  }
+  provider = getProvider(key);
   if (!provider) {
     ibiz.log.error(`找不到表格列类型${key}对应的适配器`);
+  } else {
+    return provider;
   }
-
-  return provider;
 }

package/src/register/helper/panel-item-register.ts

@@ -1,5 +1,6 @@
 import { IPanelContainer, IPanelItem, IPanelRawItem } from '@ibiz/model-core';
 import { IPanelItemProvider } from '../../interface';
+import { getPluginRegisterKey } from './common-register';
 
 /** 面板成员适配器前缀 */
 export const PANELITEM_PROVIDER_PREFIX = 'PANELITEM';
@@ -40,7 +41,20 @@ export async function getPanelItemProvider(
   model: IPanelItem,
 ): Promise<IPanelItemProvider | undefined> {
   let provider: IPanelItemProvider | undefined;
-  const { itemType } = model as Required<IPanelItem>;
+  const { itemType, sysPFPluginId, appId } = model as Required<IPanelItem>;
+
+  // 找插件适配器
+  if (sysPFPluginId) {
+    const pluginKey = await getPluginRegisterKey(sysPFPluginId, appId);
+    if (pluginKey) {
+      provider = getProvider(pluginKey);
+    }
+    if (!provider) {
+      ibiz.log.error(`找不到面板成员插件${pluginKey}对应的适配器`);
+    } else {
+      return provider;
+    }
+  }
 
   // 特殊容器类型
   if (itemType === 'CONTAINER') {
@@ -50,6 +64,8 @@ export async function getPanelItemProvider(
     provider = getProvider(key);
     if (!provider) {
       ibiz.log.error(`找不到面板容器预置类型为${predefinedType}的适配器`);
+    } else {
+      return provider;
     }
   }
 
@@ -63,16 +79,16 @@ export async function getPanelItemProvider(
       ibiz.log.error(
         `找不到面板成员直接内容预置类型为${predefinedType}的适配器`,
       );
+    } else {
+      return provider;
     }
   }
 
   // 找面板成员类型
-  if (!provider) {
-    provider = getProvider(itemType);
-  }
+  provider = getProvider(itemType);
   if (!provider) {
     ibiz.log.error(`找不到面板成员类型${itemType}对应的适配器`);
+  } else {
+    return provider;
   }
-
-  return provider;
 }

package/src/register/helper/portlet-register.ts

@@ -1,5 +1,6 @@
 import { IDBPortletPart } from '@ibiz/model-core';
 import { IPortletProvider } from '../../interface';
+import { getPluginRegisterKey } from './common-register';
 
 /** 门户部件成员适配器前缀 */
 export const PORTLET_PROVIDER_PREFIX = 'PORTLET';
@@ -37,15 +38,27 @@ export async function getPortletProvider(
   model: IDBPortletPart,
 ): Promise<IPortletProvider | undefined> {
   let provider: IPortletProvider | undefined;
-  const { portletType } = model as Required<IDBPortletPart>;
+  const { portletType, sysPFPluginId, appId } =
+    model as Required<IDBPortletPart>;
 
-  // 找门户部件成员类型
-  if (!provider) {
-    provider = getProvider(portletType);
+  // 找插件适配器
+  if (sysPFPluginId) {
+    const pluginKey = await getPluginRegisterKey(sysPFPluginId, appId);
+    if (pluginKey) {
+      provider = getProvider(pluginKey);
+    }
+    if (!provider) {
+      ibiz.log.error(`找不到门户部件插件${pluginKey}对应的适配器`);
+    } else {
+      return provider;
+    }
   }
+
+  // 找门户部件成员类型
+  provider = getProvider(portletType);
   if (!provider) {
     ibiz.log.error(`找不到门户部件成员类型${portletType}对应的适配器`);
+  } else {
+    return provider;
   }
-
-  return provider;
 }

package/src/register/helper/ui-action-register.ts

@@ -1,6 +1,7 @@
 import { RuntimeError } from '@ibiz-template/core';
 import { IAppUIAction } from '@ibiz/model-core';
 import { IUIActionProvider } from '../../interface';
+import { getPluginRegisterKey } from './common-register';
 
 /** 界面行为适配器前缀 */
 export const UIACTION_PROVIDER_PREFIX = 'UIACTION';
@@ -38,15 +39,27 @@ export async function getUIActionProvider(
   model: IAppUIAction,
 ): Promise<IUIActionProvider> {
   let provider: IUIActionProvider | undefined;
-  const { uiactionMode } = model as Required<IAppUIAction>;
+  const { uiactionMode, sysPFPluginId, appId } =
+    model as Required<IAppUIAction>;
 
-  // 找界面行为类型
-  if (!provider) {
-    provider = getProvider(uiactionMode);
+  // 找插件适配器
+  if (sysPFPluginId) {
+    const pluginKey = await getPluginRegisterKey(sysPFPluginId, appId);
+    if (pluginKey) {
+      provider = getProvider(pluginKey);
+    }
+    if (!provider) {
+      ibiz.log.error(`找不到界面行为插件${pluginKey}对应的适配器`);
+    } else {
+      return provider;
+    }
   }
+
+  // 找界面行为类型
+  provider = getProvider(uiactionMode);
   if (!provider) {
     throw new RuntimeError(`找不界面行为模式${uiactionMode}对应的适配器`);
+  } else {
+    return provider;
   }
-
-  return provider;
 }