@zgfe/modules-event 0.0.2-alpha.3 → 0.0.2-alpha.6

package/es/components/eventFilter/index.js

@@ -39,7 +39,7 @@ var EventFilter = function EventFilter(props) {
     bizAttributeSelectorValue = _useState12[0],
     setBizAttributeSelectorValue = _useState12[1];
   useEffect(function () {
-    if (props.value !== null) {
+    if (props.value) {
       var _data = props.value[0];
       setEvent({
         id: _data.id,
@@ -85,7 +85,6 @@ var EventFilter = function EventFilter(props) {
     setCount(0);
   };
   var onChangeAttr = function onChangeAttr(attr) {
-    console.log('细分属性', attr);
     if (attr === undefined) {
       setBizAttributeSelectorValue(undefined);
     } else {

package/es/components/table/index.js

@@ -67,7 +67,6 @@ var EventTable = function EventTable(props) {
     };
     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;

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,7 +31,6 @@ var TopBar = function TopBar(props) {
     currentApp = _useContext2.currentApp;
   var searchData = props.searchData,
     platformChange = props.platformChange;
-  console.log(123123, searchData);
   var _useState5 = useState(),
     _useState6 = _slicedToArray(_useState5, 2),
     panelType = _useState6[0],
@@ -68,7 +68,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() {

package/es/modules/content/index.js

@@ -55,7 +55,6 @@ var EventContent = function EventContent(props) {
   var _useContext = useContext(BizGlobalDataContext),
     currentApp = _useContext.currentApp;
   var _useContext2 = useContext(EventContext),
-    panelId = _useContext2.panelId,
     searchData = _useContext2.searchData,
     setSearchData = _useContext2.setSearchData;
   var _useContext3 = useContext(BizTargetFromPanelContext),
@@ -130,9 +129,6 @@ 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],
@@ -186,7 +182,6 @@ 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) {
@@ -196,7 +191,7 @@ var EventContent = function EventContent(props) {
       }) : [{
         id: 0
       }],
-      filterConditions: panelId ? searchData === null || searchData === void 0 ? void 0 : searchData.filterConditions : null
+      filterConditions: searchData === null || searchData === void 0 ? void 0 : searchData.filterConditions
     },
     onValuesChange: onValuesChange
   }, /*#__PURE__*/React.createElement(Form.Item, {

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/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,7 +105,7 @@ 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

package/es/modules/home/styles/index.less

@@ -2,7 +2,7 @@
   width: 100%;
   min-width: 1000px;
   height: 100%;
-  overflow: hidden;
+  background: #fafafb;
   &-header-title {
     height: 48px;
     padding: 0px 24px;

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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zgfe/modules-event",
-  "version": "0.0.2-alpha.3",
+  "version": "0.0.2-alpha.6",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",
@@ -49,7 +49,7 @@
     "react": "^16.12.0 || ^17.0.0",
     "yorkie": "^2.0.0"
   },
-  "gitHead": "8c7f23269ab76cf379ce03c0106cc4bf7fdf0c65",
+  "gitHead": "b1979977e10ced3e784c2ab74c182ffb1116db19",
   "dependencies": {
     "react-copy-to-clipboard": "^5.1.0",
     "react-highlight": "^0.15.0"