From 2d704cdcebd715c154a75d40fe938009c46daef1 Mon Sep 17 00:00:00 2001 From: richard1015 <51844712@qq.com> Date: Mon, 23 Dec 2019 09:59:13 +0800 Subject: [PATCH 01/21] =?UTF-8?q?feat=EF=BC=9ACheckboxGroup=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E5=85=A8=E9=80=89=E3=80=81=E5=8F=8D=E9=80=89=E5=8A=9F?= =?UTF-8?q?=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/packages/checkboxgroup/checkboxgroup.vue | 29 +++++++++++++++++++- src/packages/checkboxgroup/demo.vue | 9 ++++-- src/packages/checkboxgroup/doc.md | 24 ++++++++++++++-- 3 files changed, 56 insertions(+), 6 deletions(-) diff --git a/src/packages/checkboxgroup/checkboxgroup.vue b/src/packages/checkboxgroup/checkboxgroup.vue index ca3d95e9d5..58108f1752 100644 --- a/src/packages/checkboxgroup/checkboxgroup.vue +++ b/src/packages/checkboxgroup/checkboxgroup.vue @@ -148,7 +148,34 @@ export default { }, - + toggleAll(checked) { + if (checked === false) { + this.$emit("input", []); + return; + } + if(checked === true){ + this.checkBoxData.map(item => { + item.checked = true; + }); + } + if (!checked) { + this.checkBoxData.map(item => { + item.checked = !item.checked; + }); + } + + let value = [], + label = []; + let resData = this.checkBoxData.filter(item => { + if (item.checked) { + value.push(item.value); + label.push(item.label); + } + return item.checked; + }); + this.$emit("input",value); + this.$emit("change", value, label, null); + } } } \ No newline at end of file diff --git a/src/packages/checkboxgroup/demo.vue b/src/packages/checkboxgroup/demo.vue index b99a479d9e..9bf0c3524e 100644 --- a/src/packages/checkboxgroup/demo.vue +++ b/src/packages/checkboxgroup/demo.vue @@ -3,9 +3,12 @@

基本用法(2s后动态更新)

- +

{{group1}}

+ 全选 + 取消全选 + 反选

禁用状态

@@ -132,7 +135,9 @@ export default { alert('已选值:['+ val+']，当前选择值：'+ label); }, - + checkAll(state){ + this.$refs.checkboxGroup.toggleAll(state); + } } }; diff --git a/src/packages/checkboxgroup/doc.md b/src/packages/checkboxgroup/doc.md index 1254fb8f90..e6f254ba71 100644 --- a/src/packages/checkboxgroup/doc.md +++ b/src/packages/checkboxgroup/doc.md @@ -3,10 +3,15 @@ ## 基本用法(2s后动态更新) ```html - - v-model="group" + +

{{group1}}

