Skip to content

Commit ce4db4f

Browse files
FasttianFasttian
committed
merge dev
2 parents fe7530e + cd874fa commit ce4db4f

File tree

26 files changed

+985
-934
lines changed

26 files changed

+985
-934
lines changed

‎docs/components/forms.md‎

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ uni-app的内置组件已经有了 `<form>`组件，用于提交表单内容。
5353
```html
5454
<template>
5555
<view class="">
56-
<uni-forms :value="formData" ref="form">
56+
<uni-forms :modelValue="formData" ref="form">
5757
<uni-forms-item label="姓名" name="name">
5858
<uni-easyinput type="text" v-model="formData.name" placeholder="请输入姓名" />
5959
</uni-forms-item>
@@ -76,7 +76,8 @@ export default {
7676
return {
7777
formData:{
7878
name:'',
79-
age:''
79+
age:'',
80+
hobby:[]
8081
},
8182
hobby: [{
8283
text: '足球',
@@ -124,7 +125,7 @@ export default {
124125
```html
125126
<template>
126127
<view>
127-
<uni-forms ref="form" :value="formData" :rules="rules">
128+
<uni-forms ref="form" :modelValue="formData" :rules="rules">
128129
<uni-forms-item label="姓名" name="name">
129130
<uni-easyinput type="text" v-model="formData.name" placeholder="请输入姓名" />
130131
</uni-forms-item>
@@ -351,7 +352,7 @@ export default {
351352
```html
352353
<template>
353354
<view>
354-
<uni-forms :value="formData" ref="form">
355+
<uni-forms :modelValue="formData" ref="form">
355356
<uni-forms-item name="age" label="年龄">
356357
<uni-easyinput v-model="formData.age" type="text" placeholder="请输入年龄" />
357358
</uni-forms-item>
@@ -426,7 +427,7 @@ export default {
426427

427428
<template>
428429
<view>
429-
<uni-forms ref="form" :value="formData" validate-trigger="bind">
430+
<uni-forms ref="form" :modelValue="formData" validate-trigger="bind">
430431
<uni-forms-item name="age" label="年龄">
431432
<!-- uni-easyinput 的校验时机是数据发生变化， 即触发 input 时 -->
432433
<uni-easyinput v-model="formData.age" type="text" placeholder="请输入年龄" />
@@ -461,7 +462,8 @@ export default {
461462

462463
| 属性名 | 类型 |默认值 | 可选值 | 说明|
463464
| :-: | :-: |:-: | :-: | :-: |
464-
| v-model/value | Object | - | - | 表单数据|
465+
| v-model/value [即将废弃] | Object | - | - | 表单数据|
466+
| v-model/modelValue| Object | - | - | 表单数据|
465467
| rules | Object | - | - | 表单校验规则 |
466468
| validate-trigger| String | submit | bind/submit | 表单校验时机|
467469
| label-position | String | left | top/left | label 位置
@@ -480,11 +482,12 @@ validate | 任意表单项被校验后触发，返回表单校验信息
480482

481483
| 方法称名 | 说明 |
482484
| :-: | :-: |
483-
| submit | 对整个表单进行校验的方法，会返回一个 promise |
485+
| submit[即将废弃]| 对整个表单进行校验的方法，会返回一个 promise |
486+
| validate | 对整个表单进行校验的方法，会返回一个 promise |
484487
| setValue | 设置表单某一项 name 的对应值，通常在 uni-forms-item 和自定表单组件中使用|
485488
| validateField | 部分表单进行校验 |
486489
| clearValidate | 移除表单的校验结果 |
487-
| resetFields | 重置表单, 需要把 `uni-forms` 的`value`属性改为 `v-model` ,且对内置组件可能不生效|
490+
| resetFields | 重置表单, 需要把 `uni-forms` 的`modelValue`属性改为 `v-model` ,且对内置组件可能不生效|
488491

489492

490493
```javascript

‎index.js‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,15 +31,12 @@ componentsPackageJsons.forEach(item => {
3131

3232
let uniuiPackage = path.join(modulesPath, 'uni-ui', 'package.json')
3333
uniuiPackage = JSON.parse(fs.readFileSync(uniuiPackage).toString())
34-
console.log(uniuiPackage.version);
3534
const uniuiChangelog = updateChangelogFile(
3635
path.join(modulesPath, 'uni-ui', 'changelog.md'),
3736
uniuiPackage.id,
3837
uniuimd
3938
)
4039

41-
console.log(uniuiChangelog)
42-
4340
// // 将最新的个组件写入缓存区域
4441
// fs.writeFileSync(path.join(__dirname,'temps','sync-version.json'),JSON.stringify(syncVersion,null,2))
4542
// ------ 写入最新的缓存版本号 end------

‎manifest.json‎

Lines changed: 53 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -1,54 +1,54 @@
1-
{
2-
"name": "",
3-
"appid": "",
4-
"description": "",
5-
"versionName": "1.0.0",
6-
"versionCode": "100",
7-
"transformPx": false,
8-
// "debug":true,
9-
"app-plus": {
10-
"nvueCompiler": "uni-app",
11-
"nvueStyleCompiler" : "uni-app",
12-
"compilerVersion": 3,
13-
"modules": {},
14-
"distribute": {
15-
"android": {
16-
"permissions": [
17-
"<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
18-
"<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
19-
"<uses-permission android:name=\"android.permission.VIBRATE\"/>",
20-
"<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
21-
"<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
22-
"<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
23-
"<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
24-
"<uses-permission android:name=\"android.permission.CAMERA\"/>",
25-
"<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
26-
"<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
27-
"<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
28-
"<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
29-
"<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
30-
"<uses-feature android:name=\"android.hardware.camera\"/>",
31-
"<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
32-
]
33-
},
34-
"ios": {},
35-
"sdkConfigs": {}
36-
},
37-
"nvueLaunchMode": "fast"
38-
},
39-
"quickapp": {},
40-
"mp-weixin": {
41-
"appid": "",
42-
"setting": {
43-
"urlCheck": true
44-
}
45-
},
46-
"h5": {
47-
"router": {
48-
"mode": "hash",
49-
"base": "/h5"
50-
},
51-
"title": "uni-ui",
52-
"template": "template.h5.html"
53-
}
1+
{
2+
"name" : "uni-ui",
3+
"appid" : "__UNI__AA95E9C",
4+
"description" : "",
5+
"versionName" : "1.0.0",
6+
"versionCode" : "100",
7+
"transformPx" : false,
8+
// "debug":true,
9+
"app-plus" : {
10+
"nvueCompiler" : "uni-app",
11+
"nvueStyleCompiler" : "uni-app",
12+
"compilerVersion" : 3,
13+
"modules" : {},
14+
"distribute" : {
15+
"android" : {
16+
"permissions" : [
17+
"<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
18+
"<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
19+
"<uses-permission android:name=\"android.permission.VIBRATE\"/>",
20+
"<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
21+
"<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
22+
"<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
23+
"<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
24+
"<uses-permission android:name=\"android.permission.CAMERA\"/>",
25+
"<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
26+
"<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
27+
"<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
28+
"<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
29+
"<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
30+
"<uses-feature android:name=\"android.hardware.camera\"/>",
31+
"<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
32+
]
33+
},
34+
"ios" : {},
35+
"sdkConfigs" : {}
36+
},
37+
"nvueLaunchMode" : "fast"
38+
},
39+
"quickapp" : {},
40+
"mp-weixin" : {
41+
"appid" : "",
42+
"setting" : {
43+
"urlCheck" : true
44+
}
45+
},
46+
"h5" : {
47+
"router" : {
48+
"mode" : "hash",
49+
"base" : "/h5"
50+
},
51+
"title" : "uni-ui",
52+
"template" : "template.h5.html"
53+
}
5454
}

‎pages/nvue/forms/forms.nvue‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,8 @@ export default {
179179
// this.formData 应该包含所有需要校验的表单
180180
// 模拟异步请求数据
181181
setTimeout(() => {
182-
this.formData = {
182+
this.formData = {
183+
id:'testId',
183184
name: 'DCloud',
184185
age: 21,
185186
email: '',
@@ -210,9 +211,8 @@ export default {
210211
* @param {Object} form
211212
*/
212213
submitForm(form) {
213-
// console.log(this.formData);
214214
this.$refs[form]
215-
.submit()
215+
.validate(['id','remarks'])
216216
.then(res => {
217217
console.log('表单的值：', res)
218218
uni.showToast({

‎pages/vue/forms/forms.vue‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,8 @@ export default {
179179
// this.formData 应该包含所有需要校验的表单
180180
// 模拟异步请求数据
181181
setTimeout(() => {
182-
this.formData = {
182+
this.formData = {
183+
id:'testId',
183184
name: 'DCloud',
184185
age: 21,
185186
email: '',
@@ -210,9 +211,8 @@ export default {
210211
* @param {Object} form
211212
*/
212213
submitForm(form) {
213-
// console.log(this.formData);
214214
this.$refs[form]
215-
.submit()
215+
.validate(['id','remarks'])
216216
.then(res => {
217217
console.log('表单的值：', res)
218218
uni.showToast({

‎uni_modules/uni-data-checkbox/changelog.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
## 0.1.7（2021-06-02）
2+
- 新增 map 属性，可以方便映射text/value属性
3+
## 0.1.6（2021-05-26）
4+
- 修复 不关联服务空间的情况下组件报错的Bug
15
## 0.1.5（2021-05-12）
26
- 新增 组件示例地址
37
## 0.1.4（2021-04-09）

0 commit comments

Comments
 (0)