@zgfe/business-lib 1.2.70-hxd.9 → 1.2.71-hxd.10

package/es/userCondition/types.d.ts

@@ -73,13 +73,14 @@ export declare namespace BizUserConditionT {
         openCondition?: boolean;
         cdpTip?: string;
         labelCreateType?: number;
+        realTimeTags?: boolean;
     }
     interface BusinessPropsI {
         dataId: number;
         condition: BizUserConditionT.BusinessCondition;
         openBusinessDataCondition?: boolean;
         openOrderDataCondition?: boolean;
-        label?: string | React.ReactDOM;
+        label?: string | any;
         index?: number;
         onChange: (dataId: number, newData: any) => void;
     }
@@ -100,12 +101,14 @@ export declare namespace BizUserConditionT {
         userAmount: number;
         layerNum: number;
         endProcessTime: string;
+        ancestryState?: number;
         layers: {
             layerLabelId: number;
             layerLabelName: string;
             layerRemark: string;
             layerCondition: any[][];
             sequence: number;
+            ancestryState?: number;
         }[];
     }
     interface AttrCondition {
@@ -251,7 +254,7 @@ export declare namespace BizUserConditionT {
         orConditions: Conditions[number];
     }
     type ShowListT = ShowItemI[];
-    type GlobalContext = Pick<BizUserConditionT.PropsI, 'orConditionNum' | 'eventAttrNum' | 'openTagCondition' | 'userTagsData' | 'openCdpCondition' | 'openBusinessDataCondition' | 'openOrderDataCondition' | 'openCondition' | 'textMode' | 'isRealTime' | 'cdpTip'> & {
+    type GlobalContext = Pick<BizUserConditionT.PropsI, 'orConditionNum' | 'eventAttrNum' | 'openTagCondition' | 'userTagsData' | 'openCdpCondition' | 'openBusinessDataCondition' | 'openOrderDataCondition' | 'openCondition' | 'textMode' | 'isRealTime' | 'cdpTip' | 'realTimeTags'> & {
         envNameList: string[];
         userPropsMap: {
             [key: string]: UserProp;

package/es/userCondition/util.d.ts

@@ -11,6 +11,7 @@ export declare function buildSelectLayer(data: BizUserConditionT.UserTagsDataI[]
     labelCreateType?: undefined;
     layerLabelId?: undefined;
     layerLabelName?: undefined;
+    ancestryState?: undefined;
 } | {
     id: number;
     labelName: string;
@@ -18,9 +19,11 @@ export declare function buildSelectLayer(data: BizUserConditionT.UserTagsDataI[]
     labelGroup?: undefined;
     layerLabelId?: undefined;
     layerLabelName?: undefined;
+    ancestryState?: undefined;
 } | {
     layerLabelId: string;
     layerLabelName: string;
+    ancestryState: number | undefined;
     labelGroup?: undefined;
     id?: undefined;
     labelName?: undefined;
@@ -28,6 +31,7 @@ export declare function buildSelectLayer(data: BizUserConditionT.UserTagsDataI[]
 } | {
     layerLabelId: number;
     layerLabelName: string;
+    ancestryState: number | undefined;
     labelGroup?: undefined;
     id?: undefined;
     labelName?: undefined;

package/es/userCondition/util.js

@@ -1,9 +1,9 @@
-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 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) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
-function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
+function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : i + ""; }
+function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 import { LabelCreateType } from './types';
 export function buildCondition(type, labelCreateType) {
   switch (type) {
@@ -181,10 +181,12 @@ export function buildSelectLayer(data) {
       labelCreateType: data[j].labelCreateType
     }, type === LabelCreateType.firstAndLastUpdate || type === LabelCreateType.fundingSource || type === LabelCreateType.eventPreference || type === LabelCreateType.sqlCreateTable ? {
       layerLabelId: layerLabelId,
-      layerLabelName: ''
+      layerLabelName: '',
+      ancestryState: data[j].ancestryState
     } : {
       layerLabelId: data[j].layers[i].layerLabelId,
-      layerLabelName: data[j].layers[i].layerLabelName
+      layerLabelName: data[j].layers[i].layerLabelName,
+      ancestryState: data[j].layers[i].ancestryState
     }];
   };
 }

package/es/userGroup/demo/group.js

@@ -1,15 +1,15 @@
-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 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) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
-function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
-function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
+function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : i + ""; }
+function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
+function _slicedToArray(r, e) { return _arrayWithHoles(r) || _iterableToArrayLimit(r, e) || _unsupportedIterableToArray(r, e) || _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; }
+function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
+function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
+function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
+function _arrayWithHoles(r) { if (Array.isArray(r)) return r; }
 import React, { useState } from 'react';
 import { BizUserGroup, IconFont } from '@zgfe/business-lib';
 import { Form } from 'antd';
@@ -47,7 +47,7 @@ export default (function () {
         },
         enableDelete: fields.length > 1
       }));
