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

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

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) {

package/src/typing/tree.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';
@@ -64,6 +65,11 @@ export interface TreeNodeMetadata {
    */
   rowActionsSlot?: Slot;
 
+  /**
+   * 当配置了 nodes 节点时，根元数据节点具有该属性
+   */
+  nodes?: DslDefinition;
+
   /**
    * 图标 iconfont/https
    */

package/src/util/tree-utils.ts

@@ -44,6 +44,7 @@ export class TreeUtils {
     }
     let root: TreeNodeMetadata | undefined;
     let parent: TreeNodeMetadata | undefined;
+    let nodes: DslDefinition | undefined;
     const appendChild = (widget: DslDefinition) => {
       const { model, title, label, labelFields, searchFields, references, selfReferences, filter, search, icon } =
         widget;
@@ -80,28 +81,34 @@ export class TreeUtils {
       }
       parent = metadata;
     };
-    for (const widget of widgets) {
-      const appendWidget = (targetWidget: DslDefinition) => {
-        if (targetWidget.dslNodeType === TreeUtils.DSL_NODES_TYPE) {
-          const nodesWidgets = targetWidget.widgets;
-          if (nodesWidgets) {
-            for (const nodeWidget of nodesWidgets) {
-              appendChild(nodeWidget);
-            }
+    const appendWidget = (targetWidget: DslDefinition) => {
+      if (targetWidget.dslNodeType === TreeUtils.DSL_NODES_TYPE) {
+        const nodesWidgets = targetWidget.widgets;
+        if (nodesWidgets) {
+          if (!nodes) {
+            nodes = targetWidget;
           }
-        } else if (targetWidget.dslNodeType === TreeUtils.DSL_NODE_TYPE) {
-          appendChild(targetWidget);
-        } else if (DslDefinitionHelper.isTemplate(targetWidget) && targetWidget.slot === DEFAULT_SLOT_NAME) {
-          const nodesWidgets = targetWidget.widgets;
-          if (nodesWidgets) {
-            for (const nodeWidget of nodesWidgets) {
-              appendWidget(nodeWidget);
-            }
+          for (const nodeWidget of nodesWidgets) {
+            appendChild(nodeWidget);
           }
         }
-      };
+      } else if (targetWidget.dslNodeType === TreeUtils.DSL_NODE_TYPE) {
+        appendChild(targetWidget);
+      } else if (DslDefinitionHelper.isTemplate(targetWidget) && targetWidget.slot === DEFAULT_SLOT_NAME) {
+        const nodesWidgets = targetWidget.widgets;
+        if (nodesWidgets) {
+          for (const nodeWidget of nodesWidgets) {
+            appendWidget(nodeWidget);
+          }
+        }
+      }
+    };
+    for (const widget of widgets) {
       appendWidget(widget);
     }
+    if (root) {
+      root.nodes = nodes;
+    }
     return root;
   }
 

package/src/view/tree/AbstractTreeElementWidget.ts

@@ -2,7 +2,7 @@ import { DEFAULT_SLOT_NAME } from '@oinone/kunlun-dsl';
 import { ExpressionRunParam } from '@oinone/kunlun-expression';
 import { ViewType } from '@oinone/kunlun-meta';
 import { BooleanHelper, ReturnPromise, uniqueKeyGenerator } from '@oinone/kunlun-shared';
-import { OioTreeNode } from '@oinone/kunlun-vue-ui-common';
+import { OioTreeNode, StyleHelper } from '@oinone/kunlun-vue-ui-common';
 import { Widget } from '@oinone/kunlun-vue-widget';
 import { TreeNodeResponseBody, TreeService } from '../../service';
 import { TreeData, TreeNodeMetadata } from '../../typing';
@@ -83,6 +83,20 @@ export abstract class AbstractTreeElementWidget<V extends TreeData = TreeData> e
     return this.getDsl().searchRemote ?? true;
   }
 
+  @Widget.Reactive()
+  public get viewModel(): string | undefined {
+    return this.model.model;
+  }
+
+  @Widget.Reactive()
+  public get width(): string | undefined {
+    let { width } = this.getDsl();
+    if (width == null) {
+      width = this.treeDefinition?.nodes?.width;
+    }
+    return StyleHelper.px(width);
+  }
+
   public initialize(props) {
     if (!props.slotNames) {
       props.slotNames = [DEFAULT_SLOT_NAME, CONTENT_SLOT_NAME, 'rowActions'];

package/src/view/tree/DefaultTree.vue

@@ -44,9 +44,15 @@ export default defineComponent({
     viewType: {
       type: String as PropType<ViewType>
     },
+    viewModel: {
+      type: String
+    },
     template: {
       type: Object as PropType<DslDefinition>
     },
+    width: {
+      type: String
+    },
     autoExpandParent: {
       type: Boolean
     },
@@ -82,23 +88,11 @@ export default defineComponent({
       return treeNodeList;
     });
 
-    const isSameModel = computed(() => {
-      let model: string | undefined;
-      let metadata = props.rootNode?.value?.metadata;
-      while (metadata) {
-        const nodeModel = metadata.model;
-        if (nodeModel) {
-          if (model) {
-            if (model !== nodeModel) {
-              return false;
-            }
-          } else {
-            model = nodeModel;
-          }
-        }
-        metadata = metadata.child;
+    const width = computed(() => {
+      if (props.width == null) {
+        return '234px';
       }
-      return !!model;
+      return props.width;
     });
 
     const internalExpandedKeys = ref<string[]>([]);
@@ -182,7 +176,7 @@ export default defineComponent({
 
     return {
       treeData,
-      isSameModel,
+      width,
 
       internalExpandedKeys,
       selectedKeys,
@@ -196,6 +190,7 @@ export default defineComponent({
     };
   },
   render() {
+    const { viewModel } = this;
     const treeComponent = createVNode(
       OioTree,
       {
@@ -241,7 +236,7 @@ export default defineComponent({
             ];
           }
           let rowActionsSlot = dataRef.value?.metadata?.rowActionsSlot;
-          if (!rowActionsSlot && this.isSameModel) {
+          if (!rowActionsSlot && dataRef.value?.metadata?.model === viewModel) {
             rowActionsSlot = this.$slots.rowActions;
           }
           if (rowActionsSlot) {
@@ -331,3 +326,9 @@ export default defineComponent({
   }
 });
 </script>
+<style lang="scss">
+.default-tree.default-tree-content-wrapper .oio-tree-wrapper {
+  width: v-bind('width');
+  flex-basis: v-bind('width');
+}
+</style>

package/src/view/tree/TreeWidget.ts

@@ -1,4 +1,4 @@
-import { ActiveRecord } from '@oinone/kunlun-engine';
+import { ActiveRecord, ExperimentalConfigManager } from '@oinone/kunlun-engine';
 import { ViewType } from '@oinone/kunlun-meta';
 import { SPI } from '@oinone/kunlun-spi';
 import { OioTreeNode } from '@oinone/kunlun-vue-ui-common';
@@ -18,7 +18,14 @@ export class TreeWidget extends AbstractTreeElementWidget {
   protected showContent = true;
 
   protected async onNodeSelected(node: OioTreeNode<TreeData>) {
-    await this.onSelectedForQuery(node);
+    if (ExperimentalConfigManager.treeWidgetNext()) {
+      const nodeModel = node.value.metadata?.model;
+      if (nodeModel === this.model.model) {
+        await this.onSelectedForQuery(node);
+      }
+    } else {
+      await this.onSelectedForQuery(node);
+    }
   }
 
   protected async onNodeUnselected(node: OioTreeNode<TreeData>) {

package/src/view/tree/style/index.scss

@@ -92,8 +92,6 @@
 
     .oio-tree-wrapper {
       position: relative;
-      width: 234px;
-      flex-basis: 234px;
     }
 
     .default-tree-content {