@ucloud-fe/react-components 1.12.2 → 1.14.0

package/lib/components/AutoComplete/AutoComplete.d.ts

@@ -4,7 +4,7 @@ interface Item {
     value: string;
     label?: ReactNode;
 }
-interface AutoCompleteProps {
+interface AutoCompleteProps extends Omit<InputProps, 'value' | 'onChange' | 'onFocus' | 'onBlur' | 'disabled' | 'prefix' | 'onKeyDown' | 'suffix' | 'className' | 'block'> {
     /** 待筛选选项 */
     options?: Item[];
     /** 值，controlled */
@@ -35,6 +35,8 @@ interface AutoCompleteProps {
     status: InputProps['status'];
     /** @ignore */
     placeholder?: InputProps['placeholder'];
+    /** 尺寸 */
+    size?: InputProps['size'];
 }
-declare const _default: React.MemoExoticComponent<({ value: _value, defaultValue, onChange: _onChange, options, disabled, loading, prefix, block, handleSearch, popoverProps, onFocus, onBlur, style, className, status, placeholder, size }: AutoCompleteProps & Omit<InputProps, keyof AutoCompleteProps>) => JSX.Element>;
+declare const _default: React.MemoExoticComponent<({ value: _value, defaultValue, onChange: _onChange, options, disabled, loading, prefix, block, handleSearch, popoverProps, onFocus, onBlur, style, className, status, placeholder, size, ...others }: AutoCompleteProps & Omit<InputProps, keyof AutoCompleteProps>) => JSX.Element>;
 export default _default;

package/lib/components/AutoComplete/AutoComplete.js

@@ -13,6 +13,8 @@ var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends")
 
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 
+var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
+
 var _newArrowCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/newArrowCheck"));
 
 var _propTypes = _interopRequireDefault(require("prop-types"));
@@ -35,6 +37,8 @@ var _Popup = _interopRequireDefault(require("./Popup"));
 
 var _style = require("./style");
 
+var _excluded = ["value", "defaultValue", "onChange", "options", "disabled", "loading", "prefix", "block", "handleSearch", "popoverProps", "onFocus", "onBlur", "style", "className", "status", "placeholder", "size"];
+
 var _this = void 0;
 
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
@@ -63,7 +67,8 @@ var AutoComplete = function AutoComplete(_ref) {
       className = _ref.className,
       status = _ref.status,
       placeholder = _ref.placeholder,
-      size = _ref.size;
+      size = _ref.size,
+      others = (0, _objectWithoutProperties2.default)(_ref, _excluded);
 
   var _useUncontrolled = (0, _useUncontrolled3.default)(_value, defaultValue, _onChange),
       _useUncontrolled2 = (0, _slicedToArray2.default)(_useUncontrolled, 2),
@@ -139,7 +144,7 @@ var AutoComplete = function AutoComplete(_ref) {
     visible: visible,
     stretch: ['minWidth'],
     onVisibleChange: handleVisibleChange
-  }), /*#__PURE__*/_react.default.createElement(_Input.default, {
+  }), /*#__PURE__*/_react.default.createElement(_Input.default, (0, _extends2.default)({
     size: size,
     value: value,
     onChange: onInputChange,
@@ -157,7 +162,7 @@ var AutoComplete = function AutoComplete(_ref) {
     block: true,
     placeholder: placeholder,
     status: status
-  })));
+  }, others))));
 }.bind(void 0);
 
 AutoComplete.propTypes = {

package/lib/components/Cascader/Cascader.d.ts

@@ -35,7 +35,9 @@ export interface DefinedCascaderProps {
     popoverProps?: {
         [key: string]: any;
     };
+    /** 分隔符 */
+    separator?: string;
 }
 export declare type CascaderProps = DefinedCascaderProps;
-declare const _default: React.MemoExoticComponent<({ dataSource, value: _value, defaultValue, onChange: _onChange, disabled, size, search, clearable, placeholder, loadData, status, popoverProps }: DefinedCascaderProps) => JSX.Element>;
+declare const _default: React.MemoExoticComponent<({ dataSource, value: _value, defaultValue, onChange: _onChange, disabled, size, search, clearable, placeholder, loadData, status, popoverProps, separator, }: DefinedCascaderProps) => JSX.Element>;
 export default _default;

package/lib/components/Cascader/Cascader.js

@@ -126,12 +126,15 @@ var StaticInputWithoutMemo = /*#__PURE__*/_react.default.forwardRef(function Sta
 
 var StaticInput = /*#__PURE__*/_react.default.memo(StaticInputWithoutMemo);
 
-var getValueStringFromDataSource = function getValueStringFromDataSource(value, dataSource) {
+var getValueStringFromDataSource = function getValueStringFromDataSource(_ref2) {
   var _this4 = this;
 
   (0, _newArrowCheck2.default)(this, _this);
+  var value = _ref2.value,
+      dataSource = _ref2.dataSource,
+      userSeparator = _ref2.separator;
   if (!(value !== null && value !== void 0 && value.length)) return '';
-  var separator = '/';
+  var separator = userSeparator ? userSeparator : '/';
   if (!dataSource) return value.join(separator);
   var tmpItems = dataSource;
   return value.map(function (key) {
@@ -165,22 +168,23 @@ var popoverAlign = {
 };
 var defaultDataSourceAfterSearch = [];
 
-var Cascader = function Cascader(_ref2) {
+var Cascader = function Cascader(_ref3) {
   var _this6 = this;
 
   (0, _newArrowCheck2.default)(this, _this);
-  var dataSource = _ref2.dataSource,
-      _value = _ref2.value,
-      defaultValue = _ref2.defaultValue,
-      _onChange = _ref2.onChange,
-      disabled = _ref2.disabled,
-      size = _ref2.size,
-      search = _ref2.search,
-      clearable = _ref2.clearable,
-      placeholder = _ref2.placeholder,
-      loadData = _ref2.loadData,
-      status = _ref2.status,
-      popoverProps = _ref2.popoverProps;
+  var dataSource = _ref3.dataSource,
+      _value = _ref3.value,
+      defaultValue = _ref3.defaultValue,
+      _onChange = _ref3.onChange,
+      disabled = _ref3.disabled,
+      size = _ref3.size,
+      search = _ref3.search,
+      clearable = _ref3.clearable,
+      placeholder = _ref3.placeholder,
+      loadData = _ref3.loadData,
+      status = _ref3.status,
+      popoverProps = _ref3.popoverProps,
+      separator = _ref3.separator;
 
   var _useUncontrolled = (0, _useUncontrolled3.default)(_value, defaultValue, _onChange),
       _useUncontrolled2 = (0, _slicedToArray2.default)(_useUncontrolled, 2),
@@ -248,8 +252,12 @@ var Cascader = function Cascader(_ref2) {
   }.bind(this), []);
   var valueString = (0, _react.useMemo)(function () {
     (0, _newArrowCheck2.default)(this, _this6);
-    return getValueStringFromDataSource(value, dataSource);
-  }.bind(this), [dataSource, value]);
+    return getValueStringFromDataSource({
+      value: value,
+      dataSource: dataSource,
+      separator: separator
+    });
+  }.bind(this), [dataSource, value, separator]);
   var inputFocused = (0, _react.useMemo)(function () {
     (0, _newArrowCheck2.default)(this, _this6);
     return searchAble && focusing;
@@ -351,7 +359,8 @@ Cascader.propTypes = {
   })]),
   clearable: _propTypes.default.bool,
   placeholder: _propTypes.default.string,
-  popoverProps: _propTypes.default.objectOf(_propTypes.default.any)
+  popoverProps: _propTypes.default.objectOf(_propTypes.default.any),
+  separator: _propTypes.default.string
 };
 
 var _default = /*#__PURE__*/_react.default.memo(Cascader);

package/lib/components/Form/ControllerContext.d.ts

@@ -1,5 +1,5 @@
 import React from 'react';
 declare const ControllerContext: React.Context<{
-    status?: "loading" | "default" | "error" | "success" | "warning" | undefined;
+    status?: "loading" | "default" | "success" | "warning" | "error" | undefined;
 }>;
 export default ControllerContext;