@hw-component/form 1.10.95 → 1.10.97

package/es/DialogForm/DrawerForm/index.js

@@ -61,11 +61,11 @@ var Index = function Index(_ref) {
     modalTitle = _useModifyProps.title,
     saveOldParams = _useModifyProps.saveOldParams;
   var cancel = function cancel() {
+    saveOldParams();
     if (dialogForm) {
       dialogForm.hide();
       return;
     }
-    saveOldParams();
     if (onCancel) {
       return onCancel === null || onCancel === void 0 ? void 0 : onCancel();
     }

package/es/DialogForm/ModalForm.js

@@ -55,11 +55,11 @@ var Index = function Index(_ref) {
     modalTitle = _useModifyProps.title,
     saveOldParams = _useModifyProps.saveOldParams;
   var cancel = function cancel() {
+    saveOldParams();
     if (dialogForm) {
       dialogForm.hide();
       return;
     }
-    saveOldParams();
     if (onCancel) {
       return onCancel === null || onCancel === void 0 ? void 0 : onCancel();
     }

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/DialogForm/DrawerForm/index.js

@@ -64,11 +64,11 @@ var Index = function Index(_ref) {
     modalTitle = _useModifyProps.title,
     saveOldParams = _useModifyProps.saveOldParams;
   var cancel = function cancel() {
+    saveOldParams();
     if (dialogForm) {
       dialogForm.hide();
       return;
     }
-    saveOldParams();
     if (onCancel) {
       return onCancel === null || onCancel === void 0 ? void 0 : onCancel();
     }

package/lib/DialogForm/ModalForm.js

@@ -58,11 +58,11 @@ var Index = function Index(_ref) {
     modalTitle = _useModifyProps.title,
     saveOldParams = _useModifyProps.saveOldParams;
   var cancel = function cancel() {
+    saveOldParams();
     if (dialogForm) {
       dialogForm.hide();
       return;
     }
-    saveOldParams();
     if (onCancel) {
       return onCancel === null || onCancel === void 0 ? void 0 : onCancel();
     }

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.95",
+  "version": "1.10.97",
   "description": "基于antd二次开发",
   "repository": {
     "type": "git",

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

@@ -59,11 +59,11 @@ const Index: React.FC<DialogFormProps> = ({
     afterClose,
   });
   const cancel = () => {
+    saveOldParams();
     if (dialogForm) {
       dialogForm.hide();
       return;
     }
-    saveOldParams();
     if (onCancel) {
       return onCancel?.();
     }

package/src/components/DialogForm/ModalForm.tsx

@@ -55,11 +55,11 @@ const Index: React.FC<DialogFormProps> = ({
     autoClear,
   });
   const cancel = () => {
+    saveOldParams();
     if (dialogForm) {
       dialogForm.hide();
       return;
     }
-    saveOldParams();
     if (onCancel) {
       return onCancel?.();
     }

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/DrawerForm/index.tsx

@@ -69,10 +69,6 @@ export default () => {
         afterClose={() => {
           console.log("afterClose");
         }}
-        contentRender={(node) => {
-          console.log("contentRender");
-          return <div>{node}</div>;
-        }}
         title={
           <div
             onClick={() => {

package/src/pages/Form/index.tsx

@@ -236,26 +236,8 @@ export default () => {
               {
                 name: "num1",
                 label: "必填",
+                type:"selectInput",
                 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}

package/src/pages/ModalForm/index.tsx

@@ -69,6 +69,7 @@ export default () => {
         <HModalForm
           configData={data}
           visible={visible}
+          autoClear={false}
           onCancel={() => {
             console.log("fffff");
             setVisible(false);

package/src/pages/Select/index.tsx

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