-    }), fields.length < 5 && /*#__PURE__*/React.createElement(Form.Item, null, /*#__PURE__*/React.createElement("div", {
+    }), fields.length < 5 && (/*#__PURE__*/React.createElement(Form.Item, null, /*#__PURE__*/React.createElement("div", {
       className: "biz-add-btn",
       onClick: function onClick() {
         return add();
@@ -55,6 +55,6 @@ export default (function () {
     }, /*#__PURE__*/React.createElement(IconFont, {
       className: "biz-icon",
       type: 'tianjia1'
-    }), "\u6DFB\u52A0\u7528\u6237\u7FA4")));
+    }), "\u6DFB\u52A0\u7528\u6237\u7FA4"))));
   })), /*#__PURE__*/React.createElement("br", null), /*#__PURE__*/React.createElement("p", null, "\u5F53\u524D\u503C\uFF1A", JSON.stringify(target.user)));
 });

package/es/userGroup/demo/index.js

@@ -1,9 +1,9 @@
-function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
+function _slicedToArray(r, e) { return _arrayWithHoles(r) || _iterableToArrayLimit(r, e) || _unsupportedIterableToArray(r, e) || _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; }
+function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
+function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
+function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
+function _arrayWithHoles(r) { if (Array.isArray(r)) return r; }
 import React, { useState } from 'react';
 import { BizUserGroup } from '@zgfe/business-lib';
 import InnerDemo from '../../demoWrapper/innerDemo';
