feat: add role for Fieldset, use more generic wrapper for Field

ecomfe · Jun 14, 2018 · 32789a0 · 32789a0
1 parent 329956b
commit 32789a0
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 6 deletions.
diff --git a/packages/veui/src/components/Form/Field.vue b/packages/veui/src/components/Form/Field.vue
@@ -9,16 +9,16 @@
     'veui-field-required': isRequired
   }"
 >
-  <span v-if="label || $slots.label" class="veui-form-label">
+  <div v-if="label || $slots.label" class="veui-form-label">
     <slot name="label"><veui-label>{{ label }}</veui-label></slot>
-  </span>
+  </div>
   <slot/>
-  <span v-if="tip || $slots.tip" class="veui-form-tip"><slot name="tip">{{ tip }}</slot></span>
-  <p
+  <div v-if="tip || $slots.tip" class="veui-form-tip"><slot name="tip">{{ tip }}</slot></div>
+  <div
     v-if="!validity.valid && !!validity.message"
     class="veui-field-error"
     :title="validity.message"
-  ><veui-icon :name="icons.alert"/>{{ validity.message }}</p>
+  ><veui-icon :name="icons.alert"/>{{ validity.message }}</div>
 </div>
 </template>
 

diff --git a/packages/veui/src/components/Form/Fieldset.vue b/packages/veui/src/components/Form/Fieldset.vue
@@ -1,5 +1,13 @@
 <template>
-<veui-field :ui="ui" ref="field" class="veui-fieldset" :class="{'veui-fieldset-required': required}" v-bind="attrs">
+<veui-field
+  :ui="ui"
+  ref="field"
+  class="veui-fieldset"
+  :class="{
+    'veui-fieldset-required': required
+  }"
+  role="group"
+  v-bind="attrs">
   <template v-if="$slots.label" slot="label"><slot name="label"/></template>
   <slot/>
   <template v-if="$slots.tip" slot="tip"><slot name="tip"/></template>