@zgfe/modules-event 0.1.5-event.0 → 0.1.5-event.2

package/es/components/eventFilter/index.js

@@ -37,28 +37,36 @@ var EventFilter = function EventFilter(props) {
     isAdd = _useState4[0],
     setIsAdd = _useState4[1];
   var conditionRef = useRef(null);
-  var _useState5 = useState(props.value && props.value.id ? {
+  var _useState5 = useState(props.value && props.value.eventGroupId ? {
+      id: props.value.eventGroupId
+    } : {
+      id: 0
+    }),
+    _useState6 = _slicedToArray(_useState5, 2),
+    group = _useState6[0],
+    setGroup = _useState6[1];
+  var _useState7 = useState(props.value && props.value.id ? {
       id: props.value.id,
       name: props.value.name
     } : {
       id: -100,
       name: '事件概览'
     }),
-    _useState6 = _slicedToArray(_useState5, 2),
-    event = _useState6[0],
-    setEvent = _useState6[1];
-  var _useState7 = useState(false),
     _useState8 = _slicedToArray(_useState7, 2),
-    eventOverview = _useState8[0],
-    setEventOverview = _useState8[1];
-  var _useState9 = useState(),
+    event = _useState8[0],
+    setEvent = _useState8[1];
+  var _useState9 = useState(false),
     _useState10 = _slicedToArray(_useState9, 2),
-    filter = _useState10[0],
-    setFilter = _useState10[1];
+    eventOverview = _useState10[0],
+    setEventOverview = _useState10[1];
   var _useState11 = useState(),
     _useState12 = _slicedToArray(_useState11, 2),
-    bizAttributeSelectorValue = _useState12[0],
-    setBizAttributeSelectorValue = _useState12[1];
+    filter = _useState12[0],
+    setFilter = _useState12[1];
+  var _useState13 = useState(),
+    _useState14 = _slicedToArray(_useState13, 2),
+    bizAttributeSelectorValue = _useState14[0],
+    setBizAttributeSelectorValue = _useState14[1];
   useEffect(function () {
     var _data = props.value;
     if (selectEventData) {
@@ -117,6 +125,9 @@ var EventFilter = function EventFilter(props) {
     if (event && event.event) {
       setEvent(event.event);
     }
+    if (event && event.group) {
+      setGroup(event.group);
+    }
     setBizAttributeSelectorValue(undefined);
     setFilter(undefined);
     setIsAdd(false);
@@ -156,8 +167,9 @@ var EventFilter = function EventFilter(props) {
       delete _dimension.key;
       _event.dimension = _dimension;
     }
+    _event.eventGroupId = group.id !== 0 ? group.id : undefined;
     props.onChange && props.onChange(_event);
-  }, [bizAttributeSelectorValue, filter, event]);
+  }, [bizAttributeSelectorValue, filter, event, group]);
   return /*#__PURE__*/React.createElement("div", {
     className: classPrefix
   }, /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(BizEventSelector, {
@@ -166,7 +178,8 @@ var EventFilter = function EventFilter(props) {
     popupContainer: false,
     defaultSelectAble: false,
     value: {
-      event: event
+      event: event,
+      group: group
     },
     onChange: onChangeEvent,
     placeholder: "\u8BF7\u9009\u62E9\u4E8B\u4EF6"

package/es/components/table/index.js

@@ -111,8 +111,10 @@ var EventTable = function EventTable(props) {
           })
         },
         source: 'EVENT',
-        url: '/zg/web/v2/data/appEventBatch',
-        analysisSubject: searchData.analysisSubject
+        url: searchData.analysisSubject ? '/zg/web/v2/data/eventSubjectDetail' : '/zg/web/v2/data/appEventBatch',
+        downloadUrl: searchData.analysisSubject ? '/zg/web/v2/data/eventSubjectDetailDownLoad' : undefined,
+        downloadFileName: '',
+        analysisSubject: searchData.analysisSubject ? searchData.analysisSubject : undefined
       }, _objectSpread(_objectSpread({
         source: 'EVENT'
       }, defaultSearch), {}, {

package/es/modules/content/index.js

@@ -126,17 +126,18 @@ var EventContent = function EventContent(props) {
         cancel = c;
       })
     }).then(function (res) {
+      var _searchData$userGroup;
       if (!res) {
         setLoading(false);
         return;
       }
       var result = res.data;
-      var _data = searchData.dimension ? result : getChartDataEventAliasName(result, eventGroupList);
+      var _data = searchData.dimension ? result : getChartDataEventAliasName(result, eventGroupList || []);
       setShowList(_data ? getDefaultShow(_data) : []);
       if (['bar', 'pie', 'map'].indexOf(searchData.chartType) !== -1) {
         _data = getSortData(_data);
       }
-      if (searchData.userGroup.length > 1) {
+      if ((searchData === null || searchData === void 0 ? void 0 : (_searchData$userGroup = searchData.userGroup) === null || _searchData$userGroup === void 0 ? void 0 : _searchData$userGroup.length) > 1) {
         setEventData(getUserGroupsCompareData(_data));
       } else {
         setEventData(_data);
@@ -169,12 +170,15 @@ var EventContent = function EventContent(props) {
     ajaxFlag = flag;
     data.id ? setEventId(data.id) : setEventId(-1);
     setSearchData(function (_searchData) {
-      var _data = _objectSpread(_objectSpread({}, _searchData), {}, {
+      var _data = _objectSpread(_objectSpread(_objectSpread({}, _searchData), {}, {
         dimension: data.dimension,
         filters: data.filters,
         id: data.id,
         name: data.name
-      }, data);
+      }, data), {}, {
+        userGroup: data.analysisSubject ? undefined : data.userGroup,
+        analysisSubject: data.analysisSubject ? data.analysisSubject : undefined
+      });
       return _objectSpread({}, _data);
     });
   };

package/es/modules/home/demo/edit.js

@@ -11,63 +11,44 @@ import { requestConfig } from '../../../utils/ajaxConfig';
 import { Button } from 'antd';
 var defaultValue = {
   enlarged: 0,
-  id: 2526,
+  id: 247162,
   isPerfect: 1,
-  name: '事件分析',
+  name: '008',
   reqParam: {
     data: {
-      app_id: 251,
+      appId: 461,
+      platform: 0,
       module: 'event',
+      userGroup: [0],
       time: {
-        begin: '2023-09-16',
-        end: '2023-09-23',
+        begin: '2023-10-05',
+        end: '2023-10-12',
         relative: [7, 0],
         unit: 'day'
       },
-      analysisIndex: 'number',
-      chartType: 'map',
-      id: 16818,
-      name: 'click',
-      dimension: {
-        propCategory: 'envProp',
-        category: 'fixed',
-        value: 'area',
-        id: 0
-      },
-      userGroup: [0],
-      appId: 251
+      chartType: 'line',
+      eventGroupId: 4339,
+      analysisIndex: 'number'
     },
-    chosen_data: []
+    chosen_data: ['首页-点击即刻体验demo', '首页-点击免费试用', '智能辅助API调用事件']
   },
-  type: 0,
-  unExistEvent: '',
-  renderType: 'normal',
-  source: 'PANEL',
-  panelId: 286,
-  panelType: 'edit',
   data: {
-    app_id: 251,
+    appId: 461,
+    platform: 0,
     module: 'event',
+    userGroup: [0],
     time: {
-      begin: '2023-09-16',
-      end: '2023-09-23',
-      relative: [7, 0],
+      begin: '2023-10-05',
+      end: '2023-10-12',
+      relative: [14, 0],
       unit: 'day'
     },
-    analysisIndex: 'number',
-    chartType: 'map',
-    id: 16818,
-    name: 'click',
-    dimension: {
-      propCategory: 'envProp',
-      category: 'fixed',
-      value: 'area',
-      id: 0
-    },
-    userGroup: [0],
-    appId: 251
+    chartType: 'line',
+    eventGroupId: 4339,
+    analysisIndex: 'number'
   },
-  chosen_data: []
+  type: 0,
+  unExistEvent: ''
 };
 export default (function () {
   var _useState = useState(false),
@@ -99,7 +80,7 @@ export default (function () {
   };
   return /*#__PURE__*/React.createElement(DemoWrapper, {
     needMeta: true,
-    defaultApp: 251
+    defaultApp: 461
   }, isDetail ? /*#__PURE__*/React.createElement("div", null, JSON.stringify(detailParams), /*#__PURE__*/React.createElement("br", null), /*#__PURE__*/React.createElement("br", null), /*#__PURE__*/React.createElement(Button, {
     onClick: function onClick() {
       return setIsDetail(false);

package/es/modules/topPanel/index.js

@@ -46,6 +46,7 @@ var TopPanel = /*#__PURE__*/React.forwardRef(function (props, ref) {
       if (allData.filterConditions.id !== -100) {
         _data = allData.filterConditions;
       }
+      _data.eventGroupId = allData.filterConditions.eventGroupId;
     }
     if (allData.userGroup) {
       _data.userGroup = allData.userGroup.filter(function (item) {
@@ -56,7 +57,7 @@ var TopPanel = /*#__PURE__*/React.forwardRef(function (props, ref) {
       }
     }
     if (data.filterConditions) {
-      if (finalSearchData && finalSearchData.id && data.filterConditions.id === finalSearchData.id) {
+      if (finalSearchData && finalSearchData.id && data.filterConditions.id === finalSearchData.id && data.filterConditions.eventGroupId === finalSearchData.eventGroupId) {
         ajaxFlag = false;
       } else {
         ajaxFlag = true;
@@ -81,7 +82,7 @@ var TopPanel = /*#__PURE__*/React.forwardRef(function (props, ref) {
     });
     props.onChange({
       userGroup: [0],
-      analysisSubject: {},
+      analysisSubject: undefined,
       id: undefined,
       name: undefined,
       filters: undefined,
@@ -99,7 +100,8 @@ var TopPanel = /*#__PURE__*/React.forwardRef(function (props, ref) {
         id: value === null || value === void 0 ? void 0 : value.id,
         name: value === null || value === void 0 ? void 0 : value.name,
         dimension: value === null || value === void 0 ? void 0 : value.dimension,
-        filters: value === null || value === void 0 ? void 0 : value.filters
+        filters: value === null || value === void 0 ? void 0 : value.filters,
+        eventGroupId: value === null || value === void 0 ? void 0 : value.eventGroupId
       },
       analysisSubject: {
         subjectId: 0,

package/es/modules/topPanel/types.d.ts

@@ -2,6 +2,7 @@ import { AttrConditionTypes } from '@zgfe/business-lib';
 import { bizAttributeSelectorValueProp, SearchValue, EventChartTypes } from '../../types';
 interface filterConditions {
     id?: number;
+    eventGroupId?: number;
     name?: string;
     filters?: AttrConditionTypes.GroupValue;
     dimension?: bizAttributeSelectorValueProp;

package/es/types.d.ts

@@ -18,12 +18,14 @@ export interface AnalysisSubject {
 }
 export interface eventProps {
     id?: number;
+    eventGroupId?: number;
     name?: string;
     filters?: AttrConditionTypes.GroupValue;
     dimension?: bizAttributeSelectorValueProp;
 }
 export interface SearchValue {
     id?: number;
+    eventGroupId?: number;
     name?: string;
     platform?: number;
     chartType?: EventChartTypes;

package/package.json

@@ -1,57 +1,57 @@
 {
-  "name": "@zgfe/modules-event",
-  "version": "0.1.5-event.0",
-  "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"
+    "name": "@zgfe/modules-event",
+    "version": "0.1.5-event.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"
     ],
-    "*.ts?(x)": [
-      "prettier --parser=typescript --write"
-    ]
-  },
-  "devDependencies": {
-    "@testing-library/jest-dom": "^5.15.1",
-    "@testing-library/react": "^12.1.2",
-    "@types/jest": "^27.0.3",
-    "@types/lodash": "^4.14.191",
-    "@umijs/fabric": "^2.8.1",
-    "@umijs/test": "^3.0.5",
-    "@zgfe/business-lib": "1.1.89-qirui.3",
-    "antd": "^4.22.6",
-    "dumi": "^1.1.0",
-    "echarts": "^5.3.2",
-    "echarts-for-react": "^3.0.2",
-    "father-build": "^1.17.2",
-    "gh-pages": "^3.0.0",
-    "lerna": "^4.0.0",
-    "lint-staged": "^10.0.7",
-    "prettier": "^2.2.1",
-    "react": "^16.12.0 || ^17.0.0",
-    "yorkie": "^2.0.0"
-  },
-  "gitHead": "3b8003e1fc6ec9ebfe1a87e497aa626ec3b0b33e",
-  "dependencies": {
-    "react-copy-to-clipboard": "^5.1.0",
-    "react-highlight": "^0.15.0"
-  }
+    "lint-staged": {
+        "*.{js,jsx,less,md,json}": [
+            "prettier --write"
+        ],
+        "*.ts?(x)": [
+            "prettier --parser=typescript --write"
+        ]
+    },
+    "devDependencies": {
+        "@testing-library/jest-dom": "^5.15.1",
+        "@testing-library/react": "^12.1.2",
+        "@types/jest": "^27.0.3",
+        "@types/lodash": "^4.14.191",
+        "@umijs/fabric": "^2.8.1",
+        "@umijs/test": "^3.0.5",
+        "@zgfe/business-lib": "1.1.89-qirui.3",
+        "antd": "^4.22.6",
+        "dumi": "^1.1.0",
+        "echarts": "^5.3.2",
+        "echarts-for-react": "^3.0.2",
+        "father-build": "^1.17.2",
+        "gh-pages": "^3.0.0",
+        "lerna": "^4.0.0",
+        "lint-staged": "^10.0.7",
+        "prettier": "^2.2.1",
+        "react": "^16.12.0 || ^17.0.0",
+        "yorkie": "^2.0.0"
+    },
+    "gitHead": "8d1f38b63aa57bc52954cc8f30150298da0c80c4",
+    "dependencies": {
+        "react-copy-to-clipboard": "^5.1.0",
+        "react-highlight": "^0.15.0"
+    }
 }