From 7510930f41d006b7ebccdaac88b882b8a9b4ccfb Mon Sep 17 00:00:00 2001
From: tsxuehu <tsxuehu@gmail.com>
Date: Thu, 13 Apr 2017 10:10:35 +0800
Subject: [PATCH 1/6] test

---
 packages/uploader/src/main.vue | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/packages/uploader/src/main.vue b/packages/uploader/src/main.vue
index 9c0ad2c53..b2df50ec0 100644
--- a/packages/uploader/src/main.vue
+++ b/packages/uploader/src/main.vue
@@ -5,7 +5,12 @@
              <zan-button block>上传文件</zan-button>
           </div>
         </slot>
-        <input type="file" @change="onValueChange"  class="zan-uploader__input" ref="input" />
+        <template v-if="disabled">
+          <input type="file" @change="onValueChange" disabled="disabled" class="zan-uploader__input" ref="input" />
+        </template>
+        <template v-else>
+          <input type="file" @change="onValueChange"  class="zan-uploader__input" ref="input" />
+        </template>
     </div>
 </template>
 
@@ -40,9 +45,7 @@
         reader.onload = (e) => {
           this.afterRead && this.afterRead(
             {
-              name: file.name,
-              type: file.type,
-              size: file.size,
+              file: file,
               content: e.target.result
             });
           this.$refs.input.value = '';

From 1ad808ab7273d17e9b28df9fe725834e83678a7c Mon Sep 17 00:00:00 2001
From: tsxuehu <tsxuehu@gmail.com>
Date: Thu, 13 Apr 2017 16:59:13 +0800
Subject: [PATCH 2/6] test case

---
 docs/examples-docs/uploader.md   |  17 +----
 packages/uploader/src/main.vue   |   8 +--
 test/unit/specs/uploader.spec.js | 117 +++++++++++++++++++++++++++++++
 yarn.lock                        |  14 +++-
 4 files changed, 135 insertions(+), 21 deletions(-)
 create mode 100644 test/unit/specs/uploader.spec.js

diff --git a/docs/examples-docs/uploader.md b/docs/examples-docs/uploader.md
index 36466c171..b68520b9a 100644
--- a/docs/examples-docs/uploader.md
+++ b/docs/examples-docs/uploader.md
@@ -49,20 +49,7 @@ export default {
 
 #### 基础用法
 
-:::demo 基础用法
-```html
-<div class="uploader-container">
-    <zan-uploader 
-        :before-read="logContent"
-        :after-read="logContent">
-    </zan-uploader>
-</div>
-```
-:::
-
-#### 自定义上传图标
-
-:::demo 自定义上传图标
+:::demo 
 ```html
 <div class="uploader-container">
   <zan-uploader :after-read="logContent">
@@ -80,7 +67,7 @@ export default {
 | result-type | 读取文件的方式，以base64的方式读取；以文本的方式读取 | `string`  | `dataUrl`          | `dataUrl`, `text`         |
 | disable | 是否禁用上传,在图片上传期间设置为true，禁止用户点击此组件上传图片 | `boolean`  | `false`          |           |
 | before-read | 读文件之前的钩子，参数为选择的文件，若返回 false 则停止读取文件。 | `Function`  |           |  |
-| after-read | 文件读完之后回调此函数，参数为{name:'文件名',type:'文件类型',size:'文件大小',content:'读的内容'} | `Function`  |           |  |
+| after-read | 文件读完之后回调此函数，参数为{file:'选择的文件',content:'读的内容'} | `Function`  |           |  |
 
 ### Slot
 
diff --git a/packages/uploader/src/main.vue b/packages/uploader/src/main.vue
index b2df50ec0..6b0a65851 100644
--- a/packages/uploader/src/main.vue
+++ b/packages/uploader/src/main.vue
@@ -1,12 +1,10 @@
 <template>
     <div class="zan-uploader">
         <slot>
-          <div>
-             <zan-button block>上传文件</zan-button>
-          </div>
+
         </slot>
         <template v-if="disabled">
-          <input type="file" @change="onValueChange" disabled="disabled" class="zan-uploader__input" ref="input" />
+          <input type="file" @change="onValueChange" disabled="disabled" class="zan-uploader__input" />
         </template>
         <template v-else>
           <input type="file" @change="onValueChange"  class="zan-uploader__input" ref="input" />
@@ -48,7 +46,7 @@
               file: file,
               content: e.target.result
             });
-          this.$refs.input.value = '';
+          this.$refs.input && (this.$refs.input.value = '');
         };
         if (this.resultType === 'dataUrl') {
           reader.readAsDataURL(file);
diff --git a/test/unit/specs/uploader.spec.js b/test/unit/specs/uploader.spec.js
new file mode 100644
index 000000000..c45684604
--- /dev/null
+++ b/test/unit/specs/uploader.spec.js
@@ -0,0 +1,117 @@
+import Uploader from 'packages/uploader';
+import { mount } from 'avoriaz';
+
+describe('Uploader', () => {
+  let wrapper;
+  afterEach(() => {
+    wrapper && wrapper.destroy();
+  });
+
+  it('enabled', () => {
+    wrapper = mount(Uploader, {
+      propsData: {
+        disabled: false
+      }
+    });
+
+    expect(wrapper.contains('input')).to.equal(true);
+    expect(wrapper.methods().onValueChange.call(wrapper.vm, { target: { files: [] }})).to.equal(undefined);
+  });
+});
+describe('Uploader', () => {
+  let wrapper;
+  afterEach(() => {
+    wrapper && wrapper.destroy();
+  });
+
+  it('disabled', () => {
+    wrapper = mount(Uploader, {
+      propsData: {
+        disabled: true
+      }
+    });
+
+    expect(wrapper.contains('input')).to.equal(true);
+    expect(wrapper.methods().onValueChange.call(wrapper.vm, { target: { files: [] }})).to.equal(undefined);
+  });
+});
+describe('Uploader', () => {
+  let wrapper;
+  afterEach(() => {
+    wrapper && wrapper.destroy();
+  });
+
+  it('before read', () => {
+    wrapper = mount(Uploader, {
+      propsData: {
+        disabled: false,
+        beforeRead: () => {
+          return false;
+        }
+      }
+    });
+
+    expect(wrapper.contains('input')).to.equal(true);
+    expect(wrapper.methods().onValueChange.call(wrapper.vm, { target: { files: [new File([], '')] }})).to.equal(undefined);
+  });
+});
+describe('Uploader', () => {
+  let wrapper;
+  afterEach(() => {
+    wrapper && wrapper.destroy();
+  });
+
+  it('read text', () => {
+    wrapper = mount(Uploader, {
+      propsData: {
+        disabled: false,
+        resultType: 'text',
+        afterRead: (file) => {
+          console.log(file);
+        }
+      }
+    });
+
+    expect(wrapper.contains('input')).to.equal(true);
+    expect(wrapper.methods().onValueChange.call(wrapper.vm, { target: { files: [new File([], '/Users')] }})).to.equal(undefined);
+  });
+});
+describe('Uploader', () => {
+  let wrapper;
+  afterEach(() => {
+    wrapper && wrapper.destroy();
+  });
+
+  it('read text no after hook', () => {
+    wrapper = mount(Uploader, {
+      propsData: {
+        disabled: false,
+        resultType: 'text'
+      }
+    });
+
+    expect(wrapper.contains('input')).to.equal(true);
+    expect(wrapper.methods().onValueChange.call(wrapper.vm, { target: { files: [new File([], '/Users')] }})).to.equal(undefined);
+  });
+});
+describe('Uploader', () => {
+  let wrapper;
+  afterEach(() => {
+    wrapper && wrapper.destroy();
+  });
+
+  it('read dataUrl', () => {
+    wrapper = mount(Uploader, {
+      propsData: {
+        disabled: false,
+        resultType: 'dataUrl',
+        afterRead: (file) => {
+          console.log(file);
+        }
+      }
+    });
+
+    expect(wrapper.contains('input')).to.equal(true);
+    expect(wrapper.methods().onValueChange.call(wrapper.vm, { target: { files: [new File([], '/Users')] }})).to.equal(undefined);
+  });
+});
diff --git a/yarn.lock b/yarn.lock
index b7d8f7414..9dcb294e4 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1589,7 +1589,7 @@ cssesc@^0.1.0:
   version "0.1.0"
   resolved "http://registry.npm.qima-inc.com/cssesc/download/cssesc-0.1.0.tgz#c814903e45623371a0477b40109aaafbeeaddbb4"
 
-"cssnano@>=2.6.1 <4":
+"cssnano@>=2.6.1 <4", cssnano@^3.4.0:
   version "3.10.0"
   resolved "http://registry.npm.qima-inc.com/cssnano/download/cssnano-3.10.0.tgz#4f38f6cea2b9b17fa01490f23f1dc68ea65c1c38"
   dependencies:
@@ -4666,6 +4666,14 @@ optimist@^0.6.1, optimist@~0.6.1:
     minimist "~0.0.1"
     wordwrap "~0.0.2"
 
+optimize-css-assets-webpack-plugin@^1.3.0:
+  version "1.3.0"
+  resolved "http://registry.npm.qima-inc.com/optimize-css-assets-webpack-plugin/download/optimize-css-assets-webpack-plugin-1.3.0.tgz#331b3dc7ac0b2b3597f68d18fd555f5a0c81b15c"
+  dependencies:
+    cssnano "^3.4.0"
+    underscore "^1.8.3"
+    webpack-sources "^0.1.0"
+
 optionator@^0.8.1, optionator@^0.8.2:
   version "0.8.2"
   resolved "http://registry.npm.qima-inc.com/optionator/download/optionator-0.8.2.tgz#364c5e409d3f4d6301d6c0b4c05bba50180aeb64"
@@ -6531,6 +6539,10 @@ unc-path-regex@^0.1.0:
   version "0.1.2"
   resolved "http://registry.npm.qima-inc.com/unc-path-regex/download/unc-path-regex-0.1.2.tgz#e73dd3d7b0d7c5ed86fbac6b0ae7d8c6a69d50fa"
 
+underscore@^1.8.3:
+  version "1.8.3"
+  resolved "http://registry.npm.qima-inc.com/underscore/download/underscore-1.8.3.tgz#4f3fb53b106e6097fcf9cb4109f2a5e9bdfa5022"
+
 underscore@~1.6.0:
   version "1.6.0"
   resolved "http://registry.npm.qima-inc.com/underscore/download/underscore-1.6.0.tgz#8b38b10cacdef63337b8b24e4ff86d45aea529a8"

From 9255184f26f9ad3c7bcde44caf62002c8f2d863b Mon Sep 17 00:00:00 2001
From: tsxuehu <tsxuehu@gmail.com>
Date: Thu, 13 Apr 2017 17:03:00 +0800
Subject: [PATCH 3/6] test case

---
 .eslintrc.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.eslintrc.js b/.eslintrc.js
index 892f6e1db..eaf52949a 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -24,7 +24,8 @@ module.exports = {
     navigator: false,
     window: false,
     require: true,
-    FileReader: true
+    FileReader: true,
+    File: true
   },
 
   rules: {

From 1ab44ea05537b67e19bba5d9feb0c987fd3c47d8 Mon Sep 17 00:00:00 2001
From: cookfront <cookfront@gmail.com>
Date: Fri, 14 Apr 2017 17:36:24 +0800
Subject: [PATCH 4/6] dialog fix

---
 docs/examples-docs/dialog.md      | 17 +++++++++++++++++
 packages/dialog/src/dialog.js     |  4 ++++
 packages/dialog/src/dialog.vue    |  2 +-
 packages/toast/src/toast.vue      |  7 +------
 packages/zanui-css/src/dialog.css |  5 +++++
 5 files changed, 28 insertions(+), 7 deletions(-)

diff --git a/docs/examples-docs/dialog.md b/docs/examples-docs/dialog.md
index a899befdd..4e383a4b0 100644
--- a/docs/examples-docs/dialog.md
+++ b/docs/examples-docs/dialog.md
@@ -25,6 +25,14 @@ export default {
       });
     },
 
+    handleAlert2Click() {
+      Dialog.alert({
+        message: '无标题alert'
+      }).then((action) => {
+        console.log(action);
+      });
+    },
+
     handleConfirmClick() {
       Dialog.confirm({
         title: 'confirm标题',
@@ -58,6 +66,7 @@ import { Dialog } from '@youzan/zanui-vue';
 :::demo 消息提示
 ```html
 <zan-button @click="handleAlertClick">alert</zan-button>
+<zan-button @click="handleAlert2Click">无标题alert</zan-button>
 
 <script>
 export default {
@@ -69,6 +78,14 @@ export default {
       }).then((action) => {
         console.log(action);
       });
+    },
+
+    handleAlert2Click() {
+      Dialog.alert({
+        message: '弹窗提示文字，左右始终距离边20PX，上下距离20PX，文字左对齐。弹窗提示文字，左右始终距离边20PX，上下距离20PX，文字左对齐。'
+      }).then((action) => {
+        console.log(action);
+      });
     }
   }
 };
