fix: upload component not work #169

vbenjs · Jan 11, 2021 · 18ad1bc · 18ad1bc
1 parent c22de5c
commit 18ad1bc
Show file tree

Hide file tree

Showing 23 changed files with 566 additions and 577 deletions.
diff --git a/src/assets/svg/preview/p-rotate.svg b/src/assets/svg/preview/p-rotate.svg
diff --git a/src/assets/svg/preview/resume.svg b/src/assets/svg/preview/resume.svg
diff --git a/src/assets/svg/preview/scale.svg b/src/assets/svg/preview/scale.svg
diff --git a/src/assets/svg/preview/unrotate.svg b/src/assets/svg/preview/unrotate.svg
diff --git a/src/assets/svg/preview/unscale.svg b/src/assets/svg/preview/unscale.svg
diff --git a/src/components/Modal/src/BasicModal.vue b/src/components/Modal/src/BasicModal.vue
@@ -14,7 +14,11 @@
     </template>
 
     <template #footer v-if="!$slots.footer">
-      <ModalFooter v-bind="getProps" @ok="handleOk" @cancel="handleCancel" />
+      <ModalFooter v-bind="getProps" @ok="handleOk" @cancel="handleCancel">
+        <template #[item]="data" v-for="item in Object.keys($slots)">
+          <slot :name="item" v-bind="data" />
+        </template>
+      </ModalFooter>
     </template>
 
     <ModalWrapper

diff --git a/src/components/Modal/src/components/ModalWrapper.vue b/src/components/Modal/src/components/ModalWrapper.vue
@@ -67,7 +67,7 @@
           return {
             minHeight: `${props.minHeight}px`,
             // padding 28
-            height: `${unref(realHeightRef) - 28}px`,
+            height: `${unref(realHeightRef)}px`,
           };
         }
       );
@@ -130,10 +130,11 @@
           const spinEl = unref(spinRef);
 
           if (!spinEl) return;
+          await nextTick();
+          // if (!realHeight) {
+          realHeight = spinEl.scrollHeight;
+          // }
 
-          if (!realHeight) {
-            realHeight = spinEl.scrollHeight;
-          }
           if (props.fullScreen) {
             realHeightRef.value =
               window.innerHeight - props.modalFooterHeight - props.modalHeaderHeight;
@@ -142,7 +143,7 @@
               ? props.height
               : realHeight > maxHeight
               ? maxHeight
-              : realHeight + 46;
+              : realHeight;
           }
           emit('height-change', unref(realHeightRef));
         } catch (error) {

diff --git a/src/components/Preview/index.ts b/src/components/Preview/index.ts
@@ -1,7 +1,3 @@
-// export { createImgPreview } from './src/functional';
-
-export const createImgPreview = () => {};
-
 // import { createAsyncComponent } from '/@/utils/factory/createAsyncComponent';
 // export const ImagePreview = createAsyncComponent(() => import('./src/index.vue'));
 

diff --git a/src/components/Preview/src/functional.ts b/src/components/Preview/src/functional.ts
diff --git a/src/components/Preview/src/index.less b/src/components/Preview/src/index.less