diff --git a/README.md b/README.md index f618863..cbf72a2 100644 --- a/README.md +++ b/README.md @@ -379,3 +379,7 @@ Online表单&Online报表&代码生成 + +## 判断是否小尺寸屏幕 +import { useScreenSize } from '/src/utils/screenSize/useScreenSize' +const { isSmallScreen } = useScreenSize(); \ No newline at end of file diff --git a/src/components/Modal/src/hooks/useModal.ts b/src/components/Modal/src/hooks/useModal.ts index 1c88323..0982da3 100644 --- a/src/components/Modal/src/hooks/useModal.ts +++ b/src/components/Modal/src/hooks/useModal.ts @@ -60,22 +60,29 @@ export function useModal(): UseModalReturnType { getInstance()?.redoModalHeight?.(); }, - openModal: (visible = true, data?: T, openOnSet = true): void => { + openModal: (visible = true, data?: T, openOnSet = true, options?: { onOpen?: () => void; onClose?: () => void }): void => { getInstance()?.setModalProps({ visible: visible, }); - + if (!data) return; + const id = unref(uid); if (openOnSet) { dataTransfer[id] = null; dataTransfer[id] = toRaw(data); + options?.onOpen?.(); // 打开时调用 onOpen 回调 return; } + const equal = isEqual(toRaw(dataTransfer[id]), toRaw(data)); if (!equal) { dataTransfer[id] = toRaw(data); } + + if (!visible && options?.onClose) { + options.onClose(); // 关闭时调用 onClose 回调 + } }, closeModal: () => { diff --git a/src/components/Tinymce/src/Editor.vue b/src/components/Tinymce/src/Editor.vue index 06a5892..e74e140 100644 --- a/src/components/Tinymce/src/Editor.vue +++ b/src/components/Tinymce/src/Editor.vue @@ -1,4 +1,4 @@ -