plain-design 1.0.0-beta.16 → 1.0.0-beta.160

package/src/packages/components/ProgressBar/progress-bar.scss

@@ -32,7 +32,7 @@
         text-align: right;
 
         span {
-          color: white;
+         color: plv(pbfc);
         }
       }
     }

package/src/packages/components/ProgressBar/progress.utils.ts

@@ -1,5 +1,5 @@
-import {computed, getComponentCls, PropType} from "plain-design-composition";
-import {createEnum} from "plain-utils/utils/createEnum";
+import {computed, getComponentCls, PropType} from "@peryl/react-compose";
+import {createEnum} from "@peryl/utils/createEnum";
 
 export const ProgressStatus = createEnum(['normal', 'success', 'error'] as const);
 

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

@@ -27,9 +27,9 @@ A rx ry x-axis-rotation large-arc-flag sweep-flag x y
 - y：结束点y坐标
 
 */
-import {computed, designComponent, getComponentCls, reactive, useClasses, useModel, useRefs, useStyles, watch} from "plain-design-composition";
+import {computed, designComponent, getComponentCls, reactive, useClasses, useModel, useRefs, useStyles, watch} from "@peryl/react-compose";
 import {createAnimate} from "../../utils/createAnimate";
-import {unit} from "plain-utils/string/unit";
+import {unit} from "@peryl/utils/unit";
 import {Icon} from "../Icon";
 import './progress-circle.scss';
 import {PROGRESS_DEFAULT_PROPS, ProgressStatus, useProgressColor} from "../ProgressBar/progress.utils";

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

@@ -1,7 +1,7 @@
 import './progress-mini.scss';
-import {computed, designComponent, getComponentCls, useClasses, useModel, useRefs, useStyles, watch} from "plain-design-composition";
+import {computed, designComponent, getComponentCls, useClasses, useModel, useRefs, useStyles, watch} from "@peryl/react-compose";
 import {createAnimate} from "../../utils/createAnimate";
