@alicloud/console-components-search 0.2.37-alpha.4 → 0.2.37-alpha.5

package/dist/index.js

@@ -90217,7 +90217,7 @@ function formatOptionsChildren(children) {
     return children.map(function (o) {
         return {
             label: o.label,
-            value: o.value || o.dataIndex || o.label,
+            value: o.dataIndex || o.value || o.label,
             disabled: o.disabled,
             children: formatOptionsChildren(o.children),
         };
@@ -90233,7 +90233,7 @@ var normalizeOptions = function (options, prefixSelectMode) {
         return options.map(function (o) {
             return {
                 label: o.label,
-                value: o.value || o.dataIndex || o.label,
+                value: o.dataIndex || o.value || o.label,
                 disabled: o.disabled,
                 // @ts-ignore
                 children: formatOptionsChildren(o.children),
@@ -90249,7 +90249,7 @@ var normalizeOptions = function (options, prefixSelectMode) {
             children: children.map(function (l) {
                 return {
                     label: l.label,
-                    value: l.dataIndex,
+                    value: l.dataIndex || l.value,
                     disabled: l.disabled,
                 };
             }),
@@ -90279,7 +90279,7 @@ var normalizeSelectDataSource = function (title, list) {
 };
 var normalizeSearchOptions = function (dataIndex, value, options) {
     var _a, _b, _c;
-    var opt = options === null || options === void 0 ? void 0 : options.find(function (o) { return o.dataIndex === dataIndex; });
+    var opt = options === null || options === void 0 ? void 0 : options.find(function (o) { return getDataIndex(o) === dataIndex; });
     var valueLabel = value;
     if ((opt === null || opt === void 0 ? void 0 : opt.template) === 'select') {
         valueLabel = (_b = (_a = opt.templateProps) === null || _a === void 0 ? void 0 : _a.dataSource.find(function (d) { return d.value === value; })) === null || _b === void 0 ? void 0 : _b.label;
@@ -90304,9 +90304,12 @@ var highlightKeyword = function (value, keywords) {
         react_1.default.createElement("span", { style: { color: 'var(--color-brand1-6)' } }, highlightValue),
         endValue));
 };
+var getDataIndex = function (option) {
+    return (option === null || option === void 0 ? void 0 : option.dataIndex) || (option === null || option === void 0 ? void 0 : option.value);
+};
 var ComplexSearch = function (props) {
     var _a = props.options, options = _a === void 0 ? [] : _a, fuzzy = props.fuzzy, defaultDataIndex = props.defaultDataIndex, defaultSelectedDataIndex = props.defaultSelectedDataIndex, placeholder = props.placeholder, onSearch = props.onSearch, onSuggest = props.onSuggest, _b = props.suggestions, suggestions = _b === void 0 ? [] : _b, _c = props.prefix, prefix = _c === void 0 ? 'next-' : _c, _d = props.prefixSelectMode, prefixSelectMode = _d === void 0 ? 'select' : _d, prefixSelectItemRender = props.prefixSelectItemRender;
-    var _e = (0, react_1.useState)(options.find(function (o) { return o.dataIndex === defaultSelectedDataIndex; })), selectedFilterType = _e[0], setSelectedFilterType = _e[1];
+    var _e = (0, react_1.useState)(options.find(function (o) { return getDataIndex(o) === defaultSelectedDataIndex; })), selectedFilterType = _e[0], setSelectedFilterType = _e[1];
     var _f = (0, react_1.useState)(false), focused = _f[0], setFocused = _f[1];
     var autoRef = (0, react_1.useRef)(null);
     var field = console_components_1.Field.useField();
@@ -90321,7 +90324,7 @@ var ComplexSearch = function (props) {
     };
     // 计算视图，根据内部状态和输入的 props 决定一些值
     var isFuzzy = (!!defaultDataIndex || fuzzy) && !!getValue(constants_1.SEARCH_FILTER_FIELD);
-    var defaultFilter = options.find(function (t) { return t.dataIndex === defaultDataIndex; });
+    var defaultFilter = options.find(function (t) { return getDataIndex(t) === defaultDataIndex; });
     var highlightItem = function (item, searchKey) {
         var label = item.label;
         if (searchKey && searchKey.length) {
@@ -90334,18 +90337,18 @@ var ComplexSearch = function (props) {
      */
     var handlerFilterTypeChange = function (type, resetValue) {
         if (resetValue === void 0) { resetValue = true; }
-        setSelectedFilterType(options.find(function (o) { return o.dataIndex === type; }));
+        setSelectedFilterType(options.find(function (o) { return getDataIndex(o) === type; }));
         resetValue && reset();
     };
     /**
      * 处理当筛选类型没选中，用户输入筛选类型，或者是做默认搜索的情况
      */
-    var handlerFilterTypeInput = function (value, actionType, isFuzzy, option) {
-        var isFuzzySearch = isFuzzy && getValue(constants_1.SEARCH_FILTER_FIELD);
+    var handlerFilterTypeInput = function (value, actionType, _isFuzzy, option) {
+        var isFuzzySearch = _isFuzzy && getValue(constants_1.SEARCH_FILTER_FIELD);
         // 如果是模糊搜索，则直接处理
         if (isFuzzySearch) {
             if (actionType !== 'change') {
-                handleSearch(option.dataIndex);
+                handleSearch(getDataIndex(option));
             }
             else {
                 onSuggest && onSuggest(value, defaultDataIndex || '');
@@ -90371,7 +90374,7 @@ var ComplexSearch = function (props) {
                 onSearch(getValue(constants_1.SEARCH_FILTER_FIELD), dataIndex || '', normalizeSearchOptions(dataIndex || '', getValue(constants_1.SEARCH_FILTER_FIELD), options));
             }
             if (selectedFilterType) {
-                onSearch(value, selectedFilterType.dataIndex, normalizeSearchOptions(selectedFilterType.dataIndex, value, options));
+                onSearch(value, getDataIndex(selectedFilterType), normalizeSearchOptions(getDataIndex(selectedFilterType), value, options));
             }
         }
         reset();
@@ -90450,7 +90453,7 @@ 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, prefixSelectMode), label: selectedFilterType === null || selectedFilterType === void 0 ? void 0 : selectedFilterType.label, defaultValue: selectedFilterType === null || selectedFilterType === void 0 ? void 0 : selectedFilterType.dataIndex, onChange: function (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: getDataIndex(selectedFilterType), onChange: function (value) {
                     handlerFilterTypeChange(value);
                 }, itemRender: prefixSelectItemRender })) : null),
             react_1.default.createElement("div", { className: (0, classnames_1.default)('forms') },

package/es/ComplexSearch/index.js

@@ -21,7 +21,7 @@ function formatOptionsChildren(children) {
   return children.map(function (o) {
     return {
       label: o.label,
-      value: o.value || o.dataIndex || o.label,
+      value: o.dataIndex || o.value || o.label,
       disabled: o.disabled,
       children: formatOptionsChildren(o.children)
     };
@@ -38,7 +38,7 @@ var normalizeOptions = function normalizeOptions(options, prefixSelectMode) {
     return options.map(function (o) {
       return {
         label: o.label,
-        value: o.value || o.dataIndex || o.label,
+        value: o.dataIndex || o.value || o.label,
         disabled: o.disabled,
         // @ts-ignore
         children: formatOptionsChildren(o.children)
@@ -58,7 +58,7 @@ var normalizeOptions = function normalizeOptions(options, prefixSelectMode) {
       children: children.map(function (l) {
         return {
           label: l.label,
-          value: l.dataIndex,
+          value: l.dataIndex || l.value,
           disabled: l.disabled
         };
       })
@@ -86,7 +86,7 @@ var normalizeSelectDataSource = function normalizeSelectDataSource(title, list)
 };
 var normalizeSearchOptions = function normalizeSearchOptions(dataIndex, value, options) {
   var opt = options === null || options === void 0 ? void 0 : options.find(function (o) {
-    return o.dataIndex === dataIndex;
+    return getDataIndex(o) === dataIndex;
   });
   var valueLabel = value;
   if ((opt === null || opt === void 0 ? void 0 : opt.template) === 'select') {
@@ -121,6 +121,9 @@ var highlightKeyword = function highlightKeyword(value, keywords) {
     }
   }, highlightValue), endValue);
 };
+var getDataIndex = function getDataIndex(option) {
+  return (option === null || option === void 0 ? void 0 : option.dataIndex) || (option === null || option === void 0 ? void 0 : option.value);
+};
 var ComplexSearch = function ComplexSearch(props) {
   var _props$options = props.options,
     options = _props$options === void 0 ? [] : _props$options,
@@ -138,7 +141,7 @@ var ComplexSearch = function ComplexSearch(props) {
     prefixSelectMode = _props$prefixSelectMo === void 0 ? 'select' : _props$prefixSelectMo,
     prefixSelectItemRender = props.prefixSelectItemRender;
   var _useState = useState(options.find(function (o) {
-      return o.dataIndex === defaultSelectedDataIndex;
+      return getDataIndex(o) === defaultSelectedDataIndex;
     })),
     _useState2 = _slicedToArray(_useState, 2),
     selectedFilterType = _useState2[0],
@@ -164,7 +167,7 @@ var ComplexSearch = function ComplexSearch(props) {
   // 计算视图，根据内部状态和输入的 props 决定一些值
   var isFuzzy = (!!defaultDataIndex || fuzzy) && !!getValue(SEARCH_FILTER_FIELD);
   var defaultFilter = options.find(function (t) {
-    return t.dataIndex === defaultDataIndex;
+    return getDataIndex(t) === defaultDataIndex;
   });
   var highlightItem = function highlightItem(item, searchKey) {
     var label = item.label;
@@ -182,7 +185,7 @@ var ComplexSearch = function ComplexSearch(props) {
   var handlerFilterTypeChange = function handlerFilterTypeChange(type) {
     var resetValue = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : true;
     setSelectedFilterType(options.find(function (o) {
-      return o.dataIndex === type;
+      return getDataIndex(o) === type;
     }));
     resetValue && reset();
   };
@@ -190,13 +193,13 @@ var ComplexSearch = function ComplexSearch(props) {
   /**
    * 处理当筛选类型没选中，用户输入筛选类型，或者是做默认搜索的情况
    */
-  var handlerFilterTypeInput = function handlerFilterTypeInput(value, actionType, isFuzzy, option) {
-    var isFuzzySearch = isFuzzy && getValue(SEARCH_FILTER_FIELD);
+  var handlerFilterTypeInput = function handlerFilterTypeInput(value, actionType, _isFuzzy, option) {
+    var isFuzzySearch = _isFuzzy && getValue(SEARCH_FILTER_FIELD);
 
     // 如果是模糊搜索，则直接处理
     if (isFuzzySearch) {
       if (actionType !== 'change') {
-        handleSearch(option.dataIndex);
+        handleSearch(getDataIndex(option));
       } else {
         onSuggest && onSuggest(value, defaultDataIndex || '');
       }
@@ -222,7 +225,7 @@ var ComplexSearch = function ComplexSearch(props) {
         onSearch(getValue(SEARCH_FILTER_FIELD), dataIndex || '', normalizeSearchOptions(dataIndex || '', getValue(SEARCH_FILTER_FIELD), options));
       }
       if (selectedFilterType) {
-        onSearch(value, selectedFilterType.dataIndex, normalizeSearchOptions(selectedFilterType.dataIndex, value, options));
+        onSearch(value, getDataIndex(selectedFilterType), normalizeSearchOptions(getDataIndex(selectedFilterType), value, options));
       }
     }
     reset();
@@ -355,7 +358,7 @@ var ComplexSearch = function ComplexSearch(props) {
     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,
+    defaultValue: getDataIndex(selectedFilterType),
     onChange: function onChange(value) {
       handlerFilterTypeChange(value);
     },

package/lib/ComplexSearch/index.js

@@ -30,7 +30,7 @@ function formatOptionsChildren(children) {
   return children.map(function (o) {
     return {
       label: o.label,
-      value: o.value || o.dataIndex || o.label,
+      value: o.dataIndex || o.value || o.label,
       disabled: o.disabled,
       children: formatOptionsChildren(o.children)
     };
@@ -47,7 +47,7 @@ var normalizeOptions = function normalizeOptions(options, prefixSelectMode) {
     return options.map(function (o) {
       return {
         label: o.label,
-        value: o.value || o.dataIndex || o.label,
+        value: o.dataIndex || o.value || o.label,
         disabled: o.disabled,
         // @ts-ignore
         children: formatOptionsChildren(o.children)
@@ -67,7 +67,7 @@ var normalizeOptions = function normalizeOptions(options, prefixSelectMode) {
       children: children.map(function (l) {
         return {
           label: l.label,
-          value: l.dataIndex,
+          value: l.dataIndex || l.value,
           disabled: l.disabled
         };
       })
@@ -95,7 +95,7 @@ var normalizeSelectDataSource = function normalizeSelectDataSource(title, list)
 };
 var normalizeSearchOptions = function normalizeSearchOptions(dataIndex, value, options) {
   var opt = options === null || options === void 0 ? void 0 : options.find(function (o) {
-    return o.dataIndex === dataIndex;
+    return getDataIndex(o) === dataIndex;
   });
   var valueLabel = value;
   if ((opt === null || opt === void 0 ? void 0 : opt.template) === 'select') {
@@ -130,6 +130,9 @@ var highlightKeyword = function highlightKeyword(value, keywords) {
     }
   }, highlightValue), endValue);
 };
+var getDataIndex = function getDataIndex(option) {
+  return (option === null || option === void 0 ? void 0 : option.dataIndex) || (option === null || option === void 0 ? void 0 : option.value);
+};
 var ComplexSearch = function ComplexSearch(props) {
   var _props$options = props.options,
     options = _props$options === void 0 ? [] : _props$options,
@@ -147,7 +150,7 @@ var ComplexSearch = function ComplexSearch(props) {
     prefixSelectMode = _props$prefixSelectMo === void 0 ? 'select' : _props$prefixSelectMo,
     prefixSelectItemRender = props.prefixSelectItemRender;
   var _useState = (0, _react.useState)(options.find(function (o) {
-      return o.dataIndex === defaultSelectedDataIndex;
+      return getDataIndex(o) === defaultSelectedDataIndex;
     })),
     _useState2 = (0, _slicedToArray2.default)(_useState, 2),
     selectedFilterType = _useState2[0],
@@ -173,7 +176,7 @@ var ComplexSearch = function ComplexSearch(props) {
   // 计算视图，根据内部状态和输入的 props 决定一些值
   var isFuzzy = (!!defaultDataIndex || fuzzy) && !!getValue(_constants.SEARCH_FILTER_FIELD);
   var defaultFilter = options.find(function (t) {
-    return t.dataIndex === defaultDataIndex;
+    return getDataIndex(t) === defaultDataIndex;
   });
   var highlightItem = function highlightItem(item, searchKey) {
     var label = item.label;
@@ -191,7 +194,7 @@ var ComplexSearch = function ComplexSearch(props) {
   var handlerFilterTypeChange = function handlerFilterTypeChange(type) {
     var resetValue = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : true;
     setSelectedFilterType(options.find(function (o) {
-      return o.dataIndex === type;
+      return getDataIndex(o) === type;
     }));
     resetValue && reset();
   };
@@ -199,13 +202,13 @@ var ComplexSearch = function ComplexSearch(props) {
   /**
    * 处理当筛选类型没选中，用户输入筛选类型，或者是做默认搜索的情况
    */
-  var handlerFilterTypeInput = function handlerFilterTypeInput(value, actionType, isFuzzy, option) {
-    var isFuzzySearch = isFuzzy && getValue(_constants.SEARCH_FILTER_FIELD);
+  var handlerFilterTypeInput = function handlerFilterTypeInput(value, actionType, _isFuzzy, option) {
+    var isFuzzySearch = _isFuzzy && getValue(_constants.SEARCH_FILTER_FIELD);
 
     // 如果是模糊搜索，则直接处理
     if (isFuzzySearch) {
       if (actionType !== 'change') {
-        handleSearch(option.dataIndex);
+        handleSearch(getDataIndex(option));
       } else {
         onSuggest && onSuggest(value, defaultDataIndex || '');
       }
@@ -231,7 +234,7 @@ var ComplexSearch = function ComplexSearch(props) {
         onSearch(getValue(_constants.SEARCH_FILTER_FIELD), dataIndex || '', normalizeSearchOptions(dataIndex || '', getValue(_constants.SEARCH_FILTER_FIELD), options));
       }
       if (selectedFilterType) {
-        onSearch(value, selectedFilterType.dataIndex, normalizeSearchOptions(selectedFilterType.dataIndex, value, options));
+        onSearch(value, getDataIndex(selectedFilterType), normalizeSearchOptions(getDataIndex(selectedFilterType), value, options));
       }
     }
     reset();
@@ -364,7 +367,7 @@ var ComplexSearch = function ComplexSearch(props) {
     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,
+    defaultValue: getDataIndex(selectedFilterType),
     onChange: function onChange(value) {
       handlerFilterTypeChange(value);
     },

package/package.json

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