plain-design 1.0.0-beta.11 → 1.0.0-beta.110

package/src/packages/components/TimePicker/time.utils.ts

@@ -1,8 +1,8 @@
 import {useTimeHooks} from "./useTimeHooks";
 import {PDate} from "../../utils/plainDate";
-import {ComponentEvent, ComponentPropsType, computed, ExtractPropTypes, PropType, tSlotsType} from "plain-design-composition";
+import {ComponentEvent, ComponentPropsType, computed, ExtractPropTypes, PropType, tSlotsType} from "@peryl/react-compose";
 import {EditProps, tEditComputed} from "../../uses/useEdit";
-import {StyleProps} from "../../uses/useStyle";
+import {StyleProps, tStyleComputed} from "../../uses/useStyle";
 import {TimePanelProps} from "./panel/TimePanel";
 import Input from "../Input";
 import {iPopupEditorUseOption} from "../usePopupEditor";
@@ -39,6 +39,7 @@ export type tTimeCompositionParams = {
   emit: ComponentEvent<typeof TimeEmitsOption>["emit"],
   props: iTimePropsType,
   editComputed: tEditComputed,
+  styleComputed: tStyleComputed,
   slots: tSlotsType<typeof TimeSlotsOption>,
   /*获取popper公共的属性设置*/
   getPublicPopperAttrs: () => any,

package/src/packages/components/TimePicker/useRangeTimeRender.tsx

@@ -1,23 +1,23 @@
-import {computed, getComponentCls, iHTMLInputElement, reactive, useModel, useRefs} from "plain-design-composition";
+import {createEffectsOfReaction, getComponentCls, iHTMLInputElement, reactive, useModel, useRefs} from "@peryl/react-compose";
 import Input from "../Input";
-import {delay} from "plain-utils/utils/delay";
+import {delay} from "@peryl/utils/delay";
 import {useFocusHandler} from "../../uses/useFocusHandler";
 import {PDate, plainDate} from "../../utils/plainDate";
 import {TimePanelLayout} from "./panel/TimeBasePanel";
 import {TimeRangePanelType} from "./panel/TimeRangePanel";
 import {limitDatetimeTimePlainData, TimeLayoutToFormat, tTimeCompositionParams} from "./time.utils";
-import {debounce} from "plain-utils/utils/debounce";
+import {debounce} from "@peryl/utils/debounce";
 import {useRenderReference} from "../../uses/useRenderReference";
-import {createEffects} from "plain-utils/utils/createEffects";
 
 export function useRangeTimeRender({ props, emit, onBlur, slots, displayPattern, today, onInputClear, maxmin, formatString }: tTimeCompositionParams & { onBlur: () => void, onInputClear?: (range: TimeRangePanelType) => void, }) {
-  const { effects } = createEffects();
+  const { effects, effectComputed } = createEffectsOfReaction();
   const { refs, onRef } = useRefs({ input: Input, start: iHTMLInputElement, end: iHTMLInputElement, });
   const reference = useRenderReference();
-  const startModel = useModel(() => props.start, emit.onUpdateStart, { onChange: () => delay().then(() => state.input.start = format.value.start?.getDisplay()) });
-  const endModel = useModel(() => props.end, emit.onUpdateEnd, { onChange: () => delay().then(() => state.input.end = format.value.end?.getDisplay()) });
+  const startModel = useModel(() => props.start, emit.onUpdateStart, { onChange: () => delay().then(() => state.input.start = format.value.start?.getDisplay()) }, effects);
+  const endModel = useModel(() => props.end, emit.onUpdateEnd, { onChange: () => delay().then(() => state.input.end = format.value.end?.getDisplay()) }, effects);
 
   const { isFocus } = useFocusHandler({
+    effects,
     getEls: () => [refs.start, refs.end],
     /**
      * Input失去焦点事件，将文本框的值重置为display的值，以避免显示输入不正确的值
@@ -33,7 +33,7 @@ export function useRangeTimeRender({ props, emit, onBlur, slots, displayPattern,
     onFocus: emit.onFocus,
   });
 
-  const format = computed((): { start: null | PDate, end: null | PDate } => ({
+  const format = effectComputed((): { start: null | PDate, end: null | PDate } => ({
     start: !startModel.value ? null : plainDate(startModel.value, formatString.value),
     end: !endModel.value ? null : plainDate(endModel.value, formatString.value),
   }));
@@ -209,6 +209,7 @@ export function useRangeTimeRender({ props, emit, onBlur, slots, displayPattern,
   );
 
   const getInputAttrs = () => ({
+    className: getComponentCls('time-picker'),
     ref: onRef.input,
     suffixIcon: 'pi-clock-circle',
     placeValue: [startModel.value, endModel.value].join('-'),

package/src/packages/components/TimePicker/useTimeHooks.ts

@@ -1,4 +1,4 @@
-import {createSyncHooks, RenderNode} from "plain-design-composition";
+import {createSyncHooks, RenderNode} from "@peryl/react-compose";
 
 export function useTimeHooks() {
   return {

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

@@ -1,9 +1,10 @@
-import {computed, designComponent, getComponentCls, iFocusEvent, iKeyboardEvent, iMouseEvent, reactive, useClasses, useModel, useRefs} from "plain-design-composition";
+import {computed, designComponent, getComponentCls, iFocusEvent, iKeyboardEvent, iMouseEvent, reactive, useClasses, useModel, useRefs} from "@peryl/react-compose";
 import {useClickWave} from "../../directives/ClickWave";
 import './toggle.scss';
 import {EditProps, useEdit} from "../../uses/useEdit";
 import {StyleProps, ThemeStatus, useStyle} from "../../uses/useStyle";
-import {getKey, KEY} from "../KeyboardService";
+import {eKeyboardKeys, getKeyNameByKeyboardEvent} from "@peryl/utils/keyboard";
+import i18n from "../i18n";
 
 export const Toggle = designComponent({
   name: '-toggle',
@@ -14,7 +15,7 @@ export const Toggle = designComponent({
     modelValue: {},                                                                // 双向绑定值
     trueValue: { default: true as any },                                           // 选中时绑定的值
     falseValue: { default: false as any },                                         // 未选中时绑定的值
-    square: { type: Boolean },                                                      // 方形开关
+    square: { type: Boolean },                                                     // 方形开关
   },
   inheritPropsType: HTMLDivElement,
   emits: {
@@ -53,6 +54,7 @@ export const Toggle = designComponent({
         'toggle-active': state.isActive,
         'toggle-disabled': editComputed.value.disabled,
         'toggle-square': props.square,
+        'toggle-input-mode-text': styleComputed.value.inputMode === 'text',
       },
     ]));
 
@@ -77,8 +79,8 @@ export const Toggle = designComponent({
         emit.onClick(e);
       },
       keydown: (e: iKeyboardEvent) => {
-        const key = getKey(e);
-        if (key === KEY.space || key === KEY.enter) {
+        const key = getKeyNameByKeyboardEvent(e);
+        if (key === eKeyboardKeys.space || key === eKeyboardKeys.enter) {
           e.preventDefault();
           e.stopPropagation();
           handler.click(e as any);
@@ -93,7 +95,9 @@ export const Toggle = designComponent({
     return {
       refer: { refs },
       render: () => (
-        <div
+        styleComputed.value.inputMode === 'text' ? (
+          <span className={classes.value}>{isChecked.value ? i18n.$it('base.yes').d('是') : i18n.$it('base.no').d('否')}</span>
+        ) : <div
           ref={onRef.el}
           className={classes.value}
           tabIndex={0}

package/src/packages/components/Toggle/toggle.scss

@@ -1,79 +1,53 @@
 @include prefix(toggle) {
-  background-color: plv(secondary-2);
-  position: relative;
-  outline: none;
-  display: inline-block;
-  vertical-align: middle;
-  user-select: none;
-  transition: background-color 300ms;
-  cursor: pointer;
-  border-radius: 100px;
-
-  .toggle-inner {
-    content: '';
-    position: absolute;
-    left: 2px;
-    top: 2px;
-    bottom: 2px;
-    background: white;
-    box-shadow: 0 3px 12px rgba(0, 0, 0, .16), 0 3px 1px rgba(0, 0, 0, .1);
-    transition: all 0.3s cubic-bezier(0.3, 1.3, 0.3, 1);
-    border-radius: inherit;
-  }
 
-  &:before {
-    position: absolute;
-    left: 2px;
-    right: 2px;
-    top: 2px;
-    bottom: 2px;
-    border-radius: inherit;
+  &:not(.toggle-input-mode-text) {
     background-color: plv(secondary-2);
-    content: "";
-    transform: scaleX(1);
-    /*transform: scale3d(0, 0, 0);*/
-    transition: transform .3s;
-  }
+    position: relative;
+    outline: none;
+    display: inline-block;
+    vertical-align: middle;
+    user-select: none;
+    transition: background-color 300ms;
+    cursor: pointer;
+    border-radius: 100px;
 
-  @include sizeMixin(toggle, ()) {
-    height: calc(#{$height} - 6px);
-    width: calc((#{$height} - 6px) * 52 / 32);
-
-    &.toggle-on {
-      .toggle-inner {
-        left: calc((#{$height} - 6px) * 52 / 32 - 2px - (#{$height} - 6px - 4px));
-      }
-    }
     .toggle-inner {
-      right: calc((#{$height} - 6px) * 52 / 32 - 2px - (#{$height} - 6px - 4px));
-    }
-    &.toggle-active {
-      .toggle-inner {
-        right: calc((#{$height} - 6px) / 2);
-      }
-
-      &.toggle-on .toggle-inner {
-        left: calc((#{$height} - 6px) / 2);
-      }
+      content: '';
+      position: absolute;
+      left: 2px;
+      top: 2px;
+      bottom: 2px;
+      background: white;
+      box-shadow: 0 3px 12px rgba(0, 0, 0, .16), 0 3px 1px rgba(0, 0, 0, .1);
+      transition: all 0.3s cubic-bezier(0.3, 1.3, 0.3, 1);
+      border-radius: inherit;
     }
-  }
 
-  &.toggle-square {
-    &, & > .toggle-inner & > :before {
-      border-radius: plv(box-size-normal-border-radius);;
+    &:before {
+      position: absolute;
+      left: 2px;
+      right: 2px;
+      top: 2px;
+      bottom: 2px;
+      border-radius: inherit;
+      background-color: plv(secondary-2);
+      content: "";
+      transform: scaleX(1);
+      /*transform: scale3d(0, 0, 0);*/
+      transition: transform .3s;
     }
 
     @include sizeMixin(toggle, ()) {
       height: calc(#{$height} - 6px);
-      width: calc((#{$height} - 6px) * 52 / 30);
+      width: calc((#{$height} - 6px) * 52 / 32);
 
       &.toggle-on {
         .toggle-inner {
-          left: calc((#{$height} - 6px) / 2 + 8px);
+          left: calc((#{$height} - 6px) * 52 / 32 - 2px - (#{$height} - 6px - 4px));
         }
       }
       .toggle-inner {
-        right: calc((#{$height} - 6px) / 2 + 8px);
+        right: calc((#{$height} - 6px) * 52 / 32 - 2px - (#{$height} - 6px - 4px));
       }
       &.toggle-active {
         .toggle-inner {
@@ -85,63 +59,93 @@
         }
       }
     }
-  }
 
-  &.toggle-on {
-    &, &.toggle-square {
-      &:before {
-        transform: scale3d(0, 0, 0);
+    &.toggle-square {
+      &, & > .toggle-inner & > :before {
+        border-radius: plv(box-size-normal-border-radius);;
       }
 
-      .toggle-inner {
-        right: 2px;
+      @include sizeMixin(toggle, ()) {
+        height: calc(#{$height} - 6px);
+        width: calc((#{$height} - 6px) * 52 / 30);
+
+        &.toggle-on {
+          .toggle-inner {
+            left: calc((#{$height} - 6px) / 2 + 8px);
+          }
+        }
+        .toggle-inner {
+          right: calc((#{$height} - 6px) / 2 + 8px);
+        }
+        &.toggle-active {
+          .toggle-inner {
+            right: calc((#{$height} - 6px) / 2);
+          }
+
+          &.toggle-on .toggle-inner {
+            left: calc((#{$height} - 6px) / 2);
+          }
+        }
       }
     }
-  }
 
-  &.toggle-active {
-    &, &.toggle-square {
-      .toggle-inner {
-        left: 2px;
-      }
+    &.toggle-on {
+      &, &.toggle-square {
+        &:before {
+          transform: scale3d(0, 0, 0);
+        }
 
-      &.toggle-on .toggle-inner {
-        right: 2px;
+        .toggle-inner {
+          right: 2px;
+        }
       }
     }
-  }
 
-  @include statusMixin(toggle) {
-    &.toggle-on {
-      background-color: $color-6;
-    }
-    &:after {
-      border-color: $color-6;
-    }
-    /*&:focus {
-      .toggle-inner {
-        background-color: $color-4;
+    &.toggle-active {
+      &, &.toggle-square {
+        .toggle-inner {
+          left: 2px;
+        }
+
+        &.toggle-on .toggle-inner {
+          right: 2px;
+        }
       }
-    }*/
-  }
+    }
 
-  &.toggle-disabled {
-    cursor: not-allowed;
+    @include statusMixin(toggle) {
+      &.toggle-on {
+        background-color: $color-6;
+      }
+      &:after {
+        border-color: $color-6;
+      }
+      /*&:focus {
+        .toggle-inner {
+          background-color: $color-4;
+        }
+      }*/
+    }
 
-    background-color: plv(secondary-3);
+    &.toggle-disabled {
+      cursor: not-allowed;
 
-    &:before {
       background-color: plv(secondary-3);
-    }
 
-    .toggle-inner {
-      background-color: #eee;
-    }
+      &:before {
+        background-color: plv(secondary-3);
+      }
 
-    &.toggle-on {
-      @include statusMixin(toggle) {
-        background-color: $color-3;
+      .toggle-inner {
+        background-color: #eee;
+      }
+
+      &.toggle-on {
+        @include statusMixin(toggle) {
+          background-color: $color-3;
+        }
       }
     }
   }
+
 }

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

@@ -1,5 +1,5 @@
-import {designComponent, getComponentCls, mergeAttrs, nextTick, onMounted, onUpdated, PropType, reactive, useClasses, useModel, useRefs, watch} from "plain-design-composition";
-import {debounce} from "plain-utils/utils/debounce";
+import {designComponent, getComponentCls, mergeAttrs, nextTick, onMounted, onUpdated, PropType, reactive, useClasses, useModel, useRefs, watch} from "@peryl/react-compose";
+import {debounce} from "@peryl/utils/debounce";
 import './tooltip.scss';
 import {ThemeSize} from "../../uses/useStyle";
 import {Popup} from "../Popup";

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

@@ -1,4 +1,5 @@
-import {createCounter, designClassComponent, designComponent, onBeforeMount, PropType, useReference} from "plain-design-composition";
+import {designClassComponent, designComponent, onBeforeMount, PropType, useReference} from "@peryl/react-compose";
+import {createCounter} from '@peryl/utils/createCounter';
 import React from "react";
 import {CSSTransition, SwitchTransition} from "react-transition-group";
 import {findDOMNode} from "react-dom";

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

@@ -1,4 +1,4 @@
-import {cacheComputed, classnames, computed, designComponent, getComponentCls, iHTMLDivElement, iMouseEvent, PropType, useClasses, useRefs} from "plain-design-composition";
+import {cacheComputed, classnames, computed, designComponent, getComponentCls, iHTMLDivElement, iMouseEvent, PropType, useClasses, useRefs} from "@peryl/react-compose";
 import {Tree} from "./index";
 import {iTreeNode} from "../TreeCore/createTreeNode";
 import {Loading} from "../Loading";
@@ -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

@@ -1,4 +1,4 @@
-import {designComponent, getComponentCls, mergeAttrs, onBeforeUnmount, onMounted, PropType, useClasses} from "plain-design-composition";
+import {designComponent, getComponentCls, mergeAttrs, onBeforeUnmount, onMounted, PropType, useClasses} from "@peryl/react-compose";
 import {TreeEmitOptions, TreePropsOptions} from "../TreeCore/createTreeProps";
 import {createTreeCore} from "../TreeCore/createTreeCore";
 import {RenderTreeNode} from "./RenderTreeNode";
@@ -10,7 +10,7 @@ import {TreeScopeSlotsOption, TreeSlotsOption} from "../TreeCore/TreeCore.type";
 import {StyleProps, useStyle} from "../../uses/useStyle";
 import {Empty} from "../Empty";
 import {LoadingMask} from "../LoadingMask";
-import {PlainObject} from "plain-utils/utils/event";
+import {PlainObject} from "@peryl/utils/event";
 
 export const Tree = designComponent({
   name: '-tree',
@@ -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/createTreeCore.tsx

@@ -1,4 +1,4 @@
-import {computed, ComputedRef, reactive, useModel, useRefs, watchEffect} from "plain-design-composition";
+import {computed, ComputedRef, reactive, useModel, useRefs, watchEffect} from "@peryl/react-compose";
 import {iTreeNodeComputedData, iTreeProps, iTreeState} from "./TreeCore.type";
 import {createTreeUtils} from "./createTreeUtils";
 import {formatNodeData2TreeNode} from "./fromatNodeData";
@@ -10,8 +10,8 @@ import {CheckboxStatus} from "../../utils/constant";
 import {createTreeDraggier} from "./createTreeDraggier";
 import {VirtualList} from "../VirtualList";
 import {Scroll} from "../Scroll";
-import {createEffects} from "plain-utils/utils/createEffects";
-import {toArray} from "plain-utils/utils/toArray";
+import {createEffects} from "@peryl/utils/createEffects";
+import {toArray} from "@peryl/utils/toArray";
 
 export function createTreeCore(
   {