@netang/quasar 0.2.30 → 0.2.32

package/utils/getData.js

@@ -1,88 +1,88 @@
-import { isRef } from 'vue'
-
-import $n_has from 'lodash/has'
-import $n_isNil from 'lodash/isNil'
-import $n_map from 'lodash/map'
-
-import $n_http from '@netang/utils/http'
-import $n_isValidObject from '@netang/utils/isValidObject'
-
-import $n_config from './config'
-
-/**
- * 获取公共数据
- * @param {String|Array|Object} url 请求地址
- * @param pageStatus 页面状态
- * @param emptyDescription 空状态描述
- * @param refValue 请求成功后设置值
- * @returns
- */
-export default async function getData(url, pageStatus = null, emptyDescription = null, refValue = null) {
-
-    const warn = $n_isNil(pageStatus) || ! isRef(pageStatus)
-
-    // 获取单个请求配置
-    function getSingleHttpOptions(opt) {
-
-        // 如果是对象
-        if ($n_isValidObject(opt)) {
-            opt.url = $n_config('apiDataUrl') + opt.url
-            if (! $n_has(opt, 'warn')) {
-                opt.warn = warn
-            }
-            return opt
-        }
-
-        // 否则为字符串
-        return {
-            url: $n_config('apiDataUrl') + opt,
-            warn,
-        }
-    }
-
-    // 如果是数组, 说明需要同时请求多个地址
-    // --------------------------------------------------
-    if (Array.isArray(url)) {
-
-        const result = await $n_http($n_map(url, function (item) {
-            return getSingleHttpOptions(item)
-        }))
-
-        const res = []
-
-        for (const { status, data } of result) {
-            if (! status) {
-                if (! warn) {
-                    pageStatus.value = false
-                }
-                if (! $n_isNil(emptyDescription) && isRef(emptyDescription)) {
-                    emptyDescription.value = data.msg
-                }
-                return false
-            }
-            res.push(data)
-        }
-
-        return res
-    }
-
-    // 单个请求
-    // --------------------------------------------------
-    const { status, data } = await $n_http(getSingleHttpOptions(url))
-    if (! status) {
-        if (! warn) {
-            pageStatus.value = false
-        }
-        if (! $n_isNil(emptyDescription) && isRef(emptyDescription)) {
-            emptyDescription.value = data.msg
-        }
-        return false
-    }
-
-    // 直接设置 value
-    if (! $n_isNil(refValue) && isRef(refValue)) {
-        refValue.value = data
-    }
-
-    return data
-}
+import { isRef } from 'vue'
+
+import $n_has from 'lodash/has'
+import $n_isNil from 'lodash/isNil'
+import $n_map from 'lodash/map'
+
+import $n_http from '@netang/utils/http'
+import $n_isValidObject from '@netang/utils/isValidObject'
+
+import $n_config from './config'
+
+/**
+ * 获取公共数据
+ * @param {String|Array|Object} url 请求地址
+ * @param pageStatus 页面状态
+ * @param emptyDescription 空状态描述
+ * @param refValue 请求成功后设置值
+ * @returns
+ */
+export default async function getData(url, pageStatus = null, emptyDescription = null, refValue = null) {
+
+    const warn = $n_isNil(pageStatus) || ! isRef(pageStatus)
+
+    // 获取单个请求配置
+    function getSingleHttpOptions(opt) {
+
+        // 如果是对象
+        if ($n_isValidObject(opt)) {
+            opt.url = $n_config('apiDataUrl') + opt.url
+            if (! $n_has(opt, 'warn')) {
+                opt.warn = warn
+            }
+            return opt
+        }
+
+        // 否则为字符串
+        return {
+            url: $n_config('apiDataUrl') + opt,
+            warn,
+        }
+    }
+
+    // 如果是数组, 说明需要同时请求多个地址
+    // --------------------------------------------------
+    if (Array.isArray(url)) {
+
+        const result = await $n_http($n_map(url, function (item) {
+            return getSingleHttpOptions(item)
+        }))
+
+        const res = []
+
+        for (const { status, data } of result) {
+            if (! status) {
+                if (! warn) {
+                    pageStatus.value = false
+                }
+                if (! $n_isNil(emptyDescription) && isRef(emptyDescription)) {
+                    emptyDescription.value = data.msg
+                }
+                return false
+            }
+            res.push(data)
+        }
+
+        return res
+    }
+
+    // 单个请求
+    // --------------------------------------------------
+    const { status, data } = await $n_http(getSingleHttpOptions(url))
+    if (! status) {
+        if (! warn) {
+            pageStatus.value = false
+        }
+        if (! $n_isNil(emptyDescription) && isRef(emptyDescription)) {
+            emptyDescription.value = data.msg
+        }
+        return false
+    }
+
+    // 直接设置 value
+    if (! $n_isNil(refValue) && isRef(refValue)) {
+        refValue.value = data
+    }
+
+    return data
+}

package/utils/getFile.js

@@ -1,67 +1,67 @@
-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'
-
-import useFileUrl from './useFileUrl'
-
-/**
- * 获取文件
- */
-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: 开头的地址
-            if (/^(http(s)?:\/\/|data:|blob:)/i.test(src)) {
-                return src
-            }
-
-            const {
-                type,
-                domain,
-            } = $n_uploader.getUpload(
-                null,
-                src && src.slice(-1) === '_'
-                    ? 'minio'
-                    : ''
-            )
-
-            return useFileUrl({ type, domain, src })
-        }
-    }
-
-    return ''
-}
+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'
+
+import useFileUrl from './useFileUrl'
+
+/**
+ * 获取文件
+ */
+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: 开头的地址
+            if (/^(http(s)?:\/\/|data:|blob:)/i.test(src)) {
+                return src
+            }
+
+            const {
+                type,
+                domain,
+            } = $n_uploader.getUpload(
+                null,
+                src && src.slice(-1) === '_'
+                    ? 'minio'
+                    : ''
+            )
+
+            return useFileUrl({ type, domain, src })
+        }
+    }
+
+    return ''
+}