@zgfe/business-lib 1.2.70-hxd.3 → 1.2.70-hxd.31

package/es/userCondition/demo/mockData.d.ts

@@ -1,4 +1,18 @@
 export declare const tagList: ({
+    labelType: number;
+    dataStatus: number;
+    editStatus: number;
+    labelCreateType: number;
+    endProcessTime: string;
+    labelGroup: string;
+    startProcessTime: string;
+    layers: never[];
+    expireStatus: string;
+    id: number;
+    releaseState: number;
+    labelName: string;
+    labelRemark: string;
+} | {
     labelGroup: string;
     startProcessTime: string;
     labelType: number;
@@ -6,6 +20,7 @@ export declare const tagList: ({
         sequence: number;
         layerLabelId: number;
         layerLabelName: string;
+        ancestryState: number;
     }[];
     dataStatus: number;
     editStatus: number;
@@ -15,6 +30,7 @@ export declare const tagList: ({
     endProcessTime: string;
     labelName: string;
     labelRemark: string;
+    releaseState?: undefined;
 } | {
     labelGroup: string;
     labelType: number;
@@ -30,107 +46,17 @@ export declare const tagList: ({
     id: number;
     labelName: string;
     labelRemark: string;
-    startProcessTime?: undefined;
     endProcessTime?: undefined;
+    startProcessTime?: undefined;
+    releaseState?: undefined;
 })[];
-export declare const conditions: ({
+export declare const conditions: {
     attrs: never[];
     labels: {
         values: string[];
         operator: string;
     };
-    dataset?: undefined;
-    data_set_csh?: undefined;
-} | {
-    dataset: {
-        datasetId: number;
-        datasetTable: string;
-        datasetName: string;
-        fieldName: string;
-        fieldType: string;
-        webType: string;
-        paramType: string;
-        operator: string;
-        params: string[];
-    }[];
-    attrs?: undefined;
-    labels?: undefined;
-    data_set_csh?: undefined;
-} | {
-    data_set_csh: {
-        datasetName: string;
-        datasetTable: string;
-        fieldName: string;
-        fieldType: string;
-        webType: string;
-        paramType: string;
-        calculate: string;
-        operator: string;
-        params: string;
-        subCondition: {
-            operator: string;
-            datasetName: string;
-            datasetTable: string;
-            fieldName: string;
-            calculate: string;
-        };
-    }[];
-    attrs?: undefined;
-    labels?: undefined;
-    dataset?: undefined;
-} | {
-    data_set_csh: {
-        datasetName: string;
-        datasetTable: string;
-        fieldName: string;
-        fieldType: string;
-        webType: string;
-        paramType: string;
-        calculate: string;
-        operator: string;
-        between: number[];
-        subCondition: {
-            operator: string;
-            datasetName: string;
-            datasetTable: string;
-            fieldName: string;
-            calculate: string;
-        };
-    }[];
-    attrs?: undefined;
-    labels?: undefined;
-    dataset?: undefined;
-} | {
-    data_set_csh: {
-        datasetName: string;
-        datasetTable: string;
-        fieldName: string;
-        fieldType: string;
-        webType: string;
-        paramType: string;
-        calculate: string;
-        operator: string;
-        params: string;
-    }[];
-    attrs?: undefined;
-    labels?: undefined;
-    dataset?: undefined;
-} | {
-    data_set_csh: {
-        datasetName: string;
-        datasetTable: string;
-        fieldName: string;
-        fieldType: string;
-        webType: string;
-        paramType: string;
-        calculate: string;
-        operator: string;
-        between: number[];
-    }[];
-    attrs?: undefined;
-    labels?: undefined;
-    dataset?: undefined;
-})[][];
+}[][];
 export declare const datasetList: {
     id: number;
     datasetName: string;

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,28 @@ 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 () {
+    _useState4 = _slicedToArray(_useState3, 1),
+    errorData = _useState4[0];
+  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 +106,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 +136,7 @@ var BizUserCondition = function BizUserCondition(props) {
     } else {
       setLoading(false);
     }
+    setTagsStateLoading(false);
   }, []);
   function initShowList() {
     var showList = [];
@@ -213,7 +226,7 @@ var BizUserCondition = function BizUserCondition(props) {
     }));
     return _getDatasetList.apply(this, arguments);
   }
-  if (loading) {
+  if (loading || tagsStateLoading) {
     return /*#__PURE__*/React.createElement(Spin, null);
   }
   return /*#__PURE__*/React.createElement(BizUserConditionContext.Provider, {
@@ -227,11 +240,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

@@ -12,7 +12,8 @@
     list-style: none;
     .condition-type {
       padding: @padding-xss 12px;
-      background-color: @background-color-base;
+      background-color: #fff;
+      border: 1px solid #ecedf0;
       border-radius: @border-radius-large;
       cursor: pointer;
       &:nth-child(n + 2) {
@@ -20,7 +21,8 @@
       }
       &:hover {
         color: @primary-color;
-        background-color: @primary-color-hover;
+        // background-color: @primary-color-hover;
+        border: 1px solid #b9ceff;
       }
       &:active {
         border-color: @primary-color;

package/es/userCondition/styles/relationLabel.less

@@ -3,7 +3,7 @@
   position: relative;
   width: 2px;
   margin-right: @margin-lg;
-  background-color: @border-color-split;
+  background-color: #b9ceff;
   &-label {
     position: absolute;
     top: 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;