@tuya-miniapp/smart-ui 2.1.11-beta-6 → 2.1.11-beta-8

package/dist/dialog/dialog.js

@@ -1,5 +1,7 @@
 import { getCurrentPage } from '../common/utils';
-let queue = [];
+const queueRef = {
+    value: [],
+};
 const defaultOptions = {
     show: false,
     title: '',
@@ -35,13 +37,13 @@ export const contextRef = {
 const Dialog = (options) => {
     options = Object.assign(Object.assign({}, currentOptions), options);
     return new Promise((resolve, reject) => {
-        var _a;
         const context = (typeof options.context === 'function' ? options.context() : options.context) ||
             contextRef.value ||
             getCurrentPage();
         const selector = options.selector;
         const dialog = context.selectComponent(options.selector);
-        if ((queue === null || queue === void 0 ? void 0 : queue.length) > 0 && ((_a = queue === null || queue === void 0 ? void 0 : queue[0]) === null || _a === void 0 ? void 0 : _a.id) === (dialog === null || dialog === void 0 ? void 0 : dialog.id)) {
+        if (queueRef.value.length > 0 &&
+            queueRef.value.find(item => dialog && item && item.id === dialog.id)) {
             console.warn(`相同选择器的 Dialog 调用过于频繁，${dialog.id} 已忽略重复调用`);
             return;
         }
@@ -56,13 +58,13 @@ const Dialog = (options) => {
                     /**
                      * 在声明式调用的情况下，在 close 后需要手动清空队列
                      */
-                    queue = [];
+                    queueRef.value = queueRef.value.filter(item => item.id !== dialog.id);
                     action === 'confirm' ? resolve(instance) : reject(instance);
                 } }, optionsWithInputValue));
             wx.nextTick(() => {
                 dialog.setData({ show: true });
             });
-            queue.push(dialog);
+            queueRef.value.push(dialog);
         }
         else {
             console.warn(`未找到 ${(selector !== null && selector !== void 0 ? selector : '#smart-dialog').replace('#', '')} 节点，请确认 selector 及 context 是否正确`);
@@ -73,13 +75,13 @@ Dialog.alert = (options) => Dialog(options);
 Dialog.confirm = (options) => Dialog(Object.assign({ showCancelButton: true }, options));
 Dialog.input = ((options) => Dialog(Object.assign({ showCancelButton: true }, options)));
 Dialog.close = () => {
-    queue.forEach(dialog => {
+    queueRef.value.forEach(dialog => {
         dialog.close();
     });
-    queue = [];
+    queueRef.value = [];
 };
 Dialog.stopLoading = () => {
-    queue.forEach(dialog => {
+    queueRef.value.forEach(dialog => {
         dialog.stopLoading();
     });
 };

package/dist/dialog/index.js

@@ -89,6 +89,7 @@ SmartComponent({
             confirm: false,
             cancel: false,
         },
+        actionType: '',
         callback: (() => { }),
     },
     mounted: function () {
@@ -110,12 +111,14 @@ SmartComponent({
         },
         close(action) {
             this.setData({ show: false });
+            this.setData({ actionType: action });
             wx.nextTick(() => {
                 this.$emit('close', action);
-                const { callback } = this.data;
-                if (callback) {
-                    callback(action, this);
-                }
+                // const { callback } = this.data;
+                // console.log(callback, 'close');
+                // if (callback) {
+                //   callback(action, this);
+                // }
             });
         },
         stopLoading() {
@@ -151,5 +154,27 @@ SmartComponent({
                 });
             }
         },
+        onBeforeEnter() {
+            this.$emit('before-enter');
+        },
+        onEnter() {
+            this.$emit('enter');
+        },
+        onAfterEnter() {
+            this.$emit('after-enter');
+        },
+        onBeforeLeave() {
+            this.$emit('before-leave');
+        },
+        onLeave() {
+            this.$emit('leave');
+        },
+        onAfterLeave() {
+            this.$emit('after-leave');
+            const { callback, actionType } = this.data;
+            if (callback) {
+                callback(actionType, this);
+            }
+        },
     },
 });

package/dist/dialog/index.wxml

@@ -11,6 +11,12 @@
   close-on-click-overlay="{{ closeOnClickOverlay }}"
   root-portal="{{ rootPortal }}"
   bind:close="onClickOverlay"
+  bind:before-enter="onBeforeEnter"
+  bind:enter="onEnter"
+  bind:after-enter="onAfterEnter"
+  bind:before-leave="onBeforeLeave"
+  bind:leave="onLeave"
+  bind:after-leave="onAfterLeave"
 >
   <view
     wx:if="{{ title || useTitleSlot }}"

package/dist/mixins/transition.js

@@ -77,11 +77,16 @@ export function transition(showDefaultValue) {
                         });
                     });
                 });
