@hi-ui/check-select 4.0.0-alpha.32 → 4.0.0-alpha.36

package/lib/esm/hooks/use-data.js

@@ -0,0 +1,94 @@
+/** @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.
+ */
+import { __rest } from 'tslib';
+import { useMemo, isValidElement } from 'react';
+import { toArray } from '@hi-ui/use-children';
+var NOOP_ARRAY = [];
+
+var useData = function useData(_ref) {
+  var data = _ref.data,
+      children = _ref.children;
+  return useMemo(function () {
+    var mergedData; // data 优先级大于内嵌式组合
+
+    if (Array.isArray(data)) {
+      mergedData = data;
+    } else if (children) {
+      mergedData = parseChildren(children);
+    }
+
+    return mergedData || NOOP_ARRAY;
+  }, [children, data]);
+};
+
+var parseChildren = function parseChildren(children) {
+  var data = [];
+  var list = toArray(children);
+  list.forEach(function (item) {
+    if (! /*#__PURE__*/isValidElement(item)) return;
+    if (!item.type) return;
+    var HiName = item.type.HiName;
+
+    switch (HiName) {
+      case 'CheckSelectOption':
+        var option = parseOption(item);
+        data.push(option);
+        break;
+
+      case 'CheckSelectOptionGroup':
+        var optGroup = parseOptionGroup(item);
+        data.push(optGroup);
+        break;
+    }
+  });
+  return data;
+};
+
+var parseOption = function parseOption(node) {
+  var _a = node.props,
+      value = _a.value,
+      children = _a.children,
+      disabled = _a.disabled,
+      rest = __rest(_a, ["value", "children", "disabled", "groupTitle"]);
+
+  var option = {
+    id: value,
+    title: children,
+    disabled: disabled,
+    // TODO:使用 Symbol 注入，避免 data 传入使用
+    rootProps: rest
+  };
+  return option;
+};
+
+var parseOptionGroup = function parseOptionGroup(node) {
+  var key = node.key,
+      _a = node.props,
+      groupId = _a.groupId,
+      label = _a.label,
+      children = _a.children,
+      rest = __rest(_a, ["groupId", "label", "children"]);
+
+  var optGroup = {
+    groupId: groupId !== null && groupId !== void 0 ? groupId : key,
+    groupTitle: label,
+    rootProps: rest,
+    children: []
+  };
+
+  if (children) {
+    optGroup.children = parseChildren(children);
+  }
+
+  return optGroup;
+};
+
+export { parseChildren, useData };
+//# sourceMappingURL=use-data.js.map

package/lib/esm/hooks/use-data.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"use-data.js","sources":["../../../src/hooks/use-data.ts"],"sourcesContent":[null],"names":["NOOP_ARRAY","useData","data","children","useMemo","mergedData","Array","isArray","parseChildren","list","toArray","forEach","item","isValidElement","type","HiName","option","parseOption","push","optGroup","parseOptionGroup","node","_a","value","disabled","rest","id","title","rootProps","key","groupId","label","groupTitle"],"mappings":";;;;;;;;;;;;AAIA,IAAMA,UAAU,GAAG,EAAnB;;IAEaC,OAAO,GAAG,SAAVA,OAAU,KAAA;MAAGC,YAAAA;MAAMC,gBAAAA;SACvBC,OAAO,CAAC;QACTC;;QAGAC,KAAK,CAACC,OAAND,CAAcJ,IAAdI,GAAqB;AACvBD,MAAAA,UAAU,GAAGH,IAAbG;AADF,WAEO,IAAIF,QAAJ,EAAc;AACnBE,MAAAA,UAAU,GAAGG,aAAa,CAACL,QAAD,CAA1BE;;;WAGKA,UAAU,IAAIL;AAVT,GAAA,EAWX,CAACG,QAAD,EAAWD,IAAX,CAXW;;;IAcHM,aAAa,GAAG,SAAhBA,aAAgB,CAACL,QAAD;MACrBD,IAAI,GAAG;MACPO,IAAI,GAAGC,OAAO,CAACP,QAAD;AAEpBM,EAAAA,IAAI,CAACE,OAALF,CAAa,UAACG,IAAD;QACP,eAACC,cAAc,CAACD,IAAD,GAAQ;QACvB,CAACA,IAAI,CAACE,MAAM;QAGNC,MADV,GAEIH,IAFJ,CACEE,IACEF,CADMG;;YAGFA;WACD;YACGC,MAAM,GAAGC,WAAW,CAACL,IAAD;AAC1BV,QAAAA,IAAI,CAACgB,IAALhB,CAAUc,MAAVd;;;WAEG;YACGiB,QAAQ,GAAGC,gBAAgB,CAACR,IAAD;AACjCV,QAAAA,IAAI,CAACgB,IAALhB,CAAUiB,QAAVjB;;;AAfN,GAAAO;SAoBOP;;;AAGT,IAAMe,WAAW,GAAG,SAAdA,WAAc,CAACI,IAAD;MAEhBC,KACED,IAAI;MADGE,KAAT,KAAA,CAASA;MAAOpB,QAAhB,KAAA,CAAgBA;MAAUqB,QAA1B,KAAA,CAA0BA;MAAyBC,IAAnD,cAAO,QAAA,YAAA,YAAA,cAAA;;MAGHT,MAAM,GAAG;AACbU,IAAAA,EAAE,EAAEH,KADS;AAEbI,IAAAA,KAAK,EAAExB,QAFM;AAGbqB,IAAAA,QAAQ,EAAEA,QAHG;;AAKbI,IAAAA,SAAS,EAAEH;AALE;SAQRT;AAbT,CAAA;;AAgBA,IAAMI,gBAAgB,GAAG,SAAnBA,gBAAmB,CAACC,IAAD;MAErBQ,GADI,GAGFR,IAHE,CACJQ;MACAP,EAFI,GAGFD,IAAI;MADGS,OAFL,KAAA,CAEKA;MAASC,KAFd,KAAA,CAEcA;MAAO5B,QAFrB,KAAA,CAEqBA;MAAasB,IAFlC,cAEG,UAAA,SAAA,YAAA;;MAGHN,QAAQ,GAAG;AACfW,IAAAA,OAAO,EAAEA,OAAO,SAAPA,IAAAA,OAAO,WAAPA,GAAAA,OAAAA,GAAWD,GADL;AAEfG,IAAAA,UAAU,EAAED,KAFG;AAGfH,IAAAA,SAAS,EAAEH,IAHI;AAIftB,IAAAA,QAAQ,EAAE;AAJK;;MAObA,UAAU;AACZgB,IAAAA,QAAQ,CAAChB,QAATgB,GAAoBX,aAAa,CAACL,QAAD,CAAjCgB;;;SAGKA;AAjBT,CAAA;;"}

