From 356fcbf1d8d59f842d2008a3cd602f96cad99aca Mon Sep 17 00:00:00 2001 From: Cai Huanyu Date: Sat, 31 Aug 2019 11:20:01 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E5=AE=8C=E5=96=84=E5=BE=AE=E4=BF=A1?= =?UTF-8?q?=E7=BB=84=E4=BB=B6=E7=B1=BB=E5=9E=8B=E5=AE=9A=E4=B9=89=20(#161)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../remax-cli/src/build/plugins/components.ts | 2 +- .../remax-cli/templates/wechat/component.ejs | 2 +- .../src/adapters/wechat/components/Ad.ts | 10 ++- .../src/adapters/wechat/components/Audio.ts | 1 + .../src/adapters/wechat/components/Button.ts | 35 +++++++++- .../src/adapters/wechat/components/Camera.ts | 14 +++- .../src/adapters/wechat/components/Canvas.ts | 15 +++- .../adapters/wechat/components/Checkbox.ts | 15 +++- .../wechat/components/CheckboxGroup.ts | 15 +++- .../adapters/wechat/components/CoverImage.ts | 14 +++- .../adapters/wechat/components/CoverView.ts | 12 +++- .../src/adapters/wechat/components/Editor.ts | 19 ++++- .../src/adapters/wechat/components/Form.ts | 15 +++- .../components/FunctionalPageNavigator.ts | 13 +++- .../src/adapters/wechat/components/Icon.ts | 14 +++- .../src/adapters/wechat/components/Image.ts | 17 ++++- .../src/adapters/wechat/components/Input.tsx | 2 +- .../src/adapters/wechat/components/Label.ts | 12 +++- .../adapters/wechat/components/LivePlayer.ts | 20 +++++- .../adapters/wechat/components/LivePusher.ts | 28 +++++++- .../src/adapters/wechat/components/Map.ts | 37 +++++++++- .../adapters/wechat/components/MovableArea.ts | 11 ++- .../adapters/wechat/components/MovableView.ts | 27 +++++++- .../adapters/wechat/components/Navigator.ts | 21 +++++- .../wechat/components/OfficialAccount.ts | 8 ++- .../adapters/wechat/components/OpenData.ts | 11 ++- .../src/adapters/wechat/components/Picker.ts | 14 +++- .../adapters/wechat/components/PickerView.ts | 19 ++++- .../wechat/components/PickerViewColumn.ts | 6 +- .../adapters/wechat/components/Progress.ts | 22 +++++- .../src/adapters/wechat/components/Radio.ts | 15 +++- .../adapters/wechat/components/RadioGroup.ts | 12 +++- .../adapters/wechat/components/RichText.ts | 13 +++- .../adapters/wechat/components/ScrollView.ts | 22 ++++++ .../src/adapters/wechat/components/Slider.ts | 23 ++++++- .../src/adapters/wechat/components/Swiper.tsx | 35 +++++----- .../adapters/wechat/components/SwiperItem.ts | 6 +- .../src/adapters/wechat/components/Switch.ts | 16 ++++- .../src/adapters/wechat/components/Text.ts | 14 +++- .../adapters/wechat/components/Textarea.tsx | 2 +- .../src/adapters/wechat/components/Video.tsx | 69 ++++++++++--------- .../src/adapters/wechat/components/View.ts | 25 ++++++- .../src/adapters/wechat/components/WebView.ts | 9 ++- .../adapters/wechat/components/propsAlias.ts | 28 +++++--- 44 files changed, 642 insertions(+), 98 deletions(-) diff --git a/packages/remax-cli/src/build/plugins/components.ts b/packages/remax-cli/src/build/plugins/components.ts index d751d617a..48c7492af 100644 --- a/packages/remax-cli/src/build/plugins/components.ts +++ b/packages/remax-cli/src/build/plugins/components.ts @@ -53,7 +53,7 @@ export default (adapter: Adapter) => () => ({ return; } - if (id === 'picker-view-column') { + if (adapter.name === 'alipay' && id === 'picker-view-column') { return; } diff --git a/packages/remax-cli/templates/wechat/component.ejs b/packages/remax-cli/templates/wechat/component.ejs index b97950d4e..5b4d09468 100644 --- a/packages/remax-cli/templates/wechat/component.ejs +++ b/packages/remax-cli/templates/wechat/component.ejs @@ -4,7 +4,7 @@ <<%=id%> <% for(let key of props) { %> <%=key%>="{{_h.v(i.props.<%=camelCased(key)%>)}}" <% } %>> <% if (id === 'swiper') { %> - +