+全选 +取消全选 +反选 ``` ```javascript @@ -25,6 +30,11 @@ mounted(){ setTimeout(() => { this.group.push('选项B') }, 2000); +}, +methods:{ + checkAll(state){ + this.$refs.checkboxGroup.toggleAll(state); + } } ``` v-model绑定的数组选项对应data的value值，控制选项是否选中，如代码所示，‘选项A’被勾选。如果group为空那么所有选项未选中。 @@ -224,3 +234,11 @@ methods: { |----- | ----- | ----- | change | 值变化时触发 | 当前已选中项的状态（values），当前选中项值（label），event +## CheckboxGroup 方法 + +#### 通过 ref 可以获取到 CheckboxGroup 实例并调用实例方法 + +| 方法名 | 说明 | 参数 +|----- | ----- | ----- +| toggleAll | 切换所有复选框的选中状态 | checked?: boolean + From 8833bf06f2f321a8259497bd93bcd11f4e80ef52 Mon Sep 17 00:00:00 2001 From: richard1015 <51844712@qq.com> Date: Mon, 23 Dec 2019 10:15:03 +0800 Subject: [PATCH 02/21] =?UTF-8?q?feat=EF=BC=9Auploader=E4=B8=8A=E4=BC=A0?= =?UTF-8?q?=E7=BB=84=E4=BB=B6=E6=94=AF=E6=8C=81withCredentials=E5=8F=82?= =?UTF-8?q?=E6=95=B0=20#190?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/packages/uploader/doc.md | 1 + src/packages/uploader/uploader.vue | 5 +++++ src/utils/uploader.js | 3 ++- 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/packages/uploader/doc.md b/src/packages/uploader/doc.md index a5a02339c0..3d4cb6a78e 100644 --- a/src/packages/uploader/doc.md +++ b/src/packages/uploader/doc.md @@ -157,6 +157,7 @@ export default { | typeError | 文件类型错误提示文案 | String | "不支持上传该类型文件" | limitError | 文件大小超过限制提示文案 | String | "文件大小超过限制" | xmlError | 浏览器不支持本组件时的提示文案 | String | "对不起，您的浏览器不支持本组件！" +| withCredentials | 支持发送 cookie 凭证信息 | Boolean | fasle ## Event diff --git a/src/packages/uploader/uploader.vue b/src/packages/uploader/uploader.vue index e5f82877f0..41bb07a250 100644 --- a/src/packages/uploader/uploader.vue +++ b/src/packages/uploader/uploader.vue @@ -71,6 +71,10 @@ export default { limitError: { type: String, default: '' + }, + withCredentials: { + type: Boolean, + default: false } }, data() { @@ -90,6 +94,7 @@ export default { acceptType: this.acceptType, //允许上传的文件类型 xhrState: this.xhrState, clearInput: this.clearInput, + withCredentials: this.withCredentials,//支持发送 cookie 凭证信息 xmlError: this.xmlError || this.nutTranslate('lang.uploader.xmlError'), typeError: this.typeError || this.nutTranslate('lang.uploader.typeError'), limitError: this.limitError || this.nutTranslate('lang.uploader.limitError'), diff --git a/src/utils/uploader.js b/src/utils/uploader.js index ea5018057b..3388d29fff 100644 --- a/src/utils/uploader.js +++ b/src/utils/uploader.js @@ -5,6 +5,7 @@ class IdaUploader { url: '', formData: null, headers: {}, //自定义headers + withCredentials:false,//支持发送 cookie 凭证信息 isPreview: true, //是否开启本地预览 previewData: null, maxSize: 0, //允许上传的文件最大字节,0为不限制 @@ -92,7 +93,7 @@ class IdaUploader { } } }; - xhr.withCredentials = true; + xhr.withCredentials = options.withCredentials; xhr.open('POST', options.url, true); // headers for (let key in options.headers) { From 270281996a9e6d578151b6a0ca559a1d9b54fa7d Mon Sep 17 00:00:00 2001 From: richard1015 <51844712@qq.com> Date: Mon, 23 Dec 2019 10:57:27 +0800 Subject: [PATCH 03/21] =?UTF-8?q?fix=EF=BC=9A=E4=BF=AE=E5=A4=8Dnut-col?= =?UTF-8?q?=E7=BB=84=E4=BB=B6=E4=B8=AD=E6=96=87=E5=AD=97=E8=B6=85=E5=87=BA?= =?UTF-8?q?=E6=97=B6=E6=A0=B7=E5=BC=8F=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/packages/col/col.scss | 1 + src/packages/flex/demo.vue | 7 +++---- src/packages/flex/doc.md | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/packages/col/col.scss b/src/packages/col/col.scss index dce97d8549..a49a5013e7 100644 --- a/src/packages/col/col.scss +++ b/src/packages/col/col.scss @@ -11,6 +11,7 @@ .nut-col{ float: left; box-sizing: border-box; + word-break: break-all; } @for $i from 1 through 24 { diff --git a/src/packages/flex/demo.vue b/src/packages/flex/demo.vue index 984f29afe3..875491701a 100644 --- a/src/packages/flex/demo.vue +++ b/src/packages/flex/demo.vue @@ -229,7 +229,7 @@
1
-
顶部对齐 -- flex-start
+
顶部对齐 - flex-start
3
@@ -242,7 +242,7 @@
1
 -
居中对齐 -- center
+
居中对齐 - center
3
@@ -255,7 +255,7 @@
1
 -
底部对齐 -- flex-end
+
底部对齐 - flex-end
3
@@ -328,7 +328,6 @@ export default { margin-bottom: 10px; } .flex-content { - height: 30px; line-height: 30px; color: #fff; text-align: center; diff --git a/src/packages/flex/doc.md b/src/packages/flex/doc.md index fe5c407b44..86f78232fa 100644 --- a/src/packages/flex/doc.md +++ b/src/packages/flex/doc.md @@ -147,17 +147,17 @@ ```html -
顶部对齐 -- flex-start
+
顶部对齐 - flex-start
 -
