@alicloud/console-components-search 0.2.4 → 0.2.7

package/doc-dist/log-deps-build.log

@@ -1,13 +1,13 @@
 开始构建微应用external依赖...
 BreezrPluginStyledComponentsIsolation  The plugin will trying to use the package's name as isolation id of styled-components. This behavior usually occurred on dev mode. And if you were received this warning on publish mode then you should to set `options.styledComponentStyleSheetId` implicitly.
 ℹ Compiling Webpack
-✔ Webpack: Compiled successfully in 11.42s
+✔ Webpack: Compiled successfully in 12.98s
  WARN  asset size limit: The following asset(s) exceed the recommended size limit (244 KiB).
 This can impact web performance.
 Assets: 
-  main.js (2.49 MiB),entrypoint size limit: The following entrypoint(s) combined asset size exceeds the recommended limit (244 KiB). This can impact web performance.
+  main.js (2.51 MiB),entrypoint size limit: The following entrypoint(s) combined asset size exceeds the recommended limit (244 KiB). This can impact web performance.
 Entrypoints:
-  main (2.49 MiB)
+  main (2.51 MiB)
       main.css
       main.js
 ,webpack performance recommendations: 

package/es/{modeSingleSingle → ComplexSearch}/InputPrefix.js

@@ -22,6 +22,13 @@ var SearchConditionSelectPrefix = function SearchConditionSelectPrefix(props) {
     className: classNames('condition-select'),
     hasBorder: false,
     dataSource: dataSource,
+    itemRender: function itemRender(_ref) {
+      var label = _ref.label,
+          value = _ref.value;
+      return /*#__PURE__*/React.createElement("span", {
+        "data-value": value
+      }, label);
+    },
     autoWidth: true
   }, reset)));
 };

package/es/{modeSingleSingle/index2.js → ComplexSearch/index.js}

