Merge branch 'master' into 1.4.0

src/views/Editor/CanvasTool/UploadPicture.vue

@@ -6,6 +6,20 @@
                 <div class="text-title">选择、上传图片</div>
             </div>
             <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
+                <el-tab-pane label="我的空间" name="2">
+                    <!-- <FileInput @change="files => insertImageElement(files)">
+                        <div class="upload-box">
+                            <img v-if="imgPath" :src="imgPath" style="height: 200px;"/>
+                            <div v-else>
+                                <el-icon size="80" color="#a8abb2" class="el-icon--upload">
+                                    <upload-filled/> 
+                                </el-icon>
+                                <p><em>点击上传图片</em></p>
+                            </div>
+                        </div>
+                    </FileInput> -->
+                    <CloudDisk :show="showVisible" :active="activeName" @getImg="getImg"></CloudDisk>
+                </el-tab-pane>
                 <el-tab-pane label="平台资料库" name="1">
                     <template v-if="userInfo.iv||userInfo.it">
                         <el-row>
@@ -63,20 +77,7 @@
                         <BuyProduct></BuyProduct>
                     </div>
                 </el-tab-pane>
-                <el-tab-pane label="我的空间" name="2">
-                    <!-- <FileInput @change="files => insertImageElement(files)">
-                        <div class="upload-box">
-                            <img v-if="imgPath" :src="imgPath" style="height: 200px;"/>
-                            <div v-else>
-                                <el-icon size="80" color="#a8abb2" class="el-icon--upload">
-                                    <upload-filled/> 
-                                </el-icon>
-                                <p><em>点击上传图片</em></p>
-                            </div>
-                        </div>
-                    </FileInput> -->
-                    <CloudDisk :show="showVisible" :active="activeName" @getImg="getImg"></CloudDisk>
-                </el-tab-pane>
+                
                 <el-tab-pane label="图片地址" name="3">
                     <div class="row wrap q-mt-md">
                         <el-input v-model="imgUrl" placeholder="输入图片的地址" class="input-with-select"></el-input>
@@ -115,7 +116,7 @@ import BuyProduct from '@/components/User/BuyProduct.vue'
 import CloudDisk from '@/components/CloudDisk/index.vue'
 
 const showVisible = ref(true)
-const activeName = ref("1")
+const activeName = ref("2")
 const imgVisibleStore = useScreenStore()
 
 const imageFile = ref({})

src/views/Editor/Toolbar/SlideDesignPanel.vue

@@ -99,8 +99,7 @@
     <div class="row">
       <Button style="flex: 1;" @click="applyBackgroundAllSlide()">应用背景到全部</Button>
     </div>
-  <template v-if="model==1">
-    <template v-if="queryObj.TemplateType!=2">
+  <template v-if="model==1&&queryObj.TemplateType!=2">
       <Divider />
 
       <div class="row">
@@ -126,23 +125,22 @@
           ]"
         />
       </div>
-    </template>
-    <template v-else>
-      <Divider />
+  </template>
+  <template v-if="model==2&&queryObj.TemplateType==2">
+    <Divider />
 
-      <div class="row">
-        <div style="width: 40%;">画布尺寸：</div>
-        
-      </div>
-      <div class="addTemplateInput q-mt-xs row items-center">
-        <el-input size="small" type="number" min="750" v-model="datas.CustomSize.width"
-        placeholder="宽" class="input-with-selectWH" @change="setDimension"></el-input>
-        <span class="q-px-md">*</span>
-        <el-input size="small" type="number" min="383" v-model="datas.CustomSize.height"
-        placeholder="高" class="input-with-selectWH" @change="setDimension"></el-input>
-        <span class="q-ml-md" >px</span>
+    <div class="row">
+      <div style="width: 40%;">画布尺寸：</div>
+      
+    </div>
+    <div class="addTemplateInput q-mt-xs row items-center">
+      <el-input size="small" type="number" min="750" v-model="datas.CustomSize.width"
+      placeholder="宽" class="input-with-selectWH" @change="setDimension"></el-input>
+      <span class="q-px-md">*</span>
+      <el-input size="small" type="number" min="383" v-model="datas.CustomSize.height"
+      placeholder="高" class="input-with-selectWH" @change="setDimension"></el-input>
+      <span class="q-ml-md" >px</span>
     </div>
-    </template>
   </template>