@ibiz-template/runtime 0.3.5-alpha.0 → 0.3.6-dev.0

package/src/interface/controller/event/view/i-report-view.event.ts

@@ -0,0 +1,12 @@
+import { IViewEvent } from './i-view.event';
+
+/**
+ * 报表视图事件
+ *
+ * @author lxm
+ * @date 2022-09-13 10:09:00
+ * @export
+ * @interface IReportViewEvent
+ * @extends {IViewEvent}
+ */
+export type IReportViewEvent = IViewEvent;

package/src/interface/controller/event/view/index.ts

@@ -42,3 +42,4 @@ export * from './i-tree-grid-ex-view.event';
 export * from './i-medit-view9.event';
 export * from './i-chart-exp-view.event';
 export * from './i-map-view.event';
+export * from './i-report-view.event';

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

@@ -0,0 +1,37 @@
+import { IControlState } from './i-control.state';
+
+export interface IReportPanelState extends IControlState {
+  /**
+   * 是否加载完数据
+   *
+   * @type {boolean}
+   */
+  isLoaded: boolean;
+
+  /**
+   * 搜索部件的查询参数
+   * @type {IParams}
+   */
+  searchParams: IParams;
+
+  /**
+   * 报表数据
+   *
+   * @type {IData}
+   */
+  data: IData;
+
+  /**
+   * 是否正在处理中
+   * @type {boolean}
+   */
+  processing: boolean;
+
+  /**
+   * 报表类型
+   *
+   * @type {string}
+   * @memberof IReportPanelState
+   */
+  reportType: string;
+}

package/src/interface/controller/state/control/i-search-form.state.ts

@@ -1,3 +1,36 @@
 import { IFormState } from './i-form.state';
 
-export interface ISearchFormState extends IFormState {}
+/**
+ * 存储的过滤条件
+ * @author lxm
+ * @date 2023-11-27 03:15:22
+ * @export
+ * @interface StoredFilter
+ */
+export interface StoredFilter {
+  /**
+   * 标题
+   * @author lxm
+   * @date 2023-11-27 03:15:56
+   * @type {string}
+   */
+  name: string;
+
+  /**
+   * 搜索条件的数据
+   * @author lxm
+   * @date 2023-11-27 03:48:21
+   * @type {IData}
+   */
+  data: IData;
+}
+
+export interface ISearchFormState extends IFormState {
+  /**
+   * 存储的过滤条件集合
+   * @author lxm
+   * @date 2023-11-27 03:47:51
+   * @type {StoredFilter[]}
+   */
+  storedFilters: StoredFilter[];
+}

package/src/interface/controller/state/control/index.ts

@@ -38,3 +38,4 @@ export * from './i-tree-grid-ex.state';
 export * from './i-medit-view-panel.state';
 export * from './i-chart-exp-bar.state';
 export * from './i-map.state';
+export * from './i-report-panel.state';

package/src/interface/controller/state/view/i-report-view.state.ts

@@ -0,0 +1,10 @@
+import { IViewState } from './i-view.state';
+
+/**
+ * 报表视图UI状态
+ *
+ * @export
+ * @interface IReportViewState
+ * @extends {IViewState}
+ */
+export interface IReportViewState extends IViewState {}

package/src/interface/controller/state/view/index.ts

@@ -43,3 +43,4 @@ export * from './i-tree-grid-ex-view.state';
 export * from './i-medit-view9.state';
 export * from './i-chart-exp-view.state';
 export * from './i-map-view.state';
+export * from './i-report-view.state';

package/src/interface/provider/i-de-method.provider.ts

@@ -0,0 +1,35 @@
+import { IAppDEMethod, IAppDataEntity } from '@ibiz/model-core';
+import { Method } from '../../service';
+
+/**
+ * 额外创建参数
+ * @author lxm
+ * @date 2023-11-28 03:31:58
+ * @export
+ * @interface CreateOptions
+ */
+export interface IDEMethodCreateOptions {
+  /**
+   * 是否是ac 模式
+   * @author lxm
+   * @date 2023-11-28 03:32:07
+   * @type {boolean}
+   */
+  acMode: boolean;
+}
+
+/**
+ * 实体行为适配器的接口
+ *
+ * @author lxm
+ * @date 2022-10-25 13:10:45
+ * @export
+ * @interface IDEMethodProvider
+ */
+export interface IDEMethodProvider {
+  create(
+    entity: IAppDataEntity,
+    method: IAppDEMethod,
+    opts: IDEMethodCreateOptions,
+  ): Method;
+}

