acud 0.0.73 → 0.0.74

package/es/card/Card.js

@@ -78,7 +78,9 @@ var Card = function Card(_a) {
       hoverable = _a.hoverable,
       _a$tabProps = _a.tabProps,
       tabProps = _a$tabProps === void 0 ? {} : _a$tabProps,
-      restProps = __rest(_a, ["prefixCls", "simple", "description", "disabled", "footerExtra", "footerStyle", "children", "loading", "headStyle", "bodyStyle", "style", "bordered", "type", "title", "extra", "cover", "actions", "actionsExtra", "multiMedia", "multiMediaPosition", "tabList", "activeTabKey", "defaultActiveTabKey", "tabBarExtraContent", "hoverable", "tabProps"]);
+      _a$className = _a.className,
+      className = _a$className === void 0 ? '' : _a$className,
+      restProps = __rest(_a, ["prefixCls", "simple", "description", "disabled", "footerExtra", "footerStyle", "children", "loading", "headStyle", "bodyStyle", "style", "bordered", "type", "title", "extra", "cover", "actions", "actionsExtra", "multiMedia", "multiMediaPosition", "tabList", "activeTabKey", "defaultActiveTabKey", "tabBarExtraContent", "hoverable", "tabProps", "className"]);
 
   var _React$useContext = React.useContext(ConfigContext),
       getPrefixCls = _React$useContext.getPrefixCls,
@@ -226,7 +228,7 @@ var Card = function Card(_a) {
   }, multiMedia), /*#__PURE__*/React.createElement("div", {
     className: "".concat(cardPrefixCls, "-con-wrap ").concat(multiMedia ? "".concat(multiMediaPosition === 'left' ? 'right' : 'left') : '')
   }, head, coverDom, body, footer, actionRender));
