@zgfe/business-lib 1.1.35 → 1.1.36

package/es/userCondition/conditions/timeDimension.js

@@ -0,0 +1,150 @@
+function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
+function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
+function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
+function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+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 BizSelect from '../../select';
+import './styles/runTimesCondition.less';
+import { classPrefix } from '..';
+import { timeDimensionType, skyTimeOperatorType, weekTimeOperatorType, monthTimeOperatorType, timeValuesType, weekValuesType, monthValuesType } from '../../attrConditions/utils/operates';
+import RunTimesCondition from './order/runTimesCondition';
+var TimeDimension = function TimeDimension(props) {
+  var _condition$timeDimens, _condition$timeDimens3, _condition$timeDimens4, _condition$timeDimens5, _condition$timeDimens6, _condition$timeDimens7, _condition$timeDimens8, _condition$timeDimens9, _condition$timeDimens10, _condition$timeDimens11, _condition$timeDimens12, _condition$timeDimens13;
+  var onChange = props.onChange,
+    condition = props.condition,
+    index = props.index;
+  var _useState = useState({
+      name: '每天',
+      value: 1
+    }),
+    _useState2 = _slicedToArray(_useState, 2),
+    setTimeDimensionTypeList = _useState2[1];
+  var list = [];
+  var valuesList = [];
+  switch (condition === null || condition === void 0 ? void 0 : (_condition$timeDimens = condition.timeDimensions[index]) === null || _condition$timeDimens === void 0 ? void 0 : _condition$timeDimens.timeDimension) {
+    case 1:
+      list = skyTimeOperatorType;
+      valuesList = timeValuesType;
+      break;
+    case 2:
+      list = weekTimeOperatorType;
+      valuesList = weekValuesType;
+      break;
+    default:
+      list = monthTimeOperatorType;
+      valuesList = monthValuesType;
+      break;
+  }
+  var _useState3 = useState(list),
+    _useState4 = _slicedToArray(_useState3, 2),
+    timeOperatorTypeList = _useState4[0],
+    setTimeOperatorTypeList = _useState4[1];
+  var _useState5 = useState(valuesList),
+    _useState6 = _slicedToArray(_useState5, 2),
+    timeValuesTypeList = _useState6[0],
+    setTimeValuesTypeList = _useState6[1];
+  var onTimeDimensionTypeChange = function onTimeDimensionTypeChange(operate) {
+    setTimeDimensionTypeList(operate);
+    switch (operate.value) {
+      case 1:
+        setTimeValuesTypeList(timeValuesType);
+        setTimeOperatorTypeList(skyTimeOperatorType);
+        break;
+      case 2:
+        setTimeValuesTypeList(weekValuesType);
+        setTimeOperatorTypeList(weekTimeOperatorType);
+        break;
+      default:
+        setTimeValuesTypeList(monthValuesType);
+        setTimeOperatorTypeList(monthTimeOperatorType);
+        break;
+    }
+    condition.timeDimensions[index].timeDimension = operate.value;
+    onChange(_objectSpread({}, condition));
+  };
+  var onTimeOperatorTypeChange = function onTimeOperatorTypeChange(operate) {
+    var _condition$timeDimens2;
+    condition.timeDimensions[index].timeValues = [(_condition$timeDimens2 = condition.timeDimensions[index]) === null || _condition$timeDimens2 === void 0 ? void 0 : _condition$timeDimens2.timeValues[0]];
+    condition.timeDimensions[index].timeOperator = operate.value;
+    onChange(_objectSpread({}, condition));
+  };
+  var onTimeValuesType0Change = function onTimeValuesType0Change(operate) {
+    condition.timeDimensions[index].timeValues[0] = operate.value;
+    onChange(_objectSpread({}, condition));
+  };
+  var onTimeValuesType1Change = function onTimeValuesType1Change(operate) {
+    condition.timeDimensions[index].timeValues[1] = operate.value;
+    onChange(_objectSpread({}, condition));
+  };
+  return /*#__PURE__*/React.createElement("div", null, /*#__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: timeDimensionType,
+    labelField: "name",
+    keyField: "value",
+    overlayWidth: 80,
+    value: {
+      name: condition === null || condition === void 0 ? void 0 : (_condition$timeDimens3 = condition.timeDimensions[index]) === null || _condition$timeDimens3 === void 0 ? void 0 : _condition$timeDimens3.timeDimension,
+      value: condition === null || condition === void 0 ? void 0 : (_condition$timeDimens4 = condition.timeDimensions[index]) === null || _condition$timeDimens4 === void 0 ? void 0 : _condition$timeDimens4.timeDimension
+    },
+    onChange: onTimeDimensionTypeChange
+  })), /*#__PURE__*/React.createElement("div", {
+    className: "".concat(classPrefix, "-period-condition-operator")
+  }, /*#__PURE__*/React.createElement(BizSelect, {
+    className: "".concat(classPrefix, "-select-condition"),
+    options: timeOperatorTypeList,
+    labelField: "name",
+    keyField: "value",
+    overlayWidth: 120,
+    value: {
+      name: condition === null || condition === void 0 ? void 0 : (_condition$timeDimens5 = condition.timeDimensions[index]) === null || _condition$timeDimens5 === void 0 ? void 0 : _condition$timeDimens5.timeOperator,
+      value: condition === null || condition === void 0 ? void 0 : (_condition$timeDimens6 = condition.timeDimensions[index]) === null || _condition$timeDimens6 === void 0 ? void 0 : _condition$timeDimens6.timeOperator
+    },
+    onChange: onTimeOperatorTypeChange
+  })), (condition === null || condition === void 0 ? void 0 : (_condition$timeDimens7 = condition.timeDimensions[index]) === null || _condition$timeDimens7 === void 0 ? void 0 : _condition$timeDimens7.timeOperator) === 'in' || (condition === null || condition === void 0 ? void 0 : (_condition$timeDimens8 = condition.timeDimensions[index]) === null || _condition$timeDimens8 === void 0 ? void 0 : _condition$timeDimens8.timeOperator) === 'between' ? /*#__PURE__*/React.createElement("div", {
+    className: "".concat(classPrefix, "-period-condition-operator")
+  }, /*#__PURE__*/React.createElement(BizSelect, {
+    className: "".concat(classPrefix, "-select-condition"),
+    options: timeValuesTypeList,
+    labelField: "name",
+    keyField: "value",
+    overlayWidth: 120,
+    value: {
+      name: condition === null || condition === void 0 ? void 0 : (_condition$timeDimens9 = condition.timeDimensions[index]) === null || _condition$timeDimens9 === void 0 ? void 0 : _condition$timeDimens9.timeValues[0],
+      value: condition === null || condition === void 0 ? void 0 : (_condition$timeDimens10 = condition.timeDimensions[index]) === null || _condition$timeDimens10 === void 0 ? void 0 : _condition$timeDimens10.timeValues[0]
+    },
+    onChange: onTimeValuesType0Change
+  })) : null, (condition === null || condition === void 0 ? void 0 : (_condition$timeDimens11 = condition.timeDimensions[index]) === null || _condition$timeDimens11 === void 0 ? void 0 : _condition$timeDimens11.timeOperator) === 'between' ? /*#__PURE__*/React.createElement("div", {
+    className: "".concat(classPrefix, "-period-condition-operator")
+  }, /*#__PURE__*/React.createElement(BizSelect, {
+    className: "".concat(classPrefix, "-select-condition"),
+    options: timeValuesTypeList,
+    labelField: "name",
+    keyField: "value",
+    overlayWidth: 120,
+    value: {
+      name: condition === null || condition === void 0 ? void 0 : (_condition$timeDimens12 = condition.timeDimensions[index]) === null || _condition$timeDimens12 === void 0 ? void 0 : _condition$timeDimens12.timeValues[1],
+      value: condition === null || condition === void 0 ? void 0 : (_condition$timeDimens13 = condition.timeDimensions[index]) === null || _condition$timeDimens13 === void 0 ? void 0 : _condition$timeDimens13.timeValues[1]
+    },
+    onChange: onTimeValuesType1Change
+  })) : null, /*#__PURE__*/React.createElement("div", {
+    className: "".concat(classPrefix, "-period-condition-values")
+  }, /*#__PURE__*/React.createElement(RunTimesCondition, {
+    index: index,
+    dataId: props.dataId,
+    condition: condition,
+    onChange: onChange
+  }))));
+};
+export default TimeDimension;

