@ibiz-template/runtime 0.1.0 → 0.1.2

package/out/command/app/open-app-view/open-app-view.js

@@ -40,7 +40,7 @@ export class OpenAppViewCommand {
             return openRedirectView(fullViewModel, context, params, opts.data);
         }
         const { openMode = 'INDEXVIEWTAB' } = appView;
-        switch (openMode) {
+        switch (opts.openMode || openMode) {
             case 'INDEXVIEWTAB':
                 if (opts.noWaitRoute) {
                     this.openIndexViewTab(appView, context, params);

package/out/controller/utils/event/qx-event-ex.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"qx-event-ex.d.ts","sourceRoot":"","sources":["../../../../src/controller/utils/event/qx-event-ex.ts"],"names":[],"mappings":"AACA,OAAO,EAAY,OAAO,EAAE,MAAM,SAAS,CAAC;AAC5C,OAAO,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;AAElD;;;;;;;;GAQG;AACH,qBAAa,SAAS,CAAC,CAAC,SAAS,SAAS,CAAC,CAAC,CAAC,CAAE,SAAQ,OAAO,CAAC,CAAC,CAAC;IAC/D,OAAO,CAAC,WAAW,CAEZ;IAEP;;;;;;OAMG;IACH,KAAK,CACH,EAAE,EAAE,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM,GAAG,MAAM,EAAE,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,OAAO,CAAC,GAAG,CAAC,GACxE,IAAI;IAOP,IAAI,CAAC,CAAC,SAAS,MAAM,CAAC,EAAE,IAAI,EAAE,CAAC,EAAE,GAAG,IAAI,EAAE,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,IAAI;IAO3D,SAAS,CAAC,CAAC,SAAS,MAAM,CAAC,EAC/B,IAAI,EAAE,CAAC,EACP,GAAG,IAAI,EAAE,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GACxB,OAAO,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;IASvC,KAAK,IAAI,IAAI;CAId"}
+{"version":3,"file":"qx-event-ex.d.ts","sourceRoot":"","sources":["../../../../src/controller/utils/event/qx-event-ex.ts"],"names":[],"mappings":"AACA,OAAO,EAAY,OAAO,EAAE,MAAM,SAAS,CAAC;AAC5C,OAAO,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;AAElD;;;;;;;;GAQG;AACH,qBAAa,SAAS,CAAC,CAAC,SAAS,SAAS,CAAC,CAAC,CAAC,CAAE,SAAQ,OAAO,CAAC,CAAC,CAAC;IAC/D,OAAO,CAAC,WAAW,CAEZ;IAEP;;;;;;OAMG;IACH,KAAK,CACH,EAAE,EAAE,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM,GAAG,MAAM,EAAE,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,OAAO,CAAC,GAAG,CAAC,GACxE,IAAI;IAOP,IAAI,CAAC,CAAC,SAAS,MAAM,CAAC,EAAE,IAAI,EAAE,CAAC,EAAE,GAAG,IAAI,EAAE,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,IAAI;IAO3D,SAAS,CAAC,CAAC,SAAS,MAAM,CAAC,EAC/B,IAAI,EAAE,CAAC,EACP,GAAG,IAAI,EAAE,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GACxB,OAAO,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;IAUvC,KAAK,IAAI,IAAI;CAId"}

package/out/controller/utils/event/qx-event-ex.js

@@ -34,12 +34,13 @@ export class QXEventEx extends QXEvent {
         });
     }
     async asyncEmit(name, ...args) {
-        const result = await super.asyncEmit(name, ...args);
+        const resultPromise1 = super.asyncEmit(name, ...args);
         // 任意事件监听回调执行，并把执行结果展开合并入原始结果集合
         const all = this.anyEventFns.map(fn => fn(name, ...args));
-        const resultArr = await Promise.all(all);
-        result.concat(...resultArr);
-        return result;
+        const resultPromise2 = Promise.all(all);
+        const resultArr1 = await resultPromise1;
+        const resultArr2 = await resultPromise2;
+        return resultArr1.concat(...resultArr2);
     }
     reset() {
         super.reset();

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

@@ -14,6 +14,19 @@ import { IAppDataEntity, IAppDELogic } from '@ibiz/model-core';
  * @return {*}  {Promise<HttpResponse<IData>>}
  */
 export declare function execDELogic(deDELogic: IAppDELogic, context: IParams, data: IData, params: IParams): Promise<unknown>;
+/**
+ * 通过id执行实体逻辑
+ * @author lxm
+ * @date 2023-08-04 02:49:44
+ * @export
+ * @param {string} deDELogicId
+ * @param {string} dataEntityId
+ * @param {IParams} context
+ * @param {IData} data
+ * @param {IParams} params
+ * @return {*}  {Promise<unknown>}
+ */
+export declare function execDELogicById(deDELogicId: string, dataEntityId: string, context: IParams, data: IData, params: IParams): Promise<unknown>;
 /**
  * 执行实体方法的实体逻辑并返回对应的response
  * @author lxm

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/de-logic/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAa,YAAY,EAAE,MAAM,qBAAqB,CAAC;AAC9D,OAAO,EAAE,cAAc,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAS/D;;;;;;;;;;;;GAYG;AACH,wBAAsB,WAAW,CAC/B,SAAS,EAAE,WAAW,EACtB,OAAO,EAAE,OAAO,EAChB,IAAI,EAAE,KAAK,EACX,MAAM,EAAE,OAAO,GACd,OAAO,CAAC,OAAO,CAAC,CAMlB;AAED;;;;;;;;;;;GAWG;AACH,wBAAsB,iBAAiB,CACrC,SAAS,EAAE,WAAW,EACtB,OAAO,EAAE,OAAO,EAChB,IAAI,EAAE,KAAK,EACX,MAAM,EAAE,OAAO,GACd,OAAO,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC,CAU9B;AAED;;;;;;;;;;;GAWG;AACH,wBAAsB,eAAe,CACnC,MAAM,EAAE,cAAc,EACtB,IAAI,EAAE,SAAS,GAAG,QAAQ,GAAG,SAAS,EACtC,OAAO,EAAE,OAAO,EAChB,IAAI,EAAE,KAAK,EACX,MAAM,EAAE,OAAO,GACd,OAAO,CAAC,IAAI,CAAC,CAYf"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/de-logic/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAa,YAAY,EAAgB,MAAM,qBAAqB,CAAC;AAC5E,OAAO,EAAE,cAAc,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AA2B/D;;;;;;;;;;;;GAYG;AACH,wBAAsB,WAAW,CAC/B,SAAS,EAAE,WAAW,EACtB,OAAO,EAAE,OAAO,EAChB,IAAI,EAAE,KAAK,EACX,MAAM,EAAE,OAAO,GACd,OAAO,CAAC,OAAO,CAAC,CAMlB;AAED;;;;;;;;;;;GAWG;AACH,wBAAsB,eAAe,CACnC,WAAW,EAAE,MAAM,EACnB,YAAY,EAAE,MAAM,EACpB,OAAO,EAAE,OAAO,EAChB,IAAI,EAAE,KAAK,EACX,MAAM,EAAE,OAAO,GACd,OAAO,CAAC,OAAO,CAAC,CAUlB;AAED;;;;;;;;;;;GAWG;AACH,wBAAsB,iBAAiB,CACrC,SAAS,EAAE,WAAW,EACtB,OAAO,EAAE,OAAO,EAChB,IAAI,EAAE,KAAK,EACX,MAAM,EAAE,OAAO,GACd,OAAO,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC,CAU9B;AAED;;;;;;;;;;;GAWG;AACH,wBAAsB,eAAe,CACnC,MAAM,EAAE,cAAc,EACtB,IAAI,EAAE,SAAS,GAAG,QAAQ,GAAG,SAAS,EACtC,OAAO,EAAE,OAAO,EAChB,IAAI,EAAE,KAAK,EACX,MAAM,EAAE,OAAO,GACd,OAAO,CAAC,IAAI,CAAC,CAYf"}

package/out/de-logic/index.js

@@ -1,10 +1,23 @@
-import { HttpError, HttpResponse } from '@ibiz-template/core';
-import { filterFieldLogics } from '../model';
+import { HttpError, HttpResponse, RuntimeError } from '@ibiz-template/core';
+import { filterFieldLogics, findDELogic } from '../model';
 import { DELogic } from './de-logic';
 /**
  * 实体处理逻辑实例缓存
  */
 const deLogicMap = new Map();
+/**
+ * 找到实体逻辑模型
+ * @author lxm
+ * @date 2023-08-04 02:47:16
+ * @param {string} deDELogicId
+ * @param {string} dataEntityId
+ * @param {string} [appId]
+ * @return {*}  {(Promise<IAppDELogic | undefined>)}
+ */
+async function findDeLogic(deDELogicId, dataEntityId, appId) {
+    const appDataEntity = await ibiz.hub.getAppDataEntity(dataEntityId, appId);
+    return findDELogic(deDELogicId, appDataEntity);
+}
 /**
  * 执行实体处理逻辑
  *
@@ -25,6 +38,25 @@ export async function execDELogic(deDELogic, context, data, params) {
     const deLogic = deLogicMap.get(deDELogic);
     return deLogic.exec(context, data, params);
 }
+/**
+ * 通过id执行实体逻辑
+ * @author lxm
+ * @date 2023-08-04 02:49:44
+ * @export
+ * @param {string} deDELogicId
+ * @param {string} dataEntityId
+ * @param {IParams} context
+ * @param {IData} data
+ * @param {IParams} params
+ * @return {*}  {Promise<unknown>}
+ */
+export async function execDELogicById(deDELogicId, dataEntityId, context, data, params) {
+    const deLogic = await findDeLogic(deDELogicId, dataEntityId, context.srfappid);
+    if (!deLogic) {
+        throw new RuntimeError(`${dataEntityId}找不到实体逻辑${deDELogicId}`);
+    }
+    return execDELogic(deLogic, context, data, params);
+}
 /**
  * 执行实体方法的实体逻辑并返回对应的response
  * @author lxm

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

@@ -1,6 +1,6 @@
 import { IAppDEMultiDataView } from '@ibiz/model-core';
 import { ViewController } from '../controller';
-import { IMDViewEvent, IMDViewState, IMDControlController, ISearchFormController, MDCtrlRemoveParams, ISearchBarController } from '../interface';
+import { IMDViewEvent, IMDViewState, IMDControlController, ISearchFormController, MDCtrlRemoveParams, ISearchBarController, MDCtrlLoadParams } from '../interface';
 import { ViewEngineBase } from './view-base.engine';
 /**
  * 多数据视图引擎
@@ -87,7 +87,7 @@ export declare class MDViewEngine extends ViewEngineBase {
      * @date 2023-05-22 03:17:33
      * @return {*}  {Promise<void>}
      */
-    protected load(): Promise<void>;
+    protected load(args?: MDCtrlLoadParams): Promise<void>;
     /**
      * 视图刷新
      * @author lxm

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

@@ -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,EACrB,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;IAyD1B,IAAI,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,GAAG,OAAO,CAAC,KAAK,GAAG,IAAI,GAAG,SAAS,CAAC;IAoCrE,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;KACpB,GAAG,OAAO,CAAC,IAAI,CAAC;IAuBjB;;;;;;;;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;IA2BjB;;;;;;OAMG;cACa,MAAM,CAAC,IAAI,CAAC,EAAE,kBAAkB,GAAG,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC;IAI5E;;;;;OAKG;cACa,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAIrC;;;;;OAKG;cACa,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAIxC;;;;;OAKG;IACH,SAAS,CAAC,eAAe,IAAI,OAAO;IAiBpC;;;;;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"}
+{"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,EACjB,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;IAyD1B,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;KACpB,GAAG,OAAO,CAAC,IAAI,CAAC;IAuBjB;;;;;;;;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;IA2BjB;;;;;;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;IAiBpC;;;;;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

@@ -136,6 +136,10 @@ export class MDViewEngine extends ViewEngineBase {
             this.copy(args);
             return null;
         }
+        if (key === 'load') {
+            this.load(args);
+            return null;
+        }
         return super.call(key, args);
     }
     getData() {
@@ -216,8 +220,8 @@ export class MDViewEngine extends ViewEngineBase {
      * @date 2023-05-22 03:17:33
      * @return {*}  {Promise<void>}
      */
-    async load() {
-        await this.xdataControl.load({ isInitialLoad: true });
+    async load(args = {}) {
+        await this.xdataControl.load(Object.assign({ isInitialLoad: true }, args));
     }
     /**
      * 视图刷新

package/out/engine/view-base.engine.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"view-base.engine.d.ts","sourceRoot":"","sources":["../../src/engine/view-base.engine.ts"],"names":[],"mappings":"AACA,OAAO,EACL,eAAe,EACf,kBAAkB,EAClB,0BAA0B,EAC3B,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAElD;;;;;;GAMG;AACH,qBAAa,cAAe,YAAW,WAAW;IAmEpC,SAAS,CAAC,IAAI,EAAE,eAAe;IAlE3C;;;;;;;OAOG;IACH,SAAS,KAAK,OAAO,IAAI,kBAAkB,GAAG,SAAS,CAEtD;IAED;;;;;;;OAOG;IACH,SAAS,KAAK,WAAW,IAAI,kBAAkB,GAAG,SAAS,CAE1D;IAED;;;;;;;OAOG;IACH,SAAS,KAAK,YAAY,IAAI,kBAAkB,GAAG,SAAS,CAE3D;IAED;;;;;;;OAOG;IACH,SAAS,KAAK,aAAa,IAAI,kBAAkB,GAAG,SAAS,CAE5D;IAED;;;;;;;OAOG;IACH,SAAS,KAAK,eAAe,IAAI,0BAA0B,GAAG,SAAS,CAEtE;IAED;;;;;OAKG;gBACmB,IAAI,EAAE,eAAe;IAIrC,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAK1B,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAyB1B,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC;IAI5B,IAAI,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,KAAK,GAAG,OAAO,CAAC,KAAK,GAAG,IAAI,GAAG,SAAS,CAAC;IAOzE;;;;;OAKG;IACH,SAAS,CAAC,aAAa,IAAI,IAAI;IAI/B;;;;;OAKG;IACH,SAAS,CAAC,OAAO,IAAI,KAAK,EAAE;IAI5B;;;;;;;OAOG;IACH,SAAS,CAAC,qBAAqB,IAAI,OAAO;IAgD1C;;;;;;OAMG;IACH,SAAS,CAAC,qBAAqB,IAAI,OAAO;IAW1C;;;;;OAKG;IACG,cAAc,IAAI,OAAO,CAAC,IAAI,CAAC;CAsBtC"}
+{"version":3,"file":"view-base.engine.d.ts","sourceRoot":"","sources":["../../src/engine/view-base.engine.ts"],"names":[],"mappings":"AACA,OAAO,EACL,eAAe,EACf,kBAAkB,EAClB,0BAA0B,EAC3B,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAElD;;;;;;GAMG;AACH,qBAAa,cAAe,YAAW,WAAW;IAmEpC,SAAS,CAAC,IAAI,EAAE,eAAe;IAlE3C;;;;;;;OAOG;IACH,SAAS,KAAK,OAAO,IAAI,kBAAkB,GAAG,SAAS,CAEtD;IAED;;;;;;;OAOG;IACH,SAAS,KAAK,WAAW,IAAI,kBAAkB,GAAG,SAAS,CAE1D;IAED;;;;;;;OAOG;IACH,SAAS,KAAK,YAAY,IAAI,kBAAkB,GAAG,SAAS,CAE3D;IAED;;;;;;;OAOG;IACH,SAAS,KAAK,aAAa,IAAI,kBAAkB,GAAG,SAAS,CAE5D;IAED;;;;;;;OAOG;IACH,SAAS,KAAK,eAAe,IAAI,0BAA0B,GAAG,SAAS,CAEtE;IAED;;;;;OAKG;gBACmB,IAAI,EAAE,eAAe;IAIrC,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAK1B,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAyB1B,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC;IAI5B,IAAI,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,KAAK,GAAG,OAAO,CAAC,KAAK,GAAG,IAAI,GAAG,SAAS,CAAC;IAOzE;;;;;OAKG;IACH,SAAS,CAAC,aAAa,IAAI,IAAI;IAI/B;;;;;OAKG;IACH,SAAS,CAAC,OAAO,IAAI,KAAK,EAAE;IAI5B;;;;;;;OAOG;IACH,SAAS,CAAC,qBAAqB,IAAI,OAAO;IAgD1C;;;;;;OAMG;IACH,SAAS,CAAC,qBAAqB,IAAI,OAAO;IAW1C;;;;;OAKG;IACG,cAAc,IAAI,OAAO,CAAC,IAAI,CAAC;CAuBtC"}

package/out/engine/view-base.engine.js

@@ -212,12 +212,13 @@ export class ViewEngineBase {
         }
         const app = ibiz.hub.getApp(context.srfappid);
         const res = await app.deService.exec(appDataEntityId, 'get', context, params);
-        if (res.data) {
-            this.view.state.srfactiveviewdata = res.data;
-            evt.emit('onDataChange', { actionType: 'LOAD', data: [res.data] });
-            const info = {};
-            info.dataInfo = res.data.srfmajortext || '';
-            evt.emit('onViewInfoChange', info);
+        const { data } = res;
+        if (data) {
+            this.view.state.srfactiveviewdata = data;
+            evt.emit('onDataChange', { actionType: 'LOAD', data: [data] });
+            if (data.srfkey) {
+                evt.emit('onViewInfoChange', { dataInfo: data.srfmajortext || '' });
+            }
         }
     }
 }

package/out/index.d.ts

@@ -9,6 +9,8 @@ export * from './service';
 export * from './utils';
 export * from './controller';
 export * from './ui-action';
+export * from './ui-logic';
+export * from './de-logic';
 export * from './engine';
 export * from './model';
 export { Application } from './application';

package/out/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,SAAS,CAAC;AAEjB,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,cAAc,WAAW,CAAC;AAC1B,cAAc,YAAY,CAAC;AAC3B,cAAc,aAAa,CAAC;AAC5B,cAAc,UAAU,CAAC;AACzB,cAAc,YAAY,CAAC;AAC3B,cAAc,WAAW,CAAC;AAC1B,cAAc,SAAS,CAAC;AACxB,cAAc,cAAc,CAAC;AAC7B,cAAc,aAAa,CAAC;AAC5B,cAAc,UAAU,CAAC;AACzB,cAAc,SAAS,CAAC;AACxB,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,SAAS,CAAC;AAEjB,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,cAAc,WAAW,CAAC;AAC1B,cAAc,YAAY,CAAC;AAC3B,cAAc,aAAa,CAAC;AAC5B,cAAc,UAAU,CAAC;AACzB,cAAc,YAAY,CAAC;AAC3B,cAAc,WAAW,CAAC;AAC1B,cAAc,SAAS,CAAC;AACxB,cAAc,cAAc,CAAC;AAC7B,cAAc,aAAa,CAAC;AAC5B,cAAc,YAAY,CAAC;AAC3B,cAAc,YAAY,CAAC;AAC3B,cAAc,UAAU,CAAC;AACzB,cAAc,SAAS,CAAC;AACxB,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC"}

package/out/index.js

@@ -9,6 +9,8 @@ export * from './service';
 export * from './utils';
 export * from './controller';
 export * from './ui-action';
+export * from './ui-logic';
+export * from './de-logic';
 export * from './engine';
 export * from './model';
 export { Application } from './application';

package/out/interface/controller/controller/control/i-pickup-view-panel.controller.d.ts

@@ -1,6 +1,7 @@
 import { IDEPickupViewPanel } from '@ibiz/model-core';
 import { IPickupViewPanelEvent } from '../../event';
 import { IPickupViewPanelState } from '../../state';
+import { IViewController } from '../view';
 import { IControlController } from './i-control.controller';
 /**
  * 选择视图面板控制器
@@ -10,6 +11,15 @@ import { IControlController } from './i-control.controller';
  * @extends {IControlController<IDEPickupViewPanel, IPickupViewPanelState, IPickupViewPanelEvent>}
  */
 export interface IPickupViewPanelController extends IControlController<IDEPickupViewPanel, IPickupViewPanelState, IPickupViewPanelEvent> {
+    /**
+     * 选择视图嵌入视图控制器
+     *
+     * @author zk
+     * @date 2023-08-04 08:08:43
+     * @type {IViewController}
+     * @memberof IPickupViewPanelController
+     */
+    embedView: IViewController;
     /**
      * 获取选中数据
      *

package/out/interface/controller/controller/control/i-pickup-view-panel.controller.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"i-pickup-view-panel.controller.d.ts","sourceRoot":"","sources":["../../../../../src/interface/controller/controller/control/i-pickup-view-panel.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AACtD,OAAO,EAAE,qBAAqB,EAAE,MAAM,aAAa,CAAC;AACpD,OAAO,EAAE,qBAAqB,EAAE,MAAM,aAAa,CAAC;AACpD,OAAO,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AAE5D;;;;;;GAMG;AACH,MAAM,WAAW,0BACf,SAAQ,kBAAkB,CACxB,kBAAkB,EAClB,qBAAqB,EACrB,qBAAqB,CACtB;IACD;;;;;;;OAOG;IACH,eAAe,IAAI,OAAO,CAAC,KAAK,EAAE,CAAC,CAAC;IAEpC;;;;;;;OAOG;IACH,UAAU,IAAI,OAAO,CAAC,KAAK,EAAE,CAAC,CAAC;CAChC"}
+{"version":3,"file":"i-pickup-view-panel.controller.d.ts","sourceRoot":"","sources":["../../../../../src/interface/controller/controller/control/i-pickup-view-panel.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AACtD,OAAO,EAAE,qBAAqB,EAAE,MAAM,aAAa,CAAC;AACpD,OAAO,EAAE,qBAAqB,EAAE,MAAM,aAAa,CAAC;AACpD,OAAO,EAAE,eAAe,EAAE,MAAM,SAAS,CAAC;AAC1C,OAAO,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AAE5D;;;;;;GAMG;AACH,MAAM,WAAW,0BACf,SAAQ,kBAAkB,CACxB,kBAAkB,EAClB,qBAAqB,EACrB,qBAAqB,CACtB;IACD;;;;;;;OAOG;IACH,SAAS,EAAE,eAAe,CAAC;IAC3B;;;;;;;OAOG;IACH,eAAe,IAAI,OAAO,CAAC,KAAK,EAAE,CAAC,CAAC;IAEpC;;;;;;;OAOG;IACH,UAAU,IAAI,OAAO,CAAC,KAAK,EAAE,CAAC,CAAC;CAChC"}

package/out/interface/controller/controller/control/i-tree-exp-bar.controller.d.ts

@@ -2,6 +2,7 @@ import { ITreeExpBar } from '@ibiz/model-core';
 import { ITreeExpBarEvent } from '../../event';
 import { ITreeExpBarState } from '../../state';
 import { IExpBarControlController } from './i-exp-bar-control.controller';
+import { INavViewMsg } from './panel-item';
 /**
  * 树导航栏控制器
  *
@@ -10,5 +11,15 @@ import { IExpBarControlController } from './i-exp-bar-control.controller';
  * @extends {IExpBarControlController<ITreeExpBar, ITreeExpBarState, ITreeExpBarEvent>}
  */
 export interface ITreeExpBarController extends IExpBarControlController<ITreeExpBar, ITreeExpBarState, ITreeExpBarEvent> {
+    /**
+     * 获取导航视图消息
+     *
+     * @author zk
+     * @date 2023-08-04 08:08:27
+     * @param {IData[]} data
+     * @return {*}  {(INavViewMsg | undefined)}
+     * @memberof ITreeExpBarController
+     */
+    getNavViewMsg(data: IData[]): INavViewMsg | undefined;
 }
 //# sourceMappingURL=i-tree-exp-bar.controller.d.ts.map

package/out/interface/controller/controller/control/i-tree-exp-bar.controller.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"i-tree-exp-bar.controller.d.ts","sourceRoot":"","sources":["../../../../../src/interface/controller/controller/control/i-tree-exp-bar.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC/C,OAAO,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAC/C,OAAO,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAC/C,OAAO,EAAE,wBAAwB,EAAE,MAAM,gCAAgC,CAAC;AAE1E;;;;;;GAMG;AACH,MAAM,WAAW,qBACf,SAAQ,wBAAwB,CAC9B,WAAW,EACX,gBAAgB,EAChB,gBAAgB,CACjB;CAAG"}
+{"version":3,"file":"i-tree-exp-bar.controller.d.ts","sourceRoot":"","sources":["../../../../../src/interface/controller/controller/control/i-tree-exp-bar.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC/C,OAAO,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAC/C,OAAO,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAC/C,OAAO,EAAE,wBAAwB,EAAE,MAAM,gCAAgC,CAAC;AAC1E,OAAO,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAE3C;;;;;;GAMG;AACH,MAAM,WAAW,qBACf,SAAQ,wBAAwB,CAC9B,WAAW,EACX,gBAAgB,EAChB,gBAAgB,CACjB;IACD;;;;;;;;OAQG;IACH,aAAa,CAAC,IAAI,EAAE,KAAK,EAAE,GAAG,WAAW,GAAG,SAAS,CAAC;CACvD"}

package/out/interface/controller/event/control/i-pickup-view-panel.event.d.ts

@@ -40,5 +40,20 @@ export interface IPickupViewPanelEvent extends IControlEvent {
             data: IData[];
         };
     };
+    /**
+     * 选择视图初始化
+     *
+     * @author zk
+     * @date 2023-08-04 05:08:37
+     * @type {{
+     *     event: EventBase;
+     *     emitArgs: { data: IViewController };
+     *   }}
+     * @memberof IPickupViewPanelEvent
+     */
+    onPickUpViewMounted: {
+        event: EventBase;
+        emitArgs: undefined;
+    };
 }
 //# sourceMappingURL=i-pickup-view-panel.event.d.ts.map

package/out/interface/controller/event/control/i-pickup-view-panel.event.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"i-pickup-view-panel.event.d.ts","sourceRoot":"","sources":["../../../../../src/interface/controller/event/control/i-pickup-view-panel.event.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AACxC,OAAO,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAElD;;;;;;GAMG;AACH,MAAM,WAAW,qBAAsB,SAAQ,aAAa;IAC1D;;;;;;;;OAQG;IACH,iBAAiB,EAAE;QACjB,KAAK,EAAE,SAAS,CAAC;QACjB,QAAQ,EAAE;YAAE,IAAI,EAAE,KAAK,EAAE,CAAA;SAAE,CAAC;KAC7B,CAAC;IAEF;;;;;;;;;;OAUG;IACH,YAAY,EAAE;QACZ,KAAK,EAAE,SAAS,CAAC;QACjB,QAAQ,EAAE;YAAE,IAAI,EAAE,KAAK,EAAE,CAAA;SAAE,CAAC;KAC7B,CAAC;CACH"}
+{"version":3,"file":"i-pickup-view-panel.event.d.ts","sourceRoot":"","sources":["../../../../../src/interface/controller/event/control/i-pickup-view-panel.event.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AACxC,OAAO,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAElD;;;;;;GAMG;AACH,MAAM,WAAW,qBAAsB,SAAQ,aAAa;IAC1D;;;;;;;;OAQG;IACH,iBAAiB,EAAE;QACjB,KAAK,EAAE,SAAS,CAAC;QACjB,QAAQ,EAAE;YAAE,IAAI,EAAE,KAAK,EAAE,CAAA;SAAE,CAAC;KAC7B,CAAC;IAEF;;;;;;;;;;OAUG;IACH,YAAY,EAAE;QACZ,KAAK,EAAE,SAAS,CAAC;QACjB,QAAQ,EAAE;YAAE,IAAI,EAAE,KAAK,EAAE,CAAA;SAAE,CAAC;KAC7B,CAAC;IAEF;;;;;;;;;;OAUG;IACH,mBAAmB,EAAE;QACnB,KAAK,EAAE,SAAS,CAAC;QACjB,QAAQ,EAAE,SAAS,CAAC;KACrB,CAAC;CACH"}

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

@@ -0,0 +1,27 @@
+import { EventBase } from '../argument';
+import { IDataViewEvent } from './i-data-view.event';
+/**
+ * 选择数据视图事件
+ *
+ * @author lxm
+ * @date 2022-09-13 10:09:00
+ * @export
+ * @interface IPickupDataViewEvent
+ * @extends {IGridViewEvent}
+ */
+export interface IPickupDataViewEvent extends IDataViewEvent {
+    /**
+     * 选中数据变更事件
+     *
+     * @author lxm
+     * @date 2022-08-31 14:08:12
+     * @param {IData[]} selection 选中的数据集合
+     */
+    onSelectionChange: {
+        event: EventBase;
+        emitArgs: {
+            data: IData[];
+        };
+    };
+}
+//# sourceMappingURL=i-pickup-data-view.event.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"i-pickup-data-view.event.d.ts","sourceRoot":"","sources":["../../../../../src/interface/controller/event/view/i-pickup-data-view.event.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AACxC,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAErD;;;;;;;;GAQG;AACH,MAAM,WAAW,oBAAqB,SAAQ,cAAc;IAC1D;;;;;;OAMG;IACH,iBAAiB,EAAE;QACjB,KAAK,EAAE,SAAS,CAAC;QACjB,QAAQ,EAAE;YAAE,IAAI,EAAE,KAAK,EAAE,CAAA;SAAE,CAAC;KAC7B,CAAC;CACH"}

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

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

package/out/interface/controller/event/view/index.d.ts

@@ -12,6 +12,7 @@ export * from './i-tree-view.event';
 export * from './i-pickup-view.event';
 export * from './i-mpickup-view.event';
 export * from './i-pickup-grid-view.event';
+export * from './i-pickup-data-view.event';
 export * from './i-wf-edit-view.event';
 export * from './i-wf-dyna-edit-view.event';
 export * from './i-wf-dyna-edit-view3.event';

package/out/interface/controller/event/view/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/interface/controller/event/view/index.ts"],"names":[],"mappings":"AAAA,cAAc,gBAAgB,CAAC;AAC/B,cAAc,qBAAqB,CAAC;AACpC,cAAc,sBAAsB,CAAC;AACrC,cAAc,sBAAsB,CAAC;AACrC,cAAc,sBAAsB,CAAC;AACrC,cAAc,oBAAoB,CAAC;AACnC,cAAc,mBAAmB,CAAC;AAClC,cAAc,qBAAqB,CAAC;AACpC,cAAc,qBAAqB,CAAC;AACpC,cAAc,qBAAqB,CAAC;AACpC,cAAc,qBAAqB,CAAC;AACpC,cAAc,uBAAuB,CAAC;AACtC,cAAc,wBAAwB,CAAC;AACvC,cAAc,4BAA4B,CAAC;AAC3C,cAAc,wBAAwB,CAAC;AACvC,cAAc,6BAA6B,CAAC;AAC5C,cAAc,8BAA8B,CAAC;AAC7C,cAAc,8BAA8B,CAAC;AAC7C,cAAc,+BAA+B,CAAC;AAC9C,cAAc,yBAAyB,CAAC;AACxC,cAAc,wBAAwB,CAAC;AACvC,cAAc,yBAAyB,CAAC;AACxC,cAAc,sBAAsB,CAAC;AACrC,cAAc,uBAAuB,CAAC;AACtC,cAAc,yBAAyB,CAAC;AACxC,cAAc,uBAAuB,CAAC;AACtC,cAAc,oBAAoB,CAAC;AACnC,cAAc,8BAA8B,CAAC;AAC7C,cAAc,sBAAsB,CAAC;AACrC,cAAc,4BAA4B,CAAC;AAC3C,cAAc,8BAA8B,CAAC;AAC7C,cAAc,uBAAuB,CAAC;AACtC,cAAc,2BAA2B,CAAC;AAC1C,cAAc,0BAA0B,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/interface/controller/event/view/index.ts"],"names":[],"mappings":"AAAA,cAAc,gBAAgB,CAAC;AAC/B,cAAc,qBAAqB,CAAC;AACpC,cAAc,sBAAsB,CAAC;AACrC,cAAc,sBAAsB,CAAC;AACrC,cAAc,sBAAsB,CAAC;AACrC,cAAc,oBAAoB,CAAC;AACnC,cAAc,mBAAmB,CAAC;AAClC,cAAc,qBAAqB,CAAC;AACpC,cAAc,qBAAqB,CAAC;AACpC,cAAc,qBAAqB,CAAC;AACpC,cAAc,qBAAqB,CAAC;AACpC,cAAc,uBAAuB,CAAC;AACtC,cAAc,wBAAwB,CAAC;AACvC,cAAc,4BAA4B,CAAC;AAC3C,cAAc,4BAA4B,CAAC;AAC3C,cAAc,wBAAwB,CAAC;AACvC,cAAc,6BAA6B,CAAC;AAC5C,cAAc,8BAA8B,CAAC;AAC7C,cAAc,8BAA8B,CAAC;AAC7C,cAAc,+BAA+B,CAAC;AAC9C,cAAc,yBAAyB,CAAC;AACxC,cAAc,wBAAwB,CAAC;AACvC,cAAc,yBAAyB,CAAC;AACxC,cAAc,sBAAsB,CAAC;AACrC,cAAc,uBAAuB,CAAC;AACtC,cAAc,yBAAyB,CAAC;AACxC,cAAc,uBAAuB,CAAC;AACtC,cAAc,oBAAoB,CAAC;AACnC,cAAc,8BAA8B,CAAC;AAC7C,cAAc,sBAAsB,CAAC;AACrC,cAAc,4BAA4B,CAAC;AAC3C,cAAc,8BAA8B,CAAC;AAC7C,cAAc,uBAAuB,CAAC;AACtC,cAAc,2BAA2B,CAAC;AAC1C,cAAc,0BAA0B,CAAC"}

package/out/interface/controller/event/view/index.js

@@ -12,6 +12,7 @@ export * from './i-tree-view.event';
 export * from './i-pickup-view.event';
 export * from './i-mpickup-view.event';
 export * from './i-pickup-grid-view.event';
+export * from './i-pickup-data-view.event';
 export * from './i-wf-edit-view.event';
 export * from './i-wf-dyna-edit-view.event';
 export * from './i-wf-dyna-edit-view3.event';

package/out/interface/controller/state/view/i-pickup-data-view.state.d.ts

@@ -0,0 +1,22 @@
+import { IDataViewState } from './i-data-view.state';
+/**
+ * 表格选择视图UI状态
+ *
+ * @author zk
+ * @date 2023-05-25 05:05:43
+ * @export
+ * @interface IPickupDataViewState
+ * @extends {IGridViewState}
+ */
+export interface IPickupDataViewState extends IDataViewState {
+    /**
+     * 是否单选
+     *
+     * @author zk
+     * @date 2023-05-26 05:05:02
+     * @type {boolean}
+     * @memberof IPickupDataViewState
+     */
+    singleSelect: boolean;
+}
+//# sourceMappingURL=i-pickup-data-view.state.d.ts.map

package/out/interface/controller/state/view/i-pickup-data-view.state.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"i-pickup-data-view.state.d.ts","sourceRoot":"","sources":["../../../../../src/interface/controller/state/view/i-pickup-data-view.state.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAErD;;;;;;;;GAQG;AACH,MAAM,WAAW,oBAAqB,SAAQ,cAAc;IAC1D;;;;;;;OAOG;IACH,YAAY,EAAE,OAAO,CAAC;CACvB"}

package/out/interface/controller/state/view/i-pickup-data-view.state.js

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

package/out/interface/controller/state/view/index.d.ts

@@ -9,6 +9,7 @@ export * from './i-opt-view.state';
 export * from './i-mpickup-view.state';
 export * from './i-pickup-view.state';
 export * from './i-pickup-grid-view.state';
+export * from './i-pickup-data-view.state';
 export * from './i-tab-exp-view.state';
 export * from './i-exp-view.state';
 export * from './i-grid-exp-view.state';

package/out/interface/controller/state/view/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/interface/controller/state/view/index.ts"],"names":[],"mappings":"AAAA,cAAc,gBAAgB,CAAC;AAC/B,cAAc,sBAAsB,CAAC;AACrC,cAAc,mBAAmB,CAAC;AAClC,cAAc,qBAAqB,CAAC;AACpC,cAAc,qBAAqB,CAAC;AACpC,cAAc,qBAAqB,CAAC;AACpC,cAAc,qBAAqB,CAAC;AACpC,cAAc,oBAAoB,CAAC;AACnC,cAAc,wBAAwB,CAAC;AACvC,cAAc,uBAAuB,CAAC;AACtC,cAAc,4BAA4B,CAAC;AAC3C,cAAc,wBAAwB,CAAC;AACvC,cAAc,oBAAoB,CAAC;AACnC,cAAc,yBAAyB,CAAC;AACxC,cAAc,yBAAyB,CAAC;AACxC,cAAc,8BAA8B,CAAC;AAC7C,cAAc,yBAAyB,CAAC;AACxC,cAAc,sBAAsB,CAAC;AACrC,cAAc,uBAAuB,CAAC;AACtC,cAAc,qBAAqB,CAAC;AACpC,cAAc,sBAAsB,CAAC;AACrC,cAAc,sBAAsB,CAAC;AACrC,cAAc,sBAAsB,CAAC;AACrC,cAAc,8BAA8B,CAAC;AAC7C,cAAc,+BAA+B,CAAC;AAC9C,cAAc,6BAA6B,CAAC;AAC5C,cAAc,8BAA8B,CAAC;AAC7C,cAAc,wBAAwB,CAAC;AACvC,cAAc,4BAA4B,CAAC;AAC3C,cAAc,8BAA8B,CAAC;AAC7C,cAAc,uBAAuB,CAAC;AACtC,cAAc,2BAA2B,CAAC;AAC1C,cAAc,0BAA0B,CAAC;AACzC,cAAc,sBAAsB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/interface/controller/state/view/index.ts"],"names":[],"mappings":"AAAA,cAAc,gBAAgB,CAAC;AAC/B,cAAc,sBAAsB,CAAC;AACrC,cAAc,mBAAmB,CAAC;AAClC,cAAc,qBAAqB,CAAC;AACpC,cAAc,qBAAqB,CAAC;AACpC,cAAc,qBAAqB,CAAC;AACpC,cAAc,qBAAqB,CAAC;AACpC,cAAc,oBAAoB,CAAC;AACnC,cAAc,wBAAwB,CAAC;AACvC,cAAc,uBAAuB,CAAC;AACtC,cAAc,4BAA4B,CAAC;AAC3C,cAAc,4BAA4B,CAAC;AAC3C,cAAc,wBAAwB,CAAC;AACvC,cAAc,oBAAoB,CAAC;AACnC,cAAc,yBAAyB,CAAC;AACxC,cAAc,yBAAyB,CAAC;AACxC,cAAc,8BAA8B,CAAC;AAC7C,cAAc,yBAAyB,CAAC;AACxC,cAAc,sBAAsB,CAAC;AACrC,cAAc,uBAAuB,CAAC;AACtC,cAAc,qBAAqB,CAAC;AACpC,cAAc,sBAAsB,CAAC;AACrC,cAAc,sBAAsB,CAAC;AACrC,cAAc,sBAAsB,CAAC;AACrC,cAAc,8BAA8B,CAAC;AAC7C,cAAc,+BAA+B,CAAC;AAC9C,cAAc,6BAA6B,CAAC;AAC5C,cAAc,8BAA8B,CAAC;AAC7C,cAAc,wBAAwB,CAAC;AACvC,cAAc,4BAA4B,CAAC;AAC3C,cAAc,8BAA8B,CAAC;AAC7C,cAAc,uBAAuB,CAAC;AACtC,cAAc,2BAA2B,CAAC;AAC1C,cAAc,0BAA0B,CAAC;AACzC,cAAc,sBAAsB,CAAC"}

package/out/interface/controller/state/view/index.js

@@ -9,6 +9,7 @@ export * from './i-opt-view.state';
 export * from './i-mpickup-view.state';
 export * from './i-pickup-view.state';
 export * from './i-pickup-grid-view.state';
+export * from './i-pickup-data-view.state';
 export * from './i-tab-exp-view.state';
 export * from './i-exp-view.state';
 export * from './i-grid-exp-view.state';

package/out/logic-scheduler/executor/app-ui-logic-executor.d.ts

@@ -1,4 +1,4 @@
-import { IAppUIOpenDataLogic, IAppUINewDataLogic } from '@ibiz/model-core';
+import { IAppUIOpenDataLogic, IAppUINewDataLogic, IAppUILogicRefViewBase } from '@ibiz/model-core';
 import { IUILogicParams } from '../../interface';
 import { LogicExecutor } from './logic-executor';
 /**
@@ -38,5 +38,17 @@ export declare class AppUILogicExecutor extends LogicExecutor {
      * @param {IData} [opts] 额外参数，event是js原生事件
      */
     executeNewDataAppUILogic(appUILogic: IAppUINewDataLogic, parameters: IUILogicParams): Promise<void>;
+    /**
+     * 获取向导新建视图引用
+     * 返回undefined为取消操作
+     * 找不到会报错
+     * @author lxm
+     * @date 2023-08-03 06:37:22
+     * @protected
+     * @param {IAppUINewDataLogic} appUILogic
+     * @param {IUILogicParams} parameters
+     * @return {*}  {(Promise<IAppUILogicRefViewBase | undefined>)}
+     */
+    protected getWizardNewViewRef(appUILogic: IAppUINewDataLogic, parameters: IUILogicParams): Promise<IAppUILogicRefViewBase | undefined>;
 }
 //# sourceMappingURL=app-ui-logic-executor.d.ts.map

package/out/logic-scheduler/executor/app-ui-logic-executor.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"app-ui-logic-executor.d.ts","sourceRoot":"","sources":["../../../src/logic-scheduler/executor/app-ui-logic-executor.ts"],"names":[],"mappings":"AACA,OAAO,EACL,mBAAmB,EAEnB,kBAAkB,EACnB,MAAM,kBAAkB,CAAC;AAG1B,OAAO,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAEjD,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAEjD;;;;;;;GAOG;AACH,qBAAa,kBAAmB,SAAQ,aAAa;IAC3C,IAAI,EAAE,YAAY,CAAC;IAG3B,OAAO,CAAC,aAAa,EAAE,cAAc,GAAG,GAAG;IAiB3C;;;;;;;;;;;OAWG;IACG,yBAAyB,CAC7B,UAAU,EAAE,mBAAmB,EAC/B,UAAU,EAAE,cAAc,GACzB,OAAO,CAAC,IAAI,CAAC;IA8ChB;;;;;;;;;;;OAWG;IACG,wBAAwB,CAC5B,UAAU,EAAE,kBAAkB,EAC9B,UAAU,EAAE,cAAc,GACzB,OAAO,CAAC,IAAI,CAAC;CAwDjB"}
+{"version":3,"file":"app-ui-logic-executor.d.ts","sourceRoot":"","sources":["../../../src/logic-scheduler/executor/app-ui-logic-executor.ts"],"names":[],"mappings":"AAKA,OAAO,EACL,mBAAmB,EAEnB,kBAAkB,EAClB,sBAAsB,EACvB,MAAM,kBAAkB,CAAC;AAG1B,OAAO,EAAc,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAE7D,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAEjD;;;;;;;GAOG;AACH,qBAAa,kBAAmB,SAAQ,aAAa;IAC3C,IAAI,EAAE,YAAY,CAAC;IAG3B,OAAO,CAAC,aAAa,EAAE,cAAc,GAAG,GAAG;IAiB3C;;;;;;;;;;;OAWG;IACG,yBAAyB,CAC7B,UAAU,EAAE,mBAAmB,EAC/B,UAAU,EAAE,cAAc,GACzB,OAAO,CAAC,IAAI,CAAC;IA+ChB;;;;;;;;;;;OAWG;IACG,wBAAwB,CAC5B,UAAU,EAAE,kBAAkB,EAC9B,UAAU,EAAE,cAAc,GACzB,OAAO,CAAC,IAAI,CAAC;IA8DhB;;;;;;;;;;OAUG;cACa,mBAAmB,CACjC,UAAU,EAAE,kBAAkB,EAC9B,UAAU,EAAE,cAAc,GACzB,OAAO,CAAC,sBAAsB,GAAG,SAAS,CAAC;CAkC/C"}

package/out/logic-scheduler/executor/app-ui-logic-executor.js

@@ -9,7 +9,7 @@ var __rest = (this && this.__rest) || function (s, e) {
         }
     return t;
 };