package/lib/esm/hooks/use-flatten-data.js

@@ -0,0 +1,69 @@
+/** @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.
+ */
+import { useMemo } from 'react';
+import { baseFlattenTree } from '@hi-ui/tree-utils';
+var NOOP_ARRAY = [];
+var DEFAULT_FIELD_NAMES = {};
+
+var useFlattenData = function useFlattenData(_ref) {
+  var _ref$data = _ref.data,
+      data = _ref$data === void 0 ? NOOP_ARRAY : _ref$data,
+      _ref$fieldNames = _ref.fieldNames,
+      fieldNames = _ref$fieldNames === void 0 ? DEFAULT_FIELD_NAMES : _ref$fieldNames;
+  var flattedData = useMemo(function () {
+    return flattenData({
+      data: data,
+      fieldNames: fieldNames
+    });
+  }, [data, fieldNames]);
+  return flattedData;
+};
+
+var flattenData = function flattenData(_ref2) {
+  var _ref2$data = _ref2.data,
+      data = _ref2$data === void 0 ? NOOP_ARRAY : _ref2$data,
+      _ref2$fieldNames = _ref2.fieldNames,
+      fieldNames = _ref2$fieldNames === void 0 ? DEFAULT_FIELD_NAMES : _ref2$fieldNames; // 转换对象
+
+  var getKeyFields = function getKeyFields(node, key) {
+    return node[fieldNames[key] || key];
+  };
+
+  return baseFlattenTree({
+    tree: data,
+    childrenFieldName: function childrenFieldName(node) {
+      return getKeyFields(node, 'children');
+    },
+    transform: function transform(node) {
+      var _a; // 不对外暴露
+
+
+      delete node.parent;
+      var raw = node.raw;
+
+      if ('groupId' in raw) {
+        // 用于虚拟列表唯一 id
+        node.id = raw.groupId;
+        node.groupId = raw.groupId;
+        node.groupTitle = raw.groupTitle;
+      } else {
+        // 支持 fieldNames 转换
+        node.id = getKeyFields(raw, 'id');
+        node.title = getKeyFields(raw, 'title');
+        node.disabled = (_a = getKeyFields(raw, 'disabled')) !== null && _a !== void 0 ? _a : false;
+      }
+
+      return node;
+    }
+  });
+};
+
+export { flattenData, useFlattenData };
+//# sourceMappingURL=use-flatten-data.js.map

