@alicloud/console-components-search 0.2.2 → 0.2.3

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

@@ -1,7 +1,7 @@
 开始构建微应用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 12.79s
+✔ Webpack: Compiled successfully in 11.92s
  WARN  asset size limit: The following asset(s) exceed the recommended size limit (244 KiB).
 This can impact web performance.
 Assets: 

package/es/modeSingleSingle/index2.js

@@ -124,8 +124,7 @@ var ComplexSearch = function ComplexSearch(props) {
   var field = Field.useField();
   var init = field.init,
       getValue = field.getValue,
-      reset = field.reset,
-      getError = field.getError;
+      reset = field.reset;
   var focusProps = {
     onFocus: function onFocus() {
       setFocused(true);

package/es/searchTagList/index.js

@@ -1,12 +1,32 @@
+import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
+
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+
 import React from "react";
 import classNames from 'classnames';
 import { ConfigProvider, Tag } from '@alicloud/console-components';
 import { TagListWrap } from '../style';
 import { baseTagListClassName } from '../constants';
+import isArray from 'lodash/isArray';
 import PureTag from "./PureTag";
 var TagGroup = Tag.Group,
     ClosableTag = Tag.Closeable;
+/**
+ * 判断是否是 标签 的数据结构
+ */
+
+var isTagLikeDataStructure = function isTagLikeDataStructure(value) {
+  var isTag = !!value.tagKey;
+
+  if (isArray(value)) {
+    return value[0] && !!value[0].tagKey;
+  }
+
+  return isTag;
+};
 
 var SearchTagList = function SearchTagList(props) {
   var dataSource = props.dataSource,
@@ -17,7 +37,7 @@ var SearchTagList = function SearchTagList(props) {
       _props$prefix = props.prefix,
       prefix = _props$prefix === void 0 ? "next-" : _props$prefix;
 
-  function onRemoveTag(item) {
+  var onRemoveFilter = function onRemoveFilter(item) {
     var newTagList = _toConsumableArray(dataSource);
 
     if (onChange) {
@@ -27,33 +47,66 @@ var SearchTagList = function SearchTagList(props) {
       var deletedTags = newTagList.splice(resFindIndex, 1);
       onChange(deletedTags[0], newTagList);
     }
-  }
+  };
 
-  function onRemoveAllTag() {
+  var onRemoveAllFilter = function onRemoveAllFilter() {
     if (onClear) {
       onClear();
     }
-  }
+  };
+
+  var onRemoveTag = function onRemoveTag(item, tag) {
+    var newDataSource = _toConsumableArray(dataSource);
+
+    if (onChange) {
+      var resFindIndex = item.value.findIndex(function (x) {
+        return x.tagKey === tag.tagKey && x.tagValue === tag.tagValue;
+      });
+      var deletedTags = item.value.splice(resFindIndex, 1);
+      onChange(_objectSpread(_objectSpread({}, item), {}, {
+        value: deletedTags
+      }), newDataSource);
+    }
+  };
+
+  var renderTags = function renderTags(tagItem) {
+    var value = tagItem.value;
+
+    if (isArray(value)) {
+      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,
+          closable: true,
+          onClose: function onClose() {
+            onRemoveTag(tagItem, t);
+            return true;
+          }
+        });
+      });
+    }
+
+    return /*#__PURE__*/React.createElement(PureTag, {
+      showLabel: true,
+      tagKey: value.tagKey,
+      tagValue: value.tagValue,
+      closable: true,
+      onClose: function onClose() {
+        onRemoveFilter(tagItem);
+        return true;
+      }
+    });
+  };
 
   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) {
-    var value = tagItem.value;
-    var isTag = !!value.tagKey;
-
-    if (isTag) {
-      return /*#__PURE__*/React.createElement(PureTag, {
-        showLabel: true,
-        tagKey: value.tagKey,
-        tagValue: value.tagKey,
-        closable: true,
-        onClose: function onClose() {
-          onRemoveTag(tagItem);
-          return true;
-        }
-      });
+    if (isTagLikeDataStructure(tagItem.value)) {
+      return renderTags(tagItem);
     }
 
     return /*#__PURE__*/React.createElement(ClosableTag, {
@@ -62,15 +115,15 @@ var SearchTagList = function SearchTagList(props) {
       type: "normal",
       size: "medium",
       onClose: function onClose() {
-        onRemoveTag(tagItem);
+        onRemoveFilter(tagItem);
         return true;
       }
-    }, /*#__PURE__*/React.createElement("label", {
+    }, /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("label", {
       className: "console-tags-tag-label"
-    }, tagItem.label), tagItem.value || tagItem.valueLabel);
+    }, tagItem.label), tagItem.value || tagItem.valueLabel));
   }), dataSource && dataSource.length > 0 && /*#__PURE__*/React.createElement("a", {
     className: "remove-btn",
-    onClick: onRemoveAllTag
+    onClick: onRemoveAllFilter
   }, "\u6E05\u9664\u7B5B\u9009\u6761\u4EF6")));
 };
 

package/lib/modeSingleSingle/index2.js

