fan-standard-comp 4.1.8 → 4.1.9

package/es/FormComp/RenderItemGroup/index.js

@@ -12,7 +12,7 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
 function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 /* eslint-disable */
-import React, { useCallback } from "react";
+import React, { useEffect, useCallback } from "react";
 import { Row, Col, Tooltip, Form, Space } from "antd";
 import { general } from "../../data";
 import Field from "../FieldComponent";
@@ -72,10 +72,9 @@ var RenderItemGroup = function RenderItemGroup(props) {
     // if (newVal) form && form.setFieldsValue({ ...newVal })
     if (doUpdateFormFields) doUpdateFormFields(); // 用于触发更新表单实例赋值
   };
-
-  // useEffect(() => {
-  //   updateFormFields()
-  // }, [form])
+  useEffect(function () {
+    updateFormFields();
+  }, [form]);
 
   // 渲染隐藏指定控件
   var itemIsHide = function itemIsHide(isHide, getFieldsValue, FormInstance) {

package/es/StandardFilter/index.js

@@ -65,7 +65,9 @@ var StandardFilter = /*#__PURE__*/React.forwardRef(function (props, ref) {
     dateFormatter = _providerConfig$props.dateFormatter,
     _providerConfig$props11 = _providerConfig$props.collapseable,
     collapseable = _providerConfig$props11 === void 0 ? false : _providerConfig$props11,
-    parseTransform = _providerConfig$props.parseTransform;
+    parseTransform = _providerConfig$props.parseTransform,
+    _providerConfig$props12 = _providerConfig$props.forceListener,
+    forceListener = _providerConfig$props12 === void 0 ? true : _providerConfig$props12;
   var _Form$useForm = Form.useForm(),
     _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
     filterForm = _Form$useForm2[0];
@@ -134,6 +136,7 @@ var StandardFilter = /*#__PURE__*/React.forwardRef(function (props, ref) {
   var calculateHideCount = function calculateHideCount(filterFormRef, groups) {
     var itemGroupSize = columnNumberAndSize.itemGroupSize,
       columnNumber = columnNumberAndSize.columnNumber;
+    // collapseable && console.log('当前表单组有：', groups)
     var formValues = filterFormRef === null || filterFormRef === void 0 ? void 0 : filterFormRef.getFieldValue();
     // Rule1: 不包括isHidden跟isHide的数据
     // Rule2：剩余的表单项中，查找是否有自定义配置 display='block' 或者colSpan的表单项
@@ -148,6 +151,10 @@ var StandardFilter = /*#__PURE__*/React.forwardRef(function (props, ref) {
         current: filterFormRef
       }, filterFormRef)) : false));
     });
+    // collapseable && console.log('当前显示的表单组', showGroupItem)
+    // collapseable && showGroupItem.forEach((item) => {
+    //   console.log('当前是否有配置colSpan或者display', item.display, item.colSpan)
+    // })
     var showGroupWithSetting = showGroupItem.filter(function (item) {
       return item.hasOwnProperty('colSpan');
     }); // 指定设置数量
@@ -382,15 +389,30 @@ var StandardFilter = /*#__PURE__*/React.forwardRef(function (props, ref) {
       setReFormItemGroup(formItemGroup);
     }
   }, [formItemGroup, collapseable, filterFormLayout, collapsed, columnNumberAndSize === null || columnNumberAndSize === void 0 ? void 0 : columnNumberAndSize.columnNumber, itemGroupConfig, filterForm]);
