@ticatec/uniface-element 0.1.46 → 0.1.48

package/dist/lib/TreeNodes.d.ts

@@ -1,41 +1,62 @@
 export declare function compareNumber(a: number, b: number): 0 | 1 | -1;
 export type TreeNode<T> = {
     item: T;
-    expand: boolean;
+    expand?: boolean;
     children?: TreeNode<T>[];
 };
 export type CheckIsRoot<T> = (data: T) => boolean;
 export type CompareFun<T> = (o1: T, o2: T) => number | undefined;
 export type GetText<T> = (data: T) => string;
+export type CheckIsDirectory<T> = (node: TreeNode<T>) => boolean;
 export interface TreeNodeOptions<T> {
     keyField?: keyof T;
     textField?: keyof T | GetText<T>;
     parentKeyField?: keyof T;
     checkIsRoot: CheckIsRoot<T>;
-    compareFun: CompareFun<T>;
-    expendDeep?: number;
+    checkIsDirectory?: CheckIsDirectory<T>;
+    compareFun?: CompareFun<T>;
+    expendDepth?: number;
 }
-export default class TreeNodes<T> {
-    #private;
+export declare class CommonTreeNodes<T> {
     protected readonly checkIsRoot: CheckIsRoot<T>;
     protected readonly keyField: keyof T;
     protected readonly parentKeyField: keyof T;
     protected readonly textField: keyof T | GetText<T>;
+    protected readonly checkIsDirectory: CheckIsDirectory<T> | undefined;
     protected nodeMap: Map<any, TreeNode<T>>;
-    protected compareFun: any;
-    protected expendDeep: number;
+    protected compareFun: any | undefined;
+    protected expendDepth: number;
+    protected _nodes: Array<TreeNode<T>>;
     constructor(options: TreeNodeOptions<T>);
     setData(list: Array<T>): void;
-    private appendNode;
-    private collectExpandedNodes;
+    /**
+     * 获取节点
+     */
+    get nodes(): Array<TreeNode<T>>;
+    /**
+     * 设置展开层级
+     * @param nodes
+     * @param currentLevel
+     * @protected
+     */
+    protected setExpandForDepth(nodes: TreeNode<T>[], currentLevel: number): void;
+    /**
+     * 添加一个节点
+     * @param node
+     * @param doSort
+     * @protected
+     */
+    protected appendNode(node: TreeNode<T>, doSort?: boolean): void;
+}
+export default class TreeNodes<T> extends CommonTreeNodes<T> {
     /**
      * 获取展开的展示列表
      */
     getHierarchyList(): Array<TreeNode<T>>;
     /**
-     * 获取节点
+     * 给treeview设定数据，根据数据构建树结构
+     * @param list
      */
-    get nodes(): Array<TreeNode<T>>;
     /**
      * 增加一个新节点
      * @param item
@@ -53,6 +74,15 @@ export default class TreeNodes<T> {
      * @param parentId
      */
     moveTo(item: T, parentId: string): void;
-    private extractChildrenDirectories;
-    extractDirectories(exclusiveValue: any): TreeNode<T>[];
+    /**
+     * 获取除指定节点外的其他节点
+     * @param exclusiveData
+     */
+    extractDirectories(exclusiveData: T): TreeNode<T>[];
+    /**
+     * 获取所有展开的节点
+     * @param tree
+     * @private
+     */
+    private collectExpandedNodes;
 }

package/dist/lib/TreeNodes.js

@@ -1,15 +1,16 @@
 export function compareNumber(a, b) {
     return a === b ? 0 : a > b ? 1 : -1;
 }
-export default class TreeNodes {
+export class CommonTreeNodes {
     checkIsRoot;
     keyField;
     parentKeyField;
     textField;
+    checkIsDirectory;
     nodeMap;
     compareFun;
-    expendDeep;
-    #nodes = [];
+    expendDepth;
+    _nodes = [];
     constructor(options) {
         this.checkIsRoot = options.checkIsRoot;
         this.compareFun = options.compareFun;
@@ -17,16 +18,17 @@ export default class TreeNodes {
         this.textField = options.textField ?? 'text';
         this.parentKeyField = options.parentKeyField ?? 'parentId';
         this.nodeMap = new Map();
-        this.expendDeep = options.expendDeep ?? 999;
+        this.expendDepth = options.expendDepth ?? 1;
+        this.checkIsDirectory = options.checkIsDirectory;
     }
     setData(list) {
         this.nodeMap = new Map();
-        this.#nodes = [];
+        this._nodes = [];
         // 初始化每个节点
         for (const item of list) {
             const node = {
                 item,
-                expand: true
+                expand: false
             };
             const key = item[this.keyField];
             this.nodeMap.set(key, node);
@@ -37,12 +39,41 @@ export default class TreeNodes {
                 this.appendNode(node);
             }
         }
+        if (this.expendDepth > 1) {
+            this.setExpandForDepth(this.nodes, 0);
+        }
+    }
+    /**
+     * 获取节点
+     */
+    get nodes() {
+        return this._nodes;
     }
+    /**
+     * 设置展开层级
+     * @param nodes
+     * @param currentLevel
+     * @protected
+     */
+    setExpandForDepth(nodes, currentLevel) {
+        for (const node of nodes) {
+            node.expand = currentLevel < this.expendDepth;
+            if (node.children) {
+                this.setExpandForDepth(node.children, currentLevel + 1);
+            }
+        }
+    }
+    /**
+     * 添加一个节点
+     * @param node
+     * @param doSort
+     * @protected
+     */
     appendNode(node, doSort = false) {
         let item = node.item;
         const parentKey = item[this.parentKeyField];
-        if (this.checkIsRoot(item) || !this.nodeMap.has(parentKey)) {
-            this.#nodes.push(node);
+        if (this.checkIsRoot(item)) { //|| !this.nodeMap.has(parentKey)
+            this._nodes.push(node);
         }
         else {
             const parentNode = this.nodeMap.get(parentKey);
@@ -53,33 +84,23 @@ export default class TreeNodes {
                     parentNode.children = parentNode.children.sort(this.compareFun);
                 }
             }
-        }
-    }
-    collectExpandedNodes(tree) {
-        const result = [];
-        function traverse(nodes) {
-            for (const node of nodes) {
-                result.push(node);
-                if (node.expand && node.children) {
-                    traverse(node.children);
-                }
+            else {
+                console.warn('Ignore the isolate item:', item);
             }
         }
-        traverse(tree);
-        return result;
     }
+}
+export default class TreeNodes extends CommonTreeNodes {
     /**
      * 获取展开的展示列表
      */
     getHierarchyList() {
-        return this.collectExpandedNodes(this.#nodes);
+        return this.collectExpandedNodes(this._nodes);
     }
     /**
-     * 获取节点
+     * 给treeview设定数据，根据数据构建树结构
+     * @param list
      */
-    get nodes() {
-        return this.#nodes;
-    }
     /**
      * 增加一个新节点
      * @param item
@@ -140,33 +161,42 @@ export default class TreeNodes {
             }
         }
     }
-    extractChildrenDirectories(node, exclusiveValue) {
-        if (node.children && node.item[this.keyField] != exclusiveValue) {
-            let newNode = {
-                item: node.item,
-                expand: true,
-                children: []
-            };
-            for (let childNode of node.children) {
-                let ncNode = this.extractChildrenDirectories(childNode, exclusiveValue);
-                if (ncNode) {
-                    newNode.children?.push(ncNode);
+    /**
+     * 获取除指定节点外的其他节点
+     * @param exclusiveData
+     */
+    extractDirectories(exclusiveData) {
+        const getNodes = (nodes, item) => {
+            let list = [];
+            for (let node of nodes) {
+                if (node.item != item && this.checkIsDirectory?.(node)) {
+                    list.push({
+                        item: node.item,
+                        expand: true,
+                        children: getNodes(node.children ?? [], item)
+                    });
                 }
             }
-            return newNode;
-        }
-        else {
-            return;
-        }
+            return list;
+        };
+        return getNodes(this.nodes, exclusiveData);
     }
-    extractDirectories(exclusiveValue) {
-        let dirNodes = [];
-        for (let node of this.nodes) {
-            let newNode = this.extractChildrenDirectories(node, exclusiveValue);
-            if (newNode) {
-                dirNodes.push(newNode);
+    /**
+     * 获取所有展开的节点
+     * @param tree
+     * @private
+     */
+    collectExpandedNodes(tree) {
+        const result = [];
+        function traverse(nodes) {
+            for (const node of nodes) {
+                result.push(node);
+                if (node.expand && node.children) {
+                    traverse(node.children);
+                }
             }
         }
-        return dirNodes;
+        traverse(tree);
+        return result;
     }
 }

package/dist/lib/index.d.ts

@@ -0,0 +1,9 @@
+import TreeNodes from "./TreeNodes";
+import type { TreeNode } from "./TreeNodes";
+import { CommonTreeNodes } from "./TreeNodes";
+import type { CheckIsRoot, CompareFun, GetText, CheckIsDirectory, TreeNodeOptions } from "./TreeNodes";
+import { compareNumber } from "./TreeNodes";
+export default TreeNodes;
+export { CommonTreeNodes, compareNumber };
+export type { TreeNode };
+export type { CheckIsRoot, CompareFun, GetText, CheckIsDirectory, TreeNodeOptions };

package/dist/lib/index.js

@@ -0,0 +1,5 @@
+import TreeNodes from "./TreeNodes";
+import { CommonTreeNodes } from "./TreeNodes";
+import { compareNumber } from "./TreeNodes";
+export default TreeNodes;
+export { CommonTreeNodes, compareNumber };

package/dist/nav-menu/MenuItem.d.ts

@@ -1,27 +1,4 @@
-export default interface MenuItem {
-    /**
-     * 菜单编码
-     */
-    code?: string;
-    /**
-     * 菜单文字
-     */
-    text: string;
-    /**
-     * 用于i18n的key
-     */
-    key?: string;
-    /**
-     * 绑定数据，用户处理，通常为uri的跳转地址
-     */
-    data?: any;
-    /**
-     * 子菜单项
-     */
-    children?: Array<MenuItem>;
-    /**
-     * 是否打开
-     */
-    expand?: boolean;
+import type { TreeNode } from "../lib/TreeNodes";
+export default interface MenuItem extends TreeNode<any> {
 }
 export type OnMenuClick = (item: MenuItem) => void;

package/dist/nav-menu/Menus.d.ts

@@ -0,0 +1,8 @@
+import { CommonTreeNodes } from "../lib/TreeNodes";
+import type MenuItem from "./MenuItem";
+export default class Menus extends CommonTreeNodes<MenuItem> {
+    /**
+     * 删除所有没有子节点的目录类型节点
+     */
+    removeEmptyDirectory(): void;
+}

package/dist/nav-menu/Menus.js

@@ -0,0 +1,23 @@
+import { CommonTreeNodes } from "../lib/TreeNodes";
+export default class Menus extends CommonTreeNodes {
+    /**
+     * 删除所有没有子节点的目录类型节点
+     */
+    removeEmptyDirectory() {
+        const removeRecursive = (nodes) => {
+            for (let i = nodes.length - 1; i >= 0; i--) {
+                const node = nodes[i];
+                if (node.children && node.children.length > 0) {
+                    removeRecursive(node.children); // 先处理子节点
+                }
+                else {
+                    if (this.checkIsDirectory?.(node)) {
+                        nodes.splice(i, 1); // 从父节点的 children 中移除
+                        this.nodeMap.delete(node.item[this.keyField]); // 从 nodeMap 中移除
+                    }
+                }
+            }
+        };
+        removeRecursive(this._nodes);
+    }
+}

package/dist/nav-menu/NavigatorMenu.svelte

@@ -2,20 +2,25 @@
     import type MenuItem from "./MenuItem";
     import type {OnMenuClick} from "./MenuItem";
     import NavigatorMenuItem from "./NavigatorMenuItem.svelte";
+    import type {GetText} from "../lib/TreeNodes";
 
     export let menuItems: Array<MenuItem>;
     export let style: string = '';
+
+    export let textField: string | GetText<MenuItem>;
+
     export let onItemClick: OnMenuClick;
 
 
+
 </script>
 
 
 <div class="uniface-navigator-menu-panel" {style}>
     {#if menuItems && menuItems.length > 0}
         <ul>
-            {#each menuItems as item}
-                <NavigatorMenuItem {item} onMenuItemClick={onItemClick} expand={item.expand}/>
+            {#each menuItems as menu}
+                <NavigatorMenuItem {menu} onMenuItemClick={onItemClick} {textField}/>
             {/each}
         </ul>
     {/if}

package/dist/nav-menu/NavigatorMenu.svelte.d.ts

@@ -1,5 +1,6 @@
 import type MenuItem from "./MenuItem";
 import type { OnMenuClick } from "./MenuItem";
+import type { GetText } from "../lib/TreeNodes";
 interface $$__sveltets_2_IsomorphicComponent<Props extends Record<string, any> = any, Events extends Record<string, any> = any, Slots extends Record<string, any> = any, Exports = {}, Bindings = string> {
     new (options: import('svelte').ComponentConstructorOptions<Props>): import('svelte').SvelteComponent<Props, Events, Slots> & {
         $$bindings?: Bindings;
@@ -16,6 +17,7 @@ interface $$__sveltets_2_IsomorphicComponent<Props extends Record<string, any> =
 declare const NavigatorMenu: $$__sveltets_2_IsomorphicComponent<{
     menuItems: Array<MenuItem>;
     style?: string;
+    textField: string | GetText<MenuItem>;
     onItemClick: OnMenuClick;
 }, {
     [evt: string]: CustomEvent<any>;

package/dist/nav-menu/NavigatorMenuItem.svelte

@@ -3,19 +3,17 @@
     import {slide} from "svelte/transition";
     import type MenuItem from "./MenuItem";
     import type {OnMenuClick} from "./MenuItem";
-    import i18n from "@ticatec/i18n";
+    import type {GetText} from "../lib/TreeNodes";
 
-    export let item: MenuItem;
-    export let expand: boolean = false;
-
-    export let onMenuItemClick: OnMenuClick;
+    export let menu: MenuItem;
+    export let textField: string | GetText<MenuItem>;
 
+    let expand: boolean = menu.expand == true;
 
-    let expandable: boolean;
+    export let onMenuItemClick: OnMenuClick;
 
-    $: {
-        expandable = item.children != null && item.children.length > 0
-    }
+    $: expandable = menu.children != null && menu.children.length > 0
+    $: menuText = typeof textField == 'string' ? menu.item?.[textField]??'Unknown item' : textField(menu.item);
 
     let respond: boolean = true;
     const handleMenuItemClick = () => {
@@ -23,10 +21,10 @@
             respond = false;
             setTimeout(() => respond = true, 200);
             if (expandable) {
-                item.expand = !item.expand;
+                menu.expand = !menu.expand;
                 expand = !expand;
             } else {
-                onMenuItemClick?.(item);
+                onMenuItemClick?.(menu);
             }
         }
 
@@ -34,12 +32,12 @@
 
 </script>
 <li class:expandable class:fold={!expand}>
-    <span on:click={handleMenuItemClick} aria-hidden="true">{item.key ? i18n.getText(item.key, item.text) : item.text}</span>
-    {#if item.children}
+    <span on:click={handleMenuItemClick} aria-hidden="true">{menuText}</span>
+    {#if menu.children}
         {#if expand}
             <ul transition:slide={{duration: 200}}>
-                {#each item.children as el}
-                    <svelte:self item={el} {onMenuItemClick}/>
+                {#each menu.children as el}
+                    <svelte:self menu={el} {onMenuItemClick} {textField}/>
                 {/each}
             </ul>
         {/if}

package/dist/nav-menu/NavigatorMenuItem.svelte.d.ts

@@ -1,5 +1,6 @@
 import type MenuItem from "./MenuItem";
 import type { OnMenuClick } from "./MenuItem";
+import type { GetText } from "../lib/TreeNodes";
 interface $$__sveltets_2_IsomorphicComponent<Props extends Record<string, any> = any, Events extends Record<string, any> = any, Slots extends Record<string, any> = any, Exports = {}, Bindings = string> {
     new (options: import('svelte').ComponentConstructorOptions<Props>): import('svelte').SvelteComponent<Props, Events, Slots> & {
         $$bindings?: Bindings;
@@ -14,8 +15,8 @@ interface $$__sveltets_2_IsomorphicComponent<Props extends Record<string, any> =
     z_$$bindings?: Bindings;
 }
 declare const NavigatorMenuItem: $$__sveltets_2_IsomorphicComponent<{
-    item: MenuItem;
-    expand?: boolean;
+    menu: MenuItem;
+    textField: string | GetText<MenuItem>;
     onMenuItemClick: OnMenuClick;
 }, {
     [evt: string]: CustomEvent<any>;

package/dist/nav-menu/index.d.ts

@@ -1,5 +1,7 @@
 import NavigatorMenu from "./NavigatorMenu.svelte";
 import type MenuItem from "./MenuItem";
 import type { OnMenuClick } from "./MenuItem";
+import Menus from "./Menus";
 export default NavigatorMenu;
 export type { MenuItem, OnMenuClick };
+export { Menus };

package/dist/nav-menu/index.js

@@ -1,2 +1,4 @@
 import NavigatorMenu from "./NavigatorMenu.svelte";
+import Menus from "./Menus";
 export default NavigatorMenu;
+export { Menus };

package/dist/tree-view/TreeNodeView.svelte

@@ -1,25 +1,26 @@
 <script lang="ts">
-    import type TreeNode from "./TreeNode";
-    import type {LazyLoader, NodeVisibleFun, OnNodeSelectionChange} from "./TreeNode";
+
+    import type {LazyLoader, NodeVisibleFun, OnNodeSelectionChange} from "./Types";
     import iconLoading from "../assets/loading.gif"
     import utils from "../common/utils";
     import type {OnContextMenu} from "../context-menu/ContextMenuItem";
+    import type {CheckIsDirectory, GetText, TreeNode} from "../lib/TreeNodes";
 
-    export let node: TreeNode;
+    export let node: TreeNode<any>;
+    export let textField: string | GetText<any>;
     export let lazyLoader: LazyLoader | null;
     export let activeNode: any;
     export let isVisible: NodeVisibleFun;
-    export let level: number = 1;
-    export let dispLevels: number = 1;
     export let onContextMenu: OnContextMenu;
     export let onNodeSelectionChange: OnNodeSelectionChange;
 
+    export let checkIsDirectory: CheckIsDirectory<TreeNode<any>>;
 
-    let expanded: boolean = dispLevels <= level;
     let loading: boolean = false;
 
-    const isBranch = () => {
-        return lazyLoader == null ? (node.children && node.children.length > 0) : lazyLoader.isBranch(node);
+    const isDirectory = () => {
+        console.log('检测目录函数', checkIsDirectory);
+        return lazyLoader == null ? checkIsDirectory?.(node) : lazyLoader.isBranch(node);
     }
 
     const loadChildren = async () => {
@@ -38,11 +39,13 @@
         e.preventDefault();
         if (respond) {
             respond = false;
-            if (isBranch()) {
-                expanded = !expanded;
-                await loadChildren();
+            if (isDirectory()) {
+                if (!node.children) {
+                    node.expand = false;
+                    await loadChildren();
+                }
+                node.expand = !node.expand;
             }
-            dispLevels = expanded ? level + 1 : level;
             await utils.sleep(0.2);
             respond = true;
         }
@@ -58,7 +61,6 @@
         }
     }
 
-    $: expanded = dispLevels > level;
 
     const handleContextMenu = (event: MouseEvent) => {
         onContextMenu?.(event, node);
@@ -68,25 +70,25 @@
 
 
 {#if isVisible == null || isVisible(node)}
-    <div class="tree-node" class:expanded>
+    <div class="tree-node" class:expanded={node.expand}>
         <div class="node-item" class:selected={activeNode===node} on:click={handleNodeClick} aria-hidden="true"
              on:contextmenu={handleContextMenu}>
             <div class="item-icon">
-                {#if isBranch()}
+                {#if isDirectory()}
                     {#if loading}
                         <img alt="" style="cursor: default" src={iconLoading}/>
                     {:else }
-                        <span aria-hidden="true" on:click={handleNodeIconClick}>{expanded ? '▼' : '▶'}</span>
+                        <span aria-hidden="true" on:click={handleNodeIconClick}>{node.expand ? '▼' : '▶'}</span>
                     {/if}
                 {/if}
             </div>
-            <span class="item-text">{node.text}</span>
+            <span class="item-text">{typeof textField == "string" ? node.item[textField] : textField(node.item)}</span>
         </div>
-        {#if expanded && node.children}
+        {#if node.expand && node.children}
             <div class="sub-tree">
                 {#each node.children as child}
-                    <svelte:self node={child} {lazyLoader} {onContextMenu}
-                                 {dispLevels} {isVisible} level={level+1} {activeNode} {onNodeSelectionChange}/>
+                    <svelte:self node={child} {lazyLoader} {onContextMenu} {textField} {checkIsDirectory}
+                                 {isVisible} {activeNode} {onNodeSelectionChange}/>
                 {/each}
             </div>
         {/if}

package/dist/tree-view/TreeNodeView.svelte.d.ts

@@ -1,6 +1,6 @@
-import type TreeNode from "./TreeNode";
-import type { LazyLoader, NodeVisibleFun, OnNodeSelectionChange } from "./TreeNode";
+import type { LazyLoader, NodeVisibleFun, OnNodeSelectionChange } from "./Types";
 import type { OnContextMenu } from "../context-menu/ContextMenuItem";
+import type { CheckIsDirectory, GetText, TreeNode } from "../lib/TreeNodes";
 interface $$__sveltets_2_IsomorphicComponent<Props extends Record<string, any> = any, Events extends Record<string, any> = any, Slots extends Record<string, any> = any, Exports = {}, Bindings = string> {
     new (options: import('svelte').ComponentConstructorOptions<Props>): import('svelte').SvelteComponent<Props, Events, Slots> & {
         $$bindings?: Bindings;
@@ -15,14 +15,14 @@ interface $$__sveltets_2_IsomorphicComponent<Props extends Record<string, any> =
     z_$$bindings?: Bindings;
 }
 declare const TreeNodeView: $$__sveltets_2_IsomorphicComponent<{
-    node: TreeNode;
+    node: TreeNode<any>;
+    textField: string | GetText<any>;
     lazyLoader: LazyLoader | null;
     activeNode: any;
     isVisible: NodeVisibleFun;
-    level?: number;
-    dispLevels?: number;
     onContextMenu: OnContextMenu;
     onNodeSelectionChange: OnNodeSelectionChange;
+    checkIsDirectory: CheckIsDirectory<TreeNode<any>>;
 }, {
     [evt: string]: CustomEvent<any>;
 }, {}, {}, string>;

package/dist/tree-view/TreeView.svelte

@@ -1,12 +1,14 @@
 <script lang="ts">
 
-    import type TreeNode from "./TreeNode";
-    import type {LazyLoader, NodeVisibleFun, OnNodeSelectionChange} from "./TreeNode";
+
+    import type {LazyLoader, NodeVisibleFun, OnNodeSelectionChange} from "./Types";
     import TreeNodeView from "./TreeNodeView.svelte";
     import type {OnContextMenu} from "../context-menu/ContextMenuItem";
+    import type {CheckIsDirectory, GetText, TreeNode} from "../lib/TreeNodes";
 
 
-    export let nodes: Array<TreeNode>;
+    export let nodes: Array<TreeNode<any>>;
+    export let textField: string | GetText<any>;
     export let style: string = "";
     export let lazyLoader: LazyLoader | null = null;
     export let activeNode: any = null;
@@ -14,10 +16,10 @@
     export let isVisible: NodeVisibleFun = null as unknown as NodeVisibleFun;
     export let onSelectionChange: OnNodeSelectionChange = null as unknown as OnNodeSelectionChange;
     export let onContextMenu: OnContextMenu = null as unknown as OnContextMenu;
-
+    export let checkIsDirectory: CheckIsDirectory<any>;
     let className: string = "";
 
-    const onNodeSelectionChange = async (node: TreeNode): Promise<boolean> => {
+    const onNodeSelectionChange = async (node: TreeNode<any>): Promise<boolean> => {
         let accept: boolean = (await onSelectionChange?.(node));
         accept = accept == null ? true : accept;
         if (accept == null || accept == true) {
@@ -30,7 +32,7 @@
 <div class="uniface-tree-view {className}" {style}>
     <div>
         {#each nodes as node}
-            <TreeNodeView {activeNode} {node} {lazyLoader} {isVisible} {onNodeSelectionChange} {onContextMenu}/>
+            <TreeNodeView {activeNode} {node} {textField} {lazyLoader} {onNodeSelectionChange} {isVisible} {checkIsDirectory} {onContextMenu}/>
         {/each}
     </div>
 </div>

package/dist/tree-view/TreeView.svelte.d.ts

@@ -1,6 +1,6 @@
-import type TreeNode from "./TreeNode";
-import type { LazyLoader, NodeVisibleFun, OnNodeSelectionChange } from "./TreeNode";
+import type { LazyLoader, NodeVisibleFun, OnNodeSelectionChange } from "./Types";
 import type { OnContextMenu } from "../context-menu/ContextMenuItem";
+import type { CheckIsDirectory, GetText, TreeNode } from "../lib/TreeNodes";
 interface $$__sveltets_2_IsomorphicComponent<Props extends Record<string, any> = any, Events extends Record<string, any> = any, Slots extends Record<string, any> = any, Exports = {}, Bindings = string> {
     new (options: import('svelte').ComponentConstructorOptions<Props>): import('svelte').SvelteComponent<Props, Events, Slots> & {
         $$bindings?: Bindings;
@@ -15,7 +15,8 @@ interface $$__sveltets_2_IsomorphicComponent<Props extends Record<string, any> =
     z_$$bindings?: Bindings;
 }
 declare const TreeView: $$__sveltets_2_IsomorphicComponent<{
-    nodes: Array<TreeNode>;
+    nodes: Array<TreeNode<any>>;
+    textField: string | GetText<any>;
     style?: string;
     lazyLoader?: LazyLoader | null;
     activeNode?: any;
@@ -23,6 +24,7 @@ declare const TreeView: $$__sveltets_2_IsomorphicComponent<{
     isVisible?: NodeVisibleFun;
     onSelectionChange?: OnNodeSelectionChange;
     onContextMenu?: OnContextMenu;
+    checkIsDirectory: CheckIsDirectory<any>;
 }, {
     [evt: string]: CustomEvent<any>;
 }, {}, {

package/dist/tree-view/Types.d.ts

@@ -0,0 +1,23 @@
+import type { CheckIsDirectory, TreeNode } from "../lib/TreeNodes";
+export type OnNodeSelectionChange = (node: TreeNode<any>) => Promise<boolean>;
+/**
+ * 节点是否显示
+ */
+export type NodeVisibleFun = (node: TreeNode<any>) => boolean;
+/**
+ * 加载子节点
+ */
+export type LoadChildrenFun = (item: TreeNode<any>) => Promise<Array<TreeNode<any>>>;
+/**
+ * 按需数据加载器
+ */
+export interface LazyLoader {
+    /**
+     * 检查是否是枝节点
+     */
+    isBranch: CheckIsDirectory<any>;
+    /**
+     * 数据加载器
+     */
+    load: LoadChildrenFun;
+}

package/dist/tree-view/index.d.ts

@@ -1,7 +1,4 @@
 import TreeView from "./TreeView.svelte";
-import type TreeNode from "./TreeNode";
-import type { LazyLoader, NodeVisibleFun, OnNodeSelectionChange, CheckBranchFun, LoadChildrenFun, NodeLevelCompare, RootDetermine } from "./TreeNode";
-import treeUtils from "./TreeUtils";
+import type { LazyLoader, NodeVisibleFun, OnNodeSelectionChange, LoadChildrenFun } from "./Types";
 export default TreeView;
-export { treeUtils };
-export type { TreeNode, LazyLoader, NodeVisibleFun, OnNodeSelectionChange, CheckBranchFun, LoadChildrenFun, NodeLevelCompare, RootDetermine };
+export type { LazyLoader, NodeVisibleFun, OnNodeSelectionChange, LoadChildrenFun };

package/dist/tree-view/index.js

@@ -1,4 +1,2 @@
 import TreeView from "./TreeView.svelte";
-import treeUtils from "./TreeUtils";
 export default TreeView;
-export { treeUtils };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ticatec/uniface-element",
-  "version": "0.1.46",
+  "version": "0.1.48",
   "description": "uniface web elements",
   "scripts": {
     "dev": "vite dev",
@@ -292,6 +292,10 @@
       "types": "./dist/tabs/index.d.ts",
       "import": "./dist/tabs/index.js"
     },
+    "./TreeNodes": {
+      "types": "./dist/lib/index.d.ts",
+      "import": "./dist/lib/index.js"
+    },
     "./Tag": {
       "types": "./dist/tag/index.d.ts",
       "import": "./dist/tag/index.js"

package/dist/tree-view/TreeNode.d.ts

@@ -1,60 +0,0 @@
-export type OnNodeSelectionChange = (node: TreeNode) => Promise<boolean>;
-export default interface TreeNode {
-    /**
-     * 节点的值
-     */
-    value: string;
-    /**
-     * 节点的文字
-     */
-    text: string;
-    /**
-     * 对应节点的数据
-     */
-    data?: any;
-    /**
-     * 子节点
-     */
-    children?: Array<TreeNode> | null;
-    /**
-     * 父节点
-     */
-    parent?: TreeNode | null;
-    /**
-     * 是否是叶节点
-     */
-    isLeaf?: boolean;
-}
-/**
- * 节点是否显示
- */
-export type NodeVisibleFun = (node: TreeNode) => boolean;
-/**
- * 检查当前是否是叶节点
- */
-export type CheckBranchFun = (item: TreeNode) => boolean;
-/**
- * 加载子节点
- */
-export type LoadChildrenFun = (item: TreeNode) => Promise<Array<TreeNode>>;
-/**
- * 按需数据加载器
- */
-export interface LazyLoader {
-    /**
-     * 检查是否是枝节点
-     */
-    isBranch: CheckBranchFun;
-    /**
-     * 数据加载器
-     */
-    load: LoadChildrenFun;
-}
-/**
- * 判断是否是根节点
- */
-export type RootDetermine = (item: any) => boolean;
-/**
- * 层级排序
- */
-export type NodeLevelCompare = (e1: any, e2: any) => number;

package/dist/tree-view/TreeUtils.d.ts

@@ -1,6 +0,0 @@
-import type TreeNode from "./TreeNode";
-import type { NodeLevelCompare, RootDetermine } from "./TreeNode";
-declare const _default: {
-    buildTreeNode: (list: Array<any>, idKey: string, joinKey: string, textField: string, valueField?: string, isRoot?: RootDetermine, sortFun?: NodeLevelCompare) => Array<TreeNode>;
-};
-export default _default;

package/dist/tree-view/TreeUtils.js

@@ -1,53 +0,0 @@
-/**
- * 将一个数组转换成树状结构
- * @param list 待转换的数组
- * @param idKey 元素的主键
- * @param joinKey 父子间连接字段
- * @param valueField 取值的字段
- * @param textField 显示文字的字段
- * @param isRoot 判断是否是根节点，如果函数不存在，通过连接字段查询，无法获取到父节点就是根节点
- * @param sortFun 比较函数，用于曾经排序
- */
-const buildTreeNode = (list, idKey, joinKey, textField, valueField, isRoot, sortFun) => {
-    if (sortFun != null) {
-        list = list.sort(sortFun);
-    }
-    let nodes = [];
-    let map = new Map();
-    list.forEach(item => {
-        let node = { value: item[valueField ?? idKey], text: item[textField], data: item };
-        if (isRoot != null) {
-            if (isRoot(item)) {
-                nodes.push(node);
-                map.set(item[idKey], node);
-            }
-            else {
-                let parent = map.get(item[joinKey]);
-                if (parent != null) {
-                    parent.children = [...(parent.children ?? []), node];
-                    node.parent = parent;
-                    map.set(item[idKey], node);
-                }
-                else {
-                    console.warn('Isolated node：', item);
-                }
-            }
-        }
-        else {
-            let parent = map.get(item[joinKey]);
-            if (parent != null) {
-                parent.children = [...(parent.children ?? []), item];
-                node.parent = parent;
-                map.set(item[idKey], node);
-            }
-            else {
-                nodes.push(node);
-                map.set(item[idKey], node);
-            }
-        }
-    });
-    return nodes;
-};
-export default {
-    buildTreeNode
-};