@liuzengwei/element-ui 2.15.5-xn.63 → 2.15.5-xn.65

package/CHANGELOG.en-US.md

@@ -1,4 +1,11 @@
 ## Changelog
+### 2.15.5-xn.64
+
+*2026-02-09*
+
+#### Optimization
+- message-box: 支持异步确认操作及错误提示功能
+
 ### 2.15.5-xn.61
 
 *2026-01-27*

package/CHANGELOG.zh-CN.md

@@ -1,4 +1,11 @@
 ## 更新日志
+### 2.15.5-xn.64
+
+*2026-02-09*
+
+#### 优化
+- message-box: 支持异步确认操作及错误提示功能
+
 ### 2.15.5-xn.61
 
 *2026-01-27*

package/lib/cascader.js

@@ -506,6 +506,14 @@ var render = function() {
                     ],
                     2
                   )
+                : _vm._e(),
+              _vm.$slots.footer
+                ? _c(
+                    "div",
+                    { staticClass: "el-cascader__footer" },
+                    [_vm._t("footer")],
+                    2
+                  )
                 : _vm._e()
             ],
             1
@@ -695,6 +703,9 @@ var debounce_default = /*#__PURE__*/__webpack_require__.n(debounce_);
 //
 //
 //
+//
+//
+//
 
 
 

package/lib/element-ui.common.js

@@ -22776,89 +22776,109 @@ var mainvue_type_template_id_6b29b012_render = function() {
                     : _vm._e()
                 ])
               : _vm._e(),
