@netang/quasar 0.1.65 → 0.1.66

package/components/field-table/index.vue

@@ -183,6 +183,7 @@ import $n_isFunction from 'lodash/isFunction'
 import $n_findIndex from 'lodash/findIndex'
 import $n_get from 'lodash/get'
 
+import $n_indexOf from '@netang/utils/indexOf'
 import $n_forEach from '@netang/utils/forEach'
 import $n_isValidArray from '@netang/utils/isValidArray'
 import $n_join from '@netang/utils/join'
@@ -406,14 +407,14 @@ export default {
             // 刷新后清空已选数据
             refreshResetSelected: false,
             // 自定义请求方法
-            async request({ httpOptions }) {
+            async request({ httpOptions, props }) {
                 return $n_isFunction(props.request) ?
                     // 如果有自定义请求方法
                     await $n_runAsync(props.request)({
                         // http 请求参数
                         httpOptions,
                         // 对话框是否已显示
-                        showDialog: showDialog.value,
+                        showDialog: $n_get(props, 'showDialog') === 1 ? true : showDialog.value,
                     }) :
                     // 否则请求数据
                     await $n_http(httpOptions)
@@ -996,7 +997,6 @@ export default {
          */
         let _dialogShowed = false
         function onDialogShow() {
-
             if ($n_isFunction(props.request)) {
 
                 if (_dialogShowed) {
@@ -1037,10 +1037,20 @@ export default {
                 isReload = false
             }
 
-            // 如果有表格搜索值
-            if ($table.hasTableSearchValue()) {
+            // 获取表格搜索值
+            let searchValue = $table.getTableSearchValue()
+            if (searchValue.length) {
+
+                // 如果有隐藏搜索字段数组
+                if ($n_isValidArray(props.hideSearchKeys)) {
+                    // 从搜索值数组中去除隐藏搜索字段的数组
+                    searchValue = searchValue.filter(e => $n_indexOf(e.field, props.hideSearchKeys) === -1)
+                }
+
                 // 表格搜索重置
-                $table.tableSearchReset(isReload)
+                $table.tableSearchReset(isReload && searchValue.length, {
+                    showDialog: 1,
+                })
             }
         }
 

package/package.json

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

package/utils/$table.js

@@ -733,7 +733,7 @@ function create(options) {
     /**
      * 表格重新加载
      */
-    async function tableReload() {
+    async function tableReload(params = null) {
 
         // 表格已加载
         _isTableLoaded = true
@@ -751,9 +751,10 @@ function create(options) {
         // $tableRef?.requestServerInteraction({
         //     pagination: o.pagination,
         // })
-        await tableRequest({
+
+        await tableRequest(Object.assign({
             pagination: o.pagination,
-        })
+        }, params))
 
         // 清空表格已选数据
         if (o.refreshResetSelected) {
@@ -790,7 +791,7 @@ function create(options) {
     /**
      * 表格搜索重置
      */
-    function tableSearchReset(reload = true) {
+    function tableSearchReset(reload = true, params = null) {
 
         const newValue = []
 
@@ -809,7 +810,8 @@ function create(options) {
 
         // 表格重新加载
         if (reload) {
-            tableReload().finally()
+            tableReload(params)
+                .finally()
         }
     }
 
@@ -1059,12 +1061,19 @@ function create(options) {
     }
 
     /**
-     * 是否有表格搜索值
+     * 获取表格搜索值
      */
-    function hasTableSearchValue() {
-        return !! formatValue(rawSearchOptions, tableSearchValue.value).length
+    function getTableSearchValue() {
+        return formatValue(rawSearchOptions, tableSearchValue.value)
     }
 
+    /**
+     * 是否有表格搜索值
+     */
+    // function hasTableSearchValue() {
+    //     return !! formatValue(rawSearchOptions, tableSearchValue.value).length
+    // }
+
     // ==========【返回】=================================================================================================
 
     const resTable = {
@@ -1136,8 +1145,10 @@ function create(options) {
         // 设置表格搜索参数
         setTableSearchOptions,
 
+        // 获取表格搜索值
+        getTableSearchValue,
         // 是否有表格搜索值
-        hasTableSearchValue,
+        // hasTableSearchValue,
 
         // 获取当前路由
         getRoute() {