shineout 3.0.0-alpha.11 → 3.0.0-alpha.12

package/cjs/index.js

@@ -433,6 +433,6 @@ exports.TYPE = _TYPE;
 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); }
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 var _default = {
-  version: '3.0.0-alpha.11'
+  version: '3.0.0-alpha.12'
 };
 exports.default = _default;

package/cjs/tag/tag.type.d.ts

@@ -2,8 +2,8 @@ import { TagProps as UnStyledTagProps, TagInputProps as UnStyledTagInputProps }
 /**
  * @title Tag
  */
-export declare type TagProps = Omit<UnStyledTagProps, 'jssStyle'>;
+export declare type TagProps = Omit<UnStyledTagProps, 'jssStyle' | 'inlineStyle'>;
 /**
  * @title Tag.Input
  */
-export declare type TagInputProps = Omit<UnStyledTagInputProps, 'jssStyle'>;
+export declare type TagInputProps = Omit<UnStyledTagInputProps, 'jssStyle' | 'inlineStyle'>;

package/dist/shineout.js

@@ -3762,6 +3762,9 @@ var cascaderTokens = {
   cascaderResultTextSmallPaddingX: 'Padding-4',
   cascaderResultTextLargePaddingX: 'Padding-10',
   cascaderResultTextActiveBackgroundColor: 'Brand-1',
+  cascaderResultItemHoverColor: 'Brand-5',
+  cascaderResultItemActiveColor: 'Brand-7',
+  cascaderResultItemCheckedColor: 'Brand-6',
   cascaderErrorBorderColor: 'Danger-6',
   cascaderErrorFocusShadow: 'Danger-1',
   cascaderPanelColor: 'Neutral-text-5',
@@ -5457,6 +5460,7 @@ var selectTokens = {
   selectGroupTitleLargeBottom: 'Padding-4',
   selectColumnPadding: 'Padding-8',
   selectColumnOptionMargin: 'Margin-8',
+  selectColumnBorderRadius: 'Radius-4',
   selectColumnBackgroundColor: 'Neutral-fill-2'
 };
 var _default = selectTokens;
@@ -19049,7 +19053,7 @@ var handleStyle = function handleStyle(style) {
 };
 /* harmony default export */ var jss_style_handleStyle = (handleStyle);
 ;// CONCATENATED MODULE: ../shineout-style/src/version.ts
-/* harmony default export */ var version = ('3.0.0-alpha.11');
+/* harmony default export */ var version = ('3.0.0-alpha.12');
 ;// CONCATENATED MODULE: ../shineout-style/src/jss-style/index.tsx
 
 
@@ -24599,7 +24603,7 @@ var checkboxStyle = {
       background: 'transparent',
       borderRadius: '50%'
     },
-    '$wrapper:not($wrapperChecked):not($wrapperIndeterminate):not($wrapperDisabled):hover &': {
+    '$wrapper:not($wrapperChecked):not($wrapperIndeterminate):not($wrapperDisabled):hover &:not($darkIndicatorWrapper)': {
       '&::before': {
         background: esm/* default.checkboxIconCircleFill */.ZP.checkboxIconCircleFill
       },
@@ -24610,7 +24614,7 @@ var checkboxStyle = {
     }
   },
   darkIndicatorWrapper: {
-    '$wrapper:not($wrapperChecked):not($wrapperIndeterminate):not($wrapperDisabled):hover &': {
+    '$wrapper:not($wrapperChecked):not($wrapperIndeterminate):not($wrapperDisabled) &:hover': {
       '&::before': {
         background: esm/* default.checkboxIconCircleDark */.ZP.checkboxIconCircleDark
       }
@@ -25164,7 +25168,7 @@ var useCheckboxInputable = function useCheckboxInputable(props) {
 
 
 
-var use_input_excluded = ["inputRef", "rootRef", "value", "onChange", "onFocus", "onBlur", "clearable", "disabled", "autoSelect", "onClear", "onClick", "showClear"];
+var use_input_excluded = ["inputRef", "rootRef", "value", "onChange", "onFocus", "onBlur", "clearable", "disabled", "autoSelect", "onClear", "onClick", "showClear", "onFocusedChange"];
 
 
 
@@ -25192,12 +25196,17 @@ var useInput = function useInput(params) {
     onClear = params.onClear,
     onClick = params.onClick,
     showClear = params.showClear,
+    onFocusedChange = params.onFocusedChange,
     propsToForward = objectWithoutProperties_default()(params, use_input_excluded);
   var inputRef = external_root_React_commonjs2_react_commonjs_react_amd_react_.useRef(null);
   var _React$useState = external_root_React_commonjs2_react_commonjs_react_amd_react_.useState(false),
     _React$useState2 = slicedToArray_default()(_React$useState, 2),
     focused = _React$useState2[0],
-    setFocused = _React$useState2[1];
+    changeFocued = _React$useState2[1];
+  var setFocused = function setFocused(focus) {
+    changeFocued(focus);
+    onFocusedChange === null || onFocusedChange === void 0 ? void 0 : onFocusedChange(focus);
+  };
   var handleClick = function handleClick(otherHandlers) {
     return function (event) {
       var _otherHandlers$onClic;
@@ -25271,6 +25280,7 @@ var useInput = function useInput(params) {
       event.preventDefault();
       if (!focused) {
         var _inputRef$current;
+        setFocused(true);
         (_inputRef$current = inputRef.current) === null || _inputRef$current === void 0 ? void 0 : _inputRef$current.focus();
       }
       if (onClear) {
@@ -25326,7 +25336,7 @@ var useKeyEvent = function useKeyEvent(params) {
 ;// CONCATENATED MODULE: ../base/src/input/simple-input.tsx
 
 
-var simple_input_excluded = ["jssStyle", "className", "style", "status", "clearIcon", "size", "prefix", "suffix", "underline", "border", "onEnterPress", "getStatus", "renderInput", "addEnd", "hasSuffix"];
+var simple_input_excluded = ["jssStyle", "className", "style", "status", "clearIcon", "size", "prefix", "suffix", "underline", "border", "onEnterPress", "onFocusedChange", "renderInput", "addEnd", "hasSuffix"];
 
 
 
@@ -25347,13 +25357,15 @@ var Input = function Input(props) {
     _props$border = props.border,
     border = _props$border === void 0 ? true : _props$border,
     _onEnterPress = props.onEnterPress,
-    getStatus = props.getStatus,
+    onFocusedChange = props.onFocusedChange,
     renderInput = props.renderInput,
     addEnd = props.addEnd,
     hasSuffix = props.hasSuffix,
     rest = objectWithoutProperties_default()(props, simple_input_excluded);
   var inputStyle = jssStyle === null || jssStyle === void 0 ? void 0 : (_jssStyle$input = jssStyle.input) === null || _jssStyle$input === void 0 ? void 0 : _jssStyle$input.call(jssStyle);
-  var _useInput = use_input(objectSpread2_default()({}, rest)),
+  var _useInput = use_input(objectSpread2_default()(objectSpread2_default()({}, rest), {}, {
+      onFocusedChange: onFocusedChange
+    })),
     getRootProps = _useInput.getRootProps,
     getClearProps = _useInput.getClearProps,
     getInputProps = _useInput.getInputProps,
@@ -25375,13 +25387,6 @@ var Input = function Input(props) {
     className: classnames_default()(inputStyle === null || inputStyle === void 0 ? void 0 : inputStyle.input),
     onKeyUp: onKeyUp
   });
-  (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useEffect)(function () {
-    if (getStatus) {
-      getStatus({
-        focused: focused
-      });
-    }
-  }, [focused]);
   var inputEl = /*#__PURE__*/(0,jsx_runtime.jsx)("input", objectSpread2_default()({
     type: "text"
   }, inputProps));
@@ -25845,7 +25850,6 @@ function usePrevious(state) {
 var useInnerTitle = function useInnerTitle(props) {
   var _jssStyle$innerTitle;
   var innerTitle = props.innerTitle,
-    open = props.open,
     placeTitle = props.placeTitle,
     size = props.size,
     jssStyle = props.jssStyle;
@@ -25853,11 +25857,12 @@ var useInnerTitle = function useInnerTitle(props) {
     _useState2 = slicedToArray_default()(_useState, 2),
     animation = _useState2[0],
     setAnimation = _useState2[1];
-  var prevOpen = usePrevious(open);
+  var open = !!props.open;
+  var prevOpen = usePrevious(!!open);
   var innerTitleStyle = jssStyle === null || jssStyle === void 0 ? void 0 : (_jssStyle$innerTitle = jssStyle.innerTitle) === null || _jssStyle$innerTitle === void 0 ? void 0 : _jssStyle$innerTitle.call(jssStyle);
-  (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useEffect)(function () {
-    if (open !== prevOpen) setAnimation(true);
-  }, [open]);
+  if (props.innerTitle && !open !== !prevOpen && !animation) {
+    setAnimation(true);
+  }
   var renderInput = usePersistFn(function (el) {
     if (!innerTitle) return el;
     return /*#__PURE__*/(0,jsx_runtime.jsxs)("div", {
@@ -26340,7 +26345,7 @@ var useWithFormConfig = function useWithFormConfig(props) {
 
 
 
-var use_input_common_excluded = ["forwardRef", "htmlName", "value", "onChange", "defaultValue", "beforeChange", "clearable", "clearToUndefined", "style", "suffix", "info", "getStatus", "innerTitle", "placeTitle", "width", "delay", "onBlur", "tip", "error", "popover", "popoverProps", "status"];
+var use_input_common_excluded = ["forwardRef", "htmlName", "value", "onChange", "defaultValue", "beforeChange", "clearable", "clearToUndefined", "style", "suffix", "info", "innerTitle", "placeTitle", "width", "delay", "onBlur", "tip", "error", "popover", "popoverProps", "status"];
 
 
 
@@ -26371,7 +26376,6 @@ var useInputCommon = function useInputCommon(props) {
     style = props.style,
     suffix = props.suffix,
     info = props.info,
-    getStatus = props.getStatus,
     innerTitle = props.innerTitle,
     placeTitle = props.placeTitle,
     width = props.width,
@@ -26446,11 +26450,8 @@ var useInputCommon = function useInputCommon(props) {
   var mergeSuffix = /*#__PURE__*/(0,jsx_runtime.jsxs)((external_root_React_commonjs2_react_commonjs_react_amd_react_default()).Fragment, {
     children: [suffix, getInfo(), tipNode]
   });
-  var onStatusChange = usePersistFn(function (status) {
-    setFocused(!!status.focused);
-    if (getStatus) {
-      getStatus(status);
-    }
+  var onFocusedChange = usePersistFn(function (focused) {
+    setFocused(!!focused);
   });
   var mergeStyle = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useMemo)(function () {
     return objectSpread2_default()({
@@ -26476,7 +26477,7 @@ var useInputCommon = function useInputCommon(props) {
     rootRef: rootRef,
     inputRef: forwardRef,
     renderInput: renderInput,
-    getStatus: onStatusChange
+    onFocusedChange: onFocusedChange
   });
 };
 /* harmony default export */ var use_input_common = (useInputCommon);
@@ -29916,7 +29917,7 @@ var TagInput = function TagInput(props) {
 
 
 
-var tag_excluded = ["jssStyle", "className", "type", "color", "size", "disabled", "mode", "shape", "children", "onClick", "onClose", "style", "backgroundColor", "onKeyUp", "onCompleted", "onEnterPress"];
+var tag_excluded = ["jssStyle", "className", "type", "color", "size", "disabled", "mode", "shape", "children", "onClick", "onClose", "style", "backgroundColor", "inlineStyle", "onKeyUp", "onCompleted", "onEnterPress"];
 
 
 
@@ -29939,6 +29940,7 @@ var Tag = function Tag(props) {
     onClose = props.onClose,
     style = props.style,
     backgroundColor = props.backgroundColor,
+    inlineStyle = props.inlineStyle,
     onKeyUp = props.onKeyUp,
     onCompleted = props.onCompleted,
     onEnterPress = props.onEnterPress,
@@ -29978,13 +29980,14 @@ var Tag = function Tag(props) {
   var renderChildren = function renderChildren() {
     if (onClose) {
       return /*#__PURE__*/(0,jsx_runtime.jsx)("div", {
-        className: tagStyle.inline,
+        className: classnames_default()(inlineStyle && tagStyle.inline),
         children: /*#__PURE__*/(0,jsx_runtime.jsx)("span", {
           children: children
         })
       });
     }
     return /*#__PURE__*/(0,jsx_runtime.jsx)("span", {
+      className: classnames_default()(inlineStyle && tagStyle.inline),
       children: children
     });
   };
@@ -30197,6 +30200,7 @@ var result_Result = function Result(props) {
     compressedClassName = props.compressedClassName,
     renderUnmatched = props.renderUnmatched,
     renderResultProp = props.renderResult,
+    renderResultContentProp = props.renderResultContent,
     allowOnFilter = props.allowOnFilter,
     setInputText = props.setInputText,
     onRef = props.onRef,
@@ -30291,6 +30295,17 @@ var result_Result = function Result(props) {
     };
     var content = renderResultContent(item, index, nodes);
     if (!content) return null;
+    if (renderResultContentProp) {
+      return renderResultContentProp({
+        key: key,
+        size: size,
+        disabled: isDisabled,
+        className: classnames_default()(styles.tag, styles.hideTag, resultClassName),
+        children: content,
+        onClick: handleClick,
+        'data-soui-type': disabled === true ? 'dark' : undefined
+      });
+    }
     return /*#__PURE__*/(0,jsx_runtime.jsx)(tag, {
       disabled: isDisabled,
       size: size,
@@ -30298,6 +30313,7 @@ var result_Result = function Result(props) {
       onClose: closeable && handleClose,
       onClick: handleClick,
       jssStyle: jssStyle,
+      inlineStyle: true,
       "data-soui-type": disabled === true ? 'dark' : undefined,
       children: content
     }, key);
@@ -30351,6 +30367,12 @@ var result_Result = function Result(props) {
     }
     var values = getDataByValues(nextValue);
     var result = values.map(function (v, i) {
+      if (renderResultContentProp && i !== values.length - 1) {
+        return [renderResultItem(v, i, values), /*#__PURE__*/(0,jsx_runtime.jsx)("span", {
+          className: classnames_default()(styles.tag, styles.hideTag),
+          children: "/"
+        }, "separator-".concat(i))];
+      }
       return renderResultItem(v, i, values);
     });
     return result;
@@ -30460,6 +30482,8 @@ var Cascader = function Cascader(props) {
     height = props.height,
     className = props.className,
     size = props.size,
+    _props$hideTag = props.hideTag,
+    hideTag = _props$hideTag === void 0 ? false : _props$hideTag,
     maxLength = props.maxLength,
     defaultValue = props.defaultValue,
     wideMatch = props.wideMatch,
@@ -30514,9 +30538,9 @@ var Cascader = function Cascader(props) {
     onFilterProp = props.onFilter,
     onCollapseProp = props.onCollapse;
   var styles = jssStyle === null || jssStyle === void 0 ? void 0 : (_jssStyle$cascader = jssStyle.cascader) === null || _jssStyle$cascader === void 0 ? void 0 : _jssStyle$cascader.call(jssStyle);
-  var rootStyle = objectSpread2_default()(objectSpread2_default()({}, style), {}, {
+  var rootStyle = Object.assign({
     width: width
-  });
+  }, style);
   var _useState = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useState)(false),
     _useState2 = slicedToArray_default()(_useState, 2),
     focused = _useState2[0],
@@ -30737,7 +30761,7 @@ var Cascader = function Cascader(props) {
 
   // innerTitle 模式
   var renderInnerTitle = use_inner_title({
-    open: open || !!value,
+    open: open || (value && isArray(value) ? value.length > 0 : !!value),
     size: size,
     jssStyle: jssStyle,
     innerTitle: innerTitle
@@ -30770,6 +30794,13 @@ var Cascader = function Cascader(props) {
       children: defaultIcon
     });
   };
+  var renderResultContent = function renderResultContent(contentProps) {
+    var children = contentProps.children;
+    return /*#__PURE__*/(0,jsx_runtime.jsx)("div", objectSpread2_default()(objectSpread2_default()({}, contentProps), {}, {
+      className: classnames_default()(contentProps.className, styles.resultItem),
+      children: children
+    }));
+  };
   var renderResult = function renderResult() {
     var result = /*#__PURE__*/(0,jsx_runtime.jsx)("div", {
       className: classnames_default()(styles === null || styles === void 0 ? void 0 : styles.result),
@@ -30778,7 +30809,7 @@ var Cascader = function Cascader(props) {
         jssStyle: jssStyle,
         size: size,
         value: value,
-        closeable: singleRemove,
+        closeable: singleRemove && multiple,
         data: data,
         focus: open,
         keygen: keygen,
@@ -30794,6 +30825,7 @@ var Cascader = function Cascader(props) {
         renderResult: getRenderResult,
         resultClassName: resultClassName,
         renderUnmatched: renderUnmatched,
+        renderResultContent: hideTag && multiple === false ? renderResultContent : undefined,
         allowOnFilter: 'onFilter' in props || 'onAdvancedFilter' in props,
         focusSelected: focusSelected,
         inputText: inputText,
@@ -31216,6 +31248,22 @@ var cascaderStyle = objectSpread2_default()(objectSpread2_default()({
     lineHeight: esm/* default.lineHeightDynamic */.ZP.lineHeightDynamic,
     paddingRight: "calc(".concat(esm/* default.cascaderSmallFontSize */.ZP.cascaderSmallFontSize, " + ").concat(esm/* default.cascaderClearPadding */.ZP.cascaderClearPadding, ")")
   },
+  resultItem: {
+    transition: 'color 0.3s',
+    overflow: 'hidden',
+    textOverflow: 'ellipsis',
+    // hover
+    '&:hover': {
+      color: esm/* default.cascaderResultItemHoverColor */.ZP.cascaderResultItemHoverColor
+    },
+    // active
+    '&:active': {
+      color: esm/* default.cascaderResultItemActiveColor */.ZP.cascaderResultItemActiveColor
+    }
+  },
+  resultItemActive: {
+    color: esm/* default.cascaderResultItemCheckedColor */.ZP.cascaderResultItemCheckedColor
+  },
   resultTextWrapper: {
     display: 'flex',
     flex: '1',
@@ -32701,6 +32749,7 @@ var selectStyle = objectSpread2_default()(objectSpread2_default()({
     fontSize: esm/* default.selectFontSize */.ZP.selectFontSize
   },
   moreIcon: {},
+  hideTag: {},
   list: {
     paddingTop: 3,
     paddingBottom: 3
@@ -32725,7 +32774,10 @@ var selectStyle = objectSpread2_default()(objectSpread2_default()({
     marginRight: 4,
     marginTop: esm/* default.selectPlaceholderMarginY */.ZP.selectPlaceholderMarginY,
     marginBottom: esm/* default.selectPlaceholderMarginY */.ZP.selectPlaceholderMarginY,
-    textWrap: 'nowrap'
+    textWrap: 'nowrap',
+    '&$hideTag': {
+      marginRight: 0
+    }
   },
   space: {
     marginTop: esm/* default.selectPlaceholderMarginY */.ZP.selectPlaceholderMarginY,
@@ -32811,6 +32863,7 @@ var selectStyle = objectSpread2_default()(objectSpread2_default()({
     marginBottom: 4,
     '& $columnsCheckbox': {
       marginRight: 0,
+      marginLeft: 4,
       width: 'auto'
     }
   },
@@ -32840,7 +32893,7 @@ var selectStyle = objectSpread2_default()(objectSpread2_default()({
     },
     '&:not($optionDisabled):hover': {
       background: esm/* default.selectColumnBackgroundColor */.ZP.selectColumnBackgroundColor,
-      borderRadius: esm/* default.selectOptionInnerBorderRadius */.ZP.selectOptionInnerBorderRadius
+      borderRadius: esm/* default.selectColumnBorderRadius */.ZP.selectColumnBorderRadius
     }
   },
   columnsRadio: {
@@ -32855,7 +32908,8 @@ var selectStyle = objectSpread2_default()(objectSpread2_default()({
   },
   columnsCheckbox: {
     width: '100%',
-    marginLeft: esm/* default.selectColumnOptionMargin */.ZP.selectColumnOptionMargin,
+    // marginLeft: token.selectColumnOptionMargin,
+    marginLeft: 0,
     '& :last-child': {
       flex: 1,
       overflow: 'hidden',
@@ -32922,9 +32976,7 @@ var innerTitle = objectSpread2_default()(objectSpread2_default()({}, inner_title
   top: {
     opacity: '0',
     '$wrapperOpen &': {
-      opacity: '1'
-    },
-    '$animation$wrapperOpen &': {
+      opacity: '1',
       transition: "opacity 0s ease-in ".concat(moveTime)
     }
   },
@@ -32934,9 +32986,6 @@ var innerTitle = objectSpread2_default()(objectSpread2_default()({}, inner_title
       position: 'relative',
       top: 0
     },
-    '$animation$wrapperOpen &': {
-      transition: "opacity 0s ease-in ".concat(moveTime)
-    },
     '$animation$wrapperOpen & $title': {
       animation: "$movein ".concat(moveTime, " ease-in")
     },
@@ -32952,7 +33001,8 @@ var innerTitle = objectSpread2_default()(objectSpread2_default()({}, inner_title
     alignItems: 'center',
     opacity: '1',
     '$wrapperOpen &': {
-      opacity: '0'
+      opacity: '0',
+      transition: "opacity 0s ease-in ".concat(moveTime)
     }
   },
   content: {
@@ -33317,8 +33367,15 @@ var input_input = objectSpread2_default()(objectSpread2_default()(objectSpread2_
     }
   },
   password: {
+    '& $clearWrapper': {
+      flexBasis: "calc(".concat(esm/* default.inputIconSize */.ZP.inputIconSize, " + 12px)")
+    },
     '& $clear': {
-      marginRight: 4
+      marginRight: 8,
+      color: esm/* default.inputClearColor */.ZP.inputClearColor,
+      '&:hover svg': {
+        color: esm/* default.inputHoverClearColor */.ZP.inputHoverClearColor
+      }
     }
   },
   clear: {
@@ -45528,6 +45585,7 @@ var TreeCheckbox = function TreeCheckbox(props) {
   };
   var checked = getChecked(id);
   return /*#__PURE__*/(0,jsx_runtime.jsx)(src_checkbox_checkbox, {
+    theme: "dark",
     className: className,
     jssStyle: jssStyle,
     checked: checked,
@@ -45670,19 +45728,25 @@ var NodeContent = function NodeContent(props) {
     };
     return render(data, expanded, active, id);
   };
+  var contentEvent = {
+    onClick: inlineNode ? undefined : handleNodeClick
+  };
+  var textEvent = {
+    onClick: inlineNode ? handleNodeClick : undefined
+  };
   return /*#__PURE__*/(0,jsx_runtime.jsxs)("div", {
     className: rootClass,
     onDragOver: onDragOver,
-    children: [renderIndicator(), /*#__PURE__*/(0,jsx_runtime.jsxs)("div", objectSpread2_default()(objectSpread2_default()({
+    children: [renderIndicator(), /*#__PURE__*/(0,jsx_runtime.jsxs)("div", objectSpread2_default()(objectSpread2_default()(objectSpread2_default()({
       ref: bindContent,
       className: contentClass
-    }, contentDataProps()), {}, {
-      children: [onChange && renderCheckbox(), /*#__PURE__*/(0,jsx_runtime.jsx)("div", {
+    }, contentDataProps()), contentEvent), {}, {
+      children: [onChange && renderCheckbox(), /*#__PURE__*/(0,jsx_runtime.jsx)("div", objectSpread2_default()(objectSpread2_default()({
         className: textClass,
-        onDoubleClick: handleNodeExpand,
-        onClick: handleNodeClick,
+        onDoubleClick: handleNodeExpand
+      }, textEvent), {}, {
         children: renderNode()
-      })]
+      }))]
     }))]
   });
 };
@@ -46867,9 +46931,9 @@ function Select(props) {
     onEnterExpand = props.onEnterExpand,
     onFilterWidthCreate = props.onFilterWidthCreate;
   var styles = jssStyle === null || jssStyle === void 0 ? void 0 : (_jssStyle$select = jssStyle.select) === null || _jssStyle$select === void 0 ? void 0 : _jssStyle$select.call(jssStyle);
-  var rootStyle = objectSpread2_default()(objectSpread2_default()({}, style), {}, {
+  var rootStyle = Object.assign({
     width: width
-  });
+  }, style);
   var _useState = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useState)('keyboard'),
     _useState2 = slicedToArray_default()(_useState, 2),
     controlType = _useState2[0],
@@ -53751,6 +53815,14 @@ var useColumns = function useColumns(props) {
     }).filter(function (c) {
       return c !== context.expandHideCol;
     });
+    var haveCheckbox = columns.find(function (v) {
+      return v.type === 'checkbox';
+    });
+    if (props.showCheckbox && !haveCheckbox) {
+      columns.unshift({
+        type: 'checkbox'
+      });
+    }
     var left = -1;
     var right = -1;
     columns.forEach(function (c, i) {
@@ -53771,17 +53843,6 @@ var useColumns = function useColumns(props) {
         if (i === right) draft.firstFixed = true;
       });
     });
-    var haveCheckbox = columns.find(function (v) {
-      return v.type === 'checkbox';
-    });
-    if (props.showCheckbox && !haveCheckbox) {
-      context.cachedColumns.unshift({
-        index: -1,
-        key: 'checkbox',
-        type: 'checkbox',
-        fixed: left >= 0 ? 'left' : undefined
-      });
-    }
     context.oldColumns = columnsA;
     return context.cachedColumns;
   });
@@ -53890,7 +53951,7 @@ var useTableLayout = function useTableLayout(props) {
     if (!colgroup) return;
     var table = theadRef.current || tbodyRef.current;
     if (!table) return;
-    var colEl = table.querySelector("colgroup col:nth-child(".concat(col.index + 1, ")"));
+    var colEl = table.querySelector("colgroup col:nth-child(".concat(index + 1, ")"));
     if (!colEl) return;
     var oWidth = parseInt(colEl.style.width, 10);
     if (Number.isNaN(oWidth) || oWidth === 0) {
@@ -55020,7 +55081,7 @@ var useTableGroup = function useTableGroup(props) {
               margin: 0
             }
           })
-        }), renderDrag(colTemp.index)]
+        }), colTemp.type !== 'checkbox' ? renderDrag(colTemp.index) : null]
       }, 'checkbox'));
       return;
     }
@@ -56288,7 +56349,7 @@ var tableStyle = objectSpread2_default()(objectSpread2_default()({}, globalStyle
   },
   cellFixedLast: {},
   cellCheckbox: {
-    width: '0'
+    width: '42px'
   },
   cellGroup: {
     textAlign: 'center',
@@ -58907,8 +58968,9 @@ var TransferList = function TransferList(props) {
       });
     }
     return /*#__PURE__*/(0,jsx_runtime.jsx)("div", {
-      className: styles.input,
+      className: styles.inputWrapper,
       children: /*#__PURE__*/(0,jsx_runtime.jsx)(input, {
+        className: styles.input,
         clearable: true,
         jssStyle: jssStyle,
         value: filterText,
@@ -59262,6 +59324,9 @@ var TransferStyle = {
     },
     '& $close': {
       width: 24
+    },
+    '& $left, & $right': {
+      padding: 0
     }
   },
   simple: {
@@ -59345,9 +59410,11 @@ var TransferStyle = {
       width: 14
     }
   },
+  inputWrapper: {
+    padding: '6px 12px'
+  },
   input: {
-    padding: '6px 12px',
-    '& svg': {
+    '& > div > svg': {
       width: 14,
       minWidth: 14,
       color: esm/* default.transferIconColor */.ZP.transferIconColor
@@ -59670,9 +59737,9 @@ var TreeSelect = function TreeSelect(props) {
     onEnterExpand = props.onEnterExpand,
     onExpand = props.onExpand;
   var styles = jssStyle === null || jssStyle === void 0 ? void 0 : (_jssStyle$select = jssStyle.select) === null || _jssStyle$select === void 0 ? void 0 : _jssStyle$select.call(jssStyle);
-  var rootStyle = objectSpread2_default()(objectSpread2_default()({}, style), {}, {
+  var rootStyle = Object.assign({
     width: width
-  });
+  }, style);
   var datum = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useRef)();
   var blurEvent = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useRef)();
   var treeSelectRef = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useRef)();
@@ -64390,7 +64457,7 @@ var upload_interface = __webpack_require__(7818);
 
 
 /* harmony default export */ var src = ({
-  version: '3.0.0-alpha.11'
+  version: '3.0.0-alpha.12'
 });
 }();
 /******/ 	return __webpack_exports__;