package/lib/esm/hooks/use-flatten-data.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"use-flatten-data.js","sources":["../../../src/hooks/use-flatten-data.ts"],"sourcesContent":[null],"names":["NOOP_ARRAY","DEFAULT_FIELD_NAMES","useFlattenData","data","fieldNames","flattedData","useMemo","flattenData","getKeyFields","node","key","baseFlattenTree","tree","childrenFieldName","transform","parent","raw","id","groupId","groupTitle","title","disabled"],"mappings":";;;;;;;;;;;AAIA,IAAMA,UAAU,GAAG,EAAnB;AACA,IAAMC,mBAAmB,GAAG,EAA5B;;IAEaC,cAAc,GAAG,SAAjBA,cAAiB,KAAA;uBAAGC;MAAAA,8BAAOH;6BAAYI;MAAAA,0CAAaH;MACzDI,WAAW,GAAGC,OAAO,CAAC;WACnBC,WAAW,CAAC;AAAEJ,MAAAA,IAAI,EAAJA,IAAF;AAAQC,MAAAA,UAAU,EAAVA;AAAR,KAAD;AADO,GAAA,EAExB,CAACD,IAAD,EAAOC,UAAP,CAFwB;SAIpBC;;;IAGIE,WAAW,GAAG,SAAdA,WAAc,MAAA;yBAAGJ;MAAAA,+BAAOH;+BAAYI;MAAAA,2CAAaH;;MAEtDO,YAAY,GAAG,SAAfA,YAAe,CAACC,IAAD,EAAYC,GAAZ;WAAyCD,IAAI,CAACL,UAAU,CAACM,GAAD,CAAVN,IAAmBM,GAApB;AAAlE;;SAEOC,eAAe,CAAC;AACrBC,IAAAA,IAAI,EAAET,IADe;AAErBU,IAAAA,iBAAiB,EAAE,0BAAA,CAACJ,IAAD;aAAUD,YAAY,CAACC,IAAD,EAAO,UAAP;AAFpB,KAAA;AAGrBK,IAAAA,SAAS,EAAE,kBAAA,CAACL,IAAD;;;;aAEFA,IAAI,CAACM;UAEJC,GAAR,GAAgBP,IAAhB,CAAQO;;UAEJ,aAAaA,KAAK;;AAEpBP,QAAAA,IAAI,CAACQ,EAALR,GAAUO,GAAG,CAACE,OAAdT;AACAA,QAAAA,IAAI,CAACS,OAALT,GAAeO,GAAG,CAACE,OAAnBT;AACAA,QAAAA,IAAI,CAACU,UAALV,GAAkBO,GAAG,CAACG,UAAtBV;AAJF,aAKO;;AAELA,QAAAA,IAAI,CAACQ,EAALR,GAAUD,YAAY,CAACQ,GAAD,EAAM,IAAN,CAAtBP;AACAA,QAAAA,IAAI,CAACW,KAALX,GAAaD,YAAY,CAACQ,GAAD,EAAM,OAAN,CAAzBP;AACAA,QAAAA,IAAI,CAACY,QAALZ,GAAgB,MAAAD,YAAY,CAACQ,GAAD,EAAM,UAAN,CAAZ,UAAA,iBAAA,KAAA,GAAiC,KAAjDP;;;aAEKA;;AApBY,GAAD;;;"}

package/lib/esm/use-check-select.js

@@ -8,15 +8,17 @@
  * LICENSE file in the root directory of this source tree.
  */
 import { __rest } from 'tslib';
-import React, { useMemo, useCallback } from 'react';
+import { useRef, useCallback } from 'react';
 import { useUncontrolledState } from '@hi-ui/use-uncontrolled-state';
+import { uniqBy } from 'lodash';
 import { useCheck } from '@hi-ui/use-check';
-import { useLatestCallback, useLatestRef } from '@hi-ui/use-latest';
-import { toArray } from '@hi-ui/use-children';
-import { flattenTree } from '@hi-ui/tree-utils';
+import { useLatestRef, useLatestCallback } from '@hi-ui/use-latest';
+import { useData } from './hooks/use-data.js';
+import { useFlattenData } from './hooks/use-flatten-data.js';
+import '@hi-ui/env';
+import '@hi-ui/type-assertion';
 var NOOP_ARRAY = [];
 var NOOP_VALUE = [];
