@ibiz-template/runtime 0.1.0 → 0.1.2

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.2",
   "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",
@@ -54,5 +53,5 @@
     "qx-util": "^0.4.8",
     "ramda": "^0.29.0"
   },
-  "gitHead": "764e1420d9056bd84442181ab3d68218c984515d"
+  "gitHead": "f3d39488212f0fd0b65bc4a5aae8bd9541fb1cd6"
 }

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/de-logic/index.ts

@@ -1,6 +1,6 @@
-import { HttpError, HttpResponse } from '@ibiz-template/core';
+import { HttpError, HttpResponse, RuntimeError } from '@ibiz-template/core';
 import { IAppDataEntity, IAppDELogic } from '@ibiz/model-core';
-import { filterFieldLogics } from '../model';
+import { filterFieldLogics, findDELogic } from '../model';
 import { DELogic } from './de-logic';
 
 /**
@@ -8,6 +8,24 @@ import { DELogic } from './de-logic';
  */
 const deLogicMap: WeakMap<IAppDELogic, DELogic> = 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: string,
+  dataEntityId: string,
+  appId?: string,
+): Promise<IAppDELogic | undefined> {
+  const appDataEntity = await ibiz.hub.getAppDataEntity(dataEntityId, appId);
+  return findDELogic(deDELogicId, appDataEntity);
+}
+
 /**
  * 执行实体处理逻辑
  *
@@ -34,6 +52,36 @@ export async function execDELogic(
   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: string,
+  dataEntityId: string,
+  context: IParams,
+  data: IData,
+  params: IParams,
+): Promise<unknown> {
+  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/src/engine/md-view.engine.ts

@@ -9,6 +9,7 @@ import {
   ISearchFormController,
   MDCtrlRemoveParams,
   ISearchBarController,
+  MDCtrlLoadParams,
 } from '../interface';
 import { calcDeCodeNameById } from '../model';
 import { ViewEngineBase } from './view-base.engine';
@@ -168,6 +169,10 @@ export class MDViewEngine extends ViewEngineBase {
       this.copy(args);
       return null;
     }
+    if (key === 'load') {
+      this.load(args);
+      return null;
+    }
     return super.call(key, args);
   }
 
@@ -267,8 +272,8 @@ export class MDViewEngine extends ViewEngineBase {
    * @date 2023-05-22 03:17:33
    * @return {*}  {Promise<void>}
    */
-  protected async load(): Promise<void> {
-    await this.xdataControl.load({ isInitialLoad: true });
+  protected async load(args: MDCtrlLoadParams = {}): Promise<void> {
+    await this.xdataControl.load({ isInitialLoad: true, ...args });
   }
 
   /**

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/index.ts

@@ -10,6 +10,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/src/interface/controller/controller/control/i-pickup-view-panel.controller.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';
 
 /**
@@ -16,6 +17,15 @@ export interface IPickupViewPanelController
     IPickupViewPanelState,
     IPickupViewPanelEvent
   > {
+  /**
+   * 选择视图嵌入视图控制器
+   *
+   * @author zk
+   * @date 2023-08-04 08:08:43
+   * @type {IViewController}
+   * @memberof IPickupViewPanelController
+   */
+  embedView: IViewController;
   /**
    * 获取选中数据
    *

package/src/interface/controller/controller/control/i-tree-exp-bar.controller.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';
 
 /**
  * 树导航栏控制器
@@ -15,4 +16,15 @@ export interface ITreeExpBarController
     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;
+}

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

@@ -38,4 +38,20 @@ export interface IPickupViewPanelEvent extends IControlEvent {
     event: EventBase;
     emitArgs: { data: IData[] };
   };
+
+  /**
+   * 选择视图初始化
+   *
+   * @author zk
+   * @date 2023-08-04 05:08:37
+   * @type {{
+   *     event: EventBase;
+   *     emitArgs: { data: IViewController };
+   *   }}
+   * @memberof IPickupViewPanelEvent
+   */
+  onPickUpViewMounted: {
+    event: EventBase;
+    emitArgs: undefined;
+  };
 }

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';

package/src/logic-scheduler/executor/app-ui-logic-executor.ts

@@ -1,12 +1,17 @@
-import { RuntimeError, RuntimeModelError } from '@ibiz-template/core';
+import {
+  ModelError,
+  RuntimeError,
+  RuntimeModelError,
+} from '@ibiz-template/core';
 import {
   IAppUIOpenDataLogic,
   INavigateParam,
   IAppUINewDataLogic,
+  IAppUILogicRefViewBase,
 } from '@ibiz/model-core';
 import { notNilEmpty } from 'qx-util';
 import { OpenAppViewCommand } from '../../command';
-import { IUILogicParams } from '../../interface';
+import { IModalData, IUILogicParams } from '../../interface';
 import { convertNavData } from '../../utils';
 import { LogicExecutor } from './logic-executor';
 
