Merge branch 'main' into release

packages/semi-foundation/cascader/cascader.scss

@@ -25,7 +25,7 @@ $module: #{$prefix}-cascader;
         border: $width-cascader_hover-border $color-cascader_default-border-hover solid;
     }
 
-    &:focus {
+    &:focus:not(&-disabled) {
         border: $width-cascader_focus-border solid $color-cascader_default-border-focus;
         background-color: $color-cascader_default-bg-default;
         outline: 0;

packages/semi-ui/cascader/_story/cascader.stories.jsx

@@ -2099,3 +2099,28 @@ export const TriggerAddMethods = () => {
       </>
   );
 }
+
+export const DisabledAndPlusN = () => {
+  const commonProps = {
+    multiple: true,
+    maxTagCount: 1,
+    showRestTagsPopover: true,
+    disabled: true,
+    style: { width: 300 },
+    treeData: treeData4,
+    placeholder: "请选择所在地区",
+    defaultValue: [
+        ['zhejiang', 'ningbo', 'haishu'],
+        ['zhejiang', 'hangzhou', 'xihu']
+    ]
+  }
+  return (
+    <>
+      <span>disabled + maxTagCount + showRestTagsPopover</span><br /><br />
+      <Cascader {...commonProps} />
+      <br /><br />
+      <span>disabled + filterTreeNode + maxTagCount + showRestTagsPopover</span><br /><br />
+      <Cascader {...commonProps} filterTreeNode/>
+    </> 
+  )
+}

packages/semi-ui/cascader/index.tsx

@@ -705,7 +705,7 @@ class Cascader extends BaseComponent<CascaderProps, CascaderState> {
             [`${prefixcls}-selection-n-disabled`]: disabled,
         });
         const renderPlusNChildren = <span className={plusNCls}>+{hiddenTag.length}</span>;
-        return showRestTagsPopover && !disabled ? (
+        return showRestTagsPopover ? (
             <Popover
                 content={hiddenTag}
                 showArrow