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

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (7) hide show
  1. package/es/components/eventFilter/styles/index.less +1 -1
  2. package/es/components/table/styles/index.less +1 -1
  3. package/es/components/topBar/styles/index.less +2 -0
  4. package/es/modules/content/index.js +5 -1
  5. package/es/modules/topPanel/index.js +1 -0
  6. package/es/utils/formData.js +20 -14
  7. package/package.json +2 -2
package/es/components/eventFilter/styles/index.less CHANGED
@@ -1,7 +1,7 @@
1
1
  .eventfilter-box {
2
2
  > :nth-child(1) {
3
3
  display: flex;
4
- margin-bottom: 12px;
4
+ margin-bottom: 4px;
5
5
  padding: 4px 0 4px 24px;
6
6
  .biz-event-select,
7
7
  .biz-attr-select {
package/es/components/table/styles/index.less CHANGED
@@ -5,6 +5,7 @@
5
5
  }
6
6
  &-table-header {
7
7
  display: flex;
8
+ align-items: center;
8
9
  justify-content: space-between;
9
10
  height: 50px;
10
11
  margin-bottom: -1px;
@@ -15,7 +16,6 @@
15
16
  border-radius: 8px 8px 0 0;
16
17
  > :nth-child(2) {
17
18
  display: flex;
18
- margin-top: 9px;
19
19
  > :nth-child(1) {
20
20
  margin-right: 16px;
21
21
  }
package/es/components/topBar/styles/index.less CHANGED
@@ -8,6 +8,7 @@
8
8
  &-panel {
9
9
  margin-right: 16px;
10
10
  .ant-btn {
11
+ background: #fff;
11
12
  border-color: #f2f3f4;
12
13
  }
13
14
  .ant-btn:hover {
@@ -17,6 +18,7 @@
17
18
  &-scene {
18
19
  margin-right: 16px;
19
20
  .ant-btn {
21
+ background: #fff;
20
22
  border-color: #f2f3f4;
21
23
  }
22
24
  .ant-btn:hover {
package/es/modules/content/index.js CHANGED
@@ -146,7 +146,11 @@ var EventContent = function EventContent(props) {
146
146
  ajaxFlag = flag;
147
147
  data.id ? setEventId(data.id) : setEventId(-1);
148
148
  setSearchData(function (_searchData) {
149
- var _data = _objectSpread(_objectSpread({}, _searchData), data);
149
+ console.log(666, _searchData, data);
150
+ var _data = _objectSpread(_objectSpread({}, _searchData), {}, {
151
+ dimension: data.dimension,
152
+ filters: data.filters
153
+ }, data);
150
154
  if (_data.dimension) {
151
155
  var _getValue;
152
156
  var _attrName = (_getValue = getValue(_data.dimension, eventGroupList, eventEnvList, userPropList)) === null || _getValue === void 0 ? void 0 : _getValue.name;
package/es/modules/topPanel/index.js CHANGED
@@ -24,6 +24,7 @@ var TopPanel = /*#__PURE__*/React.forwardRef(function (props, ref) {
24
24
  form = _Form$useForm2[0];
25
25
  var userGroup = value.userGroup;
26
26
  var onValuesChange = function onValuesChange(data, allData) {
27
+ console.log('用户组和事件变更', data, allData);
27
28
  var _data = {};
28
29
  if (allData.filterConditions) {
29
30
  if (allData.filterConditions.id !== -100) {
package/es/utils/formData.js CHANGED
@@ -59,24 +59,27 @@ export function getColumns(eventGroupList, userPropList, eventEnvList, columnDat
59
59
  ellipsis: true,
60
60
  fixed: true,
61
61
  render: function render(val) {
62
- return /*#__PURE__*/React.createElement(Tooltip, {
63
- className: "tooltip-name-box",
62
+ return /*#__PURE__*/React.createElement("div", {
63
+ className: "tooltip-name-box"
64
+ }, /*#__PURE__*/React.createElement(Tooltip, {
64
65
  title: val
65
66
  }, /*#__PURE__*/React.createElement("div", {
66
67
  className: "tooltip-name-box-market"
67
68
  }, util.strMiddleSplit(val, {
68
- maxLength: 20,
69
- beginLength: 10,
70
- endLength: 6,
69
+ maxLength: 9,
70
+ beginLength: 9,
71
+ endLength: 0,
71
72
  replaceStr: '...'
72
- })), /*#__PURE__*/React.createElement(CopyToClipboard, {
73
+ }))), /*#__PURE__*/React.createElement(Tooltip, {
74
+ title: "\u590D\u5236"
75
+ }, /*#__PURE__*/React.createElement(CopyToClipboard, {
73
76
  text: val,
74
77
  onCopy: function onCopy() {
75
78
  return message.success('复制成功！');
76
79
  }
77
80
  }, /*#__PURE__*/React.createElement(IconFont, {
78
81
  type: "fuzhi1"
79
- })));
82
+ }))));
80
83
  }
81
84
  });
82
85
  }
@@ -94,8 +97,9 @@ export function getColumns(eventGroupList, userPropList, eventEnvList, columnDat
94
97
  fixed: true,
95
98
  render: function render(val) {
96
99
  var _val = val;
97
- return /*#__PURE__*/React.createElement(Tooltip, {
98
- className: "tooltip-name-box",
100
+ return /*#__PURE__*/React.createElement("div", {
101
+ className: "tooltip-name-box"
102
+ }, /*#__PURE__*/React.createElement(Tooltip, {
99
103
  title: _val
100
104
  }, /*#__PURE__*/React.createElement("div", {
101
105
  className: "tooltip-name-box-market",
@@ -106,18 +110,20 @@ export function getColumns(eventGroupList, userPropList, eventEnvList, columnDat
106
110
  type: "shoucang",
107
111
  className: "".concat(marketEventNameList.indexOf(_val) === -1 ? 'notshoucang' : '')
108
112
  }), util.strMiddleSplit(_val, {
109
- maxLength: 20,
110
- beginLength: 10,
111
- endLength: 6,
113
+ maxLength: 9,
114
+ beginLength: 9,
115
+ endLength: 0,
112
116
  replaceStr: '...'
113
- })), /*#__PURE__*/React.createElement(CopyToClipboard, {
117
+ }))), /*#__PURE__*/React.createElement(Tooltip, {
118
+ title: "\u590D\u5236"
119
+ }, /*#__PURE__*/React.createElement(CopyToClipboard, {
114
120
  text: _val,
115
121
  onCopy: function onCopy() {
116
122
  return message.success('复制成功！');
117
123
  }
118
124
  }, /*#__PURE__*/React.createElement(IconFont, {
119
125
  type: "fuzhi1"
120
- })));
126
+ }))));
121
127
  }
122
128
  });
123
129
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@zgfe/modules-event",
3
- "version": "0.0.2-event.74",
3
+ "version": "0.0.2-event.75",
4
4
  "scripts": {
5
5
  "start": "dumi dev",
6
6
  "docs:build": "dumi build",
@@ -49,7 +49,7 @@
49
49
  "react": "^16.12.0 || ^17.0.0",
50
50
  "yorkie": "^2.0.0"
51
51
  },
52
- "gitHead": "86b1e95cb4b38c97ca585daeafde6f8b147ac750",
52
+ "gitHead": "bcf47f0e0dec3bc95fc1f23c0406a9f680936783",
53
53
  "dependencies": {
54
54
  "react-copy-to-clipboard": "^5.1.0",
55
55
  "react-highlight": "^0.15.0"