@netang/quasar 0.0.56 → 0.0.58

package/utils/{power.js → $power.js}

@@ -35,12 +35,13 @@ import $n_http from '@netang/utils/http'
 import { statePower } from '../store'
 import { NRenderKey, NPowerKey, NFormKey, NTableKey } from './symbols'
 
-import $n_config from './config'
 import $n_getData from './getData'
 import $n_toast from './toast'
 import $n_confirm from './confirm'
 import $n_bus from './bus'
 
+import $n_config from './config'
+
 import { configs } from './config'
 
 const {
@@ -540,7 +541,7 @@ async function getData() {
     if (! statePower.value.v) {
 
         // 获取权限数据
-        const res = await $n_getData($n_config('powerName'))
+        const res = await $n_getData($n_config('apiDataPowerName'))
         if (res === false) {
             statePower.value = {
                 // 权限版本
@@ -1150,7 +1151,7 @@ function getPageData($route) {
 /**
  * 权限业务
  */
-const power = {
+const $power = {
     // 创建
     create,
     // 设置权限数据
@@ -1165,4 +1166,4 @@ const power = {
     request,
 }
 
-export default power
+export default $power

package/utils/{rule.js → $rule.js}

@@ -3,7 +3,7 @@ import $n_validate from '@netang/utils/validate'
 /**
  * 单个验证规则(用于表单验证)
  */
-export default function rule(rule) {
+export default function $rule(rule) {
     return function(value) {
         const res = $n_validate(value, 'data', rule, '', '该值')
         if (res) {

package/utils/{ruleValid.js → $ruleValid.js}

@@ -3,7 +3,7 @@ import $n_validate from '@netang/utils/validate'
 /**
  * 单个验证真假规则(用于表单验证)
  */
-export default function ruleValid (rule) {
+export default function $ruleValid (rule) {
     return function(value) {
         return ! $n_validate(value, 'data', rule, '', '该值')
     }

package/utils/{search.js → $search.js}

@@ -498,7 +498,7 @@ function formatValue(rawSearchOptions, searchValue) {
 /**
  * 搜素业务
  */
-const search = {
+const $search = {
     // 获取原始值
     getRawData,
     // 获取参数
@@ -507,4 +507,4 @@ const search = {
     formatValue,
 }
 
-export default search
+export default $search

package/utils/{table.js → $table.js}

@@ -28,8 +28,8 @@ import $n_toDate from '@netang/utils/toDate'
 import $n_slash from '@netang/utils/slash'
 import $n_http from '@netang/utils/http'
 
-import $n_search, { setItemValue } from './search'
-import $n_power from './power'
+import $n_$search, { setItemValue } from './$search'
+import $n_$power from './$power'
 import $n_dict from './dict'
 import $n_price from './price'
 
@@ -284,7 +284,7 @@ function create(params) {
         // 首次表格搜索值(如果表格搜索参数中带了初始值, 则设置初始值)
         firstTableSearchValue,
         // 表格搜索值(如果表格搜索参数中带了初始值, 则设置初始值)
-    } = $n_search.getRawData(tableColumns, Object.assign({}, $route.query), o.searchFromQuery)
+    } = $n_$search.getRawData(tableColumns, Object.assign({}, $route.query), o.searchFromQuery)
 
     // 表格搜索数据值
     const tableSearchValue = ref($route.fullPath ? firstTableSearchValue : [])
@@ -305,7 +305,7 @@ function create(params) {
         const lists = []
 
         // 先格式化权限按钮列表
-        $n_forEach($n_power.formatBtns($power.powerBtns.value), function(item) {
+        $n_forEach($n_$power.formatBtns($power.powerBtns.value), function(item) {
 
             // 如果是固定按钮
             if (item.fixed) {
@@ -671,7 +671,7 @@ function create(params) {
         })
 
         // 获取搜索值
-        const search = $n_search.formatValue(rawSearchOptions, tableSearchValue.value)
+        const search = $n_$search.formatValue(rawSearchOptions, tableSearchValue.value)
         if ($n_isValidArray(search)) {
             data.n_search = $n_has(data, 'n_search') ? $n_concat(data.n_search, search) : search
         }
@@ -871,14 +871,14 @@ function create(params) {
      * 设置表格搜索参数
      */
     async function setTableSearchOptions(format) {
-        tableSearchOptions.value = await $n_search.getOptions(rawSearchOptions, format)
+        tableSearchOptions.value = await $n_$search.getOptions(rawSearchOptions, format)
     }
 
     /**
      * 是否有表格搜索值
      */
     function hasTableSearchValue() {
-        return !! $n_search.formatValue(rawSearchOptions, tableSearchValue.value).length
+        return !! $n_$search.formatValue(rawSearchOptions, tableSearchValue.value).length
     }
 
     // 如果开启搜索
@@ -987,11 +987,11 @@ function config(routePath, path, defaultValue) {
 /**
  * 业务表格
  */
-const table = {
+const $table = {
     // 创建表格
     create,
     // 获取表格配置
     config,
 }
 
-export default table
+export default $table

package/utils/{tree.js → $tree.js}

@@ -697,9 +697,9 @@ function create(params) {
 /**
  * 树业务
  */
-const tree = {
+const $tree = {
     // 创建树实例
     create,
 }
 
-export default tree
+export default $tree

package/utils/config.js

@@ -1,12 +1,28 @@
 import $n_get from 'lodash/get'
 import $n_merge from 'lodash/merge'
 
+
+// 用户配置 参数
+// userConfig: {
+//     // api 请求公共数据地址
+//     apiDataUrl: '',
+//     // api 文件请求地址
+//     apiFileUrl: '',
+//     // api 请求权限标识
+//     apiDataPowerName: '',
+//     // 是否开启人民币分转元
+//     priceCentToYuan: false,
+//     // 上传器
+//     uploader: {
+//         upload: {
+//             type: '',
+//             domain: '',
+//         },
+//     },
+// },
+
 // 配置
 export const configs = {
-    // api 请求公共数据地址
-    apiDataUrl: '',
-    // api 文件请求地址
-    apiFileUrl: '',
     // 用户配置
     userConfig: {},
     // 用户字典
@@ -19,18 +35,6 @@ export const configs = {
     tablesConfig: {},
     // 对话框组件
     dialogComponents: {},
-    // 是否开启人民币分转元
-    priceCentToYuan: false,
-    // 上传器
-    uploader: {
-        upload: {},
-        limit: {
-            image: {
-                maxSize: 10,
-                exts: [ 'jpg', 'png', 'gif' ]
-            }
-        },
-    },
 }
 
 /**

package/utils/getData.js

@@ -5,12 +5,7 @@ import $n_map from 'lodash/map'
 
 import $n_http from '@netang/utils/http'
 
-import { configs } from './config'
-
-const {
-    // 请求公共数据地址
-    apiDataUrl,
-} = configs
+import $n_config from './config'
 
 /**
  * 获取公共数据
@@ -25,7 +20,7 @@ export default async function getData(url, pageStatus, emptyDescription, refValu
 
         const result = await $n_http($n_map(url, function (item) {
             return {
-                url: apiDataUrl + item,
+                url: $n_config('apiDataUrl') + item,
                 warn,
             }
         }))
@@ -51,7 +46,7 @@ export default async function getData(url, pageStatus, emptyDescription, refValu
     // 单个请求
     // --------------------------------------------------
     const { status, data } = await $n_http({
-        url: apiDataUrl + url,
+        url: $n_config('apiDataUrl') + url,
         warn,
     })
     if (! status) {

package/utils/getFile.js

@@ -2,7 +2,7 @@ import $n_isValidArray from '@netang/utils/isValidArray'
 import $n_isValidString from '@netang/utils/isValidString'
 import $n_slash from '@netang/utils/slash'
 
-import { configs } from './config'
+import $n_config from './config'
 
 /**
  * 获取文件
@@ -23,11 +23,15 @@ export default function getFile(src) {
                 return src
             }
 
-            const uploaderConfig = configs.uploader.upload
-            switch (uploaderConfig.type) {
+            const {
+                type,
+                domain,
+            } = $n_config('uploader.upload')
+
+            switch (type) {
                 // 七牛云
                 case 'qiniu':
-                    return $n_slash(uploaderConfig.domain, 'end', true) + src
+                    return $n_slash(domain, 'end', true) + src
             }
         }
     }

package/utils/getImage.js

@@ -86,8 +86,14 @@ export default function getImage(src, params) {
                 // --------------------------------------------------
             }
 
-            const uploaderConfig = $n_config('uploader.upload')
-            switch (uploaderConfig.type) {
+
+            const {
+                type,
+                domain,
+            } = $n_config('uploader.upload')
+
+            switch (type) {
+
                 // 七牛云
                 case 'qiniu':
 
@@ -138,7 +144,7 @@ export default function getImage(src, params) {
                         src += '/format/' + format
                     }
 
-                    return $n_slash(uploaderConfig.domain, 'end', true) + src
+                    return $n_slash(domain, 'end', true) + src
             }
         }
     }

package/utils/index.js

@@ -1,7 +1,15 @@
+import $auth from './$auth'
+import $form from './$form'
+import $power from './$power'
+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 auth from './auth'
 import bus from './bus'
 import config from './config'
 import confirm from './confirm'
@@ -9,30 +17,31 @@ import copy from './copy'
 import dialog from './dialog'
 import dict from './dict'
 import dictOptions from './dictOptions'
-import form from './form'
 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 power from './power'
 import previewImage from './previewImage'
 import price from './price'
-import rule from './rule'
-import ruleValid from './ruleValid'
-import search from './search'
-import table from './table'
 import timestamp from './timestamp'
 import toast from './toast'
-import tree from './tree'
 import uploader from './uploader'
 
 export default {
+    $auth,
+    $form,
+    $power,
+    $rule,
+    $ruleValid,
+    $search,
+    $table,
+    $tree,
+
     alert,
     area,
     arr,
-    auth,
     bus,
     config,
     confirm,
@@ -40,22 +49,15 @@ export default {
     dialog,
     dict,
     dictOptions,
-    form,
     getData,
     getFile,
     getImage,
     getTime,
     loading,
     notify,
-    power,
     previewImage,
     price,
-    rule,
-    ruleValid,
-    search,
-    table,
     timestamp,
     toast,
-    tree,
     uploader,
 }

package/utils/uploader/qiniu.js

@@ -8,13 +8,7 @@ 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 $n_config from '../config'
 
 import {
     UPLOAD_STATUS,
@@ -27,7 +21,7 @@ async function getQiniuToken(bucket = 'public') {
 
     // 请求数据
     const { status, data } = await $n_http({
-        url: apiFileUrl + 'get_qiniu_token',
+        url: $n_config('apiFileUrl') + 'get_qiniu_token',
         data: {
             bucket,
         },
@@ -133,7 +127,7 @@ export default async function ({ waitUploadFileLists, uploadFileLists, checkFile
 
         // 请求 - 上传文件至 cdn
         const { status: statusCallback, data: resCallback } = await $n_http({
-            url: apiFileUrl + 'upload_cdn_callback',
+            url: $n_config('apiFileUrl') + 'upload_cdn_callback',
             data: query,
             // 关闭错误提示
             warn: false,

package/utils/uploader.js

@@ -20,11 +20,12 @@ import $n_isValidValue from '@netang/utils/isValidValue'
 import $n_copy from '@netang/utils/copy'
 import $n_http from '@netang/utils/http'
 
-import $n_config from './config'
 import $n_toast from './toast'
 import $n_confirm from './confirm'
 import $n_alert from './alert'
 
+import $n_config from './config'
+
 import { configs } from './config'
 
 const {
@@ -106,7 +107,7 @@ function create(params) {
     const configLimit = Object.assign({
         maxSize: 100,
         exts: [],
-    }, $n_config('uploader.limit.' + props.type))
+    },  $n_config('uploader.limit.' + props.type))
 
     // 如果有单个文件的最大大小
     if (props.maxSize) {

package/utils/useRouter.js

@@ -1,3 +1,4 @@
+import $n_isNil from 'lodash/isNil'
 import $n_has from 'lodash/has'
 import $n_get from 'lodash/get'
 
@@ -6,20 +7,19 @@ import $n_slash from '@netang/utils/slash'
 
 import { configs } from './config'
 
-const {
-    // 自定义路由
-    routers,
-} = configs
-
 /**
  * 获取路由
  */
-export function getRouters(mainRouter, errorRouter) {
+export function getRouters(mainRouter, errorRouter, routers = null) {
 
     const routes = [
-        mainRouter
+        mainRouter,
     ]
 
+    if ($n_isNil(routers)) {
+        routers = $n_get(configs, 'routers')
+    }
+
     $n_forIn(routers, function(item, key) {
 
         // 如果没有 meta

package/_docs/docs/.vuepress/components/test.vue

@@ -1,23 +0,0 @@
-<template>
-    <q-badge color="blue">
-        #4D96F2
-    </q-badge>
-    <q-btn
-        label="test"
-        @click="onTest"
-    />
-</template>
-
-<script>
-import uniq from 'lodash/uniq'
-import test from 'utils/test'
-export default {
-    setup() {
-        return {
-            onTest() {
-                console.log(3333, test)
-            }
-        }
-    }
-}
-</script>

package/components/dialog-table/index.vue

@@ -1,94 +0,0 @@
-<template>
-    <slot
-        :click="onDialog"
-    />
-</template>
-
-<script>
-import $n_dialog from '../../utils/dialog'
-
-export default {
-
-    /**
-     * 标识
-     */
-    name: 'NDialogTable',
-
-    /**
-     * 声明属性
-     */
-    props: {
-        // 值
-        modelValue: [String, Number, Array, Object],
-        // 标题
-        title: String,
-        // 路由组件路径
-        route: String,
-        // 宽
-        width: {
-            type: [Number, String],
-            default: '80%',
-        },
-        // 组件传参
-        props: Object,
-        // 是否多选
-        multiple: Boolean,
-    },
-
-    /**
-     * 声明事件
-     */
-    emits: [
-        'update:modelValue',
-    ],
-
-    /**
-     * 组合式
-     */
-    setup(props) {
-
-        // ==========【方法】=============================================================================================
-
-        /**
-         * 弹出对话框
-         */
-        function onDialog() {
-
-            // 创建对话框
-            $n_dialog.create({
-                // 标题
-                title: props.title,
-                // 宽
-                width: props.width,
-                // width: 1000,
-                // 路由组件路径
-                route: props.route,
-                // 组件传参
-                props: Object.assign({
-                    multiple: props.multiple,
-                }, props.props),
-                // 对话框传参
-                dialogProps: {
-                    // 不能通过按 ESC 键关闭对话框
-                    noEscDismiss: true,
-                    // 不能通过在对话框外单击来关闭对话框
-                    noBackdropDismiss: true,
-                },
-                // 显示取消按钮
-                cancel: true,
-                // 点击确认执行
-                async onConfirm(data) {
-                     console.log('----data---', data)
-                },
-            })
-        }
-
-        // ==========【返回】=============================================================================================
-
-        return {
-            // 弹出对话框
-            onDialog,
-        }
-    }
-}
-</script>

package/package2.json

@@ -1,30 +0,0 @@
-{
-  "name": "@netang/quasar",
-  "version": "0.0.54",
-  "description": "netang-quasar",
-  "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1"
-  },
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/netangsoft/netang-quasar.git"
-  },
-  "keywords": [
-    "netang-quasar"
-  ],
-  "author": "Netang",
-  "license": "MIT",
-  "bugs": {
-    "url": "https://github.com/netangsoft/netang-quasar/issues"
-  },
-  "homepage": "https://github.com/netangsoft/netang-quasar#readme",
-  "devDependencies": {
-    "@netang/node-utils": "^0.2.61",
-    "@netang/utils": "^0.4.2",
-    "@netang/vue-utils": "^3.0.23",
-    "lodash": "^4.17.21",
-    "quasar": "^2.11.5",
-    "vue": "^3.2.47",
-    "vue-router": "^4.1.6"
-  }
-}