@hw-component/form 0.0.8-beta-v3 → 0.0.8-beta-v5

package/es/CheckboxGroup/hooks.js

@@ -73,7 +73,9 @@ var useValueProvider = function useValueProvider(_ref2) {
     });
   }, [valueMap]);
   useEffect(function () {
-    var checked = oldValueCheckMap.valueMap.checked;
+    var _oldValueCheckMap$val = oldValueCheckMap.valueMap,
+      checked = _oldValueCheckMap$val.checked,
+      noChecked = _oldValueCheckMap$val.noChecked;
     if (!value) {
       return;
     }
@@ -83,6 +85,9 @@ var useValueProvider = function useValueProvider(_ref2) {
     }
     setVal(function (oldVal) {
       var newVal = _objectSpread({}, oldVal);
+      Object.keys(newVal).forEach(function (key) {
+        newVal[key] = noChecked;
+      });
       value.forEach(function (itemVal) {
         newVal[itemVal] = checked;
       });

package/es/CheckboxGroup/index.js

@@ -66,6 +66,9 @@ var Index = function Index(_ref) {
           name = _item$name2 === void 0 ? "" : _item$name2;
         var _outputValue$name = _outputValue[name],
           itemVal = _outputValue$name === void 0 ? {} : _outputValue$name;
+        if (Array.isArray(itemVal)) {
+          return _defineProperty({}, name, itemVal);
+        }
         return _objectSpread({}, itemVal);
       }
     }

package/es/DialogForm/hooks.d.ts

@@ -1,6 +1,6 @@
 /// <reference types="react" />
 import type { DialogFormProps, HDialogFormInstance, ModifyPropsModal } from "./modal";
-export declare const useModifyProps: ({ visible, configData, initialValues, dialogForm, afterClose, params, title, onCancel, autoClear }: ModifyPropsModal) => {
+export declare const useModifyProps: ({ visible, configData, initialValues, dialogForm, afterClose, params, title, onCancel, autoClear, }: ModifyPropsModal) => {
     modalFormData: import("../Form/modal").HItemProps[];
     modalVisible: boolean | undefined;
     setModalVisible: import("react").Dispatch<import("react").SetStateAction<boolean | undefined>>;

package/es/Form/hooks/useHForm.js

@@ -165,7 +165,8 @@ var useHForm = (function () {
         Reflect.deleteProperty(dispatchSourceData, key);
       },
       outputValues: function outputValues(value) {
-        return this.formatValues(value, "outputValue");
+        var val = value || form.getFieldsValue();
+        return this.formatValues(val, "outputValue");
       }
     }, form), {}, {
       setFieldsValue: function setFieldsValue(values) {

package/lib/CheckboxGroup/hooks.js

@@ -74,7 +74,9 @@ var useValueProvider = function useValueProvider(_ref2) {
     });
   }, [valueMap]);
   React.useEffect(function () {
-    var checked = oldValueCheckMap.valueMap.checked;
+    var _oldValueCheckMap$val = oldValueCheckMap.valueMap,
+      checked = _oldValueCheckMap$val.checked,
+      noChecked = _oldValueCheckMap$val.noChecked;
     if (!value) {
       return;
     }
@@ -84,6 +86,9 @@ var useValueProvider = function useValueProvider(_ref2) {
     }
     setVal(function (oldVal) {
       var newVal = _objectSpread({}, oldVal);
+      Object.keys(newVal).forEach(function (key) {
+        newVal[key] = noChecked;
+      });
       value.forEach(function (itemVal) {
         newVal[itemVal] = checked;
       });

package/lib/CheckboxGroup/index.js

@@ -69,6 +69,9 @@ var Index = function Index(_ref) {
           name = _item$name2 === void 0 ? "" : _item$name2;
         var _outputValue$name = _outputValue[name],
           itemVal = _outputValue$name === void 0 ? {} : _outputValue$name;
+        if (Array.isArray(itemVal)) {
+          return _defineProperty({}, name, itemVal);
+        }
         return _objectSpread({}, itemVal);
       }
     }

package/lib/DialogForm/hooks.d.ts

@@ -1,6 +1,6 @@
 /// <reference types="react" />
 import type { DialogFormProps, HDialogFormInstance, ModifyPropsModal } from "./modal";
-export declare const useModifyProps: ({ visible, configData, initialValues, dialogForm, afterClose, params, title, onCancel, autoClear }: ModifyPropsModal) => {
+export declare const useModifyProps: ({ visible, configData, initialValues, dialogForm, afterClose, params, title, onCancel, autoClear, }: ModifyPropsModal) => {
     modalFormData: import("../Form/modal").HItemProps[];
     modalVisible: boolean | undefined;
     setModalVisible: import("react").Dispatch<import("react").SetStateAction<boolean | undefined>>;

package/lib/Form/hooks/useHForm.js

@@ -168,7 +168,8 @@ var useHForm = (function () {
         Reflect.deleteProperty(dispatchSourceData, key);
       },
       outputValues: function outputValues(value) {
-        return this.formatValues(value, "outputValue");
+        var val = value || form.getFieldsValue();
+        return this.formatValues(val, "outputValue");
       }
     }, form), {}, {
       setFieldsValue: function setFieldsValue(values) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hw-component/form",
-  "version": "0.0.8-beta-v3",
+  "version": "0.0.8-beta-v5",
   "description": "基于antd二次开发",
   "repository": {
     "type": "git",

package/src/components/CheckboxGroup/hooks.ts

@@ -58,7 +58,7 @@ export const useValueProvider = ({
   }, [valueMap]);
 
   useEffect(() => {
-    const { checked } = oldValueCheckMap.valueMap;
+    const { checked, noChecked } = oldValueCheckMap.valueMap;
     if (!value) {
       return;
     }
@@ -68,6 +68,9 @@ export const useValueProvider = ({
     }
     setVal((oldVal) => {
       const newVal = { ...oldVal };
+      Object.keys(newVal).forEach((key) => {
+        newVal[key] = noChecked;
+      });
       value.forEach((itemVal) => {
         newVal[itemVal] = checked;
       });

package/src/components/CheckboxGroup/index.tsx

@@ -47,6 +47,11 @@ const Index = ({
       outputValue: (item, outputValue) => {
         const { name = "" } = item;
         const { [name]: itemVal = {} } = outputValue;
+        if (Array.isArray(itemVal)) {
+          return {
+            [name]: itemVal,
+          };
+        }
         return {
           ...itemVal,
         };

package/src/components/DialogForm/DrawerForm/index.tsx

@@ -26,7 +26,7 @@ export default ({
   footer,
   params,
   onValuesChange,
-                  autoClear=true,
+  autoClear = true,
   ...props
 }: DialogFormProps) => {
   const currentForm = useCurrentForm(dialogForm);
@@ -47,7 +47,7 @@ export default ({
     params,
     title,
     onCancel,
-    autoClear
+    autoClear,
   });
   const cancel = () => {
     onAfterClose();

package/src/components/DialogForm/ModalForm.tsx

@@ -19,7 +19,7 @@ export default ({
   params,
   onOk,
   onValuesChange,
-                  autoClear=true,
+  autoClear = true,
   ...props
 }: DialogFormProps) => {
   const currentForm = useCurrentForm(dialogForm);
@@ -54,7 +54,7 @@ export default ({
       onCancel={cancel}
       confirmLoading={loading}
       afterClose={() => {
-        if (autoClear){
+        if (autoClear) {
           currentForm.clear();
         }
         afterClose?.();

package/src/components/DialogForm/hooks.ts

@@ -16,7 +16,7 @@ export const useModifyProps = ({
   params,
   title,
   onCancel,
-autoClear
+  autoClear,
 }: ModifyPropsModal) => {
   const [modalVisible, setModalVisible] = useState(visible);
   const [modalFormData, setModalFormData] = useState(configData);
@@ -26,7 +26,7 @@ autoClear
   const onAfterClose = () => {
     onCancel?.();
     setTimeout(() => {
-      if (autoClear){
+      if (autoClear) {
         dialogForm.clear();
       }
       afterClose?.();

package/src/components/DialogForm/modal.ts

@@ -13,7 +13,7 @@ export interface ModifyPropsModal<P = any> {
   params?: P;
   title?: DialogFormProps["title"];
   onCancel?: VoidFunction;
-  autoClear?:boolean;
+  autoClear?: boolean;
 }
 export interface ShowParamsModal<P = any, T = any> {
   configData?: HItemProps[];
@@ -35,5 +35,5 @@ export interface DialogFormProps<P = any, T = any>
   onCancel?: VoidFunction;
   onOk?: (data: T, params: P) => boolean | void;
   infoRequest?: (params: P) => Promise<T>;
-  autoClear?:boolean;
+  autoClear?: boolean;
 }

package/src/components/Form/hooks/useHForm.ts

@@ -140,7 +140,8 @@ export default () => {
         Reflect.deleteProperty(dispatchSourceData, key);
       },
       outputValues(value) {
-        return this.formatValues(value, "outputValue");
+        const val=value||form.getFieldsValue()
+        return this.formatValues(val, "outputValue");
       },
       ...form,
       setFieldsValue(values) {

package/src/pages/Checkbox/index.tsx

@@ -8,7 +8,6 @@ export default () => {
           { label: "测试", value: "uu" },
           { label: "测试1", value: "uu1" },
         ]}
-        value={{ uu: 0 }}
       />
     </Space>
   );

package/src/pages/Form/index.tsx

@@ -73,8 +73,8 @@ const formData = (options) => {
       rules: [{ required: true }],
       helper: "帮助我",
       options: [
-        { label: "选择1", value: "check1" },
-        { label: "选择2", value: "check2" },
+        { value: "选择1", key: "check1" },
+        { value: "选择2", key: "check2" },
       ],
     },
     {