@ibiz-template/runtime 0.7.41-alpha.124 → 0.7.41-alpha.126

package/out/ui-logic/ui-logic.js

@@ -1,9 +1,9 @@
 /* eslint-disable no-await-in-loop */
-import { IBizContext, ModelError, RuntimeModelError, } from '@ibiz-template/core';
+import { IBizContext, RuntimeModelError } from '@ibiz-template/core';
 import { clone } from 'ramda';
 import { UILogicContext } from './ui-logic-context';
-import { AppendParamNode, BindParamNode, CopyParamNode, DataSetNode, DEActionNode, DebugParamNode, DEUIActionNode, EndNode, ExecuteDELogicNode, MsgBoxNode, PFPluginNode, PrepareJSParamNode, RawJSCodeNode, RenewParamNode, ResetParamNode, SortParamNode, StartNode, ThrowExceptionNode, ViewCtrlFireEventNode, ViewCtrlInvokeNode, } from './ui-logic-node';
 import { UILogicParam } from './ui-logic-param/ui-logic-param';
+import { getUILogicNodeProvider } from '../register';
 /**
  * 界面逻辑
  *
@@ -15,20 +15,20 @@ import { UILogicParam } from './ui-logic-param/ui-logic-param';
 export class UILogic {
     /**
      * Creates an instance of UILogic.
-     * @author chitanda
-     * @date 2023-02-08 17:02:26
      * @param {IDEUILogic} model
+     * @param {IAppDataEntity} entity
+     * @memberof UILogic
      */
