@zgfe/business-lib 1.1.34-alpha.4 → 1.1.34-alpha.6

package/es/userCondition/conditions/businessCondition.js

@@ -26,6 +26,7 @@ import IconFont from '../../icon/iconFont';
 import BizGlobalDataContext from '../../context';
 var RangePicker = DatePicker.RangePicker;
 var BusinessCondition = function BusinessCondition(props) {
+  var _condition$timeDimens, _condition$timeDimens3, _condition$timeDimens4, _condition$attrs;
   var condition = props.condition,
     dataId = props.dataId,
     isEvent = props.isEvent,
@@ -41,7 +42,7 @@ var BusinessCondition = function BusinessCondition(props) {
     }
   }, []);
   var items = [];
-  if (condition.timeDimensions.length < 3) {
+  if (((_condition$timeDimens = condition.timeDimensions) === null || _condition$timeDimens === void 0 ? void 0 : _condition$timeDimens.length) < 3) {
     items = items.concat([{
       label: '时间维度',
       key: 'time dimension'
@@ -121,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
@@ -148,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']
         })
       }));
     }
@@ -182,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
@@ -191,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) {
@@ -209,14 +210,15 @@ var BusinessCondition = function BusinessCondition(props) {
       setDataAttributeLabel((_labelProps$ = labelProps[0]) === null || _labelProps$ === void 0 ? void 0 : _labelProps$.label);
     }
     if (key === 'time dimension') {
+      var _condition$timeDimens2;
       var obj = {
-        frequencyValues: ['1'],
+        frequencyValues: [1],
         frequencyOperator: '>',
         timeDimension: 1,
         timeOperator: 'all',
         timeValues: []
       };
-      if (condition.timeDimensions.length !== 3) {
+      if (((_condition$timeDimens2 = condition.timeDimensions) === null || _condition$timeDimens2 === void 0 ? void 0 : _condition$timeDimens2.length) !== 3) {
         condition.timeDimensions.push(obj);
       } else {
         notification.info({
@@ -345,7 +347,7 @@ var BusinessCondition = function BusinessCondition(props) {
     placeholder: condition.runTimes.operator !== 'between' ? '请输入' : '输入最大值',
     onChange: onOperateInput1Change,
     suffix: condition.runTimes.operator !== 'between' ? '次' : null
-  })) : null), condition.timeDimensions.map(function (_item, index) {
+  })) : null), (_condition$timeDimens3 = condition.timeDimensions) === null || _condition$timeDimens3 === void 0 ? void 0 : _condition$timeDimens3.map(function (_item, index) {
     return /*#__PURE__*/React.createElement("div", {
       style: {
         margin: '10px 0 0 65px'
@@ -398,7 +400,7 @@ var BusinessCondition = function BusinessCondition(props) {
     }, /*#__PURE__*/React.createElement(IconFont, {
       type: "qingchu"
     }))));
-  }), condition.typeId && label === '业务数据' || label === '订单数据' ? /*#__PURE__*/React.createElement("div", null, condition.timeDimensions.length !== 3 || condition.attrs.length !== 6 ? /*#__PURE__*/React.createElement("div", {
+  }), condition.typeId && label === '业务数据' || label === '订单数据' ? /*#__PURE__*/React.createElement("div", null, ((_condition$timeDimens4 = condition.timeDimensions) === null || _condition$timeDimens4 === void 0 ? void 0 : _condition$timeDimens4.length) !== 3 || ((_condition$attrs = condition.attrs) === null || _condition$attrs === void 0 ? void 0 : _condition$attrs.length) !== 6 ? /*#__PURE__*/React.createElement("div", {
     style: {
       margin: '2px 0 0 65px',
       color: '#4075fd',

package/es/userCondition/conditions/eventCondition.js

@@ -17,6 +17,7 @@ import TimeDimension from './timeDimension';
 import { Tooltip } from 'antd';
 import IconFont from '../../icon/iconFont';
 var EventCondition = function EventCondition(props) {
+  var _condition$timeDimens2, _condition$timeDimens3;
   var _useContext = useContext(BizUserConditionContext),
     isRealTime = _useContext.isRealTime;
   var condition = props.condition,
@@ -56,6 +57,7 @@ var EventCondition = function EventCondition(props) {
   var onClick = function onClick(_ref) {
     var key = _ref.key;
     if (key === 'time dimension') {
+      var _condition$timeDimens;
       var obj = {
         frequencyValues: ['1'],
         frequencyOperator: '>',
@@ -63,7 +65,7 @@ var EventCondition = function EventCondition(props) {
         timeOperator: 'all',
         timeValues: []
       };
-      if (condition.timeDimensions.length < 3) {
+      if (((_condition$timeDimens = condition.timeDimensions) === null || _condition$timeDimens === void 0 ? void 0 : _condition$timeDimens.length) < 3) {
         condition.timeDimensions.push(obj);
       } else {
         notification.info({
@@ -138,7 +140,7 @@ var EventCondition = function EventCondition(props) {
     onChange: onPeriodChange,
     isEvent: true,
     isRealTime: isRealTime
-  }))))), condition.timeDimensions.map(function (_item, index) {
+  }))))), (_condition$timeDimens2 = condition.timeDimensions) === null || _condition$timeDimens2 === void 0 ? void 0 : _condition$timeDimens2.map(function (_item, index) {
     return /*#__PURE__*/React.createElement("div", {
       style: {
         margin: '10px 0 0 38px'
@@ -164,7 +166,7 @@ var EventCondition = function EventCondition(props) {
     }, /*#__PURE__*/React.createElement(IconFont, {
       type: "qingchu"
     }))));
-  }), condition.timeDimensions.length < 3 ? /*#__PURE__*/React.createElement("div", {
+  }), ((_condition$timeDimens3 = condition.timeDimensions) === null || _condition$timeDimens3 === void 0 ? void 0 : _condition$timeDimens3.length) < 3 ? /*#__PURE__*/React.createElement("div", {
     style: {
       margin: '2px 0 0 38px',
       color: '#4075fd',

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/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[];
@@ -104,15 +112,15 @@ export declare namespace BizUserConditionT {
         typeId: 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 {

package/es/userCondition/util.js

@@ -73,13 +73,13 @@ export function buildCondition(type) {
         typeId: undefined,
         runTimes: {
           operator: '>=',
-          values: ['1']
+          values: [1]
         },
         attrs: [],
         timeDimensions: [],
         runPeriod: {
           operator: 'relative',
-          values: ['30', '0']
+          values: [30, '0']
         }
       };
     case 'order':
@@ -87,13 +87,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.4",
+    "version": "1.1.34-alpha.6",
     "scripts": {
         "start": "dumi dev",
         "docs:build": "dumi build",