@ibiz-template/runtime 0.1.11 → 0.1.12

package/src/interface/controller/event/control/i-md-control.event.ts

@@ -11,17 +11,6 @@ import { IControlEvent } from './i-control.event';
  * @interface IMDControlEvent
  */
 export interface IMDControlEvent extends IControlEvent {
-  /**
-   * 加载前事件，返回值是视图参数
-   *
-   * @author lxm
-   * @date 2022-08-30 16:08:18
-   */
-  onBeforeLoad: {
-    event: EventBase;
-    emitArgs: undefined;
-  };
-
   /**
    * 数据激活事件
    *
@@ -45,10 +34,19 @@ export interface IMDControlEvent extends IControlEvent {
   };
 
   /**
-   * 保存后处理事件
+   * 保存之前
+   *
+   * @author lxm
+   */
+  onBeforeSave: {
+    event: EventBase;
+    emitArgs: undefined;
+  };
+
+  /**
+   * 保存成功后
    *
    * @author lxm
-   * @date 2022-11-15 16:11:22
    */
   onSaveSuccess: {
     event: EventBase;
@@ -56,16 +54,56 @@ export interface IMDControlEvent extends IControlEvent {
   };
 
   /**
-   * 删除后处理事件
+   * 保存失败
+   *
+   * @author lxm
+   */
+  onSaveError: {
+    event: EventBase;
+    emitArgs: undefined;
+  };
+
+  /**
+   * 删除之前
+   *
+   * @author lxm
+   */
+  onBeforeRemove: {
+    event: EventBase;
+    emitArgs: undefined;
+  };
+
+  /**
+   * 删除成功之后
    *
    * @author lxm
-   * @date 2022-11-15 18:11:14
    */
   onRemoveSuccess: {
     event: EventBase;
     emitArgs: undefined;
   };
 
+  /**
+   * 删除失败
+   *
+   * @author lxm
+   */
+  onRemoveError: {
+    event: EventBase;
+    emitArgs: undefined;
+  };
+
+  /**
+   * 加载前事件
+   *
+   * @author lxm
+   * @date 2022-08-30 16:08:18
+   */
+  onBeforeLoad: {
+    event: EventBase;
+    emitArgs: undefined;
+  };
+
   /**
    * 加载后处理事件
    *
@@ -76,4 +114,14 @@ export interface IMDControlEvent extends IControlEvent {
     event: LoadEvent;
     emitArgs: PartialWithObject<LoadEvent, EventBase>;
   };
+
+  /**
+   * 加载失败
+   *
+   * @author lxm
+   */
+  onLoadError: {
+    event: EventBase;
+    emitArgs: undefined;
+  };
 }

package/src/interface/controller/state/control/i-exp-bar-control.state.ts

@@ -17,4 +17,12 @@ export interface IExpBarControlState extends IControlState {
    * @type {string}
    */
   query: string;
+
+  /**
+   * 占位符
+   *
+   * @type {string}
+   * @memberof IExpBarControlState
+   */
+  placeHolder: string;
 }

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

@@ -8,4 +8,12 @@ export interface ISearchBarState extends IControlState {
    * @Date: 2023-06-01 17:51:04
    */
   query: string;
+
+  /**
+   * 是否显示
+   * @author lxm
+   * @date 2023-08-25 05:32:59
+   * @type {boolean}
+   */
+  visible: boolean;
 }

package/src/interface/provider/i-app-counter.provider.ts

@@ -0,0 +1,22 @@
+import { IAppCounter } from '@ibiz/model-core';
+import { AppCounter } from '../../service';
+
+/**
+ * 计数器适配器的接口
+ *
+ * @author lxm
+ * @date 2022-10-25 13:10:45
+ * @export
+ * @interface IAppCounterProvider
+ */
+export interface IAppCounterProvider {
+  /**
+   * 创建新的计数器实例
+   *
+   * @author lxm
+   * @date 2023-08-24 12:04:25
+   * @param {IAppCounter} model
+   * @return {*}  {Promise<AppCounter>}
+   */
+  createCounter(model: IAppCounter): AppCounter;
+}

package/src/interface/provider/index.ts

@@ -8,3 +8,4 @@ export * from './i-panel-item.provider';
 export * from './i-form-detail.provider';
 export * from './i-editor.provider';
 export * from './i-portlet.provider';
+export { IAppCounterProvider } from './i-app-counter.provider';

package/src/interface/util/i-export-excel/i-export-excel.ts

@@ -0,0 +1,20 @@
+/**
+ * 导出excel文件工具
+ * @author lxm
+ * @date 2023-08-24 10:45:32
+ * @export
+ * @interface IExportExcelUtil
+ */
+export interface IExportExcelUtil {
+  /**
+   * 导出成Excel文件
+   * @author lxm
+   * @date 2023-08-24 10:45:01
+   */
+  exportJsonToExcel(args: {
+    header: string[];
+    data: IData[];
+    filename: string;
+    autoWidth: boolean;
+  }): void;
+}

package/src/interface/util/index.ts

@@ -12,3 +12,4 @@ export { IOverlayController } from './i-overlay-controller/i-overlay-controller'
 export { IOverlayPopoverContainer } from './i-overlay-popover-container/i-overlay-popover-container';
 
 export { IScriptFunctionOpts } from './script/i-script-function';
+export { IExportExcelUtil } from './i-export-excel/i-export-excel';

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

@@ -59,7 +59,7 @@ export class AppUILogicExecutor extends LogicExecutor {
   async executeOpenDataAppUILogic(
     appUILogic: IAppUIOpenDataLogic,
     parameters: IUILogicParams,
-  ): Promise<void> {
+  ): Promise<IModalData> {
     const { context, params, ...rest } = parameters;
     const { data } = parameters;
     if (!data?.[0]) {
@@ -97,7 +97,7 @@ export class AppUILogicExecutor extends LogicExecutor {
     }
 
     // 打开视图
-    await ibiz.commands.execute(
+    return ibiz.commands.execute(
       OpenAppViewCommand.TAG,
       openView,
       tempContext,
@@ -121,7 +121,7 @@ export class AppUILogicExecutor extends LogicExecutor {
   async executeNewDataAppUILogic(
     appUILogic: IAppUINewDataLogic,
     parameters: IUILogicParams,
-  ): Promise<void> {
+  ): Promise<IModalData> {
     const { context, params, ...rest } = parameters;
     const { data } = parameters;
     const { enableWizardAdd, enableBatchAdd, batchAddOnly, newDataAppView } =
@@ -132,7 +132,7 @@ export class AppUILogicExecutor extends LogicExecutor {
       newViewRef = await this.getWizardNewViewRef(appUILogic, parameters);
       if (!newViewRef) {
         // 选择视图取消操作直接返回
-        return;
+        return { ok: false };
       }
     } else if (enableBatchAdd) {
       // todo 批添加
@@ -174,7 +174,7 @@ export class AppUILogicExecutor extends LogicExecutor {
     }
 
     // 打开视图
-    await ibiz.commands.execute(
+    return ibiz.commands.execute(
       OpenAppViewCommand.TAG,
       newViewRef.refAppViewId,
       tempContext,

package/src/register/helper/app-counter-register.ts

@@ -0,0 +1,75 @@
+import { RuntimeError } from '@ibiz-template/core';
+import { IAppCounter } from '@ibiz/model-core';
+import { IAppCounterProvider } from '../../interface';
+import { getPluginRegisterKey } from './common-register';
+
+/** 系统计数器适配器前缀 */
+export const APP_COUNTER_PROVIDER_PREFIX = 'APPCOUNTER';
+
+/**
+ * 注册系统计数器适配器
+ * @author lxm
+ * @date 2023-05-06 09:14:16
+ * @export
+ * @param {string} key
+ * @param {() => IAppCounterProvider} callback 生成系统计数器适配器的回调
+ */
+export function registerAppCounterProvider(
+  key: string,
+  callback: () => IAppCounterProvider,
+): void {
+  ibiz.register.register(`${APP_COUNTER_PROVIDER_PREFIX}_${key}`, callback);
+}
+
+function getProvider(key: string): IAppCounterProvider | undefined {
+  return ibiz.register.get(
+    `${APP_COUNTER_PROVIDER_PREFIX}_${key}`,
+  ) as IAppCounterProvider;
+}
+
+/**
+ * 获取系统计数器适配器
+ * @author lxm
+ * @date 2023-05-06 09:29:23
+ * @export
+ * @param {IAppView} model
+ * @return {*}  {Promise<IAppCounterProvider>}
+ */
+export async function getAppCounterProvider(
+  model: IAppCounter,
+): Promise<IAppCounterProvider> {
+  let provider: IAppCounterProvider | undefined;
+  const { codeName, counterType, sysPFPluginId, appId } =
+    model as Required<IAppCounter>;
+
+  // 找插件适配器
+  if (sysPFPluginId) {
+    const pluginKey = await getPluginRegisterKey(sysPFPluginId, appId);
+    if (pluginKey) {
+      provider = getProvider(pluginKey);
+    }
+    if (!provider) {
+      ibiz.log.error(`找不到系统计数器插件${pluginKey}对应的适配器`);
+    } else {
+      return provider;
+    }
+  }
+
+  // 自定义的直接通过代码标识去找
+  if (counterType === 'CUSTOM') {
+    provider = getProvider(codeName);
+    if (!provider) {
+      throw new RuntimeError(`找不到自定义系统计数器${codeName}对应的适配器`);
+    } else {
+      return provider;
+    }
+  }
+
+  // 找系统计数器类型
+  provider = getProvider(counterType);
+  if (!provider) {
+    throw new RuntimeError(`找不系统计数器类型${counterType}对应的适配器`);
+  } else {
+    return provider;
+  }
+}

package/src/register/helper/index.ts

@@ -6,3 +6,4 @@ export * from './panel-item-register';
 export * from './ui-action-register';
 export * from './view-register';
 export * from './portlet-register';
+export * from './app-counter-register';

package/src/service/service/code-list/code-list.service.ts

@@ -101,10 +101,7 @@ export class CodeListService {
       // todo代码项其他属性，表单数据
       let text = codeItem.text!;
       if (codeItem.textLanguageRes) {
-        text = ibiz.i18n.t(
-          codeItem.textLanguageRes.lanResTag!,
-          codeItem.textLanguageRes.defaultContent,
-        );
+        text = ibiz.i18n.t(codeItem.textLanguageRes.lanResTag!, codeItem.text);
       }
       const _codeItem: CodeListItem = {
         text,

package/src/service/service/counter/counter.service.ts

@@ -1,6 +1,7 @@
 /* eslint-disable @typescript-eslint/no-unused-vars */
-import { ModelError, RuntimeModelError } from '@ibiz-template/core';
+import { RuntimeModelError } from '@ibiz-template/core';
 import { IAppCounter, IAppCounterRef } from '@ibiz/model-core';
+import { getAppCounterProvider } from '../../../register';
 import { AppCounter } from '../../utils';
 
 /**
@@ -44,7 +45,8 @@ export class CounterService {
       }
       this.counterMap.delete(id);
     }
-    const counter = new AppCounter(model);
+    const provider = await getAppCounterProvider(model);
+    const counter = provider.createCounter(model);
     await counter.init(context, params);
     this.counterMap.set(id, counter);
     return counter;
@@ -70,9 +72,6 @@ export class CounterService {
     if (!appCounter) {
       throw new RuntimeModelError(model, `未配置应用计数器!`);
     }
-    if (appCounter.counterType === 'CUSTOM') {
-      throw new ModelError(appCounter, `未支持自定义计数器`);
-    }
     return this.getCounter(appCounter, context, params);
   }
 }

package/src/service/utils/app-counter/app-counter.ts

@@ -1,11 +1,11 @@
-import { IBizContext, RuntimeModelError } from '@ibiz-template/core';
+import { IBizContext, RuntimeError } from '@ibiz-template/core';
 import { IAppCounter } from '@ibiz/model-core';
 import { notNilEmpty, QXEvent } from 'qx-util';
 import { clone } from 'ramda';
 import { Application } from '../../../application';
 
 /**
- * 应用实体计数器
+ * 应用计数器基类
  *
  * @author chitanda
  * @date 2022-10-26 18:10:51
@@ -15,10 +15,6 @@ import { Application } from '../../../application';
 export class AppCounter {
   protected app!: Application;
 
-  protected appDataEntityId!: string;
-
-  protected action!: string;
-
   protected intervalTimer: unknown;
 
   protected destroyed: boolean = false;
@@ -70,12 +66,6 @@ export class AppCounter {
    */
   async init(context?: IParams, params?: IParams): Promise<void> {
     this.setParams(context, params);
-    this.appDataEntityId = this.model.appDataEntityId!;
-    const action = this.model.getAppDEActionId;
-    if (!action) {
-      throw new RuntimeModelError(this.model, `未找到获取计数器行为!`);
-    }
-    this.action = action;
     this.interval();
     await this.load();
   }
@@ -138,18 +128,7 @@ export class AppCounter {
    * @return {*}  {Promise<IData>}
    */
   protected async load(): Promise<IData> {
-    const app = ibiz.hub.getApp(this.context.srfappid);
-    const res = await app.deService.exec(
-      this.appDataEntityId!,
-      this.action,
-      this.context,
-      this.params,
-    );
-    if (res.ok) {
-      this.data = res.data;
-      this.evt.emit('change', this.data);
-    }
-    return this.data;
+    throw new RuntimeError('未实现计数器加载方法');
   }
 
   /**

package/src/service/utils/app-counter/app-de-counter.provider.ts

@@ -0,0 +1,18 @@
+import { IAppCounter } from '@ibiz/model-core';
+import { IAppCounterProvider } from '../../../interface';
+import { AppCounter } from './app-counter';
+import { AppDECounter } from './app-de-counter';
+
+/**
+ * 应用实体计数器
+ * @author lxm
+ * @date 2023-08-24 12:08:24
+ * @export
+ * @class AppDECounterProvider
+ * @implements {IAppCounterProvider}
+ */
+export class AppDECounterProvider implements IAppCounterProvider {
+  createCounter(model: IAppCounter): AppCounter {
+    return new AppDECounter(model);
+  }
+}

package/src/service/utils/app-counter/app-de-counter.ts

@@ -0,0 +1,60 @@
+import { RuntimeModelError } from '@ibiz-template/core';
+import { Application } from '../../../application';
+import { AppCounter } from './app-counter';
+
+/**
+ * 应用实体计数器
+ *
+ * @author chitanda
+ * @date 2022-10-26 18:10:51
+ * @export
+ * @class AppCounter
+ */
+export class AppDECounter extends AppCounter {
+  protected app!: Application;
+
+  protected appDataEntityId!: string;
+
+  protected action!: string;
+
+  /**
+   * 计数器初始化
+   *
+   * @author chitanda
+   * @date 2022-10-26 19:10:24
+   * @param {IParams} [context]
+   * @param {IParams} [params]
+   */
+  async init(context?: IParams, params?: IParams): Promise<void> {
+    this.appDataEntityId = this.model.appDataEntityId!;
+    const action = this.model.getAppDEActionId;
+    if (!action) {
+      throw new RuntimeModelError(this.model, `未找到获取计数器行为!`);
+    }
+    this.action = action;
+    await super.init(context, params);
+  }
+
+  /**
+   * 加载计数器
+   *
+   * @author chitanda
+   * @date 2022-10-26 19:10:38
+   * @protected
+   * @return {*}  {Promise<IData>}
+   */
+  protected async load(): Promise<IData> {
+    const app = ibiz.hub.getApp(this.context.srfappid);
+    const res = await app.deService.exec(
+      this.appDataEntityId!,
+      this.action,
+      this.context,
+      this.params,
+    );
+    if (res.ok) {
+      this.data = res.data;
+      this.evt.emit('change', this.data);
+    }
+    return this.data;
+  }
+}

package/src/service/utils/app-counter/index.ts

@@ -0,0 +1,18 @@
+import { registerAppCounterProvider } from '../../../register';
+import { AppCounter } from './app-counter';
+import { AppDECounter } from './app-de-counter';
+import { AppDECounterProvider } from './app-de-counter.provider';
+
+/**
+ * 预置默认的应用计数器适配器
+ *
+ * @author lxm
+ * @date 2022-09-19 22:09:50
+ * @export
+ */
+export function presetAppCounterProvider(): void {
+  // 应用实体计数器
+  registerAppCounterProvider('DEDR', () => new AppDECounterProvider());
+}
+
+export { AppCounter, AppDECounter, AppDECounterProvider };

package/src/service/utils/dynamic-code-list/dynamic-code-list.ts

@@ -161,7 +161,7 @@ export class DynamicCodeListCache {
     if (this.isPredefined) {
       // 特殊处理，避免预置代码表加载不全
       if (!params.size) {
-        params.size = 10000;
+        params = { ...params, size: 10000 };
       }
       const res = await app.net.get(
         `/dictionaries/codelist/${this.codeList.codeName}`,

package/src/service/utils/index.ts

@@ -1,5 +1,5 @@
-export { AppCounter } from './app-counter/app-counter';
 export * from './de-dq-cond';
+export * from './app-counter';
 export { DEDQCondUtil } from './de-dq-cond-util/de-dq-cond-util';
 export { DynamicCodeListCache } from './dynamic-code-list/dynamic-code-list';
 export { DECache } from './de-cache/de-cache';

package/src/ui-action/uiaction-util.ts

@@ -49,7 +49,7 @@ export class UIActionUtil {
   ): Promise<void> {
     const result = await this.exec(actionId, params);
     if (result.closeView) {
-      params.view.closeView();
+      params.view.closeView({ ok: true });
     } else if (result.refresh) {
       switch (result.refreshMode) {
         case 1:

package/src/utils/index.ts

@@ -10,3 +10,4 @@ export * from './wf-helper/wf-helper';
 export * from './modal/modal';
 export * from './value-rule/value-rule';
 export * from './script/index';
+export { TextUtil } from './text-util/text-util';

package/src/utils/script/script-function.ts

@@ -142,6 +142,9 @@ export class ScriptFunction {
           openView: ibiz.openView,
         };
         break;
+      case 'viewParam': // 视图参数
+        param.viewParam = param.params;
+        break;
       case 'env': // 全局环境变量
         param.env = ibiz.env;
         break;

package/src/utils/text-util/text-util.ts

@@ -0,0 +1,22 @@
+/**
+ * 文本工具类
+ *
+ * @author zhanghengfeng
+ * @date 2023-08-24 14:08:27
+ * @export
+ * @class TextUtil
+ */
+export class TextUtil {
+  /**
+   * 值格式化
+   *
+   * @author zhanghengfeng
+   * @date 2023-08-24 14:08:27
+   * @param {string} value
+   * @param {string} _code
+   * @return {*}  {string}
+   */
+  format(value: string, _code: string): string {
+    return value;
+  }
+}