fan-standard-comp 4.0.3 → 4.0.4

package/lib/StandardFilter/index.js

@@ -13,6 +13,7 @@ var _data = require("../data/");
 require("./style/index.less");
 var _ConfigContext = require("../ConfigContext");
 var _FilterStyle = _interopRequireDefault(require("./style/FilterStyle"));
+var _SpecIcon = _interopRequireDefault(require("../SpecIcon"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
@@ -31,6 +32,7 @@ function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol"
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); } // @ts-nocheck
 var FormItem = _antd.Form.Item;
 var StandardFilter = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
+  var _filterFormRef$curren4;
   var InitFanContext = (0, _react.useContext)(_ConfigContext.FanContext);
   var providerConfig = InitFanContext['StandardFilter'] || {}; // 使用上下文（全局配置）设置扩展的配置项
   var _providerConfig$props = _objectSpread(_objectSpread({}, providerConfig), props),
@@ -64,7 +66,9 @@ var StandardFilter = /*#__PURE__*/_react.default.forwardRef(function (props, ref
     filterBtnsStyle = _providerConfig$props.filterBtnsStyle,
     _providerConfig$props7 = _providerConfig$props.colon,
     colon = _providerConfig$props7 === void 0 ? true : _providerConfig$props7,
-    dateFormatter = _providerConfig$props.dateFormatter;
+    dateFormatter = _providerConfig$props.dateFormatter,
+    _providerConfig$props8 = _providerConfig$props.collapseable,
+    collapseable = _providerConfig$props8 === void 0 ? false : _providerConfig$props8;
   var filterFormRef = (0, _react.useRef)();
   // ref 的转发
   (0, _react.useImperativeHandle)(ref, function () {
@@ -78,7 +82,10 @@ var StandardFilter = /*#__PURE__*/_react.default.forwardRef(function (props, ref
     _useState4 = _slicedToArray(_useState3, 2),
     isHideCount = _useState4[0],
     setIsHideCount = _useState4[1]; // 表单隐藏项数量值
-
+  var _useState5 = (0, _react.useState)(false),
+    _useState6 = _slicedToArray(_useState5, 2),
+    collapsed = _useState6[0],
+    setCollapsed = _useState6[1];
   var componentName = 'spec-standard-filter';
   var _useStyle = (0, _FilterStyle.default)(componentName),
     _useStyle2 = _slicedToArray(_useStyle, 2),
@@ -87,8 +94,9 @@ var StandardFilter = /*#__PURE__*/_react.default.forwardRef(function (props, ref
   var filterFormLayout = (0, _react.useMemo)(function () {
     return formLayout || 'inline';
   }, [formLayout]);
-  //  配置筛选按钮（确认与取消）
-  var filterActionButtons = (0, _react.useMemo)(function () {
+
+  // 计算当前栅格数量，及对应的size
+  var columnNumberAndSize = (0, _react.useMemo)(function () {
     // 当前栅栅数量
     var itemGroupSize = (itemGroupConfig === null || itemGroupConfig === void 0 ? void 0 : itemGroupConfig.size) || (filterFormLayout === 'horizontal' ? 'xxlg' : 'md');
     if (itemGroupConfig !== null && itemGroupConfig !== void 0 && itemGroupConfig.columnCount) {
@@ -108,8 +116,31 @@ var StandardFilter = /*#__PURE__*/_react.default.forwardRef(function (props, ref
           break;
       }
     }
+    return {
+      columnNumber: _data.general.modalSize[itemGroupSize].columnNumber,
+      itemGroupSize: itemGroupSize
+    };
+  }, [itemGroupConfig, filterFormLayout]);
+
+  // 计算表单隐藏项(开启展开与收缩）
+  var calculateHideCount = function calculateHideCount(filterFormRef, groups) {
+    var _filterFormRef$curren;
+    var formValues = filterFormRef === null || filterFormRef === void 0 || (_filterFormRef$curren = filterFormRef.current) === null || _filterFormRef$curren === void 0 ? void 0 : _filterFormRef$curren.getFieldValue();
+    setIsHideCount((groups || []).filter(function (item) {
+      return (item === null || item === void 0 ? void 0 : item.isHidden) || (item.hasOwnProperty('isHide') ? item.isHide(_objectSpread({}, formValues), filterFormRef) : false);
+    }).length);
+  };
+
+  //  配置筛选按钮（确认与取消）
+  var filterActionButtons = (0, _react.useMemo)(function () {
+    var itemGroupSize = columnNumberAndSize.itemGroupSize,
+      columnNumber = columnNumberAndSize.columnNumber;
     // 计算扣除栅格列数是否还有多余的项，用来判断筛选按钮的版式（初始化的时候，可能会受默认值内配置的isHide影响导致计算错误;或自定义表单控件组栅格影响）
-    var calculateTimes = (formItemGroup.length - isHideCount) % _data.general.modalSize[itemGroupSize].columnNumber;
+    // if (collapseable) {
+    //   columnNumber = collapsed ? columnNumber : (columnNumber === 1 ? columnNumber = 2 : columnNumber)
+    // }
+    var calculateTimes = (reFormItemGroup.length - isHideCount) % columnNumber;
+    // console.log('当前多余的数量', calculateTimes, '当前隐藏的控件数量isHideCount==>', isHideCount, itemGroupSize, 'columnNumber', columnNumber)
     // xs:1列  sm:1列   【span:24】
     // md:2列           【span:12】
     // lg:3列  xlg:3列  【span:8】
@@ -119,10 +150,11 @@ var StandardFilter = /*#__PURE__*/_react.default.forwardRef(function (props, ref
       label: '',
       type: 'custom',
       // display: 'block',
+      filedName: 'filterAction',
       display: {
         wrapperCol: {
-          // 占用的格子数按对应size配置的formItem(md下额外再新增1）
-          span: _data.general.modalSize[itemGroupSize].formLayout.labelCol.span + _data.general.modalSize[itemGroupSize].formLayout.wrapperCol.span + (itemGroupSize === 'md' ? 1 : 0)
+          // 占用的格子数按对应size配置的formItem(md下额外再新增1, 忘了为什么额外加了，先去除.20240619）
+          span: _data.general.modalSize[itemGroupSize].formLayout.labelCol.span + _data.general.modalSize[itemGroupSize].formLayout.wrapperCol.span // + (itemGroupSize === 'md' ? 1 : 0)
         }
       },
       protoFormItem: {
@@ -145,10 +177,23 @@ var StandardFilter = /*#__PURE__*/_react.default.forwardRef(function (props, ref
           },
           onClick: handleReset,
           ghost: true
-        }, cancelButtonProps), cancelText || '重置'));
+        }, cancelButtonProps), cancelText || '重置'), filterFormLayout === 'horizontal' && collapseable && reFormItemGroup.length > columnNumberAndSize.columnNumber - 1 ? /*#__PURE__*/_react.default.createElement(_antd.Button, {
+          type: 'link',
+          onClick: function onClick() {
+            return setCollapsed(!collapsed);
+          },
+          style: {
+            marginLeft: 8,
+            paddingInlineStart: 0,
+            paddingInlineEnd: 0
+          }
+        }, collapsed ? '收起' : '展开', /*#__PURE__*/_react.default.createElement(_SpecIcon.default, {
+          noPrefix: true,
+          name: collapsed ? 'speci-up' : 'speci-down'
+        })) : null);
       }
     })];
-  }, [confirmText, cancelText, filterFormLayout, reFormItemGroup, onFilterSearch, onFilterReset, itemGroupConfig, filterFormRef, isHideCount]);
+  }, [confirmText, cancelText, filterFormLayout, reFormItemGroup, onFilterSearch, onFilterReset, columnNumberAndSize, filterFormRef, isHideCount, collapseable, collapsed]);
 
   // 更新表单控件值，用于外部获取当前表单实例(force是否强制清空表单)
   var updateFormFields = function updateFormFields(newVal, force) {
@@ -183,37 +228,29 @@ var StandardFilter = /*#__PURE__*/_react.default.forwardRef(function (props, ref
         })
       } */
     filterFormRef.current.setFieldsValue(_objectSpread(_objectSpread({}, resetValues), newVal || {})); // 直接清空表单的赋值
-    updateCalculate(filterFormRef.current.getFieldsValue());
-    if (getFormFields) getFormFields(filterFormRef.current.getFieldsValue(), filterFormRef);
+    forceUpdateForm();
   };
   // 强制更新表单值，用于赋初始化实例值
   var forceUpdateForm = (0, _react.useCallback)(function () {
     var formValues = filterFormRef.current.getFieldsValue();
-    // if (Object.prototype.hasOwnProperty.call(formValues, false)) {
-    //   delete formValues.false // TODO 自定义结构会莫名的出来一个false字段
-    // }
-    updateCalculate(formValues); // 更新当前表单数量，排除被隐藏的值
-    if (getFormFields) getFormFields(filterFormRef.current.getFieldsValue(), filterFormRef);
-  }, [dateFormatter, formItemGroup]);
-  // 计算表单隐藏项
-  var updateCalculate = (0, _react.useCallback)(function (formValues) {
-    setIsHideCount(reFormItemGroup.filter(function (item) {
-      return item.hasOwnProperty('isHide') ? item.isHide(_objectSpread({}, formValues), filterFormRef) : false;
-    }).length);
+    if (Object.prototype.hasOwnProperty.call(formValues, false)) {
+      delete formValues.false; // 自定义结构会莫名的出来一个false字段
+    }
+    calculateHideCount(filterFormRef, reFormItemGroup); // 更新当前表单数量，排除被隐藏的值
+    if (getFormFields) getFormFields(formValues, filterFormRef);
   }, [reFormItemGroup, filterFormRef]);
   var handleSearch = function handleSearch(values) {
     if (Object.prototype.hasOwnProperty.call(values, false)) {
-      delete values.false; // TODO 自定义结构会莫名的出来一个false字段
+      delete values.false; // 自定义结构会莫名的出来一个false字段
     }
-    var resultValues = dateFormatter === 'string' ? (0, _utils.UtilValueFormat)(values, formItemGroup) : values;
-    console.log('格式化前数据', values);
-    console.log('格式化后数据', resultValues);
+    var resultValues = dateFormatter === 'string' ? (0, _utils.UtilValueFormat)(values, reFormItemGroup) : values;
+    // console.log('格式化前数据', values)
+    // console.log('格式化后数据', resultValues)
     if (onFilterSearch) {
       onFilterSearch(_objectSpread({}, resultValues));
     }
   };
   var handleReset = function handleReset() {
-    var _filterFormRef$curren;
     // 使用此方法，表单校验无法清空掉
     // const resetValues = this.filterFormRef.current.getFieldsValue()
     // Object.keys(resetValues).forEach((item) => {
@@ -222,20 +259,78 @@ var StandardFilter = /*#__PURE__*/_react.default.forwardRef(function (props, ref
     // this.filterFormRef.current.setFieldsValue({ ...resetValues }) // 直接清空表单的赋值
     filterFormRef.current.resetFields();
     setReFormItemGroup(formItemGroup); // 重新渲染列表
-    updateCalculate(filterFormRef === null || filterFormRef === void 0 || (_filterFormRef$curren = filterFormRef.current) === null || _filterFormRef$curren === void 0 ? void 0 : _filterFormRef$curren.getFieldsValue());
+    calculateHideCount(filterFormRef, reFormItemGroup);
     if (onFilterReset) {
       var _filterFormRef$curren2;
       onFilterReset(filterFormRef === null || filterFormRef === void 0 || (_filterFormRef$curren2 = filterFormRef.current) === null || _filterFormRef$curren2 === void 0 ? void 0 : _filterFormRef$curren2.getFieldsValue());
     }
   };
+
+  // 判断是否隐藏结构, display:'none'
+  var setItemHiddenNode = function setItemHiddenNode(item, index, collapsed, showItemNumber) {
+    // console.log('判断是否隐藏结构==>当前执行序号', index, showItemNumber)
+    if (item.filedName === 'filterAction') {
+      return {
+        isHidden: false
+      };
+    }
+    return {
+      // 栅格列为1时，显示1个表单项
+      isHidden: collapsed ? false : showItemNumber === 0 ? index !== 0 : !(index < showItemNumber)
+    };
+  };
+  // 渲染隐藏指定控件
+  var itemIsHide = function itemIsHide(isHide, getFieldsValue, FormInstance) {
+    if (typeof isHide === 'function') {
+      return isHide(getFieldsValue, FormInstance, 'default');
+    }
+    return isHide || false;
+  };
+  var updateGroupByCollapsed = function updateGroupByCollapsed(groups, formValues) {
+    // console.log('判断当前是否需要按展开与收缩显示对应的表单项')
+    var showItemNumber = columnNumberAndSize.columnNumber - 1;
+    return new Promise(function (resolve, reject) {
+      if (Array.isArray(groups)) {
+        resolve(groups.map(function (item, index) {
+          if (collapseable && filterFormLayout === "horizontal") {
+            var _setItemHiddenNode = setItemHiddenNode(item, index, collapsed, showItemNumber),
+              isHidden = _setItemHiddenNode.isHidden;
+            item.isHidden = isHidden;
+            item.style = _objectSpread(_objectSpread({}, item.style || {}), {}, {
+              display: item.isHidden ? 'none' : 'block'
+            });
+            if (item.hasOwnProperty('isHide') && itemIsHide(item.isHide, formValues, filterFormRef)) {
+              showItemNumber++;
+              item.isHidden = true;
+              // console.log('当前是结构是隐藏未渲染,跳到下个序号', showItemNumber)
+            }
+          }
+          return _objectSpread({}, item);
+        }));
+      } else {
+        resolve(groups);
+      }
+    });
+  };
+  (0, _react.useEffect)(function () {
+    // 初始化表单数据数据
+    if (collapseable && filterFormLayout === "horizontal") {
+      var _filterFormRef$curren3;
+      var formValues = filterFormRef === null || filterFormRef === void 0 || (_filterFormRef$curren3 = filterFormRef.current) === null || _filterFormRef$curren3 === void 0 ? void 0 : _filterFormRef$curren3.getFieldValue();
+      updateGroupByCollapsed(formItemGroup, formValues).then(function (groups) {
+        setReFormItemGroup(groups);
+        calculateHideCount(filterFormRef, groups);
+      });
+    } else {
+      setReFormItemGroup(formItemGroup);
+    }
+  }, [formItemGroup, collapseable, filterFormLayout, collapsed, columnNumberAndSize === null || columnNumberAndSize === void 0 ? void 0 : columnNumberAndSize.columnNumber, itemGroupConfig, filterFormRef, filterFormRef === null || filterFormRef === void 0 || (_filterFormRef$curren4 = filterFormRef.current) === null || _filterFormRef$curren4 === void 0 ? void 0 : _filterFormRef$curren4.getFieldValue()]);
   (0, _react.useEffect)(function () {
     if (initialValues && JSON.stringify(initialValues) !== '{}') {
       updateFormFields(initialValues, true);
     }
   }, [initialValues]);
-  (0, _react.useEffect)(function () {
-    setReFormItemGroup(formItemGroup);
-  }, [formItemGroup]);
+
   // / 表单列表组 formItemGroup 类型为数组或者React.Node
   var renderFormItemGroup = function renderFormItemGroup() {
     if (Array.isArray(reFormItemGroup)) {
@@ -245,7 +340,9 @@ var StandardFilter = /*#__PURE__*/_react.default.forwardRef(function (props, ref
         size: filterFormLayout === 'horizontal' ? 'xxlg' : 'md' // size决定栅格排列数量(4列排版）
         ,
         layout: filterFormLayout,
-        form: filterFormRef
+        form: filterFormRef,
+        collapseable: collapseable,
+        collapsed: collapsed
         // displayLayout={{labelCol: { span: 8 }, wrapperCol: { span: 16 },}}
         ,
         doUpdateFormFields: function doUpdateFormFields() {

package/package.json

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