@peng_kai/kit 0.2.41 → 0.2.42

package/antd/hooks/useAntdForm.ts

@@ -5,9 +5,8 @@
 
 import type { FormInstance, FormItemProps, RuleObject } from 'ant-design-vue/es/form';
 import type { FormProps } from 'ant-design-vue';
-import { type MaybeRefOrGetter, computed, reactive, ref, shallowRef, toRef, watch, watchEffect } from 'vue';
-import { cloneDeep, mapValues } from 'lodash-es';
-import { reactiveComputed } from '@vueuse/core';
+import { type MaybeRefOrGetter, computed, reactive, ref, toRef, watch, watchEffect } from 'vue';
+import { mapValues } from 'lodash-es';
 import { GROUP_SEP, buildGroupField, getGroupIndex } from './useAntdForm.helpers';
 
 export { useAntdForm };
@@ -29,7 +28,7 @@ interface Options<S, TS> {
 function useAntdForm<S extends Record<string, unknown>, TS = S>(schemas: MaybeRefOrGetter<SchemaConfig<S>>, options?: Options<S, TS>) {
   const schemasR = toRef(schemas);
 
-  const state = shallowRef({} as S);
+  const state = ref({} as S);
   const stateTF = computed<TS>(() => options?.transform?.(<any>state.value) ?? <any>state.value);
   const show = computed(() => mapValues(state.value, (_, k): boolean => schemasR.value[k].show?.(state.value) ?? true));
   const props = computed<FormProps>(() => ({ model: state.value, ref: (c: any) => (formRef.value = c) }));
@@ -50,16 +49,15 @@ function useAntdForm<S extends Record<string, unknown>, TS = S>(schemas: MaybeRe
     get scrollToField() {
       return formRef.value?.scrollToField;
     },
+    get validate() {
+      return formRef.value?.validate;
+    },
     get validateFields() {
       return formRef.value?.validateFields;
     },
     get clearValidate() {
       return formRef.value?.clearValidate;
     },
-    async validate(...args: Parameters<FormInstance['validate']>) {
-      const res = await formRef.value?.validate(...args);
-      return cloneDeep(reactive(res ?? {}));
-    },
     addGroup(groupName: string, groupSchemas: Record<string, ItemSchema>) {
       const i = getGroupIndex(groupName, schemasR.value) + 1;
 
@@ -98,5 +96,17 @@ function useAntdForm<S extends Record<string, unknown>, TS = S>(schemas: MaybeRe
     state.value = newState;
   }, { flush: 'pre' });
 
-  return reactive({ state: reactiveComputed(() => state.value as S), stateTF, show, props, itemProps, $form });
+  // 为什么之前用 watchEffect？
+  // watch(schemasR, () => {
+  //   const _state: any = {};
+
+  //   for (const k in schemasR.value) {
+  //     const item = schemasR.value[k];
+  //     _state[k] = (k in state.value) ? toRef(state.value, k) : toRef(item, 'value');
+  //   }
+
+  //   state.value = _state;
+  // }, { immediate: true });
+
+  return reactive({ state, stateTF, show, props, itemProps, $form });
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@peng_kai/kit",
   "type": "module",
-  "version": "0.2.41",
+  "version": "0.2.42",
   "description": "",
   "author": "",
   "license": "ISC",