@next-libs/cmdb-instances 6.48.0 → 6.49.0
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/dist/cjs/attribute-form-control-url/AttributeFormControlUrl.js +8 -23
- package/dist/cjs/attribute-form-control-url/AttributeFormControlUrl.js.map +1 -1
- package/dist/cjs/cmdb-instances-input-form/CmdbInstancesInputFormItem.js +3 -43
- package/dist/cjs/cmdb-instances-input-form/CmdbInstancesInputFormItem.js.map +1 -1
- package/dist/cjs/cmdb-instances-select-panel/CmdbInstancesSelectPanel.js +6 -45
- package/dist/cjs/cmdb-instances-select-panel/CmdbInstancesSelectPanel.js.map +1 -1
- package/dist/cjs/cmdb-url-link/CmdbUrlLink.js +0 -11
- package/dist/cjs/cmdb-url-link/CmdbUrlLink.js.map +1 -1
- package/dist/cjs/components/index.js +0 -4
- package/dist/cjs/components/index.js.map +1 -1
- package/dist/cjs/components/instance-format/index.js +0 -15
- package/dist/cjs/components/instance-format/index.js.map +1 -1
- package/dist/cjs/components/user-or-user-group-select/UserOrUserGroupSelect.js +33 -92
- package/dist/cjs/components/user-or-user-group-select/UserOrUserGroupSelect.js.map +1 -1
- package/dist/cjs/data-providers/fetchCmdbInstanceDetail.js +0 -3
- package/dist/cjs/data-providers/fetchCmdbInstanceDetail.js.map +1 -1
- package/dist/cjs/data-providers/fetchCmdbInstanceSearch.js +0 -2
- package/dist/cjs/data-providers/fetchCmdbInstanceSearch.js.map +1 -1
- package/dist/cjs/data-providers/fetchCmdbObjectDetail.js +0 -2
- package/dist/cjs/data-providers/fetchCmdbObjectDetail.js.map +1 -1
- package/dist/cjs/data-providers/fetchCmdbObjectList.js +0 -2
- package/dist/cjs/data-providers/fetchCmdbObjectList.js.map +1 -1
- package/dist/cjs/data-providers/fetchCmdbObjectRef.js +0 -2
- package/dist/cjs/data-providers/fetchCmdbObjectRef.js.map +1 -1
- package/dist/cjs/data-providers/index.js +0 -10
- package/dist/cjs/data-providers/index.js.map +1 -1
- package/dist/cjs/float-display-brick/FloatDisplayBrick.js +0 -7
- package/dist/cjs/float-display-brick/FloatDisplayBrick.js.map +1 -1
- package/dist/cjs/i18n/constants.js +0 -1
- package/dist/cjs/i18n/constants.js.map +1 -1
- package/dist/cjs/i18n/index.js +0 -7
- package/dist/cjs/i18n/index.js.map +1 -1
- package/dist/cjs/i18n/locales/en.js +0 -2
- package/dist/cjs/i18n/locales/en.js.map +1 -1
- package/dist/cjs/i18n/locales/zh.js +0 -2
- package/dist/cjs/i18n/locales/zh.js.map +1 -1
- package/dist/cjs/index.js +0 -29
- package/dist/cjs/index.js.map +1 -1
- package/dist/cjs/instance-attribute-form/InstanceAttributeForm.js +4 -25
- package/dist/cjs/instance-attribute-form/InstanceAttributeForm.js.map +1 -1
- package/dist/cjs/instance-detail/InstanceDetail.js +42 -124
- package/dist/cjs/instance-detail/InstanceDetail.js.map +1 -1
- package/dist/cjs/instance-detail/components/instance-relation-field-display/constants.js.map +1 -1
- package/dist/cjs/instance-detail/components/instance-relation-field-display/instance-relation-field-display.js +4 -19
- package/dist/cjs/instance-detail/components/instance-relation-field-display/instance-relation-field-display.js.map +1 -1
- package/dist/cjs/instance-detail/components/instance-relation-table-show/instance-relation-table-show.js +4 -11
- package/dist/cjs/instance-detail/components/instance-relation-table-show/instance-relation-table-show.js.map +1 -1
- package/dist/cjs/instance-detail/constants/index.js.map +1 -1
- package/dist/cjs/instance-list/IconButton.js +0 -18
- package/dist/cjs/instance-list/IconButton.js.map +1 -1
- package/dist/cjs/instance-list/InstanceList.js +47 -212
- package/dist/cjs/instance-list/InstanceList.js.map +1 -1
- package/dist/cjs/instance-list/constants.js +0 -7
- package/dist/cjs/instance-list/constants.js.map +1 -1
- package/dist/cjs/instance-list-modal/InstanceListModal.js +8 -32
- package/dist/cjs/instance-list-modal/InstanceListModal.js.map +1 -1
- package/dist/cjs/instance-list-table/AdvancedSearch.js +12 -133
- package/dist/cjs/instance-list-table/AdvancedSearch.js.map +1 -1
- package/dist/cjs/instance-list-table/AdvancedSearchCondition.js +3 -45
- package/dist/cjs/instance-list-table/AdvancedSearchCondition.js.map +1 -1
- package/dist/cjs/instance-list-table/DisplaySettings.js +0 -24
- package/dist/cjs/instance-list-table/DisplaySettings.js.map +1 -1
- package/dist/cjs/instance-list-table/DisplaySettingsModal.js +0 -10
- package/dist/cjs/instance-list-table/DisplaySettingsModal.js.map +1 -1
- package/dist/cjs/instance-list-table/DynamicSearch.js +4 -44
- package/dist/cjs/instance-list-table/DynamicSearch.js.map +1 -1
- package/dist/cjs/instance-list-table/InstanceListTable.js +30 -151
- package/dist/cjs/instance-list-table/InstanceListTable.js.map +1 -1
- package/dist/cjs/instance-list-table/MoreButtonsContainer.js +0 -15
- package/dist/cjs/instance-list-table/MoreButtonsContainer.js.map +1 -1
- package/dist/cjs/instance-list-table/constants.js +0 -2
- package/dist/cjs/instance-list-table/constants.js.map +1 -1
- package/dist/cjs/instance-list-table/data-providers/fetchCmdbInstanceAggregateCount.js +0 -2
- package/dist/cjs/instance-list-table/data-providers/fetchCmdbInstanceAggregateCount.js.map +1 -1
- package/dist/cjs/instance-list-table/data-providers/fetchCmdbInstanceCount.js +0 -2
- package/dist/cjs/instance-list-table/data-providers/fetchCmdbInstanceCount.js.map +1 -1
- package/dist/cjs/instance-list-table/data-providers/fetchCmdbInstanceDetail.js +0 -2
- package/dist/cjs/instance-list-table/data-providers/fetchCmdbInstanceDetail.js.map +1 -1
- package/dist/cjs/instance-list-table/data-providers/fetchCmdbObjectDetail.js +0 -2
- package/dist/cjs/instance-list-table/data-providers/fetchCmdbObjectDetail.js.map +1 -1
- package/dist/cjs/instance-list-table/data-providers/fetchPermRoleList.js +0 -2
- package/dist/cjs/instance-list-table/data-providers/fetchPermRoleList.js.map +1 -1
- package/dist/cjs/instance-list-table/data-providers/fetchPermissionList.js +0 -2
- package/dist/cjs/instance-list-table/data-providers/fetchPermissionList.js.map +1 -1
- package/dist/cjs/instance-list-table/data-providers/getDefaultValueTemplate.js +1 -2
- package/dist/cjs/instance-list-table/data-providers/getDefaultValueTemplate.js.map +1 -1
- package/dist/cjs/instance-list-table/data-providers/index.js +0 -16
- package/dist/cjs/instance-list-table/data-providers/index.js.map +1 -1
- package/dist/cjs/instance-list-table/data-providers/searchCmdbInstances.js +0 -2
- package/dist/cjs/instance-list-table/data-providers/searchCmdbInstances.js.map +1 -1
- package/dist/cjs/instance-list-table/index.js +0 -12
- package/dist/cjs/instance-list-table/index.js.map +1 -1
- package/dist/cjs/instance-list-table/utils.js +0 -24
- package/dist/cjs/instance-list-table/utils.js.map +1 -1
- package/dist/cjs/model-attribute-form/ModelAttributeForm.js +27 -99
- package/dist/cjs/model-attribute-form/ModelAttributeForm.js.map +1 -1
- package/dist/cjs/model-attribute-form/constants.js.map +1 -1
- package/dist/cjs/model-attribute-form-control/ModelAttributeFormControl.js +13 -94
- package/dist/cjs/model-attribute-form-control/ModelAttributeFormControl.js.map +1 -1
- package/dist/cjs/model-relation-form/ModelRelationForm.js +0 -18
- package/dist/cjs/model-relation-form/ModelRelationForm.js.map +1 -1
- package/dist/cjs/processors.js +2 -21
- package/dist/cjs/processors.js.map +1 -1
- package/dist/cjs/struct-components/AddStruct.js +4 -15
- package/dist/cjs/struct-components/AddStruct.js.map +1 -1
- package/dist/cjs/struct-components/AddStructModal.js +0 -48
- package/dist/cjs/struct-components/AddStructModal.js.map +1 -1
- package/dist/cjs/struct-components/StructTable.js +2 -32
- package/dist/cjs/struct-components/StructTable.js.map +1 -1
- package/dist/cjs/struct-components/index.js +0 -8
- package/dist/cjs/struct-components/index.js.map +1 -1
- package/dist/cjs/struct-components/interfaces.js +0 -1
- package/dist/cjs/struct-components/interfaces.js.map +1 -1
- package/dist/cjs/struct-components/mockData.js.map +1 -1
- package/dist/esm/attribute-form-control-url/AttributeFormControlUrl.js +8 -18
- package/dist/esm/attribute-form-control-url/AttributeFormControlUrl.js.map +1 -1
- package/dist/esm/cmdb-instances-input-form/CmdbInstancesInputFormItem.js +3 -35
- package/dist/esm/cmdb-instances-input-form/CmdbInstancesInputFormItem.js.map +1 -1
- package/dist/esm/cmdb-instances-select-panel/CmdbInstancesSelectPanel.js +4 -32
- package/dist/esm/cmdb-instances-select-panel/CmdbInstancesSelectPanel.js.map +1 -1
- package/dist/esm/cmdb-url-link/CmdbUrlLink.js +0 -3
- package/dist/esm/cmdb-url-link/CmdbUrlLink.js.map +1 -1
- package/dist/esm/components/index.js.map +1 -1
- package/dist/esm/components/instance-format/index.js +0 -5
- package/dist/esm/components/instance-format/index.js.map +1 -1
- package/dist/esm/components/user-or-user-group-select/UserOrUserGroupSelect.js +19 -74
- package/dist/esm/components/user-or-user-group-select/UserOrUserGroupSelect.js.map +1 -1
- package/dist/esm/data-providers/fetchCmdbInstanceDetail.js.map +1 -1
- package/dist/esm/data-providers/fetchCmdbInstanceSearch.js.map +1 -1
- package/dist/esm/data-providers/fetchCmdbObjectDetail.js.map +1 -1
- package/dist/esm/data-providers/fetchCmdbObjectList.js.map +1 -1
- package/dist/esm/data-providers/fetchCmdbObjectRef.js.map +1 -1
- package/dist/esm/data-providers/index.js.map +1 -1
- package/dist/esm/float-display-brick/FloatDisplayBrick.js +0 -1
- package/dist/esm/float-display-brick/FloatDisplayBrick.js.map +1 -1
- package/dist/esm/i18n/constants.js +0 -1
- package/dist/esm/i18n/constants.js.map +1 -1
- package/dist/esm/i18n/index.js +2 -1
- package/dist/esm/i18n/index.js.map +1 -1
- package/dist/esm/i18n/locales/en.js.map +1 -1
- package/dist/esm/i18n/locales/zh.js.map +1 -1
- package/dist/esm/index.js +2 -2
- package/dist/esm/index.js.map +1 -1
- package/dist/esm/instance-attribute-form/InstanceAttributeForm.js +4 -10
- package/dist/esm/instance-attribute-form/InstanceAttributeForm.js.map +1 -1
- package/dist/esm/instance-detail/InstanceDetail.js +36 -111
- package/dist/esm/instance-detail/InstanceDetail.js.map +1 -1
- package/dist/esm/instance-detail/components/instance-relation-field-display/constants.js.map +1 -1
- package/dist/esm/instance-detail/components/instance-relation-field-display/instance-relation-field-display.js +4 -10
- package/dist/esm/instance-detail/components/instance-relation-field-display/instance-relation-field-display.js.map +1 -1
- package/dist/esm/instance-detail/components/instance-relation-table-show/instance-relation-table-show.js +2 -2
- package/dist/esm/instance-detail/components/instance-relation-table-show/instance-relation-table-show.js.map +1 -1
- package/dist/esm/instance-detail/constants/index.js.map +1 -1
- package/dist/esm/instance-list/IconButton.js +0 -8
- package/dist/esm/instance-list/IconButton.js.map +1 -1
- package/dist/esm/instance-list/InstanceList.js +41 -182
- package/dist/esm/instance-list/InstanceList.js.map +1 -1
- package/dist/esm/instance-list/constants.js +0 -2
- package/dist/esm/instance-list/constants.js.map +1 -1
- package/dist/esm/instance-list-modal/InstanceListModal.js +8 -20
- package/dist/esm/instance-list-modal/InstanceListModal.js.map +1 -1
- package/dist/esm/instance-list-table/AdvancedSearch.js +10 -119
- package/dist/esm/instance-list-table/AdvancedSearch.js.map +1 -1
- package/dist/esm/instance-list-table/AdvancedSearchCondition.js +1 -31
- package/dist/esm/instance-list-table/AdvancedSearchCondition.js.map +1 -1
- package/dist/esm/instance-list-table/DisplaySettings.js +0 -16
- package/dist/esm/instance-list-table/DisplaySettings.js.map +1 -1
- package/dist/esm/instance-list-table/DisplaySettingsModal.js +0 -3
- package/dist/esm/instance-list-table/DisplaySettingsModal.js.map +1 -1
- package/dist/esm/instance-list-table/DynamicSearch.js +0 -34
- package/dist/esm/instance-list-table/DynamicSearch.js.map +1 -1
- package/dist/esm/instance-list-table/InstanceListTable.js +23 -138
- package/dist/esm/instance-list-table/InstanceListTable.js.map +1 -1
- package/dist/esm/instance-list-table/MoreButtonsContainer.js +0 -7
- package/dist/esm/instance-list-table/MoreButtonsContainer.js.map +1 -1
- package/dist/esm/instance-list-table/constants.js +0 -2
- package/dist/esm/instance-list-table/constants.js.map +1 -1
- package/dist/esm/instance-list-table/data-providers/fetchCmdbInstanceAggregateCount.js.map +1 -1
- package/dist/esm/instance-list-table/data-providers/fetchCmdbInstanceCount.js.map +1 -1
- package/dist/esm/instance-list-table/data-providers/fetchCmdbInstanceDetail.js.map +1 -1
- package/dist/esm/instance-list-table/data-providers/fetchCmdbObjectDetail.js.map +1 -1
- package/dist/esm/instance-list-table/data-providers/fetchPermRoleList.js.map +1 -1
- package/dist/esm/instance-list-table/data-providers/fetchPermissionList.js.map +1 -1
- package/dist/esm/instance-list-table/data-providers/getDefaultValueTemplate.js +1 -1
- package/dist/esm/instance-list-table/data-providers/getDefaultValueTemplate.js.map +1 -1
- package/dist/esm/instance-list-table/data-providers/index.js.map +1 -1
- package/dist/esm/instance-list-table/data-providers/searchCmdbInstances.js.map +1 -1
- package/dist/esm/instance-list-table/index.js.map +1 -1
- package/dist/esm/instance-list-table/utils.js +0 -15
- package/dist/esm/instance-list-table/utils.js.map +1 -1
- package/dist/esm/model-attribute-form/ModelAttributeForm.js +19 -92
- package/dist/esm/model-attribute-form/ModelAttributeForm.js.map +1 -1
- package/dist/esm/model-attribute-form/constants.js.map +1 -1
- package/dist/esm/model-attribute-form-control/ModelAttributeFormControl.js +27 -102
- package/dist/esm/model-attribute-form-control/ModelAttributeFormControl.js.map +1 -1
- package/dist/esm/model-relation-form/ModelRelationForm.js +0 -10
- package/dist/esm/model-relation-form/ModelRelationForm.js.map +1 -1
- package/dist/esm/processors.js +2 -7
- package/dist/esm/processors.js.map +1 -1
- package/dist/esm/struct-components/AddStruct.js +4 -9
- package/dist/esm/struct-components/AddStruct.js.map +1 -1
- package/dist/esm/struct-components/AddStructModal.js +0 -36
- package/dist/esm/struct-components/AddStructModal.js.map +1 -1
- package/dist/esm/struct-components/StructTable.js +2 -26
- package/dist/esm/struct-components/StructTable.js.map +1 -1
- package/dist/esm/struct-components/index.js.map +1 -1
- package/dist/esm/struct-components/interfaces.js +0 -1
- package/dist/esm/struct-components/interfaces.js.map +1 -1
- package/dist/esm/struct-components/mockData.js.map +1 -1
- package/package.json +9 -9
- package/CHANGELOG.md +0 -3687
|
@@ -24,29 +24,24 @@ import { CmdbUrlLink } from "../cmdb-url-link/CmdbUrlLink";
|
|
|
24
24
|
import { FloatDisplayBrick } from "../float-display-brick/FloatDisplayBrick";
|
|
25
25
|
export function attrFilter(field, modelData) {
|
|
26
26
|
var _IGNORED_FIELDS$model, _left_groups;
|
|
27
|
-
|
|
28
27
|
if ((_IGNORED_FIELDS$model = IGNORED_FIELDS[modelData.objectId]) !== null && _IGNORED_FIELDS$model !== void 0 && _IGNORED_FIELDS$model.includes(field.__id)) {
|
|
29
28
|
return false;
|
|
30
29
|
}
|
|
31
|
-
|
|
32
|
-
|
|
30
|
+
return (
|
|
31
|
+
//非关系、left_groups包含basic_info、有left_tags且在分类中
|
|
33
32
|
!field.__isRelation || field.__isRelation && ((_left_groups = field.left_groups) === null || _left_groups === void 0 ? void 0 : _left_groups.includes(BASIC_INFORMATION_RELATION_GROUP_ID)) || modelData.view.attr_category_order.includes(field.left_tags[0])
|
|
34
33
|
);
|
|
35
34
|
}
|
|
36
|
-
|
|
37
35
|
function getHref(hash) {
|
|
38
36
|
var isHash = (hash || "").startsWith("#");
|
|
39
|
-
|
|
40
37
|
if (!isHash) {
|
|
41
38
|
return hash;
|
|
42
39
|
}
|
|
43
|
-
|
|
44
40
|
var history = getHistory();
|
|
45
41
|
return history.createHref(_objectSpread(_objectSpread({}, history.location), {}, {
|
|
46
42
|
hash
|
|
47
43
|
}));
|
|
48
44
|
}
|
|
49
|
-
|
|
50
45
|
export class LegacyInstanceDetail extends React.Component {
|
|
51
46
|
constructor(props) {
|
|
52
47
|
super(props);
|
|
@@ -76,10 +71,8 @@ export class LegacyInstanceDetail extends React.Component {
|
|
|
76
71
|
initOffset: 0
|
|
77
72
|
};
|
|
78
73
|
}
|
|
79
|
-
|
|
80
74
|
render() {
|
|
81
75
|
var _this$props$brickConf;
|
|
82
|
-
|
|
83
76
|
var {
|
|
84
77
|
loaded,
|
|
85
78
|
currentAttr,
|
|
@@ -138,12 +131,15 @@ export class LegacyInstanceDetail extends React.Component {
|
|
|
138
131
|
}
|
|
139
132
|
})))))
|
|
140
133
|
);
|
|
141
|
-
}
|
|
134
|
+
}
|
|
135
|
+
|
|
136
|
+
// TODO:
|
|
142
137
|
// setFormattedInstanceData(state: LegacyInstanceDetailState): void {
|
|
143
138
|
// const { modelData, instanceData } = state;
|
|
144
139
|
// const baseAttrList = modelData.attrList.filter(
|
|
145
140
|
// attr => !["FK", "FKs"].includes(attr.value.type)
|
|
146
141
|
// );
|
|
142
|
+
|
|
147
143
|
// this.setState({
|
|
148
144
|
// formattedInstanceData: baseAttrList.reduce((acc, attr) => {
|
|
149
145
|
// acc[attr.id] = cmdbFieldValueFormat(
|
|
@@ -156,7 +152,6 @@ export class LegacyInstanceDetail extends React.Component {
|
|
|
156
152
|
// });
|
|
157
153
|
// }
|
|
158
154
|
|
|
159
|
-
|
|
160
155
|
getCardTitle() {
|
|
161
156
|
var {
|
|
162
157
|
instanceData,
|
|
@@ -178,22 +173,20 @@ export class LegacyInstanceDetail extends React.Component {
|
|
|
178
173
|
marginLeft: "6px"
|
|
179
174
|
}
|
|
180
175
|
})));
|
|
181
|
-
}
|
|
182
|
-
|
|
176
|
+
}
|
|
183
177
|
|
|
178
|
+
// istanbul ignore next
|
|
184
179
|
onActionClick(eventName) {
|
|
185
180
|
if (this.props.onActionClick) {
|
|
186
181
|
this.props.onActionClick(eventName);
|
|
187
182
|
}
|
|
188
183
|
}
|
|
189
|
-
|
|
190
184
|
getCardExtra() {
|
|
191
185
|
var {
|
|
192
186
|
buttonActions,
|
|
193
187
|
dropdownActions
|
|
194
188
|
} = this.state;
|
|
195
189
|
var menu;
|
|
196
|
-
|
|
197
190
|
if (dropdownActions && dropdownActions.length > 0) {
|
|
198
191
|
menu = /*#__PURE__*/React.createElement(Menu, null, dropdownActions.map((action, index) => {
|
|
199
192
|
if (action.url) {
|
|
@@ -214,7 +207,6 @@ export class LegacyInstanceDetail extends React.Component {
|
|
|
214
207
|
}
|
|
215
208
|
}));
|
|
216
209
|
}
|
|
217
|
-
|
|
218
210
|
return /*#__PURE__*/React.createElement("div", {
|
|
219
211
|
className: style.instanceDetailActions
|
|
220
212
|
}, buttonActions && buttonActions.map((action, index) => {
|
|
@@ -233,19 +225,16 @@ export class LegacyInstanceDetail extends React.Component {
|
|
|
233
225
|
}), menu && /*#__PURE__*/React.createElement(Dropdown, {
|
|
234
226
|
overlay: menu
|
|
235
227
|
}, /*#__PURE__*/React.createElement("a", null, i18n.t("".concat(NS_LIBS_CMDB_INSTANCES, ":").concat(K.MORE)), " ", /*#__PURE__*/React.createElement(DownOutlined, null))));
|
|
236
|
-
}
|
|
237
|
-
|
|
238
|
-
|
|
228
|
+
}
|
|
229
|
+
// istanbul ignore next (Temporarily ignored)
|
|
239
230
|
scrollToTarget() {
|
|
240
231
|
var _ref, _document$getElementB, _document$getElementB2;
|
|
241
|
-
|
|
242
|
-
|
|
243
|
-
|
|
232
|
+
var target = document.getElementById(location.hash.slice(1));
|
|
233
|
+
// istanbul ignore next (Temporarily ignored)
|
|
244
234
|
var initOffset = (_ref = ((_document$getElementB = (_document$getElementB2 = document.getElementById("basic-group-0")) === null || _document$getElementB2 === void 0 ? void 0 : _document$getElementB2.offsetTop) !== null && _document$getElementB !== void 0 ? _document$getElementB : 0) + this.props.anchorOffset) !== null && _ref !== void 0 ? _ref : 0 + 30;
|
|
245
235
|
this.setState({
|
|
246
236
|
initOffset
|
|
247
237
|
});
|
|
248
|
-
|
|
249
238
|
if (target) {
|
|
250
239
|
setTimeout(() => {
|
|
251
240
|
window.scrollTo({
|
|
@@ -254,7 +243,6 @@ export class LegacyInstanceDetail extends React.Component {
|
|
|
254
243
|
});
|
|
255
244
|
}
|
|
256
245
|
}
|
|
257
|
-
|
|
258
246
|
getCardContent() {
|
|
259
247
|
var {
|
|
260
248
|
basicInfoGroupList,
|
|
@@ -291,17 +279,14 @@ export class LegacyInstanceDetail extends React.Component {
|
|
|
291
279
|
className: "".concat(i > 0 ? style.offsetMargin : "", " ").concat(style.groupName)
|
|
292
280
|
}, basicInfoGroup.name), basicInfoGroup.attrList.map((attr, index) => {
|
|
293
281
|
var _attr$tag, _basicInfoGroupList$;
|
|
294
|
-
|
|
295
282
|
//当前模型的一对一关系模型的详情并且为基本信息的第一个属性时,跳转到该关系模型的详情页
|
|
296
283
|
//第一个属性为关系时,取第二个属性,如此类推
|
|
297
284
|
if (this.props.isRelationInstanceDetail && (attr === null || attr === void 0 ? void 0 : (_attr$tag = attr.tag) === null || _attr$tag === void 0 ? void 0 : _attr$tag[0]) === (basicInfoGroupList === null || basicInfoGroupList === void 0 ? void 0 : (_basicInfoGroupList$ = basicInfoGroupList[0]) === null || _basicInfoGroupList$ === void 0 ? void 0 : _basicInfoGroupList$.name) && index === basicInfoGroup.attrList.findIndex(r => !r.__isRelation)) {
|
|
298
285
|
return this.getAttrListNode(attr, true);
|
|
299
286
|
}
|
|
300
|
-
|
|
301
287
|
return this.getAttrListNode(attr);
|
|
302
288
|
})))));
|
|
303
289
|
}
|
|
304
|
-
|
|
305
290
|
getNewProperties(oldProperties, field) {
|
|
306
291
|
return mapValues(oldProperties, propValue => {
|
|
307
292
|
// istanbul ignore else
|
|
@@ -312,7 +297,6 @@ export class LegacyInstanceDetail extends React.Component {
|
|
|
312
297
|
return this.getNewProperties(propValue, field);
|
|
313
298
|
} else if (isString(propValue)) {
|
|
314
299
|
var regex = new RegExp("#\\{" + field + "\\}\\.(\\w+)", "g");
|
|
315
|
-
|
|
316
300
|
if (regex.test(propValue)) {
|
|
317
301
|
return this.state[field][propValue.replace(regex, "$1")];
|
|
318
302
|
} else {
|
|
@@ -322,12 +306,11 @@ export class LegacyInstanceDetail extends React.Component {
|
|
|
322
306
|
return propValue;
|
|
323
307
|
}
|
|
324
308
|
});
|
|
325
|
-
}
|
|
326
|
-
|
|
309
|
+
}
|
|
327
310
|
|
|
311
|
+
// istanbul ignore next
|
|
328
312
|
getAttrListNode(attr, linkFlag) {
|
|
329
313
|
var _instanceData$attr$__, _instanceData$attr$__2;
|
|
330
|
-
|
|
331
314
|
var {
|
|
332
315
|
isStruct,
|
|
333
316
|
isStructs,
|
|
@@ -344,18 +327,15 @@ export class LegacyInstanceDetail extends React.Component {
|
|
|
344
327
|
var config;
|
|
345
328
|
var isComponentMode = false;
|
|
346
329
|
var attrCustomConfig;
|
|
347
|
-
|
|
348
330
|
if (this.props.attributeConfigs) {
|
|
349
331
|
config = this.props.attributeConfigs[attr.id];
|
|
350
332
|
}
|
|
351
|
-
|
|
352
333
|
if (this.props.attrCustomConfigs) {
|
|
353
334
|
// attrCustomConfig = cloneDeep(this.props.attrCustomConfigs[attr.id]);
|
|
354
335
|
attrCustomConfig = this.props.attrCustomConfigs[attr.id];
|
|
355
|
-
|
|
356
336
|
if (attrCustomConfig) {
|
|
357
|
-
isComponentMode = true;
|
|
358
|
-
|
|
337
|
+
isComponentMode = true;
|
|
338
|
+
// istanbul ignore next (`component` is deprecated)
|
|
359
339
|
if (attrCustomConfig.component) {
|
|
360
340
|
// eslint-disable-next-line no-console
|
|
361
341
|
console.warn("`component` of `<cmdb-instances.instance-detail>.attrCustomConfigs[attrId].component` is deprecated, use `useBrick` instead.");
|
|
@@ -365,7 +345,6 @@ export class LegacyInstanceDetail extends React.Component {
|
|
|
365
345
|
}
|
|
366
346
|
}
|
|
367
347
|
}
|
|
368
|
-
|
|
369
348
|
return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("dt", {
|
|
370
349
|
className: isStruct(attr) || isStructs(attr) || isRelation(attr) || attr.__isRelation || isMarkdownField(attr) || config && config.isWholeLine ? style.structAttr : style.basicAttr
|
|
371
350
|
}, attr.__isRelation ? attr.right_description : attr.name, attr.description && attr.description !== "" && /*#__PURE__*/React.createElement(Tooltip, {
|
|
@@ -425,24 +404,20 @@ export class LegacyInstanceDetail extends React.Component {
|
|
|
425
404
|
structData: instanceData[attr.id],
|
|
426
405
|
isEditable: false
|
|
427
406
|
})));
|
|
428
|
-
}
|
|
429
|
-
|
|
430
|
-
|
|
407
|
+
}
|
|
408
|
+
// istanbul ignore next
|
|
431
409
|
handleRelationModal(attr) {
|
|
432
410
|
var _this = this;
|
|
433
|
-
|
|
434
411
|
return _asyncToGenerator(function* () {
|
|
435
412
|
yield _this.searchInstanceRelationData(1, 10, attr);
|
|
436
413
|
})();
|
|
437
|
-
}
|
|
438
|
-
|
|
414
|
+
}
|
|
439
415
|
|
|
416
|
+
// istanbul ignore next
|
|
440
417
|
searchInstanceRelationData(page, pageSize, attr) {
|
|
441
418
|
var _this2 = this;
|
|
442
|
-
|
|
443
419
|
return _asyncToGenerator(function* () {
|
|
444
420
|
var _modelData$view;
|
|
445
|
-
|
|
446
421
|
var {
|
|
447
422
|
right_id,
|
|
448
423
|
left_object_id,
|
|
@@ -455,17 +430,14 @@ export class LegacyInstanceDetail extends React.Component {
|
|
|
455
430
|
modelDataMap
|
|
456
431
|
} = _this2.state;
|
|
457
432
|
var hideColumns = (modelData === null || modelData === void 0 ? void 0 : (_modelData$view = modelData.view) === null || _modelData$view === void 0 ? void 0 : _modelData$view.hide_columns) || [];
|
|
458
|
-
|
|
459
433
|
if (left_object_id === modelData.objectId && !hideColumns.includes(left_id)) {
|
|
460
434
|
objectId = right_object_id;
|
|
461
435
|
queryId = right_id;
|
|
462
436
|
}
|
|
463
|
-
|
|
464
437
|
if (right_object_id === modelData.objectId && !hideColumns.includes(right_id)) {
|
|
465
438
|
objectId = left_object_id;
|
|
466
439
|
queryId = left_id;
|
|
467
440
|
}
|
|
468
|
-
|
|
469
441
|
var fields = uniq(map(modelDataMap[objectId].attrList, "id"));
|
|
470
442
|
var params = {
|
|
471
443
|
fields,
|
|
@@ -479,15 +451,14 @@ export class LegacyInstanceDetail extends React.Component {
|
|
|
479
451
|
}
|
|
480
452
|
};
|
|
481
453
|
var instanceRelationModalData = yield fetchCmdbInstanceSearch(objectId, params);
|
|
482
|
-
|
|
483
454
|
_this2.setState({
|
|
484
455
|
instanceRelationModalData,
|
|
485
456
|
currentAttr: attr
|
|
486
457
|
});
|
|
487
458
|
})();
|
|
488
|
-
}
|
|
489
|
-
|
|
459
|
+
}
|
|
490
460
|
|
|
461
|
+
// istanbul ignore next
|
|
491
462
|
formatBasicInfoGroupList(modelData, basicInfoGroupList) {
|
|
492
463
|
// let { modelData, basicInfoGroupList } = state;
|
|
493
464
|
var {
|
|
@@ -496,12 +467,10 @@ export class LegacyInstanceDetail extends React.Component {
|
|
|
496
467
|
} = this.props;
|
|
497
468
|
var basicInfoAttrList;
|
|
498
469
|
basicInfoGroupList = [];
|
|
499
|
-
|
|
500
470
|
if (fieldsByTag) {
|
|
501
471
|
basicInfoGroupList = map(fieldsByTag, tag => {
|
|
502
472
|
var attrList = compact(map(tag.fields, attr => {
|
|
503
473
|
var matched = modelData.__fieldList.find(field => field.__id === attr);
|
|
504
|
-
|
|
505
474
|
return matched;
|
|
506
475
|
}));
|
|
507
476
|
return {
|
|
@@ -514,7 +483,6 @@ export class LegacyInstanceDetail extends React.Component {
|
|
|
514
483
|
if (attributeKeys !== null && attributeKeys !== void 0 && attributeKeys.length) {
|
|
515
484
|
basicInfoAttrList = attributeKeys.map(attr => {
|
|
516
485
|
var matched = modelData.__fieldList.find(field => field.__id === attr);
|
|
517
|
-
|
|
518
486
|
if (matched && attrFilter(matched, modelData)) {
|
|
519
487
|
return matched;
|
|
520
488
|
}
|
|
@@ -522,14 +490,11 @@ export class LegacyInstanceDetail extends React.Component {
|
|
|
522
490
|
} else {
|
|
523
491
|
basicInfoAttrList = modelData.__fieldList.filter(field => attrFilter(field, modelData));
|
|
524
492
|
}
|
|
525
|
-
|
|
526
493
|
basicInfoAttrList.forEach(field => {
|
|
527
494
|
var groupTag;
|
|
528
495
|
var nameKey = getInstanceNameKeys(modelData)[0];
|
|
529
|
-
|
|
530
496
|
if (field.__isRelation) {
|
|
531
497
|
var _field$left_tags;
|
|
532
|
-
|
|
533
498
|
groupTag = (_field$left_tags = field.left_tags) !== null && _field$left_tags !== void 0 && _field$left_tags.length && field.left_tags[0].trim() !== "" ? field.left_tags[0] : "";
|
|
534
499
|
/*
|
|
535
500
|
原有逻辑,没有tag会根据默认在基本信息中展示,导致删除了的关系在实例详情中还存在。
|
|
@@ -539,13 +504,10 @@ export class LegacyInstanceDetail extends React.Component {
|
|
|
539
504
|
*/
|
|
540
505
|
} else {
|
|
541
506
|
var _field$tag;
|
|
542
|
-
|
|
543
507
|
var basicInfoText = i18n.t("".concat(NS_LIBS_CMDB_INSTANCES, ":").concat(K.BASIC_INFORMATION));
|
|
544
508
|
groupTag = ((_field$tag = field.tag) === null || _field$tag === void 0 ? void 0 : _field$tag.length) > 0 ? field.tag[0] || basicInfoText : basicInfoText;
|
|
545
509
|
}
|
|
546
|
-
|
|
547
510
|
var basicInfoGroup = basicInfoGroupList.find(item => item.name === groupTag);
|
|
548
|
-
|
|
549
511
|
if (basicInfoGroup) {
|
|
550
512
|
field.id === nameKey ? basicInfoGroup["attrList"].unshift(field) : basicInfoGroup["attrList"].push(field);
|
|
551
513
|
} else {
|
|
@@ -556,9 +518,8 @@ export class LegacyInstanceDetail extends React.Component {
|
|
|
556
518
|
});
|
|
557
519
|
}
|
|
558
520
|
});
|
|
559
|
-
}
|
|
560
|
-
|
|
561
|
-
|
|
521
|
+
}
|
|
522
|
+
// 用于处理分类排序失效问题
|
|
562
523
|
var basicInfoGroups = [];
|
|
563
524
|
var basicInfoGroupNameList = basicInfoGroupList.map(basicInfo => basicInfo.name);
|
|
564
525
|
var attrCategoryOrder = modelData.view.attr_category_order.filter(category => basicInfoGroupNameList.includes(category));
|
|
@@ -567,9 +528,9 @@ export class LegacyInstanceDetail extends React.Component {
|
|
|
567
528
|
basicInfoGroups[index] = v;
|
|
568
529
|
});
|
|
569
530
|
return basicInfoGroups;
|
|
570
|
-
}
|
|
571
|
-
|
|
531
|
+
}
|
|
572
532
|
|
|
533
|
+
// istanbul ignore next
|
|
573
534
|
setBasicInfoGroupList(state) {
|
|
574
535
|
var {
|
|
575
536
|
modelData,
|
|
@@ -581,57 +542,46 @@ export class LegacyInstanceDetail extends React.Component {
|
|
|
581
542
|
basicInfoGroupListShow: basicInfoList
|
|
582
543
|
});
|
|
583
544
|
}
|
|
584
|
-
|
|
585
545
|
componentDidUpdate(prevProps) {
|
|
586
546
|
var _this3 = this;
|
|
587
|
-
|
|
588
547
|
if (this.props.objectId && this.props.instanceId && prevProps.instanceId !== this.props.instanceId) {
|
|
589
548
|
_asyncToGenerator(function* () {
|
|
590
549
|
return yield _this3.fetchData(_this3.props);
|
|
591
550
|
})();
|
|
592
551
|
}
|
|
593
552
|
}
|
|
594
|
-
|
|
595
553
|
componentDidMount() {
|
|
596
554
|
var _this4 = this;
|
|
597
|
-
|
|
598
555
|
return _asyncToGenerator(function* () {
|
|
599
556
|
if (_this4.props.actions) {
|
|
600
557
|
var buttonActions = [];
|
|
601
558
|
var dropdownActions = [];
|
|
602
|
-
|
|
603
559
|
_this4.props.actions.forEach(action => {
|
|
604
560
|
switch (action.type) {
|
|
605
561
|
case "dropdown":
|
|
606
562
|
dropdownActions.push(action);
|
|
607
563
|
break;
|
|
608
|
-
|
|
609
564
|
case "button":
|
|
610
565
|
default:
|
|
611
566
|
buttonActions.push(action);
|
|
612
567
|
break;
|
|
613
568
|
}
|
|
614
569
|
});
|
|
615
|
-
|
|
616
570
|
_this4.setState({
|
|
617
571
|
buttonActions,
|
|
618
572
|
dropdownActions
|
|
619
573
|
});
|
|
620
574
|
}
|
|
621
|
-
|
|
622
575
|
if (_this4.props.instanceId && _this4.props.objectId) {
|
|
623
576
|
yield _this4.fetchData(_this4.props);
|
|
624
577
|
}
|
|
625
|
-
|
|
626
578
|
_this4.scrollToTarget();
|
|
627
579
|
})();
|
|
628
580
|
}
|
|
629
|
-
|
|
630
581
|
toggleBasicInfoGroupFilter(basicInfoGroup) {
|
|
631
582
|
var {
|
|
632
583
|
basicInfoGroupList
|
|
633
584
|
} = this.state;
|
|
634
|
-
|
|
635
585
|
if (!basicInfoGroup.active) {
|
|
636
586
|
basicInfoGroupList.forEach(item => {
|
|
637
587
|
item.active = false;
|
|
@@ -644,20 +594,17 @@ export class LegacyInstanceDetail extends React.Component {
|
|
|
644
594
|
basicInfoGroupListShow: basicInfoGroupList
|
|
645
595
|
});
|
|
646
596
|
}
|
|
647
|
-
|
|
648
597
|
basicInfoGroup.active = !basicInfoGroup.active;
|
|
649
|
-
}
|
|
650
|
-
|
|
598
|
+
}
|
|
651
599
|
|
|
600
|
+
// istanbul ignore next
|
|
652
601
|
getInstanceDetailData(props, modelDataMap) {
|
|
653
602
|
var modelData = modelDataMap[props.objectId];
|
|
654
603
|
var hideModelData = modelData.view.hide_columns || [];
|
|
655
|
-
|
|
656
604
|
var filterModelData = _objectSpread(_objectSpread({}, modelData), {}, {
|
|
657
605
|
attrList: modelData.attrList.filter(item => !hideModelData.includes(item.id)),
|
|
658
606
|
relation_list: modelData.relation_list.filter(item => !(hideModelData.includes(item.left_id) && item.left_object_id === props.objectId || hideModelData.includes(item.right_id) && item.right_object_id === props.objectId))
|
|
659
607
|
});
|
|
660
|
-
|
|
661
608
|
var basicInfoGroupList = this.formatBasicInfoGroupList(modifyModelData(filterModelData), []);
|
|
662
609
|
var attrIdList = flatten(basicInfoGroupList.map(v => {
|
|
663
610
|
return v.attrList.map(attr => attr.id || attr.__id);
|
|
@@ -668,25 +615,21 @@ export class LegacyInstanceDetail extends React.Component {
|
|
|
668
615
|
filterModelData,
|
|
669
616
|
fields
|
|
670
617
|
};
|
|
671
|
-
}
|
|
672
|
-
|
|
618
|
+
}
|
|
673
619
|
|
|
620
|
+
// istanbul ignore next
|
|
674
621
|
fetchData(props) {
|
|
675
622
|
var _this5 = this;
|
|
676
|
-
|
|
677
623
|
return _asyncToGenerator(function* () {
|
|
678
624
|
var modelListData, modelDataMap, instanceData;
|
|
679
625
|
var relationLimit = 10;
|
|
680
|
-
|
|
681
626
|
try {
|
|
682
627
|
if (props.modelDataList) {
|
|
683
628
|
modelDataMap = keyBy(props.modelDataList, "objectId");
|
|
684
|
-
|
|
685
629
|
if (props.showFields) {
|
|
686
630
|
var {
|
|
687
631
|
fields
|
|
688
632
|
} = _this5.getInstanceDetailData(props, modelDataMap);
|
|
689
|
-
|
|
690
633
|
instanceData = yield fetchCmdbInstanceDetailByFields(props.objectId, props.instanceId, fields, relationLimit);
|
|
691
634
|
} else {
|
|
692
635
|
instanceData = yield fetchCmdbInstanceDetail(props.objectId, props.instanceId);
|
|
@@ -695,22 +638,18 @@ export class LegacyInstanceDetail extends React.Component {
|
|
|
695
638
|
if (props.showFields) {
|
|
696
639
|
modelListData = yield fetchCmdbObjectRef(props.objectId);
|
|
697
640
|
modelDataMap = keyBy(modelListData.data, "objectId");
|
|
698
|
-
|
|
699
641
|
var {
|
|
700
642
|
fields: _fields
|
|
701
643
|
} = _this5.getInstanceDetailData(props, modelDataMap);
|
|
702
|
-
|
|
703
644
|
instanceData = yield fetchCmdbInstanceDetailByFields(props.objectId, props.instanceId, _fields, relationLimit);
|
|
704
645
|
} else {
|
|
705
646
|
[modelListData, instanceData] = yield Promise.all([fetchCmdbObjectRef(props.objectId), fetchCmdbInstanceDetail(props.objectId, props.instanceId)]);
|
|
706
647
|
modelDataMap = keyBy(modelListData.data, "objectId");
|
|
707
648
|
}
|
|
708
649
|
}
|
|
709
|
-
|
|
710
650
|
var {
|
|
711
651
|
filterModelData
|
|
712
652
|
} = _this5.getInstanceDetailData(props, modelDataMap);
|
|
713
|
-
|
|
714
653
|
_this5.setState({
|
|
715
654
|
modelDataMap,
|
|
716
655
|
modelData: modifyModelData(filterModelData),
|
|
@@ -719,62 +658,48 @@ export class LegacyInstanceDetail extends React.Component {
|
|
|
719
658
|
basicInfoGroupListShow: [],
|
|
720
659
|
basicInfoGroupList: []
|
|
721
660
|
});
|
|
722
|
-
|
|
723
|
-
|
|
724
|
-
|
|
661
|
+
_this5.setBasicInfoGroupList(_this5.state);
|
|
662
|
+
// this.setFormattedInstanceData(this.state);
|
|
725
663
|
} catch (e) {
|
|
726
664
|
// 统一处理请求错误
|
|
727
|
-
handleHttpError(e);
|
|
728
|
-
|
|
665
|
+
handleHttpError(e);
|
|
666
|
+
// 标记 `loaded` 和 `failed` 状态
|
|
729
667
|
_this5.setState({
|
|
730
668
|
loaded: true
|
|
731
669
|
});
|
|
732
670
|
}
|
|
733
671
|
})();
|
|
734
672
|
}
|
|
735
|
-
|
|
736
673
|
isStruct(attr) {
|
|
737
674
|
var _attr$value;
|
|
738
|
-
|
|
739
675
|
return ((_attr$value = attr.value) === null || _attr$value === void 0 ? void 0 : _attr$value.type) === "struct";
|
|
740
676
|
}
|
|
741
|
-
|
|
742
677
|
isStructs(attr) {
|
|
743
678
|
var _attr$value2;
|
|
744
|
-
|
|
745
679
|
return ((_attr$value2 = attr.value) === null || _attr$value2 === void 0 ? void 0 : _attr$value2.type) === "structs";
|
|
746
680
|
}
|
|
747
|
-
|
|
748
681
|
isUrl(attr) {
|
|
749
682
|
var _attr$value3, _attr$value4;
|
|
750
|
-
|
|
751
683
|
return ((_attr$value3 = attr.value) === null || _attr$value3 === void 0 ? void 0 : _attr$value3.type) === "str" && ((_attr$value4 = attr.value) === null || _attr$value4 === void 0 ? void 0 : _attr$value4.mode) === "url";
|
|
752
684
|
}
|
|
753
|
-
|
|
754
685
|
isRelation(attr) {
|
|
755
686
|
var _attr$value5, _attr$value6;
|
|
756
|
-
|
|
757
687
|
return ((_attr$value5 = attr.value) === null || _attr$value5 === void 0 ? void 0 : _attr$value5.type) === "FK" || ((_attr$value6 = attr.value) === null || _attr$value6 === void 0 ? void 0 : _attr$value6.type) === "FKs";
|
|
758
688
|
}
|
|
759
|
-
|
|
760
689
|
isFloat(attr) {
|
|
761
690
|
var _attr$value7;
|
|
762
|
-
|
|
763
691
|
return ((_attr$value7 = attr.value) === null || _attr$value7 === void 0 ? void 0 : _attr$value7.type) === "float";
|
|
764
692
|
}
|
|
765
|
-
|
|
766
693
|
isSpecialDisplayField(attr) {
|
|
767
|
-
return (
|
|
694
|
+
return (
|
|
695
|
+
// TODO: ENABLED_FEATURES.includes("user-business-special-display") &&
|
|
768
696
|
["USER", "BUSINESS"].includes(attr.id === attr.left_id ? attr.right_object_id : attr.left_object_id)
|
|
769
697
|
);
|
|
770
698
|
}
|
|
771
|
-
|
|
772
699
|
isMarkdownField(attr) {
|
|
773
700
|
var _attr$value8;
|
|
774
|
-
|
|
775
701
|
return ((_attr$value8 = attr.value) === null || _attr$value8 === void 0 ? void 0 : _attr$value8.type) === "str" && get(attr, "value.mode") === "markdown";
|
|
776
702
|
}
|
|
777
|
-
|
|
778
703
|
}
|
|
779
704
|
export var InstanceDetail = withTranslation(NS_LIBS_CMDB_INSTANCES)(LegacyInstanceDetail);
|
|
780
705
|
//# sourceMappingURL=InstanceDetail.js.map
|