@truenewx/tnxvue3 3.4.0 → 3.4.1

package/src/bootstrap-vue/tnxbsv.css

@@ -1,107 +1,107 @@
-::placeholder {
-    color: var(--bs-tertiary-color) !important;
-}
-
-::-webkit-input-placeholder {
-    color: var(--bs-tertiary-color) !important;
-}
-
-::-moz-placeholder {
-    color: var(--bs-tertiary-color) !important;
-}
-
-.text-placeholder {
-    color: var(--bs-tertiary-color);
-}
-
-.btn-light {
-    border-color: var(--bs-border-color);
-}
-
-.link {
-    cursor: pointer;
-    color: var(--bs-link-color);
-}
-
-.form-inline {
-    display: flex;
-    flex-wrap: wrap;
-}
-
-.form-inline .b-form-group {
-    display: flex;
-    flex-wrap: nowrap;
-    height: fit-content;
-    margin-right: 1.5rem;
-    margin-bottom: 1rem;
-    width: fit-content;
-}
-
-.badge {
-    border: 1px solid transparent;
-}
-
-.badge.text-bg-light {
-    border-color: var(--bs-border-color);
-}
-
-.accordion-button,
-.accordion-body {
-    padding: 1rem;
-}
-
-.toast {
-    width: fit-content;
-    min-width: 5rem;
-    text-align: center;
-}
-
-.toast::before {
-    content: '';
-    position: absolute;
-    top: 0;
-    left: 0;
-    width: 100%;
-    height: 100%;
-    background-color: rgba(255, 255, 255, 0.3);
-}
-
-.form-check {
-    margin-top: 0.125rem;
-}
-
-.form-check > * {
-    cursor: pointer;
-}
-
-.tnxbsv-dialog-alert,
-.tnxbsv-dialog-success,
-.tnxbsv-dialog-error,
-.tnxbsv-dialog-confirm {
-    display: flex;
-}
-
-.tnxbsv-dialog-alert i,
-.tnxbsv-dialog-success i,
-.tnxbsv-dialog-error i,
-.tnxbsv-dialog-confirm i {
-    font-size: 1.5rem;
-    line-height: 1;
-    margin-right: 0.5rem;
-}
-
-.tnxbsv-dialog-alert i {
-    color: var(--bs-info);
-}
-
-.tnxbsv-dialog-success i {
-    color: var(--bs-success);
-}
-
-.tnxbsv-dialog-error i {
-    color: var(--bs-danger);
-}
-
-.tnxbsv-dialog-confirm i {
-    color: var(--bs-secondary-color);
-}
+::placeholder {
+    color: var(--bs-tertiary-color) !important;
+}
+
+::-webkit-input-placeholder {
+    color: var(--bs-tertiary-color) !important;
+}
+
+::-moz-placeholder {
+    color: var(--bs-tertiary-color) !important;
+}
+
+.text-placeholder {
+    color: var(--bs-tertiary-color);
+}
+
+.btn-light {
+    border-color: var(--bs-border-color);
+}
+
+.link {
+    cursor: pointer;
+    color: var(--bs-link-color);
+}
+
+.form-inline {
+    display: flex;
+    flex-wrap: wrap;
+}
+
+.form-inline .b-form-group {
+    display: flex;
+    flex-wrap: nowrap;
+    height: fit-content;
+    margin-right: 1.5rem;
+    margin-bottom: 1rem;
+    width: fit-content;
+}
+
+.badge {
+    border: 1px solid transparent;
+}
+
+.badge.text-bg-light {
+    border-color: var(--bs-border-color);
+}
+
+.accordion-button,
+.accordion-body {
+    padding: 1rem;
+}
+
+.toast {
+    width: fit-content;
+    min-width: 5rem;
+    text-align: center;
+}
+
+.toast::before {
+    content: '';
+    position: absolute;
+    top: 0;
+    left: 0;
+    width: 100%;
+    height: 100%;
+    background-color: rgba(255, 255, 255, 0.3);
+}
+
+.form-check {
+    margin-top: 0.125rem;
+}
+
+.form-check > * {
+    cursor: pointer;
+}
+
+.tnxbsv-dialog-alert,
+.tnxbsv-dialog-success,
+.tnxbsv-dialog-error,
+.tnxbsv-dialog-confirm {
+    display: flex;
+}
+
+.tnxbsv-dialog-alert i,
+.tnxbsv-dialog-success i,
+.tnxbsv-dialog-error i,
+.tnxbsv-dialog-confirm i {
+    font-size: 1.5rem;
+    line-height: 1;
+    margin-right: 0.5rem;
+}
+
+.tnxbsv-dialog-alert i {
+    color: var(--bs-info);
+}
+
+.tnxbsv-dialog-success i {
+    color: var(--bs-success);
+}
+
+.tnxbsv-dialog-error i {
+    color: var(--bs-danger);
+}
+
+.tnxbsv-dialog-confirm i {
+    color: var(--bs-secondary-color);
+}

