iov-design 2.15.45 → 2.15.47

package/package.json

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

package/packages/dialog/src/component.vue

@@ -27,8 +27,8 @@
             <i class="el-dialog__close el-icon iov-icon-close" v-if="showClose" @click="handleClose"></i>
           </span>
         </div>
-        <div class="el-dialog__body" :class="type === 'form' ? 'el-dialog__body--form' : 'el-dialog__body--desc'" v-if="rendered"><slot></slot></div>
-        <div class="el-dialog__footer" v-if="$slots.footer">
+        <div class="el-dialog__body" ref="body" :class="type === 'form' ? 'el-dialog__body--form' : 'el-dialog__body--desc'" v-if="rendered"><slot></slot></div>
+        <div class="el-dialog__footer" ref="footer" v-if="$slots.footer">
           <slot name="footer"></slot>
         </div>
       </div>
@@ -103,7 +103,7 @@
 
       top: {
         type: String,
-        default: '15vh'
+        default: '50%'
       },
       beforeClose: Function,
       center: {
@@ -149,7 +149,7 @@
       style() {
         let style = {};
         if (!this.fullscreen) {
-          style.marginTop = this.top;
+          style.top = this.top;
           if (this.width) {
             style.width = this.width;
           }
@@ -189,10 +189,47 @@
         this.broadcast('ElDropdownMenu', 'updatePopper');
       },
       afterEnter() {
+        this.onDialogOpened();
         this.$emit('opened');
       },
       afterLeave() {
         this.$emit('closed');
+      },
+
+      onDialogOpened() {
+        this.$nextTick(() => {
+          this.checkOverflow();
+          this.observeContentChanges();
+        });
+      },
+
+      // 检查内容是否超过body高度
+      checkOverflow() {
+        const body = this.$refs.body;
+        const footer = this.$refs.footer;
+        if (!body || !footer) return;
+        if (body.scrollHeight > body.clientHeight) {
+          footer.classList.add('el-dialog__footer--shadow');
+        } else {
+          footer.classList.remove('el-dialog__footer--shadow');
+        }
+      },
+      // 监听节点变化
+      observeContentChanges() {
+        const body = this.$refs.body;
+        if (!body) return;
+        if (this._mutationObserver) {
+          this._mutationObserver.disconnect();
+        }
+        this._mutationObserver = new MutationObserver(() => {
+          this.checkOverflow();
+        });
+        // 监听子节点及文本节点的内容变化
+        this._mutationObserver.observe(body, {
+          childList: true,
+          subtree: true,
+          characterData: true
+        });
       }
     },
 
@@ -211,6 +248,9 @@
       if (this.appendToBody && this.$el && this.$el.parentNode) {
         this.$el.parentNode.removeChild(this.$el);
       }
+      if (this._mutationObserver) {
+        this._mutationObserver.disconnect();
+      }
     }
   };
 </script>

package/packages/empty/src/index.vue

@@ -44,7 +44,10 @@ export default {
       type: Number,
       default: 1
     },
