@zgfe/modules-event 0.0.2-event.72 → 0.0.2-event.75

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

@@ -1,7 +1,7 @@
 .eventfilter-box {
   > :nth-child(1) {
     display: flex;
-    margin-bottom: 12px;
+    margin-bottom: 4px;
     padding: 4px 0 4px 24px;
     .biz-event-select,
     .biz-attr-select {

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

@@ -5,6 +5,7 @@
   }
   &-table-header {
     display: flex;
+    align-items: center;
     justify-content: space-between;
     height: 50px;
     margin-bottom: -1px;
@@ -15,7 +16,6 @@
     border-radius: 8px 8px 0 0;
     > :nth-child(2) {
       display: flex;
-      margin-top: 9px;
       > :nth-child(1) {
         margin-right: 16px;
       }

package/es/components/topBar/index.js

@@ -100,7 +100,7 @@ var TopBar = function TopBar(props) {
       module: 'event'
     }, searchData),
     styleOptions: options,
-    showList: showList,
+    showList: (searchData === null || searchData === void 0 ? void 0 : searchData.chartType) !== 'map' ? showList : [],
     onCancel: function onCancel() {
       return closeHandle('panel');
     },

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

@@ -8,6 +8,7 @@
   &-panel {
     margin-right: 16px;
     .ant-btn {
+      background: #fff;
       border-color: #f2f3f4;
     }
     .ant-btn:hover {
@@ -17,6 +18,7 @@
   &-scene {
     margin-right: 16px;
     .ant-btn {
+      background: #fff;
       border-color: #f2f3f4;
     }
     .ant-btn:hover {

package/es/modules/chart/index.js

@@ -158,8 +158,7 @@ var EventChart = /*#__PURE__*/React.forwardRef(function (props, ref) {
         colors: showColors,
         xRotate: chartType === 'bar' && dataSource.series.length > 5 ? 40 : 0,
         reverseXAxis: chartType === 'bar',
-        isCity: isCity,
-        radius: ['30%', '75%']
+        isCity: isCity
       }));
     }
   };

package/es/modules/content/index.js

@@ -146,7 +146,11 @@ var EventContent = function EventContent(props) {
     ajaxFlag = flag;
     data.id ? setEventId(data.id) : setEventId(-1);
     setSearchData(function (_searchData) {
-      var _data = _objectSpread(_objectSpread({}, _searchData), data);
+      console.log(666, _searchData, data);
+      var _data = _objectSpread(_objectSpread({}, _searchData), {}, {
+        dimension: data.dimension,
+        filters: data.filters
+      }, data);
       if (_data.dimension) {
         var _getValue;
         var _attrName = (_getValue = getValue(_data.dimension, eventGroupList, eventEnvList, userPropList)) === null || _getValue === void 0 ? void 0 : _getValue.name;

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

@@ -9,33 +9,33 @@ import { DemoWrapper, setGlobalConfig } from '@zgfe/business-lib';
 import { ModuleEvent } from '../../../index';
 import { requestConfig } from '../../../utils/ajaxConfig';
 import { Button } from 'antd';
-var defaultValue = {
+var defaultValue2 = {
   enlarged: 0,
-  id: 2526,
+  id: 2551,
   isPerfect: 1,
-  name: '事件分析',
+  name: '省市000',
   reqParam: {
     data: {
-      app_id: 251,
+      appId: 251,
+      platform: 0,
       module: 'event',
+      userGroup: [0],
       time: {
-        begin: '2023-09-16',
-        end: '2023-09-23',
+        begin: '2023-09-17',
+        end: '2023-09-24',
         relative: [7, 0],
         unit: 'day'
       },
-      analysisIndex: 'number',
       chartType: 'map',
-      id: 16818,
-      name: 'click',
+      id: 16816,
+      name: '加购商品',
       dimension: {
         propCategory: 'envProp',
         category: 'fixed',
         value: 'area',
         id: 0
       },
-      userGroup: [0],
-      appId: 251
+      analysisIndex: 'number'
     },
     chosen_data: []
   },
@@ -43,31 +43,31 @@ var defaultValue = {
   unExistEvent: '',
   renderType: 'normal',
   source: 'PANEL',
-  panelId: 286,
+  panelId: 342,
   panelType: 'edit',
   data: {
-    app_id: 251,
+    appId: 251,
+    platform: 0,
     module: 'event',
+    userGroup: [0],
     time: {
-      begin: '2023-09-16',
-      end: '2023-09-23',
+      begin: '2023-09-17',
+      end: '2023-09-24',
       relative: [7, 0],
       unit: 'day'
     },
-    analysisIndex: 'number',
     chartType: 'map',
-    id: 16818,
-    name: 'click',
+    id: 16816,
+    name: '加购商品',
     dimension: {
       propCategory: 'envProp',
       category: 'fixed',
       value: 'area',
       id: 0
     },
-    userGroup: [0],
-    appId: 251
+    analysisIndex: 'number'
   },
-  chosen_data: []
+  chosen_data: ['北京市']
 };
 export default (function () {
   var _useState = useState(false),
@@ -78,7 +78,7 @@ export default (function () {
     _useState4 = _slicedToArray(_useState3, 2),
     detailParams = _useState4[0],
     setDetailParams = _useState4[1];
-  var _useState5 = useState(defaultValue),
+  var _useState5 = useState(defaultValue2),
     _useState6 = _slicedToArray(_useState5, 2),
     searchParams = _useState6[0],
     setSearchParams = _useState6[1];

package/es/modules/topPanel/index.js

@@ -24,6 +24,7 @@ var TopPanel = /*#__PURE__*/React.forwardRef(function (props, ref) {
     form = _Form$useForm2[0];
   var userGroup = value.userGroup;
   var onValuesChange = function onValuesChange(data, allData) {
+    console.log('用户组和事件变更', data, allData);
     var _data = {};
     if (allData.filterConditions) {
       if (allData.filterConditions.id !== -100) {

package/es/utils/formData.js

@@ -59,24 +59,27 @@ export function getColumns(eventGroupList, userPropList, eventEnvList, columnDat
       ellipsis: true,
       fixed: true,
       render: function render(val) {
-        return /*#__PURE__*/React.createElement(Tooltip, {
-          className: "tooltip-name-box",
+        return /*#__PURE__*/React.createElement("div", {
+          className: "tooltip-name-box"
+        }, /*#__PURE__*/React.createElement(Tooltip, {
           title: val
         }, /*#__PURE__*/React.createElement("div", {
           className: "tooltip-name-box-market"
         }, util.strMiddleSplit(val, {
-          maxLength: 20,
-          beginLength: 10,
-          endLength: 6,
+          maxLength: 9,
+          beginLength: 9,
+          endLength: 0,
           replaceStr: '...'
-        })), /*#__PURE__*/React.createElement(CopyToClipboard, {
+        }))), /*#__PURE__*/React.createElement(Tooltip, {
+          title: "\u590D\u5236"
+        }, /*#__PURE__*/React.createElement(CopyToClipboard, {
           text: val,
           onCopy: function onCopy() {
             return message.success('复制成功！');
           }
         }, /*#__PURE__*/React.createElement(IconFont, {
           type: "fuzhi1"
-        })));
+        }))));
       }
     });
   }
@@ -94,8 +97,9 @@ export function getColumns(eventGroupList, userPropList, eventEnvList, columnDat
       fixed: true,
       render: function render(val) {
         var _val = val;
-        return /*#__PURE__*/React.createElement(Tooltip, {
-          className: "tooltip-name-box",
+        return /*#__PURE__*/React.createElement("div", {
+          className: "tooltip-name-box"
+        }, /*#__PURE__*/React.createElement(Tooltip, {
           title: _val
         }, /*#__PURE__*/React.createElement("div", {
           className: "tooltip-name-box-market",
@@ -106,18 +110,20 @@ export function getColumns(eventGroupList, userPropList, eventEnvList, columnDat
           type: "shoucang",
           className: "".concat(marketEventNameList.indexOf(_val) === -1 ? 'notshoucang' : '')
         }), util.strMiddleSplit(_val, {
-          maxLength: 20,
-          beginLength: 10,
-          endLength: 6,
+          maxLength: 9,
+          beginLength: 9,
+          endLength: 0,
           replaceStr: '...'
-        })), /*#__PURE__*/React.createElement(CopyToClipboard, {
+        }))), /*#__PURE__*/React.createElement(Tooltip, {
+          title: "\u590D\u5236"
+        }, /*#__PURE__*/React.createElement(CopyToClipboard, {
           text: _val,
           onCopy: function onCopy() {
             return message.success('复制成功！');
           }
         }, /*#__PURE__*/React.createElement(IconFont, {
           type: "fuzhi1"
-        })));
+        }))));
       }
     });
   }

package/package.json

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