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

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.
@@ -478,7 +478,7 @@ var CreateMeta = function CreateMeta(props) {
478
478
  labelType: type
479
479
  }
480
480
  }).then(function (res) {
481
- if (res.code == '100000') {
481
+ if (res && res.code == '100000') {
482
482
  switch (type) {
483
483
  case 2:
484
484
  setBizTag(res.data.map(function (res) {
@@ -914,13 +914,13 @@ var PageInfo = function PageInfo(props) {
914
914
  //拼接名称
915
915
  var sliceName = function sliceName(record) {
916
916
  var _record$businessLabel, _record$triggerLabel;
917
- var point = props.pageData.labels && props.pageData.labels.filter(function (res) {
917
+ var point = props.pageData && props.pageData.labels && props.pageData.labels.filter(function (res) {
918
918
  return res.labelType == 1;
919
919
  }).map(function (res) {
920
920
  return res.labelName;
921
921
  }).join('_') || '';
922
- var biz = record.businessLabel && ((_record$businessLabel = record.businessLabel) === null || _record$businessLabel === void 0 ? void 0 : _record$businessLabel.labelName) || '';
923
- var trig = record.triggerLabel && ((_record$triggerLabel = record.triggerLabel) === null || _record$triggerLabel === void 0 ? void 0 : _record$triggerLabel.labelName) || '' || '';
922
+ var biz = (record === null || record === void 0 ? void 0 : record.businessLabel) && ((_record$businessLabel = record.businessLabel) === null || _record$businessLabel === void 0 ? void 0 : _record$businessLabel.labelName) || '';
923
+ var trig = (record === null || record === void 0 ? void 0 : record.triggerLabel) && ((_record$triggerLabel = record.triggerLabel) === null || _record$triggerLabel === void 0 ? void 0 : _record$triggerLabel.labelName) || '' || '';
924
924
  var arr = [biz, point, trig, record.eventName].filter(function (res) {
925
925
  return res;
926
926
  }).join('-');
@@ -1,156 +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
- }
97
- .gengduocaozuo1:hover {
98
- color: #165dff;
99
- }
100
- .ant-tree-switcher {
101
- color: #354354;
102
- }
103
- .ant-tree,
104
- .ant-tree-list,
105
- .ant-tree-list-holder {
106
- height: 100%;
107
- }
108
- .ant-tree-list-holder {
109
- overflow-x: hidden;
110
- overflow-y: auto;
111
- }
112
- .ant-tree-node-content-wrapper {
113
- width: calc(100% - 200px);
114
- }
115
- .ant-tree .ant-tree-node-content-wrapper.ant-tree-node-selected {
116
- background-color: #e8efff;
117
- }
118
- .ant-tree-switcher {
119
- line-height: 32px;
120
- }
121
- &-item {
122
- display: flex;
123
- flex: 1 0;
124
- gap: 10px;
125
- align-items: center;
126
- justify-content: space-between;
127
- height: 32px;
128
- padding: 0px 4px;
129
- border-radius: 4px;
130
- &-title {
131
- overflow: hidden;
132
- white-space: nowrap;
133
- text-overflow: ellipsis;
134
- &-name {
135
- margin-right: 10px;
136
- }
137
- }
138
- }
139
- .ant-tree-title {
140
- display: block;
141
- }
142
- }
143
- &-empty {
144
- display: flex;
145
- flex: 1;
146
- flex-direction: column;
147
- align-items: center;
148
- justify-content: center;
149
- .ant-empty-normal {
150
- margin: 16px 0;
151
- }
152
- .zengjia:before {
153
- margin-right: 8px;
154
- }
155
- }
156
- }
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
+ }
@@ -16,7 +16,7 @@ function _createForOfIteratorHelper(r, e) { var t = "undefined" != typeof Symbol
16
16
  function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
17
17
  function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
18
18
  import { Button, Dropdown, Empty, Input, message, Modal, Select, Tree, Popover, Spin, Tag, Checkbox } from 'antd';
19
- import { QuestionCircleOutlined, EnvironmentOutlined } from '@ant-design/icons';
19
+ import { QuestionCircleOutlined, EnvironmentOutlined, PlusCircleOutlined, MinusCircleOutlined, EditOutlined } from '@ant-design/icons';
20
20
  import React, { useContext, useEffect, useRef, useState } from 'react';
21
21
  import './styles/tree.less';
22
22
  import { BizDialog, BizGlobalDataContext, IconFont } from '@zgfe/business-lib';
@@ -227,7 +227,7 @@ var pointMap = function pointMap(props) {
227
227
  appId: currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId
228
228
  }
229
229
  }).then(function (res) {
230
- if (res.code == 100000) {
230
+ if (res && res.code == 100000) {
231
231
  setPointList(res.data.map(function (res) {
232
232
  return {
233
233
  label: res.labelName,
@@ -367,8 +367,7 @@ var pointMap = function pointMap(props) {
367
367
  }
368
368
  };
369
369
  var titleRender = function titleRender(nodeData) {
370
- var onItemClick = function onItemClick(_ref) {
371
- var key = _ref.key;
370
+ var onItemClick = function onItemClick(key) {
372
371
  switch (key) {
373
372
  case '0':
374
373
  if (nodeData.storey >= 20) {
@@ -401,16 +400,79 @@ var pointMap = function pointMap(props) {
401
400
  };
402
401
  //位置标签list
403
402
  var color = ['magenta', 'red', 'volcano', 'orange', 'gold', 'lime', 'green', 'cyan', 'blue', 'geekblue', 'purple'];
404
- var pointContent = /*#__PURE__*/React.createElement(React.Fragment, null, nodeData.labels.map(function (res, index) {
403
+ var pointContent = /*#__PURE__*/React.createElement(React.Fragment, null, nodeData.labels && nodeData.labels.map(function (res, index) {
405
404
  return /*#__PURE__*/React.createElement(Tag, {
406
405
  key: index,
407
406
  color: color[index]
408
407
  }, res.labelName);
409
408
  }));
410
- var pointIds = nodeData.labels.map(function (res) {
409
+ var pointIds = nodeData.labels && nodeData.labels.map(function (res) {
411
410
  return res.id;
412
- });
413
- return /*#__PURE__*/React.createElement("div", {
411
+ }) || [];
412
+ var menu = {
413
+ items: [{
414
+ label: '添加子页面',
415
+ icon: /*#__PURE__*/React.createElement(IconFont, {
416
+ type: "tianjia3"
417
+ }),
418
+ key: '0'
419
+ }, {
420
+ label: '上方添加页面',
421
+ icon: /*#__PURE__*/React.createElement(IconFont, {
422
+ type: "shangfangtianjia"
423
+ }),
424
+ key: '1'
425
+ }, {
426
+ label: '下方添加页面',
427
+ icon: /*#__PURE__*/React.createElement(IconFont, {
428
+ type: "xiafangtianjia"
429
+ }),
430
+ key: '2'
431
+ }, {
432
+ label: '选择位置标签',
433
+ icon: /*#__PURE__*/React.createElement(EnvironmentOutlined, null),
434
+ key: '5',
435
+ children: pointList.map(function (res) {
436
+ return {
437
+ key: '5' + res.value,
438
+ label: (/*#__PURE__*/React.createElement(Checkbox, {
439
+ defaultChecked: pointIds.indexOf(res.value) != -1,
440
+ onChange: function onChange(e) {
441
+ onChangeTag(e, nodeData, res);
442
+ }
443
+ }, res.label)),
444
+ disabled: true
445
+ };
446
+ })
447
+ }, {
448
+ type: 'divider'
449
+ }, {
450
+ label: '重命名',
451
+ icon: /*#__PURE__*/React.createElement(IconFont, {
452
+ type: "bianji1"
453
+ }),
454
+ key: '3'
455
+ }, {
456
+ type: 'divider'
457
+ }, {
458
+ label: '删除',
459
+ icon: /*#__PURE__*/React.createElement(IconFont, {
460
+ type: "shanchu2"
461
+ }),
462
+ key: '4'
463
+ }],
464
+ onClick: function onClick(item) {
465
+ onItemClick(item.key);
466
+ }
467
+ };
468
+ return /*#__PURE__*/React.createElement(Dropdown, {
469
+ disabled: !authority[1724922805],
470
+ menu: menu,
471
+ overlayStyle: {
472
+ width: 156
473
+ },
474
+ trigger: ['contextMenu']
475
+ }, /*#__PURE__*/React.createElement("div", {
414
476
  className: "".concat(classPrefix, "-tree-item")
415
477
  }, changeNameId === nodeData.id ? (/*#__PURE__*/React.createElement(Input, {
416
478
  style: {
@@ -460,73 +522,36 @@ var pointMap = function pointMap(props) {
460
522
  placement: "topLeft",
461
523
  title: "\u4F4D\u7F6E\u6807\u7B7E",
462
524
  content: pointContent
463
- }, pointContent)))), /*#__PURE__*/React.createElement(Dropdown, {
525
+ }, pointContent)))), /*#__PURE__*/React.createElement("div", {
526
+ className: "".concat(classPrefix, "-tree-item-iconList")
527
+ }, /*#__PURE__*/React.createElement(EditOutlined, {
528
+ onClick: function onClick(e) {
529
+ e.stopPropagation();
530
+ onItemClick('3');
531
+ }
532
+ }), /*#__PURE__*/React.createElement(MinusCircleOutlined, {
533
+ onClick: function onClick(e) {
534
+ e.stopPropagation();
535
+ onItemClick('4');
536
+ }
537
+ }), /*#__PURE__*/React.createElement(PlusCircleOutlined, {
538
+ onClick: function onClick(e) {
539
+ e.stopPropagation();
540
+ onItemClick('2');
541
+ }
542
+ }), /*#__PURE__*/React.createElement(Dropdown, {
464
543
  disabled: !authority[1724922805],
465
- placement: 'bottomRight',
466
- menu: {
467
- items: [{
468
- label: '添加子页面',
469
- icon: /*#__PURE__*/React.createElement(IconFont, {
470
- type: "tianjia3"
471
- }),
472
- key: '0'
473
- }, {
474
- label: '上方添加页面',
475
- icon: /*#__PURE__*/React.createElement(IconFont, {
476
- type: "shangfangtianjia"
477
- }),
478
- key: '1'
479
- }, {
480
- label: '下方添加页面',
481
- icon: /*#__PURE__*/React.createElement(IconFont, {
482
- type: "xiafangtianjia"
483
- }),
484
- key: '2'
485
- }, {
486
- label: '选择位置标签',
487
- icon: /*#__PURE__*/React.createElement(EnvironmentOutlined, null),
488
- key: '5',
489
- children: pointList.map(function (res) {
490
- return {
491
- key: '5' + res.value,
492
- label: (/*#__PURE__*/React.createElement(Checkbox, {
493
- defaultChecked: pointIds.indexOf(res.value) != -1,
494
- onChange: function onChange(e) {
495
- onChangeTag(e, nodeData, res);
496
- }
497
- }, res.label)),
498
- disabled: true
499
- };
500
- })
501
- }, {
502
- type: 'divider'
503
- }, {
504
- label: '重命名',
505
- icon: /*#__PURE__*/React.createElement(IconFont, {
506
- type: "bianji1"
507
- }),
508
- key: '3'
509
- }, {
510
- type: 'divider'
511
- }, {
512
- label: '删除',
513
- icon: /*#__PURE__*/React.createElement(IconFont, {
514
- type: "shanchu2"
515
- }),
516
- key: '4'
517
- }],
518
- onClick: onItemClick
519
- },
544
+ menu: menu,
520
545
  overlayStyle: {
521
546
  width: 156
522
547
  },
523
548
  trigger: ['click']
524
549
  }, /*#__PURE__*/React.createElement(IconFont, {
550
+ type: "gengduocaozuo1",
525
551
  onClick: function onClick(e) {
526
552
  e.stopPropagation();
527
- },
528
- type: "gengduocaozuo1"
529
- })));
553
+ }
554
+ })))));
530
555
  };
531
556
  var onChangeTag = function onChangeTag(e, node, option) {
532
557
  labelRelation(e.target.checked, node, option);
@@ -544,18 +569,16 @@ var pointMap = function pointMap(props) {
544
569
  }).then(function (res) {
545
570
  if ((res === null || res === void 0 ? void 0 : res.code) == '100000') {
546
571
  getPointTree();
547
- setTimeout(function () {
548
- var labels = [];
549
- if (checked) {
550
- labels = node.labels.push(option);
551
- } else {
552
- labels = node.labels.filter(function (res) {
553
- return res.id != option.value;
554
- });
555
- }
556
- node.labels = labels;
557
- props.onChangePage(node);
558
- }, 500);
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);
559
582
  }
560
583
  });
561
584
  };
@@ -618,8 +641,8 @@ var pointMap = function pointMap(props) {
618
641
  key: item
619
642
  };
620
643
  }),
621
- onClick: function onClick(_ref2) {
622
- var key = _ref2.key;
644
+ onClick: function onClick(_ref) {
645
+ var key = _ref.key;
623
646
  setIsOpen(false);
624
647
  setValue('');
625
648
  setSelectedKeys(undefined);
@@ -34,7 +34,7 @@ var beforeUpload = function beforeUpload(file) {
34
34
  if (!isLt2M) {
35
35
  message.error('文件不能大于100M');
36
36
  }
37
- return isLt2M;
37
+ return false;
38
38
  };
39
39
  var downloadFile = function downloadFile(resData, name) {
40
40
  var blob = resData.data;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@zgfe/modules-settings",
3
- "version": "2.1.0-zhongyuan.10",
3
+ "version": "2.1.0-zhongyuan.11",
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": "4e42ee7e1cd188c55018cdee01dfa44b62f976a9",
70
+ "gitHead": "7a1eeee0a2443864124eb2968cb28b3d85577e91",
71
71
  "gitHooks": {
72
72
  "pre-commit": "lint-staged"
73
73
  }