fix(popupload): [pop-upload]Fixed popupload review issues. (#2368)

* fix(popupload): [pop-upload]修复popupload检视的问题 * fix(pop-upload): 统一变量替换tiny前缀类名
opentiny · Oct 24, 2024 · b7845f1 · b7845f1
1 parent de89ace
commit b7845f1
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 10 deletions.
diff --git a/examples/sites/demos/pc/app/pop-upload/upload-tip-composition-api.vue b/examples/sites/demos/pc/app/pop-upload/upload-tip-composition-api.vue
@@ -13,9 +13,8 @@
           <p class="tips-item">1.上传数据应不超过{{ limit }}条，超过数量不允许上传；</p>
           <p class="tips-item">2.相同数据不会重复发</p>
           <p class="tips-item">
-            3.上传文件限{{ fileType.join(',') }}格式，文件不超过{{ fileSize / 1024 }}KB，点击<tiny-link
-              >下载模板</tiny-link
-            >
+            3.上传文件限{{ fileType.join(',') }}格式，文件不超过{{ fileSize / 1024 }}KB，点击
+            <tiny-link>下载模板</tiny-link>
           </p>
         </template>
       </tiny-alert>
@@ -36,5 +35,10 @@ const fileType = ref(['.png', '.jpg'])
 <style scoped>
 .tips-item {
   margin: 0;
+  height: 22px;
+  line-height: 22px;
+}
+:deep(.tiny-popupload__dialog-footer) {
+  justify-content: flex-end !important;
 }
 </style>
diff --git a/examples/sites/demos/pc/app/pop-upload/upload-tip.vue b/examples/sites/demos/pc/app/pop-upload/upload-tip.vue
@@ -13,9 +13,8 @@
           <p class="tips-item">1.上传数据应不超过{{ limit }}条，超过数量不允许上传；</p>
           <p class="tips-item">2.相同数据不会重复发</p>
           <p class="tips-item">
-            3.上传文件限{{ fileType.join(',') }}格式，文件不超过{{ fileSize / 1024 }}KB，点击<tiny-link
-              >下载模板</tiny-link
-            >
+            3.上传文件限{{ fileType.join(',') }}格式，文件不超过{{ fileSize / 1024 }}KB，点击
+            <tiny-link>下载模板</tiny-link>
           </p>
         </template>
       </tiny-alert>
@@ -46,5 +45,10 @@ export default {
 <style scoped>
 .tips-item {
   margin: 0;
+  height: 22px;
+  line-height: 22px;
+}
+:deep(.tiny-popupload__dialog-footer) {
+  justify-content: flex-end !important;
 }
 </style>
diff --git a/packages/theme/src/pop-upload/index.less b/packages/theme/src/pop-upload/index.less
@@ -14,7 +14,9 @@
 @import './vars.less';
 
 @popupload-prefix-cls: ~'@{css-prefix}popupload';
+@file-upload-prefix-cls: ~'@{css-prefix}file-upload';
 @upload-list-prefix-cls: ~'@{css-prefix}upload-list';
+@popconfirm-prefix-cls: ~'@{css-prefix}popconfirm';
 @popupload__modal-prefix-cls: ~'@{css-prefix}popupload__modal';
 @alert-prefix-cls: ~'@{css-prefix}alert';
 
@@ -36,7 +38,7 @@
 
   &__dialog-header {
     .@{alert-prefix-cls} {
-      margin-bottom: 10px;
+      margin-bottom: 16px;
     }
   }
 
@@ -70,7 +72,7 @@
     font-size: var(--tv-PopUpload-dialog-table-font-size);
     height: var(--tv-PopUpload-dialog-table-height);
     width: 100%;
-    margin-top: 10px;
+    margin-top: 20px;
 
     .header-col {
       position: relative;
@@ -163,14 +165,18 @@
       overflow-y: auto;
     }
 
-    .tiny-file-upload .tiny-upload-list__text-title {
+    .@{file-upload-prefix-cls} .@{upload-list-prefix-cls}__text-title {
       display: none;
     }
+
+    .@{popupload-prefix-cls}__dialog-footer {
+      justify-content: flex-end;
+    }
   }
 
   // 新规范适配
   &__pop-confirm {
-    .tiny-popconfirm-popover__title {
+    .@{popconfirm-prefix-cls}-popover__title {
       white-space: nowrap;
     }
   }