@gm-pc/react 1.28.1-beta.2 → 1.28.1-beta.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gm-pc/react",
-  "version": "1.28.1-beta.2",
+  "version": "1.28.1-beta.4",
   "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.1-beta.2",
+    "@gm-pc/locales": "^1.28.1-beta.4",
     "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": "16774306f2bd425112cf4279f4aa844b5ec9d2ee"
+  "gitHead": "62e87c5f4088a95750b89155a4906166a3f548fc"
 }

package/src/component/more_select/base.tsx

@@ -152,6 +152,7 @@ class MoreSelectBase<V extends string | number = string> extends Component<
         }
       })
     })
+    console.log(data, selected)
     selected.forEach((item) => {
       let flag = true // 判断当前已选择的选项中是否存在不在当前data里面的，解决onSearch异步，true则表示都不在data里面
       data.forEach((group) => {
@@ -161,6 +162,7 @@ class MoreSelectBase<V extends string | number = string> extends Component<
         items.push(item)
       }
     })
+    console.log(items)
     onSelect(items)
 
     if (!multiple) {
@@ -228,6 +230,9 @@ class MoreSelectBase<V extends string | number = string> extends Component<
     event.stopPropagation()
     const { onSelect = _.noop } = this.props
     onSelect([])
+    this.setState({
+      previousCurrentSelected: [],
+    })
   }
 
   private _handlePopupKeyDown = (event: KeyboardEvent<HTMLDivElement>): void => {
@@ -480,7 +485,6 @@ class MoreSelectBase<V extends string | number = string> extends Component<
                 className='gm-border-0'
                 renderItem={renderListItem}
                 onSelect={(v, target) => {
-                  this._handleSelect(v)
                   // 判断是勾选还是反选：如果 v 中包含 target.value，说明是勾选操作；否则是反选操作
                   const isChecked = v.includes(target.value)
                   if (isChecked) {
@@ -491,6 +495,9 @@ class MoreSelectBase<V extends string | number = string> extends Component<
                         target,
                       ],
                     })
+                    const newSelected = [...selected, target]
+
+                    this.props.onSelect(newSelected)
                   } else {
                     // 反选：从 previousCurrentSelected 中移除
                     this.setState({
@@ -498,6 +505,11 @@ class MoreSelectBase<V extends string | number = string> extends Component<
                         (item) => item.value !== target.value
                       ),
                     })
+                    const newSelected = selected.filter(
+                      (item) => item.value !== target.value
+                    )
+
+                    this.props.onSelect(newSelected)
                   }
                 }}
                 isScrollTo={false}