@zgfe/business-lib 1.1.31-alpha.2 → 1.1.31

package/es/userCondition/conditions/eventCondition.js

@@ -9,11 +9,8 @@ import BizEventSelector from '../../eventSelector';
 import RunTimesCondition from './runTimesCondition';
 import PeriodCondition from './periodCondition';
 import PropCondition from './propCondition';
-import { DownOutlined } from '@ant-design/icons';
 import './styles/eventCondition.less';
 import { BizUserConditionContext, classPrefix } from '..';
-import { Dropdown, notification, Space } from 'antd';
-import TimeDimension from './timeDimension';
 import { Tooltip } from 'antd';
 import IconFont from '../../icon/iconFont';
 var EventCondition = function EventCondition(props) {
@@ -53,38 +50,7 @@ var EventCondition = function EventCondition(props) {
       }]
     }));
   }
-  var onClick = function onClick(_ref) {
-    var key = _ref.key;
-    if (key === 'time dimension') {
-      var obj = {
-        frequencyValues: ['1'],
-        frequencyOperator: '>',
-        timeDimension: 1,
-        timeOperator: 'all',
-        timeValues: []
-      };
-      if (condition.timeDimensions.length < 3) {
-        condition.timeDimensions.push(obj);
-      } else {
-        notification.info({
-          message: '时间维度最多增加3条'
-        });
-      }
-    }
-    onChange(_objectSpread({}, condition));
-  };
-  var items = [{
-    label: '时间维度',
-    key: 'time dimension'
-  }];
-  function onTimeDimensionChange(condition) {
-    onChange(_objectSpread({}, condition));
-  }
-  function onTimeDimensionsDelete(index) {
-    condition.timeDimensions.splice(index, 1);
-    onChange(_objectSpread({}, condition));
-  }
-  return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("div", {
+  return /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-event-condition")
   }, /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-event-condition-left")
@@ -138,47 +104,6 @@ var EventCondition = function EventCondition(props) {
     onChange: onPeriodChange,
     isEvent: true,
     isRealTime: isRealTime
-  }))))), condition.timeDimensions.map(function (_item, index) {
-    return /*#__PURE__*/React.createElement("div", {
-      style: {
-        margin: '10px 0 0 38px'
-      },
-      className: "".concat(classPrefix, "-item"),
-      key: index
-    }, /*#__PURE__*/React.createElement("div", {
-      style: {
-        display: 'flex',
-        alignItems: 'center'
-      }
-    }, /*#__PURE__*/React.createElement("div", {
-      className: "".concat(classPrefix, "-period-condition-label")
-    }, "\u65F6\u95F4\u7EF4\u5EA6"), /*#__PURE__*/React.createElement(TimeDimension, {
-      onChange: onTimeDimensionChange,
-      condition: condition,
-      index: index
-    }), /*#__PURE__*/React.createElement("div", {
-      className: "biz-user-condition-item-delete",
-      onClick: function onClick() {
-        return onTimeDimensionsDelete(index);
-      }
-    }, /*#__PURE__*/React.createElement(IconFont, {
-      type: "qingchu"
-    }))));
-  }), condition.timeDimensions.length < 3 ? /*#__PURE__*/React.createElement("div", {
-    style: {
-      margin: '2px 0 0 38px',
-      color: '#4075fd',
-      fontSize: '12px'
-    }
-  }, /*#__PURE__*/React.createElement(Dropdown, {
-    menu: {
-      items: items,
-      onClick: onClick
-    }
-  }, /*#__PURE__*/React.createElement("a", {
-    onClick: function onClick(e) {
-      return e.preventDefault();
-    }
-  }, /*#__PURE__*/React.createElement(Space, null, "\u9AD8\u7EA7\u7B5B\u9009", /*#__PURE__*/React.createElement(DownOutlined, null))))) : null);
+  })))));
 };
 export default EventCondition;

package/es/userCondition/orConditions.js

@@ -23,7 +23,6 @@ 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,
@@ -192,20 +191,6 @@ var OrConditions = function OrConditions(props) {
           onChange: onChangeRunPeriod,
           runPeriod: conditionData.runPeriod
         });
