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/ButtonCustom/index.axml b/demo/pages/ButtonCustom/index.axml index 8374ca5c0..d7adf0e7c 100644 --- a/demo/pages/ButtonCustom/index.axml +++ b/demo/pages/ButtonCustom/index.axml @@ -1,10 +1,11 @@ - + @@ -13,8 +14,7 @@ onTap="handleTap" icon="SmileOutline" className="btn" - inline - > + inline> 主要按钮 @@ -24,71 +24,61 @@ icon="ForbidFill" className="btn" inline - danger - > + danger> 主要按钮 - - - + - - - - + + className="circle"> + className="circle"> - - \ No newline at end of file + 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 @@ - - - - - - - - - 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 @@ - - + + - - + + - + - + 上个月 - - {{ demo3.title}} - - + {{ demo3.title}} + 下个月 - - + - + - - + - - + - + - - + + - + - + @@ -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 @@ - - - - {{current}} + + + +{{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 @@ - + - + - - @@ -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" /> - + - - - 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" /> - - + + 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 @@ + allowClear>