@zgfe/business-lib 1.1.34-alpha.0 → 1.1.34-alpha.10

package/es/context/index.d.ts

@@ -10,6 +10,7 @@ export interface UserInfo {
     username: string;
     email: string;
     companyId: number;
+    serviceType: number;
     companyName: string;
 }
 export interface Menu {
@@ -36,6 +37,7 @@ export interface GlobalContextProps {
     router?: any;
     routes?: any;
     envs?: Record<string, any>;
+    system?: string;
 }
 declare const BizGlobalDataContext: import("react").Context<GlobalContextProps>;
 export default BizGlobalDataContext;

package/es/userCondition/conditionTypeList.js

@@ -15,7 +15,9 @@ var ConditionTypeList = function ConditionTypeList(props) {
     openCdpCondition = _useContext.openCdpCondition,
     cdpTip = _useContext.cdpTip;
   var _useContext2 = useContext(BizGlobalDataContext),
-    menuNameMap = _useContext2.menuNameMap;
+    menuNameMap = _useContext2.menuNameMap,
+    currentUser = _useContext2.currentUser;
+  console.log(666636, menuNameMap, useContext(BizGlobalDataContext));
   if (!show || textMode) return null;
   return /*#__PURE__*/React.createElement("div", {
     className: "biz-user-condition-type-list"
@@ -69,7 +71,7 @@ var ConditionTypeList = function ConditionTypeList(props) {
     title: cdpTip
   }, /*#__PURE__*/React.createElement(IconFont, {
     type: "tishiicon"
-  })) : null)) : null, /*#__PURE__*/React.createElement("li", {
+  })) : null)) : null, !currentUser || (currentUser === null || currentUser === void 0 ? void 0 : currentUser.serviceType) === 0 || (currentUser === null || currentUser === void 0 ? void 0 : currentUser.serviceType) === 2 ? /*#__PURE__*/React.createElement("li", {
     className: "condition-type",
     key: "business",
     onClick: function onClick() {
@@ -77,7 +79,7 @@ var ConditionTypeList = function ConditionTypeList(props) {
     }
   }, /*#__PURE__*/React.createElement(Space, {
     key: "business"
-  }, /*#__PURE__*/React.createElement(PlusOutlined, null), /*#__PURE__*/React.createElement("span", null, "\u4E1A\u52A1\u6570\u636E"))), /*#__PURE__*/React.createElement("li", {
+  }, /*#__PURE__*/React.createElement(PlusOutlined, null), /*#__PURE__*/React.createElement("span", null, "\u4E1A\u52A1\u6570\u636E"))) : null, !currentUser || (currentUser === null || currentUser === void 0 ? void 0 : currentUser.serviceType) === 0 || (currentUser === null || currentUser === void 0 ? void 0 : currentUser.serviceType) === 2 ? /*#__PURE__*/React.createElement("li", {
     className: "condition-type",
     key: "order",
     onClick: function onClick() {
@@ -85,7 +87,7 @@ var ConditionTypeList = function ConditionTypeList(props) {
     }
   }, /*#__PURE__*/React.createElement(Space, {
     key: "order"
-  }, /*#__PURE__*/React.createElement(PlusOutlined, null), /*#__PURE__*/React.createElement("span", null, "\u8BA2\u5355\u6570\u636E")))));
+  }, /*#__PURE__*/React.createElement(PlusOutlined, null), /*#__PURE__*/React.createElement("span", null, "\u8BA2\u5355\u6570\u636E"))) : null));
 };
 ConditionTypeList.defaultProps = {
   show: true

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'
@@ -58,7 +59,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];
@@ -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({
@@ -228,8 +230,8 @@ var BusinessCondition = function BusinessCondition(props) {
         attrId: 0,
         attrName: '',
         operator: '',
-        params: [''],
-        computeType: 'origin',
+        params: [],
+        computeType: '',
         attrType: '',
         category: ''
       };
@@ -258,6 +260,9 @@ var BusinessCondition = function BusinessCondition(props) {
     onChange(_objectSpread({}, condition));
   }
   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);
   }
   return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("div", {
@@ -269,6 +274,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", {
@@ -339,7 +348,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'
@@ -392,7 +401,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$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',
@@ -407,7 +416,7 @@ 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);
+  }, /*#__PURE__*/React.createElement(Space, null, "\u9AD8\u7EA7\u7B5B\u9009", /*#__PURE__*/React.createElement(DownOutlined, null))))) : null) : null);
 };
 BusinessCondition.defaultProps = {
   isEvent: false,

package/es/userCondition/conditions/dataAttribute.js

@@ -21,9 +21,9 @@ import BizGlobalDataContext from '../../context';
 import { DatePicker, Input } from 'antd';
 var RangePicker = DatePicker.RangePicker;
 var DataAttribute = function DataAttribute(props) {
+  var _condition$attrs$inde, _condition$paramsList, _condition$paramsList2, _condition$paramsList3;
   var condition = props.condition,
     index = props.index,
-    serviceAttrType = props.serviceAttrType,
     onChange = props.onChange;
   var list = [];
   var operateList = [];
@@ -38,9 +38,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];
@@ -60,22 +61,26 @@ var DataAttribute = function DataAttribute(props) {
     _useState10 = _slicedToArray(_useState9, 2),
     searchValue = _useState10[0],
     setSearchValue = _useState10[1];
-  var _useState11 = useState([]),
+  var obj = (_condition$attrs$inde = condition.attrs[index]) === null || _condition$attrs$inde === void 0 ? void 0 : _condition$attrs$inde.params.map(function (item) {
+    return {
+      name: item,
+      value: item
+    };
+  });
+  var _useState11 = useState(obj ? obj : []),
     _useState12 = _slicedToArray(_useState11, 2),
     current = _useState12[0],
     setCurrent = _useState12[1];
   var _useContext = useContext(BizGlobalDataContext),
     currentApp = _useContext.currentApp;
+  useEffect(function () {}, [searchValue]);
   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: {
@@ -97,75 +102,16 @@ var DataAttribute = function DataAttribute(props) {
           });
         });
         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
