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

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';
@@ -117,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);
@@ -177,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,
@@ -192,14 +197,14 @@ var OrConditions = function OrConditions(props) {
           onChange: onChangeRunPeriod,
           runPeriod: conditionData.runPeriod
         });
-      } else if (String(conditionData.eventId) === '-14') {
+      } 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) === '-13') {
+      } else if (String(conditionData.eventId) === eventIdType.orderData) {
         conditionDom = /*#__PURE__*/React.createElement(BusinessCondition, {
           label: "\u8BA2\u5355\u6570\u636E",
           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' | '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,6 +31,12 @@ 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' | 'order' | 'business';
     interface PropsI {
@@ -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;
@@ -80,12 +106,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[];
@@ -102,17 +133,20 @@ export declare namespace BizUserConditionT {
     }
     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 {
@@ -158,15 +192,15 @@ 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];
     }
     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.BusinessCondition | BizUserConditionT.OrderCondition | 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

@@ -71,15 +71,17 @@ export function buildCondition(type) {
       return {
         eventId: -14,
         typeId: undefined,
+        typeName: undefined,
         runTimes: {
           operator: '>=',
-          values: ['1']
+          values: [1]
         },
         attrs: [],
+        paramsList: [],
         timeDimensions: [],
         runPeriod: {
           operator: 'relative',
-          values: ['30', '0']
+          values: [30, '0']
         }
       };
     case 'order':
@@ -87,13 +89,14 @@ export function buildCondition(type) {
         eventId: -13,
         runTimes: {
           operator: '>=',
-          values: ['1']
+          values: [1]
         },
         attrs: [],
+        paramsList: [],
         timeDimensions: [],
         runPeriod: {
           operator: 'relative',
-          values: ['30', '0']
+          values: [30, '0']
         }
       };
   }

package/es/userTagsSelector/index.js

@@ -81,13 +81,15 @@ var UserTagsSelect = function UserTagsSelect(props) {
   return /*#__PURE__*/React.createElement("div", {
     className: classPrefix
   }, /*#__PURE__*/React.createElement(Dropdown, {
-    overlay: renderOverlay(),
+    dropdownRender: function dropdownRender() {
+      return renderOverlay();
+    },
     trigger: ['click'],
     overlayStyle: {
       minWidth: 0
     },
-    onVisibleChange: onVisibleChange,
-    visible: visible,
+    onOpenChange: onVisibleChange,
+    open: visible,
     destroyPopupOnHide: props.destroyPopupOnHide
   }, /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-handle")

package/es/utils/ajax.js

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

package/package.json

@@ -1,63 +1,63 @@
 {
-    "name": "@zgfe/business-lib",
-    "version": "1.1.34-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.34-alpha.21",
+  "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": "b2e287ebcfeaa841e1f4e10bd9891e58f3223e95"
 }