@ibiz-template/runtime 0.3.1 → 0.3.3

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

@@ -187,6 +187,14 @@ export class MDViewEngine extends ViewEngineBase {
       await this.exportData(args);
       return null;
     }
+    if (key === SysUIActionTag.SEARCH) {
+      await this.searchForm.search();
+      return null;
+    }
+    if (key === SysUIActionTag.RESET) {
+      await this.searchForm.reset();
+      return null;
+    }
     if (key === SysUIActionTag.COPY) {
       this.copy(args);
       return null;

package/src/interface/common/i-app-hub-service/i-app-hub-service.ts

@@ -1,10 +1,10 @@
 import { IAppDataEntity, IAppView, IApplication } from '@ibiz/model-core';
-import { Application } from '../../../application';
 import { Convert } from '../../../hub';
 import { ModelLoaderProvider } from '../../provider';
 import { IAppConfigService } from '../i-app-config-service/i-app-config-service';
 import { IHubController } from '../../controller';
 import { IConfigService } from '../../service';
+import { IAppService } from '../i-app-service/i-app-service';
 
 /**
  * 应用 hub 服务
@@ -152,9 +152,9 @@ export interface IAppHubService {
    * @author chitanda
    * @date 2023-04-23 15:04:46
    * @param {string} [appId=ibiz.env.appId]
-   * @return {*}  {Promise<Application>}
+   * @return {*}  {Promise<IAppService>}
    */
-  getAppAsync(appId?: string): Promise<Application>;
+  getAppAsync(appId?: string): Promise<IAppService>;
 
   /**
    * 获取应用实例
@@ -162,7 +162,7 @@ export interface IAppHubService {
    * @author chitanda
    * @date 2023-04-23 15:04:24
    * @param {(string | IApplication)} [app]
-   * @return {*}  {Application}
+   * @return {*}  {IAppService}
    */
-  getApp(app?: string | IApplication): Application;
+  getApp(app?: string | IApplication): IAppService;
 }

package/src/interface/common/i-app-service/i-app-service.ts

@@ -1,4 +1,11 @@
 import { Net } from '@ibiz-template/core';
+import {
+  IAppDEUIAction,
+  IAppFunc,
+  IApplication,
+  IDEOPPriv,
+  IDEUILogic,
+} from '@ibiz/model-core';
 import {
   AuthorityService,
   CodeListService,
@@ -24,6 +31,15 @@ export interface IAppService {
    */
   readonly appId: string;
 
+  /**
+   * 应用模型
+   *
+   * @author chitanda
+   * @date 2023-11-21 15:11:33
+   * @type {IApplication}
+   */
+  readonly model: IApplication;
+
   /**
    * 请求服务
    *
@@ -68,4 +84,59 @@ export interface IAppService {
    * @type {AuthorityService}
    */
   readonly authority: AuthorityService;
+
+  /**
+   * 应用实体名称到应用实体代码名称的映射
+   *
+   * @author chitanda
+   * @date 2023-11-21 15:11:18
+   * @type {Map<string, string>}
+   */
+  readonly deName2DeCodeName: Map<string, string>;
+
+  /**
+   * 根据 id 查找应用功能
+   *
+   * @author chitanda
+   * @date 2023-04-20 17:04:24
+   * @param {string} id
+   * @return {*}  {(IAppFunc | null)}
+   */
+  getAppFunc(id: string): IAppFunc | null;
+
+  /**
+   * 获取界面行为模型
+   * @author lxm
+   * @date 2023-04-28 05:44:14
+   * @param {string} actionId
+   * @param {string} [_appDataEntityId]
+   * @return {*}
+   */
+  getUIAction(actionId: string): Promise<IAppDEUIAction | undefined>;
+
+  /**
+   * 获取操作标识模型
+   * @author lxm
+   * @date 2023-05-10 11:24:17
+   * @param {string} id
+   * @param {string} [appDataEntityId]
+   * @return {*}  {(Promise<IDEOPPriv | undefined>)}
+   */
+  getOPPriv(
+    id: string,
+    appDataEntityId?: string,
+  ): Promise<IDEOPPriv | undefined>;
+
+  /**
+   * 查找实体的界面逻辑模型
+   * @author lxm
+   * @date 2023-06-14 07:20:30
+   * @param {string} deUILogicId
+   * @param {string} appDataEntityId
+   * @return {*}  {(Promise<IDEUILogic | undefined>)}
+   */
+  getDEUILogic(
+    deUILogicId: string,
+    appDataEntityId: string,
+  ): Promise<IDEUILogic | undefined>;
 }

package/src/interface/common/i-global-config/i-global-grid-config.ts

@@ -34,4 +34,14 @@ export interface IGlobalGridConfig {
    * @memberof IGlobalConfig
    */
   editSaveMode: 'cell-blur' | 'auto' | 'manual';
+
+  /**
+   * 单元格超出呈现模式
+   * - wrap 换行，高度自动增高
+   * - ellipsis 省略，出...，悬浮出tooltip
+   * @author lxm
+   * @date 2023-11-17 11:17:39
+   * @type {('wrap' | 'ellipsis')}
+   */
+  overflowMode: 'wrap' | 'ellipsis';
 }

package/src/interface/controller/controller/control/i-grid.controller.ts

@@ -1,8 +1,9 @@
-import { IDEGrid } from '@ibiz/model-core';
+import { IDEGrid, IAppCodeList, IDEDataExportItem } from '@ibiz/model-core';
 import { ControlVO } from '../../../../service';
 import { IGridEvent } from '../../event';
 import { IGridRowState, IGridState } from '../../state';
 import { IMDControlController } from './i-md-control.controller';
+import { CodeListItem } from '../../../service';
 
 /**
  * 表格控制器
@@ -67,3 +68,31 @@ export interface IGridController
    */
   validate(row: IGridRowState): Promise<boolean>;
 }
