@zgfe/business-lib 1.1.34-alpha.2 → 1.1.34-alpha.21

package/es/userCondition/conditions/businessCondition.js

@@ -13,22 +13,20 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import React, { useContext, useEffect, useState } from 'react';
 import BizSelect from '../../select';
 import { DownOutlined } from '@ant-design/icons';
-import { Input, DatePicker, Dropdown, Space, notification } from 'antd';
-import moment from 'moment';
+import { Dropdown, Space, notification } from 'antd';
 import request from '../../utils/ajax';
 import './styles/periodCondition.less';
 import { classPrefix } from '..';
-import { typeList } from '../../attrConditions/utils/operates';
-import { operatorMap } from './constants';
 import TimeDimension from './timeDimension';
 import DataAttribute from './dataAttribute';
 import IconFont from '../../icon/iconFont';
 import BizGlobalDataContext from '../../context';
-var RangePicker = DatePicker.RangePicker;
+import RunPeriodCondition from './order/runPeriodCondition';
+import Apis from '../../constants/apis';
 var BusinessCondition = function BusinessCondition(props) {
+  var _condition$timeDimens, _condition$timeDimens3, _condition$attrs, _condition$timeDimens4, _condition$attrs2;
   var condition = props.condition,
     dataId = props.dataId,
-    isEvent = props.isEvent,
     label = props.label;
   var _useContext = useContext(BizGlobalDataContext),
     currentApp = _useContext.currentApp;
@@ -41,7 +39,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'
@@ -58,7 +56,7 @@ var BusinessCondition = function BusinessCondition(props) {
       key: 'service attribute'
     }]);
   }
-  var _useState = useState(),
+  var _useState = useState(condition.typeId ? '业务属性' : '订单属性'),
     _useState2 = _slicedToArray(_useState, 2),
     dataAttributeLabel = _useState2[0],
     setDataAttributeLabel = _useState2[1];
