plain-design 1.0.0-beta.12 → 1.0.0-beta.121

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(
@@ -33,6 +33,7 @@ export function createPublicSelectRender(
     defaultCurrent,
     multiple,
     processRenderPanel,
+    effects,
   }: {
     /**
      * 判断选项是否已经选中，用来provide给option组件判断自身是否已经选中
@@ -88,16 +89,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();
 
@@ -236,7 +241,7 @@ export function createPublicSelectRender(
                   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}/>))
@@ -302,7 +307,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 +396,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;

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

@@ -1,8 +1,9 @@
 import {iSelectCompositionParams} from "./select.utils";
 import {Input} from "../Input";
 import {createPublicSelectRender} from "./createPublicSelectRender";
-import {reactive, useModel} from "plain-design-composition";
-import {delay} from "plain-utils/utils/delay";
+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/Select/decodeSelectRenderNode.tsx

@@ -1,5 +1,5 @@
-import {RenderNode} from "plain-design-composition";
-import {unit} from "plain-utils/string/unit";
+import {RenderNode} from "@peryl/react-compose";
+import {unit} from "@peryl/utils/unit";
 import {Scroll} from "../Scroll";
 import {iIsMatchSearch, SelectUtils} from "./select.utils";
 import {createSelectOptionDecoder} from "./createSelectOptionDecoder";

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

@@ -1,4 +1,4 @@
-import {designComponent, getComponentCls, reactive, useClasses} from "plain-design-composition";
+import {designComponent, getComponentCls, reactive, useClasses} from "@peryl/react-compose";
 import {useWatchAutoClear} from "../../utils/watchEffectAutoClear";
 import {createSingleSelectRender} from "./createSingleSelectRender";
 import {createMultipleSelectRender} from "./createMultipleSelectRender";

package/src/packages/components/Select/select.utils.tsx

@@ -1,8 +1,8 @@
-import {ComponentEvent, createSyncHooks, ExtractPropTypes, PropType, reactive, RenderNode, tScopeSlotsType, tSlotsType} from "plain-design-composition";
+import {ComponentEvent, createSyncHooks, ExtractPropTypes, PropType, reactive, RenderNode, tScopeSlotsType, tSlotsType} from "@peryl/react-compose";
 import {EditProps, tEditComputed} from "../../uses/useEdit";
 import {StyleProps, ThemeSize} from "../../uses/useStyle";
 import {Scroll} from "../Scroll";
-import {PlainObject} from "plain-utils/utils/event";
+import {PlainObject} from "@peryl/utils/event";
 import {iIsMatch, IsMatchPropsOption} from "../../utils/isObjectCommonMatch";
 
 /**
@@ -151,7 +151,7 @@ export const SelectUtils = {
     if (!!props.isMatchSearch) {
       return props.isMatchSearch(searchText, optionProps);
     }
-    return !!optionProps.label && optionProps.label.indexOf(searchText) > -1;
+    return !!optionProps.label && optionProps.label.toLowerCase().indexOf(searchText.toLowerCase()) > -1;
   },
 };
 

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

@@ -1,9 +1,9 @@
-import {designComponent} from "plain-design-composition";
+import {designComponent} from "@peryl/react-compose";
 import {createSelectOptionDecoder} from "../Select/createSelectOptionDecoder";
-import {pick} from "../../utils/pick";
+import {pick} from "@peryl/utils/pick";
 import {EditProps} from "../../uses/useEdit";
 import {useMultipleModel} from "../../uses/useMultipleModel";
-import {toArray} from "plain-utils/utils/toArray";
+import {toArray} from "@peryl/utils/toArray";
 
 export const SelectDisplay = designComponent({
   name: 'select-display',

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

@@ -0,0 +1,37 @@
+import {designComponent, inject, provide} from "@peryl/react-compose";
+import DropdownGroup from "../DropdownGroup";
+
+export const SelectGroup = designComponent({
+  name: 'select-group',
+  props: {
+    title: { type: String },
+  },
+  slots: ['default'],
+  setup({ props, slots }) {
+
+    const searchText = useSearchText.inject();
+
+    return () => {
+      return (
+        /*有搜索关键词的时候不显示分组标题*/
+        !searchText?.()?.length && (
+          <DropdownGroup>
+            {slots.default(props.title)}
+          </DropdownGroup>
+        )
+      );
+    };
+  },
+});
+
+export const useSearchText = (() => {
+  const PROVIDE_NAME = '@@SEARCH_TEXT_PROVIDER';
+  return {
+    provide: (getSearchText: () => string | null | undefined) => {
+      provide(PROVIDE_NAME, getSearchText);
+    },
+    inject: () => {
+      return inject(PROVIDE_NAME) as (() => string | null | undefined) | undefined | null;
+    },
+  };
+})();

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

