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

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;
     });
 
     /**

package/src/packages/components/usePopup/trigger/useReferenceTrigger.tsx

@@ -1,6 +1,6 @@
 import {ePopupTrigger, iPopupManager, iPopupUseOption} from "../utils/popup.utils";
 import {createEffects} from "@peryl/utils/createEffects";
-import {onBeforeUnmount, SimpleFunction, watchEffect} from "@peryl/react-compose";
+import {globalWatchEffect, onBeforeUnmount, SimpleFunction} from "@peryl/react-compose";
 import {isStopPopup} from "../utils/stopPopup";
 
 /**
@@ -28,57 +28,63 @@ export function createReferenceTrigger(
   }
 ) {
   const { effects } = createEffects();
+  const { effects: setupEffects } = createEffects();
 
   let prev: ReturnType<typeof get> | null = null;
 
-  watchEffect(() => {
-    const { reference, trigger } = get();
-    if (!!prev && prev.trigger === trigger && prev.reference === reference) {
-      return;
-    }
-    effects.clear();
-    prev = { reference, trigger };
-
-    if (!reference) {return;}
-
-    const onClick = (e: MouseEvent) => {
-      if (isStopPopup(e)) {
+  setupEffects.push(
+    globalWatchEffect(() => {
+      const { reference, trigger } = get();
+      if (!!prev && prev.trigger === trigger && prev.reference === reference) {
         return;
       }
-      manager.hooks.onTriggerReferenceClick.exec({ e, option: getOption() });
-    };
-    const onContextmenu = (e: MouseEvent) => {
-      e.preventDefault();
-      manager.hooks.onTriggerReferenceContextmenu.exec({ e, option: getOption() });
-    };
-    const onMouseenter = (e: MouseEvent) => {manager.hooks.onTriggerReferenceEnter.exec({ e, option: getOption() });};
-    const onMouseleave = (e: MouseEvent) => {manager.hooks.onTriggerReferenceLeave.exec({ e, option: getOption() });};
-    const onMousedown = (e: MouseEvent) => {manager.hooks.onTriggerReferenceMousedown.exec({ e, option: getOption() });};
-    const onMousemove = (e: MouseEvent) => {manager.hooks.onTriggerReferenceMousemove.exec({ e, option: getOption() });};
-    const onFocus = (e: FocusEvent) => {manager.hooks.onTriggerReferenceFocus.exec({ e, option: getOption() });};
-    const onBlur = (e: FocusEvent) => {manager.hooks.onTriggerReferenceBlur.exec({ e, option: getOption() });};
+      effects.clear();
+      prev = { reference, trigger };
 
+      if (!reference) {return;}
 
-    reference.addEventListener('click', onClick);
-    reference.addEventListener('contextmenu', onContextmenu);
-    reference.addEventListener('mouseenter', onMouseenter);
-    reference.addEventListener('mouseleave', onMouseleave);
-    reference.addEventListener('mousedown', onMousedown);
-    reference.addEventListener('mousemove', onMousemove);
-    reference.addEventListener('focus', onFocus);
-    reference.addEventListener('blur', onBlur);
+      const onClick = (e: MouseEvent) => {
+        if (isStopPopup(e)) {
+          return;
+        }
+        manager.hooks.onTriggerReferenceClick.exec({ e, option: getOption() });
+      };
+      const onContextmenu = (e: MouseEvent) => {
+        e.preventDefault();
+        manager.hooks.onTriggerReferenceContextmenu.exec({ e, option: getOption() });
+      };
+      const onMouseenter = (e: MouseEvent) => {manager.hooks.onTriggerReferenceEnter.exec({ e, option: getOption() });};
+      const onMouseleave = (e: MouseEvent) => {manager.hooks.onTriggerReferenceLeave.exec({ e, option: getOption() });};
+      const onMousedown = (e: MouseEvent) => {manager.hooks.onTriggerReferenceMousedown.exec({ e, option: getOption() });};
+      const onMousemove = (e: MouseEvent) => {manager.hooks.onTriggerReferenceMousemove.exec({ e, option: getOption() });};
+      const onFocus = (e: FocusEvent) => {manager.hooks.onTriggerReferenceFocus.exec({ e, option: getOption() });};
+      const onBlur = (e: FocusEvent) => {manager.hooks.onTriggerReferenceBlur.exec({ e, option: getOption() });};
 
-    effects.push(() => {
-      reference.removeEventListener('click', onClick);
-      reference.removeEventListener('contextmenu', onContextmenu);
-      reference.removeEventListener('mouseenter', onMouseenter);
-      reference.removeEventListener('mouseleave', onMouseleave);
-      reference.removeEventListener('mousedown', onMousedown);
-      reference.removeEventListener('mousemove', onMousemove);
-      reference.removeEventListener('focus', onFocus);
-      reference.removeEventListener('blur', onBlur);
-    });
-  });
 
-  onBeforeUnmount(() => {effects.clear();});
+      reference.addEventListener('click', onClick);
+      reference.addEventListener('contextmenu', onContextmenu);
+      reference.addEventListener('mouseenter', onMouseenter);
+      reference.addEventListener('mouseleave', onMouseleave);
+      reference.addEventListener('mousedown', onMousedown);
+      reference.addEventListener('mousemove', onMousemove);
+      reference.addEventListener('focus', onFocus);
+      reference.addEventListener('blur', onBlur);
+
+      effects.push(() => {
+        reference.removeEventListener('click', onClick);
+        reference.removeEventListener('contextmenu', onContextmenu);
+        reference.removeEventListener('mouseenter', onMouseenter);
+        reference.removeEventListener('mouseleave', onMouseleave);
+        reference.removeEventListener('mousedown', onMousedown);
+        reference.removeEventListener('mousemove', onMousemove);
+        reference.removeEventListener('focus', onFocus);
+        reference.removeEventListener('blur', onBlur);
+      });
+    })
+  );
+
+  onBeforeUnmount(() => {
+    effects.clear();
+    setupEffects.clear();
+  });
 }

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

@@ -1,6 +1,5 @@
 import {iPopupEditorOption} from "./popup-editor.utils";
-import {computed, onBeforeUnmount, SimpleFunction, watch} from "@peryl/react-compose";
-import {createEffects} from "@peryl/utils/createEffects";
+import {createEffectsOfReaction, onBeforeUnmount, SimpleFunction} from "@peryl/react-compose";
 import {createPopup} from "../usePopup/usePopup";
 import {iPopupUseOption} from "../usePopup/utils/popup.utils";
 import {createReferenceTrigger} from "../usePopup/trigger/useReferenceTrigger";
@@ -14,11 +13,11 @@ export function createPopupEditor(
   }
 ) {
 
-  const { effects } = createEffects();
+  const { effects, effectComputed, effectWatch } = createEffectsOfReaction();
 
   const popup = createPopup(effects.push);
 
-  const reference = computed(() => {
+  const reference = effectComputed(() => {
     let reference = option.reference() as any;
     if (!reference) {return null;}
     if ('$el' in reference) {reference = reference.$el;}
@@ -90,11 +89,9 @@ export function createPopupEditor(
     isShow: () => popup.$popup.manager.methods.isShow(getOption())
   };
 
-  effects.push(
-    watch(() => option.popperAttrs?.(), () => {
-      popup.$popup.update(getOption());
-    })
-  );
+  effectWatch(() => option.popperAttrs?.(), () => {
+    popup.$popup.update(getOption());
+  });
 
   effects.push(() => {
     popup.$popup.manager.methods.remove(popup.popupId);

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

@@ -1,5 +1,4 @@
-import {createEffects} from '@peryl/utils/createEffects';
-import {getComponentCls, nextTick, onBeforeUnmount, reactive, watch} from "@peryl/react-compose";
+import {createEffectsOfReaction, getComponentCls, nextTick, onBeforeUnmount, reactive} from "@peryl/react-compose";
 import {iPopupService, usePopup} from "../usePopup/usePopup";
 import {iPopupUseOption} from "../usePopup/utils/popup.utils";
 import {delay} from "@peryl/utils/delay";
@@ -10,7 +9,7 @@ import {delay} from "@peryl/utils/delay";
  * @date    2023.1.21 14:06
  */
 export function createTooltip(option: iTooltipServiceOption, popup: iPopupService) {
-  const { effects } = createEffects();
+  const { effects, effectWatch } = createEffectsOfReaction();
 
   const state = reactive({
     isEnter: false,
@@ -67,7 +66,7 @@ export function createTooltip(option: iTooltipServiceOption, popup: iPopupServic
       }
     };
     effects.push(
-      watch(
+      effectWatch(
         () => option.tooltip(),
         ({ message, reference }) => {
           if (!reference) {
@@ -108,7 +107,7 @@ export function createTooltip(option: iTooltipServiceOption, popup: iPopupServic
 
   const tooltipHandler = (() => {
     effects.push(
-      watch(
+      effectWatch(
         () => option.tooltip().message,
         val => {
           popup.$popup.update(getOption());
@@ -122,7 +121,7 @@ export function createTooltip(option: iTooltipServiceOption, popup: iPopupServic
       )
     );
     effects.push(
-      watch(
+      effectWatch(
         (): boolean => {
           const { reference, message } = option.tooltip();
           if (reference == null || message == null || (typeof message === "string" && !message.trim().length)) {

package/src/packages/uses/useDragHorizontalScroll.ts

@@ -1,6 +1,5 @@
-import {createEffects} from "@peryl/utils/createEffects";
 import {ClientZoom} from "../utils/ClientZoom";
-import {watch} from "@peryl/react-compose";
+import {createEffectsOfReaction} from "@peryl/react-compose";
 
 export function useDragHorizontalScroll(getEl: () => HTMLElement | null | undefined, config?: { onDragStart: () => void, onDragEnd: () => void }) {
 
@@ -17,7 +16,7 @@ export function useDragHorizontalScroll(getEl: () => HTMLElement | null | undefi
     }
   };
 
-  const { effects } = createEffects();
+  const { effects, effectWatch } = createEffectsOfReaction();
 
   const handler = {
     mousedown: (e: MouseEvent) => {
@@ -60,7 +59,7 @@ export function useDragHorizontalScroll(getEl: () => HTMLElement | null | undefi
     },
   };
 
-  effects.push(watch(() => getEl(), el => {
+  effectWatch(() => getEl(), el => {
     if (!!staticState.el) {
       staticState.el.removeEventListener('mousedown', handler.mousedown);
       staticState.el.removeEventListener('wheel', handler.onWheel);
@@ -69,7 +68,7 @@ export function useDragHorizontalScroll(getEl: () => HTMLElement | null | undefi
     if (!staticState.el) {return;}
     staticState.el.addEventListener('mousedown', handler.mousedown);
     staticState.el.addEventListener('wheel', handler.onWheel);
-  }));
+  });
 
   effects.push(() => {
     if (!!staticState.el) {