ods-component-lib 1.18.192 → 1.18.194

package/dist/index.js

@@ -1729,11 +1729,10 @@ var OdsFilterTagView = function OdsFilterTagView(_ref) {
 
 var Title = antd.Typography.Title;
 var OdsFilter = function OdsFilter(props) {
-  var _Form$useForm = antd.Form.useForm(),
-    advancedFilterForm = _Form$useForm[0];
   var _useState = React.useState(true),
     showFilter = _useState[0],
     setShowFilter = _useState[1];
+  var advancedRef = React__default.createRef();
   var _useStyles = useStyles({
       open: showFilter
     }),
@@ -1765,18 +1764,6 @@ var OdsFilter = function OdsFilter(props) {
       props.onClickClear();
     }
   };
-  var checkAdvancedFilterValues = function checkAdvancedFilterValues() {
-    try {
-      return Promise.resolve(_catch(function () {
-        return Promise.resolve(advancedFilterForm.validateFields());
-      }, function () {
-        setShowAdvanceFilter(true);
-        return null;
-      }));
-    } catch (e) {
-      return Promise.reject(e);
-    }
-  };
   var checkFilterValues = function checkFilterValues() {
     return Promise.resolve(_catch(function () {
       return Promise.resolve(props.form.validateFields());
@@ -1784,28 +1771,40 @@ var OdsFilter = function OdsFilter(props) {
       return null;
     }));
   };
+  var findErrorIfAdvancedFilterHasError = function findErrorIfAdvancedFilterHasError() {
+    try {
+      if (advancedRef.current) {
+        var errorItems = advancedRef.current.querySelectorAll(".ant-form-item-has-error");
+        if ((errorItems === null || errorItems === void 0 ? void 0 : errorItems.length) > 0) {
+          setShowAdvanceFilter(true);
+        }
+      }
+      return Promise.resolve();
+    } catch (e) {
+      return Promise.reject(e);
+    }
+  };
   var handleOnClickApply = function handleOnClickApply() {
     return Promise.resolve(checkFilterValues()).then(function (values) {
+      function _temp2() {
+        if (values) {
+          if (props.onFinish) {
+            props.onFinish(values);
+          }
+        } else {
+          props.onFinishFailed && props.onFinishFailed();
+        }
+      }
       var _temp = function () {
         if (hasAdvancedFilters) {
-          return Promise.resolve(checkAdvancedFilterValues()).then(function (advancedValues) {
-            if (values && advancedValues) {
-              props.onFinish && props.onFinish(_extends({}, values, advancedValues));
-            } else {
-              props.onFinishFailed && props.onFinishFailed();
-            }
-          });
-        } else {
-          if (values) {
-            props.onFinish && props.onFinish(values);
-          } else {
-            props.onFinishFailed && props.onFinishFailed();
-          }
+          return Promise.resolve(findErrorIfAdvancedFilterHasError()).then(function () {});
         }
       }();
-      if (_temp && _temp.then) return _temp.then(function () {});
+      return _temp && _temp.then ? _temp.then(_temp2) : _temp2();
     });
   };
+  React.useEffect(function () {
+  }, [advancedRef, showAdvanceFilter]);
   return React__default.createElement(OdsCard, {
     className: styles.filterWrapper
   }, React__default.createElement(antd.ConfigProvider, {
@@ -1885,14 +1884,12 @@ var OdsFilter = function OdsFilter(props) {
     className: styles.filterBody
   }, hasTagFilter && React__default.createElement(OdsTab, {
     items: props.tabs
-  }), hasFilterRow && props.filterRow, hasAdvancedFilters && React__default.createElement(antd.Form, {
-    form: advancedFilterForm,
-    layout: "vertical"
-  }, React__default.createElement("div", {
-    className: advancedFilterStyles.advancedFilterRowWrapper
+  }), hasFilterRow && props.filterRow, hasAdvancedFilters && React__default.createElement("div", {
+    className: advancedFilterStyles.advancedFilterRowWrapper,
+    ref: advancedRef
   }, React__default.createElement("div", {
     className: advancedFilterStyles.advancedFilterRow
-  }, props.advancedFilterRow))), React__default.createElement("div", {
+  }, props.advancedFilterRow)), React__default.createElement("div", {
     className: styles.filterActionButtonsWrapper
   }, React__default.createElement(OdsButton, {
     type: "text",