@@ -1,9 +1,9 @@
-import {designComponent} from "plain-design-composition";
+import {designComponent} from "@peryl/react-compose";
 import {renderDropdownOption} from "../Dropdown/dropdown.utils";
 import {SelectPanel} from "../Select/SelectPanel";
 import {SelectOptionPropOptions, SelectUtils} from "../Select/select.utils";
 import {Icon} from "../Icon";
-import {classnames} from "plain-utils/dom/classnames";
+import {classnames} from "@peryl/utils/classnames";
 
 export const SelectOption = designComponent({
   name: 'select-option',

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

@@ -1,5 +1,5 @@
-import {computed, designComponent, Fragment, getComponentCls, reactive, useClasses, useMounted, useRefs, useStyles} from "plain-design-composition";
-import {unit} from "plain-utils/string/unit";
+import {computed, designComponent, Fragment, getComponentCls, reactive, useClasses, useMounted, useRefs, useStyles} from "@peryl/react-compose";
+import {unit} from "@peryl/utils/unit";
 import './slider.scss';
 import {useEdit} from "../../uses/useEdit";
 import {ThemeStatus, useStyle} from "../../uses/useStyle";
@@ -7,7 +7,7 @@ import {createSliderHooks, createSliderUtils, iSliderPublicParams, SliderEmitsOp
 import {useWatchAutoClear} from "../../utils/watchEffectAutoClear";
 import {useSliderRange} from "./useSlider.range";
 import {useSliderSingle} from "./useSlider.single";
-import {doNothing} from "../../utils/doNothing";
+import {doNothing} from "@peryl/utils/doNothing";
 
 export const Slider = designComponent({
   name: 'slider',

package/src/packages/components/Slider/slider.scss

@@ -47,7 +47,7 @@
         transition: all 300ms ease;
         opacity: 0;
         background-color: rgba(black, 0.8);
-        color: white;
+        color: #ffffff;
         padding: 3px 6px;
         line-height: initial;
         position: absolute;

package/src/packages/components/Slider/slider.utils.tsx

@@ -1,6 +1,6 @@
 import {EditProps, tEditComputed} from "../../uses/useEdit";
 import {StyleProps} from "../../uses/useStyle";
-import {ComponentEvent, createHooks, createSyncHooks, ExtractPropTypes, PropType, RenderNode} from "plain-design-composition";
+import {ComponentEvent, createHooks, createSyncHooks, ExtractPropTypes, PropType, RenderNode} from "@peryl/react-compose";
 
 export const SliderPropsOption = {
   ...EditProps,

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

@@ -1,7 +1,6 @@
 import {iSliderPublicParams} from "./slider.utils";
-import {createEffects} from "plain-utils/utils/createEffects";
-import {computed, useModel, useStyles} from "plain-design-composition";
-import {unit} from "plain-utils/string/unit";
+import {createEffectsOfReaction, useModel, useStyles} from "@peryl/react-compose";
+import {unit} from "@peryl/utils/unit";
 import {useSliderDotDraggier} from "./useSliderDotDragier";
 
 export function useSliderRange(
@@ -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,7 +1,6 @@
 import {iSliderPublicParams} from "./slider.utils";
-import {createEffects} from "plain-utils/utils/createEffects";
-import {computed, useModel, useStyles} from "plain-design-composition";
-import {unit} from "plain-utils/string/unit";
+import {createEffectsOfReaction, useModel, useStyles} from "@peryl/react-compose";
+import {unit} from "@peryl/utils/unit";
 import {useSliderDotDraggier} from "./useSliderDotDragier";
 
 export function useSliderSingle(
@@ -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/Slider/useSliderDotDragier.tsx

@@ -1,7 +1,7 @@
-import {createEffects} from "plain-utils/utils/createEffects";
-import {disabledUserSelect} from "plain-utils/dom/disabledUserSelect";
-import {enableUserSelect} from "plain-utils/dom/enableUserSelect";
-import {iMouseEvent, reactive} from "plain-design-composition";
+import {createEffects} from "@peryl/utils/createEffects";
+import {disabledUserSelect} from "@peryl/utils/disabledUserSelect";
+import {enableUserSelect} from "@peryl/utils/enableUserSelect";
+import {iMouseEvent, reactive} from "@peryl/react-compose";
 import {iSliderHooks} from "./slider.utils";
 import {ClientZoom} from "../ClientZoom";