@zgfe/business-lib 1.2.70-hxd.11 → 1.2.70-hxd.19

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

@@ -1,34 +1,103 @@
+function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
+function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return exports; }; var exports = {}, Op = Object.prototype, hasOwn = Op.hasOwnProperty, defineProperty = Object.defineProperty || function (obj, key, desc) { obj[key] = desc.value; }, $Symbol = "function" == typeof Symbol ? Symbol : {}, iteratorSymbol = $Symbol.iterator || "@@iterator", asyncIteratorSymbol = $Symbol.asyncIterator || "@@asyncIterator", toStringTagSymbol = $Symbol.toStringTag || "@@toStringTag"; function define(obj, key, value) { return Object.defineProperty(obj, key, { value: value, enumerable: !0, configurable: !0, writable: !0 }), obj[key]; } try { define({}, ""); } catch (err) { define = function define(obj, key, value) { return obj[key] = value; }; } function wrap(innerFn, outerFn, self, tryLocsList) { var protoGenerator = outerFn && outerFn.prototype instanceof Generator ? outerFn : Generator, generator = Object.create(protoGenerator.prototype), context = new Context(tryLocsList || []); return defineProperty(generator, "_invoke", { value: makeInvokeMethod(innerFn, self, context) }), generator; } function tryCatch(fn, obj, arg) { try { return { type: "normal", arg: fn.call(obj, arg) }; } catch (err) { return { type: "throw", arg: err }; } } exports.wrap = wrap; var ContinueSentinel = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var IteratorPrototype = {}; define(IteratorPrototype, iteratorSymbol, function () { return this; }); var getProto = Object.getPrototypeOf, NativeIteratorPrototype = getProto && getProto(getProto(values([]))); NativeIteratorPrototype && NativeIteratorPrototype !== Op && hasOwn.call(NativeIteratorPrototype, iteratorSymbol) && (IteratorPrototype = NativeIteratorPrototype); var Gp = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(IteratorPrototype); function defineIteratorMethods(prototype) { ["next", "throw", "return"].forEach(function (method) { define(prototype, method, function (arg) { return this._invoke(method, arg); }); }); } function AsyncIterator(generator, PromiseImpl) { function invoke(method, arg, resolve, reject) { var record = tryCatch(generator[method], generator, arg); if ("throw" !== record.type) { var result = record.arg, value = result.value; return value && "object" == _typeof(value) && hasOwn.call(value, "__await") ? PromiseImpl.resolve(value.__await).then(function (value) { invoke("next", value, resolve, reject); }, function (err) { invoke("throw", err, resolve, reject); }) : PromiseImpl.resolve(value).then(function (unwrapped) { result.value = unwrapped, resolve(result); }, function (error) { return invoke("throw", error, resolve, reject); }); } reject(record.arg); } var previousPromise; defineProperty(this, "_invoke", { value: function value(method, arg) { function callInvokeWithMethodAndArg() { return new PromiseImpl(function (resolve, reject) { invoke(method, arg, resolve, reject); }); } return previousPromise = previousPromise ? previousPromise.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(innerFn, self, context) { var state = "suspendedStart"; return function (method, arg) { if ("executing" === state) throw new Error("Generator is already running"); if ("completed" === state) { if ("throw" === method) throw arg; return doneResult(); } for (context.method = method, context.arg = arg;;) { var delegate = context.delegate; if (delegate) { var delegateResult = maybeInvokeDelegate(delegate, context); if (delegateResult) { if (delegateResult === ContinueSentinel) continue; return delegateResult; } } if ("next" === context.method) context.sent = context._sent = context.arg;else if ("throw" === context.method) { if ("suspendedStart" === state) throw state = "completed", context.arg; context.dispatchException(context.arg); } else "return" === context.method && context.abrupt("return", context.arg); state = "executing"; var record = tryCatch(innerFn, self, context); if ("normal" === record.type) { if (state = context.done ? "completed" : "suspendedYield", record.arg === ContinueSentinel) continue; return { value: record.arg, done: context.done }; } "throw" === record.type && (state = "completed", context.method = "throw", context.arg = record.arg); } }; } function maybeInvokeDelegate(delegate, context) { var methodName = context.method, method = delegate.iterator[methodName]; if (undefined === method) return context.delegate = null, "throw" === methodName && delegate.iterator.return && (context.method = "return", context.arg = undefined, maybeInvokeDelegate(delegate, context), "throw" === context.method) || "return" !== methodName && (context.method = "throw", context.arg = new TypeError("The iterator does not provide a '" + methodName + "' method")), ContinueSentinel; var record = tryCatch(method, delegate.iterator, context.arg); if ("throw" === record.type) return context.method = "throw", context.arg = record.arg, context.delegate = null, ContinueSentinel; var info = record.arg; return info ? info.done ? (context[delegate.resultName] = info.value, context.next = delegate.nextLoc, "return" !== context.method && (context.method = "next", context.arg = undefined), context.delegate = null, ContinueSentinel) : info : (context.method = "throw", context.arg = new TypeError("iterator result is not an object"), context.delegate = null, ContinueSentinel); } function pushTryEntry(locs) { var entry = { tryLoc: locs[0] }; 1 in locs && (entry.catchLoc = locs[1]), 2 in locs && (entry.finallyLoc = locs[2], entry.afterLoc = locs[3]), this.tryEntries.push(entry); } function resetTryEntry(entry) { var record = entry.completion || {}; record.type = "normal", delete record.arg, entry.completion = record; } function Context(tryLocsList) { this.tryEntries = [{ tryLoc: "root" }], tryLocsList.forEach(pushTryEntry, this), this.reset(!0); } function values(iterable) { if (iterable) { var iteratorMethod = iterable[iteratorSymbol]; if (iteratorMethod) return iteratorMethod.call(iterable); if ("function" == typeof iterable.next) return iterable; if (!isNaN(iterable.length)) { var i = -1, next = function next() { for (; ++i < iterable.length;) if (hasOwn.call(iterable, i)) return next.value = iterable[i], next.done = !1, next; return next.value = undefined, next.done = !0, next; }; return next.next = next; } } return { next: doneResult }; } function doneResult() { return { value: undefined, done: !0 }; } return GeneratorFunction.prototype = GeneratorFunctionPrototype, defineProperty(Gp, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), defineProperty(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, toStringTagSymbol, "GeneratorFunction"), exports.isGeneratorFunction = function (genFun) { var ctor = "function" == typeof genFun && genFun.constructor; return !!ctor && (ctor === GeneratorFunction || "GeneratorFunction" === (ctor.displayName || ctor.name)); }, exports.mark = function (genFun) { return Object.setPrototypeOf ? Object.setPrototypeOf(genFun, GeneratorFunctionPrototype) : (genFun.__proto__ = GeneratorFunctionPrototype, define(genFun, toStringTagSymbol, "GeneratorFunction")), genFun.prototype = Object.create(Gp), genFun; }, exports.awrap = function (arg) { return { __await: arg }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, asyncIteratorSymbol, function () { return this; }), exports.AsyncIterator = AsyncIterator, exports.async = function (innerFn, outerFn, self, tryLocsList, PromiseImpl) { void 0 === PromiseImpl && (PromiseImpl = Promise); var iter = new AsyncIterator(wrap(innerFn, outerFn, self, tryLocsList), PromiseImpl); return exports.isGeneratorFunction(outerFn) ? iter : iter.next().then(function (result) { return result.done ? result.value : iter.next(); }); }, defineIteratorMethods(Gp), define(Gp, toStringTagSymbol, "Generator"), define(Gp, iteratorSymbol, function () { return this; }), define(Gp, "toString", function () { return "[object Generator]"; }), exports.keys = function (val) { var object = Object(val), keys = []; for (var key in object) keys.push(key); return keys.reverse(), function next() { for (; keys.length;) { var key = keys.pop(); if (key in object) return next.value = key, next.done = !1, next; } return next.done = !0, next; }; }, exports.values = values, Context.prototype = { constructor: Context, reset: function reset(skipTempReset) { if (this.prev = 0, this.next = 0, this.sent = this._sent = undefined, this.done = !1, this.delegate = null, this.method = "next", this.arg = undefined, this.tryEntries.forEach(resetTryEntry), !skipTempReset) for (var name in this) "t" === name.charAt(0) && hasOwn.call(this, name) && !isNaN(+name.slice(1)) && (this[name] = undefined); }, stop: function stop() { this.done = !0; var rootRecord = this.tryEntries[0].completion; if ("throw" === rootRecord.type) throw rootRecord.arg; return this.rval; }, dispatchException: function dispatchException(exception) { if (this.done) throw exception; var context = this; function handle(loc, caught) { return record.type = "throw", record.arg = exception, context.next = loc, caught && (context.method = "next", context.arg = undefined), !!caught; } for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i], record = entry.completion; if ("root" === entry.tryLoc) return handle("end"); if (entry.tryLoc <= this.prev) { var hasCatch = hasOwn.call(entry, "catchLoc"), hasFinally = hasOwn.call(entry, "finallyLoc"); if (hasCatch && hasFinally) { if (this.prev < entry.catchLoc) return handle(entry.catchLoc, !0); if (this.prev < entry.finallyLoc) return handle(entry.finallyLoc); } else if (hasCatch) { if (this.prev < entry.catchLoc) return handle(entry.catchLoc, !0); } else { if (!hasFinally) throw new Error("try statement without catch or finally"); if (this.prev < entry.finallyLoc) return handle(entry.finallyLoc); } } } }, abrupt: function abrupt(type, arg) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.tryLoc <= this.prev && hasOwn.call(entry, "finallyLoc") && this.prev < entry.finallyLoc) { var finallyEntry = entry; break; } } finallyEntry && ("break" === type || "continue" === type) && finallyEntry.tryLoc <= arg && arg <= finallyEntry.finallyLoc && (finallyEntry = null); var record = finallyEntry ? finallyEntry.completion : {}; return record.type = type, record.arg = arg, finallyEntry ? (this.method = "next", this.next = finallyEntry.finallyLoc, ContinueSentinel) : this.complete(record); }, complete: function complete(record, afterLoc) { if ("throw" === record.type) throw record.arg; return "break" === record.type || "continue" === record.type ? this.next = record.arg : "return" === record.type ? (this.rval = this.arg = record.arg, this.method = "return", this.next = "end") : "normal" === record.type && afterLoc && (this.next = afterLoc), ContinueSentinel; }, finish: function finish(finallyLoc) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.finallyLoc === finallyLoc) return this.complete(entry.completion, entry.afterLoc), resetTryEntry(entry), ContinueSentinel; } }, catch: function _catch(tryLoc) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.tryLoc === tryLoc) { var record = entry.completion; if ("throw" === record.type) { var thrown = record.arg; resetTryEntry(entry); } return thrown; } } throw new Error("illegal catch attempt"); }, delegateYield: function delegateYield(iterable, resultName, nextLoc) { return this.delegate = { iterator: values(iterable), resultName: resultName, nextLoc: nextLoc }, "next" === this.method && (this.arg = undefined), ContinueSentinel; } }, exports; }
 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."); }
 function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
 function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
