@netang/quasar 0.0.52 → 0.0.54

package/components/private/edit-power-data/index.vue

@@ -212,7 +212,7 @@
                     </div>
 
                     <!-- 请求成功参数 -->
-                    <!--<div class="col-xs-12 col-sm-6 col-md-3" v-if="$n.indexOf(['closePush', 'closePushRefresh'], formData.requestSuccess.type) > -1">-->
+                    <!--<div class="col-xs-12 col-sm-6 col-md-3" v-if="$n_indexOf(['closePush', 'closePushRefresh'], formData.requestSuccess.type) > -1">-->
 
                     <!--    &lt;!&ndash; 树 &ndash;&gt;-->
                     <!--    <n-field-tree-->
@@ -259,10 +259,10 @@
 
                                 <q-item-section side>
                                     <div class="text-grey-8 q-gutter-xs">
-                                        <q-btn icon="add" size="12px" flat dense round @click="$n.arr.add(formData.requestQuery.list, itemIndex, '')" />
-                                        <q-btn icon="remove" size="12px" flat dense round @click="$n.arr.delete(formData.requestQuery.list, itemIndex)" :disable="itemIndex === 0" />
-                                        <q-btn icon="expand_less" size="12px" flat dense round @click="$n.arr.up(formData.requestQuery.list, itemIndex)" :disable="itemIndex === 0" />
-                                        <q-btn icon="expand_more" size="12px" flat dense round @click="$n.arr.down(formData.requestQuery.list, itemIndex)" :disable="formData.requestQuery.list.length <= itemIndex + 1" />
+                                        <q-btn icon="add" size="12px" flat dense round @click="arr.add(formData.requestQuery.list, itemIndex, '')" />
+                                        <q-btn icon="remove" size="12px" flat dense round @click="arr.delete(formData.requestQuery.list, itemIndex)" :disable="itemIndex === 0" />
+                                        <q-btn icon="expand_less" size="12px" flat dense round @click="arr.up(formData.requestQuery.list, itemIndex)" :disable="itemIndex === 0" />
+                                        <q-btn icon="expand_more" size="12px" flat dense round @click="arr.down(formData.requestQuery.list, itemIndex)" :disable="formData.requestQuery.list.length <= itemIndex + 1" />
                                     </div>
                                 </q-item-section>
                             </q-item>
@@ -293,10 +293,10 @@
 
                             <q-item-section side>
                                 <div class="text-grey-8 q-gutter-xs">
-                                    <q-btn icon="add" size="12px" flat dense round @click="$n.arr.add(formData.requestQuery.query, itemIndex, '')" />
-                                    <q-btn icon="remove" size="12px" flat dense round @click="$n.arr.delete(formData.requestQuery.query, itemIndex)" :disable="itemIndex === 0" />
-                                    <q-btn icon="expand_less" size="12px" flat dense round @click="$n.arr.up(formData.requestQuery.query, itemIndex)" :disable="itemIndex === 0" />
-                                    <q-btn icon="expand_more" size="12px" flat dense round @click="$n.arr.down(formData.requestQuery.query, itemIndex)" :disable="formData.requestQuery.query.length <= itemIndex + 1" />
+                                    <q-btn icon="add" size="12px" flat dense round @click="arr.add(formData.requestQuery.query, itemIndex, '')" />
+                                    <q-btn icon="remove" size="12px" flat dense round @click="arr.delete(formData.requestQuery.query, itemIndex)" :disable="itemIndex === 0" />
+                                    <q-btn icon="expand_less" size="12px" flat dense round @click="arr.up(formData.requestQuery.query, itemIndex)" :disable="itemIndex === 0" />
+                                    <q-btn icon="expand_more" size="12px" flat dense round @click="arr.down(formData.requestQuery.query, itemIndex)" :disable="formData.requestQuery.query.length <= itemIndex + 1" />
                                 </div>
                             </q-item-section>
                         </q-item>
@@ -328,6 +328,35 @@
 <script>
 import { ref, watch } from 'vue'
 
