acud 1.1.13 → 1.1.15

package/es/tree/utils/iconHelper.js

@@ -1,14 +1,29 @@
 import React from 'react';
 import OutlinedDown from "acud-icon/es/icons/OutlinedDown";
-export function renderSwitcherIcon(prefixCls, nodeProps) {
-  var switcherCls = "".concat(prefixCls, "-switcher-icon");
+import classNames from 'classnames';
+import { cloneElement, isValidElement } from '../../_util/reactNode';
+export function renderSwitcherIcon(prefixCls, switcherIcon, showLine, nodeProps) {
   var isLeaf = nodeProps.isLeaf;
   if (isLeaf) {
-    return null;
+    if (!showLine) {
+      return null;
+    }
+    return /*#__PURE__*/React.createElement("span", {
+      className: "".concat(prefixCls, "-switcher-leaf-line")
+    });
+  }
+  var switcherCls = "".concat(prefixCls, "-switcher-icon");
+  var switcher = typeof switcherIcon === 'function' ? switcherIcon(nodeProps) : switcherIcon;
+  if (isValidElement(switcher)) {
+    return cloneElement(switcher, {
+      className: classNames(switcher.props.className || '', switcherCls)
+    });
+  }
+  if (switcher) {
+    return switcher;
   }
   return /*#__PURE__*/React.createElement(OutlinedDown, {
-    className: switcherCls,
-    width: '16px'
+    className: switcherCls
   });
 }
 ;

package/es/tree-select/index.js

@@ -139,7 +139,7 @@ var InternalTreeSelect = function InternalTreeSelect(_a, ref) {
     removeIcon: removeIcon,
     clearIcon: clearIcon,
     switcherIcon: function switcherIcon(nodeProps) {
-      return renderSwitcherIcon(treePrefixCls, nodeProps);
+      return renderSwitcherIcon(treePrefixCls, null, false, nodeProps);
     },
     showTreeIcon: treeIcon,
     notFoundContent: mergedNotFound,

package/es/tree-select/src/OptionList.js

@@ -242,6 +242,40 @@ var OptionList = function OptionList(_, ref) {
       triggerChange([].concat(_toConsumableArray(allDisabledCheckedKeys), _toConsumableArray(allAbleKeys)));
     }
   }, [selectAllStatus, allAbleKeys, allDisabledCheckedKeys]);
