@kdcloudjs/kdesign 1.6.26 → 1.6.28

package/lib/pagination/pagination.js

@@ -25,10 +25,10 @@ var _map = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable
 
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/toConsumableArray"));
 
-var _extends2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/extends"));
-
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/defineProperty"));
 
+var _extends2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/extends"));
+
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/slicedToArray"));
 
 var React = _interopRequireWildcard(require("react"));
@@ -90,6 +90,7 @@ var Pagination = function Pagination(props) {
       showSizeChanger = _getCompProps.showSizeChanger,
       onShowSizeChange = _getCompProps.onShowSizeChange,
       hideOnSinglePage = _getCompProps.hideOnSinglePage,
+      icons = _getCompProps.icons,
       customPrefixcls = _getCompProps.prefixCls;
 
   (0, _devwarning.default)(PageTypes.indexOf(pageType) === -1, 'Pagination', "cannot found pageType '".concat(pageType, "'")); // className前缀
@@ -131,8 +132,32 @@ var Pagination = function Pagination(props) {
   var _React$useState7 = React.useState(false),
       _React$useState8 = (0, _slicedToArray2.default)(_React$useState7, 2),
       isOpen = _React$useState8[0],
-      setIsOpen = _React$useState8[1]; // 切换pageSize
+      setIsOpen = _React$useState8[1]; // icons
+
 
+  var innerIcon = (0, _extends2.default)({
+    first: /*#__PURE__*/React.createElement(_icon.default, {
+      type: "first"
+    }),
+    last: /*#__PURE__*/React.createElement(_icon.default, {
+      type: "last"
+    }),
+    prev: /*#__PURE__*/React.createElement(_icon.default, {
+      type: "arrow-left"
+    }),
+    next: /*#__PURE__*/React.createElement(_icon.default, {
+      type: "arrow-right"
+    }),
+    down: /*#__PURE__*/React.createElement(_icon.default, {
+      type: "arrow-down"
+    }),
+    jumpPrev: /*#__PURE__*/React.createElement(_icon.default, {
+      type: "double-arrow-left"
+    }),
+    jumpNext: /*#__PURE__*/React.createElement(_icon.default, {
+      type: "double-arrow-right"
+    })
+  }, icons || {}); // 切换pageSize
 
   var handleChangeSize = function handleChangeSize(key) {
     var currentSize = Number(key);
@@ -278,24 +303,16 @@ var Pagination = function Pagination(props) {
   }, /*#__PURE__*/React.createElement("li", (0, _extends2.default)({}, itemAttr('action-item', paginationLangMsg.first)), /*#__PURE__*/React.createElement("button", {
     onClick: handleFirst,
     disabled: page === 1 || disabled
-  }, /*#__PURE__*/React.createElement(_icon.default, {
-    type: "first"
-  }))), /*#__PURE__*/React.createElement("li", (0, _extends2.default)({}, itemAttr('action-item', paginationLangMsg.prevPage)), /*#__PURE__*/React.createElement("button", {
+  }, innerIcon.first)), /*#__PURE__*/React.createElement("li", (0, _extends2.default)({}, itemAttr('action-item', paginationLangMsg.prevPage)), /*#__PURE__*/React.createElement("button", {
     onClick: handlePrev,
     disabled: page === 1 || disabled
-  }, /*#__PURE__*/React.createElement(_icon.default, {
-    type: "arrow-left"
-  }))), /*#__PURE__*/React.createElement("li", (0, _extends2.default)({}, itemAttr('action-item', paginationLangMsg.nextPage)), /*#__PURE__*/React.createElement("button", {
+  }, innerIcon.prev)), /*#__PURE__*/React.createElement("li", (0, _extends2.default)({}, itemAttr('action-item', paginationLangMsg.nextPage)), /*#__PURE__*/React.createElement("button", {
     onClick: handleNext,
     disabled: page === totalPage || disabled
-  }, /*#__PURE__*/React.createElement(_icon.default, {
-    type: "arrow-right"
-  }))), /*#__PURE__*/React.createElement("li", (0, _extends2.default)({}, itemAttr('action-item', paginationLangMsg.last)), /*#__PURE__*/React.createElement("button", {
+  }, innerIcon.next)), /*#__PURE__*/React.createElement("li", (0, _extends2.default)({}, itemAttr('action-item', paginationLangMsg.last)), /*#__PURE__*/React.createElement("button", {
     onClick: handleLast,
     disabled: page === totalPage || disabled
-  }, /*#__PURE__*/React.createElement(_icon.default, {
-    type: "last"
-  })))), showSizeSelector && /*#__PURE__*/React.createElement("div", {
+  }, innerIcon.last))), showSizeSelector && /*#__PURE__*/React.createElement("div", {
     className: "".concat(prefixCls, "-selector")
   }, /*#__PURE__*/React.createElement(_dropdown.default, (0, _extends2.default)({
     selectable: true,
@@ -315,13 +332,10 @@ var Pagination = function Pagination(props) {
   }, dropdownProps, {
     onVisibleChange: dropdownVisibleChange
   }), /*#__PURE__*/React.createElement("button", {
-    className: "".concat(prefixCls, "-selector-size")
+    className: (0, _classnames.default)("".concat(prefixCls, "-selector-size"), "".concat(prefixCls, "-options-dropdown"), (0, _defineProperty2.default)({}, "".concat(prefixCls, "-options-dropdown-open"), isOpen))
   }, /*#__PURE__*/React.createElement("span", null, locale.getLangMsg('Pagination', 'perPage', {
     size: size
-  })), /*#__PURE__*/React.createElement(_icon.default, {
-    type: "arrow-down",
-    className: (0, _classnames.default)("".concat(prefixCls, "-dropdown-icon"), (0, _defineProperty2.default)({}, "".concat(prefixCls, "-dropdown-icon-open"), isOpen))
-  })))));
+  })), innerIcon.down))));
   var simplePagination = /*#__PURE__*/React.createElement("div", {
     className: (0, _classnames.default)(prefixCls, 'simple', className),
     style: style
@@ -333,9 +347,7 @@ var Pagination = function Pagination(props) {
   }, /*#__PURE__*/React.createElement("li", (0, _extends2.default)({}, itemAttr('action-item', paginationLangMsg.prevPage)), /*#__PURE__*/React.createElement("button", {
     onClick: handlePrev,
     disabled: page === 1 || disabled
-  }, /*#__PURE__*/React.createElement(_icon.default, {
-    type: "arrow-left"
-  }))), /*#__PURE__*/React.createElement("li", (0, _extends2.default)({}, itemAttr('action-item', (0, _concat.default)(_context4 = "".concat(page, "/")).call(_context4, totalPage))), /*#__PURE__*/React.createElement("span", {
+  }, innerIcon.prev)), /*#__PURE__*/React.createElement("li", (0, _extends2.default)({}, itemAttr('action-item', (0, _concat.default)(_context4 = "".concat(page, "/")).call(_context4, totalPage))), /*#__PURE__*/React.createElement("span", {
     className: "".concat(prefixCls, "-current")
   }, showJumper ? /*#__PURE__*/React.createElement("input", {
     type: "text",
@@ -350,9 +362,7 @@ var Pagination = function Pagination(props) {
   }, totalPage)), /*#__PURE__*/React.createElement("li", (0, _extends2.default)({}, itemAttr('action-item', paginationLangMsg.nextPage)), /*#__PURE__*/React.createElement("button", {
     onClick: handleNext,
     disabled: page === totalPage || disabled
-  }, /*#__PURE__*/React.createElement(_icon.default, {
-    type: "arrow-right"
-  })))));
+  }, innerIcon.next))));
   var lessPages = genArray(1, totalPage);
   var lessPagination = /*#__PURE__*/React.createElement("div", {
     className: (0, _classnames.default)(prefixCls, 'less', {
@@ -365,9 +375,7 @@ var Pagination = function Pagination(props) {
   }, /*#__PURE__*/React.createElement("li", (0, _extends2.default)({}, itemAttr('pages-item', paginationLangMsg.prevPage)), /*#__PURE__*/React.createElement("button", {
     onClick: handlePrev,
     disabled: page === 1 || disabled
-  }, /*#__PURE__*/React.createElement(_icon.default, {
-    type: "arrow-left"
-  }))), (0, _map.default)(lessPages).call(lessPages, function (item, index) {
+  }, innerIcon.prev)), (0, _map.default)(lessPages).call(lessPages, function (item, index) {
     return /*#__PURE__*/React.createElement("li", (0, _extends2.default)({
       key: index
     }, itemAttr('pages-item', String(item), item === page)), /*#__PURE__*/React.createElement("button", {
@@ -379,9 +387,7 @@ var Pagination = function Pagination(props) {
   }), /*#__PURE__*/React.createElement("li", (0, _extends2.default)({}, itemAttr('pages-item', paginationLangMsg.nextPage)), /*#__PURE__*/React.createElement("button", {
     onClick: handleNext,
     disabled: page === totalPage || disabled
-  }, /*#__PURE__*/React.createElement(_icon.default, {
-    type: "arrow-right"
-  })))));
+  }, innerIcon.next))));
   var nicetyPages = lessPages;
 
   if (totalPage >= 8) {
@@ -410,31 +416,26 @@ var Pagination = function Pagination(props) {
   }, /*#__PURE__*/React.createElement("li", (0, _extends2.default)({}, itemAttr('pages-item', paginationLangMsg.prevPage)), /*#__PURE__*/React.createElement("button", {
     onClick: handlePrev,
     disabled: page === 1 || disabled
-  }, /*#__PURE__*/React.createElement(_icon.default, {
-    type: "arrow-left"
-  }))), (0, _map.default)(nicetyPages).call(nicetyPages, function (item, index) {
+  }, innerIcon.prev)), (0, _map.default)(nicetyPages).call(nicetyPages, function (item, index) {
     var handleChangePage = function handleChangePage() {
       return typeof item === 'string' ? item === '<<' ? jumpPrev() : jumpNext() : changePage(item);
     };
 
     var pageText = typeof item === 'string' ? '...' : item;
-    var jumperIconType = item === '<<' ? 'double-arrow-left' : 'double-arrow-right';
+    var jumperIconType = item === '<<' ? innerIcon.jumpPrev : innerIcon.jumpNext;
     var title = typeof item === 'string' ? paginationLangMsg[item === '<<' ? 'forward' : 'backward'] : String(item);
     return /*#__PURE__*/React.createElement("li", (0, _extends2.default)({
       key: index
     }, itemAttr('pages-item', title, item === page)), /*#__PURE__*/React.createElement("button", {
       onClick: handleChangePage,
       disabled: disabled
-    }, pageText, typeof item === 'string' && /*#__PURE__*/React.createElement(_icon.default, {
-      type: jumperIconType,
+    }, pageText, typeof item === 'string' && /*#__PURE__*/React.cloneElement(jumperIconType, {
       className: "".concat(prefixCls, "-pages-jumper-icon")
     })));
   }), /*#__PURE__*/React.createElement("li", (0, _extends2.default)({}, itemAttr('pages-item', paginationLangMsg.nextPage)), /*#__PURE__*/React.createElement("button", {
     onClick: handleNext,
     disabled: page === totalPage || disabled
-  }, /*#__PURE__*/React.createElement(_icon.default, {
-    type: "arrow-right"
-  })))), showJumper && /*#__PURE__*/React.createElement("div", {
+  }, innerIcon.next))), showJumper && /*#__PURE__*/React.createElement("div", {
     className: "".concat(prefixCls, "-jumper")
   }, /*#__PURE__*/React.createElement("input", {
     type: "text",
@@ -467,11 +468,8 @@ var Pagination = function Pagination(props) {
     }, dropdownProps, {
       onVisibleChange: dropdownVisibleChange
     }), /*#__PURE__*/React.createElement("button", {
-      className: "".concat(prefixCls, "-options-size")
-    }, size, /*#__PURE__*/React.createElement(_icon.default, {
-      type: "arrow-down",
-      className: (0, _classnames.default)("".concat(prefixCls, "-dropdown-icon"), (0, _defineProperty2.default)({}, "".concat(prefixCls, "-dropdown-icon-open"), isOpen))
-    })))
+      className: (0, _classnames.default)("".concat(prefixCls, "-options-size"), "".concat(prefixCls, "-options-dropdown"), (0, _defineProperty2.default)({}, "".concat(prefixCls, "-options-dropdown-open"), isOpen))
+    }, size, innerIcon.down))
   })));
   var mapPagination = {
     basic: normalPagination,

package/lib/pagination/style/index.css

@@ -707,17 +707,17 @@
   -webkit-transform: translateY(-50%);
           transform: translateY(-50%);
 }