@@ -70,34 +68,13 @@ var BusinessCondition = function BusinessCondition(props) {
     _useState6 = _slicedToArray(_useState5, 2),
     serviceAttributeList = _useState6[0],
     setServiceAttributeList = _useState6[1];
-  var options = [{
-    text: '最近',
-    value: 'relative'
-  }, {
-    text: '任意时间',
-    value: 'unlimited_time'
-  }, {
-    text: '固定时段',
-    value: 'absolute'
-  }];
-  if (isEvent) {
-    options = options.concat([{
-      text: '任意时间',
-      value: 'unlimited_time'
-    }, {
-      text: '新增后*',
-      value: 'join_time'
-    }]);
-  }
   function queryServiceAttributeList() {
-    request("/cep-console/api/v1/bizdata/type/list/".concat(currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId), {
-      headers: {
-        'Content-Type': 'application/json'
-      },
+    request(Apis.bizDataTypeList + "/".concat(currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId), {
       method: 'get'
     }).then(function (res) {
       if (res.data) {
-        var list = res.data.map(function (item) {
+        var _res$data;
+        var list = (_res$data = res.data) === null || _res$data === void 0 ? void 0 : _res$data.map(function (item) {
           return {
             name: item.typeName,
             value: item.id
@@ -111,94 +88,6 @@ var BusinessCondition = function BusinessCondition(props) {
       setServiceAttributeList([]);
     });
   }
-  function onOperatorChange(option) {
-    var newData = {
-      operator: option.value
-    };
-    if (newData.operator === 'absolute') {
-      var endDate = moment().format('YYYY-MM-DD');
-      var startDate = moment().subtract(7, 'days').format('YYYY-MM-DD');
-      newData.values = [startDate, endDate];
-    }
-    if (newData.operator === 'relative') {
-      newData.values = ['30', '0'];
-    }
-    if (newData.operator === 'unlimited_time') {
-      newData.values = ['30', '0'];
-    }
-    if (newData.operator === 'join_time') {
-      newData.values = ['3', '0'];
-    }
-    onChange(_objectSpread(_objectSpread({}, condition), {}, {
-      runPeriod: newData
-    }));
-  }
-  function onDateChange(newData) {
-    if (condition.runPeriod.operator === 'absolute') {
-      var dateRange = newData;
-      var newValues = dateRange.map(function (date) {
-        return date.format('YYYY-MM-DD');
-      });
-      onChange(_objectSpread(_objectSpread({}, condition), {}, {
-        runPeriod: _objectSpread(_objectSpread({}, condition.runPeriod), {}, {
-          values: newValues
-        })
-      }));
-    } else if (condition.runPeriod.operator === 'relative' || condition.runPeriod.operator === 'join_time') {
-      var newValue = newData.target.value;
-      onChange(_objectSpread(_objectSpread({}, condition), {}, {
-        runPeriod: _objectSpread(_objectSpread({}, condition.runPeriod), {}, {
-          values: [newValue, '0']
-        })
-      }));
-    }
-  }
-  function renderValues() {
-    var _condition$runPeriod = condition.runPeriod,
-      operator = _condition$runPeriod.operator,
-      values = _condition$runPeriod.values;
-    if (operator === 'relative' || operator === 'join_time') {
-      return /*#__PURE__*/React.createElement(Input, {
-        key: "relative-date",
-        className: "".concat(classPrefix, "-select-condition"),
-        type: "number",
-        placeholder: "\u8BF7\u8F93\u5165",
-        value: values[0],
-        size: "middle",
-        onChange: onDateChange,
-        style: {
-          width: 80
-        },
-        suffix: "\u5929"
-      });
-    }
-    if (operator === 'absolute') {
-      return /*#__PURE__*/React.createElement(RangePicker, {
-        size: "middle",
-        defaultValue: [moment(values[0]), moment(values[1])],
-        onChange: onDateChange,
-        allowClear: false
-      });
-    }
-  }
-  var onOperateChange = function onOperateChange(operate) {
-    condition.runTimes.values = [condition.runTimes.values[0]];
-    onChange(_objectSpread(_objectSpread({}, condition), {}, {
-      runTimes: _objectSpread(_objectSpread({}, condition.runTimes), {}, {
-        operator: operate.value
-      })
-    }));
-  };
-  var onOperateInput0Change = function onOperateInput0Change(value) {
-    var newValue = value.target.value;
-    condition.runTimes.values[0] = newValue;
-    onChange(_objectSpread({}, condition));
-  };
-  var onOperateInput1Change = function onOperateInput1Change(value) {
-    var newValue = value.target.value;
-    condition.runTimes.values[1] = newValue;
-    onChange(_objectSpread({}, condition));
-  };
   var onClick = function onClick(_ref) {
     var key = _ref.key;
     if (key !== 'time dimension') {
@@ -209,14 +98,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({
@@ -228,13 +118,19 @@ var BusinessCondition = function BusinessCondition(props) {
         attrId: 0,
         attrName: '',
         operator: '',
-        params: [''],
-        computeType: 'origin',
+        params: [],
+        computeType: '',
         attrType: '',
         category: ''
       };
+      var params = {
+        masterList: [],
+        bizDataAttrList: [],
+        paramsList: []
+      };
       if (condition.attrs.length < 6) {
         condition.attrs.push(_obj);
+        condition.paramsList.push(params);
       } else {
         notification.info({
           message: '事件属性最多增加6条'
@@ -251,14 +147,9 @@ var BusinessCondition = function BusinessCondition(props) {
     condition.attrs.splice(index, 1);
     onChange(_objectSpread({}, condition));
   }
-  function onTimeDimensionChange(condition) {
-    onChange(_objectSpread({}, condition));
-  }
-  function onDataAttributeChange(condition) {
-    onChange(_objectSpread({}, condition));
-  }
   function onServiceAttributeChange(operate) {
-    condition.typeId = operate === null || operate === void 0 ? void 0 : operate.bizDataTypeId;
+    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);
   }
@@ -271,6 +162,10 @@ var BusinessCondition = function BusinessCondition(props) {
     options: serviceAttributeList,
     labelField: "name",
     keyField: "value",
+    value: {
+      name: condition.typeId,
+      value: condition.typeId
+    },
     overlayWidth: 120,
     onChange: onServiceAttributeChange
   })) : null, label === '订单数据' ? /*#__PURE__*/React.createElement("div", {
@@ -278,70 +173,12 @@ var BusinessCondition = function BusinessCondition(props) {
   }, label) : /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-period-condition-label")
   }, serviceAttribute === null || serviceAttribute === void 0 ? void 0 : serviceAttribute.name), /*#__PURE__*/React.createElement("div", {
-    className: "".concat(classPrefix, "-period-condition-operator")
-  }, /*#__PURE__*/React.createElement(BizSelect, {
-    dropdownExtra: isEvent ? /*#__PURE__*/React.createElement("div", {
-      style: {
-        lineHeight: '29px'
-      }
-    }, "*\u7528\u6237\u65B0\u589E\u6570\u636E\u4E3A\u6BCF\u65E5\u51CC\u6668\u751F\u6210") : null,
-    overlayWidth: isEvent ? 210 : 114,
-    options: options,
-    labelField: "text",
-    keyField: "value",
-    size: "middle",
-    value: {
-      value: condition.runPeriod.operator,
-      text: operatorMap[condition.runPeriod.operator]
-    },
-    onChange: onOperatorChange
-  })), /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-period-condition-values")
-  }, renderValues()), /*#__PURE__*/React.createElement("div", {
-    className: "".concat(classPrefix, "-period-condition-operator")
-  }, /*#__PURE__*/React.createElement(BizSelect, {
-    className: "".concat(classPrefix, "-select-condition"),
-    options: typeList['cont-num'],
-    labelField: "name",
-    keyField: "value",
-    overlayWidth: 80,
-    value: {
-      value: condition.runTimes.operator,
-      name: condition.runTimes.operator
-    },
-    onChange: onOperateChange
-  })), /*#__PURE__*/React.createElement("div", {
-    className: "".concat(classPrefix, "-period-condition")
-  }, /*#__PURE__*/React.createElement(Input, {
-    key: "relative-date",
-    className: "".concat(classPrefix, "-select-condition"),
-    type: condition.runTimes.operator !== 'between' ? 'number' : '',
-    size: "middle",
-    value: condition.runTimes.values[0],
-    placeholder: condition.runTimes.operator !== 'between' ? '请输入' : '输入最小值',
-    style: {
-      width: 100
-    },
-    onChange: onOperateInput0Change,
-    suffix: condition.runTimes.operator !== 'between' ? '次' : null
-  })), condition.runTimes.operator === 'between' ? /*#__PURE__*/React.createElement("div", {
-    className: "".concat(classPrefix, "-period-condition"),
-    style: {
-      marginLeft: 10
-    }
-  }, /*#__PURE__*/React.createElement(Input, {
-    key: "relative-date",
-    className: "".concat(classPrefix, "-select-condition"),
-    type: condition.runTimes.operator !== 'between' ? 'number' : '',
-    size: "middle",
-    value: condition.runTimes.values[1],
-    style: {
-      width: 100
-    },
-    placeholder: condition.runTimes.operator !== 'between' ? '请输入' : '输入最大值',
-    onChange: onOperateInput1Change,
-    suffix: condition.runTimes.operator !== 'between' ? '次' : null
-  })) : null), condition.timeDimensions.map(function (_item, index) {
+  }, /*#__PURE__*/React.createElement(RunPeriodCondition, {
+    dataId: props.dataId,
+    condition: condition,
+    onChange: onChange
+  }))), (_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'
@@ -356,7 +193,8 @@ var BusinessCondition = function BusinessCondition(props) {
     }, /*#__PURE__*/React.createElement("div", {
       className: "".concat(classPrefix, "-period-condition-label")
     }, "\u65F6\u95F4\u7EF4\u5EA6"), /*#__PURE__*/React.createElement(TimeDimension, {
-      onChange: onTimeDimensionChange,
+      dataId: props.dataId,
+      onChange: onChange,
       condition: condition,
       index: index
     }), /*#__PURE__*/React.createElement("div", {
@@ -367,7 +205,7 @@ var BusinessCondition = function BusinessCondition(props) {
     }, /*#__PURE__*/React.createElement(IconFont, {
       type: "qingchu"
     }))));
-  }), condition.attrs.map(function (_item, index) {
+  }), (_condition$attrs = condition.attrs) === null || _condition$attrs === void 0 ? void 0 : _condition$attrs.map(function (_item, index) {
     return /*#__PURE__*/React.createElement("div", {
       style: {
         margin: '10px 0 0 65px'
@@ -382,7 +220,7 @@ var BusinessCondition = function BusinessCondition(props) {
     }, /*#__PURE__*/React.createElement("div", {
       className: "".concat(classPrefix, "-period-condition-label")
     }, dataAttributeLabel), /*#__PURE__*/React.createElement(DataAttribute, {
-      onChange: onDataAttributeChange,
+      onChange: onChange,
       condition: condition,
       index: index,
       serviceAttrType: serviceAttribute
@@ -394,7 +232,7 @@ var BusinessCondition = function BusinessCondition(props) {
     }, /*#__PURE__*/React.createElement(IconFont, {
       type: "qingchu"
     }))));
-  }), 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$attrs2 = condition.attrs) === null || _condition$attrs2 === void 0 ? void 0 : _condition$attrs2.length) !== 6 ? /*#__PURE__*/React.createElement("div", {
     style: {
       margin: '2px 0 0 65px',
       color: '#4075fd',
@@ -409,10 +247,6 @@ var BusinessCondition = function BusinessCondition(props) {
     onClick: function onClick(e) {
       return e.preventDefault();
     }
-  }, /*#__PURE__*/React.createElement(Space, null, "\u9AD8\u7EA7\u7B5B\u9009", /*#__PURE__*/React.createElement(DownOutlined, null))))) : null);
-};
-BusinessCondition.defaultProps = {
-  isEvent: false,
-  isRealTime: false
+  }, /*#__PURE__*/React.createElement(Space, null, "\u9AD8\u7EA7\u7B5B\u9009 ", /*#__PURE__*/React.createElement(DownOutlined, null))))) : null) : null);
 };
 export default BusinessCondition;

package/es/userCondition/conditions/cdpCondition.js

@@ -146,7 +146,7 @@ var CdpConditionItem = function CdpConditionItem(props) {
       }
     }).then(function (result) {
       setLoading(false);
-      setFieldList(result.data || []);
+      setFieldList((result === null || result === void 0 ? void 0 : result.data) || []);
     }).catch(function (e) {
       console.error(e);
       setLoading(false);