@fairys/taro-tools-simple-form-ui 0.0.5 → 0.0.7

package/esm/form/form.d.ts

@@ -15,6 +15,8 @@ export interface FairysTaroValtioFormProps<T extends MObject<T> = object> extend
     formData?: FairysTaroValtioFormInstance<T>['state'];
     /**表单隐藏状态*/
     hideState?: FairysTaroValtioFormInstance<T>['hideState'];
+    /**formData 是否进行深度拷贝，如果不是则直接把 formData 赋值到 state ，否则使用 copy 方法深度拷贝后赋值 */
+    isDeepCopy?: boolean;
 }
 export declare function FairysTaroValtioForm<T extends MObject<T> = object>(props: FairysTaroValtioFormProps<T>): import("react/jsx-runtime").JSX.Element;
 export declare namespace FairysTaroValtioForm {

package/esm/form/form.js

@@ -6,12 +6,13 @@ import { FairysTaroValtioFormHideItem, FairysTaroValtioFormItem } from "./form.i
 import { FairysTaroValtioFormConfigItem, FairysTaroValtioFormConfigListItem } from "./item.config.js";
 export * from "./item.config.js";
 function FairysTaroValtioForm(props) {
-    const { form, children, rules, formData, hideState, ...rest } = props;
+    const { form, children, rules, formData, hideState, isDeepCopy = true, ...rest } = props;
     const formInstance = useFairysTaroValtioFormInstance(form);
     formInstance.rules = rules;
     useMemo(()=>formInstance.ctor({
             formData,
-            hideState
+            hideState,
+            isDeepCopy
         }), []);
     return /*#__PURE__*/ jsx(FairysTaroValtioFormInstanceContext.Provider, {
         value: formInstance,

package/esm/form/instance/index.d.ts

@@ -13,7 +13,8 @@ export declare class FairysTaroValtioFormInstance<T extends MObject<T> = Record<
     /**初始化表单值*/
     ctor: (options?: {
         formData?: Partial<T>;
-        hideState?: Partial<Record<PropertyKey, boolean>>;
+        hideState?: Record<PropertyKey, boolean>;
+        isDeepCopy?: boolean;
     }) => void;
     /**
      * 更新数据

package/esm/form/instance/index.js

@@ -7,14 +7,13 @@ class FairysTaroValtioFormInstance {
     errorState = proxy({});
     hideState = proxy({});
     ctor = (options)=>{
-        const { formData, hideState } = options || {};
-        this.state = proxy({});
+        const { formData, hideState, isDeepCopy = true } = options || {};
         this.errorState = proxy({});
-        this.hideState = proxy({});
-        if (formData) this.updated(copy(formData));
-        if (hideState) this.updatedHideInfo(copy(hideState));
+        this.hideState = proxy(hideState ? copy(hideState) : {});
+        if (isDeepCopy) this.state = proxy(formData ? copy(formData) : {});
+        else if (formData) this.state = proxy(formData);
     };
-    updated = (state, isValidate)=>{
+    updated = (state, isValidate = true)=>{
         const keys = Object.keys(state);
         for(let index = 0; index < keys.length; index++){
             const key = keys[index];

package/package.json

@@ -3,7 +3,7 @@
   "author": "SunLxy <1011771396@qq.com>",
   "description": "框架组件库",
   "homepage": "https://github.com/autumn-fairy-tales/fairys-taro-react",
-  "version": "0.0.5",
+  "version": "0.0.7",
   "main": "lib/index.js",
   "types": "esm/index.d.ts",
   "module": "esm/index.js",

package/src/form/form.tsx

@@ -23,15 +23,17 @@ export interface FairysTaroValtioFormProps<T extends MObject<T> = object> extend
   formData?: FairysTaroValtioFormInstance<T>['state'];
   /**表单隐藏状态*/
   hideState?: FairysTaroValtioFormInstance<T>['hideState'];
+  /**formData 是否进行深度拷贝，如果不是则直接把 formData 赋值到 state ，否则使用 copy 方法深度拷贝后赋值 */
+  isDeepCopy?: boolean;
 }
 
 export function FairysTaroValtioForm<T extends MObject<T> = object>(props: FairysTaroValtioFormProps<T>) {
-  const { form, children, rules, formData, hideState, ...rest } = props;
+  const { form, children, rules, formData, hideState, isDeepCopy = true, ...rest } = props;
   const formInstance = useFairysTaroValtioFormInstance(form);
   /**表单规则*/
   formInstance.rules = rules;
   /**初始化表单值*/
-  useMemo(() => formInstance.ctor({ formData, hideState }), []);
+  useMemo(() => formInstance.ctor({ formData, hideState, isDeepCopy }), []);
   return (
     <FairysTaroValtioFormInstanceContext.Provider value={formInstance}>
       <FairysTaroValtioFormLayout {...rest}>{children}</FairysTaroValtioFormLayout>

package/src/form/instance/index.ts

@@ -11,20 +11,19 @@ export class FairysTaroValtioFormInstance<T extends MObject<T> = Record<string,
   /**
    * 错误信息
    */
-  errorState = proxy<Record<PropertyKey, string[]>>({} as Record<PropertyKey, string[]>);
+  errorState = proxy<Record<PropertyKey, string[]>>({});
   /**隐藏状态*/
-  hideState = proxy<Record<PropertyKey, boolean>>({} as Record<PropertyKey, boolean>);
+  hideState = proxy<Record<PropertyKey, boolean>>({});
   /**初始化表单值*/
-  ctor = (options?: { formData?: Partial<T>; hideState?: Partial<Record<PropertyKey, boolean>> }) => {
-    const { formData, hideState } = options || {};
-    this.state = proxy<T>({} as T);
-    this.errorState = proxy<Record<PropertyKey, string[]>>({} as Record<PropertyKey, string[]>);
-    this.hideState = proxy<Record<PropertyKey, boolean>>({} as Record<PropertyKey, boolean>);
-    if (formData) {
-      this.updated(copy(formData));
-    }
-    if (hideState) {
-      this.updatedHideInfo(copy(hideState));
+  ctor = (options?: { formData?: Partial<T>; hideState?: Record<PropertyKey, boolean>; isDeepCopy?: boolean }) => {
+    const { formData, hideState, isDeepCopy = true } = options || {};
+    // 如果是 isProxy,则直接赋值
+    this.errorState = proxy<Record<PropertyKey, string[]>>({});
+    this.hideState = proxy<Record<PropertyKey, boolean>>(hideState ? copy(hideState) : {});
+    if (isDeepCopy) {
+      this.state = proxy((formData ? copy(formData) : {}) as T);
+    } else if (formData) {
+      this.state = proxy(formData as T);
     }
   };
   /**
@@ -32,7 +31,7 @@ export class FairysTaroValtioFormInstance<T extends MObject<T> = Record<string,
    * @param state 更新数据对象
    * @param isValidate 是否验证(可选)
    */
-  updated = <M = T>(state: Partial<M>, isValidate?: boolean) => {
+  updated = <M = T>(state: Partial<M>, isValidate: boolean = true) => {
     const keys = Object.keys(state);
     for (let index = 0; index < keys.length; index++) {
       const key = keys[index];
@@ -106,8 +105,8 @@ export class FairysTaroValtioFormInstance<T extends MObject<T> = Record<string,
    */
   clear = () => {
     this.state = proxy<T>({} as T);
-    this.errorState = proxy<Record<PropertyKey, string[]>>({} as Record<keyof T, string[]>);
-    this.hideState = proxy<Record<PropertyKey, boolean>>({} as Record<keyof T, boolean>);
+    this.errorState = proxy<Record<PropertyKey, string[]>>({});
+    this.hideState = proxy<Record<PropertyKey, boolean>>({});
   };
 
   // ===================================================规则处理================================================================