@ibiz-template/runtime 0.1.0 → 0.1.1

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/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/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"}

package/out/service/service/entity/method/fetch.js

@@ -1,4 +1,4 @@
-import { HttpResponse } from '@ibiz-template/core';
+import { HttpResponse, ModelError, RuntimeModelError, } from '@ibiz-template/core';
 import { ascSort, descSort } from 'qx-util';
 import { clone, equals, isEmpty, isNil, where } from 'ramda';
 import { SearchFilter } from '../../../utils';
@@ -16,11 +16,27 @@ import { execFieldLogics } from '../../../../de-logic';
 export class FetchMethod extends Method {
     async exec(context, data, params) {
         if (this.isLocalMode) {
+            // 临时数据
             const items = await this.searchLocal(null, new SearchFilter(context, data));
             return new HttpResponse(items, 200);
         }
-        const path = this.calcPath(context);
-        const res = await this.request(path, context, data, params);
+        // 根据数据集合来源查询数据
+        let res;
+        switch (this.method.dataSetType) {
+            case 'INDEXDE':
+            case 'CODELIST':
+                res = await this.fetchCodeListSet(context, params);
+                break;
+            case 'REMOTE':
+                {
+                    const path = this.calcPath(context);
+                    res = await this.request(path, context, data, params);
+                }
+                break;
+            default:
+                throw new ModelError(this.method, `数据来源类型${this.method.dataSetType}暂未支持`);
+        }
+        // 转换实体对象
         const items = res.data || [];
         res.data = items.map(item => this.createEntity(item));
         // 计算属性逻辑,每条数据走一遍
@@ -152,4 +168,25 @@ export class FetchMethod extends Method {
         const items = list.slice(start, end).map(item => clone(item));
         return items;
     }
+    /**
+     * 获取代码表数据来源的集合
+     * @author lxm
+     * @date 2023-08-03 02:55:00
+     * @param {IParams} context
+     * @param {IParams} params
+     * @return {*}  {Promise<HttpResponse<IData[]>>}
+     */
+    async fetchCodeListSet(context, params) {
+        const { appCodeListId } = this.method;
+        if (!appCodeListId) {
+            throw new RuntimeModelError(this.method, '没有指定数据来源代码表');
+        }
+        const codeItems = await this.app.codeList.get(appCodeListId, context, params);
+        const { keyAppDEFieldId, majorAppDEFieldId } = this.entity;
+        const dataSet = codeItems.map(item => ({
+            [keyAppDEFieldId]: item.value,
+            [majorAppDEFieldId]: item.text,
+        }));
+        return new HttpResponse(dataSet, 200);
+    }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ibiz-template/runtime",
-  "version": "0.1.0",
+  "version": "0.1.1",
   "description": "控制器包",
   "type": "module",
   "main": "out/index.js",
@@ -21,16 +21,15 @@
     "build:rollup": "rollup -c",
     "lint": "eslint 'src/**/*.ts'",
     "lint:fix": "eslint --fix 'src/**/*.ts'",
-    "prepublish": "npm run build",
-    "publish:next": "npm publish --access public --tag=next",
-    "publish:dev": "npm publish --access public --tag=dev",
-    "publish:beta": "npm publish --access public --tag=beta",
-    "publish:npm": "npm publish --access public --registry=https://registry.npmjs.org/"
+    "publish:next": "npm run build && npm publish --access public --tag=next",
+    "publish:dev": "npm run build && npm publish --access public --tag=dev",
+    "publish:beta": "npm run build && npm publish --access public --tag=beta",
+    "publish:npm": "npm run build && npm publish --access public --registry=https://registry.npmjs.org/"
   },
   "author": "chitanda",
   "license": "MIT",
   "devDependencies": {
-    "@ibiz-template/core": "^0.1.0",
+    "@ibiz-template/core": "^0.1.1",
     "@ibiz/model-core": "^0.0.14",
     "@types/path-browserify": "^1.0.0",
     "@types/qs": "^6.9.7",
@@ -44,7 +43,7 @@
     "ramda": "^0.29.0"
   },
   "peerDependencies": {
-    "@ibiz-template/core": "^0.0.4-beta.35",
+    "@ibiz-template/core": "^0.1.0",
     "@ibiz/model-core": "^0.0.14",
     "async-validator": "^4.2.5",
     "dayjs": "^1.11.7",
@@ -53,6 +52,5 @@
     "qs": "^6.11.0",
     "qx-util": "^0.4.8",
     "ramda": "^0.29.0"
-  },
-  "gitHead": "764e1420d9056bd84442181ab3d68218c984515d"
+  }
 }

package/src/command/app/open-app-view/open-app-view.ts

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

package/src/controller/utils/event/qx-event-ex.ts

@@ -43,12 +43,13 @@ export class QXEventEx<T extends QXEmitter<T>> extends QXEvent<T> {
     name: K,
     ...args: Parameters<T[K]>
   ): Promise<Awaited<ReturnType<T[K]>>[]> {
-    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(): void {

package/src/engine/view-base.engine.ts

@@ -239,12 +239,13 @@ export class ViewEngineBase implements IViewEngine {
       params,
     );
 
-    if (res.data) {
-      this.view.state.srfactiveviewdata = res.data;
-      evt.emit('onDataChange', { actionType: 'LOAD', data: [res.data] });
-      const info: IData = {};
-      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/src/interface/controller/event/view/i-pickup-data-view.event.ts

@@ -0,0 +1,25 @@
+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[] };
+  };
+}

package/src/interface/controller/event/view/index.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/src/interface/controller/state/view/i-pickup-data-view.state.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;
+}

package/src/interface/controller/state/view/index.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';