@zgfe/business-lib 1.0.15-user.4 → 1.0.15

package/es/userCondition/conditions/propCondition.js

@@ -24,15 +24,13 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
-import React, { useEffect, useMemo, useState } from 'react';
+import React, { useEffect, useState } from 'react';
 import { PlusOutlined } from '@ant-design/icons';
 import BizConditionItem from '../../attrConditions';
 import './styles/propCondition.less';
 import { useContext } from 'react';
 import { BizUserConditionContext, classPrefix } from '..';
 import { transformNumberOperate } from '../util';
-import { PropType } from '../../attributeSelector/types';
-import BizGlobalDataContext from '../../context';
 var numAttrTypeMap = {
   1: 'cont-string',
   2: 'cont-num',
@@ -45,28 +43,19 @@ var attrNumTypeMap = {
 };
 
 var PropCondition = function PropCondition(props) {
-  var _useContext = useContext(BizGlobalDataContext),
-      eventEnvList = _useContext.eventEnvList;
-
-  var _useContext2 = useContext(BizUserConditionContext),
-      eventAttrNum = _useContext2.eventAttrNum;
+  var _useContext = useContext(BizUserConditionContext),
+      eventAttrNum = _useContext.eventAttrNum;
 
   var isEvent = props.isEvent,
       label = props.label,
       attrs = props.attrs,
-      dataId = props.dataId,
-      eventId = props.eventId;
+      dataId = props.dataId;
 
   var _useState = useState([]),
       _useState2 = _slicedToArray(_useState, 2),
       showList = _useState2[0],
       setShowList = _useState2[1];
 
-  var envNames = useMemo(function () {
-    return eventEnvList ? eventEnvList.map(function (env) {
-      return env.name;
-    }) : [];
-  }, [eventEnvList]);
   useEffect(function () {
     buildDefault();
   }, []);
@@ -108,8 +97,8 @@ var PropCondition = function PropCondition(props) {
     var newAttr = {
       attrName: attrName,
       attrId: attrId,
-      category: category || 'custom',
-      operator: type === PropType.NUMBER ? transformNumberOperate(operator) : operator,
+      category: category,
+      operator: transformNumberOperate(operator),
       params: values,
       attrType: numAttrTypeMap[type]
     };
@@ -141,9 +130,7 @@ var PropCondition = function PropCondition(props) {
 
   function getPropCategory(attrName) {
     if (!isEvent) return 'userProp';
-    if (attrName === undefined) return 'eventProp';
-    if (envNames.includes(attrName)) return 'envProp';
-    return 'eventProp';
+    return attrName === undefined ? 'eventProp' : 'envProp';
   }
 
   function renderAttr(item, i) {
@@ -169,10 +156,6 @@ var PropCondition = function PropCondition(props) {
       attrId && (props.defaultValue.attrId = attrId);
     }
 
-    if (isEvent) {
-      props.eventIdList = [eventId];
-    }
-
     return /*#__PURE__*/React.createElement("div", {
       className: "".concat(classPrefix, "-prop-condition-attr"),
       key: id
@@ -188,10 +171,7 @@ var PropCondition = function PropCondition(props) {
       onDelete: function onDelete() {
         return onRemoveAttr(i);
       },
-      enableDelete: isEvent,
-      border: false,
-      destroyPopupOnHide: true,
-      theme: "normal"
+      enableDelete: isEvent
     }, props))));
   }
 

package/es/userCondition/conditions/runTimesCondition.js

@@ -21,10 +21,10 @@ var options = [{
   text: '<'
 }, {
   value: '>=',
-  text: '≥'
+  text: '>='
 }, {
   value: '<=',
-  text: '≤'
+  text: '<='
 }, {
   value: 'not equal',
   text: '≠'

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

@@ -8,13 +8,10 @@
     flex: 1;
   }
   .biz-user-condition-event {
-    width: 255px;
+    width: 355px;
     .biz-event-select-handle {
       border-top-right-radius: 0;
       border-bottom-right-radius: 0;
-      .biz-select-handle-input {
-        background-color: @background-color-gray;
-      }
     }
   }
   &-times-period-wrap {
@@ -24,12 +21,14 @@
     display: flex;
     align-items: center;
     justify-content: center;
-    width: 38px;
-    height: 40px;
+    width: 30px;
+    height: 42px;
     margin-right: @margin-xs;
-    margin-left: @border-radius-small;
-    background-color: @background-color-gray;
+    border: 1px solid @border-color-base;
+    border-left: none;
     border-radius: @border-radius-small;
+    border-top-left-radius: 0;
+    border-bottom-left-radius: 0;
     cursor: pointer;
   }
   &-attrs {
@@ -41,7 +40,6 @@
   &-label {
     display: flex;
     align-items: center;
-    min-width: 28px;
     height: 42px;
     margin-right: @margin-xs;
   }

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

@@ -7,9 +7,6 @@
   &-values,
   &-unit {
     margin-right: @margin-xs;
-    > input {
-      border: none !important;
-    }
   }
   &-operator {
     width: 129px;

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

@@ -26,9 +26,9 @@
       display: flex;
       align-items: center;
       justify-content: center;
-      width: 40px;
-      height: 40px;
-      background-color: @background-color-gray;
+      width: 30px;
+      height: 30px;
+      border: 1px solid @border-color-base;
       border-radius: @border-radius-sx;
       cursor: pointer;
     }

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

@@ -9,9 +9,6 @@
   &-value {
     width: 58px;
     margin-right: @margin-xs;
-    > input {
-      border: none !important;
-    }
   }
   .biz-user-condition-runtimes-tip {
     color: @primary-color;

package/es/userCondition/demo/index.js

@@ -10,196 +10,11 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
-import React, { useEffect, useMemo, useState } from 'react';
+import React, { useEffect, useState } from 'react';
 import eventData from '../../mock/event';
 import envData from '../../mock/env';
 import userData from '../../mock/user';
 import { BizUserCondition, BizGlobalDataContext, convertAttributeData } from '@zgfe/business-lib';
-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: [[{
-    attrs: [{
-      attrId: 114,
-      attrName: 'name',
-      category: 'custom',
-      operator: 'equal',
-      params: ['Safari', 'Microsoft Edge', 'Apple WebKit'],
-      attrType: 'cont-string'
-    }]
-  }, {
-    eventId: 24143016,
-    runTimes: {
-      operator: '>=',
-      values: ['1']
-    },
-    attrs: [{
-      attrId: 30183431,
-      attrName: '用户open_id',
-      category: 'custom',
-      operator: 'equal',
-      params: ['Apple WebKit', 'Safari', 'Microsoft Edge', 'Unknown'],
-      attrType: 'cont-string'
-    }],
-    runPeriod: {
-      operator: 'relative',
-      values: ['30', '0']
-    }
-  }], [{
-    eventId: '-3',
-    runPeriod: {
-      operator: 'relative',
-      values: ['30', '0']
-    },
-    runTimes: {
-      operator: '>=',
-      values: ['1']
-    },
-    attrs: []
-  }, {
-    eventId: '-4',
-    runPeriod: {
-      operator: 'relative',
-      values: ['30', '1']
-    },
-    runTimes: {
-      operator: '>=',
-      values: ['1']
-    },
-    attrs: []
-  }]]
-};
 export default (function () {
   var _useState = useState({
     eventGroupList: [],
@@ -209,11 +24,6 @@ export default (function () {
       _useState2 = _slicedToArray(_useState, 2),
       setStore = _useState2[1];
 
-  var _useState3 = useState([]),
-      _useState4 = _slicedToArray(_useState3, 2),
-      userTagsData = _useState4[0],
-      setUserTagsData = _useState4[1];
-
   var newStore = convertAttributeData({
     eventList: eventData,
     userPropList: userData,
@@ -222,55 +32,42 @@ export default (function () {
   useEffect(function () {
     setStore(newStore);
   }, []);
-  useEffect(function () {
-    var tagsMap = {};
-    getTagList.then(function (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 data.json;
-  }, [data]);
 
-  function onChange(value) {
-    console.log(JSON.stringify(value));
+  function onChange(data) {
+    console.log(JSON.stringify(data));
   }
 
-  var descDom = /*#__PURE__*/React.createElement(BizUserCondition, {
-    defaultValue: defaultValue,
-    onChange: onChange,
-    eventAttrNum: 3,
-    openTagCondition: true,
-    userTagsData: userTagsData,
-    isRealTime: true
-  });
+  var defaultValue = [[{
+    eventId: 7086293,
+    runTimes: {
+      operator: '>=',
+      values: ['1']
+    },
+    attrs: [{
+      attrId: 30183425,
+      operator: '=',
+      params: ['Apple WebKit', 'Unknown'],
+      attrType: 'cont-string'
+    }, {
+      attrId: 5461057,
+      operator: '>',
+      params: ['123'],
+      attrType: 'cont-num'
+    }],
+    runPeriod: {
+      operator: 'relative',
+      values: ['30', '0']
+    }
+  }]];
   return /*#__PURE__*/React.createElement(BizGlobalDataContext.Provider, {
     value: {
       eventGroupList: newStore.eventGroupList,
       userPropList: newStore.userPropList,
-      eventEnvList: newStore.envPropList,
-      currentApp: {
-        appId: 160,
-        platform: 0
-      }
+      eventEnvList: newStore.envPropList
     }
-  }, /*#__PURE__*/React.createElement("div", {
-    style: {
-      display: 'inline-block'
-    }
-  }, descDom));
+  }, /*#__PURE__*/React.createElement(BizUserCondition, {
+    defaultValue: defaultValue,
+    onChange: onChange,
+    eventAttrNum: 3
+  }));
 });

package/es/userCondition/index.d.ts

@@ -1,7 +1,7 @@
 import React from 'react';
 import { BizUserConditionT } from './types';
 import './styles/index.less';
-export declare const BizUserConditionContext: React.Context<Pick<BizUserConditionT.PropsI, "textMode" | "openTagCondition" | "orConditionNum" | "eventAttrNum" | "userTagsData" | "isRealTime">>;
+export declare const BizUserConditionContext: React.Context<Pick<BizUserConditionT.PropsI, "eventAttrNum" | "orConditionNum">>;
 export declare const classPrefix = "biz-user-condition";
 declare const BizUserCondition: React.FC<BizUserConditionT.PropsI>;
 export default BizUserCondition;

package/es/userCondition/index.js

@@ -24,21 +24,15 @@ import RelationLabel from './relationLabel';
 import OrConditions from './orConditions';
 import './styles/index.less';
 import { buildCondition } from './util';
-import _ from 'lodash';
 export var BizUserConditionContext = /*#__PURE__*/createContext({
   orConditionNum: 2,
-  eventAttrNum: 1,
-  textMode: false,
-  openTagCondition: false,
-  userTagsData: []
+  eventAttrNum: 1
 });
 export var classPrefix = 'biz-user-condition';
 
 var BizUserCondition = function BizUserCondition(props) {
   var andConditionNum = props.andConditionNum,
-      defaultValue = props.defaultValue,
-      openTagCondition = props.openTagCondition,
-      userTagsData = props.userTagsData;
+      defaultValue = props.defaultValue;
 
   var _useState = useState([]),
       _useState2 = _slicedToArray(_useState, 2),
@@ -50,13 +44,7 @@ var BizUserCondition = function BizUserCondition(props) {
       dataList = _useState4[0],
       setDataList = _useState4[1];
 
-  var _useState5 = useState(function () {
-    if (defaultValue) {
-      return _.cloneDeep(defaultValue);
-    }
-
-    return [];
-  }),
+  var _useState5 = useState(defaultValue || []),
       _useState6 = _slicedToArray(_useState5, 2),
       value = _useState6[0],
       setValue = _useState6[1];
@@ -67,7 +55,7 @@ var BizUserCondition = function BizUserCondition(props) {
 
   function initShowList() {
     var showList = [];
-    value.forEach(function (item) {
+    defaultValue.forEach(function (item) {
       showList.push({
         id: Math.random(),
         orConditions: item
@@ -118,17 +106,13 @@ var BizUserCondition = function BizUserCondition(props) {
 
     setValue(newValue);
     setDataList(newDataList);
-    props.onChange && props.onChange(newValue);
+    props.onChange(newValue);
   }
 
   return /*#__PURE__*/React.createElement(BizUserConditionContext.Provider, {
     value: {
       orConditionNum: props.orConditionNum || 2,
-      eventAttrNum: props.eventAttrNum || 1,
-      textMode: props.textMode,
-      openTagCondition: openTagCondition,
-      userTagsData: userTagsData !== null && userTagsData !== void 0 ? userTagsData : [],
-      isRealTime: props.isRealTime
+      eventAttrNum: props.eventAttrNum || 1
     }
   }, /*#__PURE__*/React.createElement("div", {
     className: classPrefix
@@ -137,10 +121,9 @@ var BizUserCondition = function BizUserCondition(props) {
   }, /*#__PURE__*/React.createElement(RelationLabel, {
     show: value.length >= 2
   }, "\u4E14"), showList.length ? /*#__PURE__*/React.createElement("div", {
-    className: ["".concat(classPrefix, "-and-conditions-wrap"), props.textMode ? 'text-mode' : ''].join(' ')
-  }, showList.map(function (item, i) {
+    className: "".concat(classPrefix, "-and-conditions-wrap")
+  }, showList.map(function (item) {
     return /*#__PURE__*/React.createElement(OrConditions, {
-      showAndDesc: i > 0,
       orConditions: item.orConditions,
       key: item.id,
       onChange: function onChange(data) {
@@ -155,10 +138,6 @@ var BizUserCondition = function BizUserCondition(props) {
 };
 
 BizUserCondition.defaultProps = {
-  andConditionNum: 5,
-  textMode: false,
-  openTagCondition: false,
-  userTagsData: [],
-  isRealTime: false
+  andConditionNum: 5
 };
 export default BizUserCondition;