acud 0.0.72 → 0.0.75

package/lib/modal/style/index.less

@@ -19,35 +19,35 @@
     max-width: calc(100vw - 32px);
 
     &-sm {
-        .modal-size-config(sm, false);
+        .modal-size-config(sm);
     }
 
     &-sm > &-content {
-        .modal-size-config(sm, true);
+        .modal-size-config-content(sm);
     }
 
     &-md {
-        .modal-size-config(md, false);
+        .modal-size-config(md);
     }
 
     &-md > &-content {
-        .modal-size-config(md, true);
+        .modal-size-config-content(md);
     }
 
     &-lg {
-        .modal-size-config(lg, false);
+        .modal-size-config(lg);
     }
 
     &-lg > &-content {
-        .modal-size-config(lg, true);
+        .modal-size-config-content(lg);
     }
 
     &-xl {
-        .modal-size-config(xl, false);
+        .modal-size-config(xl);
     }
 
     &-xl > &-content {
-        .modal-size-config(xl, true);
+        .modal-size-config-content(xl);
     }
 
     // 弹框内容

package/lib/modal/style/mixin.less

@@ -37,11 +37,20 @@
   }
 }
 
-.modal-size-config(@type, @content) {
-    @width: ~'modal-width-@{type}';
+.modal-size(@type) {
     @min-height: ~'modal-height-@{type}';
     @max-height: ~'modal-max-height-@{type}';
-    width: if(@content, 100%, @@width);
     min-height: @@min-height;
     max-height: @@max-height;
 }
+
+.modal-size-config-content(@type) {
+    width: 100%;
+    .modal-size(@type);
+}
+
+.modal-size-config(@type) {
+    @width: ~'modal-width-@{type}';
+    width: @@width;
+    .modal-size(@type);
+}

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/select/src/OptionList.d.ts

@@ -15,10 +15,11 @@ export interface OptionListProps<OptionsType extends object[]> {
     notFoundContent?: React.ReactNode;
     mode?: string;
     menuItemSelectedIcon?: RenderNode;
-    childrenAsData: boolean;
-    searchValue: string;
-    virtual: boolean;
-    defaultExpandGroupKey: string[] | string | number[] | number | boolean;
+    childrenAsData?: boolean;
+    searchValue?: string;
+    virtual?: boolean;
+    keepExpand?: boolean;
+    defaultExpandGroupKey?: string[] | string | number[] | number | boolean;
     renderEmpty?: (componentName?: string, des?: string | undefined) => React.ReactNode;
     onSelect: (value: RawValueType, option: {
         selected: boolean;

package/lib/select/src/OptionList.js

@@ -87,6 +87,8 @@ var OptionList = function OptionList(_ref, ref) {
       mode = _ref.mode,
       open = _ref.open,
       virtual = _ref.virtual,
+      _ref$keepExpand = _ref.keepExpand,
+      keepExpand = _ref$keepExpand === void 0 ? false : _ref$keepExpand,
       _ref$defaultExpandGro = _ref.defaultExpandGroupKey,
       defaultExpandGroupKey = _ref$defaultExpandGro === void 0 ? false : _ref$defaultExpandGro,
       renderEmpty = _ref.renderEmpty,
@@ -425,6 +427,8 @@ var OptionList = function OptionList(_ref, ref) {
     e.stopPropagation();
   };
 
+  var isKeepExpand = !multiple && keepExpand;
+
   var renderOption = function renderOption(data, values, groupOption, label, itemIndex, groupKey) {
     var _classNames;
 
@@ -442,7 +446,7 @@ var OptionList = function OptionList(_ref, ref) {
 
     var selected = values.has(value);
     var optionPrefixCls = "".concat(itemPrefixCls, "-option");
-    var optionClassName = (0, _classnames["default"])(itemPrefixCls, optionPrefixCls, className, (_classNames = {}, (0, _defineProperty2["default"])(_classNames, "".concat(optionPrefixCls, "-grouped"), groupOption), (0, _defineProperty2["default"])(_classNames, "".concat(optionPrefixCls, "-active"), activeIndex === itemIndex && !disabled), (0, _defineProperty2["default"])(_classNames, "".concat(optionPrefixCls, "-disabled"), disabled), (0, _defineProperty2["default"])(_classNames, "".concat(optionPrefixCls, "-selected"), selected), _classNames));
+    var optionClassName = (0, _classnames["default"])(itemPrefixCls, optionPrefixCls, className, (_classNames = {}, (0, _defineProperty2["default"])(_classNames, "".concat(optionPrefixCls, "-grouped"), groupOption), (0, _defineProperty2["default"])(_classNames, "".concat(optionPrefixCls, "-grouped-keep-expand"), isKeepExpand), (0, _defineProperty2["default"])(_classNames, "".concat(optionPrefixCls, "-active"), activeIndex === itemIndex && !disabled), (0, _defineProperty2["default"])(_classNames, "".concat(optionPrefixCls, "-disabled"), disabled), (0, _defineProperty2["default"])(_classNames, "".concat(optionPrefixCls, "-selected"), selected), _classNames));
     var mergedLabel = childrenAsData ? children : label; // const iconVisible = !menuItemSelectedIcon || typeof menuItemSelectedIcon === 'function' || selected;
 
     var content = mergedLabel || value;
@@ -470,7 +474,7 @@ var OptionList = function OptionList(_ref, ref) {
         }
       },
       style: (0, _extends2["default"])({
-        display: groupOption && !expandGroupKey.includes(groupKey) ? 'none' : ''
+        display: groupOption && !expandGroupKey.includes(groupKey) && !isKeepExpand ? 'none' : ''
       }, style)
     }), multiple && /*#__PURE__*/React.createElement(_checkbox["default"], {
       checked: selected,
@@ -527,14 +531,18 @@ var OptionList = function OptionList(_ref, ref) {
 
     if (group) {
       return /*#__PURE__*/React.createElement("div", {
-        className: (0, _classnames["default"])(itemPrefixCls, "".concat(itemPrefixCls, "-group")),
+        className: (0, _classnames["default"])(itemPrefixCls, "".concat(itemPrefixCls, "-group"), (0, _defineProperty2["default"])({}, "".concat(itemPrefixCls, "-group-keep-expand"), isKeepExpand)),
         onClick: function onClick() {
+          if (isKeepExpand) {
+            return;
+          }
+
           var gIndex = expandGroupKey.indexOf(key);
           var newGroupKey = (0, _toConsumableArray2["default"])(expandGroupKey);
           gIndex !== -1 ? newGroupKey.splice(gIndex, 1) : newGroupKey.push(key);
           setExpandGroupKey(newGroupKey);
         }
-      }, /*#__PURE__*/React.createElement("span", {
+      }, !isKeepExpand && /*#__PURE__*/React.createElement("span", {
         className: "".concat(itemPrefixCls, "-group-arrow")
       }, expandGroupKey.includes(key) ? /*#__PURE__*/React.createElement(_acudIcon.OutlinedDown, null) : /*#__PURE__*/React.createElement(_acudIcon.OutlinedRight, null)), multiple && /*#__PURE__*/React.createElement(_checkbox["default"], {
         className: "".concat(itemPrefixCls, "-group-checkbox"),

package/lib/select/src/generate.d.ts

@@ -81,6 +81,7 @@ export interface SelectProps<OptionsType extends object[], ValueType> extends Re
     showAction?: ('focus' | 'click')[];
     tabIndex?: number;
     renderEmpty?: (componentName?: string, des?: string | undefined) => React.ReactNode;
+    keepExpand?: boolean;
     defaultExpandGroupKey?: string[] | string | number[] | number | boolean;
     onKeyUp?: React.KeyboardEventHandler<HTMLDivElement>;
     onKeyDown?: React.KeyboardEventHandler<HTMLDivElement>;

package/lib/select/src/generate.js

@@ -153,6 +153,7 @@ function generateSelector(config) {
         tokenSeparators = props.tokenSeparators,
         tagRender = props.tagRender,
         renderEmpty = props.renderEmpty,
+        keepExpand = props.keepExpand,
         defaultExpandGroupKey = props.defaultExpandGroupKey,
         onPopupScroll = props.onPopupScroll,
         onDropdownVisibleChange = props.onDropdownVisibleChange,
@@ -167,7 +168,7 @@ function generateSelector(config) {
         onClear = props.onClear,
         _props$internalProps = props.internalProps,
         internalProps = _props$internalProps === void 0 ? {} : _props$internalProps,
-        restProps = __rest(props, ["prefixCls", "className", "id", "open", "defaultOpen", "options", "children", "mode", "value", "defaultValue", "labelInValue", "showSearch", "inputValue", "searchValue", "filterOption", "filterSort", "optionFilterProp", "autoClearSearchValue", "onSearch", "suffixIconPre", "removeIcon", "allowClear", "clearIcon", "showArrow", "menuItemSelectedIcon", "disabled", "loading", "defaultActiveFirstOption", "notFoundContent", "optionLabelProp", "backfill", "tabIndex", "getInputElement", "getPopupContainer", "listHeight", "listItemHeight", "animation", "transitionName", "virtual", "dropdownStyle", "dropdownClassName", "dropdownMatchSelectWidth", "dropdownRender", "dropdownAlign", "showAction", "direction", "tokenSeparators", "tagRender", "renderEmpty", "defaultExpandGroupKey", "onPopupScroll", "onDropdownVisibleChange", "onFocus", "onBlur", "onKeyUp", "onKeyDown", "onMouseDown", "onChange", "onSelect", "onDeselect", "onClear", "internalProps"]);
+        restProps = __rest(props, ["prefixCls", "className", "id", "open", "defaultOpen", "options", "children", "mode", "value", "defaultValue", "labelInValue", "showSearch", "inputValue", "searchValue", "filterOption", "filterSort", "optionFilterProp", "autoClearSearchValue", "onSearch", "suffixIconPre", "removeIcon", "allowClear", "clearIcon", "showArrow", "menuItemSelectedIcon", "disabled", "loading", "defaultActiveFirstOption", "notFoundContent", "optionLabelProp", "backfill", "tabIndex", "getInputElement", "getPopupContainer", "listHeight", "listItemHeight", "animation", "transitionName", "virtual", "dropdownStyle", "dropdownClassName", "dropdownMatchSelectWidth", "dropdownRender", "dropdownAlign", "showAction", "direction", "tokenSeparators", "tagRender", "renderEmpty", "keepExpand", "defaultExpandGroupKey", "onPopupScroll", "onDropdownVisibleChange", "onFocus", "onBlur", "onKeyUp", "onKeyDown", "onMouseDown", "onChange", "onSelect", "onDeselect", "onClear", "internalProps"]);
 
     var useInternalProps = internalProps.mark === _generator.INTERNAL_PROPS_MARK;
     var domProps = omitDOMProps ? omitDOMProps(restProps) : restProps;
@@ -815,6 +816,7 @@ function generateSelector(config) {
       defaultActiveFirstOption: mergedDefaultActiveFirstOption,
       notFoundContent: notFoundContent,
       renderEmpty: renderEmpty,
+      keepExpand: keepExpand,
       defaultExpandGroupKey: defaultExpandGroupKey,
       onScroll: onPopupScroll,
       searchValue: mergedSearchValue,

package/lib/select/style/css.js

@@ -4,4 +4,6 @@ require("../../style/index.css");
 
 require("./index.css");
 
-require("../../empty/style/css");
+require("../../empty/style/css");
+
+require("../../checkbox/style/css");

package/lib/select/style/index.css

@@ -674,6 +674,9 @@
 .acud-select-item-group-checkbox {
   margin-right: 8px;
 }
+.acud-select-item-group.acud-select-item-group-keep-expand {
+  color: #B8BABF;
+}
 .acud-select-item-option {
   display: flex;
 }
@@ -704,6 +707,9 @@
 .acud-select-item-option-grouped {
   padding-left: 48px;
 }
+.acud-select-item-option-grouped.acud-select-item-option-grouped-keep-expand {
+  padding-left: 24px;
+}
 .acud-select-lg {
   font-size: 14px;
 }

package/lib/select/style/index.d.ts

@@ -1,3 +1,4 @@
 import '../../style/index.less';
 import './index.less';
 import '../../empty/style';
+import '../../checkbox/style';

package/lib/select/style/index.js

@@ -4,4 +4,6 @@ require("../../style/index.less");
 
 require("./index.less");
 
-require("../../empty/style");
+require("../../empty/style");
+
+require("../../checkbox/style");

package/lib/select/style/index.less

@@ -287,6 +287,9 @@
             &-checkbox {
                 margin-right: 2 * @P;
             }
+            &&-keep-expand {
+                color: @G6;
+            }
         }
 
         // =========== Option ===========
@@ -328,6 +331,9 @@
 
             &-grouped {
                 padding-left: 12 * @P;
+                &&-keep-expand {
+                    padding-left: 6 * @P;
+                }
             }
             // .basic-config-select-item(@select-dropdown-default-tp, @select-dropdown-default-p);
         }

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.72",
+    "version": "0.0.75",
     "description": "acg react 组件库",
     "main": "lib/index.js",
     "module": "es/index.js",