@zgfe/business-lib 1.0.25-userGroupFix.0 → 1.0.25

package/es/userCondition/util.js

@@ -1,3 +1,9 @@
+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; }
+
+function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+
 export function buildCondition(type) {
   switch (type) {
     case 'add':
@@ -99,17 +105,45 @@ export function findPropAndEnv(name, list) {
 
   return null;
 }
-export function findTagFactory(data) {
-  return function (id) {
+export function buildSelectLayer(data) {
+  return function (layerLabelId) {
     var i = -1;
     var j = data.findIndex(function (item) {
-      i = item.children.findIndex(function (tag) {
-        return tag.labelId === id;
+      i = item.layers.findIndex(function (layer) {
+        return layer.layerLabelId === layerLabelId;
       });
       if (i < 0) return false;
       return true;
     });
     if (j < 0) return null;
-    return data[j].children[i];
+    return [{
+      labelGroup: data[j].labelGroup
+    }, {
+      id: data[j].id,
+      labelName: data[j].labelName
+    }, {
+      layerLabelId: data[j].layers[i].layerLabelId,
+      layerLabelName: data[j].layers[i].layerLabelName
+    }];
   };
+}
+export function buildTagsGroup(list) {
+  var groupOrder = ['基本标签', '活跃标签', '行为标签', '预测标签', '其它标签'];
+  var groupsMap = {};
+  var options = [];
+  list.forEach(function (label) {
+    if (Object.hasOwn(groupsMap, label.labelGroup)) {
+      groupsMap[label.labelGroup].children.push(_objectSpread({}, label));
+    } else {
+      var group = {
+        labelGroup: label.labelGroup,
+        children: [_objectSpread({}, label)]
+      };
+      groupsMap[label.labelGroup] = group;
+    }
+  });
+  groupOrder.map(function (group) {
+    groupsMap[group] && options.push(groupsMap[group]);
+  });
+  return options;
 }

package/es/userTagsSelector/cascaderOverlay.js

@@ -1,3 +1,7 @@
+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; }
+
 function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
 
 function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
@@ -6,6 +10,8 @@ function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symb
 
 function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
 
+function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
@@ -18,49 +24,77 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
-import React from 'react';
+import React, { useRef } from 'react';
 import { useState } from 'react';
 import { classPrefix } from '.';
 import './styles/cascaderOverlay.less';
 import Groups from './groups/index';
 import MultipleCheckPanel from './multipleCheckPanel';
-import { getFieldFactory } from './util';
+import { filterFactory, getFieldFactory } from './util';
 import _ from 'lodash';
+import Search from './components/search';
 
 var CascaderOverlay = function CascaderOverlay(props) {
-  var data = props.data,
-      currentValue = props.currentValue,
+  var currentValue = props.currentValue,
       labelFields = props.labelFields,
       keyFields = props.keyFields,
       valueFields = props.valueFields,
       childFields = props.childFields;
+  var timer = useRef(null);
 
-  var _useState = useState(function () {
-    var initPath = [];
-    var curr = data[0];
-    var getChildField = getFieldFactory(childFields);
-
-    while (curr) {
-      initPath.push(curr);
-      curr = curr[getChildField()];
-    }
-
-    initPath.pop();
-    return initPath;
-  }),
+  var _useState = useState(props.data || []),
       _useState2 = _slicedToArray(_useState, 2),
-      currentPath = _useState2[0],
-      setCurrentPath = _useState2[1];
+      data = _useState2[0],
+      setData = _useState2[1];
+
+  var _useState3 = useState(initPath(data)),
+      _useState4 = _slicedToArray(_useState3, 2),
+      currentPath = _useState4[0],
+      setCurrentPath = _useState4[1];
+
+  var _useState5 = useState(''),
+      _useState6 = _slicedToArray(_useState5, 2),
+      highlightText = _useState6[0],
+      setHighlightText = _useState6[1];
+
+  function initPath(data) {
+    return function () {
+      var path = [];
+      var curr = data[0];
+      var getChildField = getFieldFactory(childFields);
+
+      while (curr) {
+        path.push(curr);
+        var childField = getChildField();
+
+        if (_.isArray(curr[childField])) {
+          curr = curr[childField].length ? curr[childField][0] : null;
+        } else {
+          curr = curr[childField];
+        }
+      }
+
+      path.pop();
+      return path;
+    };
+  }
 
   function onActive(data, level) {
     var currIndex = level;
     var getChildField = getFieldFactory(childFields.slice(currIndex).length ? childFields.slice(currIndex) : childFields.slice(-1));
     var curr = data;
-    var newPath = currentPath.slice();
+    var newPath = currentPath.slice(0, level + 1);
 
     while (curr) {
       newPath[currIndex] = curr;
-      curr = curr[getChildField()];
+      var childField = getChildField();
+
+      if (_.isArray(curr[childField])) {
+        curr = curr[childField].length ? curr[childField][0] : null;
+      } else {
+        curr = curr[childField];
+      }
+
       currIndex++;
     }
 
@@ -70,8 +104,13 @@ var CascaderOverlay = function CascaderOverlay(props) {
 
   function onCheck(data) {
     var getVabelField = getFieldFactory(valueFields);
+    var getLabelField = getFieldFactory(labelFields);
     var newValue = currentPath.map(function (item) {
-      return item[getVabelField()];
+      var _ref;
+
+      var labelField = getLabelField();
+      var valueField = getVabelField();
+      return _ref = {}, _defineProperty(_ref, labelField, item[labelField]), _defineProperty(_ref, valueField, item[valueField]), _ref;
     }).concat(data);
     props.onChange([].concat(_toConsumableArray(currentValue), [newValue]));
   }
@@ -85,30 +124,81 @@ var CascaderOverlay = function CascaderOverlay(props) {
     props.onChange(newValues);
   }
 
+  function onSearch(val) {
+    timer.current && clearTimeout(timer.current);
+    timer.current = setTimeout(function () {
+      var _labelFields$, _props$data;
+
+      var res = [];
+      var filter = filterFactory((_labelFields$ = labelFields[1]) !== null && _labelFields$ !== void 0 ? _labelFields$ : labelFields[0], val);
+      (_props$data = props.data) === null || _props$data === void 0 ? void 0 : _props$data.forEach(function (item) {
+        var searchList = item[childFields[0]].filter(filter);
+
+        if (searchList.length) {
+          res.push(_objectSpread(_objectSpread({}, item), {}, _defineProperty({}, childFields[0], item[childFields[0]].filter(filter))));
+        }
+      });
+      setData(res);
+      setCurrentPath(initPath(res));
+      setHighlightText(val);
+    }, 300);
+  }
+
+  function render() {
+    if (!data.length) return /*#__PURE__*/React.createElement("div", {
+      style: {
+        padding: 8,
+        width: 596
+      }
+    }, "\u6682\u65E0\u6570\u636E");
+    return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
+      className: "".concat(classPrefix, "-overlay-groups")
+    }, /*#__PURE__*/React.createElement(Groups, {
+      key: 0,
+      currentValue: currentValue,
+      valueField: valueFields[0],
+      keyField: keyFields[0],
+      childField: childFields[0],
+      labelField: labelFields[0],
+      data: data,
+      onActive: onActive,
+      level: 0
+    })), /*#__PURE__*/React.createElement("div", {
+      className: "".concat(classPrefix, "-overlay-groups")
+    }, /*#__PURE__*/React.createElement(Groups, {
+      currentValue: currentValue,
+      valueField: valueFields[1],
+      keyField: keyFields[1],
+      childField: childFields[1],
+      labelField: labelFields[1],
+      data: currentPath[0] ? currentPath[0][childFields[0]] : [],
+      onActive: onActive,
+      highlightText: highlightText,
+      level: 1
+    })), /*#__PURE__*/React.createElement("div", {
+      className: "".concat(classPrefix, "-overlay-selections")
+    }, /*#__PURE__*/React.createElement(MultipleCheckPanel, {
+      valueField: valueFields[2],
+      onCheck: onCheck,
+      onUncheck: onUncheck,
+      currentValue: currentValue,
+      level: 2,
+      labelField: labelFields[2],
+      data: currentPath[1] ? currentPath[1][childFields[1]] : []
+    })));
+  }
+
   return /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-overlay")
   }, /*#__PURE__*/React.createElement("div", {
-    className: "".concat(classPrefix, "-overlay-groups")
-  }, /*#__PURE__*/React.createElement(Groups, {
-    currentValue: currentValue,
-    valueField: valueFields[0],
-    keyField: keyFields[0],
-    childField: childFields[0],
-    labelField: labelFields[0],
-    data: data,
-    onActive: onActive,
-    level: 0
+    className: "".concat(classPrefix, "-overlay-search")
+  }, /*#__PURE__*/React.createElement(Search, {
+    show: true,
+    onChange: onSearch,
+    placeholder: "\u641C\u7D22\u6807\u7B7E\u540D\u79F0"
   })), /*#__PURE__*/React.createElement("div", {
-    className: "".concat(classPrefix, "-overlay-selections")
-  }, /*#__PURE__*/React.createElement(MultipleCheckPanel, {
-    valueField: valueFields[1],
-    onCheck: onCheck,
-    onUncheck: onUncheck,
-    currentValue: currentValue,
-    level: 1,
-    labelField: labelFields[1],
-    data: currentPath[0][childFields[0]]
-  })));
+    className: "".concat(classPrefix, "-overlay-panel")
+  }, render()));
 };
 
 export default CascaderOverlay;

