@hi-ui/check-select 4.0.0-beta.46 → 4.0.0-beta.49

package/lib/cjs/CheckSelect.js

@@ -47,8 +47,6 @@ var highlighter = require('@hi-ui/highlighter');
 
 var useToggle = require('@hi-ui/use-toggle');
 
-var times = require('@hi-ui/times');
-
 var funcUtils = require('@hi-ui/func-utils');
 
 var localeContext = require('@hi-ui/locale-context');
@@ -59,6 +57,8 @@ require('@hi-ui/use-children');
 
 var useFlattenData = require('./hooks/use-flatten-data.js');
 
+var index = require('./utils/index.js');
+
 function _interopDefaultLegacy(e) {
   return e && _typeof(e) === 'object' && 'default' in e ? e : {
     'default': e
@@ -219,48 +219,37 @@ var CheckSelect = /*#__PURE__*/React.forwardRef(function (_a, ref) {
   var activeExpandable = showOnlyShowChecked && !!filterItems && menuVisible;
 
   var _useMemo = React.useMemo(function () {
-    var dropdownIds = dropdownItems.filter(function (item) {
-      return !('groupTitle' in item);
-    }).map(function (_ref) {
-      var id = _ref.id;
-      return id;
-    });
-    var dropdownIdsSet = new Set(dropdownIds);
-    var hasValue = false;
-    value.forEach(function (id) {
-      if (dropdownIdsSet.has(id)) {
-        hasValue = true;
-        dropdownIdsSet["delete"](id);
-      }
-    });
-    return [hasValue && dropdownIdsSet.size === 0, hasValue && dropdownIdsSet.size > 0];
+    return index.getAllCheckedStatus(dropdownItems, value, index.isOption);
   }, [dropdownItems, value]),
-      allChecked = _useMemo[0],
-      indeterminate = _useMemo[1];
+      showAllChecked = _useMemo[0],
+      showIndeterminate = _useMemo[1];
 
   var valueLatestRef = useLatest.useLatestRef(value);
-  var toggleCheckAll = React.useCallback(function (showChecked) {
-    var value = valueLatestRef.current; // 当前页的数据选项
+  var toggleCheckAll = React.useCallback(function () {
+    var value = valueLatestRef.current;
 
-    var items = dropdownItems.filter(function (item) {
-      return !('groupTitle' in item);
-    });
-    var targetIds = items.map(function (_ref2) {
-      var id = _ref2.id;
+    var _getAllCheckedStatus = index.getAllCheckedStatus(dropdownItems, value, index.isCheckableOption),
+        currentAllChecked = _getAllCheckedStatus[0];
+
+    var shouldChecked = !currentAllChecked; // 当前页的数据选项
+
+    var items = dropdownItems.filter(index.isCheckableOption);
+    var targetIds = items.map(function (_ref) {
+      var id = _ref.id;
       return id;
     });
     var allData = arrayUtils.uniqBy(items.concat(mergedData), 'id');
 
-    if (showChecked) {
+    if (shouldChecked) {
       var nextCheckedIds = Array.from(new Set(value.concat(targetIds)));
       var changedIds = nextCheckedIds.filter(function (id) {
         return !value.includes(id);
       });
-      var changedItems = allData.filter(function (_ref3) {
-        var id = _ref3.id;
+      var changedItems = allData.filter(function (_ref2) {
+        var id = _ref2.id;
         return changedIds.includes(id);
       });
-      tryChangeValue(nextCheckedIds, changedItems, showChecked);
+      tryChangeValue(nextCheckedIds, changedItems, shouldChecked);
     } else {
       var _nextCheckedIds = value.filter(function (id) {
         return !targetIds.includes(id);
@@ -270,13 +259,13 @@ var CheckSelect = /*#__PURE__*/React.forwardRef(function (_a, ref) {
         return !_nextCheckedIds.includes(id);
       });
 
-      var _changedItems = allData.filter(function (_ref4) {
-        var id = _ref4.id;
+      var _changedItems = allData.filter(function (_ref3) {
+        var id = _ref3.id;
         return _changedIds.includes(id);
       }); // items
 
 
-      tryChangeValue(_nextCheckedIds, _changedItems, showChecked);
+      tryChangeValue(_nextCheckedIds, _changedItems, shouldChecked);
     }
   }, [dropdownItems, mergedData, valueLatestRef, tryChangeValue]);
 
@@ -285,11 +274,9 @@ var CheckSelect = /*#__PURE__*/React.forwardRef(function (_a, ref) {
 
     if (showCheckAll) {
       return /*#__PURE__*/React__default["default"].createElement(React__default["default"].Fragment, null, /*#__PURE__*/React__default["default"].createElement(Checkbox__default["default"], {
-        indeterminate: indeterminate,
-        checked: allChecked,
-        onChange: function onChange(evt) {
-          toggleCheckAll(evt.target.checked);
-        }
+        indeterminate: showIndeterminate,
+        checked: showAllChecked,
+        onChange: toggleCheckAll
       }, i18n.get('checkSelect.checkAll')), extra);
     }
 
@@ -489,7 +476,7 @@ if (env.__DEV__) {
 
 
 var renderIndent = function renderIndent(prefixCls, depth) {
-  return times.times(depth, function (index) {
+  return arrayUtils.times(depth, function (index) {
     return /*#__PURE__*/React__default["default"].createElement("span", {
       key: index,
       style: {

package/lib/cjs/utils/index.js

@@ -0,0 +1,52 @@
+/** @LICENSE
+ * @hi-ui/check-select
+ * https://github.com/XiaoMi/hiui/tree/master/packages/ui/check-select#readme
+ *
+ * Copyright (c) HIUI <mi-hiui@xiaomi.com>.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+'use strict';
+
+Object.defineProperty(exports, '__esModule', {
+  value: true
+});
+/**
+ * 判断选项是否进行可选操作
+ */
+
+var isCheckableOption = function isCheckableOption(item) {
+  if ('groupTitle' in item) return false;
+  if (item.disabled) return false;
+  return true;
+};
+/**
+ * 判断选项为
+ */
+
+
+var isOption = function isOption(item) {
+  if ('groupTitle' in item) return false;
+  return true;
+};
+
+var getAllCheckedStatus = function getAllCheckedStatus(dropdownItems, values, filterFunc) {
+  var dropdownIds = dropdownItems.filter(filterFunc).map(function (_ref) {
+    var id = _ref.id;
+    return id;
+  });
+  var dropdownIdsSet = new Set(dropdownIds);
+  var hasValue = false;
+  values.forEach(function (id) {
+    if (dropdownIdsSet.has(id)) {
+      hasValue = true;
+      dropdownIdsSet["delete"](id);
+    }
+  });
+  return [hasValue && dropdownIdsSet.size === 0, hasValue && dropdownIdsSet.size > 0];
+};
+
+exports.getAllCheckedStatus = getAllCheckedStatus;
+exports.isCheckableOption = isCheckableOption;
+exports.isOption = isOption;

package/lib/esm/CheckSelect.js

@@ -20,15 +20,15 @@ import { TagInputMock } from '@hi-ui/tag-input';
 import { isUndef, isFunction, isArrayNonEmpty } from '@hi-ui/type-assertion';
 import VirtualList, { useCheckInVirtual } from '@hi-ui/virtual-list';
 import { Picker } from '@hi-ui/picker';
-import { uniqBy } from '@hi-ui/array-utils';
+import { uniqBy, times } from '@hi-ui/array-utils';
 import { Highlighter } from '@hi-ui/highlighter';
 import { useUncontrolledToggle } from '@hi-ui/use-toggle';
-import { times } from '@hi-ui/times';
 import { callAllFuncs } from '@hi-ui/func-utils';
 import { useLocaleContext } from '@hi-ui/locale-context';
 import { useAsyncSearch, useTreeCustomSearch, useFilterSearch, useSearchMode } from '@hi-ui/use-search-mode';
 import '@hi-ui/use-children';
 import { flattenData } from './hooks/use-flatten-data.js';
+import { getAllCheckedStatus, isCheckableOption, isOption } from './utils/index.js';
 var _role = 'check-select';
 
 var _prefix = getPrefixCls(_role);
@@ -177,48 +177,37 @@ var CheckSelect = /*#__PURE__*/forwardRef(function (_a, ref) {
   var activeExpandable = showOnlyShowChecked && !!filterItems && menuVisible;
 
   var _useMemo = useMemo(function () {
-    var dropdownIds = dropdownItems.filter(function (item) {
-      return !('groupTitle' in item);
-    }).map(function (_ref) {
-      var id = _ref.id;
-      return id;
-    });
-    var dropdownIdsSet = new Set(dropdownIds);
-    var hasValue = false;
-    value.forEach(function (id) {
-      if (dropdownIdsSet.has(id)) {
-        hasValue = true;
-        dropdownIdsSet["delete"](id);
-      }
-    });
-    return [hasValue && dropdownIdsSet.size === 0, hasValue && dropdownIdsSet.size > 0];
+    return getAllCheckedStatus(dropdownItems, value, isOption);
   }, [dropdownItems, value]),
-      allChecked = _useMemo[0],
-      indeterminate = _useMemo[1];
+      showAllChecked = _useMemo[0],
+      showIndeterminate = _useMemo[1];
 
   var valueLatestRef = useLatestRef(value);
-  var toggleCheckAll = useCallback(function (showChecked) {
-    var value = valueLatestRef.current; // 当前页的数据选项
+  var toggleCheckAll = useCallback(function () {
+    var value = valueLatestRef.current;
 
-    var items = dropdownItems.filter(function (item) {
-      return !('groupTitle' in item);
-    });
-    var targetIds = items.map(function (_ref2) {
-      var id = _ref2.id;
+    var _getAllCheckedStatus = getAllCheckedStatus(dropdownItems, value, isCheckableOption),
+        currentAllChecked = _getAllCheckedStatus[0];
+
+    var shouldChecked = !currentAllChecked; // 当前页的数据选项
+
+    var items = dropdownItems.filter(isCheckableOption);
+    var targetIds = items.map(function (_ref) {
+      var id = _ref.id;
       return id;
     });
     var allData = uniqBy(items.concat(mergedData), 'id');
 
-    if (showChecked) {
+    if (shouldChecked) {
       var nextCheckedIds = Array.from(new Set(value.concat(targetIds)));
       var changedIds = nextCheckedIds.filter(function (id) {
         return !value.includes(id);
       });
-      var changedItems = allData.filter(function (_ref3) {
-        var id = _ref3.id;
+      var changedItems = allData.filter(function (_ref2) {
+        var id = _ref2.id;
         return changedIds.includes(id);
       });
-      tryChangeValue(nextCheckedIds, changedItems, showChecked);
+      tryChangeValue(nextCheckedIds, changedItems, shouldChecked);
     } else {
       var _nextCheckedIds = value.filter(function (id) {
         return !targetIds.includes(id);
@@ -228,13 +217,13 @@ var CheckSelect = /*#__PURE__*/forwardRef(function (_a, ref) {
         return !_nextCheckedIds.includes(id);
       });
 
-      var _changedItems = allData.filter(function (_ref4) {
-        var id = _ref4.id;
+      var _changedItems = allData.filter(function (_ref3) {
+        var id = _ref3.id;
         return _changedIds.includes(id);
       }); // items
 
 
-      tryChangeValue(_nextCheckedIds, _changedItems, showChecked);
+      tryChangeValue(_nextCheckedIds, _changedItems, shouldChecked);
     }
   }, [dropdownItems, mergedData, valueLatestRef, tryChangeValue]);
 
@@ -243,11 +232,9 @@ var CheckSelect = /*#__PURE__*/forwardRef(function (_a, ref) {
 
     if (showCheckAll) {
       return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Checkbox, {
-        indeterminate: indeterminate,
-        checked: allChecked,
-        onChange: function onChange(evt) {
-          toggleCheckAll(evt.target.checked);
-        }
+        indeterminate: showIndeterminate,
+        checked: showAllChecked,
+        onChange: toggleCheckAll
       }, i18n.get('checkSelect.checkAll')), extra);
     }
 

package/lib/esm/utils/index.js

@@ -0,0 +1,45 @@
+/** @LICENSE
+ * @hi-ui/check-select
+ * https://github.com/XiaoMi/hiui/tree/master/packages/ui/check-select#readme
+ *
+ * Copyright (c) HIUI <mi-hiui@xiaomi.com>.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+/**
+ * 判断选项是否进行可选操作
+ */
+var isCheckableOption = function isCheckableOption(item) {
+  if ('groupTitle' in item) return false;
+  if (item.disabled) return false;
+  return true;
+};
+/**
+ * 判断选项为
+ */
+
+
+var isOption = function isOption(item) {
+  if ('groupTitle' in item) return false;
+  return true;
+};
+
+var getAllCheckedStatus = function getAllCheckedStatus(dropdownItems, values, filterFunc) {
+  var dropdownIds = dropdownItems.filter(filterFunc).map(function (_ref) {
+    var id = _ref.id;
+    return id;
+  });
+  var dropdownIdsSet = new Set(dropdownIds);
+  var hasValue = false;
+  values.forEach(function (id) {
+    if (dropdownIdsSet.has(id)) {
+      hasValue = true;
+      dropdownIdsSet["delete"](id);
+    }
+  });
+  return [hasValue && dropdownIdsSet.size === 0, hasValue && dropdownIdsSet.size > 0];
+};
+
+export { getAllCheckedStatus, isCheckableOption, isOption };

package/lib/types/CheckSelect.d.ts

@@ -90,7 +90,7 @@ export interface CheckSelectProps extends Omit<PickerProps, 'trigger' | 'scrolla
      */
     onClose?: () => void;
     /**
-     * 是否开启全选功能
+     * 是否开启全选功能，需要对数据全量操作。异步数据场景暂不支持，可自行渲染弹层底部实现
      */
     showCheckAll?: boolean;
     /**

package/lib/types/utils/index.d.ts

@@ -0,0 +1,10 @@
+import React from 'react';
+/**
+ * 判断选项是否进行可选操作
+ */
+export declare const isCheckableOption: (item: any) => boolean;
+/**
+ * 判断选项为
+ */
+export declare const isOption: (item: any) => boolean;
+export declare const getAllCheckedStatus: (dropdownItems: any[], values: React.ReactText[], filterFunc: (item: any) => boolean) => boolean[];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hi-ui/check-select",
-  "version": "4.0.0-beta.46",
+  "version": "4.0.0-beta.49",
   "description": "A sub-package for @hi-ui/hiui.",
   "keywords": [],
   "author": "HIUI <mi-hiui@xiaomi.com>",
@@ -54,7 +54,7 @@
     "@hi-ui/icons": "^4.0.0-beta.14",
     "@hi-ui/input": "^4.0.0-beta.21",
     "@hi-ui/locale-context": "^4.0.0-beta.19",
-    "@hi-ui/picker": "^4.0.0-beta.35",
+    "@hi-ui/picker": "^4.0.0-beta.36",
     "@hi-ui/popper": "^4.0.0-beta.19",
     "@hi-ui/tag-input": "^4.0.0-beta.23",
     "@hi-ui/times": "^4.0.0-beta.6",
@@ -64,7 +64,7 @@
     "@hi-ui/use-children": "^4.0.0-beta.5",
     "@hi-ui/use-data-source": "^4.0.0-beta.6",
     "@hi-ui/use-latest": "^4.0.0-beta.5",
-    "@hi-ui/use-search-mode": "^4.0.0-beta.26",
+    "@hi-ui/use-search-mode": "^4.0.0-beta.27",
     "@hi-ui/use-toggle": "^4.0.0-beta.5",
     "@hi-ui/use-uncontrolled-state": "^4.0.0-beta.5",
     "@hi-ui/virtual-list": "^4.0.0-beta.1"
@@ -78,5 +78,5 @@
     "react": "^17.0.1",
     "react-dom": "^17.0.1"
   },
-  "gitHead": "4ac0806c9a05137fe6a6efbc46c99415737cbd92"
+  "gitHead": "346438168b2b334e22d4de3f302f6d9bbddccfe8"
 }