@zgfe/modules-event 1.0.29-zhongyuan.0 → 1.0.29-zhongyuan.3

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.
@@ -1,33 +1,33 @@
1
- /*滚动条凹槽的颜色,还可以设置边框属性 */
2
- ::-webkit-scrollbar-track-piece {
3
- background-color: #fff;
4
- -webkit-border-radius: 10px;
5
- -moz-border-radius: 10px;
6
- border-radius: 10px;
7
- }
8
-
9
- /*滚动条的宽度*/
10
- ::-webkit-scrollbar {
11
- width: 10px;
12
- height: 10px;
13
- }
14
-
15
- /*滚动条的设置*/
16
- ::-webkit-scrollbar-thumb {
17
- background-color: #cacdd4;
18
- background-clip: padding-box;
19
- border: 2px solid #fff;
20
- -webkit-border-radius: 10px;
21
- -moz-border-radius: 10px;
22
- border-radius: 10px;
23
- }
24
-
25
- /*滚动条鼠标移上去*/
26
- ::-webkit-scrollbar-thumb:hover {
27
- // background-color: #bbb;
28
- }
29
-
30
- ::-webkit-scrollbar-track-piece {
31
- width: 6px;
32
- height: 6px;
33
- }
1
+ /*滚动条凹槽的颜色,还可以设置边框属性 */
2
+ ::-webkit-scrollbar-track-piece {
3
+ background-color: #fff;
4
+ -webkit-border-radius: 10px;
5
+ -moz-border-radius: 10px;
6
+ border-radius: 10px;
7
+ }
8
+
9
+ /*滚动条的宽度*/
10
+ ::-webkit-scrollbar {
11
+ width: 10px;
12
+ height: 10px;
13
+ }
14
+
15
+ /*滚动条的设置*/
16
+ ::-webkit-scrollbar-thumb {
17
+ background-color: #cacdd4;
18
+ background-clip: padding-box;
19
+ border: 2px solid #fff;
20
+ -webkit-border-radius: 10px;
21
+ -moz-border-radius: 10px;
22
+ border-radius: 10px;
23
+ }
24
+
25
+ /*滚动条鼠标移上去*/
26
+ ::-webkit-scrollbar-thumb:hover {
27
+ // background-color: #bbb;
28
+ }
29
+
30
+ ::-webkit-scrollbar-track-piece {
31
+ width: 6px;
32
+ height: 6px;
33
+ }
@@ -1,49 +1,49 @@
1
- .event-module-container {
2
- width: 100%;
3
- min-width: 1000px;
4
- height: 100% !important;
5
- background: #fafafb;
6
- &-header-title {
7
- height: 48px;
8
- padding: 0px 16px;
9
- color: #021429;
10
- font-weight: 500;
11
- font-size: 16px;
12
- line-height: 48px;
13
- background: #fff;
14
- }
15
- .biz-layout-top {
16
- margin-top: 2px;
17
- padding: 0 16px 16px;
18
- .biz-user-group-header {
19
- .ant-space-item {
20
- color: #5f6085;
21
- }
22
- }
23
- }
24
- .ant-spin-container {
25
- width: 100%;
26
- height: 100%;
27
- }
28
-
29
- .biz-select-option:not(.biz-select-option-multiple),
30
- .biz-attr-select-option {
31
- &.active {
32
- background: @primary-color !important;
33
- }
34
- }
35
-
36
- // 设置下拉框最大高度
37
- .biz-select-overlay {
38
- max-height: 300px;
39
- }
40
-
41
- .biz-layout-panel-content {
42
- height: auto;
43
- }
44
-
45
- .biz-layout-collapse-container {
46
- align-items: center;
47
- height: 24px;
48
- }
49
- }
1
+ .event-module-container {
2
+ width: 100%;
3
+ min-width: 1000px;
4
+ height: 100% !important;
5
+ background: #fafafb;
6
+ &-header-title {
7
+ height: 48px;
8
+ padding: 0px 16px;
9
+ color: #021429;
10
+ font-weight: 500;
11
+ font-size: 16px;
12
+ line-height: 48px;
13
+ background: #fff;
14
+ }
15
+ .biz-layout-top {
16
+ margin-top: 2px;
17
+ padding: 0 16px 16px;
18
+ .biz-user-group-header {
19
+ .ant-space-item {
20
+ color: #5f6085;
21
+ }
22
+ }
23
+ }
24
+ .ant-spin-container {
25
+ width: 100%;
26
+ height: 100%;
27
+ }
28
+
29
+ .biz-select-option:not(.biz-select-option-multiple),
30
+ .biz-attr-select-option {
31
+ &.active {
32
+ background: @primary-color !important;
33
+ }
34
+ }
35
+
36
+ // 设置下拉框最大高度
37
+ .biz-select-overlay {
38
+ max-height: 300px;
39
+ }
40
+
41
+ .biz-layout-panel-content {
42
+ height: auto;
43
+ }
44
+
45
+ .biz-layout-collapse-container {
46
+ align-items: center;
47
+ height: 24px;
48
+ }
49
+ }
@@ -1,50 +1,50 @@
1
- .modules-event-top-panel {
2
- &-form-event {
3
- margin-bottom: 0;
4
- & .ant-form-item-label {
5
- padding-left: 24px !important;
6
- font-weight: 500;
7
- }
8
- &-select {
9
- width: 208px;
10
- margin-left: 24px;
11
- .biz-select-handle-input {
12
- padding-left: 12px;
13
- }
14
- }
15
- .ant-form-item-row .ant-form-item-control {
16
- margin-bottom: 24px;
17
- padding: 4px 0;
18
- }
19
- .ant-form-item-explain-error {
20
- padding-left: 24px;
21
- }
22
- }
23
- &-form-botton-box {
24
- display: flex;
25
- justify-content: flex-end;
26
- margin-right: 24px;
27
- > :nth-child(1) {
28
- margin-right: 16px;
29
- color: #fff;
30
- background-color: #29bd52;
31
- border-color: #29bd52;
32
- }
33
- }
34
-
35
- &-label-hasIcon {
36
- .bsicon {
37
- cursor: pointer;
38
- }
39
- }
40
- }
41
- .hoverable-form-item {
42
- .ant-form-item-control {
43
- &:hover {
44
- background: #e8efff !important;
45
- }
46
- }
47
- }
48
- .event---1 .ant-form-item-label {
49
- padding-bottom: 4px !important;
50
- }
1
+ .modules-event-top-panel {
2
+ &-form-event {
3
+ margin-bottom: 0;
4
+ & .ant-form-item-label {
5
+ padding-left: 24px !important;
6
+ font-weight: 500;
7
+ }
8
+ &-select {
9
+ width: 208px;
10
+ margin-left: 24px;
11
+ .biz-select-handle-input {
12
+ padding-left: 12px;
13
+ }
14
+ }
15
+ .ant-form-item-row .ant-form-item-control {
16
+ margin-bottom: 24px;
17
+ padding: 4px 0;
18
+ }
19
+ .ant-form-item-explain-error {
20
+ padding-left: 24px;
21
+ }
22
+ }
23
+ &-form-botton-box {
24
+ display: flex;
25
+ justify-content: flex-end;
26
+ margin-right: 24px;
27
+ > :nth-child(1) {
28
+ margin-right: 16px;
29
+ color: #fff;
30
+ background-color: #29bd52;
31
+ border-color: #29bd52;
32
+ }
33
+ }
34
+
35
+ &-label-hasIcon {
36
+ .bsicon {
37
+ cursor: pointer;
38
+ }
39
+ }
40
+ }
41
+ .hoverable-form-item {
42
+ .ant-form-item-control {
43
+ &:hover {
44
+ background: #e8efff !important;
45
+ }
46
+ }
47
+ }
48
+ .event---1 .ant-form-item-label {
49
+ padding-bottom: 4px !important;
50
+ }
@@ -1,9 +1,9 @@
1
- <?xml version="1.0" encoding="utf-8"?>
2
- <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" style="margin: auto; background: rgb(255, 255, 255); display: block; shape-rendering: auto;" width="80px" height="80px" viewBox="0 0 100 100" preserveAspectRatio="xMidYMid">
3
- <circle cx="50" cy="50" r="32" stroke-width="4" stroke="#165dff" stroke-dasharray="50.26548245743669 50.26548245743669" fill="none" stroke-linecap="round">
4
- <animateTransform attributeName="transform" type="rotate" dur="1s" repeatCount="indefinite" keyTimes="0;1" values="0 50 50;360 50 50"></animateTransform>
5
- </circle>
6
- <circle cx="50" cy="50" r="27" stroke-width="4" stroke="#85adfc" stroke-dasharray="42.411500823462205 42.411500823462205" stroke-dashoffset="42.411500823462205" fill="none" stroke-linecap="round">
7
- <animateTransform attributeName="transform" type="rotate" dur="1s" repeatCount="indefinite" keyTimes="0;1" values="0 50 50;-360 50 50"></animateTransform>
8
- </circle>
1
+ <?xml version="1.0" encoding="utf-8"?>
2
+ <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" style="margin: auto; background: rgb(255, 255, 255); display: block; shape-rendering: auto;" width="80px" height="80px" viewBox="0 0 100 100" preserveAspectRatio="xMidYMid">
3
+ <circle cx="50" cy="50" r="32" stroke-width="4" stroke="#165dff" stroke-dasharray="50.26548245743669 50.26548245743669" fill="none" stroke-linecap="round">
4
+ <animateTransform attributeName="transform" type="rotate" dur="1s" repeatCount="indefinite" keyTimes="0;1" values="0 50 50;360 50 50"></animateTransform>
5
+ </circle>
6
+ <circle cx="50" cy="50" r="27" stroke-width="4" stroke="#85adfc" stroke-dasharray="42.411500823462205 42.411500823462205" stroke-dashoffset="42.411500823462205" fill="none" stroke-linecap="round">
7
+ <animateTransform attributeName="transform" type="rotate" dur="1s" repeatCount="indefinite" keyTimes="0;1" values="0 50 50;-360 50 50"></animateTransform>
8
+ </circle>
9
9
  <!-- [ldio] generated by https://loading.io/ --></svg>
