Skip to content

Commit 0d4053e

Browse files
Merge remote-tracking branch 'origin/develop'
2 parents 7890bd7 + bbc05b7 commit 0d4053e

File tree

13 files changed

+32
-10
lines changed

13 files changed

+32
-10
lines changed

packages/components/input/__test__/__snapshots__/demo.test.js.snap

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -275,11 +275,11 @@ exports[`Input Input suffix demo works fine 1`] = `
275275
<t-input
276276
class="extra"
277277
label="标签文字"
278+
maxcharacter="{{10}}"
278279
placeholder="请输入文字"
279280
tips="最多十个字"
280281
>
281282
<t-button
282-
maxcharacter="{{10}}"
283283
size="extra-small"
284284
slot="extra"
285285
theme="primary"

packages/components/input/_example/suffix/index.wxml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
bind:click="click"
66
/>
77

8-
<t-input class="extra" label="标签文字" placeholder="请输入文字" tips="最多十个字">
9-
<t-button slot="extra" theme="primary" maxcharacter="{{10}}" size="extra-small"> 操作按钮 </t-button>
8+
<t-input class="extra" label="标签文字" placeholder="请输入文字" tips="最多十个字" maxcharacter="{{10}}">
9+
<t-button slot="extra" theme="primary" size="extra-small"> 操作按钮 </t-button>
1010
</t-input>
1111

1212
<t-input label="标签文字" placeholder="请输入文字" suffixIcon="{{ { name: 'user-avatar', ariaLabel: '通讯录' } }}" />

packages/components/popup/popup.less

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,7 @@
7373
&.@{prefix}-fade-leave-to {
7474
&.@{popup}--top {
7575
transform: translateY(-100%);
76+
transform-origin: 0% 0%;
7677
}
7778

7879
&.@{popup}--bottom {
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
<canvas type="2d" class="t-qrcode__canvas" id="qrcodeCanvas"></canvas>
1+
<canvas type="2d" class="t-qrcode__canvas class" id="qrcodeCanvas"></canvas>

packages/components/qrcode/components/qrcode-status/qrcode-status.wxml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<block wx:if="{{statusRender}}">
2-
<slot name="statusRender" status="{{status}}"> </slot>
2+
<slot name="statusRender" />
33
</block>
44

55
<block wx:else>

packages/components/qrcode/qrcode.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ const name = `${prefix}-qrcode`;
77

88
@wxComponent()
99
export default class QRCode extends SuperComponent {
10-
externalClasses = [`${prefix}-class`];
10+
externalClasses = [`${prefix}-class`, `${prefix}-class-canvas`];
1111

1212
options = {
1313
multipleSlots: true,

packages/components/qrcode/qrcode.wxml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,11 @@
22

33
<view
44
style="{{_._style([style, customStyle])}} width:{{size}}px; height: {{size}}px; background-color: {{bgColor}};"
5-
class="{{classPrefix}} {{borderless ? prefix+'-'+'borderless' : ''}} {{prefix}}-class"
5+
class="{{classPrefix}} {{borderless ? prefix+'-'+'borderless' : ''}} class {{prefix}}-class"
66
>
77
<qrcode-canvas
88
id="qrcodeCanvas"
9+
class="{{prefix}}-class-canvas"
910
size="{{size}}"
1011
value="{{value}}"
1112
level="{{level}}"

packages/components/slider/slider.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -215,6 +215,8 @@ export default class Slider extends SuperComponent {
215215
const value = trimValue(newValue, this.properties);
216216
const realLabel = this.getLabelByValue(value);
217217

218+
this.triggerValue(value);
219+
218220
const setValueAndTrigger = () => {
219221
this.setData({
220222
_value: value,

packages/components/switch/README.en-US.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,15 @@ name | params | description
2323
-- | -- | --
2424
change | `(value: SwitchValue)` | \-
2525

26+
### Switch External Classes
27+
28+
className | Description
29+
-- | --
30+
t-class | \-
31+
t-class-body | \-
32+
t-class-dot | \-
33+
t-class-label | \-
34+
2635
### CSS Variables
2736

2837
The component provides the following CSS variables, which can be used to customize styles.

packages/components/switch/README.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,15 @@ default-value | String / Number / Boolean | undefined | 开关值。非受控属
6767
-- | -- | --
6868
change | `(value: SwitchValue)` | 数据发生变化时触发
6969

70+
### Switch External Classes
71+
72+
类名 | 描述
73+
-- | --
74+
t-class | 根节点样式类
75+
t-class-body | 描述文本样式类
76+
t-class-dot | 滑块样式类
77+
t-class-label | 开关内容样式类
78+
7079
### CSS Variables
7180

7281
组件提供了下列 CSS 变量,可用于自定义样式。

0 commit comments

Comments
 (0)