+function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
+function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
 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."); }
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
 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 request from '../utils/ajax';
+import Apis from '../constants/apis';
 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, 2),
+    errorData = _useState2[0],
+    setErrorData = _useState2[1];
+  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];
+  function queryTagsState() {
+    return _queryTagsState.apply(this, arguments);
+  }
+  function _queryTagsState() {
+    _queryTagsState = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+      var res;
+      return _regeneratorRuntime().wrap(function _callee$(_context) {
+        while (1) switch (_context.prev = _context.next) {
+          case 0:
+            if (!(value && value.length > 0)) {
+              _context.next = 15;
+              break;
+            }
+            _context.prev = 1;
+            _context.next = 4;
+            return request(Apis.tagsState, {
+              method: 'post',
+              data: {
+                appId: currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId,
+                platform: (currentApp === null || currentApp === void 0 ? void 0 : currentApp.platform) || 0,
+                userGroup: value
+              }
+            });
+          case 4:
+            res = _context.sent;
+            if (res.data) {
+              setErrorData(res.data);
+            }
+            setTagsStateLoading(false);
+            _context.next = 13;
+            break;
+          case 9:
+            _context.prev = 9;
+            _context.t0 = _context["catch"](1);
+            console.error(_context.t0);
+            setTagsStateLoading(false);
+          case 13:
+            _context.next = 16;
+            break;
+          case 15:
+            setTagsStateLoading(false);
+          case 16:
+          case "end":
+            return _context.stop();
+        }
+      }, _callee, null, [[1, 9]]);
+    }));
+    return _queryTagsState.apply(this, arguments);
+  }
+  useEffect(function () {
+    queryTagsState();
+  }, []);
   useEffect(function () {
     var defaultValue = (value === null || value === void 0 ? void 0 : value.map(function (item) {
       return {
@@ -47,6 +116,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 +140,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 +153,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 +169,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

@@ -1,31 +1,50 @@
-@import '../../assets/styles/inner.less';
-.biz-user-group-header {
-  background: #fff;
-  &-title {
-    height: 20px;
-    margin-bottom: @margin-xs;
-    padding-left: @padding-lg;
-    color: @text-color-secondary;
-    font-weight: 500;
-  }
-
-  &-add {
-    color: @primary-color;
-    font-size: 20px !important;
-    cursor: pointer;
-    &.disabled {
-      display: none;
-    }
-  }
-  .biz-user {
-    width: 208px;
-  }
-  &-container {
-    width: 100%;
-    padding: @padding-xss @padding-lg;
-
-    &:hover {
-      background: #e8efff;
-    }
-  }
-}
+@import '../../assets/styles/inner.less';
+.biz-user-group-header {
+  background: #fff;
+  &-title {
+    height: 20px;
+    margin-bottom: @margin-xs;
+    padding-left: @padding-lg;
+    color: @text-color-secondary;
+    font-weight: 500;
+  }
+
+  &-add {
+    color: @primary-color;
+    font-size: 20px !important;
+    cursor: pointer;
+    &.disabled {
+      display: none;
+    }
+  }
+  .biz-user {
+    width: 208px;
+  }
+  &-container {
+    align-items: flex-start !important;
+    width: 100%;
+    padding: @padding-xss @padding-lg;
+    &:hover {
+      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;

package/es/userTagsSelector/index.js

@@ -11,12 +11,13 @@ 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, { useEffect, useState } from 'react';
-import { Dropdown } from 'antd';
+import { Dropdown, Tooltip } from 'antd';
 import SelectHandle from '../select/handle';
 import CascaderOverlay from './cascaderOverlay';
 import './styles/index.less';
 import { useMemo } from 'react';
 import { util } from '../utils';
+import IconFont from '../icon/iconFont';
 import _ from 'lodash';
 import { LabelCreateType } from '../userCondition/types';
 export var classPrefix = 'biz-user-tags-selector';
@@ -36,6 +37,10 @@ var UserTagsSelect = function UserTagsSelect(props) {
     _useState4 = _slicedToArray(_useState3, 2),
     visible = _useState4[0],
     setVisible = _useState4[1];
+  var _useState5 = useState(false),
+    _useState6 = _slicedToArray(_useState5, 2),
+    errorTextShow = _useState6[0],
+    setErrorTextShow = _useState6[1];
   var handleValue = useMemo(function () {
     return currentValue.map(function (item) {
       var pre = item[item.length - 2];
@@ -48,6 +53,21 @@ var UserTagsSelect = function UserTagsSelect(props) {
       return res;
     });
   }, [currentValue]);
+  useEffect(function () {
+    if (handleValue.length > 0) {
+      var _error = 0;
+      handleValue.map(function (item) {
+        if (item.ancestryState && item.ancestryState !== 1) {
+          _error++;
+        }
+      });
+      if (_error !== 0) {
+        setErrorTextShow(true);
+      } else {
+        setErrorTextShow(false);
+      }
+    }
+  }, [handleValue]);
   useEffect(function () {
     setCurrentValue(util.isArray(defaultValue) ? defaultValue : []);
   }, [defaultValue]);
@@ -104,7 +124,17 @@ var UserTagsSelect = function UserTagsSelect(props) {
     size: "middle",
     placeholder: "\u9009\u62E9\u6807\u7B7E",
     onDelete: onDelete
-  }))));
+  }), errorTextShow && /*#__PURE__*/React.createElement("div", {
+    className: "".concat(classPrefix, "-handle-errortext")
+  }, /*#__PURE__*/React.createElement(Tooltip, {
+    title: "\u6807\u7B7E\u5F02\u5E38\u5B58\u5728\u591A\u79CD\u539F\u56E0\uFF08\u5982\u6807\u7B7E\u88AB\u5220\u9664\uFF09\uFF0C\u5177\u4F53\u539F\u56E0\u8BF7\u524D\u5F80\u6807\u7B7E\u5217\u8868\u67E5\u8BE2"
+  }, "\u6807\u7B7E\u5F02\u5E38\uFF0C\u8BF7\u91CD\u65B0\u9009\u62E9", /*#__PURE__*/React.createElement(IconFont, {
+    style: {
+      color: '#FB5547',
+      cursor: 'pointer'
+    },
+    type: "a-iconzhuyi"
+  }))))));
 };
 UserTagsSelect.defaultProps = {
   destroyPopupOnHide: false,

package/es/userTagsSelector/styles/index.less

@@ -1,10 +1,20 @@
-@import '../../assets/styles/inner.less';
-.biz-user-tags-selector {
-  > .ant-dropdown-trigger.biz-user-tags-selector-handle {
-    > .biz-select-handle-input-multiple {
-      .ant-input.biz-select-handle-search {
-        height: auto !important;
-      }
-    }
-  }
-}
+@import '../../assets/styles/inner.less';
+.biz-user-tags-selector {
+  > .ant-dropdown-trigger.biz-user-tags-selector-handle {
+    > .biz-select-handle-input-multiple {
+      .ant-input.biz-select-handle-search {
+        height: auto !important;
+      }
+    }
+  }
+  &-handle-errortext {
+    display: flex;
+    gap: 2px;
+    align-items: center;
+    color: #fb5547;
+    font-size: 12px;
+    .bsicon {
+      font-size: 14px;
+    }
+  }
+}

package/es/userTagsSelector/types.d.ts

@@ -11,6 +11,7 @@ export declare namespace UserTagsSelectorTypes {
         layers?: Layer[];
         labelGroup?: string;
         labelGroupId?: number;
+        ancestryState?: number;
     }
     interface Layer {
         layerLabelId?: number | string;
@@ -18,6 +19,7 @@ export declare namespace UserTagsSelectorTypes {
         layerRemark?: string;
         layerCondition?: any[][];
         sequence?: number;
+        ancestryState?: any;
     }
     type Value = [BaseGroup, Tag, Layer?][];
     interface Props {

package/es/userTagsSelector/util.d.ts

@@ -1,3 +1,4 @@
+export declare function repeatMergeHandle(userTagsData: any, oldData: any, newData: any): any;
 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): (option: any, valueFiled: string) => boolean;

package/es/userTagsSelector/util.js

@@ -1,5 +1,25 @@
 import _ from 'lodash';
 import { LabelCreateType } from '../userCondition/types';
+export function repeatMergeHandle(userTagsData, oldData, newData) {
+  var _ids = [],
+    data = [];
+  userTagsData.map(function (item) {
+    _ids.push(item.id);
+  });
+  oldData.map(function (item) {
+    if (_ids.indexOf(item.id) === -1) {
+      _ids.push(item.id);
+      data.push(item);
+    }
+  });
+  newData.map(function (item) {
+    if (_ids.indexOf(item.id) === -1) {
+      _ids.push(item.id);
+      data.push(item);
+    }
+  });
+  return data;
+}
 export function curry(fn) {
   return function () {
     for (var _len = arguments.length, arg1 = new Array(_len), _key = 0; _key < _len; _key++) {