package/src/interface/provider/i-platform-provider.ts

@@ -0,0 +1,55 @@
+/**
+ * 搭载平台适配器接口
+ *
+ * @author zk
+ * @date 2023-11-20 02:11:24
+ * @export
+ * @interface IPlatformProvider
+ */
+export interface IPlatformProvider {
+  /**
+   * 登录
+   *
+   * @author zk
+   * @date 2023-11-20 03:11:10
+   * @param {string} loginName 账号!
+   * @param {string} passWord 密码!
+   * @param {string} [verificationCode] 验证码?
+   * @return {*}  {Promise<boolean>}
+   * @memberof IPlatformProvider
+   */
+  login(
+    loginName: string,
+    passWord: string,
+    verificationCode?: string,
+  ): Promise<boolean>;
+
+  /**
+   * 下载
+   *
+   * @author zk
+   * @date 2023-11-20 04:11:54
+   * @param {string} url 下载地址
+   * @param {string} name 文件名称
+   * @memberof IPlatformProvider
+   */
+  download(url: string, name: string): Promise<boolean>;
+
+  /**
+   * 初始化
+   *
+   * @author zk
+   * @date 2023-11-21 11:11:57
+   * @memberof IPlatformProvider
+   */
+  init(): Promise<void>;
+
+  /**
+   * 返回
+   *
+   * @author zk
+   * @date 2023-11-21 08:11:36
+   * @memberof IPlatformProvider
+   */
+  back(): void;
+}

package/src/interface/provider/index.ts

@@ -11,3 +11,8 @@ export type * from './i-portlet.provider';
 export type { IAppCounterProvider } from './i-app-counter.provider';
 export type { IUILogicNodeProvider } from './i-ui-login-node.provider';
 export type { IAsyncActionProvider } from './i-async-action.provider';
+export type { IPlatformProvider } from './i-platform-provider';
+export type {
+  IDEMethodProvider,
+  IDEMethodCreateOptions,
+} from './i-de-method.provider';

package/src/interface/service/service/i-auth.service.ts

@@ -16,7 +16,11 @@ export interface IAuthService {
    * @param {string} password
    * @return {*}  {Promise<boolean>}
    */
-  login(loginName: string, password: string): Promise<boolean>;
+  login(
+    loginName: string,
+    password: string,
+    rememberme?: boolean,
+  ): Promise<boolean>;
 
   /**
    * 登出

package/src/model/form/form-detail.ts

@@ -28,3 +28,15 @@ export function findChildFormDetails(parent: IDEFormDetail): IDEFormDetail[] {
   }
   return childDetails || [];
 }
+
+/**
+ * 是否是表单数据容器成员（多数据部件）
+ * @author lxm
+ * @date 2023-11-13 05:49:35
+ * @export
+ * @param {IDEFormDetail} detail
+ * @return {*}  {boolean}
+ */
+export function isFormDataContainer(detail: IDEFormDetail): boolean {
+  return detail.detailType === 'MDCTRL';
+}

package/src/model/utils/util.ts

@@ -4,6 +4,7 @@ import {
   IAppViewRef,
   IControl,
   IModelObject,
+  IPanel,
   ISysPFPlugin,
 } from '@ibiz/model-core';
 
@@ -141,3 +142,22 @@ export function getPFPlugin(id: string, appId?: string): ISysPFPlugin {
   }
   return plugin;
 }
+
+/**
+ * 获取部件布局面板
+ * @author lxm
+ * @date 2023-11-28 11:07:49
+ * @export
+ * @param {IControl} control
+ * @return {*}  {(IPanel | undefined)}
+ */
+export function getControlPanel(control: IControl): IPanel | undefined {
+  let layoutPanel: IPanel | undefined;
+  if (control.controlRenders) {
+    const panelRender = control.controlRenders.find(
+      item => item.renderType === 'LAYOUTPANEL' && !!item.layoutPanel,
+    );
+    layoutPanel = panelRender?.layoutPanel;
+  }
+  return layoutPanel;
+}

package/src/platform/index.ts

@@ -0,0 +1,2 @@
+export * from './provider';
+export * from './platform-util';

package/src/platform/platform-util.ts

