@ibiz-template/runtime 0.2.16 → 0.2.18-dev.0

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

@@ -153,7 +153,10 @@ export class MDViewEngine extends ViewEngineBase {
    * @return {*}  {Promise<void>}
    */
   protected async onXDataActive(event: EventBase): Promise<void> {
-    await this.openData(event);
+    const res = await this.openData(event);
+    if (!res.cancel) {
+      this.refresh();
+    }
   }
 
   // eslint-disable-next-line @typescript-eslint/no-explicit-any, @typescript-eslint/explicit-module-boundary-types

package/src/interface/common/index.ts

@@ -1,19 +1,19 @@
-export { IAppDEUIService } from './i-app-de-ui-service/i-app-de-ui-service';
-export { IAppHubService } from './i-app-hub-service/i-app-hub-service';
-export { IAppService } from './i-app-service/i-app-service';
-export { IAppUIService } from './i-app-ui-service/i-app-ui-service';
-export { IDrawerOptions } from './i-drawer-options/i-drawer-options';
-export {
+export type { IAppDEUIService } from './i-app-de-ui-service/i-app-de-ui-service';
+export type { IAppHubService } from './i-app-hub-service/i-app-hub-service';
+export type { IAppService } from './i-app-service/i-app-service';
+export type { IAppUIService } from './i-app-ui-service/i-app-ui-service';
+export type { IDrawerOptions } from './i-drawer-options/i-drawer-options';
+export type {
   IPopoverOptions,
   Placement,
 } from './i-popover-options/i-popover-options';
-export { IModal } from './i-modal/i-modal';
-export { IModalData } from './i-modal-data/i-modal-data';
-export { IModalOptions } from './i-modal-options/i-modal-options';
-export { IPluginFactory } from './i-plugin-factory/i-plugin-factory';
-export { IPluginItem } from './i-plugin-item/i-plugin-item';
-export { IUIActionResult } from './i-ui-action-result/i-ui-action-result';
-export { IUIActionHandler } from './i-ui-action-handler/i-ui-action-handler';
+export type { IModal } from './i-modal/i-modal';
+export type { IModalData } from './i-modal-data/i-modal-data';
+export type { IModalOptions } from './i-modal-options/i-modal-options';
+export type { IPluginFactory } from './i-plugin-factory/i-plugin-factory';
+export type { IPluginItem } from './i-plugin-item/i-plugin-item';
+export type { IUIActionResult } from './i-ui-action-result/i-ui-action-result';
+export type { IUIActionHandler } from './i-ui-action-handler/i-ui-action-handler';
 export type {
   IGlobalConfig,
   IGlobalCodeListConfig,
@@ -21,8 +21,8 @@ export type {
   IGlobalAppMenuConfig,
   IGlobalViewConfig,
 } from './i-global-config';
-export { IUILogicParams } from './i-ui-logic-params/i-ui-logic-params';
-export { IDataAbilityParams } from './i-data-ability-params/i-data-ability-params';
+export type { IUILogicParams } from './i-ui-logic-params/i-ui-logic-params';
+export type { IDataAbilityParams } from './i-data-ability-params/i-data-ability-params';
 export type { IAppConfigService } from './i-app-config-service/i-app-config-service';
 export type {
   IAppViewConfigService,

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

@@ -1,10 +1,10 @@
-export { EventBase } from './base.event';
-export { LoadEvent } from './load.event';
-export { DataChangeEvent } from './data-change.event';
-export { ViewInfoEvent } from './view-info.event';
-export { CloseViewEvent } from './close-view.event';
-export { UIActionEvent } from './uiaction.event';
-export { ControlTriggerEvent } from './control-trigger.event';
-export { NavViewChangeEvent } from './nav-view-change.event';
-export { RowEditChangeEvent } from './row-edit-change.event';
-export { PanelItemEvent } from './panel-item.event';
+export type { EventBase } from './base.event';
+export type { LoadEvent } from './load.event';
+export type { DataChangeEvent } from './data-change.event';
+export type { ViewInfoEvent } from './view-info.event';
+export type { CloseViewEvent } from './close-view.event';
+export type { UIActionEvent } from './uiaction.event';
+export type { ControlTriggerEvent } from './control-trigger.event';
+export type { NavViewChangeEvent } from './nav-view-change.event';
+export type { RowEditChangeEvent } from './row-edit-change.event';
+export type { PanelItemEvent } from './panel-item.event';

package/src/interface/provider/index.ts

@@ -1,12 +1,12 @@
-export * from './i.provider';
-export * from './i-ui-action.provider';
-export { ModelLoaderProvider } from './model-loader.provider';
-export * from './i-view.provider';
-export * from './i-control.provider';
-export * from './i-grid-column.provider';
-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';
+export type * from './i.provider';
+export type * from './i-ui-action.provider';
+export type { ModelLoaderProvider } from './model-loader.provider';
+export type * from './i-view.provider';
+export type * from './i-control.provider';
+export type * from './i-grid-column.provider';
+export type * from './i-panel-item.provider';
+export type * from './i-form-detail.provider';
+export type * from './i-editor.provider';
+export type * from './i-portlet.provider';
+export type { IAppCounterProvider } from './i-app-counter.provider';
 export type { IUILogicNodeProvider } from './i-ui-login-node.provider';

package/src/interface/service/index.ts

@@ -1,3 +1,3 @@
-export { CodeListItem } from './code-list-item/code-list-item';
-export { IDataEntity } from './i-data-entity/i-data-entity';
-export * from './service';
+export type { CodeListItem } from './code-list-item/code-list-item';
+export type { IDataEntity } from './i-data-entity/i-data-entity';
+export type * from './service';

package/src/interface/util/index.ts

@@ -1,15 +1,17 @@
-export { ILoadingUtil } from './i-loading-util/i-loading-util';
-export { IMessageUtil } from './i-message-util/i-message-util';
-export { IModalUtil, ModalParams } from './i-modal-util/i-modal-util';
-export { IConfirmUtil, ConfirmParams } from './i-confirm-util/i-confirm-util';
-export {
+export type { ILoadingUtil } from './i-loading-util/i-loading-util';
+export type { IMessageUtil } from './i-message-util/i-message-util';
+export type { IModalUtil, ModalParams } from './i-modal-util/i-modal-util';
+export type {
+  IConfirmUtil,
+  ConfirmParams,
+} from './i-confirm-util/i-confirm-util';
+export type {
   INotificationUtil,
   NotificationParams,
 } from './i-notification-util/i-notification-util';
-export { IOpenViewUtil } from './i-open-view-util/i-open-view-util';
-export { IOverlayContainer } from './i-overlay-container/i-overlay-container';
-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 { IExcelUtil } from './i-excel-util/i-excel-util';
+export type { IOpenViewUtil } from './i-open-view-util/i-open-view-util';
+export type { IOverlayContainer } from './i-overlay-container/i-overlay-container';
+export type { IOverlayController } from './i-overlay-controller/i-overlay-controller';
+export type { IOverlayPopoverContainer } from './i-overlay-popover-container/i-overlay-popover-container';
+export type { IScriptFunctionOpts } from './script/i-script-function';
+export type { IExcelUtil } from './i-excel-util/i-excel-util';

package/src/plugin/index.ts

@@ -1,5 +1,3 @@
 export { PluginStaticResource } from './plugin-static-resource/plugin-static-resource';
-export {
-  RemotePluginConfig,
-  RemotePluginItem,
-} from './remote-plugin-item/remote-plugin-item';
+export type { RemotePluginConfig } from './remote-plugin-item/remote-plugin-item';
+export { RemotePluginItem } from './remote-plugin-item/remote-plugin-item';

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);
+        }
       }
     }