linkmore-design 1.1.13 → 1.1.15

package/lib/LmTable/Table.js

@@ -61,6 +61,8 @@ var _resetConfig = _interopRequireDefault(require("./resetConfig"));
 
 var _virTual = require("./virTual");
 
+var _useGroupDataSource3 = _interopRequireDefault(require("./hooks/useGroupDataSource"));
+
 var _excluded = ["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 = ["className", "style"],
     _excluded3 = ["onResize", "width", "onResizeStop"];
@@ -197,15 +199,16 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
   }, [customizeColumns]);
   /** 行分组 */
 
-  var groupDataSource = (0, _react.useMemo)(function () {
-    if (!(groupRowKeys === null || groupRowKeys === void 0 ? void 0 : groupRowKeys.length)) {
-      return customizeDataSource;
-    }
-
-    return (0, _util.transformWithRowGroup)(customizeDataSource, groupRowKeys);
-  }, [customizeDataSource, groupRowKeys]);
+  var _useGroupDataSource = (0, _useGroupDataSource3.default)({
+    groupRowKeys: groupRowKeys,
+    customizeDataSource: customizeDataSource,
+    columnsRef: columnsRef
+  }),
+      _useGroupDataSource2 = (0, _slicedToArray2.default)(_useGroupDataSource, 1),
+      groupDataSource = _useGroupDataSource2[0];
   /** 列分组 */
 
+
   var _useMemo = (0, _react.useMemo)(function () {
     if (!(groupColKeys === null || groupColKeys === void 0 ? void 0 : groupColKeys.length)) {
       return {

package/lib/LmTable/expression.d.ts

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

package/lib/LmTable/expression.js

@@ -0,0 +1,41 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = calcExpression;
+
+var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
+
+// 分组求和计算
+function calcExpression(item, needCalcKeys) {
+  var _a;
+
+  if ((_a = item === null || item === void 0 ? void 0 : item.children) === null || _a === void 0 ? void 0 : _a.length) {
+    needCalcKeys.forEach(function (dkey) {
+      var sum = 0;
+
+      var _dkey = (0, _slicedToArray2.default)(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;
+      }
+    });
+  }
+}

package/lib/LmTable/hooks/useGroupDataSource.js

@@ -0,0 +1,50 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+
+var _react = require("react");
+
+var _util = require("../util");
+
+var _expression = _interopRequireDefault(require("../expression"));
+
+/** 行分组 */
+function useGroupDataSource(_ref) {
+  var groupRowKeys = _ref.groupRowKeys,
+      customizeDataSource = _ref.customizeDataSource,
+      columnsRef = _ref.columnsRef;
+  var groupDataSource = (0, _react.useMemo)(function () {
+    if (!(groupRowKeys === null || groupRowKeys === void 0 ? void 0 : groupRowKeys.length)) {
+      return customizeDataSource;
+    }
+
+    var source = (0, _util.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);
+          (0, _expression.default)(item, needCalcKeys);
+        }
+      });
+    };
+
+    deepChildren(source);
+    return source;
+  }, [customizeDataSource, groupRowKeys]);
+  return [groupDataSource];
+}
+
+var _default = useGroupDataSource;
+exports.default = _default;

package/lib/LmUpload/fns/index.js

@@ -61,16 +61,21 @@ var useCoreOptions = function useCoreOptions(_ref) {
       fileAreaSize = props.fileAreaSize,
       enabledOss = props.enabledOss,
       enableCrop = props.enableCrop,
-      ossConfig = props.ossConfig; // 获取两个对象是否存在指定值相等
+      ossConfig = props.ossConfig;
+  /* 获取两个对象是否存在指定值相等
+   * 取用户定义的列字段，如果读取不到则取'fileName'对比
+   */
 
   var getHasEqual = (0, _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 = (0, _react.useCallback)(function (obj) {
     var extend = [uid, 'fileName'];

package/lib/Select/index.js

@@ -19,6 +19,8 @@ var _classnames = _interopRequireDefault(require("classnames"));
 
 var _SizeContext = _interopRequireDefault(require("../ConfigProvider/SizeContext"));
 
+var _DisabledContext = _interopRequireDefault(require("../ConfigProvider/DisabledContext"));
+
 var __rest = void 0 && (void 0).__rest || function (s, e) {
   var t = {};
 
@@ -37,13 +39,20 @@ var CLMSelect = /*#__PURE__*/(0, _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 = __rest(props, ["children", "className", "size", "dropdownClassName", "options", "value", "defaultLabel"]);
+      rest = __rest(props // ===================== Size =====================
+  , ["children", "className", "size", "disabled", "dropdownClassName", "options", "value", "defaultLabel"]); // ===================== Size =====================
+
+
+  var size = customizeSize || _react.default.useContext(_SizeContext.default) || 'middle'; // ===================== Disabled =====================
+
+  var disabled = _react.default.useContext(_DisabledContext.default);
 
-  var size = customizeSize || _react.default.useContext(_SizeContext.default) || 'middle'; // 当前值是否存于选项中
+  var mergedDisabled = customDisabled || disabled; // 当前值是否存于选项中
 
   var hasOption = (0, _react.useMemo)(function () {
     var flag = false;
@@ -80,8 +89,9 @@ var CLMSelect = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
     size: size,
     ref: ref,
     value: resetValue,
-    options: options
-  }, others, {
+    options: options,
+    disabled: mergedDisabled || undefined
+  }, rest, {
     dropdownClassName: (0, _classnames.default)('lm_select_dropdown', dropdownClassName)
   }), children);
 });

package/lib/styles/variables.css

@@ -9001,6 +9001,9 @@ p {
 .lm_container_wrapper .lm_container.responsive.lm_col_5 .ant-form-item-responsive.nth-five {
   margin-right: 0;
 }
+.lm_container_wrapper .lm_container.responsive .ant-cascader {
+  width: 100%;
+}
 .lm_form-item-tip-error .ant-form-item-explain {
   width: 100%;
   position: absolute;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "linkmore-design",
-  "version": "1.1.13",
+  "version": "1.1.15",
   "author": {
     "name": "nowthen",
     "email": "rnlvwyx@gmail.com"