@aochuang/common 1.0.133 → 1.0.135

package/common/viewer/viewer.vue

@@ -52,7 +52,7 @@
             v-for="(item, index) in data"
             :key="index"
           >
-            <img :src="handleFormatSrc(item.thumbSrc || item.src)" :data-original="handleFormatSrc(item.src)" :alt="item.alt" @error="handleThumbImageError(item, $event)" />
+            <img :src="handleFormatSrc(item.thumbSrc || item.src)" :data-original="handleFormatSrc(item.src, false)" :alt="item.alt" @error="handleThumbImageError(item, $event)" />
           </li>
         </ul>
       </div>
@@ -66,6 +66,7 @@ import { downloadFile, getNameByFileUrl } from '../../utils/file'
 import { closest } from '../../utils/dom'
 import { setViewerImageData, setViewerCurrentImage, getDownloadMethod, getFormatterNameMethod } from './util'
 import { formatOssPath } from '@aochuang/common/utils/oss'
+import { removeThumbnailSrc } from '../../components/image/util'
 import { PopupManager } from 'element-ui/lib/utils/popup';
 
 export default {
@@ -413,11 +414,15 @@ export default {
       window.document.removeEventListener('keydown', this.handleDocumentKeydown)
       this.$emit('close')
     },
-    handleFormatSrc (src) {
+    handleFormatSrc (src, isCrop) { 
       if (!src) {
         return
       }
-      return formatOssPath(src)
+      if (isCrop !== false) {
+        return formatOssPath(src)
+      } else {
+        return formatOssPath(removeThumbnailSrc(src))
+      }
     }
   },
   beforeDestroy () {

package/components/image/image.vue

@@ -218,6 +218,7 @@ export default {
       const clickFn = getImageClickFn()
       if (clickFn) {
         clickFn({
+          alt: this.alt,
           src: formatOssPath(this.source)
         })
       }

package/components/image/index.js

@@ -1,5 +1,5 @@
 import Image from './image'
-import { setImageClickFn, getThumbnailSrc as _getThumbnailSrc } from './util'
+import { setImageClickFn, getThumbnailSrc as _getThumbnailSrc, removeThumbnailSrc as _removeThumbnailSrc } from './util'
 
 Image.install = (Vue, options) => {
   options = Object.assign({
@@ -10,5 +10,6 @@ Image.install = (Vue, options) => {
 }
 
 export const getThumbnailSrc = _getThumbnailSrc
+export const removeThumbnailSrc = _removeThumbnailSrc
 
 export default Image

package/components/image/util.js

@@ -105,3 +105,37 @@ export function getThumbnailSrc (url, width) {
     return url
   }
 }
+
+/**
+ * 移除图片缩略图裁剪参数，保留其他查询参数及 hash
+ */
+export function removeThumbnailSrc (url) {
+  if (!url) {
+    return url
+  }
+
+  const hashIndex = url.indexOf('#')
+  const hash = hashIndex >= 0 ? url.substr(hashIndex) : ''
+  let source = hashIndex >= 0 ? url.substr(0, hashIndex) : url
+
+  // /oss/view 和 /oss/ 地址的真实图片在 url 参数中，递归处理后再重新编码
+  if (source.indexOf('/oss/view') > -1 || source.indexOf('/oss/') > -1) {
+    const marker = source.indexOf('/oss/view') > -1 ? '/oss/view' : '/oss/'
+    const markerIndex = source.indexOf(marker)
+    const prefix = source.substr(0, markerIndex + marker.length)
+    const params = getUrlParams(source)
+    if (params.url) {
+      params.url = removeThumbnailSrc(params.url)
+      source = buildUrl(prefix, params)
+      return source + hash
+    }
+  }
+
+  // 阿里云参数是普通 query 参数；腾讯云参数是无等号的 query path
+  source = source
+    .replace(/([?&])x-oss-process=image\/resize(?:,[^&#]*)?(?=&|$)/ig, '$1')
+    .replace(/([?&])imageMogr2\/thumbnail\/[^&#]*(?=&|$)/ig, '$1')
+    .replace('?&', '?')
+    .replace(/[?&]$/, '')
+  return source + hash
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aochuang/common",
-  "version": "1.0.133",
+  "version": "1.0.135",
   "description": "",
   "main": "index.js",
   "publishConfig": {