@zgfe/modules-interval 1.0.0-interval.22 → 1.0.0-interval.24

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 (13) hide show
  1. package/dist/esm/components/common/index.js +8 -8
  2. package/dist/esm/components/common/styles/index.less +9 -0
  3. package/dist/esm/components/eventFilter/styles/index.less +1 -1
  4. package/dist/esm/components/table/styles/index.less +16 -2
  5. package/dist/esm/modules/chart/customTooltip.js +6 -2
  6. package/dist/esm/modules/chart/index.less +25 -15
  7. package/dist/esm/modules/chart/intervalChart.js +2 -1
  8. package/dist/esm/modules/content/utils.js +1 -1
  9. package/dist/esm/modules/home/styles/index.less +3 -0
  10. package/dist/esm/modules/topPanel/index.js +9 -6
  11. package/dist/esm/modules/topPanel/styles/index.less +17 -8
  12. package/dist/esm/utils/formData.js +1 -1
  13. package/package.json +2 -2
package/dist/esm/components/common/index.js CHANGED
@@ -1,21 +1,21 @@
1
1
  import React from 'react';
2
2
  import "./styles/index.less";
3
+ import { BizLoading } from '@zgfe/business-lib';
4
+ import { Empty } from 'antd';
3
5
  var classPrefix = 'mi-common-interval';
4
6
 
5
7
  // 加载按钮
6
8
  export var MiSpin = function MiSpin() {
7
- return /*#__PURE__*/React.createElement("div", {
8
- className: "".concat(classPrefix, "-loading-icon")
9
- });
9
+ return /*#__PURE__*/React.createElement(BizLoading, {
10
+ className: "mi-common-interval-content"
11
+ }, /*#__PURE__*/React.createElement("div", null));
10
12
  };
11
13
 
12
14
  // 无数据状态
13
15
  export var MiNone = function MiNone(props) {
14
16
  return /*#__PURE__*/React.createElement("div", {
15
17
  className: "".concat(classPrefix, "-none-container")
16
- }, /*#__PURE__*/React.createElement("div", {
17
- className: "".concat(classPrefix, "-none-empty")
18
- }), /*#__PURE__*/React.createElement("span", {
19
- className: "".concat(classPrefix, "-none-text")
20
- }, " ", props.label));
18
+ }, /*#__PURE__*/React.createElement(Empty, {
19
+ image: Empty.PRESENTED_IMAGE_SIMPLE
20
+ }));
21
21
  };
package/dist/esm/components/common/styles/index.less CHANGED
@@ -29,3 +29,12 @@
29
29
  align-items: center;
30
30
  }
31
31
  }
32
+ .mi-common-interval-content {
33
+ width: 100%;
34
+ .ant-spin-text {
35
+ color: #ccc;
36
+ }
37
+ }
38
+ .ant-spin-nested-loading {
39
+ width: 100%;
40
+ }
package/dist/esm/components/eventFilter/styles/index.less CHANGED
@@ -3,7 +3,7 @@
3
3
  display: flex;
4
4
  gap: 16px;
5
5
  align-items: center;
6
- margin-bottom: 0;
6
+ margin-bottom: 0 !important;
7
7
  .biz-event-select,
