Merge branch 'master' of http://119.23.210.103:3000/wy/zdqy_firm_former

src/business/platform/form/formrender/dynamic-form/dynamic-form-field.vue

@@ -26,6 +26,7 @@
                 trigger="click"
                 @command="handleCommand"
             > -->
+            <el-tooltip effect="dark" :content="dataModel" placement="top" :disabled="isShowTooltip">
                 <el-input
                     v-model="dataModel"
                     :placeholder="placeholder"
@@ -39,9 +40,11 @@
                     :clearable="clearable && hasFocus"
                     @focus="() => hasFocus = true"
                     @blur="() => hasFocus = false"
+                    @mouseover.native="inputOnMouseOver($event)"
                     v-on="$listeners"
                 />
-
+            </el-tooltip>
+                
                 <!-- <el-button
                     v-if="(!fieldOptions.custom_class || fieldOptions.custom_class>=120) && !dataModel"
                     size="mini"
@@ -668,7 +671,8 @@ export default {
             inputKey: '',
             dict_add: false,
             selectDataResult: [],
-            hasFocus: false
+            hasFocus: false,
+            isShowTooltip:false
         }
     },
     computed: {
@@ -997,6 +1001,17 @@ export default {
         }
     },
     methods: {
+        inputOnMouseOver(e){
+            const target = e.target;
+            
+            // 判断是否开启tooltip功能
+            if (this.isTable==true&&target.offsetWidth < target.scrollWidth) {
+                this.isShowTooltip = false;
+            } else {
+                this.isShowTooltip = true;
+            }
+            console.log(e,target,target.offsetWidth , target.scrollWidth,target.offsetWidth < target.scrollWidth,this.isShowTooltip,!this.isTable,!this.isTable&&this.isShowTooltip)
+        },
         handleRadioChange (val) {
             if (this.dataModel === val && this.fieldOptions.uncheck === true) {
                 this.dataModel = null

src/business/platform/form/formrender/dynamic-form/dynamic-form-table.vue

@@ -44,7 +44,6 @@
                             <el-table-column
                                 v-if="!columnHidden(column) && column.field_type != 'desc' && column.label != ''"
                                 :key="j"
-                                show-overflow-tooltip
                                 :prop="column.name"
                                 :width="column.field_options.custom_class || null"
                             >