@gmfe/react 2.13.0-beta.6 → 2.14.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gmfe/react",
-  "version": "2.13.0-beta.6",
+  "version": "2.14.0",
   "description": "",
   "author": "liyatang <liyatang@qq.com>",
   "homepage": "https://github.com/gmfe/gmfe#readme",
@@ -27,7 +27,7 @@
   },
   "dependencies": {
     "@gm-common/tool": "^1.0.0",
-    "@gmfe/locales": "^2.13.0-beta.6",
+    "@gmfe/locales": "^2.14.0",
     "big.js": "^5.2.2",
     "classnames": "^2.2.5",
     "lodash": "^4.17.14",
@@ -35,5 +35,5 @@
     "prop-types": "^15.7.2",
     "react-window": "^1.8.5"
   },
-  "gitHead": "96f27c0dc6eada975c783069453287761eef64eb"
+  "gitHead": "265a37a2d09f4bf43412f667d8f6c8ec60c6e0de"
 }

package/src/component/more_select/base.js

@@ -31,7 +31,8 @@ class Base extends React.Component {
       searchValue: '',
       loading: false,
       // keyboard 默认第一个位置
-      willActiveIndex: props.isKeyboard ? 0 : null
+      willActiveIndex: props.isKeyboard ? 0 : null,
+      _style: {}
     }
 
     // 要后于 this.state 执行，因为 getFilterData 用到 searchValue
@@ -72,6 +73,12 @@ class Base extends React.Component {
     }
   }
 
+  componentDidMount() {
+    const dom = findDOMNode(this)
+    const _style = { width: dom.offsetWidth }
+    this.setState({ _style })
+  }
+
   componentWillUnmount() {
     this._isUnmounted = true
   }
@@ -309,6 +316,8 @@ class Base extends React.Component {
       children
     } = this.props
 
+    const { _style } = this.state
+
     return (
       <div
         ref={this.ref}
@@ -320,7 +329,7 @@ class Base extends React.Component {
           },
           className
         )}
-        style={style}
+        style={{ ..._style, ...style }}
       >
         <Popover
           ref={this.popoverRef}

package/src/component/more_select/style.less

