@zgfe/business-lib 1.0.25-layers.0 → 1.0.25-layers.3

package/es/userCondition/conditions/styles/eventCondition.less

@@ -42,7 +42,7 @@
     display: flex;
     align-items: center;
     min-width: 28px;
-    height: 42px;
+    height: 34px;
     margin-right: @margin-xs;
   }
   &-runtimes {

package/es/userCondition/conditions/styles/tagsCondition.less

@@ -8,7 +8,7 @@
     margin-left: @margin-xs;
   }
   &-label {
-    line-height: 40px;
+    line-height: 32px;
   }
   &-value {
     flex: 1;

package/es/userCondition/conditions/tagsCondition.js

@@ -23,6 +23,7 @@ import { operatorMap } from './constants';
 import BizUserTagsSelect from '../../userTagsSelector';
 import './styles/tagsCondition.less';
 import { buildSelectLayer, buildTagsGroup } from '../util';
+import _ from 'lodash';
 var options = [{
   value: 'equal',
   text: '是'
@@ -68,6 +69,10 @@ var TagsCondition = function TagsCondition(props) {
     var values = [];
     var findTag = buildSelectLayer(userTagsData);
     labels.values.forEach(function (value) {
+      if (_.isNumber(value)) {
+        return;
+      }
+
       var _value$split = value.split(':'),
           _value$split2 = _slicedToArray(_value$split, 2),
           layerId = _value$split2[1];

package/es/userCondition/conditions/textDesc.js

@@ -16,6 +16,7 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
+import _ from 'lodash';
 import React, { useContext, useMemo } from 'react';
 import { BizUserConditionContext, classPrefix } from '..';
 import BizGlobalDataContext from '../../context';
@@ -186,6 +187,10 @@ var Text = function Text(props) {
     }, /*#__PURE__*/React.createElement("b", null, "\u7528\u6237\u6807\u7B7E")), /*#__PURE__*/React.createElement("span", null, /*#__PURE__*/React.createElement("b", null, operatorMap[labels.operator])), /*#__PURE__*/React.createElement("span", {
       className: "".concat(classPrefix, "-text-desc-value")
     }, /*#__PURE__*/React.createElement("span", null, "("), labels.values.map(function (value, index) {
+      if (_.isNumber(value)) {
+        return null;
+      }
+
       var _value$split = value.split(':'),
           _value$split2 = _slicedToArray(_value$split, 2),
           layerId = _value$split2[1];

package/es/userCondition/demo/index.js

@@ -53,7 +53,6 @@ export default (function () {
   }
 
   var descDom = /*#__PURE__*/React.createElement(BizUserCondition, {
-    textMode: true,
     defaultValue: defaultValue,
     onChange: onChange,
     eventAttrNum: 3,

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

@@ -1,12 +1,60 @@
-export declare const tagList: {
+export declare const tagList: ({
     dataStatus: number;
+    endProcessTime: string;
     id: number;
     labelGroup: string;
     labelName: string;
     labelRemark: string;
     labelType: number;
     layers: {
-        layerCondition: {
+        layerCondition: ({
+            eventId: number;
+            runPeriod: {
+                values: string[];
+                operator: string;
+            };
+            runTimes: {
+                values: string[];
+                operator: string;
+            };
+            attrs: never[];
+        }[] | {
+            eventId: string;
+            runPeriod: {
+                values: string[];
+                operator: string;
+            };
+            runTimes: {
+                values: string[];
+                operator: string;
+            };
+            attrs: never[];
+        }[])[];
+        layerLabelId: number;
+        layerLabelName: string;
+        layerRemark: string;
+        sequence: number;
+    }[];
+    startProcessTime: string;
+} | {
+    dataStatus: number;
+    endProcessTime: string;
+    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;
+            }[];
+        }[] | {
             eventId: string;
             runPeriod: {
                 values: string[];
@@ -17,13 +65,14 @@ export declare const tagList: {
                 operator: string;
             };
             attrs: never[];
-        }[][];
+        }[])[];
         layerLabelId: number;
         layerLabelName: string;
         layerRemark: string;
         sequence: number;
     }[];
-}[];
+    startProcessTime: string;
+})[];
 export declare const conditions: {
     attrs: never[];
     labels: {

package/es/userCondition/demo/mockData.js

@@ -1,13 +1,97 @@
 export var tagList = [{
   dataStatus: 1,
-  id: 30,
-  labelGroup: '预测标签',
-  labelName: 'test3',
+  endProcessTime: '2022-09-08T10:00:28',
+  id: 176,
+  labelGroup: '其它标签',
+  labelName: '测试一个分层分群',
   labelRemark: '',
   labelType: 0,
   layers: [{
     layerCondition: [[{
-      eventId: '-3',
+      eventId: '-4',
+      runPeriod: {
+        values: ['1', '0'],
+        operator: 'relative'
+      },
+      runTimes: {
+        values: ['1'],
+        operator: '>='
+      },
+      attrs: []
+    }]],
+    layerLabelId: 156761640992768,
+    layerLabelName: '分层1',
+    layerRemark: '',
+    sequence: 1
+  }],
+  startProcessTime: '2022-09-08T10:00:21'
+}, {
+  dataStatus: 1,
+  endProcessTime: '2022-09-06T20:14:05',
+  id: 172,
+  labelGroup: '活跃标签',
+  labelName: '每月更新-全更',
+  labelRemark: '',
+  labelType: 0,
+  layers: [{
+    layerCondition: [[{
+      eventId: 5603,
+      runPeriod: {
+        values: ['30', '0'],
+        operator: 'relative'
+      },
+      runTimes: {
+        values: ['1'],
+        operator: '>='
+      },
+      attrs: []
+    }], [{
+      eventId: '-4',
+      runPeriod: {
+        values: ['1', '0'],
+        operator: 'relative'
+      },
+      runTimes: {
+        values: ['1'],
+        operator: '>='
+      },
+      attrs: []
+    }]],
+    layerLabelId: 155848230436873,
+    layerLabelName: '分层10',
+    layerRemark: '',
+    sequence: 10
+  }, {
+    layerCondition: [[{
+      eventId: 5613,
+      runPeriod: {
+        values: ['30', '0'],
+        operator: 'relative'
+      },
+      runTimes: {
+        values: ['1'],
+        operator: '>='
+      },
+      attrs: []
+    }], [{
+      eventId: '-4',
+      runPeriod: {
+        values: ['1', '0'],
+        operator: 'relative'
+      },
+      runTimes: {
+        values: ['1'],
+        operator: '>='
+      },
+      attrs: []
+    }]],
+    layerLabelId: 155848230436872,
+    layerLabelName: '分层9',
+    layerRemark: '',
+    sequence: 9
+  }, {
+    layerCondition: [[{
+      eventId: 5621,
       runPeriod: {
         values: ['30', '0'],
         operator: 'relative'
@@ -17,14 +101,81 @@ export var tagList = [{
         operator: '>='
       },
       attrs: []
+    }], [{
+      eventId: '-4',
+      runPeriod: {
+        values: ['1', '0'],
+        operator: 'relative'
+      },
+      runTimes: {
+        values: ['1'],
+        operator: '>='
+      },
+      attrs: []
     }]],
-    layerLabelId: 130079277498373,
+    layerLabelId: 155848230436871,
+    layerLabelName: '分层8',
+    layerRemark: '',
+    sequence: 8
+  }, {
+    layerCondition: [[{
+      eventId: 5625,
+      runPeriod: {
+        values: ['30', '0'],
+        operator: 'relative'
+      },
+      runTimes: {
+        values: ['1'],
+        operator: '>='
+      },
+      attrs: []
+    }], [{
+      eventId: '-4',
+      runPeriod: {
+        values: ['1', '0'],
+        operator: 'relative'
+      },
+      runTimes: {
+        values: ['1'],
+        operator: '>='
+      },
+      attrs: []
+    }]],
+    layerLabelId: 155848230436870,
+    layerLabelName: '分层7',
+    layerRemark: '',
+    sequence: 7
+  }, {
+    layerCondition: [[{
+      eventId: 5630,
+      runPeriod: {
+        values: ['30', '0'],
+        operator: 'relative'
+      },
+      runTimes: {
+        values: ['1'],
+        operator: '>='
+      },
+      attrs: []
+    }], [{
+      eventId: '-4',
+      runPeriod: {
+        values: ['1', '0'],
+        operator: 'relative'
+      },
+      runTimes: {
+        values: ['1'],
+        operator: '>='
+      },
+      attrs: []
+    }]],
+    layerLabelId: 155848230436869,
     layerLabelName: '分层6',
     layerRemark: '',
     sequence: 6
   }, {
     layerCondition: [[{
-      eventId: '-3',
+      eventId: 5630,
       runPeriod: {
         values: ['30', '0'],
         operator: 'relative'
@@ -34,14 +185,25 @@ export var tagList = [{
         operator: '>='
       },
       attrs: []
+    }], [{
+      eventId: '-4',
+      runPeriod: {
+        values: ['1', '0'],
+        operator: 'relative'
+      },
+      runTimes: {
+        values: ['1'],
+        operator: '>='
+      },
+      attrs: []
     }]],
-    layerLabelId: 130079277498372,
+    layerLabelId: 155848230436868,
     layerLabelName: '分层5',
     layerRemark: '',
     sequence: 5
   }, {
     layerCondition: [[{
-      eventId: '-3',
+      eventId: 5625,
       runPeriod: {
         values: ['30', '0'],
         operator: 'relative'
@@ -51,14 +213,25 @@ export var tagList = [{
         operator: '>='
       },
       attrs: []
+    }], [{
+      eventId: '-4',
+      runPeriod: {
+        values: ['1', '0'],
+        operator: 'relative'
+      },
+      runTimes: {
+        values: ['1'],
+        operator: '>='
+      },
+      attrs: []
     }]],
-    layerLabelId: 130079277498371,
+    layerLabelId: 155848230436867,
     layerLabelName: '分层4',
     layerRemark: '',
     sequence: 4
   }, {
     layerCondition: [[{
-      eventId: '-3',
+      eventId: 5621,
       runPeriod: {
         values: ['30', '0'],
         operator: 'relative'
@@ -68,14 +241,25 @@ export var tagList = [{
         operator: '>='
       },
       attrs: []
+    }], [{
+      eventId: '-4',
+      runPeriod: {
+        values: ['1', '0'],
+        operator: 'relative'
+      },
+      runTimes: {
+        values: ['1'],
+        operator: '>='
+      },
+      attrs: []
     }]],
-    layerLabelId: 130079277498370,
+    layerLabelId: 155848230436866,
     layerLabelName: '分层3',
     layerRemark: '',
     sequence: 3
   }, {
     layerCondition: [[{
-      eventId: '-3',
+      eventId: 5613,
       runPeriod: {
         values: ['30', '0'],
         operator: 'relative'
@@ -85,14 +269,25 @@ export var tagList = [{
         operator: '>='
       },
       attrs: []
+    }], [{
+      eventId: '-4',
+      runPeriod: {
+        values: ['1', '0'],
+        operator: 'relative'
+      },
+      runTimes: {
+        values: ['1'],
+        operator: '>='
+      },
+      attrs: []
     }]],
-    layerLabelId: 130079277498369,
+    layerLabelId: 155848230436865,
     layerLabelName: '分层2',
     layerRemark: '',
     sequence: 2
   }, {
     layerCondition: [[{
-      eventId: '-3',
+      eventId: 5603,
       runPeriod: {
         values: ['30', '0'],
         operator: 'relative'
@@ -102,24 +297,46 @@ export var tagList = [{
         operator: '>='
       },
       attrs: []
+    }], [{
+      eventId: '-4',
+      runPeriod: {
+        values: ['1', '0'],
+        operator: 'relative'
+      },
+      runTimes: {
+        values: ['1'],
+        operator: '>='
+      },
+      attrs: []
     }]],
-    layerLabelId: 130079277498368,
+    layerLabelId: 155848230436864,
     layerLabelName: '分层1',
     layerRemark: '',
     sequence: 1
-  }]
+  }],
+  startProcessTime: '2022-09-06T20:13:51'
 }, {
   dataStatus: 1,
-  id: 29,
-  labelGroup: '活跃标签',
-  labelName: 'test2',
+  endProcessTime: '2022-09-06T21:08:37',
+  id: 85,
+  labelGroup: '行为标签',
+  labelName: '场景01-2',
   labelRemark: '',
-  labelType: 0,
+  labelType: 1,
   layers: [{
     layerCondition: [[{
+      attrs: [{
+        attrId: 584,
+        category: 'custom',
+        params: ['80'],
+        attrName: '年龄',
+        operator: '>',
+        attrType: 'cont-num'
+      }]
+    }], [{
       eventId: '-4',
       runPeriod: {
-        values: ['30', '0'],
+        values: ['1', '0'],
         operator: 'relative'
       },
       runTimes: {
@@ -128,15 +345,24 @@ export var tagList = [{
       },
       attrs: []
     }]],
-    layerLabelId: 130078364041218,
-    layerLabelName: '分层3',
+    layerLabelId: 154375754039303,
+    layerLabelName: '分层8',
     layerRemark: '',
-    sequence: 3
+    sequence: 8
   }, {
     layerCondition: [[{
+      attrs: [{
+        attrId: 584,
+        category: 'custom',
+        params: ['70'],
+        attrName: '年龄',
+        operator: '>',
+        attrType: 'cont-num'
+      }]
+    }], [{
       eventId: '-4',
       runPeriod: {
-        values: ['30', '0'],
+        values: ['1', '0'],
         operator: 'relative'
       },
       runTimes: {
@@ -145,15 +371,24 @@ export var tagList = [{
       },
       attrs: []
     }]],
-    layerLabelId: 130078364041217,
-    layerLabelName: '分层2',
+    layerLabelId: 154375754039302,
+    layerLabelName: '分层7',
     layerRemark: '',
-    sequence: 2
+    sequence: 7
   }, {
     layerCondition: [[{
-      eventId: '-3',
+      attrs: [{
+        attrId: 584,
+        category: 'custom',
+        params: ['60'],
+        attrName: '年龄',
+        operator: '>',
+        attrType: 'cont-num'
+      }]
+    }], [{
+      eventId: '-4',
       runPeriod: {
-        values: ['30', '0'],
+        values: ['1', '0'],
         operator: 'relative'
       },
       runTimes: {
@@ -162,23 +397,128 @@ export var tagList = [{
       },
       attrs: []
     }]],
-    layerLabelId: 130078364041216,
-    layerLabelName: '分层1',
+    layerLabelId: 154375754039301,
+    layerLabelName: '分层6',
     layerRemark: '',
-    sequence: 1
-  }]
-}, {
-  dataStatus: 1,
-  id: 28,
-  labelGroup: '基本标签',
-  labelName: 'test1',
-  labelRemark: '',
-  labelType: 0,
-  layers: [{
+    sequence: 6
+  }, {
+    layerCondition: [[{
+      attrs: [{
+        attrId: 584,
+        category: 'custom',
+        params: ['50'],
+        attrName: '年龄',
+        operator: '>',
+        attrType: 'cont-num'
+      }]
+    }], [{
+      eventId: '-4',
+      runPeriod: {
+        values: ['1', '0'],
+        operator: 'relative'
+      },
+      runTimes: {
+        values: ['1'],
+        operator: '>='
+      },
+      attrs: []
+    }]],
+    layerLabelId: 154375754039300,
+    layerLabelName: '分层5',
+    layerRemark: '',
+    sequence: 5
+  }, {
     layerCondition: [[{
-      eventId: '-3',
+      attrs: [{
+        attrId: 584,
+        category: 'custom',
+        params: ['40'],
+        attrName: '年龄',
+        operator: '>',
+        attrType: 'cont-num'
+      }]
+    }], [{
+      eventId: '-4',
       runPeriod: {
-        values: ['30', '0'],
+        values: ['1', '0'],
+        operator: 'relative'
+      },
+      runTimes: {
+        values: ['1'],
+        operator: '>='
+      },
+      attrs: []
+    }]],
+    layerLabelId: 154375754039299,
+    layerLabelName: '分层4',
+    layerRemark: '',
+    sequence: 4
+  }, {
+    layerCondition: [[{
+      attrs: [{
+        attrId: 584,
+        category: 'custom',
+        params: ['30'],
+        attrName: '年龄',
+        operator: '>',
+        attrType: 'cont-num'
+      }]
+    }], [{
+      eventId: '-4',
+      runPeriod: {
+        values: ['1', '0'],
+        operator: 'relative'
+      },
+      runTimes: {
+        values: ['1'],
+        operator: '>='
+      },
+      attrs: []
+    }]],
+    layerLabelId: 154375754039298,
+    layerLabelName: '分层3',
+    layerRemark: '',
+    sequence: 3
+  }, {
+    layerCondition: [[{
+      attrs: [{
+        attrId: 584,
+        category: 'custom',
+        params: ['20'],
+        attrName: '年龄',
+        operator: '>',
+        attrType: 'cont-num'
+      }]
+    }], [{
+      eventId: '-4',
+      runPeriod: {
+        values: ['1', '0'],
+        operator: 'relative'
+      },
+      runTimes: {
+        values: ['1'],
+        operator: '>='
+      },
+      attrs: []
+    }]],
+    layerLabelId: 154375754039297,
+    layerLabelName: '分层2',
+    layerRemark: '',
+    sequence: 2
+  }, {
+    layerCondition: [[{
+      attrs: [{
+        attrId: 584,
+        category: 'custom',
+        params: ['0'],
+        attrName: '年龄',
+        operator: '>',
+        attrType: 'cont-num'
+      }]
+    }], [{
+      eventId: '-4',
+      runPeriod: {
+        values: ['1', '0'],
         operator: 'relative'
       },
       runTimes: {
@@ -187,16 +527,17 @@ export var tagList = [{
       },
       attrs: []
     }]],
-    layerLabelId: 130003289636864,
+    layerLabelId: 154375754039296,
     layerLabelName: '分层1',
     layerRemark: '',
     sequence: 1
-  }]
+  }],
+  startProcessTime: '2022-09-06T21:08:28'
 }];
 export var conditions = [[{
   attrs: [],
   labels: {
     operator: 'equal',
-    values: ['28:130003289636864', '29:130078364041217', '29:130078364041216', '29: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,
@@ -127,7 +128,7 @@ export function buildSelectLayer(data) {
   };
 }
 export function buildTagsGroup(list) {
-  var groupOrder = ['基本标签', '活跃标签', '行为标签', '预测标签', '其他标签'];
+  var groupOrder = ['基本标签', '活跃标签', '行为标签', '预测标签', '其它标签'];
   var groupsMap = {};
   var options = [];
   list.forEach(function (label) {

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.0",
+  "version": "1.0.25-layers.3",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",
@@ -58,5 +58,5 @@
     "react": "^16.12.0 || ^17.0.0",
     "yorkie": "^2.0.0"
   },
-  "gitHead": "3f5bf3ac79c12018d7b44d15a42e6e715cd93f6d"
+  "gitHead": "b945e7187e809a8841813ba00df5d644694772fe"
 }