-import { RuntimeError, RuntimeModelError } from '@ibiz-template/core';
+import { ModelError, RuntimeError, RuntimeModelError, } from '@ibiz-template/core';
 import { notNilEmpty } from 'qx-util';
 import { OpenAppViewCommand } from '../../command';
 import { convertNavData } from '../../utils';
@@ -47,7 +47,8 @@ export class AppUILogicExecutor extends LogicExecutor {
      * @param {IData} [opts] 额外参数，event是js原生事件
      */
     async executeOpenDataAppUILogic(appUILogic, parameters) {
-        const { context, params, data } = parameters, rest = __rest(parameters, ["context", "params", "data"]);
+        const { context, params } = parameters, rest = __rest(parameters, ["context", "params"]);
+        const { data } = parameters;
         if (!(data === null || data === void 0 ? void 0 : data[0])) {
             throw new RuntimeError('opendata没有可操作数据！');
         }
@@ -86,15 +87,31 @@ export class AppUILogicExecutor extends LogicExecutor {
      * @param {IData} [opts] 额外参数，event是js原生事件
      */
     async executeNewDataAppUILogic(appUILogic, parameters) {
-        const { context, params, data } = parameters, rest = __rest(parameters, ["context", "params", "data"]);
-        // 准备需要的模型
-        const newViewRef = appUILogic.newDataAppView;
-        if (!newViewRef) {
-            throw new RuntimeModelError(appUILogic, 'newdata视图逻辑没有配置默认新建数据视图');
+        const { context, params } = parameters, rest = __rest(parameters, ["context", "params"]);
+        const { data } = parameters;
+        const { enableWizardAdd, enableBatchAdd, batchAddOnly, newDataAppView } = appUILogic;
+        let newViewRef;
+        if (enableWizardAdd) {
+            newViewRef = await this.getWizardNewViewRef(appUILogic, parameters);
+            if (!newViewRef) {
+                // 选择视图取消操作直接返回
+                return;
+            }
+        }
+        else if (enableBatchAdd) {
+            // todo 批添加
+            throw new ModelError(appUILogic, 'enableBatchAdd暂未支持');
+        }
+        else if (batchAddOnly) {
+            // todo 只支持批添加
+            throw new ModelError(appUILogic, 'batchAddOnly暂未支持');
         }
-        const newView = newViewRef.refAppViewId;
-        if (!newView) {
-            throw new RuntimeModelError(appUILogic, 'newdata视图逻辑的默认新建数据视图没有实际引用视图');
+        else {
+            // 准备需要的模型
+            newViewRef = newDataAppView;
+            if (!newViewRef || !newViewRef.refAppViewId) {
+                throw new RuntimeModelError(appUILogic, 'newdata视图逻辑没有配置默认新建数据视图');
+            }
         }
         // 处理导航参数
         let tempContext = {};
@@ -115,16 +132,43 @@ export class AppUILogicExecutor extends LogicExecutor {
             _data.srfkey = undefined;
             tempParams = Object.assign(tempParams, _data.$origin);
         }
-        if (appUILogic.enableWizardAdd) {
-            // todo 向导添加
+        // 打开视图
+        await ibiz.commands.execute(OpenAppViewCommand.TAG, newViewRef.refAppViewId, tempContext, tempParams, rest);
+    }
+    /**
+     * 获取向导新建视图引用
+     * 返回undefined为取消操作
+     * 找不到会报错
+     * @author lxm
+     * @date 2023-08-03 06:37:22
+     * @protected
+     * @param {IAppUINewDataLogic} appUILogic
+     * @param {IUILogicParams} parameters
+     * @return {*}  {(Promise<IAppUILogicRefViewBase | undefined>)}
+     */
+    async getWizardNewViewRef(appUILogic, parameters) {
+        var _a;
+        const { wizardAppView, newDataAppViews } = appUILogic;
+        const { context, params } = parameters, rest = __rest(parameters, ["context", "params"]);
+        // 索引实体的向导添加
+        if (!wizardAppView || !wizardAppView.refAppViewId) {
+            throw new RuntimeModelError(appUILogic, '缺少默认索引实体选择视图');
         }
-        else if (appUILogic.enableBatchAdd) {
-            // todo 批添加
+        // 打开视图
+        const result = await ibiz.commands.execute(OpenAppViewCommand.TAG, wizardAppView.refAppViewId, context, params, Object.assign(Object.assign({}, rest), { openMode: 'POPUPMODAL' }));
+        if (!result.ok) {
+            // 取消
+            return;
         }
-        else if (appUILogic.batchAddOnly) {
-            // todo 只支持批添加
+        const selectData = (_a = result.data) === null || _a === void 0 ? void 0 : _a[0];
+        if (!selectData) {
+            throw new RuntimeError('请选中一条数据');
         }
-        // 打开视图
-        await ibiz.commands.execute(OpenAppViewCommand.TAG, newView, tempContext, tempParams, rest);
+        const indexType = selectData.srfkey;
+        const findView = newDataAppViews === null || newDataAppViews === void 0 ? void 0 : newDataAppViews.find(item => item.refMode === indexType);
+        if (!findView) {
+            throw new RuntimeError(`没有找到与索引类型${indexType}相关的实体的编辑视图`);
+        }
+        return findView;
     }
 }

package/out/service/service/entity/method/fetch.d.ts

@@ -1,4 +1,5 @@
 import { HttpResponse } from '@ibiz-template/core';
+import { IAppDEDataSet } from '@ibiz/model-core';
 import { PSDEDQCondEngine, SearchFilter } from '../../../utils';
 import { Method } from './method';
 import { IDataEntity } from '../../../../interface';
@@ -12,6 +13,7 @@ import { IDataEntity } from '../../../../interface';
  * @extends {Method}
  */
 export declare class FetchMethod extends Method {
+    method: IAppDEDataSet;
     exec(context: IParams, data: IData, params: IParams): Promise<HttpResponse<IDataEntity[]>>;
     /**
      * 查询本地数据，根据属性
@@ -31,5 +33,14 @@ export declare class FetchMethod extends Method {
      * @return {*}  {Promise<IDataEntity[]>}
      */
     protected searchLocal(cond: PSDEDQCondEngine | null, filter: SearchFilter, queryParamKeys?: string[]): Promise<IDataEntity[]>;
+    /**
+     * 获取代码表数据来源的集合
+     * @author lxm
+     * @date 2023-08-03 02:55:00
+     * @param {IParams} context
+     * @param {IParams} params
+     * @return {*}  {Promise<HttpResponse<IData[]>>}
+     */
+    protected fetchCodeListSet(context: IParams, params: IParams): Promise<HttpResponse<IData[]>>;
 }
 //# sourceMappingURL=fetch.d.ts.map

package/out/service/service/entity/method/fetch.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"fetch.d.ts","sourceRoot":"","sources":["../../../../../src/service/service/entity/method/fetch.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AAGnD,OAAO,EAAE,gBAAgB,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAChE,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAClC,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAGpD;;;;;;;;GAQG;AACH,qBAAa,WAAY,SAAQ,MAAM;IAC/B,IAAI,CACR,OAAO,EAAE,OAAO,EAChB,IAAI,EAAE,KAAK,EACX,MAAM,EAAE,OAAO,GACd,OAAO,CAAC,YAAY,CAAC,WAAW,EAAE,CAAC,CAAC;IAyBvC;;;;;;OAMG;cACa,WAAW,CACzB,OAAO,EAAE,OAAO,EAChB,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,WAAW,EAAE,CAAC;IA8DzB;;;;;;;;OAQG;cACa,WAAW,CACzB,IAAI,EAAE,gBAAgB,GAAG,IAAI,EAC7B,MAAM,EAAE,YAAY,EACpB,cAAc,GAAE,MAAM,EAA0C,GAC/D,OAAO,CAAC,WAAW,EAAE,CAAC;CA4C1B"}
+{"version":3,"file":"fetch.d.ts","sourceRoot":"","sources":["../../../../../src/service/service/entity/method/fetch.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAGb,MAAM,qBAAqB,CAAC;AAG7B,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACjD,OAAO,EAAE,gBAAgB,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAChE,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAClC,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAGpD;;;;;;;;GAQG;AACH,qBAAa,WAAY,SAAQ,MAAM;IAC7B,MAAM,EAAE,aAAa,CAAC;IAExB,IAAI,CACR,OAAO,EAAE,OAAO,EAChB,IAAI,EAAE,KAAK,EACX,MAAM,EAAE,OAAO,GACd,OAAO,CAAC,YAAY,CAAC,WAAW,EAAE,CAAC,CAAC;IA6CvC;;;;;;OAMG;cACa,WAAW,CACzB,OAAO,EAAE,OAAO,EAChB,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,WAAW,EAAE,CAAC;IA8DzB;;;;;;;;OAQG;cACa,WAAW,CACzB,IAAI,EAAE,gBAAgB,GAAG,IAAI,EAC7B,MAAM,EAAE,YAAY,EACpB,cAAc,GAAE,MAAM,EAA0C,GAC/D,OAAO,CAAC,WAAW,EAAE,CAAC;IA6CzB;;;;;;;OAOG;cACa,gBAAgB,CAC9B,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,OAAO,GACd,OAAO,CAAC,YAAY,CAAC,KAAK,EAAE,CAAC,CAAC;CAkBlC"}