+
+interface AdditionalProperties {
+  /**
+   * 代码表模型
+   * @return {*}
+   * @author: zhujiamin
+   * @Date: 2023-11-21 14:13:45
+   */
+  codeList?: IAppCodeList;
+
+  /**
+   * 代码表项
+   * @return {*}
+   * @author: zhujiamin
+   * @Date: 2023-11-21 14:13:45
+   */
+  codeListItems?: readonly CodeListItem[];
+}
+
+/**
+ * 封装的导出列模型
+ * @return {*}
+ * @author: zhujiamin
+ * @Date: 2023-11-21 19:04:27
+ */
+export interface IExportColumn
+  extends IDEDataExportItem,
+    AdditionalProperties {}

package/src/interface/controller/controller/control/i-panel.controller.ts

@@ -3,6 +3,7 @@ import { IPanelEvent } from '../../event';
 import { IPanelState } from '../../state';
 import { IControlController } from './i-control.controller';
 import { IPanelItemController } from './panel-item';
+import { IController } from '../i.controller';
 
 /**
  * 面板控制器
@@ -34,6 +35,14 @@ export interface IPanelController<
    */
   data: IData;
 
+  /**
+   * 容器控制器（可能是视图控制器，也可能是部件控制器）
+   * @author lxm
+   * @date 2023-11-21 07:41:31
+   * @type {(IController)}
+   */
+  container?: IController;
+
   /**
    * 部件加载
    *

package/src/interface/service/service/i-app-de.service.ts

@@ -67,6 +67,102 @@ export interface IAppDEService {
     params2?: IParams,
   ): Promise<IHttpResponse>;
 
+  /**
+   * 获取草稿数据[系统预置]
+   *
+   * @author chitanda
+   * @date 2023-11-21 16:11:34
+   * @param {IParams} context
+   * @param {(IData | IData[])} [params]
+   * @param {IParams} [params2]
+   * @return {*}  {Promise<IHttpResponse>}
+   */
+  getDraft(
+    context: IParams,
+    params?: IData | IData[],
+    params2?: IParams,
+  ): Promise<IHttpResponse>;
+
+  /**
+   * 创建数据[系统预置]
+   *
+   * @author chitanda
+   * @date 2023-11-21 16:11:50
+   * @param {IParams} context
+   * @param {(IData | IData[])} [params]
+   * @param {IParams} [params2]
+   * @return {*}  {Promise<IHttpResponse>}
+   */
+  create(
+    context: IParams,
+    params?: IData | IData[],
+    params2?: IParams,
+  ): Promise<IHttpResponse>;
+
+  /**
+   * 获取数据[系统预置]
+   *
+   * @author chitanda
+   * @date 2023-11-21 16:11:00
+   * @param {IParams} context
+   * @param {(IData | IData[])} [params]
+   * @param {IParams} [params2]
+   * @return {*}  {Promise<IHttpResponse>}
+   */
+  get(
+    context: IParams,
+    params?: IData | IData[],
+    params2?: IParams,
+  ): Promise<IHttpResponse>;
+
+  /**
+   * 更新数据[系统预置]
+   *
+   * @author chitanda
+   * @date 2023-11-21 16:11:09
+   * @param {IParams} context
+   * @param {(IData | IData[])} [params]
+   * @param {IParams} [params2]
+   * @return {*}  {Promise<IHttpResponse>}
+   */
+  update(
+    context: IParams,
+    params?: IData | IData[],
+    params2?: IParams,
+  ): Promise<IHttpResponse>;
+
+  /**
+   * 删除数据[系统预置]
+   *
+   * @author chitanda
+   * @date 2023-11-21 16:11:12
+   * @param {IParams} context
+   * @param {(IData | IData[])} [params]
+   * @param {IParams} [params2]
+   * @return {*}  {Promise<IHttpResponse>}
+   */
+  remove(
+    context: IParams,
+    params?: IData | IData[],
+    params2?: IParams,
+  ): Promise<IHttpResponse>;
+
+  /**
+   * 获取默认数据集[系统预置]
+   *
+   * @author chitanda
+   * @date 2023-11-21 16:11:06
+   * @param {IParams} context
+   * @param {(IData | IData[])} [params]
+   * @param {IParams} [params2]
+   * @return {*}  {Promise<IHttpResponse>}
+   */
+  fetchDefault(
+    context: IParams,
+    params?: IData | IData[],
+    params2?: IParams,
+  ): Promise<IHttpResponse>;
+
   /**
    * 触发实体服务方法 ac 模式
    *

package/src/model/utils/util.ts

@@ -1,7 +1,7 @@
+import { RuntimeModelError } from '@ibiz-template/core';
 import {
   IAppView,
   IAppViewRef,
-  IApplication,
   IControl,
   IModelObject,
   ISysPFPlugin,
@@ -98,10 +98,10 @@ export function parseUserParams(userParams: Record<string, string>): {
         const splitArr: Array<string> = key.split('.');
         switch (splitArr[0]) {
           case 'SRFNAVPARAM':
-            Object.assign(navigateContexts, { [splitArr[1]]: param });
+            Object.assign(navigateParams, { [splitArr[1]]: param });
             break;
           case 'SRFNAVCTX':
-            Object.assign(navigateParams, { [splitArr[1]]: param });
+            Object.assign(navigateContexts, { [splitArr[1]]: param });
             break;
           default:
             Object.assign(other, { key: param });
@@ -118,14 +118,24 @@ export function parseUserParams(userParams: Record<string, string>): {
  * 从应用里面获取插件配置参数
  *
  * @author chitanda
- * @date 2023-11-01 17:11:28
+ * @date 2023-11-21 14:11:06
  * @export
- * @param {IApplication} app
- * @param {string} id
+ * @param {string} id 插件标识
+ * @param {string} [appId] 当前所在应用标识
  * @return {*}  {ISysPFPlugin}
  */
