npm - @ibiz-template/runtime - Versions diffs - 0.1.16 → 0.1.18 - Mend

@ibiz-template/runtime 0.1.16 → 0.1.18

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (127) hide show

package/out/controller/common/control/md-control.controller.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"md-control.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/common/control/md-control.controller.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EACL,oBAAoB,EACpB,eAAe,EACf,eAAe,EACf,gBAAgB,EAChB,kBAAkB,EACnB,MAAM,oBAAoB,CAAC;AAE5B,OAAO,EAAE,gBAAgB,EAAS,MAAM,kBAAkB,CAAC;AAC3D,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAC9C,OAAO,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AAEzD;;;;;;;;;GASG;AACH,qBAAa,mBAAmB,CAC5B,CAAC,SAAS,UAAU,GAAG,UAAU,EACjC,CAAC,SAAS,eAAe,GAAG,eAAe,EAC3C,CAAC,SAAS,eAAe,GAAG,eAAe,CAE7C,SAAQ,iBAAiB,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CACjC,YAAW,oBAAoB,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;IAExC;;;;;;OAMG;IACH,OAAO,EAAG,gBAAgB,CAAC;IAE3B,SAAS,KAAK,IAAI,IAAI,eAAe,CAAC,eAAe,CAAC,CAErD;IAED,SAAS,CAAC,SAAS,IAAI,IAAI;cAgBX,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAM1C;;;;;;;;OAQG;IACH,OAAO,CAAC,GAAG,CAAC,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,KAAK,GAAG,MAAM,GAAG,IAAI;IAMnD;;;;;;OAMG;IACG,cAAc,CAAC,WAAW,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC;IA6B7D;;;;;OAKG;IACG,IAAI,CAAC,IAAI,GAAE,gBAAqB,GAAG,OAAO,CAAC,KAAK,EAAE,CAAC;IA4CzD;;;;;;;;OAQG;IACG,SAAS,CAAC,IAAI,EAAE,gBAAgB,EAAE,KAAK,EAAE,KAAK,EAAE,GAAG,OAAO,CAAC,KAAK,EAAE,CAAC;IAIzE;;;;OAIG;IACG,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAI9B;;;;;;OAMG;IACG,MAAM,CAAC,IAAI,CAAC,EAAE,kBAAkB,GAAG,OAAO,CAAC,IAAI,CAAC;IA4DtD;;;;;;OAMG;IACH,WAAW,CAAC,IAAI,EAAE,KAAK,GAAG,IAAI;~~IAQ9B~~;;;;;;OAMG;IACH,OAAO,IAAI,KAAK,EAAE;IAIlB,SAAS,CAAC,IAAI,EAAE,KAAK,GAAG,OAAO,CAAC,IAAI,CAAC;IAMrC,YAAY,CAAC,SAAS,EAAE,KAAK,EAAE,GAAG,IAAI;IAWtC;;;;;;OAMG;IACG,UAAU,CAAC,IAAI,EAAE,KAAK,GAAG,OAAO,CAAC,IAAI,CAAC;IAmB5C;;;;;;OAMG;IACG,YAAY,CAAC,IAAI,EAAE,KAAK,GAAG,OAAO,CAAC,IAAI,CAAC;IAM9C;;;;;;OAMG;IACG,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAwBjC;;;;;;OAMG;IACG,UAAU,CAAC,KAAK,EAAE;QAAE,KAAK,EAAE,UAAU,CAAA;KAAE,GAAG,OAAO,CAAC,IAAI,CAAC;CAkC9D"}
1	+ {"version":3,"file":"md-control.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/common/control/md-control.controller.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EACL,oBAAoB,EACpB,eAAe,EACf,eAAe,EACf,gBAAgB,EAChB,kBAAkB,EACnB,MAAM,oBAAoB,CAAC;AAE5B,OAAO,EAAE,gBAAgB,EAAS,MAAM,kBAAkB,CAAC;AAC3D,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAC9C,OAAO,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AAEzD;;;;;;;;;GASG;AACH,qBAAa,mBAAmB,CAC5B,CAAC,SAAS,UAAU,GAAG,UAAU,EACjC,CAAC,SAAS,eAAe,GAAG,eAAe,EAC3C,CAAC,SAAS,eAAe,GAAG,eAAe,CAE7C,SAAQ,iBAAiB,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CACjC,YAAW,oBAAoB,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;IAExC;;;;;;OAMG;IACH,OAAO,EAAG,gBAAgB,CAAC;IAE3B,SAAS,KAAK,IAAI,IAAI,eAAe,CAAC,eAAe,CAAC,CAErD;IAED,SAAS,CAAC,SAAS,IAAI,IAAI;cAgBX,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAM1C;;;;;;;;OAQG;IACH,OAAO,CAAC,GAAG,CAAC,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,KAAK,GAAG,MAAM,GAAG,IAAI;IAMnD;;;;;;OAMG;IACG,cAAc,CAAC,WAAW,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC;IA6B7D;;;;;OAKG;IACG,IAAI,CAAC,IAAI,GAAE,gBAAqB,GAAG,OAAO,CAAC,KAAK,EAAE,CAAC;IA4CzD;;;;;;;;OAQG;IACG,SAAS,CAAC,IAAI,EAAE,gBAAgB,EAAE,KAAK,EAAE,KAAK,EAAE,GAAG,OAAO,CAAC,KAAK,EAAE,CAAC;IAIzE;;;;OAIG;IACG,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAI9B;;;;;;OAMG;IACG,MAAM,CAAC,IAAI,CAAC,EAAE,kBAAkB,GAAG,OAAO,CAAC,IAAI,CAAC;IA4DtD;;;;;;OAMG;IACH,WAAW,CAAC,IAAI,EAAE,KAAK,GAAG,IAAI;IAU9B;;;;;;OAMG;IACH,OAAO,IAAI,KAAK,EAAE;IAIlB,SAAS,CAAC,IAAI,EAAE,KAAK,GAAG,OAAO,CAAC,IAAI,CAAC;IAMrC,YAAY,CAAC,SAAS,EAAE,KAAK,EAAE,GAAG,IAAI;IAWtC;;;;;;OAMG;IACG,UAAU,CAAC,IAAI,EAAE,KAAK,GAAG,OAAO,CAAC,IAAI,CAAC;IAmB5C;;;;;;OAMG;IACG,YAAY,CAAC,IAAI,EAAE,KAAK,GAAG,OAAO,CAAC,IAAI,CAAC;IAM9C;;;;;;OAMG;IACG,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAwBjC;;;;;;OAMG;IACG,UAAU,CAAC,KAAK,EAAE;QAAE,KAAK,EAAE,UAAU,CAAA;KAAE,GAAG,OAAO,CAAC,IAAI,CAAC;CAkC9D"}

package/out/controller/common/control/md-control.controller.js CHANGED Viewed

@@ -183,7 +183,7 @@ export class MDControlController extends ControlController {
                     await this.service.remove(tempContext, params);
                     needRefresh = true;
                 }
