From 2fba04180da0a68de1d75f4961dc698badb236df Mon Sep 17 00:00:00 2001
From: From-wh <from-wh@hotmail.com>
Date: Fri, 30 Jun 2023 15:08:51 +0800
Subject: [PATCH] =?UTF-8?q?improve:=20=E4=B8=8A=E4=BC=A0=E5=9B=BE=E7=89=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 template/admin/src/components/uploadImg/index.vue     | 10 ++++++++--
 .../admin/src/components/uploadPictures/index.vue     |  8 ++++++--
 .../admin/src/components/uploadPictures/widgetImg.vue | 11 ++++++++++-
 3 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/template/admin/src/components/uploadImg/index.vue b/template/admin/src/components/uploadImg/index.vue
index c12f1fa8a..30b78b50f 100644
--- a/template/admin/src/components/uploadImg/index.vue
+++ b/template/admin/src/components/uploadImg/index.vue
@@ -5,8 +5,8 @@
       append-to-body
       :modal-append-to-body="false"
       :visible.sync="uploadModal"
-      width="1024px"
-      :fullscreen="!isPage"
+      :width="isIframe ? '100%' : '1024px'"
+      :fullscreen="isIframe"
       @close="closed"
     >
       <div class="main" v-loading="loading">
@@ -152,6 +152,9 @@ export default {
     isPage: {
       default: false,
     },
+    isIframe: {
+      default: false,
+    },
   },
   watch: {
     uploadModal: {
@@ -409,6 +412,9 @@ export default {
 };
 </script>
 <style lang="stylus" scoped>
+/deep/ .el-dialog__title{
+  font-size: 16px;
+}
 .main{
     min-height: 600px
 }
diff --git a/template/admin/src/components/uploadPictures/index.vue b/template/admin/src/components/uploadPictures/index.vue
index e70f309d3..3a1ed7727 100644
--- a/template/admin/src/components/uploadPictures/index.vue
+++ b/template/admin/src/components/uploadPictures/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="Modal" :class="{ 'fill-window': !isPage }">
+  <div class="Modal">
     <div class="colLeft">
       <div class="Nav">
         <!-- <div class="input">
@@ -198,7 +198,7 @@
         </div>
       </div>
     </div>
-    <uploadImg ref="upload" :isPage="isPage" :categoryId="treeId" :categoryList="treeData" @uploadSuccess="uploadSuccess"></uploadImg>
+    <uploadImg ref="upload" :isPage="isPage" :isIframe='isIframe' :categoryId="treeId" :categoryList="treeData" @uploadSuccess="uploadSuccess"></uploadImg>
     <div class="images" v-show="false" v-viewer="{ movable: false }">
       <img v-for="src in pictrueList" :src="src.att_dir" :key="src.att_id" />
     </div>
@@ -230,6 +230,10 @@ export default {
       type: Boolean,
       default: false,
     },
+    isIframe: {
+      type: Boolean,
+      default: false,
+    },
     gridBtn: {
       type: Object,
       default: null,
diff --git a/template/admin/src/components/uploadPictures/widgetImg.vue b/template/admin/src/components/uploadPictures/widgetImg.vue
index b47dd7f2e..93d99ba34 100644
--- a/template/admin/src/components/uploadPictures/widgetImg.vue
+++ b/template/admin/src/components/uploadPictures/widgetImg.vue
@@ -5,9 +5,17 @@
       @getPicD="getPicD"
       :gridPic="gridPic"
       :gridBtn="gridBtn"
+      :isIframe="isIframe"
       v-if="this.$route.query.fodder === 'dialog' || this.$route.query.type === 'many'"
     ></upload-from>
-    <upload-from :isChoice="isChoice" @getPic="getPic" :gridPic="gridPic" :gridBtn="gridBtn" v-else></upload-from>
+    <upload-from
+      :isChoice="isChoice"
+      :isIframe="isIframe"
+      @getPic="getPic"
+      :gridPic="gridPic"
+      :gridBtn="gridBtn"
+      v-else
+    ></upload-from>
   </div>
 </template>
 
@@ -21,6 +29,7 @@ export default {
     return {
       isChoice: '单选',
       isChoiceD: '多选',
+      isIframe: true, //是否全屏打开选择图片
       gridPic: {
         xl: 4,
         lg: 4,