@zgfe/business-lib 1.1.34-alpha.17 → 1.1.34-alpha.18

package/es/constants/apis.d.ts

@@ -8,5 +8,10 @@ declare const Apis: {
     queryDatasetList: string;
     queryDatasetDetail: string;
     getSocketToken: string;
+    bizDataTypeList: string;
+    orderAttributeMaster: string;
+    orderAttributeSon: string;
+    bizDataAttrList: string;
+    dataAttrValue: string;
 };
 export default Apis;

package/es/constants/apis.js

@@ -7,6 +7,11 @@ var Apis = {
   queryPanelGroup: '/apppanel/panels.jsp',
   queryDatasetList: '/zg/web/cdp/inner/dataset/list',
   queryDatasetDetail: '/zg/web/cdp/inner/dataset/detail',
-  getSocketToken: '/zg/web/v2/tracking/view/websocket/token'
+  getSocketToken: '/zg/web/v2/tracking/view/websocket/token',
+  bizDataTypeList: '/cep-console/api/v1/bizdata/type/list',
+  orderAttributeMaster: '/cep-console/api/v1/cdp/orderAttribute/master',
+  orderAttributeSon: '/cep-console/api/v1/cdp/orderAttribute/son',
+  bizDataAttrList: '/cep-console/api/v1/bizdata/attr/list',
+  dataAttrValue: '/cep-console/api/v1/es/data/attr/value'
 };
 export default Apis;

package/es/userCondition/conditions/business/operatorCondition.js

@@ -17,6 +17,7 @@ import { classPrefix } from '../..';
 import { computeTypeList } from '../../../attrConditions/utils/operates';
 import request from '../../../utils/ajax';
 import BizGlobalDataContext from '../../../context';
+import Apis from '../../../constants/apis';
 var OperatorCondition = function OperatorCondition(props) {
   var _condition$attrs$inde, _condition$paramsList;
   var condition = props.condition,
@@ -59,7 +60,7 @@ var OperatorCondition = function OperatorCondition(props) {
   }, [queryValueObj]);
   function queryValueList(keyword, operate) {
     var fetch = function fetch() {
-      request('/cep-console/api/v1/es/data/attr/value', {
+      request(Apis.dataAttrValue, {
         method: 'post',
         data: {
           appId: currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId,

package/es/userCondition/conditions/businessCondition.js

@@ -22,6 +22,7 @@ import DataAttribute from './dataAttribute';
 import IconFont from '../../icon/iconFont';
 import BizGlobalDataContext from '../../context';
 import RunPeriodCondition from './order/runPeriodCondition';
+import Apis from '../../constants/apis';
 var BusinessCondition = function BusinessCondition(props) {
   var _condition$timeDimens, _condition$timeDimens3, _condition$timeDimens4, _condition$attrs;
   var condition = props.condition,
@@ -68,10 +69,7 @@ var BusinessCondition = function BusinessCondition(props) {
     serviceAttributeList = _useState6[0],
     setServiceAttributeList = _useState6[1];
   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) {
@@ -203,9 +201,9 @@ var BusinessCondition = function BusinessCondition(props) {
       onClick: function onClick() {
         return onTimeDimensionsDelete(index);
       }
-    }, ' ', /*#__PURE__*/React.createElement(IconFont, {
+    }, /*#__PURE__*/React.createElement(IconFont, {
       type: "qingchu"
-    }), ' ')));
+    }))));
   }), condition.attrs.map(function (_item, index) {
     return /*#__PURE__*/React.createElement("div", {
       style: {
@@ -230,9 +228,9 @@ var BusinessCondition = function BusinessCondition(props) {
       onClick: function onClick() {
         return onAttrsDelete(index);
       }
-    }, ' ', /*#__PURE__*/React.createElement(IconFont, {
+    }, /*#__PURE__*/React.createElement(IconFont, {
       type: "qingchu"
-    }), ' ')));
+    }))));
   }), 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',
@@ -248,6 +246,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) : null);
+  }, /*#__PURE__*/React.createElement(Space, null, "\u9AD8\u7EA7\u7B5B\u9009 ", /*#__PURE__*/React.createElement(DownOutlined, null))))) : null) : null);
 };
 export default BusinessCondition;

package/es/userCondition/conditions/dataAttribute.js

@@ -20,6 +20,7 @@ import request from '../../utils/ajax';
 import BizGlobalDataContext from '../../context';
 import ParamsCondition from './business/paramsCondition';
 import OperatorCondition from './business/operatorCondition';