package/es/userCondition/demo/business.d.ts

@@ -0,0 +1,3 @@
+import '@zgfe/business-lib/es/assets/iconfont/iconfont.css';
+declare const _default: () => JSX.Element;
+export default _default;

package/es/userCondition/demo/business.js

@@ -0,0 +1,71 @@
+function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
+function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+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, { useEffect, useMemo, useState } from 'react';
+import eventData from '../../mock/event';
+import envData from '../../mock/env';
+import userData from '../../mock/user';
+import { BizUserCondition, BizGlobalDataContext, convertAttributeData } from '@zgfe/business-lib';
+import { conditions, tagList } from './mockData';
+import '@zgfe/business-lib/es/assets/iconfont/iconfont.css';
+var getTagList = Promise.resolve(tagList);
+export default (function () {
+  var _useState = useState({
+      eventGroupList: [],
+      userPropList: [],
+      eventEnvList: []
+    }),
+    _useState2 = _slicedToArray(_useState, 2),
+    setStore = _useState2[1];
+  var _useState3 = useState([]),
+    _useState4 = _slicedToArray(_useState3, 2),
+    userTagsData = _useState4[0],
+    setUserTagsData = _useState4[1];
+  var newStore = convertAttributeData({
+    eventList: eventData,
+    userPropList: userData,
+    envPropList: envData
+  });
+  useEffect(function () {
+    setStore(newStore);
+  }, []);
+  useEffect(function () {
+    getTagList.then(function (list) {
+      setUserTagsData(list);
+    });
+  }, []);
+  var defaultValue = useMemo(function () {
+    return conditions;
+  }, [conditions]);
+  function onChange(value) {
+    console.log('change:', JSON.parse(JSON.stringify(value)));
+  }
+  var descDom = /*#__PURE__*/React.createElement(BizUserCondition, {
+    openCondition: false,
+    defaultValue: defaultValue,
+    openBusinessDataCondition: true,
+    openOrderDataCondition: true,
+    onChange: onChange,
+    eventAttrNum: 3,
+    userTagsData: userTagsData,
+    isRealTime: true
+  });
+  return /*#__PURE__*/React.createElement(BizGlobalDataContext.Provider, {
+    value: {
+      eventGroupList: newStore.eventGroupList,
+      userPropList: newStore.userPropList,
+      eventEnvList: newStore.envPropList,
+      currentApp: {
+        appId: 181,
+        platform: 0
+      }
+    }
+  }, /*#__PURE__*/React.createElement("div", {
+    style: {
+      display: 'inline-block'
+    }
+  }, descDom));
+});

