plain-design 1.0.0-beta.99 → 3.0.0

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

@@ -1,6 +1,6 @@
 import './triangle.scss';
-import {designComponent, getComponentCls, onMounted, PropType, useClasses, useModel, useRefs, useStyles} from "plain-design-composition";
-import {unit} from "plain-utils/string/unit";
+import {designComponent, getComponentCls, onMounted, PropType, useClasses, useModel, useRefs, useStyles} from "@peryl/react-compose";
+import {unit} from "@peryl/utils/unit";
 
 const DirectionMap = {
   top: 'bottom',

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

@@ -1,6 +1,6 @@
 import './upload.scss';
 import {$file, FileServiceDefaultAccept, FileServiceSingleFile, FileServiceValidator} from "../$file";
-import {computed, designComponent, getComponentCls, iDragEvent, PropType, RenderNode, useClasses, useModel, useRefs} from 'plain-design-composition';
+import {computed, designComponent, getComponentCls, iDragEvent, PropType, RenderNode, useClasses, useModel, useRefs} from '@peryl/react-compose';
 import {EditProps, useEdit} from "../../uses/useEdit";
 import {Icon} from "../Icon";
 import {Loading} from "../Loading";
@@ -9,11 +9,11 @@ import {$dialog} from "../$dialog";
 import {ButtonGroup} from "../ButtonGroup";
 import {Button} from "../Button";
 import {$notice} from "../$notice";
-import {createCounter} from "plain-utils/utils/createCounter";
-import {classnames} from "plain-utils/dom/classnames";
-import {toArray} from "plain-utils/utils/toArray";
-import {defer} from "plain-utils/utils/defer";
-import {createEnum} from "plain-utils/utils/createEnum";
+import {createCounter} from "@peryl/utils/createCounter";
+import {classnames} from "@peryl/utils/classnames";
+import {toArray} from "@peryl/utils/toArray";
+import {defer} from "@peryl/utils/defer";
+import {createEnum} from "@peryl/utils/createEnum";
 import i18n from "../i18n";
 
 const nextFileId = createCounter('upload');

package/src/packages/components/VirtualList/createVirtualDraggier.ts

@@ -1,13 +1,13 @@
 import {iElementRect} from "../../utils/getRowEl";
-import {getComponentCls, iMouseEvent, iTouchEvent, reactive, SimpleFunction, StyleProperties} from "plain-design-composition";
-import {doNothing} from "plain-utils/utils/doNothing";
-import {defer, DFD} from "plain-utils/utils/defer";
-import {findParentElement} from "plain-utils/dom/findParentElement";
-import {hasClass} from "plain-utils/dom/hasClass";
+import {getComponentCls, iMouseEvent, iTouchEvent, reactive, SimpleFunction, StyleProperties} from "@peryl/react-compose";
+import {doNothing} from "@peryl/utils/doNothing";
+import {defer, DFD} from "@peryl/utils/defer";
+import {findParentElement} from "@peryl/utils/findParentElement";
+import {hasClass} from "@peryl/utils/hasClass";
 import {getElementRect} from "../../utils/getElementRect";
-import {notNull} from "plain-utils/utils/notNull";
+import {notNull} from "@peryl/utils/notNull";
 import {createWebDraggier, iDraggierData} from "../../utils/createDraggier";
-import {delay} from "plain-utils/utils/delay";
+import {delay} from "@peryl/utils/delay";
 import {PlainScroll} from "../Scroll";
 import {iVirtualList} from "./useVirtualList";
 import {createAutoScrollManager} from "../createAutoScrollManager";

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

@@ -1,5 +1,5 @@
 import './virtual-list.scss';
-import {computed, designComponent, iMouseEvent, iTouchEvent, onBeforeUnmount, useModel, useRefs} from "plain-design-composition";
+import {computed, designComponent, iMouseEvent, iTouchEvent, onBeforeUnmount, useModel, useRefs} from "@peryl/react-compose";
 import Scroll from "../Scroll";
 import {useVirtualList} from "./useVirtualList";
 import {createVirtualDraggier, iVirtualDraggierData} from "./createVirtualDraggier";

package/src/packages/components/VirtualList/useVirtualList.tsx

@@ -1,12 +1,12 @@
-import {computed, getComponentCls, onBeforeUnmount, onMounted, onUpdated, reactive, useClasses, useStyles, watch} from "plain-design-composition";
-import {createCounter} from 'plain-utils/utils/createCounter';
-import {delay} from "plain-utils/utils/delay";
+import {computed, getComponentCls, onBeforeUnmount, onMounted, onUpdated, reactive, useClasses, useStyles, watch} from "@peryl/react-compose";
+import {createCounter} from '@peryl/utils/createCounter';
+import {delay} from "@peryl/utils/delay";
 import './virtual-list.scss';
 import Scroll from "../Scroll";
-import {unit} from "plain-utils/string/unit";
-import {createEnum} from "plain-utils/utils/createEnum";
-import {PlainObject} from "plain-utils/utils/event";
-import {addWindowListener} from "plain-utils/dom/addWindowListener";
+import {unit} from "@peryl/utils/unit";
+import {createEnum} from "@peryl/utils/createEnum";
+import {PlainObject} from "@peryl/utils/event";
+import {addWindowListener} from "@peryl/utils/addWindowListener";
 
 interface DataNode {
   start: number;
@@ -94,7 +94,7 @@ export function useVirtualList(
 
   const _pageSize = computed(() => {
     if (state.hostSize == null) {return null;}
-    return Math.floor(state.hostSize / _avgSize.value);
+    return Math.max(3, Math.floor(state.hostSize / _avgSize.value));
   });
 
   const idMap = new WeakMap<PlainObject, string>();
@@ -178,7 +178,7 @@ export function useVirtualList(
       if (!props.dynamicSize) {
         style.height = `${(dataModel.value || []).length * props.size}px`;
       } else {
-        style.height = `${nodes.value[nodes.value.length - 1].end}px`;
+        style.height = !nodes.value.length ? 0 : `${nodes.value[nodes.value.length - 1].end}px`;
       }
     } else {
       /*横向*/
@@ -189,7 +189,7 @@ export function useVirtualList(
       if (!props.dynamicSize) {
         style.width = `${(dataModel.value || []).length * props.size}px`;
       } else {
-        style.width = `${nodes.value[nodes.value.length - 1].end}px`;
+        style.width = !nodes.value.length ? 0 : `${nodes.value[nodes.value.length - 1].end}px`;
       }
     }
   });
@@ -214,7 +214,7 @@ export function useVirtualList(
     if (!props.dynamicSize) {
       start = startIndex * props.size;
     } else {
-      start = nodes.value[startIndex].start;
+      start = nodes.value[startIndex]?.start ?? 0;
     }
 
     if (!props.horizontal) {

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

@@ -1,12 +1,14 @@
-import {computed, designComponent, getComponentCls, PropType, useClasses, useModel, useRefs, useStyles} from "plain-design-composition";
-import {PlainObject} from "plain-utils/utils/event";
+import {computed, designComponent, getComponentCls, PropType, useClasses, useModel, useRefs, useStyles} from "@peryl/react-compose";
+import {PlainObject} from "@peryl/utils/event";
 import {Scroll} from "../Scroll";
 import {useVirtualList} from "../VirtualList/useVirtualList";
-import {unit} from "plain-utils/string/unit";
+import {unit} from "@peryl/utils/unit";
 import './virtual-table.scss';
 import i18n from "../i18n";
-import {doNothing} from "plain-utils/utils/doNothing";
+import {doNothing} from "@peryl/utils/doNothing";
 import {useWatchAutoClear} from "../../utils/watchEffectAutoClear";
+import {useTableAutoSpan} from "../Table/plc/use/useTableAutoSpan";
+import {iTableNode} from "../Table/table/utils/table.utils";
 
 export const VirtualTable = designComponent({
   name: 'virtual-table',
@@ -55,6 +57,8 @@ export const VirtualTable = designComponent({
     /*虚拟滚动时让出顶部距离显示表头*/
     const { virtual } = useVirtualList({ dataModel, props, refs: refs as any, emit, transform: false });
 
+    const tableAutoSpan = useTableAutoSpan(() => ({ data: virtual.offsetData.value.list.map(i => (i.item as iTableNode).data) }));
+
     /*---------------------------------------computed-------------------------------------------*/
     const styles = useStyles(style => {
       style.height = unit(props.height);
@@ -154,6 +158,8 @@ export const VirtualTable = designComponent({
       },
       render: () => {
         const { list } = virtual.offsetData.value;
+        /*触发响应式计算*/
+        doNothing(tableAutoSpan.value?.spans);
         return (
           <div style={styles.value} className={classes.value}>
             <Scroll

package/src/packages/components/VirtualTable/virtual-table.scss

@@ -81,19 +81,19 @@ $scrollbarSize: 12px;
       }
 
       &:hover {
-        td {
+        td:not([data-span=true]) {
           background-color: plv(table-row-hover-color);
         }
       }
 
       &.plt-row-current {
-        td {
+        td:not([data-span=true]) {
           background-color: plv(table-row-current-color);
         }
       }
 
       &.plt-row-checked {
-        td {
+        td:not([data-span=true]) {
           background-color: plv(primary-light-1);
           border-bottom-color: plv(primary-light-2);
         }

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

@@ -1,8 +1,8 @@
 import {createAddressService} from "../$address/createAddressService";
 import {eAddressTypeEnum, iAddressSyncMeta} from "../$address/address.utils";
 import {iHttp} from "../createHttp";
-import {delay} from "plain-utils/utils/delay";
-import {toArray} from "plain-utils/utils/toArray";
+import {delay} from "@peryl/utils/delay";
+import {toArray} from "@peryl/utils/toArray";
 
 export function createPlainAddressService(
   {

package/src/packages/components/createRequestInterceptor/index.ts

@@ -1,5 +1,5 @@
-import {pathJoin} from "plain-utils/string/pathJoin";
-import {PlainObject} from "plain-utils/utils/event";
+import {pathJoin} from "@peryl/utils/pathJoin";
+import {PlainObject} from "@peryl/utils/event";
 import qs from "qs";
 
 /**

package/src/packages/components/createScrollDraggier/index.ts

@@ -1,10 +1,10 @@
-import {getComponentCls, iMouseEvent, iTouchEvent, reactive, StyleProperties} from "plain-design-composition";
-import {doNothing} from "plain-utils/utils/doNothing";
-import {findParentElement} from "plain-utils/dom/findParentElement";
-import {hasClass} from "plain-utils/dom/hasClass";
+import {getComponentCls, iMouseEvent, iTouchEvent, reactive, StyleProperties} from "@peryl/react-compose";
+import {doNothing} from "@peryl/utils/doNothing";
+import {findParentElement} from "@peryl/utils/findParentElement";
+import {hasClass} from "@peryl/utils/hasClass";
 import {getElementRect} from "../../utils/getElementRect";
 import {createWebDraggier} from "../../utils/createDraggier";
-import {delay} from "plain-utils/utils/delay";
+import {delay} from "@peryl/utils/delay";
 import {PlainScroll} from "../Scroll";
 import {createDefaultDraggierReactiveState, createDefaultDraggierStaticState, iVirtualDraggierHandler} from "../VirtualList/createVirtualDraggier";
 import {iVirtualNode} from "../VirtualList/useVirtualList";

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

@@ -1,4 +1,4 @@
-import {delay} from "plain-utils/utils/delay";
+import {delay} from "@peryl/utils/delay";
 
 export function createScrollUtils(
   {

package/src/packages/components/createSimpleDate/index.ts

@@ -0,0 +1,49 @@
+export function createSimpleDate(_date?: Date) {
+  const date = _date || new Date();
+  const year = date.getFullYear();
+  const month = date.getMonth() + 1;
+  const day = date.getDate();
+  const hour = date.getHours();
+  const minute = date.getMinutes();
+  const second = date.getSeconds();
+
+  const YYYY = String(year);
+  const MM = String(month).padStart(2, '0');
+  const DD = String(day).padStart(2, '0');
+  const HH = String(hour).padStart(2, '0');
+  const mm = String(minute).padStart(2, '0');
+  const ss = String(second).padStart(2, '0');
+
+  return {
+    'YYYY-MM-DD HH:mm:ss': `${YYYY}-${MM}-${DD} ${HH}:${mm}:${ss}`,
+    'YYYY-MM-DD': `${YYYY}-${MM}-${DD}`,
+    'HH:mm:ss': `${HH}:${mm}:${ss}`,
+    YMDHms: Number(`${YYYY}${MM}${DD}${HH}${mm}${ss}`),
+    YMD: Number(`${YYYY}${MM}${DD}`),
+  };
+}
+
+export const parseDateString = (dateString: string): Date | null => {
+  const match = /(\d\d\d\d)-(\d\d)-(\d\d)/.exec(dateString);
+  if (!match) {return null;}
+  const year = Number(match[1]);
+  const month = Number(match[2]);
+  const date = Number(match[3]);
+  return new Date(year, month - 1, date);
+};
+
+export const parseDatetimeString = (datetimeString: string) => {
+  const match = /(\d\d\d\d)-(\d\d)-(\d\d) (\d\d):(\d\d):(\d\d)/.exec(datetimeString);
+  if (!match) {return null;}
+  const year = Number(match[1]);
+  const month = Number(match[2]);
+  const date = Number(match[3]);
+  const hour = Number(match[4]);
+  const minute = Number(match[5]);
+  const second = Number(match[6]);
+  return new Date(year, month - 1, date, hour, minute, second);
+};
+
+export const nowDate = () => createSimpleDate()['YYYY-MM-DD'];
+export const nowTime = () => createSimpleDate()['HH:mm:ss'];
+export const nowDatetime = () => createSimpleDate()['YYYY-MM-DD HH:mm:ss'];

package/src/packages/components/createTransitionHandler/index.ts

@@ -1,4 +1,4 @@
-import {delay} from "plain-utils/utils/delay";
+import {delay} from "@peryl/utils/delay";
 
 /**
  * 创建一个transition管理器

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

@@ -1,8 +1,8 @@
-import {addClass} from "plain-utils/dom/addClass";
+import {addClass} from "@peryl/utils/addClass";
 import {createScrollUtils, iScrollUtils, iScrollUtilsParameter} from "../createScrollUtils";
-import {createEffects} from "plain-utils/utils/createEffects";
-import {getComponentCls} from "plain-design-composition";
-import {getElementParents} from "plain-utils/dom/getElementParents";
+import {createEffects} from "@peryl/utils/createEffects";
+import {getComponentCls} from "@peryl/react-compose";
+import {getElementParents} from "@peryl/utils/getElementParents";
 import './auto-scroll-utils.scss';
 import {isWindows} from "../../utils/getDeviceInfo";
 

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

@@ -0,0 +1,40 @@
+import {usePopup} from "../usePopup";
+import {ListPanel} from "../ListPanel";
+import {ListOption} from "../ListOption";
+import {iMouseEvent} from "@peryl/react-compose";
+import {getFunctionValue} from "@peryl/utils/getFunctionValue";
+
+export const useContextmenuOptions = () => {
+
+  const { $popup } = usePopup();
+
+  const open = ({ x, y ,options}: { x: number, y: number, options: iContextmenuOption[]}) => {
+    const pop = $popup.absolute({
+      x, y,
+      noArrow: true,
+      noPadding: true,
+      type: 'contextmenu-option',
+      placement: 'bottom-start',
+      trigger: 'contextmenu',
+      render: () => (
+        <ListPanel>
+          {options.map((option, index) => (
+            <ListOption key={index} label="管理该类型" onClick={async (e) => {
+              const flag = await option.handler(e);
+              if (flag != false) {pop.hide();}
+            }}>
+              {getFunctionValue(option.label)}
+            </ListOption>
+          ))}
+        </ListPanel>
+      )
+    });
+  };
+
+  return { open };
+};
+
+export interface iContextmenuOption {
+  label: string | (() => any);
+  handler: (e: iMouseEvent) => void | boolean | Promise<void | boolean>,
+}

package/src/packages/components/useDialog/DialogService.tsx

@@ -1,6 +1,6 @@
 import {createApplicationServiceComponent} from "../Application/service/createApplicationServiceComponent";
 import {closeDialogServiceHook, destroyDialogServiceHook, dialogCustomOptionKeys, DialogServiceEditType, iDialogServiceCustomOption, iDialogServiceOption} from "./dialog.service.utils";
-import {computed, createHooks, getComponentCls, onBeforeUnmount, reactive, ref, toRaw, useRefs} from "plain-design-composition";
+import {computed, createHooks, getComponentCls, onBeforeUnmount, reactive, ref, toRaw, useRefs} from "@peryl/react-compose";
 import {Dialog} from "../Dialog";
 import {i18n} from "../../i18n";
 import {DialogAlign, DialogCloseType, DialogPositions} from "../Dialog/utils/dialog.utils";
@@ -119,16 +119,16 @@ export const DialogService = createApplicationServiceComponent<iDialogServiceOpt
       },
       render: () => {
         /*---------------------------------------head-------------------------------------------*/
-        const head = () => (
+        const head = targetOption.value.customOption.renderHead || (() => (
           <div className="dialog-service-head">
             {!!targetOption.value.customOption.status && <Icon icon={ThemeStatusIcons[targetOption.value.customOption.status]}/>}
             <span>{targetOption.value.dialogProps.title || i18n.$it('base.defaultTitle').d('提示')}</span>
           </div>
-        );
+        ));
         /*---------------------------------------foot-------------------------------------------*/
-        const foot = () => !targetOption.value.dialogProps.confirmButton && !targetOption.value.dialogProps.cancelButton && (
+        const foot = targetOption.value.customOption.renderFoot || (() => !targetOption.value.dialogProps.confirmButton && !targetOption.value.dialogProps.cancelButton && (
           <Button mode="fill" label={i18n.$it('base.close').d('关闭')} onClick={hide} status={targetOption.value.customOption.status || undefined}/>
-        );
+        ));
         /*---------------------------------------default-------------------------------------------*/
         let defaultSlot = null as any;
         const dialogProps = { ...targetOption.value.dialogProps };
@@ -136,7 +136,7 @@ export const DialogService = createApplicationServiceComponent<iDialogServiceOpt
         /*wrap handleConfirm*/
         dialogProps.handleConfirm = async (close: () => void) => {
           if (!!targetOption.value.customOption.editRequired) {
-            if (state.editValue == null || !state.editValue.trim().length) {
+            if (state.editValue == null || (typeof state.editValue === "string" && !state.editValue.trim().length)) {
               $message.warn('不能为空！');
               return false;
             }
@@ -213,13 +213,13 @@ export const DialogService = createApplicationServiceComponent<iDialogServiceOpt
           <Dialog
             {...dialogProps}
             v-model={isShow.value}
-            v-model:open={isOpen.value}>
-            {{
+            v-model:open={isOpen.value}
+            v-slots={{
               head,
               foot,
               default: () => defaultSlot,
             }}
-          </Dialog>
+          />
         );
       }
     };

package/src/packages/components/useDialog/dialog.service.utils.tsx

@@ -1,8 +1,8 @@
-import {createEnum} from "plain-utils/utils/createEnum";
+import {createEnum} from "@peryl/utils/createEnum";
 import {Dialog} from "../Dialog";
 import {ThemeStatus} from "../../uses/useStyle";
-import {createHooks, RenderNode} from "plain-design-composition";
-import {createCounter} from "plain-utils/utils/createCounter";
+import {anonymousEffects, createHooks, RenderNode} from "@peryl/react-compose";
+import {createCounter} from "@peryl/utils/createCounter";
 
 /**
  * 给dialog option生成id
@@ -16,14 +16,14 @@ export const nextDialogId = createCounter('dialog-service');
  * @author  韦胜健
  * @date    2022.5.4 21:45
  */
-export const closeDialogServiceHook = createHooks<(id?: string) => void>();
+export const closeDialogServiceHook = createHooks<(id?: string) => void>(anonymousEffects);
 
 /**
  * 销毁dialog观察者对象
  * @author  韦胜健
  * @date    2022.5.4 21:45
  */
-export const destroyDialogServiceHook = createHooks<(option: any) => void>();
+export const destroyDialogServiceHook = createHooks<(option: any) => void>(anonymousEffects);
 
 /**
  * 弹框服务编辑框类型

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

@@ -1,11 +1,11 @@
 import {closeDialogServiceHook, destroyDialogServiceHook, iDialogServiceOption, nextDialogId} from "./dialog.service.utils";
-import {defer} from 'plain-utils/utils/defer';
+import {defer} from '@peryl/utils/defer';
 import {ThemeStatus} from "../../uses/useStyle";
 import {createApplicationServiceManager} from "../Application/service/createApplicationServiceManager";
 import {createApplicationService} from "../Application/service/createApplicationService";
 import {DialogService} from "./DialogService";
-import {formatOptions} from "plain-utils/utils/formatServiceOptions";
-import {onBeforeUnmount} from "plain-design-composition";
+import {formatOptions} from "@peryl/utils/formatServiceOptions";
+import {onBeforeUnmount} from "@peryl/react-compose";
 
 export const useDialog = createApplicationService(
   'dialog',
@@ -15,7 +15,7 @@ export const useDialog = createApplicationService(
     const service = (sourceOption: string | iDialogServiceOption, externalOption?: iDialogServiceOption): () => void => {
       const option = formatOptions(sourceOption, externalOption);
       !option.id && (option.id = nextDialogId());
-      option.minWidth === null && (option.minWidth = '325px');
+      option.minWidth == null && (option.minWidth = '325px');
 
       getManager().then(async manager => {await manager.service(option);});
 

package/src/packages/components/useImage/ImageService.tsx

@@ -1,12 +1,12 @@
-import {createCounter} from "plain-utils/utils/createCounter";
+import {createCounter} from "@peryl/utils/createCounter";
 import {createApplicationServiceComponent} from "../Application/service/createApplicationServiceComponent";
-import {computed, createHooks, getComponentCls, iHTMLDivElement, iMouseEvent, nextIndex, onBeforeUnmount, onMounted, Portal, reactive, ref, useRefs, useStyles} from "plain-design-composition";
-import {KeyboardService} from "../KeyboardService";
+import {computed, createHooks, getComponentCls, iHTMLDivElement, iMouseEvent, nextIndex, onBeforeUnmount, onMounted, Portal, reactive, ref, useRefs, useStyles} from "@peryl/react-compose";
+import {KeyboardService} from "@peryl/utils/keyboard";
 import {Image} from "../Image";
 import {Tooltip} from "../Tooltip";
 import {Icon} from "../Icon";
-import i18n from "../i18n";
-import Transition from "../Transition";
+import {i18n} from "../i18n";
+import {Transition} from "../Transition";
 import {APPLICATION_SERVICE_CONTAINER_CLASS} from "../Application/utils/application.utils";
 import {ClientZoom} from "../ClientZoom";
 import {createTransitionHandler} from "../createTransitionHandler";

package/src/packages/components/useLoading/LoadingService.tsx

@@ -1,11 +1,11 @@
 import {createApplicationServiceComponent} from "../Application/service/createApplicationServiceComponent";
 import {closeLoadingServiceHook, iLoadingServiceOption} from "./loading.service.utils";
-import {computed, createHooks, getComponentCls, iHTMLDivElement, onBeforeUnmount, reactive, ref, useClasses, useRefs, useStyles} from "plain-design-composition";
+import {computed, createHooks, getComponentCls, iHTMLDivElement, onBeforeUnmount, reactive, ref, useClasses, useRefs, useStyles} from "@peryl/react-compose";
 import {ThemeStatus} from "../../uses/useStyle";
 import {createTransitionHandler} from "../createTransitionHandler";
 import './loading.service.scss';
-import {delay} from "plain-utils/utils/delay";
-import {createEffects} from "plain-utils/utils/createEffects";
+import {delay} from "@peryl/utils/delay";
+import {createEffects} from "@peryl/utils/createEffects";
 
 export const LoadingService = createApplicationServiceComponent<iLoadingServiceOption>({
   name: 'loading-service',

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

@@ -2,7 +2,7 @@ import {closeLoadingServiceHook, iLoadingServiceOption} from "./loading.service.
 import {createApplicationService} from "../Application/service/createApplicationService";
 import {createApplicationServiceManager} from "../Application/service/createApplicationServiceManager";
 import {LoadingService} from "./LoadingService";
-import {createCounter} from "plain-utils/utils/createCounter";
+import {createCounter} from "@peryl/utils/createCounter";
 
 interface iLoadingServiceFunction {
   (option?: iLoadingServiceOption): () => void;

package/src/packages/components/useLoading/loading.service.utils.tsx

@@ -1,5 +1,5 @@
 import {ThemeStatus} from "../../uses/useStyle";
-import {createHooks} from "plain-design-composition";
+import {anonymousEffects, createHooks} from "@peryl/react-compose";
 
 export interface iLoadingServiceOption {
   id?: string,
@@ -10,4 +10,4 @@ export interface iLoadingServiceOption {
   onClose?: () => void,
 }
 
-export const closeLoadingServiceHook = createHooks<(id?: string) => void>();
+export const closeLoadingServiceHook = createHooks<(id?: string) => void>(anonymousEffects);

package/src/packages/components/useMessage/Message.tsx

@@ -1,4 +1,4 @@
-import {designComponent, getComponentCls, iMouseEvent, nextIndex, onBeforeUnmount, onMounted, PropType, useClasses} from "plain-design-composition";
+import {designComponent, getComponentCls, iMouseEvent, nextIndex, onBeforeUnmount, onMounted, PropType, useClasses} from "@peryl/react-compose";
 import {closeMessageServiceHook, iMessageServiceOption} from "./message.service.utils";
 import Icon from "../Icon";
 import './message.scss';

package/src/packages/components/useMessage/MessageContainer.tsx

@@ -1,4 +1,4 @@
-import {designComponent, getComponentCls, onMounted, reactive, useClasses, useRefList} from "plain-design-composition";
+import {designComponent, getComponentCls, onMounted, reactive, useClasses, useRefList} from "@peryl/react-compose";
 import {iMessageServiceOption} from "./message.service.utils";
 import {List} from "../List";
 import {Message} from "./Message";

package/src/packages/components/useMessage/MessageManager.tsx

@@ -1,4 +1,4 @@
-import {designComponent, getComponentCls, onMounted, PropType, reactive, useRefList} from "plain-design-composition";
+import {designComponent, getComponentCls, onMounted, PropType, reactive, useRefList} from "@peryl/react-compose";
 import {iApplicationManagerData} from "../Application/service/useApplicationService";
 import {MessageDirection} from "./message.service.utils";
 import {MessageContainer} from "./MessageContainer";

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

@@ -1,7 +1,7 @@
 import {createApplicationService} from "../Application/service/createApplicationService";
 import {MessageManager} from "./MessageManager";
 import {closeMessageServiceHook, iMessageServiceOption, MessageDirection, nextMessageId} from "./message.service.utils";
-import {formatOptions} from "plain-utils/utils/formatServiceOptions";
+import {formatOptions} from "@peryl/utils/formatServiceOptions";
 import {ThemeStatus} from "../../uses/useStyle";
 import {ThemeStatusIcons} from "../Application/theme/theme.utils";
 

package/src/packages/components/useMessage/message.service.utils.tsx

@@ -1,7 +1,7 @@
-import {createEnum} from "plain-utils/utils/createEnum";
+import {createEnum} from "@peryl/utils/createEnum";
 import {ThemeStatus} from "../../uses/useStyle";
-import {createHooks, iMouseEvent, RenderNode} from "plain-design-composition";
-import {createCounter} from "plain-utils/utils/createCounter";
+import {anonymousEffects, createHooks, iMouseEvent, RenderNode} from "@peryl/react-compose";
+import {createCounter} from "@peryl/utils/createCounter";
 
 /**
  * 消息提示服务位置方向
@@ -22,7 +22,7 @@ export const nextMessageId = createCounter('message-service');
  * @author  韦胜健
  * @date    2022.5.4 22:32
  */
-export const closeMessageServiceHook = createHooks<(id: string) => void>();
+export const closeMessageServiceHook = createHooks<(id: string) => void>(anonymousEffects);
 
 /**
  * 消息提示服务对象参数类型

package/src/packages/components/useNotice/Notice.tsx

@@ -1,5 +1,5 @@
 import './notice.scss';
-import {designComponent, getComponentCls, iMouseEvent, nextIndex, onBeforeUnmount, onMounted, PropType, useClasses} from "plain-design-composition";
+import {designComponent, getComponentCls, iMouseEvent, nextIndex, onBeforeUnmount, onMounted, PropType, useClasses} from "@peryl/react-compose";
 import {closeNoticeServiceHook, iNoticeServiceOption} from "./noitice.service.utils";
 import Icon from "../Icon";
 

package/src/packages/components/useNotice/NoticeContainer.tsx

@@ -1,4 +1,4 @@
-import {designComponent, getComponentCls, onMounted, PropType, reactive, useClasses, useRefList} from "plain-design-composition";
+import {designComponent, getComponentCls, onMounted, PropType, reactive, useClasses, useRefList} from "@peryl/react-compose";
 import {iNoticeServiceOption, NoticeDirection} from "./noitice.service.utils";
 import {List} from "../List";
 import {Notice} from "./Notice";

package/src/packages/components/useNotice/NoticeManager.tsx

@@ -1,4 +1,4 @@
-import {designComponent, getComponentCls, onMounted, PropType, reactive, useRefList} from "plain-design-composition";
+import {designComponent, getComponentCls, onMounted, PropType, reactive, useRefList} from "@peryl/react-compose";
 import {iApplicationManagerData} from "../Application/service/useApplicationService";
 import {NoticeDirection} from "./noitice.service.utils";
 import {NoticeContainer} from "./NoticeContainer";

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

@@ -1,7 +1,7 @@
 import {createApplicationService} from "../Application/service/createApplicationService";
 import {NoticeManager} from "./NoticeManager";
 import {closeNoticeServiceHook, iNoticeServiceOption, nextNoticeId, NoticeDirection} from "./noitice.service.utils";
-import {formatOptions} from "plain-utils/utils/formatServiceOptions";
+import {formatOptions} from "@peryl/utils/formatServiceOptions";
 import {i18n} from "../../i18n";
 import {ThemeStatus} from "../../uses/useStyle";
 import {ThemeStatusIcons} from "../Application/theme/theme.utils";

package/src/packages/components/useNotice/noitice.service.utils.tsx

@@ -1,7 +1,7 @@
-import {createEnum} from "plain-utils/utils/createEnum";
+import {createEnum} from "@peryl/utils/createEnum";
 import {ThemeStatus} from "../../uses/useStyle";
-import {createHooks, RenderNode, SimpleFunction} from "plain-design-composition";
-import {createCounter} from "plain-utils/utils/createCounter";
+import {anonymousEffects, createHooks, RenderNode, SimpleFunction} from "@peryl/react-compose";
+import {createCounter} from "@peryl/utils/createCounter";
 
 /**
  * 通知方向
@@ -22,7 +22,7 @@ export const nextNoticeId = createCounter('notice-service');
  * @author  韦胜健
  * @date    2022.5.6 18:53
  */
-export const closeNoticeServiceHook = createHooks<(id?: null | string) => void>();
+export const closeNoticeServiceHook = createHooks<(id?: null | string) => void>(anonymousEffects);
 
 /**
  * 消息通知服务配置对象类型

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

@@ -1,4 +1,4 @@
-import {createRenderHook} from "plain-design-composition";
+import {createRenderHook} from "@peryl/react-compose";
 
 export function usePageRenderContext() {
   const renderHook = createRenderHook();