Merge branch 'master' into feature/unit_test

.eslintrc.js

@@ -24,7 +24,8 @@ module.exports = {
     navigator: false,
     window: false,
     require: true,
-    FileReader: true
+    FileReader: true,
+    File: true
   },
 
   rules: {

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);
+      });
     }
   }
 };

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
 

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",

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));

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>

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,

packages/uploader/src/main.vue

@@ -1,11 +1,14 @@
 <template>
     <div class="zan-uploader">
         <slot>
-          <div>
-             <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" />
+        </template>
+        <template v-else>
+          <input type="file" @change="onValueChange"  class="zan-uploader__input" ref="input" />
+        </template>
     </div>
 </template>
 
@@ -40,12 +43,10 @@
         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 = '';
+          this.$refs.input && (this.$refs.input.value = '');
         };
         if (this.resultType === 'dataUrl') {
           reader.readAsDataURL(file);

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",

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 {

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,

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);
+  });
+});