@oinone/kunlun-vue-admin-base 6.2.12 → 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/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.12",
+  "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.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",
+    "@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/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/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/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 {