Browse Source

Merge branch 'master' into test-dev

duy 1 month ago
parent
commit
c8a3a6a1ce

+ 2 - 2
src/components/plugins/table-form/hc-form-upload.vue

@@ -1,7 +1,7 @@
 <template>
     <el-upload
         v-loading="isLoading"
-        
+        drag
         :accept="accept" :action="action" :class="isFocus ? 'is-focus' : ''"
         :disabled="isLoading" :headers="getHeader()" :keyname="isKeyName"
         :on-error="formUploadError"
@@ -10,7 +10,7 @@
         element-loading-text="上传中..." @exceed="formUploadExceed" @success="formUploadSuccess"
     >
         <img v-if="isSrc" :src="isSrc" alt="" class="hc-table-form-img">
-        <div v-else class="hc-table-form-icon">
+        <div v-else class="hc-table-form-icon mt-25">
             点此选择文件并上传
         </div>
         <div v-if="isSrc" class="hc-table-form-del">

+ 2 - 2
src/views/data-fill/collapse-form/index.vue

@@ -36,7 +36,7 @@
                                         class="box-item"
                                         effect="light"
                                         content="表单日期未完善"
-                                        placement="right"
+                                        placement="top"
                                     >
                                         <HcIcon name="error-warning" ui=" text-red" />
                                     </el-tooltip>
@@ -53,7 +53,7 @@
                                         class="box-item"
                                         effect="light"
                                         content="表单日期未完善"
-                                        placement="right"
+                                        placement="top"
                                     >
                                         <HcIcon name="error-warning" ui=" text-red" />
                                     </el-tooltip>