plain-design 1.0.0-beta.107 → 1.0.0-beta.109

package/src/packages/components/Object/createObjectRender.single.tsx

@@ -1,7 +1,6 @@
 import {iObjectCompositionParam, iObjectSelectOption} from "./object.utils";
-import {createEffects} from "@peryl/utils/createEffects";
 import {Select} from "../Select";
-import {computed, reactive, useRefs, watch} from "@peryl/react-compose";
+import {createEffectsOfReaction, reactive, useRefs} from "@peryl/react-compose";
 import {convertRowToSelected, convertSelectedToRow} from "../$object/object.conver";
 import {PlainObject} from "@peryl/utils/event";
 import {SelectOption} from "../SelectOption";
@@ -15,7 +14,7 @@ import i18n from "../i18n";
 export function createObjectRenderSingle(
   { props, event, hooks, classes, inputSlots, object, loading, loadData, editComputed }: iObjectCompositionParam
 ) {
-  const { effects } = createEffects();
+  const { effects, effectComputed, effectWatch } = createEffectsOfReaction();
 
   const { refs, onRef } = useRefs({ select: Select });
 
@@ -82,7 +81,7 @@ export function createObjectRenderSingle(
         hooks.onInputChange.exec(val);
       },
     };
-    const inputAttrs = computed(() => {
+    const inputAttrs = effectComputed(() => {
       /*当前选中数据的显示值*/
       const label = props.modelValue;
       /*空值占位符，没有focus的时候就显示真实的placeholder，否则显示当前匹配option的label*/
@@ -98,6 +97,7 @@ export function createObjectRenderSingle(
         clearHandler: publicHandler.onClear
       });
     });
+
     return { state, inputAttrs };
   })();
 