居中对齐 -- center
+
居中对齐 - center
 -
底部对齐 -- flex-end
+
底部对齐 - flex-end
 From 17b4b7922b636823e0e5e92a2c2f4e03e024274e Mon Sep 17 00:00:00 2001 From: richard1015 <51844712@qq.com> Date: Mon, 23 Dec 2019 15:03:14 +0800 Subject: [PATCH 04/21] =?UTF-8?q?fix=EF=BC=9A=E4=BF=AE=E5=A4=8Dimagepicker?= =?UTF-8?q?=E4=B8=ADimgList=E5=8F=8C=E5=90=91=E7=BB=91=E5=AE=9A=E9=97=AE?= =?UTF-8?q?=E9=A2=98=20#187?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/packages/imagepicker/demo.vue | 9 +++++---- src/packages/imagepicker/doc.md | 9 +++++---- src/packages/imagepicker/imagepicker.vue | 1 + 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/src/packages/imagepicker/demo.vue b/src/packages/imagepicker/demo.vue index c5db17c390..c8536afa38 100644 --- a/src/packages/imagepicker/demo.vue +++ b/src/packages/imagepicker/demo.vue @@ -1,15 +1,15 @@ + + \ No newline at end of file diff --git a/src/packages/textbox/doc.md b/src/packages/textbox/doc.md new file mode 100644 index 0000000000..08645ca188 --- /dev/null +++ b/src/packages/textbox/doc.md @@ -0,0 +1,93 @@ +# TextBox 文本域输入 + +多行文本输入框，支持字数提示、字数限制等功能。 + +## 基本用法 +```html + +``` +## 自定义高度 +```html + + +``` +## 自定义提示语 +```html + + +``` +## 自定义字数限制 +```html + + +``` +## 限制字数不可超出 +```html + + +``` +## 字数超出报错 +```html + + +``` +## 自定义文本框背景色 +```html + +``` + +## 不显示字数限制 +```html + +``` + +## 输入回调返回文字 +```html + +``` +```javascript +export default { + data() { + return { + val: "" + }; + }, + methods: { + onFocus() { + console.log("focus事件触发！"); + }, + onBlur() { + console.log("blur事件触发！"); + } + } +}; +``` + +## Prop + +| 字段 | 说明 | 类型 | 默认值 +|----- | ----- | ----- | ----- +| txtAreaH | 文本框高度 | Number | 1rem +| placeText | 自定义placeholder文案提示 | String | 请您在此输 +| maxNum | 最大字数 | Number | 50 +| switchMax | 控制字数超出是否不可输入，注意：最大字数限制，请设置maxNum | Boolean | false +| textBgColor | 设置输入框背景色 | String | #fff +| limitShow | 不显示字数限制 | Boolean | true + +## Event + +| 字段 | 说明 | 回调参数 +|----- | ----- | ----- +| errorFunc | 输入字数超过限定字数时触发事件 | -- +| inputText | 文字输入事件回调，默认传回输入文本 | -- diff --git a/src/packages/textbox/index.js b/src/packages/textbox/index.js new file mode 100644 index 0000000000..194c26e0e8 --- /dev/null +++ b/src/packages/textbox/index.js @@ -0,0 +1,10 @@ +import TextBox from './textbox.vue'; +import './textbox.scss'; + + +console.log(TextBox.name) +TextBox.install = function(Vue) { + Vue.component(TextBox.name, TextBox); +}; + +export default TextBox diff --git a/src/packages/textbox/textbox.scss b/src/packages/textbox/textbox.scss new file mode 100644 index 0000000000..dc9e12f2da --- /dev/null +++ b/src/packages/textbox/textbox.scss @@ -0,0 +1,34 @@ +.nut-textbox{ + background:#fff; + .txt-area{ + border: 1px solid #ececee; + padding: 5px 20px 5px 10px;; + position: relative; + &.num-none{ + padding:10px 20px; + } + textarea{ + resize: none; + width: 100%; + border: none; + outline: none; + margin: 0; + padding: 0; + background: transparent; + display:block; + } + span{ + color: #666; + position: absolute; + right: 10px; + bottom: 5px; + font-size:12px; + } + &.error{ + border:1px solid #e2231a; + span{ + color:#e2231a; + } + } + } +} \ No newline at end of file diff --git a/src/packages/textbox/textbox.vue b/src/packages/textbox/textbox.vue new file mode 100644 index 0000000000..4a1f122610 --- /dev/null +++ b/src/packages/textbox/textbox.vue @@ -0,0 +1,75 @@ + + From 8980ffbe16de11b77032068016601be89690e1f0 Mon Sep 17 00:00:00 2001 From: richard1015 <51844712@qq.com> Date: Fri, 27 Dec 2019 16:01:40 +0800 Subject: [PATCH 07/21] =?UTF-8?q?doc=EF=BC=9A=E5=A2=9E=E5=8A=A0cdn?= =?UTF-8?q?=E6=8C=89=E9=9C=80=E5=8A=A0=E8=BD=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docs/start.md | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/docs/start.md b/docs/start.md index 12c3d841b1..f4cf3eb2b6 100644 --- a/docs/start.md +++ b/docs/start.md @@ -86,6 +86,41 @@ CDN 引入示例 ``` +CDN 按需加载引入示例 + +```html + + + + + + + + +