+import NColumnTitle from '../../column-title'
+import NFieldTree from '../../field-tree'
+
+import $n_has from 'lodash/has'
+import $n_isPlainObject from 'lodash/isPlainObject'
+
+import $n_forEach from '@netang/utils/forEach'
+import $n_isValidArray from '@netang/utils/isValidArray'
+import $n_indexOf from '@netang/utils/indexOf'
+
+import $n_isRequired from '@netang/utils/isRequired'
+import $n_forIn from '@netang/utils/forIn'
+import $n_isValidObject from '@netang/utils/isValidObject'
+import $n_isValidValue from '@netang/utils/isValidValue'
+import $n_trimString from '@netang/utils/trimString'
+import $n_isJson from '@netang/utils/isJson'
+import $n_json from '@netang/utils/json'
+import $n_isValidString from '@netang/utils/isValidString'
+
+import $n_arr from '../../../utils/arr'
+import $n_toast from '../../../utils/toast'
+
+import { configs } from '../../../utils/config'
+
+const {
+    // 字典常量
+    dicts,
+} = configs
+
 export default {
 
     /**
@@ -346,6 +375,14 @@ export default {
         treeExpanded: Array,
     },
 
+    /**
+     * 组件
+     */
+    components: {
+        NColumnTitle,
+        NFieldTree,
+    },
+
     /**
      * 组合式
      */
@@ -397,9 +434,9 @@ export default {
 
             let obj = {}
 
-            if ($n.isJson(props.modelValue)) {
-                const data = $n.json.parse(props.modelValue)
-                if ($n.isValidObject(data)) {
+            if ($n_isJson(props.modelValue)) {
+                const data = $n_json.parse(props.modelValue)
+                if ($n_isValidObject(data)) {
                     obj = data
                 }
             }
@@ -447,7 +484,7 @@ export default {
             const rawKeys = Object.keys(rawObj)
 
             // 删除数据中的无效键值
-            $n.forIn(obj, function (item, key) {
+            $n_forIn(obj, function (item, key) {
                 // 如果键值不在原始键值中
                 if (rawKeys.indexOf(key) === -1) {
                     // 则删除
@@ -456,12 +493,12 @@ export default {
             })
 
             // 判断 requestSuccess 值是否合法
-            if ($n.has(obj, 'requestSuccess') && ! $n.isValidObject(obj.requestSuccess)) {
+            if ($n_has(obj, 'requestSuccess') && ! $n_isValidObject(obj.requestSuccess)) {
                 delete(obj.requestSuccess)
             }
 
             // 判断 requestQuery 值是否合法
-            if ($n.has(obj, 'requestQuery') && ! $n.isValidObject(obj.requestQuery)) {
+            if ($n_has(obj, 'requestQuery') && ! $n_isValidObject(obj.requestQuery)) {
                 delete(obj.requestQuery)
             }
 
@@ -471,7 +508,7 @@ export default {
             obj = Object.assign(rawObj, obj)
 
             // 列表选择类型默认值为 single
-            if (! $n.isValidString(obj.selection)) {
+            if (! $n_isValidString(obj.selection)) {
                 obj.selection = 'single'
             }
 
@@ -483,12 +520,12 @@ export default {
             obj.confirmContent = ''
             if (obj.confirmPassword) {
                 confirm = 2
-                if ($n.isValidString(obj.confirmPassword)) {
+                if ($n_isValidString(obj.confirmPassword)) {
                     obj.confirmContent = obj.confirmPassword
                 }
             } else if (obj.confirm) {
                 confirm = 1
-                if ($n.isValidString(obj.confirm)) {
+                if ($n_isValidString(obj.confirm)) {
                     obj.confirmContent = obj.confirm
                 }
             }
@@ -497,36 +534,36 @@ export default {
 
             // 【格式化请求参数中的 list】
             // ------------------------------------------------------------
-            if ($n.isValidString(obj.requestQuery.list)) {
+            if ($n_isValidString(obj.requestQuery.list)) {
                 obj.requestQuery.list = [obj.requestQuery.list]
-            } else if (! $n.isValidArray(obj.requestQuery.list)) {
+            } else if (! $n_isValidArray(obj.requestQuery.list)) {
                 obj.requestQuery.list = ['']
             }
 
             // 【格式化请求参数中的 query】
             // ------------------------------------------------------------
-            if ($n.has(obj.requestQuery, 'query')) {
+            if ($n_has(obj.requestQuery, 'query')) {
 
                 // 如果是有效值
-                if ($n.isValidValue(obj.requestQuery.query)) {
+                if ($n_isValidValue(obj.requestQuery.query)) {
                     obj.requestQuery.query = [obj.requestQuery.query]
 
                 // 如果是有效对象
-                } else if ($n.isValidObject(obj.requestQuery.query)) {
-                    obj.requestQuery.query = [$n.json.stringify(obj.requestQuery.query)]
+                } else if ($n_isValidObject(obj.requestQuery.query)) {
+                    obj.requestQuery.query = [$n_json.stringify(obj.requestQuery.query)]
 
                 // 如果是有效数组
-                } else if ($n.isValidArray(obj.requestQuery.query)) {
+                } else if ($n_isValidArray(obj.requestQuery.query)) {
                     const query = []
-                    $n.forEach(obj.requestQuery.query, function(item, key) {
+                    $n_forEach(obj.requestQuery.query, function(item) {
 
                         // 如果是有效值
-                        if ($n.isValidValue(item)) {
+                        if ($n_isValidValue(item)) {
                             query.push(item)
 
                         // 如果是对象
-                        } else if ($n.isValidObject(item)) {
-                            query.push($n.json.stringify(item))
+                        } else if ($n_isValidObject(item)) {
+                            query.push($n_json.stringify(item))
                         }
                     })
                     obj.requestQuery.query = query.length ? query : ['']
@@ -543,15 +580,15 @@ export default {
 
             // 【格式化其他参数】
             // ------------------------------------------------------------
-            if (! $n.has(obj, 'params')) {
+            if (! $n_has(obj, 'params')) {
                 obj.params = ''
 
             // 如果不是字符串
-            } else if (! $n.isValidString(obj.params)) {
-                if ($n.isValidObject(obj.params)) {
-                    obj.params = $n.json.stringify(obj.params)
-                } else if ($n.isValidArray(obj.params)) {
-                    obj.params = $n.json.stringify(obj.params)
+            } else if (! $n_isValidString(obj.params)) {
+                if ($n_isValidObject(obj.params)) {
+                    obj.params = $n_json.stringify(obj.params)
+                } else if ($n_isValidArray(obj.params)) {
+                    obj.params = $n_json.stringify(obj.params)
                 } else {
                     obj.params = ''
                 }
@@ -580,20 +617,20 @@ export default {
                     // 请求表格参数
                     const lists = []
 
-                    $n.forEach(data.requestQuery[field], function(value) {
+                    $n_forEach(data.requestQuery[field], function(value) {
 
                         value = formatParams(value)
 
                         // 如果有值
-                        if ($n.isRequired(value)) {
+                        if ($n_isRequired(value)) {
 
                             // 如果为表格
                             if (field === 'list') {
 
-                                if (Array.isArray(value) || $n.isPlainObject(value)) {
+                                if (Array.isArray(value) || $n_isPlainObject(value)) {
 
                                     // 轻提示
-                                    $n.toast({
+                                    $n_toast({
                                         message: '请求列表参数格式不能是数组或对象',
                                     })
                                     return false
@@ -602,7 +639,7 @@ export default {
                             // 否则为参数
                             } else if (Array.isArray(value)) {
                                 // 轻提示
-                                $n.toast({
+                                $n_toast({
                                     message: '请求传参参数格式不能是数组',
                                 })
                                 return false
@@ -614,7 +651,7 @@ export default {
                     })
 
                     if (lists.length) {
-                        if (! $n.has(obj, 'requestQuery')) {
+                        if (! $n_has(obj, 'requestQuery')) {
                             obj.requestQuery = {}
                         }
                         obj.requestQuery[field] = lists.length === 1 ? lists[0] : lists
@@ -625,14 +662,14 @@ export default {
 
                 // 格式化其他参数
                 function formatParams(value) {
-                    value = $n.trimString(value)
+                    value = $n_trimString(value)
                     if (
                         (value.startsWith('[') || value.startsWith('{'))
-                        && $n.isJson(value)
+                        && $n_isJson(value)
                     ) {
-                        value = $n.json.parse(value)
+                        value = $n_json.parse(value)
 
-                        if (! Array.isArray(value) && ! $n.isPlainObject(value)) {
+                        if (! Array.isArray(value) && ! $n_isPlainObject(value)) {
                             return ''
                         }
                     }
@@ -644,7 +681,7 @@ export default {
                 if (props.dataType === dicts.POWER_DATA_TYPE__LIST) {
 
                     // 列表选择类型
-                    if ($n.indexOf(['none', 'multiple'], data.selection) > -1) {
+                    if ($n_indexOf(['none', 'multiple'], data.selection) > -1) {
                         obj.selection = data.selection
                     }
 
@@ -688,7 +725,7 @@ export default {
                             // 如果没有选择跳转页面
                             if (! data.toPage) {
                                 // 轻提示
-                                $n.toast({
+                                $n_toast({
                                     message: '请选择跳转页面',
                                 })
                                 return false
@@ -711,11 +748,11 @@ export default {
 
                             // 如果是(1:提交前确认)
                             if (data.confirm === 1) {
-                                obj.confirm = $n.isValidString(data.confirmContent) ? data.confirmContent : true
+                                obj.confirm = $n_isValidString(data.confirmContent) ? data.confirmContent : true
 
                                 // 否则是(2:提交前确认登录密码)
                             } else {
-                                obj.confirmPassword = $n.isValidString(data.confirmContent) ? data.confirmContent : true
+                                obj.confirmPassword = $n_isValidString(data.confirmContent) ? data.confirmContent : true
                             }
                         }
 
@@ -724,7 +761,7 @@ export default {
                             obj.requestSuccess = {
                                 type: data.requestSuccess.type
                             }
-                            // if ($n.indexOf(['closePush', 'closePushRefresh'], data.requestSuccess.type) > -1) {
+                            // if ($n_indexOf(['closePush', 'closePushRefresh'], data.requestSuccess.type) > -1) {
                             //     if (data.requestSuccess.params) {
                             //         obj.requestSuccess.params = data.requestSuccess.params
                             //     } else {
@@ -737,13 +774,13 @@ export default {
 
                 // 自定义参数
                 const params = formatParams(data.params)
-                if ($n.isRequired(params)) {
+                if ($n_isRequired(params)) {
                     obj.params = params
                 }
             }
 
             // 转为 json
-            return $n.isValidObject(obj) ? $n.json.stringify(obj) : ''
+            return $n_isValidObject(obj) ? $n_json.stringify(obj) : ''
         }
 
         // ==========【返回】=============================================================================================
@@ -754,6 +791,9 @@ export default {
 
             // 获取格式化后的表单数据
             getValue,
+
+            dicts,
+            arr: $n_arr,
         }
     }
 }

package/components/private/table-visible-columns-button/index.vue

@@ -42,7 +42,7 @@
                         <q-icon
                             size="xs"
                             name="check"
-                            v-show="$n.indexOf(tableVisibleColumns, item.name) > -1"
+                            v-show="indexOf(tableVisibleColumns, item.name) > -1"
                         />
                     </q-item-section>
                 </q-item>
@@ -54,6 +54,8 @@
 <script>
 import { inject } from 'vue'
 
+import $n_indexOf from '@netang/utils/indexOf'
+
 import { NTableKey } from '../../../utils/symbols'
 
 export default {
@@ -79,7 +81,7 @@ export default {
          * 表格可见列点击
          */
         function onTableVisible(item) {
-            const index = $n.indexOf(tableVisibleColumns.value, item.name)
+            const index = $n_indexOf(tableVisibleColumns.value, item.name)
             if (index > -1) {
                 tableVisibleColumns.value.splice(index, 1)
             } else {
@@ -99,6 +101,8 @@ export default {
 
             // 表格可见列点击
             onTableVisible,
+
+            indexOf: $n_indexOf,
         }
     },
 }

package/components/render/index.vue

@@ -22,11 +22,25 @@
 
 <script>
 import { computed, defineAsyncComponent, provide } from 'vue'
+import $n_router from '@netang/vue-utils/router'
+
+import $n_has from 'lodash/has'
+import $n_get from 'lodash/get'
+import $n_isFunction from 'lodash/isFunction'
+
+import $n_isValidObject from '@netang/utils/isValidObject'
+import $n_isValidString from '@netang/utils/isValidString'
+import $n_slash from '@netang/utils/slash'
 
-import routers from '@/router/routers'
 import components from '../private/components'
 
 import { NRenderKey } from '../../utils/symbols'
+import { configs } from '../../utils/config'
+
+const {
+    // 自定义路由
+    routers,
+} = configs
 
 export default {
 
@@ -67,10 +81,10 @@ export default {
             // 如果是路由路径
             if (props.path) {
                 // 获取路由组件
-                comp = $n.get(routers, `${$n.slash(props.path, 'start', false)}.component`)
+                comp = $n_get(routers, `${$n_slash(props.path, 'start', false)}.component`)
 
             // 如果有组件标识
-            } else if (props.name && $n.has(components, props.name)) {
+            } else if (props.name && $n_has(components, props.name)) {
                 // 获取自定义组件
                 comp = components[props.name]
             }
@@ -81,7 +95,7 @@ export default {
             }
 
             // 如果是方法, 则说明是异步组件
-            if ($n.isFunction(comp)) {
+            if ($n_isFunction(comp)) {
                 return defineAsyncComponent(comp)
             }
 
@@ -96,16 +110,16 @@ export default {
             // 组件标识
             name: props.name,
             // 参数
-            query: $n.isValidObject(props.query) ? props.query : {},
+            query: $n_isValidObject(props.query) ? props.query : {},
             // 组件传参
             props: props.props,
         }
 
         // 如果有路由路径
-        if ($n.isValidString(props.path)) {
+        if ($n_isValidString(props.path)) {
 
             // 获取页面路由
-            const $route = $n.router.resolve({
+            const $route = $n_router.resolve({
                 path: props.path,
                 query: data.query,
             })

package/components/search/index.vue

@@ -1,5 +1,5 @@
 <template>
-    <div class="flex column absolute-full" v-if="$n.isValidArray(options)">
+    <div class="flex column absolute-full" v-if="isValidArray(options)">
         <q-scroll-area class="n-flex-1">
 
             <div class="n-search q-pa-sm q-pt-sm q-gutter-sm">
@@ -163,12 +163,38 @@
 </template>
 
 <script>
+import NSearchItem from '../search-item'
+import NFieldDate from '../field-date'
+import NInputNumber from '../input-number'
+import NFieldTree from '../field-tree'
+import NFieldTable from '../field-table'
+
+import $n_isValidArray from '@netang/utils/isValidArray'
+
+import { configs } from '../../utils/config'
+
+const {
+    priceCentToYuan,
+} = configs
+
 export default {
 
     /**
      * 标识
      */
     name: 'NSearch',
+
+    /**
+     * 组件
+     */
+    components: {
+        NSearchItem,
+        NFieldDate,
+        NInputNumber,
+        NFieldTree,
+        NFieldTable,
+    },
+
     /**
      * 声明属性
      */
@@ -189,7 +215,9 @@ export default {
     setup() {
         return {
             // 如果金额为分
-            centToYuan: $n.config('priceCent') === true,
+            centToYuan: priceCentToYuan,
+
+            isValidArray: $n_isValidArray,
         }
     }
 }

package/components/search-item/index.vue

@@ -31,7 +31,7 @@
             <slot
                 :label="data.label"
                 :index="0"
-                :multiple="$n.indexOf([dicts.SEARCH_COMPARE_TYPE__IN, dicts.SEARCH_COMPARE_TYPE__NOT_IN], modelValue[0].compare) > -1"
+                :multiple="indexOf([dicts.SEARCH_COMPARE_TYPE__IN, dicts.SEARCH_COMPARE_TYPE__NOT_IN], modelValue[0].compare) > -1"
                 v-else
             />
         </div>
@@ -39,7 +39,7 @@
         <!-- 比较2(类型为 > / >=) -->
         <div
             class="n-field-group row"
-            v-if="data.compareOptions2.length && $n.indexOf([dicts.SEARCH_TYPE__GT, dicts.SEARCH_TYPE__GTE], modelValue[0].compare) > -1"
+            v-if="data.compareOptions2.length && indexOf([dicts.SEARCH_TYPE__GT, dicts.SEARCH_TYPE__GTE], modelValue[0].compare) > -1"
         >
             <!-- 比较类型2 -->
             <q-select
@@ -66,6 +66,18 @@
 <script>
 import { watch } from 'vue'
 
+import $n_cloneDeep from 'lodash/cloneDeep'
+
+import $n_split from '@netang/utils/split'
+import $n_indexOf from '@netang/utils/indexOf'
+
+import { configs } from '../../utils/config'
+
+const {
+    // 字典常量
+    dicts,
+} = configs
+
 export default {
 
     /**
@@ -102,11 +114,11 @@ export default {
          */
         watch(()=>props.modelValue[0].compare, function(val) {
             // 如果类型不为 in / not in, 为单选
-            if ($n.indexOf([dicts.SEARCH_COMPARE_TYPE__IN, dicts.SEARCH_COMPARE_TYPE__NOT_IN], val) === -1) {
-                const arr = $n.split(props.modelValue[0].value, ',')
+            if ($n_indexOf([dicts.SEARCH_COMPARE_TYPE__IN, dicts.SEARCH_COMPARE_TYPE__NOT_IN], val) === -1) {
+                const arr = $n_split(props.modelValue[0].value, ',')
                 if (arr.length !== 1) {
                     // 克隆值
-                    const _modelValue = $n.cloneDeep(props.modelValue)
+                    const _modelValue = $n_cloneDeep(props.modelValue)
 
                     // 更新值
                     _modelValue[0].value = arr.length > 1 ? arr[0] : ''
@@ -114,14 +126,18 @@ export default {
                 }
             }
         })
+
+        // ==========【返回】=============================================================================================
+
+        return {
+            dicts,
+            indexOf: $n_indexOf,
+        }
     },
 }
 </script>
 
-
 <style lang="scss">
-@import "@/assets/sass/var.scss";
-
 .n-search__item {
     .n-field-group {
         > .q-field--outlined {

package/components/select/index.vue

@@ -36,6 +36,9 @@
 <script>
 import { ref, computed, watch } from 'vue'
 
+import $n_isValidObject from '@netang/utils/isValidObject'
+import $n_collection from '@netang/utils/collection'
+
 export default {
 
     /**
@@ -84,7 +87,7 @@ export default {
          * 插槽标识
          */
         const slotNames = computed(function() {
-            return $n.isValidObject(slots) ? Object.keys(slots) : []
+            return $n_isValidObject(slots) ? Object.keys(slots) : []
         })
 
         // ==========【当前值】===========================================================================================
@@ -130,7 +133,7 @@ export default {
                         // 选项还原为初始值
                         rawOptions
                         // 否则筛选选项
-                        : $n.collection(rawOptions)
+                        : $n_collection(rawOptions)
                             .where(props.optionLabel, 'like', value)
                             .toArray()
             })