@hw-component/form 1.9.35 → 1.9.38

package/es/Form/Basic.js

@@ -50,13 +50,15 @@ var Basic = (function (_ref) {
         _itemData$itemProps = itemData.itemProps,
         itemProps = _itemData$itemProps === void 0 ? {} : _itemData$itemProps,
         itemColon = itemData.colon,
-        configItemSpan = itemData.itemSpan;
+        configItemSpan = itemData.itemSpan,
+        nameKey = itemData.nameKey;
       var defaultItemProps = _objectSpread(_objectSpread({
         onPressEnter: dismissOnPressEnter ? undefined : defaultOnPressEnter
       }, formItemProps), itemProps);
+      var key = name || nameKey;
       return /*#__PURE__*/createElement(Item, _objectSpread(_objectSpread({}, itemData), {}, {
         labelAlign: labelAlign,
-        key: name || index,
+        key: key || index,
         style: style,
         itemProps: defaultItemProps,
         hideLabel: hideLabel,

package/es/Form/hooks/index.js

@@ -91,7 +91,7 @@ var useInfoReq = function useInfoReq(_ref) {
           return initReq(reqParams);
         case 5:
           result = _context2.sent;
-          form === null || form === void 0 || form.setFieldsValueFull(result);
+          form === null || form === void 0 || form.setFieldsValue(result);
           return _context2.abrupt("return", result || {});
         case 8:
           if (!(typeof initialValues === "undefined")) {
@@ -100,7 +100,7 @@ var useInfoReq = function useInfoReq(_ref) {
           }
           return _context2.abrupt("return", {});
         case 10:
-          form === null || form === void 0 || form.setFieldsValueFull(initialValues);
+          form === null || form === void 0 || form.setFieldsValue(initialValues);
           return _context2.abrupt("return", initialValues);
         case 12:
         case "end":

package/es/Form/hooks/useHForm.js

@@ -33,14 +33,6 @@ var useHForm = (function () {
         defaultFn: []
       };
     };
-    var clearObj = function clearObj(val) {
-      var newVal = _objectSpread({}, val);
-      var keys = Object.keys(val);
-      keys.forEach(function (key) {
-        newVal[key] = undefined;
-      });
-      return newVal;
-    };
     var formatValuesFn = function formatValuesFn() {
       var value = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
       var formatKey = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : "inputValue";
@@ -185,17 +177,6 @@ var useHForm = (function () {
         var newValue = formatValuesFn(values);
         form.setFieldsValue(newValue);
       },
-      setFieldsValueFull: function setFieldsValueFull(values) {
-        if (!isLoading) {
-          cacheValues = values;
-          return;
-        }
-        var oldFormVal = form.getFieldsValue(true);
-        var formatVal = formatValuesFn(oldFormVal, "outputValue");
-        var newValue = formatValuesFn(values);
-        var clearData = clearObj(_objectSpread(_objectSpread({}, formatVal), oldFormVal));
-        form.setFieldsValue(_objectSpread(_objectSpread({}, clearData), newValue));
-      },
       validateFields: function validateFields(nameList) {
         return new Promise(function (resolve, reject) {
           form.validateFields(nameList).then(function (value) {

package/es/Form/modal.d.ts

@@ -53,6 +53,7 @@ export interface HItemProps extends Omit<FormItemProps, "name" | "labelAlign" |
     label?: React.ReactNode | HelperModal;
     hidden?: boolean | HideModal;
     rowWrapper?: boolean;
+    nameKey?: string;
 }
 interface InfoRequestOp extends BaseOptions<any, any> {
     request: PromiseFnResult;
@@ -141,7 +142,6 @@ export interface HFormInstance extends FormInstance {
     clear: VoidFunction;
     resetFieldsInitValue: VoidFunction;
     clearFormat: (name: string) => void;
-    setFieldsValueFull: (values: Record<string, any>) => void;
 }
 export interface ConnectConfigModal {
     format?: Record<string, addFormatItemModal>;

package/lib/Form/Basic.js

@@ -53,13 +53,15 @@ var Basic = (function (_ref) {
         _itemData$itemProps = itemData.itemProps,
         itemProps = _itemData$itemProps === void 0 ? {} : _itemData$itemProps,
         itemColon = itemData.colon,
-        configItemSpan = itemData.itemSpan;
+        configItemSpan = itemData.itemSpan,
+        nameKey = itemData.nameKey;
       var defaultItemProps = _objectSpread(_objectSpread({
         onPressEnter: dismissOnPressEnter ? undefined : defaultOnPressEnter
       }, formItemProps), itemProps);
+      var key = name || nameKey;
       return /*#__PURE__*/React.createElement(index$1.default, _objectSpread(_objectSpread({}, itemData), {}, {
         labelAlign: labelAlign,
-        key: name || index,
+        key: key || index,
         style: style,
         itemProps: defaultItemProps,
         hideLabel: hideLabel,

package/lib/Form/hooks/index.js

@@ -92,7 +92,7 @@ var useInfoReq = function useInfoReq(_ref) {
           return initReq(reqParams);
         case 5:
           result = _context2.sent;
-          form === null || form === void 0 || form.setFieldsValueFull(result);
+          form === null || form === void 0 || form.setFieldsValue(result);
           return _context2.abrupt("return", result || {});
         case 8:
           if (!(typeof initialValues === "undefined")) {
@@ -101,7 +101,7 @@ var useInfoReq = function useInfoReq(_ref) {
           }
           return _context2.abrupt("return", {});
         case 10:
-          form === null || form === void 0 || form.setFieldsValueFull(initialValues);
+          form === null || form === void 0 || form.setFieldsValue(initialValues);
           return _context2.abrupt("return", initialValues);
         case 12:
         case "end":

package/lib/Form/hooks/useHForm.js

@@ -36,14 +36,6 @@ var useHForm = (function () {
         defaultFn: []
       };
     };
-    var clearObj = function clearObj(val) {
-      var newVal = _objectSpread({}, val);
-      var keys = Object.keys(val);
-      keys.forEach(function (key) {
-        newVal[key] = undefined;
-      });
-      return newVal;
-    };
     var formatValuesFn = function formatValuesFn() {
       var value = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
       var formatKey = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : "inputValue";
@@ -188,17 +180,6 @@ var useHForm = (function () {
         var newValue = formatValuesFn(values);
         form.setFieldsValue(newValue);
       },
-      setFieldsValueFull: function setFieldsValueFull(values) {
-        if (!isLoading) {
-          cacheValues = values;
-          return;
-        }
-        var oldFormVal = form.getFieldsValue(true);
-        var formatVal = formatValuesFn(oldFormVal, "outputValue");
-        var newValue = formatValuesFn(values);
-        var clearData = clearObj(_objectSpread(_objectSpread({}, formatVal), oldFormVal));
-        form.setFieldsValue(_objectSpread(_objectSpread({}, clearData), newValue));
-      },
       validateFields: function validateFields(nameList) {
         return new Promise(function (resolve, reject) {
           form.validateFields(nameList).then(function (value) {

package/lib/Form/modal.d.ts

@@ -53,6 +53,7 @@ export interface HItemProps extends Omit<FormItemProps, "name" | "labelAlign" |
     label?: React.ReactNode | HelperModal;
     hidden?: boolean | HideModal;
     rowWrapper?: boolean;
+    nameKey?: string;
 }
 interface InfoRequestOp extends BaseOptions<any, any> {
     request: PromiseFnResult;
@@ -141,7 +142,6 @@ export interface HFormInstance extends FormInstance {
     clear: VoidFunction;
     resetFieldsInitValue: VoidFunction;
     clearFormat: (name: string) => void;
-    setFieldsValueFull: (values: Record<string, any>) => void;
 }
 export interface ConnectConfigModal {
     format?: Record<string, addFormatItemModal>;

package/package.json

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

package/src/components/Form/Basic.tsx

@@ -46,18 +46,19 @@ export default ({
           itemProps = {},
           colon: itemColon,
           itemSpan: configItemSpan,
+          nameKey,
         } = itemData;
         const defaultItemProps = {
           onPressEnter: dismissOnPressEnter ? undefined : defaultOnPressEnter,
           ...formItemProps,
           ...itemProps,
         };
-
+        const key=name||nameKey;
         return (
           <Item
             {...itemData}
             labelAlign={labelAlign}
-            key={name || index}
+            key={key || index}
             style={style}
             itemProps={defaultItemProps as ItemPropsType}
             hideLabel={hideLabel}

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

@@ -61,13 +61,13 @@ export const useInfoReq = ({
     reqData.params = reqParams;
     if (initReq) {
       const result = await initReq(reqParams);
-      form?.setFieldsValueFull(result);
+      form?.setFieldsValue(result);
       return result || {};
     }
     if (typeof initialValues === "undefined") {
       return {};
     }
-    form?.setFieldsValueFull(initialValues);
+    form?.setFieldsValue(initialValues);
     return initialValues;
   },options);
   const { run, mutate } = infoControl;

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

@@ -34,14 +34,6 @@ export default () => {
         defaultFn: [],
       };
     };
-    const clearObj=(val)=>{
-       const newVal={...val};
-       const keys=Object.keys(val);
-       keys.forEach((key)=>{
-            newVal[key]=undefined;
-       });
-       return newVal;
-    }
     const formatValuesFn = (value = {}, formatKey = "inputValue") => {
       const valKeys = Object.keys(value).length;
       if (!valKeys) {
@@ -168,23 +160,6 @@ export default () => {
         const newValue = formatValuesFn(values);
         form.setFieldsValue(newValue);
       },
-      setFieldsValueFull(values){
-      if (!isLoading) {
-        cacheValues = values;
-        return;
-      }
-        const oldFormVal=form.getFieldsValue(true);
-        const formatVal=formatValuesFn(oldFormVal, "outputValue")
-        const newValue = formatValuesFn(values);
-        const clearData=clearObj({
-          ...formatVal,
-          ...oldFormVal
-        });
-        form.setFieldsValue({
-          ...clearData,
-          ...newValue
-        });
-      },
       validateFields(nameList) {
         return new Promise((resolve, reject) => {
           form

package/src/components/Form/modal.ts

@@ -100,6 +100,7 @@ export interface HItemProps
   label?: React.ReactNode | HelperModal;
   hidden?: boolean | HideModal;
   rowWrapper?: boolean;
+  nameKey?:string;
 }
 interface InfoRequestOp extends BaseOptions<any,any> {
   request:PromiseFnResult;
@@ -199,7 +200,6 @@ export interface HFormInstance extends FormInstance {
   clear: VoidFunction;
   resetFieldsInitValue: VoidFunction;
   clearFormat: (name: string) => void;
-  setFieldsValueFull:(values: Record<string, any>)=>void;
 }
 
 export interface ConnectConfigModal {