package/src/bootstrap-vue/tnxbsv.js

@@ -83,116 +83,133 @@ export default build('tnxbsv', () => {
             window.tnx.dialogInstances.push(dialog);
             return dialog;
         },
-        closeDialog(all, callback) {
-            if (typeof all === 'function') {
-                callback = all;
-                all = false;
-            }
-            if (window.tnx.dialogInstances.length) {
-                let dialog = window.tnx.dialogInstances.pop();
-                while (dialog) {
-                    dialog.close(callback);
-                    if (all) {
-                        dialog = window.tnx.dialogInstances.pop();
-                    } else {
-                        break;
+        closeDialog(all) {
+            return new Promise((resolve) => {
+                if (window.tnx.dialogInstances.length) {
+                    let dialog = window.tnx.dialogInstances.pop();
+                    while (dialog) {
+                        const originalClose = dialog.close;
+                        if (originalClose) {
+                            dialog.close = function (cb) {
+                                originalClose.call(this, () => {
+                                    if (typeof cb === 'function') {
+                                        cb();
+                                    }
+                                    resolve();
+                                });
+                            };
+                            dialog.close();
+                        } else {
+                            resolve();
+                        }
+
+                        if (all) {
+                            dialog = window.tnx.dialogInstances.pop();
+                        } else {
+                            break;
+                        }
                     }
+                } else {
+                    resolve();
                 }
-            }
+            });
         },
         _closeMessage() {
             this.hideLoading();
             this.removeToast();
         },
-        alert(message, title, callback, options) {
-            if (typeof title === 'function') {
-                options = callback;
-                callback = title;
-                title = '提示';
-            }
-            let buttons = tnxvue.getDefaultDialogButtons('primary', callback);
-            message =
-                `<div class="tnxbsv-dialog-alert"><i class="bi bi-exclamation-circle-fill"></i><div>${message}</div></div>`;
-            return this.dialog(message, title, buttons, options);
+        alert(message, title, options) {
+            return new Promise(resolve => {
+                let buttons = tnxvue.getDefaultDialogButtons('primary', close => {
+                    return resolve(close);
+                });
+                message =
+                    `<div class="tnxbsv-dialog-alert"><i class="bi bi-exclamation-circle-fill"></i><div>${message}</div></div>`;
+                this.dialog(message, title, buttons, options);
+            });
         },
-        success(message, callback, options) {
-            let buttons = tnxvue.getDefaultDialogButtons('primary', callback);
-            message =
-                `<div class="tnxbsv-dialog-success"><i class="bi bi-check-circle-fill"></i><div>${message}</div></div>`;
-            return this.dialog(message, '成功', buttons, options);
+        success(message, options) {
+            return new Promise(resolve => {
+                let buttons = tnxvue.getDefaultDialogButtons('primary', close => {
+                    return resolve(close);
+                });
+                message =
+                    `<div class="tnxbsv-dialog-success"><i class="bi bi-check-circle-fill"></i><div>${message}</div></div>`;
+                this.dialog(message, '成功', buttons, options);
+            });
         },
-        error(message, callback, options) {
-            let buttons = tnxvue.getDefaultDialogButtons('primary', callback);
-            message =
-                `<div class="tnxbsv-dialog-error"><i class="bi bi-x-circle-fill"></i><div>${message}</div></div>`;
-            return this.dialog(message, '错误', buttons, options);
+        error(message, options) {
+            return new Promise(resolve => {
+                let buttons = tnxvue.getDefaultDialogButtons('primary', close => {
+                    return resolve(close);
+                });
+                message =
+                    `<div class="tnxbsv-dialog-error"><i class="bi bi-x-circle-fill"></i><div>${message}</div></div>`;
+                this.dialog(message, '错误', buttons, options);
+            });
         },
-        confirm(message, title, callback, options) {
-            if (typeof title === 'function') {
-                options = callback;
-                callback = title;
-                title = '确认';
-            }
-            let buttons = tnxvue.getDefaultDialogButtons('confirm', callback);
-            message =
-                `<div class="tnxbsv-dialog-confirm"><i class="bi bi-question-circle-fill"></i><div>${message}</div></div>`;
-            return this.dialog(message, title, buttons, options);
+        confirm(message, title = '确认', options) {
+            return new Promise(resolve => {
+                let buttons = tnxvue.getDefaultDialogButtons('confirm', yes => {
+                    return resolve(yes);
+                });
+                message =
+                    `<div class="tnxbsv-dialog-confirm"><i class="bi bi-question-circle-fill"></i><div>${message}</div></div>`;
+                this.dialog(message, title, buttons, options);
+            });
         },
-        toast(message, timeout, callback, options = {}) {
-            if (typeof timeout === 'function') {
-                options = callback || {};
-                callback = timeout;
-                timeout = undefined;
-            }
-
+        toast(message, timeout, options = {}) {
             this._closeMessage();
 
             const div = document.createElement('div');
             document.body.appendChild(div);
 
-            const Vue = window.tnx.libs.Vue;
-            const ToastComponent = {
-                components: {
-                    BToast: BootstrapVue.BToast
-                },
-                setup() {
-                    const visible = Vue.ref(true);
-                    Vue.onMounted(() => {
-                        setTimeout(() => {
-                            visible.value = false;
-                            // 延迟移除组件，确保动画效果完成
+            return new Promise(resolve => {
+                const Vue = window.tnx.libs.Vue;
+                const ToastComponent = {
+                    components: {
+                        BToast: BootstrapVue.BToast
+                    },
+                    setup() {
+                        const visible = Vue.ref(true);
+                        Vue.onMounted(() => {
                             setTimeout(() => {
-                                window.tnx.toastInstance?.unmount();
-                                try {
-                                    document.body.removeChild(div);
-                                } catch (e) {
-                                    // 忽略异常
-                                }
-                            }, 500);
-                        }, timeout || 1500);
-                    });
-                    return {visible};
-                },
-                render() {
-                    return Vue.h(BootstrapVue.BToast, {
-                        modelValue: this.visible,
-                        variant: options.type || 'success',
-                        static: true,
-                        noCloseButton: true,
-                        class: 'position-fixed',
-                        style: {
-                            top: '50%',
-                            left: '50%',
-                            transform: 'translate(-50%, -50%)',
-                            zIndex: window.tnx.util.dom.minTopZIndex(),
-                        }
-                    }, () => message);
-                }
-            };
+                                visible.value = false;
+                                // 延迟移除组件，确保动画效果完成
+                                setTimeout(() => {
+                                    window.tnx.toastInstance?.unmount();
+                                    try {
+                                        document.body.removeChild(div);
+                                    } catch (e) {
+                                        // 忽略异常
+                                    }
+                                    resolve();
+                                }, 500);
+                            }, timeout || 1500);
+                        });
+                        return {visible};
+                    },
+                    render() {
+                        return Vue.h(BootstrapVue.BToast, {
+                            modelValue: this.visible,
+                            variant: options.type || 'success',
+                            static: true,
+                            noCloseButton: true,
+                            class: 'position-fixed',
+                            style: {
+                                top: '50%',
+                                left: '50%',
+                                transform: 'translate(-50%, -50%)',
+                                zIndex: window.tnx.util.dom.minTopZIndex(),
+                            }
+                        }, () => message);
+                    }
+                };
 
-            const instance = window.tnx.createVueInstance(ToastComponent);
-            instance.mount(div);
-            window.tnx.toastInstance = instance;
+                const instance = window.tnx.createVueInstance(ToastComponent);
+                instance.mount(div);
+                window.tnx.toastInstance = instance;
+            });
         },
         removeToast() {
             if (window.tnx.toastInstance) {