Merge branch 'master' into dev/badge_search

# Conflicts:
#	components.json
#	packages/zanui-css/src/index.css
#	src/index.js

src/index.js

@@ -9,10 +9,17 @@ import Popup from '../packages/popup/index.js';
 import Dialog from '../packages/dialog/index.js';
 import Picker from '../packages/picker/index.js';
 import RadioGroup from '../packages/radio-group/index.js';
+import Waterfall from '../packages/waterfall/index.js';
 import Loading from '../packages/loading/index.js';
 import Badge from '../packages/badge/index.js';
 import BadgeGroup from '../packages/badge-group/index.js';
 import Search from '../packages/search/index.js';
+import Panel from '../packages/panel/index.js';
+import Card from '../packages/card/index.js';
+import Steps from '../packages/steps/index.js';
+import Tag from '../packages/tag/index.js';
+import Checkbox from '../packages/checkbox/index.js';
+import CheckboxGroup from '../packages/checkbox-group/index.js';
 
 const install = function(Vue) {
   if (install.installed) return;
@@ -31,16 +38,22 @@ const install = function(Vue) {
   Vue.component(Badge.name, Badge);
   Vue.component(BadgeGroup.name, BadgeGroup);
   Vue.component(Search.name, Search);
+  Vue.component(Panel.name, Panel);
+  Vue.component(Card.name, Card);
+  Vue.component(Steps.name, Steps);
+  Vue.component(Tag.name, Tag);
+  Vue.component(Checkbox.name, Checkbox);
+  Vue.component(CheckboxGroup.name, CheckboxGroup);
 };
 
 // auto install
 if (typeof window !== 'undefined' && window.Vue) {
   install(window.Vue);
-};
+}
 
 module.exports = {
   install,
-  version: '0.0.1',
+  version: '0.0.7',
   Button,
   Switch,
   Field,
@@ -55,5 +68,13 @@ module.exports = {
   Loading,
   Badge,
   BadgeGroup,
-  Search
+  Search,
+  Waterfall,
+  Loading,
+  Panel,
+  Card,
+  Steps,
+  Tag,
+  Checkbox,
+  CheckboxGroup
 };

src/mixins/findParent.js

@@ -0,0 +1,22 @@
+/**
+ * 根据父组件名找到对应`parent`
+ */
+export default {
+  methods: {
+    findParentByComponentName(name) {
+      if (this.parentGroup) return;
+
+      let parent = this.$parent;
+      while (parent) {
+        if (parent.$options.name === name) {
+          this.parentGroup = parent;
+          break;
+        } else {
+          parent = parent.$parent;
+        }
+      }
+
+      return this.parentGroup;
+    }
+  }
+};

src/mixins/popup/index.js

@@ -85,7 +85,6 @@ export default {
 
       const dom = getDOM(this.$el);
       const props = merge({}, this, options);
-      const overlay = props.overlay;
       const zIndex = props.zIndex;
 
       // 如果属性中传入了`zIndex`，则覆盖`PopupManager`中对应的`zIndex`
@@ -94,7 +93,7 @@ export default {
       }
 
       // 如果显示遮罩层
-      if (overlay) {
+      if (this.overlay) {
         if (this.closing) {
           PopupManager.closeModal(this._popupId);
           this.closing = false;
@@ -102,7 +101,7 @@ export default {
         PopupManager.openModal(this._popupId, PopupManager.nextZIndex(), dom);
 
         // 如果滚动时需要锁定
-        if (props.lockOnScroll) {
+        if (this.lockOnScroll) {
           // 将原来的`bodyOverflow`存起来
           if (!this.bodyOverflow) {
             this.bodyOverflow = document.body.style.overflow;

src/mixins/popup/popup-manager.js

@@ -79,7 +79,7 @@ const PopupManager = {
 
     const modalDom = getModal();
 
-    addClass(modalDom, 'z-modal');
+    addClass(modalDom, 'zan-modal');
 
     if (dom && dom.parentNode && dom.parentNode.nodeType !== 11) {
       dom.parentNode.appendChild(modalDom);