one-design-next 0.0.9 → 0.0.10

package/dist/cascader/index.d.ts

@@ -44,12 +44,8 @@ export interface BaseCascaderProps extends Omit<RcCascaderProps<DefaultOptionTyp
     separator?: string;
     /** 自定义下拉列表中每一项的渲染（rc-cascader 原生支持） */
     optionRender?: (option: DefaultOptionType) => React.ReactNode;
-    /**
-     * 点击非叶节点内容区域时的行为
-     * - `true`：选中非叶节点并关闭下拉
-     * - `'keep-open'`：选中非叶节点并触发 onChange，但保持下拉展开（子菜单继续展开）
-     */
-    changeOnSelect?: boolean | 'keep-open';
+    /** 点击非叶节点内容区域时也触发 onChange（下拉保持展开，子菜单继续展开） */
+    changeOnSelect?: boolean;
 }
 export type CascaderProps<V = (string | number)[] | null> = BaseCascaderProps & {
     mode?: 'single' | 'multiple';

package/dist/cascader/index.js

@@ -3,11 +3,10 @@ function _extends() { _extends = Object.assign ? Object.assign.bind() : function
 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); }
 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 _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 _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function (_e) { function e(_x) { return _e.apply(this, arguments); } e.toString = function () { return _e.toString(); }; return e; }(function (e) { throw e; }), f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function (_e2) { function e(_x2) { return _e2.apply(this, arguments); } e.toString = function () { return _e2.toString(); }; return e; }(function (e) { didErr = true; err = e; }), f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
 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); }
 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 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; }
@@ -90,41 +89,6 @@ function CascaderInner(_ref) {
   var processedOptions = React.useMemo(function () {
     return processOptions(options, mergedFieldNames, optionPopoverProps);
   }, [options, mergedFieldNames, optionPopoverProps]);
-
-  // 根据完整路径从 processedOptions 中查找对应的 option 对象
-  var resolvePathOptions = React.useCallback(function (fullPath) {
-    var result = [];
-    var currentOptions = processedOptions;
-    var vField = mergedFieldNames.value || 'value';
-    var cField = mergedFieldNames.children || 'children';
-    var _iterator = _createForOfIteratorHelper(fullPath),
-      _step;
-    try {
-      var _loop = function _loop() {
-          var val = _step.value;
-          if (!currentOptions) return 0; // break
-          var found = currentOptions.find(function (opt) {
-            return opt[vField] === val;
-          });
-          if (found) {
-            result.push(found);
-            currentOptions = found[cField];
-          } else {
-            return 0; // break
-          }
-        },
-        _ret;
-      for (_iterator.s(); !(_step = _iterator.n()).done;) {
-        _ret = _loop();
-        if (_ret === 0) break;
-      }
-    } catch (err) {
-      _iterator.e(err);
-    } finally {
-      _iterator.f();
-    }
-    return result;
-  }, [processedOptions, mergedFieldNames]);
   var prefixCls = 'odn-select';
   var _useIcons = useIcons(_objectSpread(_objectSpread({}, restProps), {}, {
       hasFeedback: false,
@@ -211,70 +175,6 @@ function CascaderInner(_ref) {
     }
   };
 
-  // 单选模式下 pathKey → 带类型的 fullPath 映射，用于事件委托时还原路径
-  var pathKeyMap = React.useMemo(function () {
-    if (mode !== 'single') return null;
-    var SPLIT = '__RC_CASCADER_SPLIT__';
-    var map = new Map();
-    var traverse = function traverse(opts) {
-      if (!opts) return;
-      var _iterator2 = _createForOfIteratorHelper(opts),
-        _step2;
-      try {
-        for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
-          var opt = _step2.value;
-          var fullPath = opt.__fullPath__;
-          if (fullPath) {
-            map.set(fullPath.join(SPLIT), fullPath);
-          }
-          var cField = mergedFieldNames.children || 'children';
-          var children = opt[cField];
-          if (children && Array.isArray(children)) traverse(children);
-        }
-      } catch (err) {
-        _iterator2.e(err);
-      } finally {
-        _iterator2.f();
-      }
-    };
-    traverse(processedOptions);
-    return map;
-  }, [mode, processedOptions, mergedFieldNames]);
-
-  // 单选模式下：通过 onClickCapture 在 dropdown 层面拦截点击
-  // 点击展开图标区域 → 放行，由 rc-cascader 处理展开
-  // 点击其他区域（内容 / padding） → 拦截，手动选中 + 关闭
-  var handleSingleSelectCapture = React.useCallback(function (e) {
-    if (!pathKeyMap) return;
-    var target = e.target;
-    var expandIcon = target.closest('.odn-cascader-menu-item-expand-icon');
-    var menuItem = target.closest('.odn-cascader-menu-item');
-    if (!menuItem || expandIcon) return;
-    if (menuItem.classList.contains('odn-cascader-menu-item-disabled')) return;
-    if (menuItem.getAttribute('title') === 'divider') return;
-    var pathKey = menuItem.getAttribute('data-path-key');
-    if (!pathKey) return;
-    var fullPath = pathKeyMap.get(pathKey);
-    if (!fullPath) return;
-    var pathOptions = resolvePathOptions(fullPath);
-    var lastOption = pathOptions[pathOptions.length - 1];
-    if (!lastOption) return;
-    var cField = mergedFieldNames.children || 'children';
-    var hasChildren = lastOption[cField] && Array.isArray(lastOption[cField]) && lastOption[cField].length > 0;
-
-    // 非叶节点仅在 changeOnSelect 时才可点击选中
-    if (hasChildren && !changeOnSelectProp) return;
-
-    // keep-open：触发 onChange 但不关闭下拉，让 rc-cascader 继续展开子菜单
-    if (hasChildren && changeOnSelectProp === 'keep-open') {
-      handleChange(fullPath, pathOptions, e);
-      return;
-    }
-    e.stopPropagation();
-    handleChange(fullPath, pathOptions, e);
-    handleVisibleChange(false);
-  }, [pathKeyMap, mergedFieldNames, changeOnSelectProp, resolvePathOptions, handleChange, handleVisibleChange]);
-
   // 转换 value 类型以兼容 rc-cascader
   var rcValue = value === null ? undefined : value;
   var rcDefaultValue = defaultValue === null ? undefined : defaultValue;
@@ -371,49 +271,34 @@ function CascaderInner(_ref) {
     },
     dropdownMatchSelectWidth: dropdownMatchSelectWidth,
     optionRender: optionRenderProp,
-    // 单选模式不传 changeOnSelect 给 rc-cascader，
-    // 使展开图标点击时 isSelectable 对非叶节点返回 false，只触发展开
-    changeOnSelect: mode === 'single' ? false : !!changeOnSelectProp
+    changeOnSelect: !!changeOnSelectProp
   });
