@zgfe/modules-settings 2.1.0-zhongyuan.11 → 2.1.0-zhongyuan.13

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,174 +1,174 @@
1
- .setting-point-map-tree {
2
- display: flex;
3
- flex-direction: column;
4
- width: 100%;
5
- height: 100%;
6
- padding: 16px 24px;
7
- overflow: hidden;
8
- background-color: #fff;
9
- border-radius: 8px;
10
- &-select {
11
- display: flex;
12
- flex-direction: row;
13
- justify-content: space-between;
14
- height: 32px;
15
- &-box {
16
- &-txt {
17
- margin-right: 8px;
18
- overflow: hidden;
19
- white-space: nowrap;
20
- text-overflow: ellipsis;
21
- }
22
- display: flex;
23
- gap: 8px;
24
- align-items: center;
25
- .transform180 {
26
- display: inline-block;
27
- transform: rotateX(180deg);
28
- }
29
- }
30
- }
31
- &-search {
32
- position: relative;
33
- display: grid;
34
- grid-gap: 16px;
35
- grid-template-columns: 88px 1fr 20px;
36
- align-items: center;
37
- margin-top: 16px;
38
- &-selectType {
39
- width: 100px;
40
- }
41
- .qrcode-img {
42
- display: inline-flex;
43
- flex-direction: column;
44
- align-items: center;
45
- width: 200px;
46
- height: 200px;
47
- padding: 20px;
48
- > div {
49
- text-align: center;
50
- > :nth-child(2) {
51
- color: #9aa1a9;
52
- font-size: 12px;
53
- }
54
- }
55
- img {
56
- width: 144px;
57
- height: 144px;
58
- margin-top: 10px;
59
- }
60
- }
61
- .ant-popover-placement-bottom .ant-popover-arrow {
62
- left: 84%;
63
- }
64
- .loading {
65
- .ant-spin-nested-loading {
66
- padding-top: 138px;
67
- }
68
- }
69
- // .ant-select-selector {
70
- // padding-left: 40px !important;
71
- // }
72
- // .ant-select-selection-search-input {
73
- // padding-left: 30px !important;
74
- // }
75
- &-popup {
76
- .ant-select-item {
77
- height: 32px !important;
78
- padding: 4px 12px !important;
79
- }
80
- }
81
- .sousuo {
82
- position: absolute;
83
- top: 6px;
84
- left: 16px;
85
- display: none;
86
- }
87
- }
88
- &-tree {
89
- display: flex;
90
- flex: 1;
91
- flex-direction: column;
92
- margin: 16px 0 0;
93
- overflow: hidden;
94
- .gengduocaozuo1 {
95
- color: #354354;
96
- transform: translateY(4px);
97
- }
98
- .gengduocaozuo1:hover {
99
- color: #165dff;
100
- }
101
- .ant-tree-switcher {
102
- color: #354354;
103
- }
104
- .ant-tree,
105
- .ant-tree-list,
106
- .ant-tree-list-holder {
107
- height: 100%;
108
- }
109
- .ant-tree-list-holder {
110
- overflow-x: hidden;
111
- overflow-y: auto;
112
- }
113
- .ant-tree-node-content-wrapper {
114
- width: calc(100% - 200px);
115
- }
116
- .ant-tree .ant-tree-node-content-wrapper.ant-tree-node-selected {
117
- background-color: #e8efff;
118
- }
119
- .ant-tree-switcher {
120
- line-height: 32px;
121
- }
122
- &-item {
123
- display: flex;
124
- flex: 1 0;
125
- gap: 10px;
126
- align-items: center;
127
- justify-content: space-between;
128
- height: 32px;
129
- padding: 0px 4px;
130
- border-radius: 4px;
131
- &-title {
132
- overflow: hidden;
133
- white-space: nowrap;
134
- text-overflow: ellipsis;
135
- &-name {
136
- margin-right: 10px;
137
- }
138
- }
139
- &-iconList {
140
- position: absolute;
141
- top: 0;
142
- right: 0;
143
- bottom: 0;
144
- display: none;
145
- justify-content: space-around;
146
- width: 85px;
147
- font-size: 16px;
148
- background: #ffffff;
149
- .anticon:hover {
150
- color: #165dff;
151
- }
152
- }
153
- &:hover &-iconList {
154
- display: flex;
155
- }
156
- }
157
- .ant-tree-title {
158
- display: block;
159
- }
160
- }
161
- &-empty {
162
- display: flex;
163
- flex: 1;
164
- flex-direction: column;
165
- align-items: center;
166
- justify-content: center;
167
- .ant-empty-normal {
168
- margin: 16px 0;
169
- }
170
- .zengjia:before {
171
- margin-right: 8px;
172
- }
173
- }
174
- }
1
+ .setting-point-map-tree {
2
+ display: flex;
3
+ flex-direction: column;
4
+ width: 100%;
5
+ height: 100%;
6
+ padding: 16px 24px;
7
+ overflow: hidden;
8
+ background-color: #fff;
9
+ border-radius: 8px;
10
+ &-select {
11
+ display: flex;
12
+ flex-direction: row;
13
+ justify-content: space-between;
14
+ height: 32px;
15
+ &-box {
16
+ &-txt {
17
+ margin-right: 8px;
18
+ overflow: hidden;
19
+ white-space: nowrap;
20
+ text-overflow: ellipsis;
21
+ }
22
+ display: flex;
23
+ gap: 8px;
24
+ align-items: center;
25
+ .transform180 {
26
+ display: inline-block;
27
+ transform: rotateX(180deg);
28
+ }
29
+ }
30
+ }
31
+ &-search {
32
+ position: relative;
33
+ display: grid;
34
+ grid-gap: 16px;
35
+ grid-template-columns: 88px 1fr 20px;
36
+ align-items: center;
37
+ margin-top: 16px;
38
+ &-selectType {
39
+ width: 100px;
40
+ }
41
+ .qrcode-img {
42
+ display: inline-flex;
43
+ flex-direction: column;
44
+ align-items: center;
45
+ width: 200px;
46
+ height: 200px;
47
+ padding: 20px;
48
+ > div {
49
+ text-align: center;
50
+ > :nth-child(2) {
51
+ color: #9aa1a9;
52
+ font-size: 12px;
53
+ }
54
+ }
55
+ img {
56
+ width: 144px;
57
+ height: 144px;
58
+ margin-top: 10px;
59
+ }
60
+ }
61
+ .ant-popover-placement-bottom .ant-popover-arrow {
62
+ left: 84%;
63
+ }
64
+ .loading {
65
+ .ant-spin-nested-loading {
66
+ padding-top: 138px;
67
+ }
68
+ }
69
+ // .ant-select-selector {
70
+ // padding-left: 40px !important;
71
+ // }
72
+ // .ant-select-selection-search-input {
73
+ // padding-left: 30px !important;
74
+ // }
75
+ &-popup {
76
+ .ant-select-item {
77
+ height: 32px !important;
78
+ padding: 4px 12px !important;
79
+ }
80
+ }
81
+ .sousuo {
82
+ position: absolute;
83
+ top: 6px;
84
+ left: 16px;
85
+ display: none;
86
+ }
87
+ }
88
+ &-tree {
89
+ display: flex;
90
+ flex: 1;
91
+ flex-direction: column;
92
+ margin: 16px 0 0;
93
+ overflow: hidden;
94
+ .gengduocaozuo1 {
95
+ color: #354354;
96
+ transform: translateY(4px);
97
+ }
98
+ .gengduocaozuo1:hover {
99
+ color: #165dff;
100
+ }
101
+ .ant-tree-switcher {
102
+ color: #354354;
103
+ }
104
+ .ant-tree,
105
+ .ant-tree-list,
106
+ .ant-tree-list-holder {
107
+ height: 100%;
108
+ }
109
+ .ant-tree-list-holder {
110
+ overflow-x: hidden;
111
+ overflow-y: auto;
112
+ }
113
+ .ant-tree-node-content-wrapper {
114
+ width: calc(100% - 200px);
115
+ }
116
+ .ant-tree .ant-tree-node-content-wrapper.ant-tree-node-selected {
117
+ background-color: #e8efff;
118
+ }
119
+ .ant-tree-switcher {
120
+ line-height: 32px;
121
+ }
122
+ &-item {
123
+ display: flex;
124
+ flex: 1 0;
125
+ gap: 10px;
126
+ align-items: center;
127
+ justify-content: space-between;
128
+ height: 32px;
129
+ padding: 0px 4px;
130
+ border-radius: 4px;
131
+ &-title {
132
+ overflow: hidden;
133
+ white-space: nowrap;
134
+ text-overflow: ellipsis;
135
+ &-name {
136
+ margin-right: 10px;
137
+ }
138
+ }
139
+ &-iconList {
140
+ position: absolute;
141
+ top: 0;
142
+ right: 0;
143
+ bottom: 0;
144
+ display: none;
145
+ justify-content: space-around;
146
+ width: 85px;
147
+ font-size: 16px;
148
+ background: #ffffff;
149
+ .anticon:hover {
150
+ color: #165dff;
151
+ }
152
+ }
153
+ &:hover &-iconList {
154
+ display: flex;
155
+ }
156
+ }
157
+ .ant-tree-title {
158
+ display: block;
159
+ }
160
+ }
161
+ &-empty {
162
+ display: flex;
163
+ flex: 1;
164
+ flex-direction: column;
165
+ align-items: center;
166
+ justify-content: center;
167
+ .ant-empty-normal {
168
+ margin: 16px 0;
169
+ }
170
+ .zengjia:before {
171
+ margin-right: 8px;
172
+ }
173
+ }
174
+ }
@@ -193,6 +193,7 @@ var pointMap = function pointMap(props) {
193
193
  });