package/es/userTagsSelector/demo/index.js

@@ -22,7 +22,14 @@ data.forEach(function (item) {
     var id = Math.random();
     var tag = {
       id: id,
-      labelName: '标签' + id + id + id + id
+      labelName: '标签' + id + id + id + id,
+      layers: Array(5 * Math.random() >> 0).fill(1).map(function (_item, i) {
+        var layer = {
+          layerLabelId: Math.random(),
+          layerLabelName: '分层' + i
+        };
+        return layer;
+      })
     };
 
     if (id < 0.6 && defaultValue.length < 20) {
@@ -38,11 +45,11 @@ export default (function () {
   }
 
   return /*#__PURE__*/React.createElement(BizUserTagsSelect, {
-    childFields: ['children'],
+    childFields: ['children', 'layers'],
     data: data,
-    keyFields: ['labelGroup', 'id'],
-    labelFields: ['labelGroup', 'labelName'],
-    valueFields: ['labelGroup', 'labelId'],
+    keyFields: ['labelGroup', 'id', 'id'],
+    labelFields: ['labelGroup', 'labelName', 'layerLabelName'],
+    valueFields: ['labelGroup', 'labelName', 'id'],
     onChange: onChange
   });
 });

package/es/userTagsSelector/groups/groupOption.js

@@ -1,7 +1,7 @@
 import React, { forwardRef } from 'react';
 import { Badge } from 'antd';
 import { classPrefix } from '..';
-import theme from '../../assets/theme.js';
+import { theme } from '../../assets/theme.js';
 import './styles/option.less';
 import { util } from '../../utils';
 var GroupOption = /*#__PURE__*/forwardRef(function (props, ref) {
@@ -30,7 +30,8 @@ var GroupOption = /*#__PURE__*/forwardRef(function (props, ref) {
       return _onClick(value);
     },
     className: ["".concat(classPrefix, "-group-option"), actived ? 'active' : '', checked ? 'checked' : ''].join(' '),
-    ref: ref
+    ref: ref,
+    title: label
   }, /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-group-option-label")
   }, renderLabel()), /*#__PURE__*/React.createElement("div", {

package/es/userTagsSelector/groups/index.js

@@ -10,7 +10,7 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
-import React, { useMemo } from 'react';
+import React, { useEffect, useMemo } from 'react';
 import VirtualList from 'rc-virtual-list';
 import { classPrefix } from '../';
 import GroupOption from './groupOption';
@@ -33,11 +33,21 @@ var Groups = function Groups(props) {
       searchValue = _useState2[0],
       setSearchValue = _useState2[1];
 
-  var _useState3 = useState(data[0][valueField]),
+  var _useState3 = useState(data.length ? data[0][valueField] : null),
       _useState4 = _slicedToArray(_useState3, 2),
       active = _useState4[0],
       setActive = _useState4[1];
 
+  var searchFilter = useMemo(function () {
+    return filterFactory(labelField, searchValue);
+  }, [labelField, searchValue]);
+  var isChecked = useMemo(function () {
+    return isCheckedFactory(currentValue, level);
+  }, [currentValue, level]);
+  useEffect(function () {
+    if (data.length) setActive(data[0][valueField]);
+  }, [data]);
+
   function _onClick(i) {
     setActive(data[i][valueField]);
     props.onActive(data[i], level);
@@ -47,12 +57,6 @@ var Groups = function Groups(props) {
     setSearchValue(val);
   }
 
-  var searchFilter = useMemo(function () {
-    return filterFactory(labelField, searchValue);
-  }, [labelField, searchValue]);
-  var isChecked = useMemo(function () {
-    return isCheckedFactory(currentValue, level);
-  }, [currentValue, level]);
   if (!data.length) return /*#__PURE__*/React.createElement("span", null, "\u6682\u65E0\u6570\u636E");
   return /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-groups-panel")
@@ -61,19 +65,22 @@ var Groups = function Groups(props) {
     onChange: onSearch
   }), /*#__PURE__*/React.createElement(VirtualList, {
     data: searchable ? data.filter(searchFilter) : data,
-    height: 408,
+    height: 360,
+    itemHeight: 48,
     itemKey: keyField
   }, function (item, index) {
+    var _props$highlightText;
+
     return /*#__PURE__*/React.createElement(GroupOption, {
       onClick: function onClick() {
         return _onClick(index);
       },
       actived: item[valueField] === active,
-      checked: isChecked(item[valueField]),
+      checked: isChecked(item, valueField),
       count: item[childField].length,
       label: item[labelField],
       value: item[valueField],
-      highlightText: searchValue
+      highlightText: (_props$highlightText = props.highlightText) !== null && _props$highlightText !== void 0 ? _props$highlightText : searchValue
     });
   }));
 };

package/es/userTagsSelector/groups/styles/option.less

@@ -37,7 +37,7 @@
       }
     }
     &.active {
-      color: #fff;
+      color: #fff !important;
       background: @primary-color;
       .biz-user-tags-selector-group-option-count {
         .ant-badge-count {
@@ -45,6 +45,11 @@
           background: @primary-color;
         }
       }
+      .biz-user-tags-selector-group-option-label {
+        * {
+          color: #fff !important;
+        }
+      }
     }
   }
 }