+                this.enterFinishedPromise.catch(err => {
+                    this.enterFinishedPromise = null;
+                    console.log(err, '---error');
+                });
             },
             leave() {
                 if (!this.enterFinishedPromise)
                     return;
-                this.enterFinishedPromise.then(() => {
+                this.enterFinishedPromise
+                    .then(() => {
                     if (!this.data.display) {
                         return;
                     }
@@ -105,12 +110,16 @@ export function transition(showDefaultValue) {
                             }
                             this.transitionEnded = false;
                             setTimeout(() => {
-                                this.onTransitionEnd();
                                 this.enterFinishedPromise = null;
+                                this.onTransitionEnd();
                             }, currentDuration);
                             this.setData({ classes: classNames['leave-to'] });
                         });
                     });
+                })
+                    .catch(err => {
+                    this.enterFinishedPromise = null;
+                    console.log(err, '---error');
                 });
             },
             onTransitionEnd() {

package/lib/dialog/dialog.js

@@ -13,7 +13,9 @@ var __assign = (this && this.__assign) || function () {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.contextRef = void 0;
 var utils_1 = require("../common/utils");
-var queue = [];
+var queueRef = {
+    value: [],
+};
 var defaultOptions = {
     show: false,
     title: '',
@@ -49,13 +51,13 @@ exports.contextRef = {
 var Dialog = function (options) {
     options = __assign(__assign({}, currentOptions), options);
     return new Promise(function (resolve, reject) {
-        var _a;
         var context = (typeof options.context === 'function' ? options.context() : options.context) ||
             exports.contextRef.value ||
             (0, utils_1.getCurrentPage)();
         var selector = options.selector;
         var dialog = context.selectComponent(options.selector);
-        if ((queue === null || queue === void 0 ? void 0 : queue.length) > 0 && ((_a = queue === null || queue === void 0 ? void 0 : queue[0]) === null || _a === void 0 ? void 0 : _a.id) === (dialog === null || dialog === void 0 ? void 0 : dialog.id)) {
+        if (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;
         }
@@ -70,13 +72,13 @@ var Dialog = function (options) {
                     /**
                      * 在声明式调用的情况下，在 close 后需要手动清空队列
                      */
-                    queue = [];
+                    queueRef.value = queueRef.value.filter(function (item) { return item.id !== dialog.id; });
                     action === 'confirm' ? resolve(instance) : reject(instance);
                 } }, optionsWithInputValue));
             wx.nextTick(function () {
                 dialog.setData({ show: true });
             });
-            queue.push(dialog);
+            queueRef.value.push(dialog);
         }
         else {
             console.warn("\u672A\u627E\u5230 ".concat((selector !== null && selector !== void 0 ? selector : '#smart-dialog').replace('#', ''), " \u8282\u70B9\uFF0C\u8BF7\u786E\u8BA4 selector \u53CA context \u662F\u5426\u6B63\u786E"));
@@ -91,13 +93,13 @@ Dialog.input = (function (options) {
     return Dialog(__assign({ showCancelButton: true }, options));
 });
 Dialog.close = function () {
-    queue.forEach(function (dialog) {
+    queueRef.value.forEach(function (dialog) {
         dialog.close();
     });
-    queue = [];
+    queueRef.value = [];
 };
 Dialog.stopLoading = function () {
-    queue.forEach(function (dialog) {
+    queueRef.value.forEach(function (dialog) {
         dialog.stopLoading();
     });
 };

package/lib/dialog/index.js

@@ -94,6 +94,7 @@ var dialog_1 = require("./dialog");
             confirm: false,
             cancel: false,
         },
+        actionType: '',
         callback: (function () { }),
     },
     mounted: function () {
@@ -116,12 +117,14 @@ var dialog_1 = require("./dialog");
         close: function (action) {
             var _this = this;
             this.setData({ show: false });
+            this.setData({ actionType: action });
             wx.nextTick(function () {
                 _this.$emit('close', action);
-                var callback = _this.data.callback;
-                if (callback) {
-                    callback(action, _this);
-                }
+                // const { callback } = this.data;
+                // console.log(callback, 'close');
+                // if (callback) {
+                //   callback(action, this);
+                // }
             });
         },
         stopLoading: function () {
@@ -159,5 +162,27 @@ var dialog_1 = require("./dialog");
                 });
             }
         },
+        onBeforeEnter: function () {
+            this.$emit('before-enter');
+        },
+        onEnter: function () {
+            this.$emit('enter');
+        },
+        onAfterEnter: function () {
+            this.$emit('after-enter');
+        },
+        onBeforeLeave: function () {
+            this.$emit('before-leave');
+        },
+        onLeave: function () {
+            this.$emit('leave');
+        },
+        onAfterLeave: function () {
+            this.$emit('after-leave');
+            var _a = this.data, callback = _a.callback, actionType = _a.actionType;
+            if (callback) {
+                callback(actionType, this);
+            }
+        },
     },
 });

package/lib/dialog/index.wxml

@@ -11,6 +11,12 @@
   close-on-click-overlay="{{ closeOnClickOverlay }}"
   root-portal="{{ rootPortal }}"
   bind:close="onClickOverlay"
+  bind:before-enter="onBeforeEnter"
+  bind:enter="onEnter"
+  bind:after-enter="onAfterEnter"
+  bind:before-leave="onBeforeLeave"
+  bind:leave="onLeave"
+  bind:after-leave="onAfterLeave"
 >
   <view
     wx:if="{{ title || useTitleSlot }}"

package/lib/mixins/transition.js

@@ -81,12 +81,17 @@ function transition(showDefaultValue) {
                         });
                     });
                 });
+                this.enterFinishedPromise.catch(function (err) {
+                    _this.enterFinishedPromise = null;
+                    console.log(err, '---error');
+                });
             },
             leave: function () {
                 var _this = this;
                 if (!this.enterFinishedPromise)
                     return;
-                this.enterFinishedPromise.then(function () {
+                this.enterFinishedPromise
+                    .then(function () {
                     if (!_this.data.display) {
                         return;
                     }
@@ -110,12 +115,16 @@ function transition(showDefaultValue) {
                             }
                             _this.transitionEnded = false;
                             setTimeout(function () {
-                                _this.onTransitionEnd();
                                 _this.enterFinishedPromise = null;
+                                _this.onTransitionEnd();
                             }, currentDuration);
                             _this.setData({ classes: classNames['leave-to'] });
                         });
                     });
+                })
+                    .catch(function (err) {
+                    _this.enterFinishedPromise = null;
+                    console.log(err, '---error');
                 });
             },
             onTransitionEnd: function () {

package/package.json

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