@ibiz-template/runtime 0.2.15 → 0.2.17

package/src/controller/control/form/form-detail/form-mdctrl/form-mdctrl.controller.ts

@@ -216,4 +216,13 @@ export class FormMDCtrlController extends FormDetailController<IDEFormMDCtrl> {
       );
     }
   }
+
+  /**
+   *
+   * @author lxm
+   * @date 2023-11-13 11:21:06
+   */
+  refresh(): void {
+    this.mdCtrlContentController.refresh();
+  }
 }

package/src/controller/control/panel/panel/panel-item.controller.ts

@@ -4,12 +4,12 @@ import {
   IPanelItemController,
   IPanelController,
   IPanelDataContainerController,
+  IPanelItemState,
 } from '../../../../interface';
 import { calcLayoutHeightWidth, calcDynaClass } from '../../../../model';
 import { verifyPanelGroupLogic } from '../../../../utils';
 import { PanelNotifyState } from '../../../constant';
 import { PanelItemState } from './panel-item.state';
-import { PanelController } from './panel.controller';
 
 export class PanelItemController<T extends IPanelItem = IPanelItem>
   implements IPanelItemController
@@ -19,9 +19,9 @@ export class PanelItemController<T extends IPanelItem = IPanelItem>
    *
    * @author chitanda
    * @date 2023-01-04 09:01:04
-   * @type {PanelItemState}
+   * @type {IPanelItemState}
    */
-  state: PanelItemState;
+  state: IPanelItemState;
 
   /**
    * 数据父容器
@@ -72,13 +72,13 @@ export class PanelItemController<T extends IPanelItem = IPanelItem>
    * @author lxm
    * @date 2023-04-27 06:37:12
    * @param {T} model 面板成员模型
-   * @param {PanelController} panel 面板控制器
-   * @param {PanelItemController} [parent] 父容器控制器
+   * @param {IPanelController} panel 面板控制器
+   * @param {IPanelItemController} [parent] 父容器控制器
    */
   constructor(
     public readonly model: T,
-    public readonly panel: PanelController,
-    public readonly parent?: PanelItemController,
+    public readonly panel: IPanelController,
+    public readonly parent?: IPanelItemController,
   ) {
     this.state = this.createState();
   }

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

@@ -4,6 +4,7 @@ import { IControlState } from '../../state';
 import { IController } from '../i.controller';
 import { IViewController } from '../view/i-view.controller';
 import { IViewLayoutPanelController } from './i-view-layout-panel.controller';
+import { ControlLogicScheduler } from '../../../../logic-scheduler';
 
 /**
  * 部件控制器
@@ -34,6 +35,15 @@ export interface IControlController<
    */
   layoutPanel?: IViewLayoutPanelController;
 
+  /**
+   * 部件逻辑调度器
+   *
+   * @author chitanda
+   * @date 2023-11-11 10:11:16
+   * @type {ControlLogicScheduler}
+   */
+  scheduler?: ControlLogicScheduler;
+
   /**
    * 开始加载
    *

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

@@ -4,6 +4,16 @@ import { IEditFormEvent } from '../../event';
 import { IEditFormState } from '../../state';
 import { IFormController } from './i-form.controller';
 
+export interface FormSaveParams extends IDataAbilityParams {
+  /**
+   * 保存之后是否不合并后台回来的数据
+   * @author lxm
+   * @date 2023-11-11 11:28:23
+   * @type {boolean}
+   */
+  noFillBack?: boolean;
+}
+
 /**
  * 编辑表单控制器
  * @author lxm
@@ -28,7 +38,7 @@ export interface IEditFormController
    * @date 2023-05-16 12:59:03
    * @return {*}  {Promise<IData>}
    */
-  save(args?: IDataAbilityParams): Promise<IData>;
+  save(args?: FormSaveParams): Promise<IData>;
 
   /**
    * 删除表单数据

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

@@ -21,14 +21,6 @@ export interface MDCtrlLoadParams extends IDataAbilityParams {
 }
 
 export interface MDCtrlRemoveParams extends IDataAbilityParams {
-  /**
-   * 是否静默删除
-   * @author lxm
-   * @date 2023-08-17 06:04:23
-   * @type {boolean}
-   */
-  silent?: boolean;
-
   /**
    * 是否不需要刷新(默认为否，如果不需要刷新传true)
    * @author lxm

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

@@ -18,6 +18,15 @@ export interface IPanelItemState extends IColState {
    * @type {IPanelItemClass}
    */
   class: IPanelItemClass;
+
+  /**
+   * 是否必填
+   *
+   * @author chitanda
+   * @date 2023-11-11 09:11:53
+   * @type {boolean}
+   */
+  required: boolean;
 }
 
 export interface IPanelItemClass {

package/src/register/helper/panel-item-register.ts

@@ -1,4 +1,9 @@
-import { IPanelContainer, IPanelItem, IPanelRawItem } from '@ibiz/model-core';
+import {
+  IPanelContainer,
+  IPanelField,
+  IPanelItem,
+  IPanelRawItem,
+} from '@ibiz/model-core';
 import { IPanelItemProvider } from '../../interface';
 import { getPluginRegisterKey } from './common-register';
 
@@ -63,7 +68,9 @@ export async function getPanelItemProvider(
     const key = `CONTAINER_${predefinedType}`;
     provider = getProvider(key);
     if (!provider) {
-      ibiz.log.error(`找不到面板容器预置类型为${predefinedType}的适配器`);
+      ibiz.log.error(
+        `找不到面板容器预置类型为${predefinedType}的适配器，注册key为${key}`,
+      );
     } else {
       return provider;
     }
@@ -77,13 +84,24 @@ export async function getPanelItemProvider(
     provider = getProvider(key);
     if (!provider) {
       ibiz.log.error(
-        `找不到面板成员直接内容预置类型为${predefinedType}的适配器`,
+        `找不到面板成员直接内容预置类型为${predefinedType}的适配器，注册key为${key}`,
       );
     } else {
       return provider;
     }
   }
 
+  if (itemType === 'FIELD') {
+    const { editor } = model as IPanelField;
+    if (editor && editor.predefinedType) {
+      const key = `FIELD_${editor.predefinedType.toUpperCase()}`;
+      provider = getProvider(key);
+      if (provider) {
+        return provider;
+      }
+    }
+  }
+
   // 找面板成员类型
   provider = getProvider(itemType);
   if (!provider) {

package/src/ui-action/provider/ui-action-provider-base.ts

@@ -62,16 +62,22 @@ export abstract class UIActionProviderBase implements IUIActionProvider {
     }
 
     // ** 后续界面行为
-    const nextResult = await this.doNextAction(action, {
+    const nextActionParams = {
       ...args,
       context: result.nextContext || context,
       data: result.data || data,
       params: result.nextParams || params,
-    });
-    if (nextResult) {
-      Object.assign(result, nextResult);
-      if (nextResult.cancel === true) {
-        return this.returnError(result);
+    };
+    if (action.closeEditView) {
+      // 关闭视图的情况下，不等待后续界面行为
+      this.doNextAction(action, nextActionParams);
+    } else {
+      const nextResult = await this.doNextAction(action, nextActionParams);
+      if (nextResult) {
+        Object.assign(result, nextResult);
+        if (nextResult.cancel === true) {
+          return this.returnError(result);
+        }
       }
     }