@chaoswise/ui 2.5.0 → 2.5.1

package/lib/CWCascader/rc-cascader/Cascader.js

@@ -12,9 +12,9 @@ function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" !=
 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 { BaseSelect } from "rc-cascader/node_modules/rc-select";
-import useId from "rc-cascader/node_modules/rc-select/lib/hooks/useId";
-import { conductCheck } from "rc-cascader/node_modules/rc-tree/lib/utils/conductUtil";
+import { BaseSelect } from "rc-select-cascader";
+import useId from "rc-select-cascader/lib/hooks/useId";
+import { conductCheck } from "rc-tree-cascader/lib/utils/conductUtil";
 import useMergedState from "rc-util/lib/hooks/useMergedState";
 import * as React from "react";
 import CascaderContext from "./context";

package/lib/CWCascader/rc-cascader/OptionList/index.js

@@ -17,7 +17,7 @@ function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" !=
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 /* eslint-disable default-case */
 import classNames from 'classnames';
-import { useBaseProps } from 'rc-cascader/node_modules/rc-select';
+import { useBaseProps } from 'rc-select-cascader';
 import * as React from 'react';
 import CascaderContext from '../context';
 import { getFullPathKeys, isLeaf, scrollIntoParentView, toPathKey, toPathKeys, toPathValueStr } from '../utils/commonUtil';

package/lib/CWCascader/rc-cascader/OptionList/useActive.js

@@ -6,7 +6,7 @@ function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" !=
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import * as React from 'react';
 import CascaderContext from '../context';
-import { useBaseProps } from 'rc-cascader/node_modules/rc-select';
+import { useBaseProps } from 'rc-select-cascader';
 /**
  * Control the active open options path.
  */

package/lib/CWCascader/rc-cascader/OptionList/useKeyboard.js

@@ -8,7 +8,7 @@ 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; }
-import { useBaseProps } from 'rc-cascader/node_modules/rc-select';
+import { useBaseProps } from 'rc-select-cascader';
 import KeyCode from 'rc-util/lib/KeyCode';
 import * as React from 'react';
 import { SEARCH_MARK } from '../hooks/useSearchOptions';

package/lib/CWCascader/rc-cascader/hooks/useEntities.js

@@ -5,7 +5,7 @@ function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key i
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 import * as React from 'react';
-import { convertDataToEntities } from 'rc-cascader/node_modules/rc-tree/lib/utils/treeUtil';
+import { convertDataToEntities } from 'rc-tree-cascader/lib/utils/treeUtil';
 import { VALUE_SPLIT } from '../utils/commonUtil';
 /** Lazy parse options data into conduct-able info to avoid perf issue in single mode */
 export default (function (options, fieldNames) {

package/lib/CWTree/index.js

@@ -9,7 +9,7 @@ import _useLocale2 from "@chaoswise/ui/lib/useLocale";
 import _Menu from "@chaoswise/ui/lib/Menu";
 import "antd/es/tree/style";
 import _Tree from "antd/es/tree";
-var _excluded = ["children", "treeData", "menuData", "extendType", "onClickMenu", "menuStyle", "menuRender", "extraFooter", "tooltipPlacement", "searchValue", "multiple", "selectedKeys", "defaultSelectedKeys", "onSelect", "searchHighlight", "draggable", "isDrawer", "searchHighlightStyle", "className", "caseSensitive", "onExpand", "renderItem"],
+var _excluded = ["children", "treeData", "menuData", "extendType", "onClickMenu", "menuStyle", "menuRender", "extraFooter", "tooltipPlacement", "searchValue", "multiple", "selectedKeys", "defaultSelectedKeys", "onSelect", "searchHighlight", "draggable", "isDrawer", "searchHighlightStyle", "className", "caseSensitive", "onExpand", "renderItem", "useTooltipText"],
   _excluded2 = ["icon", "title", "key", "children"];
 function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
 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; }
@@ -77,6 +77,8 @@ function CWTree(_ref) {
     _ref$onExpand = _ref.onExpand,
     onExpand = _ref$onExpand === void 0 ? function () {} : _ref$onExpand,
     renderItem = _ref.renderItem,
+    _ref$useTooltipText = _ref.useTooltipText,
+    useTooltipText = _ref$useTooltipText === void 0 ? true : _ref$useTooltipText,
     rest = _objectWithoutProperties(_ref, _excluded);
   var _useState = useState(""),
     _useState2 = _slicedToArray(_useState, 2),
@@ -120,6 +122,9 @@ function CWTree(_ref) {
     if (!treeData) {
       return [];
     }
+    if (!searchHighlight) {
+      return treeData;
+    }
     return createTree(treeData, searchValue, caseSensitive, rest.checkable);
   }, [searchHighlight, treeData, searchValue, rest.checkable, caseSensitive]);
   function buildMenu(array) {
@@ -195,9 +200,9 @@ function CWTree(_ref) {
       className: "cw-tree-treenode-content"
     }, /*#__PURE__*/React.createElement("span", {
       className: "cw-tree-treenode-title"
-    }, /*#__PURE__*/React.createElement(_TooltipText, {
+    }, useTooltipText ? /*#__PURE__*/React.createElement(_TooltipText, {
       placement: tooltipPlacement ? tooltipPlacement : "bottomLeft"
-    }, title)), isDrawer && draggable && _showExtend === key && /*#__PURE__*/React.createElement("span", {
+    }, title) : title), isDrawer && draggable && _showExtend === key && /*#__PURE__*/React.createElement("span", {
       className: classnames("cw-tree-treenode-drag-icon")
     }, /*#__PURE__*/React.createElement(_Tooltip, {
       title: formatMessage(localeObj["dragMove"])
@@ -251,10 +256,10 @@ function CWTree(_ref) {
           className: "cw-tree-treenode-content"
         }, /*#__PURE__*/React.createElement("span", {
           className: "cw-tree-treenode-title"
-        }, /*#__PURE__*/React.createElement(_TooltipText, {
+        }, useTooltipText ? /*#__PURE__*/React.createElement(_TooltipText, {
           title: title,
           placement: "top"
-        }, _title))),
+        }, _title) : _title)),
         originTitle: title,
         key: key
       }, props), children && creatTreeNode(children));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@chaoswise/ui",
-  "version": "2.5.0",
+  "version": "2.5.1",
   "description": "公共UI库",
   "keywords": [
     "ui",
@@ -92,10 +92,13 @@
     "rc-cascader": "~3.9.0",
     "rc-field-form": "~1.27.0",
     "rc-input-number": "~7.3.0",
+    "rc-menu": "7.5.5",
     "rc-notification": "^4.5.7",
     "rc-picker": "^2.6.4",
     "rc-select": "^10.2.4",
+    "rc-select-cascader": "npm:rc-select@14.3.0",
     "rc-tabs": "^11.10.0",
+    "rc-tree-cascader": "npm:rc-tree@5.7.12",
     "rc-util": "^5.20.0",
     "re-resizable": "^6.9.0",
     "react-color": "^2.19.3",
@@ -143,5 +146,5 @@
     "access": "public"
   },
   "license": "MIT",
-  "gitHead": "d1215d76087f2e8ca67c04cfea1a51bee345b753"
+  "gitHead": "b52b5ea8738191c4df4dcbee8350cc769ea79259"
 }