@aochuang/common 1.0.132 → 1.0.134

package/components/icon/iconfont.json

@@ -5,6 +5,13 @@
   "css_prefix_text": "icon-",
   "description": "私域方舟",
   "glyphs": [
+    {
+      "icon_id": "29524819",
+      "name": "upload-2-fill",
+      "font_class": "upload-2-fill",
+      "unicode": "e89b",
+      "unicode_decimal": 59547
+    },
     {
       "icon_id": "29523203",
       "name": "bookmark-3-line",

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.132",
+  "version": "1.0.134",
   "description": "",
   "main": "index.js",
   "publishConfig": {