194
194
  };
195
195
  var getPointTree = function getPointTree() {
196
+ var fn = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : function () {};
196
197
  request(apis.getPointTree, {
197
198
  method: 'post',
198
199
  data: {
@@ -213,6 +214,7 @@ var pointMap = function pointMap(props) {
213
214
  // props.onChangePage(res?.data ? { ...res?.data[0], currentPointVersion } : undefined);
214
215
  }
215
216
  setChangeNameId(undefined);
217
+ fn();
216
218
  }
217
219
  }).catch(function (err) {
218
220
  console.log(err);
@@ -231,7 +233,8 @@ var pointMap = function pointMap(props) {
231
233
  setPointList(res.data.map(function (res) {
232
234
  return {
233
235
  label: res.labelName,
234
- value: res.id
236
+ value: res.id,
237
+ labelType: 1
235
238
  };
236
239
  }));
237
240
  }
@@ -439,6 +442,9 @@ var pointMap = function pointMap(props) {
439
442
  defaultChecked: pointIds.indexOf(res.value) != -1,
440
443
  onChange: function onChange(e) {
441
444
  onChangeTag(e, nodeData, res);
445
+ },
446
+ onClick: function onClick(e) {
447
+ e.stopPropagation();
442
448
  }
443
449
  }, res.label)),
444
450
  disabled: true
@@ -462,6 +468,7 @@ var pointMap = function pointMap(props) {
462
468
  key: '4'
463
469
  }],