-    imageSize: Number,
+    imageSize: {
+      type: Number,
+      default: 140
+    },
     description: {
       type: String,
       default: ''

package/packages/message/src/main.js

@@ -33,7 +33,7 @@ const Message = function(options) {
   }
   instance.$mount();
   document.body.appendChild(instance.$el);
-  let verticalOffset = options.offset || 20;
+  let verticalOffset = options.offset || 46;
   instances.forEach(item => {
     verticalOffset += item.$el.offsetHeight + 16;
   });

package/packages/message/src/main.vue

@@ -19,17 +19,17 @@
         <p v-if="!dangerouslyUseHTMLString" class="el-message__content">{{ message }}</p>
         <p v-else v-html="message" class="el-message__content"></p>
       </slot>
-      <i v-if="showClose" class="el-message__closeBtn el-icon-close" @click="close"></i>
+      <i v-if="showClose" class="el-message__closeBtn iov-icon-close" @click="close"></i>
     </div>
   </transition>
 </template>
 
 <script type="text/babel">
-  const typeMap = {
+  let typeMap = {
     success: 'success',
-    info: 'info',
+    info: 'explain',
     warning: 'warning',
-    error: 'error'
+    error: 'fail'
   };
 
   export default {
@@ -44,7 +44,7 @@
         onClose: null,
         showClose: false,
         closed: false,
-        verticalOffset: 20,
+        verticalOffset: 46,
         timer: null,
         dangerouslyUseHTMLString: false,
         center: false
@@ -54,7 +54,7 @@
     computed: {
       typeClass() {
         return this.type && !this.iconClass
-          ? `el-message__icon el-icon-${ typeMap[this.type] }`
+          ? `el-message__icon iov-icon-fill-${ typeMap[this.type] }`
           : '';
       },
       positionStyle() {

package/packages/tabs/src/tabs.vue

@@ -1,196 +1,196 @@
-<script>
-  import TabNav from './tab-nav';
-
-  export default {
-    name: 'ElTabs',
-
-    components: {
-      TabNav
-    },
-
-    props: {
-      type: String,
-      size: String,
-      activeName: String,
-      closable: Boolean,
-      addable: Boolean,
-      value: {},
-      editable: Boolean,
-      tabPosition: {
-        type: String,
-        default: 'top'
-      },
-      beforeLeave: Function,
-      stretch: Boolean
-    },
-
-    provide() {
-      return {
-        rootTabs: this
-      };
-    },
-
-    data() {
-      return {
-        currentName: this.value || this.activeName,
-        panes: []
-      };
-    },
-
-    watch: {
-      activeName(value) {
-        this.setCurrentName(value);
-      },
-      value(value) {
-        this.setCurrentName(value);
-      },
-      currentName(value) {
-        if (this.$refs.nav) {
-          this.$nextTick(() => {
-            this.$refs.nav.$nextTick(_ => {
-              this.$refs.nav.scrollToActiveTab();
-            });
-          });
-        }
-      }
-    },
-
-    methods: {
-      calcPaneInstances(isForceUpdate = false) {
-        if (this.$slots.default) {
-          const paneSlots = this.$slots.default.filter(vnode => vnode.tag &&
-            vnode.componentOptions && vnode.componentOptions.Ctor.options.name === 'ElTabPane');
-          // update indeed
-          const panes = paneSlots.map(({ componentInstance }) => componentInstance);
-          const panesChanged = !(panes.length === this.panes.length && panes.every((pane, index) => pane === this.panes[index]));
-          if (isForceUpdate || panesChanged) {
-            this.panes = panes;
-          }
-        } else if (this.panes.length !== 0) {
-          this.panes = [];
-        }
-      },
-      handleTabClick(tab, tabName, event) {
-        if (tab.disabled) return;
-        this.setCurrentName(tabName);
-        this.$emit('tab-click', tab, event);
-      },
-      handleTabRemove(pane, ev) {
-        if (pane.disabled) return;
-        ev.stopPropagation();
-        this.$emit('edit', pane.name, 'remove');
-        this.$emit('tab-remove', pane.name);
-      },
-      handleTabAdd() {
-        this.$emit('edit', null, 'add');
-        this.$emit('tab-add');
-      },
-      setCurrentName(value) {
-        const changeCurrentName = () => {
-          this.currentName = value;
-          this.$emit('input', value);
-        };
-        if (this.currentName !== value && this.beforeLeave) {
-          const before = this.beforeLeave(value, this.currentName);
-          if (before && before.then) {
-            before
-              .then(() => {
-                changeCurrentName();
-                this.$refs.nav && this.$refs.nav.removeFocus();
-              }, () => {
-                // https://github.com/ElemeFE/element/pull/14816
-                // ignore promise rejection in `before-leave` hook
-              });
-          } else if (before !== false) {
-            changeCurrentName();
-          }
-        } else {
-          changeCurrentName();
-        }
-      }
-    },
-
-    render(h) {
-      let {
-        type,
-        size,
-        handleTabClick,
-        handleTabRemove,
-        handleTabAdd,
-        currentName,
-        panes,
-        editable,
-        addable,
-        tabPosition,
-        stretch
-      } = this;
-
-      const newButton = editable || addable
-        ? (
-          <span
-            class="el-tabs__new-tab"
-            on-click={ handleTabAdd }
-            tabindex="0"
-            on-keydown={ (ev) => { if (ev.keyCode === 13) { handleTabAdd(); }} }
-          >
-            <i class="iov-icon-plus"></i>
-          </span>
-        )
-        : null;
-
-      const navData = {
-        props: {
-          currentName,
-          onTabClick: handleTabClick,
-          onTabRemove: handleTabRemove,
-          editable,
-          type,
-          panes,
-          stretch
-        },
-        ref: 'nav'
-      };
-      const header = (
-        <div class={['el-tabs__header', `is-${tabPosition}`]}>
-          {newButton}
-          <tab-nav { ...navData }></tab-nav>
-        </div>
-      );
-      const panels = (
-        <div class="el-tabs__content">
-          {this.$slots.default}
-        </div>
-      );
-
-      return (
-        <div class={{
-          'el-tabs': true,
-          'el-tabs--normal': !type,
-          'el-tabs--card': type === 'card',
-          'el-tabs--capsule': type === 'capsule',
-          [`el-tabs--${size}`]: size,
-          [`el-tabs--${tabPosition}`]: true,
-          'el-tabs--border-card': type === 'border-card'
-        }}>
-          { tabPosition !== 'bottom' ? [header, panels] : [panels, header] }
-        </div>
-      );
-    },
-
-    created() {
-      if (!this.currentName) {
-        this.setCurrentName('0');
-      }
-
-      this.$on('tab-nav-update', this.calcPaneInstances.bind(null, true));
-    },
-
-    mounted() {
-      this.calcPaneInstances();
-    },
-
-    updated() {
-      this.calcPaneInstances();
-    }
-  };
-</script>
+<script>
+  import TabNav from './tab-nav';
+
+  export default {
+    name: 'ElTabs',
+
+    components: {
+      TabNav
+    },
+
+    props: {
+      type: String,
+      size: String,
+      activeName: String,
+      closable: Boolean,
+      addable: Boolean,
+      value: {},
+      editable: Boolean,
+      tabPosition: {
+        type: String,
+        default: 'top'
+      },
+      beforeLeave: Function,
+      stretch: Boolean
+    },
+
+    provide() {
+      return {
+        rootTabs: this
+      };
+    },
+
+    data() {
+      return {
+        currentName: this.value || this.activeName,
+        panes: []
+      };
+    },
+
+    watch: {
+      activeName(value) {
+        this.setCurrentName(value);
+      },
+      value(value) {
+        this.setCurrentName(value);
+      },
+      currentName(value) {
+        if (this.$refs.nav) {
+          this.$nextTick(() => {
+            this.$refs.nav.$nextTick(_ => {
+              this.$refs.nav.scrollToActiveTab();
+            });
+          });
+        }
+      }
+    },
+
+    methods: {
+      calcPaneInstances(isForceUpdate = false) {
+        if (this.$slots.default) {
+          const paneSlots = this.$slots.default.filter(vnode => vnode.tag &&
+            vnode.componentOptions && vnode.componentOptions.Ctor.options.name === 'ElTabPane');
+          // update indeed
+          const panes = paneSlots.map(({ componentInstance }) => componentInstance);
+          const panesChanged = !(panes.length === this.panes.length && panes.every((pane, index) => pane === this.panes[index]));
+          if (isForceUpdate || panesChanged) {
+            this.panes = panes;
+          }
+        } else if (this.panes.length !== 0) {
+          this.panes = [];
+        }
+      },
+      handleTabClick(tab, tabName, event) {
+        if (tab.disabled) return;
+        this.setCurrentName(tabName);
+        this.$emit('tab-click', tab, event);
+      },
+      handleTabRemove(pane, ev) {
+        if (pane.disabled) return;
+        ev.stopPropagation();
+        this.$emit('edit', pane.name, 'remove');
+        this.$emit('tab-remove', pane.name);
+      },
+      handleTabAdd() {
+        this.$emit('edit', null, 'add');
+        this.$emit('tab-add');
+      },
+      setCurrentName(value) {
+        const changeCurrentName = () => {
+          this.currentName = value;
+          this.$emit('input', value);
+        };
+        if (this.currentName !== value && this.beforeLeave) {
+          const before = this.beforeLeave(value, this.currentName);
+          if (before && before.then) {
+            before
+              .then(() => {
+                changeCurrentName();
+                this.$refs.nav && this.$refs.nav.removeFocus();
+              }, () => {
+                // https://github.com/ElemeFE/element/pull/14816
+                // ignore promise rejection in `before-leave` hook
+              });
+          } else if (before !== false) {
+            changeCurrentName();
+          }
+        } else {
+          changeCurrentName();
+        }
+      }
+    },
+
+    render(h) {
+      let {
+        type,
+        size,
+        handleTabClick,
+        handleTabRemove,
+        handleTabAdd,
+        currentName,
+        panes,
+        editable,
+        addable,
+        tabPosition,
+        stretch
+      } = this;
+
+      const newButton = editable || addable
+        ? (
+          <span
+            class="el-tabs__new-tab"
+            on-click={ handleTabAdd }
+            tabindex="0"
+            on-keydown={ (ev) => { if (ev.keyCode === 13) { handleTabAdd(); }} }
+          >
+            <i class="iov-icon-plus"></i>
+          </span>
+        )
+        : null;
+
+      const navData = {
+        props: {
+          currentName,
+          onTabClick: handleTabClick,
+          onTabRemove: handleTabRemove,
+          editable,
+          type,
+          panes,
+          stretch
+        },
+        ref: 'nav'
+      };
+      const header = (
+        <div class={['el-tabs__header', `is-${tabPosition}`]}>
+          {newButton}
+          <tab-nav { ...navData }></tab-nav>
+        </div>
+      );
+      const panels = (
+        <div class="el-tabs__content">
+          {this.$slots.default}
+        </div>
+      );
+
+      return (
+        <div class={{
+          'el-tabs': true,
+          'el-tabs--normal': !type,
+          'el-tabs--card': type === 'card',
+          'el-tabs--capsule': type === 'capsule',
+          [`el-tabs--${size}`]: size,
+          [`el-tabs--${tabPosition}`]: true,
+          'el-tabs--border-card': type === 'border-card'
+        }}>
+          { tabPosition !== 'bottom' ? [header, panels] : [panels, header] }
+        </div>
+      );
+    },
+
+    created() {
+      if (!this.currentName) {
+        this.setCurrentName('0');
+      }
+
+      this.$on('tab-nav-update', this.calcPaneInstances.bind(null, true));
+    },
+
+    mounted() {
+      this.calcPaneInstances();
+    },
+
+    updated() {
+      this.calcPaneInstances();
+    }
+  };
+</script>

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

@@ -3,12 +3,12 @@
 
 @include b(alert) {
   width: 100%;
-  padding: $--alert-padding;
+  padding: 11px 12px;
   margin: 0;
   box-sizing: border-box;
-  border-radius: $--alert-border-radius;
+  border-radius: 4px;
   position: relative;
-  background-color: $--color-white;
+  background-color: #fff;
   overflow: hidden;
   opacity: 1;
   display: flex;
@@ -26,10 +26,10 @@
 
   @include when(dark) {
     .el-alert__closebtn {
-      color: $--color-white;
+      color: #fff;
     }
     .el-alert__description {
-      color: $--color-white;
+      color: #fff;
     }
   }
 
@@ -49,7 +49,7 @@
 
     &.is-dark {
       background-color: $--color-success-6;
-      color: $--color-white;
+      color: #fff;
     }
   }
 
@@ -65,7 +65,7 @@
 
     &.is-dark {
       background-color: $--color-primary-6;
-      color: $--color-white;
+      color: #fff;
     }
   }
 
@@ -81,7 +81,7 @@
 
     &.is-dark {
       background-color: $--color-warning-6;
-      color: $--color-white;
+      color: #fff;
     }
   }
 
@@ -97,7 +97,7 @@
 
     &.is-dark {
       background-color: $--color-danger-6;
-      color: $--color-white;
+      color: #fff;
     }
   }
 
@@ -107,30 +107,33 @@
 
   @include e(icon) {
     margin-right: 8px;
-    font-size: $--alert-icon-size;
-    width: $--alert-icon-size;
+    font-size: 16px;
+    width: 16px;
     @include when(big) {
-      font-size: $--alert-icon-large-size;
-      width: $--alert-icon-large-size;
+      font-size: 16px;
+      width: 16px;
+      align-self: flex-start;
     }
   }
 
   @include e(title) {
-    font-size: $--alert-title-font-size;
+    font-size: 12px;
+    line-height: 16px;
+    display: block;
     @include when(bold) {
       font-weight: 500;
     }
   }
 
   & .el-alert__description {
-    font-size: $--alert-description-font-size;
-    margin: 5px 0 0 0;
+    font-size: 12px;
+    margin: 4px 0 0 0;
     color: $--color-text-6;
     font-weight: 400;
   }
 
   @include e(closebtn) {
-    font-size: $--alert-close-font-size;
+    font-size: 14px;
     opacity: 1;
     position: absolute;
     top: 12px;
@@ -139,7 +142,7 @@
 
     @include when(customed) {
       font-style: normal;
-      font-size: $--alert-close-customed-font-size;
+      font-size: 12px;
       top: 11px;
     }
   }