@liuzengwei/element-ui 2.15.5-xn.52 → 2.15.5-xn.54

package/lib/element-ui.common.js

@@ -113,19 +113,19 @@ module.exports = require("@liuzengwei/element-ui/lib/mixins/emitter");
 /* 4 */
 /***/ (function(module, exports) {
 
-module.exports = require("@liuzengwei/element-ui/lib/utils/vue-popper");
+module.exports = require("vue");
 
 /***/ }),
 /* 5 */
 /***/ (function(module, exports) {
 
-module.exports = require("@liuzengwei/element-ui/lib/mixins/locale");
+module.exports = require("@liuzengwei/element-ui/lib/utils/vue-popper");
 
 /***/ }),
 /* 6 */
 /***/ (function(module, exports) {
 
-module.exports = require("vue");
+module.exports = require("@liuzengwei/element-ui/lib/mixins/locale");
 
 /***/ }),
 /* 7 */
@@ -810,7 +810,7 @@ var input_ = __webpack_require__(8);
 var input_default = /*#__PURE__*/__webpack_require__.n(input_);
 
 // EXTERNAL MODULE: external "@liuzengwei/element-ui/lib/mixins/locale"
-var locale_ = __webpack_require__(5);
+var locale_ = __webpack_require__(6);
 var locale_default = /*#__PURE__*/__webpack_require__.n(locale_);
 
 // EXTERNAL MODULE: external "@liuzengwei/element-ui/lib/utils/util"
@@ -1850,7 +1850,7 @@ autocomplete_suggestionsvue_type_template_id_cd10dcf0_render._withStripped = tru
 // CONCATENATED MODULE: ./packages/autocomplete/src/autocomplete-suggestions.vue?vue&type=template&id=cd10dcf0&
 
 // EXTERNAL MODULE: external "@liuzengwei/element-ui/lib/utils/vue-popper"
-var vue_popper_ = __webpack_require__(4);
+var vue_popper_ = __webpack_require__(5);
 var vue_popper_default = /*#__PURE__*/__webpack_require__.n(vue_popper_);
 
 // EXTERNAL MODULE: external "@liuzengwei/element-ui/lib/scrollbar"
@@ -10428,7 +10428,7 @@ var mousewheel_mousewheel = function mousewheel(element, callback) {
   }
 });
 // EXTERNAL MODULE: external "vue"
-var external_vue_ = __webpack_require__(6);
+var external_vue_ = __webpack_require__(4);
 var external_vue_default = /*#__PURE__*/__webpack_require__.n(external_vue_);
 
 // CONCATENATED MODULE: ./packages/table/src/util.js
