@ibiz-template/runtime 0.1.12-dev.0 → 0.1.12

package/src/interface/controller/event/control/i-edit-form.event.ts

@@ -11,11 +11,11 @@ import { IFormEvent } from './i-form.event';
  */
 export interface IEditFormEvent extends IFormEvent {
   /**
-   * 加载草稿成功后
+   * 加载之前
    *
    * @author lxm
    */
-  onLoadDraftSuccess: {
+  onBeforeLoad: {
     event: EventBase;
     emitArgs: undefined;
   };
@@ -30,6 +30,26 @@ export interface IEditFormEvent extends IFormEvent {
     emitArgs: undefined;
   };
 
+  /**
+   * 加载失败
+   *
+   * @author lxm
+   */
+  onLoadError: {
+    event: EventBase;
+    emitArgs: undefined;
+  };
+
+  /**
+   * 保存之前
+   *
+   * @author lxm
+   */
+  onBeforeSave: {
+    event: EventBase;
+    emitArgs: undefined;
+  };
+
   /**
    * 保存成功后
    *
@@ -41,7 +61,27 @@ export interface IEditFormEvent extends IFormEvent {
   };
 
   /**
-   * 删除之后事件
+   * 保存失败
+   *
+   * @author lxm
+   */
+  onSaveError: {
+    event: EventBase;
+    emitArgs: undefined;
+  };
+
+  /**
+   * 删除之前
+   *
+   * @author lxm
+   */
+  onBeforeRemove: {
+    event: EventBase;
+    emitArgs: undefined;
+  };
+
+  /**
+   * 删除成功之后
    *
    * @author lxm
    */
@@ -49,4 +89,14 @@ export interface IEditFormEvent extends IFormEvent {
     event: EventBase;
     emitArgs: undefined;
   };
+
+  /**
+   * 删除失败
+   *
+   * @author lxm
+   */
+  onRemoveError: {
+    event: EventBase;
+    emitArgs: undefined;
+  };
 }

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

@@ -21,4 +21,34 @@ export interface IFormEvent extends IControlEvent {
     event: EventBase;
     emitArgs: undefined;
   };
+
+  /**
+   * 加载草稿之前
+   *
+   * @author lxm
+   */
+  onBeforeLoadDraft: {
+    event: EventBase;
+    emitArgs: Partial<EventBase>;
+  };
+
+  /**
+   * 加载草稿成功后
+   *
+   * @author lxm
+   */
+  onLoadDraftSuccess: {
+    event: EventBase;
+    emitArgs: undefined;
+  };
+
+  /**
+   * 加载草稿失败
+   *
+   * @author lxm
+   */
+  onLoadDraftError: {
+    event: EventBase;
+    emitArgs: undefined;
+  };
 }

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