@ibiz-template/runtime 0.0.3-beta.6 → 0.0.4-beta.1

package/out/controller/view/wf-dyna-start-view.js

@@ -42,7 +42,7 @@ export class WFDynaStartViewController extends WFEditViewController {
     async onOkButtonClick() {
         // 先保存数据在启动工作流
         await this.save();
-        await this.nerve.form.call.wfStart();
+        await this.nerve.form.wfStart();
         await this.closeView({ ok: true, data: this.getData() });
     }
     /**

package/out/controller/view/wf-edit-view.d.ts

@@ -1,4 +1,4 @@
-import { WFEditViewModel, EditFormModel } from '@ibiz-template/model';
+import { WFEditViewModel, IDEEditForm } from '@ibiz/model-core';
 import { WFEditViewNerve } from '..';
 import { EditViewController } from '.';
 /**
@@ -24,9 +24,9 @@ export declare class WFEditViewController<T extends WFEditViewModel = WFEditView
      *
      * @author lxm
      * @date 2022-09-29 17:09:44
-     * @type {EditFormModel}
+     * @type {IDEEditForm}
      */
-    activeForm?: EditFormModel;
+    activeForm?: IDEEditForm;
     /**
      * 是否已经完成视图的第一次加载
      *

package/out/controller/view/wf-edit-view.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"wf-edit-view.d.ts","sourceRoot":"","sources":["../../../src/controller/view/wf-edit-view.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AACtE,OAAO,EAAE,eAAe,EAAE,MAAM,IAAI,CAAC;AACrC,OAAO,EAAE,kBAAkB,EAAE,MAAM,GAAG,CAAC;AAEvC;;;;;;;;GAQG;AACH,qBAAa,oBAAoB,CAC/B,CAAC,SAAS,eAAe,GAAG,eAAe,CAC3C,SAAQ,kBAAkB,CAAC,CAAC,CAAC;IAC7B;;;;;;OAMG;IACH,UAAU,EAAE,OAAO,CAAS;IAE5B;;;;;;OAMG;IACH,UAAU,CAAC,EAAE,aAAa,CAAC;IAE3B;;;;;;OAMG;IACH,aAAa,EAAE,OAAO,CAAS;IAEvB,KAAK,EAAE,eAAe,CAAC;IAE/B,SAAS,CAAC,WAAW,IAAI,eAAe;cAIxB,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAMjC,IAAI,IAAI,OAAO,CAAC,KAAK,CAAC;IAM5B;;;;;;OAMG;IACG,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAS9B;;;;;;OAMG;IACG,cAAc,IAAI,OAAO,CAAC,IAAI,CAAC;IAerC;;;;;OAKG;IACI,aAAa;CAMrB"}
+{"version":3,"file":"wf-edit-view.d.ts","sourceRoot":"","sources":["../../../src/controller/view/wf-edit-view.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAChE,OAAO,EAAE,eAAe,EAAE,MAAM,IAAI,CAAC;AACrC,OAAO,EAAE,kBAAkB,EAAE,MAAM,GAAG,CAAC;AAEvC;;;;;;;;GAQG;AACH,qBAAa,oBAAoB,CAC/B,CAAC,SAAS,eAAe,GAAG,eAAe,CAC3C,SAAQ,kBAAkB,CAAC,CAAC,CAAC;IAC7B;;;;;;OAMG;IACH,UAAU,EAAE,OAAO,CAAS;IAE5B;;;;;;OAMG;IACH,UAAU,CAAC,EAAE,WAAW,CAAC;IAEzB;;;;;;OAMG;IACH,aAAa,EAAE,OAAO,CAAS;IAEvB,KAAK,EAAE,eAAe,CAAC;IAE/B,SAAS,CAAC,WAAW,IAAI,eAAe;cAIxB,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAMjC,IAAI,IAAI,OAAO,CAAC,KAAK,CAAC;IAM5B;;;;;;OAMG;IACG,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAS9B;;;;;;OAMG;IACG,cAAc,IAAI,OAAO,CAAC,IAAI,CAAC;IAerC;;;;;OAKG;IACI,aAAa;CAMrB"}

package/out/controller/view/wizard-view.d.ts

@@ -1,4 +1,4 @@
-import { WizardViewModel } from '@ibiz-template/model';
+import { WizardViewModel } from '@ibiz/model-core';
 import { WizardViewNerve } from '../neuron';
 import { ViewController } from './view';
 /**

package/out/controller/view/wizard-view.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"wizard-view.d.ts","sourceRoot":"","sources":["../../../src/controller/view/wizard-view.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AACvD,OAAO,EAAE,eAAe,EAAE,MAAM,WAAW,CAAC;AAC5C,OAAO,EAAE,cAAc,EAAE,MAAM,QAAQ,CAAC;AAExC;;;;;;;;GAQG;AACH,qBAAa,oBAAoB,CAC/B,CAAC,SAAS,eAAe,GAAG,eAAe,CAC3C,SAAQ,cAAc,CAAC,CAAC,CAAC;IACjB,KAAK,EAAE,eAAe,CAAC;IAE/B,SAAS,CAAC,WAAW,IAAI,eAAe;cAIxB,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAevC;;;;;OAKG;IACG,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAKjC;;;;;;OAMG;IACH,aAAa,IAAI,IAAI;CAGtB"}
+{"version":3,"file":"wizard-view.d.ts","sourceRoot":"","sources":["../../../src/controller/view/wizard-view.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AACnD,OAAO,EAAE,eAAe,EAAE,MAAM,WAAW,CAAC;AAC5C,OAAO,EAAE,cAAc,EAAE,MAAM,QAAQ,CAAC;AAExC;;;;;;;;GAQG;AACH,qBAAa,oBAAoB,CAC/B,CAAC,SAAS,eAAe,GAAG,eAAe,CAC3C,SAAQ,cAAc,CAAC,CAAC,CAAC;IACjB,KAAK,EAAE,eAAe,CAAC;IAE/B,SAAS,CAAC,WAAW,IAAI,eAAe;cAIxB,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAevC;;;;;OAKG;IACG,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAKjC;;;;;;OAMG;IACH,aAAa,IAAI,IAAI;CAGtB"}

package/out/controller/view/wizard-view.js

@@ -20,7 +20,7 @@ export class WizardViewController extends ViewController {
         if (wizardPanel) {
             this.providers[wizardPanel.name] = await ibiz.register.control.get(wizardPanel);
         }
-        this.nerve.self.evt.on('mounted', () => {
+        this.nerve.self.on('onMounted', () => {
             this.initialize();
         });
     }
@@ -32,7 +32,7 @@ export class WizardViewController extends ViewController {
      */
     async initialize() {
         const { wizardPanel } = this.nerve;
-        await wizardPanel.call.initialize();
+        await wizardPanel.initialize();
     }
     /**
      * 处理向导面板完成之后

package/out/de-logic/de-logic-context.d.ts

@@ -8,23 +8,45 @@ import { DELogicParam } from './de-logic-param/de-logic-param';
  * @class DELogicContext
  */
 export declare class DELogicContext {
-    deLogicParams: Map<string, DELogicParam>;
+    private deLogicParams;
+    context: IParams;
+    data: IDatum;
+    viewParams: IParams;
+    opt?: IParams | undefined;
     /**
      * Creates an instance of DELogicContext.
      * @author lxm
-     * @date 2023-03-17 05:55:18
+     * @date 2023-03-24 09:15:14
      * @param {Map<string, DELogicParam>} deLogicParams 实体逻辑参数集合
+     * @param {IParams} context 上下文
+     * @param {IDatum} data 数据对象
+     * @param {IParams} viewParams 视图参数
+     * @param {IParams} [opt] 额外参数
      */
-    constructor(deLogicParams: Map<string, DELogicParam>);
+    constructor(deLogicParams: Map<string, DELogicParam>, context: IParams, data: IDatum, viewParams: IParams, opt?: IParams | undefined);
+    /**
+     * 重置实体逻辑参数
+     * @author lxm
+     * @date 2023-03-24 09:18:02
+     * @param {string} name
+     */
+    resetParam(name: string): void;
+    /**
+     * 重新建立变量
+     * @author lxm
+     * @date 2023-03-24 09:20:24
+     * @param {string} name
+     */
+    renewParam(name: string): void;
     /**
      * 实体逻辑参数
      *
      * @description 实体逻辑参数初始化时设置
      * @author lxm
      * @date 2023-02-08 17:02:38
-     * @type {Record<string, IData>}
+     * @type {Record<string, any>}
      */
-    params: Record<string, IData>;
+    params: Record<string, any>;
     /**
      * UI逻辑执行返回值
      *

package/out/de-logic/de-logic-context.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"de-logic-context.d.ts","sourceRoot":"","sources":["../../src/de-logic/de-logic-context.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAE/D;;;;;;;GAOG;AACH,qBAAa,cAAc;IAON,aAAa,EAAE,GAAG,CAAC,MAAM,EAAE,YAAY,CAAC;IAN3D;;;;;OAKG;gBACgB,aAAa,EAAE,GAAG,CAAC,MAAM,EAAE,YAAY,CAAC;IAE3D;;;;;;;OAOG;IACH,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,CAAM;IAEnC;;;;;;OAMG;IACH,MAAM,EAAE,OAAO,CAAQ;IAEvB;;;;;;OAMG;IACH,SAAS,EAAE,OAAO,CAAS;IAE3B;;;;;;OAMG;IACH,gBAAgB,EAAE,MAAM,CAAa;CACtC"}
+{"version":3,"file":"de-logic-context.d.ts","sourceRoot":"","sources":["../../src/de-logic/de-logic-context.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAE/D;;;;;;;GAOG;AACH,qBAAa,cAAc;IAYvB,OAAO,CAAC,aAAa;IACd,OAAO,EAAE,OAAO;IAChB,IAAI,EAAE,MAAM;IACZ,UAAU,EAAE,OAAO;IACnB,GAAG,CAAC;IAfb;;;;;;;;;OASG;gBAEO,aAAa,EAAE,GAAG,CAAC,MAAM,EAAE,YAAY,CAAC,EACzC,OAAO,EAAE,OAAO,EAChB,IAAI,EAAE,MAAM,EACZ,UAAU,EAAE,OAAO,EACnB,GAAG,CAAC,qBAAS;IAGtB;;;;;OAKG;IACH,UAAU,CAAC,IAAI,EAAE,MAAM;IAIvB;;;;;OAKG;IACH,UAAU,CAAC,IAAI,EAAE,MAAM;IAIvB;;;;;;;OAOG;IAEH,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAM;IAEjC;;;;;;OAMG;IACH,MAAM,EAAE,OAAO,CAAQ;IAEvB;;;;;;OAMG;IACH,SAAS,EAAE,OAAO,CAAS;IAE3B;;;;;;OAMG;IACH,gBAAgB,EAAE,MAAM,CAAa;CACtC"}

package/out/de-logic/de-logic-context.js

@@ -10,19 +10,28 @@ export class DELogicContext {
     /**
      * Creates an instance of DELogicContext.
      * @author lxm
-     * @date 2023-03-17 05:55:18
+     * @date 2023-03-24 09:15:14
      * @param {Map<string, DELogicParam>} deLogicParams 实体逻辑参数集合
+     * @param {IParams} context 上下文
+     * @param {IDatum} data 数据对象
+     * @param {IParams} viewParams 视图参数
+     * @param {IParams} [opt] 额外参数
      */
-    constructor(deLogicParams) {
+    constructor(deLogicParams, context, data, viewParams, opt) {
         this.deLogicParams = deLogicParams;
+        this.context = context;
+        this.data = data;
+        this.viewParams = viewParams;
+        this.opt = opt;
         /**
          * 实体逻辑参数
          *
          * @description 实体逻辑参数初始化时设置
          * @author lxm
          * @date 2023-02-08 17:02:38
-         * @type {Record<string, IData>}
+         * @type {Record<string, any>}
          */
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
         this.params = {};
         /**
          * UI逻辑执行返回值
@@ -49,4 +58,24 @@ export class DELogicContext {
          */
         this.defaultParamName = 'Default';
     }
+    /**
+     * 重置实体逻辑参数
+     * @author lxm
+     * @date 2023-03-24 09:18:02
+     * @param {string} name
+     */
+    resetParam(name) {
+        var _a;
+        (_a = this.deLogicParams.get(name)) === null || _a === void 0 ? void 0 : _a.calc(this);
+    }
+    /**
+     * 重新建立变量
+     * @author lxm
+     * @date 2023-03-24 09:20:24
+     * @param {string} name
+     */
+    renewParam(name) {
+        var _a;
+        (_a = this.deLogicParams.get(name)) === null || _a === void 0 ? void 0 : _a.renew(this);
+    }
 }

package/out/de-logic/de-logic-link/de-logic-link-group-cond/de-logic-link-group-cond.d.ts

@@ -1,4 +1,4 @@
-import { IPSDELogicLinkGroupCond } from '@ibiz-template/model';
+import { IDELogicLinkGroupCond } from '@ibiz/model-core';
 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';
@@ -12,7 +12,7 @@ import { DELogicLinkSingleCond } from '../de-logic-link-single-cond/de-logic-lin
  * @extends {DELogicLinkCond}
  */
 export declare class DELogicLinkGroupCond extends DELogicLinkCond {
-    model: IPSDELogicLinkGroupCond;
+    model: IDELogicLinkGroupCond;
     /**
      * 操作标识
      *
@@ -42,7 +42,7 @@ export declare class DELogicLinkGroupCond extends DELogicLinkCond {
      * @type {((DELogicLinkSingleCond | DELogicLinkGroupCond)[])}
      */
     protected conds: (DELogicLinkSingleCond | DELogicLinkGroupCond)[];
-    constructor(model: IPSDELogicLinkGroupCond);
+    constructor(model: IDELogicLinkGroupCond);
     /**
      * 条件判断
      *

package/out/de-logic/de-logic-link/de-logic-link-group-cond/de-logic-link-group-cond.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"de-logic-link-group-cond.d.ts","sourceRoot":"","sources":["../../../../src/de-logic/de-logic-link/de-logic-link-group-cond/de-logic-link-group-cond.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,uBAAuB,EACxB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AACxD,OAAO,EAAE,eAAe,EAAE,MAAM,0CAA0C,CAAC;AAC3E,OAAO,EAAE,qBAAqB,EAAE,MAAM,wDAAwD,CAAC;AAE/F;;;;;;;;GAQG;AACH,qBAAa,oBAAqB,SAAQ,eAAe;IAqCpC,KAAK,EAAE,uBAAuB;IApCjD;;;;;;;;OAQG;IACH,SAAS,KAAK,EAAE,IAAI,KAAK,GAAG,IAAI,CAE/B;IAED;;;;;;;;OAQG;IACH,SAAS,KAAK,OAAO,IAAI,OAAO,CAE/B;IAED;;;;;;;OAOG;IACH,SAAS,CAAC,KAAK,EAAE,CAAC,qBAAqB,GAAG,oBAAoB,CAAC,EAAE,CAAC;gBAE/C,KAAK,EAAE,uBAAuB;IAUjD;;;;;;;;;OASG;IACH,IAAI,CAAC,GAAG,EAAE,cAAc,EAAE,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,KAAK,GAAG,OAAO;CAqBlE"}
+{"version":3,"file":"de-logic-link-group-cond.d.ts","sourceRoot":"","sources":["../../../../src/de-logic/de-logic-link/de-logic-link-group-cond/de-logic-link-group-cond.ts"],"names":[],"mappings":"AAAA,OAAO,EAAqB,qBAAqB,EAAE,MAAM,kBAAkB,CAAC;AAC5E,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AACxD,OAAO,EAAE,eAAe,EAAE,MAAM,0CAA0C,CAAC;AAC3E,OAAO,EAAE,qBAAqB,EAAE,MAAM,wDAAwD,CAAC;AAE/F;;;;;;;;GAQG;AACH,qBAAa,oBAAqB,SAAQ,eAAe;IAqCpC,KAAK,EAAE,qBAAqB;IApC/C;;;;;;;;OAQG;IACH,SAAS,KAAK,EAAE,IAAI,KAAK,GAAG,IAAI,CAE/B;IAED;;;;;;;;OAQG;IACH,SAAS,KAAK,OAAO,IAAI,OAAO,CAE/B;IAED;;;;;;;OAOG;IACH,SAAS,CAAC,KAAK,EAAE,CAAC,qBAAqB,GAAG,oBAAoB,CAAC,EAAE,CAAM;gBAEpD,KAAK,EAAE,qBAAqB;IAU/C;;;;;;;;;OASG;IACH,IAAI,CAAC,GAAG,EAAE,cAAc,EAAE,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,KAAK,GAAG,OAAO;CAqBlE"}

package/out/de-logic/de-logic-link/de-logic-link-group-cond/de-logic-link-group-cond.js

@@ -1,6 +1,5 @@
-import { DefectModelError, } from '@ibiz-template/model';
+import { RuntimeModelError } from '@ibiz/model-core';
 import { DELogicLinkCond } from '../de-logic-link-cond/de-logic-link-cond';
-import { DELogicLinkSingleCond } from '../de-logic-link-single-cond/de-logic-link-single-cond';
 /**
  * 界面逻辑连接条件组
  *
@@ -33,17 +32,26 @@ export class DELogicLinkGroupCond extends DELogicLinkCond {
      * @type {boolean}
      */
     get reverse() {
-        return this.model.notMode;
+        return !!this.model.notMode;
     }
     constructor(model) {
         super();
         this.model = model;
-        const conds = model.getPSDELogicLinkConds() || [];
-        this.conds = conds.map(cond => {
-            return cond.logicType === 'SINGLE'
-                ? new DELogicLinkSingleCond(cond)
-                : new DELogicLinkGroupCond(cond);
-        });
+        /**
+         * 子条件
+         *
+         * @author lxm
+         * @date 2023-02-15 18:02:18
+         * @protected
+         * @type {((DELogicLinkSingleCond | DELogicLinkGroupCond)[])}
+         */
+        this.conds = [];
+        // const conds = model.getPSDELogicLinkConds() || [];
+        // this.conds = conds.map(cond => {
+        //   return cond.logicType === 'SINGLE'
+        //     ? new DELogicLinkSingleCond(cond as IDELogicLinkSingleCond)
+        //     : new DELogicLinkGroupCond(cond as IDELogicLinkGroupCond);
+        // });
     }
     /**
      * 条件判断
@@ -58,7 +66,7 @@ export class DELogicLinkGroupCond extends DELogicLinkCond {
     test(ctx, context, data) {
         let bol = true;
         if (this.conds.length === 0) {
-            throw new DefectModelError(this.model, `界面连接条件逻辑组未配置逻辑项`);
+            throw new RuntimeModelError(this.model, `界面连接条件逻辑组未配置逻辑项`);
         }
         for (let i = 0; i < this.conds.length; i++) {
             const cond = this.conds[i];

package/out/de-logic/de-logic-link/de-logic-link-single-cond/de-logic-link-single-cond.d.ts

@@ -1,4 +1,4 @@
-import { IPSDELogicLinkSingleCond } from '@ibiz-template/model';
+import { IDELogicLinkSingleCond } from '@ibiz/model-core';
 import { DELogicContext } from '../../de-logic-context';
 import { DELogicLinkCond } from '../de-logic-link-cond/de-logic-link-cond';
 /**
@@ -11,7 +11,7 @@ import { DELogicLinkCond } from '../de-logic-link-cond/de-logic-link-cond';
  * @extends {DELogicLinkCond}
  */
 export declare class DELogicLinkSingleCond extends DELogicLinkCond {
-    model: IPSDELogicLinkSingleCond;
+    model: IDELogicLinkSingleCond;
     /**
      * 源参数
      *
@@ -30,9 +30,9 @@ export declare class DELogicLinkSingleCond extends DELogicLinkCond {
     readonly dstParam: string;
     get dstField(): string;
     get op(): string;
-    get type(): string;
+    get type(): string | undefined;
     get value(): string;
-    constructor(model: IPSDELogicLinkSingleCond);
+    constructor(model: IDELogicLinkSingleCond);
     /**
      * 执行逻辑检测
      *

package/out/de-logic/de-logic-link/de-logic-link-single-cond/de-logic-link-single-cond.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"de-logic-link-single-cond.d.ts","sourceRoot":"","sources":["../../../../src/de-logic/de-logic-link/de-logic-link-single-cond/de-logic-link-single-cond.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,wBAAwB,EAEzB,MAAM,sBAAsB,CAAC;AAE9B,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AACxD,OAAO,EAAE,eAAe,EAAE,MAAM,0CAA0C,CAAC;AAE3E;;;;;;;;GAQG;AACH,qBAAa,qBAAsB,SAAQ,eAAe;IAmCrC,KAAK,EAAE,wBAAwB;IAlClD;;;;;;OAMG;IACH,QAAQ,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAE3B;;;;;;OAMG;IACH,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAE1B,IAAI,QAAQ,WAEX;IAED,IAAI,EAAE,WAEL;IAED,IAAI,IAAI,WAEP;IAED,IAAI,KAAK,WAER;gBAEkB,KAAK,EAAE,wBAAwB;IAUlD;;;;;;;;;OASG;IACH,IAAI,CAAC,GAAG,EAAE,cAAc,EAAE,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,KAAK,GAAG,OAAO;CAuBlE"}
+{"version":3,"file":"de-logic-link-single-cond.d.ts","sourceRoot":"","sources":["../../../../src/de-logic/de-logic-link/de-logic-link-single-cond/de-logic-link-single-cond.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,sBAAsB,EAAc,MAAM,kBAAkB,CAAC;AAEtE,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AACxD,OAAO,EAAE,eAAe,EAAE,MAAM,0CAA0C,CAAC;AAE3E;;;;;;;;GAQG;AACH,qBAAa,qBAAsB,SAAQ,eAAe;IAmCrC,KAAK,EAAE,sBAAsB;IAlChD;;;;;;OAMG;IACH,QAAQ,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAE3B;;;;;;OAMG;IACH,QAAQ,CAAC,QAAQ,EAAG,MAAM,CAAC;IAE3B,IAAI,QAAQ,WAEX;IAED,IAAI,EAAE,WAEL;IAED,IAAI,IAAI,uBAEP;IAED,IAAI,KAAK,WAER;gBAEkB,KAAK,EAAE,sBAAsB;IAUhD;;;;;;;;;OASG;IACH,IAAI,CAAC,GAAG,EAAE,cAAc,EAAE,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,KAAK,GAAG,OAAO;CAoBlE"}

package/out/de-logic/de-logic-link/de-logic-link-single-cond/de-logic-link-single-cond.js

@@ -1,4 +1,4 @@
-import { UnsupportedModelError, } from '@ibiz-template/model';
+import { ModelError } from '@ibiz/model-core';
 import { testCond } from '../../../utils';
 import { DELogicLinkCond } from '../de-logic-link-cond/de-logic-link-cond';
 /**
@@ -26,12 +26,12 @@ export class DELogicLinkSingleCond extends DELogicLinkCond {
     constructor(model) {
         super();
         this.model = model;
-        const src = model.getSrcLogicParam();
-        if (src) {
-            this.srcParam = src.codeName;
-        }
-        const dst = model.getDstLogicParam();
-        this.dstParam = dst.codeName;
+        // const src = model.getSrcLogicParam()!;
+        // if (src) {
+        //   this.srcParam = src.codeName;
+        // }
+        // const dst = model.getDstLogicParam()!;
+        // this.dstParam = dst.codeName;
     }
     /**
      * 执行逻辑检测
@@ -57,7 +57,7 @@ export class DELogicLinkSingleCond extends DELogicLinkCond {
                 return testCond(dst[this.dstField], this.op, src[this.value]);
             }
             case 'CURTIME': // 当前时间
-                throw new UnsupportedModelError(this.model, `暂未支持条件值类型为[当前时间]`);
+                throw new ModelError(this.model, `暂未支持条件值类型为[当前时间]`);
             default: // 直接使用目标对象参数属性和值做对比
                 return testCond(dst[this.dstField], this.op, this.value);
         }

package/out/de-logic/de-logic-link/de-logic-link.d.ts

@@ -1,4 +1,4 @@
-import { DELogicLinkModel } from '@ibiz-template/model';
+import { DELogicLinkModel } 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';
@@ -54,6 +54,6 @@ export declare class DELogicLink {
      * @param {IParams} [opt]
      * @return {*}  {Promise<boolean>} 是否连接成功
      */
-    exec(ctx: DELogicContext, context: IParams, data: IData | null, _params: IParams, _opt?: IParams): Promise<boolean>;
+    exec(ctx: DELogicContext): Promise<boolean>;
 }
 //# sourceMappingURL=de-logic-link.d.ts.map

package/out/de-logic/de-logic-link/de-logic-link.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"de-logic-link.d.ts","sourceRoot":"","sources":["../../../src/de-logic/de-logic-link/de-logic-link.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AACxD,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AACrD,OAAO,EAAE,WAAW,EAAE,MAAM,gCAAgC,CAAC;AAC7D,OAAO,EAAE,oBAAoB,EAAE,MAAM,qDAAqD,CAAC;AAE3F;;;;;;GAMG;AACH,qBAAa,WAAW;IAmCH,KAAK,EAAE,gBAAgB;IAlC1C;;;;;;OAMG;IACH,OAAO,EAAE,WAAW,GAAG,IAAI,CAAQ;IAEnC;;;;;;OAMG;IACH,OAAO,EAAE,WAAW,GAAG,IAAI,CAAQ;IAEnC;;;;;;OAMG;IACH,SAAS,EAAE,oBAAoB,GAAG,IAAI,CAAQ;IAE9C;;;;;;OAMG;gBACgB,KAAK,EAAE,gBAAgB;IAO1C;;;;;;;;;;OAUG;IACG,IAAI,CACR,GAAG,EAAE,cAAc,EACnB,OAAO,EAAE,OAAO,EAChB,IAAI,EAAE,KAAK,GAAG,IAAI,EAClB,OAAO,EAAE,OAAO,EAChB,IAAI,CAAC,EAAE,OAAO,GACb,OAAO,CAAC,OAAO,CAAC;CAQpB"}
+{"version":3,"file":"de-logic-link.d.ts","sourceRoot":"","sources":["../../../src/de-logic/de-logic-link/de-logic-link.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AACpD,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AACrD,OAAO,EAAE,WAAW,EAAE,MAAM,gCAAgC,CAAC;AAC7D,OAAO,EAAE,oBAAoB,EAAE,MAAM,qDAAqD,CAAC;AAE3F;;;;;;GAMG;AACH,qBAAa,WAAW;IAmCH,KAAK,EAAE,gBAAgB;IAlC1C;;;;;;OAMG;IACH,OAAO,EAAE,WAAW,GAAG,IAAI,CAAQ;IAEnC;;;;;;OAMG;IACH,OAAO,EAAE,WAAW,GAAG,IAAI,CAAQ;IAEnC;;;;;;OAMG;IACH,SAAS,EAAE,oBAAoB,GAAG,IAAI,CAAQ;IAE9C;;;;;;OAMG;gBACgB,KAAK,EAAE,gBAAgB;IAO1C;;;;;;;;;;OAUG;IACG,IAAI,CAAC,GAAG,EAAE,cAAc,GAAG,OAAO,CAAC,OAAO,CAAC;CAQlD"}

package/out/de-logic/de-logic-link/de-logic-link.js

@@ -40,7 +40,7 @@ export class DELogicLink {
          * @type {(DELogicLinkGroupCond | null)}
          */
         this.groupCond = null;
-        const cond = this.model.source.getPSDELogicLinkGroupCond();
+        const cond = this.model.delogicLinkGroupCond;
         if (cond) {
             this.groupCond = new DELogicLinkGroupCond(cond);
         }
@@ -56,12 +56,12 @@ export class DELogicLink {
      * @param {IParams} [opt]
      * @return {*}  {Promise<boolean>} 是否连接成功
      */
-    async exec(ctx, context, data, _params, _opt) {
+    async exec(ctx) {
         const { defaultLink } = this.model;
         if (defaultLink || !this.groupCond) {
             return true;
         }
         // 常规
-        return this.groupCond.test(ctx, context, data || {});
+        return this.groupCond.test(ctx, ctx.context, ctx.data || {});
     }
 }

package/out/de-logic/de-logic-node/append-param-node/append-param-node.d.ts

@@ -0,0 +1,15 @@
+import { DELogicContext } from '../../de-logic-context';
+import { DELogicNode } from '../de-logic-node';
+/**
+ * 附加到数组参数
+ *
+ * @author lxm
+ * @date 2023-02-09 21:02:20
+ * @export
+ * @class AppendParamNode
+ * @extends {DELogicNode}
+ */
+export declare class AppendParamNode extends DELogicNode {
+    exec(_ctx: DELogicContext): Promise<void>;
+}
+//# sourceMappingURL=append-param-node.d.ts.map

package/out/de-logic/de-logic-node/append-param-node/append-param-node.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"append-param-node.d.ts","sourceRoot":"","sources":["../../../../src/de-logic/de-logic-node/append-param-node/append-param-node.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AACxD,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAE/C;;;;;;;;GAQG;AACH,qBAAa,eAAgB,SAAQ,WAAW;IACxC,IAAI,CAAC,IAAI,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC;CAsBhD"}

package/out/de-logic/de-logic-node/append-param-node/append-param-node.js

@@ -0,0 +1,34 @@
+import { DELogicNode } from '../de-logic-node';
+/**
+ * 附加到数组参数
+ *
+ * @author lxm
+ * @date 2023-02-09 21:02:20
+ * @export
+ * @class AppendParamNode
+ * @extends {DELogicNode}
+ */
+export class AppendParamNode extends DELogicNode {
+    async exec(_ctx) {
+        // const source = this.model as IDEAppendParamLogic;
+        // // 目标逻辑参数
+        // const dstParam = source.getDstPSDELogicParam();
+        // // 源逻辑参数
+        // const srcParam = source.getSrcPSDELogicParam();
+        // if (!dstParam || !srcParam) {
+        //   throw new RuntimeModelError(source, '缺少目标参数对象或者源参数对象配置');
+        // }
+        // const { dstIndex, srcFieldName } = source;
+        // const insertIndex = dstIndex === -1 ? 0 : dstIndex;
+        // const arr = srcFieldName
+        //   ? ctx.params[srcParam.codeName]
+        //   : ctx.params[srcParam.codeName][srcFieldName.toLowerCase()];
+        // const srcIndex = source.srcIndex === -1 ? 0 : source.srcIndex;
+        // const srcSize = source.srcSize === -1 ? arr.length : source.srcSize;
+        // ctx.params[dstParam.codeName].splice(
+        //   insertIndex,
+        //   0,
+        //   ...arr.slice(srcIndex, srcSize),
+        // );
+    }
+}

package/out/de-logic/de-logic-node/bind-param-node/bind-param-node.d.ts

@@ -10,6 +10,6 @@ import { DELogicNode } from '../de-logic-node';
  * @extends {DELogicNode}
  */
 export declare class BindParamNode extends DELogicNode {
-    exec(ctx: DELogicContext, _context: IParams, _data: IData | null, _params: IParams, _opt?: IParams | undefined): Promise<void>;
+    exec(_ctx: DELogicContext): Promise<void>;
 }
 //# sourceMappingURL=bind-param-node.d.ts.map

package/out/de-logic/de-logic-node/bind-param-node/bind-param-node.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"bind-param-node.d.ts","sourceRoot":"","sources":["../../../../src/de-logic/de-logic-node/bind-param-node/bind-param-node.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AACxD,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAE/C;;;;;;;;GAQG;AACH,qBAAa,aAAc,SAAQ,WAAW;IACtC,IAAI,CACR,GAAG,EAAE,cAAc,EACnB,QAAQ,EAAE,OAAO,EACjB,KAAK,EAAE,KAAK,GAAG,IAAI,EACnB,OAAO,EAAE,OAAO,EAChB,IAAI,CAAC,EAAE,OAAO,GAAG,SAAS,GACzB,OAAO,CAAC,IAAI,CAAC;CAYjB"}
+{"version":3,"file":"bind-param-node.d.ts","sourceRoot":"","sources":["../../../../src/de-logic/de-logic-node/bind-param-node/bind-param-node.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AACxD,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAE/C;;;;;;;;GAQG;AACH,qBAAa,aAAc,SAAQ,WAAW;IACtC,IAAI,CAAC,IAAI,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC;CAahD"}

package/out/de-logic/de-logic-node/bind-param-node/bind-param-node.js

@@ -1,4 +1,3 @@
-import { DefectModelError } from '@ibiz-template/model';
 import { DELogicNode } from '../de-logic-node';
 /**
  * 绑定参数
@@ -10,16 +9,17 @@ import { DELogicNode } from '../de-logic-node';
  * @extends {DELogicNode}
  */
 export class BindParamNode extends DELogicNode {
-    async exec(ctx, _context, _data, _params, _opt) {
-        const source = this.model.source;
-        // 目标逻辑参数
-        const dstParam = source.getDstPSDELogicParam();
-        // 源逻辑参数
-        const srcParam = source.getSrcPSDELogicParam();
-        if (!dstParam || !srcParam) {
-            throw new DefectModelError(source, '缺少目标参数对象或者源参数对象配置');
-        }
-        const srcparam = ctx.params[srcParam.codeName];
-        ctx.params[dstParam.codeName] = srcparam[source.srcFieldName];
+    async exec(_ctx) {
+        // const source = this.model as IDEBindParamLogic;
+        // // 目标逻辑参数
+        // const dstParam = source.getDstPSDELogicParam();
+        // // 源逻辑参数
+        // const srcParam = source.getSrcPSDELogicParam();
+        // if (!dstParam || !srcParam) {
+        //   throw new RuntimeModelError(source, '缺少目标参数对象或者源参数对象配置');
+        // }
+        // const srcparam = ctx.params[srcParam.codeName];
+        // ctx.params[dstParam.codeName] = srcparam[source.srcFieldName];
+        // todo
     }
 }

package/out/de-logic/de-logic-node/copy-param-node/copy-param-node.d.ts

@@ -0,0 +1,15 @@
+import { DELogicContext } from '../../de-logic-context';
+import { DELogicNode } from '../de-logic-node';
+/**
+ * 拷贝参数
+ *
+ * @author lxm
+ * @date 2023-02-09 21:02:20
+ * @export
+ * @class CopyParamNode
+ * @extends {DELogicNode}
+ */
+export declare class CopyParamNode extends DELogicNode {
+    exec(_ctx: DELogicContext): Promise<void>;
+}
+//# sourceMappingURL=copy-param-node.d.ts.map

package/out/de-logic/de-logic-node/copy-param-node/copy-param-node.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"copy-param-node.d.ts","sourceRoot":"","sources":["../../../../src/de-logic/de-logic-node/copy-param-node/copy-param-node.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AACxD,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAE/C;;;;;;;;GAQG;AACH,qBAAa,aAAc,SAAQ,WAAW;IACtC,IAAI,CAAC,IAAI,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC;CAahD"}

package/out/de-logic/de-logic-node/copy-param-node/copy-param-node.js

@@ -0,0 +1,25 @@
+import { DELogicNode } from '../de-logic-node';
+/**
+ * 拷贝参数
+ *
+ * @author lxm
+ * @date 2023-02-09 21:02:20
+ * @export
+ * @class CopyParamNode
+ * @extends {DELogicNode}
+ */
+export class CopyParamNode extends DELogicNode {
+    async exec(_ctx) {
+        // const source = this.model as IDECopyParamLogic;
+        // // 目标逻辑参数
+        // const dstParam = source.getDstPSDELogicParam();
+        // // 源逻辑参数
+        // const srcParam = source.getSrcPSDELogicParam();
+        // if (!dstParam || !srcParam) {
+        //   throw new RuntimeModelError(source, '缺少目标参数对象或者源参数对象配置');
+        // }
+        // const srcparam = ctx.params[srcParam.codeName];
+        // ctx.params[dstParam.codeName] = clone(srcparam);
+        // todo
+    }
+}

package/out/de-logic/de-logic-node/data-set-node/data-set-node.d.ts

@@ -10,6 +10,6 @@ import { DELogicNode } from '../de-logic-node';
  * @extends {DELogicNode}
  */
 export declare class DataSetNode extends DELogicNode {
-    exec(ctx: DELogicContext, context: IParams, _data: IData | null, params: IParams, _opt?: IParams | undefined): Promise<void>;
+    exec(_ctx: DELogicContext): Promise<void>;
 }
 //# sourceMappingURL=data-set-node.d.ts.map

package/out/de-logic/de-logic-node/data-set-node/data-set-node.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"data-set-node.d.ts","sourceRoot":"","sources":["../../../../src/de-logic/de-logic-node/data-set-node/data-set-node.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AACxD,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAE/C;;;;;;;;GAQG;AACH,qBAAa,WAAY,SAAQ,WAAW;IACpC,IAAI,CACR,GAAG,EAAE,cAAc,EACnB,OAAO,EAAE,OAAO,EAChB,KAAK,EAAE,KAAK,GAAG,IAAI,EACnB,MAAM,EAAE,OAAO,EACf,IAAI,CAAC,EAAE,OAAO,GAAG,SAAS,GACzB,OAAO,CAAC,IAAI,CAAC;CAqBjB"}
+{"version":3,"file":"data-set-node.d.ts","sourceRoot":"","sources":["../../../../src/de-logic/de-logic-node/data-set-node/data-set-node.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AACxD,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAE/C;;;;;;;;GAQG;AACH,qBAAa,WAAY,SAAQ,WAAW;IACpC,IAAI,CAAC,IAAI,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC;CAqBhD"}

package/out/de-logic/de-logic-node/data-set-node/data-set-node.js

@@ -9,21 +9,25 @@ import { DELogicNode } from '../de-logic-node';
  * @extends {DELogicNode}
  */
 export class DataSetNode extends DELogicNode {
-    async exec(ctx, context, _data, params, _opt) {
-        var _a, _b;
-        const model = this.model.source;
-        const methodName = (_a = model.getDstPSAppDEDataSet()) === null || _a === void 0 ? void 0 : _a.codeName;
-        const deName = (_b = model.getDstPSAppDataEntity()) === null || _b === void 0 ? void 0 : _b.codeName;
-        const dstParam = model.getDstPSDELogicParam();
-        const retParam = model.getRetPSDELogicParam();
-        if (methodName && deName && dstParam) {
-            const requestData = ctx.params[dstParam.codeName];
-            const app = ibiz.hub.getApp(this.model.modelService.app);
-            const deService = await app.es.getService(deName);
-            const res = await deService.exec(methodName, context, requestData, params);
-            if (retParam && ctx.params[retParam.codeName]) {
-                ctx.params[retParam.codeName] = res.data;
-            }
-        }
+    async exec(_ctx) {
+        // const model = this.model as IDEDEDataSetLogic;
+        // const methodName = model.getDstPSAppDEDataSet()?.codeName;
+        // const deName = model.getDstPSAppDataEntity()?.codeName;
+        // const dstParam = model.getDstPSDELogicParam();
+        // const retParam = model.getRetPSDELogicParam();
+        // if (methodName && deName && dstParam) {
+        //   const requestData = ctx.params[dstParam.codeName];
+        //   const app = ibiz.hub.getApp(this.model.modelService.app);
+        //   const deService = await app.es.getService(deName);
+        //   const res = await deService.exec(
+        //     methodName,
+        //     ctx.context,
+        //     requestData,
+        //     ctx.viewParams,
+        //   );
+        //   if (retParam && ctx.params[retParam.codeName]) {
+        //     ctx.params[retParam.codeName] = res.data;
+        //   }
+        // }
     }
 }

package/out/de-logic/de-logic-node/de-action-node/de-action-node.d.ts

@@ -10,6 +10,6 @@ import { DELogicNode } from '../de-logic-node';
  * @extends {DELogicNode}
  */
 export declare class DEActionNode extends DELogicNode {
-    exec(ctx: DELogicContext, context: IParams, data: IData | null, params: IParams, _opt?: IParams | undefined): Promise<void>;
+    exec(_ctx: DELogicContext): Promise<void>;
 }
 //# sourceMappingURL=de-action-node.d.ts.map

package/out/de-logic/de-logic-node/de-action-node/de-action-node.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"de-action-node.d.ts","sourceRoot":"","sources":["../../../../src/de-logic/de-logic-node/de-action-node/de-action-node.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AACxD,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAE/C;;;;;;;;GAQG;AACH,qBAAa,YAAa,SAAQ,WAAW;IACrC,IAAI,CACR,GAAG,EAAE,cAAc,EACnB,OAAO,EAAE,OAAO,EAChB,IAAI,EAAE,KAAK,GAAG,IAAI,EAClB,MAAM,EAAE,OAAO,EACf,IAAI,CAAC,EAAE,OAAO,GAAG,SAAS,GACzB,OAAO,CAAC,IAAI,CAAC;CA4BjB"}
+{"version":3,"file":"de-action-node.d.ts","sourceRoot":"","sources":["../../../../src/de-logic/de-logic-node/de-action-node/de-action-node.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AACxD,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAE/C;;;;;;;;GAQG;AACH,qBAAa,YAAa,SAAQ,WAAW;IACrC,IAAI,CAAC,IAAI,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC;CA6BhD"}