@@ -0,0 +1,57 @@
+import { PlatformType } from '../constant';
+
+const ua = window.navigator.userAgent.toLowerCase();
+
+// android平台
+function isAndroid(): boolean {
+  return /Android|Adr/i.test(ua);
+}
+
+// ios平台
+function isIos(): boolean {
+  return /iPhone|iPod|iPad/i.test(ua);
+}
+// 微信生态
+function isWeChat(): boolean {
+  return /MicroMessenger/i.test(ua);
+}
+
+// 钉钉环境
+function isDingDing(): boolean {
+  return /DingTalk/i.test(ua);
+}
+// 微信小程序
+function isWxMp(): boolean {
+  return (
+    /miniProgram/i.test(ua) ||
+    (window as IData).__wxjs_environment === 'miniprogram'
+  );
+}
+
+/**
+ * 获取搭载平台名称
+ *
+ * @author zk
+ * @date 2023-11-21 02:11:28
+ * @export
+ * @return {*}  {PlatformType}
+ */
+export function getPlatformType(): PlatformType {
+  if (isAndroid()) {
+    return PlatformType.ANDROID;
+  }
+  if (isIos()) {
+    return PlatformType.IOS;
+  }
+  if (isWeChat()) {
+    return PlatformType.WECHAT;
+  }
+  if (isDingDing()) {
+    return PlatformType.DINGTALK;
+  }
+  if (isWxMp()) {
+    return PlatformType.WCMP;
+  }
+  // 默认为浏览器
+  return PlatformType.BROWSER;
+}

package/src/platform/provider/browser-platform-provider.ts

@@ -0,0 +1,12 @@
+import { PlatformProviderBase } from './platform-provider-base';
+
+/**
+ * 浏览器搭载平台适配器
+ *
+ * @author zk
+ * @date 2023-11-20 03:11:25
+ * @export
+ * @class BrowserPlatformProvider
+ * @extends {PlatformProviderBase}
+ */
+export class BrowserPlatformProvider extends PlatformProviderBase {}

package/src/platform/provider/index.ts

@@ -0,0 +1,19 @@
+import { PlatformType } from '../../constant';
+import { registerPlatformProvider } from '../../register';
+import { BrowserPlatformProvider } from './browser-platform-provider';
+import { PlatformProviderBase } from './platform-provider-base';
+
+/**
+ * 预置搭载平台适配器
+ *
+ * @author zk
+ * @date 2023-11-20 03:11:00
+ * @export
+ */
+export function install(): void {
+  // 预制浏览器搭载平台
+  const browserPlatformProvider = new BrowserPlatformProvider();
+  registerPlatformProvider(PlatformType.BROWSER, () => browserPlatformProvider);
+}
+
+export { BrowserPlatformProvider, PlatformProviderBase };

package/src/platform/provider/platform-provider-base.ts

@@ -0,0 +1,50 @@
+import { downloadFileFromBlob, RuntimeError } from '@ibiz-template/core';
+import { IPlatformProvider } from '../../interface';
+
+/**
+ * 搭载平台处理器基类
+ *
+ * @author zk
+ * @date 2023-11-20 03:11:13
+ * @export
+ * @abstract
+ * @class PlatformProviderBase
+ * @implements {IPlatformProvider}
+ */
+export abstract class PlatformProviderBase implements IPlatformProvider {
+  back(): void {
+    throw new Error('Method not implemented.');
+  }
+
+  init(): Promise<void> {
+    throw new Error('Method not implemented.');
+  }
+
+  async login(
+    loginName: string,
+    passWord: string,
+    _verificationCode?: string | undefined,
+  ): Promise<boolean> {
+    return ibiz.auth.login(loginName, passWord);
+  }
+
+  async download(url: string, name: string): Promise<boolean> {
+    // 发送get请求
+    const response = await ibiz.net.request(url, {
+      method: 'get',
+      responseType: 'blob',
+    });
+    if (response.status !== 200) {
+      throw new RuntimeError('下载文件失败');
+    }
+    // 请求成功，后台返回的是一个文件流
+    if (!response.data) {
+      throw new RuntimeError('文件流数据不存在');
+    } else {
+      // 获取文件名
+      const fileName = name;
+      downloadFileFromBlob(response.data as Blob, fileName);
+      return Promise.resolve(true);
+    }
+  }
+}

package/src/register/helper/de-method-register.ts

