@netang/quasar 0.1.96 → 0.1.98

package/components/search-item/index.vue

@@ -116,8 +116,6 @@ export default {
          */
         watch(() => props.modelValue[0].compare, function(compare) {
 
-            console.log('compare', props.data, props.modelValue[0].compare)
-
             // 获取当前值
             const value = props.modelValue[0].value
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@netang/quasar",
-  "version": "0.1.96",
+  "version": "0.1.98",
   "description": "netang-quasar",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"

package/utils/getFile.js

@@ -1,5 +1,9 @@
+import $n_has from 'lodash/has'
+
 import $n_isValidArray from '@netang/utils/isValidArray'
+import $n_isValidObject from '@netang/utils/isValidObject'
 import $n_isValidString from '@netang/utils/isValidString'
+import $n_split from '@netang/utils/split'
 
 import $n_uploader from './uploader'
 
@@ -12,11 +16,32 @@ export default function getFile(src) {
 
     if (src) {
 
+        // 如果是字符串
+        if ($n_isValidString(src)) {
+
+            // 则按照逗号隔开转为数租
+            src = $n_split(src, ',')
+        }
+
         // 如果为数组, 则获取第一个
         if ($n_isValidArray(src)) {
             src = src[0]
         }
 
+        // 如果为对象
+        if ($n_isValidObject(src)) {
+
+            if ($n_has(src, 'img')) {
+                src = src.img
+
+            } else if ($n_has(src, 'file')) {
+                src = src.file
+
+            } else if ($n_has(src, 'video')) {
+                src = src.video
+            }
+        }
+
         if ($n_isValidString(src)) {
 
             // http(s):// 或 data: 或 blob: 开头的地址
@@ -25,17 +50,11 @@ export default function getFile(src) {
             }
 
             const {
-                type,
+                // type,
                 domain,
             } = $n_uploader.getUpload()
 
-            switch (type) {
-                // 七牛云
-                case 'qiniu':
-                // minio
-                case 'minio':
-                    return useFileUrl(domain, src)
-            }
+            return useFileUrl(domain, src)
         }
     }
 

package/utils/getImage.js

@@ -1,3 +1,4 @@
+import $n_get from 'lodash/get'
 import $n_has from 'lodash/has'
 import $n_isString from 'lodash/isString'
 
@@ -6,6 +7,7 @@ import $n_isValidObject from '@netang/utils/isValidObject'
 import $n_isValidString from '@netang/utils/isValidString'
 import $n_isNumeric from '@netang/utils/isNumeric'
 import $n_split from '@netang/utils/split'
+import $n_slash from '@netang/utils/slash'
 
 import $n_uploader from './uploader'
 
@@ -28,9 +30,10 @@ export default function getImage(src, options) {
         // 如果为数组, 则获取第一个
         if ($n_isValidArray(src)) {
             src = src[0]
+        }
 
         // 如果为对象
-        } else if ($n_isValidObject(src)) {
+        if ($n_isValidObject(src)) {
 
             if ($n_has(src, 'options')) {
                 options = src.options
@@ -77,10 +80,10 @@ export default function getImage(src, options) {
                             w = Number(w)
                             if (w > 0) {
 
-                                // 获取设备像素比
                                 /* #if IS_WEB */
                                 // 如果开启缩放
                                 if (zoom) {
+                                    // 获取设备像素比
                                     const devicePixelRatio = window.devicePixelRatio || 1
                                     if (devicePixelRatio > 2) {
                                         w *= 2
@@ -104,7 +107,6 @@ export default function getImage(src, options) {
                         }
                     }
                 }
-                // --------------------------------------------------
 
             } else {
                 options = {}
@@ -113,7 +115,7 @@ export default function getImage(src, options) {
             const {
                 type,
                 domain,
-            } = $n_uploader.getUpload()
+            } = $n_uploader.getUpload(null, $n_get(options, 'upload', ''))
 
             // 判断图片上传方式
             switch (type) {
@@ -122,7 +124,7 @@ export default function getImage(src, options) {
                 case 'qiniu':
                 // minio
                 case 'minio':
-                    
+
                     const {
                         compress,
                         w,
@@ -168,9 +170,19 @@ export default function getImage(src, options) {
                             src += '/format/' + format
                         }
                     }
+                break
+            }
 
-                    return useFileUrl(domain, src)
+            // 【调试模式】
+            // --------------------------------------------------
+            // #ifdef IS_DEBUG
+            if ($n_get(options, 'upload')) {
+                return $n_slash(domain, 'end', true) + src
             }
+            // #endif
+            // --------------------------------------------------
+
+            return useFileUrl(domain, src)
         }
     }
 

package/utils/uploader.js

@@ -116,10 +116,13 @@ function create(options) {
      */
     const configUpload = getUpload()
 
-    const configLimit = Object.assign({
-        maxSize: 100,
-        exts: [],
-    },  $n_config('uploader.limit.' + props.type))
+    const configLimit = Object.assign(
+        {
+            maxSize: 100,
+            exts: [],
+        },
+        $n_config('uploader.limit.' + props.type, {})
+    )
 
     // 如果有单个文件的最大大小
     if (props.maxSize) {
@@ -1601,7 +1604,7 @@ function create(options) {
  */
 export function getUpload(userConfig = null, defaultUpload = '') {
     const uploadConfig = $n_get((userConfig ? userConfig : configs.userConfig), 'uploader.upload', {})
-    const type = defaultUpload ? defaultUpload : uploadConfig.default
+    const type = $n_isValidString(defaultUpload) ? defaultUpload : uploadConfig.default
     return Object.assign(
         {},
         $n_get(uploadConfig, type, {}),