-import {unit} from "plain-utils/string/unit";
+import {unit} from "@peryl/utils/unit";
 import {PROGRESS_DEFAULT_PROPS, ProgressStatus, useProgressColor} from "../ProgressBar/progress.utils";
 
 export const ProgressMini = designComponent({

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

@@ -1,9 +1,9 @@
-import {computed, designComponent, getComponentCls, iKeyboardEvent, iMouseEvent, PropType, SimpleFunction, useClasses, useModel, useRefs, useStyles} from "plain-design-composition";
+import {computed, designComponent, getComponentCls, iKeyboardEvent, iMouseEvent, PropType, SimpleFunction, useClasses, useModel, useRefs, useStyles} from "@peryl/react-compose";
 import {EditProps, useEdit} from "../../uses/useEdit";
 import {StyleProps, ThemeStatus, useStyle} from "../../uses/useStyle";
 import {CheckboxStatus} from "../../utils/constant";
-import {unit} from "plain-utils/string/unit";
-import {getKey, KEY} from "../KeyboardService";
+import {unit} from "@peryl/utils/unit";
+import {eKeyboardKeys, getKeyNameByKeyboardEvent} from "@peryl/utils/keyboard";
 import {useClickWave} from "../../directives/ClickWave";
 import {RadioInner} from "../RadioInner";
 import {RadioGroup} from "../RadioGroup";
@@ -95,7 +95,7 @@ export const Radio = designComponent({
         }*/
       },
       keydown: (e: iKeyboardEvent) => {
-        if (getKey(e) === KEY.space) {
+        if (getKeyNameByKeyboardEvent(e) === eKeyboardKeys.space) {
           e.preventDefault();
           e.stopPropagation();
           handler.click(e as any);

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

@@ -1,4 +1,4 @@
-import {designComponent, getComponentCls, inject, useModel, useRefs} from "plain-design-composition";
+import {designComponent, getComponentCls, inject, useModel, useRefs} from "@peryl/react-compose";
 import {EditProps, useEdit} from "../../uses/useEdit";
 import {StyleProps, ThemeStatus, useStyle} from "../../uses/useStyle";
 import {CheckboxStatus} from "../../utils/constant";

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

@@ -1,5 +1,5 @@
 import './radio-inner.scss';
-import {designComponent, getComponentCls, PropType, useClasses, useRefs} from "plain-design-composition";
+import {designComponent, getComponentCls, PropType, useClasses, useRefs} from "@peryl/react-compose";
 import {CheckboxStatus} from "../../utils/constant";
 
 export const RadioInner = designComponent({

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

@@ -1,6 +1,6 @@
-import {computed, designComponent, getComponentCls, iMouseEvent, reactive, useClasses, useModel, useMounted, useRefs} from "plain-design-composition";
-import {disabledUserSelect} from "plain-utils/dom/disabledUserSelect";
-import {enableUserSelect} from "plain-utils/dom/enableUserSelect";
+import {computed, designComponent, getComponentCls, iMouseEvent, reactive, useClasses, useModel, useMounted, useRefs} from "@peryl/react-compose";
+import {disabledUserSelect} from "@peryl/utils/disabledUserSelect";
+import {enableUserSelect} from "@peryl/utils/enableUserSelect";
 import {Icon} from "../Icon";
 import './rate.scss';
 import {EditProps, useEdit} from "../../uses/useEdit";

package/src/packages/components/Reference/ReferenceProvider.tsx

@@ -1,4 +1,4 @@
-import {inject, provide} from "plain-design-composition";
+import {inject, provide} from "@peryl/react-compose";
 
 export const ReferenceProvider = (() => {
   const PL_ELEMENT_PROVIDER = '@@PL_ELEMENT_PROVIDER';

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

@@ -1,4 +1,4 @@
-import {designComponent, nextTick, onMounted, useRefs} from "plain-design-composition";
+import {designComponent, nextTick, onMounted, useRefs} from "@peryl/react-compose";
 import {ReferenceProvider} from "./ReferenceProvider";
 import {findDOMNode} from "react-dom";
 import React from "react";

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

@@ -0,0 +1,66 @@
+import {delay, designComponent, onBeforeUnmount, onMounted, reactive, watch} from "@peryl/react-compose";
+import {createEffects} from "@peryl/utils/createEffects";
+
+export const RollingNumber = designComponent({
+  name: 'rolling-number',
+  props: {
+    val: { type: Number }
+  },
+  setup({ props }) {
+
+    const state = reactive({ val: 0 });
+
+    const utils = {
+      update: (space = 1) => {
+        // console.log('update');
+        space = Math.abs(space);
+        const val = state.val;
+        if (props.val == null) {
+          state.val = 0;
+          return;
+        }
+        if (val == props.val) {
+          return;
+        }
+        if (val > props.val) {
+          state.val = Math.max(val - space, props.val);
+          delay(20).then(() => utils.update(space));
+        } else {
+          state.val = Math.min(val + space, props.val);
+          delay(20).then(() => utils.update(space));
+        }
+      },
+      format: (num: number) => {
+        const [prepend, append] = String(num).split('.');
+        const list = String(prepend).split('').reverse();
+        const lastIndex = list.length - 1;
+        return list.reduce((prev, item, index) => {
+          return (lastIndex != index && (index + 1) % 3 == 0 ? ',' : '') + item + prev;
+        }, '') + (!append ? '' : `.${append}`);
+      },
+    };
+
+    const { effects } = createEffects();
+
+    onMounted(() => {
+      effects.push(
+        watch(() => props.val, () => {
+          const curVal = state.val || 0;
+          const newVal = props.val == null ? 0 : props.val;
+          const space = Math.ceil((newVal - curVal) / 50);
+          utils.update(space);
+        }, { immediate: true })
+      );
+    });
+
+    onBeforeUnmount(effects.clear);
+
+    return () => (
+      props.val != null && (
+        <span>{utils.format(state.val)}</span>
+      )
+    );
+  },
+});
+
+export default RollingNumber;

package/src/packages/components/Scroll/HorizontalScrollbar.tsx

@@ -1,9 +1,9 @@
-import {computed, designComponent, iMouseEvent, onBeforeUnmount, onMounted, reactive, useStyles} from "plain-design-composition";
-import {disabledUserSelect} from "plain-utils/dom/disabledUserSelect";
-import {enableUserSelect} from "plain-utils/dom/enableUserSelect";
+import {computed, designComponent, iMouseEvent, onBeforeUnmount, onMounted, reactive, useStyles} from "@peryl/react-compose";
+import {disabledUserSelect} from "@peryl/utils/disabledUserSelect";
+import {enableUserSelect} from "@peryl/utils/enableUserSelect";
 
 import {Scroll} from "./index";
-import {delay} from "plain-utils/utils/delay";
+import {delay} from "@peryl/utils/delay";
 import Tooltip from "../Tooltip";
 import {ClientZoom} from "../ClientZoom";
 

package/src/packages/components/Scroll/VerticalScrollbar.tsx

@@ -1,9 +1,9 @@
-import {computed, designComponent, iMouseEvent, onBeforeUnmount, onMounted, reactive, useStyles} from "plain-design-composition";
-import {disabledUserSelect} from "plain-utils/dom/disabledUserSelect";
-import {enableUserSelect} from "plain-utils/dom/enableUserSelect";
+import {computed, designComponent, iMouseEvent, onBeforeUnmount, onMounted, reactive, useStyles} from "@peryl/react-compose";
+import {disabledUserSelect} from "@peryl/utils/disabledUserSelect";
+import {enableUserSelect} from "@peryl/utils/enableUserSelect";
 
 import {Scroll} from "./index";
-import {delay} from "plain-utils/utils/delay";
+import {delay} from "@peryl/utils/delay";
 import Tooltip from "../Tooltip";
 import {ClientZoom} from "../ClientZoom";
 

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

@@ -1,13 +1,14 @@
 import './scroll.scss';
-import {computed, createSyncHooks, designComponent, getComponentCls, onBeforeUnmount, onMounted, reactive, useClasses, useMounted, useRefs, useStyles, watch} from "plain-design-composition";
-import {delay} from "plain-utils/utils/delay";
-import {debounce} from "plain-utils/utils/debounce";
-import {throttle} from "plain-utils/utils/throttle";
+import {computed, createSyncHooks, designComponent, getComponentCls, onBeforeUnmount, onMounted, reactive, useClasses, useMounted, useRefs, useStyles, watch} from "@peryl/react-compose";
+import {delay} from "@peryl/utils/delay";
+import {debounce} from "@peryl/utils/debounce";
+import {throttle} from "@peryl/utils/throttle";
 
 import {VerticalScrollbar} from "./VerticalScrollbar";
 import {HorizontalScrollbar} from "./HorizontalScrollbar";
 import {ResizeDetectFuncParam, useResizeDetector} from "../../directives/ResizeDetector";
 import {createScrollUtils} from "../createScrollUtils";
+import {getRectAutoFormat} from "@peryl/utils/getRectAutoFormat";
 
 export enum PLAIN_SCROLL_VERTICAL_POSITION {
   top = 'top',
@@ -34,9 +35,13 @@ export const Scroll = designComponent({
     autoScrollSpeed: { type: Number, default: 400 },                                                  // 自动滚动的时候的速度，每秒钟滚动的距离
     scrollAfterDragEnd: { type: Boolean, },                                                           // 是否拖拽结束后才刷新滚动位置
     disableListTransition: { type: Boolean, },                                                        // 是否股弄懂的时候禁用list的队列动画
-    disableTransitionWhenScroll: { type: Boolean },                                                     // 是否在滚动的时候禁用内部所有元素的transition动画
+    disableTransitionWhenScroll: { type: Boolean },                                                   // 是否在滚动的时候禁用内部所有元素的transition动画
     horizontalScrollbarTooltip: { type: String },                                                     // 横向滚动条tooltip显示文本
     verticalScrollbarTooltip: { type: String },                                                       // 纵向滚动条tooltip显示文本
+    mutationSubtree: { type: Boolean, default: true },                                                // 监听整个子树的节点变化
+    mutationChildList: { type: Boolean, default: true },                                              // 监听整个子树的节点新增与删除
+    mutationAttributes: { type: Boolean, default: false },                                            // 监听整个子树节点的属性变化
+
   },
   emits: {
     onScroll: (e: Event) => true,
@@ -78,9 +83,9 @@ export const Scroll = designComponent({
       set isDragging(val: boolean) {
         this._isDragging = val;
         if (val) {
-          refs.host!.setAttribute('is-dragging', '');
+          refs.host?.setAttribute('is-dragging', '');
         } else {
-          refs.host!.removeAttribute('is-dragging');
+          refs.host?.removeAttribute('is-dragging');
         }
       },
     };
@@ -209,15 +214,48 @@ export const Scroll = designComponent({
       autoScrollLeft() {scrollUtils.autoScrollLeft();},
       autoScrollRight() {scrollUtils.autoScrollRight();},
       stopAutoScroll() {scrollUtils.stopAutoScroll();},
+      showElement: (elementSelector: string | HTMLElement): boolean => {
+        if (!refs.host || !refs.content) {return false;}
+        const selectElement = typeof elementSelector === "string" ? refs.content?.querySelector(elementSelector) : elementSelector;
+
+        if (selectElement == null) {return false;}
+        const selectElementRect = getRectAutoFormat(selectElement as any);
+        const contentElementRect = getRectAutoFormat(refs.content);
+        const hostElementRect = getRectAutoFormat(refs.host);
+
+        /*vertical*/
+        if (selectElementRect.bottom >= hostElementRect.bottom) {
+          /*在下面*/
+          const offsetTop = selectElementRect.top - contentElementRect.top;
+          methods.scrollTop(offsetTop - (hostElementRect.height - selectElementRect.height));
+        } else if (selectElementRect.top <= hostElementRect.top) {
+          /*在上面*/
+          const offsetTop = selectElementRect.top - contentElementRect.top;
+          methods.scrollTop(offsetTop);
+        }
+
+        /*horizontal*/
+        if (selectElementRect.right >= hostElementRect.right) {
+          /*在右边*/
+          const offsetLeft = selectElementRect.left - contentElementRect.left;
+          methods.scrollLeft(offsetLeft - (hostElementRect.width - selectElementRect.width));
+        } else if (selectElementRect.left <= hostElementRect.left) {
+          /*在左边*/
+          const offsetLeft = selectElementRect.left - contentElementRect.left;
+          methods.scrollLeft(offsetLeft);
+        }
+
+        return true;
+      },
       /**
        * 禁用list的队列动画，300ms后恢复正常
        * @author  韦胜健
        * @date    2020/12/15 10:16
        */
       disableListTransition: (() => {
-        const disabledQueueAnimation = debounce(() => refs.host!.removeAttribute('virtual-scrolling'), 300, true);
+        const disabledQueueAnimation = debounce(() => refs.host?.removeAttribute('virtual-scrolling'), 300, true);
         return () => {
-          refs.host!.setAttribute('virtual-scrolling', '');
+          refs.host?.setAttribute('virtual-scrolling', '');
           disabledQueueAnimation();
         };
       })(),
@@ -227,9 +265,9 @@ export const Scroll = designComponent({
        * @date    2022.10.28 21:34
        */
       disableInnerTransition: (() => {
-        const disabledQueueAnimation = debounce(() => refs.host!.removeAttribute('disable-all-transition'), 300, true);
+        const disabledQueueAnimation = debounce(() => refs.host?.removeAttribute('disable-all-transition'), 300, true);
         return () => {
-          refs.host!.setAttribute('disable-all-transition', '');
+          refs.host?.setAttribute('disable-all-transition', '');
           disabledQueueAnimation();
         };
       })()
@@ -316,12 +354,13 @@ export const Scroll = designComponent({
           popper.event.off.onOpen(handler.popperOpen)
           popper.event.off.onShow(handler.popperShow)
       }*/
+      handler.windowResize.dispose();
     });
 
     watch(() => props.refreshState, methods.refresh);
 
-    useResizeDetector({ elGetter: () => refs.host, onResize: handler.hostResize });
-    useResizeDetector({ elGetter: () => refs.content, onResize: handler.contentResize });
+    useResizeDetector({ elGetter: () => refs.host, onResize: handler.hostResize, mutateOption: { childList: props.mutationChildList, subtree: props.mutationSubtree, attributes: props.mutationAttributes } });
+    useResizeDetector({ elGetter: () => refs.content, onResize: handler.contentResize, mutateOption: { childList: props.mutationChildList, subtree: props.mutationSubtree, attributes: props.mutationAttributes }, });
 
     return {
       refer: {

package/src/packages/components/Scroll/scroll.scss

@@ -110,8 +110,10 @@
     }
   }
   &[disable-all-transition] {
-    *, *:before, *:after {
-      transition: none !important;
+    *:not([data-force-transition=true]) {
+      &, &:before, &:after {
+        transition: none !important;
+      }
     }
   }
 

package/src/packages/components/Scroll/useAutoScroll.ts

@@ -1,4 +1,4 @@
-import {addClass} from "plain-utils/dom/addClass";
+import {addClass} from "@peryl/utils/addClass";
 import {Scroll} from "./index";
 
 function createIndicator(hostEl: HTMLElement, vertical: boolean) {

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

@@ -1,4 +1,4 @@
-import {designComponent, getComponentCls, iMouseEvent, useClasses} from "plain-design-composition";
+import {designComponent, getComponentCls, iMouseEvent, useClasses} from "@peryl/react-compose";
 import {SegmentGroup} from "../SegmentGroup";
 import './segment.scss';
 

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

@@ -1,4 +1,4 @@
-import {designComponent, getComponentCls, useClasses, useModel} from "plain-design-composition";
+import {designComponent, getComponentCls, useClasses, useModel} from "@peryl/react-compose";
 import {StyleProps, useStyle} from "../../uses/useStyle";
 
 export const SegmentGroup = designComponent({

package/src/packages/components/Select/SelectPanel.tsx

@@ -1,10 +1,11 @@
-import {designComponent, getComponentCls, iHTMLDivElement, PropType, RenderNode} from "plain-design-composition";
+import {designComponent, getComponentCls, iHTMLDivElement, PropType, RenderNode} from "@peryl/react-compose";
 import {renderDropdownPanel} from "../Dropdown/dropdown.utils";
 import {iSelectOptionProps, SelectPanelOptionPropOptions} from "./select.utils";
 import {Loading} from "../Loading";
 import Empty from "../Empty";
 import {ApplicationConfigurationProvider} from "../Application/utils/application.utils";
 import i18n from "../i18n";
+import {useSearchText} from "../SelectGroup";
 
 export const SelectPanel = designComponent({
   name: 'select-panel',
@@ -27,6 +28,8 @@ export const SelectPanel = designComponent({
 
     const applicationConfiguration = ApplicationConfigurationProvider.inject();
 
+    useSearchText.provide(() => props.searchText);
+
     const handler = {
       onClickOption: (selectOptionProps: any, e: MouseEvent,) => {emit.onSelect(selectOptionProps, e);},
       onEnterOption: emit.onEnterOption,
@@ -43,7 +46,7 @@ export const SelectPanel = designComponent({
           content = slots.loadingContent(
             <div className="select-panel-loading">
               <Loading type="delta"/>
-              <span>{i18n('base.loading').d('加载中')}</span>
+              <span>{i18n.$it('base.loading').d('加载中')}</span>
             </div>
           );
         } else if (props.dataLength === 0) {

package/src/packages/components/Select/createMultipleSelectRender.tsx

@@ -1,13 +1,14 @@
-import {reactive} from "plain-design-composition";
+import {reactive} from "@peryl/react-compose";
 import {iSelectCompositionParams, iSelectOptionProps} from "./select.utils";
 import Input from "../Input";
 import {createPublicSelectRender} from "./createPublicSelectRender";
-import {delay} from "plain-utils/utils/delay";
+import {delay} from "@peryl/utils/delay";
 import {inputScrollEnd} from "../Input/input.utils";
 import {useMultipleModel} from "../../uses/useMultipleModel";
 import i18n from "../i18n";
 import {Checkbox} from "../Checkbox";
 import {CheckboxStatus} from "../../utils/constant";
+import {createEffects} from "@peryl/utils/createEffects";
 
 export function createMultipleSelectRender(params: iSelectCompositionParams) {
 
@@ -32,7 +33,9 @@ export function createMultipleSelectRender(params: iSelectCompositionParams) {
    */
   const scrollEnd = () => {delay().then(() => inputScrollEnd(() => selector.refs.input?.refs.el));};
 
-  const model = useMultipleModel<any[] | null | undefined>(() => props.modelValue as any, emit.onUpdateModelValue, props);
+  const { effects } = createEffects();
+
+  const model = useMultipleModel<any[] | null | undefined>(() => props.modelValue as any, emit.onUpdateModelValue, props, undefined, effects);
 
   const selector = createPublicSelectRender(params, {
     isActivated,
@@ -83,11 +86,11 @@ export function createMultipleSelectRender(params: iSelectCompositionParams) {
         <>
           {editComputed.value.editable && (
             <div className="select-panel-header">
-              {/*<Button onClick={handler.handleCheckAll} size="mini">{i18n('base.select.all').d('全选')}</Button>
-              <Button onClick={handler.handleUncheckALl} size="mini">{i18n('base.clear').d('清空')}</Button>
-              <Button onClick={handler.handleCheckReverse} size="mini">{i18n('base.select.reverse').d('反选')}</Button>*/}
+              {/*<Button onClick={handler.handleCheckAll} size="mini">{i18n.$it('base.select.all').d('全选')}</Button>
+              <Button onClick={handler.handleUncheckALl} size="mini">{i18n.$it('base.clear').d('清空')}</Button>
+              <Button onClick={handler.handleCheckReverse} size="mini">{i18n.$it('base.select.reverse').d('反选')}</Button>*/}
               <Checkbox checkStatus={checkStatus} customReadonly label={
-                checkStatus !== CheckboxStatus.check ? i18n('base.select.all').d('全选') : i18n('base.clear').d('清空')
+                checkStatus !== CheckboxStatus.check ? i18n.$it('base.select.all').d('全选') : i18n.$it('base.clear').d('清空')
               } onClick={() => {
                 checkStatus !== CheckboxStatus.check ? handler.handleCheckAll() : handler.handleUncheckALl();
               }}/>
@@ -97,6 +100,7 @@ export function createMultipleSelectRender(params: iSelectCompositionParams) {
         </>
       );
     },
+    effects,
   });
 
   const handler = {
@@ -181,7 +185,7 @@ export function createMultipleSelectRender(params: iSelectCompositionParams) {
    * @author  韦胜健
    * @date    2022/8/16 9:16
    */
-  selector.effects.push(hooks.renderInput.use(() => {
+  effects.push(hooks.renderInput.use(() => {
 
     /*每次render input的时候解析内容*/
     selector.optionListHandler.decode();
@@ -224,21 +228,21 @@ export function createMultipleSelectRender(params: iSelectCompositionParams) {
    * @author  韦胜健
    * @date    2022/8/16 9:17
    */
-  selector.effects.push(hooks.onPopperClose.use(() => {state.multipleText = null;}));
+  effects.push(hooks.onPopperClose.use(() => {state.multipleText = null;}));
 
   /**
    * input多值输入文本的时候保留这个文本
    * @author  韦胜健
    * @date    2022/8/16 9:17
    */
-  selector.effects.push(hooks.onInputTextChange.use((val) => {state.multipleText = val;}));
+  effects.push(hooks.onInputTextChange.use((val) => {state.multipleText = val;}));
 
   /**
    * input清空动作
    * @author  韦胜健
    * @date    2022/8/16 9:17
    */
-  selector.effects.push(hooks.onInputClear.use(() => {state.multipleText = null;}));
+  effects.push(hooks.onInputClear.use(() => {state.multipleText = null;}));
 
-  return () => selector.effects.clear();
+  return effects.clear;
 }

package/src/packages/components/Select/createPublicSelectRender.tsx

@@ -1,16 +1,16 @@
-import {reactive, RenderNode, useRefs} from "plain-design-composition";
+import {reactive, RenderNode, useRefs} from "@peryl/react-compose";
 import {createSelectHover, iSelectCompositionParams, iSelectOptionProps, SelectDefaultVirtualRowSize, SelectUtils} from "./select.utils";
 import {decodeSelectRenderNode} from './decodeSelectRenderNode';
 import {Input} from "../Input";
 import {Scroll} from "../Scroll";
 import {SelectPanel} from "./SelectPanel";
-import {unit} from "plain-utils/string/unit";
+import {unit} from "@peryl/utils/unit";
 import {SelectOption} from "../SelectOption";
 import {VirtualList} from "../VirtualList";
-import {delay} from "plain-utils/utils/delay";
-import {handleKeyboard} from "../KeyboardService";
+import {delay} from "@peryl/utils/delay";
+import {handleKeyboard} from "@peryl/utils/keyboard";
 import {useRenderReference} from "../../uses/useRenderReference";
-import {createEffects} from "plain-utils/utils/createEffects";
+import {iEffects} from "@peryl/utils/createEffects";
 import {createPopupEditor} from "../usePopupEditor";
 
 export function createPublicSelectRender(
@@ -22,6 +22,7 @@ export function createPublicSelectRender(
     slots,
     editComputed,
     styleComputed,
+    scrollHeight,
   }: iSelectCompositionParams,
   {
     isActivated,
@@ -33,6 +34,7 @@ export function createPublicSelectRender(
     defaultCurrent,
     multiple,
     processRenderPanel,
+    effects,
   }: {
     /**
      * 判断选项是否已经选中，用来provide给option组件判断自身是否已经选中
@@ -88,16 +90,20 @@ export function createPublicSelectRender(
      * @date    2022/8/16 8:40
      */
     processRenderPanel?: (defaultRender: () => RenderNode) => RenderNode,
+    /**
+     * 副作用收集函数
+     * @author  韦胜健
+     * @date    2024.9.3 22:45
+     */
+    effects: iEffects,
   }) {
-  /*记录副作用函数*/
-  const { effects } = createEffects();
 
   const { refs, onRef } = useRefs({
     /*用来创建popper的reference对象*/
     input: Input,
     /*用来上移下移hover元素的时候滚动到目标位置，如果用的是虚拟列表，则不会有这个对象，暂定虚拟列表不支持滚动*/
     scroll: Scroll,
-  });
+  }, { effects });
 
   const reference = useRenderReference();
 
@@ -118,7 +124,7 @@ export function createPublicSelectRender(
   const hover = createSelectHover({
     defaultCurrent,
     refs,
-    scrollHeight: () => props.scrollHeight,
+    scrollHeight: () => scrollHeight.value,
     getMatchOptionsLength: () => optionListHandler.getMatchOptionPropsList().length
   });
 
@@ -231,12 +237,12 @@ export function createPublicSelectRender(
           const render = () => {
             /*如果显示的选项大于6个，则使用虚拟滚动显示，否则直接显示*/
             return (matchOptionPropsList.length > props.scrollNum ?
-              (<div style={{ height: unit(props.scrollHeight)! }}>
+              (<div style={{ height: unit(scrollHeight.value)! }}>
                 <VirtualList data={matchOptionPropsList} size={(() => {
                   const { virtualRowSize } = props;
                   return virtualRowSize == null ? SelectDefaultVirtualRowSize[styleComputed.value.size] : virtualRowSize;
                 })()}>
-                  {{ default: ({ item, index }: { item: iSelectOptionProps, index: number }) => <SelectOption {...item} index={index} key={index}/> }}
+                  {{ default: ({ item, index, vIndex }: { item: iSelectOptionProps, index: number, vIndex: number }) => <SelectOption {...item} index={index} key={vIndex}/> }}
                 </VirtualList>
               </div>) : (
                 matchOptionPropsList.map((i, index) => (<SelectOption {...i} index={index}/>))
@@ -255,6 +261,7 @@ export function createPublicSelectRender(
             props,
             onRefScroll: onRef.scroll,
             innerState,
+            scrollHeight,
           });
           optionPropsList = ret.optionPropsList;
           matchOptionPropsList = ret.matchOptionPropsList;
@@ -302,7 +309,7 @@ export function createPublicSelectRender(
      * @author  韦胜健
      * @date    2022/8/8 20:16
      */
-    onInputKeydown: handleKeyboard({
+    onInputKeydown: handleKeyboard<KeyboardEvent>({
       up: methods.handlePrev,
       down: methods.handleNext,
       enter: (): void => handler.onInputEnter(),
@@ -391,7 +398,6 @@ export function createPublicSelectRender(
   };
 
   return {
-    effects,
     refs,
     onRef,
     state,

package/src/packages/components/Select/createSelectOptionDecoder.tsx

@@ -1,7 +1,7 @@
 import {iSelectOptionProps} from "./select.utils";
 import {findReactElement} from "../../utils/findReactElement";
 import {SelectOption} from "../SelectOption";
-import {reactive} from "plain-design-composition";
+import {reactive} from "@peryl/react-compose";
 
 export interface iSelectOptionDecodeMeta {
   props: iSelectOptionProps;