@@ -1,5 +1,6 @@
 .gm-more-select {
   .gm-more-select-selected {
+    width: 100%;
     cursor: pointer;
     vertical-align: middle;
     position: relative;
@@ -11,6 +12,11 @@
     overflow: hidden;
     white-space: nowrap;
 
+    .gm-more-select-selected-item {
+      width: 100%;
+      overflow: hidden;
+    }
+
     &.gm-popover-active {
       border-color: @brand-primary;
     }

package/src/component/popup/popup_content_confirm.js

@@ -13,6 +13,7 @@ const PopupContentConfirm = props => {
     onSave,
     className,
     children,
+    hideClose,
     ...rest
   } = props
 
@@ -23,9 +24,9 @@ const PopupContentConfirm = props => {
     >
       <div className='gm-popup-content-confirm-title-wrap'>
         <div className='gm-popup-content-confirm-title'>{title}</div>
-        <div className='gm-popup-content-confirm-close' onClick={onCancel}>
+        {!hideClose && <div className='gm-popup-content-confirm-close' onClick={onCancel}>
           <SVGRemove />
-        </div>
+        </div>}
       </div>
       <div className='gm-popup-content-confirm-content'>
         {children}
@@ -55,6 +56,7 @@ PopupContentConfirm.propTypes = {
   onDelete: PropTypes.func,
   onSave: PropTypes.func,
   className: PropTypes.string,
+  hideClose: PropTypes.bool,
   style: PropTypes.object
 }
 

package/src/component/transfer/box.js

@@ -21,9 +21,11 @@ class Box extends React.Component {
   }
 
   handleSelectAll = checked => {
-    const { list, onSelect } = this.props
+    const { onSelect } = this.props
 
-    onSelect(checked.length === 0 ? [] : _.map(list, v => v.value))
+    onSelect(
+      checked.length === 0 ? [] : _.map(this.getProcessList(), v => v.value)
+    )
   }
 
   handleQuery = e => {
@@ -32,9 +34,18 @@ class Box extends React.Component {
     })
   }
 
+  getProcessList = () => {
+    const { list, withFilter } = this.props
+    const { query } = this.state
+    if (withFilter === true) {
+      return pinYinFilter(list, query, e => e.name)
+    } else if (withFilter) {
+      return withFilter(list, query)
+    }
+  }
+
   render() {
     const {
-      list,
       selectedValues,
 
       style,
@@ -47,12 +58,7 @@ class Box extends React.Component {
 
     const { query } = this.state
 
-    let processList
-    if (withFilter === true) {
-      processList = pinYinFilter(list, query, e => e.name)
-    } else if (withFilter) {
-      processList = withFilter(list, query)
-    }
+    const processList = this.getProcessList()
 
     return (
       <Flex column className='gm-transfer-box gm-border gm-bg' style={style}>
@@ -102,7 +108,10 @@ class Box extends React.Component {
           <CheckboxGroup
             name='transferBoxBottom'
             className='gm-margin-0 gm-padding-5'
-            value={[list.length !== 0 && list.length === selectedValues.length]}
+            value={[
+              processList.length !== 0 &&
+                processList.length === selectedValues.length
+            ]}
             onChange={this.handleSelectAll}
           >
             <Checkbox value disabled={disabled}>
@@ -110,7 +119,7 @@ class Box extends React.Component {
             </Checkbox>
           </CheckboxGroup>
           <div className='gm-padding-lr-5 gm-text-desc'>
-            {selectedValues.length}/{list.length}
+            {selectedValues.length}/{processList.length}
           </div>
         </Flex>
       </Flex>

package/src/component/tree/index.js

@@ -55,6 +55,7 @@ const Tree = ({
   // 区分正常的 展开收起 和 搜索导致的展开收起
   const [queryGroupSelected, setQueryGroupSelected] = useState([])
   const [groupSelected, setGroupSelected] = useState([])
+  const [checkedAll, setCheckedAll] = useState(false)
 
   // 响应 list 的变化
   useEffect(() => {
@@ -62,7 +63,8 @@ const Tree = ({
   }, [list])
 
   const handleSelectAll = checked => {
-    onSelectValues(checked ? _.map(getLeaf(list), v => v.value) : [])
+    setCheckedAll(checked)
+    onSelectValues(checked ? _.map(getLeaf(filterList), v => v.value) : [])
   }
 
   const handleQueryFilter = query => {
@@ -92,11 +94,6 @@ const Tree = ({
     setGroupSelected(groupSelected)
   }
 
-  const leafList = getLeaf(list)
-
-  const checkedAll =
-    leafList.length !== 0 && leafList.length === selectedValues.length
-
   const newGS = query ? queryGroupSelected : groupSelected
 
   return (
@@ -155,7 +152,7 @@ const Tree = ({
           checkedAll={checkedAll}
           onChange={() => handleSelectAll(!checkedAll)}
           selectValuesLength={selectedValues.length}
-          leafListLength={leafList.length}
+          leafListLength={getLeaf(filterList).length}
           disabled={disabled}
         />
       )}

package/src/component/tree_v2/index.js

@@ -89,7 +89,7 @@ const TreeV2 = ({
   }, [findIndex])
 
   const handleSelectAll = checked => {
-    onSelectValues(checked ? getLeafValues(list) : [])
+    onSelectValues(checked ? getLeafValues(filterList) : [])
   }
 
   const handleQuery = e => {
@@ -201,7 +201,7 @@ const TreeV2 = ({
 
       {showAllCheck ? (
         <Bottom
-          list={list}
+          list={filterList}
           selectedValues={selectedValues}
           onChange={handleSelectAll}
         />