Merge remote-tracking branch 'origin/fix-bug-202303' into safety-202304

jero-web/src/components/jero/JImageUpload.vue

@@ -24,7 +24,12 @@
         </div>
       </div>
     </a-upload>
-    <j-image-preview-modal ref="JImagePreviewModal"></j-image-preview-modal>
+    <div id="images">
+      <div class="image" v-viewer="{movable: false}">
+        <img v-show="image" :src="imageUrl">
+      </div>
+    </div>
+<!--    <j-image-preview-modal ref="JImagePreviewModal"></j-image-preview-modal>-->
   </div>
 </template>
 
@@ -32,7 +37,7 @@
 import Vue from 'vue'
 import { ACCESS_TOKEN } from '@/store/mutation-types'
 import { getFileAccessHttpUrl } from '@/api/manage'
-import JImagePreviewModal from './modal/JImagePreviewModal'
+// import JImagePreviewModal from './modal/JImagePreviewModal'
 // const Base64 = require('js-base64').Base64
 
 const uidGenerator = () => {
@@ -40,16 +45,18 @@ const uidGenerator = () => {
 }
 export default {
   name: 'JImageUpload',
-  components: { JImagePreviewModal },
+  // components: { JImagePreviewModal },
   data () {
     return {
       uploadAction: window._CONFIG.domianURL + '/sys/common/upload',
       uploadLoading: false,
+      image: false,
       picUrl: false,
       headers: {},
       fileList: [],
       accept: 'image/png, image/jpeg',
-      previewImage: ''
+      previewImage: '',
+      imageUrl: null
     }
   },
   props: {
@@ -184,7 +191,12 @@ export default {
         // const fileFullUrl = `${window._CONFIG.domianWebSocketURL}/${file.url}`
         // const url = `${window._CONFIG.onlinePreviewDomainURL}?url=${encodeURIComponent(Base64.encode(fileFullUrl))}`
         // window.open(url)
-        this.$refs.JImagePreviewModal.open(file)
+        // this.$refs.JImagePreviewModal.open(file)
+        this.imageUrl = getFileAccessHttpUrl(file.name)
+        // 获取viewer实例
+        const viewer = this.$el.querySelector('.image').$viewer
+        // 调用show方法进行显示预览图
+        viewer.show()
       }
     },
     getAvatarView () {

jero-web/src/components/tools/UserMenu.vue

@@ -36,7 +36,7 @@
       <a-avatar class="avatar" size="small" :src="getAvatar()"/>
     </span>
     <a-dropdown>
-      <span class="action action-full ant-dropdown-link user-dropdown-menu">
+      <span class="action">
         <span v-if="isDesktop()">欢迎您，{{ nickname() }}</span>
       </span>
       <a-menu slot="overlay" class="user-dropdown-menu-wrapper">