package/es/userCondition/index.js

@@ -26,6 +26,9 @@ export var BizUserConditionContext = /*#__PURE__*/createContext({
   textMode: false,
   openTagCondition: false,
   openCdpCondition: false,
+  openBusinessDataCondition: false,
+  openOrderDataCondition: false,
+  openCondition: true,
   userTagsData: [],
   envNameList: [],
   userPropsMap: {},
@@ -42,7 +45,10 @@ var BizUserCondition = function BizUserCondition(props) {
     defaultValue = props.defaultValue,
     openTagCondition = props.openTagCondition,
     openCdpCondition = props.openCdpCondition,
+    openBusinessDataCondition = props.openBusinessDataCondition,
+    openOrderDataCondition = props.openOrderDataCondition,
     userTagsData = props.userTagsData,
+    openCondition = props.openCondition,
     cdpTip = props.cdpTip;
   var _useState = useState([]),
     _useState2 = _slicedToArray(_useState, 2),
@@ -58,10 +64,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;
@@ -216,6 +222,9 @@ var BizUserCondition = function BizUserCondition(props) {
       textMode: props.textMode,
       openTagCondition: openTagCondition,
       openCdpCondition: openCdpCondition,
+      openCondition: openCondition,
+      openBusinessDataCondition: openBusinessDataCondition,
+      openOrderDataCondition: openOrderDataCondition,
       cdpTip: cdpTip,
       userTagsData: userTagsData !== null && userTagsData !== void 0 ? userTagsData : [],
       isRealTime: props.isRealTime,
@@ -254,6 +263,9 @@ BizUserCondition.defaultProps = {
   andConditionNum: 5,
   textMode: false,
   openTagCondition: false,
+  openBusinessDataCondition: false,
+  openOrderDataCondition: false,
+  openCondition: true,
   userTagsData: [],
   isRealTime: false
 };

package/es/userCondition/orConditions.js

@@ -10,6 +10,7 @@ function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefine
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import React, { useContext, useEffect, useState } from 'react';
 import { BizUserConditionContext } from '.';
+import { eventIdType } from './types';
 import './styles/orConditions.less';
 import { util } from '../utils';
 import ConditionTypeList from './conditionTypeList';
@@ -23,6 +24,7 @@ import TagsCondition from './conditions/tagsCondition';
 import { classPrefix } from '.';
 import Text from './conditions/textDesc';
 import CdpCondition from './conditions/cdpCondition';
+import BusinessCondition from './conditions/businessCondition';
 var OrConditions = function OrConditions(props) {
   var _useContext = useContext(BizUserConditionContext),
     orConditionNum = _useContext.orConditionNum,
@@ -116,6 +118,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);
@@ -176,14 +182,14 @@ var OrConditions = function OrConditions(props) {
           dataId: id,
           onChange: onChangeAttrs
         });
-      } else if (String(conditionData.eventId) === '-3') {
+      } else if (String(conditionData.eventId) === eventIdType.addTo) {
         conditionDom = /*#__PURE__*/React.createElement(PeriodCondition, {
           label: "\u65B0\u589E\u4E8E",
           dataId: id,
           onChange: onChangeRunPeriod,
           runPeriod: conditionData.runPeriod
         });
-      } else if (String(conditionData.eventId) === '-4') {
+      } else if (String(conditionData.eventId) === eventIdType.beActiveIn) {
         conditionDom = /*#__PURE__*/React.createElement(PeriodCondition, {
           label: "\u6D3B\u8DC3\u4E8E",
           isRealTime: true,
@@ -191,6 +197,20 @@ var OrConditions = function OrConditions(props) {
           onChange: onChangeRunPeriod,
           runPeriod: conditionData.runPeriod
         });
+      } else if (String(conditionData.eventId) === eventIdType.businessData) {
+        conditionDom = /*#__PURE__*/React.createElement(BusinessCondition, {
+          label: "\u4E1A\u52A1\u6570\u636E",
+          dataId: id,
+          onChange: onChangeEvent,
+          condition: condition
+        });
+      } else if (String(conditionData.eventId) === eventIdType.orderData) {
+        conditionDom = /*#__PURE__*/React.createElement(BusinessCondition, {
+          label: "\u8BA2\u5355\u6570\u636E",
+          dataId: id,
+          onChange: onChangeEvent,
+          condition: condition
+        });
       } else if (util.isNumber(conditionData.eventId)) {
         conditionDom = /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(EventCondition, {
           dataId: id,

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';
+    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;
@@ -23,8 +31,14 @@ export declare enum PropType {
     NUMBER2 = "number",
     DATE2 = "date"
 }
+export declare enum eventIdType {
+    addTo = "-3",
+    beActiveIn = "-4",
+    businessData = "-14",
+    orderData = "-13"
+}
 export declare namespace BizUserConditionT {
-    type ConditionType = 'add' | 'active' | 'event' | 'prop' | 'tag' | 'cdp';
+    type ConditionType = 'add' | 'active' | 'event' | 'prop' | 'tag' | 'cdp' | 'order' | 'business';
     interface PropsI {
         defaultValue: BizUserConditionT.Conditions;
         onChange: (value: any[]) => void;
@@ -36,8 +50,20 @@ export declare namespace BizUserConditionT {
         userTagsData?: UserTagsDataI[];
         isRealTime?: boolean;
         openCdpCondition?: boolean;
+        openBusinessDataCondition?: boolean;
+        openOrderDataCondition?: boolean;
+        openCondition?: boolean;
         cdpTip?: string;
     }
+    interface BusinessPropsI {
+        dataId: number;
+        condition: BizUserConditionT.BusinessCondition;
+        openBusinessDataCondition?: boolean;
+        openOrderDataCondition?: boolean;
+        label?: string | React.ReactDOM;
+        index?: number;
+        onChange: (dataId: number, newData: any) => void;
+    }
     interface UserTagsDataI {
         appId: number;
         createTime: string;
@@ -71,8 +97,30 @@ export declare namespace BizUserConditionT {
         category: 'fixed' | 'custom';
         propCategory?: string;
     }
+    interface AttrsCondition {
+        attrId: number;
+        attrName: string;
+        operator: 'is not null' | 'is null' | 'not contains' | 'contains' | 'equal' | 'not equal' | 'begin with' | 'not begin with' | 'end with' | 'not end with' | Unpacked<RunTimesI, 'operator'>;
+        params: string[];
+        attrType: 'cont-string' | 'cont-num' | 'cont-date';
+        category: 'fixed' | 'custom';
+        computeType: string;
+    }
+    interface paramsListCondition {
+        masterList: [];
+        bizDataAttrList: [];
+        paramsList: [];
+    }
+    interface TimeDimensionsCondition {
+        timeDimension: number;
+        timeOperator: string;
+        timeValues: number[];
+        frequencyOperator: string;
+        frequencyValues: any[];
+    }
     interface EventCondition {
         attrs: AttrCondition[];
+        timeDimensions: TimeDimensionsCondition[];
         runTimes: RunTimesI;
         runPeriod: RunPeriodI;
         eventId: number;
@@ -83,6 +131,24 @@ export declare namespace BizUserConditionT {
         runPeriod: RunPeriodI;
         runTimes: RunTimesI;
     }
+    interface BusinessCondition {
+        typeId: undefined;
+        typeName: undefined;
+        paramsList: paramsListCondition[];
+        attrs: AttrsCondition[];
+        timeDimensions: TimeDimensionsCondition[];
+        runTimes: RunTimesII;
+        runPeriod: RunPeriodII;
+        eventId: -14;
+    }
+    interface OrderCondition {
+        attrs: AttrsCondition[];
+        timeDimensions: TimeDimensionsCondition[];
+        paramsList: paramsListCondition[];
+        runTimes: RunTimesII;
+        runPeriod: RunPeriodII;
+        eventId: -13;
+    }
     interface ActiveCondition {
         eventId: '-4';
         attrs: [];
@@ -126,15 +192,15 @@ export declare namespace BizUserConditionT {
     interface CdpCondition {
         dataset: (BizUserConditionT.CdpConditionDetail | undefined)[];
     }
-    type Condition = EventCondition | AddCondition | ActiveCondition | PropCondition | TagsCondition | 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];
     }
     type ShowListT = ShowItemI[];
-    type GlobalContext = Pick<BizUserConditionT.PropsI, 'orConditionNum' | 'eventAttrNum' | 'openTagCondition' | 'userTagsData' | 'openCdpCondition' | 'textMode' | 'isRealTime' | 'cdpTip'> & {
+    type GlobalContext = Pick<BizUserConditionT.PropsI, 'orConditionNum' | 'eventAttrNum' | 'openTagCondition' | 'userTagsData' | 'openCdpCondition' | 'openBusinessDataCondition' | 'openOrderDataCondition' | 'openCondition' | 'textMode' | 'isRealTime' | 'cdpTip'> & {
         envNameList: string[];
         userPropsMap: {
             [key: string]: UserProp;

package/es/userCondition/types.js

@@ -6,4 +6,11 @@ export var PropType;
   PropType["STRING2"] = "string";
   PropType["NUMBER2"] = "number";
   PropType["DATE2"] = "date";
-})(PropType || (PropType = {}));
+})(PropType || (PropType = {}));
+export var eventIdType;
+(function (eventIdType) {
+  eventIdType["addTo"] = "-3";
+  eventIdType["beActiveIn"] = "-4";
+  eventIdType["businessData"] = "-14";
+  eventIdType["orderData"] = "-13";
+})(eventIdType || (eventIdType = {}));

package/es/userCondition/util.d.ts

@@ -1,6 +1,6 @@
 import type { GlobalContextProps } from '../context';
 import type { BizUserConditionT, Unpacked } from './types';
-export declare function buildCondition(type: BizUserConditionT.ConditionType): BizUserConditionT.EventCondition | BizUserConditionT.AddCondition | BizUserConditionT.ActiveCondition | BizUserConditionT.PropCondition | BizUserConditionT.CdpCondition;
+export declare function buildCondition(type: BizUserConditionT.ConditionType): BizUserConditionT.BusinessCondition | BizUserConditionT.EventCondition | BizUserConditionT.AddCondition | BizUserConditionT.OrderCondition | BizUserConditionT.ActiveCondition | BizUserConditionT.PropCondition | BizUserConditionT.CdpCondition;
 export declare function transformNumberOperate(key: string, output?: boolean): string;
 export declare function findEvent(eventId: number, eventGroupList: Unpacked<GlobalContextProps, 'eventGroupList'>): import("../attributeSelector/types").AnalysisEvent | null;
 export declare function findPropAndEnv(name: string, list: Unpacked<GlobalContextProps, 'userPropList' | 'eventEnvList'>): import("../attributeSelector/types").UserProp | import("../attributeSelector/types").EnvProp | null;

package/es/userCondition/util.js

@@ -40,6 +40,7 @@ export function buildCondition(type) {
           operator: '>=',
           values: ['1']
         },
+        timeDimensions: [],
         attrs: [],
         runPeriod: {
           operator: 'relative',
@@ -66,6 +67,38 @@ export function buildCondition(type) {
       return {
         dataset: [undefined]
       };
+    case 'business':
+      return {
+        eventId: -14,
+        typeId: undefined,
+        typeName: undefined,
+        runTimes: {
+          operator: '>=',
+          values: [1]
+        },
+        attrs: [],
+        paramsList: [],
+        timeDimensions: [],
+        runPeriod: {
+          operator: 'relative',
+          values: [30, '0']
+        }
+      };
+    case 'order':
+      return {
+        eventId: -13,
+        runTimes: {
+          operator: '>=',
+          values: [1]
+        },
+        attrs: [],
+        paramsList: [],
+        timeDimensions: [],
+        runPeriod: {
+          operator: 'relative',
+          values: [30, '0']
+        }
+      };
   }
 }
 export function transformNumberOperate(key) {

package/es/utils/ajax.js

@@ -63,6 +63,7 @@ function responseErrorHandler(url, apiResult, errorTitle, notifyType) {
     flag = true;
   } else if (new RegExp("".concat(ResponseStatus.notLogin)).test(apiResult.code)) {
     message = '账户未登录或登录已失效';
+    window.location.href = '/webapp/app/login?destination=' + window.location.href;
   } else if (new RegExp("".concat(ResponseStatus.noPermission)).test(apiResult.code)) {
     window.location.href = '/webapp/app/noPermission';
     throw new Error(apiResult.msg);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zgfe/business-lib",
-  "version": "1.1.35",
+  "version": "1.1.36",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",
@@ -59,5 +59,5 @@
     "react": "^16.12.0 || ^17.0.0",
     "yorkie": "^2.0.0"
   },
-  "gitHead": "3d79ca5a2961f8d7a99156d3a3cb71d6274bf83e"
+  "gitHead": "b2e287ebcfeaa841e1f4e10bd9891e58f3223e95"
 }