@netang/quasar 0.1.36 → 0.1.38

package/utils/dialog.js

@@ -1,36 +1,36 @@
-import $n_has from 'lodash/has'
-
-import { Dialog } from 'quasar'
-
-import DialogComponent from '../components/dialog'
-
-/**
- * 创建对话框
- */
-function create(options) {
-    if (
-        // 如果是路由组件
-        $n_has(options, 'path')
-        // 或自定义组件
-        || $n_has(options, 'name')
-    ) {
-        return Dialog.create({
-            // 组件
-            component: DialogComponent,
-            // 组件声明
-            componentProps: options,
-        })
-    }
-
-    return Dialog.create(options)
-}
-
-/**
- * 对话框
- */
-const dialog = {
-    // 创建对话框
-    create,
-}
-
-export default dialog
+import $n_has from 'lodash/has'
+
+import { Dialog } from 'quasar'
+
+import DialogComponent from '../components/dialog'
+
+/**
+ * 创建对话框
+ */
+function create(options) {
+    if (
+        // 如果是路由组件
+        $n_has(options, 'path')
+        // 或自定义组件
+        || $n_has(options, 'name')
+    ) {
+        return Dialog.create({
+            // 组件
+            component: DialogComponent,
+            // 组件声明
+            componentProps: options,
+        })
+    }
+
+    return Dialog.create(options)
+}
+
+/**
+ * 对话框
+ */
+const dialog = {
+    // 创建对话框
+    create,
+}
+
+export default dialog

package/utils/dict.js

@@ -1,21 +1,21 @@
-import $n_has from 'lodash/has'
-
-import { configs } from './config'
-
-/**
- * 获取字典值对应的文字
- */
-export default function dict(key, value, defaultValue = '') {
-    if (
-        key
-        && $n_has(configs.userDict, key)
-    ) {
-        for (const item of configs.userDict[key]) {
-            if (item[1] === value) {
-                return item[0]
-            }
-        }
-    }
-
-    return defaultValue
-}
+import $n_has from 'lodash/has'
+
+import { configs } from './config'
+
+/**
+ * 获取字典值对应的文字
+ */
+export default function dict(key, value, defaultValue = '') {
+    if (
+        key
+        && $n_has(configs.userDict, key)
+    ) {
+        for (const item of configs.userDict[key]) {
+            if (item[1] === value) {
+                return item[0]
+            }
+        }
+    }
+
+    return defaultValue
+}

package/utils/getImage.js

