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

package/demos/demo1.demo.tsx

@@ -15,7 +15,6 @@ const options = [
       // placeholder: '按实例名称搜索',
       dataSource: [],
     },
-    groupName: 'test',
   },
   {
     label: '网络类型',
@@ -30,7 +29,6 @@ const options = [
         { label: 'D', value: 'd' },
       ],
     },
-    groupName: 'test',
   },
   {
     label: '付费类型',
@@ -45,7 +43,6 @@ const options = [
         { label: 'D', value: 'd' },
       ],
     },
-    groupName: 'test2',
   },
 ];
 

package/dist/index.js

@@ -90211,18 +90211,40 @@ var InputPrefix_1 = __importDefault(__webpack_require__(423));
 var constants_1 = __webpack_require__(135);
 var message_1 = __importDefault(__webpack_require__(165));
 var AutoComplete = console_components_1.Select.AutoComplete;
+function formatOptionsChildren(children) {
+    if (!children)
+        return undefined;
+    return children.map(function (o) {
+        return {
+            label: o.label,
+            value: o.dataIndex || o.label,
+            children: formatOptionsChildren(o.children),
+        };
+    });
+}
 /**
  *
  * @param IRcSearchOptionsProps options
  * @returns
  */
-var normalizeOptions = function (options) {
+var normalizeOptions = function (options, prefixSelectMode) {
+    if (prefixSelectMode === 'cascader') {
+        return options.map(function (o) {
+            return {
+                label: o.label,
+                value: o.dataIndex || o.label,
+                // @ts-ignore
+                children: formatOptionsChildren(o.children),
+            };
+        });
+    }
     var optionsCopy = (0, cloneDeep_1.default)(options);
     optionsCopy.forEach(function (o) { !o.groupName && (o.groupName = message_1.default.defaultFilterGroupName); });
     return Object.entries((0, groupBy_1.default)(optionsCopy, 'groupName')).map(function (_a) {
         var groupName = _a[0], children = _a[1];
         return {
             label: groupName,
+            value: groupName,
             children: children.map(function (l) {
                 return {
                     label: l.label,
@@ -90426,12 +90448,11 @@ var ComplexSearch = function (props) {
         react_1.default.createElement("div", { className: (0, classnames_1.default)('left-wrap', "".concat(prefix, "input"), {
                 focus: focused,
             }) },
-            react_1.default.createElement("div", { className: (0, classnames_1.default)('condition') }, selectedFilterType ? (react_1.default.createElement(InputPrefix_1.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 (value) {
-                    console.log(value);
+            react_1.default.createElement("div", { className: (0, classnames_1.default)('condition') }, selectedFilterType ? (react_1.default.createElement(InputPrefix_1.default, { type: prefixSelectMode, dataSource: normalizeOptions(options, prefixSelectMode), label: selectedFilterType === null || selectedFilterType === void 0 ? void 0 : selectedFilterType.label, defaultValue: selectedFilterType === null || selectedFilterType === void 0 ? void 0 : selectedFilterType.dataIndex, onChange: function (value) {
                     handlerFilterTypeChange(value);
                 }, itemRender: prefixSelectItemRender })) : null),
             react_1.default.createElement("div", { className: (0, classnames_1.default)('forms') },
-                !selectedFilterType && prefixSelectMode === 'cascader' ? react_1.default.createElement(console_components_1.CascaderSelect, { className: (0, classnames_1.default)('main-input', 'multi'), hasBorder: false, dataSource: normalizeOptions(options), placeholder: placeholder ||
+                !selectedFilterType && prefixSelectMode === 'cascader' ? react_1.default.createElement(console_components_1.CascaderSelect, { className: (0, classnames_1.default)('main-input', 'multi'), hasBorder: false, dataSource: normalizeOptions(options, prefixSelectMode), placeholder: placeholder ||
                         ((defaultFilter === null || defaultFilter === void 0 ? void 0 : defaultFilter.label)
                             ? (0, lodash_1.template)(message_1.default.defaultPlaceHolder)({
                                 value: defaultFilter === null || defaultFilter === void 0 ? void 0 : defaultFilter.label,
@@ -90458,7 +90479,7 @@ var ComplexSearch = function (props) {
                     // 则表示需要模糊搜索，调用 handleSuggest
                     isFuzzy
                         ? normalizeSuggestion(suggestions)
-                        : normalizeOptions(options), popupStyle: { width: 'auto' }, popupClassName: "rc-search-auto-complete" }, focusProps))) : null,
+                        : normalizeOptions(options, prefixSelectMode), popupStyle: { width: 'auto' }, popupClassName: "rc-search-auto-complete" }, focusProps))) : null,
                 renderSelectedFilter(),
                 renderSelectFilterCloseIcon())),
         react_1.default.createElement("div", { className: (0, classnames_1.default)('right-wrap'), ref: autoRef },

package/es/ComplexSearch/index.js

@@ -16,12 +16,33 @@ import SearchConditionSelectPrefix from './InputPrefix';
 import { SEARCH_FILTER_FIELD, SEARCH_FILTER_VALUE_FIELD } from '../constants';
 import message from '../message';
 var AutoComplete = Select.AutoComplete;
+function formatOptionsChildren(children) {
+  if (!children) return undefined;
+  return children.map(function (o) {
+    return {
+      label: o.label,
+      value: o.dataIndex || o.label,
+      children: formatOptionsChildren(o.children)
+    };
+  });
+}
+
 /**
  *
  * @param IRcSearchOptionsProps options
  * @returns
  */
-var normalizeOptions = function normalizeOptions(options) {
+var normalizeOptions = function normalizeOptions(options, prefixSelectMode) {
+  if (prefixSelectMode === 'cascader') {
+    return options.map(function (o) {
+      return {
+        label: o.label,
+        value: o.dataIndex || o.label,
+        // @ts-ignore
+        children: formatOptionsChildren(o.children)
+      };
+    });
+  }
   var optionsCopy = cloneDeep(options);
   optionsCopy.forEach(function (o) {
     !o.groupName && (o.groupName = message.defaultFilterGroupName);
@@ -32,6 +53,7 @@ var normalizeOptions = function normalizeOptions(options) {
       children = _ref2[1];
     return {
       label: groupName,
+      value: groupName,
       children: children.map(function (l) {
         return {
           label: l.label,
@@ -329,11 +351,10 @@ var ComplexSearch = function ComplexSearch(props) {
     className: classNames('condition')
   }, selectedFilterType ? /*#__PURE__*/React.createElement(SearchConditionSelectPrefix, {
     type: prefixSelectMode,
-    dataSource: normalizeOptions(options),
+    dataSource: normalizeOptions(options, prefixSelectMode),
     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
@@ -342,7 +363,7 @@ var ComplexSearch = function ComplexSearch(props) {
   }, !selectedFilterType && prefixSelectMode === 'cascader' ? /*#__PURE__*/React.createElement(CascaderSelect, {
     className: classNames('main-input', 'multi'),
     hasBorder: false,
-    dataSource: normalizeOptions(options),
+    dataSource: normalizeOptions(options, prefixSelectMode),
     placeholder: placeholder || (defaultFilter !== null && defaultFilter !== void 0 && defaultFilter.label ? template(message.defaultPlaceHolder)({
       value: defaultFilter === null || defaultFilter === void 0 ? void 0 : defaultFilter.label
     }) : ''),
@@ -371,7 +392,7 @@ var ComplexSearch = function ComplexSearch(props) {
     dataSource:
     // 如果是指定了默认的筛选类型或者是直接指定模糊搜索模式 ，并且用户在这个输入框里面已经输入了值
     // 则表示需要模糊搜索，调用 handleSuggest
-    isFuzzy ? normalizeSuggestion(suggestions) : normalizeOptions(options),
+    isFuzzy ? normalizeSuggestion(suggestions) : normalizeOptions(options, prefixSelectMode),
     popupStyle: {
       width: 'auto'
     },

package/lib/ComplexSearch/index.js

@@ -25,12 +25,33 @@ function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r
 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;
+function formatOptionsChildren(children) {
+  if (!children) return undefined;
+  return children.map(function (o) {
+    return {
+      label: o.label,
+      value: o.dataIndex || o.label,
+      children: formatOptionsChildren(o.children)
+    };
+  });
+}
+
 /**
  *
  * @param IRcSearchOptionsProps options
  * @returns
  */
-var normalizeOptions = function normalizeOptions(options) {
+var normalizeOptions = function normalizeOptions(options, prefixSelectMode) {
+  if (prefixSelectMode === 'cascader') {
+    return options.map(function (o) {
+      return {
+        label: o.label,
+        value: o.dataIndex || o.label,
+        // @ts-ignore
+        children: formatOptionsChildren(o.children)
+      };
+    });
+  }
   var optionsCopy = (0, _cloneDeep.default)(options);
   optionsCopy.forEach(function (o) {
     !o.groupName && (o.groupName = _message.default.defaultFilterGroupName);
@@ -41,6 +62,7 @@ var normalizeOptions = function normalizeOptions(options) {
       children = _ref2[1];
     return {
       label: groupName,
+      value: groupName,
       children: children.map(function (l) {
         return {
           label: l.label,
@@ -338,11 +360,10 @@ var ComplexSearch = function ComplexSearch(props) {
     className: (0, _classnames.default)('condition')
   }, selectedFilterType ? /*#__PURE__*/_react.default.createElement(_InputPrefix.default, {
     type: prefixSelectMode,
-    dataSource: normalizeOptions(options),
+    dataSource: normalizeOptions(options, prefixSelectMode),
     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
@@ -351,7 +372,7 @@ var ComplexSearch = function ComplexSearch(props) {
   }, !selectedFilterType && prefixSelectMode === 'cascader' ? /*#__PURE__*/_react.default.createElement(_consoleComponents.CascaderSelect, {
     className: (0, _classnames.default)('main-input', 'multi'),
     hasBorder: false,
-    dataSource: normalizeOptions(options),
+    dataSource: normalizeOptions(options, prefixSelectMode),
     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
     }) : ''),
@@ -380,7 +401,7 @@ var ComplexSearch = function ComplexSearch(props) {
     dataSource:
     // 如果是指定了默认的筛选类型或者是直接指定模糊搜索模式 ，并且用户在这个输入框里面已经输入了值
     // 则表示需要模糊搜索，调用 handleSuggest
-    isFuzzy ? normalizeSuggestion(suggestions) : normalizeOptions(options),
+    isFuzzy ? normalizeSuggestion(suggestions) : normalizeOptions(options, prefixSelectMode),
     popupStyle: {
       width: 'auto'
     },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@alicloud/console-components-search",
-  "version": "0.2.37-alpha.1",
+  "version": "0.2.37-alpha.3",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
   "license": "MIT",