+  var formatContent = React.useCallback(function (content, searchValue, prefixCls) {
+    if (typeof content !== 'string' && typeof content !== 'number') {
+      return /*#__PURE__*/React.createElement(React.Fragment, null, content);
+    }
+    var contentStr = content.toString();
+    var lowerContent = contentStr.toLowerCase();
+    var lowerSearch = searchValue.toLowerCase().trim();
+    var searchStartIndex = lowerContent.indexOf(lowerSearch);
+    var len = lowerSearch.length;
+    // 存在搜索值不在content的情况，比如key与children不一致时
+    if (searchStartIndex === -1) {
+      return /*#__PURE__*/React.createElement(React.Fragment, null, content);
+    }
+    return /*#__PURE__*/React.createElement(React.Fragment, null, contentStr.slice(0, searchStartIndex), /*#__PURE__*/React.createElement("span", {
+      className: "".concat(prefixCls, "-search-highlight")
+    }, contentStr.slice(searchStartIndex, searchStartIndex + len)), contentStr.slice(searchStartIndex + len));
+  }, []);
+  var formatTreeData = React.useMemo(function () {
+    if ((searchValue === null || searchValue === void 0 ? void 0 : searchValue.toString().trim()) === '') {
+      return memoTreeData;
+    }
+    var loopTree = function loopTree(arr) {
+      return arr.map(function (item) {
+        var newItem = _extends(_extends({}, item), {
+          title: formatContent(item.title, searchValue, prefixCls)
+        });
+        if (newItem.children && newItem.children.length) {
+          newItem.children = loopTree(newItem.children);
+        }
+        return newItem;
+      });
+    };
+    return loopTree(memoTreeData);
+  }, [memoTreeData, searchValue, prefixCls, formatContent]);
   // ========================== Render ==========================
   if (memoTreeData.length === 0) {
     return /*#__PURE__*/React.createElement("div", {
@@ -265,7 +299,7 @@ var OptionList = function OptionList(_, ref) {
     ref: treeRef,
     focusable: false,
     prefixCls: "".concat(prefixCls, "-tree"),
-    treeData: memoTreeData,
+    treeData: formatTreeData,
     height: listHeight,
     itemHeight: listItemHeight,
     virtual: virtual !== false && dropdownMatchSelectWidth !== false,

package/es/tree-select/style/index.css

@@ -404,6 +404,7 @@
 }
 .acud-select-tree-switcher .acud-tree-switcher-icon svg,
 .acud-select-tree-switcher .acud-select-tree-switcher-icon svg {
+  width: 16px!important;
   transition: transform 0.3s;
 }
 .acud-select-tree-switcher-noop {
@@ -412,6 +413,29 @@
 .acud-select-tree-switcher_close .acud-select-tree-switcher-icon svg {
   transform: rotate(-90deg);
 }
+.acud-select-tree-switcher-leaf-line {
+  position: relative;
+  z-index: 1;
+  display: inline-block;
+  width: 100%;
+  height: 100%;
+}
+.acud-select-tree-switcher-leaf-line::before {
+  position: absolute;
+  top: 0;
+  right: 8px;
+  bottom: -4px;
+  margin-left: -1px;
+  border-right: 1px solid #B8BABF;
+  content: ' ';
+}
+.acud-select-tree-switcher-leaf-line::after {
+  position: absolute;
+  width: 10px;
+  height: 14px;
+  border-bottom: 1px solid #B8BABF;
+  content: ' ';
+}
 .acud-select-tree .acud-select-tree-node-content-wrapper {
   position: relative;
   z-index: auto;
@@ -503,6 +527,26 @@
 .acud-select-tree-treenode:hover .acud-select-tree-draggable-icon {
   opacity: 0.45;
 }
+.acud-select-tree-show-line .acud-select-tree-indent-unit {
+  position: relative;
+  height: 100%;
+}
+.acud-select-tree-show-line .acud-select-tree-indent-unit::before {
+  position: absolute;
+  top: 0;
+  right: 16px;
+  bottom: -4px;
+  border-right: 1px solid #B8BABF;
+  content: '';
+}
+.acud-select-tree-show-line .acud-select-tree-indent-unit-end::before {
+  display: none;
+}
+.acud-select-tree .acud-select-tree-treenode-leaf-last .acud-select-tree-switcher-leaf-line::before {
+  top: auto !important;
+  bottom: auto !important;
+  height: 14px !important;
+}
 .acud-select-tree-checkbox {
   margin: 2px 0 0 8px;
   top: 0.1em;

package/lib/form/style/index.css

@@ -765,7 +765,7 @@
   clear: both;
   margin: 4px 0 0;
   min-height: 1.6667;
-  color: #B8BABF;
+  color: #84868C;
   font-size: 12px;
   line-height: 1.6667;
   transition: color 0.3s cubic-bezier(0.215, 0.61, 0.355, 1);

package/lib/form/style/index.less

@@ -186,7 +186,8 @@
         clear: both;
         margin: @form-item-with-extra-margin;
         min-height: @form-line-height-base;
-        color: @form-secondary-color;
+        // color: @form-secondary-color;
+        color: @G5;
         font-size: @form-font-size-base;
         line-height: @form-line-height-base;
         transition: color 0.3s @ease-out; // sync input color transition

package/lib/input/Input.d.ts

@@ -38,6 +38,7 @@ export interface BaseInputProps extends Omit<React.InputHTMLAttributes<HTMLInput
     type?: string;
     handleClearAll?: () => void;
     style?: React.CSSProperties;
+    forbidIfLimit?: boolean;
 }
 export declare const resolveTargetValue: (event: React.ChangeEvent, value: any) => React.ChangeEvent;
 declare const Input: React.ForwardRefExoticComponent<BaseInputProps & React.RefAttributes<unknown>>;

package/lib/input/Input.js

@@ -65,7 +65,9 @@ var Input = /*#__PURE__*/_react["default"].forwardRef(function (props, ref) {
     style = props.style,
     _props$hidden = props.hidden,
     hidden = _props$hidden === void 0 ? false : _props$hidden,
-    rest = __rest(props, ["prefixCls", "size", "placeholder", "warning", "warningPopover", "warningText", "tips", "disabled", "readOnly", "defaultValue", "limitLength", "label", "prefix", "suffix", "addonBefore", "addonAfter", "className", "allowClear", "onPressEnter", "onKeyDown", "handleClearAll", "type", "style", "hidden"]);
+    _props$forbidIfLimit = props.forbidIfLimit,
+    forbidIfLimit = _props$forbidIfLimit === void 0 ? false : _props$forbidIfLimit,
+    rest = __rest(props, ["prefixCls", "size", "placeholder", "warning", "warningPopover", "warningText", "tips", "disabled", "readOnly", "defaultValue", "limitLength", "label", "prefix", "suffix", "addonBefore", "addonAfter", "className", "allowClear", "onPressEnter", "onKeyDown", "handleClearAll", "type", "style", "hidden", "forbidIfLimit"]);
   var _useState = (0, _react.useState)(props.value || defaultValue || ''),
     _useState2 = (0, _slicedToArray2["default"])(_useState, 2),
     value = _useState2[0],
@@ -145,7 +147,11 @@ var Input = /*#__PURE__*/_react["default"].forwardRef(function (props, ref) {
     }
   };
   var handleOnChange = function handleOnChange(e) {
-    setValue(e.target.value);
+    if (forbidIfLimit && limitLength && e.target.value.length >= limitLength) {
+      setValue(e.target.value.slice(0, limitLength));
+    } else {
+      setValue(e.target.value);
+    }
     if (!e.target.value.length) {
       setShowClearIcon(false);
     }

package/lib/input/Label.d.ts

@@ -1,8 +1,10 @@
 import React from 'react';
 import { BaseInputProps } from './Input';
-export interface InputLabelProps extends BaseInputProps {
+import { Omit } from '../_util/type';
+export interface InputLabelProps extends Omit<BaseInputProps, 'value'> {
     label?: string[];
     onPressEnter: (e: any) => void;
+    onLableChange: (value: any) => void;
 }
 declare const Label: React.FC<InputLabelProps>;
 export default Label;

package/lib/input/Label.js

@@ -20,7 +20,8 @@ var Label = function Label(_ref) {
     customizePrefixCls = _ref.prefixCls,
     _ref$placeholder = _ref.placeholder,
     placeholder = _ref$placeholder === void 0 ? '' : _ref$placeholder,
-    disabled = _ref.disabled;
+    disabled = _ref.disabled,
+    onLableChange = _ref.onLableChange;
   var _useState = (0, _react.useState)(label || []),
     _useState2 = (0, _slicedToArray2["default"])(_useState, 2),
     labelList = _useState2[0],
@@ -35,9 +36,15 @@ var Label = function Label(_ref) {
   var handleClearLabel = function handleClearLabel(index) {
     labelList.splice(index, 1);
     setLabelList((0, _toConsumableArray2["default"])(labelList));
+    if (onLableChange) {
+      onLableChange((0, _toConsumableArray2["default"])(labelList));
+    }
   };
   var handleClearAll = function handleClearAll() {
     setLabelList([]);
+    if (onLableChange) {
+      onLableChange([]);
+    }
     if (inputEl.current) {
       inputEl.current.focus();
     }
@@ -54,6 +61,9 @@ var Label = function Label(_ref) {
       }
       value && setLabelList([].concat((0, _toConsumableArray2["default"])(labelList), [value]));
       setInputValue('');
+      if (onLableChange) {
+        onLableChange([].concat((0, _toConsumableArray2["default"])(labelList), [value]));
+      }
     }
     if (e.key === 'Backspace' && !value) {
       var a = (0, _toConsumableArray2["default"])(labelList);
@@ -71,6 +81,7 @@ var Label = function Label(_ref) {
   };
   var handleInputBlur = function handleInputBlur() {
     acudInputEl.current.blur();
+    setInputValue('');
   };
   var handleMouseUp = function handleMouseUp(e) {
     e.preventDefault();

package/lib/input/TextArea.d.ts

@@ -21,6 +21,7 @@ export interface TextAreaProps {
     onResize?: any;
     readonly?: boolean;
     allowClear?: boolean;
+    forbidIfLimit?: boolean;
 }
 declare const TextArea: React.ForwardRefExoticComponent<TextAreaProps & React.RefAttributes<unknown>>;
 export default TextArea;

package/lib/input/TextArea.js

@@ -48,7 +48,9 @@ var TextArea = /*#__PURE__*/_react["default"].forwardRef(function (props, ref) {
     onBlur = props.onBlur,
     _props$allowClear = props.allowClear,
     allowClear = _props$allowClear === void 0 ? true : _props$allowClear,
-    rest = __rest(props, ["prefixCls", "placeholder", "className", "style", "width", "limitLength", "readonly", "autoSize", "onPressEnter", "onKeyDown", "onFocus", "onBlur", "allowClear"]);
+    _props$forbidIfLimit = props.forbidIfLimit,
+    forbidIfLimit = _props$forbidIfLimit === void 0 ? false : _props$forbidIfLimit,
+    rest = __rest(props, ["prefixCls", "placeholder", "className", "style", "width", "limitLength", "readonly", "autoSize", "onPressEnter", "onKeyDown", "onFocus", "onBlur", "allowClear", "forbidIfLimit"]);
   var _useMergedState = (0, _useMergedState3["default"])(props.defaultValue, {
       value: props.value
     }),
@@ -70,7 +72,11 @@ var TextArea = /*#__PURE__*/_react["default"].forwardRef(function (props, ref) {
     if (readonly) {
       return;
     }
-    setValue(e.target.value);
+    if (forbidIfLimit && limitLength && e.target.value.length >= limitLength) {
+      setValue(e.target.value.slice(0, limitLength));
+    } else {
+      setValue(e.target.value);
+    }
     if (props.onChange) {
       props.onChange(e);
     }

package/lib/input/style/index.css

@@ -874,42 +874,43 @@
 .acud-input-textarea-autosize {
   min-height: 32px;
 }
-.acud-input-textarea-limit {
+.acud-input-textarea-limit-box {
+  color: #84868C;
   background-color: #FFFFFF;
   border-color: #F33E3E;
 }
-.acud-input-textarea-limit:hover {
+.acud-input-textarea-limit-box:hover {
   background-color: #FFFFFF;
 }
-.acud-input-textarea-limit:focus,
-.acud-input-textarea-limit:active {
+.acud-input-textarea-limit-box:focus,
+.acud-input-textarea-limit-box:active {
   background-color: #FFFFFF;
 }
-.acud-input-textarea-limit[disabled],
-.acud-input-textarea-limit[aria-disabled="true"],
-.acud-input-textarea-limit[disabled]:hover,
-.acud-input-textarea-limit[aria-disabled="true"]:hover,
-.acud-input-textarea-limit[disabled]:focus,
-.acud-input-textarea-limit[aria-disabled="true"]:focus,
-.acud-input-textarea-limit[disabled]:active,
-.acud-input-textarea-limit[aria-disabled="true"]:active {
+.acud-input-textarea-limit-box[disabled],
+.acud-input-textarea-limit-box[aria-disabled="true"],
+.acud-input-textarea-limit-box[disabled]:hover,
+.acud-input-textarea-limit-box[aria-disabled="true"]:hover,
+.acud-input-textarea-limit-box[disabled]:focus,
+.acud-input-textarea-limit-box[aria-disabled="true"]:focus,
+.acud-input-textarea-limit-box[disabled]:active,
+.acud-input-textarea-limit-box[aria-disabled="true"]:active {
   background-color: #FFFFFF;
 }
-.acud-input-textarea-limit:hover {
+.acud-input-textarea-limit-box:hover {
   border-color: #F33E3E;
 }
-.acud-input-textarea-limit:focus,
-.acud-input-textarea-limit:active {
+.acud-input-textarea-limit-box:focus,
+.acud-input-textarea-limit-box:active {
   border-color: #F33E3E;
 }
-.acud-input-textarea-limit[disabled],
-.acud-input-textarea-limit[aria-disabled="true"],
-.acud-input-textarea-limit[disabled]:hover,
-.acud-input-textarea-limit[aria-disabled="true"]:hover,
-.acud-input-textarea-limit[disabled]:focus,
-.acud-input-textarea-limit[aria-disabled="true"]:focus,
-.acud-input-textarea-limit[disabled]:active,
-.acud-input-textarea-limit[aria-disabled="true"]:active {
+.acud-input-textarea-limit-box[disabled],
+.acud-input-textarea-limit-box[aria-disabled="true"],
+.acud-input-textarea-limit-box[disabled]:hover,
+.acud-input-textarea-limit-box[aria-disabled="true"]:hover,
+.acud-input-textarea-limit-box[disabled]:focus,
+.acud-input-textarea-limit-box[aria-disabled="true"]:focus,
+.acud-input-textarea-limit-box[disabled]:active,
+.acud-input-textarea-limit-box[aria-disabled="true"]:active {
   border-color: #F33E3E;
 }
 .acud-input-textarea-no-limit {

package/lib/input/style/index.less

@@ -292,7 +292,8 @@
     &-autosize {
         min-height: 32px;
     }
-    &-limit {
+    &-limit-box{
+        color: @G5;
         .basic-p-config(@input-enhance-p);
     }
     &-no-limit {

package/lib/toast/base.js

@@ -144,7 +144,7 @@ function getNotificationInstance(args, callback) {
     customizePrefixCls = args.prefixCls;
   var _globalConfig = (0, _configProvider.globalConfig)(),
     getPrefixCls = _globalConfig.getPrefixCls;
-  var prefixCls = getPrefixCls('notification', customizePrefixCls || defaultPrefixCls);
+  var prefixCls = getPrefixCls('', customizePrefixCls || defaultPrefixCls) + '-notification';
   var cacheKey = "".concat(prefixCls, "-").concat(placement);
   var cacheInstance = notificationInstance[cacheKey];
   if (cacheInstance) {

package/lib/toast/index.js

@@ -23,7 +23,7 @@ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj &&
 var _globalConfig = (0, _configProvider.globalConfig)(),
   getPrefixCls = _globalConfig.getPrefixCls;
 var PREFIX = 'notification-hastime';
-var defaultPrefixCls = '';
+var defaultPrefixCls = _configProvider.defaultPrefixCls;
 var maxToastArrLength = 4; // 最多显示多少个toast
 /**
  * 代理对象
@@ -65,7 +65,7 @@ function ToastDom(props) {
     counter = _useState4[0],
     setCounter = _useState4[1];
   // const prefixCls = getPrefixCls('toast-wrap', '');
-  var prefixCls = getPrefixCls('toast-wrap', customizePrefixCls || defaultPrefixCls);
+  var prefixCls = getPrefixCls('', customizePrefixCls || defaultPrefixCls) + '-toast-wrap';
   (0, _react.useEffect)(function () {
     if (counter !== undefined) {
       if (counter > 0) {
@@ -94,11 +94,11 @@ function ToastDom(props) {
   //     }
   // }, []);
   return /*#__PURE__*/_react["default"].createElement("div", {
-    className: getPrefixCls(undefined, customizePrefixCls || defaultPrefixCls) + '-toast-wrap'
+    className: getPrefixCls('', customizePrefixCls || defaultPrefixCls) + '-notification-toast-wrap'
   }, /*#__PURE__*/_react["default"].createElement("div", {
-    className: (0, _classnames["default"])("".concat(getPrefixCls(undefined, customizePrefixCls || defaultPrefixCls), "-toast-wrap-left"), (0, _defineProperty2["default"])({}, prefixCls + '-no-description', !description))
+    className: (0, _classnames["default"])("".concat(getPrefixCls('', customizePrefixCls || defaultPrefixCls), "-notification-toast-wrap-left"), (0, _defineProperty2["default"])({}, prefixCls + '-no-description', !description))
   }, message), counter === undefined ? null : /*#__PURE__*/_react["default"].createElement("div", {
-    className: getPrefixCls(undefined, customizePrefixCls || defaultPrefixCls) + '-toast-wrap-right'
+    className: getPrefixCls('', customizePrefixCls || defaultPrefixCls) + '-notification-toast-wrap-right'
   }, "(", counter, /*#__PURE__*/_react["default"].createElement("span", null, "s"), ")"));
 }
 function DescriptionDom(props) {
@@ -128,6 +128,10 @@ var handler = {
       if (name === 'config' && props.maxCount) {
         maxToastArrLength = props.maxCount;
       }
+      // 设置prefixcls 兼容antd
+      if (name === 'config' && props.prefixCls) {
+        defaultPrefixCls = props.prefixCls;
+      }
       // key相同时不重新渲染
       if (!~toastArr.indexOf(args.key)) {
         if (toastArr.length < maxToastArrLength) {
@@ -150,7 +154,7 @@ var handler = {
       // 设置样式 有描述和没描述间距不一样
       var tempClassName = (props === null || props === void 0 ? void 0 : props.className) + ' ' + PREFIX;
       if (args.description) {
-        tempClassName += ' ' + getPrefixCls('notification') + '-has-description';
+        tempClassName += ' ' + getPrefixCls('', (props === null || props === void 0 ? void 0 : props.prefixCls) || defaultPrefixCls) + '-notification-has-description';
       }
       if (props && props.className) {
         args.className = props.className + ' ' + tempClassName;
@@ -163,7 +167,8 @@ var handler = {
         description: args.description,
         countdown: tempDuration,
         notificationKey: args.key,
-        onClose: props === null || props === void 0 ? void 0 : props.onClose
+        onClose: props === null || props === void 0 ? void 0 : props.onClose,
+        prefixCls: props === null || props === void 0 ? void 0 : props.prefixCls
       });
       args.description = /*#__PURE__*/_react["default"].createElement(DescriptionDom, {
         description: args.description

package/lib/toast/style/index.css

@@ -73,23 +73,23 @@
   display: block;
   content: '';
 }
-.acud-notification-notice-message .acud-toast-wrap {
+.acud-notification-notice-message .acud-notification-toast-wrap {
   display: flex;
 }
-.acud-notification-notice-message .acud-toast-wrap-left {
+.acud-notification-notice-message .acud-notification-toast-wrap-left {
   flex: 1;
   font-size: 14px;
   color: #151B26;
   font-weight: 500;
 }
-.acud-notification-notice-message .acud-toast-wrap-right {
+.acud-notification-notice-message .acud-notification-toast-wrap-right {
   font-size: 12px;
   color: #B8BABF;
 }
-.acud-notification-notice-message .acud-toast-wrap-right span {
+.acud-notification-notice-message .acud-notification-toast-wrap-right span {
   font-size: 12px;
 }
-.acud-notification-notice-message .acud-toast-wrap-no-description {
+.acud-notification-notice-message .acud-notification-toast-wrap-no-description {
   color: #151B26;
   font-size: 12px;
   font-weight: 400;
@@ -117,16 +117,16 @@
   line-height: 16px;
   top: 8px;
 }
-.acudicon.acud-notification-notice-icon-success path {
+.acud-notification-notice .acud-notification-notice-icon-success path {
   fill: #30BF13;
 }
-.acudicon.acud-notification-notice-icon-info path {
+.acud-notification-notice .acud-notification-notice-icon-info path {
   fill: #2468F2;
 }
-.acudicon.acud-notification-notice-icon-warning path {
+.acud-notification-notice .acud-notification-notice-icon-warning path {
   fill: #FF9326;
 }
-.acudicon.acud-notification-notice-icon-error path {
+.acud-notification-notice .acud-notification-notice-icon-error path {
   fill: #F33E3E;
 }
 .acud-notification-notice-close {