package/es/userTagsSelector/index.js

@@ -1,3 +1,9 @@
+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; }
+
+function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
@@ -40,7 +46,14 @@ var UserTagsSelect = function UserTagsSelect(props) {
 
   var handleValue = useMemo(function () {
     return currentValue.map(function (item) {
-      return item.slice().pop();
+      var last = item[item.length - 1];
+      var pre = item[item.length - 2];
+
+      var res = _objectSpread(_objectSpread({}, last), {}, {
+        handleText: "".concat(pre[labelFields[labelFields.length - 2]], "\uFF1A").concat(last[labelFields[labelFields.length - 1]])
+      });
+
+      return res;
     });
   }, [currentValue]);
 
@@ -51,7 +64,8 @@ var UserTagsSelect = function UserTagsSelect(props) {
   function onDelete(data) {
     var current = currentValue.slice();
     var index = current.findIndex(function (item) {
-      return _.isEqual(item.slice().pop(), data);
+      var keyField = keyFields[keyFields.length - 1];
+      return _.isEqual(item.slice().pop()[keyField], data[keyField]);
     });
     current.splice(index, 1);
     props.onChange && props.onChange(current);
@@ -97,7 +111,7 @@ var UserTagsSelect = function UserTagsSelect(props) {
   }, /*#__PURE__*/React.createElement(SelectHandle, {
     border: false,
     value: handleValue,
-    labelField: labelFields[labelFields.length - 1],
+    labelField: "handleText",
     multiple: true,
     size: "middle",
     placeholder: "\u9009\u62E9\u6807\u7B7E",

package/es/userTagsSelector/multipleCheckPanel/checkOption.js

@@ -33,7 +33,8 @@ var CheckOption = /*#__PURE__*/forwardRef(function (props, ref) {
 
   return /*#__PURE__*/React.createElement("div", {
     ref: ref,
-    className: ["".concat(classPrefix, "-check-option"), disabled ? "".concat(classPrefix, "-check-option-disabled") : ''].join(' ')
+    className: ["".concat(classPrefix, "-check-option"), disabled ? "".concat(classPrefix, "-check-option-disabled") : ''].join(' '),
+    title: label
   }, /*#__PURE__*/React.createElement(Checkbox, {
     onChange: onChange,
     disabled: disabled,

package/es/userTagsSelector/multipleCheckPanel/index.js

@@ -13,7 +13,6 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import React, { useMemo, useState } from 'react';
 import { classPrefix } from '..';
 import VirtualList from 'rc-virtual-list';
-import Search from '../components/search';
 import CheckOption from './checkOption';
 import { filterFactory, isCheckedFactory } from '../util';
 
@@ -21,16 +20,12 @@ var MultipleCheckPanel = function MultipleCheckPanel(props) {
   var data = props.data,
       labelField = props.labelField,
       level = props.level,
-      currentValue = props.currentValue;
+      currentValue = props.currentValue,
+      valueField = props.valueField;
 
   var _useState = useState(''),
-      _useState2 = _slicedToArray(_useState, 2),
-      searchValue = _useState2[0],
-      setSearchValue = _useState2[1];
-
-  function onSearch(val) {
-    setSearchValue(val);
-  }
+      _useState2 = _slicedToArray(_useState, 1),
+      searchValue = _useState2[0];
 
   var searchFilter = useMemo(function () {
     return filterFactory(labelField, searchValue);
@@ -50,17 +45,13 @@ var MultipleCheckPanel = function MultipleCheckPanel(props) {
   if (!data.length) return /*#__PURE__*/React.createElement("span", null, "\u6682\u65E0\u6570\u636E");
   return /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-check-panel")
-  }, /*#__PURE__*/React.createElement(Search, {
-    show: true,
-    onChange: onSearch,
-    placeholder: "\u641C\u7D22\u6807\u7B7E\u540D\u79F0"
-  }), /*#__PURE__*/React.createElement(VirtualList, {
+  }, /*#__PURE__*/React.createElement(VirtualList, {
     data: data.filter(searchFilter),
     itemHeight: 48,
     itemKey: labelField,
-    height: 361
+    height: 360
   }, function (item, index) {
-    var checked = isChecked(item);
+    var checked = isChecked(item, valueField);
     return /*#__PURE__*/React.createElement(CheckOption, {
       checked: checked,
       highlightText: searchValue,

package/es/userTagsSelector/styles/cascaderOverlay.less

@@ -1,19 +1,24 @@
 @import '../../assets/styles/inner.less';
 .biz-user-tags-selector {
   &-overlay {
-    display: flex;
-    width: 651px;
     max-height: 425px;
     background-color: #fff;
     border-radius: @border-radius-normal;
     box-shadow: @box-shadow-base;
+    &-search {
+      height: 48px;
+      padding: @margin-xs @margin-xs 0;
+    }
+    &-panel {
+      display: flex;
+    }
     &-groups {
-      width: 192px;
+      width: 204px;
       padding: @margin-xs;
       border-right: 1px solid @border-color-base;
     }
     &-selections {
-      flex: 1;
+      width: 204px;
       min-width: 0;
       padding: @padding-xs;
     }

package/es/userTagsSelector/types.d.ts

@@ -29,6 +29,7 @@ export declare namespace UserTagsSelectorTypes {
         searchable?: boolean;
         level: number;
         currentValue: any[];
+        highlightText?: string;
     }
     interface GroupOption {
         actived: boolean;
@@ -55,13 +56,3 @@ export declare namespace UserTagsSelectorTypes {
         disabled: boolean;
     }
 }
-export interface TagI {
-    appId: number;
-    createTime: string;
-    updateTime: string;
-    del: number;
-    labelGroup: string;
-    labelId: number;
-    labelName: string;
-    labelStatus: number;
-}

package/es/userTagsSelector/util.d.ts

@@ -1,4 +1,4 @@
 export declare function curry(fn: Function): (...arg1: any[]) => (...arg2: any[]) => any;
 export declare function filterFactory(labelField: string, searchValue: string): (item: any) => boolean;
-export declare function isCheckedFactory(currentValue: any[], level: number): (val: any) => boolean;
+export declare function isCheckedFactory(currentValue: any[], level: number): (option: any, valueFiled: string) => boolean;
 export declare function getFieldFactory(fields: string[]): () => string;

package/es/userTagsSelector/util.js

@@ -22,9 +22,13 @@ export function filterFactory(labelField, searchValue) {
   };
 }
 export function isCheckedFactory(currentValue, level) {
-  return function (val) {
+  return function (option, valueFiled) {
     return currentValue.some(function (value) {
-      return _.isEqual(val, value[level]);
+      if (value[level][valueFiled] !== undefined) {
+        return value[level][valueFiled] === option[valueFiled];
+      } else {
+        return value[level] === option[valueFiled];
+      }
     });
   };
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zgfe/business-lib",
-  "version": "1.0.25-userGroupFix.0",
+  "version": "1.0.25",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",
@@ -58,5 +58,5 @@
     "react": "^16.12.0 || ^17.0.0",
     "yorkie": "^2.0.0"
   },
-  "gitHead": "f8c8cea2af532487d17a3d4f2e4e766844b0c748"
+  "gitHead": "6bdaae4bcfed41d119805192cad8610711297f9d"
 }