-  var classString = classNames(cardPrefixCls, (_classNames3 = {}, _defineProperty(_classNames3, "".concat(cardPrefixCls, "-loading"), loading), _defineProperty(_classNames3, "".concat(cardPrefixCls, "-bordered"), bordered), _defineProperty(_classNames3, "".concat(cardPrefixCls, "-hoverable"), hoverable), _defineProperty(_classNames3, "".concat(cardPrefixCls, "-contain-grid"), isContainGrid()), _defineProperty(_classNames3, "".concat(cardPrefixCls, "-contain-tabs"), tabList && tabList.length), _defineProperty(_classNames3, "".concat(cardPrefixCls, "-type-").concat(type), !!type), _defineProperty(_classNames3, "".concat(cardPrefixCls, "-rtl"), direction === 'rtl'), _defineProperty(_classNames3, "".concat(cardPrefixCls, "-simple"), simple), _defineProperty(_classNames3, "".concat(cardPrefixCls, "-selected"), isSelected), _classNames3));
+  var classString = classNames(cardPrefixCls, (_classNames3 = {}, _defineProperty(_classNames3, "".concat(cardPrefixCls, "-loading"), loading), _defineProperty(_classNames3, "".concat(cardPrefixCls, "-bordered"), bordered), _defineProperty(_classNames3, "".concat(cardPrefixCls, "-hoverable"), hoverable), _defineProperty(_classNames3, "".concat(cardPrefixCls, "-contain-grid"), isContainGrid()), _defineProperty(_classNames3, "".concat(cardPrefixCls, "-contain-tabs"), tabList && tabList.length), _defineProperty(_classNames3, "".concat(cardPrefixCls, "-type-").concat(type), !!type), _defineProperty(_classNames3, "".concat(cardPrefixCls, "-rtl"), direction === 'rtl'), _defineProperty(_classNames3, "".concat(cardPrefixCls, "-simple"), simple), _defineProperty(_classNames3, "".concat(cardPrefixCls, "-selected"), isSelected), _defineProperty(_classNames3, className, !!className), _classNames3));
   return /*#__PURE__*/React.createElement("div", {
     className: classString,
     disabled: simple && disabled,

package/es/cascader/index.js

@@ -21,6 +21,7 @@ var __rest = this && this.__rest || function (s, e) {
 };
 
 import get from 'lodash/get';
+import map from 'lodash/map';
 import first from 'lodash/first';
 import isEqual from 'lodash/isEqual';
 import React, { useImperativeHandle, forwardRef, useRef, useCallback, useMemo, useState, useEffect, useLayoutEffect, Fragment } from 'react';
@@ -400,7 +401,7 @@ var Cascader = function Cascader(props, ref) {
     var names = getFilledFieldNames(props);
 
     if (isMulti) {
-      var _selectedOptions = value.map(function (valueItem) {
+      var _selectedOptions = map(value, function (valueItem) {
         return arrayTreeFilter(options, function (o, level) {
           return o[names.value] === valueItem[level];
         }, {
@@ -414,7 +415,7 @@ var Cascader = function Cascader(props, ref) {
         });
       }) : value;
 
-      return _label.map(function (labelItem) {
+      return map(_label, function (labelItem) {
         return displayRender(labelItem, _selectedOptions);
       });
     }

package/es/progress/CircleProgress.js

@@ -18,6 +18,7 @@ var CircleProgress = function CircleProgress(_ref) {
       status = _ref.status,
       size = _ref.size,
       strokeColor = _ref.strokeColor,
+      iconStrokeColor = _ref.iconStrokeColor,
       _ref$infoType = _ref.infoType,
       infoType = _ref$infoType === void 0 ? 'text' : _ref$infoType,
       trailColor = _ref.trailColor,
@@ -82,13 +83,13 @@ var CircleProgress = function CircleProgress(_ref) {
       ProgressLabel = /*#__PURE__*/React.createElement(OutlinedCheck, {
         className: labelClassNames,
         width: iconWidth,
-        fill: strokeColor
+        fill: iconStrokeColor
       });
     } else if (status === 'error') {
       ProgressLabel = /*#__PURE__*/React.createElement(OutlinedClose, {
         className: labelClassNames,
         width: iconWidth,
-        fill: strokeColor
+        fill: iconStrokeColor
       });
     }
   }

package/es/progress/LineProgress.js

@@ -19,6 +19,7 @@ var LineProgress = function LineProgress(_ref) {
       status = _ref.status,
       size = _ref.size,
       strokeColor = _ref.strokeColor,
+      iconStrokeColor = _ref.iconStrokeColor,
       _ref$infoType = _ref.infoType,
       infoType = _ref$infoType === void 0 ? 'text' : _ref$infoType,
       trailColor = _ref.trailColor,
@@ -70,13 +71,13 @@ var LineProgress = function LineProgress(_ref) {
     if (status === 'success') {
       ProgressLabel = /*#__PURE__*/React.createElement(MultiToneSuccess, {
         className: labelClassNames,
-        color: strokeColor,
+        color: iconStrokeColor,
         width: "16px"
       });
     } else if (status === 'error') {
       ProgressLabel = /*#__PURE__*/React.createElement(MultiToneError, {
         className: labelClassNames,
-        color: strokeColor,
+        color: iconStrokeColor,
         width: "16px"
       });
     }

package/es/progress/index.js

@@ -54,7 +54,8 @@ var Progress = function Progress(_a) {
 
   var status = customizeStatus in statusColorMap ? customizeStatus : 'active'; // strokeColor取值异常时，将使用status对应的颜色
 
-  var strokeColor = isHexColor(customizeStrokeColor) ? customizeStrokeColor : statusColorMap[status]; // 解构进度100时的样式
+  var strokeColor = isHexColor(customizeStrokeColor) ? customizeStrokeColor : '';
+  var iconStrokeColor = strokeColor || statusColorMap[status]; // 解构进度100时的样式
 
   var successStrokeColor = successStyle.strokeColor,
       successTextColor = successStyle.textColor,
@@ -75,6 +76,7 @@ var Progress = function Progress(_a) {
     size: size,
     status: status,
     strokeColor: strokeColor,
+    iconStrokeColor: iconStrokeColor,
     textColor: textColor,
     textSize: textSize,
     labelText: labelText,

package/es/progress/interface.d.ts

@@ -25,6 +25,7 @@ export interface ProgressProps {
     strokeWidth?: number;
     strokeRatio?: number;
     strokeColor?: string;
+    iconStrokeColor?: string;
     strokeLinecap?: ProgressStrokeLinecap;
     trailColor?: string;
     textColor?: string;

package/es/tree/tree.js

@@ -352,6 +352,11 @@ var Tree = /*#__PURE__*/React.forwardRef(function (props, ref) {
 
   if (treeDataOrigin) {
     newProps.treeData = formatedTreeData;
+  } // expandedKeys和defaultExpandAll冲突需动态赋值
+
+
+  if (expandedKeys.length) {
+    newProps.expandedKeys = expandedKeys;
   }
 
   useEffect(function () {
@@ -362,7 +367,7 @@ var Tree = /*#__PURE__*/React.forwardRef(function (props, ref) {
   return /*#__PURE__*/React.createElement(React.Fragment, null, searchable && /*#__PURE__*/React.createElement(Input, {
     className: "".concat(prefixCls, "-search-input"),
     onChange: onSearchInputChange
-  }), !expandedKeys.length && searchText ? "\u672A\u627E\u5230\u4E0E".concat(searchText, "\u76F8\u5173\u7684\u7ED3\u679C") : /*#__PURE__*/React.createElement(RcTree, _extends({
+  }), !expandedKeys.length && searchText ? "\u672A\u627E\u5230\u4E0E".concat(searchText, "\u76F8\u5173\u7684\u7ED3\u679C") : (!treeDataOrigin || !!formatedTreeData.length) && /*#__PURE__*/React.createElement(RcTree, _extends({
     ref: treeRef
   }, newProps, {
     className: classes,
@@ -373,7 +378,6 @@ var Tree = /*#__PURE__*/React.forwardRef(function (props, ref) {
     checkable: checkable ? /*#__PURE__*/React.createElement("span", {
       className: "".concat(prefixCls, "-checkbox-inner")
     }) : checkable,
-    expandedKeys: expandedKeys,
     autoExpandParent: autoExpandParent,
     switcherIcon: function switcherIcon(nodeProps) {
       return renderSwitcherIcon(prefixCls, nodeProps);

package/es/upload/style/index.css

@@ -130,7 +130,7 @@
   border-color: #144BCC;
 }
 .acud-upload.acud-upload-drag.acud-upload-disabled {
-  background: #fafafa;
+  background: #F7F7F9;
   cursor: not-allowed;
 }
 .acud-upload.acud-upload-drag .acud-upload-btn {
@@ -546,9 +546,11 @@
 .acud-upload-list-picture-card .acud-upload-list-item-progress {
   position: absolute;
   top: 44px;
+  left: 50%;
   padding-left: 8px;
   padding-right: 8px;
-  width: 100%;
+  width: 96px;
+  transform: translateX(-50%);
 }
 .acud-upload-list-text-container,
 .acud-upload-list-picture-container {

package/es/upload/style/index.less

@@ -104,7 +104,7 @@
             }
         }
         &.@{upload-prefix-cls}-disabled {
-            background: @background-color-light;
+            background: @G10;
             cursor: not-allowed;
         }
 
@@ -540,10 +540,12 @@
 
         .@{upload-item}-progress {
             position: absolute;
-            top: 44px;
-            padding-left: 8px;
-            padding-right: 8px;
-            width: 100%;
+            top: 11 * @P;
+            left: 50%;
+            padding-left: 2 * @P;
+            padding-right: 2 * @P;
+            width: 24 * @P;
+            transform: translateX(-50%);
         }
     }
 

package/lib/card/Card.js

@@ -105,7 +105,9 @@ var Card = function Card(_a) {
       hoverable = _a.hoverable,
       _a$tabProps = _a.tabProps,
       tabProps = _a$tabProps === void 0 ? {} : _a$tabProps,
-      restProps = __rest(_a, ["prefixCls", "simple", "description", "disabled", "footerExtra", "footerStyle", "children", "loading", "headStyle", "bodyStyle", "style", "bordered", "type", "title", "extra", "cover", "actions", "actionsExtra", "multiMedia", "multiMediaPosition", "tabList", "activeTabKey", "defaultActiveTabKey", "tabBarExtraContent", "hoverable", "tabProps"]);
+      _a$className = _a.className,
+      className = _a$className === void 0 ? '' : _a$className,
+      restProps = __rest(_a, ["prefixCls", "simple", "description", "disabled", "footerExtra", "footerStyle", "children", "loading", "headStyle", "bodyStyle", "style", "bordered", "type", "title", "extra", "cover", "actions", "actionsExtra", "multiMedia", "multiMediaPosition", "tabList", "activeTabKey", "defaultActiveTabKey", "tabBarExtraContent", "hoverable", "tabProps", "className"]);
 
   var _React$useContext = _react["default"].useContext(_configProvider.ConfigContext),
       getPrefixCls = _React$useContext.getPrefixCls,
@@ -258,7 +260,7 @@ var Card = function Card(_a) {
     className: "".concat(cardPrefixCls, "-con-wrap ").concat(multiMedia ? "".concat(multiMediaPosition === 'left' ? 'right' : 'left') : '')
   }, head, coverDom, body, footer, actionRender));
 
-  var classString = (0, _classnames["default"])(cardPrefixCls, (_classNames3 = {}, (0, _defineProperty2["default"])(_classNames3, "".concat(cardPrefixCls, "-loading"), loading), (0, _defineProperty2["default"])(_classNames3, "".concat(cardPrefixCls, "-bordered"), bordered), (0, _defineProperty2["default"])(_classNames3, "".concat(cardPrefixCls, "-hoverable"), hoverable), (0, _defineProperty2["default"])(_classNames3, "".concat(cardPrefixCls, "-contain-grid"), isContainGrid()), (0, _defineProperty2["default"])(_classNames3, "".concat(cardPrefixCls, "-contain-tabs"), tabList && tabList.length), (0, _defineProperty2["default"])(_classNames3, "".concat(cardPrefixCls, "-type-").concat(type), !!type), (0, _defineProperty2["default"])(_classNames3, "".concat(cardPrefixCls, "-rtl"), direction === 'rtl'), (0, _defineProperty2["default"])(_classNames3, "".concat(cardPrefixCls, "-simple"), simple), (0, _defineProperty2["default"])(_classNames3, "".concat(cardPrefixCls, "-selected"), isSelected), _classNames3));
+  var classString = (0, _classnames["default"])(cardPrefixCls, (_classNames3 = {}, (0, _defineProperty2["default"])(_classNames3, "".concat(cardPrefixCls, "-loading"), loading), (0, _defineProperty2["default"])(_classNames3, "".concat(cardPrefixCls, "-bordered"), bordered), (0, _defineProperty2["default"])(_classNames3, "".concat(cardPrefixCls, "-hoverable"), hoverable), (0, _defineProperty2["default"])(_classNames3, "".concat(cardPrefixCls, "-contain-grid"), isContainGrid()), (0, _defineProperty2["default"])(_classNames3, "".concat(cardPrefixCls, "-contain-tabs"), tabList && tabList.length), (0, _defineProperty2["default"])(_classNames3, "".concat(cardPrefixCls, "-type-").concat(type), !!type), (0, _defineProperty2["default"])(_classNames3, "".concat(cardPrefixCls, "-rtl"), direction === 'rtl'), (0, _defineProperty2["default"])(_classNames3, "".concat(cardPrefixCls, "-simple"), simple), (0, _defineProperty2["default"])(_classNames3, "".concat(cardPrefixCls, "-selected"), isSelected), (0, _defineProperty2["default"])(_classNames3, className, !!className), _classNames3));
   return /*#__PURE__*/_react["default"].createElement("div", {
     className: classString,
     disabled: simple && disabled,

package/lib/cascader/index.js

@@ -19,6 +19,8 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/de
 
 var _get = _interopRequireDefault(require("lodash/get"));
 
+var _map = _interopRequireDefault(require("lodash/map"));
+
 var _first = _interopRequireDefault(require("lodash/first"));
 
 var _isEqual = _interopRequireDefault(require("lodash/isEqual"));
@@ -444,7 +446,7 @@ var Cascader = function Cascader(props, ref) {
     var names = getFilledFieldNames(props);
 
     if (isMulti) {
-      var _selectedOptions = value.map(function (valueItem) {
+      var _selectedOptions = (0, _map["default"])(value, function (valueItem) {
         return (0, _arrayTreeFilter["default"])(options, function (o, level) {
           return o[names.value] === valueItem[level];
         }, {
@@ -458,7 +460,7 @@ var Cascader = function Cascader(props, ref) {
         });
       }) : value;
 
-      return _label.map(function (labelItem) {
+      return (0, _map["default"])(_label, function (labelItem) {
         return displayRender(labelItem, _selectedOptions);
       });
     }

package/lib/progress/CircleProgress.js

@@ -31,6 +31,7 @@ var CircleProgress = function CircleProgress(_ref) {
       status = _ref.status,
       size = _ref.size,
       strokeColor = _ref.strokeColor,
+      iconStrokeColor = _ref.iconStrokeColor,
       _ref$infoType = _ref.infoType,
       infoType = _ref$infoType === void 0 ? 'text' : _ref$infoType,
       trailColor = _ref.trailColor,
@@ -96,13 +97,13 @@ var CircleProgress = function CircleProgress(_ref) {
       ProgressLabel = /*#__PURE__*/_react["default"].createElement(_acudIcon.OutlinedCheck, {
         className: labelClassNames,
         width: iconWidth,
-        fill: strokeColor
+        fill: iconStrokeColor
       });
     } else if (status === 'error') {
       ProgressLabel = /*#__PURE__*/_react["default"].createElement(_acudIcon.OutlinedClose, {
         className: labelClassNames,
         width: iconWidth,
-        fill: strokeColor
+        fill: iconStrokeColor
       });
     }
   }

package/lib/progress/LineProgress.js

@@ -31,6 +31,7 @@ var LineProgress = function LineProgress(_ref) {
       status = _ref.status,
       size = _ref.size,
       strokeColor = _ref.strokeColor,
+      iconStrokeColor = _ref.iconStrokeColor,
       _ref$infoType = _ref.infoType,
       infoType = _ref$infoType === void 0 ? 'text' : _ref$infoType,
       trailColor = _ref.trailColor,
@@ -84,13 +85,13 @@ var LineProgress = function LineProgress(_ref) {
     if (status === 'success') {
       ProgressLabel = /*#__PURE__*/_react["default"].createElement(_acudIcon.MultiToneSuccess, {
         className: labelClassNames,
-        color: strokeColor,
+        color: iconStrokeColor,
         width: "16px"
       });
     } else if (status === 'error') {
       ProgressLabel = /*#__PURE__*/_react["default"].createElement(_acudIcon.MultiToneError, {
         className: labelClassNames,
-        color: strokeColor,
+        color: iconStrokeColor,
         width: "16px"
       });
     }

package/lib/progress/index.js

@@ -74,7 +74,8 @@ var Progress = function Progress(_a) {
 
   var status = customizeStatus in _common.statusColorMap ? customizeStatus : 'active'; // strokeColor取值异常时，将使用status对应的颜色
 
-  var strokeColor = (0, _common.isHexColor)(customizeStrokeColor) ? customizeStrokeColor : _common.statusColorMap[status]; // 解构进度100时的样式
+  var strokeColor = (0, _common.isHexColor)(customizeStrokeColor) ? customizeStrokeColor : '';
+  var iconStrokeColor = strokeColor || _common.statusColorMap[status]; // 解构进度100时的样式
 
   var successStrokeColor = successStyle.strokeColor,
       successTextColor = successStyle.textColor,
@@ -95,6 +96,7 @@ var Progress = function Progress(_a) {
     size: size,
     status: status,
     strokeColor: strokeColor,
+    iconStrokeColor: iconStrokeColor,
     textColor: textColor,
     textSize: textSize,
     labelText: labelText,

package/lib/progress/interface.d.ts

@@ -25,6 +25,7 @@ export interface ProgressProps {
     strokeWidth?: number;
     strokeRatio?: number;
     strokeColor?: string;
+    iconStrokeColor?: string;
     strokeLinecap?: ProgressStrokeLinecap;
     trailColor?: string;
     textColor?: string;

package/lib/tree/tree.js

@@ -381,6 +381,11 @@ var Tree = /*#__PURE__*/_react["default"].forwardRef(function (props, ref) {
 
   if (treeDataOrigin) {
     newProps.treeData = formatedTreeData;
+  } // expandedKeys和defaultExpandAll冲突需动态赋值
+
+
+  if (expandedKeys.length) {
+    newProps.expandedKeys = expandedKeys;
   }
 
   (0, _react.useEffect)(function () {
@@ -391,7 +396,7 @@ var Tree = /*#__PURE__*/_react["default"].forwardRef(function (props, ref) {
   return /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, searchable && /*#__PURE__*/_react["default"].createElement(_input["default"], {
     className: "".concat(prefixCls, "-search-input"),
     onChange: onSearchInputChange
-  }), !expandedKeys.length && searchText ? "\u672A\u627E\u5230\u4E0E".concat(searchText, "\u76F8\u5173\u7684\u7ED3\u679C") : /*#__PURE__*/_react["default"].createElement(_rcTree["default"], (0, _extends2["default"])({
+  }), !expandedKeys.length && searchText ? "\u672A\u627E\u5230\u4E0E".concat(searchText, "\u76F8\u5173\u7684\u7ED3\u679C") : (!treeDataOrigin || !!formatedTreeData.length) && /*#__PURE__*/_react["default"].createElement(_rcTree["default"], (0, _extends2["default"])({
     ref: treeRef
   }, newProps, {
     className: classes,
@@ -402,7 +407,6 @@ var Tree = /*#__PURE__*/_react["default"].forwardRef(function (props, ref) {
     checkable: checkable ? /*#__PURE__*/_react["default"].createElement("span", {
       className: "".concat(prefixCls, "-checkbox-inner")
     }) : checkable,
-    expandedKeys: expandedKeys,
     autoExpandParent: autoExpandParent,
     switcherIcon: function switcherIcon(nodeProps) {
       return (0, _iconHelper.renderSwitcherIcon)(prefixCls, nodeProps);

package/lib/upload/style/index.css

@@ -130,7 +130,7 @@
   border-color: #144BCC;
 }
 .acud-upload.acud-upload-drag.acud-upload-disabled {
-  background: #fafafa;
+  background: #F7F7F9;
   cursor: not-allowed;
 }
 .acud-upload.acud-upload-drag .acud-upload-btn {
@@ -546,9 +546,11 @@
 .acud-upload-list-picture-card .acud-upload-list-item-progress {
   position: absolute;
   top: 44px;
+  left: 50%;
   padding-left: 8px;
   padding-right: 8px;
-  width: 100%;
+  width: 96px;
+  transform: translateX(-50%);
 }
 .acud-upload-list-text-container,
 .acud-upload-list-picture-container {

package/lib/upload/style/index.less

@@ -104,7 +104,7 @@
             }
         }
         &.@{upload-prefix-cls}-disabled {
-            background: @background-color-light;
+            background: @G10;
             cursor: not-allowed;
         }
 
@@ -540,10 +540,12 @@
 
         .@{upload-item}-progress {
             position: absolute;
-            top: 44px;
-            padding-left: 8px;
-            padding-right: 8px;
-            width: 100%;
+            top: 11 * @P;
+            left: 50%;
+            padding-left: 2 * @P;
+            padding-right: 2 * @P;
+            width: 24 * @P;
+            transform: translateX(-50%);
         }
     }
 

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "acud",
-    "version": "0.0.73",
+    "version": "0.0.74",
     "description": "acg react 组件库",
     "main": "lib/index.js",
     "module": "es/index.js",

package/CHANGELOG.md

@@ -1,4 +0,0 @@
-# 0.0.16
-`2021-12-24`
-1. fix input、textarea的clear不触发上层的onchange的bug
-2. fix textarea的length 在有值得情况下初始化的时候展示0的bug