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

package/es/userCondition/demo/mockData.js

@@ -1,11 +1,40 @@
 export var tagList = [{
+  labelType: 1,
+  dataStatus: 1,
+  editStatus: 1,
+  labelCreateType: 6,
+  endProcessTime: '2025-03-26 15:08:00',
+  labelGroup: '基本标签',
+  startProcessTime: '',
+  layers: [],
+  expireStatus: 'effective',
+  id: 922,
+  releaseState: 1,
+  labelName: '事件偏好02',
+  labelRemark: ''
+}, {
+  labelType: 1,
+  dataStatus: 1,
+  editStatus: 1,
+  labelCreateType: 6,
+  endProcessTime: '2025-03-26 15:08:00',
+  labelGroup: '基本标签',
+  startProcessTime: '',
+  layers: [],
+  expireStatus: 'effective',
+  id: 922,
+  releaseState: 1,
+  labelName: '事件偏好02',
+  labelRemark: ''
+}, {
   labelGroup: '行为标签',
   startProcessTime: '2023-06-26T01:00:00',
   labelType: 0,
   layers: [{
     sequence: 1,
     layerLabelId: 550455830020096,
-    layerLabelName: '分层1'
+    layerLabelName: '分层1',
+    ancestryState: 4
   }],
   dataStatus: 1,
   editStatus: 1,
@@ -143,83 +172,9 @@ export var tagList = [{
 export var conditions = [[{
   attrs: [],
   labels: {
-    values: ['371:550455830020096', '522:fd'],
+    values: ['371:550455830020096', '522:fd', '666666:888888'],
     operator: 'equal'
   }
-}, {
-  dataset: [{
-    datasetId: 11,
-    datasetTable: '99677e4429fd647bc4ff89f669859be168420',
-    datasetName: 'rfm555',
-    fieldName: 'price',
-    fieldType: 'bigint',
-    webType: 'number',
-    paramType: 'cont-num',
-    operator: 'gt',
-    params: ['123']
-  }]
-}, {
-  data_set_csh: [{
-    datasetName: 'rfm555',
-    datasetTable: '99677e4429fd647bc4ff89f669859be168420',
-    fieldName: 'price',
-    fieldType: 'bigint',
-    webType: 'number',
-    paramType: 'cont-num',
-    calculate: 'original',
-    operator: 'greater',
-    params: '123',
-    subCondition: {
-      operator: 'add',
-      datasetName: 'frm4444',
-      datasetTable: '996776d76380838014a92bc6a21c9da99301e',
-      fieldName: 'price',
-      calculate: 'original'
-    }
-  }]
-}, {
-  data_set_csh: [{
-    datasetName: 'rfm555',
-    datasetTable: '99677e4429fd647bc4ff89f669859be168420',
-    fieldName: 'price',
-    fieldType: 'bigint',
-    webType: 'number',
-    paramType: 'cont-num',
-    calculate: 'original',
-    operator: 'between',
-    between: [100, 200],
-    subCondition: {
-      operator: 'add',
-      datasetName: 'frm4444',
-      datasetTable: '996776d76380838014a92bc6a21c9da99301e',
-      fieldName: 'price',
-      calculate: 'original'
-    }
-  }]
-}, {
-  data_set_csh: [{
-    datasetName: 'rfm555',
-    datasetTable: '99677e4429fd647bc4ff89f669859be168420',
-    fieldName: 'price',
-    fieldType: 'bigint',
-    webType: 'number',
-    paramType: 'cont-num',
-    calculate: 'original',
-    operator: 'greater',
-    params: '123'
-  }]
-}, {
-  data_set_csh: [{
-    datasetName: 'rfm555',
-    datasetTable: '99677e4429fd647bc4ff89f669859be168420',
-    fieldName: 'price',
-    fieldType: 'bigint',
-    webType: 'number',
-    paramType: 'cont-num',
-    calculate: 'original',
-    operator: 'between',
-    between: [100, 200]
-  }]
 }]];
 export var datasetList = [{
   id: 12,

package/es/userCondition/index.d.ts

@@ -1,7 +1,11 @@
 import React from 'react';
 import { BizUserConditionT } from './types';
 import './styles/index.less';
-export declare const BizUserConditionContext: React.Context<BizUserConditionT.GlobalContext>;
+interface NewGlobalContext extends BizUserConditionT.GlobalContext {
+    searchUserTagsData?: [];
+    setSearchUserTagsData?: Function;
+}
+export declare const BizUserConditionContext: React.Context<NewGlobalContext>;
 export declare const classPrefix = "biz-user-condition";
 declare const BizUserCondition: React.FC<BizUserConditionT.PropsI>;
 export default BizUserCondition;

package/es/userCondition/index.js

@@ -52,16 +52,29 @@ var BizUserCondition = function BizUserCondition(props) {
     openOrderDataCondition = props.openOrderDataCondition,
     userTagsData = props.userTagsData,
     openCondition = props.openCondition,
-    cdpTip = props.cdpTip;
+    cdpTip = props.cdpTip,
+    realTimeTags = props.realTimeTags;
   var _useState = useState([]),
     _useState2 = _slicedToArray(_useState, 2),
-    showList = _useState2[0],
-    setShowList = _useState2[1];
+    searchUserTagsData = _useState2[0],
+    setSearchUserTagsData = _useState2[1];
   var _useState3 = useState([]),
     _useState4 = _slicedToArray(_useState3, 2),
-    dataList = _useState4[0],
-    setDataList = _useState4[1];
-  var _useState5 = useState(function () {
+    errorData = _useState4[0],
+    setErrorData = _useState4[1];
+  var _useState5 = useState(true),
+    _useState6 = _slicedToArray(_useState5, 2),
+    tagsStateLoading = _useState6[0],
+    setTagsStateLoading = _useState6[1];
+  var _useState7 = useState([]),
+    _useState8 = _slicedToArray(_useState7, 2),
+    showList = _useState8[0],
+    setShowList = _useState8[1];
+  var _useState9 = useState([]),
+    _useState10 = _slicedToArray(_useState9, 2),
+    dataList = _useState10[0],
+    setDataList = _useState10[1];
+  var _useState11 = useState(function () {
       var list = [];
       if (defaultValue) {
         var showTag = openTagCondition && authority[10038];
@@ -94,17 +107,17 @@ var BizUserCondition = function BizUserCondition(props) {
       }
       return list;
     }),
-    _useState6 = _slicedToArray(_useState5, 2),
-    value = _useState6[0],
-    setValue = _useState6[1];
-  var _useState7 = useState(true),
-    _useState8 = _slicedToArray(_useState7, 2),
-    loading = _useState8[0],
-    setLoading = _useState8[1];
-  var _useState9 = useState([]),
-    _useState10 = _slicedToArray(_useState9, 2),
-    dataset = _useState10[0],
-    setDataset = _useState10[1];
+    _useState12 = _slicedToArray(_useState11, 2),
+    value = _useState12[0],
+    setValue = _useState12[1];
+  var _useState13 = useState(true),
+    _useState14 = _slicedToArray(_useState13, 2),
+    loading = _useState14[0],
+    setLoading = _useState14[1];
+  var _useState15 = useState([]),
+    _useState16 = _slicedToArray(_useState15, 2),
+    dataset = _useState16[0],
+    setDataset = _useState16[1];
   var envNameList = useMemo(function () {
     return eventEnvList ? eventEnvList.map(function (env) {
       return env.name;
@@ -124,6 +137,7 @@ var BizUserCondition = function BizUserCondition(props) {
     } else {
       setLoading(false);
     }
+    queryTagsState();
   }, []);
   function initShowList() {
     var showList = [];
@@ -213,7 +227,68 @@ var BizUserCondition = function BizUserCondition(props) {
     }));
     return _getDatasetList.apply(this, arguments);
   }
-  if (loading) {
+  function queryTagsState() {
+    return _queryTagsState.apply(this, arguments);
+  }
+  function _queryTagsState() {
+    _queryTagsState = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
+      var _tagsData, _res$data, _res$data2, res, _res$data3;
+      return _regeneratorRuntime().wrap(function _callee2$(_context2) {
+        while (1) switch (_context2.prev = _context2.next) {
+          case 0:
+            if (!(defaultValue.length > 0)) {
+              _context2.next = 17;
+              break;
+            }
+            _tagsData = [];
+            defaultValue.map(function (item) {
+              item.map(function (_item) {
+                var _item$labels;
+                if ((_item === null || _item === void 0 ? void 0 : _item.labels) && (_item === null || _item === void 0 ? void 0 : (_item$labels = _item.labels) === null || _item$labels === void 0 ? void 0 : _item$labels.values)) {
+                  var _item$labels2;
+                  _item === null || _item === void 0 ? void 0 : (_item$labels2 = _item.labels) === null || _item$labels2 === void 0 ? void 0 : _item$labels2.values.map(function (__item) {
+                    if (_tagsData.indexOf(__item) === -1) _tagsData.push(__item);
+                  });
+                }
+              });
+            });
+            _context2.prev = 3;
+            _context2.next = 6;
+            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: [_tagsData]
+              }
+            });
+          case 6:
+            res = _context2.sent;
+            if (res.data && ((_res$data = res.data) === null || _res$data === void 0 ? void 0 : _res$data.labels) && ((_res$data2 = res.data) === null || _res$data2 === void 0 ? void 0 : _res$data2.labels.length) > 0) {
+              setErrorData((_res$data3 = res.data) === null || _res$data3 === void 0 ? void 0 : _res$data3.labels);
+            }
+            setTagsStateLoading(false);
+            _context2.next = 15;
+            break;
+          case 11:
+            _context2.prev = 11;
+            _context2.t0 = _context2["catch"](3);
+            console.error(_context2.t0);
+            setTagsStateLoading(false);
+          case 15:
+            _context2.next = 18;
+            break;
+          case 17:
+            setTagsStateLoading(false);
+          case 18:
+          case "end":
+            return _context2.stop();
+        }
+      }, _callee2, null, [[3, 11]]);
+    }));
+    return _queryTagsState.apply(this, arguments);
+  }
+  if (loading || tagsStateLoading) {
     return /*#__PURE__*/React.createElement(Spin, null);
   }
   return /*#__PURE__*/React.createElement(BizUserConditionContext.Provider, {
@@ -227,11 +302,14 @@ var BizUserCondition = function BizUserCondition(props) {
       openBusinessDataCondition: openBusinessDataCondition,
       openOrderDataCondition: openOrderDataCondition,
       cdpTip: cdpTip,
-      userTagsData: userTagsData !== null && userTagsData !== void 0 ? userTagsData : [],
+      userTagsData: (userTagsData !== null && userTagsData !== void 0 ? userTagsData : []).concat(errorData),
+      searchUserTagsData: searchUserTagsData,
+      setSearchUserTagsData: setSearchUserTagsData,
       isRealTime: props.isRealTime,
       envNameList: envNameList,
       userPropsMap: userPropsMap,
-      datasetList: dataset
+      datasetList: dataset,
+      realTimeTags: realTimeTags
     }
   }, /*#__PURE__*/React.createElement("div", {
     className: classPrefix

package/es/userCondition/styles/conditionTypeList.less

@@ -1,30 +1,32 @@
-@import '../../assets/styles/inner.less';
-.biz-user-condition-type-list {
-  display: flex;
-  align-items: center;
-  .biz-user-condition-type-label {
-    margin-right: 10px;
-  }
-  .biz-user-condition-type-container {
-    display: flex;
-    margin: 0;
-    padding: 0;
-    list-style: none;
-    .condition-type {
-      padding: @padding-xss 12px;
-      background-color: @background-color-base;
-      border-radius: @border-radius-large;
-      cursor: pointer;
-      &:nth-child(n + 2) {
-        margin-left: @margin-md;
-      }
-      &:hover {
-        color: @primary-color;
-        background-color: @primary-color-hover;
-      }
-      &:active {
-        border-color: @primary-color;
-      }
-    }
-  }
-}
+@import '../../assets/styles/inner.less';
+.biz-user-condition-type-list {
+  display: flex;
+  align-items: center;
+  .biz-user-condition-type-label {
+    margin-right: 10px;
+  }
+  .biz-user-condition-type-container {
+    display: flex;
+    margin: 0;
+    padding: 0;
+    list-style: none;
+    .condition-type {
+      padding: @padding-xss 12px;
+      background-color: #fff;
+      border: 1px solid #ecedf0;
+      border-radius: @border-radius-large;
+      cursor: pointer;
+      &:nth-child(n + 2) {
+        margin-left: @margin-md;
+      }
+      &:hover {
+        color: @primary-color;
+        // background-color: @primary-color-hover;
+        border: 1px solid #b9ceff;
+      }
+      &:active {
+        border-color: @primary-color;
+      }
+    }
+  }
+}

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;