plain-design 1.0.0-beta.10 → 1.0.0-beta.101

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,6 +34,7 @@ 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(),
@@ -42,6 +43,7 @@ export const RenderTreeNode = designComponent({
 
     const checkStatus = cacheComputed(() => props.treeNode.checkStatus());
     const isExpanded = cacheComputed(() => props.treeNode.isExpanded());
+    const isLeaf = cacheComputed(() => props.treeNode.isLeaf());
 
     const connectorClassesList = computed(() => {
 
@@ -90,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! });
       },
       /**
@@ -128,7 +131,7 @@ export const RenderTreeNode = designComponent({
           {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>
@@ -136,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}
@@ -153,7 +157,7 @@ export const RenderTreeNode = designComponent({
           })()}
         </div>
         <div className="tree-node-content" onClick={handler.onClickNodeContent}>
-          {props.treeNode.empty ? i18n('base.noData').d('暂无数据') : (() => {
+          {props.treeNode.empty ? i18n.$it('base.noData').d('暂无数据') : (() => {
             const scope = { treeNode: props.treeNode, index: props.treeNode.flatIndex, };
             return tree.props.renderContent ? tree.props.renderContent(scope) : tree.scopeSlots.default(scope, props.treeNode.label()) as any;
           })()}

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

@@ -193,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);
     }
   }

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

@@ -7,7 +7,7 @@ import {iElementRect} from "../../utils/getRowEl";
 import {iTreeUtils} from "./createTreeUtils";
 import {createEffects} from "plain-utils/utils/createEffects";
 import {useAutoScrollUtils} from "../useAutoScrollUtils";
-import {findParentElement} from "../../utils/findParentElement";
+import {findParentElement} from "plain-utils/dom/findParentElement";
 import {hasClass} from "plain-utils/dom/hasClass";
 import {disabledUserSelect} from "plain-utils/dom/disabledUserSelect";
 import {enableUserSelect} from "plain-utils/dom/enableUserSelect";
@@ -15,6 +15,7 @@ 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(
   {
@@ -109,6 +110,8 @@ export function createTreeDraggier(
    */
   const shadowTreeNode = (() => {
 
+    const reactiveState = reactive({ dragging: false, });
+
     let staticState = null as null | {
       startNode: iTreeNode,                           // 拖拽开始的时候节点
       rowElement: HTMLElement,                        // 拖拽开始的row对象
@@ -233,62 +236,68 @@ export function createTreeDraggier(
         },
         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;
+        });
       });
     };
 
@@ -370,7 +379,7 @@ export function createTreeDraggier(
       indicatorHandler.update();
     };
 
-    const isDragging = () => !staticState;
+    const isDragging = () => reactiveState.dragging;
 
     const getState = () => staticState;
 
@@ -388,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

@@ -32,7 +32,7 @@ export const TreePropsOptions = {
   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/TreeCore/createTreeUtils.ts

@@ -1,7 +1,7 @@
 import {iTreeKeyOrNode, iTreeNodeComputedData, iTreeProps} from "./TreeCore.type";
 import {iTreeNode} from "./createTreeNode";
 import {toArray} from "plain-utils/utils/toArray";
-import {iterate as utilsIterate} from "../../utils/iterate";
+import {iterate as utilsIterate} from "plain-utils/utils/iterate";
 import {eTreeDropType} from "./createTreeDraggier";
 
 export function createTreeUtils(

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

@@ -1,14 +1,19 @@
-import {cacheComputed, computed, designComponent, getComponentCls, iHTMLDivElement, iMouseEvent, PropType, useClassCache, useRefs} from "plain-design-composition";
-import Icon from "../Icon";
+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 {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 }) {
 
@@ -25,6 +30,14 @@ export const TreeNodeWithMenu = designComponent({
       }
     ]);
 
+    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);
@@ -42,9 +55,34 @@ export const TreeNodeWithMenu = designComponent({
     return () => (
       <div className={classes.value}>
         <div className="tree-node-with-menu-content" ref={onRef.content}>{props.treeNode.label()}</div>
-        <div className="tree-node-with-menu-button" onMouseDown={handler.onMousedownDraggier.value}>
-          <Icon icon="pi-drag-dot-vertical"/>
-        </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>
     );
   },

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

@@ -23,6 +23,7 @@
   &.tree-node-with-menu-draggable {
     .tree-node-with-menu-button {
       cursor: row-resize;
+      padding-right: 6px;
     }
   }
 }

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/Upload/index.tsx

