acud 0.0.71 → 0.0.74

package/lib/cascader/style/index.js

@@ -6,4 +6,12 @@ require("./index.less");
 
 require("../../empty/style");
 
-require("../../input/style");
+require("../../input/style");
+
+require("../../tag/style");
+
+require("../../tooltip/style");
+
+require("../../clear/style");
+
+require("../../checkbox/style");

package/lib/input/AutoComplete.d.ts

@@ -0,0 +1,12 @@
+import React from 'react';
+import { InternalSelectProps, SelectInterface } from '../select';
+export interface AutoCompleteProps<ValueType = any> extends Omit<InternalSelectProps<ValueType>, 'inputIcon' | 'loading' | 'mode' | 'optionLabelProp' | 'labelInValue'> {
+}
+declare const RefAutoComplete: (<ValueType = any>(props: AutoCompleteProps<ValueType> & {
+    children?: React.ReactNode;
+} & {
+    ref?: React.Ref<SelectInterface>;
+}) => React.ReactElement) & {
+    Option: import("../select/src/Option").OptionFC;
+};
+export default RefAutoComplete;

package/lib/input/AutoComplete.js

@@ -0,0 +1,72 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports["default"] = void 0;
+
+var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
+
+var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
+
+var _react = _interopRequireDefault(require("react"));
+
+var _classnames = _interopRequireDefault(require("classnames"));
+
+var _select = _interopRequireDefault(require("../select"));
+
+var _reactNode = require("../_util/reactNode");
+
+var _toArray = _interopRequireDefault(require("rc-util/lib/Children/toArray"));
+
+var Option = _select["default"].Option;
+
+function isSelectOptionOrSelectOptGroup(child) {
+  return child && child.type && (child.type.isSelectOption || child.type.isSelectOptGroup);
+}
+
+var AutoComplete = function AutoComplete(props, ref) {
+  var _props$prefixCls = props.prefixCls,
+      prefixCls = _props$prefixCls === void 0 ? 'acud-select' : _props$prefixCls,
+      className = props.className,
+      children = props.children;
+  var childNodes = (0, _toArray["default"])(children); // ============================= Input =============================
+
+  var customizeInput;
+
+  if (childNodes.length === 1 && (0, _reactNode.isValidElement)(childNodes[0]) && !isSelectOptionOrSelectOptGroup(childNodes[0])) {
+    var _childNodes = (0, _slicedToArray2["default"])(childNodes, 1);
+
+    customizeInput = _childNodes[0];
+  }
+
+  var getInputElement = customizeInput ? function () {
+    return customizeInput;
+  } : undefined; // ============================ Options ============================
+
+  var optionChildren;
+
+  if (childNodes.length && isSelectOptionOrSelectOptGroup(childNodes[0])) {
+    optionChildren = children;
+  } else {
+    optionChildren = [];
+  }
+
+  return /*#__PURE__*/_react["default"].createElement(_select["default"], (0, _extends2["default"])({
+    ref: ref
+  }, props, {
+    prefixCls: prefixCls,
+    className: (0, _classnames["default"])("".concat(prefixCls, "-auto-complete"), className),
+    mode: _select["default"].SECRET_COMBOBOX_MODE_DO_NOT_USE,
+    getInputElement: getInputElement
+  }), optionChildren);
+};
+
+var RefAutoComplete = /*#__PURE__*/_react["default"].forwardRef(AutoComplete);
+
+RefAutoComplete.Option = Option;
+var _default = RefAutoComplete; // export default AutoComplete;
+
+exports["default"] = _default;

package/lib/input/TextArea.d.ts

@@ -17,5 +17,5 @@ export interface TextAreaProps {
     readonly?: boolean;
     allowClear?: boolean;
 }
-declare const TextArea: React.FC<TextAreaProps>;
+declare const TextArea: React.ForwardRefExoticComponent<TextAreaProps & React.RefAttributes<unknown>>;
 export default TextArea;

package/lib/input/TextArea.js

