@qsxy/element-plus-react 1.0.3 → 2.0.0

package/dist/Cascader/useCascader.js

@@ -19,19 +19,20 @@ import find from 'lodash/find';
 import isEqual from 'lodash/isEqual';
 import last from 'lodash/last';
 import { useCallback, useEffect, useRef, useState } from 'react';
-import { isEmpty, isNotEmpty, randomCode } from "../Util";
+import { useForceUpdate } from "../hooks";
+import { isEmpty, isNotEmpty, nextTick, randomCode } from "../Util";
 export var useCascader = function useCascader(initialData, props, value) {
   var menuProps = props.props,
     showAllLevels = props.showAllLevels,
     separator = props.separator;
-  var _menuProps$childrenKe = menuProps.childrenKey,
-    childrenKey = _menuProps$childrenKe === void 0 ? 'children' : _menuProps$childrenKe,
-    _menuProps$valueKey = menuProps.valueKey,
-    valueKey = _menuProps$valueKey === void 0 ? 'value' : _menuProps$valueKey,
-    _menuProps$labelKey = menuProps.labelKey,
-    labelKey = _menuProps$labelKey === void 0 ? 'label' : _menuProps$labelKey,
-    _menuProps$leafKey = menuProps.leafKey,
-    leafKey = _menuProps$leafKey === void 0 ? 'leaf' : _menuProps$leafKey,
+  var _menuProps$children = menuProps.children,
+    childrenKey = _menuProps$children === void 0 ? 'children' : _menuProps$children,
+    _menuProps$value = menuProps.value,
+    valueKey = _menuProps$value === void 0 ? 'value' : _menuProps$value,
+    _menuProps$label = menuProps.label,
+    labelKey = _menuProps$label === void 0 ? 'label' : _menuProps$label,
+    _menuProps$leaf = menuProps.leaf,
+    leafKey = _menuProps$leaf === void 0 ? 'leaf' : _menuProps$leaf,
     lazy = menuProps.lazy;
   // 展开层级数
   var _useState = useState(0),
@@ -54,6 +55,7 @@ export var useCascader = function useCascader(initialData, props, value) {
   var _optionData = useRef({});
   // 选中的数据组
   var selectedValue = useRef([]);
+  var oldSelectedValue = useRef([]);
   // 选中的数据标签组
   var selectedLabel = useRef([]);
   // 选中的节点组
@@ -63,6 +65,10 @@ export var useCascader = function useCascader(initialData, props, value) {
   // 树组件扩展keys
   // const expandKeys = useRef<Record<string, Key[]>>({});
 
+  // 强制更新
+  var _useForceUpdate = useForceUpdate(),
+    forceUpdate = _useForceUpdate.forceUpdate;
+
   /**
    * 初始化时分离不同层级的数据
    * @param nodes
@@ -73,7 +79,7 @@ export var useCascader = function useCascader(initialData, props, value) {
     var level = arguments.length > 1 ? arguments[1] : undefined;
     var pid = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : '0';
     nodes.forEach(function (item) {
-      var _ref, _item$leafKey;
+      var _item$leafKey;
       var __id = randomCode(11);
       if (Object.prototype.hasOwnProperty.call(item, childrenKey)) {
         init(item[childrenKey], level + 1, __id);
@@ -82,10 +88,11 @@ export var useCascader = function useCascader(initialData, props, value) {
         _optionData.current["level".concat(level)] = [];
       }
       Object.assign(item, {
+        data: cloneDeep(item),
         __level: level,
         __id: __id,
         __pId: pid,
-        __leaf: (_ref = (_item$leafKey = item[leafKey]) !== null && _item$leafKey !== void 0 ? _item$leafKey : !Object.prototype.hasOwnProperty.call(item, childrenKey)) !== null && _ref !== void 0 ? _ref : false,
+        __leaf: (_item$leafKey = item[leafKey]) !== null && _item$leafKey !== void 0 ? _item$leafKey : !Object.prototype.hasOwnProperty.call(item, childrenKey),
         __checked: false,
         __indeterminate: false
       });
@@ -100,6 +107,11 @@ export var useCascader = function useCascader(initialData, props, value) {
    * @param value
    */
   var setSelectedValue = useCallback(function (level, val) {
+    if (selectedValue.current.length < level + 1) {
+      while (selectedValue.current.length <= level + 1) {
+        selectedValue.current.push(null);
+      }
+    }
     selectedValue.current = selectedValue.current.map(function (item, l) {
       if (l < level) {
         return item;
@@ -109,7 +121,13 @@ export var useCascader = function useCascader(initialData, props, value) {
         return null;
       }
     });
-  }, []);
+    if (!isEqual(oldSelectedValue.current, selectedValue.current)) {
+      nextTick(function () {
+        forceUpdate();
+      });
+    }
+    oldSelectedValue.current = selectedValue.current;
+  }, [forceUpdate]);
 
   /**
    * 设置任意层级节点的标签
@@ -117,6 +135,11 @@ export var useCascader = function useCascader(initialData, props, value) {
    * @param value
    */
   var setSelectedLabel = useCallback(function (level, val) {
+    if (selectedLabel.current.length < level + 1) {
+      while (selectedLabel.current.length <= level + 1) {
+        selectedLabel.current.push(null);
+      }
+    }
     selectedLabel.current = selectedLabel.current.map(function (item, l) {
       if (l < level) {
         return item;
@@ -134,6 +157,11 @@ export var useCascader = function useCascader(initialData, props, value) {
    * @param value
    */
   var setSelectedNode = useCallback(function (level, node) {
+    if (selectedNode.current.length < level + 1) {
+      while (selectedNode.current.length <= level + 1) {
+        selectedNode.current.push(null);
+      }
+    }
     selectedNode.current = selectedNode.current.map(function (item, l) {
       if (l < level) {
         return item;
@@ -226,8 +254,8 @@ export var useCascader = function useCascader(initialData, props, value) {
     }
   }, []);
   var getParent = useCallback(function (level, node) {
-    var _ref2;
-    var options = (_ref2 = isNotEmpty(optionData) ? optionData : _optionData.current) === null || _ref2 === void 0 ? void 0 : _ref2["level".concat(level - 1)];
+    var _ref;
+    var options = (_ref = isNotEmpty(optionData) ? optionData : _optionData.current) === null || _ref === void 0 ? void 0 : _ref["level".concat(level - 1)];
     if (options) {
       var _parent = options.find(function (item) {
         return item.__id === node.__pId;
@@ -331,6 +359,21 @@ export var useCascader = function useCascader(initialData, props, value) {
     });
     return result;
   }, [loopGetCheckedNodes]);
+  var getStrictlyCheckedNodes = useCallback(function () {
+    var _optionData$current8, _optionData$current9;
+    var level = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 0;
+    var result = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
+    (_optionData$current8 = _optionData.current) === null || _optionData$current8 === void 0 || (_optionData$current8 = _optionData$current8["level".concat(level)]) === null || _optionData$current8 === void 0 || _optionData$current8.forEach(function (item) {
+      // 只有一级且选中
+      if (item.__checked) {
+        result.push(level > 0 ? loopGetParent(level, item, [item]).reverse() : [item]);
+      }
+    });
+    if ((_optionData$current9 = _optionData.current) !== null && _optionData$current9 !== void 0 && _optionData$current9["level".concat(level + 1)]) {
+      getStrictlyCheckedNodes(level + 1, result);
+    }
+    return result;
+  }, [loopGetParent]);
 
   /**
    * 设置选中节点
@@ -347,6 +390,38 @@ export var useCascader = function useCascader(initialData, props, value) {
     checkedNodes.current = getCheckedNodes();
     setOptionData(_optionData.current);
   }, [getCheckedNodes, loopCheckedNodes, loopParentStatus, optionData]);
+
+  /**
+   * 设置选中节点
+   * @param level 层级
+   * @param node 当前节点
+   * @param checked 是否选中
+   */
+  var setStrictlyCheckedNode = useCallback(function (level, node, checked) {
+    var _optionData$current10, _optionData$current11;
+    if (isEmpty(_optionData.current)) {
+      _optionData.current = optionData;
+    }
+    _optionData.current = _objectSpread(_objectSpread({}, _optionData.current), {}, _defineProperty({}, "level".concat(level), ((_optionData$current10 = (_optionData$current11 = _optionData.current) === null || _optionData$current11 === void 0 ? void 0 : _optionData$current11["level".concat(level)]) !== null && _optionData$current10 !== void 0 ? _optionData$current10 : []).map(function (item) {
+      // 当前节点选中状态变更
+      if (item.__id === node.__id) {
+        var _item$children2;
+        if ((item === null || item === void 0 || (_item$children2 = item.children) === null || _item$children2 === void 0 ? void 0 : _item$children2.length) > 0) {
+          return _objectSpread(_objectSpread({}, item), {}, {
+            __checked: checked,
+            __indeterminate: false
+          });
+        }
+        return _objectSpread(_objectSpread({}, item), {}, {
+          __checked: checked,
+          __indeterminate: false
+        });
+      }
+      return item;
+    })));
+    checkedNodes.current = getStrictlyCheckedNodes();
+    setOptionData(_optionData.current);
+  }, [getStrictlyCheckedNodes, optionData]);
   var getCheckedValue = useCallback(function () {
     return checkedNodes.current.map(function (nodes) {
       return nodes.map(function (item) {
@@ -392,9 +467,9 @@ export var useCascader = function useCascader(initialData, props, value) {
       // const options = optionData[`level${level - 1}`];
       var parent = (_selectedNode$current = selectedNode.current) === null || _selectedNode$current === void 0 ? void 0 : _selectedNode$current[level - 1];
       if (parent) {
-        var _optionData$current8;
+        var _optionData$current12;
         // console.log(_optionData.current[`level${level}`].filter(item => item.__pId === parent.__id));
-        return (_optionData$current8 = _optionData.current) === null || _optionData$current8 === void 0 || (_optionData$current8 = _optionData$current8["level".concat(level)]) === null || _optionData$current8 === void 0 ? void 0 : _optionData$current8.filter(function (item) {
+        return (_optionData$current12 = _optionData.current) === null || _optionData$current12 === void 0 || (_optionData$current12 = _optionData$current12["level".concat(level)]) === null || _optionData$current12 === void 0 ? void 0 : _optionData$current12.filter(function (item) {
           return item.__pId === parent.__id;
         });
         // return (options.find(item => item.__id === parent.__id) ?? {})[childrenKey];
@@ -408,13 +483,14 @@ export var useCascader = function useCascader(initialData, props, value) {
    * @param nodes
    * @param level 层级
    */
-  var storeOptionData = useCallback(function (nodes, level, parent, _ref3) {
-    var isCover = _ref3.isCover;
+  var storeOptionData = useCallback(function (nodes, level, parent, _ref2) {
+    var isCover = _ref2.isCover;
     var data = cloneDeep(_optionData.current);
     var newNodes = [];
     newNodes = nodes.map(function (node) {
       var _parent$__id, _node$leafKey;
       return _objectSpread(_objectSpread({}, node), {}, {
+        data: cloneDeep(node),
         __level: level,
         __id: randomCode(11),
         __pId: (_parent$__id = parent === null || parent === void 0 ? void 0 : parent.__id) !== null && _parent$__id !== void 0 ? _parent$__id : '0',
@@ -442,6 +518,7 @@ export var useCascader = function useCascader(initialData, props, value) {
           p[childrenKey] = newNodes;
           if (newNodes.length === 0) {
             p.__leaf = true;
+            p[leafKey] = true;
           }
         } else {
           p[childrenKey] = isCover ? newNodes : p[childrenKey].concat(newNodes);
@@ -533,8 +610,8 @@ export var useCascader = function useCascader(initialData, props, value) {
           if (!Object.prototype.hasOwnProperty.call(item, 'children') || item.children.length === 0) {
             result.push([].concat(_toConsumableArray(path), [item]));
           } else if (item.children.length > 0) {
-            var _item$children2;
-            loopGetMatchNodes(level + 1, (_item$children2 = item.children) !== null && _item$children2 !== void 0 ? _item$children2 : [], [].concat(_toConsumableArray(path), [item]));
+            var _item$children3;
+            loopGetMatchNodes(level + 1, (_item$children3 = item.children) !== null && _item$children3 !== void 0 ? _item$children3 : [], [].concat(_toConsumableArray(path), [item]));
           }
           nodes.splice(_index, 1);
           options["level".concat(level)].splice(options["level".concat(level)].findIndex(function (node) {
@@ -559,8 +636,8 @@ export var useCascader = function useCascader(initialData, props, value) {
             if (!Object.prototype.hasOwnProperty.call(item, 'children') || item.children.length === 0) {
               result.push(current);
             } else if (item.children.length > 0) {
-              var _item$children3;
-              loopGetMatchNodes(i + 1, (_item$children3 = item.children) !== null && _item$children3 !== void 0 ? _item$children3 : [], current);
+              var _item$children4;
+              loopGetMatchNodes(i + 1, (_item$children4 = item.children) !== null && _item$children4 !== void 0 ? _item$children4 : [], current);
             }
             options["level".concat(i)].splice(_index2, 1);
             options["level".concat(i)].splice(options["level".concat(i)].findIndex(function (node) {
@@ -616,13 +693,25 @@ export var useCascader = function useCascader(initialData, props, value) {
   }, [props.options]);
   var initSelectedValue = function initSelectedValue(_value) {
     var _selectedValue$curren, _selectedLabel$curren;
-    selectedValue.current = new Array(allLevel + 1).fill(null);
-    selectedLabel.current = new Array(allLevel + 1).fill(null);
-    selectedNode.current = new Array(allLevel + 1).fill(null);
+    selectedValue.current = Array.from({
+      length: allLevel + 1
+    }, function () {
+      return null;
+    });
+    selectedLabel.current = Array.from({
+      length: allLevel + 1
+    }, function () {
+      return null;
+    });
+    selectedNode.current = Array.from({
+      length: allLevel + 1
+    }, function () {
+      return null;
+    });
     if (_value.length > 0) {
-      var _optionData$current9;
+      var _optionData$current13;
       var _level = _value.length - 1;
-      var res = (_optionData$current9 = _optionData.current) === null || _optionData$current9 === void 0 || (_optionData$current9 = _optionData$current9["level".concat(_level)]) === null || _optionData$current9 === void 0 ? void 0 : _optionData$current9.filter(function (option) {
+      var res = (_optionData$current13 = _optionData.current) === null || _optionData$current13 === void 0 || (_optionData$current13 = _optionData$current13["level".concat(_level)]) === null || _optionData$current13 === void 0 ? void 0 : _optionData$current13.filter(function (option) {
         return option[valueKey] === _value[_level];
       });
       if ((res === null || res === void 0 ? void 0 : res.length) > 1) {
@@ -648,6 +737,9 @@ export var useCascader = function useCascader(initialData, props, value) {
     if (!lazy && allLevel >= 0) {
       var _props$props;
       if (props !== null && props !== void 0 && (_props$props = props.props) !== null && _props$props !== void 0 && _props$props.multiple) {
+        if (selectedValue.current.length > 0) {
+          return;
+        }
         var _value = value.length > 0 ? value[0] : [];
         initSelectedValue(_value);
         if (isEmpty(_optionData.current)) {
@@ -731,6 +823,7 @@ export var useCascader = function useCascader(initialData, props, value) {
      * @param checked 是否选中
      */
     setCheckedNode: setCheckedNode,
+    setStrictlyCheckedNode: setStrictlyCheckedNode,
     getCheckedNodes: function getCheckedNodes() {
       return checkedNodes.current;
     },

package/dist/CheckboxGroup/CheckboxGroup.d.ts

@@ -1,5 +1,5 @@
 import { FC } from 'react';
-import type { ValueType } from '../Checkbox/index';
+import { type ValueType } from '../Checkbox/index';
 import { BaseProps, FormControlBaseProps, NativeProps, TypeAttributes } from '../types/common';
 export interface CheckboxGroupProps<V = ValueType[] | boolean> extends FormControlBaseProps<V>, BaseProps, NativeProps {
     name?: string;
@@ -11,6 +11,16 @@ export interface CheckboxGroupProps<V = ValueType[] | boolean> extends FormContr
     min?: number;
     /** 可被勾选的 checkbox 的最大数量 */
     max?: number;
+    /** 选项的数据源， value 的 key 和 label 和  disabled可以通过 props自定义. */
+    options?: Array<{
+        [key: string]: any;
+    }>;
+    /** options 的配置 */
+    props?: {
+        value?: string;
+        label?: string;
+        disabled?: string;
+    };
 }
 declare const CheckboxGroup: FC<CheckboxGroupProps>;
 export default CheckboxGroup;

package/dist/CheckboxGroup/CheckboxGroup.js

@@ -1,5 +1,4 @@
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
-var _excluded = ["className", "name", "value", "defaultValue", "classPrefix", "readOnly", "onChange", "getBooleanOnSingle", "min", "max"];
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
@@ -11,28 +10,33 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
-function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
-function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
 import classNames from 'classnames';
 import cloneDeep from 'lodash/cloneDeep';
 import remove from 'lodash/remove';
-import React, { forwardRef, memo, useCallback, useMemo } from 'react';
-import { shallowEqual } from "../Util";
+import React, { Children, forwardRef, memo, useCallback, useMemo } from 'react';
+import { Checkbox } from "../Checkbox/index";
+import { mergeDefaultProps, shallowEqual } from "../Util";
 import { useChildrenInstance, useClassNames, useControlled, useDisabled, useSize } from "../hooks";
 import { CheckboxGroupContext } from "./CheckboxGroupContext";
 var CheckboxGroup = /*#__PURE__*/memo( /*#__PURE__*/forwardRef(function (props, ref) {
-  var className = props.className,
-    name = props.name,
-    valueProp = props.value,
-    defaultValue = props.defaultValue,
-    _props$classPrefix = props.classPrefix,
+  var _props3;
+  props = mergeDefaultProps({
+    props: {},
+    options: []
+  }, props);
+  var _props = props,
+    className = _props.className,
+    name = _props.name,
+    valueProp = _props.value,
+    defaultValue = _props.defaultValue,
+    _props$classPrefix = _props.classPrefix,
     classPrefix = _props$classPrefix === void 0 ? 'checkbox-group' : _props$classPrefix,
-    readOnly = props.readOnly,
-    onChange = props.onChange,
-    getBooleanOnSingle = props.getBooleanOnSingle,
-    min = props.min,
-    max = props.max,
-    rest = _objectWithoutProperties(props, _excluded);
+    readOnly = _props.readOnly,
+    onChange = _props.onChange,
+    getBooleanOnSingle = _props.getBooleanOnSingle,
+    min = _props.min,
+    max = _props.max,
+    options = _props.options;
   var _useClassNames = useClassNames(classPrefix),
     m = _useClassNames.m;
   var _useControlled = useControlled(valueProp, defaultValue),
@@ -42,15 +46,21 @@ var CheckboxGroup = /*#__PURE__*/memo( /*#__PURE__*/forwardRef(function (props,
     isControlled = _useControlled2[2];
   var disabled = useDisabled(props.disabled);
   var size = useSize(props.size);
+  var aliasProps = mergeDefaultProps({
+    value: 'value',
+    label: 'label',
+    disabled: 'disabled'
+  }, props.props);
 
   /** 获取子组件 */
   var getTabPaneInstance = useChildrenInstance(['ElCheckbox', 'ElCheckboxButton']);
 
   /** 获取TabPane组件中的配置数据 */
   var children = useMemo(function () {
-    var componentChildren = getTabPaneInstance(props === null || props === void 0 ? void 0 : props.children);
+    var _props2;
+    var componentChildren = getTabPaneInstance((_props2 = props) === null || _props2 === void 0 ? void 0 : _props2.children);
     return componentChildren;
-  }, [getTabPaneInstance, props === null || props === void 0 ? void 0 : props.children]);
+  }, [getTabPaneInstance, (_props3 = props) === null || _props3 === void 0 ? void 0 : _props3.children]);
   var isSingle = useMemo(function () {
     return children.length === 1;
   }, [children]);
@@ -128,12 +138,61 @@ var CheckboxGroup = /*#__PURE__*/memo( /*#__PURE__*/forwardRef(function (props,
     }
     return children;
   }, [children, max, min, value]);
+  var optionChilds = useMemo(function () {
+    var checkboxs = null;
+    if (options.length > 0) {
+      checkboxs = options.map(function (item) {
+        return /*#__PURE__*/React.createElement(Checkbox, {
+          key: item[aliasProps.value],
+          value: item[aliasProps.value],
+          disabled: item[aliasProps.disabled]
+        }, item[aliasProps.label]);
+      });
+      if (min > 0 && value instanceof Array && value.length <= min) {
+        return checkboxs.map(function (item, index) {
+          var isChcked = value.some(function (i) {
+            return i === item.props.value;
+          });
+          if (isChcked && value.length < max) {
+            return /*#__PURE__*/React.cloneElement(item, _objectSpread(_objectSpread({
+              key: index
+            }, item.props), {}, {
+              disabled: isChcked
+            }));
+          } else if (value.length == max) {
+            return /*#__PURE__*/React.cloneElement(item, _objectSpread(_objectSpread({
+              key: index
+            }, item.props), {}, {
+              disabled: !isChcked
+            }));
+          } else {
+            return /*#__PURE__*/React.cloneElement(item, _objectSpread({
+              key: index
+            }, item.props));
+          }
+        });
+      }
+      if (max > 0 && value instanceof Array && value.length == max) {
+        return checkboxs.map(function (item, index) {
+          var isChcked = value.some(function (i) {
+            return i === item.props.value;
+          });
+          return /*#__PURE__*/React.cloneElement(item, _objectSpread(_objectSpread({
+            key: index
+          }, item.props), {}, {
+            disabled: !isChcked
+          }));
+        });
+      }
+    }
+    return checkboxs;
+  }, [max, min, options, aliasProps.disabled, aliasProps.label, aliasProps.value, value]);
   return /*#__PURE__*/React.createElement(CheckboxGroupContext.Provider, {
     value: contextValue
   }, /*#__PURE__*/React.createElement("div", {
     ref: ref /* {...omit(rest, ['disabled', 'size'])} */,
     className: classNames(className, m(_defineProperty({}, size, size)))
-  }, childs));
+  }, Children.count(children) === 0 ? optionChilds : childs));
 }));
 CheckboxGroup.displayName = 'ElCheckboxGroup';
 export default CheckboxGroup;

package/dist/Collapse/Collapse.d.ts

@@ -1,4 +1,4 @@
-import { FC } from 'react';
-import { CollapseProps } from './typings';
-declare const Collapse: FC<CollapseProps>;
+import React from 'react';
+import { CollapseProps, CollapseRef } from './typings';
+declare const Collapse: React.MemoExoticComponent<React.ForwardRefExoticComponent<CollapseProps & React.RefAttributes<CollapseRef>>>;
 export default Collapse;

package/dist/Collapse/Collapse.js

@@ -1,3 +1,7 @@
+function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
+function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
+function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
@@ -5,33 +9,84 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
 function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import classNames from 'classnames';
-import React, { memo } from 'react';
+import castArray from 'lodash/castArray';
+import React, { forwardRef, memo, useCallback } from 'react';
 import { useClassNames, useControlled } from "../hooks";
+import { debugWarn, isBoolean, isPromise, mergeDefaultProps, throwError } from "../Util";
 import { CollapseContext } from "./CollapseContext";
-var Collapse = /*#__PURE__*/memo(function (props) {
-  var defaultActiveName = props.defaultActiveName,
-    activeName = props.activeName,
-    accordion = props.accordion,
-    onChange = props.onChange,
-    _props$classPrefix = props.classPrefix,
+var Collapse = /*#__PURE__*/memo( /*#__PURE__*/forwardRef(function (props, ref) {
+  props = mergeDefaultProps({
+    expandIconPosition: 'right'
+  }, props);
+  var _props = props,
+    accordion = _props.accordion,
+    expandIconPosition = _props.expandIconPosition,
+    onChange = _props.onChange,
+    beforeCollapse = _props.beforeCollapse,
+    _props$classPrefix = _props.classPrefix,
     classPrefix = _props$classPrefix === void 0 ? 'collapse' : _props$classPrefix;
   var _useClassNames = useClassNames(classPrefix),
     b = _useClassNames.b;
-  var _useControlled = useControlled(activeName, defaultActiveName),
+  var _useControlled = useControlled(props.activeName ? castArray(props.activeName) : undefined, props.defaultActiveName ? castArray(props.defaultActiveName) : []),
     _useControlled2 = _slicedToArray(_useControlled, 2),
-    value = _useControlled2[0],
-    setValue = _useControlled2[1];
+    activeName = _useControlled2[0],
+    setActiveName = _useControlled2[1];
+  var setActiveNames = useCallback(function (activeNames) {
+    setActiveName(activeNames);
+    var _value = accordion ? activeNames[0] : activeNames;
+    onChange === null || onChange === void 0 || onChange(_value);
+  }, [setActiveName, accordion, onChange]);
+  var handleChange = useCallback(function (name) {
+    if (accordion) {
+      setActiveNames([activeName[0] === name ? '' : name]);
+    } else {
+      var _activeNames = _toConsumableArray(activeName);
+      var index = _activeNames.indexOf(name);
+      if (index > -1) {
+        _activeNames.splice(index, 1);
+      } else {
+        _activeNames.push(name);
+      }
+      setActiveNames(_activeNames);
+    }
+  }, [activeName, setActiveNames, accordion]);
+  var handleItemClick = function handleItemClick(name) {
+    if (!beforeCollapse) {
+      handleChange(name);
+      return;
+    }
+    var shouldChange = beforeCollapse(name);
+    var isPromiseOrBool = [isPromise(shouldChange), isBoolean(shouldChange)].includes(true);
+    if (!isPromiseOrBool) {
+      throwError('ElCollapse', 'beforeCollapse must return type `Promise<boolean>` or `boolean`');
+    }
+    if (isPromise(shouldChange)) {
+      shouldChange.then(function (result) {
+        if (result !== false) {
+          handleChange(name);
+        }
+      }).catch(function (e) {
+        debugWarn('ElCollapse', "some error occurred: ".concat(e));
+      });
+    } else if (shouldChange) {
+      handleChange(name);
+    }
+  };
+  React.useImperativeHandle(ref, function () {
+    return {
+      activeNames: activeName,
+      setActiveNames: setActiveNames
+    };
+  });
   return /*#__PURE__*/React.createElement("div", {
-    className: classNames(b(), props.className),
+    className: classNames(b(), b("icon-position-".concat(expandIconPosition)), props.className),
     style: props.style
   }, /*#__PURE__*/React.createElement(CollapseContext.Provider, {
     value: {
-      value: value,
-      setValue: setValue,
-      accordion: accordion,
-      onChange: onChange
+      activeNames: activeName,
+      handleItemClick: handleItemClick
     }
   }, props.children));
-});
+}));
 Collapse.displayName = 'ElCollapse';
 export default Collapse;

package/dist/Collapse/CollapseContext.d.ts

@@ -1,13 +1,10 @@
 /// <reference types="react" />
-import { CollapseProps } from './typings';
+import { CollapseActiveName } from './typings';
 interface CollapseContextProps {
     /** 当前激活的面板(可控模式：如果是手风琴模式，绑定值类型需要为string，否则为array) */
-    value: CollapseProps['activeName'];
-    setValue: (value: CollapseProps['activeName']) => void;
-    /** 是否手风琴模式 */
-    accordion: boolean;
+    activeNames: CollapseActiveName[];
     /** 当前激活面板改变时触发(如果是手风琴模式，参数 activeNames 类型为string，否则为array) */
-    onChange: (activeNames: string | string[]) => void;
+    handleItemClick: (name: CollapseActiveName) => void;
 }
 export declare const CollapseContext: import("react").Context<CollapseContextProps>;
 export {};

package/dist/Collapse/CollapseContext.js

@@ -1,7 +1,5 @@
 import { createContext } from 'react';
 export var CollapseContext = /*#__PURE__*/createContext({
-  value: null,
-  setValue: null,
-  accordion: false,
-  onChange: null
+  activeNames: [],
+  handleItemClick: null
 });

package/dist/Collapse/CollapseItem.d.ts

@@ -1,4 +1,4 @@
-import { FC } from 'react';
-import { CollapseItemProps } from './typings';
-declare const CollapseItem: FC<CollapseItemProps>;
+import React from 'react';
+import { CollapseItemProps, CollapseItemRef } from './typings';
+declare const CollapseItem: React.MemoExoticComponent<React.ForwardRefExoticComponent<CollapseItemProps & React.RefAttributes<CollapseItemRef>>>;
 export default CollapseItem;