@ganwei-web/gw-base-components-plus 1.0.61 → 1.0.63

package/element-plus-adapter/dist/ElementPlusAdapter.css

@@ -1136,13 +1136,13 @@
 }
 .el-alert .el-alert__close-btn:hover {
   color: var(--frame-main-color);
-}.gw-overlay-mask[data-v-cf048b89] {
+}.gw-overlay-mask[data-v-b335d597] {
   pointer-events: none;
   opacity: 0;
   transition: opacity 0.2s linear;
   will-change: opacity;
 }
-.gw-overlay-mask--visible[data-v-cf048b89] {
+.gw-overlay-mask--visible[data-v-b335d597] {
   opacity: 1;
   pointer-events: auto;
 }.el-dialog {
@@ -1245,10 +1245,19 @@
 .el-tooltip__popper.is-light .el-popper__arrow::before {
   background-color: var(--popper-background);
   border-color: var(--popper-border);
-}.el-message-box {
+}.el-overlay-message-box .el-message-box {
+  padding-bottom: 0;
+  background-color: var(--frame-main-background);
+}
+
+.el-overlay-message-box .el-message-box .el-message-box__btns {
+  padding: 20px 0;
+}
+
+.el-message-box {
   border: unset;
   padding-bottom: 0;
-  background-color: var(--message-box-background);
+  background-color: var(--frame-main-background);
 }
 
 .el-message-box .el-message-box__status {
@@ -1266,7 +1275,7 @@
 .el-message-box .el-message-box__content {
   color: var(--message-box-color);
   padding-top: 20px;
-  padding-bottom: 0;
+  padding-bottom: 20px;
 }
 
 .el-message-box .el-message-box__content p {
@@ -1297,7 +1306,17 @@
 
 .el-message-box .el-message-box__btns .el-button:nth-child(2) {
   color: var(--message-box-button-color);
-}.el-notification.success {
+}.el-notification {
+  background-color: var(--notification-background);
+  border: 0;
+}
+
+.el-notification .el-notification__title,
+.el-notification .el-notification__content p {
+  color: var(--notification-color);
+}
+
+.el-notification.success {
   background-color: #f0ffe2;
 }
 

package/element-plus-adapter/dist/ElementPlusAdapter.iife.js

@@ -1052,7 +1052,7 @@ var ElementPlusAdapter = function(exports, elementPlus, vue) {
       }
     }
   };
-  const GwOverlayMaskKey = "__gwOverlayMaskActive__";
+  const GwOverlayMaskKey = "__gwOverlayMaskRegistry__";
   const _sfc_main$f = /* @__PURE__ */ vue.defineComponent({
     __name: "index",
     props: {
@@ -1066,13 +1066,25 @@ var ElementPlusAdapter = function(exports, elementPlus, vue) {
     setup(__props, { emit: __emit }) {
       const props = __props;
       const emit = __emit;
-      const isInstance = !window[GwOverlayMaskKey];
-      if (isInstance) {
-        window[GwOverlayMaskKey] = true;
+      const existingRegistry = window[GwOverlayMaskKey];
+      const registry = (existingRegistry == null ? void 0 : existingRegistry.owner) && Array.isArray(existingRegistry.instances) ? existingRegistry : {
+        owner: vue.ref(null),
+        instances: []
+      };
+      window[GwOverlayMaskKey] = registry;
+      const instanceId = Symbol("GwOverlayMask");
+      registry.instances.push(instanceId);
+      if (!registry.owner.value) {
+        registry.owner.value = instanceId;
       }
+      const isInstance = vue.computed(() => registry.owner.value === instanceId);
       vue.onUnmounted(() => {
-        if (isInstance) {
-          window[GwOverlayMaskKey] = false;
+        const index2 = registry.instances.indexOf(instanceId);
+        if (index2 !== -1) {
+          registry.instances.splice(index2, 1);
+        }
+        if (registry.owner.value === instanceId) {
+          registry.owner.value = registry.instances[0] || null;
         }
       });
       const overlayStyle = vue.computed(() => ({
@@ -1093,7 +1105,7 @@ var ElementPlusAdapter = function(exports, elementPlus, vue) {
       };
       return (_ctx, _cache) => {
         return vue.openBlock(), vue.createBlock(vue.Teleport, { to: "body" }, [
-          isInstance ? (vue.openBlock(), vue.createElementBlock("div", {
+          isInstance.value ? (vue.openBlock(), vue.createElementBlock("div", {
             key: 0,
             class: vue.normalizeClass(["gw-overlay-mask", { "gw-overlay-mask--visible": __props.visible }]),
             style: vue.normalizeStyle(overlayStyle.value),
@@ -1104,7 +1116,7 @@ var ElementPlusAdapter = function(exports, elementPlus, vue) {
       };
     }
   });
-  const index_vue_vue_type_style_index_0_scoped_cf048b89_lang = "";
+  const index_vue_vue_type_style_index_0_scoped_b335d597_lang = "";
   const _export_sfc = (sfc, props) => {
     const target = sfc.__vccOpts || sfc;
     for (const [key, val] of props) {
@@ -1112,7 +1124,7 @@ var ElementPlusAdapter = function(exports, elementPlus, vue) {
     }
     return target;
   };
-  const GwOverlayMask = /* @__PURE__ */ _export_sfc(_sfc_main$f, [["__scopeId", "data-v-cf048b89"]]);
+  const GwOverlayMask = /* @__PURE__ */ _export_sfc(_sfc_main$f, [["__scopeId", "data-v-b335d597"]]);
   const _sfc_main$e = /* @__PURE__ */ vue.defineComponent({
     __name: "index",
     setup(__props, { expose: __expose }) {
@@ -1124,6 +1136,7 @@ var ElementPlusAdapter = function(exports, elementPlus, vue) {
       const { nextZIndex } = elementPlus.useZIndex();
       const dialogModal = vue.computed(() => !isInIframe);
       function handleOpen() {
+        console.log("[ElDialog adapter] handleOpen", isInIframe);
         if (isInIframe) {
           const currentCount = window.__elDialogOverlayCount__ || 0;
           if (currentCount === 0) {