@netang/quasar 0.0.53 → 0.0.55

package/utils/previewImage.js

@@ -1,8 +1,10 @@
+import $n_toast from './toast'
+
 /**
  * 预览图片
  */
-$n.previewImage = function(src) {
-    $n.toast({
+export default function previewImage(src) {
+    $n_toast({
         message: '预览图片还没做'
     })
 }

package/utils/price.js

@@ -1,13 +1,22 @@
+import $n_decimal from '@netang/utils/decimal'
+
+import { configs } from './config'
+
+const {
+    // 是否开启人民币分转元
+    priceCentToYuan,
+} = configs
+
 /**
  * 换算金额
  */
-$n.price = function(value, params) {
-    return $n.decimal(value, Object.assign({
+export default function price(value, params) {
+    return $n_decimal(value, Object.assign({
         // 最小值
         min: 0,
         // 小数点位数
         decimalLength: 2,
         // 是否开启人民币分转元(如值 189 -> 1.89)
-        centToYuan: $n.config('priceCent') === true,
+        centToYuan: priceCentToYuan === true,
     }, params))
 }

package/utils/rule.js

@@ -1,17 +1,13 @@
+import { validate as $n_validate } from '@netang/utils/validator'
+
 /**
- * 验证规则(用于表单验证)
+ * 单个验证规则(用于表单验证)
  */
-$n.rule = function (rule) {
+export default function rule(rule) {
     return function(value) {
-        const res = $n.validate(value, 'data', rule, '', '该值')
+        const res = $n_validate(value, 'data', rule, '', '该值')
         if (res) {
             return res
         }
     }
 }
-
-$n.ruleValid = function (rule) {
-    return function(value) {
-        return ! $n.validate(value, 'data', rule, '', '该值')
-    }
-}

package/utils/ruleValid.js

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

package/utils/search.js

@@ -1,6 +1,35 @@
+import $n_has from 'lodash/has'
+import $n_cloneDeep from 'lodash/cloneDeep'
+import $n_merge from 'lodash/merge'
+import $n_isFunction from 'lodash/isFunction'
+import $n_findIndex from 'lodash/findIndex'
+
+import $n_forEach from '@netang/utils/forEach'
+import $n_isValidArray from '@netang/utils/isValidArray'
+import $n_join from '@netang/utils/join'
+import $n_split from '@netang/utils/split'
+import $n_indexOf from '@netang/utils/indexOf'
+
+import $n_isRequired from '@netang/utils/isRequired'
+import $n_forIn from '@netang/utils/forIn'
+import $n_runAsync from '@netang/utils/runAsync'
+import $n_isValidObject from '@netang/utils/isValidObject'
+import $n_isValidValue from '@netang/utils/isValidValue'
+import $n_trimString from '@netang/utils/trimString'
+import $n_numberDeep from '@netang/utils/numberDeep'
+import $n_toDate from '@netang/utils/toDate'
+
 import { date as quasarDate } from 'quasar'
 import { getQuickRange, quickRange } from '../components/field-date/methods'
 
+import $n_dictOptions from './dictOptions'
+import { configs } from './config'
+
+const {
+    // 字典常量
+    dicts,
+} = configs
+
 /**
  * 比较类型默认值
  */
@@ -40,7 +69,7 @@ function setItemCompare(item) {
     // 如果类型为日期
     if (item.type === 'date') {
         // 添加日期快捷选项
-        $n.forEach(quickRange, function(label, key) {
+        $n_forEach(quickRange, function(label, key) {
             opts1.push({ label, value: key + 20 })
         })
 
@@ -54,8 +83,8 @@ function setItemCompare(item) {
 
     // 如果有比较类型
     if (
-        $n.has(item, 'compare')
-        && $n.isValidArray(item.compare)
+        $n_has(item, 'compare')
+        && $n_isValidArray(item.compare)
     ) {
         const {
             compare,
@@ -84,11 +113,11 @@ function setItemCompare(item) {
     item.compareOptions2 = []
 
     // 如果比较类型有 >
-    if ($n.findIndex(opts1, { value: dicts.SEARCH_COMPARE_TYPE__GT }) > -1) {
+    if ($n_findIndex(opts1, { value: dicts.SEARCH_COMPARE_TYPE__GT }) > -1) {
         item.compareOptions2.push({ label: '<', value: dicts.SEARCH_COMPARE_TYPE__LT })
 
     // 如果比较类型有 >=
-    } else if ($n.findIndex(opts1, { value: dicts.SEARCH_COMPARE_TYPE__GTE }) > -1) {
+    } else if ($n_findIndex(opts1, { value: dicts.SEARCH_COMPARE_TYPE__GTE }) > -1) {
         item.compareOptions2.push({ label: '≤', value: dicts.SEARCH_COMPARE_TYPE__LTE })
     }
 }
@@ -103,10 +132,10 @@ export function setItemValue(value, val) {
         // 比较类型为 in
         value[0].compare = dicts.SEARCH_COMPARE_TYPE__IN
         // 设置值为将数组转为逗号分隔的字符串
-        value[0].value = $n.join(val, ',')
+        value[0].value = $n_join(val, ',')
 
     // 如果值是逗号隔开
-    } else if ($n.split(val, ',').length > 1) {
+    } else if ($n_split(val, ',').length > 1) {
         // 比较类型为 in
         value[0].compare = dicts.SEARCH_COMPARE_TYPE__IN
         // 设置值为将数组转为逗号分隔的字符串
@@ -130,15 +159,15 @@ function formatItemValueCompare(value, { compareOptions1 }) {
     const value1 = value[0]
 
     // 如果值1 的比较条件不在值1 的限制范围内
-    if ($n.findIndex(compareOptions1, { value: value1.compare }) === -1) {
+    if ($n_findIndex(compareOptions1, { value: value1.compare }) === -1) {
         // 则取比较条件中的第一个
         value1.compare = compareOptions1[0].value
     }
 
     // 如果比较类型不为 in / not in
-    if ($n.indexOf([ dicts.SEARCH_COMPARE_TYPE__IN, dicts.SEARCH_COMPARE_TYPE__NOT_IN ], value1.compare) === -1) {
+    if ($n_indexOf([ dicts.SEARCH_COMPARE_TYPE__IN, dicts.SEARCH_COMPARE_TYPE__NOT_IN ], value1.compare) === -1) {
         // 如果值中含有逗号
-        const arr = $n.split(value1.value, ',')
+        const arr = $n_split(value1.value, ',')
         if (arr.length > 1) {
             value1.value = arr[0]
         }
@@ -173,23 +202,23 @@ function getRawData(tableColumns, query, searchFromQuery = true) {
     // 搜索参数键值数组
     const searchQueryKey = []
 
-    $n.forEach(tableColumns, function (item) {
-        if ($n.has(item, 'search.type')) {
+    $n_forEach(tableColumns, function (item) {
+        if ($n_has(item, 'search.type')) {
 
             // 【设置原始表格搜索参数】
             // --------------------------------------------------
 
             // 搜索参数
-            const newItem = $n.merge({
+            const newItem = $n_merge({
                 // 标签
                 label: item.label,
             }, item.search)
 
             // 标识
-            newItem.name = $n.has(newItem, 'name') ? newItem.name : item.name
+            newItem.name = $n_has(newItem, 'name') ? newItem.name : item.name
 
             // 如果有字典标识
-            if ($n.has(item, 'dict')) {
+            if ($n_has(item, 'dict')) {
                 newItem.dict = item.dict
             }
 
@@ -226,16 +255,16 @@ function getRawData(tableColumns, query, searchFromQuery = true) {
             }
 
             // 添加原始表格搜索值
-            rawTableSearchValue.push($n.cloneDeep(value))
+            rawTableSearchValue.push($n_cloneDeep(value))
 
             if (
                 // 如果开启从参数中获取搜索值
                 searchFromQuery
                 // 如果在传参中有搜索参数
-                && $n.has(query, newItem.name)
+                && $n_has(query, newItem.name)
             ) {
                 // 如果有值
-                if ($n.isRequired(query[newItem.name])) {
+                if ($n_isRequired(query[newItem.name])) {
                     // 设置单个搜索值
                     setItemValue(value, query[newItem.name])
                 }
@@ -245,10 +274,10 @@ function getRawData(tableColumns, query, searchFromQuery = true) {
 
             // 否则, 如果表格参数中有设置初始值
             } else if (
-                $n.has(newItem, 'value')
-                && $n.isValidArray(newItem.value)
+                $n_has(newItem, 'value')
+                && $n_isValidArray(newItem.value)
             ) {
-                value = $n.merge([], value, newItem.value)
+                value = $n_merge([], value, newItem.value)
             }
 
             // 格式化单个值的比较条件
@@ -260,7 +289,7 @@ function getRawData(tableColumns, query, searchFromQuery = true) {
     })
 
     if (searchQueryKey.length) {
-        $n.forIn(query, function(val, key) {
+        $n_forIn(query, function(val, key) {
             if (searchQueryKey.indexOf(key) === -1) {
                 rawQuery[key] = val
             }
@@ -288,43 +317,43 @@ async function getOptions(rawSearchOptions, format) {
 
     const lists = []
 
-    if ($n.isValidArray(rawSearchOptions)) {
+    if ($n_isValidArray(rawSearchOptions)) {
         for (const item of rawSearchOptions) {
 
             const newItem = Object.assign({}, item)
 
             // 格式化单个参数
-            if ($n.isFunction(format)) {
-                const res = await $n.runAsync(format)(newItem)
-                if ($n.isValidObject(res)) {
-                    $n.merge(newItem, res)
+            if ($n_isFunction(format)) {
+                const res = await $n_runAsync(format)(newItem)
+                if ($n_isValidObject(res)) {
+                    $n_merge(newItem, res)
                 }
             }
 
             // 如果有字典标识, 则一定是下拉菜单
-            if ($n.has(newItem, 'dict')) {
-                $n.merge(newItem, {
+            if ($n_has(newItem, 'dict')) {
+                $n_merge(newItem, {
                     searchType: 'select',
                     select: {
-                        options: $n.dictOptions(newItem.dict)
+                        options: $n_dictOptions(newItem.dict)
                     },
                 })
 
             // 如果有下拉菜单选项
-            } else if ($n.has(newItem, 'select')) {
+            } else if ($n_has(newItem, 'select')) {
                 newItem.searchType = 'select'
                 newItem.select = Object.assign({
                     options: [],
                 }, newItem.select)
 
                 // 如果下拉选项是方法
-                if ($n.isFunction(newItem.select.options)) {
+                if ($n_isFunction(newItem.select.options)) {
                     // 读取下拉选项
-                    newItem.select.options = await $n.runAsync(newItem.select.options)()
+                    newItem.select.options = await $n_runAsync(newItem.select.options)()
                 }
 
             // 如果有树选项(调用的是 <n-field-tree> 组件)
-            } else if ($n.has(newItem, 'tree')) {
+            } else if ($n_has(newItem, 'tree')) {
                 newItem.searchType = 'tree'
                 newItem.tree = Object.assign({
                     nodes: [],
@@ -333,13 +362,13 @@ async function getOptions(rawSearchOptions, format) {
                 }, newItem.tree)
 
                 // 如果节点数组是方法
-                if ($n.isFunction(newItem.tree.nodes)) {
+                if ($n_isFunction(newItem.tree.nodes)) {
                     // 读取下拉选项
-                    newItem.tree.nodes = await $n.runAsync(newItem.tree.nodes)()
+                    newItem.tree.nodes = await $n_runAsync(newItem.tree.nodes)()
                 }
 
             // 如果有表格选项(调用的是 <n-field-table.md> 组件)
-            } else if ($n.has(newItem, 'table')) {
+            } else if ($n_has(newItem, 'table')) {
                 newItem.searchType = 'table'
                 newItem.table = Object.assign({
                     // 值字段(必填)
@@ -370,20 +399,20 @@ function formatValue(rawSearchOptions, searchValue) {
 
     const lists = []
 
-    $n.forEach(rawSearchOptions, function ({ name, type }, itemIndex) {
+    $n_forEach(rawSearchOptions, function ({ name, type }, itemIndex) {
 
         // 添加值1
         function addValue1(value1) {
 
             // 如果有值1
-            if ($n.isValidValue(value1.value)) {
+            if ($n_isValidValue(value1.value)) {
 
                 // 如果值1 类型为 in / not in
-                if ($n.indexOf([dicts.SEARCH_COMPARE_TYPE__IN, dicts.SEARCH_COMPARE_TYPE__NOT_IN], value1.compare) > -1) {
+                if ($n_indexOf([dicts.SEARCH_COMPARE_TYPE__IN, dicts.SEARCH_COMPARE_TYPE__NOT_IN], value1.compare) > -1) {
                     const vals = []
-                    $n.forEach($n.split($n.trimString(value1.value).replaceAll('，', ','), ','), function (item) {
-                        item = $n.numberDeep(item)
-                        if ($n.isValidValue(item)) {
+                    $n_forEach($n_split($n_trimString(value1.value).replaceAll('，', ','), ','), function (item) {
+                        item = $n_numberDeep(item)
+                        if ($n_isValidValue(item)) {
                             vals.push(item)
                         }
                     })
@@ -401,7 +430,7 @@ function formatValue(rawSearchOptions, searchValue) {
                 lists.push({
                     field: name,
                     compare: value1.compare,
-                    value: $n.numberDeep(value1.value),
+                    value: $n_numberDeep(value1.value),
                 })
             }
         }
@@ -432,14 +461,14 @@ function formatValue(rawSearchOptions, searchValue) {
                             field: name,
                             // ≥
                             compare: dicts.SEARCH_COMPARE_TYPE__GTE,
-                            value: $n.numberDeep(quasarDate.formatDate($n.toDate(`${res.date.from} ${res.time.from}`), 'X')),
+                            value: $n_numberDeep(quasarDate.formatDate($n_toDate(`${res.date.from} ${res.time.from}`), 'X')),
                         },
                         // 日期止
                         {
                             field: name,
                             // ≤
                             compare: dicts.SEARCH_COMPARE_TYPE__LTE,
-                            value: $n.numberDeep(quasarDate.formatDate($n.toDate(`${res.date.to} ${res.time.to}`), 'X')),
+                            value: $n_numberDeep(quasarDate.formatDate($n_toDate(`${res.date.to} ${res.time.to}`), 'X')),
                         }
                     )
                 }
@@ -450,13 +479,13 @@ function formatValue(rawSearchOptions, searchValue) {
             addValue1(value1)
 
             // 只有值1 类型为 > / ≥ 值2才有效
-            if ($n.indexOf([dicts.SEARCH_COMPARE_TYPE__GT, dicts.SEARCH_COMPARE_TYPE__GTE], value1.compare) > -1) {
+            if ($n_indexOf([dicts.SEARCH_COMPARE_TYPE__GT, dicts.SEARCH_COMPARE_TYPE__GTE], value1.compare) > -1) {
                 const value2 = searchValue[itemIndex][1]
-                if ($n.isValidValue(value2.value)) {
+                if ($n_isValidValue(value2.value)) {
                     lists.push({
                         field: name,
                         compare: value2.compare,
-                        value: $n.numberDeep(value2.value),
+                        value: $n_numberDeep(value2.value),
                     })
                 }
             }
@@ -469,7 +498,7 @@ function formatValue(rawSearchOptions, searchValue) {
 /**
  * 搜素业务
  */
-$n.search = {
+const search = {
     // 获取原始值
     getRawData,
     // 获取参数
@@ -477,3 +506,5 @@ $n.search = {
     // 格式化值
     formatValue,
 }
+
+export default search