-      } else if (String(conditionData.eventId) === '-14') {
-        conditionDom = /*#__PURE__*/React.createElement(BusinessCondition, {
-          label: "\u4E1A\u52A1\u6570\u636E",
-          dataId: id,
-          onChange: onChangeEvent,
-          condition: condition
-        });
-      } else if (String(conditionData.eventId) === '-13') {
-        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

@@ -8,7 +8,7 @@ export interface RunPeriodI {
     values: string[];
 }
 export interface RunTimesI {
-    operator: '>' | '=' | '<' | '>=' | '<=' | '>=' | 'not equal' | 'between';
+    operator: '>' | '=' | '<' | '>=' | '<=' | '>=' | 'not equal';
     values: string[];
 }
 export interface AllConditionBasePropsI<T> {
@@ -24,7 +24,7 @@ export declare enum PropType {
     DATE2 = "date"
 }
 export declare namespace BizUserConditionT {
-    type ConditionType = 'add' | 'active' | 'event' | 'prop' | 'tag' | 'cdp' | 'order' | 'business';
+    type ConditionType = 'add' | 'active' | 'event' | 'prop' | 'tag' | 'cdp';
     interface PropsI {
         defaultValue: BizUserConditionT.Conditions;
         onChange: (value: any[]) => void;
@@ -71,25 +71,8 @@ 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 TimeDimensionsCondition {
-        timeDimension: number;
-        timeOperator: string;
-        timeValues: number[];
-        frequencyOperator: string;
-        frequencyValues: string[];
-    }
     interface EventCondition {
         attrs: AttrCondition[];
-        timeDimensions: TimeDimensionsCondition[];
         runTimes: RunTimesI;
         runPeriod: RunPeriodI;
         eventId: number;
@@ -100,20 +83,6 @@ export declare namespace BizUserConditionT {
         runPeriod: RunPeriodI;
         runTimes: RunTimesI;
     }
-    interface BusinessCondition {
-        attrs: AttrsCondition[];
-        timeDimensions: TimeDimensionsCondition[];
-        runTimes: RunTimesI;
-        runPeriod: RunPeriodI;
-        eventId: -14;
-    }
-    interface OrderCondition {
-        attrs: AttrsCondition[];
-        timeDimensions: TimeDimensionsCondition[];
-        runTimes: RunTimesI;
-        runPeriod: RunPeriodI;
-        eventId: -13;
-    }
     interface ActiveCondition {
         eventId: '-4';
         attrs: [];
@@ -157,7 +126,7 @@ 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 | CdpCondition;
     type Conditions = Condition[][];
     type OtherCondition = EventCondition | AddCondition | ActiveCondition | PropCondition;
     interface ShowItemI {

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.BusinessCondition | BizUserConditionT.OrderCondition | BizUserConditionT.ActiveCondition | BizUserConditionT.PropCondition | BizUserConditionT.CdpCondition;
+export declare function buildCondition(type: BizUserConditionT.ConditionType): BizUserConditionT.EventCondition | BizUserConditionT.AddCondition | 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,7 +40,6 @@ export function buildCondition(type) {
           operator: '>=',
           values: ['1']
         },
-        timeDimensions: [],
         attrs: [],
         runPeriod: {
           operator: 'relative',
@@ -67,34 +66,6 @@ export function buildCondition(type) {
       return {
         dataset: [undefined]
       };
-    case 'business':
-      return {
-        eventId: -14,
-        runTimes: {
-          operator: '>=',
-          values: ['1']
-        },
-        attrs: [],
-        timeDimensions: [],
-        runPeriod: {
-          operator: 'relative',
-          values: ['30', '0']
-        }
-      };
-    case 'order':
-      return {
-        eventId: -13,
-        runTimes: {
-          operator: '>=',
-          values: ['1']
-        },
-        attrs: [],
-        timeDimensions: [],
-        runPeriod: {
-          operator: 'relative',
-          values: ['30', '0']
-        }
-      };
   }
 }
 export function transformNumberOperate(key) {

package/package.json

@@ -1,63 +1,63 @@
 {
-    "name": "@zgfe/business-lib",
-    "version": "1.1.31-alpha.2",
-    "scripts": {
-        "start": "dumi dev",
-        "docs:build": "dumi build",
-        "docs:deploy": "gh-pages -d docs-dist",
-        "build": "father-build",
-        "deploy": "npm run docs:build && npm run docs:deploy",
-        "prettier": "prettier --write \"**/*.{js,jsx,tsx,ts,less,md,json}\"",
-        "test": "umi-test",
-        "test:coverage": "umi-test --coverage",
-        "prepublishOnly": "npm run build",
-        "pub": "lerna publish"
-    },
-    "module": "es/index.js",
-    "typings": "es/index.d.ts",
-    "gitHooks": {
-        "pre-commit": "lint-staged"
-    },
-    "files": [
-        "es"
+  "name": "@zgfe/business-lib",
+  "version": "1.1.31",
+  "scripts": {
+    "start": "dumi dev",
+    "docs:build": "dumi build",
+    "docs:deploy": "gh-pages -d docs-dist",
+    "build": "father-build",
+    "deploy": "npm run docs:build && npm run docs:deploy",
+    "prettier": "prettier --write \"**/*.{js,jsx,tsx,ts,less,md,json}\"",
+    "test": "umi-test",
+    "test:coverage": "umi-test --coverage",
+    "prepublishOnly": "npm run build",
+    "pub": "lerna publish"
+  },
+  "module": "es/index.js",
+  "typings": "es/index.d.ts",
+  "gitHooks": {
+    "pre-commit": "lint-staged"
+  },
+  "files": [
+    "es"
+  ],
+  "lint-staged": {
+    "*.{js,jsx,less,md,json}": [
+      "prettier --write"
     ],
-    "lint-staged": {
-        "*.{js,jsx,less,md,json}": [
-            "prettier --write"
-        ],
-        "*.ts?(x)": [
-            "prettier --parser=typescript --write"
-        ]
-    },
-    "dependencies": {
-        "@types/js-cookie": "^3.0.2",
-        "@types/qs": "^6.9.7",
-        "axios": "^0.26.1",
-        "babel-plugin-import": "^1.13.3",
-        "echarts": "^5.3.2",
-        "echarts-for-react": "^3.0.2",
-        "js-cookie": "^3.0.1",
-        "lerna": "^4.0.0",
-        "rc-virtual-list": "^3.4.8",
-        "react-infinite-scroll-component": "^6.1.0",
-        "umi-request": "^1.4.0"
-    },
-    "devDependencies": {
-        "@testing-library/jest-dom": "^5.15.1",
-        "@testing-library/react": "^12.1.2",
-        "@types/jest": "^27.0.3",
-        "@types/lodash": "^4.14.182",
-        "@umijs/fabric": "^2.8.1",
-        "@umijs/test": "^3.0.5",
-        "antd": "^4.22.8",
-        "dumi": "^1.1.0",
-        "father-build": "^1.17.2",
-        "gh-pages": "^3.0.0",
-        "lint-staged": "^10.0.7",
-        "lodash": "^4.17.21",
-        "prettier": "^2.2.1",
-        "react": "^16.12.0 || ^17.0.0",
-        "yorkie": "^2.0.0"
-    },
-    "gitHead": "b2e287ebcfeaa841e1f4e10bd9891e58f3223e95"
-}
+    "*.ts?(x)": [
+      "prettier --parser=typescript --write"
+    ]
+  },
+  "dependencies": {
+    "@types/js-cookie": "^3.0.2",
+    "@types/qs": "^6.9.7",
+    "axios": "^0.26.1",
+    "babel-plugin-import": "^1.13.3",
+    "echarts": "^5.3.2",
+    "echarts-for-react": "^3.0.2",
+    "js-cookie": "^3.0.1",
+    "lerna": "^4.0.0",
+    "rc-virtual-list": "^3.4.8",
+    "react-infinite-scroll-component": "^6.1.0",
+    "umi-request": "^1.4.0"
+  },
+  "devDependencies": {
+    "@testing-library/jest-dom": "^5.15.1",
+    "@testing-library/react": "^12.1.2",
+    "@types/jest": "^27.0.3",
+    "@types/lodash": "^4.14.182",
+    "@umijs/fabric": "^2.8.1",
+    "@umijs/test": "^3.0.5",
+    "antd": "^4.22.8",
+    "dumi": "^1.1.0",
+    "father-build": "^1.17.2",
+    "gh-pages": "^3.0.0",
+    "lint-staged": "^10.0.7",
+    "lodash": "^4.17.21",
+    "prettier": "^2.2.1",
+    "react": "^16.12.0 || ^17.0.0",
+    "yorkie": "^2.0.0"
+  },
+  "gitHead": "8973d9ddc501b94d01f445eaebbd4e15d98638b2"
+}

package/es/userCondition/conditions/businessCondition.d.ts

@@ -1,11 +0,0 @@
-import React from 'react';
-import { AllConditionBasePropsI, BizUserConditionT } from '../types';
-import './styles/periodCondition.less';
-export interface BusinessConditionPropsI extends AllConditionBasePropsI<any> {
-    condition: BizUserConditionT.BusinessCondition;
-    label?: string | React.ReactDOM;
-    isEvent?: boolean;
-    isRealTime?: boolean;
-}
-declare const BusinessCondition: React.FC<BusinessConditionPropsI>;
-export default BusinessCondition;