@netang/quasar 0.2.3 → 0.2.4

package/utils/getTime.js

@@ -1,113 +1,113 @@
-import $n_get from 'lodash/get'
-
-import $n_isValidString from '@netang/utils/isValidString'
-import $n_toDate from '@netang/utils/toDate'
-import $n_indexOf from '@netang/utils/indexOf'
-
-import $n_timestamp from './timestamp'
-
-import { date as quasarDate } from 'quasar'
-
-/**
- * 获取时间
- */
-export default function getTime(time, options, defaultValue = '') {
-
-    if (! time) {
-        return $n_isValidString(options) ? options : defaultValue
-    }
-
-    // 分隔符
-    const separator = $n_get(options, 'separator', '-')
-
-    let {
-        hideCurrentYear,
-        showSecond,
-        format,
-        calendar,
-        showCalendarToday,
-        showCalendarTime,
-
-    } = Object.assign({
-        // 默认格式化
-        format: `MM${separator}DD HH:mm`,
-        // 是否显示秒
-        showSecond: false,
-        // 是否隐藏当前年份
-        hideCurrentYear: false,
-        // 是否显示日历格式
-        calendar: false,
-        // 是否显示日历今天
-        showCalendarToday: false,
-        // 是否显示日历时间
-        showCalendarTime: false,
-    }, options)
-
-    // 传入时间
-    const date = $n_toDate(time)
-
-    // 当前时间
-    const now = $n_toDate($n_timestamp())
-
-    // 如果是自然化时间
-    // 如果是今天, 则显示时分秒
-    // 如果是昨天, 则显示昨天
-    // 如果是本周, 则显示星期几
-    // 如果是本年, 则显示某月某日
-    // 如果是非本年, 则显示某年某月某日
-    if (calendar) {
-
-        // 当前时间
-        let time = ''
-
-        // 如果是今年
-        if (quasarDate.formatDate(date, 'YYYY') === quasarDate.formatDate(now, 'YYYY')) {
-
-            const formatYmd = `YYYY${separator}MM${separator}DD`
-
-            // 如果是今天
-            const resDay = quasarDate.formatDate(date, formatYmd)
-            if (resDay === quasarDate.formatDate(now, formatYmd)) {
-                return showCalendarToday ? '今天' : quasarDate.formatDate(date, 'HH:mm' + (showSecond ? ':ss' : ''))
-            }
-
-            // 判断是否是昨天
-            if (resDay === quasarDate.formatDate(quasarDate.subtractFromDate(now, { days: 1 }), formatYmd)) {
-                time = '昨天'
-
-            // 是否为本周(判断日期在本年是第几周 如果相同, 则是本周)
-            } else if (quasarDate.formatDate(date, 'YYYY w') === quasarDate.formatDate(now, 'YYYY w')) {
-                time = quasarDate.formatDate(date, 'dddd')
-
-            // 否则显示某月某日
-            } else {
-                time = quasarDate.formatDate(date, 'MM月DD日')
-            }
-
-        // 否则显示某年某月某日
-        } else {
-            time = quasarDate.formatDate(date, 'YYYY年MM月DD日')
-        }
-
-        // 是否显示日历时间
-        if (showCalendarTime) {
-            return time + ' ' + quasarDate.formatDate(date, 'HH:mm' + (showSecond ? ':ss' : ''))
-        }
-
-        // 否则仅显示日期
-        return time
-    }
-
-    // 如果是今年是否显示
-    if (
-        $n_indexOf(format, 'YYYY') === -1
-        && (
-            ! hideCurrentYear
-            || quasarDate.formatDate(date, 'YYYY') !== quasarDate.formatDate(now, 'YYYY')
-        )
-    ) {
-        format = 'YYYY' + separator + format
-    }
-
-    return quasarDate.formatDate(date, format + (showSecond ? ':ss' : ''))
-}
+import $n_get from 'lodash/get'
+
+import $n_isValidString from '@netang/utils/isValidString'
+import $n_toDate from '@netang/utils/toDate'
+import $n_indexOf from '@netang/utils/indexOf'
+
+import $n_timestamp from './timestamp'
+
+import { date as quasarDate } from 'quasar'
+
+/**
+ * 获取时间
+ */
+export default function getTime(time, options, defaultValue = '') {
+
+    if (! time) {
+        return $n_isValidString(options) ? options : defaultValue
+    }
+
+    // 分隔符
+    const separator = $n_get(options, 'separator', '-')
+
+    let {
+        hideCurrentYear,
+        showSecond,
+        format,
+        calendar,
+        showCalendarToday,
+        showCalendarTime,
+
+    } = Object.assign({
+        // 默认格式化
+        format: `MM${separator}DD HH:mm`,
+        // 是否显示秒
+        showSecond: false,
+        // 是否隐藏当前年份
+        hideCurrentYear: false,
+        // 是否显示日历格式
+        calendar: false,
+        // 是否显示日历今天
+        showCalendarToday: false,
+        // 是否显示日历时间
+        showCalendarTime: false,
+    }, options)
+
+    // 传入时间
+    const date = $n_toDate(time)
+
+    // 当前时间
+    const now = $n_toDate($n_timestamp())
+
+    // 如果是自然化时间
+    // 如果是今天, 则显示时分秒
+    // 如果是昨天, 则显示昨天
+    // 如果是本周, 则显示星期几
+    // 如果是本年, 则显示某月某日
+    // 如果是非本年, 则显示某年某月某日
+    if (calendar) {
+
+        // 当前时间
+        let time = ''
+
+        // 如果是今年
+        if (quasarDate.formatDate(date, 'YYYY') === quasarDate.formatDate(now, 'YYYY')) {
+
+            const formatYmd = `YYYY${separator}MM${separator}DD`
+
+            // 如果是今天
+            const resDay = quasarDate.formatDate(date, formatYmd)
+            if (resDay === quasarDate.formatDate(now, formatYmd)) {
+                return showCalendarToday ? '今天' : quasarDate.formatDate(date, 'HH:mm' + (showSecond ? ':ss' : ''))
+            }
+
+            // 判断是否是昨天
+            if (resDay === quasarDate.formatDate(quasarDate.subtractFromDate(now, { days: 1 }), formatYmd)) {
+                time = '昨天'
+
+            // 是否为本周(判断日期在本年是第几周 如果相同, 则是本周)
+            } else if (quasarDate.formatDate(date, 'YYYY w') === quasarDate.formatDate(now, 'YYYY w')) {
+                time = quasarDate.formatDate(date, 'dddd')
+
+            // 否则显示某月某日
+            } else {
+                time = quasarDate.formatDate(date, 'MM月DD日')
+            }
+
+        // 否则显示某年某月某日
+        } else {
+            time = quasarDate.formatDate(date, 'YYYY年MM月DD日')
+        }
+
+        // 是否显示日历时间
+        if (showCalendarTime) {
+            return time + ' ' + quasarDate.formatDate(date, 'HH:mm' + (showSecond ? ':ss' : ''))
+        }
+
+        // 否则仅显示日期
+        return time
+    }
+
+    // 如果是今年是否显示
+    if (
+        $n_indexOf(format, 'YYYY') === -1
+        && (
+            ! hideCurrentYear
+            || quasarDate.formatDate(date, 'YYYY') !== quasarDate.formatDate(now, 'YYYY')
+        )
+    ) {
+        format = 'YYYY' + separator + format
+    }
+
+    return quasarDate.formatDate(date, format + (showSecond ? ':ss' : ''))
+}

