linkmore-design 1.1.13-alpha.0 → 1.1.13-alpha.10

package/es/LmUpload/LmUpload.js

@@ -13,6 +13,7 @@ var __rest = this && this.__rest || function (s, e) {
 
 import React, { useRef, useMemo, forwardRef } from 'react';
 import LmFilterRoot from './wrapper/UploadRoot';
+import DisabledContext from '../ConfigProvider/DisabledContext';
 
 var LmUpload = function LmUpload(_a, ref) {
   var _fileConfig = _a.fileConfig,
@@ -21,7 +22,8 @@ var LmUpload = function LmUpload(_a, ref) {
       _ossConfig = _a.ossConfig,
       resetProps = __rest(_a, ["fileConfig", "fileNames", "components", "ossConfig"]);
 
-  var defaultRef = useRef(null); // 仅在初始化触发一次
+  var defaultRef = useRef(null);
+  var disabled = React.useContext(DisabledContext); // 仅在初始化触发一次
 
   var initConfig = useMemo(function () {
     return {
@@ -73,12 +75,12 @@ var LmUpload = function LmUpload(_a, ref) {
     size: 100,
     fileSize: 10,
     fileSizeType: 'M',
-    uid: 'uid',
+    uid: 'fileName',
     accept: '',
     type: ['jpg', 'jpeg', 'png'],
     listType: 'card',
     readOnly: false,
-    disabled: false,
+    disabled: disabled || false,
     showUploadList: true,
     fileList: null,
     defaultFileList: [],
@@ -88,6 +90,7 @@ var LmUpload = function LmUpload(_a, ref) {
     itemRender: null,
     enabledPreview: true,
     enabledCrop: false,
+    enableDrag: false,
     enabledOss: false,
     // oss配置
     ossConfig: function ossConfig() {

package/es/LmUpload/UploadList/ItemPicture.js

@@ -6,6 +6,7 @@ var PictureItem = function PictureItem(_ref) {
   var file = _ref.file,
       instance = _ref.instance;
   var readOnly = instance.readOnly,
+      disabled = instance.disabled,
       remove = instance.remove,
       preview = instance.preview,
       download = instance.download,
@@ -27,7 +28,7 @@ var PictureItem = function PictureItem(_ref) {
     onClick: function onClick() {
       return download(file);
     }
-  }, file[fileNames.fileName])), !readOnly && /*#__PURE__*/React.createElement("div", {
+  }, file[fileNames.fileName])), !readOnly && !disabled && /*#__PURE__*/React.createElement("div", {
     className: "picture_right lm_upload_item_action"
   }, /*#__PURE__*/React.createElement("div", {
     className: "action_delete",

package/es/LmUpload/UploadList/ItemPictureCard.d.ts

@@ -1,6 +1,7 @@
-declare const PictureItem: ({ file, index, instance }: {
+declare const PictureItem: ({ file, index, instance, listeners }: {
     file: any;
     index: any;
     instance: any;
+    listeners: any;
 }) => JSX.Element;
 export default PictureItem;

package/es/LmUpload/UploadList/ItemPictureCard.js

@@ -64,8 +64,10 @@ var renderThumb = function renderThumb(file) {
 var PictureItem = function PictureItem(_ref) {
   var file = _ref.file,
       index = _ref.index,
-      instance = _ref.instance;
+      instance = _ref.instance,
+      listeners = _ref.listeners;
   var dispatch = instance.dispatch,
+      disabled = instance.disabled,
       readOnly = instance.readOnly,
       size = instance.size,
       remove = instance.remove,
@@ -121,13 +123,13 @@ var PictureItem = function PictureItem(_ref) {
     });
   };
 
-  return /*#__PURE__*/React.createElement("div", {
+  return /*#__PURE__*/React.createElement("div", Object.assign({
     className: cn('lm_upload_item', 'lm_upload_item_card', isError && 'lm_upload_item_error'),
     style: {
       height: size,
       width: size
     }
-  }, /*#__PURE__*/React.createElement("div", {
+  }, listeners || {}), /*#__PURE__*/React.createElement("div", {
     className: "lm_upload_item_thumb"
   }, isError || !isImg ? renderThumb(resetFile) : /*#__PURE__*/React.createElement(Image, {
     width: resetSize.width,
@@ -139,7 +141,15 @@ var PictureItem = function PictureItem(_ref) {
   })), /*#__PURE__*/React.createElement("div", {
     className: "lm_upload_item_mask"
   }, /*#__PURE__*/React.createElement("div", {
-    className: "lm_upload_item_action"
+    className: "lm_upload_item_action",
+    onKeyDown: function onKeyDown(e) {
+      e.stopPropagation();
+      e.preventDefault();
+    },
+    onPointerDown: function onPointerDown(e) {
+      e.stopPropagation();
+      e.preventDefault();
+    }
   }, /*#__PURE__*/React.createElement("div", {
     className: "action_preview",
     onClick: handlePreview
@@ -148,7 +158,7 @@ var PictureItem = function PictureItem(_ref) {
     style: {
       fontSize: resetSize.fontSize
     }
-  })), !readOnly && /*#__PURE__*/React.createElement("div", {
+  })), !readOnly && !disabled && /*#__PURE__*/React.createElement("div", {
     className: "action_delete",
     onClick: function onClick() {
       return remove(file);

package/es/LmUpload/UploadList/ItemText.js

@@ -6,7 +6,9 @@ var TextItem = function TextItem(_ref) {
   var file = _ref.file,
       instance = _ref.instance;
   var readOnly = instance.readOnly,
+      disabled = instance.disabled,
       remove = instance.remove,
+      download = instance.download,
       fileNames = instance.fileNames;
   return /*#__PURE__*/React.createElement("div", {
     className: cn('lm_upload_item lm_upload_item_text', file[fileNames.status] === 'error' && 'lm_upload_item_error')
@@ -17,8 +19,11 @@ var TextItem = function TextItem(_ref) {
   }, /*#__PURE__*/React.createElement(IconFont, {
     type: "lmweb-attachment"
   })), /*#__PURE__*/React.createElement("div", {
-    className: "lm_upload_item_name"
-  }, file[fileNames.fileName])), !readOnly && /*#__PURE__*/React.createElement("div", {
+    className: "lm_upload_item_name",
+    onClick: function onClick() {
+      return download(file);
+    }
+  }, file[fileNames.fileName])), !readOnly && !disabled && /*#__PURE__*/React.createElement("div", {
     className: "text_right lm_upload_item_text_action"
   }, /*#__PURE__*/React.createElement("div", {
     className: "action_delete",

package/es/LmUpload/UploadList/index.js

@@ -1,14 +1,20 @@
 import React, { useMemo } from 'react';
+import { LmDrag } from 'linkmore-design';
 import { render } from '../utils';
 import RenderItem from './RenderItem';
 
 var LmUploadList = function LmUploadList(_ref) {
   var instance = _ref.instance;
-  var getFileHasValue = instance.getFileHasValue,
+  var uid = instance.uid,
+      getFileHasValue = instance.getFileHasValue,
       getFileList = instance.getFileList,
       itemRender = instance.itemRender,
       listType = instance.listType,
-      showUploadList = instance.showUploadList;
+      showUploadList = instance.showUploadList,
+      disabled = instance.disabled,
+      enableDrag = instance.enableDrag,
+      fileNames = instance.fileNames,
+      move = instance.move;
   if (!showUploadList) return null;
   var fileList = useMemo(function () {
     var _a;
@@ -17,6 +23,51 @@ var LmUploadList = function LmUploadList(_ref) {
       return a.seq - b.seq;
     });
   }, [getFileList]);
+
+  var handleMove = function handleMove(active, over, fileList) {
+    try {
+      var fileMap = fileList.map(function (v) {
+        if (getFileHasValue(v) === getFileHasValue(active)) {
+          return Object.assign(Object.assign({}, v), {
+            seq: over[fileNames.seq]
+          });
+        }
+
+        if (getFileHasValue(v) === getFileHasValue(over)) {
+          return Object.assign(Object.assign({}, v), {
+            seq: active[fileNames.seq]
+          });
+        }
+
+        return v;
+      });
+      move(active, over, fileMap);
+    } catch (error) {
+      console.log('移动出现了错误', error);
+    }
+  };
+
+  if (!disabled && enableDrag) {
+    return /*#__PURE__*/React.createElement(LmDrag, {
+      options: fileList,
+      rowKey: uid,
+      move: handleMove
+    }, function (_ref2) {
+      var item = _ref2.item,
+          listeners = _ref2.listeners,
+          index = _ref2.index;
+      return render(itemRender || RenderItem, {
+        type: listType,
+        key: getFileHasValue(item) || index,
+        index: index,
+        file: item,
+        fileList: fileList,
+        instance: instance,
+        listeners: listeners
+      });
+    });
+  }
+
   return /*#__PURE__*/React.createElement(React.Fragment, null, fileList === null || fileList === void 0 ? void 0 : fileList.map(function (file, idx) {
     return render(itemRender || RenderItem, {
       type: listType,

package/es/LmUpload/body/UploadCore.js

@@ -1,4 +1,5 @@
 import React, { useCallback } from 'react';
+import cn from 'classnames';
 import UploadPicture from './UploadPicture'; // 上传核心
 // 渲染上传区域样式, 仅用于触发上传事件
 // type: 'card' 图片 | 'drag' 拖拽
@@ -10,6 +11,7 @@ var UploadCore = function UploadCore(_ref) {
 
   var inputRef = React.useRef(null);
   var accept = instance.accept,
+      disabled = instance.disabled,
       children = instance.children,
       beforeUpload = instance.beforeUpload,
       getUploadStatus = instance.getUploadStatus,
@@ -18,6 +20,7 @@ var UploadCore = function UploadCore(_ref) {
   var handleClick = useCallback(function () {
     var _a;
 
+    if (disabled) return;
     var isUploading = getUploadStatus().uploading;
     if (isUploading) return;
     (_a = inputRef === null || inputRef === void 0 ? void 0 : inputRef.current) === null || _a === void 0 ? void 0 : _a.click();
@@ -43,7 +46,7 @@ var UploadCore = function UploadCore(_ref) {
   };
   return !getIsMaxCount() && /*#__PURE__*/React.createElement("div", {
     onClick: handleClick,
-    className: "lm_upload_core"
+    className: cn('lm_upload_core', disabled && 'disabled')
   }, children || /*#__PURE__*/React.createElement(UploadPicture, {
     instance: instance
   }), /*#__PURE__*/React.createElement("input", Object.assign({

package/es/LmUpload/fns/index.d.ts

@@ -15,6 +15,7 @@ declare const useCoreOptions: ({ state, dispatch, props }: {
         remove: (file: any) => Promise<void>;
         preview: (file: any) => void;
         download: (file: any) => void;
+        move: (active: any, over: any, fileList: any) => void;
     };
     RefMethods: {
         getState: () => any;

package/es/LmUpload/fns/index.js

@@ -49,22 +49,28 @@ var useCoreOptions = function useCoreOptions(_ref) {
       fileAreaSize = props.fileAreaSize,
       enabledOss = props.enabledOss,
       enableCrop = props.enableCrop,
-      ossConfig = props.ossConfig; // 获取两个对象是否存在指定值相等
+      ossConfig = props.ossConfig;
+  /* 获取两个对象是否存在指定值相等
+   * 取用户定义的列字段，如果读取不到则取'fileName'对比
+   */
 
   var getHasEqual = useCallback(function (obj1, obj2) {
     var extend = [uid, 'fileName'];
     var flag = false;
     extend.forEach(function (v) {
-      if (!flag) flag = obj1[v] === obj2[v];
+      if (!flag && obj1[v] && obj2[v]) {
+        flag = obj1[v] === obj2[v];
+      }
     });
     return flag;
-  }, []); // 从对象中读取存在的指定属性
+  }, [uid]); // 从对象中读取存在的指定属性
 
   var getFileHasValue = useCallback(function (obj) {
+    if (!obj) return '';
     var extend = [uid, 'fileName'];
     var val = '';
     extend.forEach(function (v) {
-      if (!val) val = obj[v];
+      if (!val && obj[v]) val = obj[v];
     });
     return val;
   }, [uid]); // 获取当前的文件列表
@@ -465,7 +471,21 @@ var useCoreOptions = function useCoreOptions(_ref) {
     var _a;
 
     (_a = props.onDownload) === null || _a === void 0 ? void 0 : _a.call(props, file);
-  }, [props.onDownload]);
+  }, [props.onDownload]); // 拖拽移动事件
+
+  var move = useCallback(function (active, over, fileList) {
+    var _a;
+
+    (_a = props.onMove) === null || _a === void 0 ? void 0 : _a.call(props, active, over, fileList);
+    onChange === null || onChange === void 0 ? void 0 : onChange({
+      file: active,
+      fileList: fileList
+    });
+    dispatch({
+      type: 'changeFileList',
+      fileList: fileList
+    });
+  }, [props.onMove, onChange, dispatch]);
   var CoreMethods = {
     getIsMaxCount: getIsMaxCount,
     getFileHasValue: getFileHasValue,
@@ -475,7 +495,8 @@ var useCoreOptions = function useCoreOptions(_ref) {
     getUploadStatus: getUploadStatus,
     remove: remove,
     preview: preview,
-    download: download
+    download: download,
+    move: move
   };
   var RefMethods = {
     getState: function getState() {

package/es/LmUpload/style/index.css

@@ -122,6 +122,7 @@
   gap: 8px;
 }
 .lm_upload_wrapper .lm_upload_core {
+  position: relative;
   display: inline-flex;
   vertical-align: middle;
 }
@@ -136,6 +137,12 @@
   cursor: pointer;
   transition: all 0.3s;
 }
+.lm_upload_wrapper .lm_upload_core .lm_upload_core_picture::after {
+  position: absolute;
+  background-color: var(--disabled-bg-color);
+  cursor: not-allowed;
+  inset: 0;
+}
 .lm_upload_wrapper .lm_upload_core .lm_upload_core_picture:hover {
   border-color: var(--primary-color);
 }
@@ -151,6 +158,16 @@
   margin-top: var(--gap);
   color: var(--color-45);
 }
+.lm_upload_wrapper .lm_upload_core.disabled .lm_upload_core_picture {
+  border-color: var(--disabled-border-color);
+}
+.lm_upload_wrapper .lm_upload_core.disabled .lm_upload_core_picture::after {
+  content: '';
+}
+.lm_upload_wrapper .lm_upload_core.disabled .lm_upload_core_picture .lm_upload_core_picture_action .action_plus,
+.lm_upload_wrapper .lm_upload_core.disabled .lm_upload_core_picture .lm_upload_core_picture_action .tip {
+  color: var(--disabled-font-color);
+}
 .lm_upload_wrapper .lm_upload_progress {
   width: 100%;
   height: 2px;

package/es/LmUpload/style/variables.css

@@ -122,6 +122,7 @@
   gap: 8px;
 }
 .lm_upload_wrapper .lm_upload_core {
+  position: relative;
   display: inline-flex;
   vertical-align: middle;
 }
@@ -136,6 +137,12 @@
   cursor: pointer;
   transition: all 0.3s;
 }
+.lm_upload_wrapper .lm_upload_core .lm_upload_core_picture::after {
+  position: absolute;
+  background-color: var(--disabled-bg-color);
+  cursor: not-allowed;
+  inset: 0;
+}
 .lm_upload_wrapper .lm_upload_core .lm_upload_core_picture:hover {
   border-color: var(--primary-color);
 }
@@ -151,6 +158,16 @@
   margin-top: var(--gap);
   color: var(--color-45);
 }
+.lm_upload_wrapper .lm_upload_core.disabled .lm_upload_core_picture {
+  border-color: var(--disabled-border-color);
+}
+.lm_upload_wrapper .lm_upload_core.disabled .lm_upload_core_picture::after {
+  content: '';
+}
+.lm_upload_wrapper .lm_upload_core.disabled .lm_upload_core_picture .lm_upload_core_picture_action .action_plus,
+.lm_upload_wrapper .lm_upload_core.disabled .lm_upload_core_picture .lm_upload_core_picture_action .tip {
+  color: var(--disabled-font-color);
+}
 .lm_upload_wrapper .lm_upload_progress {
   width: 100%;
   height: 2px;

package/es/QuickMenu/index.d.ts

@@ -1,7 +1,8 @@
 import React from 'react';
-interface IMenuData {
+export interface IMenuData {
     menuId: string;
     title: string | React.ReactNode;
+    hidden?: boolean;
 }
 export interface IQuickMenuProps {
     className?: string;
@@ -9,6 +10,7 @@ export interface IQuickMenuProps {
     top?: number;
     menuData: IMenuData[];
     warpElement: any;
+    root?: IntersectionObserver['root'] | undefined;
 }
 declare const LMQuickMenu: React.FC<IQuickMenuProps>;
 export default LMQuickMenu;

package/es/QuickMenu/index.js

@@ -1,5 +1,5 @@
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
-import React, { useEffect, useState, useRef } from 'react';
+import React, { useEffect, useState, useRef, useMemo } from 'react';
 import { IconFont, Button } from 'linkmore-design';
 import { useScroll, useDebounceEffect } from 'ahooks';
 import classNames from 'classnames';
@@ -12,7 +12,8 @@ var LMQuickMenu = function LMQuickMenu(props) {
       top = _props$top === void 0 ? '104px' : _props$top,
       _props$menuData = props.menuData,
       menuData = _props$menuData === void 0 ? [] : _props$menuData,
-      warpElement = props.warpElement;
+      warpElement = props.warpElement,
+      root = props.root;
   var idTopInfo = useRef({});
 
   var _useState = useState(false),
@@ -31,6 +32,11 @@ var LMQuickMenu = function LMQuickMenu(props) {
   var scroll = useScroll(getTargetElement(warpElement || document), function () {
     return scrollOpenStatus;
   });
+  var filterMenuData = useMemo(function () {
+    return menuData === null || menuData === void 0 ? void 0 : menuData.filter(function (item) {
+      return item.hidden !== true;
+    });
+  }, [menuData]);
 
   function clearActiveToc() {
     [].forEach.call(document.querySelectorAll('.lm_menu_list li a'), function (node) {
@@ -54,7 +60,7 @@ var LMQuickMenu = function LMQuickMenu(props) {
       (_a = menuTimeEventRef.current) === null || _a === void 0 ? void 0 : _a.destroy();
     }
 
-    if (!menuData.length) {
+    if (!filterMenuData.length) {
       return;
     } // eslint-disable-next-line global-require
 
@@ -65,12 +71,13 @@ var LMQuickMenu = function LMQuickMenu(props) {
     var scrollama = require('scrollama');
 
     menuTimeEventRef.current = scrollama();
+    console.log(getTargetElement(warpElement || document), '--getTargetElement(warpElement || document)');
     (_c = (_b = menuTimeEventRef.current) === null || _b === void 0 ? void 0 : _b.setup({
-      step: menuData.map(function (item) {
+      step: filterMenuData.map(function (item) {
         return document.getElementById("".concat(item.menuId));
-      }).filter(Boolean) // required
-      // offset: '10px',
-
+      }).filter(Boolean),
+      container: getTargetElement(warpElement || document),
+      root: root ? getTargetElement(root) : undefined
     })) === null || _c === void 0 ? void 0 : _c.onStepEnter(function (_ref) {
       var element = _ref.element;
       updateActiveToc(element.id);
@@ -78,7 +85,7 @@ var LMQuickMenu = function LMQuickMenu(props) {
   };
 
   function setKeysDom() {
-    menuData.forEach(function (item) {
+    filterMenuData.forEach(function (item) {
       var _a, _b;
 
       var warpTop = ((_a = getTargetElement(warpElement || document)) === null || _a === void 0 ? void 0 : _a.offsetTop) || 0;
@@ -102,12 +109,6 @@ var LMQuickMenu = function LMQuickMenu(props) {
     wait: 50
   });
 
-  var bindDom = function bindDom() {
-    if (!Object.keys(idTopInfo.current).length) {
-      setKeysDom();
-    }
-  };
-
   var handleScroll = function handleScroll() {
     setScrollOpenStatus(true);
   };
@@ -122,10 +123,6 @@ var LMQuickMenu = function LMQuickMenu(props) {
     var _a; // bindScroller();
 
 
-    setTimeout(function () {
-      bindDom();
-      bindScroller();
-    }, 200);
     (_a = getTargetElement(warpElement || document)) === null || _a === void 0 ? void 0 : _a.addEventListener('scroll', handleScroll, {
       once: true
     });
@@ -135,6 +132,12 @@ var LMQuickMenu = function LMQuickMenu(props) {
       (_a = getTargetElement(warpElement || document)) === null || _a === void 0 ? void 0 : _a.removeEventListener('scroll', handleScroll);
     };
   }, []);
+  useEffect(function () {
+    setTimeout(function () {
+      setKeysDom();
+      bindScroller();
+    }, 200);
+  }, [filterMenuData]);
   return /*#__PURE__*/React.createElement("div", {
     className: classNames(prefixCls),
     onMouseEnter: function onMouseEnter() {
@@ -156,7 +159,7 @@ var LMQuickMenu = function LMQuickMenu(props) {
     })
   }), /*#__PURE__*/React.createElement("ul", {
     className: classNames('lm_menu_list', hovering && 'show', className)
-  }, menuData.map(function (item) {
+  }, filterMenuData.map(function (item) {
     return /*#__PURE__*/React.createElement("li", {
       key: item.menuId,
       onClick: function onClick() {

package/es/Select/index.d.ts

@@ -6,6 +6,9 @@ export interface ISelectProps extends SelectProps {
     Option?: typeof Select.Option;
     OptGroup?: typeof Select.OptGroup;
     defaultLabel?: string;
+    suffix?: React.ReactNode;
+    icon?: React.ReactNode;
+    iconClick?: () => void;
 }
 declare type SelectType = typeof Select & typeof Select.Option & typeof Select.OptGroup;
 declare const LMSelect: SelectType;

package/es/Select/index.js

@@ -15,20 +15,31 @@ var __rest = this && this.__rest || function (s, e) {
 };
 
 import React, { forwardRef, useMemo } from 'react';
+import Button from '../Button';
 import classNames from 'classnames';
 import SizeContext from '../ConfigProvider/SizeContext';
+import DisabledContext from '../ConfigProvider/DisabledContext';
 var prefixCls = 'lm_select';
 var CLMSelect = /*#__PURE__*/forwardRef(function (props, ref) {
   var children = props.children,
       className = props.className,
       customizeSize = props.size,
+      customDisabled = props.disabled,
       dropdownClassName = props.dropdownClassName,
       options = props.options,
       value = props.value,
       defaultLabel = props.defaultLabel,
-      others = __rest(props, ["children", "className", "size", "dropdownClassName", "options", "value", "defaultLabel"]);
+      suffix = props.suffix,
+      icon = props.icon,
+      iconClick = props.iconClick,
+      rest = __rest(props // ===================== Size =====================
+  , ["children", "className", "size", "disabled", "dropdownClassName", "options", "value", "defaultLabel", "suffix", "icon", "iconClick"]); // ===================== Size =====================
 
-  var size = customizeSize || React.useContext(SizeContext) || 'middle'; // 当前值是否存于选项中
+
+  var size = customizeSize || React.useContext(SizeContext) || 'middle'; // ===================== Disabled =====================
+
+  var disabled = React.useContext(DisabledContext);
+  var mergedDisabled = customDisabled || disabled; // 当前值是否存于选项中
 
   var hasOption = useMemo(function () {
     var flag = false;
@@ -47,24 +58,50 @@ var CLMSelect = /*#__PURE__*/forwardRef(function (props, ref) {
 
     if (options) {
       flag = !!options.some(function (v) {
-        return v.value === value;
+        var _a, _b;
+
+        return v[(_b = (_a = props.fieldNames) === null || _a === void 0 ? void 0 : _a.value) !== null && _b !== void 0 ? _b : 'value'] === value;
       });
     }
 
     return flag;
-  }, [children, value, options]); // 重组value: 传入value但找不到options项时，展示默认label
+  }, [children, value, options, props.fieldNames]); // 重组value: 传入value但找不到options项时，展示默认label
 
   var resetValue = useMemo(function () {
     if (value && !hasOption) return defaultLabel !== null && defaultLabel !== void 0 ? defaultLabel : value;
     return value;
-  }, [value, hasOption]);
+  }, [value, defaultLabel, hasOption]);
+
+  if (icon) {
+    return /*#__PURE__*/React.createElement("div", {
+      className: 'lm_select_has_icon',
+      style: props.style
+    }, /*#__PURE__*/React.createElement(_Select, Object.assign({
+      className: classNames(className, prefixCls),
+      size: size,
+      ref: ref,
+      value: resetValue,
+      options: options,
+      disabled: mergedDisabled || undefined
+    }, rest, {
+      dropdownClassName: classNames('lm_select_dropdown', dropdownClassName)
+    }), children), /*#__PURE__*/React.createElement(Button, {
+      size: size,
+      onClick: iconClick,
+      className: 'lm_select_icon_button',
+      disabled: mergedDisabled || undefined,
+      icon: icon
+    }));
+  }
+
   return /*#__PURE__*/React.createElement(_Select, Object.assign({
     className: classNames(className, prefixCls),
     size: size,
     ref: ref,
     value: resetValue,
-    options: options
-  }, others, {
+    options: options,
+    disabled: mergedDisabled || undefined
+  }, rest, {
     dropdownClassName: classNames('lm_select_dropdown', dropdownClassName)
   }), children);
 });

package/es/Select/style/index.css

@@ -512,6 +512,7 @@ p {
 }
 .lm_select.ant-select {
   font-size: 12px;
+  width: 100%;
 }
 .lm_select.ant-select-focused:not(.ant-select-disabled).ant-select:not(.ant-select-customize-input) .ant-select-selector {
   box-shadow: none;
@@ -525,3 +526,30 @@ p {
 .lm_select_dropdown .ant-select-item-option-disabled {
   color: var(--disabled-font-color);
 }
+.lm_select_has_icon {
+  width: 100%;
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+  justify-content: flex-start;
+  position: relative;
+}
+.lm_select_has_icon .ant-select {
+  border-top-right-radius: 0;
+  border-bottom-right-radius: 0;
+  z-index: 3;
+}
+.lm_select_has_icon .ant-select .ant-select-selector {
+  border-top-right-radius: 0 !important;
+  border-bottom-right-radius: 0 !important;
+}
+.lm_select_has_icon .lm_select_icon_button {
+  margin-left: -1px;
+  border-top-left-radius: 0;
+  border-bottom-left-radius: 0;
+  z-index: 2;
+}
+.lm_select_has_icon .lm_select_icon_button:hover,
+.lm_select_has_icon .lm_select_icon_button:focus {
+  z-index: 5;
+}