@@ -153,8 +153,7 @@ var ComplexSearch = function ComplexSearch(props) {
 
   var init = field.init,
       getValue = field.getValue,
-      reset = field.reset,
-      getError = field.getError;
+      reset = field.reset;
   var focusProps = {
     onFocus: function onFocus() {
       setFocused(true);

package/lib/searchTagList/index.js

@@ -7,6 +7,8 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 
 var _react = _interopRequireDefault(require("react"));
@@ -19,10 +21,29 @@ var _style = require("../style");
 
 var _constants = require("../constants");
 
+var _isArray = _interopRequireDefault(require("lodash/isArray"));
+
 var _PureTag = _interopRequireDefault(require("./PureTag"));
 
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+
 var TagGroup = _consoleComponents.Tag.Group,
     ClosableTag = _consoleComponents.Tag.Closeable;
+/**
+ * 判断是否是 标签 的数据结构
+ */
+
+var isTagLikeDataStructure = function isTagLikeDataStructure(value) {
+  var isTag = !!value.tagKey;
+
+  if ((0, _isArray.default)(value)) {
+    return value[0] && !!value[0].tagKey;
+  }
+
+  return isTag;
+};
 
 var SearchTagList = function SearchTagList(props) {
   var dataSource = props.dataSource,
@@ -33,7 +54,7 @@ var SearchTagList = function SearchTagList(props) {
       _props$prefix = props.prefix,
       prefix = _props$prefix === void 0 ? "next-" : _props$prefix;
 
-  function onRemoveTag(item) {
+  var onRemoveFilter = function onRemoveFilter(item) {
     var newTagList = (0, _toConsumableArray2.default)(dataSource);
 
     if (onChange) {
@@ -43,33 +64,66 @@ var SearchTagList = function SearchTagList(props) {
       var deletedTags = newTagList.splice(resFindIndex, 1);
       onChange(deletedTags[0], newTagList);
     }
-  }
+  };
 
-  function onRemoveAllTag() {
+  var onRemoveAllFilter = function onRemoveAllFilter() {
     if (onClear) {
       onClear();
     }
-  }
+  };
+
+  var onRemoveTag = function onRemoveTag(item, tag) {
+    var newDataSource = (0, _toConsumableArray2.default)(dataSource);
+
+    if (onChange) {
+      var resFindIndex = item.value.findIndex(function (x) {
+        return x.tagKey === tag.tagKey && x.tagValue === tag.tagValue;
+      });
+      var deletedTags = item.value.splice(resFindIndex, 1);
+      onChange(_objectSpread(_objectSpread({}, item), {}, {
+        value: deletedTags
+      }), newDataSource);
+    }
+  };
+
+  var renderTags = function renderTags(tagItem) {
+    var value = tagItem.value;
+
+    if ((0, _isArray.default)(value)) {
+      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,
+          closable: true,
+          onClose: function onClose() {
+            onRemoveTag(tagItem, t);
+            return true;
+          }
+        });
+      });
+    }
+
+    return /*#__PURE__*/_react.default.createElement(_PureTag.default, {
+      showLabel: true,
+      tagKey: value.tagKey,
+      tagValue: value.tagValue,
+      closable: true,
+      onClose: function onClose() {
+        onRemoveFilter(tagItem);
+        return true;
+      }
+    });
+  };
 
   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) {
-    var value = tagItem.value;
-    var isTag = !!value.tagKey;
-
-    if (isTag) {
-      return /*#__PURE__*/_react.default.createElement(_PureTag.default, {
-        showLabel: true,
-        tagKey: value.tagKey,
-        tagValue: value.tagKey,
-        closable: true,
-        onClose: function onClose() {
-          onRemoveTag(tagItem);
-          return true;
-        }
-      });
+    if (isTagLikeDataStructure(tagItem.value)) {
+      return renderTags(tagItem);
     }
 
     return /*#__PURE__*/_react.default.createElement(ClosableTag, {
@@ -78,15 +132,15 @@ var SearchTagList = function SearchTagList(props) {
       type: "normal",
       size: "medium",
       onClose: function onClose() {
-        onRemoveTag(tagItem);
+        onRemoveFilter(tagItem);
         return true;
       }
-    }, /*#__PURE__*/_react.default.createElement("label", {
+    }, /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement("label", {
       className: "console-tags-tag-label"
-    }, tagItem.label), tagItem.value || tagItem.valueLabel);
+    }, tagItem.label), tagItem.value || tagItem.valueLabel));
   }), dataSource && dataSource.length > 0 && /*#__PURE__*/_react.default.createElement("a", {
     className: "remove-btn",
-    onClick: onRemoveAllTag
+    onClick: onRemoveAllFilter
   }, "\u6E05\u9664\u7B5B\u9009\u6761\u4EF6")));
 };
 

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

@@ -7,7 +7,7 @@ export interface IRcSearchTagItemProps {
     /**
      * tag的类别展示名称
      */
-    label: string;
+    label?: string;
     /**
      * tag的类别的key
      */

package/package.json

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