@zgfe/modules-event 0.0.2-alpha.4 → 0.0.2-alpha.9

package/es/components/eventFilter/index.js

@@ -1,3 +1,6 @@
+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) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 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); }
@@ -8,6 +11,7 @@ import { Tooltip } from 'antd';
 import React, { useEffect, useRef, useState } from 'react';
 import { BizEventSelector, BizAttributeSelector, IconFont, BizAttrConditionGroup } from '@zgfe/business-lib';
 import './styles/index.less';
+import _ from 'lodash';
 var classPrefix = 'eventfilter-box';
 var EventFilter = function EventFilter(props) {
   var _useState = useState(0),
@@ -39,14 +43,16 @@ var EventFilter = function EventFilter(props) {
     bizAttributeSelectorValue = _useState12[0],
     setBizAttributeSelectorValue = _useState12[1];
   useEffect(function () {
-    if (props.value !== null) {
-      var _data = props.value[0];
+    if (props.value) {
+      var _data = props.value;
       setEvent({
         id: _data.id,
         name: _data.name
       });
       setFilter(_data.filters);
-      setBizAttributeSelectorValue(_data.eventAttr);
+      setBizAttributeSelectorValue(_objectSpread(_objectSpread({}, _data.dimension), {}, {
+        key: _data.dimension.propCategory === 'eventProp' ? _data.dimension.value : _data.dimension.propCategory + '-' + _data.dimension.value
+      }));
       setEventOverview(false);
     }
   }, []);
@@ -89,13 +95,12 @@ var EventFilter = function EventFilter(props) {
     if (attr === undefined) {
       setBizAttributeSelectorValue(undefined);
     } else {
+      var _value = attr.propCategory === 'eventProp' ? attr.id : attr.name;
       setBizAttributeSelectorValue({
-        id: attr.id,
         propCategory: attr.propCategory,
-        name: attr.name,
         category: attr.category,
-        label: attr.label,
-        dimensionSub: attr.dimensionSub
+        value: _value,
+        key: attr.propCategory === 'eventProp' ? attr.id : attr.propCategory + '-' + _value
       });
     }
   };
@@ -108,10 +113,15 @@ var EventFilter = function EventFilter(props) {
       _event.filters = filter;
     }
     if (bizAttributeSelectorValue) {
-      _event.eventAttr = bizAttributeSelectorValue;
+      var _dimension = _.cloneDeep(bizAttributeSelectorValue);
+      delete _dimension.key;
+      _event.dimension = _dimension;
     }
     props.onChange && props.onChange(_event);
   }, [bizAttributeSelectorValue, filter, event]);
+  useEffect(function () {
+    console.log(666, bizAttributeSelectorValue);
+  }, [bizAttributeSelectorValue]);
   return /*#__PURE__*/React.createElement("div", {
     className: classPrefix
   }, /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(BizEventSelector, {

package/es/components/eventFilter/styles/index.less

@@ -9,6 +9,7 @@
     }
     .shaixuan {
       margin-top: 2px;
+      margin-left: 20px;
       color: #9aa1a9;
       font-size: 20px !important;
       cursor: pointer;

package/es/components/table/index.js

@@ -17,6 +17,7 @@ import { Apis } from '../../constants';
 import { Modal, message } from 'antd';
 import { formTableData, getColumns } from '../../utils/formData';
 import './styles/index.less';
+import { getValue } from '../../modules/content/utils';
 import { EventContext } from '../../types';
 var classPrefix = 'mi-table';
 var EventTable = function EventTable(props) {
@@ -53,7 +54,7 @@ var EventTable = function EventTable(props) {
     sqlText = _useState10[0],
     setSqlText = _useState10[1];
   useEffect(function () {
-    var gLen = (searchData === null || searchData === void 0 ? void 0 : searchData.filterConditions) && (searchData === null || searchData === void 0 ? void 0 : searchData.filterConditions[0].eventAttr) ? 1 : 0;
+    var gLen = (searchData === null || searchData === void 0 ? void 0 : searchData.dimension) ? 1 : 0;
     var sortData = formTableData(dataSource, searchData.userGroup || [0], gLen, eventGroupList);
     setSearchTable(sortData);
     setSortTable(sortData);
@@ -66,40 +67,24 @@ var EventTable = function EventTable(props) {
       props.changeShowByName(nameGroup);
     };
     var onClickToDetail = function onClickToDetail(item, time, count) {
-      var _searchData$time;
-      console.log('666', searchData);
-      var group_value = '';
-      if (searchData.filterConditions && searchData.filterConditions[0].eventAttr) {
-        group_value = item.eventAttr;
-      } else {
-        eventGroupList === null || eventGroupList === void 0 ? void 0 : eventGroupList.forEach(function (group) {
-          group.eventList.forEach(function (event) {
-            if (event.name === item.name) {
-              group_value = event.id.toString();
-            }
-          });
-        });
-      }
-      var group_by = [['bar', 'map', 'pie'].includes(searchData.chartType) ? 'total' : (_searchData$time = searchData.time) === null || _searchData$time === void 0 ? void 0 : _searchData$time.unit];
-      if (searchData.filterConditions && searchData.filterConditions[0].eventAttr) {
-        var _searchData$filterCon;
-        group_by.push((_searchData$filterCon = searchData.filterConditions[0].eventAttr) === null || _searchData$filterCon === void 0 ? void 0 : _searchData$filterCon.dimensionSub);
-      } else {
-        group_by.push('');
+      var _searchData$filters;
+      var group_value = {};
+      if (searchData.dimension) {
+        group_value = {
+          group_value: item.dimension
+        };
       }
       onUserDrill && onUserDrill({
         appId: currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId,
         platform: (currentApp === null || currentApp === void 0 ? void 0 : currentApp.platform) || 0,
         count: count,
-        params: _objectSpread(_objectSpread({
-          appid: currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId,
-          plat: (currentApp === null || currentApp === void 0 ? void 0 : currentApp.platform) || 0,
-          user_type: 0,
-          isTotal: false,
-          group_value: group_value,
-          group_by: group_by.join(','),
-          module: 'event'
-        }, searchData), {}, {
+        module: 'event',
+        params: _objectSpread(_objectSpread({}, group_value), {}, {
+          id: searchData.id,
+          userGroup: searchData.userGroup,
+          chartType: searchData.chartType,
+          conditions: (_searchData$filters = searchData.filters) === null || _searchData$filters === void 0 ? void 0 : _searchData$filters.conditions,
+          dimension: searchData.dimension,
           time: _objectSpread(_objectSpread({}, searchData.time), {}, {
             begin: time[0],
             end: time.length > 1 ? time[1] : time[0]
@@ -128,7 +113,7 @@ var EventTable = function EventTable(props) {
       data: _objectSpread({
         appId: currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId,
         platform: (currentApp === null || currentApp === void 0 ? void 0 : currentApp.platform) || 0,
-        service: !searchData.filterConditions ? 'event/overview_sql' : 'event_sql'
+        service: !searchData.dimension ? 'event/overview_sql' : 'event_sql'
       }, searchData)
     }).then(function (res) {
       setSqlText(res.data.sql);
@@ -140,10 +125,10 @@ var EventTable = function EventTable(props) {
     if (searchData.userGroup && searchData.userGroup.length > 1) {
       seriesNames.push(base64.encode('用户群'));
     }
-    if (searchData.filterConditions && searchData.filterConditions[0].eventAttr) {
-      seriesNames.push(base64.encode(searchData.filterConditions[0].eventAttr.label));
+    if (searchData.dimension) {
+      seriesNames.push(base64.encode(getValue(searchData.dimension).label));
     }
-    if (searchData.filterConditions && !searchData.filterConditions[0].eventAttr || !searchData.filterConditions) {
+    if (searchData.id && !searchData.dimension || !searchData.id) {
       seriesNames.push(base64.encode('事件'));
     }
     var params = _objectSpread(_objectSpread({

package/es/components/topBar/index.js

@@ -17,7 +17,8 @@ var classPrefix = 'modules-event-topbar';
 var TopBar = function TopBar(props) {
   var _useContext = useContext(EventContext),
     panelId = _useContext.panelId,
-    afterEditTarget = _useContext.afterEditTarget;
+    afterEditTarget = _useContext.afterEditTarget,
+    enableAddScene = _useContext.enableAddScene;
   var _useState = useState(false),
     _useState2 = _slicedToArray(_useState, 2),
     showPanel = _useState2[0],
@@ -30,11 +31,14 @@ var TopBar = function TopBar(props) {
     currentApp = _useContext2.currentApp;
   var searchData = props.searchData,
     platformChange = props.platformChange;
-  console.log(123123, searchData);
-  var _useState5 = useState(),
+  var _useState5 = useState(searchData.platform === undefined ? 0 : searchData.platform),
     _useState6 = _slicedToArray(_useState5, 2),
-    panelType = _useState6[0],
-    setPanelType = _useState6[1];
+    selectPlatform = _useState6[0],
+    setselectPlatform = _useState6[1];
+  var _useState7 = useState(),
+    _useState8 = _slicedToArray(_useState7, 2),
+    panelType = _useState8[0],
+    setPanelType = _useState8[1];
   var closeHandle = function closeHandle(type) {
     if (type === 'panel') {
       setPanelType(undefined);
@@ -68,7 +72,7 @@ var TopBar = function TopBar(props) {
     onOk: function onOk(data) {
       return _onOk('panel', data);
     }
-  })), !panelId && /*#__PURE__*/React.createElement("div", {
+  })), enableAddScene && /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-scene")
   }, /*#__PURE__*/React.createElement(Button, {
     onClick: function onClick() {
@@ -95,9 +99,11 @@ var TopBar = function TopBar(props) {
     className: "".concat(classPrefix, "-platform")
   }, platformOption.map(function (item) {
     return /*#__PURE__*/React.createElement("div", {
+      className: "".concat(selectPlatform === item.key ? 'active' : ''),
       key: item.key,
       onClick: function onClick() {
-        return platformChange(item.key);
+        setselectPlatform(item.key);
+        platformChange(item.key);
       }
     }, item.value);
   })));

package/es/components/topBar/styles/index.less

@@ -25,7 +25,8 @@
       border: 1px solid #ecedf0;
       cursor: pointer;
     }
-    > div:hover {
+    > div:hover,
+    .active {
       z-index: 1;
       color: #165dff;
       background: #e8efff;

package/es/modules/chart/index.js

@@ -11,6 +11,7 @@ import React, { useContext, useEffect, useMemo, useState } from 'react';
 import { BizChart, BizGlobalDataContext, ajax } from '@zgfe/business-lib';
 import { EventTable, MiNone } from '../../components';
 import { judgeIsCity } from '../content/utils';
+import { getValue } from '../../modules/content/utils';
 import { getDefaultShow, getShowColor } from '../../utils/formData';
 import _ from 'lodash';
 import { Apis, chartColors } from '../../constants';
@@ -70,10 +71,10 @@ var EventChart = /*#__PURE__*/React.forwardRef(function (props, ref) {
     var chartData = ((_params$chartType = params.chartType) === null || _params$chartType === void 0 ? void 0 : _params$chartType.split(',')) || ['line'];
     var type = (chartData === null || chartData === void 0 ? void 0 : chartData.length) > 1 ? chartData[chartData.length - 1] : chartData[0];
     setChartType(props.type || type);
-    if (params.filterConditions && params.filterConditions[0]) {
-      var dimensions = params.filterConditions[0].eventAttr;
-      if (type === 'map' && dimensions && dimensions.name) {
-        setIsCity(judgeIsCity(dimensions.name));
+    if (params.id) {
+      var dimensions = params.dimension;
+      if (type === 'map' && dimensions) {
+        setIsCity(judgeIsCity(getValue(dimensions).name));
       }
     }
   }, [params, props.type]);

package/es/modules/content/index.js

@@ -25,6 +25,7 @@ var CancelToken = Request.CancelToken;
 var cancel;
 var classPrefix = 'event-content';
 var EventContent = function EventContent(props) {
+  console.log('EventContent', props);
   var _Form$useForm = Form.useForm(),
     _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
     form = _Form$useForm2[0];
@@ -52,10 +53,13 @@ var EventContent = function EventContent(props) {
     _useState12 = _slicedToArray(_useState11, 2),
     isCity = _useState12[0],
     setIsCity = _useState12[1];
+  var _useState13 = useState(-1),
+    _useState14 = _slicedToArray(_useState13, 2),
+    eventId = _useState14[0],
+    setEventId = _useState14[1];
   var _useContext = useContext(BizGlobalDataContext),
     currentApp = _useContext.currentApp;
   var _useContext2 = useContext(EventContext),
-    panelId = _useContext2.panelId,
     searchData = _useContext2.searchData,
     setSearchData = _useContext2.setSearchData;
   var _useContext3 = useContext(BizTargetFromPanelContext),
@@ -63,13 +67,41 @@ var EventContent = function EventContent(props) {
   var chartRef = useRef();
   var collapseRef = useRef();
   useEffect(function () {
-    if (props.value && props.value.filterConditions && props.value.filterConditions[0].id !== -1) {
-      setEventId(props.value.filterConditions[0].id);
+    form.resetFields();
+    if (props.defaultValue) {
+      setEventId(props.defaultValue.id);
+      var _props$defaultValue = props.defaultValue,
+        id = _props$defaultValue.id,
+        name = _props$defaultValue.name,
+        dimension = _props$defaultValue.dimension,
+        filters = _props$defaultValue.filters,
+        userGroup = _props$defaultValue.userGroup;
+      form.setFieldsValue({
+        userGroup: userGroup ? userGroup.map(function (item) {
+          return {
+            id: item
+          };
+        }) : [{
+          id: 0
+        }],
+        filterConditions: {
+          id: id,
+          name: name,
+          dimension: dimension,
+          filters: filters
+        }
+      });
+    } else {
+      form.setFieldsValue({
+        userGroup: [{
+          id: 0
+        }]
+      });
     }
-  }, []);
+  }, [props.defaultValue]);
   useEffect(function () {
-    if (searchData && searchData.filterConditions && searchData.filterConditions[0].eventAttr) {
-      var _attrName = searchData.filterConditions[0].eventAttr.name;
+    if (searchData && searchData.filterConditions && searchData.filterConditions[0].dimension) {
+      var _attrName = searchData.filterConditions[0].dimension.name;
       setEnableSelectChart(judgeIsArea(_attrName));
       setIsCity(judgeIsCity(_attrName));
     }
@@ -130,23 +162,14 @@ var EventContent = function EventContent(props) {
   var onChangeShow = function onChangeShow(data) {
     setShowList(data);
   };
-  var onFinish = function onFinish(values) {
-    console.log('onFinish', values);
-  };
-  var _useState13 = useState(-1),
-    _useState14 = _slicedToArray(_useState13, 2),
-    eventId = _useState14[0],
-    setEventId = _useState14[1];
   var onValuesChange = function onValuesChange(data) {
-    console.log('onValuesChange', data);
     var _data = {};
     if (data.filterConditions) {
       if (data.filterConditions.id !== -100) {
-        _data.filterConditions = [data.filterConditions];
-      } else {
-        _data.filterConditions = undefined;
+        _data = data.filterConditions;
+        setEventId(data.filterConditions.id);
       }
-      if (finalSearchData && finalSearchData.filterConditions && data.filterConditions.id === finalSearchData.filterConditions[0].id) {
+      if (finalSearchData && finalSearchData.id && data.filterConditions.id === finalSearchData.id) {
         ajaxFlag = false;
       }
     } else if (data.userGroup) {
@@ -161,14 +184,13 @@ var EventContent = function EventContent(props) {
     setSearchData(function (_searchData) {
       return _objectSpread(_objectSpread({}, _searchData), _data);
     });
-    if (data.event && data.event.id !== -1) {
-      setEventId(data.event.id);
-    }
   };
   var platformChange = function platformChange(data) {
     ajaxFlag = true;
     setSearchData(function (_searchData) {
-      return _objectSpread(_objectSpread({}, _searchData), data);
+      return _objectSpread(_objectSpread({}, _searchData), {}, {
+        platform: data
+      });
     });
   };
   var resetting = function resetting() {
@@ -186,18 +208,7 @@ var EventContent = function EventContent(props) {
     component: "div",
     colon: false,
     layout: "vertical",
-    onFinish: onFinish,
     scrollToFirstError: true,
-    initialValues: {
-      userGroup: searchData && searchData.userGroup ? searchData.userGroup.map(function (item) {
-        return {
-          id: item
-        };
-      }) : [{
-        id: 0
-      }],
-      filterConditions: panelId ? searchData === null || searchData === void 0 ? void 0 : searchData.filterConditions : null
-    },
     onValuesChange: onValuesChange
   }, /*#__PURE__*/React.createElement(Form.Item, {
     label: "",

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

@@ -1,6 +1,7 @@
 import { SearchValue } from '../../types';
 export declare namespace EventContentProps {
     interface Props {
+        defaultValue?: SearchValue;
         value: SearchValue;
         show?: string[];
         onSearching?: (flag: boolean) => void;

package/es/modules/content/utils.d.ts

@@ -1,2 +1,5 @@
+import { AttributeSelect } from '@zgfe/business-lib';
+import { bizAttributeSelectorValueProp } from '../../types';
 export declare const judgeIsCity: (name: string | undefined) => boolean;
 export declare const judgeIsArea: (name: string | undefined) => boolean;
+export declare const getValue: (param: bizAttributeSelectorValueProp) => AttributeSelect.Value | undefined;

package/es/modules/content/utils.js

@@ -1,3 +1,5 @@
+import { BizGlobalDataContext } from '@zgfe/business-lib';
+import { useContext } from 'react';
 export var judgeIsCity = function judgeIsCity(name) {
   var areaData = ['current_city', 'city'];
   return name && areaData.indexOf(name) !== -1 ? true : false;
@@ -5,4 +7,30 @@ export var judgeIsCity = function judgeIsCity(name) {
 export var judgeIsArea = function judgeIsArea(name) {
   var areaData = ['current_area', 'current_city', 'area', 'city'];
   return name && areaData.indexOf(name) !== -1 ? true : false;
+};
+export var getValue = function getValue(param) {
+  var _useContext = useContext(BizGlobalDataContext),
+    eventGroupList = _useContext.eventGroupList,
+    eventEnvList = _useContext.eventEnvList,
+    userPropList = _useContext.userPropList;
+  var res = undefined;
+  var key = param.propCategory === 'eventProp' ? param.value : param.propCategory + '-' + param.value;
+  if ((param === null || param === void 0 ? void 0 : param.propCategory) === 'envProp') {
+    eventEnvList === null || eventEnvList === void 0 ? void 0 : eventEnvList.forEach(function (attr) {
+      if (attr.key === key) res = attr;
+    });
+  } else if ((param === null || param === void 0 ? void 0 : param.propCategory) === 'eventProp') {
+    eventGroupList === null || eventGroupList === void 0 ? void 0 : eventGroupList.forEach(function (group) {
+      group.eventList.forEach(function (event) {
+        event.attrList.forEach(function (attr) {
+          if (attr.key === key) res = attr;
+        });
+      });
+    });
+  } else if ((param === null || param === void 0 ? void 0 : param.propCategory) === 'userProp') {
+    userPropList === null || userPropList === void 0 ? void 0 : userPropList.forEach(function (attr) {
+      if (attr.key === key) res = attr;
+    });
+  }
+  return res;
 };

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

@@ -9,7 +9,7 @@ import { DemoWrapper, setGlobalConfig } from '@zgfe/business-lib';
 import { ModuleEvent } from '../../../index';
 import { requestConfig } from '../../../utils/ajaxConfig';
 import { Button } from 'antd';
-var defaultValue = {};
+var defaultValue = null;
 export default (function () {
   var _useState = useState(false),
     _useState2 = _slicedToArray(_useState, 2),

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

@@ -10,54 +10,43 @@ import { ModuleEvent } from '../../../index';
 import { requestConfig } from '../../../utils/ajaxConfig';
 import { Button } from 'antd';
 var defaultValue = {
-  id: 243217,
-  name: '事件分析1',
+  id: 7565,
+  name: '测试6666',
   type: 0,
   enlarged: 0,
   panelId: 400900,
   panelType: 'edit',
   data: {
-    appId: 204,
     chartType: 'line',
-    platform: 0,
-    userGroup: [959, 962],
-    analysisIndex: 'number',
-    userAttr: '',
+    analysisIndex: 'per',
+    id: 7565,
+    name: '测试6666',
+    appId: 266,
+    platform: 1,
+    userGroup: [933, 935],
     time: {
       unit: 'day',
-      relative: [7, 0],
-      begin: '2023-08-03',
-      end: '2023-08-10'
+      relative: [14, 0],
+      begin: '2023-08-04',
+      end: '2023-08-18'
     },
-    filterConditions: [{
-      type: 'event',
-      alias: '崩溃',
-      id: 6606,
-      name: '崩溃',
-      eventGroupId: -1,
-      marked: false,
-      filters: {
-        relation: 'and',
-        conditions: [{
-          attrId: 142787,
-          propCategory: 'eventProp',
-          type: 1,
-          operator: 'equal',
-          values: ['com.zhuge.demo:main'],
-          dimensionSub: 'event_attr',
-          label: '异常进程名称',
-          attrName: '异常进程名称'
-        }]
-      },
-      eventAttr: {
-        id: 142787,
+    dimension: {
+      propCategory: 'eventProp',
+      value: 151045
+    },
+    filters: {
+      relation: 'and',
+      conditions: [{
+        attrId: 151045,
         propCategory: 'eventProp',
-        type: 2,
+        type: 1,
+        operator: 'equal',
+        values: ['55'],
         dimensionSub: 'event_attr',
-        label: '异常进程名称',
-        name: '异常进程名称'
-      }
-    }]
+        label: '应用名称',
+        attrName: '应用名称'
+      }]
+    }
   }
 };
 export default (function () {
@@ -87,7 +76,7 @@ export default (function () {
   };
   return /*#__PURE__*/React.createElement(DemoWrapper, {
     needMeta: true,
-    defaultApp: 204
+    defaultApp: 266
   }, 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/home/demo/scene.js

@@ -10,29 +10,26 @@ import { ModuleEvent } from '../../../index';
 import { requestConfig } from '../../../utils/ajaxConfig';
 import { Button } from 'antd';
 var defaultValue = {
-  source: 'SCENE',
   data: {
-    app_id: 177,
-    targets: [{
-      type: 'event',
-      alias: '事件概览',
-      eventId: -100,
-      eventName: '事件概览',
-      eventGroupId: 0,
-      analysisDimension: {
-        analysisIndex: 'number'
-      }
+    filterConditions: [{
+      name: '123123',
+      id: 7567
     }],
-    userGroup: [0],
+    module: 'event',
+    analysisIndex: 'number',
+    chartType: 'line',
     time: {
-      unit: 'month',
-      relative: [3, 1],
-      begin: '2022-09-27',
-      end: '2022-12-27'
+      unit: 'day',
+      end: '2023-08-17',
+      begin: '2023-08-03',
+      relative: [14, 0]
     },
-    chartType: 'line'
+    appId: 266,
+    userGroup: [0, 1039]
   },
-  chosen_data: []
+  chosen_data: [],
+  source: 'EVENT',
+  enableAddScene: false
 };
 export default (function () {
   var _useState = useState(false),
@@ -61,7 +58,7 @@ export default (function () {
   };
   return /*#__PURE__*/React.createElement(DemoWrapper, {
     needMeta: true,
-    defaultApp: 254
+    defaultApp: 266
   }, 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/home/index.js

@@ -17,6 +17,7 @@ import EventContent from '../content';
 import { chartTypes } from '../../constants';
 var classPrefix = 'event-container';
 var ModuleEvent = function ModuleEvent(props) {
+  console.log('ModuleEvent-props', props);
   var _useContext = useContext(BizGlobalDataContext),
     userGroupList = _useContext.userGroupList,
     currentApp = _useContext.currentApp;
@@ -104,12 +105,13 @@ var ModuleEvent = function ModuleEvent(props) {
       setSearchData: setSearchData,
       panelName: title,
       includeToday: props.includeToday,
-      enableAddScene: props.enableAddScene && (!props.defaultValue || props.defaultValue.source === 'EVENT'),
+      enableAddScene: props.defaultValue && props.defaultValue.enableAddScene || !props.defaultValue,
       changeLoading: changeLoading,
       afterEditTarget: props.afterEditTarget,
       onUserDrill: props.onUserDrill
     }
   }, /*#__PURE__*/React.createElement(EventContent, {
+    defaultValue: props.defaultValue ? props.defaultValue.data : null,
     value: searchData,
     show: showList,
     onChange: setSearchData,

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

@@ -3,7 +3,6 @@ export declare namespace EventProps {
     interface Props {
         defaultValue?: Value;
         includeToday?: boolean;
-        enableAddScene?: boolean;
         afterEditTarget?: (type: string, value?: any) => void;
         onUserDrill: (data: any, searchData: SearchValue) => void;
     }

package/es/types.d.ts

@@ -2,26 +2,27 @@ import { TargetConditionTypes, AttrConditionTypes, BizSelectTypes, AttributeSele
 import { DatePickerTypes } from '@zgfe/business-lib/es/datePicker/types';
 import { ReactNode } from 'react';
 export interface bizAttributeSelectorValueProp {
-    id?: number;
     propCategory?: string;
-    name?: string;
     category?: string;
-    label?: string;
-    dimensionSub?: string;
+    value?: number | string;
+    key?: number | string;
 }
 export interface eventProps {
     id?: number;
     name?: string;
     filters?: AttrConditionTypes.GroupValue;
-    eventAttr?: bizAttributeSelectorValueProp;
+    dimension?: bizAttributeSelectorValueProp;
 }
 export interface SearchValue {
+    id?: number;
+    name?: string;
     chartType?: EventChartTypes;
     userGroup?: number[];
     analysisIndex?: string;
     analysisAttr?: string;
     time?: DatePickerTypes.Value;
-    filterConditions?: eventProps[];
+    dimension?: bizAttributeSelectorValueProp;
+    filters?: AttrConditionTypes.GroupValue;
 }
 export interface SearchData {
     userGroup?: Array<BizSelectTypes.Option>;

package/es/utils/formData.js

@@ -4,6 +4,7 @@ import { chartColors } from '../constants/color';
 import { PropCategory } from '@zgfe/business-lib/es/attributeSelector/types';
 import { Tooltip } from 'antd';
 import '../style/index.less';
+import { getValue } from '../modules/content/utils';
 var classPrefix = 'event-form-data';
 export function getColumns(columnData, userGroup, searchData, showList, onShowCallback, onClickToDetailCallback) {
   var data = [{
@@ -44,13 +45,12 @@ export function getColumns(columnData, userGroup, searchData, showList, onShowCa
       }
     });
   }
-  if (searchData.filterConditions && searchData.filterConditions[0].eventAttr) {
-    var eventAttr = searchData.filterConditions[0].eventAttr;
+  if (searchData.dimension) {
     data.push({
-      title: eventAttr.label,
+      title: getValue(searchData.dimension).label,
       width: 150,
-      dataIndex: 'eventAttr',
-      key: 'eventAttr',
+      dataIndex: 'dimension',
+      key: 'dimension',
       ellipsis: true,
       render: function render(val) {
         return /*#__PURE__*/React.createElement(Tooltip, {
@@ -64,7 +64,7 @@ export function getColumns(columnData, userGroup, searchData, showList, onShowCa
       }
     });
   }
-  if (searchData.filterConditions && !searchData.filterConditions[0].eventAttr || !searchData.filterConditions) {
+  if (searchData.id && !searchData.dimension || !searchData.id) {
     data.push({
       title: '事件',
       width: 150,
@@ -184,7 +184,7 @@ export function formTableData(originalData, userGroups, attrNum, eventGroupList,
     };
     data.marked = markList[names[len - 1]];
     if (attrNum) {
-      data["eventAttr"] = haveUserGroup ? names[1] : names[0];
+      data["dimension"] = haveUserGroup ? names[1] : names[0];
     } else {
       data["eventName"] = names[0];
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zgfe/modules-event",
-  "version": "0.0.2-alpha.4",
+  "version": "0.0.2-alpha.9",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",
@@ -36,7 +36,7 @@
     "@types/lodash": "^4.14.191",
     "@umijs/fabric": "^2.8.1",
     "@umijs/test": "^3.0.5",
-    "@zgfe/business-lib": "1.1.72-event.3",
+    "@zgfe/business-lib": "1.1.76-event.0",
     "antd": "^4.22.6",
     "dumi": "^1.1.0",
     "echarts": "^5.3.2",
@@ -49,7 +49,7 @@
     "react": "^16.12.0 || ^17.0.0",
     "yorkie": "^2.0.0"
   },
-  "gitHead": "a10ec53ac2302e81df1bbc1fab795dc065008019",
+  "gitHead": "b06071e8686d8bf5d8677633a58f4d8239151ba3",
   "dependencies": {
     "react-copy-to-clipboard": "^5.1.0",
     "react-highlight": "^0.15.0"