perf: search校验失败后，refresh保持原来的formData

fast-crud · Jun 7, 2023 · 632a0df · 632a0df
1 parent 1931489
commit 632a0df
Show file tree

Hide file tree

Showing 6 changed files with 48 additions and 4 deletions.
diff --git a/docs/zh/api/crud-options/search.md b/docs/zh/api/crud-options/search.md
@@ -121,5 +121,25 @@ const crudOptions = {
 }
 ```
 
+## validate
+* 说明：是否启用表单验证
+* 类型：Boolean
+* 默认：`false`
+
+
+## onValidateError
+* 说明：监听校验错误事件
+* 类型：async Function(context)
+* 默认值： `()=>{ui.notification.error({message:'查询表单校验失败'})}` 弹出查询表单校验失败通知
+```js
+const crudOptions = {
+    search:{
+        onValidateError(context:any){
+            console.log('validate  error',context.error)
+        }
+    }
+}
+```
+
 ## 更多参数
 * 说明：更多参数见：[FsSearch](/api/components/crud/search/index.md)组件文档
diff --git a/packages/fast-crud/src/components/fs-crud.vue b/packages/fast-crud/src/components/fs-crud.vue
@@ -111,13 +111,13 @@
 <script lang="ts">
 import { computed, defineComponent, nextTick, onMounted, provide, ref, SetupContext, toRef } from "vue";
 import _ from "lodash-es";
-import traceUtil from "../utils/util.trace";
 import { uiContext } from "../ui";
 import { useMerge } from "../use/use-merge";
 import utilLog from "../utils/util.log";
 import { SetSearchFormDataProps } from "../d";
 import { useUi } from "../use";
 import { utils } from "../utils";
+
 const { merge } = useMerge();
 
 function useProviders(props: any, ctx: SetupContext) {
@@ -164,6 +164,13 @@ function useSearch(props: any, ctx: SetupContext) {
     return searchFormData.value;
   };
 
+  const getSearchValidatedFormData = () => {
+    if (searchRef.value) {
+      searchFormData.value = searchRef.value.getValidatedForm();
+    }
+    return searchFormData.value;
+  };
+
   /**
    * 设置form值
    * @param form form对象
@@ -191,7 +198,8 @@ function useSearch(props: any, ctx: SetupContext) {
     onSearchReset,
     getSearchRef,
     getSearchFormData,
-    setSearchFormData
+    setSearchFormData,
+    getSearchValidatedFormData
   };
 }
 

diff --git a/packages/fast-crud/src/components/search/index.vue b/packages/fast-crud/src/components/search/index.vue
@@ -512,6 +512,7 @@ export default defineComponent({
       getComponentRenderRef,
       getComponentRef,
       getForm,
+      getValidatedForm,
       setForm,
       searchFormRef,
       onInput,

diff --git a/packages/fast-crud/src/d/expose.ts b/packages/fast-crud/src/d/expose.ts
@@ -103,9 +103,12 @@ export type CrudExpose = {
   getSearchRef: () => any;
   /**
    * 获取查询表单数据
-   * @param context
    */
   getSearchFormData: () => any;
+  /**
+   * 获取查询表单校验成功的数据
+   */
+  getSearchValidatedFormData: () => any;
   /**
    * 重新设置查询表单数据
    */

diff --git a/packages/fast-crud/src/use/default-crud-options.ts b/packages/fast-crud/src/use/default-crud-options.ts
@@ -24,6 +24,9 @@ export default {
           // n-form 是否显示校验反馈
           showFeedback: false
         },
+        onValidateError() {
+          ui.notification.error({ message: t("fs.search.error.message") });
+        },
         collapse: true,
         show: true,
         buttons: {

diff --git a/packages/fast-crud/src/use/use-expose.ts b/packages/fast-crud/src/use/use-expose.ts
@@ -278,6 +278,15 @@ export function useExpose(props: UseExposeProps): UseExposeRet {
       }
       return {};
     },
+    getSearchValidatedFormData() {
+      if (!crudRef.value) {
+        return {};
+      }
+      if (crudRef.value.getSearchValidatedFormData) {
+        return crudRef.value.getSearchValidatedFormData();
+      }
+      return {};
+    },
     /**
      * {form,mergeForm}
      */
@@ -312,7 +321,7 @@ export function useExpose(props: UseExposeProps): UseExposeRet {
         };
       }
 
-      const searchFormData = _.cloneDeep(crudExpose.getSearchFormData());
+      const searchFormData = _.cloneDeep(crudExpose.getSearchValidatedFormData());
       //配置searchValueResolve
       if (crudBinding.value?.search?.columns) {
         crudExpose.doValueResolve({ form: searchFormData }, toRaw(crudBinding.value.search.columns));