diff --git a/src/datetime-picker/README.md b/src/datetime-picker/README.md index 724e53d99..287c60616 100644 --- a/src/datetime-picker/README.md +++ b/src/datetime-picker/README.md @@ -32,7 +32,7 @@ app.use(DatetimePicker); import { ref } from 'vue'; export default { - data() { + setup() { const currentDate = ref(new Date()); return { minDate: new Date(2020, 0, 1), @@ -60,7 +60,7 @@ export default { import { ref } from 'vue'; export default { - data() { + setup() { const currentDate = ref(new Date()); const formatter = (type, val) => { @@ -99,7 +99,7 @@ export default { import { ref } from 'vue'; export default { - data() { + setup() { const currentDate = ref(new Date()); const formatter = (type, val) => { @@ -137,7 +137,7 @@ export default { import { ref } from 'vue'; export default { - data() { + setup() { const currentTime = ref('12:00'); return { currentTime }; }, @@ -160,7 +160,7 @@ export default { import { ref } from 'vue'; export default { - data() { + setup() { const currentDate = ref(new Date()); return { minDate: new Date(2020, 0, 1), @@ -187,7 +187,7 @@ export default { import { ref } from 'vue'; export default { - data() { + setup() { const currentDate = ref(new Date()); return { minDate: new Date(2020, 0, 1), @@ -213,7 +213,7 @@ export default { import { ref } from 'vue'; export default { - data() { + setup() { const currentTime = ref('12:00'); const filter = (type, options) => { diff --git a/src/datetime-picker/README.zh-CN.md b/src/datetime-picker/README.zh-CN.md index 091810dcb..2c4968485 100644 --- a/src/datetime-picker/README.zh-CN.md +++ b/src/datetime-picker/README.zh-CN.md @@ -34,7 +34,7 @@ DatetimePicker 通过 type 属性来定义需要选择的时间类型,type 为 import { ref } from 'vue'; export default { - data() { + setup() { const currentDate = ref(new Date()); return { minDate: new Date(2020, 0, 1), @@ -64,7 +64,7 @@ export default { import { ref } from 'vue'; export default { - data() { + setup() { const currentDate = ref(new Date()); const formatter = (type, val) => { @@ -105,7 +105,7 @@ export default { import { ref } from 'vue'; export default { - data() { + setup() { const currentDate = ref(new Date()); const formatter = (type, val) => { @@ -145,7 +145,7 @@ export default { import { ref } from 'vue'; export default { - data() { + setup() { const currentTime = ref('12:00'); return { currentTime }; }, @@ -170,7 +170,7 @@ export default { import { ref } from 'vue'; export default { - data() { + setup() { const currentDate = ref(new Date()); return { minDate: new Date(2020, 0, 1), @@ -199,7 +199,7 @@ export default { import { ref } from 'vue'; export default { - data() { + setup() { const currentDate = ref(new Date()); return { minDate: new Date(2020, 0, 1), @@ -222,7 +222,7 @@ export default { import { ref } from 'vue'; export default { - data() { + setup() { const currentTime = ref('12:00'); const filter = (type, options) => { diff --git a/src/form/README.md b/src/form/README.md index 967df44d0..ff22456c6 100644 --- a/src/form/README.md +++ b/src/form/README.md @@ -17,14 +17,14 @@ app.use(Form); ```html { console.log('submit', values); - }, + }; + + return { + state, + onSubmit, + }; }, }; ``` @@ -60,19 +65,19 @@ export default { ```html { + }); + const pattern = /\d{6}/; + + const validator = (val) => /1\d{10}/.test(val); + + const asyncValidator = (val) => + new Promise((resolve) => { Toast.loading('Validating...'); setTimeout(() => { @@ -110,10 +114,18 @@ export default { resolve(/\d{6}/.test(val)); }, 1000); }); - }, - onFailed(errorInfo) { + + const onFailed = (errorInfo) => { console.log('failed', errorInfo); - }, + }; + + return { + state, + pattern, + onFailed, + validator, + asyncValidator, + }; }, }; ``` @@ -123,17 +135,18 @@ export default { ```html ``` ```js +import { ref } from 'vue'; + export default { - data() { - return { - switchChecked: false, - }; + setup() { + const checked = ref(false); + return { checked }; }, }; ``` @@ -143,12 +156,12 @@ export default { ```html diff --git a/src/form/demo/FieldTypeDatetimePicker.vue b/src/form/demo/FieldTypeDatetimePicker.vue index e8123b4ae..cc89fdf28 100644 --- a/src/form/demo/FieldTypeDatetimePicker.vue +++ b/src/form/demo/FieldTypeDatetimePicker.vue @@ -14,34 +14,42 @@ diff --git a/src/form/demo/FieldTypePicker.vue b/src/form/demo/FieldTypePicker.vue index d78630680..8b946fe92 100644 --- a/src/form/demo/FieldTypePicker.vue +++ b/src/form/demo/FieldTypePicker.vue @@ -18,36 +18,45 @@ diff --git a/src/form/demo/ValidateRules.vue b/src/form/demo/ValidateRules.vue index a17a3a91f..0019c16b5 100644 --- a/src/form/demo/ValidateRules.vue +++ b/src/form/demo/ValidateRules.vue @@ -22,7 +22,7 @@ :rules="[{ validator: asyncValidator, message: t('message') }]" :placeholder="t('asyncValidator')" /> -
+
{{ t('submit') }} @@ -32,62 +32,71 @@