Merge branch 'qin_18'

src/components/formTable/formItemGroup.vue

@@ -494,7 +494,7 @@ const linksIf = (obj: FormList) => {
 <template>
 
         <div v-for="(element,index) in dataList" :key="index" :style="getFormItemDivStyle(element)">
-			
+		
 			<div v-if="linksIf(element)">
 				<template v-if="element.type === 'tabs'">
 					<!--选项卡-->

src/components/lowCode/newFormItem.vue

@@ -415,12 +415,13 @@ const testPage = (val:any) =>{
         :class="config.className"
         :label="getLabel(data.item as FormItem)"
         :rules="itemRules"
+        class="rlabel"
     >
         <template #label v-if="config.help">
             <span :style="getFormItemLableStyle(configStyle)">{{ getLabel(data.item) }}</span>
             <Tooltips :content="config.help" />
         </template>
-        <template #label v-else>
+        <template  #label v-else>
             <span :style="getFormItemLableStyle(configStyle)" >{{ getLabel(data.item) }}</span>
         </template>
         <!-- {{ data.type }} -->
@@ -474,5 +475,13 @@ const testPage = (val:any) =>{
     </el-form-item>
 </template>
 <style  lang='scss' scoped>
-
+.rlabel{
+    label{
+        height: 100%;
+    }
+    :deep .el-form-item__label{
+        height: 100%;
+        max-width: 150px;
+    }
+}
 </style>