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

package/es/userCondition/styles/orConditions.less

@@ -1,34 +1,34 @@
-@import '../../assets/styles/variable.less';
-.biz-user-condition-or {
-  &:not(:last-child) {
-    margin-bottom: @margin-lg;
-  }
-  &.text-mode {
-    display: flex;
-    min-width: 0;
-    // align-items: center;
-    margin-bottom: 0;
-    .biz-user-condition-or-content {
-      margin-bottom: 0;
-      border: none;
-      .biz-user-condition-conditions {
-        padding: 0;
-      }
-    }
-  }
-  &-content {
-    display: flex;
-    width: 100%;
-
-    background: #ffffff;
-    border: 1px solid @border-color-base;
-    border-radius: @border-radius-small;
-    &:not(:last-child) {
-      margin-bottom: @margin-md;
-    }
-    .biz-user-condition-conditions {
-      flex: 1;
-      padding: @padding-xs @padding-md 0 0;
-    }
-  }
-}
+@import '../../assets/styles/variable.less';
+.biz-user-condition-or {
+  &:not(:last-child) {
+    margin-bottom: @margin-lg;
+  }
+  &.text-mode {
+    display: flex;
+    min-width: 0;
+    // align-items: center;
+    margin-bottom: 0;
+    .biz-user-condition-or-content {
+      margin-bottom: 0;
+      border: none;
+      .biz-user-condition-conditions {
+        padding: 0;
+      }
+    }
+  }
+  &-content {
+    display: flex;
+    width: 100%;
+
+    background: #ffffff;
+    border: 1px solid @border-color-base;
+    border-radius: @border-radius-small;
+    &:not(:last-child) {
+      margin-bottom: @margin-md;
+    }
+    .biz-user-condition-conditions {
+      flex: 1;
+      padding: @padding-xs @padding-md 0 0;
+    }
+  }
+}

package/es/userCondition/styles/relationLabel.less

@@ -1,19 +1,19 @@
-@import '../../assets/styles/inner.less';
-.biz-user-condition-relation {
-  position: relative;
-  width: 2px;
-  margin-right: @margin-lg;
-  background-color: @border-color-split;
-  &-label {
-    position: absolute;
-    top: 50%;
-    left: 50%;
-    width: 24px;
-    height: 24px;
-    line-height: 24px;
-    text-align: center;
-    background-color: @border-color-split;
-    border-radius: @border-radius-small;
-    transform: translate(-50%, -50%);
-  }
-}
+@import '../../assets/styles/inner.less';
+.biz-user-condition-relation {
+  position: relative;
+  width: 2px;
+  margin-right: @margin-lg;
+  background-color: #b9ceff;
+  &-label {
+    position: absolute;
+    top: 50%;
+    left: 50%;
+    width: 24px;
+    height: 24px;
+    line-height: 24px;
+    text-align: center;
+    background-color: @border-color-split;
+    border-radius: @border-radius-small;
+    transform: translate(-50%, -50%);
+  }
+}

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

@@ -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/index.js

@@ -79,7 +79,7 @@ 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",
@@ -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

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

package/es/userGroup/overlay.js

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