+ cdn按需加载 +
+ + + + + + + + + + + +``` + > 在页面中直接引入，将无法使用 **主题定制** 等功能。我们推荐使用 *NPM* 或 *YARN* 方式安装，不推荐在页面中直接引入的用法 * 通过 **Vue CLI** 图形化界面安装 From 390058165f50a6e59f815bb83a86fe04efd3e70e Mon Sep 17 00:00:00 2001 From: zhenyulei Date: Mon, 30 Dec 2019 14:22:29 +0800 Subject: [PATCH 08/21] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=94=B5=E6=A2=AF?= =?UTF-8?q?=E6=A5=BC=E5=B1=82=E7=BB=84=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 2 +- src/config.json | 10 ++ src/nutui.js | 5 +- src/packages/elevator/demo.vue | 239 ++++++++++++++++++++++++++++ src/packages/elevator/doc.md | 53 ++++++ src/packages/elevator/elevator.scss | 62 ++++++++ src/packages/elevator/elevator.vue | 156 ++++++++++++++++++ src/packages/elevator/index.js | 8 + types/nutui.d.ts | 1 + 9 files changed, 534 insertions(+), 2 deletions(-) create mode 100644 src/packages/elevator/demo.vue create mode 100644 src/packages/elevator/doc.md create mode 100644 src/packages/elevator/elevator.scss create mode 100644 src/packages/elevator/elevator.vue create mode 100644 src/packages/elevator/index.js diff --git a/package.json b/package.json index e7007a89e7..4a2543f4b8 100644 --- a/package.json +++ b/package.json @@ -162,4 +162,4 @@ "instrument": false, "sourceMap": false } -} \ No newline at end of file +} diff --git a/src/config.json b/src/config.json index b8c26dead5..0e4b25027b 100644 --- a/src/config.json +++ b/src/config.json @@ -482,6 +482,16 @@ "sort": "1", "showDemo": true, "author": "guoxiaoxiao" + }, + { + "version": "1.0.0", + "name": "Elevator", + "chnName": "电梯楼层组件", + "desc": "类似于电梯楼层，组件可以跟着右侧索引而滑动", + "type": "component", + "sort": "3", + "showDemo": true, + "author": "zhenyulei" } ] } \ No newline at end of file diff --git a/src/nutui.js b/src/nutui.js index ea8ea23b0a..16f1eb558b 100644 --- a/src/nutui.js +++ b/src/nutui.js @@ -92,6 +92,8 @@ import "./packages/avatar/avatar.scss"; import Lazyload from "./packages/lazyload/index.js"; import "./packages/textbox/textbox.scss"; import TextBox from "./packages/textbox/index.js"; +import Elevator from "./packages/elevator/index.js"; +import "./packages/elevator/elevator.scss"; const packages = { Cell, @@ -139,7 +141,7 @@ const packages = { TextInput, TextBox, Avatar, - + Elevator: Elevator }; const components = {}; @@ -149,6 +151,7 @@ const directives = {}; pkgList.map(item => { const pkg = packages[item.name]; if (!pkg) return; + if (item.type == 'component') { if (pkg.name) { components[pkg.name] = pkg; diff --git a/src/packages/elevator/demo.vue b/src/packages/elevator/demo.vue new file mode 100644 index 0000000000..b832f28111 --- /dev/null +++ b/src/packages/elevator/demo.vue @@ -0,0 +1,239 @@ + + + + + diff --git a/src/packages/elevator/doc.md b/src/packages/elevator/doc.md new file mode 100644 index 0000000000..2c8df5b5c6 --- /dev/null +++ b/src/packages/elevator/doc.md @@ -0,0 +1,53 @@ +# Elevator 电梯楼层组件 + +## 基本用法 + +```html + +``` +数据类型 +```js +dataList:[ + { + title:"A", + list:[//可以为空数组 + { + name:'安其拉', + id:'a1'//id字段可以没有 + }, + { + name:'安琪', + id:'a2' + } + ] + } +] +``` + +## Prop + +| 参数 | 说明 | 类型 | 默认值|可选值| +|----- | ----- | ----- | ----- |---| +| dataArray | 渲染楼层数据，为必填项 | Array | []| --| +| showIndicator | 是否显示索引值提示符 | Boolean | -- | --| +| hiddenTime | 索引值提示符显示的时间，单位ms | Number | 500 | --| +| navHeight | 索引栏每个索引区域的高度，单位rem | Number | 0.8 | --| +| initIndex | 进入页面后，当前定位到的索引值 | Number | 0 | --| +| otherHeight| 显示组件区域外部的高度，比如title区域高度，单位px|Number|40|--| + +## Events +|事件名|说明|回调参数| +|clickNav|点击/离开索引栏时的回调函数|返回点击的索引值和title| +|clickList|点击左侧列表时的回调函数|返回点击的对象数据和所在区域的对象数据| + + + + diff --git a/src/packages/elevator/elevator.scss b/src/packages/elevator/elevator.scss new file mode 100644 index 0000000000..7fff159713 --- /dev/null +++ b/src/packages/elevator/elevator.scss @@ -0,0 +1,62 @@ +.nut-elevator{ + overflow: scroll; + background:#FFF; +} +.nut-elevator-ul{ + width: 100%; + padding:0px; + margin:0px; +} +.nut-list-title{ + list-style-type:none; + width:100%; + margin-bottom:20px; +} +.nut-list-h{ + height: 30px; + line-height: 30px; + padding-left: 20px; + background: #eee; + margin: 0px; +} +.nut-people-list{ + padding: 0px; + padding-left: 20px; +} +.nut-list-name{ + list-style-type:none; + height: 40px; + line-height: 40px; + border-bottom: 1px solid #ccc; +} +.nut-elevator-nav{ + background: #fff; + text-align: center; + border:1px solid #ccc; + width: 50px; + position:fixed; + top:50%; + right: 0px; + transform:translate(0, -50%); + padding: 0px; + z-index: 100; + .nut-nav-list{ + list-style-type:none; + height: 40px; + line-height: 40px; + } +} +.nut-big-box{ + width: 26px; + height: 26px; + background: #000; + opacity: 0.7; + position: absolute; + top: 50%; + left: 50%; + transform:translate(-50%, -50%); + text-align: center; + line-height: 26px; + color:#fff; + font-family: bold; +} \ No newline at end of file diff --git a/src/packages/elevator/elevator.vue b/src/packages/elevator/elevator.vue new file mode 100644 index 0000000000..92035af007 --- /dev/null +++ b/src/packages/elevator/elevator.vue @@ -0,0 +1,156 @@ + + \ No newline at end of file diff --git a/src/packages/elevator/index.js b/src/packages/elevator/index.js new file mode 100644 index 0000000000..5d152e9a77 --- /dev/null +++ b/src/packages/elevator/index.js @@ -0,0 +1,8 @@ +import Elevator from './elevator.vue'; +import './elevator.scss'; + +Elevator.install = function(Vue) { + Vue.component(Elevator.name, Elevator); +}; + +export default Elevator \ No newline at end of file diff --git a/types/nutui.d.ts b/types/nutui.d.ts index c26b5e1f6d..69fbba1c5d 100644 --- a/types/nutui.d.ts +++ b/types/nutui.d.ts @@ -63,3 +63,4 @@ export declare class TextInput extends UIComponent {} export declare class Avatar extends UIComponent {} export declare class Infiniteloading extends UIComponent {} export declare class Lazyload extends UIComponent {} +export declare class Elevator extends UIComponent {} From b1f8084a1536ac4a7ddf4e558b34ed4dab0deb81 Mon Sep 17 00:00:00 2001 From: zhenyulei Date: Mon, 30 Dec 2019 14:36:44 +0800 Subject: [PATCH 09/21] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=94=B5=E6=A2=AF?= =?UTF-8?q?=E6=A5=BC=E5=B1=82=E7=BB=84=E4=BB=B6=E6=96=87=E6=A1=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/packages/elevator/doc.md | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/packages/elevator/doc.md b/src/packages/elevator/doc.md index 2c8df5b5c6..bfbb47ee55 100644 --- a/src/packages/elevator/doc.md +++ b/src/packages/elevator/doc.md @@ -6,12 +6,14 @@ + > + ``` 数据类型 ```js @@ -39,12 +41,13 @@ dataList:[ | dataArray | 渲染楼层数据，为必填项 | Array | []| --| | showIndicator | 是否显示索引值提示符 | Boolean | -- | --| | hiddenTime | 索引值提示符显示的时间，单位ms | Number | 500 | --| -| navHeight | 索引栏每个索引区域的高度，单位rem | Number | 0.8 | --| +| navHeight | 索引栏每个索引区域的高度，单位px | Number | 40 | --| | initIndex | 进入页面后，当前定位到的索引值 | Number | 0 | --| | otherHeight| 显示组件区域外部的高度，比如title区域高度，单位px|Number|40|--| ## Events |事件名|说明|回调参数| +|--|--|--| |clickNav|点击/离开索引栏时的回调函数|返回点击的索引值和title| |clickList|点击左侧列表时的回调函数|返回点击的对象数据和所在区域的对象数据| From 14bdc382019072b95b2e677f5b397e843644c42c Mon Sep 17 00:00:00 2001 From: richard1015 <51844712@qq.com> Date: Tue, 31 Dec 2019 11:29:18 +0800 Subject: [PATCH 10/21] =?UTF-8?q?doc:swpier=20=E6=96=87=E6=A1=A3=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/packages/swiper/doc.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/packages/swiper/doc.md b/src/packages/swiper/doc.md index ce330286ff..cc789faf8a 100644 --- a/src/packages/swiper/doc.md +++ b/src/packages/swiper/doc.md @@ -155,7 +155,7 @@ | initPage | 设置初始时候显示的页 | Number | 1 | lazyLoad | 是否懒加载图片 | Boolean | false | lazyLoadUrl | 懒加载的默认展示图片 | String | - -| swiperData | 异步数据渲染slide时，必须绑定对应数组 | Array | - +| swiperData | 异步数据渲染slide时，必须绑定对应数组（v2.1.7以上支持） | Array | - ## Methods From cc1ef7efd3212e701684816ca940ec51e1f07476 Mon Sep 17 00:00:00 2001 From: guoxiao158 Date: Tue, 31 Dec 2019 14:53:44 +0800 Subject: [PATCH 11/21] =?UTF-8?q?fix=EF=BC=9A=E4=BF=AE=E5=A4=8Dtoast?= =?UTF-8?q?=E5=A4=9A=E5=AE=9E=E4=BE=8B=E5=85=B3=E9=97=AD=E4=BA=8B=E4=BB=B6?= =?UTF-8?q?=E5=86=B2=E7=AA=81=20#181?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/packages/dialog/dialog.vue | 2 +- src/packages/textbox/demo.vue | 16 ++++++++-------- src/packages/toast/_toast.js | 2 +- src/packages/toast/toast.vue | 4 ++-- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/packages/dialog/dialog.vue b/src/packages/dialog/dialog.vue index d0a12747a2..b8b1de74b8 100644 --- a/src/packages/dialog/dialog.vue +++ b/src/packages/dialog/dialog.vue @@ -79,7 +79,7 @@ export default { mixins: [locale], props: { id: { - default: null + default: "" }, title: { default: "" diff --git a/src/packages/textbox/demo.vue b/src/packages/textbox/demo.vue index 49bff37385..8262f65f8a 100644 --- a/src/packages/textbox/demo.vue +++ b/src/packages/textbox/demo.vue @@ -1,31 +1,31 @@