-.kd-pagination.nicety .kd-pagination-options .kd-pagination-options-size .kd-pagination-dropdown-icon-open {
+.kd-pagination.nicety .kd-pagination-options .kd-pagination-options-size.kd-pagination-options-dropdown-open i {
   -webkit-transform: rotate(180deg) translateY(50%);
           transform: rotate(180deg) translateY(50%);
 }
-.kd-pagination-dropdown-icon {
+.kd-pagination-options-dropdown i {
   -webkit-transition: -webkit-transform var(--kd-g-duration, 0.3s);
   transition: -webkit-transform var(--kd-g-duration, 0.3s);
   transition: transform var(--kd-g-duration, 0.3s);
   transition: transform var(--kd-g-duration, 0.3s), -webkit-transform var(--kd-g-duration, 0.3s);
 }
-.kd-pagination-dropdown-icon-open {
+.kd-pagination-options-dropdown-open i {
   -webkit-transform: rotate(180deg);
           transform: rotate(180deg);
 }

package/lib/pagination/style/index.less

@@ -25,6 +25,7 @@
     display: inline-block;
     margin-right: 12px;
     vertical-align: middle;
+
     .@{pagination-prefix-cls}-current-input {
       box-sizing: border-box;
       width: 44px;
@@ -303,6 +304,7 @@
     .@{pagination-pages-prefix-cls} {
       .reset-component;
       display: inline-block;
+
       &-item {
         .reset-component;
         position: relative;
@@ -372,6 +374,7 @@
     .@{pagination-pages-prefix-cls} {
       .reset-component;
       display: inline-block;
+
       &-item {
         .reset-component;
         position: relative;
@@ -388,6 +391,7 @@
         &.active {
           button {
             border-color: @pagination-border-hover-color;
+
             &:disabled {
               border-color: @pagination-border-disabled-color;
             }
@@ -577,16 +581,24 @@
           transform: translateY(-50%);
         }
 
-        .@{pagination-prefix-cls}-dropdown-icon-open {
-          transform: rotate(180deg) translateY(50%);
+        &.@{pagination-prefix-cls}-options-dropdown-open {
+          i {
+            transform: rotate(180deg) translateY(50%);
+          }
         }
       }
     }
   }
-  &-dropdown-icon {
-    transition: transform @duration-promptly;
+
+  &-options-dropdown {
+    i {
+      transition: transform @duration-promptly;
+    }
+
     &-open {
-      transform: rotate(180deg);
+      i {
+        transform: rotate(180deg);
+      }
     }
   }
 }

package/lib/radio/index.js

@@ -27,6 +27,7 @@ var _radioButton = _interopRequireDefault(require("./radio-button"));
 
 var Radio = _radio.default;
 Radio.Group = _group.default;
+Radio.Group.displayName = 'RadioGroup';
 Radio.Button = _radioButton.default;
 var _default = Radio;
 exports.default = _default;

package/lib/select/interface.d.ts

@@ -59,4 +59,12 @@ export interface ISelectProps<T extends SelectValue> extends AbstractSelectProps
     onSearch?: (value?: string) => void;
     onClear?: () => void;
     onDropdownVisibleChange?: (value?: T) => void;
+    tagRender?: (props: TagProps) => void;
+}
+export interface TagProps {
+    value?: string;
+    label?: React.ReactNode;
+    disabled: boolean;
+    size: SelectSize;
+    onClose: () => void;
 }

package/lib/select/select.js

@@ -98,7 +98,8 @@ var InternalSelect = function InternalSelect(props, ref) {
       optionFilterProp = selectProps.optionFilterProp,
       optionLabelProp = selectProps.optionLabelProp,
       _selectProps$popperSt = selectProps.popperStyle,
-      popperStyle = _selectProps$popperSt === void 0 ? {} : _selectProps$popperSt;
+      popperStyle = _selectProps$popperSt === void 0 ? {} : _selectProps$popperSt,
+      tagRender = selectProps.tagRender;
   var isMultiple = mode === 'multiple'; // 是否多选
 
   var _useMergedState = (0, _hooks.useMergedState)(undefined, {
@@ -440,25 +441,27 @@ var InternalSelect = function InternalSelect(props, ref) {
         selectedVal = _multipleRef$current3.selectedVal,
         selectMulOpts = _multipleRef$current3.selectMulOpts;
 
-    if ((filledOptions === null || filledOptions === void 0 ? void 0 : filledOptions.length) !== selectedVal.length) {
-      (0, _map.default)(filledOptions).call(filledOptions, function (child) {
-        var _ref = child.props || child,
-            value = _ref.value;
-
-        if (!(0, _includes.default)(selectedVal).call(selectedVal, value)) {
-          selectedVal.push(value);
-          selectMulOpts.push({
-            value: value,
-            label: getOptionLabel(child)
-          });
-        }
-      });
-      setMulOptions((0, _toConsumableArray2.default)(selectMulOpts));
-      setSearchValue('');
-    } else {
-      multipleRef.current.selectedVal = selectedVal = [];
-      multipleRef.current.selectMulOpts = selectMulOpts = [];
-      setMulOptions([]);
+    if (!('value' in selectProps)) {
+      if ((filledOptions === null || filledOptions === void 0 ? void 0 : filledOptions.length) !== selectedVal.length) {
+        (0, _map.default)(filledOptions).call(filledOptions, function (child) {
+          var _ref = child.props || child,
+              value = _ref.value;
+
+          if (!(0, _includes.default)(selectedVal).call(selectedVal, value)) {
+            selectedVal.push(value);
+            selectMulOpts.push({
+              value: value,
+              label: getOptionLabel(child)
+            });
+          }
+        });
+        setMulOptions((0, _toConsumableArray2.default)(selectMulOpts));
+        setSearchValue('');
+      } else {
+        multipleRef.current.selectedVal = selectedVal = [];
+        multipleRef.current.selectMulOpts = selectMulOpts = [];
+        setMulOptions([]);
+      }
     }
 
     onChange && onChange(labelInValue ? selectMulOpts : selectedVal, selectMulOpts);
@@ -490,6 +493,7 @@ var InternalSelect = function InternalSelect(props, ref) {
     }
 
     onClear && onClear('');
+    setSearchValue('');
     onChange && onChange(isMultiple ? '' : undefined);
   }; // 多选模式下清除某一项
 
@@ -515,7 +519,7 @@ var InternalSelect = function InternalSelect(props, ref) {
     var selectedVal = multipleRef.current.selectedVal; // 选择器下拉icon样式
 
     var arrowIconCls = (0, _classnames.default)((_classNames7 = {}, (0, _defineProperty2.default)(_classNames7, "".concat(selectPrefixCls, "-icon-arrow"), true), (0, _defineProperty2.default)(_classNames7, "".concat(selectPrefixCls, "-icon-arrow-up"), optionShow), (0, _defineProperty2.default)(_classNames7, "".concat(selectPrefixCls, "-icon-arrow-down"), !optionShow), (0, _defineProperty2.default)(_classNames7, "".concat(selectPrefixCls, "-icon-arrow-focus"), optionShow), _classNames7));
-    var iconShow = allowClear && !disabled && (isMultiple ? mulOptions.length > 0 : (selectedVal !== null && selectedVal !== void 0 ? selectedVal : '') !== '');
+    var iconShow = allowClear && !disabled && ((isMultiple ? mulOptions.length > 0 : (selectedVal !== null && selectedVal !== void 0 ? selectedVal : '') !== '') || searchValue);
     var clearIconCls = (0, _classnames.default)((0, _defineProperty2.default)({}, "".concat(selectPrefixCls, "-icon-clear"), true));
     return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, iconShow && /*#__PURE__*/_react.default.createElement("span", {
       onClick: handleReset,
@@ -709,7 +713,13 @@ var InternalSelect = function InternalSelect(props, ref) {
         onMouseDown: function onMouseDown(e) {
           return e.preventDefault();
         }
-      }, /*#__PURE__*/_react.default.createElement(_index.Tag, {
+      }, typeof tagRender === 'function' ? tagRender === null || tagRender === void 0 ? void 0 : tagRender({
+        onClose: handleRemove,
+        value: value,
+        label: label,
+        disabled: disabled,
+        size: size
+      }) : /*#__PURE__*/_react.default.createElement(_index.Tag, {
         type: "edit",
         style: TagStyle,
         size: size,

package/lib/upload/interface.d.ts

@@ -145,6 +145,7 @@ export interface IFileItem {
     file: UploadFile;
     prefixCls: string;
     listType: string;
+    disabled: boolean;
     handleReUpload: (file: UploadFile, e: React.MouseEvent) => void;
     handleRemove: (file: UploadFile, e: React.MouseEvent) => void;
 }

package/lib/upload/upload.js

@@ -186,7 +186,9 @@ var InternalUpload = function InternalUpload(props, ref) {
     var _context2;
 
     files.forEach(function (file) {
-      file.originFileObj = new File([file], file.type);
+      file.originFileObj = new File([file], file.name, {
+        type: file.type
+      });
       file.uid = getUid();
       file.status = 'notStart';
       file.fileName = allProps.name || file.name;
@@ -492,7 +494,8 @@ var InternalUpload = function InternalUpload(props, ref) {
       prefixCls: prefixCls,
       listType: listType,
       handleReUpload: handleReUpload,
-      handleRemove: handleRemove
+      handleRemove: handleRemove,
+      disabled: disabled
     })), file, setFileList) : /*#__PURE__*/React.createElement(Item, (0, _extends2.default)({
       key: file.uid
     }, {
@@ -500,7 +503,8 @@ var InternalUpload = function InternalUpload(props, ref) {
       prefixCls: prefixCls,
       listType: listType,
       handleReUpload: handleReUpload,
-      handleRemove: handleRemove
+      handleRemove: handleRemove,
+      disabled: disabled
     }));
   })));
 };
@@ -512,7 +516,8 @@ var Item = function Item(_ref3) {
       prefixCls = _ref3.prefixCls,
       listType = _ref3.listType,
       handleReUpload = _ref3.handleReUpload,
-      handleRemove = _ref3.handleRemove;
+      handleRemove = _ref3.handleRemove,
+      disabled = _ref3.disabled;
   var mapStatus = {
     uploading: 'loadding',
     error: 'warning-solid',
@@ -540,7 +545,7 @@ var Item = function Item(_ref3) {
     href: "true",
     className: (0, _concat.default)(_context13 = "".concat(prefixCls, "-")).call(_context13, listType, "-list-item-reupload"),
     onClick: handleReUpload.bind(_this, file)
-  }, "\u91CD\u65B0\u4E0A\u4F20"), /*#__PURE__*/React.createElement("a", {
+  }, "\u91CD\u65B0\u4E0A\u4F20"), !disabled && /*#__PURE__*/React.createElement("a", {
     href: "true",
     className: (0, _concat.default)(_context14 = "".concat(prefixCls, "-")).call(_context14, listType, "-list-item-delete"),
     onClick: handleRemove.bind(_this, file)
@@ -559,7 +564,7 @@ var Item = function Item(_ref3) {
     style: {
       verticalAlign: 'top'
     }
-  }), "\u4E0A\u4F20\u5931\u8D25"), /*#__PURE__*/React.createElement("div", {
+  }), "\u4E0A\u4F20\u5931\u8D25"), !disabled && /*#__PURE__*/React.createElement("div", {
     className: (0, _concat.default)(_context18 = "".concat(prefixCls, "-")).call(_context18, listType, "-list-item-action")
   }, /*#__PURE__*/React.createElement("a", {
     href: "true",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kdcloudjs/kdesign",
-  "version": "1.6.26",
+  "version": "1.6.28",
   "description": "KDesign 金蝶前端react 组件库",
   "title": "kdesign",
   "keywords": [