@netang/quasar 0.0.53 → 0.0.55

package/utils/tree.js

@@ -1,4 +1,25 @@
-import { isRef, watch } from 'vue'
+import $n_has from 'lodash/has'
+import $n_get from 'lodash/get'
+import $n_isNil from 'lodash/isNil'
+import $n_findIndex from 'lodash/findIndex'
+import $n_cloneDeep from 'lodash/cloneDeep'
+
+import $n_router from '@netang/vue-utils/router'
+
+import $n_isValidArray from '@netang/utils/isValidArray'
+import $n_isValidObject from '@netang/utils/isValidObject'
+import $n_isValidString from '@netang/utils/isValidString'
+import $n_hasId from '@netang/utils/hasId'
+import $n_http from '@netang/utils/http'
+import $n_run from '@netang/utils/run'
+import $n_storage from '@netang/utils/storage'
+
+import $n_toast from './toast'
+import $n_confirm from './confirm'
+import $n_dialog from './dialog'
+import $n_alert from './alert'
+
+import { isRef, watch, inject, ref } from 'vue'
 
 import { NPowerKey } from './symbols'
 
@@ -29,7 +50,7 @@ function getTreeNode(data, nodeId) {
  */
 function getChildren(data, callback) {
     for (const item of data) {
-        if ($n.run(callback)(item) === false) {
+        if ($n_run(callback)(item) === false) {
             return false
         }
         // 如果是父节点
@@ -75,24 +96,24 @@ function create(params) {
     }, params)
 
     // 获取权限注入
-    const $power = $n.has(params, '$power') ? params.$power : inject(NPowerKey)
+    const $power = $n_has(params, '$power') ? params.$power : inject(NPowerKey)
     const hasPowr = !! $power
 
     // 获取权限路由
-    const $route = $n.isValidString(path) ?
+    const $route = $n_isValidString(path) ?
         // 如果为自定义路由
-        $n.router.resolve({
+        $n_router.resolve({
             path,
             query,
         })
         // 否则获取当前路由
-        : (hasPowr ? $power.getRoute() : $n.router.getRoute())
+        : (hasPowr ? $power.getRoute() : $n_router.getRoute())
 
     // 权限按钮
     const powerBtns = hasPowr ? $power.powerBtns : ref([])
 
     // 是否有展开节点
-    const hasExpanded = ! $n.isNil(expanded) && isRef(expanded)
+    const hasExpanded = ! $n_isNil(expanded) && isRef(expanded)
 
     // 如果开启展开节点缓存
     if (hasExpanded && cache) {
@@ -138,7 +159,7 @@ function create(params) {
     function updateNode(data) {
 
         // 获取 id
-        const id = $n.get(formData.value, 'id')
+        const id = $n_get(formData.value, 'id')
 
         // 更新表单数据
         formData.value = Object.assign({}, formData.value, data)
@@ -158,7 +179,7 @@ function create(params) {
         // 否则为新增节点
         } else if (
             // 如果为新增节点
-            $n.get(data, 'id')
+            $n_get(data, 'id')
             // 没有节点存在
             && ! nodeItem
         ) {
@@ -185,7 +206,7 @@ function create(params) {
         }
 
         // 获取节点索引
-        const nodeIndex = $n.findIndex(parentNodeItem.children, { id })
+        const nodeIndex = $n_findIndex(parentNodeItem.children, { id })
         if (nodeIndex > -1) {
             parentNodeItem.children.splice(nodeIndex, 1)
         }
@@ -213,18 +234,18 @@ function create(params) {
 
         const allPowerBtn = {}
         for (const item of powerBtns.value) {
-            if ($n.has(maps, $n.get(item, 'name'))) {
+            if ($n_has(maps, $n_get(item, 'name'))) {
                 allPowerBtn[maps[item.name]] = item
             }
         }
 
         return {
-            all: $n.isValidObject(allPowerBtn),
-            update: $n.has(allPowerBtn, 'update'),
-            move: $n.has(allPowerBtn, 'move'),
-            copy: $n.has(allPowerBtn, 'copy'),
-            delete: $n.has(allPowerBtn, 'delete'),
-            status: $n.has(allPowerBtn, 'status'),
+            all: $n_isValidObject(allPowerBtn),
+            update: $n_has(allPowerBtn, 'update'),
+            move: $n_has(allPowerBtn, 'move'),
+            copy: $n_has(allPowerBtn, 'copy'),
+            delete: $n_has(allPowerBtn, 'delete'),
+            status: $n_has(allPowerBtn, 'status'),
             allPowerBtn,
         }
     }
@@ -234,7 +255,7 @@ function create(params) {
      */
     function confirmMenu(callback) {
         // 确认框
-        $n.confirm({
+        $n_confirm({
             message: '确认要执行该操作吗？',
         })
             // 点击确认执行
@@ -272,13 +293,13 @@ function create(params) {
             // 移至节点下
             case 'moveDown':
 
-                if (! $n.get(o.menuStatus, 'value.allPowerBtn.move.url')) {
+                if (! $n_get(o.menuStatus, 'value.allPowerBtn.move.url')) {
                     console.error('没有找到复制地址')
                     return
                 }
 
                 // 创建对话框
-                $n.dialog.create({
+                $n_dialog.create({
                     // 标题
                     title: `移动至节点的${o.type === 'moveUp' ? '上方' : (o.type === 'moveDown' ? '下方' : '内部')}`,
                     // 宽度
@@ -298,8 +319,8 @@ function create(params) {
                     async onConfirm({ value: moveNodeId }) {
 
                         // 是否为正确的 id
-                        if (! $n.hasId(moveNodeId)) {
-                            $n.toast({
+                        if (! $n_hasId(moveNodeId)) {
+                            $n_toast({
                                 message: '请选择节点',
                             })
                             return false
@@ -307,7 +328,7 @@ function create(params) {
 
                         // 如果节点是自己
                         if (moveNodeId === o.node.id) {
-                            $n.toast({
+                            $n_toast({
                                 message: '不能选择当前节点',
                             })
                             return false
@@ -316,14 +337,14 @@ function create(params) {
                         // 获取需移动至的节点
                         const moveNodeItem = getNode(moveNodeId)
                         if (! moveNodeItem) {
-                            $n.alert({
+                            $n_alert({
                                 message: '移动至的节点不存在',
                             })
                             return false
                         }
 
                         // 克隆当前树列表数据
-                        const nodesClone = $n.cloneDeep(nodes.value)
+                        const nodesClone = $n_cloneDeep(nodes.value)
 
                         // 获取当前节点
                         const nodeItem = getNode(o.node.id)
@@ -358,7 +379,7 @@ function create(params) {
                             })
 
                             // 将本节点从原父节点中删除
-                            const nodeItemIndex = $n.findIndex(parentNodeItem.children, { id: nodeItem.id })
+                            const nodeItemIndex = $n_findIndex(parentNodeItem.children, { id: nodeItem.id })
                             parentNodeItem.children.splice(nodeItemIndex, 1)
 
                             // 将本节点添加至移动至的节点的子节点中
@@ -383,11 +404,11 @@ function create(params) {
                             })
 
                             // 将本节点从原父节点中删除
-                            const nodeItemIndex = $n.findIndex(parentNodeItem.children, { id: nodeItem.id })
+                            const nodeItemIndex = $n_findIndex(parentNodeItem.children, { id: nodeItem.id })
                             parentNodeItem.children.splice(nodeItemIndex, 1)
 
                             // 获取移动至节点的索引
-                            const moveNodeItemIndex = $n.findIndex(moveParentNodeItem.children, { id: moveNodeId })
+                            const moveNodeItemIndex = $n_findIndex(moveParentNodeItem.children, { id: moveNodeId })
 
                             for (let i = moveNodeItemIndex + (o.type === 'moveUp' ? 0 : 1); i < moveParentNodeItem.children.length; i++) {
                                 const item = moveParentNodeItem.children[i]
@@ -404,7 +425,7 @@ function create(params) {
                         }
 
                         // 请求 - 移动
-                        const { status } = await $n.http({
+                        const { status } = await $n_http({
                             url: o.menuStatus.value.allPowerBtn.move.url,
                             data: {
                                 data: moveLists,
@@ -424,7 +445,7 @@ function create(params) {
                 // 确认菜单
                 confirmMenu(async function() {
 
-                    if (! $n.get(o.menuStatus, 'value.allPowerBtn.copy.url')) {
+                    if (! $n_get(o.menuStatus, 'value.allPowerBtn.copy.url')) {
                         console.error('没有找到复制地址')
                         return
                     }
@@ -448,7 +469,7 @@ function create(params) {
                     }
 
                     // 请求 - 复制
-                    const { status, data: res } = await $n.http({
+                    const { status, data: res } = await $n_http({
                         url: o.menuStatus.value.allPowerBtn.copy.url,
                         data: {
                             data: copyLists,
@@ -462,7 +483,7 @@ function create(params) {
                     if (isLeafNode) {
 
                         // 如果返回了 id
-                        if ($n.hasId(res)) {
+                        if ($n_hasId(res)) {
 
                             // 更新数据
                             Object.assign(newAttr, res)
@@ -487,7 +508,7 @@ function create(params) {
                     }
 
                     // 轻提示
-                    $n.toast({
+                    $n_toast({
                         type: 'positive',
                         message: '复制成功',
                     })
@@ -500,13 +521,13 @@ function create(params) {
                 // 如果有子节点
                 if (o.node.children.length) {
                     // 提示框
-                    $n.alert({
+                    $n_alert({
                         message: '请先删除该节点下的子节点',
                     })
                     return
                 }
 
-                if (! $n.get(o.menuStatus, 'value.allPowerBtn.delete.url')) {
+                if (! $n_get(o.menuStatus, 'value.allPowerBtn.delete.url')) {
                     console.error('没有找到删除地址')
                     return
                 }
@@ -515,7 +536,7 @@ function create(params) {
                 confirmMenu(async function() {
 
                     // 请求 - 删除
-                    const { status } = await $n.http({
+                    const { status } = await $n_http({
                         url: o.menuStatus.value.allPowerBtn.delete.url,
                         data: {
                             id: o.node.id,
@@ -529,7 +550,7 @@ function create(params) {
                     deleteNode(o.node)
 
                     // 轻提示
-                    $n.toast({
+                    $n_toast({
                         type: 'positive',
                         message: '删除成功',
                     })
@@ -541,7 +562,7 @@ function create(params) {
             // 全部正常
             case 'statusNormal':
 
-                if (! $n.get(o.menuStatus, 'value.allPowerBtn.status.url')) {
+                if (! $n_get(o.menuStatus, 'value.allPowerBtn.status.url')) {
                     console.error('没有找到状态地址')
                     return
                 }
@@ -566,7 +587,7 @@ function create(params) {
                     }
 
                     // 请求 - 全部禁用/正常
-                    const { status } = await $n.http({
+                    const { status } = await $n_http({
                         url: o.menuStatus.value.allPowerBtn.status.url,
                         data: {
                             // ids
@@ -590,7 +611,7 @@ function create(params) {
                     }
 
                     // 轻提示
-                    $n.toast({
+                    $n_toast({
                         type: 'positive',
                         message: '恭喜您，操作成功',
                     })
@@ -604,8 +625,8 @@ function create(params) {
      */
     function getExpandedCache(defaultValue = []) {
         // 获取展开节点缓存
-        const res = $n.storage.get('tree_expanded_' + $route.fullPath)
-        return $n.isValidArray(res) ? res : defaultValue
+        const res = $n_storage.get('tree_expanded_' + $route.fullPath)
+        return $n_isValidArray(res) ? res : defaultValue
     }
 
     /**
@@ -613,7 +634,7 @@ function create(params) {
      */
     function setExpandedCache(expanded) {
         // 设置展开节点缓存(永久缓存)
-        $n.storage.set('tree_expanded_' + $route.fullPath, expanded, 0)
+        $n_storage.set('tree_expanded_' + $route.fullPath, expanded, 0)
     }
 
     /**
@@ -627,13 +648,13 @@ function create(params) {
         function getChildren(data) {
             for (const { id, children } of data) {
                 ids.push(id)
-                if ($n.isValidArray(children)) {
+                if ($n_isValidArray(children)) {
                     getChildren(children)
                 }
             }
         }
 
-        if ($n.isValidArray(nodes.value)) {
+        if ($n_isValidArray(nodes.value)) {
             getChildren(nodes.value)
         }
 
@@ -676,7 +697,9 @@ function create(params) {
 /**
  * 树业务
  */
-$n.tree = {
+const tree = {
     // 创建树实例
     create,
 }
+
+export default tree

package/utils/uploader/qiniu.js

@@ -1,6 +1,22 @@
+import $n_has from 'lodash/has'
+import $n_isString from 'lodash/isString'
+import $n_findIndex from 'lodash/findIndex'
+import $n_trim from 'lodash/trim'
+
+import $n_isValidObject from '@netang/utils/isValidObject'
+import $n_isValidString from '@netang/utils/isValidString'
+import $n_http from '@netang/utils/http'
+
+import $n_toast from '../toast'
+
+import { configs } from '../config'
+
+const {
+    // api 文件请求地址
+    apiFileUrl,
+} = configs
+
 import {
-    // 文件请求地址
-    REQUEST_URL,
     UPLOAD_STATUS,
 } from '../useUploader'
 
@@ -10,8 +26,8 @@ import {
 async function getQiniuToken(bucket = 'public') {
 
     // 请求数据
-    const { status, data } = await $n.http({
-        url: REQUEST_URL + 'get_qiniu_token',
+    const { status, data } = await $n_http({
+        url: apiFileUrl + 'get_qiniu_token',
         data: {
             bucket,
         },
@@ -46,7 +62,7 @@ export default async function ({ waitUploadFileLists, uploadFileLists, checkFile
         for (const fileItem of waitUploadFileLists) {
             setFileFail(fileItem, '上传失败')
         }
-        $n.toast({
+        $n_toast({
             message: '获取上传参数失败',
         })
         return
@@ -68,7 +84,7 @@ export default async function ({ waitUploadFileLists, uploadFileLists, checkFile
         fileItem.status = UPLOAD_STATUS.uploading
 
         // 请求上传文件到七牛云
-        const { status, data: resUpload } = await $n.http({
+        const { status, data: resUpload } = await $n_http({
             // 上传地址
             url: 'https://upload.qiniup.com/',
             // 数据
@@ -92,7 +108,7 @@ export default async function ({ waitUploadFileLists, uploadFileLists, checkFile
             onCancel(cancel) {
                 // 设置中断上传
                 fileItem.abort = function(msg) {
-                    cancel($n.isValidString(msg) ? msg : '已取消')
+                    cancel($n_isValidString(msg) ? msg : '已取消')
                 }
             },
             // 监听上传进度
@@ -116,8 +132,8 @@ export default async function ({ waitUploadFileLists, uploadFileLists, checkFile
         }
 
         // 请求 - 上传文件至 cdn
-        const { status: statusCallback, data: resCallback } = await $n.http({
-            url: REQUEST_URL + 'upload_cdn_callback',
+        const { status: statusCallback, data: resCallback } = await $n_http({
+            url: apiFileUrl + 'upload_cdn_callback',
             data: query,
             // 关闭错误提示
             warn: false,
@@ -140,7 +156,7 @@ export default async function ({ waitUploadFileLists, uploadFileLists, checkFile
     function checkQiniuCallback(res, fileItem) {
 
         // 如果文件被删除
-        if ($n.findIndex(uploadFileLists.value, { hash: fileItem.hash }) === -1) {
+        if ($n_findIndex(uploadFileLists.value, { hash: fileItem.hash }) === -1) {
             // 设置文件上传失败
             setFileFail(fileItem, '上传失败')
             return false
@@ -215,7 +231,7 @@ export default async function ({ waitUploadFileLists, uploadFileLists, checkFile
                 d: vduration,
             })
 
-            if ($n.has(rotates, vrotate)) {
+            if ($n_has(rotates, vrotate)) {
                 json.o = rotates[vrotate]
             }
 
@@ -263,9 +279,9 @@ export default async function ({ waitUploadFileLists, uploadFileLists, checkFile
                     // 【8】旋转 270 度(宽高反转)
                     'left-bottom': 8,
                 }
-                if (orientation && $n.isString(orientation)) {
-                    const key = $n.trim(orientation).toLowerCase()
-                    if ($n.has(orientations, key)) {
+                if (orientation && $n_isString(orientation)) {
+                    const key = $n_trim(orientation).toLowerCase()
+                    if ($n_has(orientations, key)) {
                         json.o = orientations[key]
                     }
                 }
@@ -305,7 +321,7 @@ export default async function ({ waitUploadFileLists, uploadFileLists, checkFile
         Object.assign(fileItem, query)
 
         return Object.assign({}, query, {
-            json: $n.isValidObject(json) ? JSON.stringify(json) : ''
+            json: $n_isValidObject(json) ? JSON.stringify(json) : ''
         })
     }
 }