+import Apis from '../../constants/apis';
 var DataAttribute = function DataAttribute(props) {
   var _condition$paramsList, _condition$paramsList2;
   var condition = props.condition,
@@ -67,7 +68,7 @@ var DataAttribute = function DataAttribute(props) {
     }
   }, [condition === null || condition === void 0 ? void 0 : condition.typeId]);
   function queryAppList(type) {
-    request(type === 'master' ? '/cep-console/api/v1/cdp/orderAttribute/master' : '/cep-console/api/v1/cdp/orderAttribute/son', {
+    request(type === 'master' ? Apis.orderAttributeMaster : Apis.orderAttributeSon, {
       method: 'post',
       data: {
         appId: currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId,
@@ -96,7 +97,7 @@ var DataAttribute = function DataAttribute(props) {
     onChange(_objectSpread({}, condition));
   }
   function queryBizDataAttrList(bizDataTypeId) {
-    request('/cep-console/api/v1/bizdata/attr/list', {
+    request(Apis.bizDataAttrList, {
       method: 'post',
       data: {
         bizDataTypeId: bizDataTypeId
@@ -176,18 +177,22 @@ var DataAttribute = function DataAttribute(props) {
           }
           break;
       }
-      condition.attrs[index].attrId = operate.id;
-      condition.attrs[index].computeType = 'origin';
-      condition.attrs[index].attrName = operate.name;
-      condition.attrs[index].attrMaping = operate.columnName;
-      condition.attrs[index].operator = '';
+      condition.attrs[index] = {
+        attrId: operate.id,
+        computeType: 'origin',
+        attrName: operate.name,
+        attrMaping: operate.columnName,
+        operator: ''
+      };
     } else {
       switch (condition.attrs[index].attrType) {
         case 'cont-string':
         case 'cont-date':
-          condition.attrs[index].operator = operate.value;
-          condition.attrs[index].computeType = 'origin';
-          condition.attrs[index].params = [];
+          condition.attrs[index] = {
+            operator: operate.value,
+            computeType: 'origin',
+            params: []
+          };
           if (condition.attrs[index].operator === 'absolute' && condition.attrs[index].attrType === 'cont-date') {
             var _endDate = moment().format('YYYY-MM-DD');
             var _startDate = moment().subtract(7, 'days').format('YYYY-MM-DD');
@@ -201,7 +206,7 @@ var DataAttribute = function DataAttribute(props) {
     }
     onChange(_objectSpread({}, condition));
   };
-  return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("div", {
+  return /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-runtimes-condition")
   }, /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-period-condition-operator")
@@ -238,6 +243,6 @@ var DataAttribute = function DataAttribute(props) {
     index: index,
     condition: condition,
     onChange: onChange
-  })));
+  }));
 };
 export default DataAttribute;

package/es/userCondition/conditions/order/runTimesCondition.js

@@ -10,7 +10,7 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
 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 = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0); } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i.return && (_r = _i.return(), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
-import React, { useState } from 'react';
+import React, { useEffect, useState } from 'react';
 import { Input } from 'antd';
 import '../styles/periodCondition.less';
 import { classPrefix } from '../..';
@@ -20,10 +20,17 @@ var RunTimesCondition = function RunTimesCondition(props) {
   var onChange = props.onChange,
     index = props.index,
     condition = props.condition;
-  var _useState = useState(index !== undefined ? condition === null || condition === void 0 ? void 0 : condition.timeDimensions[index].frequencyOperator : condition === null || condition === void 0 ? void 0 : condition.runTimes.operator),
+  var _useState = useState(''),
     _useState2 = _slicedToArray(_useState, 2),
     operator = _useState2[0],
     setOperator = _useState2[1];
+  useEffect(function () {
+    if (index !== undefined) {
+      setOperator(condition === null || condition === void 0 ? void 0 : condition.timeDimensions[index].frequencyOperator);
+    } else {
+      setOperator(condition === null || condition === void 0 ? void 0 : condition.runTimes.operator);
+    }
+  }, [index]);
   var onOperateChange = function onOperateChange(operate) {
     if (index !== undefined) {
       condition.timeDimensions[index].frequencyOperator = operate.value;
@@ -31,13 +38,10 @@ var RunTimesCondition = function RunTimesCondition(props) {
       onChange(_objectSpread({}, condition));
     } else {
       condition.runTimes.values = [Number(condition.runTimes.values[0])];
-      onChange(_objectSpread(_objectSpread({}, condition), {}, {
-        runTimes: _objectSpread(_objectSpread({}, condition.runTimes), {}, {
-          operator: operate.value
-        })
-      }));
+      condition.runTimes.operator = operate.value;
+      onChange(_objectSpread({}, condition));
     }
-    setOperator(index !== undefined ? condition.timeDimensions[index].frequencyOperator : condition.runTimes.operator);
+    setOperator(operate.value);
   };
   var onOperateInput0Change = function onOperateInput0Change(value) {
     var newValue = value.target.value;

package/package.json

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