sard-uniapp 1.1.5 → 1.1.6

package/changelog.md

@@ -1,3 +1,12 @@
+## [1.1.6](https://github.com/sutras/sard-uniapp/compare/v1.1.5...v1.1.6) (2024-05-19)
+
+
+### Bug Fixes
+
+* 修复 notify 组件显示问题、优化文档 ([7ed66fd](https://github.com/sutras/sard-uniapp/commit/7ed66fd09870b24d485fd82ed6f152373b665f3c))
+
+
+
 ## [1.1.5](https://github.com/sutras/sard-uniapp/compare/v1.1.4...v1.1.5) (2024-05-18)
 
 

package/components/notify-agent/common.d.ts

@@ -9,10 +9,11 @@ export declare const notifyAgentPropsDefaults: {
     duration: number;
     timeout: number;
 };
-export declare const mapIdImperative: Record<string, {
-    show(props: Record<string, any>): void;
+export declare const imperativeName = "notify";
+export interface NotifyImperative {
+    show(newProps: Record<string, any>): void;
     hide(): void;
-}>;
+}
 export type NotifyOptions = NotifyAgentProps;
 export interface NotifySimpleShowFunction {
     (options: NotifyOptions): void;

package/components/notify-agent/common.js

@@ -1,9 +1,11 @@
+import { notifyPropsDefaults } from '../notify/common';
 import { defaultConfig } from '../config';
+import { getAllImperatives, getAvailableImperative, getImperatives, } from '../../use/useImperative';
 export const notifyAgentPropsDefaults = {
-    ...defaultConfig.notify,
+    ...notifyPropsDefaults,
     ...defaultConfig.notifyAgent,
 };
-export const mapIdImperative = {};
+export const imperativeName = 'notify';
 const show = (optionsOrMessage, options = {}, internalType) => {
     if (optionsOrMessage && typeof optionsOrMessage === 'object') {
         options = optionsOrMessage;
@@ -12,8 +14,8 @@ const show = (optionsOrMessage, options = {}, internalType) => {
         options.message = optionsOrMessage;
     }
     options.type = internalType;
-    const { id = 'notify' } = options;
-    const imperative = mapIdImperative[id];
+    const { id = defaultConfig.notifyAgent.id } = options;
+    const imperative = getAvailableImperative(imperativeName, id);
     if (imperative) {
         imperative.show(options);
     }
@@ -30,14 +32,19 @@ const warning = (optionsOrMessage, options) => {
 const error = (optionsOrMessage, options) => {
     show(optionsOrMessage, options, 'error');
 };
-const hide = (id = 'notify') => {
-    const imperative = mapIdImperative[id];
-    if (imperative) {
-        imperative.hide();
+const hide = (id = defaultConfig.notifyAgent.id) => {
+    const imperatives = getImperatives(imperativeName, id);
+    if (imperatives && imperatives.length > 0) {
+        imperatives.forEach((item) => {
+            item.imperative.hide();
+        });
     }
 };
 const hideAll = () => {
-    Object.keys(mapIdImperative).forEach(hide);
+    const mapImperatives = getAllImperatives()[imperativeName];
+    if (mapImperatives) {
+        Object.keys(mapImperatives).forEach(hide);
+    }
 };
 notify.success = success;
 notify.warning = warning;

package/components/notify-agent/notify-agent.vue

@@ -15,12 +15,13 @@
 
 <script>
 import { mergeDefaults as _mergeDefaults, defineComponent as _defineComponent } from "vue";
-import { onMounted, onUnmounted, ref } from "vue";
+import { computed, ref } from "vue";
 import SarNotify from "../notify/notify.vue";
 import {
-  mapIdImperative,
+  imperativeName,
   notifyAgentPropsDefaults
 } from "./common";
+import { useImperative } from "../../use/useImperative";
 export default  _defineComponent({
   ...{
     options: {
@@ -64,16 +65,11 @@ export default  _defineComponent({
         elRef.value?.cancelHide();
       }
     };
-    onMounted(() => {
-      if (innerProps.value.id) {
-        mapIdImperative[innerProps.value.id] = imperative;
-      }
-    });
-    onUnmounted(() => {
-      if (innerProps.value.id) {
-        delete mapIdImperative[innerProps.value.id];
-      }
-    });
+    useImperative(
+      imperativeName,
+      imperative,
+      computed(() => innerProps.value.id)
+    );
     const __returned__ = { props, innerProps, elRef, imperative, SarNotify };
     return __returned__;
   }

package/components/popover/index.d.ts

@@ -1,3 +1,3 @@
-import { Position } from './utils';
+import type { Position } from './utils';
 export { usePopover } from './usePopover';
 export type PopoverPosition = Position;

package/components/toast/common.d.ts

@@ -19,7 +19,7 @@ export declare const toastPropsDefaults: {
     duration: number;
 };
 export interface ToastEmits {
-    (e: 'update:visible', event: any): void;
+    (e: 'update:visible', visible: boolean): void;
 }
 export interface ToastExpose {
     reHideLater: () => void;

package/components/toast/toast.d.ts

@@ -9,7 +9,7 @@ declare const _default: import("vue").DefineComponent<__VLS_WithDefaults<__VLS_T
     reHideLater: () => void;
     cancelHide: () => void;
 }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {
-    "update:visible": (event: any) => void;
+    "update:visible": (visible: boolean) => void;
 }, string, import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<__VLS_WithDefaults<__VLS_TypePropsToOption<ToastProps>, {
     type: "text";
     position: "center";
@@ -17,7 +17,7 @@ declare const _default: import("vue").DefineComponent<__VLS_WithDefaults<__VLS_T
     timeout: number;
     duration: number;
 }>>> & {
-    "onUpdate:visible"?: ((event: any) => any) | undefined;
+    "onUpdate:visible"?: ((visible: boolean) => any) | undefined;
 }, {
     type: "success" | "text" | "loading" | "fail";
     overlay: boolean;

package/package.json

@@ -2,7 +2,8 @@
   "id": "sard-uniapp",
   "name": "sard-uniapp",
   "displayName": "sard-uniapp",
-  "version": "1.1.5",
+  "version": "1.1.6",
+  "type": "module",
   "description": "sard-uniapp 是一套基于 Uniapp + Vue3 框架开发的兼容多端的 UI 组件库",
   "keywords": [
     "uniapp",
@@ -24,8 +25,8 @@
     "test": "vitest"
   },
   "peerDependencies": {
-    "@dcloudio/types": "^3.3.2",
-    "vue": "^3.3.11"
+    "@dcloudio/types": "^3.4.8",
+    "vue": "^3.4.27"
   },
   "devDependencies": {
     "@sard/uniapp-cli": "workspace:*",