iov-design 2.15.82 → 2.15.83

package/lib/utils/popper.js

@@ -48,7 +48,9 @@ var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol
 
     'use strict';
 
-    var root = window;
+    // var root = window;
+
+    var root = window.__POWERED_BY_WUJIE__ ? window.parent : window;
 
     // default options
     var DEFAULTS = {
@@ -1017,6 +1019,9 @@ var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol
      */
     function getStyleComputedProperty(element, property) {
         // NOTE: 1 DOM access here
+        // var css = root.getComputedStyle(element, null);
+        // return css[property];
+        if (window.__POWERED_BY_WUJIE__ && element.nodeType === 9) return 'static';
         var css = root.getComputedStyle(element, null);
         return css[property];
     }

package/lib/utils/vue-popper.js

@@ -106,7 +106,14 @@ exports.default = {
 
       if (!popper || !reference) return;
       if (this.visibleArrow) this.appendArrow(popper);
-      if (this.appendToBody) document.body.appendChild(this.popperElm);
+      // if (this.appendToBody) document.body.appendChild(this.popperElm);
+      if (this.appendToBody) {
+        if (window.__POWERED_BY_WUJIE__) {
+          window.parent.document.body.appendChild(this.popperElm);
+        } else {
+          document.body.appendChild(this.popperElm);
+        }
+      }
       if (this.popperJS && this.popperJS.destroy) {
         this.popperJS.destroy();
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "iov-design",
-  "version": "2.15.82",
+  "version": "2.15.83",
   "description": "A Component Library for Vue.js.",
   "main": "lib/iov-design.common.js",
   "files": [

package/packages/image/src/main.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="el-image">
+  <div class="el-image" :class="{'el-image__border': border}">
     <slot v-if="loading" name="placeholder">
       <div class="el-image__placeholder"></div>
     </slot>
@@ -63,7 +63,8 @@
         type: Number,
         default: 2000
       },
-      initialIndex: Number
+      initialIndex: Number,
+      border: Boolean
     },
 
     data() {

package/packages/message/src/main.js

@@ -14,9 +14,30 @@ const Message = function(options) {
   options = options || {};
   if (typeof options === 'string') {
     options = {
+      grouping: true,
       message: options
     };
+  } else {
+    options = {
+      grouping: true,
+      ...options
+    };
+  }
+  // ========== grouping 逻辑 ==========
+  if (options.grouping) {
+    const last = instances[instances.length - 1];
+
+    // 字符串形式时
+    const messageStr = typeof options === 'string'
+      ? options
+      : options.message;
+
+    if (last && !last.closed && last.message === messageStr) {
+      last.repeatNum++;
+      return last; // 直接返回，不创建新 toast
+    }
   }
+  // =================================================
   let userOnClose = options.onClose;
   let id = 'message_' + seed++;
 
@@ -48,11 +69,13 @@ const Message = function(options) {
   Message[type] = (options) => {
     if (isObject(options) && !isVNode(options)) {
       return Message({
+        grouping: true,
         ...options,
         type
       });
     }
     return Message({
+      grouping: true,
       type,
       message: options
     });

package/packages/message/src/main.vue

@@ -47,7 +47,8 @@
         verticalOffset: 46,
         timer: null,
         dangerouslyUseHTMLString: false,
-        center: false
+        center: false,
+        repeatNum: 1 // 合并消息数, 暂未渲染
       };
     },
 

package/packages/theme-chalk/src/image.scss

@@ -11,6 +11,13 @@
   display: inline-block;
   overflow: hidden;
 
+  @include e(border) {
+    border: 1px solid $--color-line-2;
+    border-radius: 4px;
+    overflow: hidden;
+    box-sizing: border-box;
+  }
+
   @include e(inner) {
     @extend %size;
     vertical-align: top;

package/src/index.js

@@ -212,7 +212,7 @@ if (typeof window !== 'undefined' && window.Vue) {
 }
 
 export default {
-  version: '2.15.82',
+  version: '2.15.83',
   locale: locale.use,
   i18n: locale.i18n,
   install,

package/src/utils/popper.js

@@ -44,7 +44,8 @@
 
     'use strict';
 
-    var root = window;
+    // var root = window;
+    var root = window.__POWERED_BY_WUJIE__ ? window.parent : window;
 
     // default options
     var DEFAULTS = {
@@ -1026,6 +1027,9 @@
      */
     function getStyleComputedProperty(element, property) {
         // NOTE: 1 DOM access here
+        // var css = root.getComputedStyle(element, null);
+        // return css[property];
+        if (window.__POWERED_BY_WUJIE__ && element.nodeType === 9) return 'static';
         var css = root.getComputedStyle(element, null);
         return css[property];
     }

package/src/utils/vue-popper.js

@@ -96,7 +96,14 @@ export default {
 
       if (!popper || !reference) return;
       if (this.visibleArrow) this.appendArrow(popper);
-      if (this.appendToBody) document.body.appendChild(this.popperElm);
+      // if (this.appendToBody) document.body.appendChild(this.popperElm);
+      if (this.appendToBody) {
+        if (window.__POWERED_BY_WUJIE__) {
+          window.parent.document.body.appendChild(this.popperElm);
+        } else {
+          document.body.appendChild(this.popperElm);
+        }
+      }
       if (this.popperJS && this.popperJS.destroy) {
         this.popperJS.destroy();
       }