ソースを参照

支持标签、文字组件

tongshangming 2 年 前
コミット
1c1feb61cc

+ 1 - 1
src/components/core/form/BasicForm.vue

@@ -57,7 +57,7 @@ buildContainerSlots(props.formConfig.formItems)
         </template>
       </component>
       <template v-else>
-        <el-form-item :label="item.notFormItem ? '' : item.label" :rules="item.rules" :prop="item.name">
+        <el-form-item :label="item.label" :rules="item.rules" :prop="item.name">
           <form-comp :item="item" v-model="formData[item.name]">
             <template #[slot.alias]="slotProps" v-for="slot in item.slots" :key="slot.alias">
               <slot :name="slot.alias" v-bind="slotProps"></slot>

+ 2 - 0
src/components/core/form/FormComp.vue

@@ -96,7 +96,9 @@ const headers = reactive({
     v-on="item.events || {}"
   >
     <template v-if="item.type === 'button'">{{ item.props.buttonName }}</template>
+    <template v-if="item.type === 'tag'">{{ item.props.tagName }}</template>
     <template v-if="item.type === 'divider'">{{ item.props.dividerName }}</template>
+    <template v-if="item.type === 'text'">{{ item.props.textName }}</template>
     <template v-if="item.type === 'radio-group'">
       <template v-if="item.props?.button">
         <el-radio-button

+ 1 - 1
src/components/form/ElFormCard.vue

@@ -39,7 +39,7 @@ const cardSlot = props.formItem.slots?.find(slot => slot.name === 'header')
           </template>
         </component>
         <template v-else>
-          <el-form-item :label="item.notFormItem ? '' : item.label" :rules="item.rules" :prop="item.name">
+          <el-form-item :label="item.label" :rules="item.rules" :prop="item.name">
             <form-comp :item="item" v-model="formData[item.name]">
               <template #[slot.alias]="slotProps" v-for="slot in item.slots" :key="slot.alias">
                 <slot :name="slot.alias" v-bind="slotProps"></slot>

+ 1 - 1
src/components/form/ElFormLayout.vue

@@ -36,7 +36,7 @@ defineProps<Props>()
       <template v-else>
         <el-row :gutter="20">
           <el-col v-for="child in item.children" :span="child.span || formConfig.span || 12" v-show="!child.hidden">
-            <el-form-item :label="child.notFormItem ? '' : child.label" :rules="child.rules" :prop="child.name">
+            <el-form-item :label="child.label" :rules="child.rules" :prop="child.name">
               <form-comp :item="child" v-model="formData[child.name]">
                 <template #[slot.alias]="slotProps" v-for="slot in child.slots" :key="slot.alias">
                   <slot :name="slot.alias" v-bind="slotProps"></slot>

+ 1 - 1
src/components/form/ElFormTabs.vue

@@ -46,7 +46,7 @@ const modelValue = computed({
             </template>
           </component>
           <template v-else>
-            <el-form-item :label="item.notFormItem ? '' : item.label" :rules="item.rules" :prop="item.name">
+            <el-form-item :label="item.label" :rules="item.rules" :prop="item.name">
               <form-comp :item="item" v-model="formData[item.name]">
                 <template #[slot.alias]="slotProps" v-for="slot in item.slots" :key="slot.alias">
                   <slot :name="slot.alias" v-bind="slotProps"></slot>