From ab6f3efa6f8ca65beb21b18ac638a353c8f97372 Mon Sep 17 00:00:00 2001 From: yangxiaolu3 <962468124@qq.com> Date: Thu, 29 Dec 2022 19:19:05 +0800 Subject: [PATCH 01/33] fix: popover --- src/packages/__VUE/popover/demo.vue | 2 +- src/packages/__VUE/popover/index.scss | 2 +- src/packages/__VUE/popover/index.taro.vue | 42 +++++++------------ src/packages/__VUE/popup/index.vue | 2 + src/packages/__VUE/popup/props.ts | 7 ++++ .../src/exhibition/pages/popover/index.vue | 15 ++++++- 6 files changed, 39 insertions(+), 31 deletions(-) diff --git a/src/packages/__VUE/popover/demo.vue b/src/packages/__VUE/popover/demo.vue index 9d7d0bb644..14bff3b9d7 100644 --- a/src/packages/__VUE/popover/demo.vue +++ b/src/packages/__VUE/popover/demo.vue @@ -47,7 +47,7 @@ - diff --git a/src/packages/__VUE/popup/index.vue b/src/packages/__VUE/popup/index.vue index 10f5aced7c..2e2923babf 100644 --- a/src/packages/__VUE/popup/index.vue +++ b/src/packages/__VUE/popup/index.vue @@ -7,6 +7,8 @@ :z-index="zIndex" :lock-scroll="lockScroll" :duration="duration" + :overlay-class="overlayClass" + :overlay-style="overlayStyle" @click="onClickOverlay" v-bind="$attrs" /> diff --git a/src/packages/__VUE/popup/props.ts b/src/packages/__VUE/popup/props.ts index 10ed1b5339..30c86a18e7 100644 --- a/src/packages/__VUE/popup/props.ts +++ b/src/packages/__VUE/popup/props.ts @@ -71,5 +71,12 @@ export const popupProps = { safeAreaInsetBottom: { type: Boolean, default: false + }, + overlayClass: { + type: String, + default: '' + }, + overlayStyle: { + type: Object as PropType } }; diff --git a/src/sites/mobile-taro/vue/src/exhibition/pages/popover/index.vue b/src/sites/mobile-taro/vue/src/exhibition/pages/popover/index.vue index fa5b9ec2c0..a16e6ca91a 100644 --- a/src/sites/mobile-taro/vue/src/exhibition/pages/popover/index.vue +++ b/src/sites/mobile-taro/vue/src/exhibition/pages/popover/index.vue @@ -45,7 +45,8 @@ - - + + + @@ -141,7 +138,6 @@ export default create({ default: false }, leftIcon: { type: Object || String, default: () => Notice }, - rightIcon: { type: Object || String, default: '' }, color: { type: String, default: '' diff --git a/src/sites/mobile-taro/vue/project.private.config.json b/src/sites/mobile-taro/vue/project.private.config.json index 578944c46f..39f7acfbef 100644 --- a/src/sites/mobile-taro/vue/project.private.config.json +++ b/src/sites/mobile-taro/vue/project.private.config.json @@ -15,7 +15,7 @@ }, { "name": "exhibition/pages/popover/index", - "pathName": "exhibition/pages/popover/index", + "pathName": "exhibition/pages/noticebar/index", "query": "", "launchMode": "default", "scene": null From 0d84f108ba9af88fd36ecf365e868d07b37d15c1 Mon Sep 17 00:00:00 2001 From: yangxiaolu3 <962468124@qq.com> Date: Tue, 3 Jan 2023 15:12:18 +0800 Subject: [PATCH 08/33] =?UTF-8?q?feat:=20=E7=BB=84=E4=BB=B6=E6=96=87?= =?UTF-8?q?=E6=A1=A3=E4=BF=AE=E6=94=B9picker?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/packages/__VUE/audio/demo.vue | 3 +- src/packages/__VUE/audio/doc.en-US.md | 12 ++-- src/packages/__VUE/audio/doc.md | 14 ++-- src/packages/__VUE/audio/doc.taro.md | 2 +- src/packages/__VUE/audio/index.scss | 2 +- src/packages/__VUE/picker/doc.en-US.md | 64 +++++++++---------- src/packages/__VUE/picker/doc.md | 88 +++++++++++++------------- src/packages/__VUE/picker/doc.taro.md | 70 ++++++++++---------- 8 files changed, 127 insertions(+), 128 deletions(-) diff --git a/src/packages/__VUE/audio/demo.vue b/src/packages/__VUE/audio/demo.vue index 77fc0ded27..45303fbb4b 100644 --- a/src/packages/__VUE/audio/demo.vue +++ b/src/packages/__VUE/audio/demo.vue @@ -22,7 +22,7 @@ ref="audioDemo" >
-
+
{{ duration }}"
@@ -181,6 +181,7 @@ export default createDemo({ .nut-voice { display: flex; justify-content: space-between; + align-items: center; width: 100px; height: 20px; padding: 8px; diff --git a/src/packages/__VUE/audio/doc.en-US.md b/src/packages/__VUE/audio/doc.en-US.md index 944deaed87..b2a9df3e15 100644 --- a/src/packages/__VUE/audio/doc.en-US.md +++ b/src/packages/__VUE/audio/doc.en-US.md @@ -240,12 +240,12 @@ export default { | Attribute | Description | Type | Default | |--------------|----------------------------------|--------|------------------| -| url | Audio Url | String | '' | -| muted | Whether to be muted | Boolean | false | -| autoplay | Whether to autoplay | Boolean | false | -| loop | Whether to loop playback | Boolean | false | -| preload | Whether to proload audio | String | 'auto' | -| type | Show type| String | 'progress' | +| url | Audio Url | string | `''` | +| muted | Whether to be muted | boolean | `false` | +| autoplay | Whether to autoplay | boolean | `false` | +| loop | Whether to loop playback | boolean | `false` | +| preload | Whether to proload audio | string | `auto` | +| type | Show type| String | `progress` | ### Events diff --git a/src/packages/__VUE/audio/doc.md b/src/packages/__VUE/audio/doc.md index 3a47153054..a3592df8d4 100644 --- a/src/packages/__VUE/audio/doc.md +++ b/src/packages/__VUE/audio/doc.md @@ -112,7 +112,6 @@ export default { ### 进度条展示 :::demo - ```html diff --git a/src/packages/__VUE/sku/index.scss b/src/packages/__VUE/sku/index.scss index 791b8ee6d2..3df6a5255e 100644 --- a/src/packages/__VUE/sku/index.scss +++ b/src/packages/__VUE/sku/index.scss @@ -50,7 +50,7 @@ flex-shrink: 0; margin-top: 18px; padding: 0 18px; - > img { + .nut-sku-header-img { width: $sku-product-img-width; height: $sku-product-img-height; flex-shrink: 0; diff --git a/src/packages/__VUE/sku/index.taro.vue b/src/packages/__VUE/sku/index.taro.vue index dfce3fa2aa..825aabda35 100644 --- a/src/packages/__VUE/sku/index.taro.vue +++ b/src/packages/__VUE/sku/index.taro.vue @@ -63,7 +63,7 @@ diff --git a/src/sites/mobile-taro/vue/src/dentry/pages/cascader/index.vue b/src/sites/mobile-taro/vue/src/dentry/pages/cascader/index.vue index a451ce9362..f74158c333 100644 --- a/src/sites/mobile-taro/vue/src/dentry/pages/cascader/index.vue +++ b/src/sites/mobile-taro/vue/src/dentry/pages/cascader/index.vue @@ -186,7 +186,7 @@ export default { { value: value3, text: value3, leaf: level >= 6 } ]); } - }, 2000); + }, 3000); } }); From 9eed9759b19c98047d6a193ff0b21571b9a53b73 Mon Sep 17 00:00:00 2001 From: yangxiaolu3 <962468124@qq.com> Date: Sat, 7 Jan 2023 17:53:43 +0800 Subject: [PATCH 22/33] =?UTF-8?q?feat:=20picker=E6=96=87=E6=A1=88=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/__VUE/picker/doc.en-US.md | 14 +++++++------- src/packages/__VUE/picker/doc.md | 14 +++++++------- src/packages/__VUE/picker/doc.taro.md | 14 +++++++------- 3 files changed, 21 insertions(+), 21 deletions(-) diff --git a/src/packages/__VUE/picker/doc.en-US.md b/src/packages/__VUE/picker/doc.en-US.md index 64bed7ecaf..cfa959cb5a 100644 --- a/src/packages/__VUE/picker/doc.en-US.md +++ b/src/packages/__VUE/picker/doc.en-US.md @@ -22,7 +22,7 @@ app.use(Picker); - ``` ::: @@ -107,7 +102,7 @@ The value of `headerType` allows you to set the image to be displayed in multipl - ``` ::: @@ -148,7 +143,7 @@ export default { > - ``` ::: ## API diff --git a/src/packages/__VUE/comment/doc.md b/src/packages/__VUE/comment/doc.md index 38d3762e0e..5be2985e40 100644 --- a/src/packages/__VUE/comment/doc.md +++ b/src/packages/__VUE/comment/doc.md @@ -26,7 +26,6 @@ app.use(Comment); :images="cmt.images" :videos="cmt.videos" :info="cmt.info" - :labels="labels" @click="handleclick" @clickImages="clickImages" :operation="['replay']" @@ -39,15 +38,12 @@ app.use(Comment); - ``` ::: @@ -107,7 +102,7 @@ export default { - ``` ::: @@ -148,7 +143,7 @@ export default { > - ``` ::: ## API diff --git a/src/packages/__VUE/comment/doc.taro.md b/src/packages/__VUE/comment/doc.taro.md index 2be56ac9f9..da0618562a 100644 --- a/src/packages/__VUE/comment/doc.taro.md +++ b/src/packages/__VUE/comment/doc.taro.md @@ -26,7 +26,6 @@ app.use(Comment); :images="cmt.images" :videos="cmt.videos" :info="cmt.info" - :labels="labels" @click="handleclick" @clickImages="clickImages" :operation="['replay']" @@ -39,15 +38,12 @@ app.use(Comment); - ``` ::: @@ -107,7 +102,7 @@ export default { - ``` ::: @@ -148,7 +143,7 @@ export default { > - ``` ::: ## API diff --git a/src/packages/__VUE/countdown/doc.en-US.md b/src/packages/__VUE/countdown/doc.en-US.md index 595525a4a9..115c793c3f 100644 --- a/src/packages/__VUE/countdown/doc.en-US.md +++ b/src/packages/__VUE/countdown/doc.en-US.md @@ -286,12 +286,7 @@ Paused and restarted the countdown with the `paused` attribute const reset = () => { Countdown.value.reset(); }; - return { - toggle, - onpaused, - onrestart, - ...toRefs(state) - }; + return {Countdown,start,pause,reset}; } } diff --git a/src/packages/__VUE/countdown/doc.md b/src/packages/__VUE/countdown/doc.md index b7b5b7b7ea..08b068a1b3 100644 --- a/src/packages/__VUE/countdown/doc.md +++ b/src/packages/__VUE/countdown/doc.md @@ -289,16 +289,13 @@ app.use(Countdown); const reset = () => { Countdown.value.reset(); }; - return { - toggle, - onpaused, - onrestart, - ...toRefs(state) - }; + return {Countdown,start,pause,reset}; } } + + ``` ::: ## API diff --git a/src/packages/__VUE/countdown/doc.taro.md b/src/packages/__VUE/countdown/doc.taro.md index edca7f8fd4..4922ccd1d2 100644 --- a/src/packages/__VUE/countdown/doc.taro.md +++ b/src/packages/__VUE/countdown/doc.taro.md @@ -289,16 +289,13 @@ app.use(Countdown); const reset = () => { Countdown.value.reset(); }; - return { - toggle, - onpaused, - onrestart, - ...toRefs(state) - }; + return {Countdown,start,pause,reset}; } } + + ``` ::: ## API diff --git a/src/packages/__VUE/datepicker/doc.en-US.md b/src/packages/__VUE/datepicker/doc.en-US.md index 1c23dfcf49..efbf89d379 100644 --- a/src/packages/__VUE/datepicker/doc.en-US.md +++ b/src/packages/__VUE/datepicker/doc.en-US.md @@ -29,7 +29,7 @@ app.use(DatePicker); > - @@ -389,7 +389,6 @@ Use the children field of the Columns attribute to cascade options | ok-text | Text of confirm button | string | `confirm` | | three-dimensional | Turn on 3D effects | boolean | `true` | | swipe-duration | Duration of the momentum animation | number \| string | `1000` | -| safe-area-inset-bottom | Whether to enable iPhone series full screen bottom safety zone adaptation, which is only valid when `position` is `bottom` | boolean |`false` | | visible-option-num | Count of visible columns | number \| string | `7` | | option-height | Option height | number \| string | `36` | | show-toolbar | Whether to show toolbar | boolean | `true` | @@ -407,9 +406,9 @@ Use the children field of the Columns attribute to cascade options | Event | Description | Arguments | |--------|----------------|--------------| -| confirm | Emitted when click confirm button. | { selectedValue, selectedOptions } | -| cancel | Emitted when click close button. | { selectedValue, selectedOptions } | -| change | Emitted when current option changed. | { columnIndex, selectedValue, selectedOptions } | +| confirm | Emitted when click confirm button. | `{ selectedValue, selectedOptions }` | +| cancel | Emitted when click close button. | `{ selectedValue, selectedOptions }` | +| change | Emitted when current option changed. | `{ columnIndex, selectedValue, selectedOptions }` | ### Slots @@ -435,8 +434,6 @@ The component provides the following CSS variables, which can be used to customi | --nut-picker-bar-title-color| _var(--nut-title-color)_ | | --nut-picker-bar-title-font-weight| _normal_ | | --nut-picker-item-height| _36px_ | -| --nut-picker-item-text-color| _var(--nut-title-color)_ | -| --nut-picker-item-active-text-color| _inherit_ | +| --nut-picker-item-text-color| _var(--nut-title-color)_ | | --nut-picker-item-text-font-size| _14px_ | | --nut-picker-item-active-line-border| _1px solid #d8d8d8_ | -| --nut-picker-columns-item-color| _var(--nut-title-color)_ | diff --git a/src/packages/__VUE/picker/doc.md b/src/packages/__VUE/picker/doc.md index 3f7d097702..a8510a8848 100644 --- a/src/packages/__VUE/picker/doc.md +++ b/src/packages/__VUE/picker/doc.md @@ -90,7 +90,7 @@ Picker 通常作为用于辅助表单填写，可以搭配 Popup 实现效果。 show.value = false } - return {columns, confirm}; + return {show,popupDesc,columns, confirm,popupConfirm}; } }; @@ -383,7 +383,6 @@ Picker 通常作为用于辅助表单填写，可以搭配 Popup 实现效果。 | ok-text | 确定按钮文案 | string | `确定` | | three-dimensional | 是否开启3D效果 | boolean | `true` | | swipe-duration | 惯性滚动时长 | number \| string | `1000` | -| safe-area-inset-bottom | 是否开启 iphone 系列全面屏底部安全区适配,仅当 `position` 为 `bottom` 时有效 | boolean |`false` | | visible-option-num |可见的选项个数 | number \| string | `7` | | option-height | 选项高度 | number \| string | `36` | | show-toolbar | 是否显示顶部导航 | boolean | `true` | @@ -401,9 +400,9 @@ Picker 通常作为用于辅助表单填写，可以搭配 Popup 实现效果。 | 事件名 | 说明 | 回调参数 | |--------|----------------|--------------| -| confirm | 点击确定按钮时触发 | { selectedValue, selectedOptions } | -| cancel | 点击取消按钮时触发 | { selectedValue, selectedOptions } | -| change | 选项发生改变时触发 | { columnIndex, selectedValue, selectedOptions } | +| confirm | 点击确定按钮时触发 | `{ selectedValue, selectedOptions }` | +| cancel | 点击取消按钮时触发 | `{ selectedValue, selectedOptions }` | +| change | 选项发生改变时触发 | `{ columnIndex, selectedValue, selectedOptions }` | ### Slots @@ -430,7 +429,5 @@ Picker 通常作为用于辅助表单填写，可以搭配 Popup 实现效果。 | --nut-picker-bar-title-font-weight| _normal_ | | --nut-picker-item-height| _36px_ | | --nut-picker-item-text-color| _var(--nut-title-color)_ | -| --nut-picker-item-active-text-color| _inherit_ | | --nut-picker-item-text-font-size| _14px_ | -| --nut-picker-item-active-line-border| _1px solid #d8d8d8_ | -| --nut-picker-columns-item-color| _var(--nut-title-color)_ | \ No newline at end of file +| --nut-picker-item-active-line-border| _1px solid #d8d8d8_ | \ No newline at end of file diff --git a/src/packages/__VUE/picker/doc.taro.md b/src/packages/__VUE/picker/doc.taro.md index ccff99ae6d..5296938bb7 100644 --- a/src/packages/__VUE/picker/doc.taro.md +++ b/src/packages/__VUE/picker/doc.taro.md @@ -86,7 +86,7 @@ Picker 通常作为用于辅助表单填写，可以搭配 Popup 实现效果。 show.value = false } - return {columns, confirm}; + return {show,popupDesc,columns, confirm,popupConfirm}; } }; @@ -369,7 +369,6 @@ Picker 通常作为用于辅助表单填写，可以搭配 Popup 实现效果。 | ok-text | 确定按钮文案 | string | `确定` | | three-dimensional | 是否开启3D效果 | boolean | `true` | | swipe-duration | 惯性滚动时长 | number \| string | `1000` | -| safe-area-inset-bottom | 是否开启 iphone 系列全面屏底部安全区适配,仅当 `position` 为 `bottom` 时有效 | boolean |`false` | | visible-option-num |可见的选项个数 | number \| string |`7` | | option-height | 选项高度 | number \| string | `36` | | show-toolbar | 是否显示顶部导航 | boolean | `true` | @@ -387,9 +386,9 @@ Picker 通常作为用于辅助表单填写，可以搭配 Popup 实现效果。 | 事件名 | 说明 | 回调参数 | |--------|----------------|--------------| -| confirm | 点击确定按钮时触发 | { selectedValue, selectedOptions } | -| cancel | 点击取消按钮时触发 | { selectedValue, selectedOptions } | -| change | 选项发生改变时触发 | { columnIndex, selectedValue, selectedOptions } | +| confirm | 点击确定按钮时触发 | `{ selectedValue, selectedOptions }` | +| cancel | 点击取消按钮时触发 | `{ selectedValue, selectedOptions }` | +| change | 选项发生改变时触发 | `{ columnIndex, selectedValue, selectedOptions }` | ### Slots @@ -416,7 +415,5 @@ Picker 通常作为用于辅助表单填写，可以搭配 Popup 实现效果。 | --nut-picker-bar-title-font-weight| _normal_ | | --nut-picker-item-height| _36px_ | | --nut-picker-item-text-color| _var(--nut-title-color)_ | -| --nut-picker-item-active-text-color| _inherit_ | | --nut-picker-item-text-font-size| _14px_ | -| --nut-picker-item-active-line-border| _1px solid #d8d8d8_ | -| --nut-picker-columns-item-color| _var(--nut-title-color)_ | \ No newline at end of file +| --nut-picker-item-active-line-border| _1px solid #d8d8d8_ | \ No newline at end of file diff --git a/src/packages/styles/variables-jdb.scss b/src/packages/styles/variables-jdb.scss index f1655fb91d..1f41ad5b74 100644 --- a/src/packages/styles/variables-jdb.scss +++ b/src/packages/styles/variables-jdb.scss @@ -240,11 +240,8 @@ $picker-bar-title-color: $title-color !default; $picker-bar-title-font-weight: normal !default; $picker-item-height: 36px !default; $picker-item-text-color: $title-color !default; -$picker-item-active-text-color: inherit !default; $picker-item-text-font-size: 14px !default; $picker-item-active-line-border: 1px solid #d8d8d8 !default; -$picker-columns-item-color: $title-color !default; - //input $input-border-bottom: #eaf0fb !default; $input-disabled-color: #c8c9cc !default; diff --git a/src/packages/styles/variables-jddkh.scss b/src/packages/styles/variables-jddkh.scss index 8cf9a30b52..0ed98fddaa 100644 --- a/src/packages/styles/variables-jddkh.scss +++ b/src/packages/styles/variables-jddkh.scss @@ -171,10 +171,8 @@ $picker-bar-title-color: $title-color !default; $picker-bar-title-font-weight: normal !default; $picker-item-height: 36px !default; $picker-item-text-color: $title-color !default; -$picker-item-active-text-color: inherit !default; $picker-item-text-font-size: 14px !default; $picker-item-active-line-border: 1px solid #d8d8d8 !default; -$picker-columns-item-color: $title-color !default; //input $input-border-bottom: #eaf0fb !default; diff --git a/src/packages/styles/variables-jdt.scss b/src/packages/styles/variables-jdt.scss index ef9dc28a75..caa2a64629 100644 --- a/src/packages/styles/variables-jdt.scss +++ b/src/packages/styles/variables-jdt.scss @@ -172,10 +172,8 @@ $picker-bar-title-color: var(--nut-picker-bar-title-color, #323233) !default; $picker-bar-title-font-weight: var(--nut-picker-bar-title-font-weight, 600) !default; $picker-item-height: var(--nut-picker-item-height, 36px) !default; $picker-item-text-color: var(--nut-picker-item-text-color, $title-color) !default; -$picker-item-active-text-color: var(--nut-picker-item-active-text-color, $primary-color) !default; $picker-item-text-font-size: var(--nut-picker-item-text-font-size, 14px) !default; $picker-item-active-line-border: var(--nut-picker-item-active-line-border, 1px solid rgba(0, 0, 0, 0.06)) !default; -$picker-columns-item-color: var(--nut-picker-columns-item-color, $title-color) !default; //input $input-border-bottom: var(--nut-input-border-bottom, #eaf0fb) !default; diff --git a/src/packages/styles/variables.scss b/src/packages/styles/variables.scss index c760116107..b531da5e5f 100644 --- a/src/packages/styles/variables.scss +++ b/src/packages/styles/variables.scss @@ -191,10 +191,8 @@ $picker-bar-title-color: var(--nut-picker-bar-title-color, $title-color) !defaul $picker-bar-title-font-weight: var(--nut-picker-bar-title-font-weight, normal) !default; $picker-item-height: var(--nut-picker-item-height, 36px) !default; $picker-item-text-color: var(--nut-picker-item-text-color, $title-color) !default; -$picker-item-active-text-color: var(--nut-picker-item-active-text-color, inherit) !default; $picker-item-text-font-size: var(--nut-picker-item-text-font-size, 14px) !default; $picker-item-active-line-border: var(--nut-picker-item-active-line-border, 1px solid #eae7e7) !default; -$picker-columns-item-color: var(--nut-picker-columns-item-color, $title-color) !default; //input $input-border-bottom: var(--nut-input-border-bottom, #eaf0fb) !default; From e8a93738d70d6c7ac4878483abbb7b48534370d2 Mon Sep 17 00:00:00 2001 From: yangxiaolu3 <962468124@qq.com> Date: Sun, 8 Jan 2023 21:50:23 +0800 Subject: [PATCH 24/33] =?UTF-8?q?feat:=20=E6=96=87=E6=A1=88=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/__VUE/address/demo.vue | 3 - src/packages/__VUE/address/doc.en-US.md | 25 +- src/packages/__VUE/address/doc.md | 23 +- src/packages/__VUE/address/doc.taro.md | 21 +- src/packages/__VUE/comment/doc.taro.md | 40 +-- src/packages/__VUE/comment/index.scss | 5 + src/packages/__VUE/comment/index.taro.vue | 2 +- .../__VUE/infiniteloading/doc.en-US.md | 112 ++++++-- src/packages/__VUE/infiniteloading/doc.md | 112 ++++++-- src/packages/__VUE/infiniteloading/index.vue | 8 - src/packages/__VUE/noticebar/demo.vue | 8 +- src/packages/__VUE/noticebar/doc.en-US.md | 6 +- src/packages/__VUE/noticebar/doc.md | 6 +- src/packages/__VUE/noticebar/doc.taro.md | 13 +- src/packages/__VUE/noticebar/index.taro.vue | 9 +- src/packages/__VUE/noticebar/index.vue | 9 +- src/packages/__VUE/popover/doc.en-US.md | 260 ++++++++++-------- src/packages/__VUE/popover/doc.md | 248 ++++++++++------- src/packages/__VUE/popover/doc.taro.md | 244 +++++++++------- src/packages/__VUE/popover/index.taro.vue | 1 - src/packages/__VUE/popover/index.vue | 1 - src/packages/__VUE/pullrefresh/doc.en-US.md | 4 +- src/packages/__VUE/pullrefresh/doc.md | 4 +- src/packages/__VUE/pullrefresh/index.vue | 8 +- .../__VUE/sku/components/SkuHeader.vue | 6 +- .../__VUE/sku/components/SkuHeaderTaro.vue | 6 +- .../__VUE/sku/components/SkuStepper.vue | 5 + src/packages/__VUE/sku/demo.vue | 2 - src/packages/__VUE/sku/doc.en-US.md | 4 +- src/packages/__VUE/sku/doc.md | 4 +- src/packages/__VUE/sku/doc.taro.md | 76 ++--- .../vue/src/business/pages/address/index.vue | 1 - 32 files changed, 786 insertions(+), 490 deletions(-) diff --git a/src/packages/__VUE/address/demo.vue b/src/packages/__VUE/address/demo.vue index 3687ced164..78997b44ee 100644 --- a/src/packages/__VUE/address/demo.vue +++ b/src/packages/__VUE/address/demo.vue @@ -42,7 +42,6 @@ height="270px" @change="(cal) => onChange(cal, 'normal2')" @close="close5" - :columns-placeholder="placeholder" >

{{ translate('existAddress') }}

@@ -52,7 +51,6 @@ v-model:visible="exist" type="exist" :exist-address="existAddress" - @change="(cal) => onChange(cal, 'exist')" @close="close2" :is-show-custom-address="false" @selected="selected" @@ -65,7 +63,6 @@ v-model:visible="customImg" type="exist" :exist-address="existAddress" - @change="(cal) => onChange(cal, 'customImg')" @close="close3" :is-show-custom-address="false" @selected="selected" diff --git a/src/packages/__VUE/address/doc.en-US.md b/src/packages/__VUE/address/doc.en-US.md index 15f4cc7602..6dafc4fef6 100644 --- a/src/packages/__VUE/address/doc.en-US.md +++ b/src/packages/__VUE/address/doc.en-US.md @@ -2,8 +2,7 @@ ### Intro - - +Used for level four address selection ### Install ``` javascript @@ -162,14 +161,16 @@ If you want to select a province, you need to set the region ID in the order of @@ -421,6 +423,7 @@ If you want to select a province, you need to set the region ID in the order of custom-and-exist-title="Choose Other Address" @switch-module="switchModule" @close-mask="closeMask" + @change='onChange' > @@ -526,7 +536,8 @@ If you want to select a province, you need to set the region ID in the order of | Attribute | Description | Type | Default | |----- | ----- | ----- | ----- | -| v-model:visible | Whether to open address | string | `''`| +| v-model:visible | Whether to open address | boolean | `false` | +| v-model:value | Default value | Array | `[]` | | type | Choose type: `exist/custom/custom2` | string | `custom`| | province | Province data| Array | `[]`| | city | City data | Array | `[]`| diff --git a/src/packages/__VUE/address/doc.md b/src/packages/__VUE/address/doc.md index 374a4d2701..ff0603a73e 100644 --- a/src/packages/__VUE/address/doc.md +++ b/src/packages/__VUE/address/doc.md @@ -2,6 +2,8 @@ ### 介绍 +用于进行四级地址选择 + ### 安装 ``` javascript @@ -106,6 +108,7 @@ app.use(Address); export default { setup() { const showPopup = ref(false); + const value = ref([1, 7, 3]); const address = reactive({ province:[ { id: 1, name: '北京' }, @@ -160,14 +163,16 @@ app.use(Address); @@ -437,6 +444,7 @@ app.use(Address); custom-and-exist-title="选择其他地址" @switch-module="switchModule" @close-mask="closeMask" + @change='onChange' > @@ -543,7 +557,8 @@ app.use(Address); | 参数 | 说明 | 类型 | 默认值 | |----- | ----- | ----- | ----- | -| v-model:visible | 是否打开地址选择 | string | `''` | +| v-model:visible | 是否打开地址选择 | boolean | `false` | +| v-model:value | 设置默认选中值 | Array | `[]` | | type | 地址选择类型 `exist/custom/custom2` | string | `custom` | | province | 省，每个省的对象中，必须有 `name` 字段，如果类型选择 `custom2`，必须指定 `title` 字段为首字母 | Array | `[]` | | city | 市，每个市的对象中，必须有 `name` 字段，如果类型选择 `custom2`，必须指定 `title` 字段为首字母 | Array | `[]` | diff --git a/src/packages/__VUE/address/doc.taro.md b/src/packages/__VUE/address/doc.taro.md index e7683024d5..de9fb9c5a8 100644 --- a/src/packages/__VUE/address/doc.taro.md +++ b/src/packages/__VUE/address/doc.taro.md @@ -2,7 +2,7 @@ ### 介绍 - +用于进行四级地址选择 ### 安装 @@ -162,7 +162,9 @@ app.use(Address); @@ -545,7 +557,8 @@ app.use(Address); | 参数 | 说明 | 类型 | 默认值 | |----- | ----- | ----- | ----- | -| v-model:visible | 是否打开地址选择 | string | `''` | +| v-model:visible | 是否打开地址选择 | boolean | `false` | +| v-model:value | 设置默认选中值 | Array | `[]` | | type | 地址选择类型 `exist/custom/custom2` | string | `custom` | | province | 省，每个省的对象中，必须有 `name` 字段，如果类型选择 `custom2`，必须指定 `title` 字段为首字母 | Array | `[]` | | city | 市，每个市的对象中，必须有 `name` 字段，如果类型选择 `custom2`，必须指定 `title` 字段为首字母 | Array | `[]` | diff --git a/src/packages/__VUE/comment/doc.taro.md b/src/packages/__VUE/comment/doc.taro.md index da0618562a..1ef4dfe090 100644 --- a/src/packages/__VUE/comment/doc.taro.md +++ b/src/packages/__VUE/comment/doc.taro.md @@ -40,17 +40,17 @@ app.use(Comment); + + ``` ::: @@ -59,38 +89,68 @@ Scrolling to the bottom of the list automatically loads more data. ```html + + ``` ::: diff --git a/src/packages/__VUE/infiniteloading/doc.md b/src/packages/__VUE/infiniteloading/doc.md index 98c408b7ac..5fa9852bde 100644 --- a/src/packages/__VUE/infiniteloading/doc.md +++ b/src/packages/__VUE/infiniteloading/doc.md @@ -21,13 +21,19 @@ ```html + + ``` ::: ### 自定义加载文案 @@ -60,39 +90,69 @@ ```html + + ``` ::: diff --git a/src/packages/__VUE/infiniteloading/index.vue b/src/packages/__VUE/infiniteloading/index.vue index 475c818ec2..6f3f2a73c2 100644 --- a/src/packages/__VUE/infiniteloading/index.vue +++ b/src/packages/__VUE/infiniteloading/index.vue @@ -63,14 +63,6 @@ export default create({ type: String, default: '' }, - useWindow: { - type: Boolean, - default: true - }, - containerId: { - type: String, - default: '' - }, useCapture: { type: Boolean, default: false diff --git a/src/packages/__VUE/noticebar/demo.vue b/src/packages/__VUE/noticebar/demo.vue index 8b7868685d..5a0b5168b1 100644 --- a/src/packages/__VUE/noticebar/demo.vue +++ b/src/packages/__VUE/noticebar/demo.vue @@ -9,9 +9,9 @@

{{ translate('mode') }}

- {{ translate('text') }} + {{ translate('text') }}

- {{ translate('text') }} + {{ translate('text') }}