-  var dropdownRender = React.useMemo(function () {
-    var searchRenderFn = showInnerSearch ? function (menu) {
-      var searchNode = /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("div", {
-        className: "odn-select-dropdown-search"
-      }, /*#__PURE__*/React.createElement(Icon, {
-        name: "search",
-        className: "odn-select-dropdown-search-icon"
-      }), /*#__PURE__*/React.createElement("input", {
-        ref: dropdownSearchInputRef,
-        className: "odn-select-dropdown-search-input",
-        placeholder: "\u8BF7\u8F93\u5165",
-        value: searchValue,
-        onChange: function onChange(e) {
-          var value = e.target.value;
-          if (searchValueProp === undefined) {
-            setSearchValue(value);
-          }
-          if (_onSearch) {
-            _onSearch(value);
-          }
-        },
-        onKeyDown: function onKeyDown(e) {
-          e.stopPropagation();
+  var dropdownRender = showInnerSearch ? function (menu) {
+    var searchNode = /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("div", {
+      className: "odn-select-dropdown-search"
+    }, /*#__PURE__*/React.createElement(Icon, {
+      name: "search",
+      className: "odn-select-dropdown-search-icon"
+    }), /*#__PURE__*/React.createElement("input", {
+      ref: dropdownSearchInputRef,
+      className: "odn-select-dropdown-search-input",
+      placeholder: "\u8BF7\u8F93\u5165",
+      value: searchValue,
+      onChange: function onChange(e) {
+        var value = e.target.value;
+        if (searchValueProp === undefined) {
+          setSearchValue(value);
         }
-      })));
-      return /*#__PURE__*/React.createElement(React.Fragment, null, searchNode, menu);
-    } : undefined;
-
-    // 单选模式：在 dropdown 层面用 onClickCapture 拦截内容区域点击
-    if (mode === 'single') {
-      return function (menu) {
-        var rendered = searchRenderFn ? searchRenderFn(menu) : menu;
-        return /*#__PURE__*/React.createElement("div", {
-          onClickCapture: handleSingleSelectCapture
-        }, rendered);
-      };
-    }
-    return searchRenderFn;
-  }, [showInnerSearch, searchValue, searchValueProp, _onSearch, mode, handleSingleSelectCapture]);
+        if (_onSearch) {
+          _onSearch(value);
+        }
+      },
+      onKeyDown: function onKeyDown(e) {
+        e.stopPropagation();
+      }
+    })));
+    return /*#__PURE__*/React.createElement(React.Fragment, null, searchNode, menu);
+  } : undefined;
   if (mode === 'multiple') {
     return /*#__PURE__*/React.createElement(RcCascader, _extends({}, commonProps, {
       value: rcValue,

package/dist/layout/huxuan-layout.js

@@ -210,16 +210,12 @@ function CollectionPanel() {
   })), /*#__PURE__*/React.createElement("div", {
     "data-odn-huxuan-layout-collection-footer": true
   }, /*#__PURE__*/React.createElement(Button, {
+    icon: "plus",
     style: {
       width: '100%',
       justifyContent: 'center'
     }
-  }, /*#__PURE__*/React.createElement(Icon, {
-    name: "plus",
-    style: {
-      marginRight: 4
-    }
-  }), "\u65B0\u5EFA\u8FBE\u4EBA\u540D\u5355")));
+  }, "\u65B0\u5EFA\u8FBE\u4EBA\u540D\u5355")));
 }
 
 /** 导航下拉面板：hover 触发 */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "one-design-next",
-  "version": "0.0.9",
+  "version": "0.0.10",
   "description": "One Design Next from TAD@tencent.com",
   "module": "dist/index.js",
   "types": "dist/index.d.ts",