@oinone/kunlun-vue-admin-base 6.2.11 → 6.2.13

package/dist/types/src/basic/form-item/DefaultFormItem.vue.d.ts

@@ -1,3 +1,4 @@
+import { PropType } from 'vue';
 declare const _default: import("vue").DefineComponent<{
     itemName: {
         type: StringConstructor;
@@ -17,7 +18,7 @@ declare const _default: import("vue").DefineComponent<{
         default: boolean;
     };
     layout: {
-        type: import("vue").PropType<import("@oinone/kunlun-vue-ui-antd").FormLayout>;
+        type: PropType<import("@oinone/kunlun-vue-ui-antd").FormLayout>;
     };
     label: {
         type: (BooleanConstructor | StringConstructor)[];
@@ -34,10 +35,10 @@ declare const _default: import("vue").DefineComponent<{
         default: undefined;
     };
     validateTrigger: {
-        type: import("vue").PropType<string | string[]>;
+        type: PropType<string | string[]>;
     };
     validatorInfo: {
-        type: import("vue").PropType<import("../../typing").ValidatorInfo>;
+        type: PropType<import("../../typing").ValidatorInfo>;
     };
 }, {
     required: import("vue").ComputedRef<boolean>;
@@ -60,7 +61,7 @@ declare const _default: import("vue").DefineComponent<{
         default: boolean;
     };
     layout: {
-        type: import("vue").PropType<import("@oinone/kunlun-vue-ui-antd").FormLayout>;
+        type: PropType<import("@oinone/kunlun-vue-ui-antd").FormLayout>;
     };
     label: {
         type: (BooleanConstructor | StringConstructor)[];
@@ -77,10 +78,10 @@ declare const _default: import("vue").DefineComponent<{
         default: undefined;
     };
     validateTrigger: {
-        type: import("vue").PropType<string | string[]>;
+        type: PropType<string | string[]>;
     };
     validatorInfo: {
-        type: import("vue").PropType<import("../../typing").ValidatorInfo>;
+        type: PropType<import("../../typing").ValidatorInfo>;
     };
 }>>, {
     required: boolean;

package/dist/types/src/container/collapse/DefaultCollapse.vue.d.ts

@@ -11,6 +11,9 @@ declare const _default: import("vue").DefineComponent<{
     onActiveKeyChange: {
         type: PropType<(key: string | string[]) => void>;
     };
+    setAllKeys: {
+        type: PropType<(keys: string[]) => void>;
+    };
     type: {
         type: PropType<OioCollapseType | "bordered" | "stripe" | "simple" | "ghost">;
         default: OioCollapseType;
@@ -59,6 +62,9 @@ declare const _default: import("vue").DefineComponent<{
     onActiveKeyChange: {
         type: PropType<(key: string | string[]) => void>;
     };
+    setAllKeys: {
+        type: PropType<(keys: string[]) => void>;
+    };
     type: {
         type: PropType<OioCollapseType | "bordered" | "stripe" | "simple" | "ghost">;
         default: OioCollapseType;

package/dist/types/src/container/collapse/DefaultCollapseWidget.d.ts

@@ -2,7 +2,9 @@ import { BasePackWidget } from '../../basic';
 export declare class DefaultCollapseWidget extends BasePackWidget {
     protected defaultAllInvisible: boolean;
     initialize(props: any): this;
-    private activeKey;
+    protected allKeys: string[] | undefined;
+    setAllKeys(keys: string[]): void;
+    protected activeKey: string | string[] | undefined;
     getActiveKey(): string | string[] | undefined;
     setActiveKey(key: string | string[] | undefined): void;
     onActiveKeyChange(key: string | string[]): void;
@@ -12,4 +14,6 @@ export declare class DefaultCollapseWidget extends BasePackWidget {
     protected get collapseMethod(): string;
     get accordion(): boolean | undefined;
     protected get expandIconPosition(): any;
+    onExpandAll(): void;
+    onCollapseAll(): void;
 }

package/dist/types/src/field/form/float/Plat.vue.d.ts

@@ -47,7 +47,7 @@ declare const _default: import("vue").DefineComponent<{
         default: boolean;
     };
     layout: {
-        type: PropType<import("@oinone/kunlun-vue-ui-common").FormLayout>;
+        type: PropType<import("@oinone/kunlun-vue-ui-antd").FormLayout>;
     };
     label: {
         type: (BooleanConstructor | StringConstructor)[];
@@ -141,7 +141,7 @@ declare const _default: import("vue").DefineComponent<{
         default: boolean;
     };
     layout: {
-        type: PropType<import("@oinone/kunlun-vue-ui-common").FormLayout>;
+        type: PropType<import("@oinone/kunlun-vue-ui-antd").FormLayout>;
     };
     label: {
         type: (BooleanConstructor | StringConstructor)[];

package/dist/types/src/permission/permission/field/ActionPermissionWidget.d.ts

@@ -33,7 +33,7 @@ interface Menu {
     module: string;
 }
 export declare class ActionPermissionWidget extends FormFieldWidget<unknown, RuntimeO2MField> {
-    private class;
+    get class(): string;
     initialize(props: any): this;
     /**
      * 挂载时

package/dist/types/src/spi/LayoutManager.d.ts

@@ -8,31 +8,31 @@ export interface LayoutRegisterOptions extends SPIOptions {
     /**
      * 视图类型
      */
-    viewType: ViewType;
+    viewType: ViewType | ViewType[];
     /**
-     * 视图模型所在模块编码，一般是驼峰风格的英文 designerCommon
+     * 视图模型所在模块编码，一般是下划线风格的英文 designer_common
      */
-    module?: string;
+    module?: string | string[];
     /**
-     * 视图模型所在模块名称，一般是下划线风格的英文 designer_common
+     * 视图模型所在模块名称，一般是驼峰风格的英文 designerCommon
      */
-    moduleName?: string;
+    moduleName?: string | string[];
     /**
-     * 布局名称，对应viewActionQuery.load.resView.baseLayoutName
+     * 布局名称，对应 viewActionQuery.load.resView.baseLayoutName
      */
-    layoutName?: string;
+    layoutName?: string | string[];
     /**
      * 视图的模型编码
      */
-    model?: string;
+    model?: string | string[];
     /**
      * 视图的模型名称
      */
-    modelName?: string;
+    modelName?: string | string[];
     /**
      * 视图的名称
      */
-    viewName?: string;
+    viewName?: string | string[];
     /**
      * 是否为内嵌视图(子视图特有)，表单页内有个o2m的子表格，该表格的inline为true
      */
@@ -40,23 +40,23 @@ export interface LayoutRegisterOptions extends SPIOptions {
     /**
      * 模型字段类型(子视图特有)
      */
-    ttype?: ModelFieldType;
+    ttype?: ModelFieldType | ModelFieldType[];
     /**
      * 关联模型字段类型(子视图特有)
      */
-    relatedTtype?: ModelFieldType;
+    relatedTtype?: ModelFieldType | ModelFieldType[];
     /**
      * 字段(子视图特有)
      */
-    field?: string;
+    field?: string | string[];
     /**
      * 动作名称
      */
-    actionName?: string;
+    actionName?: string | string[];
     /**
      * 动作使用的组件名称
      */
-    actionWidget?: string;
+    actionWidget?: string | string[];
 }
 export declare class LayoutManager {
     private static Token;
@@ -64,6 +64,9 @@ export declare class LayoutManager {
     static register(options: LayoutRegisterOptions, template: string): boolean;
     static selector(options: LayoutRegisterOptions): DslDefinition | undefined;
 }
+/**
+ * @deprecated please use {@link LayoutRegisterOptions}
+ */
 export declare type ILayoutOption = LayoutRegisterOptions;
-export declare function registerLayout(layoutTpl: string, layoutOption: ILayoutOption): boolean;
-export declare function generatorLayout(layoutOption: ILayoutOption): DslDefinition | undefined;
+export declare function registerLayout(layoutTpl: string, layoutOption: LayoutRegisterOptions): boolean;
+export declare function generatorLayout(layoutOption: LayoutRegisterOptions): DslDefinition | undefined;

package/dist/types/src/spi/MaskManager.d.ts

@@ -1,8 +1,33 @@
+import { ViewType } from '@oinone/kunlun-meta';
 import { SPIOptions } from '@oinone/kunlun-spi';
 export interface MaskRegisterOptions extends SPIOptions {
-    module?: string;
-    moduleName?: string;
-    model?: string;
+    /**
+     * 视图类型
+     */
+    viewType?: ViewType | ViewType[];
+    /**
+     * 模块编码
+     */
+    module?: string | string[];
+    /**
+     * 模块名称
+     */
+    moduleName?: string | string[];
+    /**
+     * 模型编码
+     */
+    model?: string | string[];
+    /**
+     * 模型名称
+     */
+    modelName?: string | string[];
+    /**
+     * 视图名称
+     */
+    viewName?: string | string[];
+    /**
+     * 动作名称
+     */
     actionName?: string | string[];
 }
 export declare class MaskManager {
@@ -11,6 +36,9 @@ export declare class MaskManager {
     static register(options: MaskRegisterOptions, template: string): boolean;
     static selector(options: MaskRegisterOptions): string | undefined;
 }
+/**
+ * @deprecated please use {@link MaskRegisterOptions}
+ */
 export declare type IMaskOption = MaskRegisterOptions;
-export declare function registerMask(maskTpl: string, maskOption?: IMaskOption): boolean;
-export declare function generatorMask(maskOption?: IMaskOption): string | undefined;
+export declare function registerMask(maskTpl: string, maskOption?: MaskRegisterOptions): boolean;
+export declare function generatorMask(maskOption?: MaskRegisterOptions): string | undefined;

package/dist/types/src/tags/context/runtime-context-helper.d.ts

@@ -1,5 +1,6 @@
 import { DslDefinition } from '@oinone/kunlun-dsl';
 import { RuntimeContext, RuntimeContextService, RuntimeModelField, RuntimeView, RuntimeViewAction } from '@oinone/kunlun-engine';
+export declare function seekViewMask(viewAction: RuntimeViewAction, moduleName?: string): DslDefinition;
 export declare function createRuntimeContextByViewAction(viewAction: RuntimeViewAction, inline: boolean, nodeHandle?: string, rootHandle?: string): RuntimeContext | undefined;
 export declare function createRuntimeContextByView(view: RuntimeView, inline: boolean, nodeHandle?: string, rootHandle?: string): RuntimeContext;
 export declare function createRuntimeContextByFieldSubview(view: RuntimeView, field: RuntimeModelField, inline: boolean, nodeHandle?: string, rootHandle?: string): RuntimeContext;

package/dist/types/src/typing/tree.d.ts

@@ -1,3 +1,4 @@
+import { DslDefinition } from '@oinone/kunlun-dsl';
 import { ActiveRecord, Pagination, RefreshCallChainingParameters } from '@oinone/kunlun-engine';
 import { TreeNode } from '@oinone/kunlun-shared';
 import { Slot } from 'vue';
@@ -61,6 +62,10 @@ export interface TreeNodeMetadata {
      * 行内按钮插槽
      */
     rowActionsSlot?: Slot;
+    /**
+     * 当配置了 nodes 节点时，根元数据节点具有该属性
+     */
+    nodes?: DslDefinition;
     /**
      * 图标 iconfont/https
      */

package/dist/types/src/view/tree/AbstractTreeElementWidget.d.ts

@@ -26,6 +26,8 @@ export declare abstract class AbstractTreeElementWidget<V extends TreeData = Tre
     get checkAll(): boolean | undefined;
     get checkAllLabel(): any;
     get searchRemote(): any;
+    get viewModel(): string | undefined;
+    get width(): string | undefined;
     initialize(props: any): this;
     protected runtimeInitialed(): void;
     protected generatorRootNode(metadata: TreeNodeMetadata): OioTreeNode<V>;

package/dist/types/src/view/tree/DefaultTree.vue.d.ts

@@ -3,13 +3,19 @@ import { ViewType } from '@oinone/kunlun-meta';
 import { OioTreeNode } from '@oinone/kunlun-vue-ui-antd';
 import { PropType } from 'vue';
 import { TreeData } from '../../typing';
-declare const _default: import("vue").DefineComponent<{
+declare const __default__: import("vue").DefineComponent<{
     viewType: {
         type: PropType<ViewType>;
     };
+    viewModel: {
+        type: StringConstructor;
+    };
     template: {
         type: PropType<DslDefinition>;
     };
+    width: {
+        type: StringConstructor;
+    };
     autoExpandParent: {
         type: BooleanConstructor;
     };
@@ -139,7 +145,7 @@ declare const _default: import("vue").DefineComponent<{
     };
 }, {
     treeData: import("vue").ComputedRef<OioTreeNode<TreeData>[]>;
-    isSameModel: import("vue").ComputedRef<boolean>;
+    width: import("vue").ComputedRef<string>;
     internalExpandedKeys: import("vue").Ref<string[]>;
     selectedKeys: import("vue").WritableComputedRef<string[]>;
     expandedKeys: import("vue").WritableComputedRef<string[]>;
@@ -161,9 +167,15 @@ declare const _default: import("vue").DefineComponent<{
     viewType: {
         type: PropType<ViewType>;
     };
+    viewModel: {
+        type: StringConstructor;
+    };
     template: {
         type: PropType<DslDefinition>;
     };
+    width: {
+        type: StringConstructor;
+    };
     autoExpandParent: {
         type: BooleanConstructor;
     };
@@ -309,4 +321,4 @@ declare const _default: import("vue").DefineComponent<{
     enableSearch: boolean;
     searchPlaceHolder: string;
 }>;
-export default _default;
+export default __default__;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@oinone/kunlun-vue-admin-base",
-  "version": "6.2.11",
+  "version": "6.2.13",
   "main": "index.ts",
   "scripts": {
     "prebuild": "rimraf dist",
@@ -14,13 +14,13 @@
     "doc": "typedoc --out docs src/index.ts"
   },
   "dependencies": {
-    "@oinone/kunlun-vue-admin-layout": "6.2.11",
-    "@oinone/kunlun-vue-router": "6.2.11",
-    "@oinone/kunlun-vue-ui": "6.2.11",
-    "@oinone/kunlun-vue-ui-antd": "6.2.11",
-    "@oinone/kunlun-vue-ui-common": "6.2.11",
-    "@oinone/kunlun-vue-ui-el": "6.2.11",
-    "@oinone/kunlun-vue-widget": "6.2.11",
+    "@oinone/kunlun-vue-admin-layout": "6.2.13",
+    "@oinone/kunlun-vue-router": "6.2.13",
+    "@oinone/kunlun-vue-ui": "6.2.13",
+    "@oinone/kunlun-vue-ui-antd": "6.2.13",
+    "@oinone/kunlun-vue-ui-common": "6.2.13",
+    "@oinone/kunlun-vue-ui-el": "6.2.13",
+    "@oinone/kunlun-vue-widget": "6.2.13",
     "@wangeditor/editor": "5.1.23",
     "@wangeditor/editor-for-vue": "5.1.11",
     "@wangeditor/plugin-upload-attachment": "1.1.0",

package/src/basic/element/BaseElementViewWidget.ts

@@ -1,4 +1,11 @@
-import { parseConfigs, RelationUpdateType, ROOT_HANDLE, SubmitType, SubmitValue } from '@oinone/kunlun-engine';
+import {
+  ExperimentalConfigManager,
+  parseConfigs,
+  RelationUpdateType,
+  ROOT_HANDLE,
+  SubmitType,
+  SubmitValue
+} from '@oinone/kunlun-engine';
 import { LifeCycleHeart, LifeCycleTypes } from '@oinone/kunlun-event';
 import { ViewMode } from '@oinone/kunlun-meta';
 import { Router } from '@oinone/kunlun-router';
@@ -228,7 +235,9 @@ export abstract class BaseElementViewWidget<
       mainViewFilter
     );
     this.setViewFilter?.(internalFilter);
-    this.internalDomain = RSQLHelper.concatByAnd(this.viewAction?.domain, this.getDsl().domain as string | undefined);
+    if (!ExperimentalConfigManager.baseElementViewWidgetNext()) {
+      this.internalDomain = RSQLHelper.concatByAnd(this.viewAction?.domain, this.getDsl().domain as string | undefined);
+    }
   }
 
   protected refreshConditionContext(): Record<string, unknown> | undefined {

package/src/basic/form-item/DefaultFormItem.vue

@@ -4,7 +4,7 @@ import { translateValueByKey } from '@oinone/kunlun-engine';
 import { BooleanHelper } from '@oinone/kunlun-shared';
 import { OioFormItem, PropRecordHelper } from '@oinone/kunlun-vue-ui-antd';
 import { Tooltip as ATooltip } from 'ant-design-vue';
-import { computed, createVNode, defineComponent, Slot, VNode, vShow, withDirectives } from 'vue';
+import { computed, createVNode, defineComponent, PropType, Slot, VNode, vShow, withDirectives } from 'vue';
 import { ValidatorStatus } from '../../typing';
 import { BaseFormItemProps } from './props';
 

package/src/container/collapse/DefaultCollapse.vue

@@ -29,6 +29,9 @@ export default defineComponent({
     onActiveKeyChange: {
       type: Function as PropType<(key: string | string[]) => void>
     },
+    setAllKeys: {
+      type: Function as PropType<(keys: string[]) => void>
+    },
     type: {
       type: String as PropType<OioCollapseType | keyof typeof OioCollapseType>,
       default: OioCollapseType.bordered
@@ -58,9 +61,10 @@ export default defineComponent({
     };
 
     onMounted(() => {
-      if (props.expandAll && !props.accordion) {
-        const panelKeys = origin.value?.getPanelKeys();
-        if (panelKeys) {
+      const panelKeys = origin.value?.getPanelKeys();
+      if (panelKeys) {
+        props.setAllKeys?.(panelKeys);
+        if (props.expandAll && !props.accordion) {
           onUpdateActiveKey(panelKeys);
         }
       }

package/src/container/collapse/DefaultCollapseWidget.ts

@@ -17,7 +17,15 @@ export class DefaultCollapseWidget extends BasePackWidget {
   }
 
   @Widget.Reactive()
-  private activeKey: string | string[] | undefined;
+  protected allKeys: string[] | undefined;
+
+  @Widget.Method()
+  public setAllKeys(keys: string[]) {
+    this.allKeys = keys;
+  }
+
+  @Widget.Reactive()
+  protected activeKey: string | string[] | undefined;
 
   public getActiveKey() {
     return this.activeKey;
@@ -69,4 +77,14 @@ export class DefaultCollapseWidget extends BasePackWidget {
   protected get expandIconPosition() {
     return this.getDsl()?.expandIconPosition?.toLowerCase() || OioCollapseExpandIconPosition.right;
   }
+
+  @Widget.Method()
+  public onExpandAll() {
+    this.setActiveKey(this.allKeys);
+  }
+
+  @Widget.Method()
+  public onCollapseAll() {
+    this.setActiveKey([]);
+  }
 }

package/src/main-view/DefaultMetadataMainViewWidget.ts

@@ -1,4 +1,4 @@
-import { DslDefinition, XMLParse } from '@oinone/kunlun-dsl';
+import { DslDefinition } from '@oinone/kunlun-dsl';
 import {
   $systemMajorConfig,
   CurrentLanguage,
@@ -22,21 +22,20 @@ import {
 import { ViewActionTarget } from '@oinone/kunlun-meta';
 import { isNotPermission, setSessionPath, useSessionPath } from '@oinone/kunlun-request';
 import { useMatched } from '@oinone/kunlun-router';
-import { CallChaining, debugConsole } from '@oinone/kunlun-shared';
+import { CallChaining } from '@oinone/kunlun-shared';
 import { distinctUntilChanged, Subscription } from '@oinone/kunlun-state';
 import { DEFAULT_PREFIX } from '@oinone/kunlun-theme';
 
 import {
   emptyHomepageModelName,
-  getDefaultMaskTemplate,
   getUnauthorizedAction,
-  maskTemplateEdit,
   MenuService,
   ModuleService,
   replaceStanderMainView,
   RuntimeMenu,
   TopBarService,
-  unauthorizedActionName, urlHomepageModelName
+  unauthorizedActionName,
+  urlHomepageModelName
 } from '@oinone/kunlun-vue-admin-layout';
 import { OioNotification } from '@oinone/kunlun-vue-ui-antd';
 import { ZH_CN_CODE } from '@oinone/kunlun-vue-ui-common';
@@ -44,7 +43,7 @@ import { Widget } from '@oinone/kunlun-vue-widget';
 import { nextTick, VNode } from 'vue';
 import { MetadataViewWidget } from '../basic';
 import { TeleportWidget } from '../components/teleport';
-import { MaskManager } from '../spi';
+import { seekViewMask } from '../tags';
 import { TranslateBox } from '../view/translate';
 import DefaultMetadataMainView from './DefaultMetadataMainView.vue';
 import { MetadataMainViewLifecycle } from './lifecycle';
@@ -355,24 +354,8 @@ export class DefaultMetadataMainViewWidget extends MetadataViewWidget {
     newPage: ViewActionQueryParameter
   ): Promise<void> {
     const { module: moduleName, model, action } = newPage;
-    let maskTemplate: string = MaskManager.selector({
-      module: viewAction.moduleDefinition?.module || viewAction.resModuleDefinition?.module,
-      moduleName: viewAction.moduleDefinition?.name || viewAction.resModuleDefinition?.name || moduleName,
-      model,
-      actionName: action
-    })!;
-    if (!maskTemplate) {
-      maskTemplate = viewAction.resMaskDefinition?.template as string;
-      if (maskTemplate) {
-        debugConsole.log('使用后端mask', maskTemplate);
-      }
-    }
-    let finalMaskTemplate: DslDefinition;
-    if (maskTemplate) {
-      finalMaskTemplate = maskTemplateEdit({ isDefault: false }, XMLParse.INSTANCE.parse(maskTemplate));
-    } else {
-      finalMaskTemplate = getDefaultMaskTemplate();
-    }
+
+    let finalMaskTemplate: DslDefinition = seekViewMask(viewAction, moduleName);
 
     /**
      * 当前用户没有该视图没有权限

package/src/permission/permission/field/ActionPermissionWidget.ts

@@ -57,7 +57,9 @@ let counter = 0;
 @SPI.ClassFactory(FormFieldWidget.Token({ widget: 'action-permission' }))
 export class ActionPermissionWidget extends FormFieldWidget<unknown, RuntimeO2MField> {
   @Widget.Reactive()
-  private class = 'oio-tree';
+  public get class() {
+    return 'oio-tree';
+  }
 
   public initialize(props) {
     super.initialize(props);

package/src/spi/LayoutManager.ts

@@ -11,31 +11,31 @@ export interface LayoutRegisterOptions extends SPIOptions {
   /**
    * 视图类型
    */
-  viewType: ViewType;
+  viewType: ViewType | ViewType[];
   /**
-   * 视图模型所在模块编码，一般是驼峰风格的英文 designerCommon
+   * 视图模型所在模块编码，一般是下划线风格的英文 designer_common
    */
-  module?: string;
+  module?: string | string[];
   /**
-   * 视图模型所在模块名称，一般是下划线风格的英文 designer_common
+   * 视图模型所在模块名称，一般是驼峰风格的英文 designerCommon
    */
-  moduleName?: string;
+  moduleName?: string | string[];
   /**
-   * 布局名称，对应viewActionQuery.load.resView.baseLayoutName
+   * 布局名称，对应 viewActionQuery.load.resView.baseLayoutName
    */
-  layoutName?: string;
+  layoutName?: string | string[];
   /**
    * 视图的模型编码
    */
-  model?: string;
+  model?: string | string[];
   /**
    * 视图的模型名称
    */
-  modelName?: string;
+  modelName?: string | string[];
   /**
    * 视图的名称
    */
-  viewName?: string;
+  viewName?: string | string[];
   /**
    * 是否为内嵌视图(子视图特有)，表单页内有个o2m的子表格，该表格的inline为true
    */
@@ -48,15 +48,15 @@ export interface LayoutRegisterOptions extends SPIOptions {
   /**
    * 模型字段类型(子视图特有)
    */
-  ttype?: ModelFieldType;
+  ttype?: ModelFieldType | ModelFieldType[];
   /**
    * 关联模型字段类型(子视图特有)
    */
-  relatedTtype?: ModelFieldType;
+  relatedTtype?: ModelFieldType | ModelFieldType[];
   /**
    * 字段(子视图特有)
    */
-  field?: string;
+  field?: string | string[];
 
   // endregion
 
@@ -65,11 +65,11 @@ export interface LayoutRegisterOptions extends SPIOptions {
   /**
    * 动作名称
    */
-  actionName?: string;
+  actionName?: string | string[];
   /**
    * 动作使用的组件名称
    */
-  actionWidget?: string;
+  actionWidget?: string | string[];
 
   // endregion
 }
@@ -115,9 +115,12 @@ export class LayoutManager {
   }
 }
 
+/**
+ * @deprecated please use {@link LayoutRegisterOptions}
+ */
 export type ILayoutOption = LayoutRegisterOptions;
 
-export function registerLayout(layoutTpl: string, layoutOption: ILayoutOption): boolean {
+export function registerLayout(layoutTpl: string, layoutOption: LayoutRegisterOptions): boolean {
   if (!layoutOption.viewType) {
     console.warn('viewType is blank');
     return false;
@@ -129,6 +132,6 @@ export function registerLayout(layoutTpl: string, layoutOption: ILayoutOption):
   return LayoutManager.register(layoutOption, layoutTpl);
 }
 
-export function generatorLayout(layoutOption: ILayoutOption): DslDefinition | undefined {
+export function generatorLayout(layoutOption: LayoutRegisterOptions): DslDefinition | undefined {
   return LayoutManager.selector(layoutOption);
 }