@zgfe/modules-event 0.0.2-event.35 → 0.0.2-event.36

package/es/components/eventFilter/index.js

@@ -16,7 +16,6 @@ import './styles/index.less';
 import _ from 'lodash';
 var classPrefix = 'eventfilter-box';
 var EventFilter = function EventFilter(props) {
-  console.log('EventFilter', props);
   var setSearchDisabled = props.setSearchDisabled;
   var _useContext = useContext(EventContext),
     selectEventData = _useContext.selectEventData;
@@ -89,11 +88,9 @@ var EventFilter = function EventFilter(props) {
     }, 0);
   };
   var onChangeFilters = function onChangeFilters(data) {
-    console.log('onChangeFilters', data);
     setFilter(data);
   };
   useEffect(function () {
-    console.log('onChangeFilters-count', count, filter);
     if (!judgeFilterValue(filter, count)) {
       setSearchDisabled(true);
     } else {
@@ -102,7 +99,6 @@ var EventFilter = function EventFilter(props) {
     if (count <= 0) setFilter(undefined);
   }, [count, filter]);
   var onChangeEvent = function onChangeEvent(event) {
-    console.log('onChangeEvent', event);
     if (event && event.event && event.event.id === -100) {
       setEventOverview(false);
     } else {
@@ -117,7 +113,6 @@ var EventFilter = function EventFilter(props) {
     setCount(0);
   };
   var onChangeAttr = function onChangeAttr(attr) {
-    console.log('细分属性', attr);
     if (attr === undefined) {
       setBizAttributeSelectorValue(undefined);
     } else {
@@ -144,7 +139,6 @@ var EventFilter = function EventFilter(props) {
       delete _dimension.key;
       _event.dimension = _dimension;
     }
-    console.log('变更searchData', _event);
     props.onChange && props.onChange(_event);
   }, [bizAttributeSelectorValue, filter, event]);
   return /*#__PURE__*/React.createElement("div", {
@@ -169,7 +163,8 @@ var EventFilter = function EventFilter(props) {
     onChange: onChangeAttr,
     onDelete: function onDelete() {
       onChangeAttr(undefined);
-    }
+    },
+    placeholder: "\u8BF7\u9009\u62E9\u7EC6\u5206\u5C5E\u6027"
   }), /*#__PURE__*/React.createElement(Tooltip, {
     placement: "top",
     title: '添加属性筛选'

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

@@ -4,7 +4,7 @@
     margin-bottom: 12px;
     .biz-event-select,
     .biz-attr-select {
-      width: 184px;
+      width: 208px;
       margin-right: 16px;
     }
     .shaixuan {

package/es/components/renderContent/index.js

@@ -35,7 +35,6 @@ var ContentPanel = function ContentPanel(props) {
       indicator: /*#__PURE__*/React.createElement(MiSpin, null)
     });
   }
-  console.log('hhhh', searchData);
   return /*#__PURE__*/React.createElement("div", {
     className: classPrefix
   }, /*#__PURE__*/React.createElement("div", {

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

@@ -6,7 +6,7 @@
     align-items: center;
     justify-content: center;
     height: 368px;
-    padding: @padding-lg @padding-md;
+    padding: @padding-lg;
     border: 1px solid @border-color-base;
     border-radius: @border-radius-normal;
 

package/es/components/searchPanel/index.js

@@ -25,9 +25,6 @@ var SearchPanel = function SearchPanel(props) {
     _useState4 = _slicedToArray(_useState3, 2),
     chart = _useState4[0],
     setChart = _useState4[1];
-  useEffect(function () {
-    console.log('当前图表类型', chart);
-  }, [chart]);
   var _useState5 = useState(0),
     _useState6 = _slicedToArray(_useState5, 2),
     timer = _useState6[0],
@@ -94,7 +91,6 @@ var SearchPanel = function SearchPanel(props) {
       chartType: chart.value
     }, data));
   };
-  console.log('BizTargetDimension', props.eventId);
   return /*#__PURE__*/React.createElement("div", {
     className: classPrefix
   }, /*#__PURE__*/React.createElement("div", {

package/es/components/table/index.js

@@ -64,7 +64,6 @@ var EventTable = function EventTable(props) {
   useEffect(function () {
     var gLen = (searchData === null || searchData === void 0 ? void 0 : searchData.dimension) ? 1 : 0;
     var _data = formTableData(dataSource, searchData.userGroup || [0], gLen);
-    console.log(111, _data);
     setTotal(_data.length);
     setTableData(_data);
   }, []);
@@ -166,7 +165,6 @@ var EventTable = function EventTable(props) {
     });
   };
   var pageChange = function pageChange(page, pageSize) {
-    console.log('切页码', page, pageSize);
     setCurrent(page);
     setPageSize(pageSize);
   };
@@ -193,9 +191,6 @@ var EventTable = function EventTable(props) {
     renderEmpty: tableEmptyRender
   }, /*#__PURE__*/React.createElement(Table, {
     className: "table",
-    scroll: {
-      y: '380px'
-    },
     rowKey: 'id',
     columns: columns,
     dataSource: tableData,

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

@@ -4,9 +4,11 @@
     display: flex;
     justify-content: space-between;
     height: 50px;
+    margin-bottom: -1px;
     padding: 0 12px;
     line-height: 50px;
     background: #fafafb;
+    border: 1px solid #e6e7ea;
     border-radius: 8px 8px 0 0;
     > :nth-child(2) {
       display: flex;
@@ -20,6 +22,7 @@
         line-height: 32px;
         background: #fff;
         border: 1px solid #f2f3f4;
+        border-radius: 4px;
         cursor: pointer;
         .xiazai1 {
           margin-right: 4px;
@@ -27,11 +30,24 @@
           vertical-align: -2px;
         }
       }
+      div:hover {
+        color: #165dff;
+        background: #e8efff;
+      }
+      div:active {
+        color: #1454e5;
+        background: #e8efff;
+      }
     }
   }
   .ant-table {
+    max-height: 550px;
+    overflow: auto;
     border-radius: 0 0 8px 8px;
   }
+  .ant-pagination {
+    margin-top: 24px !important;
+  }
   .ant-table
     .ant-table-thead
     .ant-table-cell.ant-table-column-has-sorters
@@ -48,14 +64,17 @@
   }
   .tooltip-name-box {
     display: flex;
-    justify-content: space-between;
     &-market {
       display: flex;
+      margin-right: 8px;
       cursor: pointer;
       .shoucang {
         color: #fd9f41;
         font-size: 16px !important;
       }
+      .notshoucang {
+        opacity: 0;
+      }
     }
 
     .fuzhi1 {
@@ -122,9 +141,14 @@
     width: 100%;
     height: auto;
   }
+  pre {
+    margin-bottom: 0;
+  }
   .hljs {
     padding: 16px;
+    padding-bottom: 0;
     background: #fafafb;
+    border-radius: 8px;
   }
   .copy-box {
     position: absolute;
@@ -137,4 +161,12 @@
       margin-right: 8px;
     }
   }
+  .copy-box:hover {
+    color: #165dff;
+    background: #e8efff;
+  }
+  .copy-box:active {
+    color: #1454e5;
+    background: #e8efff;
+  }
 }

package/es/modules/chart/index.js

@@ -21,7 +21,6 @@ import { Spin } from 'antd';
 import emptyImg from '../../style/image/empty.png';
 var classPrefix = 'event-mi-table';
 var EventChart = function EventChart(props) {
-  console.log('EventChart6', props);
   var params = props.params;
   var _useState = useState(false),
     _useState2 = _slicedToArray(_useState, 2),
@@ -73,7 +72,6 @@ var EventChart = function EventChart(props) {
     if (!props.dataSource) {
       type = (chartData === null || chartData === void 0 ? void 0 : chartData.length) > 1 ? chartData[chartData.length - 1] : chartData[0];
     }
-    console.log('更新图表-params', props.type, type, params);
     setChartType(props.type || type);
     if (params.id) {
       var dimensions = params.dimension;
@@ -99,7 +97,6 @@ var EventChart = function EventChart(props) {
         return;
       }
       var _data = params.dimension ? res.data : getChartDataEventAliasName(res.data, eventGroupList, params.userGroup.length);
-      console.log('chartData?.length-2', _data);
       if (params.userGroup.length > 1) {
         setDataSource(getUserGroupsCompareData(_data));
       } else {
@@ -147,7 +144,6 @@ var EventChart = function EventChart(props) {
         src: emptyImg
       }), /*#__PURE__*/React.createElement("p", null, "\u6682\u65E0\u6570\u636E"));
     } else {
-      console.log('chartBox渲染BizChart', chartType);
       return /*#__PURE__*/React.createElement("div", {
         className: "".concat(classPrefix, "-chart-box")
       }, dataUpdateTime(), /*#__PURE__*/React.createElement(BizChart, {

package/es/modules/content/index.js

@@ -24,7 +24,6 @@ var CancelToken = Request.CancelToken;
 var cancel;
 var classPrefix = 'event-content';
 var EventContent = function EventContent(props) {
-  console.log('EventContent', props);
   var _useState = useState(props.value),
     _useState2 = _slicedToArray(_useState, 2),
     finalSearchData = _useState2[0],

package/es/modules/content/utils.js

@@ -23,7 +23,6 @@ export var judgeIsCity = function judgeIsCity(name) {
   return name && areaData.indexOf(name) !== -1 ? true : false;
 };
 export var judgeIsArea = function judgeIsArea(name) {
-  console.log('地图是否可选', name);
   var areaData = ['current_area', 'current_city', 'area', 'city'];
   return name && areaData.indexOf(name) !== -1 ? true : false;
 };
@@ -47,7 +46,6 @@ export var getValue = function getValue(param, eventGroupList, eventEnvList, use
       if (attr.key === key) res = attr;
     });
   }
-  console.log('获取当前属性的全部数据', res);
   return res;
 };
 export var getNumberPanelData = function getNumberPanelData(data) {

package/es/modules/home/index.js

@@ -24,7 +24,6 @@ var ModuleEvent = function ModuleEvent(props) {
     eventEnvList = _useContext.eventEnvList,
     userPropList = _useContext.userPropList,
     userGroupList = _useContext.userGroupList;
-  console.log('BizGlobalDataContext', eventGroupList, eventEnvList, userPropList);
   var _useState = useState(),
     _useState2 = _slicedToArray(_useState, 2),
     searchData = _useState2[0],
@@ -84,7 +83,6 @@ var ModuleEvent = function ModuleEvent(props) {
     });
   };
   var onSelectEvent = function onSelectEvent(id, name) {
-    console.log('onSelectEvent', id, name, searchData);
     if ((searchData === null || searchData === void 0 ? void 0 : searchData.id) === undefined) {
       setSelectEventData({
         analysisIndex: searchData === null || searchData === void 0 ? void 0 : searchData.analysisIndex,

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

@@ -41,4 +41,9 @@
   .biz-layout-panel-content {
     height: auto;
   }
+
+  .biz-layout-collapse-container {
+    align-items: center;
+    height: 24px;
+  }
 }

package/es/modules/topPanel/index.js

@@ -11,7 +11,6 @@ import EventFilter from '../../components/eventFilter';
 import './styles/index.less';
 var classPrefix = 'top-panel';
 var TopPanel = /*#__PURE__*/React.forwardRef(function (props, ref) {
-  console.log('TopPanel-props', props);
   var value = props.value,
     ajaxFlag = props.ajaxFlag,
     finalSearchData = props.finalSearchData,
@@ -46,7 +45,6 @@ var TopPanel = /*#__PURE__*/React.forwardRef(function (props, ref) {
         ajaxFlag = true;
       }
     }
-    console.log('用户组和事件变更-2', _data);
     props.onChange(_data, ajaxFlag);
   };
   var resetting = function resetting() {
@@ -88,6 +86,7 @@ var TopPanel = /*#__PURE__*/React.forwardRef(function (props, ref) {
   })), /*#__PURE__*/React.createElement("div", {
     ref: ref
   }, /*#__PURE__*/React.createElement(Form.Item, {
+    className: "".concat(classPrefix, "-event-hover"),
     label: "\u4E8B\u4EF6",
     name: "filterConditions",
     style: {

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

@@ -2,7 +2,7 @@
   &-form-botton-box {
     display: flex;
     justify-content: flex-end;
-    margin-top: 24px;
+    margin-top: -12px;
     margin-right: 24px;
     > :nth-child(1) {
       margin-right: 16px;
@@ -11,4 +11,11 @@
       border-color: #29bd52;
     }
   }
+  &-event-hover {
+    margin-top: -12px;
+    padding-top: 6px;
+  }
+  &-event-hover:hover {
+    background: #e8efff;
+  }
 }

package/es/utils/formData.js

@@ -82,14 +82,17 @@ export function getColumns(eventGroupList, userPropList, eventEnvList, columnDat
   }
   if (searchData.id && !searchData.dimension || !searchData.id) {
     data.push({
-      title: '事件',
+      title: /*#__PURE__*/React.createElement("div", {
+        style: {
+          paddingLeft: '16px'
+        }
+      }, "\u4E8B\u4EF6"),
       width: 150,
       dataIndex: 'eventName',
       key: 'eventName',
       ellipsis: true,
       fixed: true,
       render: function render(val) {
-        console.log('事件', val, eventGroupList);
         var _val = val;
         return /*#__PURE__*/React.createElement(Tooltip, {
           className: "tooltip-name-box",
@@ -99,8 +102,9 @@ export function getColumns(eventGroupList, userPropList, eventEnvList, columnDat
           onClick: function onClick() {
             onSelectEvent && onSelectEvent(getEventAliasId(val, eventGroupList), val);
           }
-        }, marketEventNameList.indexOf(_val) !== -1 && /*#__PURE__*/React.createElement(IconFont, {
-          type: "shoucang"
+        }, /*#__PURE__*/React.createElement(IconFont, {
+          type: "shoucang",
+          className: "".concat(marketEventNameList.indexOf(_val) === -1 ? 'notshoucang' : '')
         }), util.strMiddleSplit(_val, {
           maxLength: 20,
           beginLength: 10,
@@ -168,7 +172,6 @@ export function getChartDataEventAliasName(dataSource, eventGroupList, userGroup
     series.push(item);
   });
   data.series = series;
-  console.log('getChartDataEventAliasName', data, dataSource);
   return data;
 }
 export function getEventAliasName(name, eventGroupList) {
@@ -220,7 +223,6 @@ export function marketEventGroupList(eventGroupList) {
       if (_item.marked) _marketName.push(_item.name);
     });
   });
-  console.log(666, _marketName);
   return _marketName;
 }
 export function getWarningId(searchData, eventData, eventGroupList) {

package/package.json

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