@@ -1,153 +1,167 @@
-import $n_has from 'lodash/has'
-import $n_isString from 'lodash/isString'
-
-import $n_isValidArray from '@netang/utils/isValidArray'
-import $n_isValidObject from '@netang/utils/isValidObject'
-import $n_isValidString from '@netang/utils/isValidString'
-import $n_isNumeric from '@netang/utils/isNumeric'
-import $n_slash from '@netang/utils/slash'
-
-import $n_config from './config'
-
-/**
- * 获取图片
- */
-export default function getImage(src, options) {
-
-    if (src) {
-
-        // 如果为数组, 则获取第一个
-        if ($n_isValidArray(src)) {
-            src = src[0]
-
-        // 如果为对象
-        } else if ($n_isValidObject(src)) {
-
-            if ($n_has(src, 'options')) {
-                options = src.options
-            }
-
-            if ($n_has(src, 'img')) {
-                src = src.img
-            }
-        }
-
-        if ($n_isValidString(src)) {
-
-            // http(s):// 或 data: 或 blob: 开头的地址
-            if (/^(http(s)?:\/\/|data:|blob:)/i.test(src)) {
-                return src
-            }
-
-            // 如果为对象定义的规格
-            if ($n_isValidObject(options)) {
-
-                // 是否自动缩放
-                // --------------------------------------------------
-                // 如果有定义 w
-                if ($n_has(options, 'w')) {
-
-                    let {
-                        w,
-                        maxWidth,
-                        zoom,
-                    } = options
-
-                    // 先设为 0
-                    options.w = 0
-
-                    // 如果开启缩放 && 有宽度
-                    if (zoom && w) {
-
-                        if (! $n_isNumeric(w) && $n_isString(w)) {
-                            w = w.replace('px', '')
-                        }
-
-                        if ($n_isNumeric(w)) {
-                            w = Number(w)
-                            if (w > 0) {
-
-                                // 获取设备像素比
-                                /* #if IS_WEB */
-                                const devicePixelRatio = window.devicePixelRatio || 1
-                                if (devicePixelRatio > 2) {
-                                    w *= 2
-                                }
-                                /* #endif */
-
-                                if (w > 10) {
-                                    w = Math.floor(w / 10) * 10
-                                } else {
-                                    w = Math.floor(w)
-                                }
-
-                                // 如果有最大宽度
-                                if (maxWidth && maxWidth > w) {
-                                    w = maxWidth
-                                }
-
-                                options.w = w
-                            }
-                        }
-                    }
-                }
-                // --------------------------------------------------
-
-                const {
-                    type,
-                    domain,
-                } = $n_config('uploader.upload')
-
-                // 判断图片上传方式
-                switch (type) {
-
-                    // 七牛云
-                    case 'qiniu':
-
-                        const {
-                            w,
-                            h,
-                            q,
-                            format,
-                        } = Object.assign({
-                            // 宽
-                            w: 0,
-                            // 高
-                            h: 0,
-                            // 质量
-                            q: 75,
-                            // 格式
-                            format: 'webp',
-                        }, options)
-
-                        // 裁剪图片方式
-                        src += '?imageView2/2'
-
-                        // 质量
-                        if (q) {
-                            src += '/q/' + q
-                        }
-
-                        // 宽
-                        if (w) {
-                            src += '/w/' + w
-                        }
-
-                        // 高
-                        if (h) {
-                            src += '/h/' + h
-                        }
-
-                        // 格式
-                        if (format) {
-                            src += '/format/' + format
-                        }
-
-                        return $n_slash(domain, 'end', true) + src
-                }
-            }
-        }
-    }
-
-    return ''
-}
+import $n_has from 'lodash/has'
+import $n_isString from 'lodash/isString'
+
+import $n_isValidArray from '@netang/utils/isValidArray'
+import $n_isValidObject from '@netang/utils/isValidObject'
+import $n_isValidString from '@netang/utils/isValidString'
+import $n_isNumeric from '@netang/utils/isNumeric'
+import $n_slash from '@netang/utils/slash'
+
+import $n_config from './config'
+
+/**
+ * 获取图片
+ */
+export default function getImage(src, options) {
+
+    if (src) {
+
+        // 如果为数组, 则获取第一个
+        if ($n_isValidArray(src)) {
+            src = src[0]
+
+        // 如果为对象
+        } else if ($n_isValidObject(src)) {
+
+            if ($n_has(src, 'options')) {
+                options = src.options
+            }
+
+            if ($n_has(src, 'img')) {
+                src = src.img
+            }
+        }
+
+        if ($n_isValidString(src)) {
+
+            // http(s):// 或 data: 或 blob: 开头的地址
+            if (/^(http(s)?:\/\/|data:|blob:)/i.test(src)) {
+                return src
+            }
+
+            // 如果为对象定义的规格
+            if ($n_isValidObject(options)) {
+
+                // 如果有定义 w
+                if ($n_has(options, 'w')) {
+
+                    let {
+                        w,
+                        maxWidth,
+                        zoom,
+                    } = options
+
+                    // 先设为 0
+                    options.w = 0
+
+                    // 如果有宽度
+                    if (w) {
+
+                        if (
+                            ! $n_isNumeric(w)
+                            && $n_isString(w)
+                        ) {
+                            w = w.replace('px', '')
+                        }
+
+                        if ($n_isNumeric(w)) {
+                            w = Number(w)
+                            if (w > 0) {
+
+                                // 获取设备像素比
+                                /* #if IS_WEB */
+                                // 如果开启缩放
+                                if (zoom) {
+                                    const devicePixelRatio = window.devicePixelRatio || 1
+                                    if (devicePixelRatio > 2) {
+                                        w *= 2
+                                    }
+                                }
+                                /* #endif */
+
+                                if (w > 10) {
+                                    w = Math.floor(w / 10) * 10
+                                } else {
+                                    w = Math.floor(w)
+                                }
+
+                                // 如果有最大宽度
+                                if (maxWidth && maxWidth > w) {
+                                    w = maxWidth
+                                }
+
+                                options.w = w
+                            }
+                        }
+                    }
+                }
+                // --------------------------------------------------
+
+            } else {
+                options = {}
+            }
+
+            const {
+                type,
+                domain,
+            } = $n_config('uploader.upload')
+
+            // 判断图片上传方式
+            switch (type) {
+
+                // 七牛云
+                case 'qiniu':
+
+                    const {
+                        compress,
+                        w,
+                        h,
+                        q,
+                        format,
+                    } = Object.assign({
+                        // 是否压缩
+                        compress: true,
+                        // 宽
+                        w: 0,
+                        // 高
+                        h: 0,
+                        // 质量
+                        q: 75,
+                        // 格式
+                        format: 'webp',
+                    }, options)
+
+                    // 如果压缩
+                    if (compress) {
+
+                        // 裁剪图片方式
+                        src += '?imageView2/2'
+
+                        // 质量
+                        if (q) {
+                            src += '/q/' + q
+                        }
+
+                        // 宽
+                        if (w) {
+                            src += '/w/' + w
+                        }
+
+                        // 高
+                        if (h) {
+                            src += '/h/' + h
+                        }
+
+                        // 格式
+                        if (format) {
+                            src += '/format/' + format
+                        }
+                    }
+
+                    return $n_slash(domain, 'end', true) + src
+            }
+        }
+    }
+
+    return ''
+}

