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

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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@oinone/kunlun-vue-admin-base",
-  "version": "6.2.11",
+  "version": "6.2.12",
   "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.12",
+    "@oinone/kunlun-vue-router": "6.2.12",
+    "@oinone/kunlun-vue-ui": "6.2.12",
+    "@oinone/kunlun-vue-ui-antd": "6.2.12",
+    "@oinone/kunlun-vue-ui-common": "6.2.12",
+    "@oinone/kunlun-vue-ui-el": "6.2.12",
+    "@oinone/kunlun-vue-widget": "6.2.12",
     "@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/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/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);
 }

package/src/spi/MaskManager.ts

@@ -1,13 +1,40 @@
+import { ViewType } from '@oinone/kunlun-meta';
 import { SPIFactory, SPIOperator, SPIOptions, SPISingleSelector, SPITokenFactory } 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[];
 }
 
-@SPIFactory.Storage(['module', 'moduleName', 'model', 'actionName'], { key: Symbol('MaskTpl') })
+@SPIFactory.Storage(['viewType', 'module', 'moduleName', 'model', 'modelName', 'viewName', 'actionName'], {
+  key: Symbol('MaskTpl')
+})
 export class MaskManager {
   private static Token: SPITokenFactory<MaskRegisterOptions>;
 
@@ -26,9 +53,12 @@ export class MaskManager {
   }
 }
 
+/**
+ * @deprecated please use {@link MaskRegisterOptions}
+ */
 export type IMaskOption = MaskRegisterOptions;
 
-export function registerMask(maskTpl: string, maskOption?: IMaskOption) {
+export function registerMask(maskTpl: string, maskOption?: MaskRegisterOptions) {
   if (!maskTpl) {
     console.warn('maskTpl is blank');
     return false;
@@ -36,6 +66,6 @@ export function registerMask(maskTpl: string, maskOption?: IMaskOption) {
   return MaskManager.register(maskOption || {}, maskTpl);
 }
 
-export function generatorMask(maskOption?: IMaskOption): string | undefined {
+export function generatorMask(maskOption?: MaskRegisterOptions): string | undefined {
   return MaskManager.selector(maskOption || {});
 }

package/src/tags/context/runtime-context-helper.ts

@@ -19,17 +19,19 @@ import { SPI } from '@oinone/kunlun-spi';
 import { getDefaultMaskTemplate, maskTemplateEdit } from '@oinone/kunlun-vue-admin-layout';
 import { isNil, isPlainObject, isString } from 'lodash-es';
 import { LayoutManager, LayoutRegisterOptions, MaskManager } from '../../spi';
-import { useInjectMetaContext } from './context';
 import { ActiveLayoutEffectOpt } from './active';
+import { useInjectMetaContext } from './context';
 
-function seekViewMask(viewAction: RuntimeViewAction, moduleName?: string): DslDefinition {
-  let maskTemplate: string =
-    MaskManager.selector({
-      module: viewAction.moduleDefinition?.module || viewAction.resModuleDefinition?.module,
-      moduleName: viewAction.moduleDefinition?.name || viewAction.resModuleDefinition?.name || moduleName,
-      model: viewAction.model,
-      actionName: viewAction.name
-    })!;
+export function seekViewMask(viewAction: RuntimeViewAction, moduleName?: string): DslDefinition {
+  let maskTemplate: string | undefined = MaskManager.selector({
+    viewType: viewAction.resViewType || viewAction.viewType,
+    module: viewAction.moduleDefinition?.module || viewAction.resModuleDefinition?.module,
+    moduleName: viewAction.moduleDefinition?.name || viewAction.resModuleDefinition?.name || moduleName,
+    model: viewAction.modelDefinition?.model || viewAction.model,
+    modelName: viewAction.modelDefinition?.name || viewAction.modelName,
+    viewName: viewAction.resViewName || viewAction.viewName,
+    actionName: viewAction.name
+  });
   if (!maskTemplate) {
     maskTemplate = viewAction.resMaskDefinition?.template as string;
     if (maskTemplate) {