cosey 0.10.24 → 0.10.25

package/components/table/table.vue.js

@@ -1,4 +1,4 @@
-import { defineComponent, useSlots, unref, computed, ref, useTemplateRef, mergeProps, watch, onMounted, onBeforeUnmount, resolveComponent, resolveDirective, createBlock, openBlock, Teleport, withDirectives, createElementBlock, normalizeStyle, normalizeClass, createCommentVNode, createElementVNode, createVNode, renderSlot, withCtx, createSlots, Fragment, renderList, vShow, normalizeProps, guardReactiveProps } from 'vue';
+import { defineComponent, useSlots, unref, computed, ref, useTemplateRef, mergeProps, watch, onMounted, onBeforeUnmount, resolveComponent, resolveDirective, createBlock, openBlock, Teleport, withDirectives, createElementBlock, normalizeStyle, normalizeClass, createCommentVNode, createElementVNode, createVNode, renderSlot, withCtx, createSlots, Fragment, renderList, vShow, normalizeProps, guardReactiveProps, nextTick } from 'vue';
 import { merge, get, cloneDeep } from 'lodash-es';
 import { reactiveComputed, reactiveOmit } from '@vueuse/core';
 import { useNamespace, useZIndex, ElButton, Mousewheel } from 'element-plus';
@@ -96,7 +96,7 @@ var stdin_default = /* @__PURE__ */defineComponent({
         [tableKeys.orderType]: mapOrderType[order]
       } : null;
       page.value = 1;
-      execute();
+      validateExecute();
     };
     const elTableProps = computed(() => {
       return mergeProps(reactiveOmit(props, omittedTableProps), {
@@ -194,13 +194,21 @@ var stdin_default = /* @__PURE__ */defineComponent({
           elTableRef.value?.setScrollTop(0);
         }
       },
-      onFinally() {
-        reloading.value = false;
+      onError(err) {
+        console.error(err);
       }
     });
+    const validateExecute = async () => {
+      if (props.formProps && tableQueryRef.value) {
+        await tableQueryRef.value.validate();
+        await execute();
+      } else {
+        await execute();
+      }
+    };
     onMounted(() => {
       if (props.immediate && props.api) {
-        execute();
+        validateExecute();
       }
     });
     const ns = useNamespace("table");
@@ -263,7 +271,7 @@ var stdin_default = /* @__PURE__ */defineComponent({
       page.value = 1;
     };
     const onPageChange = () => {
-      execute();
+      validateExecute();
     };
     const getPagination = () => {
       return {
@@ -293,7 +301,9 @@ var stdin_default = /* @__PURE__ */defineComponent({
     const reload = () => {
       if (!isFetching.value) {
         reloading.value = true;
-        execute();
+        validateExecute().finally(() => {
+          reloading.value = false;
+        });
       }
     };
     const innerExpandRowKeys = ref();
@@ -342,8 +352,9 @@ var stdin_default = /* @__PURE__ */defineComponent({
     };
     const onReset = async () => {
       if (!isFetching.value) {
+        await nextTick();
         page.value = 1;
-        await execute();
+        await validateExecute();
       }
     };
     const submit = async () => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cosey",
-  "version": "0.10.24",
+  "version": "0.10.25",
   "description": "基于 Vue3 + vite 的后台管理系统框架",
   "type": "module",
   "main": "index.js",