8
8
  .biz-attr-select {
9
9
  width: 208px;
package/dist/esm/components/table/styles/index.less CHANGED
@@ -5,7 +5,17 @@
5
5
  .ant-table {
6
6
  border-radius: 8px;
7
7
  }
8
-
8
+ .ant-table-cell-with-append .ant-table-row-expand-icon {
9
+ left: 16px !important;
10
+ color: #9aa1a9;
11
+ border: 1px solid #9aa1a9;
12
+ }
13
+ .ant-table-row-expand-icon::before {
14
+ height: 1.4px !important;
15
+ }
16
+ .ant-table-row-expand-icon::after {
17
+ width: 1.4px !important;
18
+ }
9
19
  .ant-table-cell {
10
20
  height: 50px;
11
21
  padding: 0 16px !important;
@@ -36,13 +46,13 @@
36
46
  > :nth-child(2) {
37
47
  display: flex;
38
48
  margin-top: 9px;
39
-
40
49
  div {
41
50
  height: 32px;
42
51
  padding: 0 16px;
43
52
  line-height: 32px;
44
53
  background: #fff;
45
54
  border: 1px solid #f2f3f4;
55
+ border-radius: 4px;
46
56
  cursor: pointer;
47
57
 
48
58
  .xiazai1 {
@@ -51,6 +61,10 @@
51
61
  vertical-align: -2px;
52
62
  }
53
63
  }
64
+ div:hover {
65
+ color: #165dff;
66
+ border: 1px solid #165dff;
67
+ }
54
68
  }
55
69
  }
56
70
 
package/dist/esm/modules/chart/customTooltip.js CHANGED
@@ -15,8 +15,12 @@ var CustomTooltip = function CustomTooltip(_ref) {
15
15
  var marker = payload === null || payload === void 0 ? void 0 : payload.marker;
16
16
  var value = payload === null || payload === void 0 ? void 0 : payload.value;
17
17
  return /*#__PURE__*/React.createElement("div", {
18
- className: "custom-tooltip"
19
- }, /*#__PURE__*/React.createElement("div", null, payload.name), /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("div", {
18
+ className: "custom-tooltip-chart"
19
+ }, /*#__PURE__*/React.createElement("div", {
20
+ className: "custom-tooltip-name"
21
+ }, payload.name, " "), /*#__PURE__*/React.createElement("div", {
22
+ className: "custom-tooltip-div"
23
+ }, /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("div", {
20
24
  dangerouslySetInnerHTML: {
21
25
  __html: marker
22
26
  }
package/dist/esm/modules/chart/index.less CHANGED
@@ -1,4 +1,4 @@
1
- .custom-tooltip {
1
+ .custom-tooltip-chart {
2
2
  display: flex;
3
3
  flex-direction: column;
4
4
  flex-shrink: 0;
@@ -6,16 +6,25 @@
6
6
  align-items: flex-start;
7
7
  width: 146px;
8
8
  height: 100%;
9
+ padding: 8px;
9
10
  color: var(--io-n, #021429);
10
11
  font-weight: 500;
11
12
  font-size: 12px;
12
13
  font-style: normal;
13
14
  background: rgba(250, 251, 253, 0.8);
14
15
  border-radius: 10px;
15
- box-shadow: 0px 4px 10px 0px rgba(0, 0, 0, 0.1);
16
- backdrop-filter: blur(2px);
16
+ box-shadow: 0px 4px 10px 0px #0000001a;
17
17
 
18
- > div:nth-child(2) {
18
+ .custom-tooltip-name {
19
+ color: var(--io-n, #021429);
20
+ font-weight: 500;
21
+ font-size: 12px;
22
+ font-family: PingFang SC;
23
+ font-style: normal;
24
+ line-height: normal;
25
+ }
26
+
27
+ .custom-tooltip-div {
19
28
  display: flex;
20
29
  flex-direction: column;
21
30
  gap: 7px;
@@ -24,7 +33,18 @@
24
33
  padding: 4px 8px;
25
34
  background: #fff;
26
35
  border-radius: 4px;
27
- box-shadow: 0px 1px 2px 0px rgba(0, 0, 0, 0.04);
36
+ // box-shadow: 0px 1px 2px 0px rgba(0, 0, 0, 0.04);
37
+
38
+ .tooltip-span {
39
+ display: block;
40
+ color: var(--3, #5f6085);
41
+ font-weight: 400;
42
+ font-size: 12px;
43
+ font-family: PingFang SC;
44
+ font-style: normal;
45
+ line-height: normal;
46
+ }
47
+
28
48
  > div {
29
49
  display: flex;
30
50
  align-items: center;
@@ -35,14 +55,4 @@
35
55
  justify-content: flex-start;
36
56
  }
37
57
  }
38
-
39
- .tooltip-span {
40
- display: block;
41
- color: var(--3, #5f6085);
42
- font-weight: 400;
43
- font-size: 12px;
44
- font-family: PingFang SC;
45
- font-style: normal;
46
- line-height: normal;
47
- }
48
58
  }
package/dist/esm/modules/chart/intervalChart.js CHANGED
@@ -30,6 +30,7 @@ var IntervalChart = function IntervalChart(props) {
30
30
  },
31
31
  legend: {
32
32
  bottom: 0,
33
+ icon: 'circle',
33
34
  type: 'scroll'
34
35
  },
35
36
  grid: {
@@ -102,7 +103,7 @@ var IntervalChart = function IntervalChart(props) {
102
103
  tooltip: {
103
104
  show: true,
104
105
  // 单独配置series中的tooltip为显示
105
- extraCssText: 'border: none;',
106
+ extraCssText: 'border: none;padding:0',
106
107
  // 添加自定义的CSS样式，去掉边框
107
108
  formatter: function formatter(params) {
108
109
  var tooltipString = renderToString( /*#__PURE__*/React.createElement(CustomTooltip, {
package/dist/esm/modules/content/utils.js CHANGED
@@ -52,7 +52,7 @@ export var getValue = function getValue(param, eventGroupList, eventEnvList, use
52
52
  if (attr.key === key) res = attr;
53
53
  });
54
54
  }
55
- console.log('获取当前属性的全部数据', res);
55
+ // console.log('获取当前属性的全部数据', res);
56
56
  return res;
57
57
  };
58
58
  export function searchCondition(params) {
package/dist/esm/modules/home/styles/index.less CHANGED
@@ -9,6 +9,9 @@
9
9
  height: 100%;
10
10
  background: #fafafb;
11
11
  .interval-layout {
12
+ .biz-layout-collapse-container {
13
+ height: 24px;
14
+ }
12
15
  .biz-layout-collapse-handle {
13
16
  height: 24px;
14
17
  }
package/dist/esm/modules/topPanel/index.js CHANGED
@@ -18,7 +18,6 @@ import "./styles/index.less";
18
18
  var classPrefix = 'top-panel-interval';
19
19
  var TopPanel = function TopPanel(props) {
20
20
  var _defaultValue$associa, _defaultValue$associa2, _defaultValue$associa3, _defaultValue$associa4, _defaultValue$associa5, _defaultValue$associa6, _defaultValue$associa7, _defaultValue$associa8, _defaultValue$dimensi, _defaultValue$dimensi2, _defaultValue$dimensi3, _defaultValue$dimensi4;
21
- console.log(777777, props);
22
21
  var defaultValue = props.defaultValue,
23
22
  loading = props.loading,
24
23
  collapseRef = props.collapseRef,
@@ -81,18 +80,23 @@ var TopPanel = function TopPanel(props) {
81
80
  form.resetFields();
82
81
  form.setFieldsValue({
83
82
  userGroup: [0],
84
- start: {},
85
- end: {},
83
+ start: undefined,
84
+ end: undefined,
86
85
  dimension: undefined,
86
+ filters: undefined,
87
87
  associatedPreAttr: undefined,
88
88
  associatedNextAttr: undefined
89
89
  });
90
90
  props.onChange({
91
91
  userGroup: [0],
92
+ start: undefined,
93
+ end: undefined,
92
94
  id: undefined,
93
- name: undefined,
94
95
  filters: undefined,
95
- dimension: undefined
96
+ name: undefined,
97
+ dimension: undefined,
98
+ associatedPreAttr: undefined,
99
+ associatedNextAttr: undefined
96
100
  }, true);
97
101
  };
98
102
  // 细分属性
@@ -235,7 +239,6 @@ var TopPanel = function TopPanel(props) {
235
239
  })), /*#__PURE__*/React.createElement("i", {
236
240
  style: {
237
241
  lineHeight: '32px',
238
- color: '#9AA1A9',
239
242
  marginLeft: '28px',
240
243
  cursor: 'pointer'
241
244
  },
package/dist/esm/modules/topPanel/styles/index.less CHANGED
@@ -19,10 +19,10 @@
19
19
 
20
20
  .panel-form-interval {
21
21
  .interval-item {
22
+ margin-top: -2px;
22
23
  .ant-space-vertical {
23
24
  gap: 0px !important;
24
25
  width: 100%;
25
-
26
26
  .ant-space-item:nth-child(1) {
27
27
  padding: 0 12px;
28
28
  }
@@ -61,7 +61,7 @@
61
61
 
62
62
  .collapseRefs {
63
63
  .biz-attr-condition-group-container {
64
- margin-top: 12px;
64
+ margin-top: 6px;
65
65
  }
66
66
 
67
67
  .ant-form-item {
@@ -88,7 +88,7 @@
88
88
 
89
89
  .biz-attr-condition-group-handle {
90
90
  margin-right: 0;
91
- margin-left: 24px;
91
+ margin-left: 28px;
92
92
  }
93
93
 
94
94
  .biz-attr-condition-group-container {
@@ -96,9 +96,9 @@
96
96
  }
97
97
 
98
98
  .ant-space-item {
99
- max-width: calc(100% + 24px) !important;
100
- margin-left: -24px;
101
- padding: 4px 48px;
99
+ max-width: calc(100% + 30px) !important;
100
+ margin-left: -30px;
101
+ padding: 4px 54px;
102
102
 
103
103
  .ant-space-item {
104
104
  width: auto;
@@ -129,14 +129,23 @@
129
129
  }
130
130
 
131
131
  > .ant-form-item {
132
- margin-bottom: 12px;
132
+ margin-bottom: 10px;
133
133
  }
134
134
 
135
135
  .associated {
136
+ margin-top: -8px;
136
137
  margin-bottom: 12px;
137
138
 
139
+ .qingchu {
140
+ color: #9aa1a9;
141
+ }
142
+
143
+ .qingchu:hover {
144
+ color: @error-color;
145
+ }
146
+
138
147
  .ant-form-item-control-input {
139
- padding: 4px 20px;
148
+ padding: 4px 24px;
140
149
 
141
150
  .ant-form-item-control-input {
142
151
  padding: 0;
package/dist/esm/utils/formData.js CHANGED
@@ -40,7 +40,7 @@ export function getColumns(eventGroupList, userPropList, eventEnvList, columnDat
40
40
  width: 148,
41
41
  ellipsis: true,
42
42
  key: 'time',
43
- align: 'center',
43
+ align: 'right',
44
44
  dataIndex: 'time',
45
45
  className: "".concat(classPrefix, "-table-td"),
46
46
  render: function render(text, record) {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@zgfe/modules-interval",
3
- "version": "1.0.0-interval.22",
3
+ "version": "1.0.0-interval.24",
4
4
  "scripts": {
5
5
  "start": "dumi dev",
6
6
  "docs:build": "dumi build",
@@ -43,7 +43,7 @@
43
43
  "@types/uuid": "^9.0.2",
44
44
  "@umijs/fabric": "^2.8.1",
45
45
  "@umijs/test": "^3.0.5",
46
- "@zgfe/business-lib": "1.1.81-page.9",
46
+ "@zgfe/business-lib": "1.1.84-panel.4",
47
47
  "@zgfe/modules-demo-manage": "^1.0.1",
48
48
  "antd": "^4.22.6",
49
49
  "dumi": "^1.1.0",