diff --git a/.prettierrc b/.prettierrc
index f2f92eddd..4fe5ac973 100644
--- a/.prettierrc
+++ b/.prettierrc
@@ -4,13 +4,14 @@
"files": "*.axml",
"options": {
"parser": "html",
- "printWidth": 40,
+ "printWidth": 80,
"tabWidth": 2,
- "useTabs":true,
- "bracketSameLine":true,
- "bracketSpacing":true
+ "bracketSameLine": true,
+ "bracketSpacing": true,
+ "singleAttributePerLine": true,
+ "htmlWhitespaceSensitivity": "ignore"
}
}
],
"singleQuote": true
-}
\ No newline at end of file
+}
diff --git a/demo/pages/ActionSheet/index.axml b/demo/pages/ActionSheet/index.axml
index 096fc4ec6..6036eb496 100644
--- a/demo/pages/ActionSheet/index.axml
+++ b/demo/pages/ActionSheet/index.axml
@@ -1,11 +1,29 @@
-
+
-
+
-
+
+ onClose="handleCloseBasic" />
+ onClose="handleCloseBasic" />
\ No newline at end of file
+ onClose="handleCloseBasic" />
diff --git a/demo/pages/Avatar/index.axml b/demo/pages/Avatar/index.axml
index 25bec0e48..2504c86a3 100644
--- a/demo/pages/Avatar/index.axml
+++ b/demo/pages/Avatar/index.axml
@@ -1,5 +1,8 @@
-
+
@@ -7,24 +10,31 @@
-
+
-
+
+ brief="Deserunt dolor ea eaque eos">
Novalee Spicer
+ src="{{images[0]}}" />
-
+
diff --git a/demo/pages/Badge/index.axml b/demo/pages/Badge/index.axml
index f28847851..8cd0532df 100644
--- a/demo/pages/Badge/index.axml
+++ b/demo/pages/Badge/index.axml
@@ -3,31 +3,31 @@
-
+
-
+
-
+
-
+
-
+
@@ -38,35 +38,35 @@
type="dot"
stroke
position="top-right">
-
+
-
+
-
+
-
+
-
+
@@ -77,34 +77,34 @@
type="number"
text="{{1}}"
position="top-left">
-
+
-
+
-
+
-
+
-
+
@@ -116,7 +116,7 @@
text="1"
offsetX="-20px"
offsetY="0px">
-
+
-
+
-
+
@@ -143,8 +143,10 @@
type="text"
iconType="GlobalOutline"
position="top-right">
-
-
+
+
diff --git a/demo/pages/Button/index.axml b/demo/pages/Button/index.axml
index 2b08536db..b55f6774b 100644
--- a/demo/pages/Button/index.axml
+++ b/demo/pages/Button/index.axml
@@ -1,73 +1,115 @@
-
-
diff --git a/demo/pages/ButtonIcon/index.axml b/demo/pages/ButtonIcon/index.axml
index 3654eb5b3..7481d7555 100644
--- a/demo/pages/ButtonIcon/index.axml
+++ b/demo/pages/ButtonIcon/index.axml
@@ -1,173 +1,153 @@
+ type="primary"
+ icon="SmileOutline">
Icon
+ type="default"
+ icon="SmileOutline">
Icon
+ type="text"
+ icon="SmileOutline">
Icon
+ icon="ForbidFill">
Icon
+ icon="ForbidFill">
Icon
+ icon="ForbidFill">
Icon
+ size="large">
Icon
+ size="medium">
Icon
+ size="small">
Icon
-
+ size="large">
Icon
+ size="medium">
Icon
+ size="small">
Icon
-
-
+ loading>
loading
-
+ loading>
loading
-
+ loading>
loading
-
+ disabled>
disabled
-
-
+ disabled>
disabled
-
+ disabled>
disabled
diff --git a/demo/pages/ButtonInline/index.axml b/demo/pages/ButtonInline/index.axml
index c2a1197bb..ff4b9565f 100644
--- a/demo/pages/ButtonInline/index.axml
+++ b/demo/pages/ButtonInline/index.axml
@@ -1,74 +1,130 @@
-
-
+
+
主要按钮
-
+
次要按钮
-
+
文本按钮
-
-
-
+
+
主要按钮
-
+
主要按钮
-
+
主要按钮
-
-
-
+
+
主要按钮
-
+
次要按钮
-
+
文本按钮
-
-
-
+
+
主要按钮
-
+
次要按钮
-
+
文本按钮
-
-
-
+
+
主要按钮
-
+
次要按钮
-
+
文本
-
diff --git a/demo/pages/Calendar/collapse-container/cn-day/cn-day.axml b/demo/pages/Calendar/collapse-container/cn-day/cn-day.axml
index e7d1a9711..dc0b911fe 100644
--- a/demo/pages/Calendar/collapse-container/cn-day/cn-day.axml
+++ b/demo/pages/Calendar/collapse-container/cn-day/cn-day.axml
@@ -1,3 +1,3 @@
{{cnday}}
-
\ No newline at end of file
+
diff --git a/demo/pages/Calendar/collapse-container/collapse-container.axml b/demo/pages/Calendar/collapse-container/collapse-container.axml
index aab11ff20..367b56951 100644
--- a/demo/pages/Calendar/collapse-container/collapse-container.axml
+++ b/demo/pages/Calendar/collapse-container/collapse-container.axml
@@ -1,15 +1,18 @@
-
+
收起
展示
-
+
-
- 展示
-
+ 展示
-
\ No newline at end of file
+
diff --git a/demo/pages/Calendar/index.axml b/demo/pages/Calendar/index.axml
index 463ff2a18..9c6099f3a 100644
--- a/demo/pages/Calendar/index.axml
+++ b/demo/pages/Calendar/index.axml
@@ -1,68 +1,93 @@
-
-
+
+
-
-
+
+
-
+
-
+
-
-
+
-
-
+
-
+
-
-
+
+
-
+
-
+
@@ -70,9 +95,12 @@
-
+
-
-
+
diff --git a/demo/pages/CascaderPicker/index.axml b/demo/pages/CascaderPicker/index.axml
index 91eed84c6..b0eb17929 100644
--- a/demo/pages/CascaderPicker/index.axml
+++ b/demo/pages/CascaderPicker/index.axml
@@ -1,44 +1,50 @@
-
- 请选择省市
-
-
+
+ 请选择省市
+
+
-
+
-
- 请选择城市
-
-
+
+ 请选择城市
+
+
-
- 请选择城市
-
-
-
- 选择上海
- 清空
-
-
\ No newline at end of file
+
+ 请选择城市
+
+
+
+
+ 选择上海
+
+
+ 清空
+
+
+
diff --git a/demo/pages/Checkbox/index.axml b/demo/pages/Checkbox/index.axml
index 453130844..f232f0656 100644
--- a/demo/pages/Checkbox/index.axml
+++ b/demo/pages/Checkbox/index.axml
@@ -8,18 +8,25 @@
Checkbox1
- Checkbox2
+
+ Checkbox2
+
- Checkbox
+
+ Checkbox
+
- Checkbox
+ onChange="handleChange">
+ Checkbox
diff --git a/demo/pages/CheckboxCustomGroup/index.axml b/demo/pages/CheckboxCustomGroup/index.axml
index c6431ad8a..c81044156 100644
--- a/demo/pages/CheckboxCustomGroup/index.axml
+++ b/demo/pages/CheckboxCustomGroup/index.axml
@@ -1,7 +1,15 @@
-
-
- {{ item.title }}
-
-
-
\ No newline at end of file
+
+
+
+ {{ item.title }}
+
+
+
+
diff --git a/demo/pages/CheckboxGroup/index.axml b/demo/pages/CheckboxGroup/index.axml
index 703cf3008..dab8a6c23 100644
--- a/demo/pages/CheckboxGroup/index.axml
+++ b/demo/pages/CheckboxGroup/index.axml
@@ -1,51 +1,46 @@
+ onChange="onChange" />
+ onChange="onChange" />
+ position="horizontal" />
+ disabled />
+ onChange="handleChange" />
+ color="red" />
-
+
{{item.index +1}} {{item.value.label}}
-
diff --git a/demo/pages/Checklist/index.axml b/demo/pages/Checklist/index.axml
index cb22899c2..579b5778c 100644
--- a/demo/pages/Checklist/index.axml
+++ b/demo/pages/Checklist/index.axml
@@ -1,56 +1,55 @@
-
+ onChange="onChange" />
-
+ onChange="onChange" />
-
+ onChange="onChangeControlled" />
-
+ onChange="onChange" />
-
-
+
+ onChange="onChange" />
-
-
+
+ onChange="onChange">
-
+
-
+
title: {{props.item.title}}
diff --git a/demo/pages/Collapse/index.axml b/demo/pages/Collapse/index.axml
index 98b0ef7b1..6523e9de8 100644
--- a/demo/pages/Collapse/index.axml
+++ b/demo/pages/Collapse/index.axml
@@ -1,5 +1,4 @@
+ onChange="onChange" />
diff --git a/demo/pages/CollapseAccordion/index.axml b/demo/pages/CollapseAccordion/index.axml
index 2a0d03da6..721599954 100644
--- a/demo/pages/CollapseAccordion/index.axml
+++ b/demo/pages/CollapseAccordion/index.axml
@@ -1,5 +1,4 @@
+ accordion />
diff --git a/demo/pages/CollapseControl/index.axml b/demo/pages/CollapseControl/index.axml
index 3402e8b14..d816902f2 100644
--- a/demo/pages/CollapseControl/index.axml
+++ b/demo/pages/CollapseControl/index.axml
@@ -1,10 +1,21 @@
-切换
- 修改content
- 添加items
- {{current}}
+
+ 切换
+
+
+ 修改content
+
+
+ 添加items
+
+{{current}}
+ onChange="onChange" />
diff --git a/demo/pages/CollapseCustom/index.axml b/demo/pages/CollapseCustom/index.axml
index b4385505f..9ecb22fcd 100644
--- a/demo/pages/CollapseCustom/index.axml
+++ b/demo/pages/CollapseCustom/index.axml
@@ -1,18 +1,22 @@
-
-
- {{item.value.title}}
- {{item.current.indexOf(item.index) >= 0 ? '' : item.value.content.slice(0, 20) + '...' }}
+
+
+ {{item.value.title}} {{item.current.indexOf(item.index) >= 0 ? '' :
+ item.value.content.slice(0, 20) + '...' }}
-
+
{{item.value.brief}}
+ slot-scope="item">
{{item.current.indexOf(item.index) >= 0 ? '关闭' : '展开'}}
-
diff --git a/demo/pages/CollapseWithCheckbox/index.axml b/demo/pages/CollapseWithCheckbox/index.axml
index 18bfaf74b..6f9090e40 100644
--- a/demo/pages/CollapseWithCheckbox/index.axml
+++ b/demo/pages/CollapseWithCheckbox/index.axml
@@ -1,19 +1,26 @@
-
+
-
-
-
- {{item.value.title}}
+
+ {{item.value.title}}
-
+
{{item.value.content}}
-
-
+
提交
diff --git a/demo/pages/Container/index.axml b/demo/pages/Container/index.axml
index a43dff66d..53630385b 100644
--- a/demo/pages/Container/index.axml
+++ b/demo/pages/Container/index.axml
@@ -1,48 +1,40 @@
-
-
+
-
-
+
标题
右侧内容
-
-
+
-
右侧内容
-
-
-
-
-
-
+
+
+
-
-
+
右侧内容
-
-
+
-
diff --git a/demo/pages/DatePicker/index.axml b/demo/pages/DatePicker/index.axml
index bbf192ea2..dbd426792 100644
--- a/demo/pages/DatePicker/index.axml
+++ b/demo/pages/DatePicker/index.axml
@@ -1,113 +1,107 @@
-
- 请选择日期
-
-
-
-
- 请选择日期(点击蒙层关闭)
-
-
-
+
+ 请选择日期
+
+
+
+ 请选择日期(点击蒙层关闭)
+
+
-
- 请选择年度
-
-
-
- 请选择月份
-
-
-
- 请选择时间
-
-
+
+ 请选择年度
+
+
+
+ 请选择月份
+
+
+
+ 请选择时间
+
+
-
- 请选择日期
-
-
-
+
+ 请选择日期
+
+
-
- 每列不显示单位
-
-
-
+
+ 每列不显示单位
+
+
-
- 日期范围
-
-
-
-
- 每列不显示单位
-
-
-
+
+ 日期范围
+
+
+
+ 每列不显示单位
+
+
diff --git a/demo/pages/Divider/index.axml b/demo/pages/Divider/index.axml
index 89d027318..fc6f37850 100644
--- a/demo/pages/Divider/index.axml
+++ b/demo/pages/Divider/index.axml
@@ -1,28 +1,38 @@
-
+
-
-
-
-
+
+
+
+
-
-
+
+ lineColor="#1677ff" />
-
+
100m
-
+
浙江省杭州市西湖区西溪路556号
-
diff --git a/demo/pages/Empty/index.axml b/demo/pages/Empty/index.axml
index c12e9d708..dcf057fe6 100644
--- a/demo/pages/Empty/index.axml
+++ b/demo/pages/Empty/index.axml
@@ -1,14 +1,24 @@
-
+
-
+
-
+
操作1
-
+
操作2
@@ -19,6 +29,5 @@
+ image="https://gw.alipayobjects.com/mdn/rms_7cc883/afts/img/A*PG7NQoXbN38AAAAAAAAAAAAAARQnAQ" />
diff --git a/demo/pages/Form/index.axml b/demo/pages/Form/index.axml
index 2ab56d373..b48c256c1 100644
--- a/demo/pages/Form/index.axml
+++ b/demo/pages/Form/index.axml
@@ -4,50 +4,43 @@
placeholder="请输入用户名"
tooltip="用户名说明"
allowClear
- ref="handleRef"
-/>
+ ref="handleRef" />
+ ref="handleRef" />
+ ref="handleRef" />
+ ref="handleRef" />
+ ref="handleRef" />
+ ref="handleRef" />
+ ref="handleRef" />
+ ref="handleRef" />
+ ref="handleRef" />
+ ref="handleRef" />
+ ref="handleRef" />
+ ref="handleRef" />
+ ref="handleRef" />
+ ref="handleRef" />
+ ref="handleRef" />
- 提交
+
+ 提交
+
重置
diff --git a/demo/pages/FormCustom/checklist/index.axml b/demo/pages/FormCustom/checklist/index.axml
index f971fab63..ab9893fcd 100644
--- a/demo/pages/FormCustom/checklist/index.axml
+++ b/demo/pages/FormCustom/checklist/index.axml
@@ -1,4 +1,6 @@
-
+
-
+ help="{{help}}">
+
-
+
{{utils.getTitle(options, item)}}
@@ -25,25 +30,21 @@
-
- {{extra}}
-
+ {{extra}}
-
-
-
-
+
+ onChange="onChange" />
-
\ No newline at end of file
+
diff --git a/demo/pages/FormCustom/index.axml b/demo/pages/FormCustom/index.axml
index 10dabbf10..b05be0d9f 100644
--- a/demo/pages/FormCustom/index.axml
+++ b/demo/pages/FormCustom/index.axml
@@ -6,8 +6,7 @@
placeholder="请输入用户名"
position="vertical"
inputClassName="input"
- ref="handleRef"
-/>
+ ref="handleRef" />
+ ref="handleRef" />
+ ref="handleRef" />
- 提交
- 重置
+
+ 提交
+
+
+ 重置
+
diff --git a/demo/pages/FormCustom/location/index.axml b/demo/pages/FormCustom/location/index.axml
index 095751939..5aa15ffc3 100644
--- a/demo/pages/FormCustom/location/index.axml
+++ b/demo/pages/FormCustom/location/index.axml
@@ -1,4 +1,6 @@
-
+
-
+ help="{{help}}">
+
-
- {{formData.value.name}}
-
+ {{formData.value.name}}
-
- {{formData.value.address}}
-
-
+ {{formData.value.address}}
@@ -30,9 +28,6 @@
-
- {{extra}}
-
+ {{extra}}
-
diff --git a/demo/pages/FormCustomError/index.axml b/demo/pages/FormCustomError/index.axml
index 36cead16c..4de971178 100644
--- a/demo/pages/FormCustomError/index.axml
+++ b/demo/pages/FormCustomError/index.axml
@@ -5,11 +5,16 @@
placeholder="请输入用户名"
message="需要输入用户名"
validateStatus="success"
- ref="handleRef"
->
-
-
-
+ ref="handleRef">
+
+
+
{{item.errors}}
@@ -22,17 +27,31 @@
placeholder="请输入地址"
message="需要输入地址"
validateStatus="success"
- ref="handleRef"
->
-
-
-
+ ref="handleRef">
+
+
+
{{item.errors}}
- 提交
- 重置
+
+ 提交
+
+
+ 重置
+
diff --git a/demo/pages/FormDependency/index.axml b/demo/pages/FormDependency/index.axml
index 0bfdc1500..41dbe310d 100644
--- a/demo/pages/FormDependency/index.axml
+++ b/demo/pages/FormDependency/index.axml
@@ -1,28 +1,28 @@
-
+ ref="handleRef" />
+ ref="handleRef" />
+ ref="handleRef" />
-
- 提交
+
+ 提交
+
重置
diff --git a/demo/pages/FormDynamic/index.axml b/demo/pages/FormDynamic/index.axml
index 61cfa6f90..e43316660 100644
--- a/demo/pages/FormDynamic/index.axml
+++ b/demo/pages/FormDynamic/index.axml
@@ -5,18 +5,31 @@
message="需要输入用户名"
ref="handleRef"
a:for="{{list}}"
- a:key="id"
->
-
+ a:key="id">
+
-
+
添加用户
- 提交
- 重置
+
+ 提交
+
+
+ 重置
+
diff --git a/demo/pages/FormImageUploadRules/index.axml b/demo/pages/FormImageUploadRules/index.axml
index c58152d6e..a45988497 100644
--- a/demo/pages/FormImageUploadRules/index.axml
+++ b/demo/pages/FormImageUploadRules/index.axml
@@ -1,8 +1,7 @@
+ ref="handleRef" />
+ ref="handleRef" />
- 提交
+
+ 提交
+
重置
diff --git a/demo/pages/FormInitialValues/index.axml b/demo/pages/FormInitialValues/index.axml
index 2300fedd7..d92946f31 100644
--- a/demo/pages/FormInitialValues/index.axml
+++ b/demo/pages/FormInitialValues/index.axml
@@ -5,29 +5,30 @@
allowClear
required
message="需要填写用户名"
- ref="handleRef"
-/>
+ ref="handleRef" />
+ ref="handleRef" />
+ ref="handleRef" />
+ ref="handleRef" />
- 提交
+
+ 提交
+
重置
diff --git a/demo/pages/FormInitialValuesAsync/index.axml b/demo/pages/FormInitialValuesAsync/index.axml
index 2300fedd7..d92946f31 100644
--- a/demo/pages/FormInitialValuesAsync/index.axml
+++ b/demo/pages/FormInitialValuesAsync/index.axml
@@ -5,29 +5,30 @@
allowClear
required
message="需要填写用户名"
- ref="handleRef"
-/>
+ ref="handleRef" />
+ ref="handleRef" />
+ ref="handleRef" />
+ ref="handleRef" />
- 提交
+
+ 提交
+
重置
diff --git a/demo/pages/FormJSON/form-json/index.axml b/demo/pages/FormJSON/form-json/index.axml
index f396e36e9..cae93c8f9 100644
--- a/demo/pages/FormJSON/form-json/index.axml
+++ b/demo/pages/FormJSON/form-json/index.axml
@@ -6,16 +6,14 @@
required="{{item.required}}"
message="{{item.message}}"
placeholder="{{item.placeholder}}"
- ref="handleRef"
- />
+ ref="handleRef" />
+ ref="handleRef" />
+ ref="handleRef" />
-
+
-
+ onTap="submit">
{{config.submit.text}}
+ onTap="reset">
{{config.reset.text}}
-
-
diff --git a/demo/pages/FormJSON/index.axml b/demo/pages/FormJSON/index.axml
index c90aee435..a01c45821 100644
--- a/demo/pages/FormJSON/index.axml
+++ b/demo/pages/FormJSON/index.axml
@@ -1,24 +1,25 @@
-
+ ref="handleFormJSONRef">
+
+ ref="handleRef" />
-
+
+ ref="handleRef" />
diff --git a/demo/pages/FormLayout/index.axml b/demo/pages/FormLayout/index.axml
index 1e75250ba..f72589bba 100644
--- a/demo/pages/FormLayout/index.axml
+++ b/demo/pages/FormLayout/index.axml
@@ -3,32 +3,41 @@
name="account"
required
position="{{position}}"
- ref="handleRef"
-/>
+ ref="handleRef" />
+ ref="handleRef" />
+ ref="handleRef" />
+ ref="handleRef" />
- 提交
- 重置
- 切换表单布局
+
+ 提交
+
+
+ 重置
+
+
+ 切换表单布局
+
diff --git a/demo/pages/FormMultiple/index.axml b/demo/pages/FormMultiple/index.axml
index 60e50d072..847d95180 100644
--- a/demo/pages/FormMultiple/index.axml
+++ b/demo/pages/FormMultiple/index.axml
@@ -5,18 +5,21 @@
allowClear
required
message="需要填写用户名"
- ref="handleRef"
- />
+ ref="handleRef" />
+ ref="handleRef" />
- 提交
+
+ 提交
+
重置
@@ -28,18 +31,21 @@
allowClear
required
message="需要填写用户名"
- ref="handleRef2"
- />
+ ref="handleRef2" />
+ ref="handleRef2" />
- 提交
+
+ 提交
+
重置
-
\ No newline at end of file
+
diff --git a/demo/pages/FormRules/index.axml b/demo/pages/FormRules/index.axml
index 3a3b11d84..dffea7e75 100644
--- a/demo/pages/FormRules/index.axml
+++ b/demo/pages/FormRules/index.axml
@@ -3,26 +3,32 @@
name="account"
required
message="需要输入用户名"
- ref="handleRef"
-/>
+ ref="handleRef" />
+ ref="handleRef" />
+ ref="handleRef" />
- 提交
- 重置
+
+ 提交
+
+
+ 重置
+
Fill表单
diff --git a/demo/pages/FormValidate/index.axml b/demo/pages/FormValidate/index.axml
index 52578929d..a2011d12c 100644
--- a/demo/pages/FormValidate/index.axml
+++ b/demo/pages/FormValidate/index.axml
@@ -3,23 +3,25 @@
name="account"
validateStatus="error"
help="需要填写用户名"
- ref="handleRef"
-/>
+ ref="handleRef" />
+ ref="handleRef" />
+ ref="handleRef" />
- 提交
+
+ 提交
+
重置
diff --git a/demo/pages/FormValidateMessages/index.axml b/demo/pages/FormValidateMessages/index.axml
index ae5b6758c..d2e299424 100644
--- a/demo/pages/FormValidateMessages/index.axml
+++ b/demo/pages/FormValidateMessages/index.axml
@@ -1,23 +1,29 @@
+ ref="handleRef" />
+ ref="handleRef" />
+ ref="handleRef" />
- 提交
- 重置
-
\ No newline at end of file
+
+ 提交
+
+
+ 重置
+
+
diff --git a/demo/pages/FormWatch/index.axml b/demo/pages/FormWatch/index.axml
index 1f06b9aa9..278d836dc 100644
--- a/demo/pages/FormWatch/index.axml
+++ b/demo/pages/FormWatch/index.axml
@@ -3,31 +3,33 @@
name="account"
placeholder="请输入用户名"
required
- ref="handleRef"
-/>
+ ref="handleRef" />
+ ref="handleRef" />
-
+
onValuesChange:
-
-
- 修改:{{changedValuesText}}
-
+
+ 修改:{{changedValuesText}}
-
- 表单:{{allValuesText}}
-
+ 表单:{{allValuesText}}
-
- 提交
- 重置
+
+ 提交
+
+
+ 重置
+
diff --git a/demo/pages/Grid/index.axml b/demo/pages/Grid/index.axml
index 77fd2d22d..6ffa1dd03 100644
--- a/demo/pages/Grid/index.axml
+++ b/demo/pages/Grid/index.axml
@@ -1,43 +1,104 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
-
-
-
-
- 第{{ props.index + 1}}项
- 描述{{ props.index + 1}}
-
-
\ No newline at end of file
+
+
+
+
+
+
+
+
+ 第{{ props.index + 1}}项
+
+
+ 描述{{ props.index + 1}}
+
+
+
diff --git a/demo/pages/GuideTour/index.axml b/demo/pages/GuideTour/index.axml
index ebc9de8a5..bb7cf65a6 100644
--- a/demo/pages/GuideTour/index.axml
+++ b/demo/pages/GuideTour/index.axml
@@ -1,19 +1,67 @@
-
-
-
+
+
-
-
-
+
+
+
step-{{props.index}}
-
- 单图模式
- 多图模式
- 滑动模式
- 受控模式
+
+
+ 单图模式
+
+
+ 多图模式
+
+
+ 滑动模式
+
+
+ 受控模式
+
+
+
+
+ 开始
+
-
- 开始
-
\ No newline at end of file
diff --git a/demo/pages/Icon/index.axml b/demo/pages/Icon/index.axml
index 575206409..1def82f46 100644
--- a/demo/pages/Icon/index.axml
+++ b/demo/pages/Icon/index.axml
@@ -5,14 +5,24 @@
-
-
-
+
+
+
-
-
+
+
@@ -20,5 +30,3 @@
-
-
diff --git a/demo/pages/ImageUpload/index.axml b/demo/pages/ImageUpload/index.axml
index 496f32ff4..857ebf8ce 100644
--- a/demo/pages/ImageUpload/index.axml
+++ b/demo/pages/ImageUpload/index.axml
@@ -1,16 +1,14 @@
+ onUpload="onUpload" />
+ onUpload="onUpload" />
@@ -18,8 +16,7 @@
+ onUpload="onUpload" />
@@ -27,8 +24,7 @@
defaultFileList="{{defaultFileList}}"
onRemove="onRemove"
onChange="onChange"
- onUpload="onUpload"
- />
+ onUpload="onUpload" />
@@ -36,6 +32,5 @@
defaultFileList="{{defaultFileList}}"
onBeforeUpload="onBeforeUpload"
onChange="onChange"
- onUpload="onUpload"
- />
+ onUpload="onUpload" />
diff --git a/demo/pages/ImageUploadControl/index.axml b/demo/pages/ImageUploadControl/index.axml
index 987ebc72e..11ca9e457 100644
--- a/demo/pages/ImageUploadControl/index.axml
+++ b/demo/pages/ImageUploadControl/index.axml
@@ -1,9 +1,8 @@
-
+ onUpload="onUpload" />
@@ -11,7 +10,11 @@
ref="handleUploaderRef"
fileList="{{fileList}}"
onChange="onChange"
- onUpload="onUpload"
- />
- 上传
+ onUpload="onUpload" />
+
+ 上传
+
diff --git a/demo/pages/IndexBar/index.axml b/demo/pages/IndexBar/index.axml
index 75daac3cc..79b081b75 100644
--- a/demo/pages/IndexBar/index.axml
+++ b/demo/pages/IndexBar/index.axml
@@ -1,6 +1,6 @@
-
+
-
\ No newline at end of file
+
diff --git a/demo/pages/IndexBarScrollView/index.axml b/demo/pages/IndexBarScrollView/index.axml
index db24df8de..9c55c4309 100644
--- a/demo/pages/IndexBarScrollView/index.axml
+++ b/demo/pages/IndexBarScrollView/index.axml
@@ -6,10 +6,12 @@
onChange="onChange">
-
+
{{props.value.label}}-{{itemX}}
-
\ No newline at end of file
+
diff --git a/demo/pages/InputTextarea/index.axml b/demo/pages/InputTextarea/index.axml
index 32afd28e2..87f9d654a 100644
--- a/demo/pages/InputTextarea/index.axml
+++ b/demo/pages/InputTextarea/index.axml
@@ -2,8 +2,7 @@
+ onChange="onChange" />
@@ -11,24 +10,20 @@
placeholder="请输入内容"
defaultValue="这是antd mini小程序组件"
autoHeight
- onChange="onChange"
- />
+ onChange="onChange" />
+ allowClear>
+ disabled />
@@ -37,9 +32,13 @@
placeholder="请输入内容"
allowClear
onChange="handleChange"
- onClear="clear"
- />
- clear
+ onClear="clear" />
+
+ clear
+
@@ -47,10 +46,12 @@
placeholder="请输入内容"
allowClear
onChange="onChange"
- ref="handleRef"
- />
+ ref="handleRef" />
- clear
+
+ clear
+
-
diff --git a/demo/pages/List/index.axml b/demo/pages/List/index.axml
index 476392f9d..7c301adf3 100644
--- a/demo/pages/List/index.axml
+++ b/demo/pages/List/index.axml
@@ -1,32 +1,57 @@
-
+
1
2
3
-
- 总资产
- 设置
- 图片
+
+
+ 总资产
+
+
+ 设置
+
+
+ 图片
+
-
圆角
-
+
-
- 大字号模式
+ 大字号模式
-
授权管理
-
三行列表
-
+
-
- 账单
- 总资产
+
+ 账单
+
+
+ 总资产
+
-
\ No newline at end of file
+
diff --git a/demo/pages/Loading/index.axml b/demo/pages/Loading/index.axml
index 12a1f888d..006cffe65 100644
--- a/demo/pages/Loading/index.axml
+++ b/demo/pages/Loading/index.axml
@@ -1,27 +1,45 @@
-
+
-
+
-
+
-
-
-
-
+
+
+
+
-
+
-
+
@@ -29,10 +47,12 @@
-
+
-
-
+
+
diff --git a/demo/pages/Modal/index.axml b/demo/pages/Modal/index.axml
index 2286b2ac6..14fb1f527 100644
--- a/demo/pages/Modal/index.axml
+++ b/demo/pages/Modal/index.axml
@@ -3,16 +3,14 @@
visible="{{basicVisible}}"
onClose="handleClose"
primaryButtonText="我知道了"
- onPrimaryButtonTap="handlePrimaryButtonTap"
-/>
+ onPrimaryButtonTap="handlePrimaryButtonTap" />
+ onPrimaryButtonTap="handlePrimaryButtonTap" />
+ onSecondaryButtonTap="handleSecondaryButtonTap" />
+ onCancelButtonTap="handleSecondaryButtonTap" />
+ onPrimaryButtonTap="handlePrimaryButtonTap" />
+ onSecondaryButtonTap="handleSecondaryButtonTap" />
+ onCancelButtonTap="handleSecondaryButtonTap" />
-
+
-
-
+
+
+
+
-
- 最简单的弹框
- 带有标题
- 带辅助按钮
- 带辅助和取消按钮
+
+
+ 最简单的弹框
+
+
+ 带有标题
+
+
+ 带辅助按钮
+
+
+ 带辅助和取消按钮
+
+
+
+
+ 只有主按钮
+
+
+ 带辅助按钮
+
+
+ 带辅助和取消按钮
+
-
- 只有主按钮
- 带辅助按钮
- 带辅助和取消按钮
+
+
+ 自定义按钮样式
+
+
+ 完全自定义内容区
+
-
- 自定义按钮样式
- 完全自定义内容区
-
\ No newline at end of file
diff --git a/demo/pages/NoticeBar/index.axml b/demo/pages/NoticeBar/index.axml
index 163e72fb8..2319be338 100644
--- a/demo/pages/NoticeBar/index.axml
+++ b/demo/pages/NoticeBar/index.axml
@@ -1,14 +1,14 @@
-
{{item}}
-
这条通知可以关闭
@@ -16,10 +16,10 @@
-
-
+
不展示图标
-
+
-
自定义左侧图标
-
自定义左侧图标图片
-
自定义右侧按钮
-
-
\ No newline at end of file
+
diff --git a/demo/pages/NumberKeyboard/index.axml b/demo/pages/NumberKeyboard/index.axml
index 7d623e4f1..bc22cceb4 100644
--- a/demo/pages/NumberKeyboard/index.axml
+++ b/demo/pages/NumberKeyboard/index.axml
@@ -1,42 +1,43 @@
-
默认键盘
-
+
没有小数点
+ onClose="onTap1" />
带确认按钮
+ onClose="onTap2" />
带关闭箭头
+ onClose="onTap3" />
乱序键盘
-
+ onClose="onTap4" />
-
自定义标题
-
-
+
+
自定义确认按钮
@@ -44,8 +45,10 @@
confirmText="确认"
visible="{{visible7}}"
onClose="onTap7">
-
-
+
+
diff --git a/demo/pages/NumberKeyboardAmount/index.axml b/demo/pages/NumberKeyboardAmount/index.axml
index 86af82e6a..72cfb5134 100644
--- a/demo/pages/NumberKeyboardAmount/index.axml
+++ b/demo/pages/NumberKeyboardAmount/index.axml
@@ -2,15 +2,17 @@
+ catchTap="onAmountFocus">
{{ value }}
- 0.00
+
+ 0.00
+
+ style="{{{position: value ? 'static' : 'absolute'}}}" />
-
\ No newline at end of file
+ onClose="onClose" />
+
diff --git a/demo/pages/NumberKeyboardCode/index.axml b/demo/pages/NumberKeyboardCode/index.axml
index 3a1a9c9ab..add9e328f 100644
--- a/demo/pages/NumberKeyboardCode/index.axml
+++ b/demo/pages/NumberKeyboardCode/index.axml
@@ -1,12 +1,16 @@
-
+
- {{value[index] || ''}}
-
+ {{value[index] || ''}}
+
@@ -16,6 +20,5 @@
closeable="{{true}}"
value="{{value}}"
onChange="onChange"
- onClose="onClose"
- />
-
\ No newline at end of file
+ onClose="onClose" />
+
diff --git a/demo/pages/NumberKeyboardNumber/index.axml b/demo/pages/NumberKeyboardNumber/index.axml
index 0d0c96cc4..61c7800ca 100644
--- a/demo/pages/NumberKeyboardNumber/index.axml
+++ b/demo/pages/NumberKeyboardNumber/index.axml
@@ -2,15 +2,17 @@
+ catchTap="onNumberFocus">
{{ value }}
- 0.00
+
+ 0.00
+
+ style="{{{position: value ? 'static' : 'absolute'}}}" />
-
\ No newline at end of file
+ onClose="onClose" />
+
diff --git a/demo/pages/Picker/index.axml b/demo/pages/Picker/index.axml
index a5b88ab04..108eef6e0 100644
--- a/demo/pages/Picker/index.axml
+++ b/demo/pages/Picker/index.axml
@@ -1,7 +1,7 @@
选择城市
-
-
+ options="{{list}}">
选择城市(点击蒙层关闭)
-
-
+ options="{{list}}">
选择城市
-
-
+ options="{{list}}">
- 选择深圳
- 清空
+
+ 选择深圳
+
+
+ 清空
+
-
+
选择日期
-
-
+ options="{{weekList}}">
-
-
请选择时间
-
-
+ options="{{columns}}">
diff --git a/demo/pages/Popover/index.axml b/demo/pages/Popover/index.axml
index b79ef8eb7..6123a3512 100644
--- a/demo/pages/Popover/index.axml
+++ b/demo/pages/Popover/index.axml
@@ -1,44 +1,61 @@
- 点我
+
+ 点我
+
-
+
点我
-
+
点我红色
-
+
点我蓝色
-
-
查看说明
-
+
-
-
+
+
点我
{{item}}
-
+
{{item}}
@@ -46,16 +63,31 @@
-
- 点我
+
+
+ 点我
+
-
+
点击按钮修改visible
- change visible
+
+ change visible
+
-
diff --git a/demo/pages/PopoverList/index.axml b/demo/pages/PopoverList/index.axml
index 2459133d0..42b0a1f96 100644
--- a/demo/pages/PopoverList/index.axml
+++ b/demo/pages/PopoverList/index.axml
@@ -1,29 +1,34 @@
-
- 点我
-
+ color="#fff">
+
+ 点我
+
+
扫一扫
-
付钱/收钱
-
乘车码
-
图片
diff --git a/demo/pages/Popup/index.axml b/demo/pages/Popup/index.axml
index 5cc11cc7f..4d7dfcd19 100644
--- a/demo/pages/Popup/index.axml
+++ b/demo/pages/Popup/index.axml
@@ -1,45 +1,131 @@
-
-
+
从屏幕滑出或弹出一块自定义内容区,用于展示弹窗、信息提示、选择输入、切换等内容。
-
-
+
从屏幕滑出或弹出一块自定义内容区,用于展示弹窗、信息提示、选择输入、切换等内容。
-
+
-
-
- Ea consectetur ipsum consequat exercitation laboris excepteur pariatur excepteur labore dolor cillum tempor esse. Ad adipisicing nostrud fugiat eu mollit. Proident nisi voluptate sunt ea laboris Lorem ullamco deserunt aute incididunt cillum tempor duis est. Elit voluptate laboris laborum anim exercitation consequat laboris ad. Quis ad enim fugiat. Aliqua reprehenderit irure non esse consequat laborum ea ut minim ex ea cillum. Dolore dolore proident laboris occaecat pariatur eu ad. Velit mollit aliqua do. Sunt enim tempor deserunt nostrud ut et. Sunt ad sit eiusmod ipsum ad non in sit veniam. Consectetur do id excepteur et aute. Commodo duis ea sit occaecat nisi dolore aliquip laborum esse minim. Officia veniam deserunt id cupidatat consectetur nisi cillum pariatur qui dolor veniam sit. Nostrud elit irure cupidatat esse ad ipsum. Consectetur culpa et et enim mollit officia in elit ipsum. Dolor et veniam labore excepteur magna magna in. Dolore voluptate eiusmod et. Esse fugiat irure excepteur duis tempor minim. Officia enim incididunt magna dolore exercitation occaecat et do et in duis deserunt excepteur. Cupidatat magna officia commodo reprehenderit anim qui laborum duis reprehenderit voluptate quis veniam. Consequat pariatur in magna Lorem eiusmod cupidatat qui est Lorem tempor qui anim aliquip duis. Laborum occaecat est laborum qui deserunt incididunt laborum cillum eu nostrud in deserunt culpa mollit. Nisi reprehenderit non duis qui elit eu dolore pariatur duis laboris exercitation minim nulla adipisicing et. Fugiat ad commodo enim eiusmod sint aliquip Lorem. Reprehenderit cillum dolor deserunt adipisicing commodo qui magna consectetur est ut Lorem sint. Cillum dolor enim incididunt excepteur cupidatat mollit deserunt deserunt ullamco cillum nostrud duis excepteur non. Excepteur sit consectetur ut laborum consequat culpa aute id aute et. Eiusmod Lorem esse pariatur culpa officia minim eu magna irure. Minim adipisicing quis excepteur irure est exercitation dolore exercitation id tempor fugiat pariatur eu Lorem. Nostrud incididunt laboris irure et aliqua reprehenderit anim enim occaecat aliqua. Nostrud adipisicing nisi enim aliqua enim sint sunt ad qui irure amet aute. Quis esse cillum commodo laboris adipisicing mollit cillum est amet velit cupidatat proident. Voluptate adipisicing dolore consequat officia culpa in fugiat consectetur velit. Minim ex aliqua proident irure. Aliquip magna reprehenderit laborum elit proident culpa sint occaecat sunt sint adipisicing adipisicing anim. Eu nisi anim in laboris voluptate. Sit ullamco adipisicing fugiat ad adipisicing excepteur esse exercitation nostrud ipsum nostrud. Deserunt sunt irure id mollit anim aliquip ullamco amet laborum nisi. Sit consequat consequat ullamco voluptate do sit nisi quis laboris tempor amet mollit sint. Incididunt mollit eu anim eiusmod ea cupidatat veniam aliquip. Tempor ea elit amet ea. Et proident occaecat id. Sunt sunt cillum ut sunt ea voluptate ea sit amet minim deserunt pariatur ullamco. Commodo nostrud excepteur non id dolore minim anim anim tempor qui duis. Quis occaecat pariatur reprehenderit anim reprehenderit cillum mollit aliqua sit anim cillum ut. Enim eiusmod quis sit consequat consectetur. Reprehenderit ex elit sit adipisicing dolor eiusmod occaecat duis culpa. Ex laboris exercitation occaecat exercitation commodo proident esse. Tempor voluptate mollit amet ex ea occaecat adipisicing. Minim quis voluptate labore reprehenderit commodo. Pariatur ex sit aliquip minim ea sunt. Lorem et velit veniam ut sunt deserunt mollit eu in nostrud tempor. Aliqua nisi duis duis excepteur et quis quis proident do cillum dolor. Labore cupidatat eiusmod voluptate cupidatat anim ad do pariatur sunt quis. Occaecat cillum eu non enim dolor nulla aliqua minim amet tempor irure reprehenderit reprehenderit laboris quis. Laboris ullamco excepteur ut fugiat sunt. Labore ex culpa incididunt sint minim velit sunt non et laborum consectetur eu. Ullamco magna dolore reprehenderit amet do. Nisi exercitation esse deserunt exercitation deserunt ex eu ea cillum magna adipisicing. Incididunt adipisicing aute voluptate deserunt fugiat nostrud nostrud. Id nostrud do cupidatat quis ea sint anim duis labore proident minim excepteur dolor proident elit.
+
+ Ea consectetur ipsum consequat exercitation laboris excepteur pariatur
+ excepteur labore dolor cillum tempor esse. Ad adipisicing nostrud fugiat eu
+ mollit. Proident nisi voluptate sunt ea laboris Lorem ullamco deserunt aute
+ incididunt cillum tempor duis est. Elit voluptate laboris laborum anim
+ exercitation consequat laboris ad. Quis ad enim fugiat. Aliqua reprehenderit
+ irure non esse consequat laborum ea ut minim ex ea cillum. Dolore dolore
+ proident laboris occaecat pariatur eu ad. Velit mollit aliqua do. Sunt enim
+ tempor deserunt nostrud ut et. Sunt ad sit eiusmod ipsum ad non in sit
+ veniam. Consectetur do id excepteur et aute. Commodo duis ea sit occaecat
+ nisi dolore aliquip laborum esse minim. Officia veniam deserunt id cupidatat
+ consectetur nisi cillum pariatur qui dolor veniam sit. Nostrud elit irure
+ cupidatat esse ad ipsum. Consectetur culpa et et enim mollit officia in elit
+ ipsum. Dolor et veniam labore excepteur magna magna in. Dolore voluptate
+ eiusmod et. Esse fugiat irure excepteur duis tempor minim. Officia enim
+ incididunt magna dolore exercitation occaecat et do et in duis deserunt
+ excepteur. Cupidatat magna officia commodo reprehenderit anim qui laborum
+ duis reprehenderit voluptate quis veniam. Consequat pariatur in magna Lorem
+ eiusmod cupidatat qui est Lorem tempor qui anim aliquip duis. Laborum
+ occaecat est laborum qui deserunt incididunt laborum cillum eu nostrud in
+ deserunt culpa mollit. Nisi reprehenderit non duis qui elit eu dolore
+ pariatur duis laboris exercitation minim nulla adipisicing et. Fugiat ad
+ commodo enim eiusmod sint aliquip Lorem. Reprehenderit cillum dolor deserunt
+ adipisicing commodo qui magna consectetur est ut Lorem sint. Cillum dolor
+ enim incididunt excepteur cupidatat mollit deserunt deserunt ullamco cillum
+ nostrud duis excepteur non. Excepteur sit consectetur ut laborum consequat
+ culpa aute id aute et. Eiusmod Lorem esse pariatur culpa officia minim eu
+ magna irure. Minim adipisicing quis excepteur irure est exercitation dolore
+ exercitation id tempor fugiat pariatur eu Lorem. Nostrud incididunt laboris
+ irure et aliqua reprehenderit anim enim occaecat aliqua. Nostrud adipisicing
+ nisi enim aliqua enim sint sunt ad qui irure amet aute. Quis esse cillum
+ commodo laboris adipisicing mollit cillum est amet velit cupidatat proident.
+ Voluptate adipisicing dolore consequat officia culpa in fugiat consectetur
+ velit. Minim ex aliqua proident irure. Aliquip magna reprehenderit laborum
+ elit proident culpa sint occaecat sunt sint adipisicing adipisicing anim. Eu
+ nisi anim in laboris voluptate. Sit ullamco adipisicing fugiat ad
+ adipisicing excepteur esse exercitation nostrud ipsum nostrud. Deserunt sunt
+ irure id mollit anim aliquip ullamco amet laborum nisi. Sit consequat
+ consequat ullamco voluptate do sit nisi quis laboris tempor amet mollit
+ sint. Incididunt mollit eu anim eiusmod ea cupidatat veniam aliquip. Tempor
+ ea elit amet ea. Et proident occaecat id. Sunt sunt cillum ut sunt ea
+ voluptate ea sit amet minim deserunt pariatur ullamco. Commodo nostrud
+ excepteur non id dolore minim anim anim tempor qui duis. Quis occaecat
+ pariatur reprehenderit anim reprehenderit cillum mollit aliqua sit anim
+ cillum ut. Enim eiusmod quis sit consequat consectetur. Reprehenderit ex
+ elit sit adipisicing dolor eiusmod occaecat duis culpa. Ex laboris
+ exercitation occaecat exercitation commodo proident esse. Tempor voluptate
+ mollit amet ex ea occaecat adipisicing. Minim quis voluptate labore
+ reprehenderit commodo. Pariatur ex sit aliquip minim ea sunt. Lorem et velit
+ veniam ut sunt deserunt mollit eu in nostrud tempor. Aliqua nisi duis duis
+ excepteur et quis quis proident do cillum dolor. Labore cupidatat eiusmod
+ voluptate cupidatat anim ad do pariatur sunt quis. Occaecat cillum eu non
+ enim dolor nulla aliqua minim amet tempor irure reprehenderit reprehenderit
+ laboris quis. Laboris ullamco excepteur ut fugiat sunt. Labore ex culpa
+ incididunt sint minim velit sunt non et laborum consectetur eu. Ullamco
+ magna dolore reprehenderit amet do. Nisi exercitation esse deserunt
+ exercitation deserunt ex eu ea cillum magna adipisicing. Incididunt
+ adipisicing aute voluptate deserunt fugiat nostrud nostrud. Id nostrud do
+ cupidatat quis ea sint anim duis labore proident minim excepteur dolor
+ proident elit.
-
- 顶部弹出
- 底部弹出
- 左侧弹出
- 右侧弹出
+
+
+ 顶部弹出
+
+
+ 底部弹出
+
+
+ 左侧弹出
+
+
+ 右侧弹出
+
自定义弹窗内关闭
超长内容滚动
开启过渡动画
-
+
-
\ No newline at end of file
+
diff --git a/demo/pages/ProgressCircle/index.axml b/demo/pages/ProgressCircle/index.axml
index b5ae85325..f6e468861 100644
--- a/demo/pages/ProgressCircle/index.axml
+++ b/demo/pages/ProgressCircle/index.axml
@@ -2,12 +2,20 @@
+ percent="{{percent1}}" />
- 减少
- 增加
+
+ 减少
+
+
+ 增加
+
@@ -16,13 +24,11 @@
+ strokeWidth="{{12}}" />
+ strokeWidth="{{2}}" />
@@ -31,32 +37,24 @@
+ strokeColor="#00B578" />
+ strokeColor="#FF8F1F" />
@@ -66,17 +64,14 @@
+ width="{{80}}" />
+ width="{{100}}" />
+ width="{{120}}" />
diff --git a/demo/pages/ProgressLine/index.axml b/demo/pages/ProgressLine/index.axml
index 94982a535..edc630a55 100644
--- a/demo/pages/ProgressLine/index.axml
+++ b/demo/pages/ProgressLine/index.axml
@@ -1,36 +1,61 @@
- 减少
- 增加
+
+ 减少
+
+
+ 增加
+
-
-
+
+
-
+
-
-
+
+
-
-
-
+
+
+
-
\ No newline at end of file
+
diff --git a/demo/pages/Radio/index.axml b/demo/pages/Radio/index.axml
index b9edb8500..f04727cb6 100644
--- a/demo/pages/Radio/index.axml
+++ b/demo/pages/Radio/index.axml
@@ -8,18 +8,25 @@
Radio1
- Radio2
+
+ Radio2
+
- Radio
+
+ Radio
+
+ onChange="handleChange">
Radio
diff --git a/demo/pages/RadioGroup/index.axml b/demo/pages/RadioGroup/index.axml
index 4bd528cc7..d83d458d1 100644
--- a/demo/pages/RadioGroup/index.axml
+++ b/demo/pages/RadioGroup/index.axml
@@ -1,30 +1,26 @@
+ onChange="onChange" />
+ onChange="onChange" />
+ position="horizontal" />
+ disabled />
@@ -35,19 +31,18 @@
+ onChange="handleChange" />
-
+ defaultValue="banana">
+
{{item.index +1}} {{item.value.label}}
-
diff --git a/demo/pages/Rate/index.axml b/demo/pages/Rate/index.axml
index 54bb40c09..475330995 100644
--- a/demo/pages/Rate/index.axml
+++ b/demo/pages/Rate/index.axml
@@ -1,30 +1,50 @@
-
+
-
+
-
+
allowClear: true
-
-
+
+
allowClear: false
-
+
-
+
-
-
-
+
+
+
diff --git a/demo/pages/RateCustom/index.axml b/demo/pages/RateCustom/index.axml
index 2f89851c3..9b9cc0350 100644
--- a/demo/pages/RateCustom/index.axml
+++ b/demo/pages/RateCustom/index.axml
@@ -1,16 +1,24 @@
-
+
8px
-
+
16px
-
+
30px
-
+
40px
@@ -18,53 +26,46 @@
+ characterActiveClassName="star-active" />
基础
+ characterActiveClassName="star-active-gradient" />
渐变
-
-
+
+
自定义为HeartFill
-
+ allowHalf>
+
自定义为StarOutline
-
- 正
-
+ characterClassName="character">
+ 正
自定义为正
-
- A
-
+ characterClassName="character">
+ A
自定义为A
@@ -72,9 +73,10 @@
defaultValue="{{2.5}}"
allowHalf
gutter="{{20}}"
- characterClassName="character"
- >
-
+ characterClassName="character">
+
{{rate.index}}
diff --git a/demo/pages/Result/index.axml b/demo/pages/Result/index.axml
index c75617b39..71e55310d 100644
--- a/demo/pages/Result/index.axml
+++ b/demo/pages/Result/index.axml
@@ -1,52 +1,51 @@
-
+
-
+ message="内容详情可折行,建议不超过两行建议不超过两行建议不超过两行"
+ type="wait" />
-
+ message="内容详情可折行,建议不超过两行建议不超过两行建议不超过两行"
+ type="info" />
-
+
-
+
-
+
标题插槽
描述插槽
辅助操作
- 主要操作
+
+ 主要操作
+
diff --git a/demo/pages/Selector/index.axml b/demo/pages/Selector/index.axml
index e3ee7c7de..a9f825d24 100644
--- a/demo/pages/Selector/index.axml
+++ b/demo/pages/Selector/index.axml
@@ -1,49 +1,41 @@
-
+
-
-
+ options="{{items2}}" />
-
+ multiple />
-
+ multiple />
-
+ multiple />
-
-
+
改变选中值为选项三
@@ -51,12 +43,9 @@
-
+ options="{{items1}}" />
-
-
diff --git a/demo/pages/SelectorFilter/index.axml b/demo/pages/SelectorFilter/index.axml
index 5c641b04d..565fa0461 100644
--- a/demo/pages/SelectorFilter/index.axml
+++ b/demo/pages/SelectorFilter/index.axml
@@ -1,22 +1,28 @@
-
-
-
- {{item.title}}
-
+
+
+ {{item.title}}
+
-
-
-
-
-
+
+
+
+
-
\ No newline at end of file
+
+
diff --git a/demo/pages/Skeleton/index.axml b/demo/pages/Skeleton/index.axml
index 7349a8519..8dc144122 100644
--- a/demo/pages/Skeleton/index.axml
+++ b/demo/pages/Skeleton/index.axml
@@ -10,28 +10,42 @@
-
-
+
-
+
-
+
-
- We supply a series of design principles, practical patterns and high quality design resources, to help people create their product prototypes beautifully and efficiently.
+
+
+ We supply a series of design principles, practical patterns and high
+ quality design resources, to help people create their product prototypes
+ beautifully and efficiently.
显示骨架
-
+
diff --git a/demo/pages/Slider/index.axml b/demo/pages/Slider/index.axml
index 04cab5b9e..f3034eada 100644
--- a/demo/pages/Slider/index.axml
+++ b/demo/pages/Slider/index.axml
@@ -2,8 +2,7 @@
+ onAfterChange="onAfterChange" />
@@ -11,8 +10,7 @@
defaultValue="{{[20, 60]}}"
range
onChange="onChange"
- onAfterChange="onAfterChange"
- />
+ onAfterChange="onAfterChange" />
@@ -21,8 +19,7 @@
step="{{20}}"
showTicks
onChange="onChange"
- onAfterChange="onAfterChange"
- />
+ onAfterChange="onAfterChange" />
@@ -32,8 +29,7 @@
showTicks
showNumber
onChange="onChange"
- onAfterChange="onAfterChange"
- />
+ onAfterChange="onAfterChange" />
@@ -43,8 +39,7 @@
showTicks
range
onChange="onChange"
- onAfterChange="onAfterChange"
- />
+ onAfterChange="onAfterChange" />
@@ -55,18 +50,15 @@
showNumber
range
onChange="onChange"
- onAfterChange="onAfterChange"
- />
+ onAfterChange="onAfterChange" />
-
+ onAfterChange="onAfterChange" />
@@ -74,14 +66,12 @@
min="{{0}}"
max="{{100}}"
value="{{value}}"
- onChange="handleChange"
- />
+ onChange="handleChange" />
+ value="{{value}}"
+ onChange="handleChange" />
@@ -94,13 +84,22 @@
activeLineStyle="background-color: #ff8f1f"
activeDotStyle="background-color: red"
onChange="onChange"
- onAfterChange="onAfterChange"
- >
- {{props.value}}°C
- {{props.value}}°C
-
+ onAfterChange="onAfterChange">
+
+ {{props.value}}°C
+
+
+ {{props.value}}°C
+
+
-
+
@@ -110,6 +109,5 @@
+ onChange="onChange" />
diff --git a/demo/pages/Stepper/index.axml b/demo/pages/Stepper/index.axml
index f3e7ce320..7c4f0b4b2 100644
--- a/demo/pages/Stepper/index.axml
+++ b/demo/pages/Stepper/index.axml
@@ -1,57 +1,67 @@
-
+
-
+
-
+ inputStyle="width: 60px" />
-
+ inputStyle="width: 60px" />
-
+ step="{{1}}" />
-
+ disabled />
-
+ onFocus="onFocus" />
value: {{value}}
- add
- minus
- clear
+
+ add
+
+
+ minus
+
+
+ clear
+
-
\ No newline at end of file
+
diff --git a/demo/pages/Steps/index.axml b/demo/pages/Steps/index.axml
index d3a907b98..bee75048d 100644
--- a/demo/pages/Steps/index.axml
+++ b/demo/pages/Steps/index.axml
@@ -6,15 +6,13 @@
+ current="{{1}}" />
+ direction="vertical" />
@@ -22,36 +20,38 @@
items="{{items}}"
status="error"
current="{{1}}"
- direction="vertical"
- />
+ direction="vertical" />
-
+
+ current="{{2}}">
+ a:if="{{iconList[item.index]}}" />
-
+
{{item.index + 1}}
-
+
{{item.value.title}}
{{item.value.description}}
-
diff --git a/demo/pages/StepsControl/index.axml b/demo/pages/StepsControl/index.axml
index 49d101994..83c706398 100644
--- a/demo/pages/StepsControl/index.axml
+++ b/demo/pages/StepsControl/index.axml
@@ -1,12 +1,16 @@
-
+ current="{{current}}" />
+
下一步
完成
- 上一步
-
+
+ 上一步
+
diff --git a/demo/pages/SwipeAction/index.axml b/demo/pages/SwipeAction/index.axml
index fb6542364..bfcce0ce1 100644
--- a/demo/pages/SwipeAction/index.axml
+++ b/demo/pages/SwipeAction/index.axml
@@ -2,7 +2,9 @@
基础用法
-
+
-
- 右侧-三个按钮
-
+ onButtonTap="onButtonTap">
+ 右侧-三个按钮
-
\ No newline at end of file
+
diff --git a/demo/pages/SwipeActionAnimation/index.axml b/demo/pages/SwipeActionAnimation/index.axml
index bd88ece32..43ee36553 100644
--- a/demo/pages/SwipeActionAnimation/index.axml
+++ b/demo/pages/SwipeActionAnimation/index.axml
@@ -2,7 +2,9 @@
去除松开手之后的滑动回弹效果
-
+
-
- 右侧-三个按钮
-
+ onButtonTap="onButtonTap">
+ 右侧-三个按钮
-
\ No newline at end of file
+
diff --git a/demo/pages/SwipeActionLeft/index.axml b/demo/pages/SwipeActionLeft/index.axml
index 03a4512e3..8ed435697 100644
--- a/demo/pages/SwipeActionLeft/index.axml
+++ b/demo/pages/SwipeActionLeft/index.axml
@@ -2,7 +2,9 @@
按钮在左侧
-
+
-
- 左侧-三个按钮
-
+ onButtonTap="onButtonTap">
+ 左侧-三个按钮
-
\ No newline at end of file
+
diff --git a/demo/pages/SwipeActionLeftRight/index.axml b/demo/pages/SwipeActionLeftRight/index.axml
index abcfbff4a..a11a7ca84 100644
--- a/demo/pages/SwipeActionLeftRight/index.axml
+++ b/demo/pages/SwipeActionLeftRight/index.axml
@@ -3,7 +3,9 @@
左右两侧都有按钮
-
+
-
- 三个按钮
-
+ onButtonTap="onButtonTap">
+ 三个按钮
-
\ No newline at end of file
+
diff --git a/demo/pages/SwipeActionMove/index.axml b/demo/pages/SwipeActionMove/index.axml
index 6257b4640..f9886a000 100644
--- a/demo/pages/SwipeActionMove/index.axml
+++ b/demo/pages/SwipeActionMove/index.axml
@@ -2,7 +2,9 @@
删除按钮滑动到最大距离触发二次确认
-
+
-
- 右侧-三个按钮
-
+ onButtonTap="onButtonTap">
+ 右侧-三个按钮
-
+
-
\ No newline at end of file
+
diff --git a/demo/pages/SwipeActionNumber/index.axml b/demo/pages/SwipeActionNumber/index.axml
index c9c328cf9..90f828c73 100644
--- a/demo/pages/SwipeActionNumber/index.axml
+++ b/demo/pages/SwipeActionNumber/index.axml
@@ -2,7 +2,9 @@
调整按钮数量,最多为3个
-
+
+ onButtonTap="onButtonTap">
右侧-{{`${index + 1 > 3 ? 3 : index + 1}个按钮`}}
-
\ No newline at end of file
+
diff --git a/demo/pages/SwipeActionSpeed/index.axml b/demo/pages/SwipeActionSpeed/index.axml
index cf0185271..82f806848 100644
--- a/demo/pages/SwipeActionSpeed/index.axml
+++ b/demo/pages/SwipeActionSpeed/index.axml
@@ -2,7 +2,9 @@
滑动速度变慢
-
+
-
- 右侧-三个按钮
-
+ onButtonTap="onButtonTap">
+ 右侧-三个按钮
-
\ No newline at end of file
+
diff --git a/demo/pages/SwipeActionTap/index.axml b/demo/pages/SwipeActionTap/index.axml
index 1e6dce612..abb0b8907 100644
--- a/demo/pages/SwipeActionTap/index.axml
+++ b/demo/pages/SwipeActionTap/index.axml
@@ -2,7 +2,9 @@
删除按钮点击二次确认
-
+
-
- 右侧-三个按钮
-
+ onButtonTap="onButtonTap">
+ 右侧-三个按钮
-
\ No newline at end of file
+
diff --git a/demo/pages/SwipeActionWidth/index.axml b/demo/pages/SwipeActionWidth/index.axml
index 59dde70e2..e5365085c 100644
--- a/demo/pages/SwipeActionWidth/index.axml
+++ b/demo/pages/SwipeActionWidth/index.axml
@@ -2,7 +2,9 @@
自定义按钮宽度
-
+
-
- 右侧-三个按钮
-
+ onButtonTap="onButtonTap">
+ 右侧-三个按钮
-
\ No newline at end of file
+
diff --git a/demo/pages/Switch/index.axml b/demo/pages/Switch/index.axml
index c173389eb..a618a0ea5 100644
--- a/demo/pages/Switch/index.axml
+++ b/demo/pages/Switch/index.axml
@@ -4,34 +4,38 @@
-
+
+ onChange="onChange" />
-
-
+
+
-
+ color="#00b578" />
-
-
+ disabled="{{true}}" />
+
@@ -57,7 +61,6 @@
+ defaultChecked="{{true}}" />
diff --git a/demo/pages/TabBar/index.axml b/demo/pages/TabBar/index.axml
index 9dfea0d16..31d32121f 100644
--- a/demo/pages/TabBar/index.axml
+++ b/demo/pages/TabBar/index.axml
@@ -1,25 +1,19 @@
-
+
+ onChange="handleChange" />
-
+
-
\ No newline at end of file
+ activeStyle="color:red;" />
+
diff --git a/demo/pages/Tabs/index.axml b/demo/pages/Tabs/index.axml
index b4b370131..d7b937d3f 100644
--- a/demo/pages/Tabs/index.axml
+++ b/demo/pages/Tabs/index.axml
@@ -2,84 +2,73 @@
-
-
+
{{item.value.content}}
-
+ defaultCurrent="{{1}}" />
-
+ items="{{items}}" />
-
-
+
-
- {{item.value.title}}
-
-
-
- {{item.value.title}}
+ {{item.value.title}}
+ {{item.value.title}}
-
-
-
+
-
-
+
-
+ onChange="handleChange" />
-
-
- {{items[current].content}}
-
+ onChange="handleChange" />
+ {{items[current].content}}
diff --git a/demo/pages/TabsControl/index.axml b/demo/pages/TabsControl/index.axml
index 85b12e716..573563c7c 100644
--- a/demo/pages/TabsControl/index.axml
+++ b/demo/pages/TabsControl/index.axml
@@ -1,24 +1,31 @@
-
- {{items[current].content}}
-
+ onChange="onChange">
+ {{items[current].content}}
-
-
- current: {{current}}
- length: {{items.length}}
-
+current: {{current}} length: {{items.length}}
- 上一个
- 下一个
- 添加
- 减少
+
+ 上一个
+
+
+ 下一个
+
+
+ 添加
+
+
+ 减少
+
-
-
diff --git a/demo/pages/TabsElevator/index.axml b/demo/pages/TabsElevator/index.axml
index 3b932477f..58dd71efc 100644
--- a/demo/pages/TabsElevator/index.axml
+++ b/demo/pages/TabsElevator/index.axml
@@ -2,9 +2,11 @@
items="{{items}}"
current="{{current}}"
onChange="onChange"
- class="tabs"
->
-
+ class="tabs">
+
{{item.value.title}}
@@ -16,10 +18,13 @@
scroll-y="{{true}}"
scroll-with-animation="{{true}}"
scroll-animation-duration="{{300}}"
- class="content"
- >
-
-
+ class="content">
+
+
{{item.title}}
{{item.content}}
diff --git a/demo/pages/TabsScroll/index.axml b/demo/pages/TabsScroll/index.axml
index f408bf0e2..bbad83364 100644
--- a/demo/pages/TabsScroll/index.axml
+++ b/demo/pages/TabsScroll/index.axml
@@ -4,19 +4,27 @@
选择后居中滚动
-
+
-
+
-
+
-
+
diff --git a/demo/pages/TabsSticky/index.axml b/demo/pages/TabsSticky/index.axml
index 83f0015f8..e3c2456c7 100644
--- a/demo/pages/TabsSticky/index.axml
+++ b/demo/pages/TabsSticky/index.axml
@@ -1,16 +1,12 @@
- tabs 吸顶模式,
- 滑动到最顶部会吸顶,
- 切换tab content会滚动到最顶部
+ tabs 吸顶模式, 滑动到最顶部会吸顶, 切换tab content会滚动到最顶部
-
+ class="tabs" />
+ class="content">
{{items[current].content}}
diff --git a/demo/pages/TabsSwiper/index.axml b/demo/pages/TabsSwiper/index.axml
index e9d9d38d8..7568e7ab4 100644
--- a/demo/pages/TabsSwiper/index.axml
+++ b/demo/pages/TabsSwiper/index.axml
@@ -1,19 +1,15 @@
+ onChange="onChange">
+ onChange="onSwipeChange">
-
- {{item.content}}
-
+ {{item.content}}
diff --git a/demo/pages/TabsVertical/index.axml b/demo/pages/TabsVertical/index.axml
index 89e1b751e..752c3ff31 100644
--- a/demo/pages/TabsVertical/index.axml
+++ b/demo/pages/TabsVertical/index.axml
@@ -3,19 +3,16 @@
current="{{current}}"
onChange="onChange"
class="tabs"
- direction="vertical"
->
+ direction="vertical">
+ class="content">
{{items[current].content}}
-
+
diff --git a/demo/pages/TabsVerticalElevator/index.axml b/demo/pages/TabsVerticalElevator/index.axml
index 24a0c7849..02374e770 100644
--- a/demo/pages/TabsVerticalElevator/index.axml
+++ b/demo/pages/TabsVerticalElevator/index.axml
@@ -5,8 +5,7 @@
direction="vertical"
class="tabs"
tabsBarClassName="tabs-bar"
- tabActiveClassName="tab-active"
->
+ tabActiveClassName="tab-active">
-
- {{item.title}}
+ class="content">
+
+
+ {{item.title}}
+
{{item.content}}
-
+
diff --git a/demo/pages/Tag/index.axml b/demo/pages/Tag/index.axml
index ecd97422c..502bac8ae 100644
--- a/demo/pages/Tag/index.axml
+++ b/demo/pages/Tag/index.axml
@@ -4,23 +4,66 @@
default
- success
- warning
- danger
+
+ success
+
+
+ warning
+
+
+ danger
+
- fill
- outline
- fill-light
+
+ fill
+
+
+ outline
+
+
+ fill-light
+
- 标签
- 标签
- 标签
- 标签
+
+ 标签
+
+
+ 标签
+
+
+ 标签
+
+
+ 标签
+
-
\ No newline at end of file
+
diff --git a/demo/pages/Toast/index.axml b/demo/pages/Toast/index.axml
index 0590deb6c..f891bd156 100644
--- a/demo/pages/Toast/index.axml
+++ b/demo/pages/Toast/index.axml
@@ -1,179 +1,161 @@
-
+ data-index="1"
+ onTap="handleShowToast">
简短文字
-
+
过长文字
-
+ data-index="7"
+ onTap="handleShowToast">
成功提示
-
+
失败提示
-
+
警告提示
-
+
自定义图标
-
+
自定义图片
-
+
加载态
-
+ onTap="handleShowToast">
提示持续3s
-
-
-
+ data-index="1" />
-
+
-
+
+
+ duration="{{0}}"
+ showMask="{{true}}"
+ maskCloseable="{{true}}"
+ onClose="handleCloseToast"
+ data-index="5" />
-
+ data-index="3"
+ onClose="handleCloseToast"
+ showMask="{{true}}"
+ maskCloseable="{{true}}" />
-
+ data-index="6"
+ type="loading"
+ onClose="handleCloseToast"
+ showMask="{{true}}"
+ duration="{{0}}"
+ maskCloseable="{{true}}" />
-
-
+
-
+
\ No newline at end of file
+ data-index="9"
+ type="warning"
+ onClose="handleCloseToast"
+ showMask="{{true}}"
+ duration="{{0}}"
+ maskCloseable="{{true}}" />
diff --git a/src/ActionSheet/index.axml b/src/ActionSheet/index.axml
index ecf1b2949..f34431856 100644
--- a/src/ActionSheet/index.axml
+++ b/src/ActionSheet/index.axml
@@ -1,41 +1,54 @@
-
+
-
-
-
- {{title}}
-
-
-
+ onClose="onClose">
+
+
+
+ {{title}}
+
+
+
+
+ class="ant-actionsheet-list-item-icon"
+ a:if="{{helper.isIconMode(actions)}}"
+ style="background-image: url('{{item.icon}}')">
+
+ class="ant-actionsheet-list-item-title {{ item.danger ? 'ant-actionsheet-list-item-title-danger' : ''}}">
+ {{item.text}}
-
- {{item.text}}
- {{item.description}}
+
+ {{item.description}}
-
-
- {{cancelText}}
-
+
+
+
+
+ {{cancelText}}
+
+
diff --git a/src/Avatar/index.axml b/src/Avatar/index.axml
index 54147e7e6..ada28eba1 100644
--- a/src/Avatar/index.axml
+++ b/src/Avatar/index.axml
@@ -1,9 +1,12 @@
-
+
-
+
+ a:if="{{src}}" />
diff --git a/src/Badge/index.axml b/src/Badge/index.axml
index e1542bb4b..73bf7de89 100644
--- a/src/Badge/index.axml
+++ b/src/Badge/index.axml
@@ -1,18 +1,21 @@
-
+
-
+
-
-
+ a:if="{{type=== 'dot'}}"
+ class="ant-badge-content"
+ style="{{_sjs.setPositionStyle(position, offsetX, offsetY)}}">
+
-
-
+
@@ -36,8 +38,9 @@
class="ant-badge-text">
{{text}}
-
+
{{text}}
diff --git a/src/Button/index.axml b/src/Button/index.axml
index 3d64e162e..4fed30419 100644
--- a/src/Button/index.axml
+++ b/src/Button/index.axml
@@ -1,5 +1,6 @@
-
-
+
+ style="{{style}}">
-
+
-
+
{{subText}}
-
+
+ className="ant-button-content-loading" />
diff --git a/src/Calendar/index.axml b/src/Calendar/index.axml
index 1f8ee390d..e214d7dbb 100644
--- a/src/Calendar/index.axml
+++ b/src/Calendar/index.axml
@@ -1,9 +1,17 @@
-
-
+
+
-
+
-
+
{{item}}
@@ -24,14 +32,13 @@
data-elementSize="{{elementSize}}"
data-monthList="{{monthList}}"
onScroll="{{scroll.handleScroll}}"
- ref="handleRef"
- >
-
+ ref="handleRef">
+
-
- {{currentMonth.title}}
-
+ {{currentMonth.title}}
@@ -39,21 +46,21 @@
+ onTap="clickCell">
-
+
{{item.top.label}}
-
- {{item.date}}
-
+ {{item.date}}
-
+
{{item.bottom.label}}
@@ -64,10 +71,11 @@
-
+
-
\ No newline at end of file
+
diff --git a/src/Checkbox/CheckboxGroup/index.axml b/src/Checkbox/CheckboxGroup/index.axml
index cca05149e..37d76a418 100644
--- a/src/Checkbox/CheckboxGroup/index.axml
+++ b/src/Checkbox/CheckboxGroup/index.axml
@@ -1,11 +1,13 @@
-
+
-
+
+ value="{{ mixin.value }}">
@@ -15,11 +17,15 @@
data-index="{{index}}"
value="{{item.value}}"
disabled="{{disabled || item.disabled}}"
- onChange="onChange"
- >
-
- {{item.label}}
-
+ onChange="onChange">
+
+
+ {{item.label}}
+
+
@@ -31,10 +37,14 @@
data-index="{{index}}"
value="{{item.value}}"
disabled="{{disabled || item.disabled}}"
- onChange="onChange"
- >
-
- {{item.label}}
+ onChange="onChange">
+
+
+ {{item.label}}
+
diff --git a/src/Checkbox/index.axml b/src/Checkbox/index.axml
index 73dddc15a..d87ca67e4 100644
--- a/src/Checkbox/index.axml
+++ b/src/Checkbox/index.axml
@@ -1,21 +1,30 @@
-
-
-
+
+ class="ant-rare-words-keyboard_pinyin_row">
+ onTap="handleKeyClick">
{{ item.label }}
@@ -92,16 +103,19 @@
+ onTap="handleDelete">
-
+
-
+
diff --git a/src/Rate/index.axml b/src/Rate/index.axml
index c111757de..5067fb18c 100644
--- a/src/Rate/index.axml
+++ b/src/Rate/index.axml
@@ -1,25 +1,32 @@
-
+
-
+
-
-
+ style="margin-right: {{(index === count - 1 ? 0 : gutter) + 'px'}}">
+
+
-
-
+
+
diff --git a/src/Result/index.axml b/src/Result/index.axml
index a9bf15ea4..b2a9c294f 100644
--- a/src/Result/index.axml
+++ b/src/Result/index.axml
@@ -1,20 +1,24 @@
-
+
-
+
-
-
+
+ style="font-size: 64px" />
-
+ image="{{image}}" />
{{title}}
@@ -23,6 +27,5 @@
{{message}}
-
-
+
diff --git a/src/Selector/index.axml b/src/Selector/index.axml
index 694addb40..e67bdfb68 100644
--- a/src/Selector/index.axml
+++ b/src/Selector/index.axml
@@ -1,20 +1,33 @@
-
+
-
+
-
+
- {{item.text}}
- {{item.subText}}
-
+
+ {{item.text}}
+
+
+ {{item.subText}}
+
+
diff --git a/src/Skeleton/Avatar/index.axml b/src/Skeleton/Avatar/index.axml
index 5dd57250b..7e1b61670 100644
--- a/src/Skeleton/Avatar/index.axml
+++ b/src/Skeleton/Avatar/index.axml
@@ -1,8 +1,9 @@
-
+
-
+ a:if="{{loading}}"
+ style="{{style}}"
+ class="ant-skeleton-avatar ant-skeleton-avatar-{{shape}} {{animate?'ant-skeleton-avatar-animate':''}} {{utils.getClass(size)}} {{className || ''}}" />
+
diff --git a/src/Skeleton/Button/index.axml b/src/Skeleton/Button/index.axml
index f089ff39d..c82e99183 100644
--- a/src/Skeleton/Button/index.axml
+++ b/src/Skeleton/Button/index.axml
@@ -1,6 +1,9 @@
-
+
-
-
-
-
\ No newline at end of file
+
+
diff --git a/src/Skeleton/Input/index.axml b/src/Skeleton/Input/index.axml
index 85b55b8b7..4b4361a80 100644
--- a/src/Skeleton/Input/index.axml
+++ b/src/Skeleton/Input/index.axml
@@ -1,4 +1,5 @@
-
-
-
-
\ No newline at end of file
+
+
diff --git a/src/Skeleton/Paragraph/index.axml b/src/Skeleton/Paragraph/index.axml
index c54bcf36d..5438f32d3 100644
--- a/src/Skeleton/Paragraph/index.axml
+++ b/src/Skeleton/Paragraph/index.axml
@@ -1,4 +1,9 @@
-
-
+
+
-
\ No newline at end of file
+
diff --git a/src/Skeleton/Title/index.axml b/src/Skeleton/Title/index.axml
index 1fa5a6f7c..6c2956633 100644
--- a/src/Skeleton/Title/index.axml
+++ b/src/Skeleton/Title/index.axml
@@ -1,4 +1,5 @@
-
-
-
-
\ No newline at end of file
+
+
diff --git a/src/Skeleton/index.axml b/src/Skeleton/index.axml
index c02fad6a6..04852f796 100644
--- a/src/Skeleton/index.axml
+++ b/src/Skeleton/index.axml
@@ -1,10 +1,24 @@
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
diff --git a/src/Slider/index.axml b/src/Slider/index.axml
index a223f99e7..c51338b21 100644
--- a/src/Slider/index.axml
+++ b/src/Slider/index.axml
@@ -1,62 +1,80 @@
-
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
-
- {{value}}
-
-
+
+
+
+ {{value}}
+
+
+
+
-
-
-
+
+
-
-
-
+
+
+
+ style="width: {{sliderWidth}}%; left: {{sliderLeft}}%; {{activeLineStyle || ''}}" />
-
-
-
- {{item.value}}
-
+
+
+
+ {{item.value}}
+
+
-
-
-
+
+
-
+
+
diff --git a/src/Stepper/index.axml b/src/Stepper/index.axml
index a04d4ce73..6678a3b83 100644
--- a/src/Stepper/index.axml
+++ b/src/Stepper/index.axml
@@ -1,4 +1,6 @@
-
+
-
+ onTap="onTap">
-
+ value="{{mixin.value}}" />
-
-
+ onTap="onTap">
diff --git a/src/Steps/index.axml b/src/Steps/index.axml
index e924b9dff..d5c1f7cec 100644
--- a/src/Steps/index.axml
+++ b/src/Steps/index.axml
@@ -1,31 +1,49 @@
-
+
-
-
+
-
-
-
-
+ {{index > current? 'ant-steps-item-non-active' : ''}}">
+
+
+
+
-
-
+
+
{{item.title}}
-
+
{{item.description}}
-
diff --git a/src/SwipeAction/index.axml b/src/SwipeAction/index.axml
index 7885f9421..fa926d9dd 100644
--- a/src/SwipeAction/index.axml
+++ b/src/SwipeAction/index.axml
@@ -1,7 +1,11 @@
-
+
-
+
+ catchTouchStart="onTouchStart">
-
+
@@ -49,9 +54,10 @@
animation="{{false}}"
disabled="{{true}}"
direction="horizontal"
- x="{{moveX * (util.getMoveX(_rightButtons, idx) / rightWidth)}}"
- >
-
+ x="{{moveX * (util.getMoveX(_rightButtons, idx) / rightWidth)}}">
+
-
- {{tapTypeR && tapTypeR === `R-${idx}` ? (item.confirmText || item.text) : item.text}}
-
+
+ {{tapTypeR && tapTypeR === `R-${idx}` ? (item.confirmText ||
+ item.text) : item.text}}
+
@@ -85,17 +93,16 @@
animation="{{false}}"
disabled="{{true}}"
direction="horizontal"
- x="{{moveX * (util.getMoveX(_leftButtons, idx) / leftWidth)}}"
- >
-
+ x="{{moveX * (util.getMoveX(_leftButtons, idx) / leftWidth)}}">
+
-
-
- {{tapTypeL && tapTypeL === `L-${idx}` ? (itemL.confirmText || itemL.text) : itemL.text}}
+
+
+ {{tapTypeL && tapTypeL === `L-${idx}` ? (itemL.confirmText ||
+ itemL.text) : itemL.text}}
+
-
-
\ No newline at end of file
+
diff --git a/src/Switch/index.axml b/src/Switch/index.axml
index 6c49ad5e9..bd1d9c789 100644
--- a/src/Switch/index.axml
+++ b/src/Switch/index.axml
@@ -1,12 +1,23 @@
-
-
+
- {{checkedText}}
- {{uncheckedText}}
+
+ {{checkedText}}
+
+
+ {{uncheckedText}}
+
diff --git a/src/TabBar/index.axml b/src/TabBar/index.axml
index ea2cec265..caa54b5b8 100644
--- a/src/TabBar/index.axml
+++ b/src/TabBar/index.axml
@@ -1,12 +1,13 @@
-
+
+ data-index="{{index}}">
-
+ offsetY="{{item.badge.offsetY || '0px'}}">
+
+ image="{{mixin.value === index? item.activeIcon : item.icon}}" />
-
+
+ image="{{mixin.value === index?item.activeIcon : item.icon}}" />
-
-
- {{item.text}}
-
+
+ {{item.text}}
diff --git a/src/Tabs/index.axml b/src/Tabs/index.axml
index f65c62fd7..30a63096b 100644
--- a/src/Tabs/index.axml
+++ b/src/Tabs/index.axml
@@ -1,44 +1,60 @@
-
-
+
+
-
+
-
-
-
+ scroll-animation-duration="{{300}}">
-
+
-
-
+
{{item.title}}
-
-
+
{{item.title}}
@@ -48,16 +64,21 @@
-
+
{{item.title}}
-
+
{{item.subTitle}}
@@ -67,21 +88,24 @@
-
-
-
+
-
+
-
+ scroll-animation-duration="{{300}}">
+ data-index="{{index}}">
-
+
{{item.title}}
@@ -101,9 +127,10 @@
-
+
{{items[mixin.value].content}}
-
diff --git a/src/Tag/index.axml b/src/Tag/index.axml
index 33babba81..419426fd1 100644
--- a/src/Tag/index.axml
+++ b/src/Tag/index.axml
@@ -1,5 +1,9 @@
-
-
+
+
diff --git a/src/Toast/index.axml b/src/Toast/index.axml
index 9820ced64..1a19e8a6e 100644
--- a/src/Toast/index.axml
+++ b/src/Toast/index.axml
@@ -1,53 +1,45 @@
-
-
-
-
-
-
+
+
+
+
+
+
-
-
+
+
-
- {{content.substring(0, 24)}}
-
+ {{content.substring(0, 24)}}
-
\ No newline at end of file
+ onMaskTap="handleClickMask"
+ style="{{maskStyle}}" />