@riil-frontend/component-topology 5.0.15 → 5.0.16
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.
- package/build/1.js +1 -1
- package/build/index.js +12 -12
- package/es/components/BatchAttrMetric/SelectTable.js +21 -0
- package/es/components/BatchAttrMetric/index.js +1 -1
- package/es/components/BatchAttrMetric/setting.js +6 -21
- package/es/core/components/ResourceViewAttributeSetting/Setting.js +13 -1
- package/es/core/models/TopoApp.js +1 -1
- package/es/core/viewer/components/plugins/ResourceDetail/components/WebConsole/WebConsoleContainer.js +3 -3
- package/es/core/viewer/components/plugins/ResourceDetail/components/WebConsole/WebConsoleForm/WebConsoleForm.js +96 -3
- package/es/core/viewer/components/plugins/ResourceDetail/components/WebConsole/WebConsoleForm/hooks/useWebConsole.js +15 -7
- package/lib/components/BatchAttrMetric/SelectTable.js +29 -0
- package/lib/components/BatchAttrMetric/index.js +1 -1
- package/lib/components/BatchAttrMetric/setting.js +6 -22
- package/lib/core/components/ResourceViewAttributeSetting/Setting.js +12 -0
- package/lib/core/models/TopoApp.js +1 -1
- package/lib/core/viewer/components/plugins/ResourceDetail/components/WebConsole/WebConsoleContainer.js +3 -2
- package/lib/core/viewer/components/plugins/ResourceDetail/components/WebConsole/WebConsoleForm/WebConsoleForm.js +106 -3
- package/lib/core/viewer/components/plugins/ResourceDetail/components/WebConsole/WebConsoleForm/hooks/useWebConsole.js +15 -7
- package/package.json +2 -2
|
@@ -0,0 +1,21 @@
|
|
|
1
|
+
import React from 'react';
|
|
2
|
+
export default function SelectTable(props) {
|
|
3
|
+
return /*#__PURE__*/React.createElement(Table, {
|
|
4
|
+
fixedHeader: true,
|
|
5
|
+
hasBorder: false,
|
|
6
|
+
dataSource: tableData,
|
|
7
|
+
emptyContent: /*#__PURE__*/React.createElement(NoDataPage, {
|
|
8
|
+
type: "table"
|
|
9
|
+
}),
|
|
10
|
+
rowSelection: {
|
|
11
|
+
selectedRowKeys: selectedRowKeys,
|
|
12
|
+
onChange: onTableSelect,
|
|
13
|
+
getProps: function getProps(_ref) {
|
|
14
|
+
var id = _ref.id;
|
|
15
|
+
return {
|
|
16
|
+
disabled: !selectedRowKeys.includes(id) && selectedRowKeys.length >= limit
|
|
17
|
+
};
|
|
18
|
+
}
|
|
19
|
+
}
|
|
20
|
+
}, columnNodes);
|
|
21
|
+
}
|
|
@@ -66,7 +66,7 @@ var BatchAttrMetricDrawer = /*#__PURE__*/forwardRef(function (_ref, ref) {
|
|
|
66
66
|
title: drawerTitle,
|
|
67
67
|
className: styles.drawer,
|
|
68
68
|
width: drawerWidth
|
|
69
|
-
}, /*#__PURE__*/React.createElement(SettingPage, _extends({}, pageConfig, props, {
|
|
69
|
+
}, visible && /*#__PURE__*/React.createElement(SettingPage, _extends({}, pageConfig, props, {
|
|
70
70
|
showType: showType,
|
|
71
71
|
cancelCb: setFalse,
|
|
72
72
|
saveCb: function saveCb(values) {
|
|
@@ -5,7 +5,7 @@ import _Grid from "@alifd/next/es/grid";
|
|
|
5
5
|
import _Message from "@alifd/next/es/message";
|
|
6
6
|
import _extends from "@babel/runtime/helpers/extends";
|
|
7
7
|
import _objectWithoutPropertiesLoose from "@babel/runtime/helpers/objectWithoutPropertiesLoose";
|
|
8
|
-
var _excluded = ["defaultSet", "allCiSet", "showType"];
|
|
8
|
+
var _excluded = ["value", "defaultSet", "allCiSet", "showType"];
|
|
9
9
|
import React, { useState, useMemo } from "react";
|
|
10
10
|
import rlog from "@riil-frontend/component-topology-utils/es/rlog";
|
|
11
11
|
import ActionTree from "@riil-frontend/component-action-tree";
|
|
@@ -16,7 +16,9 @@ import * as utils from "./utils";
|
|
|
16
16
|
import styles from "./index.module.scss";
|
|
17
17
|
|
|
18
18
|
var Setting = function Setting(_ref) {
|
|
19
|
-
var
|
|
19
|
+
var _ref$value = _ref.value,
|
|
20
|
+
value = _ref$value === void 0 ? {} : _ref$value,
|
|
21
|
+
defaultSet = _ref.defaultSet,
|
|
20
22
|
allCiSet = _ref.allCiSet,
|
|
21
23
|
showType = _ref.showType,
|
|
22
24
|
props = _objectWithoutPropertiesLoose(_ref, _excluded);
|
|
@@ -24,14 +26,7 @@ var Setting = function Setting(_ref) {
|
|
|
24
26
|
// const allCiSet = utils.dsTransform(props.allCiSet);
|
|
25
27
|
var limit = props.limit,
|
|
26
28
|
saveCb = props.saveCb,
|
|
27
|
-
topo = props.topo,
|
|
28
29
|
elementType = props.elementType;
|
|
29
|
-
|
|
30
|
-
var _topo$store$useModel = topo.store.useModel("topoMod"),
|
|
31
|
-
topoState = _topo$store$useModel[0],
|
|
32
|
-
topoDispatchers = _topo$store$useModel[1];
|
|
33
|
-
|
|
34
|
-
var resAndMetrics = topoState.resAndMetrics;
|
|
35
30
|
rlog.debug("Setting-resAndMetrics-allCiSet-elementType", showType, props, elementType);
|
|
36
31
|
rlog.debug("Setting----allCiSet", allCiSet);
|
|
37
32
|
|
|
@@ -43,11 +38,11 @@ var Setting = function Setting(_ref) {
|
|
|
43
38
|
search = _useState2[0],
|
|
44
39
|
setSearch = _useState2[1];
|
|
45
40
|
|
|
46
|
-
var _useState3 = useState(
|
|
41
|
+
var _useState3 = useState(value),
|
|
47
42
|
selected = _useState3[0],
|
|
48
43
|
setSelected = _useState3[1];
|
|
49
44
|
|
|
50
|
-
var selectedRowKeys = selected[ciType];
|
|
45
|
+
var selectedRowKeys = selected[ciType] || [];
|
|
51
46
|
|
|
52
47
|
var _RiilHooks$useTableCo = RiilHooks.useTableColumn({
|
|
53
48
|
columns: utils.columns(showType, props.showCiNum)
|
|
@@ -71,16 +66,6 @@ var Setting = function Setting(_ref) {
|
|
|
71
66
|
};
|
|
72
67
|
|
|
73
68
|
var saveSelected = function saveSelected() {
|
|
74
|
-
rlog.debug("Setting-saveSelected", allCiSet, selected);
|
|
75
|
-
var newCiSet = utils.updateCiSetSeleted(selected, allCiSet, showType);
|
|
76
|
-
var newResAndMetrics = elementType === "node" ? _extends({}, resAndMetrics, {
|
|
77
|
-
allCiModSet: newCiSet
|
|
78
|
-
}) : _extends({}, resAndMetrics, {
|
|
79
|
-
allLinkModSet: newCiSet
|
|
80
|
-
});
|
|
81
|
-
topoDispatchers.update({
|
|
82
|
-
resAndMetrics: newResAndMetrics
|
|
83
|
-
});
|
|
84
69
|
saveCb(utils.saveTransform(selected));
|
|
85
70
|
};
|
|
86
71
|
|
|
@@ -1,4 +1,5 @@
|
|
|
1
|
-
import
|
|
1
|
+
import _extends from "@babel/runtime/helpers/extends";
|
|
2
|
+
import React, { useState, useEffect, useRef, useCallback, useImperativeHandle, forwardRef, useMemo } from "react";
|
|
2
3
|
import { TopoEvent } from "@riil-frontend/component-topology-graph";
|
|
3
4
|
import rlog from "@riil-frontend/component-topology-utils/es/rlog";
|
|
4
5
|
import BatchAttrMetricDrawer from "../../../components/BatchAttrMetric";
|
|
@@ -70,8 +71,19 @@ var ResourceDiplayInfoSetting = /*#__PURE__*/forwardRef(function (props, ref) {
|
|
|
70
71
|
}
|
|
71
72
|
};
|
|
72
73
|
});
|
|
74
|
+
var newValue = useMemo(function () {
|
|
75
|
+
var d = _extends({}, (value === null || value === void 0 ? void 0 : value.data) || {});
|
|
76
|
+
|
|
77
|
+
Object.keys(d).forEach(function (key) {
|
|
78
|
+
d[key] = (d[key] || []).map(function (item) {
|
|
79
|
+
return item.code + "-" + item.type;
|
|
80
|
+
});
|
|
81
|
+
});
|
|
82
|
+
return d;
|
|
83
|
+
}, [value]);
|
|
73
84
|
return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(BatchAttrMetricDrawer, {
|
|
74
85
|
ref: batchAttrMetric,
|
|
86
|
+
value: newValue,
|
|
75
87
|
allCiSet: markData,
|
|
76
88
|
limit: limit,
|
|
77
89
|
topo: topo,
|
|
@@ -21,7 +21,7 @@ import PluginManager from "./PluginManager";
|
|
|
21
21
|
import topoFactory from "./topoFactory";
|
|
22
22
|
import ElementTagTipConfig from "./tagstips/ElementTagTipConfig"; // eslint-disable-next-line no-undef
|
|
23
23
|
|
|
24
|
-
var version = typeof "5.0.
|
|
24
|
+
var version = typeof "5.0.16" === 'string' ? "5.0.16" : null;
|
|
25
25
|
console.info("\u62D3\u6251\u7248\u672C: " + version);
|
|
26
26
|
/**
|
|
27
27
|
* 拓扑显示和编辑
|
|
@@ -1,11 +1,11 @@
|
|
|
1
|
-
import React from 'react';
|
|
2
|
-
|
|
1
|
+
import React from 'react';
|
|
2
|
+
import DefaultWebConsoleForm from "./WebConsoleForm/WebConsoleForm";
|
|
3
3
|
export default function WebConsoleContainer(props) {
|
|
4
4
|
var _topo$viewProps, _topo$viewProps$viewe;
|
|
5
5
|
|
|
6
6
|
var data = props.data,
|
|
7
7
|
topo = props.topo;
|
|
8
|
-
var WebConsoleForm = (_topo$viewProps = topo.viewProps) === null || _topo$viewProps === void 0 ? void 0 : (_topo$viewProps$viewe = _topo$viewProps.viewerProps) === null || _topo$viewProps$viewe === void 0 ? void 0 : _topo$viewProps$viewe.WebConsoleForm;
|
|
8
|
+
var WebConsoleForm = ((_topo$viewProps = topo.viewProps) === null || _topo$viewProps === void 0 ? void 0 : (_topo$viewProps$viewe = _topo$viewProps.viewerProps) === null || _topo$viewProps$viewe === void 0 ? void 0 : _topo$viewProps$viewe.WebConsoleForm) || DefaultWebConsoleForm;
|
|
9
9
|
|
|
10
10
|
if (!WebConsoleForm) {
|
|
11
11
|
return null;
|
|
@@ -1,14 +1,107 @@
|
|
|
1
|
-
import
|
|
1
|
+
import _Loading from "@alifd/next/es/loading";
|
|
2
|
+
import _Button from "@alifd/next/es/button";
|
|
3
|
+
import _Input from "@alifd/next/es/input";
|
|
4
|
+
import _Field from "@alifd/next/es/field";
|
|
5
|
+
import _Form from "@alifd/next/es/form";
|
|
6
|
+
import React, { useState, useEffect } from 'react';
|
|
2
7
|
import useWebConsole from "./hooks/useWebConsole";
|
|
8
|
+
var FormItem = _Form.Item;
|
|
3
9
|
export default function WebConsoleForm(props) {
|
|
4
10
|
var ciId = props.ciId;
|
|
11
|
+
var ipv4Address = props.ciData.attributes.ipv4_address;
|
|
5
12
|
|
|
6
13
|
var _useWebConsole = useWebConsole({
|
|
7
|
-
ciId: ciId
|
|
14
|
+
ciId: ciId,
|
|
15
|
+
ipv4Address: ipv4Address
|
|
8
16
|
}),
|
|
9
17
|
queryDataLoading = _useWebConsole.queryDataLoading,
|
|
10
18
|
webConsoleUrl = _useWebConsole.webConsoleUrl,
|
|
11
19
|
save = _useWebConsole.save;
|
|
12
20
|
|
|
13
|
-
|
|
21
|
+
var _useState = useState(true),
|
|
22
|
+
isEdit = _useState[0],
|
|
23
|
+
handleInput = _useState[1];
|
|
24
|
+
|
|
25
|
+
var _useState2 = useState(false),
|
|
26
|
+
isSave = _useState2[0],
|
|
27
|
+
handleSaveBtn = _useState2[1];
|
|
28
|
+
|
|
29
|
+
var _useState3 = useState(false),
|
|
30
|
+
isShow = _useState3[0],
|
|
31
|
+
handleEdit = _useState3[1];
|
|
32
|
+
|
|
33
|
+
var field = _Field.useField({
|
|
34
|
+
autoUnmount: true,
|
|
35
|
+
values: {},
|
|
36
|
+
onChange: function onChange(name, value) {
|
|
37
|
+
field.getValue('url').length > 0 ? handleSaveBtn(false) : handleSaveBtn(true);
|
|
38
|
+
}
|
|
39
|
+
});
|
|
40
|
+
|
|
41
|
+
useEffect(function () {
|
|
42
|
+
field.setValue('url', webConsoleUrl);
|
|
43
|
+
}, [webConsoleUrl]);
|
|
44
|
+
useEffect(function () {
|
|
45
|
+
field.getError('url') == null ? handleSaveBtn(false) : handleSaveBtn(true);
|
|
46
|
+
}, [field.getError('url')]);
|
|
47
|
+
|
|
48
|
+
function handleEditLink() {
|
|
49
|
+
handleInput(false);
|
|
50
|
+
handleEdit(true);
|
|
51
|
+
}
|
|
52
|
+
|
|
53
|
+
function saveData() {
|
|
54
|
+
save(field.getValue('url'));
|
|
55
|
+
handleEdit(function (isShow) {
|
|
56
|
+
return !isShow;
|
|
57
|
+
});
|
|
58
|
+
handleInput(function (isEdit) {
|
|
59
|
+
return !isEdit;
|
|
60
|
+
});
|
|
61
|
+
}
|
|
62
|
+
|
|
63
|
+
return /*#__PURE__*/React.createElement(_Loading, {
|
|
64
|
+
visible: queryDataLoading
|
|
65
|
+
}, /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(_Form, {
|
|
66
|
+
field: field,
|
|
67
|
+
labelAlign: "top"
|
|
68
|
+
}, /*#__PURE__*/React.createElement(FormItem, {
|
|
69
|
+
style: {
|
|
70
|
+
'paddingTop': '12px'
|
|
71
|
+
},
|
|
72
|
+
label: "\u94FE\u63A5",
|
|
73
|
+
maxLength: 1000,
|
|
74
|
+
minmaxLengthMessage: "\u94FE\u63A5\u957F\u5EA6\u4E0D\u80FD\u8D85\u8FC71000\u4E2A\u5B57\u7B26",
|
|
75
|
+
minmaxLengthTrigger: "onBlur",
|
|
76
|
+
format: "url",
|
|
77
|
+
formatMessage: "\u94FE\u63A5\u4E0D\u662F\u5408\u6CD5\u7684URL\u5730\u5740",
|
|
78
|
+
formatTrigger: "onBlur"
|
|
79
|
+
}, /*#__PURE__*/React.createElement(_Input, {
|
|
80
|
+
style: {
|
|
81
|
+
width: '358px',
|
|
82
|
+
height: '60px',
|
|
83
|
+
'bordeRadius': '4px'
|
|
84
|
+
},
|
|
85
|
+
name: "url",
|
|
86
|
+
placeholder: "\u8BF7\u8F93\u5165\u94FE\u63A5\u5730\u5740",
|
|
87
|
+
trim: true,
|
|
88
|
+
disabled: isEdit
|
|
89
|
+
})), /*#__PURE__*/React.createElement(FormItem, null, isShow ? /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(_Button, {
|
|
90
|
+
type: "primary",
|
|
91
|
+
disabled: isSave,
|
|
92
|
+
onClick: saveData,
|
|
93
|
+
name: "baocun"
|
|
94
|
+
}, "\u4FDD\u5B58")) : /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(_Button, {
|
|
95
|
+
component: "a",
|
|
96
|
+
type: "primary",
|
|
97
|
+
onClick: function onClick() {
|
|
98
|
+
window.open(field.getValue('url'));
|
|
99
|
+
}
|
|
100
|
+
}, "\u8BBF\u95EE"), /*#__PURE__*/React.createElement(_Button, {
|
|
101
|
+
type: "normal",
|
|
102
|
+
style: {
|
|
103
|
+
'marginLeft': '10px'
|
|
104
|
+
},
|
|
105
|
+
onClick: handleEditLink
|
|
106
|
+
}, "\u7F16\u8F91\u94FE\u63A5"))))));
|
|
14
107
|
}
|
|
@@ -12,7 +12,7 @@ function queryWebConsoleUrlById(_x) {
|
|
|
12
12
|
|
|
13
13
|
function _queryWebConsoleUrlById() {
|
|
14
14
|
_queryWebConsoleUrlById = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2(id) {
|
|
15
|
-
var _list
|
|
15
|
+
var _list, list;
|
|
16
16
|
|
|
17
17
|
return _regeneratorRuntime.wrap(function _callee2$(_context2) {
|
|
18
18
|
while (1) {
|
|
@@ -24,28 +24,30 @@ function _queryWebConsoleUrlById() {
|
|
|
24
24
|
|
|
25
25
|
case 3:
|
|
26
26
|
list = _context2.sent;
|
|
27
|
-
|
|
27
|
+
;
|
|
28
|
+
return _context2.abrupt("return", (_list = list[list.length - 1]) === null || _list === void 0 ? void 0 : _list.webUrl);
|
|
28
29
|
|
|
29
|
-
case
|
|
30
|
-
_context2.prev =
|
|
30
|
+
case 8:
|
|
31
|
+
_context2.prev = 8;
|
|
31
32
|
_context2.t0 = _context2["catch"](0);
|
|
32
33
|
rlog.error('资源web控制台.加载数据异常', _context2.t0);
|
|
33
34
|
|
|
34
|
-
case
|
|
35
|
+
case 11:
|
|
35
36
|
return _context2.abrupt("return", null);
|
|
36
37
|
|
|
37
|
-
case
|
|
38
|
+
case 12:
|
|
38
39
|
case "end":
|
|
39
40
|
return _context2.stop();
|
|
40
41
|
}
|
|
41
42
|
}
|
|
42
|
-
}, _callee2, null, [[0,
|
|
43
|
+
}, _callee2, null, [[0, 8]]);
|
|
43
44
|
}));
|
|
44
45
|
return _queryWebConsoleUrlById.apply(this, arguments);
|
|
45
46
|
}
|
|
46
47
|
|
|
47
48
|
export default function useWebConsole(props) {
|
|
48
49
|
var ciId = props.ciId;
|
|
50
|
+
var ipv4Address = props.ipv4Address;
|
|
49
51
|
|
|
50
52
|
var _useState = useState(null),
|
|
51
53
|
webConsoleUrl = _useState[0],
|
|
@@ -55,6 +57,12 @@ export default function useWebConsole(props) {
|
|
|
55
57
|
var requestWebConsoleUrl = useRequest(queryWebConsoleUrlById, {
|
|
56
58
|
manual: true,
|
|
57
59
|
onSuccess: function onSuccess(result) {
|
|
60
|
+
if (ipv4Address != undefined) {
|
|
61
|
+
result = result === undefined ? "http://" + ipv4Address : result;
|
|
62
|
+
} else {
|
|
63
|
+
result = result === undefined ? null : result;
|
|
64
|
+
}
|
|
65
|
+
|
|
58
66
|
setWebConsoleUrl(result);
|
|
59
67
|
}
|
|
60
68
|
});
|
|
@@ -0,0 +1,29 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
|
|
3
|
+
var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
|
|
4
|
+
|
|
5
|
+
exports.__esModule = true;
|
|
6
|
+
exports["default"] = SelectTable;
|
|
7
|
+
|
|
8
|
+
var _react = _interopRequireDefault(require("react"));
|
|
9
|
+
|
|
10
|
+
function SelectTable(props) {
|
|
11
|
+
return /*#__PURE__*/_react["default"].createElement(Table, {
|
|
12
|
+
fixedHeader: true,
|
|
13
|
+
hasBorder: false,
|
|
14
|
+
dataSource: tableData,
|
|
15
|
+
emptyContent: /*#__PURE__*/_react["default"].createElement(NoDataPage, {
|
|
16
|
+
type: "table"
|
|
17
|
+
}),
|
|
18
|
+
rowSelection: {
|
|
19
|
+
selectedRowKeys: selectedRowKeys,
|
|
20
|
+
onChange: onTableSelect,
|
|
21
|
+
getProps: function getProps(_ref) {
|
|
22
|
+
var id = _ref.id;
|
|
23
|
+
return {
|
|
24
|
+
disabled: !selectedRowKeys.includes(id) && selectedRowKeys.length >= limit
|
|
25
|
+
};
|
|
26
|
+
}
|
|
27
|
+
}
|
|
28
|
+
}, columnNodes);
|
|
29
|
+
}
|
|
@@ -83,7 +83,7 @@ var BatchAttrMetricDrawer = /*#__PURE__*/(0, _react.forwardRef)(function (_ref,
|
|
|
83
83
|
title: drawerTitle,
|
|
84
84
|
className: _indexModule["default"].drawer,
|
|
85
85
|
width: drawerWidth
|
|
86
|
-
}, /*#__PURE__*/_react["default"].createElement(_setting["default"], (0, _extends2["default"])({}, pageConfig, props, {
|
|
86
|
+
}, visible && /*#__PURE__*/_react["default"].createElement(_setting["default"], (0, _extends2["default"])({}, pageConfig, props, {
|
|
87
87
|
showType: showType,
|
|
88
88
|
cancelCb: setFalse,
|
|
89
89
|
saveCb: function saveCb(values) {
|
|
@@ -35,29 +35,24 @@ var utils = _interopRequireWildcard(require("./utils"));
|
|
|
35
35
|
|
|
36
36
|
var _indexModule = _interopRequireDefault(require("./index.module.scss"));
|
|
37
37
|
|
|
38
|
-
var _excluded = ["defaultSet", "allCiSet", "showType"];
|
|
38
|
+
var _excluded = ["value", "defaultSet", "allCiSet", "showType"];
|
|
39
39
|
|
|
40
40
|
function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
|
|
41
41
|
|
|
42
42
|
function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
|
|
43
43
|
|
|
44
44
|
var Setting = function Setting(_ref) {
|
|
45
|
-
var
|
|
45
|
+
var _ref$value = _ref.value,
|
|
46
|
+
value = _ref$value === void 0 ? {} : _ref$value,
|
|
47
|
+
defaultSet = _ref.defaultSet,
|
|
46
48
|
allCiSet = _ref.allCiSet,
|
|
47
49
|
showType = _ref.showType,
|
|
48
50
|
props = (0, _objectWithoutPropertiesLoose2["default"])(_ref, _excluded);
|
|
49
51
|
// const allCiSet = utils.dsTransform(props.allCiSet);
|
|
50
52
|
var limit = props.limit,
|
|
51
53
|
saveCb = props.saveCb,
|
|
52
|
-
topo = props.topo,
|
|
53
54
|
elementType = props.elementType;
|
|
54
55
|
|
|
55
|
-
var _topo$store$useModel = topo.store.useModel("topoMod"),
|
|
56
|
-
topoState = _topo$store$useModel[0],
|
|
57
|
-
topoDispatchers = _topo$store$useModel[1];
|
|
58
|
-
|
|
59
|
-
var resAndMetrics = topoState.resAndMetrics;
|
|
60
|
-
|
|
61
56
|
_rlog["default"].debug("Setting-resAndMetrics-allCiSet-elementType", showType, props, elementType);
|
|
62
57
|
|
|
63
58
|
_rlog["default"].debug("Setting----allCiSet", allCiSet);
|
|
@@ -70,11 +65,11 @@ var Setting = function Setting(_ref) {
|
|
|
70
65
|
search = _useState2[0],
|
|
71
66
|
setSearch = _useState2[1];
|
|
72
67
|
|
|
73
|
-
var _useState3 = (0, _react.useState)(
|
|
68
|
+
var _useState3 = (0, _react.useState)(value),
|
|
74
69
|
selected = _useState3[0],
|
|
75
70
|
setSelected = _useState3[1];
|
|
76
71
|
|
|
77
|
-
var selectedRowKeys = selected[ciType];
|
|
72
|
+
var selectedRowKeys = selected[ciType] || [];
|
|
78
73
|
|
|
79
74
|
var _RiilHooks$useTableCo = _hooks["default"].useTableColumn({
|
|
80
75
|
columns: utils.columns(showType, props.showCiNum)
|
|
@@ -99,17 +94,6 @@ var Setting = function Setting(_ref) {
|
|
|
99
94
|
};
|
|
100
95
|
|
|
101
96
|
var saveSelected = function saveSelected() {
|
|
102
|
-
_rlog["default"].debug("Setting-saveSelected", allCiSet, selected);
|
|
103
|
-
|
|
104
|
-
var newCiSet = utils.updateCiSetSeleted(selected, allCiSet, showType);
|
|
105
|
-
var newResAndMetrics = elementType === "node" ? (0, _extends2["default"])({}, resAndMetrics, {
|
|
106
|
-
allCiModSet: newCiSet
|
|
107
|
-
}) : (0, _extends2["default"])({}, resAndMetrics, {
|
|
108
|
-
allLinkModSet: newCiSet
|
|
109
|
-
});
|
|
110
|
-
topoDispatchers.update({
|
|
111
|
-
resAndMetrics: newResAndMetrics
|
|
112
|
-
});
|
|
113
97
|
saveCb(utils.saveTransform(selected));
|
|
114
98
|
};
|
|
115
99
|
|
|
@@ -5,6 +5,8 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
|
|
|
5
5
|
exports.__esModule = true;
|
|
6
6
|
exports["default"] = void 0;
|
|
7
7
|
|
|
8
|
+
var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
|
|
9
|
+
|
|
8
10
|
var _react = _interopRequireWildcard(require("react"));
|
|
9
11
|
|
|
10
12
|
var _componentTopologyGraph = require("@riil-frontend/component-topology-graph");
|
|
@@ -84,8 +86,18 @@ var ResourceDiplayInfoSetting = /*#__PURE__*/(0, _react.forwardRef)(function (pr
|
|
|
84
86
|
}
|
|
85
87
|
};
|
|
86
88
|
});
|
|
89
|
+
var newValue = (0, _react.useMemo)(function () {
|
|
90
|
+
var d = (0, _extends2["default"])({}, (value === null || value === void 0 ? void 0 : value.data) || {});
|
|
91
|
+
Object.keys(d).forEach(function (key) {
|
|
92
|
+
d[key] = (d[key] || []).map(function (item) {
|
|
93
|
+
return item.code + "-" + item.type;
|
|
94
|
+
});
|
|
95
|
+
});
|
|
96
|
+
return d;
|
|
97
|
+
}, [value]);
|
|
87
98
|
return /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement(_BatchAttrMetric["default"], {
|
|
88
99
|
ref: batchAttrMetric,
|
|
100
|
+
value: newValue,
|
|
89
101
|
allCiSet: markData,
|
|
90
102
|
limit: limit,
|
|
91
103
|
topo: topo,
|
|
@@ -50,7 +50,7 @@ var _topoFactory = _interopRequireDefault(require("./topoFactory"));
|
|
|
50
50
|
var _ElementTagTipConfig = _interopRequireDefault(require("./tagstips/ElementTagTipConfig"));
|
|
51
51
|
|
|
52
52
|
// eslint-disable-next-line no-undef
|
|
53
|
-
var version = typeof "5.0.
|
|
53
|
+
var version = typeof "5.0.16" === 'string' ? "5.0.16" : null;
|
|
54
54
|
console.info("\u62D3\u6251\u7248\u672C: " + version);
|
|
55
55
|
/**
|
|
56
56
|
* 拓扑显示和编辑
|
|
@@ -7,13 +7,14 @@ exports["default"] = WebConsoleContainer;
|
|
|
7
7
|
|
|
8
8
|
var _react = _interopRequireDefault(require("react"));
|
|
9
9
|
|
|
10
|
-
|
|
10
|
+
var _WebConsoleForm = _interopRequireDefault(require("./WebConsoleForm/WebConsoleForm"));
|
|
11
|
+
|
|
11
12
|
function WebConsoleContainer(props) {
|
|
12
13
|
var _topo$viewProps, _topo$viewProps$viewe;
|
|
13
14
|
|
|
14
15
|
var data = props.data,
|
|
15
16
|
topo = props.topo;
|
|
16
|
-
var WebConsoleForm = (_topo$viewProps = topo.viewProps) === null || _topo$viewProps === void 0 ? void 0 : (_topo$viewProps$viewe = _topo$viewProps.viewerProps) === null || _topo$viewProps$viewe === void 0 ? void 0 : _topo$viewProps$viewe.WebConsoleForm;
|
|
17
|
+
var WebConsoleForm = ((_topo$viewProps = topo.viewProps) === null || _topo$viewProps === void 0 ? void 0 : (_topo$viewProps$viewe = _topo$viewProps.viewerProps) === null || _topo$viewProps$viewe === void 0 ? void 0 : _topo$viewProps$viewe.WebConsoleForm) || _WebConsoleForm["default"];
|
|
17
18
|
|
|
18
19
|
if (!WebConsoleForm) {
|
|
19
20
|
return null;
|
|
@@ -5,19 +5,122 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
|
|
|
5
5
|
exports.__esModule = true;
|
|
6
6
|
exports["default"] = WebConsoleForm;
|
|
7
7
|
|
|
8
|
-
var
|
|
8
|
+
var _loading = _interopRequireDefault(require("@alifd/next/lib/loading"));
|
|
9
|
+
|
|
10
|
+
var _button = _interopRequireDefault(require("@alifd/next/lib/button"));
|
|
11
|
+
|
|
12
|
+
var _input = _interopRequireDefault(require("@alifd/next/lib/input"));
|
|
13
|
+
|
|
14
|
+
var _field = _interopRequireDefault(require("@alifd/next/lib/field"));
|
|
15
|
+
|
|
16
|
+
var _form = _interopRequireDefault(require("@alifd/next/lib/form"));
|
|
17
|
+
|
|
18
|
+
var _react = _interopRequireWildcard(require("react"));
|
|
9
19
|
|
|
10
20
|
var _useWebConsole2 = _interopRequireDefault(require("./hooks/useWebConsole"));
|
|
11
21
|
|
|
22
|
+
function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
|
|
23
|
+
|
|
24
|
+
function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
|
|
25
|
+
|
|
26
|
+
var FormItem = _form["default"].Item;
|
|
27
|
+
|
|
12
28
|
function WebConsoleForm(props) {
|
|
13
29
|
var ciId = props.ciId;
|
|
30
|
+
var ipv4Address = props.ciData.attributes.ipv4_address;
|
|
14
31
|
|
|
15
32
|
var _useWebConsole = (0, _useWebConsole2["default"])({
|
|
16
|
-
ciId: ciId
|
|
33
|
+
ciId: ciId,
|
|
34
|
+
ipv4Address: ipv4Address
|
|
17
35
|
}),
|
|
18
36
|
queryDataLoading = _useWebConsole.queryDataLoading,
|
|
19
37
|
webConsoleUrl = _useWebConsole.webConsoleUrl,
|
|
20
38
|
save = _useWebConsole.save;
|
|
21
39
|
|
|
22
|
-
|
|
40
|
+
var _useState = (0, _react.useState)(true),
|
|
41
|
+
isEdit = _useState[0],
|
|
42
|
+
handleInput = _useState[1];
|
|
43
|
+
|
|
44
|
+
var _useState2 = (0, _react.useState)(false),
|
|
45
|
+
isSave = _useState2[0],
|
|
46
|
+
handleSaveBtn = _useState2[1];
|
|
47
|
+
|
|
48
|
+
var _useState3 = (0, _react.useState)(false),
|
|
49
|
+
isShow = _useState3[0],
|
|
50
|
+
handleEdit = _useState3[1];
|
|
51
|
+
|
|
52
|
+
var field = _field["default"].useField({
|
|
53
|
+
autoUnmount: true,
|
|
54
|
+
values: {},
|
|
55
|
+
onChange: function onChange(name, value) {
|
|
56
|
+
field.getValue('url').length > 0 ? handleSaveBtn(false) : handleSaveBtn(true);
|
|
57
|
+
}
|
|
58
|
+
});
|
|
59
|
+
|
|
60
|
+
(0, _react.useEffect)(function () {
|
|
61
|
+
field.setValue('url', webConsoleUrl);
|
|
62
|
+
}, [webConsoleUrl]);
|
|
63
|
+
(0, _react.useEffect)(function () {
|
|
64
|
+
field.getError('url') == null ? handleSaveBtn(false) : handleSaveBtn(true);
|
|
65
|
+
}, [field.getError('url')]);
|
|
66
|
+
|
|
67
|
+
function handleEditLink() {
|
|
68
|
+
handleInput(false);
|
|
69
|
+
handleEdit(true);
|
|
70
|
+
}
|
|
71
|
+
|
|
72
|
+
function saveData() {
|
|
73
|
+
save(field.getValue('url'));
|
|
74
|
+
handleEdit(function (isShow) {
|
|
75
|
+
return !isShow;
|
|
76
|
+
});
|
|
77
|
+
handleInput(function (isEdit) {
|
|
78
|
+
return !isEdit;
|
|
79
|
+
});
|
|
80
|
+
}
|
|
81
|
+
|
|
82
|
+
return /*#__PURE__*/_react["default"].createElement(_loading["default"], {
|
|
83
|
+
visible: queryDataLoading
|
|
84
|
+
}, /*#__PURE__*/_react["default"].createElement("div", null, /*#__PURE__*/_react["default"].createElement(_form["default"], {
|
|
85
|
+
field: field,
|
|
86
|
+
labelAlign: "top"
|
|
87
|
+
}, /*#__PURE__*/_react["default"].createElement(FormItem, {
|
|
88
|
+
style: {
|
|
89
|
+
'paddingTop': '12px'
|
|
90
|
+
},
|
|
91
|
+
label: "\u94FE\u63A5",
|
|
92
|
+
maxLength: 1000,
|
|
93
|
+
minmaxLengthMessage: "\u94FE\u63A5\u957F\u5EA6\u4E0D\u80FD\u8D85\u8FC71000\u4E2A\u5B57\u7B26",
|
|
94
|
+
minmaxLengthTrigger: "onBlur",
|
|
95
|
+
format: "url",
|
|
96
|
+
formatMessage: "\u94FE\u63A5\u4E0D\u662F\u5408\u6CD5\u7684URL\u5730\u5740",
|
|
97
|
+
formatTrigger: "onBlur"
|
|
98
|
+
}, /*#__PURE__*/_react["default"].createElement(_input["default"], {
|
|
99
|
+
style: {
|
|
100
|
+
width: '358px',
|
|
101
|
+
height: '60px',
|
|
102
|
+
'bordeRadius': '4px'
|
|
103
|
+
},
|
|
104
|
+
name: "url",
|
|
105
|
+
placeholder: "\u8BF7\u8F93\u5165\u94FE\u63A5\u5730\u5740",
|
|
106
|
+
trim: true,
|
|
107
|
+
disabled: isEdit
|
|
108
|
+
})), /*#__PURE__*/_react["default"].createElement(FormItem, null, isShow ? /*#__PURE__*/_react["default"].createElement("div", null, /*#__PURE__*/_react["default"].createElement(_button["default"], {
|
|
109
|
+
type: "primary",
|
|
110
|
+
disabled: isSave,
|
|
111
|
+
onClick: saveData,
|
|
112
|
+
name: "baocun"
|
|
113
|
+
}, "\u4FDD\u5B58")) : /*#__PURE__*/_react["default"].createElement("div", null, /*#__PURE__*/_react["default"].createElement(_button["default"], {
|
|
114
|
+
component: "a",
|
|
115
|
+
type: "primary",
|
|
116
|
+
onClick: function onClick() {
|
|
117
|
+
window.open(field.getValue('url'));
|
|
118
|
+
}
|
|
119
|
+
}, "\u8BBF\u95EE"), /*#__PURE__*/_react["default"].createElement(_button["default"], {
|
|
120
|
+
type: "normal",
|
|
121
|
+
style: {
|
|
122
|
+
'marginLeft': '10px'
|
|
123
|
+
},
|
|
124
|
+
onClick: handleEditLink
|
|
125
|
+
}, "\u7F16\u8F91\u94FE\u63A5"))))));
|
|
23
126
|
}
|