@@ -49,7 +49,8 @@ var __rest = void 0 && (void 0).__rest || function (s, e) {
  */
 
 
-var TextArea = function TextArea(props) {
+// const TextArea:React.FC<TextAreaProps> = props => {
+var TextArea = /*#__PURE__*/_react["default"].forwardRef(function (props, ref) {
   var _classNames;
 
   var _props$prefixCls = props.prefixCls,
@@ -157,6 +158,7 @@ var TextArea = function TextArea(props) {
     className: "".concat(prefixCls, "-outer"),
     style: style
   }, /*#__PURE__*/_react["default"].createElement(_rcTextarea["default"], (0, _extends2["default"])({}, rest, {
+    ref: ref,
     placeholder: placeholder,
     className: (0, _classnames["default"])(classes),
     onChange: handleOnChange,
@@ -178,7 +180,7 @@ var TextArea = function TextArea(props) {
   }, /*#__PURE__*/_react["default"].createElement("span", {
     className: (0, _classnames["default"])(limitClassName, 'limit')
   }, currentLength, "/", limitLength)));
-};
+});
 
 var _default = TextArea;
 exports["default"] = _default;

package/lib/input/index.d.ts

@@ -4,11 +4,13 @@ import Label from './Label';
 import TextArea from './TextArea';
 import Password from './Password';
 import MultiSelectInput from './MultiSelectInput';
+import AutoComplete from './AutoComplete';
 interface CompoundedComponent extends React.ForwardRefExoticComponent<BaseInputProps & React.RefAttributes<HTMLInputElement>> {
     Label: typeof Label;
     TextArea: typeof TextArea;
     Password: typeof Password;
     MultiSelectInput: typeof MultiSelectInput;
+    AutoComplete: typeof AutoComplete;
     __ACUD_CHECKBOX: boolean;
 }
 declare const Input: CompoundedComponent;

package/lib/input/index.js

@@ -17,10 +17,13 @@ var _Password = _interopRequireDefault(require("./Password"));
 
 var _MultiSelectInput = _interopRequireDefault(require("./MultiSelectInput"));
 
+var _AutoComplete = _interopRequireDefault(require("./AutoComplete"));
+
 var Input = _Input["default"];
 Input.Label = _Label["default"];
 Input.TextArea = _TextArea["default"];
 Input.Password = _Password["default"];
 Input.MultiSelectInput = _MultiSelectInput["default"];
+Input.AutoComplete = _AutoComplete["default"];
 var _default = Input;
 exports["default"] = _default;

package/lib/input/style/index.css

@@ -682,7 +682,6 @@
   padding-top: 6px;
   padding-right: 24px;
   padding-bottom: 24px;
-  min-height: 100px;
   border-radius: 4px;
   font-family: -apple-system, BlinkMacSystemFont, "SF Pro SC", "SF Pro Text", "Helvetica Neue", Helvetica, "PingFang SC", Roboto, 'Arial', 'microsoft yahei ui', "Microsoft YaHei", SimSun, sans-serif;
   color: #151B26;
@@ -887,3 +886,56 @@
 .acud-input-select-tags .acud-select-clear {
   right: 12px;
 }
+.acud-select-auto-complete .acud-select-selector {
+  width: 100%;
+  display: flex;
+  cursor: text;
+  position: relative;
+}
+.acud-select-auto-complete {
+  width: 100%;
+  display: block;
+}
+.acud-select-auto-complete:not(.acud-select-customize-input) .acud-select-selector {
+  position: relative;
+  background-color: #fff;
+  border-radius: 2px;
+  transition: all 0.3s cubic-bezier(0.645, 0.045, 0.355, 1);
+}
+.acud-select-auto-complete:not(.acud-select-customize-input) .acud-select-selector .acud-select-selection-search .acud-select-selection-search-input {
+  cursor: auto;
+  margin: 0;
+  padding: 0;
+  background: 0 0;
+  border: none;
+  outline: none;
+  -webkit-appearance: none;
+     -moz-appearance: none;
+          appearance: none;
+}
+.acud-select-auto-complete .acud-select-selector {
+  width: 100%;
+  display: flex;
+  cursor: text;
+  position: relative;
+}
+.acud-select-auto-complete .acud-select-selector .acud-select-selection-search {
+  position: absolute;
+  inset: 0 12px;
+  z-index: 2;
+}
+.acud-select-auto-complete .acud-select-selector .acud-select-selection-search .acud-select-selection-search-input {
+  width: 100%;
+}
+.acud-select-auto-complete .acud-select-selector .acud-select-selection-placeholder {
+  flex: 1;
+  transition: none;
+  pointer-events: none;
+  overflow: hidden;
+  color: #bfbfbf;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+  padding-left: 12px;
+  padding-right: 12px;
+  z-index: 1;
+}

package/lib/input/style/index.less

@@ -8,6 +8,10 @@
 
 @input-password-outer-prefix-cls: ~'@{acud-prefix}-input-password-outer';
 @input-password-prefix-cls: ~'@{acud-prefix}-input-password';
+@select-auto-complete-prefix-cls: ~'@{acud-prefix}-select-auto-complete';
+
+@select-prefix-cls: ~'@{acud-prefix}-select';
+
 // basic logic - line hight, font size
 // content layer - 只处理文字 Icon， 没有开关config，对应四种交互状态配置
 // background layer - 背景层 填色、描边、阴影，可以通过开关config配置， 对应四种交互状态
@@ -254,7 +258,7 @@
     padding-top: 1.5*@padding-xsm;
     padding-right: 2*@padding-m;
     padding-bottom: 6*@padding-xsm;
-    min-height: 100px;
+    // min-height: 100px;
     border-radius: @input-border-lg-radius;
     font-family: -apple-system, BlinkMacSystemFont, "SF Pro SC", "SF Pro Text", "Helvetica Neue", Helvetica, "PingFang SC", Roboto, 'Arial', 'microsoft yahei ui', "Microsoft YaHei", SimSun, sans-serif;
     &::-webkit-input-placeholder {
@@ -379,4 +383,62 @@
         right:12px;
     }
 }
+.acud-select-auto-complete{
+    .acud-select-selector{
+        width:100%;
+        display: flex;
+        cursor: text;
+        position: relative;
+    }
+}
+.@{select-auto-complete-prefix-cls}{
+    width:100%;
+    display: block;
+    &:not(.acud-select-customize-input) {
+        .acud-select-selector{
+            position: relative;
+            background-color: #fff;
+            border-radius: 2px;
+            transition: all .3s cubic-bezier(.645,.045,.355,1);
+            .acud-select-selection-search{
+                .acud-select-selection-search-input{
+                    cursor: auto;
+                    margin: 0;
+                    padding: 0;
+                    background: 0 0;
+                    border: none;
+                    outline: none;
+                    appearance: none;
+                }
+            }
+        }
+        
+    }
+    .@{select-prefix-cls}-selector{
+        width:100%;
+        display: flex;
+        cursor: text;
+        position: relative;
+        .@{select-prefix-cls}-selection-search{
+            position: absolute;
+            inset: 0 12px;
+            z-index: 2;
+            .@{select-prefix-cls}-selection-search-input{
+                width:100%;
+            }
+        }
+        .@{select-prefix-cls}-selection-placeholder{
+            flex:1;
+            transition: none;
+            pointer-events: none;
+            overflow: hidden;
+            color: #bfbfbf;
+            white-space: nowrap;
+            text-overflow: ellipsis;
+            padding-left: 12px;
+            padding-right: 12px;
+            z-index: 1;
+        }
 
+    }
+}

package/lib/modal/style/css.js

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

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

@@ -1,2 +1,3 @@
 import '../../style/index.less';
 import './index.less';
+import '../../button/style';

package/lib/modal/style/index.js

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

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/index.d.ts

@@ -29,7 +29,7 @@ declare const SelectRef: <VT extends SelectValue = SelectValue>(props: SelectPro
     ref?: React.Ref<RefSelectProps>;
 }) => React.ReactElement;
 declare type InternalSelectType = typeof SelectRef;
-interface SelectInterface extends InternalSelectType {
+export interface SelectInterface extends InternalSelectType {
     SECRET_COMBOBOX_MODE_DO_NOT_USE: string;
     Option: typeof Option;
     OptGroup: typeof OptGroup;

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