+
+  // 如果不监听initialValues的话，可能url上的search更改时表单无法清空，需要自行手动重置
   useEffect(function () {
-    if (filterForm) {
-      // <---- check ref before use the form instance
-      if (initialValues && _typeof(initialValues) === 'object') {
+    if (!forceListener) {
+      if (initialValues && JSON.stringify(initialValues) !== '{}') {
         updateFormFields(initialValues, true);
       }
     }
-  }, [filterForm]);
-
+  }, [forceListener, filterForm]);
+  useEffect(function () {
+    if (forceListener) {
+      if (initialValues && JSON.stringify(initialValues) !== '{}') {
+        updateFormFields(initialValues, true);
+      }
+    }
+  }, [forceListener, initialValues]);
+  // 如果不监听initialValues的话，可能url上的search更改时表单无法清空
+  // useEffect(() => {
+  //   if (filterForm) {   // <---- check ref before use the form instance
+  //     if (initialValues && typeof initialValues === 'object') {
+  //       updateFormFields(initialValues, true)
+  //     }
+  //   }
+  // }, [filterForm]);
   // / 表单列表组 formItemGroup 类型为数组或者React.Node
   var renderFormItemGroup = function renderFormItemGroup() {
     if (Array.isArray(reFormItemGroup)) {

package/lib/FormComp/RenderItemGroup/index.js

@@ -79,10 +79,9 @@ var RenderItemGroup = function RenderItemGroup(props) {
     // if (newVal) form && form.setFieldsValue({ ...newVal })
     if (doUpdateFormFields) doUpdateFormFields(); // 用于触发更新表单实例赋值
   };
-
-  // useEffect(() => {
-  //   updateFormFields()
-  // }, [form])
+  (0, _react.useEffect)(function () {
+    updateFormFields();
+  }, [form]);
 
   // 渲染隐藏指定控件
   var itemIsHide = function itemIsHide(isHide, getFieldsValue, FormInstance) {

package/lib/StandardFilter/index.js

@@ -73,7 +73,9 @@ var StandardFilter = /*#__PURE__*/_react.default.forwardRef(function (props, ref
     dateFormatter = _providerConfig$props.dateFormatter,
     _providerConfig$props11 = _providerConfig$props.collapseable,
     collapseable = _providerConfig$props11 === void 0 ? false : _providerConfig$props11,
-    parseTransform = _providerConfig$props.parseTransform;
+    parseTransform = _providerConfig$props.parseTransform,
+    _providerConfig$props12 = _providerConfig$props.forceListener,
+    forceListener = _providerConfig$props12 === void 0 ? true : _providerConfig$props12;
   var _Form$useForm = _antd.Form.useForm(),
     _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
     filterForm = _Form$useForm2[0];
@@ -142,6 +144,7 @@ var StandardFilter = /*#__PURE__*/_react.default.forwardRef(function (props, ref
   var calculateHideCount = function calculateHideCount(filterFormRef, groups) {
     var itemGroupSize = columnNumberAndSize.itemGroupSize,
       columnNumber = columnNumberAndSize.columnNumber;
+    // collapseable && console.log('当前表单组有：', groups)
     var formValues = filterFormRef === null || filterFormRef === void 0 ? void 0 : filterFormRef.getFieldValue();
     // Rule1: 不包括isHidden跟isHide的数据
     // Rule2：剩余的表单项中，查找是否有自定义配置 display='block' 或者colSpan的表单项
@@ -156,6 +159,10 @@ var StandardFilter = /*#__PURE__*/_react.default.forwardRef(function (props, ref
         current: filterFormRef
       }, filterFormRef)) : false));
     });
+    // collapseable && console.log('当前显示的表单组', showGroupItem)
+    // collapseable && showGroupItem.forEach((item) => {
+    //   console.log('当前是否有配置colSpan或者display', item.display, item.colSpan)
+    // })
     var showGroupWithSetting = showGroupItem.filter(function (item) {
       return item.hasOwnProperty('colSpan');
     }); // 指定设置数量
@@ -390,15 +397,30 @@ var StandardFilter = /*#__PURE__*/_react.default.forwardRef(function (props, ref
       setReFormItemGroup(formItemGroup);
     }
   }, [formItemGroup, collapseable, filterFormLayout, collapsed, columnNumberAndSize === null || columnNumberAndSize === void 0 ? void 0 : columnNumberAndSize.columnNumber, itemGroupConfig, filterForm]);
+
+  // 如果不监听initialValues的话，可能url上的search更改时表单无法清空，需要自行手动重置
   (0, _react.useEffect)(function () {
-    if (filterForm) {
-      // <---- check ref before use the form instance
-      if (initialValues && _typeof(initialValues) === 'object') {
+    if (!forceListener) {
+      if (initialValues && JSON.stringify(initialValues) !== '{}') {
         updateFormFields(initialValues, true);
       }
     }
-  }, [filterForm]);
-
+  }, [forceListener, filterForm]);
+  (0, _react.useEffect)(function () {
+    if (forceListener) {
+      if (initialValues && JSON.stringify(initialValues) !== '{}') {
+        updateFormFields(initialValues, true);
+      }
+    }
+  }, [forceListener, initialValues]);
+  // 如果不监听initialValues的话，可能url上的search更改时表单无法清空
+  // useEffect(() => {
+  //   if (filterForm) {   // <---- check ref before use the form instance
+  //     if (initialValues && typeof initialValues === 'object') {
+  //       updateFormFields(initialValues, true)
+  //     }
+  //   }
+  // }, [filterForm]);
   // / 表单列表组 formItemGroup 类型为数组或者React.Node
   var renderFormItemGroup = function renderFormItemGroup() {
     if (Array.isArray(reFormItemGroup)) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fan-standard-comp",
-  "version": "4.1.8",
+  "version": "4.1.9",
   "description": "FZ standard-comp,basic of antd5.0 and custom component.",
   "main": "lib/index.js",
   "module": "es/index.js",