@ibiz-template/runtime 0.0.3-beta.3 → 0.0.3-beta.5

package/out/controller/editor/picker.js

@@ -55,11 +55,15 @@ export class PickerEditorController extends EditorController {
          * 不支持AC（根据编辑器类型得）
          */
         this.noAC = false;
+        /**
+         * 不支持按钮（根据编辑器类型得）
+         */
+        this.noButton = false;
     }
     async onInit() {
         var _a, _b, _c;
         super.onInit();
-        this.initNOAC();
+        this.initParams();
         this.valueItem = ((_a = this.model.valueItemName) === null || _a === void 0 ? void 0 : _a.toLowerCase()) || '';
         this.keyName = ((_b = this.model.appDataEntity) === null || _b === void 0 ? void 0 : _b.keyName) || '';
         this.textName = ((_c = this.model.appDataEntity) === null || _c === void 0 ? void 0 : _c.textName) || '';
@@ -69,14 +73,19 @@ export class PickerEditorController extends EditorController {
         this.sort = this.getAcSort();
     }
     /**
-     * 初始化noAc
+     * 初始化noAc和noButton
      */
-    initNOAC() {
+    initParams() {
         switch (this.model.editorType) {
             case 'PICKEREX_NOAC':
+            case 'PICKEREX_NOAC_LINK':
                 this.noAC = true;
                 break;
+            case 'PICKEREX_NOBUTTON':
+                this.noButton = true;
+                break;
             default:
+                this.noButton = false;
                 this.noAC = false;
         }
     }
@@ -100,8 +109,9 @@ export class PickerEditorController extends EditorController {
      * 获取Ac参数
      */
     getAcParams() {
-        const appDe = this.model.source.getPSAppDataEntity();
-        const dataSet = this.model.source.getPSAppDEDataSet();
+        var _a, _b, _c, _d;
+        const appDe = (_b = (_a = this.model.source).getPSAppDataEntity) === null || _b === void 0 ? void 0 : _b.call(_a);
+        const dataSet = (_d = (_c = this.model.source).getPSAppDEDataSet) === null || _d === void 0 ? void 0 : _d.call(_c);
         if (appDe && dataSet) {
             this.serviceName = appDe.codeName;
             this.interfaceName = dataSet.codeName;
@@ -132,11 +142,12 @@ export class PickerEditorController extends EditorController {
      * @memberof PickerEditorController
      */
     async getServiceData(query, data) {
-        const { context, params } = this.handlePublicParams(data);
+        // 附加编辑器视图参数
+        const tempParams = Object.assign(Object.assign({}, this.params), { query, size: 1000 });
         if (this.sort && !Object.is(this.sort, '')) {
-            Object.assign(params, { sort: this.sort });
+            Object.assign(tempParams, { sort: this.sort });
         }
-        Object.assign(params, { query, size: 1000 });
+        const { context, params } = this.handlePublicParams(data, this.context, tempParams);
         if (this.serviceName && this.interfaceName) {
             const deService = await this.app.es.getService(this.serviceName);
             const res = await deService.exec(this.interfaceName, context, params);
@@ -153,7 +164,7 @@ export class PickerEditorController extends EditorController {
      * @memberof PickerEditorController
      */
     async openPickUpView(data, selectedData) {
-        const { context, params } = this.handlePublicParams(data);
+        const { context, params } = this.handlePublicParams(data, this.context, this.params);
         if (selectedData) {
             params.selectedData = selectedData;
         }
@@ -170,7 +181,7 @@ export class PickerEditorController extends EditorController {
      * 打开数据链接视图
      */
     async openLinkView(data) {
-        const { context, params } = this.handlePublicParams(data);
+        const { context, params } = this.handlePublicParams(data, this.context, this.params);
         context.srfkey = data[this.valueItem];
         if (!this.linkView) {
             throw new DefectModelError(this.model.source, '请配置数据链接视图');

package/out/controller/interface/register/i-view-register.d.ts

@@ -1,4 +1,4 @@
-import { IPSAppView } from '@ibiz-template/model';
+import { ViewModel } from '@ibiz-template/model';
 import { IRegister } from '../../../interface';
 import { IViewProvider } from '../provider';
 /**
@@ -19,6 +19,6 @@ export interface IViewRegister extends IRegister<IViewProvider> {
      * @param {ControlModel} model 部件模型
      * @returns {*}  {(IViewProvider)}
      */
-    get(model: IPSAppView): Promise<IViewProvider>;
+    get(model: ViewModel): Promise<IViewProvider>;
 }
 //# sourceMappingURL=i-view-register.d.ts.map

package/out/controller/interface/register/i-view-register.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"i-view-register.d.ts","sourceRoot":"","sources":["../../../../src/controller/interface/register/i-view-register.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAClD,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAC/C,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAE5C;;;;;;;;GAQG;AACH,MAAM,WAAW,aAAc,SAAQ,SAAS,CAAC,aAAa,CAAC;IAC7D;;;;;;;OAOG;IACH,GAAG,CAAC,KAAK,EAAE,UAAU,GAAG,OAAO,CAAC,aAAa,CAAC,CAAC;CAChD"}
+{"version":3,"file":"i-view-register.d.ts","sourceRoot":"","sources":["../../../../src/controller/interface/register/i-view-register.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AACjD,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAC/C,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAE5C;;;;;;;;GAQG;AACH,MAAM,WAAW,aAAc,SAAQ,SAAS,CAAC,aAAa,CAAC;IAC7D;;;;;;;OAOG;IACH,GAAG,CAAC,KAAK,EAAE,SAAS,GAAG,OAAO,CAAC,aAAa,CAAC,CAAC;CAC/C"}

package/out/controller/neuron/nerve/view/grid-exp-view-nerve.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"grid-exp-view-nerve.d.ts","sourceRoot":"","sources":["../../../../../src/controller/neuron/nerve/view/grid-exp-view-nerve.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,UAAU,EACV,MAAM,EAEN,WAAW,EACX,iBAAiB,EAClB,MAAM,OAAO,CAAC;AACf,OAAO,EAAE,qBAAqB,EAAE,MAAM,UAAU,CAAC;AAEjD;;;;;;GAMG;AACH,qBAAa,gBAAiB,SAAQ,WAAW,CAC/C,iBAAiB,EACjB,qBAAqB,CACtB;IACC,IAAI,EAAG,UAAU,CAAC;IAElB,SAAS,CAAC,YAAY,IAAI,iBAAiB;IAI3C,SAAS,CAAC,WAAW;;;;;;;;;;;IAQrB,SAAS,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO;IAQhC,OAAO,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,IAAI;IAwC3C,OAAO,IAAI,IAAI;CAIhB"}
+{"version":3,"file":"grid-exp-view-nerve.d.ts","sourceRoot":"","sources":["../../../../../src/controller/neuron/nerve/view/grid-exp-view-nerve.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,UAAU,EACV,MAAM,EAEN,WAAW,EACX,iBAAiB,EAClB,MAAM,OAAO,CAAC;AACf,OAAO,EAAE,qBAAqB,EAAE,MAAM,UAAU,CAAC;AAEjD;;;;;;GAMG;AACH,qBAAa,gBAAiB,SAAQ,WAAW,CAC/C,iBAAiB,EACjB,qBAAqB,CACtB;IACC,IAAI,EAAG,UAAU,CAAC;IAElB,SAAS,CAAC,YAAY,IAAI,iBAAiB;IAI3C,SAAS,CAAC,WAAW;;;;;;;;;;;IAQrB,SAAS,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO;IAQhC,OAAO,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,IAAI;IA4C3C,OAAO,IAAI,IAAI;CAIhB"}

package/out/controller/neuron/nerve/view/grid-exp-view-nerve.js

@@ -34,6 +34,7 @@ export class GridExpViewNerve extends MDViewNerve {
             this.grid.evt.on('destroyed', () => {
                 this.grid = undefined;
             });
+            this.grid.evt.on('beforeLoad', this.controller.onBeforeLoad.bind(this.controller));
             this.grid.evt.on('dataActive', this.controller.onDataActive.bind(this.controller));
             this.grid.evt.on('selectionChange', this.controller.onSelectionChange.bind(this.controller));
             this.grid.evt.on('actionClick', this.controller.executeViewLogic.bind(this.controller));

package/out/controller/neuron/nerve/view/kanban-view-nerve.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"kanban-view-nerve.d.ts","sourceRoot":"","sources":["../../../../../src/controller/neuron/nerve/view/kanban-view-nerve.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,gBAAgB,EAAE,MAAM,EAAE,MAAM,OAAO,CAAC;AAC/D,OAAO,EAAE,oBAAoB,EAAE,MAAM,UAAU,CAAC;AAChD,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAE9C;;;;;;;;;;GAUG;AACH,qBAAa,eAAe,CAC1B,CAAC,SAAS,gBAAgB,GAAG,gBAAgB,EAC7C,CAAC,SAAS,oBAAoB,GAAG,oBAAoB,CACrD,SAAQ,WAAW,CAAC,CAAC,EAAE,CAAC,CAAC;IACzB,MAAM,EAAG,YAAY,CAAC;IAEtB,SAAS,CAAC,YAAY,IAAI,CAAC;IAI3B,SAAS,CAAC,WAAW;;;;;;;;;;IAOrB,SAAS,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO;IAIhC,OAAO,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,IAAI;IA6B3C,OAAO,IAAI,IAAI;CAIhB"}
+{"version":3,"file":"kanban-view-nerve.d.ts","sourceRoot":"","sources":["../../../../../src/controller/neuron/nerve/view/kanban-view-nerve.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,gBAAgB,EAAE,MAAM,EAAE,MAAM,OAAO,CAAC;AAC/D,OAAO,EAAE,oBAAoB,EAAE,MAAM,UAAU,CAAC;AAChD,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAE9C;;;;;;;;;;GAUG;AACH,qBAAa,eAAe,CAC1B,CAAC,SAAS,gBAAgB,GAAG,gBAAgB,EAC7C,CAAC,SAAS,oBAAoB,GAAG,oBAAoB,CACrD,SAAQ,WAAW,CAAC,CAAC,EAAE,CAAC,CAAC;IACzB,MAAM,EAAG,YAAY,CAAC;IAEtB,SAAS,CAAC,YAAY,IAAI,CAAC;IAI3B,SAAS,CAAC,WAAW;;;;;;;;;;IAOrB,SAAS,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO;IAIhC,OAAO,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,IAAI;IAiC3C,OAAO,IAAI,IAAI;CAIhB"}

package/out/controller/neuron/nerve/view/kanban-view-nerve.js

@@ -30,6 +30,7 @@ export class KanbanViewNerve extends MDViewNerve {
                 this.kanban = undefined;
             });
             this.kanban.evt.on('beforeLoad', this.controller.onBeforeLoad.bind(this.controller));
+            this.kanban.evt.on('beforeLoad', this.controller.onBeforeLoad.bind(this.controller));
             this.kanban.evt.on('dataActive', this.controller.onDataActive.bind(this.controller));
             this.kanban.evt.on('selectionChange', this.controller.onSelectionChange.bind(this.controller));
             this.kanban.evt.on('afterSave', (...args) => this.controller.onAfterSave(...args, name));

package/out/controller/neuron/nerve/view/list-exp-view-nerve.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"list-exp-view-nerve.d.ts","sourceRoot":"","sources":["../../../../../src/controller/neuron/nerve/view/list-exp-view-nerve.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,UAAU,EACV,MAAM,EAEN,WAAW,EACX,iBAAiB,EAClB,MAAM,OAAO,CAAC;AACf,OAAO,EAAE,qBAAqB,EAAE,MAAM,UAAU,CAAC;AAEjD;;;;;;GAMG;AACH,qBAAa,gBAAiB,SAAQ,WAAW,CAC/C,iBAAiB,EACjB,qBAAqB,CACtB;IACC,IAAI,EAAG,UAAU,CAAC;IAElB,SAAS,CAAC,YAAY,IAAI,iBAAiB;IAI3C,SAAS,CAAC,WAAW;;;;;;;;;;IAOrB,SAAS,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO;IAQhC,OAAO,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,IAAI;IAoC3C,OAAO,IAAI,IAAI;CAIhB"}
+{"version":3,"file":"list-exp-view-nerve.d.ts","sourceRoot":"","sources":["../../../../../src/controller/neuron/nerve/view/list-exp-view-nerve.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,UAAU,EACV,MAAM,EAEN,WAAW,EACX,iBAAiB,EAClB,MAAM,OAAO,CAAC;AACf,OAAO,EAAE,qBAAqB,EAAE,MAAM,UAAU,CAAC;AAEjD;;;;;;GAMG;AACH,qBAAa,gBAAiB,SAAQ,WAAW,CAC/C,iBAAiB,EACjB,qBAAqB,CACtB;IACC,IAAI,EAAG,UAAU,CAAC;IAElB,SAAS,CAAC,YAAY,IAAI,iBAAiB;IAI3C,SAAS,CAAC,WAAW;;;;;;;;;;IAOrB,SAAS,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO;IAQhC,OAAO,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,IAAI;IAwC3C,OAAO,IAAI,IAAI;CAIhB"}

package/out/controller/neuron/nerve/view/list-exp-view-nerve.js

@@ -34,6 +34,7 @@ export class ListExpViewNerve extends MDViewNerve {
             this.list.evt.on('destroyed', () => {
                 this.list = undefined;
             });
+            this.list.evt.on('beforeLoad', this.controller.onBeforeLoad.bind(this.controller));
             this.list.evt.on('dataActive', this.controller.onDataActive.bind(this.controller));
             this.list.evt.on('selectionChange', this.controller.onSelectionChange.bind(this.controller));
             this.list.evt.on('afterSave', (...args) => this.controller.onAfterSave(...args, name));

package/out/controller/register/control-register.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"control-register.d.ts","sourceRoot":"","sources":["../../../src/controller/register/control-register.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACpD,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAC9C,OAAO,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;AAElE;;;;;;;;;GASG;AACH,qBAAa,eACX,SAAQ,YAAY,CAAC,gBAAgB,CACrC,YAAW,gBAAgB;IAErB,GAAG,CAAC,KAAK,EAAE,YAAY,GAAG,OAAO,CAAC,gBAAgB,CAAC;CA6B1D"}
+{"version":3,"file":"control-register.d.ts","sourceRoot":"","sources":["../../../src/controller/register/control-register.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACpD,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAC9C,OAAO,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;AAElE;;;;;;;;;GASG;AACH,qBAAa,eACX,SAAQ,YAAY,CAAC,gBAAgB,CACrC,YAAW,gBAAgB;IAErB,GAAG,CAAC,KAAK,EAAE,YAAY,GAAG,OAAO,CAAC,gBAAgB,CAAC;CAkC1D"}

package/out/controller/register/control-register.js

@@ -12,6 +12,7 @@ import { RegisterBase } from '../../register';
  */
 export class ControlRegister extends RegisterBase {
     async get(model) {
+        await ibiz.plugin.loadPredefinedPlugin(`CONTROL_${model.source.controlType}_${model.source.controlStyle || 'DEFAULT'}`);
         // 先找插件标识和类型
         if (model.source.getPSSysPFPlugin()) {
             await ibiz.plugin.loadPlugin(model.source.getPSSysPFPlugin());

package/out/controller/register/editor-register.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"editor-register.d.ts","sourceRoot":"","sources":["../../../src/controller/register/editor-register.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AACnD,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAC9C,OAAO,EAAE,eAAe,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAEhE;;;;;;;;;GASG;AACH,qBAAa,cACX,SAAQ,YAAY,CAAC,eAAe,CACpC,YAAW,eAAe;IAEpB,GAAG,CAAC,KAAK,EAAE,WAAW,GAAG,OAAO,CAAC,eAAe,CAAC;CA6BxD"}
+{"version":3,"file":"editor-register.d.ts","sourceRoot":"","sources":["../../../src/controller/register/editor-register.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AACnD,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAC9C,OAAO,EAAE,eAAe,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAEhE;;;;;;;;;GASG;AACH,qBAAa,cACX,SAAQ,YAAY,CAAC,eAAe,CACpC,YAAW,eAAe;IAEpB,GAAG,CAAC,KAAK,EAAE,WAAW,GAAG,OAAO,CAAC,eAAe,CAAC;CAmCxD"}

package/out/controller/register/editor-register.js

@@ -12,6 +12,8 @@ import { RegisterBase } from '../../register';
  */
 export class EditorRegister extends RegisterBase {
     async get(model) {
+        // 加载预置的编辑器插件
+        await ibiz.plugin.loadPredefinedPlugin(`EDITOR_${model.source.editorType}_${model.source.editorStyle || 'DEFAULT'}`);
         // 先找插件标识和类型
         if (model.source.getPSSysPFPlugin()) {
             await ibiz.plugin.loadPlugin(model.source.getPSSysPFPlugin());

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

@@ -1,4 +1,4 @@
-import { IPSAppView } from '@ibiz-template/model';
+import { ViewModel } from '@ibiz-template/model';
 import { RegisterBase } from '../../register';
 import { IViewRegister, IViewProvider } from '../interface';
 /**
@@ -12,6 +12,6 @@ import { IViewRegister, IViewProvider } from '../interface';
  * @implements {IViewRegister}
  */
 export declare class ViewRegister extends RegisterBase<IViewProvider> implements IViewRegister {
-    get(model: IPSAppView): Promise<IViewProvider>;
+    get(model: ViewModel): Promise<IViewProvider>;
 }
 //# sourceMappingURL=view-register.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"view-register.d.ts","sourceRoot":"","sources":["../../../src/controller/register/view-register.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAyB,MAAM,sBAAsB,CAAC;AACzE,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAC9C,OAAO,EAAE,aAAa,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAE5D;;;;;;;;;GASG;AACH,qBAAa,YACX,SAAQ,YAAY,CAAC,aAAa,CAClC,YAAW,aAAa;IAElB,GAAG,CAAC,KAAK,EAAE,UAAU,GAAG,OAAO,CAAC,aAAa,CAAC;CAkCrD"}
+{"version":3,"file":"view-register.d.ts","sourceRoot":"","sources":["../../../src/controller/register/view-register.ts"],"names":[],"mappings":"AAAA,OAAO,EAAyB,SAAS,EAAE,MAAM,sBAAsB,CAAC;AACxE,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAC9C,OAAO,EAAE,aAAa,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAE5D;;;;;;;;;GASG;AACH,qBAAa,YACX,SAAQ,YAAY,CAAC,aAAa,CAClC,YAAW,aAAa;IAElB,GAAG,CAAC,KAAK,EAAE,SAAS,GAAG,OAAO,CAAC,aAAa,CAAC;CAkCpD"}

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

@@ -12,34 +12,32 @@ import { RegisterBase } from '../../register';
  */
 export class ViewRegister extends RegisterBase {
     async get(model) {
-        // 不加载拿不到viewType等
-        if (!model.isFill) {
-            await model.fill(true);
-        }
+        await ibiz.plugin.loadPredefinedPlugin(`VIEW_${model.source.viewType}_${model.source.viewStyle || 'DEFAULT'}`);
         // 先找插件标识和类型
-        if (model.getPSSysPFPlugin()) {
-            await ibiz.plugin.loadPlugin(model.getPSSysPFPlugin());
-            const { pluginType, pluginCode } = model.getPSSysPFPlugin();
+        const { source } = model;
+        if (source.getPSSysPFPlugin()) {
+            await ibiz.plugin.loadPlugin(source.getPSSysPFPlugin());
+            const { pluginType, pluginCode } = source.getPSSysPFPlugin();
             const key = `${pluginType}_${pluginCode}`;
             if (this.providers.has(key)) {
                 return this.providers.get(key);
             }
-            ibiz.log.error(`找不到插件标识[${key}]对应的适配器`, model);
+            ibiz.log.error(`找不到插件标识[${key}]对应的适配器`, source);
         }
         // 再找视图类型和视图样式
-        const { viewType, viewStyle } = model;
+        const { viewType, viewStyle } = source;
         if (viewStyle && viewStyle !== 'DEFAULT') {
             const key = `${viewType}_${viewStyle}`;
             if (this.providers.has(key)) {
                 return this.providers.get(key);
             }
-            ibiz.log.error(`找不到视图类型：[${viewType}]的视图样式：[${viewStyle}]对应的适配器`, model);
+            ibiz.log.error(`找不到视图类型：[${viewType}]的视图样式：[${viewStyle}]对应的适配器`, source);
         }
         // 最后找视图类型
         if (this.providers.has(viewType)) {
             return this.providers.get(viewType);
         }
-        ibiz.log.error(`找不到视图类型[${viewType}]对应的适配器`, model);
-        throw new UnsupportedModelError(model, `暂未实现`);
+        ibiz.log.error(`找不到视图类型[${viewType}]对应的适配器`, source);
+        throw new UnsupportedModelError(source, `暂未实现`);
     }
 }

package/out/controller/state/control/form/form-state.d.ts

@@ -26,5 +26,13 @@ export declare class FormState extends ControlState {
      * @type {ControlVO}
      */
     data: ControlVO;
+    /**
+     * 是否正在处理中(动态控制，值规则，表单项更新等逻辑中)
+     * @author lxm
+     * @date 2023-03-06 09:07:20
+     * @type {boolean}
+     * @memberof FormController
+     */
+    processing: boolean;
 }
 //# sourceMappingURL=form-state.d.ts.map

package/out/controller/state/control/form/form-state.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"form-state.d.ts","sourceRoot":"","sources":["../../../../../src/controller/state/control/form/form-state.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAChD,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAEhD;;;;;;;;GAQG;AACH,qBAAa,SAAU,SAAQ,YAAY;IACzC;;;;;;OAMG;IACH,QAAQ,EAAE,OAAO,CAAS;IAE1B;;;;;;OAMG;IACH,IAAI,EAAE,SAAS,CAAmB;CACnC"}
+{"version":3,"file":"form-state.d.ts","sourceRoot":"","sources":["../../../../../src/controller/state/control/form/form-state.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAChD,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAEhD;;;;;;;;GAQG;AACH,qBAAa,SAAU,SAAQ,YAAY;IACzC;;;;;;OAMG;IACH,QAAQ,EAAE,OAAO,CAAS;IAE1B;;;;;;OAMG;IACH,IAAI,EAAE,SAAS,CAAmB;IAElC;;;;;;OAMG;IACH,UAAU,EAAE,OAAO,CAAS;CAC7B"}

package/out/controller/state/control/form/form-state.js

@@ -28,5 +28,13 @@ export class FormState extends ControlState {
          * @type {ControlVO}
          */
         this.data = new ControlVO();
+        /**
+         * 是否正在处理中(动态控制，值规则，表单项更新等逻辑中)
+         * @author lxm
+         * @date 2023-03-06 09:07:20
+         * @type {boolean}
+         * @memberof FormController
+         */
+        this.processing = false;
     }
 }

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

@@ -1 +1 @@
-{"version":3,"file":"edit-view.d.ts","sourceRoot":"","sources":["../../../src/controller/view/edit-view.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAGrD,OAAO,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AAE9C,OAAO,EAAE,aAAa,EAAE,MAAM,WAAW,CAAC;AAC1C,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AACzC,OAAO,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAC;AAEjD;;;;;;;;GAQG;AACH,qBAAa,kBAAkB,CAC7B,CAAC,SAAS,aAAa,GAAG,aAAa,CACvC,SAAQ,kBAAkB,CAAC,CAAC,CAAC;IAC7B;;;;;;;OAOG;IACH,SAAS,CAAC,aAAa,EAAG,aAAa,CAAC;IAExC,KAAK,gBAAuB;IAEpB,KAAK,EAAE,aAAa,CAAC;IAE7B,SAAS,CAAC,WAAW,IAAI,aAAa;cAItB,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAiBvC,OAAO,IAAI,KAAK,EAAE;IAKlB;;;;;OAKG;IACG,IAAI,IAAI,OAAO,CAAC,KAAK,CAAC;IAU5B;;;;;OAKG;IACG,IAAI,IAAI,OAAO,CAAC,KAAK,CAAC;IAM5B;;;;;;;;OAQG;IACG,eAAe,CAAC,SAAS,EAAE,OAAO,EAAE,IAAI,EAAE,KAAK,GAAG,OAAO,CAAC,IAAI,CAAC;IAcrE;;;;;;;OAOG;IACG,iBAAiB,CAAC,IAAI,EAAE,KAAK,GAAG,OAAO,CAAC,IAAI,CAAC;IAQnD;;;;;OAKG;IACG,UAAU;IAOhB;;;;;OAKG;IACG,MAAM;IAKN,OAAO;IAKb;;;;;;OAMG;IACG,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAoD9B;;;;;;OAMG;IACH,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;IAIzB;;;;;;OAMG;IACG,UAAU,CACd,OAAO,EAAE,QAAQ,EACjB,MAAM,EAAE,OAAO,EACf,IAAI,EAAE,KAAK,GACV,OAAO,CAAC,IAAI,CAAC;CASjB"}
+{"version":3,"file":"edit-view.d.ts","sourceRoot":"","sources":["../../../src/controller/view/edit-view.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAGrD,OAAO,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AAE9C,OAAO,EAAE,aAAa,EAAE,MAAM,WAAW,CAAC;AAC1C,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AACzC,OAAO,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAC;AAEjD;;;;;;;;GAQG;AACH,qBAAa,kBAAkB,CAC7B,CAAC,SAAS,aAAa,GAAG,aAAa,CACvC,SAAQ,kBAAkB,CAAC,CAAC,CAAC;IAC7B;;;;;;;OAOG;IACH,SAAS,CAAC,aAAa,EAAG,aAAa,CAAC;IAExC,KAAK,gBAAuB;IAEpB,KAAK,EAAE,aAAa,CAAC;IAE7B,SAAS,CAAC,WAAW,IAAI,aAAa;cAItB,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAiBvC,OAAO,IAAI,KAAK,EAAE;IAKlB;;;;;OAKG;IACG,IAAI,IAAI,OAAO,CAAC,KAAK,CAAC;IAU5B;;;;;OAKG;IACG,IAAI,IAAI,OAAO,CAAC,KAAK,CAAC;IAM5B;;;;;;;;OAQG;IACG,eAAe,CAAC,SAAS,EAAE,OAAO,EAAE,IAAI,EAAE,KAAK,GAAG,OAAO,CAAC,IAAI,CAAC;IAcrE;;;;;;;OAOG;IACG,iBAAiB,CAAC,IAAI,EAAE,KAAK,GAAG,OAAO,CAAC,IAAI,CAAC;IAQnD;;;;;OAKG;IACG,UAAU;IAOhB;;;;;OAKG;IACG,MAAM;IAKN,OAAO;IAKb;;;;;;OAMG;IACG,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAiD9B;;;;;;OAMG;IACH,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;IAIzB;;;;;;OAMG;IACG,UAAU,CACd,OAAO,EAAE,QAAQ,EACjB,MAAM,EAAE,OAAO,EACf,IAAI,EAAE,KAAK,GACV,OAAO,CAAC,IAAI,CAAC;CASjB"}

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

@@ -1,4 +1,4 @@
-import { IBizContext, RuntimeError } from '@ibiz-template/core';
+import { RuntimeError } from '@ibiz-template/core';
 import { OpenAppViewCommand } from '../../command';
 import { EditViewNerve } from '../neuron';
 import { EditViewState } from '../state';
@@ -147,9 +147,9 @@ export class EditViewController extends MainViewController {
         const wfInfo = res.data[0];
         const refKey = `WFSTART@${wfInfo.wfversion}`;
         // 处理视图上下文
-        const newContext = new IBizContext({
+        const newContext = Object.assign(this.context.clone(), {
             activeForm: wfInfo['process-form'],
-        }, this.context);
+        });
         // 处理视图参数
         const newParams = {
             processDefinitionKey: wfInfo.definitionkey,

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

@@ -1 +1 @@
-{"version":3,"file":"edit-view3.d.ts","sourceRoot":"","sources":["../../../src/controller/view/edit-view3.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAItD,OAAO,EAAE,cAAc,EAAE,MAAM,WAAW,CAAC;AAC3C,OAAO,EAAE,cAAc,EAAE,MAAM,UAAU,CAAC;AAC1C,OAAO,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAC;AAEjD;;;;;;;;GAQG;AACH,qBAAa,mBAAoB,SAAQ,kBAAkB,CAAC,cAAc,CAAC;IACzE,KAAK,iBAAwB;IAE7B;;;;;;OAMG;IACH,SAAS,EAAE,OAAO,CAAQ;IAE1B;;;;;OAKG;IACH,OAAO,EAAE;QACP,CAAC,GAAG,EAAE,MAAM,GAAG;YACb,OAAO,EAAE,QAAQ,CAAC;YAClB,MAAM,EAAE,OAAO,CAAC;YAChB,GAAG,EAAE,MAAM,CAAC;SACb,CAAC;KACH,CAAM;IAEC,KAAK,EAAE,cAAc,CAAC;IAE9B,SAAS,CAAC,WAAW,IAAI,cAAc;cAIvB,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAejC,IAAI,IAAI,OAAO,CAAC,KAAK,CAAC;IAO5B;;;;;OAKG;IACH,cAAc,CAAC,IAAI,EAAE,KAAK,GAAG,IAAI;CAsClC"}
+{"version":3,"file":"edit-view3.d.ts","sourceRoot":"","sources":["../../../src/controller/view/edit-view3.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAItD,OAAO,EAAE,cAAc,EAAE,MAAM,WAAW,CAAC;AAC3C,OAAO,EAAE,cAAc,EAAE,MAAM,UAAU,CAAC;AAC1C,OAAO,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAC;AAEjD;;;;;;;;GAQG;AACH,qBAAa,mBAAoB,SAAQ,kBAAkB,CAAC,cAAc,CAAC;IACzE,KAAK,iBAAwB;IAE7B;;;;;;OAMG;IACH,SAAS,EAAE,OAAO,CAAQ;IAE1B;;;;;OAKG;IACH,OAAO,EAAE;QACP,CAAC,GAAG,EAAE,MAAM,GAAG;YACb,OAAO,EAAE,QAAQ,CAAC;YAClB,MAAM,EAAE,OAAO,CAAC;YAChB,GAAG,EAAE,MAAM,CAAC;SACb,CAAC;KACH,CAAM;IAEC,KAAK,EAAE,cAAc,CAAC;IAE9B,SAAS,CAAC,WAAW,IAAI,cAAc;cAIvB,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAejC,IAAI,IAAI,OAAO,CAAC,KAAK,CAAC;IAO5B;;;;;OAKG;IACH,cAAc,CAAC,IAAI,EAAE,KAAK,GAAG,IAAI;CAsClC"}

package/out/controller/view/edit-view3.js

@@ -1,4 +1,3 @@
-import { IBizContext } from '@ibiz-template/core';
 import { createUUID, notNilEmpty } from 'qx-util';
 import { Srfuf } from '../../service';
 import { convertNavData } from '../../utils';
@@ -69,7 +68,7 @@ export class EditView3Controller extends EditViewController {
         for (const page of pages) {
             const { name } = page.source;
             // 计算导航上下文
-            let newContext = new IBizContext({}, this.context);
+            let newContext = this.context.clone();
             const navContexts = page.source.getPSNavigateContexts();
             if (notNilEmpty(navContexts)) {
                 newContext = Object.assign(newContext, convertNavData(navContexts, this.context, this.params, data));

package/out/controller/view/grid-exp-view.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"grid-exp-view.d.ts","sourceRoot":"","sources":["../../../src/controller/view/grid-exp-view.ts"],"names":[],"mappings":"AACA,OAAO,EAEL,gBAAgB,EAChB,mBAAmB,EACpB,MAAM,sBAAsB,CAAC;AAE9B,OAAO,EAAkB,gBAAgB,EAAE,gBAAgB,EAAE,MAAM,OAAO,CAAC;AAC3E,OAAO,EAAE,gBAAgB,EAAE,MAAM,WAAW,CAAC;AAE7C,qBAAa,qBAAsB,SAAQ,gBAAgB,CAAC,gBAAgB,CAAC;IAC3E,KAAK,mBAA0B;IAEvB,KAAK,EAAE,gBAAgB,CAAC;IAEhC,SAAS,CAAC,WAAW,IAAI,gBAAgB;cAIzB,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAYvC;;;;;;OAMG;IACG,IAAI,IAAI,OAAO,CAAC,KAAK,EAAE,CAAC;IAK9B;;;;;;OAMG;IACG,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAK7B;;;;;;OAMG;IACG,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAK7B;;;;;;OAMG;IACG,YAAY,CAAC,IAAI,EAAE,KAAK;IAmE9B;;;;;;;;OAQG;IACG,cAAc,CAClB,IAAI,EAAE,mBAAmB,EACzB,KAAK,EAAE,UAAU,GAChB,OAAO,CAAC,IAAI,CAAC;CAajB"}
+{"version":3,"file":"grid-exp-view.d.ts","sourceRoot":"","sources":["../../../src/controller/view/grid-exp-view.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,gBAAgB,EAChB,mBAAmB,EACpB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAiB,gBAAgB,EAAE,gBAAgB,EAAE,MAAM,OAAO,CAAC;AAC1E,OAAO,EAAE,gBAAgB,EAAE,MAAM,WAAW,CAAC;AAE7C,qBAAa,qBAAsB,SAAQ,gBAAgB,CAAC,gBAAgB,CAAC;IAC3E,KAAK,mBAA0B;IAEvB,KAAK,EAAE,gBAAgB,CAAC;IAEhC,SAAS,CAAC,WAAW,IAAI,gBAAgB;cAIzB,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAYvC;;;;;;OAMG;IACG,IAAI,IAAI,OAAO,CAAC,KAAK,EAAE,CAAC;IAK9B;;;;;;OAMG;IACG,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAK7B;;;;;;OAMG;IACG,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAK7B;;;;;;OAMG;IACG,YAAY,CAAC,IAAI,EAAE,KAAK;IAgC9B;;;;;;;;OAQG;IACG,cAAc,CAClB,IAAI,EAAE,mBAAmB,EACzB,KAAK,EAAE,UAAU,GAChB,OAAO,CAAC,IAAI,CAAC;CAajB"}

package/out/controller/view/grid-exp-view.js

@@ -1,7 +1,5 @@
-import { IBizContext } from '@ibiz-template/core';
 import { DefectModelError, } from '@ibiz-template/model';
-import { notNilEmpty } from 'qx-util';
-import { convertNavData, GridExpViewState, MDViewController } from '../..';
+import { calcNavParams, GridExpViewState, MDViewController } from '../..';
 import { GridExpViewNerve } from '../neuron';
 export class GridExpViewController extends MDViewController {
     constructor() {
@@ -71,58 +69,20 @@ export class GridExpViewController extends MDViewController {
             if (!grid.navView.initialized) {
                 await grid.navView.init();
             }
-            const tempContext = {};
-            const tempViewParam = Object.assign({}, this.params);
             this.state.navItem.key = data.srfkey;
-            // 表格导航视图实体相关
-            const { appEntity } = grid.navView;
-            if (appEntity && data) {
-                const { deName } = appEntity;
-                Object.assign(tempContext, {
-                    [`${deName}`]: data[deName],
-                });
-                // 导航过滤项
-                const { navFilter } = grid.source;
-                if (navFilter) {
-                    Object.assign(tempViewParam, {
-                        [navFilter]: data[deName],
-                    });
-                }
-                // 导航关系
-                const navPSDer = grid.source.getNavPSDER();
-                if (navPSDer) {
-                    const navPSDerStr = `n_${(navPSDer.codeName && navPSDer.minorCodeName).toLowerCase()}_eq`;
-                    Object.assign(tempViewParam, {
-                        [navPSDerStr]: data[deName],
-                    });
-                }
-            }
-            // 处理自定义导航上下文
-            const navContexts = grid.source.getPSNavigateContexts();
-            let context = {};
-            if (notNilEmpty(navContexts)) {
-                context = convertNavData(navContexts, tempContext, this.params);
-            }
-            Object.assign(tempContext, context);
-            // 处理自定义视图参数
-            const navParams = grid.source.getPSNavigateParams();
-            let params = {};
-            if (notNilEmpty(navParams)) {
-                params = convertNavData(navParams, tempViewParam, this.params);
-            }
-            Object.assign(tempViewParam, params);
+            // 导航相关参数处理
+            const tempContext = this.context.clone();
+            const { deName } = grid.appEntity;
+            const { resultContext, resultParams: tempParams } = calcNavParams(Object.assign(Object.assign({}, grid), { deName }), { context: this.context, params: this.params, datum: data });
+            Object.assign(tempContext, resultContext);
             // 路由模式下跳转视图，变更路由
             if (this.context.isRouter) {
                 Object.assign(tempContext, { toRouteLevel: this.modal.level + 1 });
-                const tempIBizContext = new IBizContext(tempContext, this.context);
-                this.state.navItem.context = tempIBizContext;
-                this.state.navItem.params = tempViewParam;
-                ibiz.openView.root(grid.navView.source, tempIBizContext, tempViewParam);
+                ibiz.openView.root(grid.navView.source, tempContext, tempParams);
             }
             else {
-                const tempIBizContext = new IBizContext(tempContext, this.context);
-                this.state.navItem.context = tempIBizContext;
-                this.state.navItem.params = tempViewParam;
+                this.state.navItem.context = tempContext;
+                this.state.navItem.params = tempParams;
             }
         }
     }

package/out/controller/view/list-exp-view.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"list-exp-view.d.ts","sourceRoot":"","sources":["../../../src/controller/view/list-exp-view.ts"],"names":[],"mappings":"AACA,OAAO,EAEL,gBAAgB,EAChB,mBAAmB,EACpB,MAAM,sBAAsB,CAAC;AAE9B,OAAO,EAAkB,gBAAgB,EAAE,gBAAgB,EAAE,MAAM,OAAO,CAAC;AAC3E,OAAO,EAAE,gBAAgB,EAAE,MAAM,WAAW,CAAC;AAE7C,qBAAa,qBAAsB,SAAQ,gBAAgB,CAAC,gBAAgB,CAAC;IAC3E,KAAK,mBAA0B;IAEvB,KAAK,EAAE,gBAAgB,CAAC;IAEhC,SAAS,CAAC,WAAW,IAAI,gBAAgB;cAIzB,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAYvC;;;;;;OAMG;IACG,IAAI,IAAI,OAAO,CAAC,KAAK,EAAE,CAAC;IAK9B;;;;;;OAMG;IACG,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAK7B;;;;;;OAMG;IACG,YAAY,CAAC,IAAI,EAAE,KAAK;IAmE9B;;;;;;;;OAQG;IACG,cAAc,CAClB,IAAI,EAAE,mBAAmB,EACzB,KAAK,EAAE,UAAU,GAChB,OAAO,CAAC,IAAI,CAAC;CAajB"}
+{"version":3,"file":"list-exp-view.d.ts","sourceRoot":"","sources":["../../../src/controller/view/list-exp-view.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,gBAAgB,EAChB,mBAAmB,EACpB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAiB,gBAAgB,EAAE,gBAAgB,EAAE,MAAM,OAAO,CAAC;AAC1E,OAAO,EAAE,gBAAgB,EAAE,MAAM,WAAW,CAAC;AAE7C,qBAAa,qBAAsB,SAAQ,gBAAgB,CAAC,gBAAgB,CAAC;IAC3E,KAAK,mBAA0B;IAEvB,KAAK,EAAE,gBAAgB,CAAC;IAEhC,SAAS,CAAC,WAAW,IAAI,gBAAgB;cAIzB,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAYvC;;;;;;OAMG;IACG,IAAI,IAAI,OAAO,CAAC,KAAK,EAAE,CAAC;IAK9B;;;;;;OAMG;IACG,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAK7B;;;;;;OAMG;IACG,YAAY,CAAC,IAAI,EAAE,KAAK;IA+B9B;;;;;;;;OAQG;IACG,cAAc,CAClB,IAAI,EAAE,mBAAmB,EACzB,KAAK,EAAE,UAAU,GAChB,OAAO,CAAC,IAAI,CAAC;CAajB"}

package/out/controller/view/list-exp-view.js

@@ -1,7 +1,5 @@
-import { IBizContext } from '@ibiz-template/core';
 import { DefectModelError, } from '@ibiz-template/model';
-import { notNilEmpty } from 'qx-util';
-import { convertNavData, ListExpViewState, MDViewController } from '../..';
+import { calcNavParams, ListExpViewState, MDViewController } from '../..';
 import { ListExpViewNerve } from '../neuron';
 export class ListExpViewController extends MDViewController {
     constructor() {
@@ -60,58 +58,19 @@ export class ListExpViewController extends MDViewController {
             if (!list.navView.initialized) {
                 await list.navView.init();
             }
-            const tempContext = {};
-            const tempViewParam = Object.assign({}, this.params);
-            this.state.navItem.key = data.srfkey;
-            // 表格导航视图实体相关
-            const { appEntity } = list.navView;
-            if (appEntity && data) {
-                const { deName } = appEntity;
-                Object.assign(tempContext, {
-                    [`${deName}`]: data[deName],
-                });
-                // 导航过滤项
-                const { navFilter } = list.source;
-                if (navFilter) {
-                    Object.assign(tempViewParam, {
-                        [navFilter]: data[deName],
-                    });
-                }
-                // 导航关系
-                const navPSDer = list.source.getNavPSDER();
-                if (navPSDer) {
-                    const navPSDerStr = `n_${(navPSDer.codeName && navPSDer.minorCodeName).toLowerCase()}_eq`;
-                    Object.assign(tempViewParam, {
-                        [navPSDerStr]: data[deName],
-                    });
-                }
-            }
-            // 处理自定义导航上下文
-            const navContexts = list.source.getPSNavigateContexts();
-            let context = {};
-            if (notNilEmpty(navContexts)) {
-                context = convertNavData(navContexts, tempContext, this.params);
-            }
-            Object.assign(tempContext, context);
-            // 处理自定义视图参数
-            const navParams = list.source.getPSNavigateParams();
-            let params = {};
-            if (notNilEmpty(navParams)) {
-                params = convertNavData(navParams, tempViewParam, this.params);
-            }
-            Object.assign(tempViewParam, params);
+            // 导航相关参数处理
+            const tempContext = this.context.clone();
+            const { deName } = list.appEntity;
+            const { resultContext, resultParams: tempParams } = calcNavParams(Object.assign(Object.assign({}, list), { deName }), { context: this.context, params: this.params, datum: data });
+            Object.assign(tempContext, resultContext);
             // 路由模式下跳转视图，变更路由
             if (this.context.isRouter) {
                 Object.assign(tempContext, { toRouteLevel: this.modal.level + 1 });
-                const tempIBizContext = new IBizContext(tempContext, this.context);
-                this.state.navItem.context = tempIBizContext;
-                this.state.navItem.params = tempViewParam;
-                ibiz.openView.root(list.navView.source, tempIBizContext, tempViewParam);
+                ibiz.openView.root(list.navView.source, tempContext, tempParams);
             }
             else {
-                const tempIBizContext = new IBizContext(tempContext, this.context);
-                this.state.navItem.context = tempIBizContext;
-                this.state.navItem.params = tempViewParam;
+                this.state.navItem.context = tempContext;
+                this.state.navItem.params = tempParams;
             }
         }
     }

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

@@ -14,33 +14,6 @@ import { ViewController } from './view';
  */
 export declare class MDViewController<T extends MDViewModel = MDViewModel> extends ViewController<T> {
     state: MDViewState;
-    /**
-     * 是否显示搜索表单
-     *
-     * @deprecated
-     * @author lxm
-     * @date 2022-08-28 20:08:10
-     * @type {boolean}
-     */
-    showSearchForm: boolean;
-    /**
-     * 快速搜索字符串
-     *
-     * @deprecated
-     * @author lxm
-     * @date 2022-08-31 11:08:45
-     * @type {string}
-     */
-    query: string;
-    /**
-     * 选中的数据
-     *
-     * @deprecated
-     * @author lxm
-     * @date 2022-08-28 18:08:34
-     * @type {IData[]}
-     */
-    selectedData: IData[];
     nerve: MDViewNerve;
     protected createNerve(): MDViewNerve;
     protected onInit(): Promise<void>;

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

@@ -1 +1 @@
-{"version":3,"file":"md-view.d.ts","sourceRoot":"","sources":["../../../src/controller/view/md-view.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AACnD,OAAO,EAAE,WAAW,EAAE,MAAM,WAAW,CAAC;AACxC,OAAO,EAAE,WAAW,EAAE,MAAM,UAAU,CAAC;AACvC,OAAO,EAAE,cAAc,EAAE,MAAM,QAAQ,CAAC;AAExC;;;;;;;;;GASG;AACH,qBAAa,gBAAgB,CAC3B,CAAC,SAAS,WAAW,GAAG,WAAW,CACnC,SAAQ,cAAc,CAAC,CAAC,CAAC;IACzB,KAAK,cAAqB;IAE1B;;;;;;;OAOG;IACH,cAAc,EAAE,OAAO,CAAS;IAEhC;;;;;;;OAOG;IACH,KAAK,EAAE,MAAM,CAAM;IAEnB;;;;;;;OAOG;IACH,YAAY,EAAE,KAAK,EAAE,CAAM;IAEnB,KAAK,EAAE,WAAW,CAAC;IAE3B,SAAS,CAAC,WAAW,IAAI,WAAW;cAIpB,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAkBvC;;;;;;OAMG;IACH,OAAO;IAIP;;;;;OAKG;IACG,IAAI,IAAI,OAAO,CAAC,KAAK,EAAE,CAAC;IAKxB,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAK9B;;;;;;;;OAQG;IACG,QAAQ,CAAC,IAAI,EAAE,KAAK,EAAE,KAAK,CAAC,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;IAO9D;;;;;;;;OAQG;IACG,OAAO,CAAC,KAAK,CAAC,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;IAOhD;;;;;OAKG;IACH,YAAY,IAAI,IAAI;IAIpB;;;;;;OAMG;IACG,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAIjC;;;;;;OAMG;IACG,UAAU,CAAC,MAAM,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;IAInD;;;;;OAKG;IACG,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;IAI/B;;;;;;OAMG;IACH,iBAAiB,CAAC,IAAI,EAAE,KAAK,EAAE;IAO/B;;;;;;OAMG;IACH,YAAY,CAAC,IAAI,EAAE,KAAK,EAAE,KAAK,CAAC,EAAE,UAAU;IAI5C;;;;;;OAMG;IACH,YAAY,IAAI,OAAO;IAUvB;;;;;;;;;OASG;IACG,WAAW,CACf,IAAI,EAAE,KAAK,EAAE,EACb,QAAQ,EAAE,OAAO,EACjB,WAAW,EAAE,MAAM,GAClB,OAAO,CAAC,IAAI,CAAC;IAQhB;;;;;;;;OAQG;IACG,aAAa,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;CAOvE"}
+{"version":3,"file":"md-view.d.ts","sourceRoot":"","sources":["../../../src/controller/view/md-view.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AACnD,OAAO,EAAE,WAAW,EAAE,MAAM,WAAW,CAAC;AACxC,OAAO,EAAE,WAAW,EAAE,MAAM,UAAU,CAAC;AACvC,OAAO,EAAE,cAAc,EAAE,MAAM,QAAQ,CAAC;AAExC;;;;;;;;;GASG;AACH,qBAAa,gBAAgB,CAC3B,CAAC,SAAS,WAAW,GAAG,WAAW,CACnC,SAAQ,cAAc,CAAC,CAAC,CAAC;IACzB,KAAK,cAAqB;IAElB,KAAK,EAAE,WAAW,CAAC;IAE3B,SAAS,CAAC,WAAW,IAAI,WAAW;cAIpB,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAkBvC;;;;;;OAMG;IACH,OAAO;IAIP;;;;;OAKG;IACG,IAAI,IAAI,OAAO,CAAC,KAAK,EAAE,CAAC;IAKxB,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAK9B;;;;;;;;OAQG;IACG,QAAQ,CAAC,IAAI,EAAE,KAAK,EAAE,KAAK,CAAC,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;IAO9D;;;;;;;;OAQG;IACG,OAAO,CAAC,KAAK,CAAC,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;IAOhD;;;;;OAKG;IACH,YAAY,IAAI,IAAI;IAIpB;;;;;;OAMG;IACG,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAIjC;;;;;;OAMG;IACG,UAAU,CAAC,MAAM,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;IAInD;;;;;OAKG;IACG,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;IAI/B;;;;;;OAMG;IACH,iBAAiB,CAAC,IAAI,EAAE,KAAK,EAAE;IAO/B;;;;;;OAMG;IACH,YAAY,CAAC,IAAI,EAAE,KAAK,EAAE,KAAK,CAAC,EAAE,UAAU;IAI5C;;;;;;OAMG;IACH,YAAY,IAAI,OAAO;IAUvB;;;;;;;;;OASG;IACG,WAAW,CACf,IAAI,EAAE,KAAK,EAAE,EACb,QAAQ,EAAE,OAAO,EACjB,WAAW,EAAE,MAAM,GAClB,OAAO,CAAC,IAAI,CAAC;IAQhB;;;;;;;;OAQG;IACG,aAAa,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;CAOvE"}

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

@@ -15,33 +15,6 @@ export class MDViewController extends ViewController {
     constructor() {
         super(...arguments);
         this.state = new MDViewState();
-        /**
-         * 是否显示搜索表单
-         *
-         * @deprecated
-         * @author lxm
-         * @date 2022-08-28 20:08:10
-         * @type {boolean}
-         */
-        this.showSearchForm = false;
-        /**
-         * 快速搜索字符串
-         *
-         * @deprecated
-         * @author lxm
-         * @date 2022-08-31 11:08:45
-         * @type {string}
-         */
-        this.query = '';
-        /**
-         * 选中的数据
-         *
-         * @deprecated
-         * @author lxm
-         * @date 2022-08-28 18:08:34
-         * @type {IData[]}
-         */
-        this.selectedData = [];
     }
     createNerve() {
         return new MDViewNerve(this);
@@ -185,7 +158,7 @@ export class MDViewController extends ViewController {
      * @returns {*}  {IParams}
      */
     onBeforeLoad() {
-        const params = { query: this.state.query };
+        const params = { query: this.state.query.trim() };
         // 有搜索表单的整合相关参数
         if (this.nerve.searchForm) {
             const addParams = this.nerve.searchForm.call.getParams();

package/out/controller/view/pickup-grid-view.js

@@ -22,7 +22,7 @@ export class PickupGridViewController extends GridViewController {
      */
     onSelectionChange(data) {
         super.onSelectionChange(data);
-        this.nerve.self.evt.asyncEmit('selectionChange', this.selectedData);
+        this.nerve.self.evt.asyncEmit('selectionChange', this.state.selectedData);
     }
     /**
      * 选中所有数据并返回

package/out/controller/view/tree-exp-view.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tree-exp-view.d.ts","sourceRoot":"","sources":["../../../src/controller/view/tree-exp-view.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAExD,OAAO,EAAE,gBAAgB,EAAE,MAAM,WAAW,CAAC;AAC7C,OAAO,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAC;AAC5C,OAAO,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AAE9C,OAAO,EAAE,gBAAgB,EAAE,MAAM,WAAW,CAAC;AAE7C;;;;;;;;GAQG;AACH,qBAAa,qBAAqB,CAChC,CAAC,SAAS,gBAAgB,GAAG,gBAAgB,CAC7C,SAAQ,gBAAgB,CAAC,CAAC,CAAC;IAC3B,KAAK,mBAA0B;IAEvB,KAAK,EAAE,gBAAgB,CAAC;IAEhC,SAAS,CAAC,WAAW,IAAI,gBAAgB;cAIzB,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IASvC;;;;;OAKG;IACG,IAAI,IAAI,OAAO,CAAC,KAAK,EAAE,CAAC;IAMxB,YAAY,CAAC,QAAQ,EAAE,aAAa;CAoD3C"}
+{"version":3,"file":"tree-exp-view.d.ts","sourceRoot":"","sources":["../../../src/controller/view/tree-exp-view.ts"],"names":[],"mappings":"AACA,OAAO,EAAwB,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAC9E,OAAO,EAAE,gBAAgB,EAAE,MAAM,WAAW,CAAC;AAC7C,OAAO,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAC;AAC5C,OAAO,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AAC9C,OAAO,EAAE,gBAAgB,EAAE,MAAM,WAAW,CAAC;AAG7C;;;;;;;;GAQG;AACH,qBAAa,qBAAqB,CAChC,CAAC,SAAS,gBAAgB,GAAG,gBAAgB,CAC7C,SAAQ,gBAAgB,CAAC,CAAC,CAAC;IAC3B,KAAK,mBAA0B;IAEvB,KAAK,EAAE,gBAAgB,CAAC;IAEhC,SAAS,CAAC,WAAW,IAAI,gBAAgB;cAIzB,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IASvC;;;;;OAKG;IACG,IAAI,IAAI,OAAO,CAAC,KAAK,EAAE,CAAC;IAMxB,YAAY,CAAC,QAAQ,EAAE,aAAa;CA+C3C"}