@@ -41940,6 +41940,7 @@ var mainvue_type_template_id_a4885264_render = function() {
           class: _vm.referenceMode
             ? "el-drawer__wrapper-reference"
             : "el-drawer__wrapper",
+          style: _vm.wrapperStyle,
           attrs: { tabindex: "-1" }
         },
         [
@@ -42044,6 +42045,203 @@ mainvue_type_template_id_a4885264_render._withStripped = true
 
 // CONCATENATED MODULE: ./packages/drawer/src/main.vue?vue&type=template&id=a4885264&
 
+// CONCATENATED MODULE: ./src/utils/popup/popup-manager.js
+
+
+
+var hasModal = false;
+var hasInitZIndex = false;
+var popup_manager_zIndex = void 0;
+
+var popup_manager_getModal = function getModal() {
+  if (external_vue_default.a.prototype.$isServer) return;
+  var modalDom = popup_manager_PopupManager.modalDom;
+  if (modalDom) {
+    hasModal = true;
+  } else {
+    hasModal = false;
+    modalDom = document.createElement('div');
+    popup_manager_PopupManager.modalDom = modalDom;
+
+    modalDom.addEventListener('touchmove', function (event) {
+      event.preventDefault();
+      event.stopPropagation();
+    });
+
+    modalDom.addEventListener('click', function () {
+      popup_manager_PopupManager.doOnModalClick && popup_manager_PopupManager.doOnModalClick();
+    });
+  }
+
+  return modalDom;
+};
+
+var popup_manager_instances = {};
+
+var popup_manager_PopupManager = {
+  modalFade: true,
+
+  getInstance: function getInstance(id) {
+    return popup_manager_instances[id];
+  },
+
+  register: function register(id, instance) {
+    if (id && instance) {
+      popup_manager_instances[id] = instance;
+    }
+  },
+
+  deregister: function deregister(id) {
+    if (id) {
+      popup_manager_instances[id] = null;
+      delete popup_manager_instances[id];
+    }
+  },
+
+  nextZIndex: function nextZIndex() {
+    return popup_manager_PopupManager.zIndex++;
+  },
+
+  modalStack: [],
+
+  doOnModalClick: function doOnModalClick() {
+    var topItem = popup_manager_PopupManager.modalStack[popup_manager_PopupManager.modalStack.length - 1];
+    if (!topItem) return;
+
+    var instance = popup_manager_PopupManager.getInstance(topItem.id);
+    if (instance && instance.closeOnClickModal) {
+      instance.close();
+    }
+  },
+
+  openModal: function openModal(id, zIndex, dom, modalClass, modalFade) {
+    if (external_vue_default.a.prototype.$isServer) return;
+    if (!id || zIndex === undefined) return;
+    this.modalFade = modalFade;
+
+    var modalStack = this.modalStack;
+
+    for (var i = 0, j = modalStack.length; i < j; i++) {
+      var item = modalStack[i];
+      if (item.id === id) {
+        return;
+      }
+    }
+
+    var modalDom = popup_manager_getModal();
+
+    Object(dom_["addClass"])(modalDom, 'v-modal');
+    if (this.modalFade && !hasModal) {
+      Object(dom_["addClass"])(modalDom, 'v-modal-enter');
+    }
+    if (modalClass) {
+      var classArr = modalClass.trim().split(/\s+/);
+      classArr.forEach(function (item) {
+        return Object(dom_["addClass"])(modalDom, item);
+      });
+    }
+    setTimeout(function () {
+      Object(dom_["removeClass"])(modalDom, 'v-modal-enter');
+    }, 200);
+
+    if (dom && dom.parentNode && dom.parentNode.nodeType !== 11) {
+      dom.parentNode.appendChild(modalDom);
+    } else {
+      document.body.appendChild(modalDom);
+    }
+
+    if (zIndex) {
+      modalDom.style.zIndex = zIndex;
+    }
+    modalDom.tabIndex = 0;
+    modalDom.style.display = '';
+
+    this.modalStack.push({ id: id, zIndex: zIndex, modalClass: modalClass });
+  },
+
+  closeModal: function closeModal(id) {
+    var modalStack = this.modalStack;
+    var modalDom = popup_manager_getModal();
+
+    if (modalStack.length > 0) {
+      var topItem = modalStack[modalStack.length - 1];
+      if (topItem.id === id) {
+        if (topItem.modalClass) {
+          var classArr = topItem.modalClass.trim().split(/\s+/);
+          classArr.forEach(function (item) {
+            return Object(dom_["removeClass"])(modalDom, item);
+          });
+        }
+
+        modalStack.pop();
+        if (modalStack.length > 0) {
+          modalDom.style.zIndex = modalStack[modalStack.length - 1].zIndex;
+        }
+      } else {
+        for (var i = modalStack.length - 1; i >= 0; i--) {
+          if (modalStack[i].id === id) {
+            modalStack.splice(i, 1);
+            break;
+          }
+        }
+      }
+    }
+
+    if (modalStack.length === 0) {
+      if (this.modalFade) {
+        Object(dom_["addClass"])(modalDom, 'v-modal-leave');
+      }
+      setTimeout(function () {
+        if (modalStack.length === 0) {
+          if (modalDom.parentNode) modalDom.parentNode.removeChild(modalDom);
+          modalDom.style.display = 'none';
+          popup_manager_PopupManager.modalDom = undefined;
+        }
+        Object(dom_["removeClass"])(modalDom, 'v-modal-leave');
+      }, 200);
+    }
+  }
+};
+
+Object.defineProperty(popup_manager_PopupManager, 'zIndex', {
+  configurable: true,
+  get: function get() {
+    if (!hasInitZIndex) {
+      popup_manager_zIndex = popup_manager_zIndex || (external_vue_default.a.prototype.$ELEMENT || {}).zIndex || 2000;
+      hasInitZIndex = true;
+    }
+    return popup_manager_zIndex;
+  },
+  set: function set(value) {
+    popup_manager_zIndex = value;
+  }
+});
+
+var popup_manager_getTopPopup = function getTopPopup() {
+  if (external_vue_default.a.prototype.$isServer) return;
+  if (popup_manager_PopupManager.modalStack.length > 0) {
+    var topPopup = popup_manager_PopupManager.modalStack[popup_manager_PopupManager.modalStack.length - 1];
+    if (!topPopup) return;
+    var instance = popup_manager_PopupManager.getInstance(topPopup.id);
+
+    return instance;
+  }
+};
+
+if (!external_vue_default.a.prototype.$isServer) {
+  // handle `esc` key when the popup is shown
+  window.addEventListener('keydown', function (event) {
+    if (event.keyCode === 27) {
+      var topPopup = popup_manager_getTopPopup();
+
+      if (topPopup && topPopup.closeOnPressEscape) {
+        topPopup.handleClose ? topPopup.handleClose() : topPopup.handleAction ? topPopup.handleAction('cancel') : topPopup.close();
+      }
+    }
+  });
+}
+
+/* harmony default export */ var popup_manager = (popup_manager_PopupManager);
 // CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./packages/drawer/src/main.vue?vue&type=script&lang=js&
 var mainvue_type_script_lang_js_extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; };
 