464
470
  onClick: function onClick(item) {
471
+ item.domEvent.stopPropagation();
465
472
  onItemClick(item.key);
466
473
  }
467
474
  };
@@ -568,17 +575,20 @@ var pointMap = function pointMap(props) {
568
575
  }
569
576
  }).then(function (res) {
570
577
  if ((res === null || res === void 0 ? void 0 : res.code) == '100000') {
571
- getPointTree();
572
- // setTimeout(() => {
573
- // let labels = node.labels;
574
- // if (checked) {
575
- // labels.push(option);
576
- // } else {
577
- // labels = labels.filter((res: LabelsData) => res.id != option.value);
578
- // }
579
- // node.labels = labels;
580
- // props.onChangePage({ ...node, currentPointVersion });
581
- // }, 0);
578
+ getPointTree(function () {
579
+ var labels = node.labels;
580
+ if (checked) {
581
+ labels.push(option);
582
+ } else {
583
+ labels = labels.filter(function (res) {
584
+ return res.id != option.value;
585
+ });
586
+ }
587
+ node.labels = labels;
588
+ props.onChangePage(_objectSpread(_objectSpread({}, node), {}, {
589
+ currentPointVersion: currentPointVersion
590
+ }));
591
+ });
582
592
  }
583
593
  });
584
594
  };