@@ -55,7 +60,8 @@ export class AppUILogicExecutor extends LogicExecutor {
     appUILogic: IAppUIOpenDataLogic,
     parameters: IUILogicParams,
   ): Promise<void> {
-    const { context, params, data, ...rest } = parameters;
+    const { context, params, ...rest } = parameters;
+    const { data } = parameters;
     if (!data?.[0]) {
       throw new RuntimeError('opendata没有可操作数据！');
     }
@@ -116,21 +122,33 @@ export class AppUILogicExecutor extends LogicExecutor {
     appUILogic: IAppUINewDataLogic,
     parameters: IUILogicParams,
   ): Promise<void> {
-    const { context, params, data, ...rest } = parameters;
-    // 准备需要的模型
-    const newViewRef = appUILogic.newDataAppView;
-    if (!newViewRef) {
-      throw new RuntimeModelError(
-        appUILogic,
-        'newdata视图逻辑没有配置默认新建数据视图',
-      );
-    }
-    const newView = newViewRef.refAppViewId;
-    if (!newView) {
-      throw new RuntimeModelError(
-        appUILogic,
-        'newdata视图逻辑的默认新建数据视图没有实际引用视图',
-      );
+    const { context, params, ...rest } = parameters;
+    const { data } = parameters;
+    const { enableWizardAdd, enableBatchAdd, batchAddOnly, newDataAppView } =
+      appUILogic;
+
+    let newViewRef: IAppUILogicRefViewBase | undefined;
+    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暂未支持');
+    } else {
+      // 准备需要的模型
+      newViewRef = newDataAppView;
+      if (!newViewRef || !newViewRef.refAppViewId) {
+        throw new RuntimeModelError(
+          appUILogic,
+          'newdata视图逻辑没有配置默认新建数据视图',
+        );
+      }
     }
 
     // 处理导航参数
@@ -154,21 +172,63 @@ export class AppUILogicExecutor extends LogicExecutor {
       _data.srfkey = undefined;
       tempParams = Object.assign(tempParams, _data.$origin);
     }
-    if (appUILogic.enableWizardAdd) {
-      // todo 向导添加
-    } else if (appUILogic.enableBatchAdd) {
-      // todo 批添加
-    } else if (appUILogic.batchAddOnly) {
-      // todo 只支持批添加
-    }
 
     // 打开视图
     await ibiz.commands.execute(
       OpenAppViewCommand.TAG,
-      newView,
+      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>)}
+   */
+  protected async getWizardNewViewRef(
+    appUILogic: IAppUINewDataLogic,
+    parameters: IUILogicParams,
+  ): Promise<IAppUILogicRefViewBase | undefined> {
+    const { wizardAppView, newDataAppViews } = appUILogic;
+    const { context, params, ...rest } = parameters;
+    // 索引实体的向导添加
+    if (!wizardAppView || !wizardAppView.refAppViewId) {
+      throw new RuntimeModelError(appUILogic, '缺少默认索引实体选择视图');
+    }
+
+    // 打开视图
+    const result = await ibiz.commands.execute<IModalData>(
+      OpenAppViewCommand.TAG,
+      wizardAppView.refAppViewId,
+      context,
+      params,
+      { ...rest, openMode: 'POPUPMODAL' },
+    );
+
+    if (!result.ok) {
+      // 取消
+      return;
+    }
+    const selectData = result.data?.[0];
+    if (!selectData) {
+      throw new RuntimeError('请选中一条数据');
+    }
+    const indexType = selectData.srfkey;
+    const findView = newDataAppViews?.find(item => item.refMode === indexType);
+    if (!findView) {
+      throw new RuntimeError(
+        `没有找到与索引类型${indexType}相关的实体的编辑视图`,
+      );
+    }
+    return findView;
+  }
 }

package/src/service/service/entity/method/fetch.ts

@@ -1,6 +1,11 @@
-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 { IAppDEDataSet } from '@ibiz/model-core';
 import { PSDEDQCondEngine, SearchFilter } from '../../../utils';
 import { Method } from './method';
 import { IDataEntity } from '../../../../interface';
@@ -16,20 +21,43 @@ import { execFieldLogics } from '../../../../de-logic';
  * @extends {Method}
  */
 export class FetchMethod extends Method {
+  declare method: IAppDEDataSet;
+
   async exec(
     context: IParams,
     data: IData,
     params: IParams,
   ): Promise<HttpResponse<IDataEntity[]>> {
     if (this.isLocalMode) {
+      // 临时数据
       const items = await this.searchLocal(
         null,
         new SearchFilter(context, data),
       );
       return new HttpResponse<IDataEntity[]>(items, 200);
     }
-    const path = this.calcPath(context);
-    const res = await this.request(path, context, data, params);
+
+    // 根据数据集合来源查询数据
+    let res: HttpResponse<IData[]>;
+    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: IData[] = res.data || [];
     res.data = items.map(item => this.createEntity(item));
 
@@ -41,8 +69,7 @@ export class FetchMethod extends Method {
         ),
       );
     }
-
-    return res;
+    return res as HttpResponse<IDataEntity[]>;
   }
 
   /**
@@ -174,4 +201,34 @@ 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[]>>}
+   */
+  protected async fetchCodeListSet(
+    context: IParams,
+    params: IParams,
+  ): Promise<HttpResponse<IData[]>> {
+    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);
+  }
 }