@zgfe/business-lib 1.2.70-hxd.7 → 1.2.71-hxd.1

package/es/userGroup/index.js

@@ -4,12 +4,13 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0); } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i.return && (_r = _i.return(), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
-import React, { useEffect } from 'react';
+import React, { useEffect, useState } from 'react';
 import './styles/index.less';
 import { Dropdown, Skeleton, Tag, Tooltip } from 'antd';
 import IconFont from '../icon/iconFont';
 import Overlay from './overlay';
 import UserGroupContext from './context';
+import { errorShow, mergeData } from './util';
 import _ from 'lodash';
 import BizGlobalDataContext from '../context';
 export var classPrefix = 'biz-user-group';
@@ -20,7 +21,8 @@ var BizUserGroup = function BizUserGroup(_ref) {
     onDelete = _ref.onDelete,
     value = _ref.value,
     onChange = _ref.onChange,
-    placeholder = _ref.placeholder;
+    placeholder = _ref.placeholder,
+    errorData = _ref.errorData;
   var _React$useState = React.useState(false),
     _React$useState2 = _slicedToArray(_React$useState, 2),
     open = _React$useState2[0],
@@ -34,13 +36,46 @@ var BizUserGroup = function BizUserGroup(_ref) {
     tagList = _React$useContext.tagList,
     groupLoading = _React$useContext.groupLoading,
     tagLoading = _React$useContext.tagLoading;
+  var _useState = useState(function () {
+      return _.isArray(value) && errorData && errorData.length > 0 ? mergeData(tagList, errorData) : tagList;
+    }),
+    _useState2 = _slicedToArray(_useState, 2),
+    tagListData = _useState2[0],
+    setTagListData = _useState2[1];
+  var _useState3 = useState(function () {
+      return !_.isArray(value) && errorData && errorData.length > 0 ? mergeData(userGroupList, errorData) : userGroupList;
+    }),
+    _useState4 = _slicedToArray(_useState3, 2),
+    userGroupListData = _useState4[0],
+    setUserGroupListData = _useState4[1];
+  var _useState5 = useState(null),
+    _useState6 = _slicedToArray(_useState5, 1),
+    errorDataSelf = _useState6[0];
+  var _useState7 = useState(true),
+    _useState8 = _slicedToArray(_useState7, 2),
+    tagsStateLoading = _useState8[0],
+    setTagsStateLoading = _useState8[1];
+  useEffect(function () {
+    if (errorDataSelf && (errorDataSelf === null || errorDataSelf === void 0 ? void 0 : errorDataSelf.labels)) {
+      if (_.isArray(value)) {
+        setTagListData(tagList === null || tagList === void 0 ? void 0 : tagList.concat(errorDataSelf === null || errorDataSelf === void 0 ? void 0 : errorDataSelf.labels));
+      } else {
+        setUserGroupListData(userGroupList === null || userGroupList === void 0 ? void 0 : userGroupList.concat(errorDataSelf === null || errorDataSelf === void 0 ? void 0 : errorDataSelf.userGroups));
+      }
+    }
+  }, [errorDataSelf, tagList, userGroupList]);
+  useEffect(function () {
+    if (errorData === undefined) {
+      setTagsStateLoading(false);
+    }
+  }, []);
   useEffect(function () {
     if (groupLoading || tagLoading) return;
     var noLayers = ['fd', 'ep', 'sql', 'zj'];
     if (_.isArray(value)) {
       var selected = [];
       var _loop = function _loop() {
-        var tag = tagList[i];
+        var tag = tagListData[i];
         if (selected.length === value.length) return "break";
         value.forEach(function (item) {
           if (/:/.test(item)) {
@@ -54,7 +89,8 @@ var BizUserGroup = function BizUserGroup(_ref) {
                   id: tag.labelGroupId,
                   labelGroup: tag.labelGroup
                 }, tag, {
-                  layerLabelId: layerId
+                  layerLabelId: layerId,
+                  ancestryState: tag === null || tag === void 0 ? void 0 : tag.ancestryState
                 }]);
               } else {
                 var _tag$layers;
@@ -78,20 +114,20 @@ var BizUserGroup = function BizUserGroup(_ref) {
           }
         });
       };
-      for (var i = 0; i < (tagList === null || tagList === void 0 ? void 0 : tagList.length); i++) {
+      for (var i = 0; i < (tagListData === null || tagListData === void 0 ? void 0 : tagListData.length); i++) {
         var _ret = _loop();
         if (_ret === "break") break;
       }
       setChosen(selected);
     } else {
-      var userGroup = userGroupList === null || userGroupList === void 0 ? void 0 : userGroupList.find(function (item) {
+      var userGroup = userGroupListData === null || userGroupListData === void 0 ? void 0 : userGroupListData.find(function (item) {
         return item.id === value;
       });
       if (userGroup) {
         setChosen(userGroup);
       }
     }
-  }, [groupLoading, tagLoading]);
+  }, [groupLoading, tagLoading, tagListData, userGroupListData]);
   useEffect(function () {
     if (!onChange || groupLoading || tagLoading || open) return;
     if (!enableTags) {
@@ -116,7 +152,7 @@ var BizUserGroup = function BizUserGroup(_ref) {
       return choseData;
     });
   };
-  if (tagLoading || groupLoading) {
+  if (tagLoading || groupLoading || tagsStateLoading && errorData === undefined) {
     return /*#__PURE__*/React.createElement("div", {
       className: "".concat(classPrefix)
     }, /*#__PURE__*/React.createElement(Skeleton.Input, {
@@ -124,7 +160,7 @@ var BizUserGroup = function BizUserGroup(_ref) {
     }));
   }
   return /*#__PURE__*/React.createElement("div", {
-    className: "".concat(classPrefix)
+    className: "".concat(classPrefix, " ").concat(errorData ? 'errortext' : '')
   }, /*#__PURE__*/React.createElement(UserGroupContext.Provider, {
     value: {
       value: chosen,
@@ -143,7 +179,7 @@ var BizUserGroup = function BizUserGroup(_ref) {
     trigger: ['click'],
     onOpenChange: function onOpenChange(open) {
       if (_.isArray(chosen) && !chosen.length || chosen === undefined) {
-        setChosen(userGroupList === null || userGroupList === void 0 ? void 0 : userGroupList.find(function (item) {
+        setChosen(userGroupListData === null || userGroupListData === void 0 ? void 0 : userGroupListData.find(function (item) {
           return item.id === 0;
         }));
       }
@@ -154,8 +190,8 @@ var BizUserGroup = function BizUserGroup(_ref) {
     overlayStyle: {
       minWidth: 'initial'
     }
-  }, /*#__PURE__*/React.createElement("div", {
-    className: "".concat(classPrefix, "-handle ").concat(className)
+  }, /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("div", {
+    className: "".concat(classPrefix, "-handle ").concat(className, " ").concat(errorDataSelf && errorShow(value, errorDataSelf) ? 'errortext' : '')
   }, function () {
     if (!chosen || _.isArray(chosen) && !chosen.length) {
       return /*#__PURE__*/React.createElement("div", {
@@ -171,9 +207,11 @@ var BizUserGroup = function BizUserGroup(_ref) {
           tag = _ref3[1],
           layer = _ref3[2];
         var name = [tag.labelName];
-        if (layer === null || layer === void 0 ? void 0 : layer.layerLabelName) name.push(layer === null || layer === void 0 ? void 0 : layer.layerLabelName);
+        if ((layer === null || layer === void 0 ? void 0 : layer.layerLabelName) && tag.id !== (layer === null || layer === void 0 ? void 0 : layer.layerLabelId)) {
+          name.push(layer === null || layer === void 0 ? void 0 : layer.layerLabelName);
+        }
         return /*#__PURE__*/React.createElement(Tag, {
-          className: "".concat(classPrefix, "-handle-tags-item"),
+          className: "".concat(classPrefix, "-handle-tags-item state-").concat(layer === null || layer === void 0 ? void 0 : layer.ancestryState),
           key: "".concat(type.labelGroup, ":").concat(tag.id, ":").concat(layer === null || layer === void 0 ? void 0 : layer.layerLabelId),
           closable: enableDelete || !enableDelete && chosen.length > 1,
           onClose: function onClose(e) {
@@ -183,7 +221,7 @@ var BizUserGroup = function BizUserGroup(_ref) {
       }));
     }
     return /*#__PURE__*/React.createElement("span", {
-      className: "".concat(classPrefix, "-val")
+      className: "".concat(classPrefix, "-val ").concat(classPrefix, "-errorState-").concat(chosen === null || chosen === void 0 ? void 0 : chosen.ancestryState)
     }, chosen === null || chosen === void 0 ? void 0 : chosen.name);
   }(), /*#__PURE__*/React.createElement(IconFont, {
     type: "xiangxia",
@@ -198,6 +236,16 @@ var BizUserGroup = function BizUserGroup(_ref) {
     }
   }, /*#__PURE__*/React.createElement(IconFont, {
     type: "qingchu"
+  })))), errorDataSelf && errorShow(value, errorDataSelf) && /*#__PURE__*/React.createElement("div", {
+    className: "".concat(classPrefix, "-handle-errortext")
+  }, /*#__PURE__*/React.createElement(Tooltip, {
+    title: "".concat(_.isArray(value) ? '标签异常存在多种原因（如标签被删除），具体原因请前往标签列表查询' : '用户群异常情况说明：用户群内的圈选规则存在异常，具体原因请前往用户分群列表查询')
+  }, _.isArray(value) ? '标签' : '用户群', "\u5F02\u5E38\uFF0C\u8BF7\u91CD\u65B0\u9009\u62E9", /*#__PURE__*/React.createElement(IconFont, {
+    style: {
+      color: '#FB5547',
+      cursor: 'pointer'
+    },
+    type: "a-iconzhuyi"
   })))))));
 };
 BizUserGroup.defaultProps = {

package/es/userGroup/overlay.js

@@ -9,7 +9,7 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
 function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0); } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i.return && (_r = _i.return(), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import React, { useContext, useEffect, useState } from 'react';
-import { classPrefix } from '.';
+import { Tooltip } from 'antd';
 import CascaderOverlay from '../userTagsSelector/cascaderOverlay';
 import Search from '../userTagsSelector/components/search';
 import BizGlobalDataContext from '../context';
@@ -17,19 +17,33 @@ import List from 'rc-virtual-list';
 import _ from 'lodash';
 import IconFont from '../icon/iconFont';
 import UserGroupContext from './context';
+import { classPrefix } from '.';
 var GroupItem = function GroupItem(_ref) {
   var item = _ref.item,
     currentGroup = _ref.currentGroup,
     onClose = _ref.onClose,
     setCurrentGroup = _ref.setCurrentGroup;
-  return /*#__PURE__*/React.createElement("div", {
-    className: "".concat(classPrefix, "-item ").concat((currentGroup === null || currentGroup === void 0 ? void 0 : currentGroup.id) === item.id ? 'active' : ''),
+  var disable = item.ancestryState && item.ancestryState !== 1;
+  var itemData = /*#__PURE__*/React.createElement("div", {
+    className: "".concat(classPrefix, "-item ").concat(disable ? 'disable' : '', " ").concat((currentGroup === null || currentGroup === void 0 ? void 0 : currentGroup.id) === item.id ? 'active' : ''),
     key: item.id,
     onClick: function onClick() {
+      if (disable) return;
       setCurrentGroup(item);
       if (onClose) onClose();
     }
   }, item.name);
+  if (disable) {
+    return /*#__PURE__*/React.createElement(Tooltip, {
+      placement: "top",
+      title: "\u7528\u6237\u7FA4\u5F02\u5E38",
+      getPopupContainer: function getPopupContainer(triggerNode) {
+        return triggerNode;
+      }
+    }, itemData);
+  } else {
+    return itemData;
+  }
 };
 var Overlay = function Overlay(_ref2) {
   var onClose = _ref2.onClose,

package/es/userGroup/styles/index.less

@@ -5,7 +5,6 @@
   width: 100%;
   min-width: 208px;
   color: @text-color;
-
   &-handle {
     .__select-handle();
     display: flex;
@@ -19,6 +18,28 @@
         display: inline-block;
       }
     }
+    &-errortext {
+      display: flex;
+      gap: 2px;
+      align-items: center;
+      color: #fb5547;
+      font-size: 12px;
+      border-radius: 4px;
+      > div {
+        border: 1px solid #fb5547;
+      }
+      .bsicon {
+        margin-left: 4px;
+        font-size: 12px;
+      }
+    }
+  }
+  &-handle.errortext {
+    border: 1px solid #fb5547;
+    border-radius: 4px;
+    .biz-user-group-val {
+      color: #fb5547;
+    }
   }
   &-placeholder {
     flex: 1;
@@ -30,6 +51,11 @@
     overflow: hidden;
     text-overflow: ellipsis;
   }
+  &-errorState-2,
+  &-errorState-3,
+  &-errorState-4 {
+    color: #fb5547 !important;
+  }
   &-handle-tags {
     display: flex;
     flex: 1;
@@ -138,8 +164,36 @@
   &-item {
     .__select-option();
   }
+  &-item.disable:not(.active) {
+    color: #9aa1a9 !important;
+    cursor: not-allowed !important;
+    user-select: none !important;
+  }
   &-empty {
     .__select-nodata();
     flex: none;
   }
+  .state-2,
+  .state-3,
+  .state-4 {
+    color: #fb5547;
+    border-color: #feddda;
+    .ant-tag-close-icon {
+      color: #fb5547 !important;
+    }
+    &:not(.disable) {
+      &:hover {
+        color: #fb5547;
+        border-color: #feddda;
+      }
+    }
+  }
+}
+.biz-user-group.errortext {
+  color: #fb5547;
+  border-radius: 4px;
+  .biz-user-group-handle {
+    border: 1px solid #fb5547;
+    border-radius: 4px;
+  }
 }

package/es/userGroup/types.d.ts

@@ -6,6 +6,7 @@ export declare namespace UserGroupTypes {
         createTime: Date;
         name: string;
         updateTime: Date;
+        ancestryState?: number;
     }
     type Value = number | string[];
     interface Props {
@@ -15,6 +16,7 @@ export declare namespace UserGroupTypes {
         className?: string;
         enableDelete?: boolean;
         disableItemList?: Value[];
+        errorData?: any;
         onChange?: (val: Value) => void;
         onDelete?: () => void;
     }

package/es/userGroup/util.d.ts

@@ -0,0 +1,2 @@
+export declare const errorShow: (data: any, errorData: any) => any;
+export declare const mergeData: (data: any, errorData: any) => any;

package/es/userGroup/util.js

@@ -0,0 +1,47 @@
+import _ from 'lodash';
+export var errorShow = function errorShow(data, errorData) {
+  if (errorData === null) return null;
+  var _data = [];
+  if (data && _.isArray(data) && (errorData === null || errorData === void 0 ? void 0 : errorData.labels) && (errorData === null || errorData === void 0 ? void 0 : errorData.labels.length) > 0) {
+    data.map(function (itemData) {
+      errorData === null || errorData === void 0 ? void 0 : errorData.labels.map(function (item) {
+        if (item.ancestryState != 1) {
+          if (item.layers && item.layers.length > 0) {
+            item.layers.map(function (_item) {
+              if (item.id == itemData.split(':')[0] && _item.layerLabelId == itemData.split(':')[1]) {
+                _data.push(item);
+              }
+            });
+          } else {
+            if (item.id == itemData.split(':')[0]) {
+              _data.push(item);
+            }
+          }
+        }
+      });
+    });
+  }
+  if (data && !_.isArray(data) && (errorData === null || errorData === void 0 ? void 0 : errorData.userGroups) && (errorData === null || errorData === void 0 ? void 0 : errorData.userGroups.length) > 0) {
+    errorData === null || errorData === void 0 ? void 0 : errorData.userGroups.map(function (item) {
+      if (item.ancestryState != 1 && data == item.id) {
+        _data.push(item);
+      }
+    });
+  }
+  return _data.length <= 0 ? null : _data;
+};
+export var mergeData = function mergeData(data, errorData) {
+  var newList = [];
+  var ids = [];
+  errorData && errorData.map(function (item) {
+    ids.push(item.id);
+    newList.push(item);
+  });
+  data && data.map(function (item) {
+    if (ids.indexOf(item.id) === -1) {
+      ids.push(item.id);
+      newList.push(item);
+    }
+  });
+  return newList;
+};

package/es/userGroupHeader/demo/index.js

@@ -11,7 +11,7 @@ export default (function () {
   }, /*#__PURE__*/React.createElement(BizUserGroupHeader, {
     max: 3,
     enableTags: true,
-    value: [0],
+    value: [['997:1481997583073282', '982:982', '979:fd']],
     onChange: function onChange(value) {
       console.log('>>>>>>>>回传值', value);
     }

package/es/userGroupHeader/index.d.ts

@@ -8,5 +8,6 @@ declare const BizUserGroupHeader: React.FC<{
     enableTags?: boolean;
     title?: string;
     placeholder?: string;
+    isOpenComparison?: boolean;
 }>;
 export default BizUserGroupHeader;

package/es/userGroupHeader/index.js

@@ -8,27 +8,40 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0); } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i.return && (_r = _i.return(), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
-import React, { useEffect, useContext } from 'react';
+import React, { useEffect, useContext, useState } from 'react';
 import './styles/index.less';
-import { Space, Tooltip } from 'antd';
+import { Space, Tooltip, Spin, Modal } from 'antd';
 import BizUserGroup from '../userGroup';
 import IconFont from '../icon/iconFont';
 import BizGlobalDataContext from '../context';
+import { errorShow } from '../userGroup/util';
 import _ from 'lodash';
+var confirm = Modal.confirm;
 var BizUserGroupHeader = function BizUserGroupHeader(_ref) {
   var max = _ref.max,
     value = _ref.value,
     onChange = _ref.onChange,
     enableTags = _ref.enableTags,
     title = _ref.title,
-    placeholder = _ref.placeholder;
+    placeholder = _ref.placeholder,
+    isOpenComparison = _ref.isOpenComparison;
   var _useContext = useContext(BizGlobalDataContext),
     currentApp = _useContext.currentApp;
   var classPrefix = 'biz-user-group-header';
+  var _useState = useState(null),
+    _useState2 = _slicedToArray(_useState, 1),
+    errorData = _useState2[0];
+  var _useState3 = useState(true),
+    _useState4 = _slicedToArray(_useState3, 2),
+    tagsStateLoading = _useState4[0],
+    setTagsStateLoading = _useState4[1];
   var _React$useState = React.useState([]),
     _React$useState2 = _slicedToArray(_React$useState, 2),
     tempValue = _React$useState2[0],
     setTempValue = _React$useState2[1];
+  useEffect(function () {
+    setTagsStateLoading(false);
+  }, []);
   useEffect(function () {
     var defaultValue = (value === null || value === void 0 ? void 0 : value.map(function (item) {
       return {
@@ -47,6 +60,23 @@ var BizUserGroupHeader = function BizUserGroupHeader(_ref) {
     }));
   }, [tempValue]);
   function onAdd() {
+    if (isOpenComparison) {
+      confirm({
+        className: "".concat(classPrefix, "-confirm"),
+        title: /*#__PURE__*/React.createElement("div", null, "\u63D0\u793A"),
+        width: 520,
+        okText: '知道了',
+        content: '您已经选择时间周期对比分析漏斗，无法再进行多群组数据对比分析漏斗，为了保证您的分析准确，请先取消已选择对比时间段。',
+        cancelButtonProps: {
+          style: {
+            display: 'none'
+          }
+        },
+        onOk: function onOk() {},
+        onCancel: function onCancel() {}
+      });
+      return;
+    }
     if (max && tempValue.length >= max) return;
     var list = _toConsumableArray(tempValue);
     list.push({
@@ -54,6 +84,11 @@ var BizUserGroupHeader = function BizUserGroupHeader(_ref) {
     });
     setTempValue(list);
   }
+  if (tagsStateLoading) {
+    return /*#__PURE__*/React.createElement(Spin, {
+      spinning: true
+    });
+  }
   return /*#__PURE__*/React.createElement("div", {
     className: classPrefix
   }, /*#__PURE__*/React.createElement("div", {
@@ -62,7 +97,8 @@ var BizUserGroupHeader = function BizUserGroupHeader(_ref) {
     size: 16,
     className: "".concat(classPrefix, "-container")
   }, [tempValue.map(function (item, i) {
-    return /*#__PURE__*/React.createElement(BizUserGroup, {
+    var _errorShow = errorShow(item.value, errorData);
+    return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(BizUserGroup, {
       key: item.id,
       value: item.value,
       enableDelete: tempValue.length > 1,
@@ -77,8 +113,19 @@ var BizUserGroupHeader = function BizUserGroupHeader(_ref) {
         list[i].value = val;
         setTempValue(list);
       },
-      placeholder: placeholder || '请选择分群'
-    });
+      placeholder: placeholder || '请选择分群',
+      errorData: _errorShow
+    }), errorData && _errorShow && /*#__PURE__*/React.createElement("div", {
+      className: "".concat(classPrefix, "-handle-errortext")
+    }, /*#__PURE__*/React.createElement(Tooltip, {
+      title: "".concat(_.isArray(item.value) ? '标签异常存在多种原因（如标签被删除），具体原因请前往标签列表查询' : '用户群异常情况说明：用户群内的圈选规则存在异常，具体原因请前往用户分群列表查询')
+    }, _.isArray(item.value) ? '标签' : '用户群', "\u5F02\u5E38\uFF0C\u8BF7\u91CD\u65B0\u9009\u62E9", /*#__PURE__*/React.createElement(IconFont, {
+      style: {
+        color: '#FB5547',
+        cursor: 'pointer'
+      },
+      type: "a-iconzhuyi"
+    }))));
   })], /*#__PURE__*/React.createElement(Tooltip, {
     title: "\u6DFB\u52A0\u5206\u7FA4\u505A\u5BF9\u6BD4"
   }, /*#__PURE__*/React.createElement(IconFont, {

package/es/userGroupHeader/styles/index.less

@@ -21,11 +21,30 @@
     width: 208px;
   }
   &-container {
+    align-items: flex-start !important;
     width: 100%;
     padding: @padding-xss @padding-lg;
-
     &:hover {
-      background: #e8efff;
+      background: #e7f3fe;
+    }
+  }
+  &-handle-errortext {
+    display: flex;
+    gap: 2px;
+    align-items: center;
+    color: #fb5547;
+    font-size: 12px;
+    .bsicon {
+      margin-left: 4px;
+      font-size: 13px;
+    }
+  }
+  &-confirm {
+    .anticon {
+      display: none;
+    }
+    .ant-modal-confirm-content {
+      margin-left: 0 !important;
     }
   }
 }

package/es/userTagsSelector/cascaderOverlay.d.ts

@@ -1,5 +1,8 @@
 import React from 'react';
 import './styles/cascaderOverlay.less';
 import { UserTagsSelectorTypes } from './types';
-declare const CascaderOverlay: React.FC<UserTagsSelectorTypes.CascaderOverlayProps>;
+type FCWithDefaultProps<P> = React.FC<P> & {
+    defaultProps?: Partial<P>;
+};
+declare const CascaderOverlay: FCWithDefaultProps<UserTagsSelectorTypes.CascaderOverlayProps>;
 export default CascaderOverlay;

package/es/userTagsSelector/cascaderOverlay.js

@@ -29,6 +29,8 @@ import { Spin } from 'antd';
 import Request from 'umi-request';
 import { getLayerLabelId } from './util';
 import { LabelCreateType } from '../userCondition/types';
+import { BizUserConditionContext } from '../userCondition';
+import { repeatMergeHandle } from './util';
 var CancelToken = Request.CancelToken;
 var cancel;
 var CascaderOverlay = function CascaderOverlay(props) {
@@ -43,6 +45,10 @@ var CascaderOverlay = function CascaderOverlay(props) {
     _useState2 = _slicedToArray(_useState, 2),
     highlightText = _useState2[0],
     setHighlightText = _useState2[1];
+  var _useContext = useContext(BizUserConditionContext),
+    userTagsData = _useContext.userTagsData,
+    searchUserTagsData = _useContext.searchUserTagsData,
+    setSearchUserTagsData = _useContext.setSearchUserTagsData;
   var _useState3 = useState([]),
     _useState4 = _slicedToArray(_useState3, 2),
     groupList = _useState4[0],
@@ -67,8 +73,8 @@ var CascaderOverlay = function CascaderOverlay(props) {
     _useState14 = _slicedToArray(_useState13, 2),
     currentPage = _useState14[0],
     setCurrentPage = _useState14[1];
-  var _useContext = useContext(BizGlobalDataContext),
-    currentApp = _useContext.currentApp;
+  var _useContext2 = useContext(BizGlobalDataContext),
+    currentApp = _useContext2.currentApp;
   var pId = Math.random();
   var groupMap = useMemo(function () {
     var data = {};
@@ -169,6 +175,7 @@ var CascaderOverlay = function CascaderOverlay(props) {
     }).then(function (res) {
       if ((res === null || res === void 0 ? void 0 : res.data) && res.data.results) {
         var result = res.data.results;
+        setSearchUserTagsData && setSearchUserTagsData(repeatMergeHandle(userTagsData, searchUserTagsData, result));
         setGroupList(function (group) {
           return group.map(function (item) {
             if (item.labelGroup === currentSelect) {

package/es/userTagsSelector/components/tagList/index.d.ts

@@ -1,7 +1,10 @@
 import React from 'react';
 import { UserTagsSelectorTypes } from '../../types';
 import './index.less';
-declare const TagListScroll: React.FC<{
+type FCWithDefaultProps<P> = React.FC<P> & {
+    defaultProps?: Partial<P>;
+};
+declare const TagListScroll: FCWithDefaultProps<{
     id: number;
     value: UserTagsSelectorTypes.TagValue[];
     total: number;

package/es/userTagsSelector/groups/index.d.ts

@@ -1,4 +1,7 @@
 import React from 'react';
 import { UserTagsSelectorTypes } from '../types';
-declare const Groups: React.FC<UserTagsSelectorTypes.Groups>;
+type FCWithDefaultProps<P> = React.FC<P> & {
+    defaultProps?: Partial<P>;
+};
+declare const Groups: FCWithDefaultProps<UserTagsSelectorTypes.Groups>;
 export default Groups;

package/es/userTagsSelector/index.d.ts

@@ -2,5 +2,8 @@ import React from 'react';
 import './styles/index.less';
 import { UserTagsSelectorTypes } from './types';
 export declare const classPrefix = "biz-user-tags-selector";
-declare const UserTagsSelect: React.FC<UserTagsSelectorTypes.Props>;
+type FCWithDefaultProps<P> = React.FC<P> & {
+    defaultProps?: Partial<P>;
+};
+declare const UserTagsSelect: FCWithDefaultProps<UserTagsSelectorTypes.Props>;
 export default UserTagsSelect;