@zgfe/business-lib 1.0.26 → 1.0.27-adanalysis.0

package/es/userCondition/conditions/tagsCondition.js

@@ -16,14 +16,13 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
-import React, { useContext, useMemo, useState } from 'react';
+import React, { useContext, useState } from 'react';
 import { BizUserConditionContext, classPrefix } from '..';
 import BizSelect from '../../select';
 import { operatorMap } from './constants';
 import BizUserTagsSelect from '../../userTagsSelector';
 import './styles/tagsCondition.less';
-import { buildSelectLayer, buildTagsGroup } from '../util';
-import _ from 'lodash';
+import { findTagFactory } from '../util';
 var options = [{
   value: 'equal',
   text: '是'
@@ -46,10 +45,6 @@ var TagsCondition = function TagsCondition(props) {
       _useState2 = _slicedToArray(_useState, 1),
       defaultValues = _useState2[0];
 
-  var tagGroupList = useMemo(function () {
-    return buildTagsGroup(userTagsData || []);
-  }, [userTagsData]);
-
   function onOperatorChange(operator) {
     onChange(dataId, _objectSpread(_objectSpread({}, labels), {}, {
       operator: operator.value
@@ -58,7 +53,7 @@ var TagsCondition = function TagsCondition(props) {
 
   function onTagsChange(data) {
     var values = data.map(function (item) {
-      return "".concat(item[1].id, ":").concat(item[2].layerLabelId);
+      return item[1].labelId;
     });
     onChange(dataId, _objectSpread(_objectSpread({}, labels), {}, {
       values: values
@@ -67,20 +62,12 @@ var TagsCondition = function TagsCondition(props) {
 
   function buildDefaultValues() {
     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];
-
-      var selectValue = findTag(Number(layerId));
+    var findTag = findTagFactory(userTagsData);
+    labels.values.forEach(function (id) {
+      var tag = findTag(id);
 
-      if (selectValue) {
-        values.push(selectValue);
+      if (tag) {
+        values.push([tag.labelGroup, tag]);
       }
     });
     return values;
@@ -105,11 +92,11 @@ var TagsCondition = function TagsCondition(props) {
     className: "".concat(classPrefix, "-tags-condition-value")
   }, /*#__PURE__*/React.createElement(BizUserTagsSelect, {
     defaultValue: defaultValues,
-    data: tagGroupList,
-    childFields: ['children', 'layers'],
-    keyFields: ['labelGroup', 'id', 'layerLabelId'],
-    labelFields: ['labelGroup', 'labelName', 'layerLabelName'],
-    valueFields: ['labelGroup', 'id', 'layerLabelId'],
+    data: userTagsData,
+    childFields: ['children'],
+    keyFields: ['labelGroup', 'labelId'],
+    labelFields: ['labelGroup', 'labelName'],
+    valueFields: ['labelGroup', 'labelId'],
     onChange: onTagsChange,
     destroyPopupOnHide: true
   })), /*#__PURE__*/React.createElement("div", {

package/es/userCondition/conditions/textDesc.js

@@ -4,23 +4,10 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 
 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."); }
-
-function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
-
-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 = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"]; if (_i == null) return; var _arr = []; var _n = true; var _d = false; var _s, _e; try { for (_i = _i.call(arr); !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"] != null) _i["return"](); } finally { if (_d) throw _e; } } return _arr; }
-
-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';
-import { findEvent, findPropAndEnv, buildSelectLayer } from '../util';
+import { findEvent, findPropAndEnv, findTagFactory } from '../util';
 import { durationHandler, operatorMap } from './constants';
 import './styles/textDesc.less';
 
@@ -70,12 +57,12 @@ var Text = function Text(props) {
   function renderPeriod(label, period, isEvent) {
     var _label$after;
 
+    var valuesDom = /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("span", null, period.values[0]), /*#__PURE__*/React.createElement("span", null, (_label$after = label.after) !== null && _label$after !== void 0 ? _label$after : '天'));
+
     if (period.operator === 'unlimited_time') {
       return /*#__PURE__*/React.createElement("span", null, "\u5728\u4EFB\u610F\u65F6\u95F4\u5185");
     }
 
-    var valuesDom = /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("span", null, period.values[0]), /*#__PURE__*/React.createElement("span", null, (_label$after = label.after) !== null && _label$after !== void 0 ? _label$after : '天'));
-
     if (period.operator === 'absolute') {
       valuesDom = /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("span", {
         className: "".concat(classPrefix, "-text-desc-value")
@@ -186,23 +173,15 @@ var Text = function Text(props) {
       className: "label"
     }, /*#__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];
-
-      var tag = findTag(Number(layerId));
+    }, /*#__PURE__*/React.createElement("span", null, "("), labels.values.map(function (id, index) {
+      var tag = findTag(id);
       return /*#__PURE__*/React.createElement("span", {
-        key: layerId
+        key: id
       }, index >= 1 ? /*#__PURE__*/React.createElement("span", {
         style: {
           margin: '0 4px'
         }
-      }, "\u6216") : null, /*#__PURE__*/React.createElement("span", null, tag && tag[1].labelName + '：' + tag[2].layerLabelName));
+      }, "\u6216") : null, /*#__PURE__*/React.createElement("span", null, tag && tag.labelName));
     }), /*#__PURE__*/React.createElement("span", null, ")")));
   }
 
@@ -252,7 +231,7 @@ var Text = function Text(props) {
   }
 
   var findTag = useMemo(function () {
-    return buildSelectLayer(userTagsData);
+    return findTagFactory(userTagsData);
   }, [userTagsData]);
   return /*#__PURE__*/React.createElement("span", {
     className: "".concat(classPrefix, "-text-desc")

package/es/userCondition/demo/index.js

@@ -15,8 +15,216 @@ import eventData from '../../mock/event';
 import envData from '../../mock/env';
 import userData from '../../mock/user';
 import { BizUserCondition, BizGlobalDataContext, convertAttributeData } from '@zgfe/business-lib';
-import { conditions, tagList } from './mockData';
-var getTagList = Promise.resolve(tagList);
+var getTagList = Promise.resolve([{
+  appId: 51,
+  createTime: '2022-07-05T13:48:51',
+  del: 0,
+  id: 286,
+  isInner: 0,
+  isStartup: 0,
+  labelGroup: '行为标签',
+  labelId: 66284406603776,
+  labelName: 'test8（新增）',
+  labelStatus: 1,
+  updateTime: '2022-07-05T13:48:51'
+}, {
+  appId: 51,
+  createTime: '2022-07-05T13:47:38',
+  del: 0,
+  id: 285,
+  isInner: 0,
+  isStartup: 0,
+  labelGroup: '预测标签',
+  labelId: 66283215683584,
+  labelName: 'test7（新增）',
+  labelStatus: 1,
+  updateTime: '2022-07-05T13:47:38'
+}, {
+  appId: 51,
+  createTime: '2022-07-05T13:47:10',
+  del: 0,
+  id: 284,
+  isInner: 0,
+  isStartup: 0,
+  labelGroup: '其他标签',
+  labelId: 66282747314176,
+  labelName: 'test6（新增）',
+  labelStatus: 1,
+  updateTime: '2022-07-05T13:47:10'
+}, {
+  appId: 51,
+  createTime: '2022-07-05T13:44:20',
+  del: 0,
+  id: 283,
+  isInner: 0,
+  isStartup: 0,
+  labelGroup: '其他标签',
+  labelId: 66279963361280,
+  labelName: 'test5（新增）',
+  labelStatus: 1,
+  updateTime: '2022-07-05T13:44:20'
+}, {
+  appId: 51,
+  createTime: '2022-07-05T13:43:08',
+  del: 0,
+  id: 282,
+  isInner: 0,
+  isStartup: 0,
+  labelGroup: '活跃标签',
+  labelId: 66278784057344,
+  labelName: 'test3（新增）',
+  labelStatus: 1,
+  updateTime: '2022-07-05T13:43:08'
+}, {
+  appId: 51,
+  createTime: '2022-07-05T13:42:44',
+  del: 0,
+  id: 281,
+  isInner: 0,
+  isStartup: 0,
+  labelGroup: '其他标签',
+  labelId: 66278393724928,
+  labelName: 'test2（新增）',
+  labelStatus: 1,
+  updateTime: '2022-07-05T13:42:44'
+}, {
+  appId: 51,
+  createTime: '2022-07-05T13:42:30',
+  del: 0,
+  id: 280,
+  isInner: 0,
+  isStartup: 0,
+  labelGroup: '预测标签',
+  labelId: 66278158696448,
+  labelName: 'test1（新增）',
+  labelStatus: 1,
+  updateTime: '2022-07-05T13:42:30'
+}, {
+  appId: 51,
+  createTime: '2022-06-21T15:04:24',
+  del: 0,
+  id: 277,
+  isInner: 0,
+  isStartup: 0,
+  labelGroup: '活跃标签',
+  labelId: 46540583010304,
+  labelName: '匿名用户',
+  labelStatus: 0,
+  updateTime: '2022-06-21T15:04:24'
+}, {
+  appId: 51,
+  createTime: '2022-06-10T11:10:52',
+  del: 0,
+  id: 197,
+  isInner: 0,
+  isStartup: 0,
+  labelGroup: '活跃标签',
+  labelId: 77384417755136,
+  labelName: '手动更新1',
+  labelStatus: 0,
+  updateTime: '2022-06-10T11:32:31'
+}, {
+  appId: 51,
+  createTime: '2022-06-10T11:10:36',
+  del: 0,
+  id: 196,
+  isInner: 0,
+  isStartup: 0,
+  labelGroup: '活跃标签',
+  labelId: 77383474429952,
+  labelName: '自动更新修改',
+  labelStatus: 0,
+  updateTime: '2022-06-10T11:11:13'
+}, {
+  appId: 51,
+  createTime: '2022-06-10T10:49:57',
+  del: 0,
+  id: 191,
+  isInner: 0,
+  isStartup: 0,
+  labelGroup: '基本标签',
+  labelId: 77388914425856,
+  labelName: '一般价值',
+  labelStatus: 0,
+  updateTime: '2022-06-10T10:49:57'
+}]);
+var data = {
+  json: [[{
+    eventId: -4,
+    attrs: [],
+    runPeriod: {
+      operator: 'relative',
+      values: ['30', '1']
+    },
+    runTimes: {
+      operator: '>=',
+      values: ['1']
+    }
+  }, {
+    eventId: -3,
+    attrs: [],
+    runPeriod: {
+      operator: 'absolute',
+      values: ['2022-07-13', '2022-07-19']
+    },
+    runTimes: {
+      operator: '>=',
+      values: ['1']
+    }
+  }], [{
+    attrs: [{
+      attrId: 0,
+      attrName: 'zg_id',
+      operator: '>',
+      params: ['20'],
+      attrType: 'cont-num',
+      category: 'fixed'
+    }]
+  }, {
+    attrs: [{
+      attrId: 0,
+      attrName: 'app_user_id',
+      operator: 'equal',
+      params: ['20'],
+      attrType: 'cont-string',
+      category: 'fixed'
+    }]
+  }], [{
+    attrs: [{
+      attrId: 0,
+      attrName: 'duration',
+      operator: 'not equal',
+      params: [1198800, '1'],
+      attrType: 'cont-num',
+      category: 'fixed'
+    }]
+  }, {
+    eventId: 24143017,
+    runTimes: {
+      operator: '>=',
+      values: ['1']
+    },
+    attrs: [{
+      attrId: 0,
+      attrName: 'resolution_l',
+      category: 'fixed',
+      operator: '>',
+      params: ['10'],
+      attrType: 'cont-num'
+    }, {
+      attrId: 30183430,
+      attrName: '扫码场景描述',
+      category: 'custom',
+      operator: 'equal',
+      params: ['Microsoft Edge', 'Safari', 'Apple WebKit'],
+      attrType: 'cont-string'
+    }],
+    runPeriod: {
+      operator: 'relative',
+      values: ['30', '0']
+    }
+  }]]
+};
 export default (function () {
   var _useState = useState({
     eventGroupList: [],
@@ -40,13 +248,28 @@ export default (function () {
     setStore(newStore);
   }, []);
   useEffect(function () {
+    var tagsMap = {};
     getTagList.then(function (list) {
-      setUserTagsData(list);
+      var data = [];
+      list.forEach(function (item) {
+        var labelGroup = item.labelGroup;
+
+        if (tagsMap[labelGroup]) {
+          tagsMap[labelGroup].push(item);
+        } else {
+          tagsMap[labelGroup] = [item];
+          data.push({
+            labelGroup: labelGroup,
+            children: tagsMap[labelGroup]
+          });
+        }
+      });
+      setUserTagsData(data);
     });
   }, []);
   var defaultValue = useMemo(function () {
-    return conditions;
-  }, [conditions]);
+    return data.json;
+  }, [data]);
 
   function onChange(value) {
     console.log(JSON.stringify(value));

package/es/userCondition/types.d.ts

@@ -1,5 +1,6 @@
 /// <reference types="react" />
 import { UserProp } from '../attributeSelector/types';
+import { TagI } from './../userTagsSelector/types';
 export declare type Unpacked<T, U extends keyof T> = Required<T> extends {
     [key in U]: infer R;
 } ? R : never;
@@ -29,27 +30,8 @@ export declare namespace BizUserConditionT {
         isRealTime?: boolean;
     }
     interface UserTagsDataI {
-        appId: number;
-        createTime: string;
-        updateTime: string;
-        del: number;
         labelGroup: string;
-        id: number;
-        labelName: string;
-        labelStatus: number;
-        labelType: number;
-        remark: string;
-        creator: string;
-        userAmount: number;
-        layerNum: number;
-        endProcessTime: string;
-        layers: {
-            layerLabelId: number;
-            layerLabelName: string;
-            layerRemark: string;
-            layerCondition: any[][];
-            sequence: number;
-        }[];
+        children: TagI[];
     }
     interface AttrCondition {
         attrId: number;
@@ -80,7 +62,7 @@ export declare namespace BizUserConditionT {
     }
     interface Labels {
         operator: 'not equal' | 'equal';
-        values: string[];
+        values: number[];
     }
     interface TagsCondition {
         attrs: [];

package/es/userCondition/util.d.ts

@@ -4,26 +4,4 @@ export declare function buildCondition(type: BizUserConditionT.ConditionType): B
 export declare function transformNumberOperate(key: string, output?: boolean): string;
 export declare function findEvent(eventId: number, eventGroupList: Unpacked<GlobalContextProps, 'eventGroupList'>): import("../attributeSelector/types").AnalysisEvent | null;
 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;
-    layerLabelName?: undefined;
-} | {
-    layerLabelId: number;
-    layerLabelName: string;
-    labelGroup?: undefined;
-    id?: undefined;
-    labelName?: undefined;
-})[] | null;
-export declare function buildTagsGroup(list: BizUserConditionT.UserTagsDataI[]): {
-    labelGroup: string;
-    children: BizUserConditionT.UserTagsDataI[];
-}[];
+export declare function findTagFactory(data: BizUserConditionT.UserTagsDataI[]): (id: number) => import("../userTagsSelector/types").TagI | null;

package/es/userCondition/util.js

@@ -1,9 +1,3 @@
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
-
-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; }
-
 export function buildCondition(type) {
   switch (type) {
     case 'add':
@@ -105,45 +99,17 @@ export function findPropAndEnv(name, list) {
 
   return null;
 }
-export function buildSelectLayer(data) {
-  return function (layerLabelId) {
+export function findTagFactory(data) {
+  return function (id) {
     var i = -1;
     var j = data.findIndex(function (item) {
-      i = item.layers.findIndex(function (layer) {
-        return layer.layerLabelId === layerLabelId;
+      i = item.children.findIndex(function (tag) {
+        return tag.labelId === id;
       });
       if (i < 0) return false;
       return true;
     });
     if (j < 0) return null;
-    return [{
-      labelGroup: data[j].labelGroup
-    }, {
-      id: data[j].id,
-      labelName: data[j].labelName
-    }, {
-      layerLabelId: data[j].layers[i].layerLabelId,
-      layerLabelName: data[j].layers[i].layerLabelName
-    }];
+    return data[j].children[i];
   };
-}
-export function buildTagsGroup(list) {
-  var groupOrder = ['基本标签', '活跃标签', '行为标签', '预测标签', '其它标签'];
-  var groupsMap = {};
-  var options = [];
-  list.forEach(function (label) {
-    if (Object.hasOwn(groupsMap, label.labelGroup)) {
-      groupsMap[label.labelGroup].children.push(_objectSpread({}, label));
-    } else {
-      var group = {
-        labelGroup: label.labelGroup,
-        children: [_objectSpread({}, label)]
-      };
-      groupsMap[label.labelGroup] = group;
-    }
-  });
-  groupOrder.map(function (group) {
-    groupsMap[group] && options.push(groupsMap[group]);
-  });
-  return options;
 }