-var DEFAULT_FIELD_NAMES = {};
 
 var useCheckSelect = function useCheckSelect(_a) {
   var _a$data = _a.data,
@@ -29,127 +31,51 @@ var useCheckSelect = function useCheckSelect(_a) {
       defaultValue = _a$defaultValue === void 0 ? NOOP_VALUE : _a$defaultValue,
       onChangeProp = _a.onChange,
       onSelect = _a.onSelect,
-      _a$emptyContent = _a.emptyContent,
-      emptyContent = _a$emptyContent === void 0 ? '无匹配选项' : _a$emptyContent,
-      _a$fieldNames = _a.fieldNames,
-      fieldNames = _a$fieldNames === void 0 ? DEFAULT_FIELD_NAMES : _a$fieldNames,
-      rest = __rest(_a, ["data", "children", "disabled", "value", "defaultValue", "onChange", "onSelect", "emptyContent", "searchPlaceholder", "filter", "fieldNames"]);
-
-  var data = useMemo(function () {
-    // @private
-    if (children) {
-      var dfs = function dfs(child) {
-        var arr = [];
-        var list = toArray(child);
-        list.forEach(function (item) {
-          if (! /*#__PURE__*/React.isValidElement(item)) return; // @ts-ignore
-
-          if (item.type.HiName === 'CheckSelectOption') {
-            var props = item.props;
-
-            var _value = props.value,
-                _children = props.children,
-                _disabled = props.disabled,
-                _rest = __rest(props, ["value", "children", "disabled", "groupTitle"]);
-
-            var option = {
-              id: _value,
-              title: _children,
-              disabled: _disabled,
-              rootProps: _rest
-            };
-            arr.push(option); // @ts-ignore
-          } else if (item.type.HiName === 'CheckSelectOptionGroup') {
-            var _props = item.props;
-
-            var groupId = _props.groupId,
-                label = _props.label,
-                _children2 = _props.children,
-                _rest2 = __rest(_props, ["groupId", "label", "children"]);
-
-            var optGroup = {
-              groupId: groupId,
-              groupTitle: label,
-              children: [],
-              rootProps: _rest2
-            }; // @ts-ignore
-
-            if (_children2) {
-              // @ts-ignore
-              optGroup.children = dfs(_children2);
-            }
-
-            arr.push(optGroup);
-          }
-        });
-        return arr;
-      };
-
-      return dfs(children);
-    }
-
-    return dataProp;
-  }, [children, dataProp]);
-  /**
-   * 转换对象
-   */
-
-  var getKeyFields = useCallback(function (node, key) {
-    return node[fieldNames[key] || key];
-  }, [fieldNames]);
-  var flattedData = useMemo(function () {
-    // @ts-ignore
-    return flattenTree(data, function (node) {
-      var _a;
-
-      if ('groupId' in node.raw) {
-        // @ts-ignore
-        node.id = node.raw.groupId; // @ts-ignore
-
-        node.groupTitle = node.raw.groupTitle; // @ts-ignore
-
-        node.groupId = node.raw.groupId;
-      } else {
-        // TODO：support children field map
-        node.id = getKeyFields(node.raw, 'id'); // @ts-ignore
-
-        node.title = getKeyFields(node.raw, 'title'); // @ts-ignore
-
-        node.disabled = (_a = getKeyFields(node.raw, 'disabled')) !== null && _a !== void 0 ? _a : false;
-      }
-
-      return node;
-    });
-  }, [data, getKeyFields]);
+      fieldNames = _a.fieldNames,
+      rest = __rest(_a, ["data", "children", "disabled", "value", "defaultValue", "onChange", "onSelect", "fieldNames"]);
+
+  var data = useData({
+    data: dataProp,
+    children: children
+  });
+  var flattedData = useFlattenData({
+    data: data,
+    fieldNames: fieldNames
+  });
+  var flattedDataRef = useLatestRef(flattedData);
 
   var _useUncontrolledState = useUncontrolledState(defaultValue, valueProp, onChangeProp),
       value = _useUncontrolledState[0],
       tryChangeValue = _useUncontrolledState[1];
 
   var onSelectLatest = useLatestCallback(onSelect);
-  var flattedDataRef = useLatestRef(flattedData);
+  var selectedItemsRef = useRef([]);
   var proxyTryChangeValue = useCallback(function (value, item, shouldChecked) {
-    // 调用用户的select
-    var checkedItems = flattedDataRef.current // 使用最新的value
-    .filter(function (item) {
-      return value.includes(item.id);
-    }).map(function (item) {
-      return item.raw;
-    });
     var changedItems = item;
 
     if (!Array.isArray(item)) {
       changedItems = [item];
+
+      if (shouldChecked) {
+        selectedItemsRef.current.push(item);
+      }
+
       onSelectLatest(value, item, shouldChecked);
     }
 
+    var selectedItems = uniqBy([].concat(changedItems, selectedItemsRef.current, flattedDataRef.current), 'id'); // 调用用户的select
+
+    var checkedItems = selectedItems // 使用最新的value
+    .filter(function (item) {
+      return value.includes(item.id);
+    }).map(function (item) {
+      return 'raw' in item ? item.raw : item;
+    });
     tryChangeValue(value, // TODO: 处理脏数据
     changedItems.map(function (item) {
       return 'raw' in item ? item.raw : item;
     }), checkedItems);
-  }, // deps-ignore: isCheckedId no changed
-  // eslint-disable-next-line react-hooks/exhaustive-deps
-  [tryChangeValue, onSelectLatest, flattedDataRef]);
+  }, [tryChangeValue, onSelectLatest, flattedDataRef, selectedItemsRef]);
 
   var _useCheckDefault = useCheck({
     disabled: disabled,
@@ -158,30 +84,16 @@ var useCheckSelect = function useCheckSelect(_a) {
     allowCheck: allowCheck
   }),
       onOptionCheck = _useCheckDefault[0],
-      isCheckedId = _useCheckDefault[1]; // const [inSearch, matchedItems, inputProps, isEmpty, resetSearch] = useSearch(data, filter)
-  // const getSearchInputProps = useCallback(
-  //   () => ({
-  //     placeholder: searchPlaceholder,
-  //     value: inputProps.value,
-  //     onChange: inputProps.onChange,
-  //   }),
-  //   [searchPlaceholder, inputProps]
-  // )
-
+      isCheckedId = _useCheckDefault[1];
 
   return {
     rootProps: rest,
-    // data: inSearch ? matchedItems : data,
     data: data,
     flattedData: flattedData,
     value: value,
     tryChangeValue: proxyTryChangeValue,
     onSelect: onOptionCheck,
-    isCheckedId: isCheckedId,
-    emptyContent: emptyContent // getSearchInputProps,
-    // isEmpty,
-    // resetSearch,
-
+    isCheckedId: isCheckedId
   };
 };
 