-    constructor(model) {
-        var _a;
+    constructor(model, entity) {
         this.model = model;
+        this.entity = entity;
         /**
          * 所有节点实例
          *
          * @author chitanda
          * @date 2023-02-08 21:02:38
          * @protected
-         * @type {Map<string, UILogicNode>}
+         * @type {Map<string, IUILogicNode>}
          */
         this.nodes = new Map();
         /**
@@ -40,83 +40,22 @@ export class UILogic {
          * @type {Map<string, UILogicParam>}
          */
         this.params = new Map();
-        if (!((_a = model.deuilogicNodes) === null || _a === void 0 ? void 0 : _a.length)) {
-            throw new RuntimeModelError(model, ibiz.i18n.t('runtime.uiLogic.noLogicalNodesConfigured'));
+    }
+    /**
+     * @description 初始化
+     * @returns {*}  {Promise<void>}
+     * @memberof UILogic
+     */
+    async init() {
+        var _a;
+        if (!((_a = this.model.deuilogicNodes) === null || _a === void 0 ? void 0 : _a.length)) {
+            throw new RuntimeModelError(this.model, ibiz.i18n.t('runtime.uiLogic.noLogicalNodesConfigured'));
         }
-        model.deuilogicNodes.forEach(node => {
-            const { logicNodeType } = node;
-            let logicNode;
-            switch (logicNodeType) {
-                case 'BEGIN': // 开始
-                    logicNode = new StartNode(node);
-                    break;
-                case 'END': // 结束
-                    logicNode = new EndNode(node);
-                    break;
-                case 'DEACTION': // 实体行为
-                    logicNode = new DEActionNode(node);
-                    break;
-                case 'DEUIACTION': // 实体界面行为调用
-                    logicNode = new DEUIActionNode(node);
-                    break;
-                case 'PREPAREJSPARAM': // 准备参数
-                    logicNode = new PrepareJSParamNode(node);
-                    break;
-                case 'RESETPARAM': // 重置参数
-                    logicNode = new ResetParamNode(node);
-                    break;
-                case 'COPYPARAM': // 拷贝参数
-                    logicNode = new CopyParamNode(node);
-                    break;
-                case 'BINDPARAM': // 绑定参数
-                    logicNode = new BindParamNode(node);
-                    break;
-                case 'VIEWCTRLINVOKE': // 视图部件调用
-                    logicNode = new ViewCtrlInvokeNode(node);
-                    break;
-                case 'MSGBOX': // 消息弹窗
-                    logicNode = new MsgBoxNode(node);
-                    break;
-                case 'DEBUGPARAM': // 调试逻辑参数
-                    logicNode = new DebugParamNode(node);
-                    break;
-                case 'APPENDPARAM': // 附加到数组参数
-                    logicNode = new AppendParamNode(node);
-                    break;
-                case 'SORTPARAM': // 排序数组参数
-                    logicNode = new SortParamNode(node);
-                    break;
-                case 'RENEWPARAM': // 重新建立参数
-                    logicNode = new RenewParamNode(node);
-                    break;
-                case 'DEDATASET': // 实体数据集
-                    logicNode = new DataSetNode(node);
-                    break;
-                case 'THROWEXCEPTION': // 抛出异常
-                    logicNode = new ThrowExceptionNode(node);
-                    break;
-                case 'VIEWCTRLFIREEVENT': // 视图部件事件触发
-                    logicNode = new ViewCtrlFireEventNode(node);
-                    break;
-                case 'DELOGIC': // 实体逻辑
-                    logicNode = new ExecuteDELogicNode(node);
-                    break;
-                case 'PFPLUGIN': // 前端插件调用
-                    logicNode = new PFPluginNode(node);
-                    break;
-                case 'RAWJSCODE':
-                    logicNode = new RawJSCodeNode(node);
-                    break;
-                default:
-                    throw new ModelError(node, ibiz.i18n.t('runtime.deLogic.deLogicNode.unsupportedLogical', {
-                        logicNodeType,
-                    }));
-            }
-            this.nodes.set(node.id, logicNode);
-        });
-        model.deuilogicParams.forEach(param => {
-            this.params.set(param.id, new UILogicParam(param));
-        });
+        await Promise.all(this.model.deuilogicNodes.map(async (node) => {
+            const provider = await getUILogicNodeProvider(node, this.model, this.entity);
+            if (provider)
+                this.nodes.set(node.id, provider);
+        }));
         // 将已经实例化的逻辑节点挂载到逻辑连接上
         this.nodes.forEach(node => {
             node.links.forEach(link => {
@@ -126,17 +65,15 @@ export class UILogic {
                 }
             });
         });
+        this.model.deuilogicParams.forEach(param => {
+            this.params.set(param.id, new UILogicParam(param));
+        });
     }
     /**
-     * 初始化逻辑参数
-     *
-     * @author chitanda
-     * @date 2023-02-08 21:02:58
+     * @description 初始化逻辑参数
      * @protected
      * @param {UILogicContext} ctx
-     * @param {IContext} context
-     * @param {IData} data
-     * @param {IParams} [opt]
+     * @memberof UILogic
      */
     initLogicParams(ctx) {
         this.params.forEach(param => {
@@ -147,14 +84,10 @@ export class UILogic {
         });
     }
     /**
-     * 执行视图逻辑
-     *
-     * @author chitanda
-     * @date 2023-02-08 21:02:09
-     * @param {IContext} context
-     * @param {IData} data
-     * @param {IParams} [opt]
-     * @return {*}  {Promise<IData>}
+     * @description 执行逻辑
+     * @param {IUILogicParams} parameters 逻辑参数
+     * @returns {*}  {Promise<unknown>}
+     * @memberof UILogic
      */
     async exec(parameters) {
         // 克隆传入应用上下文参数和视图参数
@@ -179,18 +112,12 @@ export class UILogic {
         return null;
     }
     /**
-     * 开始根据连线递归执行逻辑
-     *
-     * @author chitanda
-     * @date 2023-02-09 15:02:32
+     * @description 开始根据连线递归执行逻辑
      * @protected
-     * @param {UILogicNode} node
+     * @param {IUILogicNode} node
      * @param {UILogicContext} ctx
-     * @param {IContext} context
-     * @param {(IData[] | null)} data
-     * @param {IParams} params
-     * @param {IParams} [opt]
-     * @return {*}  {(Promise<IData | null>)}
+     * @returns {*}  {Promise<void>}
+     * @memberof UILogic
      */
     async deepExec(node, ctx) {
         // 执行逻辑节点

package/out/utils/dr-ctrl-util/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/utils/dr-ctrl-util/index.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,gBAAgB,EAChB,gBAAgB,EAChB,gBAAgB,EACjB,MAAM,iBAAiB,CAAC;AAEzB,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAI3C;;;;;;;;;GASG;AACH,wBAAgB,wBAAwB,CACtC,IAAI,EAAE,gBAAgB,GAAG,gBAAgB,EACzC,OAAO,CAAC,EAAE,UAAU,GACnB,OAAO,GAAG,SAAS,CAiBrB;AAED;;;;;;;;;;;;;GAaG;AACH,wBAAsB,eAAe,CACnC,IAAI,EAAE,gBAAgB,GAAG,gBAAgB,EACzC,OAAO,EAAE,QAAQ,EACjB,MAAM,EAAE,OAAO,EACf,OAAO,EAAE,MAAM,EACf,KAAK,EAAE,MAAM,EACb,IAAI,CAAC,EAAE,KAAK,GACX,OAAO,CAAC,OAAO,GAAG,SAAS,CAAC,CAoC9B;AAED;;;;;;;;GAQG;AACH,wBAAsB,mBAAmB,CACvC,IAAI,EAAE,KAAK,EACX,OAAO,EAAE,QAAQ,EACjB,eAAe,EAAE,MAAM,GACtB,OAAO,CAAC,KAAK,CAAC,CA0BhB;AAED;;;;;;;;;;;;;;;;;;;GAmBG;AACH,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,OAAO,GAAG,gBAAgB,EAAE,CA8BxE"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/utils/dr-ctrl-util/index.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,gBAAgB,EAChB,gBAAgB,EAChB,gBAAgB,EACjB,MAAM,iBAAiB,CAAC;AAEzB,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAI3C;;;;;;;;;GASG;AACH,wBAAgB,wBAAwB,CACtC,IAAI,EAAE,gBAAgB,GAAG,gBAAgB,EACzC,OAAO,CAAC,EAAE,UAAU,GACnB,OAAO,GAAG,SAAS,CAiBrB;AAED;;;;;;;;;;;;;GAaG;AACH,wBAAsB,eAAe,CACnC,IAAI,EAAE,gBAAgB,GAAG,gBAAgB,EACzC,OAAO,EAAE,QAAQ,EACjB,MAAM,EAAE,OAAO,EACf,OAAO,EAAE,MAAM,EACf,KAAK,EAAE,MAAM,EACb,IAAI,CAAC,EAAE,KAAK,GACX,OAAO,CAAC,OAAO,GAAG,SAAS,CAAC,CA0C9B;AAED;;;;;;;;GAQG;AACH,wBAAsB,mBAAmB,CACvC,IAAI,EAAE,KAAK,EACX,OAAO,EAAE,QAAQ,EACjB,eAAe,EAAE,MAAM,GACtB,OAAO,CAAC,KAAK,CAAC,CA0BhB;AAED;;;;;;;;;;;;;;;;;;;GAmBG;AACH,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,OAAO,GAAG,gBAAgB,EAAE,CA8BxE"}

package/out/utils/dr-ctrl-util/index.js

@@ -55,7 +55,7 @@ export async function calcItemVisible(item, context, params, appDeId, appId, dat
         const entityModel = await ibiz.hub.getAppDataEntity(appDeId, appId);
         const deLogic = findDELogic(testAppDELogicId, entityModel);
         if (deLogic) {
-            const result = await execDELogicAction(deLogic, context, data, params);
+            const result = await execDELogicAction(deLogic, entityModel, context, data, params);
             return !!result.data;
         }
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ibiz-template/runtime",
-  "version": "0.7.41-alpha.124",
+  "version": "0.7.41-alpha.126",
   "description": "运行时逻辑库",
   "type": "module",
   "main": "out/index.js",
@@ -70,5 +70,5 @@
     "qx-util": "^0.4.8",
     "ramda": "^0.29.0"
   },
-  "gitHead": "a0501c822177c396a8209d3cee75a9a2c494e46a"
+  "gitHead": "1dc811502125ae2ca520bc1ad303a1a8d5b63b66"
 }

package/src/application.ts

@@ -169,6 +169,7 @@ export class Application implements IAppService {
     await this.loadAppModelStyle();
     await this.loadAppLang();
     await this.loadGlobalAppUtil();
+    await this.loadExtensionPlugin();
     await this.loadReplaceDefaultPlugin();
   }
 
@@ -236,6 +237,28 @@ export class Application implements IAppService {
     await ibiz.plugin.loadPlugin(globalAppUtilPlugin as ISysPFPlugin);
   }
 
+  /**
+   * @description 加载扩展插件
+   * @protected
+   * @returns {*}  {Promise<void>}
+   * @memberof Application
+   */
+  protected async loadExtensionPlugin(): Promise<void> {
+    try {
+      await ibiz.plugin.loadPlugin({
+        runtimeObject: true,
+        rtobjectName: 'ExtensionPlugin',
+        rtobjectRepo: `${ibiz.env.baseUrl}/${this.appId}${ibiz.env.remoteModelUrl}/ext`,
+      } as IAppPFPluginRef);
+    } catch (error) {
+      ibiz.log.warn(
+        ibiz.i18n.t('runtime.application.noExtensionPlugin', {
+          appId: this.appId,
+        }),
+      );
+    }
+  }
+
   /**
    * @description 加载替换默认插件（仅主应用执行）
    * @protected

package/src/controller/control/app-menu/app-menu.controller.ts

@@ -407,7 +407,7 @@ export class AppMenuController
   protected async initAppMenuItemProviders(): Promise<void> {
     await Promise.all(
       this.allAppMenuItems.map(async item => {
-        const provider = await getAppMenuItemProvider(item);
+        const provider = await getAppMenuItemProvider(item, this.model);
         if (provider) {
           this.itemProviders[item.id!] = provider;
         }

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

@@ -224,7 +224,6 @@ export class FormItemController
     if (this.model.editor && this.model.editor.editorType !== 'HIDDEN') {
       this.editorProvider = await getEditorProvider(
         this.model.editor,
-        this.model,
         this.form.model,
       );
       if (this.editorProvider) {

package/src/controller/control/grid/grid-column/grid-field-column/grid-field-column.controller.ts

@@ -151,7 +151,6 @@ export class GridFieldColumnController
     ) {
       this.filterEditorProvider = await getEditorProvider(
         filterEditor,
-        this.model,
         this.grid.model,
       );
       if (this.filterEditorProvider) {

package/src/controller/control/grid/grid-column/grid-field-edit-column/grid-field-edit-column.controller.ts

@@ -133,7 +133,6 @@ export class GridFieldEditColumnController
       ) {
         this.editorProvider = await getEditorProvider(
           this.editItem.editor,
-          this.model,
           this.grid.model,
         );
         if (this.editorProvider) {

package/src/controller/control/toolbar/toolbar.controller.ts

@@ -262,7 +262,7 @@ export class ToolbarController<
   protected async initToolbarItemProviders(): Promise<void> {
     await Promise.all(
       this.allToolbarItems.map(async item => {
-        const provider = await getToolbarItemProvider(item);
+        const provider = await getToolbarItemProvider(item, this.model);
         if (provider) {
           this.itemProviders[item.id!] = provider;
         }

package/src/controller/control/tree/tree.service.ts

@@ -654,6 +654,7 @@ export class TreeService<
       if (deLogic) {
         const response = await execDELogicAction(
           deLogic,
+          entityModel,
           context,
           parentNodeData?._deData,
           params,

package/src/controller/utils/view-msg/view-msg-controller.ts

@@ -226,7 +226,13 @@ export class ViewMsgController {
       );
       const deLogic = findDELogic(testAppDELogicId, entityModel);
       if (deLogic) {
-        const result = await execDELogicAction(deLogic, context, data, params);
+        const result = await execDELogicAction(
+          deLogic,
+          entityModel,
+          context,
+          data,
+          params,
+        );
         return !!result.data;
       }
     }

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

@@ -1,5 +1,5 @@
-import { isArray } from 'lodash-es';
 import { DELogicParam } from './de-logic-param/de-logic-param';
+import { IDeLogicContext, IDeLogicParams } from '../interface';
 
 /**
  * 实体逻辑执行上下文
@@ -9,7 +9,7 @@ import { DELogicParam } from './de-logic-param/de-logic-param';
  * @export
  * @class DELogicContext
  */
-export class DELogicContext {
+export class DELogicContext implements IDeLogicContext {
   /**
    * 上一次返回值
    * @author lxm
@@ -18,14 +18,6 @@ export class DELogicContext {
    */
   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 };
-
   /**
    * 上下文
    */
@@ -64,12 +56,8 @@ export class DELogicContext {
    */
   constructor(
     private deLogicParams: Map<string, DELogicParam>,
-    context: IContext,
-    data: IData | IData[],
-    params: IParams,
-  ) {
-    this.parameters = { context, data: isArray(data) ? data : [data], params };
-  }
+    public parameters: IDeLogicParams,
+  ) {}
 
   /**
    * 重置实体逻辑参数

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

@@ -1,9 +1,21 @@
+import { IDeLogicContext, IDeLogicLinkCond } from '../../../interface';
+
 /**
- * 界面逻辑连接条件
- *
- * @author lxm
- * @date 2023-02-10 15:02:28
+ * @description 实体逻辑连接条件
  * @export
+ * @abstract
  * @class DELogicLinkCond
+ * @implements {IDELogicLinkCond}
  */
-export abstract class DELogicLinkCond {}
+export abstract class DELogicLinkCond implements IDeLogicLinkCond {
+  /**
+   * @description 条件判断
+   * @abstract
+   * @param {IDeLogicContext} ctx 实体逻辑执行上下文
+   * @param {IContext} context 上下文
+   * @param {IData} data 数据
+   * @returns {*}  {boolean}
+   * @memberof DELogicLinkCond
+   */
+  abstract test(ctx: IDeLogicContext, context: IContext, data: IData): boolean;
+}

package/src/de-logic/de-logic-link/de-logic-link-group-cond/de-logic-link-group-cond.ts

@@ -6,6 +6,7 @@ import {
 import { DELogicContext } from '../../de-logic-context';
 import { DELogicLinkCond } from '../de-logic-link-cond/de-logic-link-cond';
 import { DELogicLinkSingleCond } from '../de-logic-link-single-cond/de-logic-link-single-cond';
+import { IDeLogicLinkGroupCond } from '../../../interface';
 
 /**
  * 界面逻辑连接条件组
@@ -16,7 +17,10 @@ import { DELogicLinkSingleCond } from '../de-logic-link-single-cond/de-logic-lin
  * @class DELogicLinkGroupCond
  * @extends {DELogicLinkCond}
  */
-export class DELogicLinkGroupCond extends DELogicLinkCond {
+export class DELogicLinkGroupCond
+  extends DELogicLinkCond
+  implements IDeLogicLinkGroupCond
+{
   /**
    * 操作标识
    *

package/src/de-logic/de-logic-link/de-logic-link-single-cond/de-logic-link-single-cond.ts

@@ -4,6 +4,7 @@ import { IDELogicLinkSingleCond } from '@ibiz/model-core';
 import { testCond } from '../../../utils';
 import { DELogicContext } from '../../de-logic-context';
 import { DELogicLinkCond } from '../de-logic-link-cond/de-logic-link-cond';
+import { IDeLogicLinkSingleCond } from '../../../interface';
 
 /**
  * 界面逻辑连接条件项
@@ -14,7 +15,10 @@ import { DELogicLinkCond } from '../de-logic-link-cond/de-logic-link-cond';
  * @class DELogicLinkSingleCond
  * @extends {DELogicLinkCond}
  */
-export class DELogicLinkSingleCond extends DELogicLinkCond {
+export class DELogicLinkSingleCond
+  extends DELogicLinkCond
+  implements IDeLogicLinkSingleCond
+{
   /**
    * 源参数
    *

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

@@ -2,15 +2,15 @@ import { IDELogicLink } from '@ibiz/model-core';
 import { DELogicContext } from '../de-logic-context';
 import { DELogicNode } from '../de-logic-node/de-logic-node';
 import { DELogicLinkGroupCond } from './de-logic-link-group-cond/de-logic-link-group-cond';
+import { IDeLogicLink, IDeLogicLinkGroupCond } from '../../interface';
 
 /**
- *
- * @author lxm
- * @date 2023-02-08 16:02:10
+ * @description 实体逻辑连线
  * @export
  * @class DELogicLink
+ * @implements {IDeLogicLink}
  */
-export class DELogicLink {
+export class DELogicLink implements IDeLogicLink {
   /**
    * 源节点
    *
@@ -34,9 +34,9 @@ export class DELogicLink {
    *
    * @author lxm
    * @date 2023-02-15 17:02:49
-   * @type {(DELogicLinkGroupCond | null)}
+   * @type {(IDeLogicLinkGroupCond | null)}
    */
-  groupCond: DELogicLinkGroupCond | null = null;
+  groupCond: IDeLogicLinkGroupCond | null = null;
 
   /**
    * Creates an instance of DELogicLink.

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

@@ -1,6 +1,7 @@
 import { IDELogicNode } from '@ibiz/model-core';
 import { DELogicContext } from '../de-logic-context';
 import { DELogicLink } from '../de-logic-link/de-logic-link';
+import { IDeLogicNode } from '../../interface';
 
 /**
  * 逻辑节点
@@ -10,7 +11,7 @@ import { DELogicLink } from '../de-logic-link/de-logic-link';
  * @export
  * @class DELogicNode
  */
-export abstract class DELogicNode {
+export abstract class DELogicNode implements IDeLogicNode {
   /**
    * 节点连接
    *

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

@@ -11,3 +11,4 @@ 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';