@hw-component/form 1.10.96 → 1.11.0

package/es/Form/hooks/useHForm.js

@@ -198,7 +198,18 @@ var useHForm = (function () {
         keys.forEach(function (key) {
           newVale[key] = undefined;
         });
-        form.setFieldsValue(_objectSpread(_objectSpread(_objectSpread({}, newVale), initSaveValue), values));
+        var allValue = _objectSpread(_objectSpread(_objectSpread({}, newVale), initSaveValue), values);
+        var valueKeys = Object.keys(allValue);
+        var names = valueKeys.map(function (key) {
+          var val = allValue[key];
+          return {
+            name: key,
+            touched: false,
+            value: val,
+            errors: []
+          };
+        });
+        form.setFields(names);
       },
       resetFieldsValues: function resetFieldsValues() {
         var values = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};

package/es/Input/SelectInput.js

@@ -27,6 +27,7 @@ var Index = function Index(_ref) {
     addFormat = _ref.addFormat;
     _ref.addDispatchListener;
     var props = _objectWithoutProperties(_ref, _excluded);
+  console.log(props, "ppppppp");
   var _valueName$input = valueName.input,
     input = _valueName$input === void 0 ? "" : _valueName$input,
     _valueName$select = valueName.select,

package/es/Select/index.js

@@ -145,6 +145,11 @@ var Index = function Index(_ref) {
       optionFilterProp: optionFilterProp,
       filterOption: selfFilterOption,
       showSearch: mathShowSearch,
+      onBlur: function onBlur() {
+        if (serviceSearch && onSearch) {
+          onSearch("");
+        }
+      },
       labelInValue: true,
       onPopupScroll: propsOnPopupScroll || onPopupScroll,
       getPopupContainer: selfPopupContainer ? function () {

package/lib/Form/hooks/useHForm.js

@@ -201,7 +201,18 @@ var useHForm = (function () {
         keys.forEach(function (key) {
           newVale[key] = undefined;
         });
-        form.setFieldsValue(_objectSpread(_objectSpread(_objectSpread({}, newVale), initSaveValue), values));
+        var allValue = _objectSpread(_objectSpread(_objectSpread({}, newVale), initSaveValue), values);
+        var valueKeys = Object.keys(allValue);
+        var names = valueKeys.map(function (key) {
+          var val = allValue[key];
+          return {
+            name: key,
+            touched: false,
+            value: val,
+            errors: []
+          };
+        });
+        form.setFields(names);
       },
       resetFieldsValues: function resetFieldsValues() {
         var values = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};

package/lib/Input/SelectInput.js

@@ -30,6 +30,7 @@ var Index = function Index(_ref) {
     addFormat = _ref.addFormat;
     _ref.addDispatchListener;
     var props = _objectWithoutProperties(_ref, _excluded);
+  console.log(props, "ppppppp");
   var _valueName$input = valueName.input,
     input = _valueName$input === void 0 ? "" : _valueName$input,
     _valueName$select = valueName.select,

package/lib/Select/index.js

@@ -148,6 +148,11 @@ var Index = function Index(_ref) {
       optionFilterProp: optionFilterProp,
       filterOption: selfFilterOption,
       showSearch: mathShowSearch,
+      onBlur: function onBlur() {
+        if (serviceSearch && onSearch) {
+          onSearch("");
+        }
+      },
       labelInValue: true,
       onPopupScroll: propsOnPopupScroll || onPopupScroll,
       getPopupContainer: selfPopupContainer ? function () {

package/package.json

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

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

@@ -183,11 +183,22 @@ export default () => {
         keys.forEach((key) => {
           newVale[key] = undefined;
         });
-        form.setFieldsValue({
+        const allValue={
           ...newVale,
           ...initSaveValue,
           ...values,
+        }
+        const valueKeys=Object.keys(allValue);
+        const names=valueKeys.map(key => {
+            const val=allValue[key];
+            return {
+              name:key,
+              touched:false,
+              value: val,
+              errors:[]
+            }
         });
+        form.setFields(names)
       },
       resetFieldsValues: (values = {}) => {
         const oldValue = form.getFieldsValue(true);

package/src/components/Input/SelectInput.tsx

@@ -16,6 +16,7 @@ export const Index = ({
   addDispatchListener,
   ...props
 }: HSelectInputProps) => {
+  console.log(props,"ppppppp");
   const { input = "", select = "" } = valueName;
   const { [input]: inputVal, [select]: selectVal } = value;
   const {

package/src/components/Select/index.tsx

@@ -130,6 +130,11 @@ const Index: React.FC<HSelectProps> = ({
         optionFilterProp={optionFilterProp}
         filterOption={selfFilterOption}
         showSearch={mathShowSearch}
+        onBlur={()=>{
+           if (serviceSearch&&onSearch){
+              onSearch("");
+           }
+        }}
         labelInValue={true}
         onPopupScroll={propsOnPopupScroll || onPopupScroll}
         getPopupContainer={

package/src/pages/Form/index.tsx

@@ -226,6 +226,7 @@ export default () => {
                 label: "你好啊",
                 type: "rangePicker",
                 hover: ["123123213", "22222"],
+                  rules:[{required: true, message: "Please input your password!", }],
                 itemProps: {
                   valueMap: {
                     start: "start",
@@ -236,43 +237,14 @@ export default () => {
               {
                 name: "num1",
                 label: "必填",
+                  rules:[{required: true, message: "Please input your password!", }],
                 dependencies: ["num"],
-                // hidden: () => {
-                //   return !form.getFieldValue("num");
-                // },
-                rules: [
-                  {
-                    required: true,
-                    message: "Please confirm your password!",
-                  },
-                  {
-                    validator(_, value) {
-                      console.log("ffff");
-                      return Promise.reject(
-                        new Error(
-                          "The two passwords that you entered do not match!"
-                        )
-                      );
-                    },
-                  },
-                ],
               },
             ]}
             dismissOnPressEnter={false}
             form={form}
             initialValues={{
-              deviceType: 1,
-              tt: {
-                select: "test",
-                time: {
-                  EndTime: null,
-                  StartTime: null,
-                },
-              },
-              selectInput: {
-                select: "1",
-                input: "",
-              },
+              num1:"23123"
             }}
             labelAlign={"top"}
             onValuesChange={(val) => {

package/src/pages/Select/index.tsx

@@ -18,7 +18,7 @@ export default () => {
       <HSelect
         placeholder="分页"
         serviceSearch
-        addonBefore="你好"
+        addonBefore="你好111"
         allowClear={true}
         labelInValue
         fieldNames={{