package/lib/esm/use-check-select.js.map

@@ -1 +1 @@
-{"version":3,"file":"use-check-select.js","sources":["../../src/use-check-select.ts"],"sourcesContent":[null],"names":["NOOP_ARRAY","NOOP_VALUE","DEFAULT_FIELD_NAMES","useCheckSelect","_a","data","dataProp","children","disabled","valueProp","value","defaultValue","onChangeProp","onChange","onSelect","emptyContent","fieldNames","rest","useMemo","dfs","child","arr","list","toArray","forEach","item","React","isValidElement","type","HiName","props","option","id","title","rootProps","push","groupId","label","optGroup","groupTitle","getKeyFields","useCallback","node","key","flattedData","flattenTree","raw","useUncontrolledState","tryChangeValue","onSelectLatest","useLatestCallback","flattedDataRef","useLatestRef","proxyTryChangeValue","shouldChecked","checkedItems","current","filter","includes","map","changedItems","Array","isArray","useCheckDefault","checkedIds","onCheck","allowCheck","onOptionCheck","isCheckedId"],"mappings":"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"}
+{"version":3,"file":"use-check-select.js","sources":["../../src/use-check-select.ts"],"sourcesContent":[null],"names":["NOOP_ARRAY","NOOP_VALUE","useCheckSelect","_a","data","dataProp","children","disabled","valueProp","value","defaultValue","onChangeProp","onChange","onSelect","fieldNames","rest","useData","flattedData","useFlattenData","flattedDataRef","useLatestRef","useUncontrolledState","tryChangeValue","onSelectLatest","useLatestCallback","selectedItemsRef","useRef","proxyTryChangeValue","useCallback","item","shouldChecked","changedItems","Array","isArray","current","push","selectedItems","uniqBy","checkedItems","filter","includes","id","map","raw","useCheckDefault","checkedIds","onCheck","allowCheck","onOptionCheck","isCheckedId","rootProps","option"],"mappings":";;;;;;;;;;;;;;;;;;;AASA,IAAMA,UAAU,GAAG,EAAnB;AACA,IAAMC,UAAU,GAAG,EAAnB;;IAEaC,cAAc,GAAG,SAAjBA,cAAiB,CAACC,EAAD;mBAC5BC;MAAMC,gCAAWL;MACjBM,cAAAA;uBACAC;MAAAA,oCAAW;MACJC,eAAPC;2BACAC;MAAAA,4CAAeT;MACLU,kBAAVC;MACAC,cAAAA;MACAC,gBAAAA;MACGC,kBAT0B,OAAA,YAAA,YAAA,SAAA,gBAAA,YAAA,YAAA,cAAA;;MAWvBX,IAAI,GAAGY,OAAO,CAAC;AAAEZ,IAAAA,IAAI,EAAEC,QAAR;AAAkBC,IAAAA,QAAQ,EAARA;AAAlB,GAAD;MACdW,WAAW,GAAGC,cAAc,CAAC;AAAEd,IAAAA,IAAI,EAAJA,IAAF;AAAQU,IAAAA,UAAU,EAAVA;AAAR,GAAD;MAC5BK,cAAc,GAAGC,YAAY,CAACH,WAAD;;8BAEHI,oBAAoB,CAACX,YAAD,EAAeF,SAAf,EAA0BG,YAA1B;MAA7CF,KAAP;MAAca,cAAd;;MAEMC,cAAc,GAAGC,iBAAiB,CAACX,QAAD;MAElCY,gBAAgB,GAAGC,MAAM,CAAQ,EAAR;MAEzBC,mBAAmB,GAAGC,WAAW,CACrC,UACEnB,KADF,EAEEoB,IAFF,EAGEC,aAHF;QAKMC,YAAY,GAAGF;;QAEf,CAACG,KAAK,CAACC,OAAND,CAAcH,IAAdG,GAAqB;AACxBD,MAAAA,YAAY,GAAG,CAACF,IAAD,CAAfE;;UAEID,eAAe;AACjBL,QAAAA,gBAAgB,CAACS,OAAjBT,CAAyBU,IAAzBV,CAA8BI,IAA9BJ;;;AAEFF,MAAAA,cAAc,CAACd,KAAD,EAAQoB,IAAR,EAAcC,aAAd,CAAdP;;;QAGIa,aAAa,GAAGC,MAAM,WACtBN,cAAiBN,gBAAgB,CAACS,SAAYf,cAAc,CAACe,QADvC,EAE1B,IAF0B;;QAMtBI,YAAY,GAAGF,aAAa;AAAA,KAE/BG,MAFkBH,CAEX,UAACP,IAAD;aAAUpB,KAAK,CAAC+B,QAAN/B,CAAeoB,IAAI,CAACY,EAApBhC;AAFC,KAAA2B,EAGlBM,GAHkBN,CAGd,UAACP,IAAD;aAAW,SAASA,IAAT,GAAgBA,IAAI,CAACc,GAArB,GAA2Bd;AAHxB,KAAAO;AAKrBd,IAAAA,cAAc,CACZb,KADY;AAGZsB,IAAAA,YAAY,CAACW,GAAbX,CAAiB,UAACF,IAAD;aAAW,SAASA,IAAT,GAAgBA,IAAI,CAACc,GAArB,GAA2Bd;AAAvD,KAAAE,CAHY,EAIZO,YAJY,CAAdhB;AA5BmC,GAAA,EAmCrC,CAACA,cAAD,EAAiBC,cAAjB,EAAiCJ,cAAjC,EAAiDM,gBAAjD,CAnCqC;;yBAsCFmB,QAAe,CAAC;AACnDrC,IAAAA,QAAQ,EAARA,QADmD;AAEnDsC,IAAAA,UAAU,EAAEpC,KAFuC;AAGnDqC,IAAAA,OAAO,EAAEnB,mBAH0C;AAInDoB,IAAAA,UAAU,EAAVA;AAJmD,GAAD;MAA7CC,aAAP;MAAsBC,WAAtB;;SAOO;AACLC,IAAAA,SAAS,EAAEnC,IADN;AAELX,IAAAA,IAAI,EAAJA,IAFK;AAGLa,IAAAA,WAAW,EAAXA,WAHK;AAILR,IAAAA,KAAK,EAALA,KAJK;AAKLa,IAAAA,cAAc,EAAEK,mBALX;AAMLd,IAAAA,QAAQ,EAAEmC,aANL;AAOLC,IAAAA,WAAW,EAAXA;AAPK;;;AA4DT,IAAMF,UAAU,GAAG,SAAbA,UAAa,CAACI,MAAD;SAAiB,CAACA,MAAM,CAAC5C;AAA5C,CAAA;;"}