@@ -0,0 +1,64 @@
+import { RuntimeError } from '@ibiz-template/core';
+import { IAppDEMethod } from '@ibiz/model-core';
+import { getPluginRegisterKey } from './common-register';
+import { IDEMethodProvider } from '../../interface';
+
+/** 实体行为适配器前缀 */
+export const DEMETHOD_PROVIDER_PREFIX = 'DEMETHOD';
+
+/**
+ * 注册实体行为适配器
+ * @author lxm
+ * @date 2023-05-06 09:14:16
+ * @export
+ * @param {string} key
+ * @param {() => IDEMethodProvider} callback 生成实体行为适配器的回调
+ */
+export function registerDEMethodProvider(
+  key: string,
+  callback: () => IDEMethodProvider,
+): void {
+  ibiz.register.register(`${DEMETHOD_PROVIDER_PREFIX}_${key}`, callback);
+}
+
+function getProvider(key: string): IDEMethodProvider | undefined {
+  return ibiz.register.get(
+    `${DEMETHOD_PROVIDER_PREFIX}_${key}`,
+  ) as IDEMethodProvider;
+}
+
+/**
+ * 获取实体行为适配器
+ * @author lxm
+ * @date 2023-05-06 09:29:23
+ * @export
+ * @param {IAppView} model
+ * @return {*}  {Promise<IDEMethodProvider>}
+ */
+export async function getDEMethodProvider(
+  model: IAppDEMethod,
+): Promise<IDEMethodProvider> {
+  let provider: IDEMethodProvider | undefined;
+  const { methodType, sysPFPluginId, appId } = model as Required<IAppDEMethod>;
+
+  // 找插件适配器
+  if (sysPFPluginId) {
+    const pluginKey = await getPluginRegisterKey(sysPFPluginId, appId);
+    if (pluginKey) {
+      provider = getProvider(pluginKey);
+    }
+    if (!provider) {
+      ibiz.log.error(`找不到实体行为插件${pluginKey}对应的适配器`);
+    } else {
+      return provider;
+    }
+  }
+
+  // 找实体行为类型
+  provider = getProvider(methodType);
+  if (!provider) {
+    throw new RuntimeError(`找不实体行为方法类型为${methodType}的适配器`);
+  } else {
+    return provider;
+  }
+}

package/src/register/helper/index.ts

@@ -9,3 +9,5 @@ export * from './ui-action-register';
 export * from './ui-logic-node-register';
 export * from './view-register';
 export * from './async-action-register';
+export * from './platform-register';
+export * from './de-method-register';

package/src/register/helper/platform-register.ts

@@ -0,0 +1,56 @@
+import { IPlatformProvider } from '../../interface';
+
+import { PlatformType } from '../../constant';
+import { getPlatformType } from '../../platform';
+
+/** 搭载平台适配器前缀 */
+export const PLATFORM_PROVIDER_PREFIX = 'PLATFORM';
+
+/**
+ * 注册搭载平台适配器
+ * @author zk
+ * @date 2023-11-20 02:11:36
+ * @export
+ * @param {string} key
+ * @param {() => IPlatformProvider} callback 生成搭载平台适配器的回调
+ */
+
+export function registerPlatformProvider(
+  key: PlatformType,
+  callback: () => IPlatformProvider,
+): void {
+  ibiz.register.register(`${PLATFORM_PROVIDER_PREFIX}_${key}`, callback);
+}
+
+/**
+ * 获取适配器
+ *
+ * @author zk
+ * @date 2023-11-20 02:11:00
+ * @param {string} key
+ * @return {*}  {(IPlatformProvider | undefined)}
+ */
+function getProvider(key: PlatformType): IPlatformProvider | undefined {
+  return ibiz.register.get(
+    `${PLATFORM_PROVIDER_PREFIX}_${key}`,
+  ) as IPlatformProvider;
+}
+
+/**
+ * 获取搭载平台适配器
+ * @author zk
+ * @date 2023-11-20 02:11:38
+ * @export
+ * @param {IAppView} model
+ * @return {*}  {Promise<IPlatformProvider>}
+ */
+export function getPlatformProvider(): IPlatformProvider {
+  // 搭载平台类型
+  const platformType = getPlatformType();
+  const provider: IPlatformProvider | undefined = getProvider(platformType);
+  if (!provider) {
+    // 默认返回浏览器搭载平台适配器
+    return getProvider(PlatformType.BROWSER)!;
+  }
+  return provider;
+}

package/src/service/service/auth/v7-auth.service.ts

