@gm-pc/react 1.28.0-beta.1 → 1.28.0-beta.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gm-pc/react",
-  "version": "1.28.0-beta.1",
+  "version": "1.28.0-beta.2",
   "description": "观麦前端基础组件库",
   "author": "liyatang <liyatang@qq.com>",
   "homepage": "https://github.com/gmfe/gm-pc#readme",
@@ -24,7 +24,7 @@
   "dependencies": {
     "@gm-common/hooks": "^2.10.0",
     "@gm-common/tool": "^2.10.0",
-    "@gm-pc/locales": "^1.28.0-beta.1",
+    "@gm-pc/locales": "^1.28.0-beta.2",
     "big.js": "^6.0.1",
     "classnames": "^2.2.5",
     "lodash": "^4.17.19",
@@ -48,5 +48,5 @@
     "react-router-dom": "^5.2.0",
     "react-window": "^1.8.5"
   },
-  "gitHead": "994ee00d0f8515ba21e8522f0e66f717bc0859d9"
+  "gitHead": "8e9f3a00a9da2a0d800dafeb65f37d737f84be75"
 }

package/src/component/more_select/base.tsx

@@ -20,8 +20,8 @@ import { getLocale } from '@gm-pc/locales'
 import { ListBase } from '../list'
 import { findDOMNode } from 'react-dom'
 import { ConfigConsumer, ConfigProvider, ConfigProviderProps } from '../config_provider'
-import { Checkbox, Switch } from '@gm-pc/react'
-
+import { Checkbox } from '../checkbox'
+import { Switch } from '../switch'
 interface MoreSelectBaseState {
   searchValue: string
   loading: boolean
@@ -327,7 +327,8 @@ class MoreSelectBase<V extends string | number = string> extends Component<
           <Flex alignCenter>
             <Flex row>
               <Switch
-                style={{ width: 48 }}
+                size='small'
+                style={{ width: 32 }}
                 checked={isFilterDelete}
                 onChange={(open) => {
                   this.setState({
@@ -344,7 +345,7 @@ class MoreSelectBase<V extends string | number = string> extends Component<
                 }}
               />
             </Flex>
-            <span className='gm-margin-left-5'>过滤已删除商品</span>
+            <span className='gm-margin-left-5'>过滤已删除数据</span>
           </Flex>
         )}
       </Flex>

package/src/component/switch/style.less

@@ -6,6 +6,10 @@
   border-radius: calc(var(--gm-switch-size-height) / 2);
   background-color: var(--gm-color-bg-switch);
 
+  &.gm-switch-small {
+    --gm-switch-size-height: 16px;
+  }
+
   &::before {
     position: absolute;
     content: '';

package/src/component/switch/switch.tsx

@@ -11,6 +11,7 @@ interface SwitchProps {
   onChange?(checked: boolean): void
   className?: string
   style?: CSSProperties
+  size?: 'small' | 'middle'
 }
 
 interface SwitchState {
@@ -26,10 +27,11 @@ class Switch extends Component<SwitchProps, SwitchState> {
     on: '',
     off: '',
     onChange: _.noop,
+    size: 'middle',
   }
 
   readonly state: SwitchState = {
-    checked: this.props.checked,
+    checked: !!this.props.checked,
     labelWidth: null,
     isReady: false,
   }
@@ -53,7 +55,7 @@ class Switch extends Component<SwitchProps, SwitchState> {
   UNSAFE_componentWillReceiveProps(nextProps: Readonly<SwitchProps>) {
     if ('checked' in nextProps) {
       this.setState({
-        checked: nextProps.checked,
+        checked: !!nextProps.checked,
       })
     }
   }
@@ -82,6 +84,7 @@ class Switch extends Component<SwitchProps, SwitchState> {
       disabled,
       on,
       off,
+      size,
       ...rest
     } = this.props
 
@@ -101,8 +104,9 @@ class Switch extends Component<SwitchProps, SwitchState> {
           ref={this._inputOffRef}
           className={classNames('gm-switch gm-switch-' + type, className, {
             disabled,
+            [`gm-switch-${size}`]: size,
           })}
-          style={style}
+          style={style as any}
           data-attr={this.state.labelWidth}
           disabled={disabled}
           type='checkbox'