@@ -79,14 +79,14 @@ var UserGroupDemo = function UserGroupDemo() {
       }
     }
   }, /*#__PURE__*/React.createElement(Space, null, /*#__PURE__*/React.createElement(BizUserGroup, {
-    value: ['874:ep', '873:830763176214528'],
+    value: ['4230:1313538234793984', '666666:888888'],
     enableDelete: false,
     enableTags: true,
     placeholder: "\u652F\u6301\u6807\u7B7E",
     onChange: function onChange(value) {
       return console.log(value);
     }
-  }), showUserGroupModal && /*#__PURE__*/React.createElement(BizDialog, {
+  }), showUserGroupModal && (/*#__PURE__*/React.createElement(BizDialog, {
     open: true,
     title: "\u6DFB\u52A0\u7528\u6237\u7FA4",
     closable: true,
@@ -98,14 +98,7 @@ var UserGroupDemo = function UserGroupDemo() {
     onCancel: function onCancel() {
       setShowUserGroupModal(false);
     }
-  }, "\u6DFB\u52A0\u7528\u6237\u7FA4"), /*#__PURE__*/React.createElement(BizUserGroup, {
-    value: 758,
-    enableDelete: false,
-    placeholder: "\u4E0D\u652F\u6301\u6807\u7B7E",
-    onChange: function onChange(value) {
-      return console.log(value);
-    }
-  })));
+  }, "\u6DFB\u52A0\u7528\u6237\u7FA4"))));
 };
 export default (function () {
   return /*#__PURE__*/React.createElement(UserGroupDemo, null);

package/es/userGroup/index.d.ts

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

package/es/userGroup/index.js

@@ -1,15 +1,16 @@
-function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
+function _slicedToArray(r, e) { return _arrayWithHoles(r) || _iterableToArrayLimit(r, e) || _unsupportedIterableToArray(r, e) || _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 } from 'react';
+function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
+function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
+function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
+function _arrayWithHoles(r) { if (Array.isArray(r)) return r; }
+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,14 +36,47 @@ 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];
-        if (selected.length === value.length) return "break";
+        var tag = tagListData[i];
+        if (selected.length === value.length) return 1; // break
         value.forEach(function (item) {
           if (/:/.test(item)) {
             var _item$split = item.split(':'),
@@ -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,19 @@ var BizUserGroup = function BizUserGroup(_ref) {
           }
         });
       };
-      for (var i = 0; i < (tagList === null || tagList === void 0 ? void 0 : tagList.length); i++) {
-        var _ret = _loop();
-        if (_ret === "break") break;
+      for (var i = 0; i < (tagListData === null || tagListData === void 0 ? void 0 : tagListData.length); i++) {
+        if (_loop()) 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 +151,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 +159,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 +178,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 +189,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 +206,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 +220,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,7 +235,17 @@ 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 = {
   enableTags: false

package/es/userGroup/overlay.js

@@ -1,15 +1,15 @@
-function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
+function _toConsumableArray(r) { return _arrayWithoutHoles(r) || _iterableToArray(r) || _unsupportedIterableToArray(r) || _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 _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
+function _iterableToArray(r) { if ("undefined" != typeof Symbol && null != r[Symbol.iterator] || null != r["@@iterator"]) return Array.from(r); }
+function _arrayWithoutHoles(r) { if (Array.isArray(r)) return _arrayLikeToArray(r); }
+function _slicedToArray(r, e) { return _arrayWithHoles(r) || _iterableToArrayLimit(r, e) || _unsupportedIterableToArray(r, e) || _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; }
+function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
+function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
+function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
+function _arrayWithHoles(r) { if (Array.isArray(r)) return r; }
 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,
@@ -93,7 +107,7 @@ var Overlay = function Overlay(_ref2) {
   }
   return /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-overlay")
-  }, enableTags && /*#__PURE__*/React.createElement("div", {
+  }, enableTags && (/*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-typelist")
   }, [{
     type: 'userGroup',
@@ -111,13 +125,13 @@ var Overlay = function Overlay(_ref2) {
         setCurrentGroup(undefined);
       }
     }, item.label);
-  })), type === 'tag' && /*#__PURE__*/React.createElement(CascaderOverlay, {
+  }))), type === 'tag' && (/*#__PURE__*/React.createElement(CascaderOverlay, {
     currentValue: chosenTags,
     onChange: function onChange(val) {
       setChosenTags(val);
     },
     className: "".concat(classPrefix, "-tags")
-  }), type === 'userGroup' && /*#__PURE__*/React.createElement("div", {
+  })), type === 'userGroup' && (/*#__PURE__*/React.createElement("div", {
     className: enableTags ? "".concat(classPrefix, "-grouplist") : "".concat(classPrefix, "-grouplist-no")
   }, /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-top")
@@ -130,7 +144,7 @@ var Overlay = function Overlay(_ref2) {
     onClick: onClickAdd
   }, /*#__PURE__*/React.createElement(IconFont, {
     type: "zengjia"
-  }), "\u6DFB\u52A0\u5206\u7FA4")), showList.length > 10 ? /*#__PURE__*/React.createElement(List, {
+  }), "\u6DFB\u52A0\u5206\u7FA4")), showList.length > 10 ? (/*#__PURE__*/React.createElement(List, {
     data: showList || [],
     itemHeight: 32,
     itemKey: "id",
@@ -144,7 +158,7 @@ var Overlay = function Overlay(_ref2) {
       setCurrentGroup: setCurrentGroup,
       onClose: onClose
     });
-  }) : /*#__PURE__*/React.createElement("div", {
+  })) : (/*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-list")
   }, showList === null || showList === void 0 ? void 0 : showList.map(function (item) {
     return /*#__PURE__*/React.createElement(GroupItem, {
@@ -154,8 +168,8 @@ var Overlay = function Overlay(_ref2) {
       setCurrentGroup: setCurrentGroup,
       onClose: onClose
     });
-  })), (showList === null || showList === void 0 ? void 0 : showList.length) === 0 && /*#__PURE__*/React.createElement("div", {
+  }))), (showList === null || showList === void 0 ? void 0 : showList.length) === 0 && /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-empty")
-  }, "\u6682\u65E0\u6570\u636E")));
+  }, "\u6682\u65E0\u6570\u636E"))));
 };
 export default Overlay;