Merge branch 'master' of http://787255.xyz:4003/ydm/zl365

src/component/tree/index.tsx

@@ -18,23 +18,23 @@ import {
   MenuTrigger,
   useRestoreFocusTarget,
 } from "@fluentui/react-components";
-import { Edit20Regular, MoreHorizontal20Regular, CardUiFilled } from "@fluentui/react-icons";
+import { Edit20Regular, MoreHorizontal20Regular, BowTieFilled,BalloonFilled } from "@fluentui/react-icons";
 
-type FlatItem = HeadlessFlatTreeItemProps & { content: string };
+type FlatItem = HeadlessFlatTreeItemProps & { content: string ,icon?:any};
 
 const flatTreeItems: FlatItem[] = [
-  { value: "1", content: "中联新技术工作室" },
-  { value: "1-1", parentValue: "1", content: "陈丹" },
-  { value: "1-2", parentValue: "1", content: "蔡青松" },
-  { value: "1-3", parentValue: "1", content: "唐渝林" },
-  { value: "1-4", parentValue: "1", content: "吴瑞强" },
-  { value: "1-5", parentValue: "1", content: "王华川" },
-  { value: "1-6", parentValue: "1", content: "涂建华" },
-  { value: "1-7", parentValue: "1", content: "杨东明" },
-  { value: "2", content: "中联敏捷" },
-  { value: "2-1", parentValue: "2", content: "范俊" },
-  { value: "2-2", parentValue: "2", content: "杨斌" },
-  { value: "2-2", parentValue: "2", content: "陈亮" },
+  { value: "1", content: "中联新技术工作室",icon:<BalloonFilled/> },
+  { value: "1-1", parentValue: "1", content: "陈丹",icon:<BowTieFilled/> },
+  { value: "1-2", parentValue: "1", content: "蔡青松",icon:<BalloonFilled/> },
+  { value: "1-3", parentValue: "1", content: "唐渝林",icon:<BalloonFilled/> },
+  { value: "1-4", parentValue: "1", content: "吴瑞强",icon:<BalloonFilled/> },
+  { value: "1-5", parentValue: "1", content: "王华川",icon:<BalloonFilled/> },
+  { value: "1-6", parentValue: "1", content: "涂建华",icon:<BalloonFilled/> },
+  { value: "1-7", parentValue: "1", content: "杨东明",icon:<BalloonFilled/> },
+  { value: "2", content: "中联敏捷",icon:<BalloonFilled/> },
+  { value: "2-1", parentValue: "2", content: "范俊",icon:<BalloonFilled/>  },
+  { value: "2-2", parentValue: "2", content: "杨斌",icon:<BalloonFilled/> },
+  { value: "2-2", parentValue: "2", content: "陈亮",icon:<BalloonFilled/> },
 ];
 
 const ActionsExample = () => (
@@ -67,7 +67,7 @@ const UseHeadlessFlatTree = () => {
   return (
     <FlatTree {...flatTree.getTreeProps()} aria-label="Flat Tree">
       {Array.from(flatTree.items(), (flatTreeItem) => {
-        const { content, ...treeItemProps } = flatTreeItem.getTreeItemProps();
+        const { content,icon, ...treeItemProps } = flatTreeItem.getTreeItemProps();
         return (
           <Menu key={flatTreeItem.value} positioning="below-end" openOnContext>
             <MenuTrigger disableButtonEnhancement>
@@ -76,10 +76,16 @@ const UseHeadlessFlatTree = () => {
                 {...focusTargetAttribute}
                 {...treeItemProps}
               >
-                <TreeItemPersonaLayout
+                {/* <TreeItemPersonaLayout
                   actions={<ActionsExample />}>
                   {content}
-                </TreeItemPersonaLayout>
+                </TreeItemPersonaLayout> */}
+                <TreeItemLayout iconBefore={icon}>
+                  {content}
+                </TreeItemLayout>
+                {/* <TreeItemPersonaLayout media={<Avatar image={{ alt: "avatar" }} />}>
+                  {content}
+                </TreeItemPersonaLayout> */}
               </TreeItem>
             </MenuTrigger>
             <MenuPopover>