@alicloud/console-components-search 0.2.36 → 0.2.37-alpha.1

package/es/ComplexSearch/InputPrefix.js

@@ -1,15 +1,16 @@
 import _extends from "@babel/runtime/helpers/esm/extends";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-var _excluded = ["defaultValue", "dataSource", "label"];
+var _excluded = ["defaultValue", "dataSource", "label", "type"];
 import React from 'react';
 import classNames from 'classnames';
-import { Icon, Select } from '@alicloud/console-components';
+import { Icon, Select, CascaderSelect } from '@alicloud/console-components';
 var SearchConditionSelectPrefix = function SearchConditionSelectPrefix(props) {
   var _dataSource$, _dataSource$$children;
   var defaultValue = props.defaultValue,
     _props$dataSource = props.dataSource,
     dataSource = _props$dataSource === void 0 ? [] : _props$dataSource,
     label = props.label,
+    type = props.type,
     reset = _objectWithoutProperties(props, _excluded);
   var noSelect = dataSource.length < 2 && ((_dataSource$ = dataSource[0]) === null || _dataSource$ === void 0 ? void 0 : (_dataSource$$children = _dataSource$.children) === null || _dataSource$$children === void 0 ? void 0 : _dataSource$$children.length) < 2;
   return /*#__PURE__*/React.createElement("div", {
@@ -19,7 +20,7 @@ var SearchConditionSelectPrefix = function SearchConditionSelectPrefix(props) {
   }, label), noSelect ? null : /*#__PURE__*/React.createElement(Icon, {
     type: "caret-down",
     size: "xxs"
-  }), /*#__PURE__*/React.createElement(Select, _extends({
+  }), type === 'select' ? /*#__PURE__*/React.createElement(Select, _extends({
     className: classNames('condition-select', {
       'rc-search-prefix-no-select': noSelect
     }),
@@ -38,6 +39,20 @@ var SearchConditionSelectPrefix = function SearchConditionSelectPrefix(props) {
   }, reset, {
     autoWidth: false,
     popupClassName: "rc-search-prefix"
+  })) : /*#__PURE__*/React.createElement(CascaderSelect, _extends({
+    className: classNames('condition-select', {
+      'rc-search-prefix-no-select': noSelect
+    }),
+    defaultValue: defaultValue,
+    hasBorder: false,
+    disabled: noSelect,
+    autoHighlightFirstItem: false,
+    dataSource: dataSource
+    // itemRender={({ label, value }) => (<span data-value={value}>{label}</span>)}
+  }, reset, {
+    autoWidth: false,
+    popupClassName: "rc-search-prefix",
+    canOnlyCheckLeaf: true
   })));
 };
 export default SearchConditionSelectPrefix;

package/es/ComplexSearch/index.js

@@ -9,7 +9,7 @@ import cloneDeep from 'lodash/cloneDeep';
 import groupBy from 'lodash/groupBy';
 import isArray from 'lodash/isArray';
 import React, { useState, useRef } from 'react';
-import { Button, Icon, Select, ConfigProvider, Field, Checkbox } from '@alicloud/console-components';
+import { Button, Icon, Select, ConfigProvider, Field, Checkbox, CascaderSelect } from '@alicloud/console-components';
 import { isPlainObject, template } from 'lodash';
 import { SearchWarp, MultiBtnWarp } from '../style';
 import SearchConditionSelectPrefix from './InputPrefix';
@@ -109,7 +109,10 @@ var ComplexSearch = function ComplexSearch(props) {
     _props$suggestions = props.suggestions,
     suggestions = _props$suggestions === void 0 ? [] : _props$suggestions,
     _props$prefix = props.prefix,
-    prefix = _props$prefix === void 0 ? 'next-' : _props$prefix;
+    prefix = _props$prefix === void 0 ? 'next-' : _props$prefix,
+    _props$prefixSelectMo = props.prefixSelectMode,
+    prefixSelectMode = _props$prefixSelectMo === void 0 ? 'select' : _props$prefixSelectMo,
+    prefixSelectItemRender = props.prefixSelectItemRender;
   var _useState = useState(options.find(function (o) {
       return o.dataIndex === defaultSelectedDataIndex;
     })),
@@ -325,15 +328,29 @@ var ComplexSearch = function ComplexSearch(props) {
   }, /*#__PURE__*/React.createElement("div", {
     className: classNames('condition')
   }, selectedFilterType ? /*#__PURE__*/React.createElement(SearchConditionSelectPrefix, {
+    type: prefixSelectMode,
     dataSource: normalizeOptions(options),
     label: selectedFilterType === null || selectedFilterType === void 0 ? void 0 : selectedFilterType.label,
     defaultValue: selectedFilterType === null || selectedFilterType === void 0 ? void 0 : selectedFilterType.dataIndex,
     onChange: function onChange(value) {
+      console.log(value);
       handlerFilterTypeChange(value);
-    }
+    },
+    itemRender: prefixSelectItemRender
   }) : null), /*#__PURE__*/React.createElement("div", {
     className: classNames('forms')
-  }, !selectedFilterType ? /*#__PURE__*/React.createElement(AutoComplete, _extends({}, init(SEARCH_FILTER_FIELD, {
+  }, !selectedFilterType && prefixSelectMode === 'cascader' ? /*#__PURE__*/React.createElement(CascaderSelect, {
+    className: classNames('main-input', 'multi'),
+    hasBorder: false,
+    dataSource: normalizeOptions(options),
+    placeholder: placeholder || (defaultFilter !== null && defaultFilter !== void 0 && defaultFilter.label ? template(message.defaultPlaceHolder)({
+      value: defaultFilter === null || defaultFilter === void 0 ? void 0 : defaultFilter.label
+    }) : ''),
+    onChange: function onChange(value) {
+      handlerFilterTypeChange(value);
+    },
+    itemRender: prefixSelectItemRender
+  }) : null, !selectedFilterType && prefixSelectMode === 'select' ? /*#__PURE__*/React.createElement(AutoComplete, _extends({}, init(SEARCH_FILTER_FIELD, {
     props: {
       // @ts-ignore
       onChange: function onChange(value, actionType, option) {
@@ -344,7 +361,7 @@ var ComplexSearch = function ComplexSearch(props) {
     autoHighlightFirstItem: false
     // @ts-ignore
     ,
-    itemRender: highlightItem,
+    itemRender: prefixSelectItemRender || highlightItem,
     placeholder: placeholder || (defaultFilter !== null && defaultFilter !== void 0 && defaultFilter.label ? template(message.defaultPlaceHolder)({
       value: defaultFilter === null || defaultFilter === void 0 ? void 0 : defaultFilter.label
     }) : ''),

package/es/search.js

@@ -9,8 +9,6 @@ var SearchWrap = styled.div.withConfig({
 })(["height:32px;width:400px;display:inline-block;vertical-align:top;"]);
 export var Search = function Search(props) {
   var className = props.className,
-    _props$simple = props.simple,
-    simple = _props$simple === void 0 ? false : _props$simple,
     style = props.style;
   var windThemeClass = useWindTheme();
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(SearchWrap, {

package/lib/ComplexSearch/InputPrefix.js

@@ -10,13 +10,14 @@ var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/h
 var _react = _interopRequireDefault(require("react"));
 var _classnames = _interopRequireDefault(require("classnames"));
 var _consoleComponents = require("@alicloud/console-components");
-var _excluded = ["defaultValue", "dataSource", "label"];
+var _excluded = ["defaultValue", "dataSource", "label", "type"];
 var SearchConditionSelectPrefix = function SearchConditionSelectPrefix(props) {
   var _dataSource$, _dataSource$$children;
   var defaultValue = props.defaultValue,
     _props$dataSource = props.dataSource,
     dataSource = _props$dataSource === void 0 ? [] : _props$dataSource,
     label = props.label,
+    type = props.type,
     reset = (0, _objectWithoutProperties2.default)(props, _excluded);
   var noSelect = dataSource.length < 2 && ((_dataSource$ = dataSource[0]) === null || _dataSource$ === void 0 ? void 0 : (_dataSource$$children = _dataSource$.children) === null || _dataSource$$children === void 0 ? void 0 : _dataSource$$children.length) < 2;
   return /*#__PURE__*/_react.default.createElement("div", {
@@ -26,7 +27,7 @@ var SearchConditionSelectPrefix = function SearchConditionSelectPrefix(props) {
   }, label), noSelect ? null : /*#__PURE__*/_react.default.createElement(_consoleComponents.Icon, {
     type: "caret-down",
     size: "xxs"
-  }), /*#__PURE__*/_react.default.createElement(_consoleComponents.Select, (0, _extends2.default)({
+  }), type === 'select' ? /*#__PURE__*/_react.default.createElement(_consoleComponents.Select, (0, _extends2.default)({
     className: (0, _classnames.default)('condition-select', {
       'rc-search-prefix-no-select': noSelect
     }),
@@ -45,6 +46,20 @@ var SearchConditionSelectPrefix = function SearchConditionSelectPrefix(props) {
   }, reset, {
     autoWidth: false,
     popupClassName: "rc-search-prefix"
+  })) : /*#__PURE__*/_react.default.createElement(_consoleComponents.CascaderSelect, (0, _extends2.default)({
+    className: (0, _classnames.default)('condition-select', {
+      'rc-search-prefix-no-select': noSelect
+    }),
+    defaultValue: defaultValue,
+    hasBorder: false,
+    disabled: noSelect,
+    autoHighlightFirstItem: false,
+    dataSource: dataSource
+    // itemRender={({ label, value }) => (<span data-value={value}>{label}</span>)}
+  }, reset, {
+    autoWidth: false,
+    popupClassName: "rc-search-prefix",
+    canOnlyCheckLeaf: true
   })));
 };
 var _default = exports.default = SearchConditionSelectPrefix;

package/lib/ComplexSearch/index.js

@@ -21,8 +21,7 @@ var _style = require("../style");
 var _InputPrefix = _interopRequireDefault(require("./InputPrefix"));
 var _constants = require("../constants");
 var _message = _interopRequireDefault(require("../message"));
-function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
-function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
+function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
 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) { (0, _defineProperty2.default)(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; }
 var AutoComplete = _consoleComponents.Select.AutoComplete;
@@ -119,7 +118,10 @@ var ComplexSearch = function ComplexSearch(props) {
     _props$suggestions = props.suggestions,
     suggestions = _props$suggestions === void 0 ? [] : _props$suggestions,
     _props$prefix = props.prefix,
-    prefix = _props$prefix === void 0 ? 'next-' : _props$prefix;
+    prefix = _props$prefix === void 0 ? 'next-' : _props$prefix,
+    _props$prefixSelectMo = props.prefixSelectMode,
+    prefixSelectMode = _props$prefixSelectMo === void 0 ? 'select' : _props$prefixSelectMo,
+    prefixSelectItemRender = props.prefixSelectItemRender;
   var _useState = (0, _react.useState)(options.find(function (o) {
       return o.dataIndex === defaultSelectedDataIndex;
     })),
@@ -335,15 +337,29 @@ var ComplexSearch = function ComplexSearch(props) {
   }, /*#__PURE__*/_react.default.createElement("div", {
     className: (0, _classnames.default)('condition')
   }, selectedFilterType ? /*#__PURE__*/_react.default.createElement(_InputPrefix.default, {
+    type: prefixSelectMode,
     dataSource: normalizeOptions(options),
     label: selectedFilterType === null || selectedFilterType === void 0 ? void 0 : selectedFilterType.label,
     defaultValue: selectedFilterType === null || selectedFilterType === void 0 ? void 0 : selectedFilterType.dataIndex,
     onChange: function onChange(value) {
+      console.log(value);
       handlerFilterTypeChange(value);
-    }
+    },
+    itemRender: prefixSelectItemRender
   }) : null), /*#__PURE__*/_react.default.createElement("div", {
     className: (0, _classnames.default)('forms')
-  }, !selectedFilterType ? /*#__PURE__*/_react.default.createElement(AutoComplete, (0, _extends2.default)({}, init(_constants.SEARCH_FILTER_FIELD, {
+  }, !selectedFilterType && prefixSelectMode === 'cascader' ? /*#__PURE__*/_react.default.createElement(_consoleComponents.CascaderSelect, {
+    className: (0, _classnames.default)('main-input', 'multi'),
+    hasBorder: false,
+    dataSource: normalizeOptions(options),
+    placeholder: placeholder || (defaultFilter !== null && defaultFilter !== void 0 && defaultFilter.label ? (0, _lodash.template)(_message.default.defaultPlaceHolder)({
+      value: defaultFilter === null || defaultFilter === void 0 ? void 0 : defaultFilter.label
+    }) : ''),
+    onChange: function onChange(value) {
+      handlerFilterTypeChange(value);
+    },
+    itemRender: prefixSelectItemRender
+  }) : null, !selectedFilterType && prefixSelectMode === 'select' ? /*#__PURE__*/_react.default.createElement(AutoComplete, (0, _extends2.default)({}, init(_constants.SEARCH_FILTER_FIELD, {
     props: {
       // @ts-ignore
       onChange: function onChange(value, actionType, option) {
@@ -354,7 +370,7 @@ var ComplexSearch = function ComplexSearch(props) {
     autoHighlightFirstItem: false
     // @ts-ignore
     ,
-    itemRender: highlightItem,
+    itemRender: prefixSelectItemRender || highlightItem,
     placeholder: placeholder || (defaultFilter !== null && defaultFilter !== void 0 && defaultFilter.label ? (0, _lodash.template)(_message.default.defaultPlaceHolder)({
       value: defaultFilter === null || defaultFilter === void 0 ? void 0 : defaultFilter.label
     }) : ''),

package/lib/search.js

@@ -16,8 +16,6 @@ var SearchWrap = _styledComponents.default.div.withConfig({
 })(["height:32px;width:400px;display:inline-block;vertical-align:top;"]);
 var Search = exports.Search = function Search(props) {
   var className = props.className,
-    _props$simple = props.simple,
-    simple = _props$simple === void 0 ? false : _props$simple,
     style = props.style;
   var windThemeClass = (0, _useCssVar.useWindTheme)();
   return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(SearchWrap, {

package/lib/types/IRcSearchProps.type.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 /**
  * 这是IRcSearchProps的说明。breezr-docs支持从源码中提取接口信息并文档化，因此你可以使用接口来定义Props，从而能便捷地将Props的信息通过文档透出。
  *
@@ -63,4 +64,14 @@ export interface IRcSearchProps {
      * 样式 class 前缀
      */
     prefix?: string;
+    /**
+     * 前缀选择器类型
+     */
+    prefixSelectMode?: 'select' | 'cascader';
+    /**
+     * 前缀选择器 item 渲染
+     * @param item
+     * @returns
+     */
+    prefixSelectItemRender?: (item: any) => React.ReactNode;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@alicloud/console-components-search",
-  "version": "0.2.36",
+  "version": "0.2.37-alpha.1",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
   "license": "MIT",
@@ -9,6 +9,7 @@
     "@alicloud/console-toolkit-preset-component": "^1.2.8",
     "@alicloud/console-toolkit-preset-docs": "^1.0.34",
     "@alifd/next": "^1.27.29",
+    "@babel/core": "^7.28.0",
     "@types/classnames": "^2.3.4",
     "@types/js-cookie": "^3.0.1",
     "@types/react": "^17.0.0",
@@ -17,6 +18,8 @@
     "prettier": "^2.2.1",
     "react": "^17.0.1",
     "react-dom": "^17.0.1",
+    "react-router": "^5.0.0",
+    "react-router-dom": "^5.0.0",
     "serve": "^11.3.2",
     "styled-components": "^5.2.1",
     "typescript": "^4.1.3"