-export function getPFPlugin(app: IApplication, id: string): ISysPFPlugin {
-  const plugin = app.appPFPluginRefs?.find(item => item.id === id);
+export function getPFPlugin(id: string, appId?: string): ISysPFPlugin {
+  const app = ibiz.hub.getApp(appId);
+  if (!app) {
+    throw new RuntimeModelError(app, '未找到应用');
+  }
+  const { model } = app;
+  if (!model.appPFPluginRefs) {
+    throw new RuntimeModelError(model, '应用未配置插件');
+  }
+  const plugin = model.appPFPluginRefs.find(
+    item => item.pluginCode!.toLowerCase() === id.toLowerCase(),
+  );
   if (!plugin) {
     throw new Error(`未找到插件${id}`);
   }

package/src/service/dto/method.dto.ts

@@ -5,9 +5,9 @@ import {
   IAppDEMethodDTOField,
 } from '@ibiz/model-core';
 import { ModelError } from '@ibiz-template/core';
-import { Application } from '../../application';
 import { AppDataEntity } from '../app-data-entity/app-data-entity';
 import { findModelChild } from '../../model';
+import { IAppService } from '../../interface';
 
 interface listMap {
   [key: number]: IData;
@@ -22,7 +22,7 @@ interface listMap {
  * @class MethodDto
  */
 export class MethodDto {
-  protected app?: Application;
+  protected app?: IAppService;
 
   protected fields!: IAppDEMethodDTOField[];
 
@@ -86,7 +86,9 @@ export class MethodDto {
       const field = this.fields[i];
       const key = field.codeName!.toLowerCase();
       switch (field.type) {
-        case 'SIMPLE': {
+        case 'SIMPLE':
+        case 'SIMPLES':
+        case 'DTO': {
           break;
         }
         case 'DTOS': {

package/src/service/service/config/config.service.ts

@@ -1,5 +1,4 @@
-import { Application } from '../../../application';
-import { IConfigService } from '../../../interface';
+import { IAppService, IConfigService } from '../../../interface';
 
 /**
  * 应用配置存储服务
@@ -10,7 +9,7 @@ import { IConfigService } from '../../../interface';
  * @class ConfigService
  */
 export class ConfigService implements IConfigService {
-  private app: Application;
+  private app: IAppService;
 
   /**
    * Creates an instance of ConfigService.

package/src/service/service/control/control.service.ts

@@ -2,10 +2,10 @@ import { IHttpResponse, clone } from '@ibiz-template/core';
 import { IControl } from '@ibiz/model-core';
 import { ControlVO } from '../../vo/control.vo';
 import { UIMapField } from '../../vo/ui-map-field';
-import { Application } from '../../../application';
+import { IAppService } from '../../../interface';
 
 export class ControlService<T extends IControl = IControl> {
-  app!: Application;
+  app!: IAppService;
 
   /**
    * 部件模型

package/src/service/service/entity/de.service.ts

@@ -151,6 +151,54 @@ export class DEService implements IAppDEService {
     throw new RuntimeError(`${this.model.codeName}未支持「${id}」方法`);
   }
 
+  getDraft(
+    context: IParams,
+    params?: IData | IData[],
+    params2?: IParams,
+  ): Promise<IHttpResponse<IData>> {
+    return this.exec('GetDraft', context, params, params2);
+  }
+
+  create(
+    context: IParams,
+    params?: IData | IData[],
+    params2?: IParams,
+  ): Promise<IHttpResponse<IData>> {
+    return this.exec('Create', context, params, params2);
+  }
+
+  get(
+    context: IParams,
+    params?: IData | IData[],
+    params2?: IParams,
+  ): Promise<IHttpResponse<IData>> {
+    return this.exec('Get', context, params, params2);
+  }
+
+  update(
+    context: IParams,
+    params?: IData | IData[],
+    params2?: IParams,
+  ): Promise<IHttpResponse<IData>> {
+    return this.exec('Update', context, params, params2);
+  }
+
+  remove(
+    context: IParams,
+    params?: IData | IData[],
+    params2?: IParams,
+  ): Promise<IHttpResponse<IData>> {
+    return this.exec('Remove', context, params, params2);
+  }
+
+  fetchDefault(
+    context: IParams,
+    params?: IData | IData[],
+    params2?: IParams,
+  ): Promise<IHttpResponse<IData>> {
+    return this.exec('FetchDefault', context, params, params2);
+  }
+
   /**
    * 执行服务方法 ac 模式
    *

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

@@ -2,12 +2,11 @@
 import { HttpResponse, RuntimeModelError } from '@ibiz-template/core';
 import { IAppDataEntity, IAppDEMethod } from '@ibiz/model-core';
 import { isArray } from 'lodash-es';
-import { Application } from '../../../../application';
 import { AppDataEntity } from '../../../app-data-entity/app-data-entity';
 import { calcResPath } from '../../../utils';
 import { MethodInput } from './method-input';
 import { MethodReturn } from './method-renturn';
-import { IAppDEService, IDataEntity } from '../../../../interface';
+import { IAppDEService, IAppService, IDataEntity } from '../../../../interface';
 
 /**
  * 应用实体方法
@@ -18,7 +17,7 @@ import { IAppDEService, IDataEntity } from '../../../../interface';
  * @class Method
  */
 export abstract class Method {
-  protected app!: Application;
+  protected app!: IAppService;
 
   /**
    * 输入 DTO

package/src/service/service/work-flow/work-flow.service.ts

@@ -1,7 +1,6 @@
 import { IHttpResponse, RuntimeError } from '@ibiz-template/core';
 import { IAppDataEntity } from '@ibiz/model-core';
-import { Application } from '../../../application';
-import { IWorkFlowService } from '../../../interface';
+import { IAppService, IWorkFlowService } from '../../../interface';
 
 /**
  * 工作流服务
@@ -12,7 +11,7 @@ import { IWorkFlowService } from '../../../interface';
  * @class WorkFlowService
  */
 export class WorkFlowService implements IWorkFlowService {
-  private app!: Application;
+  private app!: IAppService;
 
   /**
    * 常规基础路径

package/src/service/vo/tree-node-data/tree-data-set-node-data.ts

@@ -26,7 +26,7 @@ export class TreeDataSetNodeData extends TreeNodeData implements ITreeNodeData {
     parentNodeData: ITreeNodeData | undefined,
     opts: {
       data: IData;
-      leaf: boolean;
+      leaf: boolean; // 是否有子节点关系
       navContext?: IParams;
       navParams?: IParams;
     },
@@ -59,6 +59,12 @@ export class TreeDataSetNodeData extends TreeNodeData implements ITreeNodeData {
 
     this.icon = this.calcIcon(model);
     this.textHtml = this.calcTextHtml(model);
+
+    // 识别叶子节点标识属性，根据后台数据赋值leaf
+    if (model.leafFlagAppDEFieldId) {
+      const value = data[model.leafFlagAppDEFieldId];
+      this.leaf = [1, '1', true, 'true'].includes(value);
+    }
   }
 
   protected calcIcon(model: IDETreeDataSetNode): IIcon | undefined {