@@ -306,7 +306,7 @@ var ComplexSearch = function ComplexSearch(props) {
     }, /*#__PURE__*/React.createElement("span", {
       className: "".concat(prefix, "input-hint-wrap")
     }, /*#__PURE__*/React.createElement("i", {
-      className: "".concat(prefix, "icon ").concat(prefix, "icon-delete-filling ").concat(prefix, "medium ").concat(prefix, "input-hint ").concat(prefix, "input-clear-icon"),
+      className: "".concat(prefix, "icon ").concat(prefix, "icon-delete-filling ").concat(prefix, "input-hint ").concat(prefix, "input-clear-icon"),
       role: "button",
       "aria-label": "\u6E05\u9664",
       onClick: function onClick() {

package/es/search.js

@@ -1,8 +1,8 @@
 import React from "react";
-import ComplexSearch from "./modeSingleSingle/index2";
 import classNames from 'classnames';
 import styled from "styled-components";
 import { baseClassName } from './constants';
+import ComplexSearch from "./ComplexSearch/index";
 import LoggerProvider from './provider/LoggerProvider';
 var SearchWrap = styled.div.withConfig({
   componentId: "sc-1szhzw4-0"

package/es/searchTagList/index.js

@@ -19,7 +19,7 @@ var TagGroup = Tag.Group,
  */
 
 var isTagLikeDataStructure = function isTagLikeDataStructure(value) {
-  var isTag = !!value.tagKey;
+  var isTag = !!(value !== null && value !== void 0 && value.tagKey);
 
   if (isArray(value)) {
     return value[0] && !!value[0].tagKey;
@@ -63,9 +63,14 @@ var SearchTagList = function SearchTagList(props) {
         return x.tagKey === tag.tagKey && x.tagValue === tag.tagValue;
       });
       var deletedTags = item.value.splice(resFindIndex, 1);
-      onChange(_objectSpread(_objectSpread({}, item), {}, {
-        value: deletedTags
-      }), newDataSource);
+
+      if (item.value.length === 0) {
+        onRemoveFilter(item);
+      } else {
+        onChange(_objectSpread(_objectSpread({}, item), {}, {
+          value: deletedTags
+        }), newDataSource);
+      }
     }
   };
 
@@ -76,9 +81,9 @@ var SearchTagList = function SearchTagList(props) {
       return value.map(function (t) {
         return /*#__PURE__*/React.createElement(PureTag, {
           showLabel: true,
-          key: "".concat(t.tagKey, "-").concat(t.tagValue),
-          tagKey: t.tagKey,
-          tagValue: t.tagValue,
+          key: "".concat(t === null || t === void 0 ? void 0 : t.tagKey, "-").concat(t === null || t === void 0 ? void 0 : t.tagValue),
+          tagKey: t === null || t === void 0 ? void 0 : t.tagKey,
+          tagValue: t === null || t === void 0 ? void 0 : t.tagValue,
           closable: true,
           onClose: function onClose() {
             onRemoveTag(tagItem, t);
@@ -90,8 +95,8 @@ var SearchTagList = function SearchTagList(props) {
 
     return /*#__PURE__*/React.createElement(PureTag, {
       showLabel: true,
-      tagKey: value.tagKey,
-      tagValue: value.tagValue,
+      tagKey: value === null || value === void 0 ? void 0 : value.tagKey,
+      tagValue: value === null || value === void 0 ? void 0 : value.tagValue,
       closable: true,
       onClose: function onClose() {
         onRemoveFilter(tagItem);
@@ -100,11 +105,16 @@ var SearchTagList = function SearchTagList(props) {
     });
   };
 
+  var processDataSource = dataSource && dataSource.filter(function (t) {
+    var _t$value;
+
+    return !isArray(t === null || t === void 0 ? void 0 : t.value) || (t === null || t === void 0 ? void 0 : (_t$value = t.value) === null || _t$value === void 0 ? void 0 : _t$value.length);
+  }) || [];
   return /*#__PURE__*/React.createElement(TagListWrap, {
     prefix: prefix,
     className: classNames(baseTagListClassName, className),
     style: style
-  }, /*#__PURE__*/React.createElement(TagGroup, null, dataSource && dataSource.length > 0 && dataSource.map(function (tagItem) {
+  }, /*#__PURE__*/React.createElement(TagGroup, null, processDataSource.map(function (tagItem) {
     if (isTagLikeDataStructure(tagItem.value)) {
       return renderTags(tagItem);
     }
@@ -121,7 +131,7 @@ var SearchTagList = function SearchTagList(props) {
     }, /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("label", {
       className: "console-tags-tag-label"
     }, tagItem.label), tagItem.valueLabel || tagItem.value));
-  }), dataSource && dataSource.length > 0 && /*#__PURE__*/React.createElement("a", {
+  }), processDataSource.length > 0 && /*#__PURE__*/React.createElement("a", {
     className: "remove-btn",
     onClick: onRemoveAllFilter
   }, "\u6E05\u9664\u7B5B\u9009\u6761\u4EF6")));

package/es/style.js

@@ -6,7 +6,7 @@ var prefix = function prefix(props) {
 
 var SearchWarp = styled.div.withConfig({
   componentId: "sc-1afc1cn-0"
-})(["height:100%;width:100%;display:flex;.left-wrap{flex:1;border-left:1px solid rgba(192,198,204,1);border-bottom:1px solid rgba(192,198,204,1);border-top:1px solid rgba(192,198,204,1);border-right:1px solid rgba(192,198,204,1);display:flex;border-bottom-left-radius:2px;border-top-left-radius:2px;&.focus{border:1px solid #0064c8;border:1px solid var(--input-focus-border-color,#0064c8);;border-right:1px solid rgba(192,198,204,1);}.condition{height:26px;display:inline-block;margin-top:2px;}.condition-item{height:26px;display:inline-block;line-height:26px;background:#EFF3F8;border-radius:2px;background-color:#EFF3F8;padding:0 8px;margin:0 2px;font-size:12px;color:#333;position:relative;&-txt{padding-right:4px;}&:hover{background-color:#E0E4E8;}}.condition-select{width:100%;height:100%;opacity:0;position:absolute;top:0;left:0;min-width:auto;", "select-inner{min-width:auto;}}.forms{flex:1;position:relative;.clear-level1{position:absolute;top:1px;right:1px;height:28px;width:30px;background-color:#fff;z-index:99;color:#333;text-align:center;line-height:28px;font-size:12px;cursor:pointer;padding:6px 0 0 6px;}}.main-input{height:auto;border:none;box-shadow:none;&.single{flex:1;}&.select{width:100%;}&.multi{width:100%;}", "input,", "input{height:auto;box-shadow:none;}}", "input", "medium{height:auto;}}.right-wrap{width:32px;.search-btn{width:32px;padding:0 !important;border-bottom-left-radius:0;border-top-left-radius:0;&.focus{border-color:#0064c8;border-color:var(--input-focus-border-color,#0064c8);}border-left:none;}}"], prefix, prefix, prefix, prefix, prefix);
+})(["height:100%;width:100%;display:flex;.left-wrap{flex:1;border-left:1px solid rgba(192,198,204,1);border-bottom:1px solid rgba(192,198,204,1);border-top:1px solid rgba(192,198,204,1);border-right:1px solid rgba(192,198,204,1);display:flex;border-bottom-left-radius:var(--corner-1,2px);border-top-left-radius:var(--corner-1,2px);&.focus{border:1px solid #0064c8;border:1px solid var(--input-focus-border-color,#0064c8);;border-right:1px solid rgba(192,198,204,1);}.condition{height:26px;display:inline-block;margin-top:2px;}.condition-item{height:26px;display:inline-block;line-height:26px;background:#EFF3F8;border-radius:var(--corner-1,2px);background-color:#EFF3F8;padding:0 8px;margin:0 2px;font-size:12px;color:#333;position:relative;&-txt{padding-right:4px;}&:hover{background-color:#E0E4E8;}}.condition-select{width:100%;height:100%;opacity:0;position:absolute;top:0;left:0;min-width:auto;", "select-inner{min-width:auto;}}.forms{flex:1;position:relative;.clear-level1{position:absolute;top:1px;right:1px;height:28px;width:30px;background-color:#fff;z-index:99;color:#333;text-align:center;line-height:28px;font-size:12px;cursor:pointer;padding:6px 0 0 6px;}}.main-input{height:auto;border:none;box-shadow:none;&.single{flex:1;}&.select{width:100%;}&.multi{width:100%;}", "input,", "input{height:auto;box-shadow:none;}}", "input", "medium{height:auto;}}.right-wrap{width:32px;.search-btn{width:32px;padding:0 !important;border-bottom-left-radius:0;border-top-left-radius:0;&.focus{border-color:#0064c8;border-color:var(--input-focus-border-color,#0064c8);}border-left:none;}}"], prefix, prefix, prefix, prefix, prefix);
 var MenuContentWrap = styled.ul.withConfig({
   componentId: "sc-1afc1cn-1"
 })(["", "tag-small", "tag-closable > ", "tag-close-btn{margin-left:8px;padding-right:4px;padding-top:1px;}", "tag-small", "tag-closable > ", "tag-body{max-width:calc(100% - 8px - 8px - var(--tag-size-m-padding-lr,8px));}", "tag-small", "tag-closable > ", "tag-close-btn ", "icon:before,", "tag-small", "tag-closable > ", "tag-close-btn ", "icon ", "icon-remote{font-size:13px;}&& [class*='-icon-close']:hover::before{color:#181818;}&& [class*='-icon-close']::before{color:#808080;content:var(--icon-content-delete-filling);}"], prefix, prefix, prefix, prefix, prefix, prefix, prefix, prefix, prefix, prefix, prefix, prefix, prefix, prefix, prefix);

package/lib/{modeSingleSingle → ComplexSearch}/InputPrefix.js

@@ -35,6 +35,13 @@ var SearchConditionSelectPrefix = function SearchConditionSelectPrefix(props) {
     className: (0, _classnames.default)('condition-select'),
     hasBorder: false,
     dataSource: dataSource,
+    itemRender: function itemRender(_ref) {
+      var label = _ref.label,
+          value = _ref.value;
+      return /*#__PURE__*/_react.default.createElement("span", {
+        "data-value": value
+      }, label);
+    },
     autoWidth: true
   }, reset)));
 };

package/lib/{modeSingleSingle/index2.js → ComplexSearch/index.js}

@@ -335,7 +335,7 @@ var ComplexSearch = function ComplexSearch(props) {
     }, /*#__PURE__*/_react.default.createElement("span", {
       className: "".concat(prefix, "input-hint-wrap")
     }, /*#__PURE__*/_react.default.createElement("i", {
-      className: "".concat(prefix, "icon ").concat(prefix, "icon-delete-filling ").concat(prefix, "medium ").concat(prefix, "input-hint ").concat(prefix, "input-clear-icon"),
+      className: "".concat(prefix, "icon ").concat(prefix, "icon-delete-filling ").concat(prefix, "input-hint ").concat(prefix, "input-clear-icon"),
       role: "button",
       "aria-label": "\u6E05\u9664",
       onClick: function onClick() {

package/lib/search.js

@@ -9,14 +9,14 @@ exports.Search = void 0;
 
 var _react = _interopRequireDefault(require("react"));
 
-var _index = _interopRequireDefault(require("./modeSingleSingle/index2"));
-
 var _classnames = _interopRequireDefault(require("classnames"));
 
 var _styledComponents = _interopRequireDefault(require("styled-components"));
 
 var _constants = require("./constants");
 
+var _index = _interopRequireDefault(require("./ComplexSearch/index"));
+
 var _LoggerProvider = _interopRequireDefault(require("./provider/LoggerProvider"));
 
 var SearchWrap = _styledComponents.default.div.withConfig({

package/lib/searchTagList/index.js

@@ -36,7 +36,7 @@ var TagGroup = _consoleComponents.Tag.Group,
  */
 
 var isTagLikeDataStructure = function isTagLikeDataStructure(value) {
-  var isTag = !!value.tagKey;
+  var isTag = !!(value !== null && value !== void 0 && value.tagKey);
 
   if ((0, _isArray.default)(value)) {
     return value[0] && !!value[0].tagKey;
@@ -80,9 +80,14 @@ var SearchTagList = function SearchTagList(props) {
         return x.tagKey === tag.tagKey && x.tagValue === tag.tagValue;
       });
       var deletedTags = item.value.splice(resFindIndex, 1);
-      onChange(_objectSpread(_objectSpread({}, item), {}, {
-        value: deletedTags
-      }), newDataSource);
+
+      if (item.value.length === 0) {
+        onRemoveFilter(item);
+      } else {
+        onChange(_objectSpread(_objectSpread({}, item), {}, {
+          value: deletedTags
+        }), newDataSource);
+      }
     }
   };
 
@@ -93,9 +98,9 @@ var SearchTagList = function SearchTagList(props) {
       return value.map(function (t) {
         return /*#__PURE__*/_react.default.createElement(_PureTag.default, {
           showLabel: true,
-          key: "".concat(t.tagKey, "-").concat(t.tagValue),
-          tagKey: t.tagKey,
-          tagValue: t.tagValue,
+          key: "".concat(t === null || t === void 0 ? void 0 : t.tagKey, "-").concat(t === null || t === void 0 ? void 0 : t.tagValue),
+          tagKey: t === null || t === void 0 ? void 0 : t.tagKey,
+          tagValue: t === null || t === void 0 ? void 0 : t.tagValue,
           closable: true,
           onClose: function onClose() {
             onRemoveTag(tagItem, t);
@@ -107,8 +112,8 @@ var SearchTagList = function SearchTagList(props) {
 
     return /*#__PURE__*/_react.default.createElement(_PureTag.default, {
       showLabel: true,
-      tagKey: value.tagKey,
-      tagValue: value.tagValue,
+      tagKey: value === null || value === void 0 ? void 0 : value.tagKey,
+      tagValue: value === null || value === void 0 ? void 0 : value.tagValue,
       closable: true,
       onClose: function onClose() {
         onRemoveFilter(tagItem);
@@ -117,11 +122,16 @@ var SearchTagList = function SearchTagList(props) {
     });
   };
 
+  var processDataSource = dataSource && dataSource.filter(function (t) {
+    var _t$value;
+
+    return !(0, _isArray.default)(t === null || t === void 0 ? void 0 : t.value) || (t === null || t === void 0 ? void 0 : (_t$value = t.value) === null || _t$value === void 0 ? void 0 : _t$value.length);
+  }) || [];
   return /*#__PURE__*/_react.default.createElement(_style.TagListWrap, {
     prefix: prefix,
     className: (0, _classnames.default)(_constants.baseTagListClassName, className),
     style: style
-  }, /*#__PURE__*/_react.default.createElement(TagGroup, null, dataSource && dataSource.length > 0 && dataSource.map(function (tagItem) {
+  }, /*#__PURE__*/_react.default.createElement(TagGroup, null, processDataSource.map(function (tagItem) {
     if (isTagLikeDataStructure(tagItem.value)) {
       return renderTags(tagItem);
     }
@@ -138,7 +148,7 @@ var SearchTagList = function SearchTagList(props) {
     }, /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement("label", {
       className: "console-tags-tag-label"
     }, tagItem.label), tagItem.valueLabel || tagItem.value));
-  }), dataSource && dataSource.length > 0 && /*#__PURE__*/_react.default.createElement("a", {
+  }), processDataSource.length > 0 && /*#__PURE__*/_react.default.createElement("a", {
     className: "remove-btn",
     onClick: onRemoveAllFilter
   }, "\u6E05\u9664\u7B5B\u9009\u6761\u4EF6")));

package/lib/style.js

@@ -15,7 +15,7 @@ var prefix = function prefix(props) {
 
 var SearchWarp = _styledComponents.default.div.withConfig({
   componentId: "sc-1afc1cn-0"
-})(["height:100%;width:100%;display:flex;.left-wrap{flex:1;border-left:1px solid rgba(192,198,204,1);border-bottom:1px solid rgba(192,198,204,1);border-top:1px solid rgba(192,198,204,1);border-right:1px solid rgba(192,198,204,1);display:flex;border-bottom-left-radius:2px;border-top-left-radius:2px;&.focus{border:1px solid #0064c8;border:1px solid var(--input-focus-border-color,#0064c8);;border-right:1px solid rgba(192,198,204,1);}.condition{height:26px;display:inline-block;margin-top:2px;}.condition-item{height:26px;display:inline-block;line-height:26px;background:#EFF3F8;border-radius:2px;background-color:#EFF3F8;padding:0 8px;margin:0 2px;font-size:12px;color:#333;position:relative;&-txt{padding-right:4px;}&:hover{background-color:#E0E4E8;}}.condition-select{width:100%;height:100%;opacity:0;position:absolute;top:0;left:0;min-width:auto;", "select-inner{min-width:auto;}}.forms{flex:1;position:relative;.clear-level1{position:absolute;top:1px;right:1px;height:28px;width:30px;background-color:#fff;z-index:99;color:#333;text-align:center;line-height:28px;font-size:12px;cursor:pointer;padding:6px 0 0 6px;}}.main-input{height:auto;border:none;box-shadow:none;&.single{flex:1;}&.select{width:100%;}&.multi{width:100%;}", "input,", "input{height:auto;box-shadow:none;}}", "input", "medium{height:auto;}}.right-wrap{width:32px;.search-btn{width:32px;padding:0 !important;border-bottom-left-radius:0;border-top-left-radius:0;&.focus{border-color:#0064c8;border-color:var(--input-focus-border-color,#0064c8);}border-left:none;}}"], prefix, prefix, prefix, prefix, prefix);
+})(["height:100%;width:100%;display:flex;.left-wrap{flex:1;border-left:1px solid rgba(192,198,204,1);border-bottom:1px solid rgba(192,198,204,1);border-top:1px solid rgba(192,198,204,1);border-right:1px solid rgba(192,198,204,1);display:flex;border-bottom-left-radius:var(--corner-1,2px);border-top-left-radius:var(--corner-1,2px);&.focus{border:1px solid #0064c8;border:1px solid var(--input-focus-border-color,#0064c8);;border-right:1px solid rgba(192,198,204,1);}.condition{height:26px;display:inline-block;margin-top:2px;}.condition-item{height:26px;display:inline-block;line-height:26px;background:#EFF3F8;border-radius:var(--corner-1,2px);background-color:#EFF3F8;padding:0 8px;margin:0 2px;font-size:12px;color:#333;position:relative;&-txt{padding-right:4px;}&:hover{background-color:#E0E4E8;}}.condition-select{width:100%;height:100%;opacity:0;position:absolute;top:0;left:0;min-width:auto;", "select-inner{min-width:auto;}}.forms{flex:1;position:relative;.clear-level1{position:absolute;top:1px;right:1px;height:28px;width:30px;background-color:#fff;z-index:99;color:#333;text-align:center;line-height:28px;font-size:12px;cursor:pointer;padding:6px 0 0 6px;}}.main-input{height:auto;border:none;box-shadow:none;&.single{flex:1;}&.select{width:100%;}&.multi{width:100%;}", "input,", "input{height:auto;box-shadow:none;}}", "input", "medium{height:auto;}}.right-wrap{width:32px;.search-btn{width:32px;padding:0 !important;border-bottom-left-radius:0;border-top-left-radius:0;&.focus{border-color:#0064c8;border-color:var(--input-focus-border-color,#0064c8);}border-left:none;}}"], prefix, prefix, prefix, prefix, prefix);
 
 exports.SearchWarp = SearchWarp;
 

package/package.json

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