@@ -1,48 +1,48 @@
1
- .clearDict {
2
- height: 100%;
3
- padding: 24px;
4
- background: #fff;
5
- border-radius: 8px;
6
- border-radius: 8px;
7
- &-searchTop {
8
- display: grid;
9
- grid-template-columns: 1fr;
10
- align-items: center;
11
- justify-items: self-end;
12
- margin-bottom: 20px;
13
- }
14
- &-modal {
15
- .ant-modal-body {
16
- height: 350px;
17
- }
18
- .ant-picker-dropdown {
19
- top: 133px !important;
20
- left: 13px !important;
21
- }
22
- }
23
- &-content {
24
- display: flex;
25
- align-items: center;
26
- justify-content: space-between;
27
- }
28
- &-drawerCloseIcon {
29
- float: right;
30
- cursor: pointer;
31
- }
32
- &-addListBtn {
33
- display: flex;
34
- align-items: center;
35
- justify-content: space-between;
36
- margin-top: 20px;
37
- }
38
- &-tableContainer {
39
- margin-top: 10px;
40
- .ant-table {
41
- height: calc(100vh - 380px);
42
- min-height: 410px !important; /* 设置表格最小高度 */
43
- }
44
- .ant-empty-normal {
45
- height: 260px; /* 设置表格最小高度 */
46
- }
47
- }
48
- }
1
+ .clearDict {
2
+ height: 100%;
3
+ padding: 24px;
4
+ background: #fff;
5
+ border-radius: 8px;
6
+ border-radius: 8px;
7
+ &-searchTop {
8
+ display: grid;
9
+ grid-template-columns: 1fr;
10
+ align-items: center;
11
+ justify-items: self-end;
12
+ margin-bottom: 20px;
13
+ }
14
+ &-modal {
15
+ .ant-modal-body {
16
+ height: 350px;
17
+ }
18
+ .ant-picker-dropdown {
19
+ top: 133px !important;
20
+ left: 13px !important;
21
+ }
22
+ }
23
+ &-content {
24
+ display: flex;
25
+ align-items: center;
26
+ justify-content: space-between;
27
+ }
28
+ &-drawerCloseIcon {
29
+ float: right;
30
+ cursor: pointer;
31
+ }
32
+ &-addListBtn {
33
+ display: flex;
34
+ align-items: center;
35
+ justify-content: space-between;
36
+ margin-top: 20px;
37
+ }
38
+ &-tableContainer {
39
+ margin-top: 10px;
40
+ .ant-table {
41
+ height: calc(100vh - 380px);
42
+ min-height: 410px !important; /* 设置表格最小高度 */
43
+ }
44
+ .ant-empty-normal {
45
+ height: 260px; /* 设置表格最小高度 */
46
+ }
47
+ }
48
+ }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@zgfe/modules-settings",
3
- "version": "2.1.0-zhongyuan.11",
3
+ "version": "2.1.0-zhongyuan.13",
4
4
  "private": false,
5
5
  "module": "es/index.js",
6
6
  "typings": "es/index.d.ts",
@@ -67,7 +67,7 @@
67
67
  "publishConfig": {
68
68
  "access": "public"
69
69
  },
70
- "gitHead": "7a1eeee0a2443864124eb2968cb28b3d85577e91",
70
+ "gitHead": "e8f798dc2c72809baba51145e80cf7ed64c9d85f",
71
71
  "gitHooks": {
72
72
  "pre-commit": "lint-staged"
73
73
  }