@kdcloudjs/kdesign 1.6.8 → 1.6.11

package/lib/menu/style/index.css

@@ -129,6 +129,12 @@
   color: var(--kd-c-menu-light-color-text, var(--kd-g-color-text-primary, #212121));
   background: #fafafa;
 }
+.menu-light-base .kd-menu-submenu:not(.kd-menu-submenu-disabled):not(.kd-menu-submenu-active):hover,
+.menu-light-base .kd-menu-submenu-hover {
+  background-color: var(--kd-c-menu-light-color-background-hover, #f5f5f5);
+  color: var(--kd-c-menu-light-color-text-hover, var(--kd-g-color-text-primary, #212121));
+  border: none;
+}
 .menu-light-base .kd-menu-item:not(.kd-menu-item-disabled):not(.kd-menu-item-active):hover {
   background-color: var(--kd-c-menu-light-color-background-hover, #f5f5f5);
   color: var(--kd-c-menu-light-color-text-hover, var(--kd-g-color-text-primary, #212121));
@@ -477,6 +483,12 @@
   color: var(--kd-c-menu-light-color-text, var(--kd-g-color-text-primary, #212121));
   background: #fafafa;
 }
+.kd-menu-light .kd-menu-submenu:not(.kd-menu-submenu-disabled):not(.kd-menu-submenu-active):hover,
+.kd-menu-light .kd-menu-submenu-hover {
+  background-color: var(--kd-c-menu-light-color-background-hover, #f5f5f5);
+  color: var(--kd-c-menu-light-color-text-hover, var(--kd-g-color-text-primary, #212121));
+  border: none;
+}
 .kd-menu-light .kd-menu-item:not(.kd-menu-item-disabled):not(.kd-menu-item-active):hover {
   background-color: var(--kd-c-menu-light-color-background-hover, #f5f5f5);
   color: var(--kd-c-menu-light-color-text-hover, var(--kd-g-color-text-primary, #212121));
@@ -569,6 +581,12 @@
   color: var(--kd-c-menu-light-color-text, var(--kd-g-color-text-primary, #212121));
   background: #fafafa;
 }
+.kd-menu-popper.light .kd-menu-submenu:not(.kd-menu-submenu-disabled):not(.kd-menu-submenu-active):hover,
+.kd-menu-popper.light .kd-menu-submenu-hover {
+  background-color: var(--kd-c-menu-light-color-background-hover, #f5f5f5);
+  color: var(--kd-c-menu-light-color-text-hover, var(--kd-g-color-text-primary, #212121));
+  border: none;
+}
 .kd-menu-popper.light .kd-menu-item:not(.kd-menu-item-disabled):not(.kd-menu-item-active):hover {
   background-color: var(--kd-c-menu-light-color-background-hover, #f5f5f5);
   color: var(--kd-c-menu-light-color-text-hover, var(--kd-g-color-text-primary, #212121));

package/lib/menu/style/mixin.less

@@ -107,6 +107,11 @@
     background: #fafafa;
   }
 
+  .@{submenu-prefix-cls}:not(.@{submenu-prefix-cls}-disabled):not(.@{submenu-prefix-cls}-active):hover,
+  .@{submenu-prefix-cls}-hover {
+    .menu-light-hover();
+  }
+
   .@{menuitem-prefix-cls}:not(.@{menuitem-prefix-cls}-disabled):not(.@{menuitem-prefix-cls}-active):hover {
     .menu-light-hover();
   }

package/lib/select/interface.d.ts

@@ -36,6 +36,7 @@ export interface AbstractSelectProps extends PopperProps {
     maxTagPlaceholder?: React.ReactNode | ((omittedValues: LabeledValue[]) => React.ReactNode);
     filterOption?: boolean | ((inputValue: string, option?: OptionsType) => boolean);
     optionFilterProp?: string;
+    optionLabelProp?: string;
 }
 export interface LabeledValue {
     key?: string;

package/lib/select/select.js

@@ -313,20 +313,22 @@ var InternalSelect = function InternalSelect(props, ref) {
   var getOptionLabel = (0, _react.useCallback)(function (obj) {
     var _a;
 
+    var text = 'options' in selectProps ? 'label' : optionLabelProp;
+
     if (obj.props) {
-      if (optionLabelProp) {
-        return obj === null || obj === void 0 ? void 0 : obj.props[optionLabelProp];
+      if (text) {
+        return obj === null || obj === void 0 ? void 0 : obj.props[text];
       }
 
       return (_a = obj.props) === null || _a === void 0 ? void 0 : _a.children;
     } else {
-      if (optionLabelProp) {
-        return obj[optionLabelProp];
+      if (text) {
+        return obj[text];
       }
     }
 
     return obj === null || obj === void 0 ? void 0 : obj.label;
-  }, [optionLabelProp]); // 点击下拉列表中某项回调
+  }, [optionLabelProp, selectProps]); // 点击下拉列表中某项回调
 
   var handleOption = function handleOption(key, label, isSelected) {
     var onSelect = selectProps.onSelect,

package/lib/upload/interface.d.ts

@@ -141,4 +141,11 @@ export interface UploadRequestOption<T = any> {
     headers?: HttpRequestHeader;
     method: UploadRequestMethod;
 }
+export interface IFileItem {
+    file: UploadFile;
+    prefixCls: string;
+    listType: string;
+    handleReUpload: (file: UploadFile, e: React.MouseEvent) => void;
+    handleRemove: (file: UploadFile, e: React.MouseEvent) => void;
+}
 export {};

package/lib/upload/upload.js

@@ -147,6 +147,7 @@ var InternalUpload = function InternalUpload(props, ref) {
       onRemove = allProps.onRemove,
       directory = allProps.directory,
       className = allProps.className,
+      itemRender = allProps.itemRender,
       showUploadList = allProps.showUploadList,
       customPrefixcls = allProps.prefixCls;
 
@@ -391,13 +392,6 @@ var InternalUpload = function InternalUpload(props, ref) {
     directory: directory ? 'directory' : undefined,
     webkitdirectory: directory ? 'webkitdirectory' : undefined
   };
-  var mapStatus = {
-    uploading: 'loadding',
-    error: 'warning-solid',
-    done: 'attachment',
-    success: 'attachment',
-    notStart: 'attachment'
-  };
   var dragEvents = {};
 
   var _React$useState3 = React.useState(false),
@@ -493,76 +487,105 @@ var InternalUpload = function InternalUpload(props, ref) {
   }, inputFileProps, {
     ref: mergedRef
   }))))), showUploadList && (0, _map.default)(fileList).call(fileList, function (file) {
-    var _context8, _context9, _context10, _context11, _context12, _context13, _context14, _context15, _context16, _context17, _context18, _context19, _context20;
-
-    return /*#__PURE__*/React.createElement("li", {
-      key: file.uid,
-      className: (0, _classnames.default)((0, _concat.default)(_context8 = "".concat(prefixCls, "-")).call(_context8, listType, "-list-item"), {
-        error: file.status === 'error'
-      })
-    }, listType === 'text' ? /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("span", {
-      className: (0, _concat.default)(_context9 = "".concat(prefixCls, "-")).call(_context9, listType, "-list-item-icon")
-    }, /*#__PURE__*/React.createElement(_icon.default, {
-      spin: file.status === 'uploading',
-      type: mapStatus[file.status]
-    })), /*#__PURE__*/React.createElement("span", {
-      className: (0, _concat.default)(_context10 = "".concat(prefixCls, "-")).call(_context10, listType, "-list-item-name"),
-      title: file.name
-    }, file.name), /*#__PURE__*/React.createElement("span", {
-      className: (0, _concat.default)(_context11 = "".concat(prefixCls, "-")).call(_context11, listType, "-list-item-size")
-    }, "(", (0, _utils2.getFileSize)(file.size), ")"), /*#__PURE__*/React.createElement("div", {
-      className: (0, _concat.default)(_context12 = "".concat(prefixCls, "-")).call(_context12, listType, "-list-item-action")
-    }, file.status === 'error' && /*#__PURE__*/React.createElement("a", {
-      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", {
-      href: "true",
-      className: (0, _concat.default)(_context14 = "".concat(prefixCls, "-")).call(_context14, listType, "-list-item-delete"),
-      onClick: handleRemove.bind(_this, file)
-    }, "\u5220\u9664"))) : file.status === 'uploading' ? /*#__PURE__*/React.createElement("div", {
-      className: (0, _concat.default)(_context15 = "".concat(prefixCls, "-")).call(_context15, listType, "-list-item-loading")
-    }, /*#__PURE__*/React.createElement(_progress.default, {
-      percent: file.percent,
-      textMap: ['文件上传中'],
-      showInfo: false
-    })) : file.status === 'error' ? /*#__PURE__*/React.createElement("div", {
-      className: (0, _concat.default)(_context16 = "".concat(prefixCls, "-")).call(_context16, listType, "-list-item-error")
-    }, /*#__PURE__*/React.createElement("div", {
-      className: (0, _concat.default)(_context17 = "".concat(prefixCls, "-")).call(_context17, listType, "-list-item-error-text")
-    }, /*#__PURE__*/React.createElement(_icon.default, {
-      type: mapStatus[file.status],
-      style: {
-        verticalAlign: 'top'
-      }
-    }), "\u4E0A\u4F20\u5931\u8D25"), /*#__PURE__*/React.createElement("div", {
-      className: (0, _concat.default)(_context18 = "".concat(prefixCls, "-")).call(_context18, listType, "-list-item-action")
-    }, /*#__PURE__*/React.createElement("a", {
-      href: "true",
-      className: (0, _concat.default)(_context19 = "".concat(prefixCls, "-")).call(_context19, listType, "-list-item-reupload"),
-      onClick: handleReUpload.bind(_this, file)
-    }, "\u91CD\u65B0\u4E0A\u4F20"), /*#__PURE__*/React.createElement("a", {
-      href: "true",
-      className: (0, _concat.default)(_context20 = "".concat(prefixCls, "-")).call(_context20, listType, "-list-item-delete"),
-      onClick: handleRemove.bind(_this, file)
-    }, "\u5220\u9664"))) : /*#__PURE__*/React.createElement(_image.default, {
-      previewType: "upload",
-      name: file.name,
-      size: (0, _utils2.getFileSize)(file.size),
-      src: file.thumbUrl || file.url,
-      style: {
-        width: '100%',
-        height: '100%'
-      },
-      operations: [/*#__PURE__*/React.createElement(_icon.default, {
-        key: "1",
-        type: "delete",
-        onClick: handleRemove.bind(_this, file)
-      })]
+    return itemRender ? itemRender( /*#__PURE__*/React.createElement(Item, (0, _extends2.default)({}, {
+      file: file,
+      prefixCls: prefixCls,
+      listType: listType,
+      handleReUpload: handleReUpload,
+      handleRemove: handleRemove
+    })), file, setFileList) : /*#__PURE__*/React.createElement(Item, (0, _extends2.default)({
+      key: file.uid
+    }, {
+      file: file,
+      prefixCls: prefixCls,
+      listType: listType,
+      handleReUpload: handleReUpload,
+      handleRemove: handleRemove
     }));
   })));
 };
 
+var Item = function Item(_ref3) {
+  var _context8, _context9, _context10, _context11, _context12, _context13, _context14, _context15, _context16, _context17, _context18, _context19, _context20;
+
+  var file = _ref3.file,
+      prefixCls = _ref3.prefixCls,
+      listType = _ref3.listType,
+      handleReUpload = _ref3.handleReUpload,
+      handleRemove = _ref3.handleRemove;
+  var mapStatus = {
+    uploading: 'loadding',
+    error: 'warning-solid',
+    done: 'attachment',
+    success: 'attachment',
+    notStart: 'attachment'
+  };
+  return /*#__PURE__*/React.createElement("li", {
+    className: (0, _classnames.default)((0, _concat.default)(_context8 = "".concat(prefixCls, "-")).call(_context8, listType, "-list-item"), {
+      error: file.status === 'error'
+    })
+  }, listType === 'text' ? /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("span", {
+    className: (0, _concat.default)(_context9 = "".concat(prefixCls, "-")).call(_context9, listType, "-list-item-icon")
+  }, /*#__PURE__*/React.createElement(_icon.default, {
+    spin: file.status === 'uploading',
+    type: mapStatus[file.status]
+  })), /*#__PURE__*/React.createElement("span", {
+    className: (0, _concat.default)(_context10 = "".concat(prefixCls, "-")).call(_context10, listType, "-list-item-name"),
+    title: file.name
+  }, file.name), /*#__PURE__*/React.createElement("span", {
+    className: (0, _concat.default)(_context11 = "".concat(prefixCls, "-")).call(_context11, listType, "-list-item-size")
+  }, "(", (0, _utils2.getFileSize)(file.size), ")"), /*#__PURE__*/React.createElement("div", {
+    className: (0, _concat.default)(_context12 = "".concat(prefixCls, "-")).call(_context12, listType, "-list-item-action")
+  }, file.status === 'error' && /*#__PURE__*/React.createElement("a", {
+    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", {
+    href: "true",
+    className: (0, _concat.default)(_context14 = "".concat(prefixCls, "-")).call(_context14, listType, "-list-item-delete"),
+    onClick: handleRemove.bind(_this, file)
+  }, "\u5220\u9664"))) : file.status === 'uploading' ? /*#__PURE__*/React.createElement("div", {
+    className: (0, _concat.default)(_context15 = "".concat(prefixCls, "-")).call(_context15, listType, "-list-item-loading")
+  }, /*#__PURE__*/React.createElement(_progress.default, {
+    percent: file.percent,
+    textMap: ['文件上传中'],
+    showInfo: false
+  })) : file.status === 'error' ? /*#__PURE__*/React.createElement("div", {
+    className: (0, _concat.default)(_context16 = "".concat(prefixCls, "-")).call(_context16, listType, "-list-item-error")
+  }, /*#__PURE__*/React.createElement("div", {
+    className: (0, _concat.default)(_context17 = "".concat(prefixCls, "-")).call(_context17, listType, "-list-item-error-text")
+  }, /*#__PURE__*/React.createElement(_icon.default, {
+    type: mapStatus[file.status],
+    style: {
+      verticalAlign: 'top'
+    }
+  }), "\u4E0A\u4F20\u5931\u8D25"), /*#__PURE__*/React.createElement("div", {
+    className: (0, _concat.default)(_context18 = "".concat(prefixCls, "-")).call(_context18, listType, "-list-item-action")
+  }, /*#__PURE__*/React.createElement("a", {
+    href: "true",
+    className: (0, _concat.default)(_context19 = "".concat(prefixCls, "-")).call(_context19, listType, "-list-item-reupload"),
+    onClick: handleReUpload.bind(_this, file)
+  }, "\u91CD\u65B0\u4E0A\u4F20"), /*#__PURE__*/React.createElement("a", {
+    href: "true",
+    className: (0, _concat.default)(_context20 = "".concat(prefixCls, "-")).call(_context20, listType, "-list-item-delete"),
+    onClick: handleRemove.bind(_this, file)
+  }, "\u5220\u9664"))) : /*#__PURE__*/React.createElement(_image.default, {
+    previewType: "upload",
+    name: file.name,
+    size: (0, _utils2.getFileSize)(file.size),
+    src: file.thumbUrl || file.url,
+    style: {
+      width: '100%',
+      height: '100%'
+    },
+    operations: [/*#__PURE__*/React.createElement(_icon.default, {
+      key: "1",
+      type: "delete",
+      onClick: handleRemove.bind(_this, file)
+    })]
+  }));
+};
+
 var Upload = /*#__PURE__*/React.forwardRef(InternalUpload);
 Upload.displayName = 'Upload';
 var _default = Upload;

package/package.json

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