@@ -11,10 +11,18 @@ import { IAuthService } from '../../../interface';
  * @class AuthService
  */
 export class V7AuthService implements IAuthService {
-  async login(loginname: string, password: string): Promise<boolean> {
+  async login(
+    loginname: string,
+    password: string,
+    rememberme?: boolean,
+  ): Promise<boolean> {
     // eslint-disable-next-line no-useless-catch
     try {
-      const res = await ibiz.net.post('/v7/login', { loginname, password });
+      const res = await ibiz.net.post('/v7/login', {
+        loginname,
+        password,
+        rememberme,
+      });
       const { data } = res;
       if (data && data.token) {
         setCookie(CoreConst.TOKEN, data.token, 0, true);

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

@@ -57,7 +57,7 @@ export class ConfigService implements IConfigService {
   async load(): Promise<IData> {
     const res = await this.app.net.get(`/configs/${this.folder}/${this.tag}`);
     if (res.ok) {
-      return res.data;
+      return res.data || {};
     }
     return {};
   }

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

@@ -10,11 +10,9 @@ import { WorkFlowService } from '../work-flow/work-flow.service';
 import { Method } from './method/method';
 import { FileService } from '../file/file.service';
 import { findModelChild } from '../../../model';
-import { DEActionMethod } from './method/de-action';
-import { FetchMethod } from './method/fetch';
 import { IAppDEService } from '../../../interface';
 import { ConfigService } from '../config/config.service';
-import { AcFetchMethod } from './method/ac-fetch';
+import { getDEMethodProvider } from '../../../register/helper/de-method-register';
 
 /**
  * 实体服务
@@ -98,31 +96,22 @@ export class DEService implements IAppDEService {
    * @param {boolean} [acMode=false]
    * @return {*}  {Method}
    */
-  protected getMethod(id: string, acMode: boolean = false): Method {
+  protected async getMethod(
+    id: string,
+    acMode: boolean = false,
+  ): Promise<Method> {
     const cacheId = acMode ? `ac-${id}` : id;
     if (this.methodMap.has(cacheId)) {
       return this.methodMap.get(cacheId)!;
     }
     const model = findModelChild(this.model.appDEMethods!, id) as IAppDEMethod;
-    let method: Method | null = null;
-    switch (model.methodType) {
-      case 'DEACTION':
-        method = new DEActionMethod(this.model, model);
-        break;
-      case 'FETCH':
-      case 'FETCHTEMP':
-        if (acMode) {
-          method = new AcFetchMethod(this.model, model);
-        } else {
-          method = new FetchMethod(this.model, model);
-        }
-        break;
-      default:
-        throw new ModelError(
-          model,
-          `未支持的服务方法类型: ${model.methodType}`,
-        );
+
+    // 获取适配器
+    const provider = await getDEMethodProvider(model);
+    if (!provider) {
+      throw new ModelError(model, `未支持的服务方法类型: ${model.methodType}`);
     }
+    const method: Method = provider.create(this.model, model, { acMode });
     this.methodMap.set(cacheId, method);
     return method;
   }
@@ -138,13 +127,13 @@ export class DEService implements IAppDEService {
    * @param {IParams} [params2={}] 查询参数
    * @return {*}  {Promise<IHttpResponse>}
    */
-  exec(
+  async exec(
     id: string,
     context: IParams,
     params?: IData | IData[],
     params2?: IParams,
   ): Promise<IHttpResponse> {
-    const method = this.getMethod(id);
+    const method = await this.getMethod(id);
     if (method) {
       return method.exec(context, params, params2);
     }
@@ -210,13 +199,13 @@ export class DEService implements IAppDEService {
    * @param {IParams} [params2={}] 查询参数
    * @return {*}  {Promise<IHttpResponse>}
    */
-  execAc(
+  async execAc(
     id: string,
     context: IParams,
     params?: IData | IData[],
     params2: IParams = {},
   ): Promise<IHttpResponse> {
-    const method = this.getMethod(id, true);
+    const method = await this.getMethod(id, true);
     if (method) {
       return method.exec(context, params, params2);
     }

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

@@ -0,0 +1,7 @@
+export { presetDEMethodProvider } from './provider/index';
+export { Method } from './method';
+export { DEActionMethod } from './de-action';
+export { FetchMethod } from './fetch';
+export { AcFetchMethod } from './ac-fetch';
+export { MethodInput } from './method-input';
+export { MethodReturn } from './method-renturn';