@netang/quasar 0.1.13 → 0.1.15

package/components/table-summary/index.vue

@@ -1,110 +1,107 @@
-<template>
-    <q-tr class="q-table__bottom">
-        <q-td
-            v-for="(item, index) in columns"
-            :class="item.css"
-        >
-            <!-- 合计标题 -->
-            <span v-if="index === 0">合计</span>
-
-            <!-- 合计数据 -->
-            <span v-else-if="item.value">{{item.value}}</span>
-        </q-td>
-    </q-tr>
-</template>
-
-<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 {
-
-    /**
-     * 标识
-     */
-    name: 'NTableSummary',
-
-    /**
-     * 声明属性
-     */
-    props: {
-        // 传值
-        props: Object,
-        // 选择类型, 可选值 single multiple none
-        selection: String,
-        // 表格合计数据
-        data: Object,
-    },
-
-    /**
-     * 组合式
-     */
-    setup(props) {
-
-        // ==========【数据】============================================================================================
-
-        // 获取表格注入
-        const {
-            // 表格选择类型
-            tableSelection,
-        } = inject(NTableKey)
-
-        // ==========【计算属性】============================================================================================
-
-        const columns = computed(function () {
-
-            const lists = []
-
-            if (tableSelection.value !== 'none') {
-                lists.push({
-                    css: 'q-table--col-auto-width text-center',
-                    name: '',
-                })
-            }
-
-            $n_forEach($n_get(props.props, 'cols'), function(item) {
-
-                const {
-                    // 标识
-                    name,
-                    // 对齐方式
-                    align,
-                } = item
-
-                const res = {
-                    css: `text-${align}`,
-                    name,
-                    value: '',
-                }
-
-                // 如果有统计字段
-                if ($n_has(props.data, name)) {
-                    // 判断是否是价格
-                    res.value = $n_has(item, 'price') ? $n_price(props.data[name]) : props.data[name]
-                }
-
-                lists.push(res)
-            })
-
-            return lists
-        })
-
-        // ==========【返回】=============================================================================================
-
-        return {
-            // 栏目
-            columns,
-            // 表格选择类型
-            tableSelection,
-        }
-    },
-}
-</script>
+<template>
+    <q-tr class="q-table__bottom">
+        <q-td
+            v-for="(item, index) in columns"
+            :class="item.css"
+        >
+            <!-- 合计标题 -->
+            <span v-if="index === 0">合计</span>
+
+            <!-- 合计数据 -->
+            <span v-else-if="item.value">{{item.value}}</span>
+        </q-td>
+    </q-tr>
+</template>
+
+<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 {
+
+    /**
+     * 标识
+     */
+    name: 'NTableSummary',
+
+    /**
+     * 声明属性
+     */
+    props: {
+        // 传值
+        props: Object,
+    },
+
+    /**
+     * 组合式
+     */
+    setup(props) {
+
+        // ==========【数据】============================================================================================
+
+        // 获取表格注入
+        const {
+            // 表格选择类型
+            tableSelection,
+            tableSummary,
+        } = inject(NTableKey)
+
+        // ==========【计算属性】============================================================================================
+
+        const columns = computed(function () {
+
+            const lists = []
+
+            if (tableSelection.value !== 'none') {
+                lists.push({
+                    css: 'q-table--col-auto-width text-center',
+                    name: '',
+                })
+            }
+
+            $n_forEach($n_get(props.props, 'cols'), function(item) {
+
+                const {
+                    // 标识
+                    name,
+                    // 对齐方式
+                    align,
+                } = item
+
+                const res = {
+                    css: `text-${align}`,
+                    name,
+                    value: '',
+                }
+
+                // 如果有统计字段
+                if ($n_has(tableSummary.value, name)) {
+                    // 判断是否是价格
+                    res.value = $n_has(item, 'price') ? $n_price(tableSummary.value[name]) : tableSummary.value[name]
+                }
+
+                lists.push(res)
+            })
+
+            return lists
+        })
+
+        // ==========【返回】=============================================================================================
+
+        return {
+            // 栏目
+            columns,
+            // 表格选择类型
+            tableSelection,
+        }
+    },
+}
+</script>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@netang/quasar",
-  "version": "0.1.13",
+  "version": "0.1.15",
   "description": "netang-quasar",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"

package/utils/$table.js

@@ -679,8 +679,11 @@ function create(options) {
             }
         })
 
+        console.log('tableSearchValue.value', tableSearchValue.value)
+
         // 获取搜索值
         const search = formatValue(rawSearchOptions, tableSearchValue.value)
+        console.log('search', search)
         if ($n_isValidArray(search)) {
             data.n_search = $n_has(data, 'n_search') ? $n_concat(data.n_search, search) : search
         }

package/utils/useSearch.js

@@ -1,4 +1,5 @@
 import $n_has from 'lodash/has'
+import $n_isArray from 'lodash/isArray'
 import $n_cloneDeep from 'lodash/cloneDeep'
 import $n_merge from 'lodash/merge'
 import $n_isFunction from 'lodash/isFunction'
@@ -18,6 +19,7 @@ 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 $n_replaceAll from '@netang/utils/replaceAll'
 
 import { date as quasarDate } from 'quasar'
 import { getQuickRange, quickRange } from '../components/field-date/methods'
@@ -399,17 +401,21 @@ export function formatValue(rawSearchOptions, searchValue) {
         function addValue1(value1) {
 
             // 如果有值1
-            if ($n_isValidValue(value1.value)) {
+            if ($n_isRequired(value1.value)) {
 
                 // 如果值1 类型为 in / not in
                 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) {
+
+                    const values = $n_isArray(value1.value) ? value1.value : $n_split($n_replaceAll($n_trimString(value1.value), '，', ','), ',')
+                    $n_forEach(values, function (item) {
                         item = $n_numberDeep(item)
                         if ($n_isValidValue(item)) {
                             vals.push(item)
                         }
                     })
+
                     if (vals.length) {
                         lists.push({
                             field: name,