@@ -109,7 +109,7 @@ export function createObjectRenderSingle(
   const selectHandler = (() => {
 
     /*将row转化为selected对象，用来辅助getSelectValue实现功能*/
-    const row2selected = computed(() => {return !props.row || !props.modelValue ? null : convertRowToSelected(props.row, props.map);});
+    const row2selected = effectComputed(() => {return !props.row || !props.modelValue ? null : convertRowToSelected(props.row, props.map);});
 
     /*获取当前select的modelValue以及要渲染的select options数组*/
     const getSelectValue = (): { value: any, option: null | iObjectSelectOption[] } => {
@@ -124,9 +124,7 @@ export function createObjectRenderSingle(
     const state = reactive(getSelectValue());
 
     /*当绑定值变化时，重新计算select的modelValue以及option数组*/
-    effects.push(
-      watch(() => props.modelValue, () => {Object.assign(state, getSelectValue());})
-    );
+    effectWatch(() => props.modelValue, () => {Object.assign(state, getSelectValue());});
 
     /**
      * 根据搜索关键词加载数据
@@ -147,16 +145,17 @@ export function createObjectRenderSingle(
       onClose: () => {Object.assign(state, getSelectValue());},
     };
     /*监听popper的部分参数*/
-    const popperAttrs = computed(() => ({
+    const popperAttrs = effectComputed(() => ({
       ...handler,
     }));
+
     /*监听select的选中选项动作*/
     const onSelectChange = (code: string | null) => {
       const selected = !code ? null : state.option?.find(i => i.val === code)?.data;
       publicHandler.onSelect(selected);
     };
     /*给select传递的属性*/
-    const selectAttrs = computed(() => ({
+    const selectAttrs = effectComputed(() => ({
       onUpdateModelValue: onSelectChange,
       loading: loading.value,
       class: classes.value,
@@ -169,6 +168,7 @@ export function createObjectRenderSingle(
       /*没有关键词的时候，提示输入关键词，已经有关键词并且没有选项的情况下提示placeholder*/
       noDataLabel: !inputHandler.state.inputValue && state.option == null ? (props.searchPlaceholder || i18n.$it('table.pleaseEnterSearchKey').d('请输入搜索关键词')) : undefined
     }));
+
     return { state, popperAttrs, onSelectChange, selectAttrs };
   })();
 

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

@@ -1,4 +1,4 @@
-import {computed, getComponentCls, reactive} from "@peryl/react-compose";
+import {getComponentCls, globalComputed, reactive} from "@peryl/react-compose";
 import {createCache} from "../../utils/createCache";
 import {InputMode, ThemeMode, ThemeShape, ThemeSize} from "../../uses/useStyle";
 import {DeepPartial} from "../../utils/type";
@@ -27,7 +27,7 @@ export const PageThemeUtils = (() => {
     zoom: zoomCache.get(),
   });
 
-  const configuration = computed((): DeepPartial<iApplicationConfiguration> => {
+  const configuration = globalComputed((): DeepPartial<iApplicationConfiguration> => {
     const config: DeepPartial<iApplicationConfiguration> = {};
     if (!config.theme) {config.theme = {};}
     if (!config.theme.base) {config.theme.base = {};}

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

@@ -8,6 +8,7 @@ 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,
@@ -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

@@ -10,7 +10,7 @@ import {VirtualList} from "../VirtualList";
 import {delay} from "@peryl/utils/delay";
 import {handleKeyboard} from "@peryl/utils/keyboard";
 import {useRenderReference} from "../../uses/useRenderReference";
-import {createEffects} from "@peryl/utils/createEffects";
+import {iEffects} from "@peryl/utils/createEffects";
 import {createPopupEditor} from "../usePopupEditor";
 
 export function createPublicSelectRender(
@@ -33,6 +33,7 @@ export function createPublicSelectRender(
     defaultCurrent,
     multiple,
     processRenderPanel,
+    effects,
   }: {
     /**
      * 判断选项是否已经选中，用来provide给option组件判断自身是否已经选中
@@ -88,9 +89,13 @@ 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对象*/
@@ -391,7 +396,6 @@ export function createPublicSelectRender(
   };
 
   return {
-    effects,
     refs,
     onRef,
     state,

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

@@ -3,6 +3,7 @@ import {Input} from "../Input";
 import {createPublicSelectRender} from "./createPublicSelectRender";
 import {reactive, useModel} from "@peryl/react-compose";
 import {delay} from "@peryl/utils/delay";
+import {createEffects} from "@peryl/utils/createEffects";
 
 /**
  * 单选组合函数，支持普通单选以及虚拟列表的方式
@@ -18,15 +19,18 @@ export function createSingleSelectRender(params: iSelectCompositionParams) {
     inputValue: null as null | string
   });
 
+  const { effects } = createEffects();
+
   const model = useModel(() => props.modelValue, params.emit.onUpdateModelValue, {
     onChange: async () => {
       await delay();
       state.inputValue = selector.optionListHandler.getMatchLabel();
     }
-  });
+  }, effects);
 
   const selector = createPublicSelectRender(params, {
     isActivated: props => isMatch({ option: props.val, value: model.value }),
+    effects,
     model,
     ...(() => {
       /**
@@ -69,7 +73,7 @@ export function createSingleSelectRender(params: iSelectCompositionParams) {
     defaultCurrent: undefined,
   });
 
-  selector.effects.push(hooks.renderInput.use(() => {
+  effects.push(hooks.renderInput.use(() => {
 
     selector.optionListHandler.decode();
     /*显示文本*/
@@ -106,24 +110,24 @@ export function createSingleSelectRender(params: iSelectCompositionParams) {
     });
   }));
 
-  selector.effects.push(hooks.onPopperClose.use(() => {
+  effects.push(hooks.onPopperClose.use(() => {
     /*重置input绑定值，防止输入一半取消选择时显示不正确的文本*/
     state.inputValue = selector.optionListHandler.getMatchLabel();
   }));
 
-  selector.effects.push(hooks.onPopperShow.use(() => {
+  effects.push(hooks.onPopperShow.use(() => {
     state.inputValue = null;
   }));
 
-  selector.effects.push(hooks.onInputTextChange.use((val) => {
+  effects.push(hooks.onInputTextChange.use((val) => {
     /*应用绑定值*/
     state.inputValue = val;
   }));
 
-  selector.effects.push(hooks.onInputClear.use(() => {
+  effects.push(hooks.onInputClear.use(() => {
     /*点击clear的时候，应用输入绑定值*/
     state.inputValue = null;
   }));
 
-  return () => selector.effects.clear();
+  return effects.clear;
 }

package/src/packages/components/Slider/useSlider.range.tsx

@@ -1,6 +1,5 @@
 import {iSliderPublicParams} from "./slider.utils";
-import {createEffects} from "@peryl/utils/createEffects";
-import {computed, useModel, useStyles} from "@peryl/react-compose";
+import {createEffectsOfReaction, useModel, useStyles} from "@peryl/react-compose";
 import {unit} from "@peryl/utils/unit";
 import {useSliderDotDraggier} from "./useSliderDotDragier";
 
@@ -14,7 +13,7 @@ export function useSliderRange(
     utils,
   }: iSliderPublicParams) {
 
-  const { effects } = createEffects();
+  const { effects, effectComputed } = createEffectsOfReaction();
 
   /**
    * 创建指示器管理对象
@@ -22,14 +21,16 @@ export function useSliderRange(
    * @date    2022.12.10 15:43
    */
   function createDotManager(type: 'start' | 'end') {
-    const model = type === "start" ? useModel(() => props.start, event.emit.onUpdateStart, { autoEmit: props.emitImmediate }) :
-      useModel(() => props.end, event.emit.onUpdateEnd, { autoEmit: props.emitImmediate });
+    const model = type === "start" ?
+      useModel(() => props.start, event.emit.onUpdateStart, { autoEmit: props.emitImmediate }, effects) :
+      useModel(() => props.end, event.emit.onUpdateEnd, { autoEmit: props.emitImmediate }, effects);
     /**
      * 当前指示器位置百分比
      * @author  韦胜健
      * @date    2022.12.10 15:44
      */
-    const percent = computed(() => Number(((model.value == null ? 0 : Number(model.value)) / props.total).toFixed(2)));
+    const percent = effectComputed(() => Number(((model.value == null ? 0 : Number(model.value)) / props.total).toFixed(2)));
+
     /**
      * 指示器行内样式
      * @author  韦胜健
@@ -51,16 +52,18 @@ export function useSliderRange(
       } else {
         styles.transform = `translateY(${length}px)`;
       }
-    });
+    }, effects);
+
     /**
      * 指示器tooltip显示文本
      * @author  韦胜健
      * @date    2022.12.10 15:44
      */
-    const tooltipLabel = computed(() => {
+    const tooltipLabel = effectComputed(() => {
       let ret = model.value;
       return !!props.tooltipFormatter ? props.tooltipFormatter(ret || 0) : ret;
     });
+
     /**
      * 指示器拖拽处理对象
      * @author  韦胜健
@@ -117,7 +120,7 @@ export function useSliderRange(
       styles.transform = `translateY(${start.percent.value * totalLength.value}px) scaleY(${percentValue})`;
       styles.transformOrigin = props.alignEnd ? 'bottom' : 'top';
     }
-  });
+  }, effects);
 
   /**
    * 拖拽的时候一直显示tooltip

package/src/packages/components/Slider/useSlider.single.tsx

@@ -1,6 +1,5 @@
 import {iSliderPublicParams} from "./slider.utils";
-import {createEffects} from "@peryl/utils/createEffects";
-import {computed, useModel, useStyles} from "@peryl/react-compose";
+import {createEffectsOfReaction, useModel, useStyles} from "@peryl/react-compose";
 import {unit} from "@peryl/utils/unit";
 import {useSliderDotDraggier} from "./useSliderDotDragier";
 
@@ -14,16 +13,16 @@ export function useSliderSingle(
     editComputed,
   }: iSliderPublicParams) {
 
-  const model = useModel(() => props.modelValue, event.emit.onUpdateModelValue, { autoEmit: props.emitImmediate });
+  const { effects, effectComputed } = createEffectsOfReaction();
 
-  const { effects } = createEffects();
+  const model = useModel(() => props.modelValue, event.emit.onUpdateModelValue, { autoEmit: props.emitImmediate }, effects);
 
   /**
    * 当前百分比
    * @author  韦胜健
    * @date    2022.12.10 15:42
    */
-  const percent = computed(() => Number(((model.value == null ? 0 : Number(model.value)) / props.total).toFixed(2)));
+  const percent = effectComputed(() => Number(((model.value == null ? 0 : Number(model.value)) / props.total).toFixed(2)));
 
   /**
    * 进度条行内样式
@@ -44,7 +43,7 @@ export function useSliderSingle(
       styles.transform = `scaleY(${percentValue})`;
       styles.transformOrigin = props.alignEnd ? 'bottom' : 'top';
     }
-  });
+  }, effects);
 
   /**
    * 指示器行内样式
@@ -60,7 +59,7 @@ export function useSliderSingle(
     } else {
       styles.transform = `translateY(${length}px)`;
     }
-  });
+  }, effects);
 
   /**
    * 指示器拖拽行为
@@ -83,7 +82,7 @@ export function useSliderSingle(
    * @author  韦胜健
    * @date    2022.12.10 15:43
    */
-  const tooltipLabel = computed(() => {
+  const tooltipLabel = effectComputed(() => {
     let ret = model.value;
     return !!props.tooltipFormatter ? props.tooltipFormatter(ret || 0) : ret;
   });

package/src/packages/components/Table/standard/PlcCheck/PlcCheck.hooks.tsx

@@ -3,8 +3,8 @@ import {iTableCellRenderScope, iTableRowRenderScope} from "../../table/utils/tab
 
 export function createPlcCheckHooks() {
   return {
-    onRenderNormal: createSyncHooks<(data: { scope: iTableCellRenderScope, content: RenderNode }) => void>(),
-    onRenderHead: createSyncHooks<(renderNode: RenderNode) => void>(),
+    onRenderNormal: createSyncHooks<(data: { scope: iTableCellRenderScope, content: RenderNode }) => void>(true),
+    onRenderHead: createSyncHooks<(renderNode: RenderNode) => void>(true),
     onClickRow: createHooks<(data: { rowRenderScope: iTableRowRenderScope }) => void>(),
 
     onTriggerCheckAll: createHooks(),

package/src/packages/components/Table/standard/PlcCheck/PlcCheck.multiple.tsx

@@ -1,12 +1,11 @@
 import {iPlcCheckEventType, iPlcCheckPropsType} from "./PlcCheck.utils";
-import {computed, reactive, toRaw, useModel} from "@peryl/react-compose";
+import {createEffectsOfReaction, reactive, toRaw, useModel} from "@peryl/react-compose";
 import {toArray} from "@peryl/utils/toArray";
 import {PlainObject} from "@peryl/utils/event";
 import {iTableRowRenderScope} from "../../table/utils/table.utils";
 import {CheckboxStatus} from "../../../../utils/constant";
 import {Checkbox} from "../../../Checkbox";
 import {iPlcCheckHooks} from "./PlcCheck.hooks";
-import {createEffects} from "@peryl/utils/createEffects";
 import {iTableRefer} from "../../table/Table";
 import {Badge} from "../../../Badge";
 import {Dropdown} from "../../../Dropdown";
@@ -37,21 +36,21 @@ export function usePlcCheckMultiple(
   }
 ) {
 
-  const { effects } = createEffects();
+  const { effects, effectComputed } = createEffectsOfReaction();
 
   /**
    * 双向绑定值
    * @author  韦胜健
    * @date    2022.11.27 16:36
    */
-  const model = useModel(() => props.modelValue as PlainObject[] | null | undefined, event.emit.onUpdateModelValue as any);
+  const model = useModel(() => props.modelValue as PlainObject[] | null | undefined, event.emit.onUpdateModelValue as any, undefined, effects);
 
   /**
    * 已经选中的keys
    * @author  韦胜健
    * @date    2022.11.27 16:36
    */
-  const checkKeys = computed(() => {
+  const checkKeys = effectComputed(() => {
     if (!model.value) {return {};}
     return toArray(model.value).reduce((prev, item) => {
       prev[item[props.field]] = true;

package/src/packages/components/Table/standard/PlcCheck/PlcCheck.single.tsx

@@ -1,10 +1,9 @@
 import {iPlcCheckEventType, iPlcCheckPropsType} from "./PlcCheck.utils";
-import {useModel} from "@peryl/react-compose";
+import {createEffectsOfReaction, useModel} from "@peryl/react-compose";
 import {PlainObject} from "@peryl/utils/event";
 import {iTableRowRenderScope} from "../../table/utils/table.utils";
 import {Radio} from "../../../Radio";
 import {CheckboxStatus} from "../../../../utils/constant";
-import {createEffects} from "@peryl/utils/createEffects";
 import {iPlcCheckHooks} from "./PlcCheck.hooks";
 import {iTableRefer} from "../../table/Table";
 
@@ -22,14 +21,14 @@ export function usePlcCheckSingle(
   }
 ) {
 
-  const { effects } = createEffects();
+  const { effects } = createEffectsOfReaction();
 
   /**
    * 双向绑定值
    * @author  韦胜健
    * @date    2022.11.27 16:36
    */
-  const model = useModel(() => props.modelValue as PlainObject | null | undefined, event.emit.onUpdateModelValue as any);
+  const model = useModel(() => props.modelValue as PlainObject | null | undefined, event.emit.onUpdateModelValue as any, undefined, effects);
 
   const utils = {
     /**

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

@@ -1,22 +1,21 @@
 import {TimePanel} from "./panel/TimePanel";
 import Input from "../Input";
-import {computed, getComponentCls, reactive, useModel, useRefs} from "@peryl/react-compose";
+import {createEffectsOfReaction, getComponentCls, reactive, useModel, useRefs} from "@peryl/react-compose";
 import {delay} from "@peryl/utils/delay";
 import {PDate, plainDate} from "../../utils/plainDate";
 import {limitDatetimeTimePlainData, TimeLayoutToFormat, tTimeCompositionParams} from "./time.utils";
 import {TimePanelLayout} from "./panel/TimeBasePanel";
 import {debounce} from "@peryl/utils/debounce";
 import {useRenderReference} from "../../uses/useRenderReference";
-import {createEffects} from "@peryl/utils/createEffects";
 import {createPopupEditor} from "../usePopupEditor";
 
 export function createSingleTimeRender({ emit, props, hooks, displayPattern, today, maxmin, editComputed, slots, getPublicPopperAttrs, getInheritPublicTimeAttrs, formatString }: tTimeCompositionParams) {
 
-  const { effects } = createEffects();
+  const { effects, effectComputed } = createEffectsOfReaction();
   const { refs, onRef } = useRefs({ input: Input });
   const reference = useRenderReference();
-  const model = useModel(() => props.modelValue, emit.onUpdateModelValue, { onChange: () => delay().then(() => state.input = format.value?.getDisplay()) });
-  const format = computed((): null | PDate => !model.value ? null : plainDate(model.value, formatString.value));
+  const model = useModel(() => props.modelValue, emit.onUpdateModelValue, { onChange: () => delay().then(() => state.input = format.value?.getDisplay()) }, effects);
+  const format = effectComputed((): null | PDate => !model.value ? null : plainDate(model.value, formatString.value));
   const state = reactive({
     input: format.value?.getDisplay(),
     hoverColumnType: null as null | TimePanelLayout,

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

@@ -1,4 +1,4 @@
-import {computed, getComponentCls, iHTMLInputElement, reactive, useModel, useRefs} from "@peryl/react-compose";
+import {createEffectsOfReaction, getComponentCls, iHTMLInputElement, reactive, useModel, useRefs} from "@peryl/react-compose";
 import Input from "../Input";
 import {delay} from "@peryl/utils/delay";
 import {useFocusHandler} from "../../uses/useFocusHandler";
@@ -8,16 +8,16 @@ import {TimeRangePanelType} from "./panel/TimeRangePanel";
 import {limitDatetimeTimePlainData, TimeLayoutToFormat, tTimeCompositionParams} from "./time.utils";
 import {debounce} from "@peryl/utils/debounce";
 import {useRenderReference} from "../../uses/useRenderReference";
-import {createEffects} from "@peryl/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),
   }));

package/src/packages/components/usePopup/PopupItem.tsx

@@ -322,9 +322,9 @@ export const PopupItem = designComponent({
      * @author  韦胜健
      * @date    2023/5/16 17:14
      */
-    useWatchAutoClear(() => state.option.reference, () => {
-      const effects: SimpleFunction[] = [];
+    useWatchAutoClear(() => state.option.reference, (): (() => void) => {
       if (!state.option.reference) {return doNothing;}
+      const { effects } = createEffects();
       const parents = getElementParents(state.option.reference).concat(window as any);
       const onScroll = () => {
         if (state.option.hideOnScroll) {
@@ -341,7 +341,7 @@ export const PopupItem = designComponent({
         parent.addEventListener('scroll', onScroll);
         effects.push(() => {parent.removeEventListener('scroll', onScroll);});
       });
-      return () => {effects.forEach(i => i());};
+      return effects.clear;
     });
 
     /**