Merge remote-tracking branch 'origin/dev-ele-update' into dev

# Conflicts: # package.json
2024-03-07 15:58:35 +08:00
parent dbf6aada39 7d9e8f2790
commit f5926b265b
84 changed files with 1303 additions and 514 deletions
--- a/src/components/common/popBox/TopToolMoreOptions.vue
+++ b/src/components/common/popBox/TopToolMoreOptions.vue
@@ -29,7 +29,7 @@
                     action=""
                     class="upload-demo"
                     drag>
-            <i class="el-icon-upload"></i>
+            <el-icon><UploadFilled /></el-icon>
            <div class="el-upload__text">{{$t('overall.dragFileTip')}}，{{$t('overall.or')}}&nbsp;<em>{{$t('overall.clickUpload')}}</em></div>
            <template #tip>
              <div class="el-upload__tip" >