Merge branch 'master' into 1.4.0

src/store/menu.ts

@@ -29,7 +29,7 @@ const menus:{menu:Menu,owner:MenuOwner}[] = [
     // {menu:{name:'数据统计',icon:'IconDashBoard',url:'/a/d'},owner:'A'},
     {menu:{name:'水印设置',icon:'IconTag',url:'/a/w'},owner:'A'},
     {menu:{name:'云盘空间',icon:'IconCloudStorage',url:'/a/c'},owner:'A'},
-    // {menu:{name:'LOGO设置',icon:'IconPicture',url:'/a/l'},owner:'A'},
+    {menu:{name:'LOGO设置',icon:'IconPicture',url:'/a/l'},owner:'A'},
     {menu:{name:'订单/发票',icon:'IconCurrency',url:'/a/order'},owner:'E'},
     {
         menu:{

src/views/Editor/Toolbar/ElementTemplateData.vue

@@ -9,7 +9,7 @@
                     :style="{ backgroundImage: `url(${CoverImg})` }"
                     ></div>
                 </template>
-                <div class="row">
+                <div class="row" v-if="!CoverImg">
                     <Button v-loading="isCoverImg" style="flex: 1;" @click="setDialogForExport('image')">
                         <span class="Required" v-if="!CoverImg">*</span>
                         {{CoverImg?'重新生成封面图':'生成封面图'}}

src/views/TeamCenter/LogoDisposition.vue

@@ -63,7 +63,7 @@
                                 </div>
                             </FileInput>
                         </div>
-                        <div class="MoreClickCenter" v-if="ShowMessage&&currentMore==index">
+                        <div class="MoreClickCenter" v-show="ShowMessage&&currentMore==index">
                             <div class="q-pa-xs microsoft">
                                 <div class="row items-center cloudDownControls" @click="seeLogo(index)">
                                     <el-icon size="14px" theme="filled">
@@ -71,7 +71,7 @@
                                     </el-icon>
                                     <span class="q-pl-md">默认LOGO</span>
                                 </div>
-                                <FileInput @change="files => insertImageElement(files,index)">
+                                <FileInput v-if="IsEnable" @change="files => insertImageElement(files,index)">
                                     <div class="row items-center cloudDownControls">
                                         <el-icon size="14px" theme="filled">
                                             <Upload v-if="!item.FilePath"></Upload>
@@ -112,7 +112,7 @@
                                 </div>
                             </FileInput>
                         </div>
-                        <div class="MoreClickCenter" v-if="ShowMessage&&currentMore==index">
+                        <div class="MoreClickCenter" v-show="ShowMessage&&currentMore==index">
                             <div class="q-pa-xs microsoft">
                                 <div class="row items-center cloudDownControls" @click="seeLogo(index)">
                                     <el-icon size="14px" theme="filled">
@@ -120,7 +120,7 @@
                                     </el-icon>
                                     <span class="q-pl-md">默认LOGO</span>
                                 </div>
-                                <FileInput @change="files => insertImageElement(files,index)">
+                                <FileInput v-if="IsEnable" @change="files => insertImageElement(files,index)">
                                     <div class="row items-center cloudDownControls">
                                         <el-icon size="14px" theme="filled">
                                             <Upload v-if="!item.FilePath"></Upload>
@@ -168,6 +168,9 @@
                         </el-button>
                     </div>
                 </div>
+                <div class="tip q-pt-md" style="color: #8c85e6;">
+                    提示：滚动鼠标中键可以放大缩小图片
+                </div>
                 <div class="modal-content q-pt-lg">
                     <VuePictureCropper
                     :boxStyle="{
@@ -215,6 +218,7 @@
     import InviteMember from '@/views/components/Team/InviteMember.vue'
     import { dataURLtoFile } from "@/utils/common";
     import VuePictureCropper, { cropper } from 'vue-picture-cropper'
+    import FileInput from '@/components/FileInput.vue'
 
     
     
@@ -393,16 +397,16 @@
     }
     const insertImageElement = async (files: FileList,index:number) => {
         let fileType = files[0].name.split('.')
-        fileName.value = fileType[0]+".png"
+        fileName.value = fileType[0]+`${fileType[1]?fileType[1]:'.png'}`
         currentData.value = index
         pic.value = URL.createObjectURL(files[0])
         opt.width = acquiesceIMG.value[index].width
         opt.height = acquiesceIMG.value[index].height
         let x = acquiesceIMG.value[index]
-        let newSize = await FileService.getImageSizeWithoutDownloading(pic.value)
+        let newSize = await FileService.convertNetworkToBase64Async(pic.value)//getImageSizeWithoutDownloading
         let scale = parseInt(newSize.width/newSize.height)
         if(newSize&&newSize.width&&(newSize.width<x.width&&newSize.height<x.height)){
-            return ElMessage.error({message:`请选择${x.FileSize}、或大于${x.FileSize}的LOGO`})
+            return ElMessage.error({message:`请选择${x.FileSize}、或大于${x.FileSize}的图`})
         }
         isShowModal.value = true
     }

src/views/TemplateCenter/nation.vue

@@ -121,7 +121,7 @@
     }
     const ConfirmCreation = async () => {
       //添加、编辑国家
-      if(!datas.params.Content)return ElMessage({
+      if(!datas.params.Name) return ElMessage({
                 showClose: true,
                 message: '请完善国家名称',
                 type: 'warning',