linkmore-design 1.1.13 → 1.1.15

package/CHANGELOG.md

@@ -1,3 +1,9 @@
+## <small>1.1.14 () </small>
+* 1.1.14
+* fix: 表单禁用disabled不生效([67393fd](https://gitlab.scm321.com/web-group/UFX.SCM.linkDesign/commit/67393fd))
+* feat: 分组表格支持金额总和计算([2402d16](https://gitlab.scm321.com/web-group/UFX.SCM.linkDesign/commit/2402d16))
+* fix: 修复表单响应式下多级下拉菜单宽度问题([a228946b](https://gitlab.scm321.com/web-group/UFX.SCM.linkDesign/commit/a228946b))
+
 ## <small>1.1.12 (2022-10-18)</small>
 
 * 1.1.12 ([ce4a587](https://gitlab.scm321.com/web-group/UFX.SCM.linkDesign/commit/ce4a587))
@@ -1117,3 +1123,8 @@
 
 
 
+
+
+[[git地址]: 
+
+[[小北IT官网]: 

package/dist/Form/demos/disabled.d.ts

@@ -0,0 +1,2 @@
+declare const App: () => JSX.Element;
+export default App;

package/dist/LmFilter/LmFilter.d.ts

@@ -1,7 +1,3 @@
-declare const _default: React.ForwardRefExoticComponent<Pick<{
-    [x: string]: any;
-    searchConfig?: {};
-    localization?: {};
-}, string | number> & React.RefAttributes<any>>;
-export default _default;
+export default LmFilter;
+declare const LmFilter: React.ForwardRefExoticComponent<React.RefAttributes<any>>;
 import React from "react";

package/dist/LmTable/expression.d.ts

@@ -0,0 +1 @@
+export default function calcExpression(item: any, needCalcKeys: string[]): void;

package/dist/LmTable/hooks/useGroupDataSource.d.ts

@@ -0,0 +1,7 @@
+export default useGroupDataSource;
+/** 行分组 */
+declare function useGroupDataSource({ groupRowKeys, customizeDataSource, columnsRef }: {
+    groupRowKeys: any;
+    customizeDataSource: any;
+    columnsRef: any;
+}): any[];

package/dist/index.umd.js

@@ -34794,11 +34794,11 @@
         others = _objectWithoutProperties$1(props, _excluded$y);
 
     var displayRender = function displayRender(label, selectedOptions) {
-      var hasOptions = selectedOptions.some(function (v) {
-        return !!v;
+      var hasUndefined = selectedOptions.some(function (v) {
+        return !v;
       });
 
-      if (!hasOptions && defaultLabel) {
+      if (hasUndefined && defaultLabel) {
         return defaultLabel;
       }
 
@@ -90774,7 +90774,8 @@
         setVisible = _useState2[1];
 
     var filterValue = instance.filterValue,
-        size = instance.size; // 触发查询时关闭下拉框
+        size = instance.size;
+    var popupClassName = item.popupClassName; // 触发查询时关闭下拉框
 
     var setFilterValue = function setFilterValue(obj) {
       instance.setFilterValue(obj);
@@ -90809,7 +90810,7 @@
         instance: resetInstance,
         item: item
       }),
-      overlayClassName: "filter_dropdown_container_".concat(item.type),
+      overlayClassName: classnames("filter_dropdown_container_".concat(item.type), _defineProperty$1({}, popupClassName, popupClassName)),
       onVisibleChange: function onVisibleChange(v) {
         return setVisible(v);
       } // 未开启则需手动控制下拉展示组件的初始化
@@ -93458,8 +93459,7 @@
   };
 
   var _excluded$1a = ["searchConfig", "localization"];
-
-  var LmFilter$1 = function LmFilter(_ref, ref) {
+  var LmFilter$1 = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
     var _ref$searchConfig = _ref.searchConfig,
         searchConfig = _ref$searchConfig === void 0 ? {} : _ref$searchConfig,
         _ref$localization = _ref.localization,
@@ -93501,11 +93501,8 @@
     return /*#__PURE__*/React__default['default'].createElement(LmFilterRoot$1, _extends$2({
       ref: ref || defaultRef
     }, defaultProps, resetProps));
-  };
-
-  var LmFilter$2 = /*#__PURE__*/React.forwardRef(LmFilter$1);
-
-  LmFilter$2.FilterControl = FilterControl$1;
+  });
+  LmFilter$1.FilterControl = FilterControl$1;
 
   // 状态管理操作
   var reducer$1 = function reducer(state, action) {
@@ -181391,16 +181388,21 @@
         fileAreaSize = props.fileAreaSize,
         enabledOss = props.enabledOss,
         enableCrop = props.enableCrop,
-        ossConfig = props.ossConfig; // 获取两个对象是否存在指定值相等
+        ossConfig = props.ossConfig;
+    /* 获取两个对象是否存在指定值相等
+     * 取用户定义的列字段，如果读取不到则取'fileName'对比
+     */
 
     var getHasEqual = React.useCallback(function (obj1, obj2) {
       var extend = [uid, 'fileName'];
       var flag = false;
       extend.forEach(function (v) {
-        if (!flag) flag = obj1[v] === obj2[v];
+        if (!flag && obj1[v] && obj2[v]) {
+          flag = obj1[v] === obj2[v];
+        }
       });
       return flag;
-    }, []); // 从对象中读取存在的指定属性
+    }, [uid]); // 从对象中读取存在的指定属性
 
     var getFileHasValue = React.useCallback(function (obj) {
       var extend = [uid, 'fileName'];
@@ -188465,19 +188467,26 @@
     }))));
   };
 
-  var _excluded$1i = ["allowClear", "size"],
-      _excluded2$i = ["allowClear"],
-      _excluded3$5 = ["allowClear"];
+  var _excluded$1i = ["className", "size", "disabled", "allowClear"],
+      _excluded2$i = ["allowClear", "className"],
+      _excluded3$5 = ["allowClear", "className"];
   var LmInput = /*#__PURE__*/React.forwardRef(function (props, ref) {
-    var _props$allowClear = props.allowClear,
+    var className = props.className,
+        customSize = props.size,
+        customDisabled = props.disabled,
+        _props$allowClear = props.allowClear,
         allowClear = _props$allowClear === void 0 ? true : _props$allowClear,
-        customizeSize = props.size,
-        rest = _objectWithoutProperties$1(props, _excluded$1i);
+        rest = _objectWithoutProperties$1(props, _excluded$1i); // ===================== Size =====================
+
 
-    var size = customizeSize || React__default['default'].useContext(SizeContext$1) || 'middle';
+    var size = customSize || React__default['default'].useContext(SizeContext$1) || 'middle'; // ===================== Disabled =====================
+
+    var disabled = React__default['default'].useContext(DisabledContext$1);
+    var mergedDisabled = customDisabled || disabled;
     return /*#__PURE__*/React__default['default'].createElement(Input$3, _objectSpread(_objectSpread({
       ref: ref,
-      className: "lm_input",
+      className: classnames('lm_input', className),
+      disabled: mergedDisabled || undefined,
       size: size
     }, rest), {}, {
       allowClear: allowClear
@@ -188487,6 +188496,7 @@
   LmInput.Search = /*#__PURE__*/React.forwardRef(function (props, ref) {
     var _props$allowClear2 = props.allowClear,
         allowClear = _props$allowClear2 === void 0 ? true : _props$allowClear2,
+        className = props.className,
         rest = _objectWithoutProperties$1(props, _excluded2$i);
 
     return /*#__PURE__*/React__default['default'].createElement(Input$3.Search, _objectSpread(_objectSpread({
@@ -188496,7 +188506,7 @@
     }, rest), {}, {
       ref: ref,
       allowClear: allowClear,
-      className: "lm_input_search"
+      className: classnames('lm_input_search', className)
     }));
   });
   LmInput.TextArea = Input$3.TextArea;
@@ -188504,10 +188514,11 @@
   LmInput.Password = function (props) {
     var _props$allowClear3 = props.allowClear,
         allowClear = _props$allowClear3 === void 0 ? true : _props$allowClear3,
+        className = props.className,
         rest = _objectWithoutProperties$1(props, _excluded3$5);
 
     return /*#__PURE__*/React__default['default'].createElement(Input$3.Password, _objectSpread(_objectSpread({
-      className: "lm_input_password",
+      className: classnames('lm_input_password', className),
       iconRender: function iconRender(visible) {
         return visible ? /*#__PURE__*/React__default['default'].createElement(IconFont, {
           type: "lmweb-eye"
@@ -188520,18 +188531,23 @@
     }));
   };
 
-  var _excluded$1j = ["children", "className"];
+  var _excluded$1j = ["children", "className", "disabled"];
   var prefixCls$3 = 'lm_input-number';
 
   var LMInputNumber = function LMInputNumber(props) {
     var children = props.children,
         className = props.className,
-        others = _objectWithoutProperties$1(props, _excluded$1j);
+        customDisabled = props.disabled,
+        rest = _objectWithoutProperties$1(props, _excluded$1j); // ===================== Disabled =====================
+
 
+    var disabled = React__default['default'].useContext(DisabledContext$1);
+    var mergedDisabled = customDisabled || disabled;
     return /*#__PURE__*/React__default['default'].createElement(InputNumber$1, _objectSpread({
       className: classnames(className, prefixCls$3),
+      disabled: mergedDisabled,
       placeholder: "\u8BF7\u8F93\u5165"
-    }, others));
+    }, rest));
   };
 
   var CInputNumber = LMInputNumber;
@@ -285576,6 +285592,71 @@
     }), fixedColumns.fixedRight);
   });
 
+  // 分组求和计算
+  function calcExpression(item, needCalcKeys) {
+    var _item$children;
+
+    if (item === null || item === void 0 ? void 0 : (_item$children = item.children) === null || _item$children === void 0 ? void 0 : _item$children.length) {
+      needCalcKeys.forEach(function (dkey) {
+        var sum = 0;
+
+        var _dkey = _slicedToArray$1(dkey, 2),
+            key = _dkey[0],
+            expression = _dkey[1];
+
+        item.children.forEach(function (subItem) {
+          if (key in subItem) {
+            sum += Number(subItem[key]);
+          }
+        });
+
+        if (!sum) {
+          return;
+        }
+
+        if (expression === 'sum') {
+          item[key] = sum;
+        } else if (expression === 'average') {
+          item[key] = sum / item.children.length;
+        }
+      });
+    }
+  }
+
+  /** 行分组 */
+
+  function useGroupDataSource(_ref) {
+    var groupRowKeys = _ref.groupRowKeys,
+        customizeDataSource = _ref.customizeDataSource,
+        columnsRef = _ref.columnsRef;
+    var groupDataSource = React.useMemo(function () {
+      if (!(groupRowKeys === null || groupRowKeys === void 0 ? void 0 : groupRowKeys.length)) {
+        return customizeDataSource;
+      }
+
+      var source = transformWithRowGroup(customizeDataSource, groupRowKeys); // 获取需要计算的key，生成数组
+
+      var needCalcKeys = columnsRef.current.filter(function (col) {
+        return col.expression;
+      }).map(function (col) {
+        return [col.dataIndex, col.expression];
+      });
+
+      var deepChildren = function deepChildren(arr) {
+        arr === null || arr === void 0 ? void 0 : arr.forEach(function (item) {
+          if (item === null || item === void 0 ? void 0 : item.children) {
+            deepChildren(item === null || item === void 0 ? void 0 : item.children);
+            calcExpression(item, needCalcKeys);
+          }
+        });
+      };
+
+      deepChildren(source);
+      return source;
+    }, [customizeDataSource, groupRowKeys]);
+    return [groupDataSource];
+  }
+
   var _excluded$29 = ["columns", "dataSource", "autoSize", "rowClick", "onDoubleClick", "checkConfig", "summary", "pagination", "hiddenPage", "loading", "virtual", "sortOpen", "colSortOpen", "resizeable", "customCheck", "components", "rowSelection", "columnsState", "onChange", "filterChange", "tableRowType", "size", "openSheet", "editSheet", "dataChange", "groupRowKeys", "groupColKeys", "emptyProps"],
       _excluded2$w = ["className", "style"],
       _excluded3$7 = ["onResize", "width", "onResizeStop"];
@@ -285712,15 +285793,16 @@
     }, [customizeColumns]);
     /** 行分组 */
 
-    var groupDataSource = React.useMemo(function () {
-      if (!(groupRowKeys === null || groupRowKeys === void 0 ? void 0 : groupRowKeys.length)) {
-        return customizeDataSource;
-      }
-
-      return transformWithRowGroup(customizeDataSource, groupRowKeys);
-    }, [customizeDataSource, groupRowKeys]);
+    var _useGroupDataSource = useGroupDataSource({
+      groupRowKeys: groupRowKeys,
+      customizeDataSource: customizeDataSource,
+      columnsRef: columnsRef
+    }),
+        _useGroupDataSource2 = _slicedToArray$1(_useGroupDataSource, 1),
+        groupDataSource = _useGroupDataSource2[0];
     /** 列分组 */
 
+
     var _useMemo = React.useMemo(function () {
       if (!(groupColKeys === null || groupColKeys === void 0 ? void 0 : groupColKeys.length)) {
         return {
@@ -288113,19 +288195,24 @@
 
   LMRadio.Button = Radio$1.Button;
 
-  var _excluded$2h = ["children", "className", "size", "dropdownClassName", "options", "value", "defaultLabel"];
+  var _excluded$2h = ["children", "className", "size", "disabled", "dropdownClassName", "options", "value", "defaultLabel"];
   var prefixCls$7 = 'lm_select';
   var CLMSelect$1 = /*#__PURE__*/React.forwardRef(function (props, ref) {
     var children = props.children,
         className = props.className,
         customizeSize = props.size,
+        customDisabled = props.disabled,
         dropdownClassName = props.dropdownClassName,
         options = props.options,
         value = props.value,
         defaultLabel = props.defaultLabel,
-        others = _objectWithoutProperties$1(props, _excluded$2h);
+        rest = _objectWithoutProperties$1(props, _excluded$2h); // ===================== Size =====================
+
+
+    var size = customizeSize || React__default['default'].useContext(SizeContext$1) || 'middle'; // ===================== Disabled =====================
 
-    var size = customizeSize || React__default['default'].useContext(SizeContext$1) || 'middle'; // 当前值是否存于选项中
+    var disabled = React__default['default'].useContext(DisabledContext$1);
+    var mergedDisabled = customDisabled || disabled; // 当前值是否存于选项中
 
     var hasOption = React.useMemo(function () {
       var flag = false;
@@ -288162,8 +288249,9 @@
       size: size,
       ref: ref,
       value: resetValue,
-      options: options
-    }, others), {}, {
+      options: options,
+      disabled: mergedDisabled || undefined
+    }, rest), {}, {
       dropdownClassName: classnames('lm_select_dropdown', dropdownClassName)
     }), children);
   });
@@ -312352,7 +312440,7 @@
           fontSize: 16
         }
       })
-    })) : /*#__PURE__*/React__default['default'].createElement(LMButton, {
+    })) : (options === null || options === void 0 ? void 0 : options.includes('add')) || (options === null || options === void 0 ? void 0 : options.includes('addInChildren')) ? /*#__PURE__*/React__default['default'].createElement(LMButton, {
       type: "link",
       size: "small",
       icon: /*#__PURE__*/React__default['default'].createElement(IconFont, {
@@ -312364,7 +312452,7 @@
       onClick: function onClick() {
         return handleAdd(record, (options === null || options === void 0 ? void 0 : options.includes('addInChildren')) ? true : false);
       }
-    }));
+    }) : null);
   }; // const isValidValue = (verifyValue) => {
   //   const toStringValue = JSON.stringify(verifyValue);
   //   if (verifyValue === undefined || verifyValue === null || verifyValue === '' || toStringValue === '[]' || toStringValue === '{}') {
@@ -324366,7 +324454,7 @@
   exports.LeftTable = LeftSide;
   exports.List = List$2;
   exports.LmEditTable = LmEditTable;
-  exports.LmFilter = LmFilter$2;
+  exports.LmFilter = LmFilter$1;
   exports.LmImgList = LmImgList;
   exports.LmSelect = LMSelect;
   exports.LmTable = Table$2;