package/lib/types/CheckSelect.d.ts

@@ -93,6 +93,14 @@ export interface CheckSelectProps extends Omit<PickerProps, 'trigger'>, UseCheck
      * 面板关闭时回调
      */
     onClose?: () => void;
+    /**
+     * 是否开启全选功能
+     */
+    showCheckAll?: boolean;
+    /**
+     * 是否开启查看仅已选功能
+     */
+    showOnlyShowChecked?: boolean;
 }
 /**
  * TODO: What is CheckSelectOption

package/lib/types/context.d.ts

@@ -1,27 +1,19 @@
 /// <reference types="react" />
 export declare const CheckSelectProvider: import("react").Provider<Omit<{
-    rootProps: {
-        displayRender?: ((option: import("./types").CheckSelectEventData) => import("react").ReactNode) | undefined;
-        placeholder?: string | undefined;
-    };
+    rootProps: {};
     data: any[];
     flattedData: import("packages/utils/tree-utils/lib/types/types").BaseFlattedTreeNodeData<any, any>[];
     value: import("react").ReactText[];
     tryChangeValue: (value: import("react").ReactText[], item: import("./types").CheckSelectEventData | import("./types").CheckSelectEventData[], shouldChecked: boolean) => void;
     onSelect: (targetItem: import("packages/hooks/use-check/lib/types").UseCheckItem, shouldChecked: boolean) => void;
     isCheckedId: (id: import("react").ReactText) => boolean;
-    emptyContent: boolean | import("react").ReactChild | import("react").ReactFragment | import("react").ReactPortal | null;
 }, "rootProps"> | null>;
 export declare const useCheckSelectContext: () => Omit<{
-    rootProps: {
-        displayRender?: ((option: import("./types").CheckSelectEventData) => import("react").ReactNode) | undefined;
-        placeholder?: string | undefined;
-    };
+    rootProps: {};
     data: any[];
     flattedData: import("packages/utils/tree-utils/lib/types/types").BaseFlattedTreeNodeData<any, any>[];
     value: import("react").ReactText[];
     tryChangeValue: (value: import("react").ReactText[], item: import("./types").CheckSelectEventData | import("./types").CheckSelectEventData[], shouldChecked: boolean) => void;
     onSelect: (targetItem: import("packages/hooks/use-check/lib/types").UseCheckItem, shouldChecked: boolean) => void;
     isCheckedId: (id: import("react").ReactText) => boolean;
-    emptyContent: boolean | import("react").ReactChild | import("react").ReactFragment | import("react").ReactPortal | null;
 }, "rootProps">;

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

@@ -1 +1,3 @@
+export * from './use-data';
+export * from './use-flatten-data';
 export * from './use-search';

package/lib/types/hooks/use-data.d.ts

@@ -0,0 +1,4 @@
+import React from 'react';
+import { CheckSelectMergedItem } from '../types';
+export declare const useData: ({ data, children }: any) => any[];
+export declare const parseChildren: (children: React.ReactNode) => CheckSelectMergedItem[];

package/lib/types/hooks/use-flatten-data.d.ts

@@ -0,0 +1,2 @@
+export declare const useFlattenData: ({ data, fieldNames }: any) => import("packages/utils/tree-utils/lib/types/types").BaseFlattedTreeNodeData<any, any>[];
+export declare const flattenData: ({ data, fieldNames }: any) => import("packages/utils/tree-utils/lib/types/types").BaseFlattedTreeNodeData<any, any>[];

package/lib/types/hooks/use-search.d.ts

@@ -1,9 +1,9 @@
 import React from 'react';
-import { CheckSelectItem } from '../types';
+import { CheckSelectMergedItem } from '../types';
 /**
  * 支持搜索功能的 hook
  */
