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

package/es/userCondition/conditions/dataAttribute.js

@@ -18,12 +18,13 @@ import { stringOperate, orderTypeList, typeList, computeTypeList } from '../../a
 import moment from 'moment';
 import request from '../../utils/ajax';
 import BizGlobalDataContext from '../../context';
-import { DatePicker, Input } from 'antd';
-var RangePicker = DatePicker.RangePicker;
+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,
     index = props.index,
-    serviceAttrType = props.serviceAttrType,
     onChange = props.onChange;
   var list = [];
   var operateList = [];
@@ -38,9 +39,10 @@ var DataAttribute = function DataAttribute(props) {
       break;
     default:
       list = typeList['cont-date'];
+      operateList = typeList['cont-date'];
       break;
   }
-  var _useState = useState((serviceAttrType === null || serviceAttrType === void 0 ? void 0 : serviceAttrType.value) ? list : []),
+  var _useState = useState((condition === null || condition === void 0 ? void 0 : condition.typeId) ? list : []),
     _useState2 = _slicedToArray(_useState, 2),
     masterList = _useState2[0],
     setMasterList = _useState2[1];
@@ -48,39 +50,25 @@ var DataAttribute = function DataAttribute(props) {
     _useState4 = _slicedToArray(_useState3, 2),
     stringOperateList = _useState4[0],
     setStringOperateList = _useState4[1];
-  var _useState5 = useState([]),
+  var _useState5 = useState({}),
     _useState6 = _slicedToArray(_useState5, 2),
-    paramsList = _useState6[0],
-    setParamsList = _useState6[1];
+    queryValueObj = _useState6[0],
+    setQueryValueObj = _useState6[1];
   var _useState7 = useState([]),
     _useState8 = _slicedToArray(_useState7, 2),
     bizDataAttrList = _useState8[0],
     setBizDataAttrList = _useState8[1];
-  var _useState9 = useState(''),
-    _useState10 = _slicedToArray(_useState9, 2),
-    searchValue = _useState10[0],
-    setSearchValue = _useState10[1];
-  var _useState11 = useState([]),
-    _useState12 = _slicedToArray(_useState11, 2),
-    current = _useState12[0],
-    setCurrent = _useState12[1];
   var _useContext = useContext(BizGlobalDataContext),
     currentApp = _useContext.currentApp;
   useEffect(function () {
-    if (serviceAttrType === null || serviceAttrType === void 0 ? void 0 : serviceAttrType.value) {
-      queryBizDataAttrList(serviceAttrType === null || serviceAttrType === void 0 ? void 0 : serviceAttrType.value);
+    if (condition === null || condition === void 0 ? void 0 : condition.typeId) {
+      queryBizDataAttrList(condition === null || condition === void 0 ? void 0 : condition.typeId);
     } else {
       setBizDataAttrList(orderTypeList);
     }
-    if (searchValue) {
-      console.log(66666, searchValue);
-    }
-  }, [searchValue]);
+  }, [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', {
-      headers: {
-        'Content-Type': 'application/json'
-      },
+    request(type === 'master' ? Apis.orderAttributeMaster : Apis.orderAttributeSon, {
       method: 'post',
       data: {
         appId: currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId,
@@ -89,150 +77,65 @@ var DataAttribute = function DataAttribute(props) {
       }
     }).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 _objectSpread(_objectSpread({}, item), {}, {
-            name: item.name,
-            value: item.id,
-            columnName: item.columnName
+            value: item.id
           });
         });
         setMasterList(_list);
+        condition.paramsList[index].masterList = _list;
       } else {
+        condition.paramsList[index].masterList = [];
         setMasterList([]);
       }
     }).catch(function () {
-      setMasterList([{
-        id: 81,
-        value: 81,
-        appId: 99677,
-        name: '手机号',
-        propType: 1,
-        required: 0,
-        isOrderShow: 1,
-        isUserShow: 1,
-        columnName: 'cus4',
-        isDelete: null,
-        isUniqueOrder: '',
-        isUniqueUser: '',
-        isUniqueCreatedate: '',
-        isUniquePaydate: '',
-        orderRelationSon: '',
-        createDate: 1678431608000,
-        updateDateTime: null,
-        hidden: null,
-        attrOrder: 5,
-        requestHide: null
-      }, {
-        id: 82,
-        value: 82,
-        appId: 99677,
-        name: 'ID',
-        propType: 2,
-        required: 1,
-        isOrderShow: 1,
-        isUserShow: 1,
-        columnName: 'cus5',
-        isDelete: null,
-        isUniqueOrder: '',
-        isUniqueUser: '',
-        isUniqueCreatedate: 'Y',
-        isUniquePaydate: '',
-        orderRelationSon: '',
-        createDate: 1678431608000,
-        updateDateTime: 1678433665000,
-        hidden: null,
-        attrOrder: 6,
-        requestHide: null
-      }, {
-        id: 83,
-        value: 83,
-        appId: 99677,
-        name: '订单支付时间',
-        propType: 3,
-        required: 1,
-        isOrderShow: 1,
-        isUserShow: 1,
-        columnName: 'cus6',
-        isDelete: null,
-        isUniqueOrder: '',
-        isUniqueUser: '',
-        isUniqueCreatedate: '',
-        isUniquePaydate: 'Y',
-        orderRelationSon: '',
-        createDate: 1678431608000,
-        updateDateTime: 1678433668000,
-        hidden: null,
-        attrOrder: 7,
-        requestHide: null
-      }]);
-    });
-  }
-  function queryValueList(keyword, operate) {
-    request('/cep-console/api/v1/es/data/attr/value', {
-      headers: {
-        'Content-Type': 'application/json'
-      },
-      method: 'post',
-      data: {
-        appId: currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId,
-        attrId: condition.attrs[index].attrId,
-        dataTypeId: operate.bizDataTypeId ? operate.bizDataTypeId : condition.attrs[index].orderType === 'master' ? 1 : 2,
-        keyword: keyword,
-        pageNum: 1,
-        pageSize: 20,
-        attrName: operate.name,
-        eventId: 0
-      }
-    }).then(function (res) {
-      if (res.data) {
-        var _list2 = res.data.map(function (item) {
-          return {
-            name: operate.bizDataTypeId ? item : item.name,
-            value: operate.bizDataTypeId ? item : item.id
-          };
-        });
-        setParamsList(_list2);
-      } else {
-        setParamsList([]);
-      }
-    }).catch(function () {
-      setParamsList([]);
+      setMasterList([]);
+      condition.paramsList[index].masterList = [];
     });
+    onChange(_objectSpread({}, condition));
   }
   function queryBizDataAttrList(bizDataTypeId) {
-    request('/cep-console/api/v1/bizdata/attr/list', {
-      headers: {
-        'Content-Type': 'application/json'
-      },
+    request(Apis.bizDataAttrList, {
       method: 'post',
       data: {
         bizDataTypeId: bizDataTypeId
       }
     }).then(function (res) {
       if (res.data) {
-        var _list3 = res.data.map(function (item) {
+        var _res$data2;
+        var _list2 = (_res$data2 = res.data) === null || _res$data2 === void 0 ? void 0 : _res$data2.map(function (item) {
           return _objectSpread(_objectSpread({}, item), {}, {
             value: item.id
           });
         });
-        setBizDataAttrList(_list3);
+        condition.paramsList[index].bizDataAttrList = _list2;
+        setBizDataAttrList(_list2);
       } else {
+        condition.paramsList[index].bizDataAttrList = [];
         setBizDataAttrList([]);
       }
     }).catch(function () {
+      condition.paramsList[index].bizDataAttrList = [];
       setBizDataAttrList([]);
     });
+    onChange(_objectSpread({}, condition));
   }
   var onOrderTypeListChange = function onOrderTypeListChange(operate) {
-    if (serviceAttrType === null || serviceAttrType === void 0 ? void 0 : serviceAttrType.value) {
-      condition.attrs[index].category = 'custom';
-      condition.attrs[index].attrId = operate.id;
-      condition.attrs[index].attrName = operate.name;
+    if (condition === null || condition === void 0 ? void 0 : condition.typeId) {
+      condition.attrs[index] = _objectSpread(_objectSpread({}, condition.attrs[index]), {}, {
+        category: 'custom',
+        attrId: operate.id,
+        attrName: operate.name
+      });
       switch (operate.propType) {
         case 1:
           setMasterList(typeList['cont-string']);
           condition.attrs[index].attrType = 'cont-string';
-          queryValueList('', operate);
+          setQueryValueObj({
+            keyword: '',
+            operate: operate
+          });
           break;
         case 2:
           setMasterList(computeTypeList);
@@ -252,12 +155,16 @@ var DataAttribute = function DataAttribute(props) {
     onChange(_objectSpread({}, condition));
   };
   var onMasterListChange = function onMasterListChange(operate) {
-    if (!(serviceAttrType === null || serviceAttrType === void 0 ? void 0 : serviceAttrType.value)) {
+    condition.attrs[index].params = [];
+    if (!(condition === null || condition === void 0 ? void 0 : condition.typeId)) {
       switch (operate.propType) {
         case 1:
           setStringOperateList(typeList['cont-string']);
           condition.attrs[index].attrType = 'cont-string';
-          queryValueList('', operate);
+          setQueryValueObj({
+            keyword: '',
+            operate: operate
+          });
           break;
         case 2:
           setStringOperateList(typeList['cont-num']);
@@ -273,15 +180,22 @@ var DataAttribute = function DataAttribute(props) {
           }
           break;
       }
-      condition.attrs[index].attrId = operate.id;
-      condition.attrs[index].attrName = operate.name;
-      condition.attrs[index].attrMaping = operate.columnName;
+      condition.attrs[index] = _objectSpread(_objectSpread({}, 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].params = [];
+          condition.attrs[index] = _objectSpread(_objectSpread({}, 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');
@@ -295,153 +209,43 @@ var DataAttribute = function DataAttribute(props) {
     }
     onChange(_objectSpread({}, condition));
   };
-  var onStringOperateChange = function onStringOperateChange(operate) {
-    if (condition.attrs[index].operator !== 'absolute') {
-      condition.attrs[index].params = [];
-    }
-    condition.attrs[index].operator = operate.value;
-    onChange(_objectSpread({}, condition));
-  };
-  var onComputeTypeOperateChange = function onComputeTypeOperateChange(operate) {
-    condition.attrs[index].computeType = operate.value;
-    onChange(_objectSpread({}, condition));
-  };
-  var onValue0Change = function onValue0Change(e) {
-    var value = e.target.value;
-    condition.attrs[index].params[0] = value;
-    onChange(_objectSpread({}, condition));
-  };
-  var onValue1Change = function onValue1Change(e) {
-    var value = e.target.value;
-    condition.attrs[index].params[1] = value;
-    onChange(_objectSpread({}, condition));
-  };
-  var onParamsChange = function onParamsChange(operate) {
-    var obj = operate.map(function (item) {
-      return {
-        name: item.name,
-        value: item.value
-      };
-    });
-    var params = operate.map(function (item) {
-      return item.value;
-    });
-    if (!(serviceAttrType === null || serviceAttrType === void 0 ? void 0 : serviceAttrType.value)) {
-      queryValueList(searchValue, {});
-    }
-    setCurrent(obj);
-    condition.attrs[index].params = params;
-    onChange(_objectSpread({}, condition));
-  };
-  function onDateChange(newData) {
-    if (condition.attrs[index].operator === 'absolute') {
-      var dateRange = newData;
-      var newValues = dateRange.map(function (date) {
-        return date.format('YYYY-MM-DD');
-      });
-      condition.attrs[index].params = newValues;
-      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")
   }, /*#__PURE__*/React.createElement(BizSelect, {
     className: "".concat(classPrefix, "-select-condition"),
-    options: bizDataAttrList,
-    labelField: "name",
-    keyField: "value",
-    overlayWidth: 120,
-    onChange: onOrderTypeListChange
-  })), /*#__PURE__*/React.createElement("div", {
-    className: "".concat(classPrefix, "-period-condition-operator")
-  }, /*#__PURE__*/React.createElement(BizSelect, {
-    className: "".concat(classPrefix, "-select-condition"),
-    options: masterList,
-    labelField: "name",
-    keyField: "value",
-    onChange: onMasterListChange
-  })), !(serviceAttrType === null || serviceAttrType === void 0 ? void 0 : serviceAttrType.value) && condition.attrs[index].attrType === 'cont-num' ? /*#__PURE__*/React.createElement("div", {
-    className: "".concat(classPrefix, "-period-condition-operator")
-  }, /*#__PURE__*/React.createElement(BizSelect, {
-    className: "".concat(classPrefix, "-select-condition"),
-    options: computeTypeList,
+    options: bizDataAttrList.length > 0 ? bizDataAttrList : condition === null || condition === void 0 ? void 0 : (_condition$paramsList = condition.paramsList[index]) === null || _condition$paramsList === void 0 ? void 0 : _condition$paramsList.bizDataAttrList,
     labelField: "name",
     keyField: "value",
     value: {
-      name: condition.attrs[index].computeType,
-      value: condition.attrs[index].computeType
+      name: condition.typeId ? condition.attrs[index].attrName : condition.attrs[index].orderType,
+      value: condition.typeId ? condition.attrs[index].attrId : condition.attrs[index].orderType
     },
     overlayWidth: 120,
-    onChange: onComputeTypeOperateChange
-  })) : null, (serviceAttrType === null || serviceAttrType === void 0 ? void 0 : serviceAttrType.value) && condition.attrs[index].attrType === 'cont-num' || !(serviceAttrType === null || serviceAttrType === void 0 ? void 0 : serviceAttrType.value) ? /*#__PURE__*/React.createElement("div", {
+    onChange: onOrderTypeListChange
+  })), /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-period-condition-operator")
   }, /*#__PURE__*/React.createElement(BizSelect, {
     className: "".concat(classPrefix, "-select-condition"),
-    options: stringOperateList,
-    labelField: "name",
-    keyField: "value",
+    options: masterList.length > 0 ? masterList : condition === null || condition === void 0 ? void 0 : (_condition$paramsList2 = condition.paramsList[index]) === null || _condition$paramsList2 === void 0 ? void 0 : _condition$paramsList2.masterList,
     value: {
-      name: condition.attrs[index].operator,
-      value: condition.attrs[index].operator
+      name: condition.typeId ? condition.attrs[index].attrType === 'cont-string' || condition.attrs[index].attrType === 'cont-date' ? condition.attrs[index].operator : condition.attrs[index].computeType : condition.attrs[index].attrName,
+      value: condition.typeId ? condition.attrs[index].attrType === 'cont-string' || condition.attrs[index].attrType === 'cont-date' ? condition.attrs[index].operator : condition.attrs[index].computeType : condition.attrs[index].attrId
     },
-    overlayWidth: 120,
-    onChange: onStringOperateChange
-  })) : null, !(serviceAttrType === null || serviceAttrType === void 0 ? void 0 : serviceAttrType.value) && condition.attrs[index].attrType === 'cont-string' || condition.attrs[index].attrType === 'cont-string' && condition.attrs[index].operator !== 'is null' && condition.attrs[index].operator !== 'is not null' ? /*#__PURE__*/React.createElement("div", {
-    className: "".concat(classPrefix, "-period-condition-operator"),
-    style: {
-      width: '250px'
-    }
-  }, /*#__PURE__*/React.createElement(BizSelect, {
-    className: "".concat(classPrefix, "-multi-select"),
-    multiple: true,
-    size: "middle",
     labelField: "name",
     keyField: "value",
-    value: current,
-    options: paramsList,
-    onChange: onParamsChange,
-    onSearch: setSearchValue,
-    enableCreate: true
-  })) : null, condition.attrs[index].attrType === 'cont-num' || condition.attrs[index].attrType === 'cont-date' && condition.attrs[index].operator !== 'absolute' ? /*#__PURE__*/React.createElement("div", {
-    className: "".concat(classPrefix, "-period-condition")
-  }, /*#__PURE__*/React.createElement(Input, {
-    key: "relative-date",
-    className: "".concat(classPrefix, "-select-condition"),
-    size: "middle",
-    type: condition.attrs[index].attrType === 'cont-date' ? 'number' : '',
-    placeholder: condition.attrs[index].operator === 'between' ? '输入最小值' : '请输入',
-    value: condition.attrs[index].params[0],
-    style: {
-      width: condition.attrs[index].operator === 'between' || condition.attrs[index].attrType === 'cont-date' && condition.attrs[index].operator ? 100 : 200
-    },
-    suffix: condition.attrs[index].attrType === 'cont-date' ? '天' : null,
-    onChange: onValue0Change
-  })) : null, condition.attrs[index].attrType === 'cont-num' && condition.attrs[index].operator === 'between' || condition.attrs[index].attrType === 'cont-date' && (condition.attrs[index].operator === 'relativeInterval' || condition.attrs[index].operator === 'futureInterval') ? /*#__PURE__*/React.createElement("div", {
-    className: "".concat(classPrefix, "-period-condition"),
-    style: {
-      marginLeft: 10
-    }
-  }, /*#__PURE__*/React.createElement(Input, {
-    key: "relative-date",
-    className: "".concat(classPrefix, "-select-condition"),
-    size: "middle",
-    type: condition.attrs[index].attrType === 'cont-date' ? 'number' : '',
-    placeholder: '输入最大值',
-    value: condition.attrs[index].params[1],
-    style: {
-      width: 100
-    },
-    suffix: condition.attrs[index].attrType === 'cont-date' ? '天' : null,
-    onChange: onValue1Change
-  })) : null, condition.attrs[index].attrType === 'cont-date' && condition.attrs[index].operator === 'absolute' ? /*#__PURE__*/React.createElement("div", {
-    className: "".concat(classPrefix, "-runtimes-condition")
-  }, /*#__PURE__*/React.createElement(RangePicker, {
-    size: "middle",
-    defaultValue: [moment(condition.attrs[index].params[0]), moment(condition.attrs[index].params[1])],
-    onChange: onDateChange,
-    allowClear: false
-  })) : null));
+    onChange: onMasterListChange
+  })), /*#__PURE__*/React.createElement(OperatorCondition, {
+    queryValueObj: queryValueObj,
+    stringOperateList: stringOperateList,
+    index: index,
+    condition: condition,
+    onChange: onChange
+  }), /*#__PURE__*/React.createElement(ParamsCondition, {
+    index: index,
+    condition: condition,
+    onChange: onChange
+  }));
 };
 export default DataAttribute;

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'
@@ -155,7 +157,8 @@ var EventCondition = function EventCondition(props) {
     }, "\u65F6\u95F4\u7EF4\u5EA6"), /*#__PURE__*/React.createElement(TimeDimension, {
       onChange: onTimeDimensionChange,
       condition: condition,
-      index: index
+      index: index,
+      dataId: dataId
     }), /*#__PURE__*/React.createElement("div", {
       className: "biz-user-condition-item-delete",
       onClick: function onClick() {
@@ -164,7 +167,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/conditions/order/runPeriodCondition.d.ts

@@ -0,0 +1,11 @@
+import React from 'react';
+import { AllConditionBasePropsI, BizUserConditionT } from '../../types';
+import '../styles/periodCondition.less';
+export interface RunPeriodConditionPropsI extends AllConditionBasePropsI<any> {
+    onChange: (condition: any) => void;
+    isEvent?: boolean;
+    dataId: number;
+    condition: BizUserConditionT.BusinessCondition;
+}
+declare const RunPeriodCondition: React.FC<RunPeriodConditionPropsI>;
+export default RunPeriodCondition;