-      }]);
+      setMasterList([]);
+      condition.paramsList[index].masterList = [];
     });
+    onChange(_objectSpread({}, condition));
   }
   function queryValueList(keyword, operate) {
     request('/cep-console/api/v1/es/data/attr/value', {
@@ -191,13 +137,17 @@ var DataAttribute = function DataAttribute(props) {
             value: operate.bizDataTypeId ? item : item.id
           };
         });
+        condition.paramsList[index].paramsList = _list2;
         setParamsList(_list2);
       } else {
         setParamsList([]);
+        condition.paramsList[index].paramsList = [];
       }
     }).catch(function () {
       setParamsList([]);
+      condition.paramsList[index].paramsList = [];
     });
+    onChange(_objectSpread({}, condition));
   }
   function queryBizDataAttrList(bizDataTypeId) {
     request('/cep-console/api/v1/bizdata/attr/list', {
@@ -215,20 +165,23 @@ var DataAttribute = function DataAttribute(props) {
             value: item.id
           });
         });
+        condition.paramsList[index].bizDataAttrList = _list3;
         setBizDataAttrList(_list3);
       } 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) {
+    if (condition === null || condition === void 0 ? void 0 : condition.typeId) {
       condition.attrs[index].category = 'custom';
       condition.attrs[index].attrId = operate.id;
       condition.attrs[index].attrName = operate.name;
-      condition.typeId = operate === null || operate === void 0 ? void 0 : operate.bizDataTypeId;
       switch (operate.propType) {
         case 1:
           setMasterList(typeList['cont-string']);
@@ -253,7 +206,7 @@ var DataAttribute = function DataAttribute(props) {
     onChange(_objectSpread({}, condition));
   };
   var onMasterListChange = function onMasterListChange(operate) {
-    if (!(serviceAttrType === null || serviceAttrType === void 0 ? void 0 : serviceAttrType.value)) {
+    if (!(condition === null || condition === void 0 ? void 0 : condition.typeId)) {
       switch (operate.propType) {
         case 1:
           setStringOperateList(typeList['cont-string']);
@@ -275,13 +228,16 @@ 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 = '';
     } 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 = [];
           if (condition.attrs[index].operator === 'absolute' && condition.attrs[index].attrType === 'cont-date') {
             var _endDate = moment().format('YYYY-MM-DD');
@@ -318,21 +274,23 @@ var DataAttribute = function DataAttribute(props) {
     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, {});
+    if (operate.length > 0) {
+      var _obj = operate.map(function (item) {
+        return {
+          name: item.name,
+          value: item.value
+        };
+      });
+      var params = operate.map(function (item) {
+        return item.value;
+      });
+      if (!(condition === null || condition === void 0 ? void 0 : condition.typeId)) {
+        queryValueList(searchValue, {});
+      }
+      setCurrent(_obj);
+      condition.attrs[index].params = params;
+      onChange(_objectSpread({}, condition));
     }
-    setCurrent(obj);
-    condition.attrs[index].params = params;
-    onChange(_objectSpread({}, condition));
   };
   function onDateChange(newData) {
     if (condition.attrs[index].operator === 'absolute') {
@@ -350,20 +308,28 @@ var DataAttribute = function DataAttribute(props) {
     className: "".concat(classPrefix, "-period-condition-operator")
   }, /*#__PURE__*/React.createElement(BizSelect, {
     className: "".concat(classPrefix, "-select-condition"),
-    options: bizDataAttrList,
+    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.typeId ? condition.attrs[index].attrName : condition.attrs[index].orderType,
+      value: condition.typeId ? condition.attrs[index].attrId : condition.attrs[index].orderType
+    },
     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,
+    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.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
+    },
     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", {
+  })), !(condition === null || condition === void 0 ? void 0 : condition.typeId) && 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"),
@@ -376,7 +342,7 @@ var DataAttribute = function DataAttribute(props) {
     },
     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", {
+  })) : null, (condition === null || condition === void 0 ? void 0 : condition.typeId) && condition.attrs[index].attrType === 'cont-num' || !(condition === null || condition === void 0 ? void 0 : condition.typeId) ? /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-period-condition-operator")
   }, /*#__PURE__*/React.createElement(BizSelect, {
     className: "".concat(classPrefix, "-select-condition"),
@@ -389,7 +355,7 @@ var DataAttribute = function DataAttribute(props) {
     },
     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", {
+  })) : null, !(condition === null || condition === void 0 ? void 0 : condition.typeId) && 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'
@@ -399,9 +365,9 @@ var DataAttribute = function DataAttribute(props) {
     multiple: true,
     size: "middle",
     labelField: "name",
+    options: (paramsList.length > 0 ? paramsList : condition === null || condition === void 0 ? void 0 : (_condition$paramsList3 = condition.paramsList[index]) === null || _condition$paramsList3 === void 0 ? void 0 : _condition$paramsList3.paramsList) || [],
     keyField: "value",
     value: current,
-    options: paramsList,
     onChange: onParamsChange,
     onSearch: setSearchValue,
     enableCreate: true

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/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,12 @@ var Text = function Text(props) {
     if (data.eventId === undefined) {
       return renderProps(data.attrs[0], 'user');
     }
+    if (String(data.eventId) === '-13') {
+      return renderOrder(data);
+    }
+    if (String(data.eventId) === '-14') {
+      return renderBusiness(data);
+    }
     if (data.eventId) {
       return renderEvent(data);
     }
@@ -103,6 +111,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,11 +120,91 @@ 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, property, frequencyValues);
+  }
+  function renderBusiness(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'
+      }
+    }, condition.typeName, period, timeDimensions, property, frequencyValues);
+  }
+  function renderProperty(attrs, label) {
+    var attrsDom = [];
+    attrs === null || attrs === void 0 ? void 0 : 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' && item.operator !== 'absolute' ? '天数' : item.operator === 'absolute' ? '日期' : '');
+      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"), label, ":", attrsDom, /*#__PURE__*/React.createElement("span", null, "\uFF09"));
   }
   function renderAttrs(event, attrs) {
     var attrsDom = [];
-    attrs.forEach(function (attr, i) {
+    attrs === null || attrs === void 0 ? void 0 : attrs.forEach(function (attr, i) {
       var index = event.attrList.findIndex(function (item) {
         return item.id === attr.attrId;
       });
@@ -145,6 +234,76 @@ 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 === null || frequencyValues === void 0 ? void 0 : 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 === null || timeDimensions === void 0 ? void 0 : 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) {
+        var _item$timeValues;
+        (_item$timeValues = item.timeValues) === null || _item$timeValues === void 0 ? void 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;
@@ -80,12 +88,17 @@ export declare namespace BizUserConditionT {
         category: 'fixed' | 'custom';
         computeType: string;
     }
+    interface paramsListCondition {
+        masterList: [];
+        bizDataAttrList: [];
+        paramsList: [];
+    }
     interface TimeDimensionsCondition {
         timeDimension: number;
         timeOperator: string;
         timeValues: number[];
         frequencyOperator: string;
-        frequencyValues: string[];
+        frequencyValues: any[];
     }
     interface EventCondition {
         attrs: AttrCondition[];
@@ -101,17 +114,21 @@ export declare namespace BizUserConditionT {
         runTimes: RunTimesI;
     }
     interface BusinessCondition {
+        typeId: undefined;
+        typeName: undefined;
+        paramsList: paramsListCondition[];
         attrs: AttrsCondition[];
         timeDimensions: TimeDimensionsCondition[];
-        runTimes: RunTimesI;
-        runPeriod: RunPeriodI;
+        runTimes: RunTimesII;
+        runPeriod: RunPeriodII;
         eventId: -14;
     }
     interface OrderCondition {
         attrs: AttrsCondition[];
         timeDimensions: TimeDimensionsCondition[];
-        runTimes: RunTimesI;
-        runPeriod: RunPeriodI;
+        paramsList: paramsListCondition[];
+        runTimes: RunTimesII;
+        runPeriod: RunPeriodII;
         eventId: -13;
     }
     interface ActiveCondition {
@@ -157,9 +174,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

@@ -70,15 +70,22 @@ export function buildCondition(type) {
     case 'business':
       return {
         eventId: -14,
+        typeId: undefined,
+        typeName: undefined,
         runTimes: {
           operator: '>=',
-          values: ['1']
+          values: [1]
         },
         attrs: [],
+        paramsList: [{
+          masterList: [],
+          bizDataAttrList: [],
+          paramsList: []
+        }],
         timeDimensions: [],
         runPeriod: {
           operator: 'relative',
-          values: ['30', '0']
+          values: [30, '0']
         }
       };
     case 'order':
@@ -86,13 +93,18 @@ export function buildCondition(type) {
         eventId: -13,
         runTimes: {
           operator: '>=',
-          values: ['1']
+          values: [1]
         },
         attrs: [],
+        paramsList: [{
+          masterList: [],
+          bizDataAttrList: [],
+          paramsList: []
+        }],
         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.0",
+    "version": "1.1.34-alpha.10",
     "scripts": {
         "start": "dumi dev",
         "docs:build": "dumi build",