@zgfe/business-lib 1.1.34-alpha.5 → 1.1.34-alpha.7

package/es/userCondition/conditions/businessCondition.js

@@ -122,13 +122,13 @@ var BusinessCondition = function BusinessCondition(props) {
       newData.values = [startDate, endDate];
     }
     if (newData.operator === 'relative') {
-      newData.values = ['30', '0'];
+      newData.values = [30, '0'];
     }
     if (newData.operator === 'unlimited_time') {
-      newData.values = ['30', '0'];
+      newData.values = [30, '0'];
     }
     if (newData.operator === 'join_time') {
-      newData.values = ['3', '0'];
+      newData.values = [3, '0'];
     }
     onChange(_objectSpread(_objectSpread({}, condition), {}, {
       runPeriod: newData
@@ -149,7 +149,7 @@ var BusinessCondition = function BusinessCondition(props) {
       var newValue = newData.target.value;
       onChange(_objectSpread(_objectSpread({}, condition), {}, {
         runPeriod: _objectSpread(_objectSpread({}, condition.runPeriod), {}, {
-          values: [newValue, '0']
+          values: [Number(newValue), '0']
         })
       }));
     }
@@ -183,7 +183,7 @@ var BusinessCondition = function BusinessCondition(props) {
     }
   }
   var onOperateChange = function onOperateChange(operate) {
-    condition.runTimes.values = [condition.runTimes.values[0]];
+    condition.runTimes.values = [Number(condition.runTimes.values[0])];
     onChange(_objectSpread(_objectSpread({}, condition), {}, {
       runTimes: _objectSpread(_objectSpread({}, condition.runTimes), {}, {
         operator: operate.value
@@ -192,7 +192,7 @@ var BusinessCondition = function BusinessCondition(props) {
   };
   var onOperateInput0Change = function onOperateInput0Change(value) {
     var newValue = value.target.value;
-    condition.runTimes.values[0] = newValue;
+    condition.runTimes.values[0] = Number(newValue);
     onChange(_objectSpread({}, condition));
   };
   var onOperateInput1Change = function onOperateInput1Change(value) {
@@ -212,7 +212,7 @@ var BusinessCondition = function BusinessCondition(props) {
     if (key === 'time dimension') {
       var _condition$timeDimens2;
       var obj = {
-        frequencyValues: ['1'],
+        frequencyValues: [1],
         frequencyOperator: '>',
         timeDimension: 1,
         timeOperator: 'all',
@@ -261,6 +261,7 @@ var BusinessCondition = function BusinessCondition(props) {
   }
   function onServiceAttributeChange(operate) {
     condition.typeId = operate === null || operate === void 0 ? void 0 : operate.value;
+    condition.typeName = operate === null || operate === void 0 ? void 0 : operate.name;
     onChange(_objectSpread({}, condition));
     setServiceAttribute(operate);
   }

package/es/userCondition/conditions/textDesc.d.ts

@@ -2,7 +2,7 @@ import React from 'react';
 import { BizUserConditionT } from '../types';
 import './styles/textDesc.less';
 export interface TextProps {
-    condition: BizUserConditionT.ActiveCondition | BizUserConditionT.AddCondition | BizUserConditionT.PropCondition | BizUserConditionT.EventCondition | BizUserConditionT.TagsCondition | BizUserConditionT.CdpCondition;
+    condition: BizUserConditionT.ActiveCondition | BizUserConditionT.AddCondition | BizUserConditionT.PropCondition | BizUserConditionT.EventCondition | BizUserConditionT.TagsCondition | BizUserConditionT.CdpCondition | BizUserConditionT.OrderCondition | BizUserConditionT.BusinessCondition;
     showOrDesc: boolean;
 }
 declare const Text: React.FC<TextProps>;

package/es/userCondition/conditions/textDesc.js

@@ -13,6 +13,7 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import _ from 'lodash';
 import React, { useContext, useMemo } from 'react';
 import { BizUserConditionContext, classPrefix } from '..';
+import { monthTimeOperatorType, monthValuesType, skyTimeOperatorType, timeDimensionType, timeValuesType, typeList, weekTimeOperatorType, weekValuesType, orderTypeList, computeTypeList, stringOperate } from '../../attrConditions/utils/operates';
 import BizGlobalDataContext from '../../context';
 import { findEvent, findPropAndEnv, buildSelectLayer } from '../util';
 import { durationHandler, operatorMap } from './constants';
@@ -36,6 +37,7 @@ var Text = function Text(props) {
       return renderCdp(condition);
     }
     var data = condition;
+    console.log(77773333, data, props);
     if (String(data.eventId) === '-4') {
       return renderPeriod({
         before: '活跃于'
@@ -49,6 +51,9 @@ var Text = function Text(props) {
     if (data.eventId === undefined) {
       return renderProps(data.attrs[0], 'user');
     }
+    if (String(data.eventId) === '-13') {
+      return renderOrder(data);
+    }
     if (data.eventId) {
       return renderEvent(data);
     }
@@ -103,6 +108,7 @@ var Text = function Text(props) {
     }
     var period = renderPeriod(periodLabel, condition.runPeriod, true);
     var runtimes = renderRuntimes(condition.runTimes);
+    var timeDimensions = renderTimeDimensions(condition.timeDimensions);
     var attrs = renderAttrs(event, condition.attrs);
     return /*#__PURE__*/React.createElement("span", {
       style: {
@@ -111,7 +117,67 @@ var Text = function Text(props) {
       }
     }, period, /*#__PURE__*/React.createElement("span", {
       className: "".concat(classPrefix, "-text-desc-value")
-    }, event.alias || event.name), attrs, runtimes);
+    }, event.alias || event.name), attrs, timeDimensions, runtimes);
+  }
+  function renderOrder(condition) {
+    var periodLabel = {};
+    if (condition.runPeriod.operator === 'join_time') {
+      periodLabel.before = '在新增后';
+      periodLabel.after = '天内';
+    }
+    if (condition.runPeriod.operator === 'relative' || condition.runPeriod.operator === 'absolute') {
+      periodLabel.before = '在';
+    }
+    var period = renderPeriod(periodLabel, condition.runPeriod, true);
+    var frequencyValues = renderFrequencyValues(condition.runTimes.values, condition.runTimes.operator, '次数');
+    var timeDimensions = renderTimeDimensions(condition.timeDimensions);
+    var property = renderProperty(condition.attrs, '订单属性');
+    return /*#__PURE__*/React.createElement("span", {
+      style: {
+        backgroundColor: '#fffeeb',
+        padding: '6px 7px'
+      }
+    }, "\u8BA2\u5355\u6570\u636E ", period, timeDimensions, "\u8BA2\u5355\u5C5E\u6027 ", property, frequencyValues);
+  }
+  function renderProperty(attrs, label) {
+    var attrsDom = [];
+    attrs.forEach(function (item, i) {
+      var attrTypeList = [];
+      var operateList = [];
+      switch (item.attrType) {
+        case 'cont-string':
+          attrTypeList = typeList['cont-string'];
+          operateList = stringOperate;
+          break;
+        case 'cont-num':
+          attrTypeList = computeTypeList;
+          operateList = typeList['cont-num'];
+          break;
+        default:
+          attrTypeList = typeList['cont-date'];
+          operateList = typeList['cont-date'];
+          break;
+      }
+      var orderType = orderTypeList.filter(function (v) {
+        return v.value === item.orderType;
+      });
+      var attrType = attrTypeList.filter(function (v) {
+        return v.value === (item.attrType === 'cont-num' ? item.computeType : item.operator);
+      });
+      var operator = operateList.filter(function (v) {
+        return v.value === item.computeType;
+      });
+      var frequencyValues = renderFrequencyValues(item.params, item.operator, item.attrType === 'cont-date' ? '天数' : '');
+      if (label) {
+        var _orderType$, _attrType$, _operator$;
+        var dom = /*#__PURE__*/React.createElement("span", {
+          key: i
+        }, /*#__PURE__*/React.createElement("span", null, (_orderType$ = orderType[0]) === null || _orderType$ === void 0 ? void 0 : _orderType$.name), /*#__PURE__*/React.createElement("span", null, item.attrName), /*#__PURE__*/React.createElement("span", null, (_attrType$ = attrType[0]) === null || _attrType$ === void 0 ? void 0 : _attrType$.name), /*#__PURE__*/React.createElement("span", null, (_operator$ = operator[0]) === null || _operator$ === void 0 ? void 0 : _operator$.name), /*#__PURE__*/React.createElement("span", null, frequencyValues), i !== attrs.length - 1 ? '，' : '');
+        attrsDom.push(dom);
+      }
+    });
+    if (!attrsDom.length) return null;
+    return /*#__PURE__*/React.createElement("span", null, /*#__PURE__*/React.createElement("span", null, "\uFF08"), attrsDom, /*#__PURE__*/React.createElement("span", null, "\uFF09"));
   }
   function renderAttrs(event, attrs) {
     var attrsDom = [];
@@ -145,6 +211,75 @@ var Text = function Text(props) {
       className: "".concat(classPrefix, "-text-desc-value")
     }, runTimes.values[0]));
   }
+  function renderFrequencyValues(frequencyValues, frequencyOperator, frequency) {
+    var _frequencyOperatorLis;
+    var frequencyValuesDom = [];
+    var frequencyOperatorList = typeList['cont-num'].filter(function (v) {
+      return v.value === frequencyOperator;
+    });
+    frequencyValues.forEach(function (item, i) {
+      var dom = /*#__PURE__*/React.createElement("span", {
+        key: i
+      }, /*#__PURE__*/React.createElement("span", null, item, i !== frequencyValues.length - 1 ? '到' : ''));
+      frequencyValuesDom.push(dom);
+    });
+    return /*#__PURE__*/React.createElement("span", null, /*#__PURE__*/React.createElement("span", {
+      className: "".concat(classPrefix, "-text-desc-value")
+    }, frequency), /*#__PURE__*/React.createElement("span", {
+      className: "".concat(classPrefix, "-text-desc-value")
+    }, (_frequencyOperatorLis = frequencyOperatorList[0]) === null || _frequencyOperatorLis === void 0 ? void 0 : _frequencyOperatorLis.name), /*#__PURE__*/React.createElement("span", {
+      className: "".concat(classPrefix, "-text-desc-value")
+    }, frequencyValuesDom));
+  }
+  function renderTimeDimensions(timeDimensions) {
+    var timeDimensionsDom = [];
+    timeDimensions.forEach(function (item, i) {
+      var _label$, _operatorTypeList$;
+      var label = [];
+      var list = [];
+      var valuesList = [];
+      switch (item.timeDimension) {
+        case 1:
+          list = skyTimeOperatorType;
+          valuesList = timeValuesType;
+          break;
+        case 2:
+          list = weekTimeOperatorType;
+          valuesList = weekValuesType;
+          break;
+        default:
+          list = monthTimeOperatorType;
+          valuesList = monthValuesType;
+          break;
+      }
+      label = timeDimensionType.filter(function (v) {
+        return v.value === item.timeDimension;
+      });
+      var operatorTypeList = list.filter(function (v) {
+        return v.value === item.timeOperator;
+      });
+      var itemTimeValuesDom = [];
+      if (item.timeValues.length > 0) {
+        item.timeValues.forEach(function (_v, vIndex) {
+          var _valuesTypeList$;
+          var valuesTypeList = valuesList.filter(function (v) {
+            return v.value === _v;
+          });
+          var dom = /*#__PURE__*/React.createElement("span", {
+            key: vIndex
+          }, /*#__PURE__*/React.createElement("span", null, (_valuesTypeList$ = valuesTypeList[0]) === null || _valuesTypeList$ === void 0 ? void 0 : _valuesTypeList$.name, vIndex !== item.timeValues.length - 1 ? '到' : ''));
+          itemTimeValuesDom.push(dom);
+        });
+      }
+      var frequencyValues = renderFrequencyValues(item.frequencyValues, item.frequencyOperator, '次数');
+      var dom = /*#__PURE__*/React.createElement("span", {
+        key: i
+      }, /*#__PURE__*/React.createElement("span", null, (_label$ = label[0]) === null || _label$ === void 0 ? void 0 : _label$.name, (_operatorTypeList$ = operatorTypeList[0]) === null || _operatorTypeList$ === void 0 ? void 0 : _operatorTypeList$.name, itemTimeValuesDom, frequencyValues, i !== timeDimensions.length - 1 ? '，' : ''));
+      timeDimensionsDom.push(dom);
+    });
+    if (!timeDimensionsDom.length) return null;
+    return /*#__PURE__*/React.createElement("span", null, /*#__PURE__*/React.createElement("span", null, "\uFF08"), "\u65F6\u95F4\u7EF4\u5EA6: ", timeDimensionsDom, /*#__PURE__*/React.createElement("span", null, "\uFF09"));
+  }
   function renderTags(condition) {
     var labels = condition.labels;
     return /*#__PURE__*/React.createElement("span", {

package/es/userCondition/index.js

@@ -58,10 +58,10 @@ var BizUserCondition = function BizUserCondition(props) {
         var showTag = openTagCondition && (!menuNameMap || menuNameMap['userTags']);
         var showCdp = openCdpCondition && (!menuNameMap || menuNameMap['dataset']);
         var flag = false;
-        defaultValue.forEach(function (item) {
+        defaultValue === null || defaultValue === void 0 ? void 0 : defaultValue.forEach(function (item) {
           var showItem = _toConsumableArray(item);
           if (!(showTag && showCdp)) {
-            item.forEach(function (data, index) {
+            item === null || item === void 0 ? void 0 : item.forEach(function (data, index) {
               if (data.dataset && !showCdp || data.labels && !showTag) {
                 showItem.splice(index, 1);
                 flag = true;

package/es/userCondition/orConditions.js

@@ -117,6 +117,10 @@ var OrConditions = function OrConditions(props) {
           data.condition.labels = newData;
         } else if (type === 'cdp') {
           data.condition.dataset = newData;
+        } else if (type === 'business') {
+          data.condition = newData;
+        } else if (type === 'order') {
+          data.condition = newData;
         }
       }
       newValue.push(data.condition);

package/es/userCondition/types.d.ts

@@ -7,10 +7,18 @@ export interface RunPeriodI {
     operator: 'relative' | 'unlimited_time' | 'join_time' | 'absolute';
     values: string[];
 }
+export interface RunPeriodII {
+    operator: 'relative' | 'unlimited_time' | 'join_time' | 'absolute';
+    values: any[];
+}
 export interface RunTimesI {
     operator: '>' | '=' | '<' | '>=' | '<=' | '>=' | 'not equal' | 'between';
     values: string[];
 }
+export interface RunTimesII {
+    operator: '>' | '=' | '<' | '>=' | '<=' | '>=' | 'not equal' | 'between';
+    values: any[];
+}
 export interface AllConditionBasePropsI<T> {
     dataId: number;
     onChange: (dataId: number, newData: T) => void;
@@ -85,7 +93,7 @@ export declare namespace BizUserConditionT {
         timeOperator: string;
         timeValues: number[];
         frequencyOperator: string;
-        frequencyValues: string[];
+        frequencyValues: any[];
     }
     interface EventCondition {
         attrs: AttrCondition[];
@@ -102,17 +110,18 @@ export declare namespace BizUserConditionT {
     }
     interface BusinessCondition {
         typeId: undefined;
+        typeName: undefined;
         attrs: AttrsCondition[];
         timeDimensions: TimeDimensionsCondition[];
-        runTimes: RunTimesI;
-        runPeriod: RunPeriodI;
+        runTimes: RunTimesII;
+        runPeriod: RunPeriodII;
         eventId: -14;
     }
     interface OrderCondition {
         attrs: AttrsCondition[];
         timeDimensions: TimeDimensionsCondition[];
-        runTimes: RunTimesI;
-        runPeriod: RunPeriodI;
+        runTimes: RunTimesII;
+        runPeriod: RunPeriodII;
         eventId: -13;
     }
     interface ActiveCondition {
@@ -158,9 +167,9 @@ export declare namespace BizUserConditionT {
     interface CdpCondition {
         dataset: (BizUserConditionT.CdpConditionDetail | undefined)[];
     }
-    type Condition = EventCondition | AddCondition | ActiveCondition | PropCondition | TagsCondition | BusinessCondition | CdpCondition;
+    type Condition = EventCondition | AddCondition | ActiveCondition | PropCondition | TagsCondition | BusinessCondition | OrderCondition | CdpCondition;
     type Conditions = Condition[][];
-    type OtherCondition = EventCondition | AddCondition | ActiveCondition | PropCondition;
+    type OtherCondition = EventCondition | AddCondition | ActiveCondition | PropCondition | BusinessCondition | OrderCondition;
     interface ShowItemI {
         id: number;
         orConditions: Conditions[number];

package/es/userCondition/util.js

@@ -71,15 +71,16 @@ export function buildCondition(type) {
       return {
         eventId: -14,
         typeId: undefined,
+        typeName: undefined,
         runTimes: {
           operator: '>=',
-          values: ['1']
+          values: [1]
         },
         attrs: [],
         timeDimensions: [],
         runPeriod: {
           operator: 'relative',
-          values: ['30', '0']
+          values: [30, '0']
         }
       };
     case 'order':
@@ -87,13 +88,13 @@ export function buildCondition(type) {
         eventId: -13,
         runTimes: {
           operator: '>=',
-          values: ['1']
+          values: [1]
         },
         attrs: [],
         timeDimensions: [],
         runPeriod: {
           operator: 'relative',
-          values: ['30', '0']
+          values: [30, '0']
         }
       };
   }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@zgfe/business-lib",
-    "version": "1.1.34-alpha.5",
+    "version": "1.1.34-alpha.7",
     "scripts": {
         "start": "dumi dev",
         "docs:build": "dumi build",