@dt-frames/ui 2.0.16 → 2.0.18

package/es/components/table/index.less

@@ -27,6 +27,27 @@
 
 	.ant-table-empty {
 		border-bottom: 1px solid #f0f0f0;
+		.ant-table-cell {
+			border: none;
+		}
+	}
+
+	.ant-spin-nested-loading, .ant-spin-container {
+		height: 100%;
+	}
+
+	.ant-spin-container, .ant-table-container, .ant-table {
+		flex: 1;
+		display: flex;
+		flex-direction: column;
+	}
+
+	.ant-table, .ant-table-container {
+		height: 0;
+	}
+
+	.ant-table-body {
+		flex: 1;
 	}
 
 	.dt-pagination{
@@ -108,6 +129,14 @@
 			}
 		}
 	}
+
+	.primary-color-link{
+		color: @primary-color;
+		cursor: pointer;
+		&:hover{
+			text-decoration: underline;
+		}
+	}
 }
 
 .ant-table{

package/es/components/table/src/components/editTable/EditTableCell.d.ts

@@ -62,6 +62,7 @@ declare const _sfc_main: import("vue").DefineComponent<{
     handleChange: (e: any) => Promise<void>;
     handleSubmitRule: () => Promise<boolean>;
     handleOptionsChange: (options: LableValOptions) => void;
+    readonly omit: any;
     readonly CellComponent: import("vue").FunctionalComponent<{}, {}>;
 }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
     value: {

package/es/components/table/src/index.d.ts

@@ -91,10 +91,6 @@ declare const _sfc_main: import("vue").DefineComponent<{
         type: BooleanConstructor;
         default: boolean;
     };
-    canResize: {
-        type: BooleanConstructor;
-        default: boolean;
-    };
     pagination: {
         type: import("vue").PropType<Boolean | import("./types/table.type").PaginationProps>;
         default: any;
@@ -313,7 +309,6 @@ declare const _sfc_main: import("vue").DefineComponent<{
         showCheckboxColumn: boolean;
         expandActions: boolean;
         ellipsis: boolean;
-        canResize: boolean;
         onTableChange: Function;
         onDownload: Function;
         indexColumnProps: import("./types/table.type").BasicColumn[];
@@ -494,10 +489,6 @@ declare const _sfc_main: import("vue").DefineComponent<{
         type: BooleanConstructor;
         default: boolean;
     };
-    canResize: {
-        type: BooleanConstructor;
-        default: boolean;
-    };
     pagination: {
         type: import("vue").PropType<Boolean | import("./types/table.type").PaginationProps>;
         default: any;
@@ -611,7 +602,6 @@ declare const _sfc_main: import("vue").DefineComponent<{
     ellipsis: boolean;
     dataSource: import("@dt-frames/core").Recordable<any>[];
     bordered: boolean;
-    canResize: boolean;
     pagination: any;
     loading: boolean;
     scroll: {};

package/es/components/table/src/props.d.ts

@@ -95,10 +95,6 @@ export declare const TableProps: {
         type: BooleanConstructor;
         default: boolean;
     };
-    canResize: {
-        type: BooleanConstructor;
-        default: boolean;
-    };
     pagination: {
         type: PropType<Boolean | PaginationProps>;
         default: any;

package/es/components/table/src/types/table.type.d.ts

@@ -20,6 +20,14 @@ export declare type CellFormat = ((record: Recordable, index: Number, text: stri
     date: string;
 } | {
     percent: string;
+} | {
+    tag: (row: Recordable) => {
+        color: string;
+        text: string | number;
+    };
+} | {
+    link: (row: Recordable, index: number) => void;
+    text?: any;
 } | {
     [key: string]: Recordable;
 } | VNode | JSX.Element;

package/es/components/tree/index.js

@@ -2,7 +2,7 @@ import { Input, MenuItem, MenuDivider, Menu, Dropdown, Tree, Empty, Spin } from
 import "ant-design-vue/es/spin/style";
 import "ant-design-vue/es/empty/style";
 import "ant-design-vue/es/tree/style";
-import { unref, defineComponent, useSlots, ref, computed, watch, openBlock, createElementBlock, toDisplayString, createCommentVNode, renderSlot, createVNode, createBlock, withModifiers, withCtx, Fragment, renderList, normalizeProps, guardReactiveProps, createTextVNode, createElementVNode, onMounted, onUnmounted, isVNode, getCurrentInstance, render as render$2, useAttrs, reactive, toRaw, watchEffect, normalizeClass, createSlots, withDirectives, mergeProps, vShow } from "vue";
+import { unref, defineComponent, useSlots, ref, computed, watch, openBlock, createElementBlock, toDisplayString, createCommentVNode, renderSlot, createVNode, createBlock, withModifiers, withCtx, Fragment, renderList, normalizeProps, guardReactiveProps, createTextVNode, createElementVNode, onMounted, nextTick, onUnmounted, isVNode, getCurrentInstance, render as render$2, useAttrs, reactive, toRaw, watchEffect, normalizeClass, createSlots, withDirectives, mergeProps, vShow } from "vue";
 import { useI18n, useSlots as useSlots$1, isArray, isFunction, isEmpty, isBoolean } from "@dt-frames/core";
 import { cloneDeep, difference, omit, get } from "lodash-es";
 import "ant-design-vue/es/dropdown/style";
@@ -18,6 +18,9 @@ const BasicProps = {
   defaultExpandAll: {
     type: Boolean
   },
+  height: {
+    type: [Number, String]
+  },
   showIcon: {
     type: Boolean,
     default: false
@@ -94,9 +97,8 @@ const BasicProps = {
     type: [Boolean, String],
     default: false
   },
-  actionList: {
-    type: Array,
-    default: () => []
+  action: {
+    type: Function
   },
   clickRowToExpand: {
     type: Boolean,
@@ -189,13 +191,16 @@ const rightMenuProps = {
   items: {
     type: Array,
     default: () => []
+  },
+  node: {
+    type: Object
   }
 };
-function eachTree(treeDatas, callBack, parentNode = {}) {
+function eachTree(treeDatas, callBack, parentNode = {}, config = { children: "children" }) {
   treeDatas.forEach((el) => {
     const newNode = callBack(el, parentNode) || el;
-    if (el.children) {
-      eachTree(el.children, callBack, newNode);
+    if (el[config.children]) {
+      eachTree(el[config.children], callBack, newNode, config);
     }
   });
 }
@@ -385,6 +390,7 @@ function useTree(treeDataRef, getFieldNames, emit) {
     if (!key && key !== 0)
       return null;
     const treeData = list || unref(treeDataRef);
+    const { children: childrenField } = unref(getFieldNames);
     treeData.forEach((item) => {
       if (selectedNode?.key || selectedNode?.key === 0)
         return selectedNode;
@@ -392,8 +398,8 @@ function useTree(treeDataRef, getFieldNames, emit) {
         selectedNode = item;
         return;
       }
-      if (item.children && item.children.length) {
-        selectedNode = getSelectedNode(key, item.children, selectedNode);
+      if (item[childrenField] && item[childrenField].length) {
+        selectedNode = getSelectedNode(key, item[childrenField], selectedNode);
       }
     });
     return selectedNode || null;
@@ -403,12 +409,13 @@ function useTree(treeDataRef, getFieldNames, emit) {
     const dragKey = info.dragNode.key;
     const dropPos = info.node.pos.split("-");
     const dropPosition = info.dropPosition - Number(dropPos[dropPos.length - 1]);
+    const { children: childrenField } = unref(getFieldNames);
     const loop = (data2, key, callback) => {
       data2.forEach((item, index) => {
         if (item.key === key)
           return callback(item, index, data2);
-        if (item.children)
-          return loop(item.children, key, callback);
+        if (item[childrenField])
+          return loop(item[childrenField], key, callback);
       });
     };
     const data = [...treeDataRef.value];
@@ -419,13 +426,13 @@ function useTree(treeDataRef, getFieldNames, emit) {
     });
     if (!info.dropToGap) {
       loop(data, dropKey, (item) => {
-        item.children = item.children || [];
-        item.children.unshift(dragObj);
+        item[childrenField] = item[childrenField] || [];
+        item[childrenField].unshift(dragObj);
       });
     } else if ((info.node.children || []).length > 0 && info.node.expanded && dropPosition === 1) {
       loop(data, dropKey, (item) => {
-        item.children = item.children || [];
-        item.children.unshift(dragObj);
+        item[childrenField] = item[childrenField] || [];
+        item[childrenField].unshift(dragObj);
       });
     } else {
       let ar = [];
@@ -642,7 +649,7 @@ const _sfc_main$1 = defineComponent({
       showRef.value = false;
       e?.stopPropagation();
       e?.preventDefault();
-      handler?.();
+      handler?.(props.node);
     }
     function renderMenuItem(items) {
       const visibleItems = items.filter((item) => !item.hidden);
@@ -714,12 +721,12 @@ function useContextMenu() {
     }
   };
   function createContextMenu(options) {
-    const { event } = options || {};
+    const { event, node } = options || {};
     event && event?.preventDefault();
     return new Promise((resolve) => {
       const body = document.body;
       const container = document.createElement("div");
-      const propsData = {};
+      const propsData = { node };
       if (options.styles) {
         propsData.styles = options.styles;
       }
@@ -814,8 +821,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       t
     } = useI18n("UI");
     const {
-      getSlot,
-      extendSlots
+      getSlot
     } = useSlots$1();
     const {
       getUiSize
@@ -856,7 +862,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       if (!icon) {
         if (props.renderIcon && isFunction(props.renderIcon)) {
           return props.renderIcon(params);
-        } else if (params.children?.length) {
+        } else if (!params?.isLeaf) {
           return state.expandedKeys.includes(params.key) ? createVNode(ForderOpen, null, null) : createVNode(Forder, null, null);
         }
       }
@@ -866,16 +872,16 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     };
     const treeData = computed(() => {
       const data = cloneDeep(getTreeData.value);
+      const {
+        title: titleField,
+        key: keyField,
+        children: childrenField
+      } = unref(getFieldNames);
       eachTree(data, (item, _parent) => {
         const searchText = searchState.searchText;
         const {
           highlight
         } = unref(props);
-        const {
-          title: titleField,
-          key: keyField,
-          children: childrenField
-        } = unref(getFieldNames);
         const icon = getIcon(item, item.icon);
         const title = get(item, titleField);
         const searchIdx = searchText ? title.indexOf(searchText) : -1;
@@ -886,13 +892,17 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         }, [createVNode("span", null, [title.substr(0, searchIdx)]), createVNode("span", {
           "style": highlightStyle
         }, [searchText]), createVNode("span", null, [title.substr(searchIdx + searchText.length)])]) : title;
-        item._title = item.title;
+        item._title = item[titleField];
         item[titleField] = createVNode("span", {
-          "class": `tree-title ${unref(activeKey) === item[keyField] ? "tree-active-node" : ""}`,
+          "class": `tree-title ${unref(activeKey) === item[keyField] ? "tree-active-node" : ""}`
+        }, [slots?.title ? getSlot(slots, "title", item) : createVNode(Fragment, null, [createVNode("span", {
+          "class": "flex items-center flex-1",
           "onClick": handleClickNode.bind(null, item[keyField], item[childrenField], item)
-        }, [slots?.title ? getSlot(slots, "title", item) : createVNode(Fragment, null, [unref(getBindValues).showIcon && icon, titleDom, createVNode("span", {
+        }, [unref(getBindValues).showIcon && icon, titleDom]), createVNode("span", {
           "class": "tree-action"
         }, [renderAction(item)])])]);
+      }, {}, {
+        children: childrenField
       });
       return data;
     });
@@ -961,21 +971,12 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     }
     function renderAction(node) {
       const {
-        actionList
+        action
       } = props;
-      if (!actionList || actionList.length === 0)
-        return;
-      return actionList.map((item, index) => {
-        let nodeShow = true;
-        if (isFunction(item.show)) {
-          nodeShow = item.show?.(node);
-        } else if (isBoolean(item.show)) {
-          nodeShow = item.show;
-        }
-        if (!nodeShow)
-          return null;
-        return createVNode(Fragment, null, [item.render(node)]);
-      });
+      if (action && isFunction(action)) {
+        return createVNode(Fragment, null, [action(node)]);
+      }
+      return null;
     }
     function handleSearch(searchValue) {
       if (searchValue !== searchState.searchText)
@@ -1022,7 +1023,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       } = props;
       let contextMenuOptions = {
         event,
-        items: []
+        items: [],
+        node
       };
       if (beforeRightClick && isFunction(beforeRightClick)) {
         let result = await beforeRightClick(node, event);

package/es/components/tree/index.less

@@ -56,6 +56,13 @@
                 background-color: @primary-color-hover;
             }
         }
+
+        .anticon-file {
+            opacity: 0.6;
+            svg{
+                width: 12px;
+            }
+        }
     }
 
     .toolbar{
@@ -112,6 +119,12 @@
                 font-size: 14px;
                 line-height: 36px;
             }
+
+            .anticon-file {
+                svg{
+                    width: 13px;
+                }
+            }
         }
     }
 }

package/es/components/tree/src/basicProps.d.ts

@@ -1,6 +1,6 @@
 import { CSSProperties, PropType } from "vue";
 import { Recordable } from "@dt-frames/core";
-import { KeyType, CheckKeys, FieldNames, TreeActionItem, TreeItem } from './type/tree';
+import { KeyType, CheckKeys, FieldNames, TreeItem } from './type/tree';
 import { Axis, ContextMenuItem } from "./type/menu";
 export declare const BasicProps: {
     defaultExpandLevel: {
@@ -9,6 +9,9 @@ export declare const BasicProps: {
     defaultExpandAll: {
         type: BooleanConstructor;
     };
+    height: {
+        type: PropType<String | Number>;
+    };
     showIcon: {
         type: BooleanConstructor;
         default: boolean;
@@ -85,9 +88,8 @@ export declare const BasicProps: {
         type: PropType<String | Boolean>;
         default: boolean;
     };
-    actionList: {
-        type: PropType<TreeActionItem[]>;
-        default: () => any[];
+    action: {
+        type: PropType<(record: Recordable) => any>;
     };
     clickRowToExpand: {
         type: BooleanConstructor;
@@ -182,4 +184,7 @@ export declare const rightMenuProps: {
         type: PropType<ContextMenuItem[]>;
         default: () => any[];
     };
+    node: {
+        type: PropType<Recordable<any>>;
+    };
 };

package/es/components/tree/src/components/ContextMenu.d.ts

@@ -27,6 +27,9 @@ declare const _sfc_main: import("vue").DefineComponent<{
         type: import("vue").PropType<ContextMenuItem[]>;
         default: () => any[];
     };
+    node: {
+        type: import("vue").PropType<import("@dt-frames/core").Recordable<any>>;
+    };
 }, () => JSX.Element, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
     width: {
         type: NumberConstructor;
@@ -54,6 +57,9 @@ declare const _sfc_main: import("vue").DefineComponent<{
         type: import("vue").PropType<ContextMenuItem[]>;
         default: () => any[];
     };
+    node: {
+        type: import("vue").PropType<import("@dt-frames/core").Recordable<any>>;
+    };
 }>>, {
     showIcon: boolean;
     width: number;

package/es/components/tree/src/index.d.ts

@@ -8,6 +8,9 @@ declare const _sfc_main: import("vue").DefineComponent<{
     defaultExpandAll: {
         type: BooleanConstructor;
     };
+    height: {
+        type: import("vue").PropType<String | Number>;
+    };
     showIcon: {
         type: BooleanConstructor;
         default: boolean;
@@ -84,9 +87,8 @@ declare const _sfc_main: import("vue").DefineComponent<{
         type: import("vue").PropType<String | Boolean>;
         default: boolean;
     };
-    actionList: {
-        type: import("vue").PropType<import("./type/tree").TreeActionItem[]>;
-        default: () => any[];
+    action: {
+        type: import("vue").PropType<(record: Recordable<any>) => any>;
     };
     clickRowToExpand: {
         type: BooleanConstructor;
@@ -137,9 +139,6 @@ declare const _sfc_main: import("vue").DefineComponent<{
     }>, slot?: string, data?: any) => import("vue").VNode<import("vue").RendererNode, import("vue").RendererElement, {
         [key: string]: any;
     }>[];
-    extendSlots: (slots: Readonly<{
-        [name: string]: import("vue").Slot;
-    }>, excludeKeys?: string[]) => any;
     getUiSize: import("vue").ComputedRef<import('../../../theme').UiSize>;
     props: any;
     attrs: {
@@ -6329,7 +6328,7 @@ declare const _sfc_main: import("vue").DefineComponent<{
     getBindValues: import("vue").ComputedRef<any>;
     showTitle: import("vue").ComputedRef<string | true | import("vue").Slot>;
     handleClickNode: (key: string, children: TreeItem[], node: TreeItem) => void;
-    renderAction: (node: TreeItem) => JSX.Element[];
+    renderAction: (node: TreeItem) => JSX.Element;
     handleSearch: (searchValue: string) => void;
     createContextMenu: ((options: CreateContextOptions) => Promise<unknown>) | (() => void);
     handleRightClick: ({ event, node }: Recordable) => Promise<void>;
@@ -6459,6 +6458,9 @@ declare const _sfc_main: import("vue").DefineComponent<{
     defaultExpandAll: {
         type: BooleanConstructor;
     };
+    height: {
+        type: import("vue").PropType<String | Number>;
+    };
     showIcon: {
         type: BooleanConstructor;
         default: boolean;
@@ -6535,9 +6537,8 @@ declare const _sfc_main: import("vue").DefineComponent<{
         type: import("vue").PropType<String | Boolean>;
         default: boolean;
     };
-    actionList: {
-        type: import("vue").PropType<import("./type/tree").TreeActionItem[]>;
-        default: () => any[];
+    action: {
+        type: import("vue").PropType<(record: Recordable<any>) => any>;
     };
     clickRowToExpand: {
         type: BooleanConstructor;
@@ -6606,7 +6607,6 @@ declare const _sfc_main: import("vue").DefineComponent<{
     checkedKeys: CheckKeys;
     beforeRightClick: (...arg: any) => import("./type/menu").ContextMenuItem[];
     highlight: String | Boolean;
-    actionList: import("./type/tree").TreeActionItem[];
     clickRowToExpand: boolean;
     searchValue: string;
     filterFn: (searchValue: any, node: TreeItem, fieldNames: FieldNames) => boolean;

package/es/components/tree/src/type/menu.d.ts

@@ -1,3 +1,4 @@
+import { Recordable } from "@dt-frames/core";
 export interface Axis {
     x: number;
     y: number;
@@ -21,6 +22,7 @@ export interface CreateContextOptions {
     icon?: string;
     styles?: any;
     items?: ContextMenuItem[];
+    node?: Recordable;
 }
 export interface ContextMenuProps {
     event?: MouseEvent;
@@ -30,4 +32,5 @@ export interface ContextMenuProps {
     axis?: Axis;
     width?: number;
     showIcon?: boolean;
+    node?: Recordable;
 }

package/es/components/tree/src/type/tree.d.ts

@@ -1,4 +1,3 @@
-import { Recordable } from "@dt-frames/core";
 import { TreeDataItem } from "ant-design-vue/lib/tree/Tree";
 export declare type KeyType = string | number;
 export declare type CheckKeys = KeyType[] | {
@@ -10,10 +9,6 @@ export interface FieldNames {
     title?: string;
     key?: string;
 }
-export interface TreeActionItem {
-    render: (record: Recordable) => any;
-    show?: boolean | ((record: Recordable) => boolean);
-}
 export interface TreeItem extends TreeDataItem {
     icon?: any;
 }

package/es/components/tree/src/utils/tree.d.ts

@@ -1,5 +1,7 @@
 import { TreeHelperConfig } from "../type/tree";
-export declare function eachTree(treeDatas: any[], callBack: Function, parentNode?: {}): void;
+export declare function eachTree(treeDatas: any[], callBack: Function, parentNode?: {}, config?: {
+    children: string;
+}): void;
 export declare function forEach<T = any>(tree: T[], func: (n: T) => any, config?: Partial<TreeHelperConfig>): void;
 export declare function filter<T = any>(tree: T[], func: (n: T) => boolean, config?: Partial<TreeHelperConfig>): T[];
 export declare function treeToList<T = any>(tree: any, config?: Partial<TreeHelperConfig>): T;