fix: component-props,decorator-props label -> props title

formilyjs · Mar 11, 2022 · f08ce7e · f08ce7e
1 parent d5b98f0
commit f08ce7e
Show file tree

Hide file tree

Showing 29 changed files with 120 additions and 172 deletions.
diff --git a/docs/demos/guide/area/json-schema.vue b/docs/demos/guide/area/json-schema.vue
@@ -23,6 +23,7 @@ export default {
   data() {
     const schema = {
       type: 'object',
+      title: '城市',
       properties: {
         area: {
           type: 'array',
@@ -34,7 +35,6 @@ export default {
                   .filter((item) => !!item)
                   .map((item) => item && item.name)
                   .join('/'),
-              label: '城市',
               placeholder: '选择城市',
             },
             popupProps: {},

diff --git a/docs/demos/guide/area/markup-schema.vue b/docs/demos/guide/area/markup-schema.vue
@@ -3,10 +3,10 @@
     <SchemaField>
       <SchemaStringField
         name="area"
+        title="城市"
         x-component="Area"
         :x-component-props="{
           formItemProps: {
-            label: '城市',
             placeholder: '选择城市',
             format: (val) =>
               (val || [])

diff --git a/docs/demos/guide/area/template.vue b/docs/demos/guide/area/template.vue
@@ -2,6 +2,7 @@
   <Form :form="form">
     <Field
       name="area"
+      title="城市"
       :component="[
         Area,
         {
@@ -11,7 +12,6 @@
                 .filter((item) => !!item)
                 .map((item) => item && item.name)
                 .join('/'),
-            label: '城市',
             placeholder: '选择城市',
           },
           popupProps: {},

diff --git a/docs/demos/guide/calendar/json-schema.vue b/docs/demos/guide/calendar/json-schema.vue
@@ -26,10 +26,10 @@ export default {
       properties: {
         calendar: {
           type: 'string',
+          title: '日历',
           'x-component': 'Calendar',
           'x-component-props': {
             formItemProps: {
-              label: '日历',
               placeholder: '选择日历',
               format: (date) =>
                 date && `${date.getMonth() + 1}/${date.getDate()}`,

diff --git a/docs/demos/guide/calendar/markup-schema.vue b/docs/demos/guide/calendar/markup-schema.vue
@@ -3,10 +3,10 @@
     <SchemaField>
       <SchemaStringField
         name="calendar"
+        title="日历"
         x-component="Calendar"
         :x-component-props="{
           formItemProps: {
-            label: '日历',
             placeholder: '选择日历',
             format: (date) =>
               date && `${date.getMonth() + 1}/${date.getDate()}`,

diff --git a/docs/demos/guide/calendar/template.vue b/docs/demos/guide/calendar/template.vue
@@ -2,11 +2,11 @@
   <Form :form="form">
     <Field
       name="calendar"
+      title="日历"
       :component="[
         Calendar,
         {
           formItemProps: {
-            label: '日历',
             placeholder: '选择日历',
             format: (date) =>
               date && `${date.getMonth() + 1}/${date.getDate()}`,

diff --git a/docs/demos/guide/cascader/json-schema.vue b/docs/demos/guide/cascader/json-schema.vue
@@ -26,10 +26,10 @@ export default {
       properties: {
         cascader: {
           type: 'string',
+          title: '地区',
           'x-component': 'Cascader',
           'x-component-props': {
             formItemProps: {
-              label: '地区',
               placeholder: '请选择所在地区',
               format: (data) => {
                 const { selectedOptions = [] } = data || {}

diff --git a/docs/demos/guide/cascader/markup-schema.vue b/docs/demos/guide/cascader/markup-schema.vue
@@ -3,10 +3,10 @@
     <SchemaField>
       <SchemaStringField
         name="cascader"
+        title="地区"
         x-component="Cascader"
         :x-component-props="{
           formItemProps: {
-            label: '地区',
             placeholder: '请选择所在地区',
             format: (data) => {
               const { selectedOptions = [] } = data || {}

diff --git a/docs/demos/guide/cascader/template.vue b/docs/demos/guide/cascader/template.vue
@@ -2,11 +2,11 @@
   <Form :form="form">
     <Field
       name="cascader"
+      title="地区"
       :component="[
         Cascader,
         {
           formItemProps: {
-            label: '地区',
             placeholder: '请选择所在地区',
             format: (data) => {
               const { selectedOptions = [] } = data || {}

diff --git a/docs/demos/guide/checkbox/json-schema.vue b/docs/demos/guide/checkbox/json-schema.vue
@@ -17,8 +17,8 @@ const schema = {
   properties: {
     single: {
       type: 'boolean',
+      title: '选项',
       'x-component': 'Checkbox',
-      'x-component-props': { label: '选项' },
     },
     multiple: {
       type: 'array',

diff --git a/docs/demos/guide/checkbox/markup-schema.vue b/docs/demos/guide/checkbox/markup-schema.vue
@@ -1,11 +1,7 @@
 <template>
   <Form class="checkbox" :form="form">
     <SchemaField>
-      <SchemaBooleanField
-        name="single"
-        x-component="Checkbox"
-        :x-component-props="{ label: '选项' }"
-      />
+      <SchemaBooleanField name="single" title="选项" x-component="Checkbox" />
       <SchemaArrayField
         name="multiple"
         :enum="[

diff --git a/docs/demos/guide/checkbox/template.vue b/docs/demos/guide/checkbox/template.vue
@@ -1,6 +1,6 @@
 <template>
   <Form class="checkbox" :form="form">
-    <Field name="single" :component="[Checkbox, { label: '选项' }]" />
+    <Field name="single" title="选项" :component="[Checkbox]" />
     <ArrayField
       name="multiple"
       :dataSource="[

diff --git a/docs/demos/guide/datetime-picker/json-schema.vue b/docs/demos/guide/datetime-picker/json-schema.vue
@@ -26,10 +26,10 @@ export default {
       properties: {
         datetimePicker: {
           type: 'string',
+          title: '时间选择器',
           'x-component': 'DatetimePicker',
           'x-component-props': {
             formItemProps: {
-              label: '时间选择器',
               placeholder: '请选择时间',
             },
             popupProps: {},

diff --git a/docs/demos/guide/datetime-picker/markup-schema.vue b/docs/demos/guide/datetime-picker/markup-schema.vue
@@ -3,10 +3,10 @@
     <SchemaField>
       <SchemaStringField
         name="datetimePicker"
+        title="时间选择器"
         x-component="DatetimePicker"
         :x-component-props="{
           formItemProps: {
-            label: '时间选择器',
             placeholder: '请选择时间',
           },
           popupProps: {},

diff --git a/docs/demos/guide/datetime-picker/template.vue b/docs/demos/guide/datetime-picker/template.vue
@@ -2,11 +2,11 @@
   <Form :form="form">
     <Field
       name="datetimePicker"
+      title="时间选择器"
       :component="[
         DatetimePicker,
         {
           formItemProps: {
-            label: '时间选择器',
             placeholder: '请选择时间',
           },
           popupProps: {},

diff --git a/docs/demos/guide/form/markup-schema-verify.vue b/docs/demos/guide/form/markup-schema-verify.vue
@@ -3,17 +3,16 @@
     <SchemaField>
       <SchemaStringField
         name="input"
+        title="输入框"
         x-component="Input"
-        :x-component-props="{ label: '输入框', placeholder: '请输入' }"
+        :x-component-props="{ placeholder: '请输入' }"
         required
       />
 
       <SchemaStringField
         name="switch"
+        title="开关"
         x-decorator="FormItem"
-        :x-decorator-props="{
-          label: '开关',
-        }"
         x-component="Switch"
         :x-component-props="{
           size: 20,
@@ -22,10 +21,8 @@
 
       <SchemaStringField
         name="checkbox"
+        title="复选框"
         x-decorator="FormItem"
-        :x-decorator-props="{
-          label: '复选框',
-        }"
         x-component="Checkbox"
         :x-component-props="{
           shape: 'square',
@@ -35,10 +32,8 @@
 
       <SchemaArrayField
         name="checkboxGroup"
+        title="复选框组"
         x-decorator="FormItem"
-        :x-decorator-props="{
-          label: '复选框组',
-        }"
         :enum="[
           { label: '复选框 1', name: 1, shape: 'square' },
           { label: '复选框 2', name: 2, shape: 'square' },
@@ -51,10 +46,10 @@
 
       <SchemaArrayField
         name="radio"
+        title="单选框"
         x-decorator="FormItem"
         :x-decorator-props="{
           asterisk: true,
-          label: '单选框',
         }"
         :enum="[
           { label: '单选框 1', name: 1 },
@@ -75,46 +70,38 @@
 
       <SchemaStringField
         name="stepper"
+        title="步进器"
         x-decorator="FormItem"
-        :x-decorator-props="{
-          label: '步进器',
-        }"
         x-component="Stepper"
       />
 
       <SchemaStringField
         name="rate"
+        title="评分"
         x-decorator="FormItem"
-        :x-decorator-props="{
-          label: '评分',
-        }"
         x-component="Rate"
       />
 
       <SchemaStringField
         name="slider"
+        title="滑块"
         x-decorator="FormItem"
-        :x-decorator-props="{
-          label: '滑块',
-        }"
         x-component="Slider"
       />
 
       <SchemaStringField
         name="uploader"
+        title="文件上传"
         x-decorator="FormItem"
-        :x-decorator-props="{
-          label: '文件上传',
-        }"
         x-component="Uploader"
       />
 
       <SchemaStringField
         name="picker"
+        title="选择器"
         x-component="Picker"
         :x-component-props="{
           formItemProps: {
-            label: '选择器',
             placeholder: '点击选择城市',
           },
           pickerProps: {
@@ -139,10 +126,10 @@
 
       <SchemaStringField
         name="datetimePicker"
+        title="时间选择"
         x-component="DatetimePicker"
         :x-component-props="{
           formItemProps: {
-            label: '时间选择',
             placeholder: '点击选择时间',
           },
           popupProps: {},
@@ -157,10 +144,10 @@
 
       <SchemaStringField
         name="area"
+        title="地区选择"
         x-component="Area"
         :x-component-props="{
           formItemProps: {
-            label: '地区选择',
             placeholder: '点击选择省市区',
             format: (val) =>
               (val || [])
@@ -193,10 +180,10 @@
 
       <SchemaStringField
         name="calendar"
+        title="日历"
         x-component="Calendar"
         :x-component-props="{
           formItemProps: {
-            label: '日历',
             placeholder: '选择日历',
             format: (date) =>
               date && `${date.getMonth() + 1}/${date.getDate()}`,
@@ -208,9 +195,7 @@
       />
     </SchemaField>
 
-    <Submit :style="{ 'margin-top': '16px' }" round block>
-      提交
-    </Submit>
+    <Submit :style="{ 'margin-top': '16px' }" round block> 提交 </Submit>
   </Form>
 </template>