-export declare const useSearch: (flattedData: CheckSelectItem[], filter?: ((keyword: string, option: CheckSelectItem) => boolean) | undefined) => readonly [boolean, CheckSelectItem[], {
+export declare const useSearch: (flattedData: CheckSelectMergedItem[], filter?: ((keyword: string, option: CheckSelectMergedItem) => boolean) | undefined) => readonly [boolean, CheckSelectMergedItem[], {
     value: string;
     onChange: (evt: React.ChangeEvent<HTMLInputElement>) => void;
 }, boolean, () => void];

package/lib/types/types.d.ts

@@ -3,7 +3,7 @@ export interface CheckSelectDataItem {
     /**
      * 节点唯一 id
      */
-    id: React.ReactText;
+    id?: React.ReactText;
     /**
      * 节点标题
      */
@@ -13,7 +13,7 @@ export interface CheckSelectDataItem {
      */
     disabled?: boolean;
 }
-export interface CheckSelectDataGroupItem {
+export interface CheckSelectGroupDataItem {
     /**
      * 节点组标题
      */
@@ -23,7 +23,7 @@ export interface CheckSelectDataGroupItem {
      */
     children?: CheckSelectDataItem[];
 }
-export declare type CheckSelectItem = CheckSelectDataItem & CheckSelectDataGroupItem;
+export declare type CheckSelectMergedItem = CheckSelectDataItem & CheckSelectGroupDataItem;
 export interface CheckSelectRequiredProps {
     checked: boolean;
     focused: boolean;

package/lib/types/use-check-select.d.ts

@@ -1,23 +1,14 @@
 import React from 'react';
 import { CheckSelectDataItem, CheckSelectEventData } from './types';
-export declare const useCheckSelect: ({ data: dataProp, children, disabled, value: valueProp, defaultValue, onChange: onChangeProp, onSelect, emptyContent, searchPlaceholder, filter, fieldNames, ...rest }: UseCheckSelectProps) => {
-    rootProps: {
-        /**
-         * 自定义选择后触发器所展示的内容，只在 title 为字符串时有效
-         */
-        displayRender?: ((option: CheckSelectEventData) => React.ReactNode) | undefined;
-        /**
-         * 触发器输入框占位符
-         */
-        placeholder?: string | undefined;
-    };
+import { HiBaseFieldNames } from '@hi-ui/core';
+export declare const useCheckSelect: ({ data: dataProp, children, disabled, value: valueProp, defaultValue, onChange: onChangeProp, onSelect, fieldNames, ...rest }: UseCheckSelectProps) => {
+    rootProps: {};
     data: any[];
     flattedData: import("packages/utils/tree-utils/lib/types/types").BaseFlattedTreeNodeData<any, any>[];
     value: React.ReactText[];
     tryChangeValue: (value: React.ReactText[], item: CheckSelectEventData | CheckSelectEventData[], shouldChecked: boolean) => void;
     onSelect: (targetItem: import("@hi-ui/use-check").UseCheckItem, shouldChecked: boolean) => void;
     isCheckedId: (id: React.ReactText) => boolean;
-    emptyContent: boolean | React.ReactChild | React.ReactFragment | React.ReactPortal | null;
 };
 export interface UseCheckSelectProps {
     /**
@@ -37,32 +28,13 @@ export interface UseCheckSelectProps {
     onChange?: (value: React.ReactText[], changedItems?: CheckSelectDataItem[], checkedItems?: CheckSelectDataItem[]) => void;
     /**
      * 选中值时回调
+     * @private
      */
     onSelect?: (value: React.ReactText[], targetOption: CheckSelectEventData, shouldChecked: boolean) => void;
     /**
      * 是否禁止使用
      */
     disabled?: boolean;
-    /**
-     * 设置选项为空时展示的内容
-     */
-    emptyContent?: React.ReactNode;
-    /**
-     * 自定义选择后触发器所展示的内容，只在 title 为字符串时有效
-     */
-    displayRender?: (option: CheckSelectEventData) => React.ReactNode;
-    /**
-     * 触发器输入框占位符
-     */
-    placeholder?: string;
-    /**
-     * 搜索输入框占位符
-     */
-    searchPlaceholder?: string;
-    /**
-     * 启用自定义过滤函数实现根据搜索框内容，自定义搜索
-     */
-    filter?: (keyword: string, option: CheckSelectEventData) => boolean;
     /**
      * 选项数据
      */
@@ -74,6 +46,6 @@ export interface UseCheckSelectProps {
     /**
      * 设置 data 中 id, title, disabled, children 对应的 key
      */
-    fieldNames?: Record<string, string>;
+    fieldNames?: HiBaseFieldNames;
 }
 export declare type UseSelectReturn = ReturnType<typeof useCheckSelect>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hi-ui/check-select",
-  "version": "4.0.0-alpha.32",
+  "version": "4.0.0-alpha.36",
   "description": "A sub-package for @hi-ui/hiui.",
   "keywords": [],
   "author": "HIUI <mi-hiui@xiaomi.com>",
@@ -43,28 +43,29 @@
     "url": "https://github.com/XiaoMi/hiui/issues"
   },
   "dependencies": {
-    "@hi-ui/checkbox": "^4.0.0-alpha.29",
+    "@hi-ui/checkbox": "^4.0.0-alpha.32",
     "@hi-ui/classname": "^4.0.0-alpha.3",
-    "@hi-ui/core": "^4.0.0-alpha.19",
-    "@hi-ui/core-css": "^4.0.0-alpha.13",
-    "@hi-ui/env": "^4.0.0-alpha.5",
-    "@hi-ui/func-utils": "^4.0.0-alpha.5",
-    "@hi-ui/highlighter": "^4.0.0-alpha.11",
-    "@hi-ui/icons": "^4.0.0-alpha.27",
-    "@hi-ui/input": "^4.0.0-alpha.32",
-    "@hi-ui/picker": "^4.0.0-alpha.16",
-    "@hi-ui/popper": "^4.0.0-alpha.23",
-    "@hi-ui/tag-input": "^4.0.0-alpha.23",
+    "@hi-ui/core": "^4.0.0-alpha.20",
+    "@hi-ui/core-css": "^4.0.0-alpha.14",
+    "@hi-ui/env": "^4.0.0-alpha.6",
+    "@hi-ui/func-utils": "^4.0.0-alpha.6",
+    "@hi-ui/highlighter": "^4.0.0-alpha.13",
+    "@hi-ui/icons": "^4.0.0-alpha.29",
+    "@hi-ui/input": "^4.0.0-alpha.34",
+    "@hi-ui/locale-context": "^4.0.0-alpha.19",
+    "@hi-ui/picker": "^4.0.0-alpha.19",
+    "@hi-ui/popper": "^4.0.0-alpha.25",
+    "@hi-ui/tag-input": "^4.0.0-alpha.25",
     "@hi-ui/times": "^4.0.0-alpha.4",
-    "@hi-ui/tree-utils": "^4.0.0-alpha.12",
-    "@hi-ui/type-assertion": "^4.0.0-alpha.13",
-    "@hi-ui/use-check": "^4.0.0-alpha.19",
+    "@hi-ui/tree-utils": "^4.0.0-alpha.13",
+    "@hi-ui/type-assertion": "^4.0.0-alpha.14",
+    "@hi-ui/use-check": "^4.0.0-alpha.21",
     "@hi-ui/use-children": "^4.0.0-alpha.4",
-    "@hi-ui/use-data-source": "^4.0.0-alpha.7",
+    "@hi-ui/use-data-source": "^4.0.0-alpha.8",
     "@hi-ui/use-latest": "^4.0.0-alpha.5",
-    "@hi-ui/use-search-mode": "^4.0.0-alpha.12",
-    "@hi-ui/use-toggle": "^4.0.0-alpha.11",
-    "@hi-ui/use-uncontrolled-state": "^4.0.0-alpha.13",
+    "@hi-ui/use-search-mode": "^4.0.0-alpha.16",
+    "@hi-ui/use-toggle": "^4.0.0-alpha.12",
+    "@hi-ui/use-uncontrolled-state": "^4.0.0-alpha.14",
     "lodash": "^4.17.21",
     "rc-virtual-list": "^3.4.1"
   },
@@ -77,5 +78,5 @@
     "react": "^17.0.1",
     "react-dom": "^17.0.1"
   },
-  "gitHead": "41a20321632beddf84d61d121f59ecb175a8d17e"
+  "gitHead": "420774ce836a4ead70f844c6f815b3cda0a0c7d4"
 }