@zgfe/business-lib 1.0.25-layers.1 → 1.0.25-layers.2

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

@@ -1,4 +1,27 @@
-export declare const tagList: {
+export declare const tagList: ({
+    dataStatus: number;
+    id: number;
+    labelGroup: string;
+    labelName: string;
+    labelRemark: string;
+    labelType: number;
+    layers: {
+        layerCondition: {
+            attrs: {
+                attrId: number;
+                category: string;
+                params: string[];
+                attrName: string;
+                operator: string;
+                attrType: string;
+            }[];
+        }[][];
+        layerLabelId: number;
+        layerLabelName: string;
+        layerRemark: string;
+        sequence: number;
+    }[];
+} | {
     dataStatus: number;
     id: number;
     labelGroup: string;
@@ -23,11 +46,11 @@ export declare const tagList: {
         layerRemark: string;
         sequence: number;
     }[];
-}[];
+})[];
 export declare const conditions: {
     attrs: never[];
     labels: {
         operator: string;
-        values: (string | number)[];
+        values: string[];
     };
 }[][];

package/es/userCondition/demo/mockData.js

@@ -1,13 +1,36 @@
 export var tagList = [{
   dataStatus: 1,
-  id: 30,
-  labelGroup: '预测标签',
-  labelName: 'test3',
+  id: 78,
+  labelGroup: '基本标签',
+  labelName: '场景02',
   labelRemark: '',
   labelType: 0,
   layers: [{
     layerCondition: [[{
-      eventId: '-3',
+      attrs: [{
+        attrId: 392,
+        category: 'fixed',
+        params: ['王桂芝'],
+        attrName: 'name',
+        operator: 'equal',
+        attrType: 'cont-string'
+      }]
+    }]],
+    layerLabelId: 150062299430912,
+    layerLabelName: '分层1',
+    layerRemark: '',
+    sequence: 1
+  }]
+}, {
+  dataStatus: 1,
+  id: 77,
+  labelGroup: '基本标签',
+  labelName: '方法',
+  labelRemark: '',
+  labelType: 0,
+  layers: [{
+    layerCondition: [[{
+      eventId: '-4',
       runPeriod: {
         values: ['30', '0'],
         operator: 'relative'
@@ -18,10 +41,10 @@ export var tagList = [{
       },
       attrs: []
     }]],
-    layerLabelId: 130079277498373,
-    layerLabelName: '分层6',
+    layerLabelId: 150050265743362,
+    layerLabelName: '分层3',
     layerRemark: '',
-    sequence: 6
+    sequence: 3
   }, {
     layerCondition: [[{
       eventId: '-3',
@@ -34,11 +57,22 @@ export var tagList = [{
         operator: '>='
       },
       attrs: []
+    }, {
+      eventId: '-4',
+      runPeriod: {
+        values: ['30', '0'],
+        operator: 'relative'
+      },
+      runTimes: {
+        values: ['1'],
+        operator: '>='
+      },
+      attrs: []
     }]],
-    layerLabelId: 130079277498372,
-    layerLabelName: '分层5',
+    layerLabelId: 150050265743361,
+    layerLabelName: '分层1',
     layerRemark: '',
-    sequence: 5
+    sequence: 2
   }, {
     layerCondition: [[{
       eventId: '-3',
@@ -52,13 +86,179 @@ export var tagList = [{
       },
       attrs: []
     }]],
-    layerLabelId: 130079277498371,
-    layerLabelName: '分层4',
+    layerLabelId: 150050265743360,
+    layerLabelName: '分层2',
+    layerRemark: '',
+    sequence: 1
+  }]
+}, {
+  dataStatus: 1,
+  id: 76,
+  labelGroup: '基本标签',
+  labelName: '场景01',
+  labelRemark: '',
+  labelType: 1,
+  layers: [{
+    layerCondition: [[{
+      attrs: [{
+        attrId: 394,
+        category: 'custom',
+        params: ['9'],
+        attrName: '年龄',
+        operator: '>=',
+        attrType: 'cont-num'
+      }]
+    }]],
+    layerLabelId: 149967696576521,
+    layerLabelName: '分层10',
+    layerRemark: '',
+    sequence: 1
+  }, {
+    layerCondition: [[{
+      attrs: [{
+        attrId: 394,
+        category: 'custom',
+        params: ['91'],
+        attrName: '年龄',
+        operator: '>=',
+        attrType: 'cont-num'
+      }]
+    }]],
+    layerLabelId: 149967696576520,
+    layerLabelName: '分层9',
+    layerRemark: '',
+    sequence: 2
+  }, {
+    layerCondition: [[{
+      attrs: [{
+        attrId: 394,
+        category: 'custom',
+        params: ['81'],
+        attrName: '年龄',
+        operator: '>=',
+        attrType: 'cont-num'
+      }]
+    }]],
+    layerLabelId: 149967696576519,
+    layerLabelName: '分层8',
+    layerRemark: '',
+    sequence: 3
+  }, {
+    layerCondition: [[{
+      attrs: [{
+        attrId: 394,
+        category: 'custom',
+        params: ['71'],
+        attrName: '年龄',
+        operator: '>=',
+        attrType: 'cont-num'
+      }]
+    }]],
+    layerLabelId: 149967696576518,
+    layerLabelName: '分层7',
     layerRemark: '',
     sequence: 4
   }, {
     layerCondition: [[{
-      eventId: '-3',
+      attrs: [{
+        attrId: 394,
+        category: 'custom',
+        params: ['61'],
+        attrName: '年龄',
+        operator: '>=',
+        attrType: 'cont-num'
+      }]
+    }]],
+    layerLabelId: 149967696576517,
+    layerLabelName: '分层6',
+    layerRemark: '',
+    sequence: 5
+  }, {
+    layerCondition: [[{
+      attrs: [{
+        attrId: 394,
+        category: 'custom',
+        params: ['51'],
+        attrName: '年龄',
+        operator: '>=',
+        attrType: 'cont-num'
+      }]
+    }]],
+    layerLabelId: 149967696576516,
+    layerLabelName: '分层5',
+    layerRemark: '',
+    sequence: 6
+  }, {
+    layerCondition: [[{
+      attrs: [{
+        attrId: 394,
+        category: 'custom',
+        params: ['41'],
+        attrName: '年龄',
+        operator: '>=',
+        attrType: 'cont-num'
+      }]
+    }]],
+    layerLabelId: 149967696576515,
+    layerLabelName: '分层4',
+    layerRemark: '',
+    sequence: 7
+  }, {
+    layerCondition: [[{
+      attrs: [{
+        attrId: 394,
+        category: 'custom',
+        params: ['31'],
+        attrName: '年龄',
+        operator: '>=',
+        attrType: 'cont-num'
+      }]
+    }]],
+    layerLabelId: 149967696576514,
+    layerLabelName: '分层3',
+    layerRemark: '',
+    sequence: 8
+  }, {
+    layerCondition: [[{
+      attrs: [{
+        attrId: 394,
+        category: 'custom',
+        params: ['21'],
+        attrName: '年龄',
+        operator: '>=',
+        attrType: 'cont-num'
+      }]
+    }]],
+    layerLabelId: 149967696576513,
+    layerLabelName: '分层2',
+    layerRemark: '',
+    sequence: 9
+  }, {
+    layerCondition: [[{
+      attrs: [{
+        attrId: 394,
+        category: 'custom',
+        params: ['0'],
+        attrName: '年龄',
+        operator: '>=',
+        attrType: 'cont-num'
+      }]
+    }]],
+    layerLabelId: 149967696576512,
+    layerLabelName: '分层1',
+    layerRemark: '',
+    sequence: 10
+  }]
+}, {
+  dataStatus: 1,
+  id: 75,
+  labelGroup: '活跃标签',
+  labelName: 'test1',
+  labelRemark: '',
+  labelType: 0,
+  layers: [{
+    layerCondition: [[{
+      eventId: '-4',
       runPeriod: {
         values: ['30', '0'],
         operator: 'relative'
@@ -69,13 +269,13 @@ export var tagList = [{
       },
       attrs: []
     }]],
-    layerLabelId: 130079277498370,
+    layerLabelId: 149835924930562,
     layerLabelName: '分层3',
     layerRemark: '',
     sequence: 3
   }, {
     layerCondition: [[{
-      eventId: '-3',
+      eventId: '-4',
       runPeriod: {
         values: ['30', '0'],
         operator: 'relative'
@@ -86,7 +286,7 @@ export var tagList = [{
       },
       attrs: []
     }]],
-    layerLabelId: 130079277498369,
+    layerLabelId: 149835924930561,
     layerLabelName: '分层2',
     layerRemark: '',
     sequence: 2
@@ -103,23 +303,23 @@ export var tagList = [{
       },
       attrs: []
     }]],
-    layerLabelId: 130079277498368,
+    layerLabelId: 149835924930560,
     layerLabelName: '分层1',
     layerRemark: '',
     sequence: 1
   }]
 }, {
   dataStatus: 1,
-  id: 29,
+  id: 71,
   labelGroup: '活跃标签',
-  labelName: 'test2',
+  labelName: '四期标签-2-新增',
   labelRemark: '',
   labelType: 0,
   layers: [{
     layerCondition: [[{
-      eventId: '-4',
+      eventId: '-3',
       runPeriod: {
-        values: ['30', '0'],
+        values: ['120', '0'],
         operator: 'relative'
       },
       runTimes: {
@@ -128,15 +328,15 @@ export var tagList = [{
       },
       attrs: []
     }]],
-    layerLabelId: 130078364041218,
-    layerLabelName: '分层3',
+    layerLabelId: 149794433728512,
+    layerLabelName: '新增于120天',
     layerRemark: '',
-    sequence: 3
+    sequence: 2
   }, {
     layerCondition: [[{
-      eventId: '-4',
+      eventId: '-3',
       runPeriod: {
-        values: ['30', '0'],
+        values: ['90', '0'],
         operator: 'relative'
       },
       runTimes: {
@@ -145,15 +345,15 @@ export var tagList = [{
       },
       attrs: []
     }]],
-    layerLabelId: 130078364041217,
-    layerLabelName: '分层2',
+    layerLabelId: 149666588688384,
+    layerLabelName: '新增于90天',
     layerRemark: '',
-    sequence: 2
+    sequence: 1
   }, {
     layerCondition: [[{
       eventId: '-3',
       runPeriod: {
-        values: ['30', '0'],
+        values: ['60', '0'],
         operator: 'relative'
       },
       runTimes: {
@@ -162,19 +362,11 @@ export var tagList = [{
       },
       attrs: []
     }]],
-    layerLabelId: 130078364041216,
-    layerLabelName: '分层1',
+    layerLabelId: 148623442149377,
+    layerLabelName: '新增于60天',
     layerRemark: '',
-    sequence: 1
-  }]
-}, {
-  dataStatus: 1,
-  id: 28,
-  labelGroup: '基本标签',
-  labelName: 'test1',
-  labelRemark: '',
-  labelType: 0,
-  layers: [{
+    sequence: 3
+  }, {
     layerCondition: [[{
       eventId: '-3',
       runPeriod: {
@@ -187,8 +379,46 @@ export var tagList = [{
       },
       attrs: []
     }]],
-    layerLabelId: 130003289636864,
-    layerLabelName: '分层1',
+    layerLabelId: 148623442149376,
+    layerLabelName: '新增于30天',
+    layerRemark: '',
+    sequence: 4
+  }]
+}, {
+  dataStatus: 1,
+  id: 70,
+  labelGroup: '基本标签',
+  labelName: '四期标签-1-性别',
+  labelRemark: '',
+  labelType: 1,
+  layers: [{
+    layerCondition: [[{
+      attrs: [{
+        attrId: 393,
+        category: 'custom',
+        params: ['女'],
+        attrName: '性别',
+        operator: 'equal',
+        attrType: 'cont-string'
+      }]
+    }]],
+    layerLabelId: 148447906299905,
+    layerLabelName: '分层2性别是女',
+    layerRemark: '',
+    sequence: 2
+  }, {
+    layerCondition: [[{
+      attrs: [{
+        attrId: 393,
+        category: 'custom',
+        params: ['男'],
+        attrName: '性别',
+        operator: 'equal',
+        attrType: 'cont-string'
+      }]
+    }]],
+    layerLabelId: 148447906299904,
+    layerLabelName: '分层1性别是男',
     layerRemark: '',
     sequence: 1
   }]
@@ -197,6 +427,6 @@ export var conditions = [[{
   attrs: [],
   labels: {
     operator: 'equal',
-    values: ['28:130003289636864', '29:130078364041217', '29:130078364041216', 130078364041218]
+    values: ['78:150062299430912', '77:150050265743360']
   }
 }]];

package/es/userCondition/util.d.ts

@@ -6,10 +6,12 @@ export declare function findEvent(eventId: number, eventGroupList: Unpacked<Glob
 export declare function findPropAndEnv(name: string, list: Unpacked<GlobalContextProps, 'userPropList' | 'eventEnvList'>): import("../attributeSelector/types").UserProp | import("../attributeSelector/types").EnvProp | null;
 export declare function buildSelectLayer(data: BizUserConditionT.UserTagsDataI[]): (layerLabelId: number) => ({
     labelGroup: string;
+    id?: undefined;
     labelName?: undefined;
     layerLabelId?: undefined;
     layerLabelName?: undefined;
 } | {
+    id: number;
     labelName: string;
     labelGroup?: undefined;
     layerLabelId?: undefined;
@@ -18,6 +20,7 @@ export declare function buildSelectLayer(data: BizUserConditionT.UserTagsDataI[]
     layerLabelId: number;
     layerLabelName: string;
     labelGroup?: undefined;
+    id?: undefined;
     labelName?: undefined;
 })[] | null;
 export declare function buildTagsGroup(list: BizUserConditionT.UserTagsDataI[]): {

package/es/userCondition/util.js

@@ -119,6 +119,7 @@ export function buildSelectLayer(data) {
     return [{
       labelGroup: data[j].labelGroup
     }, {
+      id: data[j].id,
       labelName: data[j].labelName
     }, {
       layerLabelId: data[j].layers[i].layerLabelId,

package/es/userTagsSelector/groups/index.js

@@ -1,5 +1,3 @@
-function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
@@ -71,14 +69,14 @@ var Groups = function Groups(props) {
     itemHeight: 48,
     itemKey: keyField
   }, function (item, index) {
-    var _isChecked, _props$highlightText;
+    var _props$highlightText;
 
     return /*#__PURE__*/React.createElement(GroupOption, {
       onClick: function onClick() {
         return _onClick(index);
       },
       actived: item[valueField] === active,
-      checked: isChecked((_isChecked = {}, _defineProperty(_isChecked, valueField, item[valueField]), _defineProperty(_isChecked, labelField, item[labelField]), _isChecked)),
+      checked: isChecked(item, valueField),
       count: item[childField].length,
       label: item[labelField],
       value: item[valueField],

package/es/userTagsSelector/multipleCheckPanel/index.js

@@ -20,7 +20,8 @@ var MultipleCheckPanel = function MultipleCheckPanel(props) {
   var data = props.data,
       labelField = props.labelField,
       level = props.level,
-      currentValue = props.currentValue;
+      currentValue = props.currentValue,
+      valueField = props.valueField;
 
   var _useState = useState(''),
       _useState2 = _slicedToArray(_useState, 1),
@@ -50,7 +51,7 @@ var MultipleCheckPanel = function MultipleCheckPanel(props) {
     itemKey: labelField,
     height: 360
   }, function (item, index) {
-    var checked = isChecked(item);
+    var checked = isChecked(item, valueField);
     return /*#__PURE__*/React.createElement(CheckOption, {
       checked: checked,
       highlightText: searchValue,

package/es/userTagsSelector/util.d.ts

@@ -1,4 +1,4 @@
 export declare function curry(fn: Function): (...arg1: any[]) => (...arg2: any[]) => any;
 export declare function filterFactory(labelField: string, searchValue: string): (item: any) => boolean;
-export declare function isCheckedFactory(currentValue: any[], level: number): (val: any) => boolean;
+export declare function isCheckedFactory(currentValue: any[], level: number): (option: any, valueFiled: string) => boolean;
 export declare function getFieldFactory(fields: string[]): () => string;

package/es/userTagsSelector/util.js

@@ -22,9 +22,13 @@ export function filterFactory(labelField, searchValue) {
   };
 }
 export function isCheckedFactory(currentValue, level) {
-  return function (val) {
+  return function (option, valueFiled) {
     return currentValue.some(function (value) {
-      return _.isEqual(val, value[level]);
+      if (value[level][valueFiled] !== undefined) {
+        return value[level][valueFiled] === option[valueFiled];
+      } else {
+        return value[level] === option[valueFiled];
+      }
     });
   };
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zgfe/business-lib",
-  "version": "1.0.25-layers.1",
+  "version": "1.0.25-layers.2",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",
@@ -58,5 +58,5 @@
     "react": "^16.12.0 || ^17.0.0",
     "yorkie": "^2.0.0"
   },
-  "gitHead": "b9fbc29e1763a99246b7cccf08e322b4b019b21b"
+  "gitHead": "643a989f24b208966f5fba8ff0eefb973b11e126"
 }