-                this.afterRemove(data);
+                this.afterRemove(item);
             }));
             if ((args === null || args === void 0 ? void 0 : args.silent) !== true) {
                 ibiz.notification.success({
@@ -217,7 +217,9 @@ export class MDControlController extends ControlController {
     afterRemove(data) {
         // 删除this.items里的数据
         const index = this.state.items.findIndex(item => item.srfkey === data.srfkey);
-        this.state.items.splice(index, 1);
+        if (index !== -1) {
+            this.state.items.splice(index, 1);
+        }
     }
     /**
      * 获取多数据部件的选中数据集合

package/out/controller/common/index.d.ts CHANGED Viewed

@@ -1,5 +1,6 @@
 export { MobViewController } from './view/mob-view.controller';
 export { ViewController } from './view/view.controller';
+export { WFStepTraceViewController } from './view/wf-step-trace-view.controller';
 export { BaseController } from './base.controller';
 export { EditorController } from './editor/editor.controller';
 export { CodeListEditorController } from './editor/code-list-editor.controller';

package/out/controller/common/index.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/controller/common/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,4BAA4B,CAAC;AAC/D,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AACxD,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AACnD,OAAO,EAAE,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AAC9D,OAAO,EAAE,wBAAwB,EAAE,MAAM,sCAAsC,CAAC;AAChF,cAAc,WAAW,CAAC"}
1	+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/controller/common/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,4BAA4B,CAAC;AAC/D,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AACxD,OAAO,EAAE,yBAAyB,EAAE,MAAM,sCAAsC,CAAC;AACjF,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AACnD,OAAO,EAAE,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AAC9D,OAAO,EAAE,wBAAwB,EAAE,MAAM,sCAAsC,CAAC;AAChF,cAAc,WAAW,CAAC"}

package/out/controller/common/index.js CHANGED Viewed

@@ -1,5 +1,6 @@
 export { MobViewController } from './view/mob-view.controller';
 export { ViewController } from './view/view.controller';
+export { WFStepTraceViewController } from './view/wf-step-trace-view.controller';
 export { BaseController } from './base.controller';
 export { EditorController } from './editor/editor.controller';
 export { CodeListEditorController } from './editor/code-list-editor.controller';

package/out/controller/common/view/view.controller.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"view.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/common/view/view.controller.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAE5C,OAAO,EAAE,YAAY,EAAE,MAAM,mCAAmC,CAAC;AACjE,OAAO,EACL,eAAe,EACf,UAAU,EACV,0BAA0B,EAC1B,gBAAgB,EAChB,MAAM,EACN,UAAU,EACV,eAAe,EACf,cAAc,EACd,WAAW,EACZ,MAAM,oBAAoB,CAAC;AAG5B,OAAO,EAAE,GAAG,EAAE,MAAM,WAAW,CAAC;AAChC,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAC9C,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AACpD,OAAO,EAAE,UAAU,EAAE,MAAM,qCAAqC,CAAC;AAEjE,OAAO,EAAE,UAAU,EAAkB,MAAM,kBAAkB,CAAC;AAM9D,OAAO,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAC;AAE9D;;;;;;;GAOG;AACH,qBAAa,cAAc,CACvB,CAAC,SAAS,QAAQ,GAAG,QAAQ,EAC7B,CAAC,SAAS,UAAU,GAAG,UAAU,EACjC,CAAC,SAAS,UAAU,GAAG,UAAU,CAEnC,SAAQ,cAAc,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAC9B,YAAW,eAAe,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;IAEnC,OAAO,EAAE,KAAK,CAAM;IAEpB,KAAK,EAAE,MAAM,CAAiB;IAE9B,SAAS,KAAK,IAAI,IAAI,eAAe,CAAC,UAAU,CAAC,CAEhD;IAED,SAAS,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,gBAAgB,CAAA;KAAE,CAAM;IAEpD,OAAO,EAAE,WAAW,EAAE,CAAM;IAE5B,SAAS,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,KAAK,CAAA;KAAE,CAAM;IAEzC,QAAQ,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,UAAU,CAAA;KAAE,CAAM;IAE7C;;;;;OAKG;IACH,SAAS,CAAC,WAAW,eAAsB;IAE3C;;;;;;;OAOG;IACH,SAAS,CAAC,WAAW,EAAE,OAAO,CAAS;IAEvC;;;;;;OAMG;IACH,IAAI,UAAU,IAAI,eAAe,GAAG,SAAS,CAE5C;IAED,SAAS,CAAC,SAAS,UAAQ;IAE3B,IAAI,QAAQ,IAAI,OAAO,CAEtB;IAED;;;;;OAKG;IACH,SAAS,CAAC,EAAE,kBAAkB,CAAC;IAE/B,WAAW,CAAC,EAAE,0BAA0B,CAAC;IAEzC;;;;;;;;OAQG;gBACS,KAAK,EAAE,CAAC,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,CAAC,EAAE,OAAO,EAAE,GAAG,CAAC,EAAE,GAAG;IAcpE;;;;;OAKG;IACH,WAAW,IAAI,IAAI;IAKnB;;;;;OAKG;IACH,aAAa,IAAI,IAAI;IAKrB;;;;;OAKG;IACH,SAAS,CAAC,WAAW,IAAI,IAAI;IAqB7B;;;;;OAKG;cACa,YAAY,IAAI,OAAO,CAAC,IAAI,CAAC;IAoB7C,SAAS,CAAC,SAAS,IAAI,IAAI;cAOX,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;~~cAyD1B~~,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;cAW1B,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC;IAe5C;;;;;;OAMG;IACH,mBAAmB,IAAI,IAAI;IAiCrB,IAAI,CAAC,CAAC,SAAS,KAAK,EAAE,GAAG,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,CAAC,GAAG,OAAO,CAAC,GAAG,CAAC;IAY1D,YAAY,CAChB,GAAG,EAAE,MAAM,EACX,IAAI,CAAC,EAAE,OAAO,CAAC,cAAc,CAAC,GAC7B,OAAO,CAAC,eAAe,GAAG,IAAI,CAAC;IAQ5B,SAAS,CACb,SAAS,GAAE,UAAoC,GAC9C,OAAO,CAAC,IAAI,CAAC;IAIhB,YAAY,IAAI,IAAI;IAKpB,UAAU,IAAI,IAAI;IAKlB;;;;;OAKG;IACH,cAAc,CAAC,KAAK,EAAE,0BAA0B,GAAG,IAAI;CAoBxD"}
1	+ {"version":3,"file":"view.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/common/view/view.controller.ts"],"names":[],"mappings":"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"}

package/out/controller/common/view/view.controller.js CHANGED Viewed

@@ -1,7 +1,7 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
 import { createUUID, notNilEmpty } from 'qx-util';
 import { IBizContext, RuntimeError } from '@ibiz-template/core';
-import { isEmpty, isNil } from 'ramda';
+import { isEmpty, isNil, isNotNil } from 'ramda';
 import { LoadingState } from '../../utils/loading/loading.state';
 import { SysUIActionTag } from '../../../constant';
 import { convertNavData, Modal } from '../../../utils';
@@ -154,6 +154,10 @@ export class ViewController extends BaseController {
         await super.onCreated();
         // 给modal的关闭前回调注入视图关闭事件
         this.modal.hooks.beforeDismiss.tapPromise(async (modalData) => {
+            // 如果视图设置了关闭状态，根据关闭状态返回
+            if (isNotNil(this.state.closeOK)) {
+                modalData.ok = this.state.closeOK;
+            }
             await this._evt.emit('onCloseView', Object.assign({}, modalData));
         });
         // 抛出初始的视图信息

package/out/controller/common/view/wf-step-trace-view.controller.d.ts ADDED Viewed

@@ -0,0 +1,8 @@
+import { IAppView } from '@ibiz/model-core';
+import { IViewController, IViewEvent, IWFStepTraceViewState } from '../../../interface';
+import { ViewController } from './view.controller';
+export declare class WFStepTraceViewController<T extends IAppView = IAppView, S extends IWFStepTraceViewState = IWFStepTraceViewState, E extends IViewEvent = IViewEvent> extends ViewController<T, S, E> implements IViewController<T, S, E> {
+    protected initState(): void;
+    protected onCreated(): Promise<void>;
+}
+//# sourceMappingURL=wf-step-trace-view.controller.d.ts.map

package/out/controller/common/view/wf-step-trace-view.controller.d.ts.map ADDED Viewed

@@ -0,0 +1 @@

+ {"version":3,"file":"wf-step-trace-view.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/common/view/wf-step-trace-view.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAC5C,OAAO,EACL,eAAe,EACf,UAAU,EACV,qBAAqB,EACtB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAEnD,qBAAa,yBAAyB,CAClC,CAAC,SAAS,QAAQ,GAAG,QAAQ,EAC7B,CAAC,SAAS,qBAAqB,GAAG,qBAAqB,EACvD,CAAC,SAAS,UAAU,GAAG,UAAU,CAEnC,SAAQ,cAAc,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAC9B,YAAW,eAAe,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;IAEnC,SAAS,CAAC,SAAS,IAAI,IAAI;cAKX,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;CAc3C"}

package/out/controller/common/view/wf-step-trace-view.controller.js ADDED Viewed

@@ -0,0 +1,20 @@
+import { ViewController } from './view.controller';
+export class WFStepTraceViewController extends ViewController {
+    initState() {
+        super.initState();
+        this.state.historyData = null;
+    }
+    async onCreated() {
+        var _a;
+        await super.onCreated();
+        const app = ibiz.hub.getApp(this.context.srfappid);
+        if ((_a = this.ctx.parent) === null || _a === void 0 ? void 0 : _a.view.model.appDataEntityId) {
+            const entityService = await app.deService.getService(this.ctx.parent.view.model.appDataEntityId);
+            const params = Object.assign(this.context.clone(), this.params);
+            const res = await entityService.wf.getWFHistory(params);
+            if (res.data) {
+                this.state.historyData = res.data;
+            }
+        }
+    }
+}

package/out/controller/control/exp-bar/exp-bar.controller.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"exp-bar.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/exp-bar/exp-bar.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,OAAO,EAEP,OAAO,EACP,OAAO,EACP,WAAW,EACX,YAAY,EACb,MAAM,kBAAkB,CAAC;AAE1B,OAAO,EACL,mBAAmB,EACnB,mBAAmB,EACnB,wBAAwB,EACxB,oBAAoB,EACpB,kBAAkB,EAClB,SAAS,EACT,SAAS,EACT,WAAW,EACX,0BAA0B,EAC3B,MAAM,oBAAoB,CAAC;AAG5B,OAAO,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AACjD,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAE9C,KAAK,iBAAiB,GAAG,OAAO,GAAG,OAAO,GAAG,WAAW,CAAC;AAEzD;;;;;;;;;;;;GAYG;AACH,qBAAa,uBAAuB,CAChC,CAAC,SAAS,OAAO,GAAG,OAAO,EAC3B,CAAC,SAAS,mBAAmB,GAAG,mBAAmB,EACnD,CAAC,SAAS,mBAAmB,GAAG,mBAAmB,CAErD,SAAQ,iBAAiB,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CACjC,YAAW,wBAAwB,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;IAE5C,SAAS,KAAK,IAAI,IAAI,eAAe,CAAC,mBAAmB,CAAC,CAEzD;IAED;;;;;;;;OAQG;IACH,IAAI,UAAU,IAAI,MAAM,GAAG,SAAS,CAEnC;IAED;;;;;;;OAOG;IACH,SAAS,EAAG,MAAM,CAAC;IAEnB;;;;;;OAMG;IACH,UAAU,SAAY;IAEtB,SAAS,CAAC,SAAS,IAAI,IAAI;IAK3B;;;;;;;OAOG;IACH,IAAI,IAAI,OAAO,CAAC,KAAK,EAAE,CAAC;IAIxB;;;;;;;;OAQG;IACH,IAAI,eAAe,IAAI,oBAAoB,CAS1C;IAED;;;;;;OAMG;IACH,IAAI,iBAAiB,IAAI,kBAAkB,GAAG,SAAS,CAKtD;IAED;;;;;;;;OAQG;IACH,IAAI,UAAU,IAAI,iBAAiB,GAAG,SAAS,CAO9C;IAED;;;;;;;;OAQG;cACa,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IA8B1C;;;;;;;;OAQG;cACa,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAyB1C;;;;;;OAMG;IACH,gBAAgB,CAAC,KAAK,EAAE,SAAS,GAAG,IAAI;IAaxC;;;;;OAKG;IACH,SAAS,CAAC,kBAAkB,IAAI,IAAI;IAgBpC;;;;;;;OAOG;IACH,SAAS,CAAC,qBAAqB,IAAI,IAAI;~~IAUvC~~;;;;;;;OAOG;IACH,WAAW,CAAC,KAAK,EAAE,SAAS,GAAG,IAAI;IAMnC;;;;;;;;OAQG;IACH,aAAa,CACX,UAAU,EAAE,YAAY,GAAG;QAAE,eAAe,CAAC,EAAE,MAAM,CAAA;KAAE,EACvD,IAAI,EAAE,KAAK,EACX,OAAO,EAAE,QAAQ,EACjB,MAAM,EAAE,OAAO,GACd;QAAE,OAAO,EAAE,QAAQ,CAAC;QAAC,MAAM,EAAE,OAAO,CAAA;KAAE;IA6BzC;;;;;;;OAOG;IACI,eAAe,IAAI,MAAM,GAAG,SAAS;IAS5C;;;;;;;;OAQG;IACI,aAAa,CAClB,IAAI,EAAE,KAAK,EACX,OAAO,EAAE,QAAQ,EACjB,MAAM,EAAE,OAAO,GACd,WAAW;IAWd;;;;;;OAMG;IACH,SAAS,CAAC,wBAAwB,IAAI,OAAO;IAe7C,cAAc,CAAC,KAAK,EAAE,0BAA0B,GAAG,IAAI;CAaxD"}
1	+ {"version":3,"file":"exp-bar.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/exp-bar/exp-bar.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,OAAO,EAEP,OAAO,EACP,OAAO,EACP,WAAW,EACX,YAAY,EACb,MAAM,kBAAkB,CAAC;AAE1B,OAAO,EACL,mBAAmB,EACnB,mBAAmB,EACnB,wBAAwB,EACxB,oBAAoB,EACpB,kBAAkB,EAClB,SAAS,EACT,SAAS,EACT,WAAW,EACX,0BAA0B,EAC3B,MAAM,oBAAoB,CAAC;AAG5B,OAAO,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AACjD,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAE9C,KAAK,iBAAiB,GAAG,OAAO,GAAG,OAAO,GAAG,WAAW,CAAC;AAEzD;;;;;;;;;;;;GAYG;AACH,qBAAa,uBAAuB,CAChC,CAAC,SAAS,OAAO,GAAG,OAAO,EAC3B,CAAC,SAAS,mBAAmB,GAAG,mBAAmB,EACnD,CAAC,SAAS,mBAAmB,GAAG,mBAAmB,CAErD,SAAQ,iBAAiB,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CACjC,YAAW,wBAAwB,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;IAE5C,SAAS,KAAK,IAAI,IAAI,eAAe,CAAC,mBAAmB,CAAC,CAEzD;IAED;;;;;;;;OAQG;IACH,IAAI,UAAU,IAAI,MAAM,GAAG,SAAS,CAEnC;IAED;;;;;;;OAOG;IACH,SAAS,EAAG,MAAM,CAAC;IAEnB;;;;;;OAMG;IACH,UAAU,SAAY;IAEtB,SAAS,CAAC,SAAS,IAAI,IAAI;IAK3B;;;;;;;OAOG;IACH,IAAI,IAAI,OAAO,CAAC,KAAK,EAAE,CAAC;IAIxB;;;;;;;;OAQG;IACH,IAAI,eAAe,IAAI,oBAAoB,CAS1C;IAED;;;;;;OAMG;IACH,IAAI,iBAAiB,IAAI,kBAAkB,GAAG,SAAS,CAKtD;IAED;;;;;;;;OAQG;IACH,IAAI,UAAU,IAAI,iBAAiB,GAAG,SAAS,CAO9C;IAED;;;;;;;;OAQG;cACa,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IA8B1C;;;;;;;;OAQG;cACa,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAyB1C;;;;;;OAMG;IACH,gBAAgB,CAAC,KAAK,EAAE,SAAS,GAAG,IAAI;IAaxC;;;;;OAKG;IACH,SAAS,CAAC,kBAAkB,IAAI,IAAI;IAgBpC;;;;;;;OAOG;IACH,SAAS,CAAC,qBAAqB,IAAI,IAAI;IAYvC;;;;;;;OAOG;IACH,WAAW,CAAC,KAAK,EAAE,SAAS,GAAG,IAAI;IAMnC;;;;;;;;OAQG;IACH,aAAa,CACX,UAAU,EAAE,YAAY,GAAG;QAAE,eAAe,CAAC,EAAE,MAAM,CAAA;KAAE,EACvD,IAAI,EAAE,KAAK,EACX,OAAO,EAAE,QAAQ,EACjB,MAAM,EAAE,OAAO,GACd;QAAE,OAAO,EAAE,QAAQ,CAAC;QAAC,MAAM,EAAE,OAAO,CAAA;KAAE;IA6BzC;;;;;;;OAOG;IACI,eAAe,IAAI,MAAM,GAAG,SAAS;IAS5C;;;;;;;;OAQG;IACI,aAAa,CAClB,IAAI,EAAE,KAAK,EACX,OAAO,EAAE,QAAQ,EACjB,MAAM,EAAE,OAAO,GACd,WAAW;IAWd;;;;;;OAMG;IACH,SAAS,CAAC,wBAAwB,IAAI,OAAO;IAe7C,cAAc,CAAC,KAAK,EAAE,0BAA0B,GAAG,IAAI;CAaxD"}

package/out/controller/control/exp-bar/exp-bar.controller.js CHANGED Viewed

@@ -212,6 +212,8 @@ export class ExpBarControlController extends ControlController {
     defaultNavByFirstItem() {
         const data = this.xDataController.state.items[0];
         if (!data) {
+            // 导航视图传空让他导航占位绘制空界面
+            this._evt.emit('onNavViewChange', { navViewMsg: { key: '' } });
             return;
         }
         // 默认选中并激活第一项

package/out/controller/control/form/edit-form/edit-form.service.d.ts CHANGED Viewed

@@ -111,5 +111,13 @@ export declare class EditFormService<T extends IDEEditForm = IDEEditForm> extend
      * @returns {*}  {IHttpResponse}
      */
     handleResponse(response: IHttpResponse): IHttpResponse<ControlVO>;
+    /**
+     * 保存时根据表单项过滤出传给后台的数据
+     *
+     * @return {*}
+     * @author: zhujiamin
+     * @Date: 2023-09-01 10:04:25
+     */
+    getFilteredData(data: IData): IData;
 }
 //# sourceMappingURL=edit-form.service.d.ts.map

package/out/controller/control/form/edit-form/edit-form.service.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"edit-form.service.d.ts","sourceRoot":"","sources":["../../../../../src/controller/control/form/edit-form/edit-form.service.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,aAAa,EAGd,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EACL,WAAW,~~EAMZ~~,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,cAAc,EAAE,SAAS,EAAc,MAAM,qBAAqB,CAAC;AAE5E,qBAAa,eAAe,CAC1B,CAAC,SAAS,WAAW,GAAG,WAAW,CACnC,SAAQ,cAAc,CAAC,CAAC,CAAC;IACzB;;;;;;;;OAQG;IACG,GAAG,CACP,OAAO,EAAE,OAAO,EAChB,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC;IAWpC;;;;;;;;OAQG;IACG,QAAQ,CACZ,OAAO,EAAE,OAAO,EAChB,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC;IAWpC;;;;;;;;OAQG;IACG,MAAM,CAAC,OAAO,EAAE,OAAO,EAAE,MAAM,GAAE,OAAY,GAAG,OAAO,CAAC,aAAa,CAAC;IAU5E;;;;;;;;OAQG;IACG,MAAM,CACV,OAAO,EAAE,OAAO,EAChB,IAAI,EAAE,KAAK,GACV,OAAO,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC;~~IAUpC~~;;;;;;;;OAQG;IACG,MAAM,CACV,OAAO,EAAE,OAAO,EAChB,IAAI,EAAE,KAAK,GACV,OAAO,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC;~~IAUpC~~;;;;;;;;OAQG;IACG,MAAM,CACV,OAAO,EAAE,OAAO,EAChB,IAAI,EAAE,KAAK,GACV,OAAO,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC;IAepC;;;;;;;;;OASG;IACG,cAAc,CAClB,UAAU,EAAE,MAAM,EAClB,OAAO,EAAE,OAAO,EAChB,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC;IAMpC;;;;;;;;;OASG;IACG,OAAO,CACX,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,OAAO,EACf,IAAI,EAAE,KAAK,GACV,OAAO,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;IAchC;;;;;;;;;OASG;IACG,QAAQ,CACZ,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,OAAO,EACf,IAAI,EAAE,KAAK,GACV,OAAO,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;IAsBhC;;;;;OAKG;IACH,SAAS,CAAC,aAAa,IAAI,IAAI;~~IA8D~~/B;;;;;;;OAOG;IACH,cAAc,CAAC,QAAQ,EAAE,aAAa,GAAG,aAAa,CAAC,SAAS,CAAC;~~CAOlE~~"}
1	+ {"version":3,"file":"edit-form.service.d.ts","sourceRoot":"","sources":["../../../../../src/controller/control/form/edit-form/edit-form.service.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,aAAa,EAGd,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EACL,WAAW,EAKZ,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,cAAc,EAAE,SAAS,EAAc,MAAM,qBAAqB,CAAC;AAE5E,qBAAa,eAAe,CAC1B,CAAC,SAAS,WAAW,GAAG,WAAW,CACnC,SAAQ,cAAc,CAAC,CAAC,CAAC;IACzB;;;;;;;;OAQG;IACG,GAAG,CACP,OAAO,EAAE,OAAO,EAChB,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC;IAWpC;;;;;;;;OAQG;IACG,QAAQ,CACZ,OAAO,EAAE,OAAO,EAChB,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC;IAWpC;;;;;;;;OAQG;IACG,MAAM,CAAC,OAAO,EAAE,OAAO,EAAE,MAAM,GAAE,OAAY,GAAG,OAAO,CAAC,aAAa,CAAC;IAU5E;;;;;;;;OAQG;IACG,MAAM,CACV,OAAO,EAAE,OAAO,EAChB,IAAI,EAAE,KAAK,GACV,OAAO,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC;IAYpC;;;;;;;;OAQG;IACG,MAAM,CACV,OAAO,EAAE,OAAO,EAChB,IAAI,EAAE,KAAK,GACV,OAAO,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC;IAYpC;;;;;;;;OAQG;IACG,MAAM,CACV,OAAO,EAAE,OAAO,EAChB,IAAI,EAAE,KAAK,GACV,OAAO,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC;IAepC;;;;;;;;;OASG;IACG,cAAc,CAClB,UAAU,EAAE,MAAM,EAClB,OAAO,EAAE,OAAO,EAChB,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC;IAMpC;;;;;;;;;OASG;IACG,OAAO,CACX,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,OAAO,EACf,IAAI,EAAE,KAAK,GACV,OAAO,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;IAchC;;;;;;;;;OASG;IACG,QAAQ,CACZ,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,OAAO,EACf,IAAI,EAAE,KAAK,GACV,OAAO,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;IAsBhC;;;;;OAKG;IACH,SAAS,CAAC,aAAa,IAAI,IAAI;IA4C/B;;;;;;;OAOG;IACH,cAAc,CAAC,QAAQ,EAAE,aAAa,GAAG,aAAa,CAAC,SAAS,CAAC;IAQjE;;;;;;OAMG;IACH,eAAe,CAAC,IAAI,EAAE,KAAK,GAAG,KAAK;CASpC"}

package/out/controller/control/form/edit-form/edit-form.service.js CHANGED Viewed

@@ -56,7 +56,9 @@ export class EditFormService extends ControlService {
      */
     async create(context, data) {
         var _a;
-        let res = await this.exec(((_a = this.model.createControlAction) === null || _a === void 0 ? void 0 : _a.appDEMethodId) || 'create', context, data instanceof ControlVO ? data.getOrigin() : data);
+        const _data = data instanceof ControlVO ? data.getOrigin() : data;
+        const tempData = this.getFilteredData(_data);
+        let res = await this.exec(((_a = this.model.createControlAction) === null || _a === void 0 ? void 0 : _a.appDEMethodId) || 'create', context, tempData);
         res = this.handleResponse(res);
         return res;
     }
@@ -71,7 +73,9 @@ export class EditFormService extends ControlService {
      */
     async update(context, data) {
         var _a;
-        let res = await this.exec(((_a = this.model.updateControlAction) === null || _a === void 0 ? void 0 : _a.appDEMethodId) || 'update', context, data instanceof ControlVO ? data.getOrigin() : data);
+        const _data = data instanceof ControlVO ? data.getOrigin() : data;
+        const tempData = this.getFilteredData(_data);
+        let res = await this.exec(((_a = this.model.updateControlAction) === null || _a === void 0 ? void 0 : _a.appDEMethodId) || 'update', context, tempData);
         res = this.handleResponse(res);
         return res;
     }
@@ -173,7 +177,7 @@ export class EditFormService extends ControlService {
         ];
         // *初始化表单的属性映射
         recursiveIterate(this.model, (item) => {
-            if (item.detailType === 'FORMITEM') {
+            if (item.detailType === 'FORMITEM' || item.detailType === 'MDCTRL') {
                 const formItem = item;
                 const uiKey = formItem.fieldName || formItem.id.toLowerCase();
                 const deField = formItem.fieldName || item.appDEFieldId;
@@ -191,24 +195,6 @@ export class EditFormService extends ControlService {
                 }
                 this.dataUIMap.set(uiKey, mapField);
             }
-            if (item.detailType === 'MDCTRL') {
-                const formItem = item;
-                const uiKey = formItem.fieldName || formItem.id.toLowerCase();
-                const deField = formItem.fieldName || item.appDEFieldId;
-                let mapField;
-                if (deField) {
-                    mapField = new UIMapField(uiKey, deField, {
-                        isOriginField: true,
-                    });
-                }
-                else {
-                    // 前台属性和没属性的表单项，或预置属性
-                    mapField = new UIMapField(uiKey, uiKey, {
-                        isOriginField: true,
-                    });
-                }
-                this.dataUIMap.set(uiKey, mapField);
-            }
         }, {
             childrenFields: ['deformPages', 'deformDetails'],
         });
@@ -228,4 +214,20 @@ export class EditFormService extends ControlService {
         }
         return res;
     }
+    /**
+     * 保存时根据表单项过滤出传给后台的数据
+     *
+     * @return {*}
+     * @author: zhujiamin
+     * @Date: 2023-09-01 10:04:25
+     */
+    getFilteredData(data) {
+        const tempData = {};
+        this.dataUIMap.forEach(dataUI => {
+            if (data[dataUI.dataKey] !== undefined) {
+                tempData[dataUI.dataKey] = data[dataUI.dataKey];
+            }
+        });
+        return tempData;
+    }
 }

package/out/controller/control/form/form-detail/form-item/form-item.controller.d.ts CHANGED Viewed

@@ -106,6 +106,15 @@ export declare class FormItemController extends FormDetailController<IDEFormItem
      * @type {(string | undefined)}
      */
     get valueFormat(): string | undefined;
+    /**
+     * 数据类型
+     *
+     * @author zhanghengfeng
+     * @date 2023-09-01 11:09:00
+     * @readonly
+     * @type {(number | undefined)}
+     */
+    get dataType(): number | undefined;
     /**
      * 初始化
      *

package/out/controller/control/form/form-detail/form-item/form-item.controller.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"form-item.controller.d.ts","sourceRoot":"","sources":["../../../../../../src/controller/control/form/form-detail/form-item/form-item.controller.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAoB,MAAM,kBAAkB,CAAC;AAMjE,OAAO,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAC5D,OAAO,EAAE,oBAAoB,EAAE,MAAM,uCAAuC,CAAC;AAC7E,OAAO,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAClD,OAAO,EACL,0BAA0B,EAC1B,iBAAiB,EACjB,eAAe,EACf,8BAA8B,EAC/B,MAAM,0BAA0B,CAAC;AAIlC,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAGvD,qBAAa,kBACX,SAAQ,oBAAoB,CAAC,WAAW,CACxC,YAAW,0BAA0B;IAE7B,KAAK,EAAE,aAAa,CAAC;IAE7B,SAAS,CAAC,WAAW,IAAI,aAAa;IAItC;;;;;;OAMG;IACH,QAAQ,CAAC,OAAO,EAAE,QAAQ,CAAC;IAE3B;;;;;;OAMG;IACH,QAAQ,CAAC,MAAM,EAAE,OAAO,CAAC;IAEzB;;;;;;OAMG;IACH,MAAM,CAAC,EAAE,iBAAiB,CAAC;IAE3B;;;;;OAKG;IACH,cAAc,CAAC,EAAE,eAAe,CAAC;IAEjC;;;;;;;OAOG;IACH,OAAO,CAAC,SAAS,CAAU;IAE3B;;;;;;OAMG;IACH,KAAK,EAAE,KAAK,CAAM;IAElB;;;;;;OAMG;IACH,IAAI,IAAI,IAAI,MAAM,CAEjB;IAED;;;;;;;OAOG;IACH,IAAI,KAAK,IAAI,OAAO,CAEnB;IAED;;;;;;OAMG;IACH,IAAI,aAAa,IAAI,MAAM,GAAG,SAAS,CAKtC;IAED;;;;;;;;OAQG;gBAED,KAAK,EAAE,WAAW,EAClB,IAAI,EAAE,cAAc,EACpB,MAAM,CAAC,EAAE,8BAA8B;IAOzC;;;;;;OAMG;IACH,IAAI,QAAQ,IAAI,MAAM,GAAG,SAAS,CAEjC;IAED;;;;;;OAMG;IACH,IAAI,WAAW,IAAI,MAAM,GAAG,SAAS,CAEpC;IAED;;;;;;;OAOG;cACa,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAiBvC;;;;;;;OAOG;cACa,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAa1C;;;;;;;OAOG;IACH,cAAc,IAAI,IAAI;IAWhB,gBAAgB,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IA8B/C,eAAe,CAAC,KAAK,EAAE,eAAe,GAAG,OAAO,CAAC,IAAI,CAAC;IAY5D,SAAS,CAAC,gBAAgB,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE,KAAK,CAAC,EAAE,eAAe,GAAG,IAAI;IAO1E;;;;;;OAMG;IACG,QAAQ,IAAI,OAAO,CAAC,OAAO,CAAC;IAyBlC;;;;;;;OAOG;IACG,YAAY,CAAC,KAAK,EAAE,OAAO,EAAE,IAAI,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAKhE;;;;;;OAMG;IACH,eAAe,CAAC,QAAQ,EAAE,OAAO,EAAE,IAAI,GAAE,KAAiB,GAAG,IAAI;CAsElE"}
1	+ {"version":3,"file":"form-item.controller.d.ts","sourceRoot":"","sources":["../../../../../../src/controller/control/form/form-detail/form-item/form-item.controller.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAoB,MAAM,kBAAkB,CAAC;AAMjE,OAAO,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAC5D,OAAO,EAAE,oBAAoB,EAAE,MAAM,uCAAuC,CAAC;AAC7E,OAAO,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAClD,OAAO,EACL,0BAA0B,EAC1B,iBAAiB,EACjB,eAAe,EACf,8BAA8B,EAC/B,MAAM,0BAA0B,CAAC;AAIlC,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAGvD,qBAAa,kBACX,SAAQ,oBAAoB,CAAC,WAAW,CACxC,YAAW,0BAA0B;IAE7B,KAAK,EAAE,aAAa,CAAC;IAE7B,SAAS,CAAC,WAAW,IAAI,aAAa;IAItC;;;;;;OAMG;IACH,QAAQ,CAAC,OAAO,EAAE,QAAQ,CAAC;IAE3B;;;;;;OAMG;IACH,QAAQ,CAAC,MAAM,EAAE,OAAO,CAAC;IAEzB;;;;;;OAMG;IACH,MAAM,CAAC,EAAE,iBAAiB,CAAC;IAE3B;;;;;OAKG;IACH,cAAc,CAAC,EAAE,eAAe,CAAC;IAEjC;;;;;;;OAOG;IACH,OAAO,CAAC,SAAS,CAAU;IAE3B;;;;;;OAMG;IACH,KAAK,EAAE,KAAK,CAAM;IAElB;;;;;;OAMG;IACH,IAAI,IAAI,IAAI,MAAM,CAEjB;IAED;;;;;;;OAOG;IACH,IAAI,KAAK,IAAI,OAAO,CAEnB;IAED;;;;;;OAMG;IACH,IAAI,aAAa,IAAI,MAAM,GAAG,SAAS,CAKtC;IAED;;;;;;;;OAQG;gBAED,KAAK,EAAE,WAAW,EAClB,IAAI,EAAE,cAAc,EACpB,MAAM,CAAC,EAAE,8BAA8B;IAOzC;;;;;;OAMG;IACH,IAAI,QAAQ,IAAI,MAAM,GAAG,SAAS,CAEjC;IAED;;;;;;OAMG;IACH,IAAI,WAAW,IAAI,MAAM,GAAG,SAAS,CAEpC;IAED;;;;;;;OAOG;IACH,IAAI,QAAQ,IAAI,MAAM,GAAG,SAAS,CAEjC;IAED;;;;;;;OAOG;cACa,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAiBvC;;;;;;;OAOG;cACa,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAa1C;;;;;;;OAOG;IACH,cAAc,IAAI,IAAI;IAWhB,gBAAgB,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IA8B/C,eAAe,CAAC,KAAK,EAAE,eAAe,GAAG,OAAO,CAAC,IAAI,CAAC;IAY5D,SAAS,CAAC,gBAAgB,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE,KAAK,CAAC,EAAE,eAAe,GAAG,IAAI;IAO1E;;;;;;OAMG;IACG,QAAQ,IAAI,OAAO,CAAC,OAAO,CAAC;IAyBlC;;;;;;;OAOG;IACG,YAAY,CAAC,KAAK,EAAE,OAAO,EAAE,IAAI,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAKhE;;;;;;OAMG;IACH,eAAe,CAAC,QAAQ,EAAE,OAAO,EAAE,IAAI,GAAE,KAAiB,GAAG,IAAI;CAsElE"}

package/out/controller/control/form/form-detail/form-item/form-item.controller.js CHANGED Viewed

@@ -90,6 +90,17 @@ export class FormItemController extends FormDetailController {
     get valueFormat() {
         return this.model.valueFormat;
     }
+    /**
+     * 数据类型
+     *
+     * @author zhanghengfeng
+     * @date 2023-09-01 11:09:00
+     * @readonly
+     * @type {(number | undefined)}
+     */
+    get dataType() {
+        return this.model.dataType;
+    }
     /**
      * 初始化
      *

package/out/controller/control/form/form-detail/form-mdctrl/form-mdctrl-repeater/form-mdctrl-repeater-grid/form-mdctrl-repeater-grid.controller.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"form-mdctrl-repeater-grid.controller.d.ts","sourceRoot":"","sources":["../../../../../../../../src/controller/control/form/form-detail/form-mdctrl/form-mdctrl-repeater/form-mdctrl-repeater-grid/form-mdctrl-repeater-grid.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAe,MAAM,kBAAkB,CAAC;AAC9D,OAAO,EACL,iBAAiB,EACjB,eAAe,EAChB,MAAM,gCAAgC,CAAC;AAIxC,OAAO,EAAE,+BAA+B,EAAE,MAAM,2CAA2C,CAAC;AAE5F;;;;;;;;;GASG;AACH,qBAAa,gCAAiC,SAAQ,+BAA+B;IACnF;;;;;;;OAOG;IACH,OAAO,EAAE;QAAE,QAAQ,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAA;KAAE,EAAE,CAAM;IAEtD;;;;;;;;;OASG;IACH,SAAS,EAAE;QACT,CAAC,GAAG,EAAE,MAAM,GAAG;YAAE,QAAQ,EAAE,eAAe,CAAC;YAAC,UAAU,EAAE,iBAAiB,CAAA;SAAE,CAAC;KAC7E,CAAM;IAEP;;;;;;;;OAQG;IACU,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAIpC;;;;;;;OAOG;IACI,WAAW,CAAC,OAAO,EAAE,aAAa,EAAE,GAAG,IAAI;~~IA6BlD~~;;;;;;;;;;OAUG;IACH,aAAa,CAAC,GAAG,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,IAAI;CAY/D"}
1	+ {"version":3,"file":"form-mdctrl-repeater-grid.controller.d.ts","sourceRoot":"","sources":["../../../../../../../../src/controller/control/form/form-detail/form-mdctrl/form-mdctrl-repeater/form-mdctrl-repeater-grid/form-mdctrl-repeater-grid.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAe,MAAM,kBAAkB,CAAC;AAC9D,OAAO,EACL,iBAAiB,EACjB,eAAe,EAChB,MAAM,gCAAgC,CAAC;AAIxC,OAAO,EAAE,+BAA+B,EAAE,MAAM,2CAA2C,CAAC;AAE5F;;;;;;;;;GASG;AACH,qBAAa,gCAAiC,SAAQ,+BAA+B;IACnF;;;;;;;OAOG;IACH,OAAO,EAAE;QAAE,QAAQ,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAA;KAAE,EAAE,CAAM;IAEtD;;;;;;;;;OASG;IACH,SAAS,EAAE;QACT,CAAC,GAAG,EAAE,MAAM,GAAG;YAAE,QAAQ,EAAE,eAAe,CAAC;YAAC,UAAU,EAAE,iBAAiB,CAAA;SAAE,CAAC;KAC7E,CAAM;IAEP;;;;;;;;OAQG;IACU,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAIpC;;;;;;;OAOG;IACI,WAAW,CAAC,OAAO,EAAE,aAAa,EAAE,GAAG,IAAI;IA8BlD;;;;;;;;;;OAUG;IACH,aAAa,CAAC,GAAG,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,IAAI;CAY/D"}

package/out/controller/control/form/form-detail/form-mdctrl/form-mdctrl-repeater/form-mdctrl-repeater-grid/form-mdctrl-repeater-grid.controller.js CHANGED Viewed

@@ -59,7 +59,7 @@ export class FormMDCtrlRepeaterGridController extends FormMDCtrlContentTypeContr
     initColumns(details) {
         details.forEach(async (detail) => {
             if (detail.detailType === 'FORMITEM') {
-                const { editor } = detail;
+                const { editor, dataType } = detail;
                 const editorProvider = await getEditorProvider(editor);
                 if (editorProvider) {
                     const c = await editorProvider.createController(editor, {
@@ -67,6 +67,7 @@ export class FormMDCtrlRepeaterGridController extends FormMDCtrlContentTypeContr
                         valueFormat: editor.valueFormat,
                         context: this.parent.form.context,
                         params: this.parent.form.params,
+                        dataType,
                     });
                     this.editorMap[detail.codeName] = {
                         provider: editorProvider,

package/out/controller/control/grid/grid/grid.controller.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"grid.controller.d.ts","sourceRoot":"","sources":["../../../../../src/controller/control/grid/grid/grid.controller.ts"],"names":[],"mappings":"AASA,OAAO,EAAE,OAAO,EAAsB,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAE9E,OAAO,EAAE,yBAAyB,EAAE,MAAM,+DAA+D,CAAC;AAC1G,OAAO,EAAE,oBAAoB,EAAE,MAAM,0BAA0B,CAAC;AAChE,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAChD,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAC7C,OAAO,EACL,6BAA6B,EAC7B,sBAAsB,EACvB,MAAM,gBAAgB,CAAC;AACxB,OAAO,EACL,UAAU,EACV,UAAU,EACV,eAAe,EACf,mBAAmB,EACnB,YAAY,EACZ,gBAAgB,EACjB,MAAM,uBAAuB,CAAC;AAG/B,OAAO,EAAE,SAAS,EAAS,MAAM,qBAAqB,CAAC;AACvD,OAAO,EAAE,mBAAmB,EAAE,MAAM,iBAAiB,CAAC;AACtD,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;~~AAGpD~~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~~IA4B5E~~;;;;;;;;OAQG;IACG,QAAQ,CAAC,IAAI,EAAE,gBAAgB,GAAG,OAAO,CAAC,SAAS,EAAE,CAAC;IAe5D;;;;;;OAMG;IACG,UAAU,CAAC,KAAK,EAAE;QAAE,KAAK,EAAE,UAAU,CAAC;QAAC,MAAM,EAAE,KAAK,CAAA;KAAE,GAAG,OAAO,CAAC,IAAI,CAAC;CA4F7E"}
1	+ {"version":3,"file":"grid.controller.d.ts","sourceRoot":"","sources":["../../../../../src/controller/control/grid/grid/grid.controller.ts"],"names":[],"mappings":"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"}

package/out/controller/control/grid/grid/grid.controller.js CHANGED Viewed

@@ -9,6 +9,7 @@ import { Srfuf } from '../../../../service';
 import { MDControlController } from '../../../common';
 import { GridNotifyState } from '../../../constant';
 import { isValueChange } from '../../../utils';
+import { ScriptFactory } from '../../../../utils';
 /**
  * 表格控制器
  *
@@ -647,15 +648,22 @@ export class GridController extends MDControlController {
         if (!findUpdate) {
             throw new RuntimeError(`没找到${updateId}编辑列更新`);
         }
-        const { appDEMethodId, degeiupdateDetails } = findUpdate;
+        const { appDEMethodId, degeiupdateDetails, customCode, scriptCode } = findUpdate;
         const updateItems = degeiupdateDetails.map(item => item.id);
-        const params = Object.assign(Object.assign({}, this.params), row.data.getOrigin());
-        const res = await this.service.updateGridEditItem(appDEMethodId, this.context, params);
-        const result = res.data;
-        if (result && (updateItems === null || updateItems === void 0 ? void 0 : updateItems.length)) {
-            await Promise.all(updateItems.map(itemName => {
-                return this.setRowValue(row, itemName, result[itemName]);
-            }));
+        if (customCode && scriptCode) {
+            ScriptFactory.execScriptFn({ data: row.data }, scriptCode, {
+                isAsync: false,
+            });
+        }
+        else {
+            const params = Object.assign(Object.assign({}, this.params), row.data.getOrigin());
+            const res = await this.service.updateGridEditItem(appDEMethodId, this.context, params);
+            const result = res.data;
+            if (result && (updateItems === null || updateItems === void 0 ? void 0 : updateItems.length)) {
+                await Promise.all(updateItems.map(itemName => {
+                    return this.setRowValue(row, itemName, result[itemName]);
+                }));
+            }
         }
     }
     /**

package/out/controller/control/grid/grid/grid.service.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"grid.service.d.ts","sourceRoot":"","sources":["../../../../../src/controller/control/grid/grid/grid.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACpD,OAAO,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAC3C,OAAO,EAAE,gBAAgB,EAAc,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAE9E;;;;;;;GAOG;AACH,qBAAa,WAAY,SAAQ,gBAAgB,CAAC,OAAO,CAAC;IACxD;;;;;OAKG;IACH,aAAa,IAAI,IAAI;IAgCrB;;;;;;;;;OASG;IACG,kBAAkB,CACtB,UAAU,EAAE,MAAM,EAClB,OAAO,EAAE,OAAO,EAChB,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC;~~CAKrC~~"}
1	+ {"version":3,"file":"grid.service.d.ts","sourceRoot":"","sources":["../../../../../src/controller/control/grid/grid/grid.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACpD,OAAO,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAC3C,OAAO,EAAE,gBAAgB,EAAc,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAE9E;;;;;;;GAOG;AACH,qBAAa,WAAY,SAAQ,gBAAgB,CAAC,OAAO,CAAC;IACxD;;;;;OAKG;IACH,aAAa,IAAI,IAAI;IAgCrB;;;;;;;;;OASG;IACG,kBAAkB,CACtB,UAAU,EAAE,MAAM,EAClB,OAAO,EAAE,OAAO,EAChB,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC;CAQrC"}

package/out/controller/control/grid/grid/grid.service.js CHANGED Viewed

@@ -57,7 +57,8 @@ export class GridService extends MDControlService {
      * @returns {*}  {Promise<IHttpResponse<ControlVO>>}
      */
     async updateGridEditItem(methodName, context, params = {}) {
-        let res = await this.entityService.exec(methodName, context, params);
+        const entityService = await this.app.deService.getService(this.model.appDataEntityId);
+        let res = await entityService.exec(methodName, context, params);
         res = this.handleResponse(res);
         return res;
     }

package/out/controller/control/grid/grid-column/grid-field-column/grid-field-column.controller.js CHANGED Viewed

@@ -233,7 +233,7 @@ export class GridFieldColumnController extends GridColumnController {
      */
     formatValue(value = '') {
         // 根据数据类型增强转换显示文本
-        if (this.model.valueType) {
+        if (this.model.valueType !== 'SIMPLE') {
             return ValueExUtil.toText(this.model, value);
         }
         // 根据格式化配置格式化显示

package/out/controller/control/list/list.controller.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"list.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/list/list.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAC3C,OAAO,EACL,UAAU,EACV,UAAU,EACV,eAAe,EACf,kBAAkB,EAClB,gBAAgB,EAGjB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AACnD,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAE7C,qBAAa,cACX,SAAQ,mBAAmB,CAAC,OAAO,EAAE,UAAU,EAAE,UAAU,CAC3D,YAAW,eAAe;IAElB,OAAO,EAAE,WAAW,CAAC;IAE7B,SAAS,CAAC,SAAS,IAAI,IAAI;cAKX,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;~~IAM1C~~;;;;;;;OAOG;IACH,OAAO,CAAC,GAAG,CAAC,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,KAAK,GAAG,MAAM,GAAG,IAAI;IAcnD;;;;;;;;OAQG;IACH,SAAS,KAAK,sBAAsB,IAAI,kBAAkB,GAAG,SAAS,CAKrE;IAED;;;;;;;;OAQG;IACH,SAAS,KAAK,sBAAsB,IAAI,kBAAkB,GAAG,SAAS,CAKrE;IAED;;;;;;;OAOG;IACH,YAAY,CAAC,SAAS,EAAE,KAAK,EAAE,GAAG,IAAI;IAatC;;;;;OAKG;IACG,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;IAMzB,SAAS,CAAC,IAAI,EAAE,gBAAgB,EAAE,KAAK,EAAE,KAAK,EAAE,GAAG,OAAO,CAAC,KAAK,EAAE,CAAC;IAKzE;;;;;;;OAOG;IACH,OAAO,CAAC,KAAK,EAAE,KAAK,EAAE,GAAG,IAAI;IAI7B;;;;;;;OAOG;IACH,UAAU,IAAI,KAAK,EAAE;IAIrB;;;;OAIG;cACa,eAAe,IAAI,OAAO,CAAC,IAAI,CAAC;IAWhD;;;;OAIG;IACH,SAAS,CAAC,eAAe,IAAI,IAAI;IAqBjC;;;;OAIG;cACa,mBAAmB,IAAI,OAAO,CAAC,IAAI,CAAC;CAkCrD"}
1	+ {"version":3,"file":"list.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/list/list.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAC3C,OAAO,EACL,UAAU,EACV,UAAU,EACV,eAAe,EACf,kBAAkB,EAClB,gBAAgB,EAGjB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AACnD,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAE7C,qBAAa,cACX,SAAQ,mBAAmB,CAAC,OAAO,EAAE,UAAU,EAAE,UAAU,CAC3D,YAAW,eAAe;IAElB,OAAO,EAAE,WAAW,CAAC;IAE7B,SAAS,CAAC,SAAS,IAAI,IAAI;cAKX,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAO1C;;;;;;;OAOG;IACH,OAAO,CAAC,GAAG,CAAC,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,KAAK,GAAG,MAAM,GAAG,IAAI;IAcnD;;;;;;;;OAQG;IACH,SAAS,KAAK,sBAAsB,IAAI,kBAAkB,GAAG,SAAS,CAKrE;IAED;;;;;;;;OAQG;IACH,SAAS,KAAK,sBAAsB,IAAI,kBAAkB,GAAG,SAAS,CAKrE;IAED;;;;;;;OAOG;IACH,YAAY,CAAC,SAAS,EAAE,KAAK,EAAE,GAAG,IAAI;IAatC;;;;;OAKG;IACG,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;IAMzB,SAAS,CAAC,IAAI,EAAE,gBAAgB,EAAE,KAAK,EAAE,KAAK,EAAE,GAAG,OAAO,CAAC,KAAK,EAAE,CAAC;IAKzE;;;;;;;OAOG;IACH,OAAO,CAAC,KAAK,EAAE,KAAK,EAAE,GAAG,IAAI;IAI7B;;;;;;;OAOG;IACH,UAAU,IAAI,KAAK,EAAE;IAIrB;;;;OAIG;cACa,eAAe,IAAI,OAAO,CAAC,IAAI,CAAC;IAWhD;;;;OAIG;IACH,SAAS,CAAC,eAAe,IAAI,IAAI;IAqBjC;;;;OAIG;cACa,mBAAmB,IAAI,OAAO,CAAC,IAAI,CAAC;CAkCrD"}

package/out/controller/control/list/list.controller.js CHANGED Viewed

@@ -7,6 +7,7 @@ export class ListController extends MDControlController {
     }
     async onCreated() {
         await super.onCreated();
+        this.state.size = this.model.pagingSize || 20;
         this.service = new ListService(this.model);
         await this.service.init(this.context);
     }

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

@@ -12,6 +12,13 @@ export declare class DELogicContext {
     context: IParams;
     data: IData;
     viewParams: IParams;
+    /**
+     * 上一次返回值
+     * @author lxm
+     * @date 2023-09-04 09:22:52
+     * @type {unknown}
+     */
+    lastReturn: unknown;
     /**
      * Creates an instance of DELogicContext.
      * @author lxm
@@ -69,5 +76,19 @@ export declare class DELogicContext {
      * @type {string}
      */
     defaultParamName: string;
+    /**
+     * 设置上一次返回值
+     * @author lxm
+     * @date 2023-09-04 09:23:52
+     * @param {unknown} value
+     */
+    setLastReturn(value: unknown): void;
+    /**
+     * 初始化上一次返回参数类型的逻辑参数
+     * @author lxm
+     * @date 2023-09-04 09:52:00
+     * @param {string} tag
+     */
+    initLastReturnParam(tag: string): void;
 }
 //# sourceMappingURL=de-logic-context.d.ts.map

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

	@@ -1 +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;~~IAWvB~~,OAAO,CAAC,aAAa;IACd,OAAO,EAAE,OAAO;IAChB,IAAI,EAAE,KAAK;IACX,UAAU,EAAE,OAAO;~~IAb5B~~;;;;;;;;OAQG;gBAEO,aAAa,EAAE,GAAG,CAAC,MAAM,EAAE,YAAY,CAAC,EACzC,OAAO,EAAE,OAAO,EAChB,IAAI,EAAE,KAAK,EACX,UAAU,EAAE,OAAO;IAG5B;;;;;OAKG;IACH,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI;IAI9B;;;;;OAKG;IACH,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI;IAI9B;;;;;;;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~~"}
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;IAmBvB,OAAO,CAAC,aAAa;IACd,OAAO,EAAE,OAAO;IAChB,IAAI,EAAE,KAAK;IACX,UAAU,EAAE,OAAO;IArB5B;;;;;OAKG;IACH,UAAU,EAAE,OAAO,CAAC;IAEpB;;;;;;;;OAQG;gBAEO,aAAa,EAAE,GAAG,CAAC,MAAM,EAAE,YAAY,CAAC,EACzC,OAAO,EAAE,OAAO,EAChB,IAAI,EAAE,KAAK,EACX,UAAU,EAAE,OAAO;IAG5B;;;;;OAKG;IACH,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI;IAI9B;;;;;OAKG;IACH,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI;IAI9B;;;;;;;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;IAErC;;;;;OAKG;IACH,aAAa,CAAC,KAAK,EAAE,OAAO,GAAG,IAAI;IAInC;;;;;OAKG;IACH,mBAAmB,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI;CAOvC"}

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

@@ -76,4 +76,26 @@ export class DELogicContext {
         var _a;
         (_a = this.deLogicParams.get(name)) === null || _a === void 0 ? void 0 : _a.renew(this);
     }
+    /**
+     * 设置上一次返回值
+     * @author lxm
+     * @date 2023-09-04 09:23:52
+     * @param {unknown} value
+     */
+    setLastReturn(value) {
+        this.lastReturn = value;
+    }
+    /**
+     * 初始化上一次返回参数类型的逻辑参数
+     * @author lxm
+     * @date 2023-09-04 09:52:00
+     * @param {string} tag
+     */
+    initLastReturnParam(tag) {
+        Object.defineProperty(this.params, tag, {
+            enumerable: true,
+            configurable: true,
+            get: () => this.lastReturn,
+        });
+    }
 }

package/out/de-logic/de-logic-param/de-logic-param.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"de-logic-param.d.ts","sourceRoot":"","sources":["../../../src/de-logic/de-logic-param/de-logic-param.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAEjD,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAErD;;;;;;;GAOG;AACH,qBAAa,YAAY;IAQJ,KAAK,EAAE,aAAa;IAPvC;;;;;;OAMG;gBACgB,KAAK,EAAE,aAAa;IAEvC;;;;;;;;;OASG;IACH,IAAI,CAAC,GAAG,EAAE,cAAc,GAAG,IAAI;~~IA+C~~/B;;;;;OAKG;IACH,KAAK,CAAC,GAAG,EAAE,cAAc,GAAG,IAAI;CAWjC"}
1	+ {"version":3,"file":"de-logic-param.d.ts","sourceRoot":"","sources":["../../../src/de-logic/de-logic-param/de-logic-param.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAEjD,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAErD;;;;;;;GAOG;AACH,qBAAa,YAAY;IAQJ,KAAK,EAAE,aAAa;IAPvC;;;;;;OAMG;gBACgB,KAAK,EAAE,aAAa;IAEvC;;;;;;;;;OASG;IACH,IAAI,CAAC,GAAG,EAAE,cAAc,GAAG,IAAI;IAgD/B;;;;;OAKG;IACH,KAAK,CAAC,GAAG,EAAE,cAAc,GAAG,IAAI;CAWjC"}

package/out/de-logic/de-logic-param/de-logic-param.js CHANGED Viewed

@@ -51,7 +51,8 @@ export class DELogicParam {
             ctx.params[tag] = {};
         }
         else if (m.lastReturnParam) {
-            throw new ModelError(m, `未支持的逻辑参数类型: 上次调用返回`);
+            // 上一次调用返回
+            ctx.initLastReturnParam(tag);
         }
         else if (m.appContextParam) {
             // 应用上下文

package/out/engine/md-view.engine.d.ts CHANGED Viewed

@@ -106,6 +106,13 @@ export declare class MDViewEngine extends ViewEngineBase {
      * @return {*}  {Promise<void>}
      */
     protected refresh(): Promise<void>;
+    /**
+     * 视图重新加载
+     * @author lxm
+     * @date 2023-05-22 03:17:33
+     * @return {*}  {Promise<void>}
+     */
+    protected reLoad(): Promise<void>;
     /**
      * 获取搜索相关的查询参数
      * @author lxm

package/out/engine/md-view.engine.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"md-view.engine.d.ts","sourceRoot":"","sources":["../../src/engine/md-view.engine.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AAEvD,OAAO,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AAC/C,OAAO,EACL,YAAY,EACZ,YAAY,EACZ,oBAAoB,EACpB,qBAAqB,EACrB,kBAAkB,EAClB,oBAAoB,EACpB,gBAAgB,EAChB,SAAS,EACV,MAAM,cAAc,CAAC;AAEtB,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAEpD;;;;;;;GAOG;AACH,qBAAa,YAAa,SAAQ,cAAc;IAC9C,UAAkB,IAAI,EAAE,cAAc,CACpC,mBAAmB,EACnB,YAAY,EACZ,YAAY,CACb,CAAC;IAEF;;;;;;OAMG;IACH,IAAI,gBAAgB,IAAI,MAAM,CAE7B;IAED;;;;;OAKG;IACH,SAAS,KAAK,UAAU,IAAI,qBAAqB,CAEhD;IAED;;;;;OAKG;IACH,SAAS,KAAK,SAAS,IAAI,oBAAoB,CAE9C;IAED;;;;;;OAMG;IACH,SAAS,KAAK,YAAY,IAAI,oBAAoB,CAIjD;IAEK,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAM1B,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAsDhC;;;;;;;OAOG;cACa,aAAa,CAAC,KAAK,EAAE,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC;IAKxD,IAAI,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,GAAG,OAAO,CAAC,KAAK,GAAG,IAAI,GAAG,SAAS,CAAC;IAwCrE,SAAS,CAAC,OAAO,IAAI,KAAK,EAAE;IAI5B;;;;;;;;OAQG;cACa,QAAQ,CAAC,IAAI,EAAE;QAC7B,IAAI,EAAE,KAAK,EAAE,CAAC;QACd,KAAK,CAAC,EAAE,UAAU,CAAC;QACnB,OAAO,CAAC,EAAE,QAAQ,CAAC;QACnB,MAAM,CAAC,EAAE,OAAO,CAAC;KAClB,GAAG,OAAO,CAAC,IAAI,CAAC;IA0BjB;;;;;;;;OAQG;cACa,OAAO,CAAC,IAAI,EAAE;QAC5B,IAAI,EAAE,KAAK,EAAE,CAAC;QACd,KAAK,CAAC,EAAE,UAAU,CAAC;QACnB,QAAQ,CAAC,EAAE,OAAO,CAAC;KACpB,GAAG,OAAO,CAAC,IAAI,CAAC;IA6BjB;;;;;;OAMG;cACa,MAAM,CAAC,IAAI,CAAC,EAAE,kBAAkB,GAAG,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC;IAI5E;;;;;OAKG;cACa,IAAI,CAAC,IAAI,GAAE,gBAAqB,GAAG,OAAO,CAAC,IAAI,CAAC;IAIhE;;;;;OAKG;cACa,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAIxC;;;;;OAKG;IACH,SAAS,CAAC,eAAe,IAAI,OAAO;IAsCpC;;;;;OAKG;cACa,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAI3C;;;;;;OAMG;cACa,UAAU,CAAC,IAAI,EAAE;QAAE,KAAK,EAAE,UAAU,CAAA;KAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAItE;;;;;;OAMG;IACG,IAAI,CAAC,IAAI,EAAE;QAAE,IAAI,EAAE,KAAK,EAAE,CAAC;QAAC,KAAK,CAAC,EAAE,UAAU,CAAA;KAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAItE,SAAS,CAAC,qBAAqB,IAAI,OAAO;IAc1C;;;;;OAKG;IACH,SAAS,CAAC,YAAY,IAAI,IAAI;CAS/B"}
1	+ {"version":3,"file":"md-view.engine.d.ts","sourceRoot":"","sources":["../../src/engine/md-view.engine.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AAEvD,OAAO,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AAC/C,OAAO,EACL,YAAY,EACZ,YAAY,EACZ,oBAAoB,EACpB,qBAAqB,EACrB,kBAAkB,EAClB,oBAAoB,EACpB,gBAAgB,EAChB,SAAS,EACV,MAAM,cAAc,CAAC;AAEtB,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAEpD;;;;;;;GAOG;AACH,qBAAa,YAAa,SAAQ,cAAc;IAC9C,UAAkB,IAAI,EAAE,cAAc,CACpC,mBAAmB,EACnB,YAAY,EACZ,YAAY,CACb,CAAC;IAEF;;;;;;OAMG;IACH,IAAI,gBAAgB,IAAI,MAAM,CAE7B;IAED;;;;;OAKG;IACH,SAAS,KAAK,UAAU,IAAI,qBAAqB,CAEhD;IAED;;;;;OAKG;IACH,SAAS,KAAK,SAAS,IAAI,oBAAoB,CAE9C;IAED;;;;;;OAMG;IACH,SAAS,KAAK,YAAY,IAAI,oBAAoB,CAIjD;IAEK,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAM1B,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAsDhC;;;;;;;OAOG;cACa,aAAa,CAAC,KAAK,EAAE,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC;IAKxD,IAAI,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,GAAG,OAAO,CAAC,KAAK,GAAG,IAAI,GAAG,SAAS,CAAC;IAwCrE,SAAS,CAAC,OAAO,IAAI,KAAK,EAAE;IAI5B;;;;;;;;OAQG;cACa,QAAQ,CAAC,IAAI,EAAE;QAC7B,IAAI,EAAE,KAAK,EAAE,CAAC;QACd,KAAK,CAAC,EAAE,UAAU,CAAC;QACnB,OAAO,CAAC,EAAE,QAAQ,CAAC;QACnB,MAAM,CAAC,EAAE,OAAO,CAAC;KAClB,GAAG,OAAO,CAAC,IAAI,CAAC;IA0BjB;;;;;;;;OAQG;cACa,OAAO,CAAC,IAAI,EAAE;QAC5B,IAAI,EAAE,KAAK,EAAE,CAAC;QACd,KAAK,CAAC,EAAE,UAAU,CAAC;QACnB,QAAQ,CAAC,EAAE,OAAO,CAAC;KACpB,GAAG,OAAO,CAAC,IAAI,CAAC;IA6BjB;;;;;;OAMG;cACa,MAAM,CAAC,IAAI,CAAC,EAAE,kBAAkB,GAAG,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC;IAI5E;;;;;OAKG;cACa,IAAI,CAAC,IAAI,GAAE,gBAAqB,GAAG,OAAO,CAAC,IAAI,CAAC;IAIhE;;;;;OAKG;cACa,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAIxC;;;;;OAKG;cACa,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAIvC;;;;;OAKG;IACH,SAAS,CAAC,eAAe,IAAI,OAAO;IAsCpC;;;;;OAKG;cACa,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAI3C;;;;;;OAMG;cACa,UAAU,CAAC,IAAI,EAAE;QAAE,KAAK,EAAE,UAAU,CAAA;KAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAItE;;;;;;OAMG;IACG,IAAI,CAAC,IAAI,EAAE;QAAE,IAAI,EAAE,KAAK,EAAE,CAAC;QAAC,KAAK,CAAC,EAAE,UAAU,CAAA;KAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAItE,SAAS,CAAC,qBAAqB,IAAI,OAAO;IAc1C;;;;;OAKG;IACH,SAAS,CAAC,YAAY,IAAI,IAAI;CAS/B"}

package/out/engine/md-view.engine.js CHANGED Viewed

@@ -86,13 +86,13 @@ export class MDViewEngine extends ViewEngineBase {
         // 搜索表单搜索触发加载
         if (this.searchForm) {
             this.searchForm.evt.on('onSearch', () => {
-                this.refresh();
+                this.reLoad();
             });
         }
         // 搜索栏搜索触发加载
         if (this.searchBar) {
             this.searchBar.evt.on('onSearch', () => {
-                this.refresh();
+                this.reLoad();
             });
         }
         // 默认加载
@@ -248,6 +248,15 @@ export class MDViewEngine extends ViewEngineBase {
     async refresh() {
         await this.xdataControl.refresh();
     }
+    /**
+     * 视图重新加载
+     * @author lxm
+     * @date 2023-05-22 03:17:33
+     * @return {*}  {Promise<void>}
+     */
+    async reLoad() {
+        await this.xdataControl.load({ isInitialLoad: true });
+    }
     /**
      * 获取搜索相关的查询参数
      * @author lxm

package/out/interface/controller/controller/editor/i-editor-container.controller.d.ts CHANGED Viewed

@@ -34,5 +34,13 @@ export interface IEditorContainerController {
      * @type {IParams}
      */
     params: IParams;
+    /**
+     * 数据类型
+     *
+     * @author zhanghengfeng
+     * @date 2023-09-01 11:09:38
+     * @type {(number | undefined)}
+     */
+    dataType: number | undefined;
 }
 //# sourceMappingURL=i-editor-container.controller.d.ts.map

package/out/interface/controller/controller/editor/i-editor-container.controller.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"i-editor-container.controller.d.ts","sourceRoot":"","sources":["../../../../../src/interface/controller/controller/editor/i-editor-container.controller.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AACH,MAAM,WAAW,0BAA0B;IACzC;;;;;OAKG;IACH,QAAQ,EAAE,MAAM,GAAG,SAAS,CAAC;IAE7B;;;;;OAKG;IACH,WAAW,EAAE,MAAM,GAAG,SAAS,CAAC;IAEhC;;;;;OAKG;IACH,OAAO,EAAE,QAAQ,CAAC;IAElB;;;;;OAKG;IACH,MAAM,EAAE,OAAO,CAAC;~~CACjB~~"}
1	+ {"version":3,"file":"i-editor-container.controller.d.ts","sourceRoot":"","sources":["../../../../../src/interface/controller/controller/editor/i-editor-container.controller.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AACH,MAAM,WAAW,0BAA0B;IACzC;;;;;OAKG;IACH,QAAQ,EAAE,MAAM,GAAG,SAAS,CAAC;IAE7B;;;;;OAKG;IACH,WAAW,EAAE,MAAM,GAAG,SAAS,CAAC;IAEhC;;;;;OAKG;IACH,OAAO,EAAE,QAAQ,CAAC;IAElB;;;;;OAKG;IACH,MAAM,EAAE,OAAO,CAAC;IAEhB;;;;;;OAMG;IACH,QAAQ,EAAE,MAAM,GAAG,SAAS,CAAC;CAC9B"}

package/out/interface/controller/event/view/i-form-pickup-data-view.event.d.ts ADDED Viewed

@@ -0,0 +1,13 @@
+import { IPickupDataViewEvent } from './i-pickup-data-view.event';
+/**
+ * 表单选择数据视图事件
+ *
+ * @author zk
+ * @date 2023-09-01 02:09:26
+ * @export
+ * @interface IFormPickupDataViewEvent
+ * @extends {IMDViewEvent}
+ */
+export interface IFormPickupDataViewEvent extends IPickupDataViewEvent {
+}
+//# sourceMappingURL=i-form-pickup-data-view.event.d.ts.map

package/out/interface/controller/event/view/i-form-pickup-data-view.event.d.ts.map ADDED Viewed

	@@ -0,0 +1 @@
1	+ {"version":3,"file":"i-form-pickup-data-view.event.d.ts","sourceRoot":"","sources":["../../../../../src/interface/controller/event/view/i-form-pickup-data-view.event.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,MAAM,4BAA4B,CAAC;AAElE;;;;;;;;GAQG;AACH,MAAM,WAAW,wBAAyB,SAAQ,oBAAoB;CAAG"}

package/out/interface/controller/event/view/i-form-pickup-data-view.event.js ADDED Viewed

	@@ -0,0 +1 @@
1	+ export {};