@tuya-miniapp/smart-ui 2.2.0 → 2.2.1-beta-2

package/dist/dialog/dialog.d.ts

@@ -35,6 +35,7 @@ interface DialogOptions {
     closeOnClickOverlay?: boolean;
     confirmButtonOpenType?: string;
     value?: null | string;
+    ignoreQueue?: boolean;
     password?: boolean;
     placeholder?: string;
     maxlength?: number;
@@ -47,7 +48,7 @@ interface DialogInputOptions extends DialogOptions {
     maxlength?: number;
 }
 export declare const contextRef: {
-    value: DialogContext | null;
+    value: Record<string, DialogContext | null>;
 };
 declare const Dialog: {
     (options: DialogOptions): Promise<WechatMiniprogram.Component.TrivialInstance>;

package/dist/dialog/dialog.js

@@ -11,8 +11,6 @@ const defaultOptions = {
     zIndex: 100,
     overlay: true,
     selector: '#smart-dialog',
-    // className: '',
-    // asyncClose: false,
     beforeClose: null,
     transition: 'scale',
     customStyle: '',
@@ -25,6 +23,7 @@ const defaultOptions = {
     closeOnClickOverlay: false,
     confirmButtonOpenType: '',
     icon: false,
+    ignoreQueue: false,
     value: null,
     password: false,
     placeholder: '',
@@ -32,17 +31,18 @@ const defaultOptions = {
 };
 let currentOptions = Object.assign({}, defaultOptions);
 export const contextRef = {
-    value: null,
+    value: {},
 };
 const Dialog = (options) => {
     options = Object.assign(Object.assign({}, currentOptions), options);
     return new Promise((resolve, reject) => {
         const context = (typeof options.context === 'function' ? options.context() : options.context) ||
-            contextRef.value ||
+            contextRef.value[options.selector] ||
             getCurrentPage();
         const selector = options.selector;
         const dialog = context.selectComponent(options.selector);
-        if (queueRef.value.length > 0 &&
+        if (!options.ignoreQueue &&
+            queueRef.value.length > 0 &&
             queueRef.value.find(item => dialog && item && item.id === dialog.id)) {
             console.warn(`相同选择器的 Dialog 调用过于频繁，${dialog.id} 已忽略重复调用`);
             return;

package/dist/dialog/index.js

@@ -93,7 +93,14 @@ SmartComponent({
         callback: (() => { }),
     },
     mounted: function () {
-        contextRef.value = getCurrentPage();
+        if (!this.id)
+            return;
+        contextRef.value[`#${this.id}`] = getCurrentPage();
+    },
+    destroyed: function () {
+        if (!this.id)
+            return;
+        contextRef.value[`#${this.id}`] = null;
     },
     methods: {
         onConfirm() {

package/dist/toast/index.js

@@ -1,3 +1,10 @@
+/*
+ * @Author: mjh
+ * @Date: 2025-02-14 16:33:01
+ * @LastEditors: mjh
+ * @LastEditTime: 2025-02-18 10:12:49
+ * @Description:
+ */
 import { Success, Alarm, Error } from './icons';
 import { SmartComponent } from '../common/component';
 import { contextRef } from './toast';
@@ -34,7 +41,14 @@ SmartComponent({
         warn: Alarm,
     },
     mounted: function () {
-        contextRef.value = getCurrentPage();
+        if (!this.id)
+            return;
+        contextRef.value[`#${this.id}`] = getCurrentPage();
+    },
+    destroyed: function () {
+        if (!this.id)
+            return;
+        contextRef.value[`#${this.id}`] = null;
     },
     methods: {
         // for prevent touchmove

package/dist/toast/toast.d.ts

@@ -12,13 +12,14 @@ interface ToastOptions {
     duration?: number;
     selector?: string;
     forbidClick?: boolean;
+    ignoreQueue?: boolean;
     loadingType?: string;
     message?: ToastMessage;
     onClose?: () => void;
     width?: number;
 }
 export declare const contextRef: {
-    value: ToastContext | null;
+    value: Record<string, ToastContext | null>;
 };
 declare function Toast(toastOptions: ToastOptions | ToastMessage): WechatMiniprogram.Component.TrivialInstance | undefined;
 declare namespace Toast {

package/dist/toast/toast.js

@@ -7,6 +7,7 @@ const defaultOptions = {
     show: true,
     zIndex: 1000,
     duration: 2000,
+    ignoreQueue: false,
     position: 'middle',
     forbidClick: false,
     loadingType: 'circular',
@@ -22,12 +23,12 @@ function parseOptions(message) {
     return isObj(message) ? message : { message };
 }
 export const contextRef = {
-    value: null,
+    value: {},
 };
 function Toast(toastOptions) {
     const options = Object.assign(Object.assign({}, currentOptions), parseOptions(toastOptions));
     const context = (typeof options.context === 'function' ? options.context() : options.context) ||
-        contextRef.value ||
+        contextRef.value[options.selector] ||
         getCurrentPage();
     const toast = context.selectComponent(options.selector);
     if (!toast) {

package/lib/dialog/dialog.d.ts

@@ -35,6 +35,7 @@ interface DialogOptions {
     closeOnClickOverlay?: boolean;
     confirmButtonOpenType?: string;
     value?: null | string;
+    ignoreQueue?: boolean;
     password?: boolean;
     placeholder?: string;
     maxlength?: number;
@@ -47,7 +48,7 @@ interface DialogInputOptions extends DialogOptions {
     maxlength?: number;
 }
 export declare const contextRef: {
-    value: DialogContext | null;
+    value: Record<string, DialogContext | null>;
 };
 declare const Dialog: {
     (options: DialogOptions): Promise<WechatMiniprogram.Component.TrivialInstance>;

package/lib/dialog/dialog.js

@@ -25,8 +25,6 @@ var defaultOptions = {
     zIndex: 100,
     overlay: true,
     selector: '#smart-dialog',
-    // className: '',
-    // asyncClose: false,
     beforeClose: null,
     transition: 'scale',
     customStyle: '',
@@ -39,6 +37,7 @@ var defaultOptions = {
     closeOnClickOverlay: false,
     confirmButtonOpenType: '',
     icon: false,
+    ignoreQueue: false,
     value: null,
     password: false,
     placeholder: '',
@@ -46,17 +45,18 @@ var defaultOptions = {
 };
 var currentOptions = __assign({}, defaultOptions);
 exports.contextRef = {
-    value: null,
+    value: {},
 };
 var Dialog = function (options) {
     options = __assign(__assign({}, currentOptions), options);
     return new Promise(function (resolve, reject) {
         var context = (typeof options.context === 'function' ? options.context() : options.context) ||
-            exports.contextRef.value ||
+            exports.contextRef.value[options.selector] ||
             (0, utils_1.getCurrentPage)();
         var selector = options.selector;
         var dialog = context.selectComponent(options.selector);
-        if (queueRef.value.length > 0 &&
+        if (!options.ignoreQueue &&
+            queueRef.value.length > 0 &&
             queueRef.value.find(function (item) { return dialog && item && item.id === dialog.id; })) {
             console.warn("\u76F8\u540C\u9009\u62E9\u5668\u7684 Dialog \u8C03\u7528\u8FC7\u4E8E\u9891\u7E41\uFF0C".concat(dialog.id, " \u5DF2\u5FFD\u7565\u91CD\u590D\u8C03\u7528"));
             return;

package/lib/dialog/index.js

@@ -98,7 +98,14 @@ var dialog_1 = require("./dialog");
         callback: (function () { }),
     },
     mounted: function () {
-        dialog_1.contextRef.value = (0, utils_1.getCurrentPage)();
+        if (!this.id)
+            return;
+        dialog_1.contextRef.value["#".concat(this.id)] = (0, utils_1.getCurrentPage)();
+    },
+    destroyed: function () {
+        if (!this.id)
+            return;
+        dialog_1.contextRef.value["#".concat(this.id)] = null;
     },
     methods: {
         onConfirm: function () {

package/lib/toast/index.js

@@ -1,5 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+/*
+ * @Author: mjh
+ * @Date: 2025-02-14 16:33:01
+ * @LastEditors: mjh
+ * @LastEditTime: 2025-02-18 10:12:49
+ * @Description:
+ */
 var icons_1 = require("./icons");
 var component_1 = require("../common/component");
 var toast_1 = require("./toast");
@@ -36,7 +43,14 @@ var utils_1 = require("../common/utils");
         warn: icons_1.Alarm,
     },
     mounted: function () {
-        toast_1.contextRef.value = (0, utils_1.getCurrentPage)();
+        if (!this.id)
+            return;
+        toast_1.contextRef.value["#".concat(this.id)] = (0, utils_1.getCurrentPage)();
+    },
+    destroyed: function () {
+        if (!this.id)
+            return;
+        toast_1.contextRef.value["#".concat(this.id)] = null;
     },
     methods: {
         // for prevent touchmove

package/lib/toast/toast.d.ts

@@ -12,13 +12,14 @@ interface ToastOptions {
     duration?: number;
     selector?: string;
     forbidClick?: boolean;
+    ignoreQueue?: boolean;
     loadingType?: string;
     message?: ToastMessage;
     onClose?: () => void;
     width?: number;
 }
 export declare const contextRef: {
-    value: ToastContext | null;
+    value: Record<string, ToastContext | null>;
 };
 declare function Toast(toastOptions: ToastOptions | ToastMessage): WechatMiniprogram.Component.TrivialInstance | undefined;
 declare namespace Toast {

package/lib/toast/toast.js

@@ -21,6 +21,7 @@ var defaultOptions = {
     show: true,
     zIndex: 1000,
     duration: 2000,
+    ignoreQueue: false,
     position: 'middle',
     forbidClick: false,
     loadingType: 'circular',
@@ -36,12 +37,12 @@ function parseOptions(message) {
     return (0, validator_1.isObj)(message) ? message : { message: message };
 }
 exports.contextRef = {
-    value: null,
+    value: {},
 };
 function Toast(toastOptions) {
     var options = __assign(__assign({}, currentOptions), parseOptions(toastOptions));
     var context = (typeof options.context === 'function' ? options.context() : options.context) ||
-        exports.contextRef.value ||
+        exports.contextRef.value[options.selector] ||
         (0, utils_1.getCurrentPage)();
     var toast = context.selectComponent(options.selector);
     if (!toast) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tuya-miniapp/smart-ui",
-  "version": "2.2.0",
+  "version": "2.2.1-beta-2",
   "author": "MiniApp Team",
   "license": "MIT",
   "miniprogram": "lib",