diff --git a/packages/dialog/src/dialog.js b/packages/dialog/src/dialog.js
index 5c13346cd..7f1e1abbf 100644
--- a/packages/dialog/src/dialog.js
+++ b/packages/dialog/src/dialog.js
@@ -76,6 +76,8 @@ var DialogBox = options => {
 DialogBox.alert = function(options) {
   return DialogBox(merge({
     type: 'alert',
+    title: '',
+    message: '',
     closeOnClickOverlay: false,
     showCancelButton: false
   }, options));
@@ -84,6 +86,8 @@ DialogBox.alert = function(options) {
 DialogBox.confirm = function(options) {
   return DialogBox(merge({
     type: 'confirm',
+    title: '',
+    message: '',
     closeOnClickOverlay: true,
     showCancelButton: true
   }, options));
diff --git a/packages/dialog/src/dialog.vue b/packages/dialog/src/dialog.vue
index 47b8f1cbb..d8bb490c5 100644
--- a/packages/dialog/src/dialog.vue
+++ b/packages/dialog/src/dialog.vue
@@ -6,7 +6,7 @@
           <div class="zan-dialog__title" v-text="title"></div>
         </div>
         <div class="zan-dialog__content" v-if="message">
-          <div class="zan-dialog__message" v-html="message"></div>
+          <div class="zan-dialog__message" :class="{ 'zan-dialog__message--notitle': !title }" v-html="message"></div>
         </div>
         <div class="zan-dialog__footer" :class="{ 'is-twobtn': showCancelButton && showConfirmButton }">
           <button class="zan-dialog__btn zan-dialog__cancel" v-show="showCancelButton" @click="handleAction('cancel')">{{ cancelButtonText }}</button>
diff --git a/packages/toast/src/toast.vue b/packages/toast/src/toast.vue
index 3ffe32bea..535dc60e7 100644
--- a/packages/toast/src/toast.vue
+++ b/packages/toast/src/toast.vue
@@ -56,12 +56,7 @@ export default {
     },
     message: {
       type: String,
-      default: '',
-      validator(value) {
-        if (this.type === 'success' || this.type === 'fail') {
-          return value.length <= 16;
-        }
-      }
+      default: ''
     },
     forbidClick: {
       type: Boolean,
diff --git a/packages/zanui-css/src/dialog.css b/packages/zanui-css/src/dialog.css
index 41fbddc48..e842e3c96 100644
--- a/packages/zanui-css/src/dialog.css
+++ b/packages/zanui-css/src/dialog.css
@@ -46,6 +46,11 @@
       margin: 0;
       font-size: 14px;
       line-height: 1.5;
+
+      @m notitle {
+        color: #333;
+        font-size: 16px;
+      }
     }
 
     @e footer {

From fa2d934553462fdb286543acecabbfff1c7f996b Mon Sep 17 00:00:00 2001
From: cookfront <cookfront@gmail.com>
Date: Fri, 14 Apr 2017 17:37:44 +0800
Subject: [PATCH 5/6] [build] 0.1.2

---
 packages/zanui-css/package.json | 2 +-
 src/index.js                    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/zanui-css/package.json b/packages/zanui-css/package.json
index d1b723c6d..b0333a6a3 100644
--- a/packages/zanui-css/package.json
+++ b/packages/zanui-css/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@youzan/zanui-css",
-  "version": "0.1.1",
+  "version": "0.1.2",
   "description": "zanui css.",
   "main": "lib/index.css",
   "style": "lib/index.css",
diff --git a/src/index.js b/src/index.js
index ded005f83..9e8daf149 100644
--- a/src/index.js
+++ b/src/index.js
@@ -80,7 +80,7 @@ if (typeof window !== 'undefined' && window.Vue) {
 
 module.exports = {
   install,
-  version: '0.1.1',
+  version: '0.1.2',
   Button,
   Switch,
   Field,

From db6cd730058770f15b00c08ede0efc126470ae5a Mon Sep 17 00:00:00 2001
From: cookfront <cookfront@gmail.com>
Date: Fri, 14 Apr 2017 17:37:45 +0800
Subject: [PATCH 6/6] [release] 0.1.2

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 6c4b03d67..927f9df4f 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@youzan/zanui-vue",
-  "version": "0.1.1",
+  "version": "0.1.2",
   "description": "有赞vue wap组件库",
   "main": "lib/zanui.js",
   "style": "lib/zanui-css/index.css",