@netang/quasar 0.0.53 → 0.0.55

package/components/splitter/index.vue

@@ -26,6 +26,12 @@
 import { computed, ref, watch, inject } from 'vue'
 import { useQuasar } from 'quasar'
 
+import $n_router from '@netang/vue-utils/router'
+
+import $n_storage from '@netang/utils/storage'
+import $n_sleep from '@netang/utils/sleep'
+import $n_isValidObject from '@netang/utils/isValidObject'
+
 import { NPowerKey } from '../../utils/symbols'
 
 export default {
@@ -104,10 +110,10 @@ export default {
         if (props.cache) {
 
             // 设置缓存名
-            cacheName = `splitter:${props.cache === true ? ($power && $power.routePath ? $power.routePath : $n.router.getRoute('path')) : props.cache}:`
+            cacheName = `splitter:${props.cache === true ? ($power && $power.routePath ? $power.routePath : $n_router.getRoute('path')) : props.cache}:`
 
             // 从缓存获取初始值
-            let cache = $n.storage.get(cacheName + 'modelValue')
+            let cache = $n_storage.get(cacheName + 'modelValue')
             if (cache !== null) {
                 rawValue = cache
             }
@@ -119,7 +125,7 @@ export default {
 
             } else {
                 // 从缓存获取初始值
-                cache = $n.storage.get(cacheName + 'before')
+                cache = $n_storage.get(cacheName + 'before')
                 if (cache !== null) {
                     rawBefore = cache
                 }
@@ -132,7 +138,7 @@ export default {
 
             } else {
                 // 从缓存获取初始值
-                cache = $n.storage.get(cacheName + 'after')
+                cache = $n_storage.get(cacheName + 'after')
                 if (cache !== null) {
                     rawAfter = cache
                 }
@@ -155,7 +161,7 @@ export default {
         }
 
         // 创建睡眠实例
-        const sleep = $n.sleep()
+        const sleep = $n_sleep()
 
         // 当前值
         const currentValue = ref(rawValue)
@@ -184,7 +190,7 @@ export default {
 
             const keys = []
 
-            if ($n.isValidObject(slots)) {
+            if ($n_isValidObject(slots)) {
 
                 for (const key in slots) {
                     if (key === 'before') {
@@ -243,7 +249,7 @@ export default {
                 await sleep(500, key)
 
                 // 设置缓存(永久缓存)
-                $n.storage.set(cacheName + key, val, 0)
+                $n_storage.set(cacheName + key, val, 0)
             }
         }
 
@@ -352,8 +358,6 @@ export default {
 </script>
 
 <style lang="scss">
-@import "@/assets/sass/var.scss";
-
 .n-splitter {
 
     // 分离器激活背景色

package/components/table/index.vue

@@ -179,8 +179,22 @@
 <script>
 import { ref, watch, computed, inject } from 'vue'
 
+import $n_isFunction from 'lodash/isFunction'
+
+import $n_isValidObject from '@netang/utils/isValidObject'
+import $n_isValidValue from '@netang/utils/isValidValue'
+import $n_collection from '@netang/utils/collection'
+
 import { NDialogKey, NTableKey } from '../../utils/symbols'
 
+import NToolbar from '../toolbar'
+import NDrawer from '../drawer'
+import NThumbnail from '../thumbnail'
+import NTableColumnFixed from '../table-column-fixed'
+import NTableSummary from '../table-summary'
+import NTablePagination from '../table-pagination'
+import NSearch from '../search'
+
 export default {
 
     /**
@@ -188,6 +202,19 @@ export default {
      */
     name: 'NTable',
 
+    /**
+     * 组件
+     */
+    components: {
+        NToolbar,
+        NDrawer,
+        NThumbnail,
+        NTableColumnFixed,
+        NTableSummary,
+        NTablePagination,
+        NSearch,
+    },
+
     /**
      * 声明属性
      */
@@ -308,7 +335,7 @@ export default {
             let rightDrawer = false
 
             // 如果有插槽
-            if ($n.isValidObject(slots)) {
+            if ($n_isValidObject(slots)) {
                 for (const key in slots) {
                     if (key.startsWith('toolbar-')) {
                         toolbar.push(key.replace('toolbar-', ''))
@@ -336,13 +363,13 @@ export default {
         // ==========【监听数据】=========================================================================================
 
         // 如果有树节点点击方法
-        if ($n.isFunction(props.treeNodeClick)) {
+        if ($n_isFunction(props.treeNodeClick)) {
 
             /**
              * 树节点 all
              */
             const treeNodesAll = computed(function () {
-                return $n.collection(props.treeNodes)
+                return $n_collection(props.treeNodes)
                     .keyBy(props.treeNodeKey)
                     .toObject()
             })
@@ -356,7 +383,7 @@ export default {
             watch(treeSelected, function(nodeKey) {
 
                 // 如果节点值不是有效值
-                if (! $n.isValidValue(nodeKey)) {
+                if (! $n_isValidValue(nodeKey)) {
 
                     // 则无任何操作
                     return
@@ -365,7 +392,7 @@ export default {
                 // 树节点点击
                 const res = props.treeNodeClick(nodeKey, treeNodesAll.value[nodeKey])
 
-                if ($n.isValidObject(res)) {
+                if ($n_isValidObject(res)) {
 
                     // 设置表格传参
                     $table.setQuery(res)

package/components/table-pagination/index.vue

@@ -184,7 +184,6 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-@import "@/assets/sass/var.scss";
 
 // 紧凑模式
 .dense {

package/components/table-splitter/index.vue

@@ -81,6 +81,15 @@
 import { nextTick, ref, watch, computed, inject } from 'vue'
 import { useQuasar } from 'quasar'
 
+import $n_isFunction from 'lodash/isFunction'
+
+import $n_isValidObject from '@netang/utils/isValidObject'
+
+import NSplitter from '../splitter'
+import NTable from '../table'
+import NRender from '../render'
+import NEmpty from '../empty'
+
 import { NTableKey } from '../../utils/symbols'
 
 export default {
@@ -95,6 +104,16 @@ export default {
      */
     name: 'NTableSplitter',
 
+    /**
+     * 组件
+     */
+    components: {
+        NSplitter,
+        NTable,
+        NRender,
+        NEmpty,
+    },
+
     /**
      * 声明属性
      */
@@ -167,7 +186,7 @@ export default {
          * 插槽标识
          */
         const slotNames = computed(function() {
-            return $n.isValidObject(slots) ? Object.keys(slots).filter(e => e !== 'toolbar-right') : []
+            return $n_isValidObject(slots) ? Object.keys(slots).filter(e => e !== 'toolbar-right') : []
         })
 
         /**
@@ -185,10 +204,10 @@ export default {
             // 如果有已选数据
             if (
                 currentSelectedItem.value
-                && $n.isFunction(props.renderQuery)
+                && $n_isFunction(props.renderQuery)
             ) {
                 const resQuery = props.renderQuery(currentSelectedItem.value)
-                if ($n.isValidObject(resQuery)) {
+                if ($n_isValidObject(resQuery)) {
 
                     // 如果需要加载渲染页面标识参数
                     if (! props.noRendPageName) {

package/components/table-summary/index.vue

@@ -16,6 +16,13 @@
 <script>
 import { computed, inject } from 'vue'
 
+import $n_has from 'lodash/has'
+import $n_get from 'lodash/get'
+
+import $n_forEach from '@netang/utils/forEach'
+
+import $n_price from '../../utils/price'
+
 import { NTableKey } from '../../utils/symbols'
 
 export default {
@@ -63,7 +70,7 @@ export default {
                 })
             }
 
-            $n.forEach($n.get(props.props, 'cols'), function(item) {
+            $n_forEach($n_get(props.props, 'cols'), function(item) {
 
                 const {
                     // 标识
@@ -79,9 +86,9 @@ export default {
                 }
 
                 // 如果有统计字段
-                if ($n.has(props.data, name)) {
+                if ($n_has(props.data, name)) {
                     // 判断是否是价格
-                    res.value = $n.has(item, 'price') ? $n.price(props.data[name]) : props.data[name]
+                    res.value = $n_has(item, 'price') ? $n_price(props.data[name]) : props.data[name]
                 }
 
                 lists.push(res)

package/components/thumbnail/index.vue

@@ -1,9 +1,9 @@
 <template>
     <q-img
         :src="currentSrc"
-        :spinner-size="$n.px(size / 2)"
-        :width="$n.px(size)"
-        :height="$n.px(size)"
+        :spinner-size="toPx(size / 2)"
+        :width="toPx(size)"
+        :height="toPx(size)"
         fit="fill"
         v-if="currentSrc"
     >
@@ -11,7 +11,7 @@
         <div
             class="absolute-full transparent cursor-pointer"
             @click.prevent.stop="onPreview"
-            @dblclick.prevent.stop="$n.noop"
+            @dblclick.prevent.stop="onNoop"
             v-if="preview"
         ></div>
     </q-img>
@@ -21,6 +21,11 @@
 import { computed } from 'vue'
 import { useQuasar } from 'quasar'
 
+import $n_px from '@netang/utils/px'
+import $n_noop from '@netang/utils/noop'
+
+import $n_previewImage from '../../utils/previewImage'
+import $n_getImage from '../../utils/getImage'
 
 export default {
 
@@ -60,7 +65,7 @@ export default {
          * 当前图片地址
          */
         const currentSrc = computed(function () {
-            const res = $n.getImage(props.src, { w: $q.platform.is.mobile ? props.size * 2 : props.size })
+            const res = $n_getImage(props.src, { w: $q.platform.is.mobile ? props.size * 2 : props.size })
             if (res) {
                 return res
             }
@@ -73,7 +78,7 @@ export default {
          */
         function onPreview() {
             // 预览图片
-            $n.previewImage(props.src)
+            $n_previewImage(props.src)
         }
 
         return {
@@ -81,6 +86,11 @@ export default {
             currentSrc,
             // 预览
             onPreview,
+
+            // 转像素
+            toPx: $n_px,
+            // 点击空方法
+            onNoop: $n_noop,
         }
     }
 }

package/components/toolbar/index.vue

@@ -123,8 +123,6 @@ export default {
 </script>
 
 <style lang="scss">
-@import "@/assets/sass/var.scss";
-
 .n-toolbar {
     &__body {
         .q-btn {

package/components/uploader/index.vue

@@ -21,7 +21,10 @@
 
 <script>
 import { onMounted, ref, provide, inject } from 'vue'
-import { NPowerKey, NUploaderKey, NLayoutKey } from '../../utils/symbols'
+
+import $n_uploader from '../../utils/uploader'
+
+import { NPowerKey, NUploaderKey } from '../../utils/symbols'
 
 export default {
 
@@ -90,7 +93,7 @@ export default {
         const uploadFileLists = ref([])
 
         // 创建上传器
-        const uploader = $n.uploader.create({
+        const uploader = $n_uploader.create({
             type: props.type,
             // 声明属性
             props,

package/components/uploader-query/index.vue

@@ -44,8 +44,8 @@
                     <div
                         class="n-uploader-query__button--square cursor-pointer"
                         :style="{
-                            width: $n.px(currentSize),
-                            height: $n.px(currentSize),
+                            width: toPx(currentSize),
+                            height: toPx(currentSize),
                         }"
                         @click="uploader.chooseUpload"
                         v-show="showSquareButton"
@@ -53,7 +53,7 @@
                     >
                         <q-icon
                             name="add"
-                            :size="$n.px(currentSize / 2)"
+                            :size="toPx(currentSize / 2)"
                         />
                         <div class="n-uploader-query__button--square__text" v-if="buttonText">{{buttonText}}</div>
                     </div>
@@ -76,9 +76,9 @@
                 >
                     <q-img
                         :src="getImage(fileItem)"
-                        :spinner-size="$n.px(currentSize / 2)"
-                        :width="$n.px(currentSize)"
-                        :height="$n.px(currentSize)"
+                        :spinner-size="toPx(currentSize / 2)"
+                        :width="toPx(currentSize)"
+                        :height="toPx(currentSize)"
                         fit="fill"
                     >
                         <!-- 内容 -->
@@ -99,7 +99,7 @@
                             <q-circular-progress
                                 indeterminate
                                 rounded
-                                :size="$n.px(currentSize / 1.5)"
+                                :size="toPx(currentSize / 1.5)"
                                 :thickness="0.14"
                                 color="white"
                                 v-if="fileItem.status < UPLOAD_STATUS.uploading"
@@ -108,7 +108,7 @@
                             <!-- 上传中 -->
                             <q-circular-progress
                                 :value="fileItem.progress"
-                                :size="$n.px(currentSize / 1.5)"
+                                :size="toPx(currentSize / 1.5)"
                                 :thickness="0.14"
                                 color="white"
                                 track-color="grey-5"
@@ -118,7 +118,7 @@
                                 <q-icon
                                     class="cursor-pointer"
                                     name="pause"
-                                    :size="$n.px(currentSize / 3)"
+                                    :size="toPx(currentSize / 3)"
                                     @click="uploader.deleteFileItem(fileItem)"
                                 />
                             </q-circular-progress>
@@ -163,16 +163,16 @@
                     <div
                         class="n-uploader-query__button--square cursor-pointer"
                         :style="{
-                        width: $n.px(currentSize),
-                        height: $n.px(currentSize),
-                    }"
+                            width: toPx(currentSize),
+                            height: toPx(currentSize),
+                        }"
                         @click="uploader.chooseUpload"
                         v-show="showSquareButton"
                         v-else-if="! noButton && currentButtonType === 'square'"
                     >
                         <q-icon
                             name="add"
-                            :size="$n.px(currentSize / 2)"
+                            :size="toPx(currentSize / 2)"
                         />
                         <div class="n-uploader-query__button--square__text" v-if="buttonText">{{buttonText}}</div>
                     </div>
@@ -191,7 +191,7 @@
                         ghost: fileItemIndex === fromIndex,
                     }"
                     :style="{
-                        height: $n.px(currentSize),
+                        height: toPx(currentSize),
                     }"
                     :draggable="currentDrag"
                     @mousedown.self="mousedown($event, fileItemIndex)"
@@ -204,8 +204,8 @@
                     <div
                         class="n-uploader-query__item__icon"
                         :style="{
-                            width: $n.px(currentSize),
-                            height: $n.px(currentSize),
+                            width: toPx(currentSize),
+                            height: toPx(currentSize),
                         }"
                     >
                         <!-- 上传中前 -->
@@ -213,7 +213,7 @@
                             class="n-uploader-query__item__icon__icon"
                             indeterminate
                             rounded
-                            :size="$n.px(currentSize / 1.8)"
+                            :size="toPx(currentSize / 1.8)"
                             :thickness="0.18"
                             v-if="fileItem.status < UPLOAD_STATUS.uploading"
                         />
@@ -222,7 +222,7 @@
                         <q-circular-progress
                             class="n-uploader-query__item__icon__icon"
                             :value="fileItem.progress"
-                            :size="$n.px(currentSize / 1.8)"
+                            :size="toPx(currentSize / 1.8)"
                             :thickness="0.18"
                             show-value
                             v-else-if="fileItem.status === UPLOAD_STATUS.uploading"
@@ -230,7 +230,7 @@
                             <q-icon
                                 class="cursor-pointer"
                                 name="pause"
-                                :size="$n.px(currentSize / 3)"
+                                :size="toPx(currentSize / 3)"
                                 @click="uploader.deleteFileItem(fileItem)"
                             />
                         </q-circular-progress>
@@ -239,7 +239,7 @@
                         <q-icon
                             class="n-uploader-query__item__icon__icon"
                             name="description"
-                            :size="$n.px(currentSize / 1.5)"
+                            :size="toPx(currentSize / 1.5)"
                             v-else-if="type === 'file'"
                         />
 
@@ -248,7 +248,7 @@
                             class="n-uploader-query__item__icon__icon cursor-pointer"
                             name="play_circle"
                             title="播放"
-                            :size="$n.px(currentSize / 1.5)"
+                            :size="toPx(currentSize / 1.5)"
                             @click="uploader.play(fileItem)"
                             v-else
                         />
@@ -331,11 +331,23 @@
 import { onMounted, computed, inject } from 'vue'
 import { useQuasar } from 'quasar'
 
+import $n_has from 'lodash/has'
+import $n_get from 'lodash/get'
+
+import $n_px from '@netang/utils/px'
+import $n_isValidArray from '@netang/utils/isValidArray'
+import $n_isValidString from '@netang/utils/isValidString'
+
+import $n_getImage from '../../utils/getImage'
+
+import NDragger from '../dragger'
+
+import { NUploaderKey } from '../../utils/symbols'
+
 import {
     // 上传状态
     UPLOAD_STATUS,
 } from '../../utils/useUploader'
-import { NUploaderKey } from '../../utils/symbols'
 
 export default {
 
@@ -344,6 +356,13 @@ export default {
      */
     name: 'NUploaderQuery',
 
+    /**
+     * 组件
+     */
+    components: {
+        NDragger,
+    },
+
     /**
      * 声明属性
      */
@@ -412,7 +431,7 @@ export default {
          */
         const currentDrag = computed(function() {
             return props.drag
-                && $n.isValidArray(query.value)
+                && $n_isValidArray(query.value)
                 && query.value.length > 1
         })
 
@@ -454,11 +473,11 @@ export default {
          * 获取图片地址
          */
         function getImage(fileItem) {
-            return $n.has(fileItem, '__img') ?
+            return $n_has(fileItem, '__img') ?
                 fileItem.__img
                 : (
-                    $n.isValidString(fileItem.hash) ?
-                        $n.getImage(fileItem.hash, { w: $q.platform.is.mobile ? currentSize.value * 2 : currentSize.value })
+                    $n_isValidString(fileItem.hash) ?
+                        $n_getImage(fileItem.hash, { w: $q.platform.is.mobile ? currentSize.value * 2 : currentSize.value })
                         : ''
                 )
         }
@@ -467,7 +486,7 @@ export default {
          * 获取文件名称
          */
         function getFileName(fileItem) {
-            return fileItem.title + ($n.get(fileItem, 'ext') ? '.' + fileItem.ext : '')
+            return fileItem.title + ($n_get(fileItem, 'ext') ? '.' + fileItem.ext : '')
         }
 
         // ==========【生命周期】=========================================================================================
@@ -507,6 +526,8 @@ export default {
             getImage,
             // 获取文件名称
             getFileName,
+
+            toPx: $n_px,
         }
     },
 }

package/components/value-format/index.vue

@@ -7,6 +7,13 @@
 
 <script>
 import { ref, watch } from 'vue'
+import $n_isFunction from 'lodash/isFunction'
+import $n_uniq from 'lodash/uniq'
+
+import $n_isValidArray from '@netang/utils/isValidArray'
+import $n_split from '@netang/utils/split'
+import $n_isValidValue from '@netang/utils/isValidValue'
+import $n_trimString from '@netang/utils/trimString'
 
 export default {
 
@@ -100,7 +107,7 @@ export default {
          * 格式化声明值
          */
         function formatModelValue(value) {
-            return $n.isFunction(props.before)
+            return $n_isFunction(props.before)
                 // 如果有修改前值方法
                 ? props.before({ value, formatArray, formatString })
                 // 返回值
@@ -128,7 +135,7 @@ export default {
             const value = current.value.value
 
             // 获取新值
-            const newValue = $n.isFunction(props.after) ?
+            const newValue = $n_isFunction(props.after) ?
                 // 如果有修改提交值方法
                 props.after({ value, formatArray, formatString })
                 // 否则返回当前值
@@ -160,24 +167,24 @@ export default {
                 toString: false,
             }, params)
 
-            val = $n.isValidArray(val) ? val : []
+            val = $n_isValidArray(val) ? val : []
 
             // 如果数组有值
             if (val.length) {
 
                 // 是否给每个值去除首位空格
                 if (o.trim) {
-                    val = val.map(e => $n.trimString(e))
+                    val = val.map(e => $n_trimString(e))
                 }
 
                 // 是否验证每个值是否为有效字符串/数字
                 if (o.isValidValue) {
-                    val = val.filter(val => $n.isValidValue(val))
+                    val = val.filter(val => $n_isValidValue(val))
                 }
 
                 // 去重
                 if (o.unique) {
-                    val = $n.uniq(val)
+                    val = $n_uniq(val)
                 }
             }
 
@@ -213,15 +220,15 @@ export default {
             // 是否去除首尾空格
             if (o.trim) {
                 // 去除首尾空格
-                val = $n.trimString(val)
+                val = $n_trimString(val)
 
             // 否则转字符串
             } else {
-                val = $n.isValidValue(val) ? String(val) : ''
+                val = $n_isValidValue(val) ? String(val) : ''
             }
 
             // 如果有分割符
-            if ($n.isValidValue(o.separator, true)) {
+            if ($n_isValidValue(o.separator, true)) {
 
                 // 是否替换
                 if (o.replace) {
@@ -229,16 +236,16 @@ export default {
                 }
 
                 // 分隔成数组
-                val = $n.split(val, o.separator)
+                val = $n_split(val, o.separator)
 
                 // 如果去重
                 if (o.unique) {
-                    val = $n.uniq(val)
+                    val = $n_uniq(val)
                 }
 
                 // 如果验证每个值是否为有效字符串/数字
                 if (o.isValidValue) {
-                    val = val.filter(val => $n.isValidValue(val))
+                    val = val.filter(val => $n_isValidValue(val))
                 }
 
                 // 如果转数组