package/utils/index.js

@@ -1,62 +1,62 @@
-import $auth from './$auth'
-import $form from './$form'
-import $power from './$power'
-import $render from './$render'
-import $rule from './$rule'
-import $ruleValid from './$ruleValid'
-import $table from './$table'
-import $tree from './$tree'
-
-import alert from './alert'
-import area from './area'
-import arr from './arr'
-import bus from './bus'
-import config from './config'
-import confirm from './confirm'
-import copy from './copy'
-import dialog from './dialog'
-import dict from './dict'
-import dictOptions from './dictOptions'
-import getData from './getData'
-import getFile from './getFile'
-import getImage from './getImage'
-import getTime from './getTime'
-import loading from './loading'
-import notify from './notify'
-import previewImage from './previewImage'
-import price from './price'
-import timestamp from './timestamp'
-import toast from './toast'
-import uploader from './uploader'
-
-export default {
-    $auth,
-    $form,
-    $power,
-    $rule,
-    $ruleValid,
-    $table,
-    $tree,
-
-    alert,
-    area,
-    arr,
-    bus,
-    config,
-    confirm,
-    copy,
-    dialog,
-    dict,
-    dictOptions,
-    getData,
-    getFile,
-    getImage,
-    getTime,
-    loading,
-    notify,
-    previewImage,
-    price,
-    timestamp,
-    toast,
-    uploader,
-}
+import $auth from './$auth'
+import $form from './$form'
+import $power from './$power'
+import $render from './$render'
+import $rule from './$rule'
+import $ruleValid from './$ruleValid'
+import $table from './$table'
+import $tree from './$tree'
+
+import alert from './alert'
+import area from './area'
+import arr from './arr'
+import bus from './bus'
+import config from './config'
+import confirm from './confirm'
+import copy from './copy'
+import dialog from './dialog'
+import dict from './dict'
+import dictOptions from './dictOptions'
+import getData from './getData'
+import getFile from './getFile'
+import getImage from './getImage'
+import getTime from './getTime'
+import loading from './loading'
+import notify from './notify'
+import previewImage from './previewImage'
+import price from './price'
+import timestamp from './timestamp'
+import toast from './toast'
+import uploader from './uploader'
+
+export default {
+    $auth,
+    $form,
+    $power,
+    $rule,
+    $ruleValid,
+    $table,
+    $tree,
+
+    alert,
+    area,
+    arr,
+    bus,
+    config,
+    confirm,
+    copy,
+    dialog,
+    dict,
+    dictOptions,
+    getData,
+    getFile,
+    getImage,
+    getTime,
+    loading,
+    notify,
+    previewImage,
+    price,
+    timestamp,
+    toast,
+    uploader,
+}

package/utils/previewImage.js

@@ -1,10 +1,14 @@
-import $n_toast from './toast'
-
-/**
- * 预览图片
- */
-export default function previewImage(src) {
-    $n_toast({
-        message: '预览图片还没做'
-    })
-}
+import { Dialog } from 'quasar'
+import ImgViewer from '../components/dialog/img-viewer'
+
+/**
+ * 预览图片
+ */
+export default function previewImage(options) {
+    return Dialog.create({
+        // 组件
+        component: ImgViewer,
+        // 组件声明
+        componentProps: options,
+    })
+}

package/utils/timestamp.js

@@ -1,18 +1,18 @@
-import { stateTimeDiff } from '../store'
-
-/**
- * 获取当前时间戳
- */
-export default function timestamp(isMicro = false) {
-
-    // 获取当前时间戳(毫秒)
-    const nowTime = Date.now()
-
-    // 如果是毫秒
-    if (isMicro) {
-        return nowTime - (stateTimeDiff.value * 1000)
-    }
-
-    // 否则是秒
-    return Math.floor(nowTime / 1000) - stateTimeDiff.value
-}
+import { stateTimeDiff } from '../store'
+
+/**
+ * 获取当前时间戳
+ */
+export default function timestamp(isMicro = false) {
+
+    // 获取当前时间戳(毫秒)
+    const nowTime = Date.now()
+
+    // 如果是毫秒
+    if (isMicro) {
+        return nowTime - (stateTimeDiff.value * 1000)
+    }
+
+    // 否则是秒
+    return Math.floor(nowTime / 1000) - stateTimeDiff.value
+}