@@ -1,62 +1,62 @@
1
- @import '~@zgfe/business-lib/es/assets/styles/variable.less';
2
- .event-form-data {
3
- &-table-td {
4
- padding: 0 !important;
5
-
6
- &-show {
7
- display: flex;
8
- align-items: center;
9
- justify-content: center;
10
- min-width: 60px;
11
- height: 48px;
12
- cursor: pointer;
13
- span {
14
- width: 10px;
15
- height: 10px;
16
- border-radius: 50%;
17
- cursor: pointer;
18
- }
19
- }
20
-
21
- &-name {
22
- display: flex;
23
- align-items: center;
24
- .bsicon {
25
- margin-right: 4px;
26
- color: #fd9f41;
27
- }
28
-
29
- &-content {
30
- display: inline-block;
31
- max-width: 300px;
32
- overflow: hidden;
33
- white-space: nowrap;
34
- text-overflow: ellipsis;
35
- cursor: pointer;
36
- }
37
- }
38
-
39
- &-link {
40
- display: flex;
41
- justify-content: flex-end;
42
- &:hover {
43
- .a-yanjingkai {
44
- display: block;
45
- }
46
- }
47
- .a-yanjingkai {
48
- display: none;
49
- margin-right: 10px;
50
- }
51
- }
52
- &-link:not(.not-to-detail) {
53
- cursor: pointer;
54
- &:hover {
55
- color: @primary-color;
56
- }
57
- }
58
- }
59
- &-table-event-data {
60
- text-align: right !important;
61
- }
62
- }
1
+ @import '~@zgfe/business-lib/es/assets/styles/variable.less';
2
+ .event-form-data {
3
+ &-table-td {
4
+ padding: 0 !important;
5
+
6
+ &-show {
7
+ display: flex;
8
+ align-items: center;
9
+ justify-content: center;
10
+ min-width: 60px;
11
+ height: 48px;
12
+ cursor: pointer;
13
+ span {
14
+ width: 10px;
15
+ height: 10px;
16
+ border-radius: 50%;
17
+ cursor: pointer;
18
+ }
19
+ }
20
+
21
+ &-name {
22
+ display: flex;
23
+ align-items: center;
24
+ .bsicon {
25
+ margin-right: 4px;
26
+ color: #fd9f41;
27
+ }
28
+
29
+ &-content {
30
+ display: inline-block;
31
+ max-width: 300px;
32
+ overflow: hidden;
33
+ white-space: nowrap;
34
+ text-overflow: ellipsis;
35
+ cursor: pointer;
36
+ }
37
+ }
38
+
39
+ &-link {
40
+ display: flex;
41
+ justify-content: flex-end;
42
+ &:hover {
43
+ .a-yanjingkai {
44
+ display: block;
45
+ }
46
+ }
47
+ .a-yanjingkai {
48
+ display: none;
49
+ margin-right: 10px;
50
+ }
51
+ }
52
+ &-link:not(.not-to-detail) {
53
+ cursor: pointer;
54
+ &:hover {
55
+ color: @primary-color;
56
+ }
57
+ }
58
+ }
59
+ &-table-event-data {
60
+ text-align: right !important;
61
+ }
62
+ }
@@ -192,7 +192,7 @@ export function getColumns(eventGroupList, userPropList, eventEnvList, columnDat
192
192
  export function getChartDataEventAliasName(dataSource, eventGroupList) {
193
193
  var data = _.cloneDeep(dataSource);
194
194
  var series = [];
195
- data.series.map(function (item) {
195
+ data === null || data === void 0 ? void 0 : data.series.map(function (item) {
196
196
  item.originalNames = item.names;
197
197
  item.names = item.names.length > 1 ? [item.names[0], getEventAliasName(item.names[1], eventGroupList)] : [getEventAliasName(item.names[0], eventGroupList)];
198
198
  series.push(item);
@@ -223,7 +223,7 @@ export function getEventAliasId(name, eventGroupList) {
223
223
  return eventId;
224
224
  }
225
225
  export function getSortData(data) {
226
- var series = data.series;
226
+ var series = data === null || data === void 0 ? void 0 : data.series;
227
227
  var sort = function sort(obj1, obj2) {
228
228
  var val1 = obj1.values[0];
229
229
  var val2 = obj2.values[0];
@@ -239,20 +239,20 @@ export function getSortData(data) {
239
239
  return data;
240
240
  }
241
241
  export function getUserGroupsCompareData(data) {
242
- if (data.series.length <= 0) {
242
+ if ((data === null || data === void 0 ? void 0 : data.series.length) <= 0) {
243
243
  return data;
244
244
  } else {
245
245
  var _data = _.cloneDeep(data);
246
246
  var _series = [];
247
- _data.series.map(function (item, index) {
247
+ _data === null || _data === void 0 ? void 0 : _data.series.map(function (item, index) {
248
248
  _series.push(item);
249
- _data.series.map(function (_item, _index) {
249
+ _data === null || _data === void 0 ? void 0 : _data.series.map(function (_item, _index) {
250
250
  if (item.names[1] === _item.names[1] && index !== _index) {
251
251
  _series.push(_item);
252
- delete _data.series[_index];
252
+ _data === null || _data === void 0 ? true : delete _data.series[_index];
253
253
  }
254
254
  });
255
- delete _data.series[index];
255
+ _data === null || _data === void 0 ? true : delete _data.series[index];
256
256
  });
257
257
  _data.series = _series;
258
258
  return _data;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@zgfe/modules-event",
3
- "version": "1.0.29-zhongyuan.0",
3
+ "version": "1.0.29-zhongyuan.3",
4
4
  "module": "es/index.js",
5
5
  "typings": "es/index.d.ts",
6
6
  "private": false,
@@ -41,7 +41,7 @@
41
41
  "@types/lodash": "^4.14.191",
42
42
  "@umijs/fabric": "^2.8.1",
43
43
  "@umijs/test": "^3.0.5",
44
- "@zgfe/business-lib": "1.2.70-hxd.1",
44
+ "@zgfe/business-lib": "1.2.70-hxd.5",
45
45
  "antd": "^4.22.6",
46
46
  "dumi": "^1.1.0",
47
47
  "echarts": "^5.3.2",
@@ -54,7 +54,7 @@
54
54
  "react": "^16.12.0 || ^17.0.0",
55
55
  "yorkie": "^2.0.0"
56
56
  },
57
- "gitHead": "3304351c056bc30d6684a212920d2ae01905885b",
57
+ "gitHead": "154df5d9a1397d58b3b1958c4c57bc4c5a6902ac",
58
58
  "gitHooks": {
59
59
  "pre-commit": "lint-staged"
60
60
  }