Merge branch 'master' into feature/cascader(#2594)

.changeset/dirty-snails-listen.md

@@ -0,0 +1,5 @@
+---
+"@hi-ui/select": minor
+---
+
+feat: add size api

.changeset/fast-beers-film.md

@@ -0,0 +1,5 @@
+---
+"@hi-ui/hiui": patch
+---
+
+Select feat: add size api

.changeset/funny-waves-drum.md

@@ -0,0 +1,5 @@
+---
+"@hi-ui/check-select": minor
+---
+
+feat: add size api

.changeset/gentle-doors-design.md

@@ -0,0 +1,5 @@
+---
+"@hi-ui/hiui": patch
+---
+
+CheckCascader feat: add size api

.changeset/metal-fireants-sneeze.md

@@ -0,0 +1,5 @@
+---
+"@hi-ui/check-cascader": minor
+---
+
+feat: add size api

.changeset/nasty-geckos-push.md

@@ -0,0 +1,5 @@
+---
+"@hi-ui/tree-select": minor
+---
+
+feat: add size api

.changeset/ninety-seals-hammer.md

@@ -0,0 +1,5 @@
+---
+"@hi-ui/hiui": patch
+---
+
+CheckSelect feat: add size api

.changeset/proud-turkeys-call.md

@@ -0,0 +1,5 @@
+---
+"@hi-ui/cascader": minor
+---
+
+feat: add size api

.changeset/real-masks-glow.md

@@ -0,0 +1,5 @@
+---
+"@hi-ui/check-tree-select": minor
+---
+
+feat: add size api

.changeset/spotty-tools-cross.md

@@ -0,0 +1,5 @@
+---
+"@hi-ui/hiui": patch
+---
+
+Cascader feat: add size api

.changeset/tricky-impalas-notice.md

@@ -0,0 +1,5 @@
+---
+"@hi-ui/hiui": patch
+---
+
+TreeSelect feat: add size api

.changeset/wise-teachers-tease.md

@@ -0,0 +1,5 @@
+---
+"@hi-ui/hiui": patch
+---
+
+CheckTreeSelect feat: add size api

packages/ui/cascader/src/Cascader.tsx

@@ -1,5 +1,5 @@
 import React, { forwardRef, useState, useMemo, useEffect } from 'react'
-import type { HiBaseAppearanceEnum } from '@hi-ui/core'
+import type { HiBaseAppearanceEnum, HiBaseSizeEnum } from '@hi-ui/core'
 import { cx, getPrefixCls } from '@hi-ui/classname'
 import { __DEV__ } from '@hi-ui/env'
 import { useUncontrolledToggle } from '@hi-ui/use-toggle'
@@ -52,6 +52,7 @@ export const Cascader = forwardRef<HTMLDivElement | null, CascaderProps>((props,
     data = NOOP_ARRAY,
     flattedSearchResult = true,
     visible,
+    size = 'md',
     onOpen,
     onClose,
     renderExtraFooter,
@@ -230,6 +231,7 @@ export const Cascader = forwardRef<HTMLDivElement | null, CascaderProps>((props,
         onSearch={callAllFuncs(onSearchProp, onSearch)}
         trigger={
           <MockInput
+            size={size}
             clearable={clearable}
             placeholder={placeholder}
             displayRender={displayRender as any}
@@ -320,6 +322,10 @@ export interface CascaderProps
    * 自定义下拉菜单每列渲染
    */
   dropdownColumnRender?: (menu: React.ReactElement, level: number) => React.ReactNode
+  /**
+   * 设置尺寸
+   */
+  size?: HiBaseSizeEnum
 }
 
 if (__DEV__) {

packages/ui/cascader/src/styles/cascader.scss

@@ -81,7 +81,7 @@ $prefix: '#{$component-prefix}-cascader' !default;
 
   &-item {
     width: 100%;
-    padding: use-spacing(2) 0;
+    padding: use-spacing(1) 0;
     position: relative;
     cursor: pointer;
     display: flex;
@@ -90,7 +90,7 @@ $prefix: '#{$component-prefix}-cascader' !default;
   &-option {
     padding: 0 use-spacing(4);
     box-sizing: border-box;
-    height: 32px;
+    height: use-height-size(7);
     width: 100%;
     display: flex;
     align-items: center;

packages/ui/cascader/stories/index.stories.tsx

@@ -2,6 +2,7 @@ import React from 'react'
 import Cascader from '../src'
 
 export * from './basic.stories'
+export * from './size.stories'
 export * from './disabled.stories'
 export * from './search.stories'
 export * from './filter-options.stories'

packages/ui/cascader/stories/size.stories.tsx

@@ -0,0 +1,102 @@
+import React from 'react'
+import Cascader from '../src'
+
+/**
+ * @title 不同尺寸
+ */
+export const Size = () => {
+  const [data] = React.useState([
+    {
+      id: '手机',
+      title: '手机t',
+      children: [
+        {
+          id: '小米',
+          title: '小米t',
+          children: [
+            {
+              id: '小米3',
+              title: '小米3t',
+            },
+            {
+              id: '小米4',
+              title: '小米4t',
+            },
+          ],
+        },
+        {
+          id: '红米',
+          title: '红米t',
+          children: [
+            {
+              id: '红米3',
+              title: '红米3t',
+            },
+            {
+              id: '红米4',
+              title: '红米4t',
+            },
+          ],
+        },
+      ],
+    },
+    {
+      id: '电视',
+      title: '电视t',
+      children: [
+        {
+          id: '小米电视4A',
+          title: '小米电视4At',
+        },
+        {
+          id: '小米电视4C',
+          title: '小米电视4Ct',
+        },
+      ],
+    },
+  ])
+
+  return (
+    <>
+      <h1>Size</h1>
+      <div className="cascader-size__wrap">
+        <h2>sm</h2>
+        <Cascader
+          style={{ width: 240 }}
+          size="sm"
+          clearable
+          placeholder="请选择品类"
+          defaultValue={['手机', '红米', '红米4']}
+          data={data}
+          onChange={(...args) => {
+            console.log('onChange', ...args)
+          }}
+        ></Cascader>
+        <h2>md</h2>
+        <Cascader
+          style={{ width: 240 }}
+          size="md"
+          clearable
+          placeholder="请选择品类"
+          defaultValue={['手机', '红米', '红米4']}
+          data={data}
+          onChange={(...args) => {
+            console.log('onChange', ...args)
+          }}
+        ></Cascader>
+        <h2>lg</h2>
+        <Cascader
+          style={{ width: 240 }}
+          size="lg"
+          clearable
+          placeholder="请选择品类"
+          defaultValue={['手机', '红米', '红米4']}
+          data={data}
+          onChange={(...args) => {
+            console.log('onChange', ...args)
+          }}
+        ></Cascader>
+      </div>
+    </>
+  )
+}

packages/ui/check-cascader/src/CheckCascader.tsx

@@ -24,7 +24,7 @@ import { flattenTreeData } from './utils'
 import { getNodeAncestorsWithMe, getTopDownAncestors } from '@hi-ui/tree-utils'
 import { useLatestCallback } from '@hi-ui/use-latest'
 import { isArrayNonEmpty, isUndef } from '@hi-ui/type-assertion'
-import { HiBaseAppearanceEnum, useLocaleContext } from '@hi-ui/core'
+import { HiBaseAppearanceEnum, HiBaseSizeEnum, useLocaleContext } from '@hi-ui/core'
 
 import { callAllFuncs } from '@hi-ui/func-utils'
 
@@ -69,6 +69,7 @@ export const CheckCascader = forwardRef<HTMLDivElement | null, CheckCascaderProp
       onOpen,
       onClose,
       tagInputProps,
+      size = 'md',
       ...rest
     },
     ref
@@ -225,6 +226,7 @@ export const CheckCascader = forwardRef<HTMLDivElement | null, CheckCascaderProp
         trigger={
           <TagInputMock
             {...tagInputProps}
+            size={size}
             clearable={clearable}
             placeholder={placeholder}
             // @ts-ignore
@@ -369,6 +371,10 @@ export interface CheckCascaderProps extends Omit<PickerProps, 'trigger' | 'scrol
    * TagInput 参数设置
    */
   tagInputProps?: TagInputMockProps
+  /**
+   * 设置尺寸
+   */
+  size?: HiBaseSizeEnum
 }
 
 if (__DEV__) {

packages/ui/check-cascader/src/styles/check-cascader.scss

@@ -86,7 +86,7 @@ $prefix: '#{$component-prefix}-check-cascader' !default;
 
   &-item {
     width: 100%;
-    padding: use-spacing(2) 0;
+    padding: use-spacing(1) 0;
     position: relative;
     cursor: pointer;
     display: flex;
@@ -109,7 +109,7 @@ $prefix: '#{$component-prefix}-check-cascader' !default;
   &-option {
     padding: 0 use-spacing(4);
     box-sizing: border-box;
-    height: 32px;
+    height: use-height-size(7);
     width: 100%;
     display: flex;
     align-items: center;

packages/ui/check-cascader/stories/index.stories.tsx

@@ -3,6 +3,7 @@ import CheckCascader from '../src'
 
 export * from './basic.stories'
 export * from './tag-input-wrap.stories'
+export * from './size.stories'
 export * from './disabled.stories'
 export * from './search.stories'
 export * from './select-change.stories'