-            _c("div", { staticClass: "el-message-box__content" }, [
-              _c("div", { staticClass: "el-message-box__container" }, [
-                _vm.icon && !_vm.center && _vm.message !== ""
-                  ? _c("div", { class: ["el-message-box__status", _vm.icon] })
-                  : _vm._e(),
-                _vm.message !== ""
-                  ? _c(
-                      "div",
-                      { staticClass: "el-message-box__message" },
-                      [
-                        _vm._t("default", [
-                          !_vm.dangerouslyUseHTMLString
-                            ? _c("p", [_vm._v(_vm._s(_vm.message))])
-                            : _c("p", {
-                                domProps: { innerHTML: _vm._s(_vm.message) }
-                              })
-                        ])
-                      ],
-                      2
-                    )
-                  : _vm._e()
-              ]),
-              _c(
-                "div",
-                {
-                  directives: [
-                    {
-                      name: "show",
-                      rawName: "v-show",
-                      value: _vm.showInput,
-                      expression: "showInput"
-                    }
-                  ],
-                  staticClass: "el-message-box__input"
-                },
-                [
-                  _c("el-input", {
-                    ref: "input",
-                    attrs: {
-                      type: _vm.inputType,
-                      placeholder: _vm.inputPlaceholder
-                    },
-                    nativeOn: {
-                      keydown: function($event) {
-                        if (
-                          !("button" in $event) &&
-                          _vm._k(
-                            $event.keyCode,
-                            "enter",
-                            13,
-                            $event.key,
-                            "Enter"
-                          )
-                        ) {
-                          return null
-                        }
-                        return _vm.handleInputEnter($event)
+            _c(
+              "div",
+              { staticClass: "el-message-box__content" },
+              [
+                _c("div", { staticClass: "el-message-box__container" }, [
+                  _vm.icon && !_vm.center && _vm.message !== ""
+                    ? _c("div", { class: ["el-message-box__status", _vm.icon] })
+                    : _vm._e(),
+                  _vm.message !== ""
+                    ? _c(
+                        "div",
+                        { staticClass: "el-message-box__message" },
+                        [
+                          _vm._t("default", [
+                            !_vm.dangerouslyUseHTMLString
+                              ? _c("p", [_vm._v(_vm._s(_vm.message))])
+                              : _c("p", {
+                                  domProps: { innerHTML: _vm._s(_vm.message) }
+                                })
+                          ])
+                        ],
+                        2
+                      )
+                    : _vm._e()
+                ]),
+                _c(
+                  "div",
+                  {
+                    directives: [
+                      {
+                        name: "show",
+                        rawName: "v-show",
+                        value: _vm.showInput,
+                        expression: "showInput"
                       }
-                    },
-                    model: {
-                      value: _vm.inputValue,
-                      callback: function($$v) {
-                        _vm.inputValue = $$v
+                    ],
+                    staticClass: "el-message-box__input"
+                  },
+                  [
+                    _c("el-input", {
+                      ref: "input",
+                      attrs: {
+                        type: _vm.inputType,
+                        placeholder: _vm.inputPlaceholder
                       },
-                      expression: "inputValue"
-                    }
-                  }),
-                  _c(
-                    "div",
-                    {
-                      staticClass: "el-message-box__errormsg",
-                      style: {
-                        visibility: !!_vm.editorErrorMessage
-                          ? "visible"
-                          : "hidden"
+                      nativeOn: {
+                        keydown: function($event) {
+                          if (
+                            !("button" in $event) &&
+                            _vm._k(
+                              $event.keyCode,
+                              "enter",
+                              13,
+                              $event.key,
+                              "Enter"
+                            )
+                          ) {
+                            return null
+                          }
+                          return _vm.handleInputEnter($event)
+                        }
+                      },
+                      model: {
+                        value: _vm.inputValue,
+                        callback: function($$v) {
+                          _vm.inputValue = $$v
+                        },
+                        expression: "inputValue"
                       }
-                    },
-                    [_vm._v(_vm._s(_vm.editorErrorMessage))]
-                  )
-                ],
-                1
-              )
-            ]),
+                    }),
+                    _c(
+                      "div",
+                      {
+                        staticClass: "el-message-box__errormsg",
+                        style: {
+                          visibility: !!_vm.editorErrorMessage
+                            ? "visible"
+                            : "hidden"
+                        }
+                      },
+                      [_vm._v(_vm._s(_vm.editorErrorMessage))]
+                    )
+                  ],
+                  1
+                ),
+                _c("transition", { attrs: { name: "el-message-fade" } }, [
+                  _vm.showErrorTip
+                    ? _c(
+                        "div",
+                        {
+                          staticClass: "el-message-box__error-tip",
+                          attrs: { role: "alert" }
+                        },
+                        [
+                          _c("i", { staticClass: "el-icon-warning" }),
+                          _c("span", [_vm._v(_vm._s(_vm.errorMessage))])
+                        ]
+                      )
+                    : _vm._e()
+                ])
+              ],
+              1
+            ),
             _c(
               "div",
               { staticClass: "el-message-box__btns" },
@@ -22923,6 +22943,7 @@ var mainvue_type_template_id_6b29b012_render = function() {
                     class: [_vm.confirmButtonClasses],
                     attrs: {
                       loading: _vm.confirmButtonLoading,
+                      disabled: _vm.confirmButtonLoading,
                       round: _vm.roundButton,
                       size: "small"
                     },
@@ -22953,7 +22974,9 @@ var mainvue_type_template_id_6b29b012_render = function() {
                     _vm._v(
                       "\n          " +
                         _vm._s(
-                          _vm.confirmButtonText ||
+                          (_vm.confirmButtonLoading &&
+                            _vm.confirmButtonLoadingText) ||
+                            _vm.confirmButtonText ||
                             _vm.t("el.messagebox.confirm")
                         ) +
                         "\n        "
@@ -23064,6 +23087,16 @@ var aria_dialog_default = /*#__PURE__*/__webpack_require__.n(aria_dialog_);
 //
 //
 //
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
 
 
 
@@ -23174,9 +23207,28 @@ var typeMap = {
       }
     },
     handleAction: function handleAction(action) {
+      var _this3 = this;
+
       if (this.$type === 'prompt' && action === 'confirm' && !this.validate()) {
         return;
       }
+
+      // 新增: 执行 beforeConfirm
+      if (action === 'confirm' && typeof this.beforeConfirm === 'function') {
+        this.executeBeforeConfirm().then(function (canContinue) {
+          if (canContinue === false) {
+            return; // 阻止关闭
+          }
+          _this3.proceedWithAction(action);
+        }).catch(function (error) {
+          _this3.handleConfirmError(error);
+        });
+        return;
+      }
+
+      this.proceedWithAction(action);
+    },
+    proceedWithAction: function proceedWithAction(action) {
       this.action = action;
       if (typeof this.beforeClose === 'function') {
         this.close = this.getSafeClose();
@@ -23223,6 +23275,78 @@ var typeMap = {
     },
     handleClose: function handleClose() {
       this.handleAction('close');
+    },
+
+
+    // 新增: 显示错误提示
+    showError: function showError(message) {
+      var _this4 = this;
+
+      this.errorMessage = message;
+      this.showErrorTip = true;
+      if (this.errorMessageDuration) {
+        setTimeout(function () {
+          _this4.clearError();
+        }, this.errorMessageDuration);
+      }
+    },
+
+
+    // 新增: 清除错误提示
+    clearError: function clearError() {
+      this.showErrorTip = false;
+      this.errorMessage = '';
+    },
+
+
+    // 新增: 手动设置确认按钮 loading
+    setConfirmLoading: function setConfirmLoading(loading, text) {
+      this.confirmButtonLoading = loading;
+      if (text !== undefined) {
+        this.confirmButtonText = text;
+      }
+    },
+
+
+    // 新增: 执行 beforeConfirm
+    executeBeforeConfirm: function executeBeforeConfirm() {
+      var _this5 = this;
+
+      this.clearError();
+      this.originalConfirmButtonText = this.confirmButtonText;
+
+      // 开启 loading
+      this.confirmButtonLoading = true;
+      if (this.confirmButtonLoadingText) {
+        this.confirmButtonText = this.confirmButtonLoadingText;
+      }
+
+      return Promise.resolve(this.beforeConfirm(this)).then(function (result) {
+        // 恢复状态
+        _this5.confirmButtonLoading = false;
+        _this5.confirmButtonText = _this5.originalConfirmButtonText;
+        return result;
+      }).catch(function (error) {
+        // 恢复状态
+        _this5.confirmButtonLoading = false;
+        _this5.confirmButtonText = _this5.originalConfirmButtonText;
+        throw error;
+      });
+    },
+
+
+    // 新增: 处理确认错误
+    handleConfirmError: function handleConfirmError(error) {
+      if (this.keepOpenOnError !== false) {
+        // 保持弹框打开
+        if (this.showErrorMessage !== false && error && error.message) {
+          this.showError(error.message);
+        }
+      } else {
+        // 关闭弹框并 reject
+        this.action = 'error';
+        this.doClose();
+      }
     }
   },
 
@@ -23230,24 +23354,24 @@ var typeMap = {
     inputValue: {
       immediate: true,
       handler: function handler(val) {
-        var _this3 = this;
+        var _this6 = this;
 
         this.$nextTick(function (_) {
-          if (_this3.$type === 'prompt' && val !== null) {
-            _this3.validate();
+          if (_this6.$type === 'prompt' && val !== null) {
+            _this6.validate();
           }
         });
       }
     },
 
     visible: function visible(val) {
-      var _this4 = this;
+      var _this7 = this;
 
       if (val) {
         this.uid++;
         if (this.$type === 'alert' || this.$type === 'confirm') {
           this.$nextTick(function () {
-            _this4.$refs.confirm.$el.focus();
+            _this7.$refs.confirm.$el.focus();
           });
         }
         this.focusAfterClosed = document.activeElement;
@@ -23258,8 +23382,8 @@ var typeMap = {
       if (this.$type !== 'prompt') return;
       if (val) {
         setTimeout(function () {
-          if (_this4.$refs.input && _this4.$refs.input.$el) {
-            _this4.getInputElement().focus();
+          if (_this7.$refs.input && _this7.$refs.input.$el) {
+            _this7.getInputElement().focus();
           }
         }, 500);
       } else {
@@ -23270,11 +23394,11 @@ var typeMap = {
   },
 
   mounted: function mounted() {
-    var _this5 = this;
+    var _this8 = this;
 
     this.$nextTick(function () {
-      if (_this5.closeOnHashChange) {
-        window.addEventListener('hashchange', _this5.close);
+      if (_this8.closeOnHashChange) {
+        window.addEventListener('hashchange', _this8.close);
       }
     });
   },
@@ -23316,7 +23440,16 @@ var typeMap = {
       dangerouslyUseHTMLString: false,
       focusAfterClosed: null,
       isOnComposition: false,
-      distinguishCancelAndClose: false
+      distinguishCancelAndClose: false,
+      // 新增: 异步确认相关字段
+      confirmButtonLoadingText: '',
+      originalConfirmButtonText: '',
+      errorMessage: '',
+      showErrorTip: false,
+      beforeConfirm: null,
+      keepOpenOnError: true,
+      showErrorMessage: false,
+      errorMessageDuration: 3000
     };
   }
 });
@@ -23383,7 +23516,13 @@ var main_defaults = {
   dangerouslyUseHTMLString: false,
   center: false,
   roundButton: false,
-  distinguishCancelAndClose: false
+  distinguishCancelAndClose: false,
+  // 新增: 异步确认配置
+  beforeConfirm: null,
+  confirmButtonLoadingText: '',
+  keepOpenOnError: true,
+  showErrorMessage: true,
+  errorMessageDuration: 3000
 };
 
 
@@ -34469,6 +34608,14 @@ var cascadervue_type_template_id_032537a6_render = function() {
                     ],
                     2
                   )
+                : _vm._e(),
+              _vm.$slots.footer
+                ? _c(
+                    "div",
+                    { staticClass: "el-cascader__footer" },
+                    [_vm._t("footer")],
+                    2
+                  )
                 : _vm._e()
             ],
             1
@@ -34607,6 +34754,9 @@ var aria_utils_default = /*#__PURE__*/__webpack_require__.n(aria_utils_);
 //
 //
 //
+//
+//
+//
 
 
 
@@ -53161,7 +53311,7 @@ if (typeof window !== 'undefined' && window.Vue) {
 }
 
 /* harmony default export */ var src_0 = __webpack_exports__["default"] = ({
-  version: '2.15.5-xn.63',
+  version: '2.15.5-xn.65',
   locale: lib_locale_default.a.use,
   i18n: lib_locale_default.a.i18n,
   install: src_install,