plain-design 1.0.0-beta.4 → 1.0.0-beta.41

package/src/packages/components/ThemePrimaryColors/index.ts

@@ -0,0 +1,5 @@
+import {ThemePrimaryColors} from "../PageThemeUtils";
+
+export default ThemePrimaryColors;
+
+export {ThemePrimaryColors};

package/src/packages/components/Tree/RenderTreeNode.tsx

@@ -11,7 +11,7 @@ export const RenderTreeNode = designComponent({
   props: {
     multiple: { type: Boolean },
     treeNode: { type: Object as PropType<iTreeNode>, required: true },
-    dataVid: { type: Number },
+    dataVid: { type: String },
   },
   setup({ props }) {
 
@@ -34,13 +34,16 @@ export const RenderTreeNode = designComponent({
       getComponentCls('tree-node'),
       {
         'tree-node-current': tree.state.current === props.treeNode.key,
+        'tree-node-lead': isLeaf.value,
         'tree-node-single-check': !props.multiple && props.treeNode.checkStatus() === CheckboxStatus.check,
+        'tree-node-multi-check': props.multiple && props.treeNode.checkStatus() === CheckboxStatus.check,
         'tree-node-disable-check': !props.treeNode.isCheckAble(),
       }
     ]);
 
     const checkStatus = cacheComputed(() => props.treeNode.checkStatus());
     const isExpanded = cacheComputed(() => props.treeNode.isExpanded());
+    const isLeaf = cacheComputed(() => props.treeNode.isLeaf());
 
     const connectorClassesList = computed(() => {
 
@@ -89,6 +92,7 @@ export const RenderTreeNode = designComponent({
        */
       onClickNodeContent: () => {
         if (props.treeNode.empty) {return;}
+        if (tree.draggier.value?.isDragging()) {return;}
         tree.hooks.onClickNodeContent.exec({ treeNode: props.treeNode, el: refs.el! });
       },
       /**
@@ -124,10 +128,10 @@ export const RenderTreeNode = designComponent({
                 />
             }
           </div>
-          {tree.props.draggable && (
+          {tree.props.draggable && !tree.props.customDraggier && (
             <div
               className={classnames(['tree-node-draggier', { 'tree-node-draggier-disable': !tree.utils.isAllowDraggable(props.treeNode) }])}
-              onMouseDown={handler.onMousedownDraggier.value}
+              onMouseDown={props.treeNode.empty ? undefined : handler.onMousedownDraggier.value}
             >
               <Icon icon="pi-menu"/>
             </div>
@@ -135,6 +139,7 @@ export const RenderTreeNode = designComponent({
           {tree.props.multiple && (
             <div className="tree-node-checker">
               <Checkbox
+                key={props.treeNode.id}
                 checkStatus={checkStatus.value}
                 disabled={!props.treeNode.isCheckAble()}
                 onClick={handler.onClickCheckbox}

package/src/packages/components/Tree/index.tsx

@@ -26,6 +26,7 @@ export const Tree = designComponent({
     scroll: { type: Boolean },                            // 是否使用滚动容器
     innerAttrs: { type: Object as PropType<PlainObject> },// inner 节点属性类型
     contentWrap: { type: Boolean },                       // 节点内容是否换行显示，默认不换行
+    virtualRowType: { type: String as PropType<'virtualIndex' | 'realIndex'> }, // 虚拟滚动的行渲染类型，virtualIndex意思为使用虚拟的行索引作为key渲染行，好处是虚拟滚动时完全复用行组件实例；realIndex意味着虚拟滚动时新的行会重新初始化
     ...TreePropsOptions,
   },
   emits: {
@@ -92,9 +93,9 @@ export const Tree = designComponent({
                 return (
                   <VirtualList data={treeCore.flatNodeComputedData.value} ref={treeCore.onRef.list} size={props.virtualSize != null ? props.virtualSize : TreeSizeToRowHeight[styleComputed.value.size]} dynamicSize={props.virtualDynamicSize}>
                     {{
-                      content: ({ data }: { data: { item: iTreeNode, index: number }[] }) => (
+                      content: ({ data }: { data: { item: iTreeNode, index: number, vIndex: number, vid: string }[] }) => (
                         <div className="tree-node-list">
-                          {data.map(({ item }, flatIndex) => <RenderTreeNode key={flatIndex} treeNode={item} dataVid={item.flatIndex} multiple={props.multiple}/>)}
+                          {data.map(({ item, vid, index }, vIndex) => <RenderTreeNode key={(props.virtualRowType === 'realIndex') ? index : vIndex} treeNode={item} dataVid={vid} multiple={props.multiple}/>)}
                         </div>
                       )
                     }}
@@ -104,7 +105,7 @@ export const Tree = designComponent({
                 const content = (
                   <div className="tree-node-list">
                     {treeCore.flatNodeComputedData.value.map((item) => (
-                      <RenderTreeNode key={item.key} treeNode={item} dataVid={item.flatIndex} multiple={props.multiple}/>
+                      <RenderTreeNode key={item.key} treeNode={item} dataVid={item.key} multiple={props.multiple}/>
                     ))}
                   </div>
                 );

package/src/packages/components/Tree/tree.scss

@@ -3,6 +3,7 @@
   align-items: center;
   line-height: 22px;
   padding-bottom: 1px;
+  position: relative;
 
   .tree-node-operator > div, .tree-node-content {
     transition: background-color linear 150ms, color linear 150ms;
@@ -88,19 +89,43 @@
   .tree-node-content {
     padding: 5px 8px;
     color: plv(text-2);
+  }
 
-    &:hover {
+  .tree-node-operator, .tree-node-content {
+    position: relative;
+    z-index: 2;
+  }
+
+  &:after {
+    position: absolute;
+    top: 1px;
+    bottom: 1px;
+    left: 0;
+    right: 0;
+    z-index: 1;
+    border-radius: plv(border-radius-normal);
+    content: '';
+    transition: background-color ease 0.3s;
+  }
+
+  &:hover:not(.tree-node-current):not(.tree-node-single-check) {
+    cursor: pointer;
+
+    &:after {
       background-color: plv(background-hover);
-      cursor: pointer;
+      content: '';
     }
   }
 
-  &.tree-node-current, &.tree-node-single-check {
-    .tree-node-content {
-      &, &:hover {
-        background-color: plv(primary-light-1);
-        color: plv(primary-6);
-      }
+  &.tree-node-current, &.tree-node-single-check, &.tree-node-multi-check {
+
+    .tree-node-operator, .tree-node-content {
+      color: plv(primary-6);
+    }
+
+    &:after {
+      background-color: plv(primary-light-1);
+      content: '';
     }
   }
 
@@ -168,9 +193,16 @@
   }
 
   &.tree-expander-cover {
+    @include comp(tree-node) {
+      &:not(.tree-node-lead) {
+        .tree-node-expander {
+          background-color: plv(secondary-2);
+        }
+      }
+    }
+
     .tree-node-expander {
       border-radius: 2px;
-      background-color: plv(secondary-2);
       transform: scale(0.75);
     }
   }
@@ -216,6 +248,7 @@
 @include comp(tree-draggier-indicator) {
   position: fixed;
   pointer-events: none;
+  z-index: 10;
 
   &[data-available=true] {
     background-color: plv(primary-6);

package/src/packages/components/TreeCore/TreeCore.type.tsx

@@ -63,6 +63,8 @@ export interface iTreeProps {
   getNodeIcon?: (node: iTreeNode) => string,
   /*是否开启拖拽节点功能*/
   draggable?: boolean,
+  /*自定义draggier按钮*/
+  customDraggier?: boolean,
   /*判断节点是否可以拖拽*/
   isAllowDraggable?: (treeNode: iTreeNode) => boolean | void,
   /*判断节点是否可以放置*/

package/src/packages/components/TreeCore/createTreeCore.tsx

@@ -327,7 +327,11 @@ export function createTreeCore(
     hooks.onClickExpandIcon.use(({ treeNode }) => {methods.toggleExpand(treeNode);})
   );
   effects.push(
-    hooks.onClickNodeContent.use(({ treeNode }) => {methods.singleSelect(treeNode);})
+    hooks.onClickNodeContent.use(({ treeNode }) => {
+      methods.singleSelect(treeNode);
+      if (props.expandOnClickNode) {methods.toggleExpand(treeNode);}
+      if (props.checkOnClickNode) {methods.toggleCheck(treeNode);}
+    })
   );
   effects.push(
     hooks.onClickCheckbox.use(({ treeNode }) => {

package/src/packages/components/TreeCore/createTreeDraggier.tsx

@@ -14,6 +14,8 @@ import {enableUserSelect} from "plain-utils/dom/enableUserSelect";
 import {onParentElementsScroll} from "../../utils/onParentElementsScroll";
 import {addClass} from "plain-utils/dom/addClass";
 import {iTreeHooks} from "./createTreeHooks";
+import {ClientZoom} from "../ClientZoom";
+import {delay} from "plain-utils/utils/delay";
 
 export function createTreeDraggier(
   {
@@ -108,6 +110,8 @@ export function createTreeDraggier(
    */
   const shadowTreeNode = (() => {
 
+    const reactiveState = reactive({ dragging: false, });
+
     let staticState = null as null | {
       startNode: iTreeNode,                           // 拖拽开始的时候节点
       rowElement: HTMLElement,                        // 拖拽开始的row对象
@@ -222,71 +226,78 @@ export function createTreeDraggier(
       if (!rowElement) {
         throw new Error(`tree draggier: can't find row element with selector: .${rowClass}`);
       }
+      const { clientX, clientY } = ClientZoom.getClientPosition(e);
       staticState = {
         startNode: node,
         rowElement,
         start: {
-          x: e.clientX,
-          y: e.clientY,
+          x: clientX,
+          y: clientY,
         },
         data: null,
       };
+      reactiveState.dragging = true;
       /**
        * 拖拽结束之后，处理拖拽数据
        * @author  韦胜健
        * @date    2023/6/1 21:13
        */
       draggierEffects.push(async () => {
-        if (!!staticState?.data) {
-          const { startNode, } = staticState;
-          const { moveNode, dropType, droppable, isHideDraggier } = staticState.data.move;
-          if (!droppable || isHideDraggier) {
-            return;
-          }
-          const newParentNode = moveNode.parent;
-          const oldParentNode = startNode.parent;
-          const newSiblings = dropType === eTreeDropType.inner ? methods.getReactiveChildrenData(moveNode) : methods.getParentChildrenData(moveNode);
-          const newSiblingsBak = [...newSiblings];
-          const oldSiblings = methods.getParentChildrenData(startNode);
-          const oldSiblingsBak = [...oldSiblings];
-
-          methods.removeSelf(startNode!);
-          switch (dropType) {
-            case eTreeDropType.prev:
-              methods.previousSibling(moveNode!, startNode!);
-              break;
-            case eTreeDropType.inner:
-              methods.unshiftChild(moveNode!, startNode!);
-              await methods.expand(moveNode!);
-              break;
-            case eTreeDropType.next:
-              methods.nextSibling(moveNode!, startNode!);
-              await methods.collapse(moveNode);
-              break;
+        await (async () => {
+          if (!!staticState?.data) {
+            const { startNode, } = staticState;
+            const { moveNode, dropType, droppable, isHideDraggier } = staticState.data.move;
+            if (!droppable || isHideDraggier) {
+              return;
+            }
+            const newParentNode = dropType === eTreeDropType.inner ? moveNode : moveNode.parent;
+            const oldParentNode = startNode.parent;
+            const newSiblings = dropType === eTreeDropType.inner ? methods.getReactiveChildrenData(moveNode) : methods.getParentChildrenData(moveNode);
+            const newSiblingsBak = [...newSiblings];
+            const oldSiblings = methods.getParentChildrenData(startNode);
+            const oldSiblingsBak = [...oldSiblings];
+
+            methods.removeSelf(startNode!);
+            switch (dropType) {
+              case eTreeDropType.prev:
+                methods.previousSibling(moveNode!, startNode!);
+                break;
+              case eTreeDropType.inner:
+                methods.unshiftChild(moveNode!, startNode!);
+                await methods.expand(moveNode!);
+                break;
+              case eTreeDropType.next:
+                methods.nextSibling(moveNode!, startNode!);
+                await methods.collapse(moveNode);
+                break;
+            }
+            await nextTick();
+            await Promise.all([
+              methods.refreshCheckStatus(startNode!.parent),
+              methods.refreshCheckStatus(moveNode!.parent)
+            ]);
+            await hooks.onDragChange.exec({
+              data: startNode.data,
+              newParent: newParentNode?.data,
+              oldParent: oldParentNode?.data,
+              node: startNode,
+              newParentNode,
+              oldParentNode,
+              newSiblings,
+              oldSiblings,
+              newSiblingsBak,
+              oldSiblingsBak,
+              undo: () => {
+                newSiblings.splice(0, newSiblings.length, ...newSiblingsBak);
+                oldSiblings.splice(0, oldSiblings.length, ...oldSiblingsBak);
+              },
+            });
           }
-          await nextTick();
-          await Promise.all([
-            methods.refreshCheckStatus(startNode!.parent),
-            methods.refreshCheckStatus(moveNode!.parent)
-          ]);
-          await hooks.onDragChange.exec({
-            data: startNode.data,
-            newParent: newParentNode?.data,
-            oldParent: oldParentNode?.data,
-            node: startNode,
-            newParentNode,
-            oldParentNode,
-            newSiblings,
-            oldSiblings,
-            newSiblingsBak,
-            oldSiblingsBak,
-            undo: () => {
-              newSiblings.splice(0, newSiblings.length, ...newSiblingsBak);
-              oldSiblings.splice(0, oldSiblings.length, ...oldSiblingsBak);
-            },
-          });
-        }
-        staticState = null;
+        })();
+        delay().then(() => {
+          staticState = null;
+          reactiveState.dragging = false;
+        });
       });
     };
 
@@ -302,7 +313,8 @@ export function createTreeDraggier(
 
       if (!isDragging) {
         /*拖拽超过一定距离的时候才开始拖拽，避免与点击事件冲突*/
-        if (!!e && Math.abs(e.clientY - staticState.start.y) > 5) {
+        const { clientY } = ClientZoom.getClientPosition(e);
+        if (!!e && Math.abs(clientY - staticState.start.y) > 5) {
           isDragging = true;
           initDraggierState();
         }
@@ -323,9 +335,10 @@ export function createTreeDraggier(
         staticState.data.move.isHideDraggier = true;
         staticState.data.cloneTreeNode.style.opacity = '0';
       } else {
+        const { clientX, clientY } = ClientZoom.getClientPosition(e);
         staticState.data.move.isHideDraggier = false;
-        staticState.data.move.x = e.clientX;
-        staticState.data.move.y = e.clientY;
+        staticState.data.move.x = clientX;
+        staticState.data.move.y = clientY;
         staticState.data.move.moveNode = node;
         staticState.data.move.contentRect = (e.currentTarget as HTMLElement).querySelector(`.${contentClass}`)!.getBoundingClientRect();
         const percent = (staticState.data.move.y - staticState.data.move.contentRect.top) / staticState.data.move.contentRect.height;
@@ -366,7 +379,7 @@ export function createTreeDraggier(
       indicatorHandler.update();
     };
 
-    const isDragging = () => !staticState;
+    const isDragging = () => reactiveState.dragging;
 
     const getState = () => staticState;
 
@@ -384,7 +397,8 @@ export function createTreeDraggier(
         document.removeEventListener('mouseup', draggierEffects.clear);
       });
     },
-    onMousemoveRow: null as null | ((e: iMouseEvent, node: iTreeNode) => void)
+    onMousemoveRow: null as null | ((e: iMouseEvent, node: iTreeNode) => void),
+    isDragging: () => shadowTreeNode.isDragging(),
   });
 
   return ret;

package/src/packages/components/TreeCore/createTreeMethods.tsx

@@ -254,6 +254,7 @@ export function createTreeMethods(
      * @date    2022/9/22 19:56
      */
     refreshCheckStatus: async (keyOrNode: iTreeKeyOrNode, emitChange = true) => {
+      if (!props.multiple) {return;}
       const checkKeys: string[] = [];
       const unCheckKeys: string[] = [];
       await nextTick();

package/src/packages/components/TreeCore/createTreeProps.ts

@@ -29,9 +29,10 @@ export const TreePropsOptions = {
   defaultExpandAll: { type: Boolean as PropType<iTreeProps["defaultExpandAll"]> },
   getNodeIcon: { type: Function as PropType<iTreeProps["getNodeIcon"]> },
   draggable: { type: Boolean as PropType<iTreeProps["draggable"]> },
+  customDraggier: { type: Boolean as PropType<iTreeProps["customDraggier"]> },
   isAllowDraggable: { type: Function as PropType<iTreeProps["isAllowDraggable"]> },
   isAllowDroppable: { type: Function as PropType<iTreeProps["isAllowDroppable"]> },
-  leafIcon: { type: String as PropType<iTreeProps["leafIcon"]>, default: 'pi-file' as string },
+  leafIcon: { type: String as PropType<iTreeProps["leafIcon"]>, default: 'pi-drive-file' as string },
   folderCollapseIcon: { type: String as PropType<iTreeProps["folderCollapseIcon"]>, default: 'pi-caret-right' as string },
   folderExpandIcon: { type: String as PropType<iTreeProps["folderExpandIcon"]>, default: 'pi-down' as string },
   expanderCover: { type: Boolean as PropType<iTreeProps["expanderCover"]>, default: true },

package/src/packages/components/TreeNodeWithMenu/index.tsx

@@ -0,0 +1,91 @@
+import {cacheComputed, ComponentPropsType, computed, designComponent, getComponentCls, iHTMLDivElement, iMouseEvent, PropType, useClassCache, useRefs} from "plain-design-composition";
+import {Icon} from "../Icon";
+import {iTreeNode} from "../TreeCore/createTreeNode";
+import './tree-node-with-menu.scss';
+import {Tree} from "../Tree";
+import {useTooltip} from "../useTooltip";
+import {iTreeNodeWithMenuOption} from "./treeNodeWithMenu.utils";
+import {Dropdown} from "../Dropdown";
+import {DropdownOption} from "../DropdownOption";
+
+export const TreeNodeWithMenu = designComponent({
+  name: 'tree-node-with-menu',
+  props: {
+    treeNode: { type: Object as PropType<iTreeNode>, required: true },
+    dropdownOptions: { type: Array as PropType<iTreeNodeWithMenuOption[]> },
+    dropdownAttrs: { type: Object as PropType<ComponentPropsType<typeof Dropdown>> },
+  },
+  setup({ props }) {
+
+    const { refs, onRef } = useRefs({ content: iHTMLDivElement });
+
+    const tree = Tree.use.inject();
+
+    const isDraggable = cacheComputed(() => tree.props.draggable && tree.utils.isAllowDraggable(props.treeNode));
+
+    const classes = useClassCache(() => [
+      getComponentCls('tree-node-with-menu'),
+      {
+        'tree-node-with-menu-draggable': isDraggable.value,
+      }
+    ]);
+
+    const dropdownAttrs = computed(() => {
+      return {
+        trigger: 'hover' as const,
+        placement: 'right-start' as const,
+        ...props.dropdownAttrs,
+      };
+    });
+
+    const handler = {
+      onMousedownDraggier: computed(() => !tree.draggier.value ? undefined : ((e: iMouseEvent) => {
+        tree.draggier.value!.onMousedownDraggier(e, props.treeNode);
+      })),
+    };
+
+    useTooltip({
+      overflow: true,
+      tooltip: () => ({
+        reference: refs.content,
+        message: props.treeNode.label()
+      }),
+    });
+
+    return () => (
+      <div className={classes.value}>
+        <div className="tree-node-with-menu-content" ref={onRef.content}>{props.treeNode.label()}</div>
+        {(() => {
+          let btn = (
+            <div className="tree-node-with-menu-button" onMouseDown={handler.onMousedownDraggier.value}>
+              <Icon icon="pi-drag-dot-vertical"/>
+            </div>
+          );
+          let ret = btn;
+          if (!!props.dropdownOptions?.length && !tree.draggier.value?.isDragging()) {
+            ret = (
+              <Dropdown
+                {...dropdownAttrs.value}
+                v-slots={{
+                  default: () => btn,
+                  popper: () => (
+                    props.dropdownOptions?.map((option, index) => {
+                      const { renderDefault, renderContent, ...leftOption } = option;
+                      const vSlots = {} as any;
+                      if (!!renderDefault) {vSlots.default = () => renderDefault();}
+                      if (!!renderContent) {vSlots.content = () => renderContent();}
+                      return <DropdownOption key={index} {...leftOption} v-slots={vSlots}/>;
+                    })
+                  )
+                }}
+              />
+            );
+          }
+          return ret;
+        })()}
+      </div>
+    );
+  },
+});
+
+export default TreeNodeWithMenu;

package/src/packages/components/TreeNodeWithMenu/tree-node-with-menu.scss

@@ -0,0 +1,39 @@
+@include comp(tree-node-with-menu) {
+  display: flex;
+  align-items: center;
+
+  .tree-node-with-menu-content {
+    flex: 1;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+  }
+
+  .tree-node-with-menu-button {
+    height: 1em;
+    width: 1em;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    cursor: pointer;
+    user-select: none;
+    //transition: all ease 0.3s;
+  }
+
+  &.tree-node-with-menu-draggable {
+    .tree-node-with-menu-button {
+      cursor: row-resize;
+      padding-right: 6px;
+    }
+  }
+}
+
+@include comp(tree-node) {
+  &:not(:hover) {
+    .tree-node-with-menu-button {
+      opacity: 0;
+      width: 0;
+      pointer-events: none;
+    }
+  }
+}

package/src/packages/components/TreeNodeWithMenu/treeNodeWithMenu.utils.ts

@@ -0,0 +1,12 @@
+import {iMouseEvent, RenderNode} from "plain-design-composition";
+
+export interface iTreeNodeWithMenuOption {
+  label?: string,
+  disabled?: boolean,
+  readonly?: boolean,
+  icon?: string,
+  val?: any,
+  onClick?: (e: iMouseEvent) => void
+  renderDefault?: () => RenderNode,
+  renderContent?: () => RenderNode,
+}

package/src/packages/components/VirtualList/index.tsx

@@ -11,15 +11,17 @@ export const VirtualList = designComponent({
     size: { type: Number, require: true, default: 40 },           // 每一行高度
     dynamicSize: { type: Boolean },                               // 标识列表中的每一行高度不是固定的，但是还是需要提供 size 属性，而且size属性不能与每一行的高度差距太多；
     disabled: { type: Boolean },                                  // 禁用虚拟滚动
-    width: { type: [String, Number] },                            // 当需要横向滚动是，需要指定内容宽度
+    horizontal: { type: Boolean },                                // 启用横向虚拟滚动
+    width: { type: [String, Number] },                            // 纵向虚拟滚动需要横向滚动时，需要指定内容宽度
+    height: { type: [String, Number] },                           // 横向虚拟滚动需要纵向滚动时，需要指定内容高度
   },
   emits: {
     onScroll: (e: Event) => true,
     onRefScroll: (scroll: typeof Scroll.use.class | null) => true,
-    onPageIndexChange: (data: { pageIndex: number, start: number }) => true,
+    onPageIndexChange: (data: { pageIndex: number, startIndex: number, endIndex: number }) => true,
   },
   scopeSlots: {
-    default: (scope: { item: any, index: number, virtualIndex: number }) => {},
+    default: (scope: { item: any, index: number, vid: string, vIndex: number }) => {},
     content: (scope: { data: any[] }) => {},
   },
   setup({ props, scopeSlots, event: { emit } }) {
@@ -43,13 +45,20 @@ export const VirtualList = designComponent({
       render: () => {
         const { list } = virtual.offsetData.value;
         return (
-          <Scroll scrollX={!!props.width} onScroll={virtual.handler.onScroll} ref={onRefScroll as any} className={virtual.classes.value} disableTransitionWhenScroll>
+          <Scroll
+            scrollX={!!props.width || props.horizontal}
+            scrollY={!!props.height || !props.horizontal}
+            onScroll={virtual.handler.onScroll}
+            ref={onRefScroll as any}
+            className={virtual.classes.value}
+            disableTransitionWhenScroll
+          >
             <div className="virtual-list-strut" style={virtual.strutStyles.value}>
               <div className="virtual-list-content" style={virtual.contentStyles.value} ref={onRef.content}>
                 {scopeSlots.content.isExist() ?
                   scopeSlots.content({ data: list }, null) :
-                  list.map((node, virtualIndex) =>
-                    scopeSlots.default({ item: node.item, index: node.index, virtualIndex })
+                  list.map((node, vIndex) =>
+                    scopeSlots.default({ item: node.item, index: node.index, vid: node.id, vIndex })
                   )}
               </div>
             </div>