package/utils/index.js

@@ -1,65 +1,65 @@
-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 $search from './$search'
-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,
-    $render,
-    $rule,
-    $ruleValid,
-    $search,
-    $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 $search from './$search'
+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,
+    $render,
+    $rule,
+    $ruleValid,
+    $search,
+    $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,14 +1,14 @@
-import { Dialog } from 'quasar'
-import ImgViewer from '../components/dialog/img-viewer'
-
-/**
- * 预览图片
- */
-export default function previewImage(options) {
-    return Dialog.create({
-        // 组件
-        component: ImgViewer,
-        // 组件声明
-        componentProps: options,
-    })
-}
+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
+}

package/utils/uploader.js

@@ -544,6 +544,7 @@ function create(options) {
                     fileItem.ext = ext
 
                     const {
+                        title,
                         size,
                     } = fileItem.file
 
@@ -568,7 +569,7 @@ function create(options) {
                         // 设置文件 hash
                         fileItem.hash = hash
                         // 标题
-                        fileItem.title = ''
+                        fileItem.title = title
                         // 设置文件状态
                         fileItem.status = UPLOAD_STATUS.hashChecked
                         // 设置文件检查进度

package/utils/useFileUrl.js

@@ -1,26 +1,26 @@
-import $n_isFunction from 'lodash/isFunction'
-
-import $n_isValidString from '@netang/utils/isValidString'
-import $n_slash from '@netang/utils/slash'
-
-import { configs } from './config'
-
-/**
- * 获取文件 url
- */
-export default function useFileUrl(domain, src) {
-
-    // 获取文件地址
-    const {
-        getFileUrl,
-    } = configs
-
-    if ($n_isFunction(getFileUrl)) {
-        const res = getFileUrl(domain, src)
-        if ($n_isValidString(res)) {
-            return res
-        }
-    }
-
-    return $n_slash(domain, 'end', true) + src
-}
+import $n_isFunction from 'lodash/isFunction'
+
+import $n_isValidString from '@netang/utils/isValidString'
+import $n_slash from '@netang/utils/slash'
+
+import { configs } from './config'
+
+/**
+ * 获取文件 url
+ */
+export default function useFileUrl(domain, src) {
+
+    // 获取文件地址
+    const {
+        getFileUrl,
+    } = configs
+
+    if ($n_isFunction(getFileUrl)) {
+        const res = getFileUrl(domain, src)
+        if ($n_isValidString(res)) {
+            return res
+        }
+    }
+
+    return $n_slash(domain, 'end', true) + src
+}