@@ -42095,6 +42293,9 @@ var mainvue_type_script_lang_js_extends = Object.assign || function (target) { f
 //
 //
 //
+//
+
+
 
 
 
@@ -42161,7 +42362,7 @@ var mainvue_type_script_lang_js_extends = Object.assign || function (target) { f
       default: true
     },
     reference: {
-      type: [String, Object],
+      type: [String, Object, typeof window !== 'undefined' ? window.HTMLElement : Object],
       default: null
     },
     placement: {
@@ -42199,6 +42400,13 @@ var mainvue_type_script_lang_js_extends = Object.assign || function (target) { f
       }
       return this.direction;
     },
+    wrapperStyle: function wrapperStyle() {
+      // 在 reference 模式下，将 z-index 设置在 wrapper 上，与全局模式保持一致
+      if (this.referenceMode && this.drawerZIndex) {
+        return { zIndex: this.drawerZIndex };
+      }
+      return null;
+    },
     drawerStyle: function drawerStyle() {
       if (this.referenceMode) {
         var style = mainvue_type_script_lang_js_extends({}, this.position);
@@ -42217,7 +42425,9 @@ var mainvue_type_script_lang_js_extends = Object.assign || function (target) { f
     return {
       closed: false,
       prevActiveElement: null,
-      position: {}
+      position: {},
+      drawerZIndex: null,
+      modalZIndex: null
     };
   },
 
@@ -42229,19 +42439,36 @@ var mainvue_type_script_lang_js_extends = Object.assign || function (target) { f
         this.closed = false;
         this.$emit('open');
         if (this.referenceMode) {
+          // z-index 已经通过 drawerStyle computed 属性设置
           var referenceEl = this.getReferenceElement();
           if (referenceEl) {
             referenceEl.appendChild(this.$el);
           }
-        } else if (this.appendToBody) {
-          document.body.appendChild(this.$el);
-        }
-        this.prevActiveElement = document.activeElement;
-        if (this.referenceMode) {
+          // 在 drawer 挂载后创建 modal
           this.$nextTick(function () {
+            // drawer 的 z-index 已经在 appendChild 前设置
+
+            // 创建/显示 modal（使用预分配的较低值）
+            if (_this.modal) {
+              _this.createReferenceModal({
+                modalClass: _this.modalClass,
+                modalFade: _this.modalFade
+              });
+            }
+
+            // 更新位置
             _this.updatePosition();
+
+            // 清理可能被 PopupManager 创建的全局 modal
+            // 延迟执行，确保全局 modal 已经被创建后再移除
+            setTimeout(function () {
+              _this.removeGlobalModal();
+            }, 300);
           });
+        } else if (this.appendToBody) {
+          document.body.appendChild(this.$el);
         }
+        this.prevActiveElement = document.activeElement;
       } else {
         if (!this.closed) {
           this.$emit('close');
@@ -42249,6 +42476,10 @@ var mainvue_type_script_lang_js_extends = Object.assign || function (target) { f
             this.rendered = false;
           }
         }
+        // 关闭 reference 模式的 modal
+        if (this.referenceMode) {
+          this.closeReferenceModal();
+        }
         this.$nextTick(function () {
           if (_this.prevActiveElement) {
             _this.prevActiveElement.focus();
@@ -42258,6 +42489,122 @@ var mainvue_type_script_lang_js_extends = Object.assign || function (target) { f
     }
   },
   methods: {
+    doOpen: function doOpen(props) {
+      // 在 reference 模式下，需要让遮罩层挂载到参考元素而不是 body
+      if (this.referenceMode) {
+        // 手动实现 doOpen 的逻辑，但将 modal 挂载到 reference 元素
+        if (this.$isServer) return;
+        if (this.willOpen && !this.willOpen()) return;
+        if (this.opened) return;
+
+        this._opening = true;
+
+        var dom = this.$el;
+        var zIndex = props.zIndex;
+
+        if (zIndex) {
+          popup_manager.zIndex = zIndex;
+        }
+
+        // modal 的创建已经移到 watch visible 中，在 drawer 挂载后执行
+        // 这里预先分配 z-index，确保 modal 和 drawer 的层级关系正确
+        // 每次打开都重新分配，避免复用时的 z-index 错乱
+        this.modalZIndex = popup_manager.nextZIndex();
+        this.drawerZIndex = popup_manager.nextZIndex();
+
+        if (Object(dom_["getStyle"])(dom, 'position') === 'static') {
+          dom.style.position = 'absolute';
+        }
+
+        // z-index 的设置已经移到 watch visible 中，在 modal 创建后设置
+        this.opened = true;
+
+        this.onOpen && this.onOpen();
+
+        this.doAfterOpen();
+      } else {
+        // 非 reference 模式，使用原始的 doOpen
+        this.$options.mixins[0].methods.doOpen.call(this, props);
+      }
+    },
+    createReferenceModal: function createReferenceModal(props) {
+      var _this2 = this;
+
+      // 创建并挂载 modal 到 reference 元素
+      var referenceEl = this.getReferenceElement();
+      if (!referenceEl) return;
+
+      // 创建或复用 modal DOM
+      var modalDom = this._referenceModalDom;
+      if (!modalDom) {
+        modalDom = document.createElement('div');
+        modalDom.className = 'v-modal';
+        modalDom.tabIndex = 0;
+
+        // 使用预先分配的 modal z-index，确保 drawer 已经有更高的 z-index
+        var modalZIndex = this.modalZIndex || popup_manager.nextZIndex();
+        modalDom.style.zIndex = modalZIndex;
+
+        // 关键：在 reference 模式下使用 absolute 定位，而不是 fixed
+        modalDom.style.position = 'absolute';
+        modalDom.style.left = '0';
+        modalDom.style.top = '0';
+        modalDom.style.width = '100%';
+        modalDom.style.height = '100%';
+
+        if (props.modalClass) {
+          var classArr = props.modalClass.trim().split(/\s+/);
+          classArr.forEach(function (cls) {
+            return modalDom.classList.add(cls);
+          });
+        }
+
+        // 添加淡入动画
+        if (props.modalFade) {
+          modalDom.classList.add('v-modal-enter');
+          setTimeout(function () {
+            modalDom.classList.remove('v-modal-enter');
+          }, 200);
+        }
+
+        // 直接挂载到 reference 元素内部
+        referenceEl.appendChild(modalDom);
+
+        // 点击 modal 时的处理
+        modalDom.addEventListener('click', function () {
+          if (_this2.closeOnClickModal) {
+            _this2.closeDrawer();
+          }
+        });
+
+        // 保存引用以便后续清理
+        this._referenceModalDom = modalDom;
+      } else {
+        // 复用 modal 时，使用预分配的 z-index
+        modalDom.style.display = '';
+        modalDom.style.zIndex = this.modalZIndex || popup_manager.nextZIndex();
+      }
+    },
+    closeReferenceModal: function closeReferenceModal() {
+      // 关闭 reference 模式的 modal
+      if (this._referenceModalDom) {
+        this._referenceModalDom.style.display = 'none';
+      }
+    },
+    removeGlobalModal: function removeGlobalModal() {
+      // 移除 PopupManager 可能创建的全局 modal（在 body 下的）
+      // 只在 reference 模式下调用此方法
+      if (this.referenceMode) {
+        // 查找并移除 body 下与此 drawer 关联的 modal
+        var globalModals = document.body.querySelectorAll('.v-modal');
+        globalModals.forEach(function (modal) {
+          // 移除 body 下的所有 modal（它们不应该存在）
+          if (modal.parentNode === document.body) {
+            document.body.removeChild(modal);
+          }
+        });
+      }
+    },
     afterEnter: function afterEnter() {
       this.$emit('opened');
     },
@@ -42361,6 +42708,16 @@ var mainvue_type_script_lang_js_extends = Object.assign || function (target) { f
       }
     }
   },
+  beforeMount: function beforeMount() {
+    // 在 reference 模式下，我们不使用 PopupManager 的 modal
+    // 设置一个内部标志来阻止 PopupManager 创建 modal
+    if (this.referenceMode) {
+      // 保存原始的 modal 属性
+      this._originalModal = this.modal;
+      // 临时将 modal 设为 false，这样 Popup mixin 的逻辑不会调用 PopupManager.openModal
+      // 注意：这个技巧可能不work，因为 modal 是 prop
+    }
+  },
   mounted: function mounted() {
     if (this.visible) {
       this.rendered = true;
@@ -42379,6 +42736,23 @@ var mainvue_type_script_lang_js_extends = Object.assign || function (target) { f
       window.addEventListener('resize', this.handleResize);
     }
   },
+  beforeDestroy: function beforeDestroy() {
+    // 在 reference 模式下，不使用 PopupManager 管理 modal
+    // 所以需要阻止 Popup mixin 的 beforeDestroy 调用 PopupManager.closeModal
+    if (!this.referenceMode) {
+      // 非 reference 模式，调用 mixin 的 beforeDestroy
+      if (this.$options.mixins && this.$options.mixins[0].beforeDestroy) {
+        this.$options.mixins[0].beforeDestroy.call(this);
+      }
+    } else {
+      // reference 模式，只执行必要的清理
+      if (this._popupId) {
+        popup_manager.deregister(this._popupId);
+        // 不调用 PopupManager.closeModal，因为我们用的是自定义 modal
+      }
+      this.restoreBodyStyle();
+    }
+  },
   destroyed: function destroyed() {
     // if appendToBody is true, remove DOM node after destroy
     if (this.appendToBody && this.$el && this.$el.parentNode) {
@@ -42387,6 +42761,11 @@ var mainvue_type_script_lang_js_extends = Object.assign || function (target) { f
     if (this.referenceMode && this.$el && this.$el.parentNode) {
       this.$el.parentNode.removeChild(this.$el);
     }
+    // 清理 reference modal
+    if (this.referenceMode && this._referenceModalDom && this._referenceModalDom.parentNode) {
+      this._referenceModalDom.parentNode.removeChild(this._referenceModalDom);
+      this._referenceModalDom = null;
+    }
     if (this.referenceMode) {
       window.removeEventListener('scroll', this.handleScroll, true);
       window.removeEventListener('resize', this.handleResize);
@@ -51952,7 +52331,7 @@ if (typeof window !== 'undefined' && window.Vue) {
 }
 
 /* harmony default export */ var src_0 = __webpack_exports__["default"] = ({
-  version: '2.15.5-xn.52',
+  version: '2.15.5-xn.54',
   locale: lib_locale_default.a.use,
   i18n: lib_locale_default.a.i18n,
   install: src_install,

package/lib/footer.js

@@ -82,7 +82,7 @@ module.exports =
 /******/
 /******/
 /******/ 	// Load entry module and return exports
-/******/ 	return __webpack_require__(__webpack_require__.s = 131);
+/******/ 	return __webpack_require__(__webpack_require__.s = 132);
 /******/ })
 /************************************************************************/
 /******/ ({
@@ -189,7 +189,7 @@ function normalizeComponent (
 
 /***/ }),
 
-/***/ 131:
+/***/ 132:
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";

package/lib/form.js

@@ -82,7 +82,7 @@ module.exports =
 /******/
 /******/
 /******/ 	// Load entry module and return exports
-/******/ 	return __webpack_require__(__webpack_require__.s = 111);
+/******/ 	return __webpack_require__(__webpack_require__.s = 112);
 /******/ })
 /************************************************************************/
 /******/ ({
@@ -189,7 +189,7 @@ function normalizeComponent (
 
 /***/ }),
 
-/***/ 111:
+/***/ 112:
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";

package/lib/header.js

@@ -82,7 +82,7 @@ module.exports =
 /******/
 /******/
 /******/ 	// Load entry module and return exports
-/******/ 	return __webpack_require__(__webpack_require__.s = 128);
+/******/ 	return __webpack_require__(__webpack_require__.s = 129);
 /******/ })
 /************************************************************************/
 /******/ ({
@@ -189,7 +189,7 @@ function normalizeComponent (
 
 /***/ }),
 
-/***/ 128:
+/***/ 129:
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";

package/lib/icon.js

@@ -82,7 +82,7 @@ module.exports =
 /******/
 /******/
 /******/ 	// Load entry module and return exports
-/******/ 	return __webpack_require__(__webpack_require__.s = 114);
+/******/ 	return __webpack_require__(__webpack_require__.s = 115);
 /******/ })
 /************************************************************************/
 /******/ ({
@@ -189,7 +189,7 @@ function normalizeComponent (
 
 /***/ }),
 
-/***/ 114:
+/***/ 115:
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";

package/lib/image.js

@@ -224,7 +224,7 @@ module.exports = require("@liuzengwei/element-ui/lib/utils/util");
 
 /***/ }),
 
-/***/ 6:
+/***/ 7:
 /***/ (function(module, exports) {
 
 module.exports = require("@liuzengwei/element-ui/lib/mixins/locale");
@@ -828,7 +828,7 @@ if (false) { var api; }
 component.options.__file = "packages/image/src/image-viewer.vue"
 /* harmony default export */ var image_viewer = (component.exports);
 // EXTERNAL MODULE: external "@liuzengwei/element-ui/lib/mixins/locale"
-var locale_ = __webpack_require__(6);
+var locale_ = __webpack_require__(7);
 var locale_default = /*#__PURE__*/__webpack_require__.n(locale_);
 
 // EXTERNAL MODULE: external "@liuzengwei/element-ui/lib/utils/types"