@@ -110,7 +110,7 @@ export const Upload = designComponent({
       [eUploadStatus.empty]: <Icon icon="pi-info-circle"/>,
     };
     const singleEmptyFile: UploadFile = {
-      name: i18n('file.notUpload').d('未上传'),
+      name: i18n.$it('file.notUpload').d('未上传'),
       status: eUploadStatus.empty,
       id: 'nothing'
     };
@@ -151,7 +151,7 @@ export const Upload = designComponent({
           if (props.max != null) {
             if (f.calcSize > props.max) {
               $message.error(
-                i18n('file.oversize', { filename: file.name, filesize: f.calcSize, max: props.max }).d(`[${file.name}]大小为${f.calcSize}MB，超过最大限制${props.max}MB`)
+                i18n.$it('file.oversize', { filename: file.name, filesize: f.calcSize, max: props.max }).d(`[${file.name}]大小为${f.calcSize}MB，超过最大限制${props.max}MB`)
                 , { time: 5000 });
               return false;
             }
@@ -249,7 +249,7 @@ export const Upload = designComponent({
         // 状态不存在或者状态为success表示需要用户处理删除文件在后端的逻辑，否则其他状态直接前端删除
         if (!file.status || file.status === eUploadStatus.success) {
           if (props.removeConfirm) {
-            await $dialog.confirm(i18n('file.areYouSureToDeleteFile', { name: file.name }).d(`确认要删除文件：${file.name} 吗？`));
+            await $dialog.confirm(i18n.$it('file.areYouSureToDeleteFile', { name: file.name }).d(`确认要删除文件：${file.name} 吗？`));
           }
           if (!!props.beforeRemove) {await props.beforeRemove(file);}
           await props.handleRemove!(file);
@@ -289,7 +289,7 @@ export const Upload = designComponent({
             toArray(uploadFiles).forEach(file => {
               file.status = eUploadStatus.success;
               file.percent = undefined;
-              $notice.success(i18n('file.uploadFileSucceed', { name: file.name }).d(`文件[${file.name}]上传成功！`));
+              $notice.success(i18n.$it('file.uploadFileSucceed', { name: file.name }).d(`文件[${file.name}]上传成功！`));
             });
             dfd.resolve();
             emit.onUploadSuccess({ file: uploadFiles, resp: data });
@@ -298,7 +298,7 @@ export const Upload = designComponent({
             toArray(uploadFiles).forEach(file => file.status = eUploadStatus.error);
             dfd.reject();
             emit.onUploadError(error);
-            $notice.error(i18n('file.uploadFailed').d(`文件上传失败！`));
+            $notice.error(i18n.$it('file.uploadFailed').d(`文件上传失败！`));
           },
         };
 
@@ -339,7 +339,7 @@ export const Upload = designComponent({
         <div className="upload-item-inner">
           {!!custom ? custom() : <>
             {file.status ? renderIcon[file.status] : <Icon icon="pi-file"/>}
-            {file.status === eUploadStatus.ready ? `(${i18n('file.toBeUpload').d('待上传')}) ` : ''}
+            {file.status === eUploadStatus.ready ? `(${i18n.$it('file.toBeUpload').d('待上传')}) ` : ''}
             <div className="upload-item-content" onClick={() => !!props.handlePreview && props.handlePreview(file)}>
               {scopeSlots.default({ item: file, index }, file.name)}
             </div>
@@ -366,8 +366,8 @@ export const Upload = designComponent({
     const singleRender = computed(() => <>
       {editComputed.value.editable && (
         <ButtonGroup>
-          <Button label={i18n('file.selectFile').d('选择文件')} icon="pi-file" onClick={methods.chooseFile}/>
-          {!props.autoUpload && <Button label={i18n('file.upload').d('上传')} icon="pi-upload" onClick={methods.upload}/>}
+          <Button label={i18n.$it('file.selectFile').d('选择文件')} icon="pi-file" onClick={methods.chooseFile}/>
+          {!props.autoUpload && <Button label={i18n.$it('file.upload').d('上传')} icon="pi-upload" onClick={methods.upload}/>}
           {slots.button()}
         </ButtonGroup>
       )}
@@ -378,8 +378,8 @@ export const Upload = designComponent({
         {!props.draggable ? (
           editComputed.value.editable && (
             <ButtonGroup>
-              <Button label={i18n('file.selectFile').d('选择文件')} icon="pi-file" onClick={methods.chooseFile}/>
-              {!props.autoUpload && <Button label={i18n('file.upload').d('上传')} icon="pi-upload" onClick={methods.upload}/>}
+              <Button label={i18n.$it('file.selectFile').d('选择文件')} icon="pi-file" onClick={methods.chooseFile}/>
+              {!props.autoUpload && <Button label={i18n.$it('file.upload').d('上传')} icon="pi-upload" onClick={methods.upload}/>}
               {slots.button()}
             </ButtonGroup>
           )
@@ -388,9 +388,9 @@ export const Upload = designComponent({
             <div className="upload-drop-area" onClick={methods.chooseFile} {...dropHandler}>
               <Icon icon="pi-share-external"/>
               <div>
-                <span>{i18n('file.dropFilesOr').d('拖拽文件至此处，或者')}</span>
+                <span>{i18n.$it('file.dropFilesOr').d('拖拽文件至此处，或者')}</span>
                 <Button mode="text" className="upload-drop-upload-button" onClick={methods.chooseFile}>
-                  <span>{i18n('file.clickToUpload').d('点击上传')}</span>
+                  <span>{i18n.$it('file.clickToUpload').d('点击上传')}</span>
                   <Icon icon="pi-upload"/>
                 </Button>
                 {slots.button()}