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

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

@@ -1,6 +1,5 @@
 import {iPopupEditorOption} from "./popup-editor.utils";
-import {computed, onBeforeUnmount, SimpleFunction, watch} from "plain-design-composition";
-import {createEffects} from "plain-utils/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/usePopupEditor/popup-editor.utils.ts

@@ -1,4 +1,4 @@
-import {RenderNode} from "plain-design-composition";
+import {RenderNode} from "@peryl/react-compose";
 import {iPopupEditorUseOption} from "./index";
 
 export interface iPopupEditorOption {

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

@@ -1,7 +1,7 @@
-import {createEffects} from 'plain-utils/utils/createEffects';
-import {getComponentCls, nextTick, onBeforeUnmount, reactive, watch} from "plain-design-composition";
+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";
 
 /**
  * 提供两种用法，第一种实时地创建tooltip
@@ -9,7 +9,7 @@ import {iPopupUseOption} from "../usePopup/utils/popup.utils";
  * @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,
@@ -66,7 +66,7 @@ export function createTooltip(option: iTooltipServiceOption, popup: iPopupServic
       }
     };
     effects.push(
-      watch(
+      effectWatch(
         () => option.tooltip(),
         ({ message, reference }) => {
           if (!reference) {
@@ -107,7 +107,7 @@ export function createTooltip(option: iTooltipServiceOption, popup: iPopupServic
 
   const tooltipHandler = (() => {
     effects.push(
-      watch(
+      effectWatch(
         () => option.tooltip().message,
         val => {
           popup.$popup.update(getOption());
@@ -121,12 +121,15 @@ 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)) {
             return false;
           }
+          if (option.alwaysShow) {
+            return true;
+          }
           if (!state.isEnter) {
             return false;
           }
@@ -144,12 +147,15 @@ export function createTooltip(option: iTooltipServiceOption, popup: iPopupServic
         },
       )
     );
-    const close = () => popup.$popup.hide(popup.popupId);
+    const close = () => {delay(23).then(() => {popup.$popup.hide(popup.popupId);});};
     effects.push(close);
     return { close };
   })();
 
-  const clear = () => {effects.clear();};
+  const clear = () => {
+    effects.clear();
+    popup.dispose();
+  };
 
   return { referenceEnterHandler, tooltipHandler, clear };
 }
@@ -164,11 +170,15 @@ export function createTooltip(option: iTooltipServiceOption, popup: iPopupServic
 export function useTooltip(option: iTooltipServiceOption) {
   const popup = usePopup();
   const val = createTooltip(option, popup);
-  onBeforeUnmount(() => {val.clear();});
+  onBeforeUnmount(() => {
+    val.clear();
+    popup.dispose();
+  });
   return val;
 }
 
 export interface iTooltipServiceOption {
+  alwaysShow?: boolean,
   /*传递给tooltip的水星*/
   tooltip: () => Omit<iPopupUseOption, 'id' | 'reference' | 'render'> & { reference: HTMLElement | null | undefined, message: any },
   /*是否在文本溢出时才会显示消息*/

package/src/packages/directives/ClickWave/index.tsx

@@ -1,6 +1,6 @@
-import {onBeforeUnmount, watch} from 'plain-design-composition';
+import {onBeforeUnmount, watch} from '@peryl/react-compose';
 import './click-wave.scss';
-import {delay} from "plain-utils/utils/delay";
+import {delay} from "@peryl/utils/delay";
 import {ThemeSize} from "../../uses/useStyle";
 
 export interface ClickWaveOptions {

package/src/packages/directives/ResizeDetector/index.tsx

@@ -1,5 +1,5 @@
-import {onBeforeUnmount, watch} from "plain-design-composition";
-import {delay} from "plain-utils/utils/delay";
+import {onBeforeUnmount, watch} from "@peryl/react-compose";
+import {delay} from "@peryl/utils/delay";
 
 export interface ResizeDetectFuncParam {
   width?: number;
@@ -13,7 +13,7 @@ export interface ResizeDetectFuncParam {
 
 export interface ResizeDetectFunc {(option: ResizeDetectFuncParam): void;}
 
-function createResizeDetector(el: HTMLElement, callback: ResizeDetectFunc) {
+function createResizeDetector(el: HTMLElement, callback: ResizeDetectFunc, mutateOption?: MutationObserverInit) {
 
   const state = {
     observer: undefined as undefined | MutationObserver,
@@ -44,6 +44,7 @@ function createResizeDetector(el: HTMLElement, callback: ResizeDetectFunc) {
       ret.oldHeight = state.height;
       state.height = height;
     }
+
     runCallback(ret);
   };
 
@@ -57,7 +58,11 @@ function createResizeDetector(el: HTMLElement, callback: ResizeDetectFunc) {
   const init = () => {
     if (!el) {return console.error(`el is ${typeof el}`);}
     state.observer = new MutationObserver(detect);
-    state.observer.observe(el, { childList: true, subtree: true });
+    state.observer.observe(el, {
+      childList: true,
+      subtree: true,
+      ...mutateOption,
+    });
     // const {width, height} = el.getBoundingClientRect()
     const { scrollHeight, scrollWidth } = el;
     state.width = scrollWidth;
@@ -79,9 +84,11 @@ export function useResizeDetector(
   {
     elGetter,
     onResize,
+    mutateOption,
   }: {
     elGetter: () => HTMLElement | undefined | null,
     onResize: ResizeDetectFunc,
+    mutateOption?: MutationObserverInit,
   }) {
 
   const state = { resizeDetector: null as null | ResizeDetector, };
@@ -90,7 +97,7 @@ export function useResizeDetector(
     await delay(0);
     if (!!state.resizeDetector) {state.resizeDetector.destroy();}
     state.resizeDetector = null;
-    !!el && (state.resizeDetector = createResizeDetector(el, onResize));
+    !!el && (state.resizeDetector = createResizeDetector(el, onResize, mutateOption));
   }, { immediate: true });
 
   !!state.resizeDetector && state.resizeDetector.detect();

package/src/packages/entry.tsx

@@ -1,5 +1,5 @@
-import {setComponentPrefix} from "plain-design-composition";
-import {createProvider} from "./utils/createProvider";
+import {setComponentPrefix} from "@peryl/react-compose";
+import packageJson from '../../package.json';
 
 export {Application} from "./components/Application";
 export type {iApplicationConfiguration} from './components/Application/utils/application.utils';
@@ -28,13 +28,14 @@ export {RadioGroup} from "./components/RadioGroup";
 export {DropdownOption} from "./components/DropdownOption";
 export {Dropdown} from "./components/Dropdown";
 export {DropdownGroup} from "./components/DropdownGroup";
+export {DropdownSeparator} from "./components/DropdownSeparator";
 export {VirtualList} from "./components/VirtualList";
 export {Segment} from "./components/Segment";
 export {SegmentGroup} from "./components/SegmentGroup";
 export {InputGroup} from "./components/InputGroup";
 export {Card} from "./components/Card";
+export {CarouselItem} from "./components/CarouselItem";
 export {Carousel} from "./components/Carousel";
-export {CarouselGroup} from "./components/CarouselGroup";
 export {CollapseGroup} from "./components/CollapseGroup";
 export {Collapse} from "./components/Collapse";
 export {ProgressBar} from "./components/ProgressBar";
@@ -42,6 +43,7 @@ export {ProgressCircle} from "./components/ProgressCircle";
 export {ProgressMini} from "./components/ProgressMini";
 export {Slider} from "./components/Slider";
 export {InputNumber} from './components/InputNumber';
+export {NumberRange} from './components/NumberRange';
 export {Toggle} from "./components/Toggle";
 export {Rate} from './components/Rate';
 export {Badge} from './components/Badge';
@@ -55,15 +57,18 @@ export {TabGroup} from './components/TabGroup';
 export {Tab} from './components/Tab';
 export {Tag} from './components/Tag';
 export {Tree} from './components/Tree';
+export type {iTreeDragChangeData} from './components/TreeCore/createTreeProps';
 export {TreeNodeWithMenu} from './components/TreeNodeWithMenu';
 export {ColorPicker} from './components/ColorPicker';
 export {TimePicker} from './components/TimePicker';
 export {DatePicker} from './components/DatePicker';
 export {Select} from './components/Select';
 export {SelectOption} from './components/SelectOption';
+export {SelectGroup} from './components/SelectGroup';
 export {Form} from './components/Form';
 export {FormItem} from './components/FormItem';
 export {Cascade} from './components/Cascade';
+export {CascadeKeys} from './components/CascadeKeys';
 export {Image} from './components/Image';
 export {Tooltip} from './components/Tooltip';
 export {useImage} from './components/useImage';
@@ -72,6 +77,7 @@ export {ImageUploader} from './components/ImageUploader';
 export {Upload} from './components/Upload';
 export {$file} from './components/$file';
 export {$image} from './components/$image';
+export {$loading} from './components/$loading';
 export {useTooltip} from './components/useTooltip';
 export {i18n} from './components/i18n';
 export {KeepAlive} from './components/KeepAlive';
@@ -86,6 +92,7 @@ export type {FileServiceChooseFileConfig, FileServiceSingleFile, FileServiceUplo
 export {CascadePanel} from './components/CascadePanel';
 export {usePopup} from './components/usePopup';
 export {Popup} from './components/Popup';
+export {ConfirmPopup} from './components/ConfirmPopup';
 export {createPopup} from './components/createPopup';
 export type {
   iPopupAlign,
@@ -109,6 +116,20 @@ export {useAutoScrollUtils} from './components/useAutoScrollUtils';
 export {ClientZoom} from './components/ClientZoom';
 export {Layout} from './components/Layout';
 export {LayoutSection} from './components/LayoutSection';
+export {$previewer} from './components/$previewer';
+export {StackCard} from './components/StackCard';
+export {StackCardItem} from './components/StackCardItem';
+export {SortList} from './components/SortList';
+export {Space} from './components/Space';
+export {Box} from './components/Box';
+export {PageCard} from './components/PageCard';
+export {PageCardTitle} from './components/PageCardTitle';
+export {PageCardContent} from './components/PageCardContent';
+export {RollingNumber} from './components/RollingNumber';
+export {Paragraph} from './components/Paragraph';
+export {ParagraphItem} from './components/ParagraphItem';
+export {ImagePreviewer} from './components/ImagePreviewer/ImagePreviewer';
+export {Corner} from './components/Corner';
 
 export {VirtualTable} from './components/VirtualTable';
 export {Table} from './components/Table';
@@ -144,16 +165,60 @@ export {PlcObject} from './components/PlcObject';
 export {Ov} from './components/Ov';
 export {PlcOv} from './components/PlcOv';
 export type {iOvMeta} from './components/$ov/ov.utils';
+export type {
+  tPlc,
+  tPlcType,
+  tPlcGroup,
+  tPlcPublicAttrsType,
+  iPlcEventType,
+  iPlcGroupPropsType,
+  iPlcPropsSourceType,
+  iPlcPropsProxyConfig,
+  iPlcPropsType
+} from './components/Table/plc/utils/plc.utils';
+export type {iTreeNode} from './components/TreeCore/createTreeNode';
+export type {
+  iTableOperation,
+  iTableInnerOperation,
+  iTableInnerOperationConfig,
+  iTableOperationPermitMetaConfig,
+  iTableOperationPermitData,
+  iTableOperationPermitMeta,
+  iTableOuterOperation,
+  iTableOuterOperationConfig,
+  iTableOperationPermitConfig
+} from './components/Table/standard/PlcOperation/PlcOperation.utils';
+export type {iTreeProps, iTreeState, iTreeKey2CheckStatus, iTreeKeyOrNode, iTreeNodeComputedData} from './components/TreeCore/TreeCore.type';
 
 export {$configuration} from './components/$configuration';
 export {createAddressService} from './components/createAddressService';
 export {createHttp} from './components/createHttp';
+export type {
+  iHttpRequestConfig,
+  iPlainResponseDataType,
+  iHttpResponseDataType
+} from './components/createHttp/http.utils';
+export type {
+  iSearchServiceCustomConfig,
+  iSearchServiceConfig,
+  iSearchServiceDefaultConfig,
+  iSearchDataMeta,
+  iSearchDataRender,
+} from './components/$search/search.utils';
+export {$search} from './components/$search';
 
 export {Address} from './components/Address';
 export {AddressCascade} from './components/AddressCascade';
 export {eAddressTypeEnum} from './components/$address/address.utils';
 export type {iAddressSyncMeta, iAddressLazyMeta} from './components/$address/address.utils';
 export type {iPlainAddressData} from './components/createPlainAddressService';
+export {Empty} from './components/Empty';
+export {ThemeColor} from './components/ThemeColor';
+export {ThemeColorSelector} from './components/ThemeColorSelector';
+export {ThemeLocaleSelector} from './components/ThemeLocaleSelector';
+export {ThemeDarkSelector} from './components/ThemeDarkSelector';
+export {ThemeSizeSelector} from './components/ThemeSizeSelector';
+export {ThemeShapeSelector} from './components/ThemeShapeSelector';
 
 export {FormInput} from './components/FormInput';
 export {FormSelect} from './components/FormSelect';
@@ -173,6 +238,19 @@ export {FormToggle} from './components/FormToggle';
 export {FilterFormSingle} from './components/FilterFormSingle';
 export {FilterFormMultiple} from './components/FilterFormMultiple';
 export {FilterService} from './components/FilterService';
+export type {
+  iValidateRule,
+  iValidateState,
+  iAnotherRule,
+  iFormItemValidatePropsType,
+  iFormValidatePropsType,
+  iRegistrationValidator,
+  iValidateResult,
+  iValidateValueGetter,
+  iValidationDisabledFields,
+  iValidationReadonlyFields,
+  iValidatorParam,
+} from './components/Form/validate/validate.utils';
 
 export {TableOptionUtils} from './components/TableOptionUtils';
 export {TableOptionSpace} from './components/TableOptionSpace';
@@ -183,13 +261,30 @@ export type {
   iTableOptionCacheRegistryConfig,
   iTableOptionGetCacheParam
 } from './components/AutoTable/use/useTableOption.cache.utils';
-export {PageThemeUtils} from './components/PageThemeUtils';
+export {PageThemeUtils, getPrimaryColor} from './components/PageThemeUtils';
+export {BaseColors, BaseGrayColors} from './components/Application/theme/theme';
 export {ThemePrimaryColors} from './components/ThemePrimaryColors';
+export {ThemeEditor} from './components/ThemeEditor';
 export {useReferenceTrigger} from './components/useReferenceTrigger';
 export {usePopupTrigger} from './components/usePopupTrigger';
 export {useWatchAutoClear} from './components/useWatchAutoClear';
 export {nextPopupId} from './components/nextPopupId';
-export {createProvider} from './components/createProvider';
 export {usePopupManager} from './components/usePopupManager';
+export {useEdit, EditProps, EDIT_PROVIDER} from './uses/useEdit';
+export type {tEditComputed, tEditControl, EditProvideData} from './uses/useEdit';
+export {useStyle, StyleProps, ThemeShape, ThemeSize, ThemeStatus, InputMode} from './uses/useStyle';
+export type {tStyleComputed, UseStyleProvideData} from './uses/useStyle';
+export {AutoLoadingObserver} from './components/AutoLoadingObserver';
+export {lighter, darken} from './utils/color.utils';
+export {createRequestInterceptor} from './components/createRequestInterceptor';
+export type{iRequestInterceptor} from './components/createRequestInterceptor';
+export {createVirtualDraggier} from './components/createVirtualDraggier';
+export {createWebDraggier} from './components/createWebDraggier';
+export {createScrollDraggier} from './components/createScrollDraggier';
+export {loadFile} from './components/loadFile';
+export {getDeviceInfo, clearDeviceInfo, eDeviceType} from './utils/getDeviceInfo';
 
+// @ts-ignore
 setComponentPrefix(globalComponentPrefix);
+
+export const version = packageJson.version;