@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
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
|
|
3
3
|
var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
|
|
4
|
-
|
|
5
4
|
Object.defineProperty(exports, "__esModule", {
|
|
6
5
|
value: true
|
|
7
6
|
});
|
|
@@ -9,36 +8,21 @@ exports.ConditionType = exports.AdvancedSearchForm = exports.AdvancedSearch = vo
|
|
|
9
8
|
exports.convertValue = convertValue;
|
|
10
9
|
exports.getCondition = getCondition;
|
|
11
10
|
exports.getFieldConditionsAndValues = getFieldConditionsAndValues;
|
|
12
|
-
|
|
13
11
|
var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
|
|
14
|
-
|
|
15
12
|
var _react = _interopRequireDefault(require("react"));
|
|
16
|
-
|
|
17
13
|
var _immutabilityHelper = _interopRequireDefault(require("immutability-helper"));
|
|
18
|
-
|
|
19
14
|
var _lodash = require("lodash");
|
|
20
|
-
|
|
21
15
|
var _compatible = require("@ant-design/compatible");
|
|
22
|
-
|
|
23
16
|
var _antd = require("antd");
|
|
24
|
-
|
|
25
17
|
var _cmdbUtils = require("@next-libs/cmdb-utils");
|
|
26
|
-
|
|
27
18
|
var _constants = require("./constants");
|
|
28
|
-
|
|
29
19
|
var _AdvancedSearchModule = _interopRequireDefault(require("./AdvancedSearch.module.css"));
|
|
30
|
-
|
|
31
20
|
var _i18next = _interopRequireDefault(require("i18next"));
|
|
32
|
-
|
|
33
21
|
var _constants2 = require("../i18n/constants");
|
|
34
|
-
|
|
35
22
|
var _ModelAttributeFormControl = require("../model-attribute-form-control/ModelAttributeFormControl");
|
|
36
|
-
|
|
37
23
|
var _processors = require("../processors");
|
|
38
|
-
|
|
39
24
|
let ConditionType;
|
|
40
25
|
exports.ConditionType = ConditionType;
|
|
41
|
-
|
|
42
26
|
(function (ConditionType) {
|
|
43
27
|
ConditionType["Equal"] = "equal";
|
|
44
28
|
ConditionType["NotEqual"] = "notEqual";
|
|
@@ -50,7 +34,6 @@ exports.ConditionType = ConditionType;
|
|
|
50
34
|
ConditionType["True"] = "true";
|
|
51
35
|
ConditionType["False"] = "false";
|
|
52
36
|
})(ConditionType || (exports.ConditionType = ConditionType = {}));
|
|
53
|
-
|
|
54
37
|
const FieldTypeConditionTypesMap = {
|
|
55
38
|
[_ModelAttributeFormControl.ModelAttributeValueType.STRING]: [ConditionType.Contain, ConditionType.NotContain, ConditionType.Equal, ConditionType.NotEqual, ConditionType.Empty, ConditionType.NotEmpty],
|
|
56
39
|
[_ModelAttributeFormControl.ModelAttributeValueType.INTEGER]: [ConditionType.Equal, ConditionType.NotEqual, ConditionType.Between, ConditionType.Empty, ConditionType.NotEmpty],
|
|
@@ -79,58 +62,46 @@ const multiValueSearchOperators = [{
|
|
|
79
62
|
logicalOperator: _cmdbUtils.LogicalOperators.And
|
|
80
63
|
}];
|
|
81
64
|
FieldTypeConditionTypesMap[_ModelAttributeFormControl.ModelAttributeValueType.STRUCT_LIST] = FieldTypeConditionTypesMap[_ModelAttributeFormControl.ModelAttributeValueType.STRUCT];
|
|
82
|
-
|
|
83
65
|
function getCondition(conditionType, fieldType) {
|
|
84
66
|
let label;
|
|
85
67
|
let operations;
|
|
86
|
-
|
|
87
68
|
switch (conditionType) {
|
|
88
69
|
case ConditionType.Equal:
|
|
89
70
|
label = _i18next.default.t(`${_constants2.NS_LIBS_CMDB_INSTANCES}:${_constants2.K.OPERATOR_EQUAL_DEFINE}`);
|
|
90
|
-
|
|
91
71
|
switch (fieldType) {
|
|
92
72
|
case _ModelAttributeFormControl.ModelAttributeValueType.ARR:
|
|
93
73
|
operations = [{
|
|
94
74
|
operator: _cmdbUtils.ComparisonOperators.In
|
|
95
75
|
}];
|
|
96
76
|
break;
|
|
97
|
-
|
|
98
77
|
default:
|
|
99
78
|
operations = [{
|
|
100
79
|
operator: _cmdbUtils.ComparisonOperators.Equal
|
|
101
80
|
}];
|
|
102
81
|
}
|
|
103
|
-
|
|
104
82
|
break;
|
|
105
|
-
|
|
106
83
|
case ConditionType.NotEqual:
|
|
107
84
|
label = _i18next.default.t(`${_constants2.NS_LIBS_CMDB_INSTANCES}:${_constants2.K.OPERATOR_NOT_EQUAL_DEFINE}`);
|
|
108
|
-
|
|
109
85
|
switch (fieldType) {
|
|
110
86
|
case _ModelAttributeFormControl.ModelAttributeValueType.ARR:
|
|
111
87
|
operations = [{
|
|
112
88
|
operator: _cmdbUtils.ComparisonOperators.NotIn
|
|
113
89
|
}];
|
|
114
90
|
break;
|
|
115
|
-
|
|
116
91
|
default:
|
|
117
92
|
operations = [{
|
|
118
93
|
operator: _cmdbUtils.ComparisonOperators.NotEqual
|
|
119
94
|
}];
|
|
120
95
|
}
|
|
121
|
-
|
|
122
96
|
break;
|
|
123
|
-
|
|
124
97
|
case ConditionType.Contain:
|
|
125
98
|
label = _i18next.default.t(`${_constants2.NS_LIBS_CMDB_INSTANCES}:${_constants2.K.OPERATOR_CONTAIN_DEFINE}`);
|
|
126
|
-
|
|
127
99
|
switch (fieldType) {
|
|
128
100
|
case _ModelAttributeFormControl.ModelAttributeValueType.ENUMS:
|
|
129
101
|
operations = [{
|
|
130
102
|
operator: _cmdbUtils.ComparisonOperators.In
|
|
131
103
|
}];
|
|
132
104
|
break;
|
|
133
|
-
|
|
134
105
|
default:
|
|
135
106
|
operations = [{
|
|
136
107
|
operator: _cmdbUtils.ComparisonOperators.Like,
|
|
@@ -138,19 +109,15 @@ function getCondition(conditionType, fieldType) {
|
|
|
138
109
|
suffix: "%"
|
|
139
110
|
}];
|
|
140
111
|
}
|
|
141
|
-
|
|
142
112
|
break;
|
|
143
|
-
|
|
144
113
|
case ConditionType.NotContain:
|
|
145
114
|
label = _i18next.default.t(`${_constants2.NS_LIBS_CMDB_INSTANCES}:${_constants2.K.OPERATOR_NOT_CONTAIN_DEFINE}`);
|
|
146
|
-
|
|
147
115
|
switch (fieldType) {
|
|
148
116
|
case _ModelAttributeFormControl.ModelAttributeValueType.ENUMS:
|
|
149
117
|
operations = [{
|
|
150
118
|
operator: _cmdbUtils.ComparisonOperators.NotIn
|
|
151
119
|
}];
|
|
152
120
|
break;
|
|
153
|
-
|
|
154
121
|
default:
|
|
155
122
|
operations = [{
|
|
156
123
|
operator: _cmdbUtils.ComparisonOperators.NotLike,
|
|
@@ -158,9 +125,7 @@ function getCondition(conditionType, fieldType) {
|
|
|
158
125
|
suffix: "%"
|
|
159
126
|
}];
|
|
160
127
|
}
|
|
161
|
-
|
|
162
128
|
break;
|
|
163
|
-
|
|
164
129
|
case ConditionType.Empty:
|
|
165
130
|
label = _i18next.default.t(`${_constants2.NS_LIBS_CMDB_INSTANCES}:${_constants2.K.OPERATOR_IS_EMPTY_DEFINE}`);
|
|
166
131
|
operations = [{
|
|
@@ -168,7 +133,6 @@ function getCondition(conditionType, fieldType) {
|
|
|
168
133
|
fixedValue: false
|
|
169
134
|
}];
|
|
170
135
|
break;
|
|
171
|
-
|
|
172
136
|
case ConditionType.NotEmpty:
|
|
173
137
|
label = _i18next.default.t(`${_constants2.NS_LIBS_CMDB_INSTANCES}:${_constants2.K.OPERATOR_IS_NOT_EMPTY_DEFINE}`);
|
|
174
138
|
operations = [{
|
|
@@ -176,7 +140,6 @@ function getCondition(conditionType, fieldType) {
|
|
|
176
140
|
fixedValue: true
|
|
177
141
|
}];
|
|
178
142
|
break;
|
|
179
|
-
|
|
180
143
|
case ConditionType.True:
|
|
181
144
|
label = "true";
|
|
182
145
|
operations = [{
|
|
@@ -184,7 +147,6 @@ function getCondition(conditionType, fieldType) {
|
|
|
184
147
|
fixedValue: true
|
|
185
148
|
}];
|
|
186
149
|
break;
|
|
187
|
-
|
|
188
150
|
case ConditionType.False:
|
|
189
151
|
label = "false";
|
|
190
152
|
operations = [{
|
|
@@ -192,148 +154,118 @@ function getCondition(conditionType, fieldType) {
|
|
|
192
154
|
fixedValue: false
|
|
193
155
|
}];
|
|
194
156
|
break;
|
|
195
|
-
|
|
196
157
|
case ConditionType.Between:
|
|
197
158
|
operations = [{
|
|
198
159
|
operator: _cmdbUtils.ComparisonOperators.GreaterThanOrEqual
|
|
199
160
|
}, {
|
|
200
161
|
operator: _cmdbUtils.ComparisonOperators.LessThanOrEqual
|
|
201
162
|
}];
|
|
202
|
-
|
|
203
163
|
switch (fieldType) {
|
|
204
164
|
case _ModelAttributeFormControl.ModelAttributeValueType.INTEGER:
|
|
205
165
|
case _ModelAttributeFormControl.ModelAttributeValueType.FLOAT:
|
|
206
166
|
// label = "在此区间";
|
|
207
167
|
label = _i18next.default.t(`${_constants2.NS_LIBS_CMDB_INSTANCES}:${_constants2.K.OPERATOR_BETWEEN_DEFINE_TEXT_INT}`);
|
|
208
168
|
break;
|
|
209
|
-
|
|
210
169
|
case _ModelAttributeFormControl.ModelAttributeValueType.DATE:
|
|
211
170
|
case _ModelAttributeFormControl.ModelAttributeValueType.DATETIME:
|
|
212
171
|
// label = "在此期间";
|
|
213
172
|
label = _i18next.default.t(`${_constants2.NS_LIBS_CMDB_INSTANCES}:${_constants2.K.OPERATOR_BETWEEN_DEFINE_TEXT_TIME}`);
|
|
214
173
|
break;
|
|
215
|
-
|
|
216
174
|
case _ModelAttributeFormControl.ModelAttributeValueType.IP:
|
|
217
175
|
// label = "范围";
|
|
218
176
|
label = _i18next.default.t(`${_constants2.NS_LIBS_CMDB_INSTANCES}:${_constants2.K.OPERATOR_BETWEEN_DEFINE_TEXT}`);
|
|
219
177
|
break;
|
|
220
|
-
|
|
221
178
|
default:
|
|
222
179
|
// label = "在此之间";
|
|
223
180
|
label = _i18next.default.t(`${_constants2.NS_LIBS_CMDB_INSTANCES}:${_constants2.K.OPERATOR_BETWEEN_DEFINE_TEXT_THE}`);
|
|
224
181
|
}
|
|
225
|
-
|
|
226
182
|
break;
|
|
227
183
|
}
|
|
228
|
-
|
|
229
184
|
return {
|
|
230
185
|
type: conditionType,
|
|
231
186
|
label,
|
|
232
187
|
operations
|
|
233
188
|
};
|
|
234
189
|
}
|
|
235
|
-
|
|
236
190
|
function convertValue(valueType, value) {
|
|
237
191
|
if (typeof value !== "boolean") {
|
|
238
192
|
switch (valueType) {
|
|
239
193
|
case _ModelAttributeFormControl.ModelAttributeValueType.INTEGER:
|
|
240
194
|
return parseInt(value);
|
|
241
|
-
|
|
242
195
|
case _ModelAttributeFormControl.ModelAttributeValueType.FLOAT:
|
|
243
196
|
return parseFloat(value);
|
|
244
|
-
|
|
245
197
|
case _ModelAttributeFormControl.ModelAttributeValueType.BOOLEAN:
|
|
246
198
|
return value === "true";
|
|
247
199
|
}
|
|
248
200
|
}
|
|
249
|
-
|
|
250
201
|
return value;
|
|
251
202
|
}
|
|
252
|
-
|
|
253
203
|
function getFieldConditionsAndValues(fieldQueryOperatorExpressionsMap, id, valueType, isRelation, relationSideId, objectId, attrId) {
|
|
254
204
|
let isRelationWithNoExpression = false;
|
|
255
205
|
let expressions = fieldQueryOperatorExpressionsMap[id];
|
|
256
206
|
let expressionsKeys;
|
|
257
|
-
|
|
258
207
|
if (!expressions && isRelation) {
|
|
259
208
|
isRelationWithNoExpression = true;
|
|
260
209
|
const relatedKey = (0, _lodash.findKey)(fieldQueryOperatorExpressionsMap, (v, k) => (0, _lodash.startsWith)(k, `${relationSideId}.`) || k === relationSideId);
|
|
261
210
|
const relatedExpressions = fieldQueryOperatorExpressionsMap[relatedKey];
|
|
262
|
-
|
|
263
211
|
if (relatedExpressions && !(0, _lodash.isNil)(relatedExpressions[_cmdbUtils.ElementOperators.Exists])) {
|
|
264
212
|
expressions = fieldQueryOperatorExpressionsMap[relatedKey];
|
|
265
213
|
}
|
|
266
214
|
}
|
|
267
|
-
|
|
268
215
|
if (expressions) {
|
|
269
216
|
expressionsKeys = Object.keys(expressions);
|
|
270
217
|
}
|
|
271
|
-
|
|
272
218
|
let currentCondition;
|
|
273
219
|
const availableConditions = FieldTypeConditionTypesMap[valueType].map(conditionType => {
|
|
274
220
|
var _expressionsKeys;
|
|
275
|
-
|
|
276
221
|
const condition = getCondition(conditionType, valueType);
|
|
277
|
-
|
|
278
222
|
if ((_expressionsKeys = expressionsKeys) !== null && _expressionsKeys !== void 0 && _expressionsKeys.length) {
|
|
279
|
-
const operatorsStr = [];
|
|
280
|
-
|
|
223
|
+
const operatorsStr = [];
|
|
224
|
+
// 由于当 ConditionType.Between ,operations 有两个,当用户只填选一个时,currentCondition会默认第一个选择器。与实际不符
|
|
281
225
|
const isFixedValueEqual = condition.operations.every(operation => {
|
|
282
226
|
operatorsStr.push(operation.operator);
|
|
283
|
-
|
|
284
227
|
if (operation.fixedValue !== undefined) {
|
|
285
228
|
var _operation$fixedValue, _expressions$operatio;
|
|
286
|
-
|
|
287
229
|
return ((_operation$fixedValue = operation.fixedValue) === null || _operation$fixedValue === void 0 ? void 0 : _operation$fixedValue.toString()) === ((_expressions$operatio = expressions[operation === null || operation === void 0 ? void 0 : operation.operator]) === null || _expressions$operatio === void 0 ? void 0 : _expressions$operatio.toString());
|
|
288
230
|
} else {
|
|
289
231
|
return true;
|
|
290
232
|
}
|
|
291
233
|
});
|
|
292
|
-
|
|
293
234
|
if (isFixedValueEqual && expressionsKeys.every(operator => operatorsStr.includes(operator))) {
|
|
294
235
|
currentCondition = condition;
|
|
295
236
|
}
|
|
296
237
|
}
|
|
297
|
-
|
|
298
238
|
return condition;
|
|
299
239
|
});
|
|
300
|
-
|
|
301
240
|
if (!currentCondition) {
|
|
302
241
|
currentCondition = availableConditions[0];
|
|
303
242
|
}
|
|
304
|
-
|
|
305
243
|
let queryValuesStr = "";
|
|
306
244
|
const values = currentCondition.operations.map(operation => {
|
|
307
245
|
var _expressions;
|
|
308
|
-
|
|
309
|
-
|
|
310
|
-
|
|
246
|
+
let value;
|
|
247
|
+
// istanbul ignore else ElementOperators.Exists时直接返回fixedValue
|
|
311
248
|
if (((_expressions = expressions) === null || _expressions === void 0 ? void 0 : _expressions[operation.operator]) !== undefined && operation.operator !== _cmdbUtils.ElementOperators.Exists) {
|
|
312
249
|
value = expressions[operation.operator];
|
|
313
250
|
let values = [expressions[operation.operator]];
|
|
314
251
|
const i = multiValueSearchOperators.find(multiValueSearchOperator => multiValueSearchOperator.comparisonOperator === operation.operator);
|
|
315
|
-
|
|
316
252
|
if (i) {
|
|
317
253
|
if (valueType === _ModelAttributeFormControl.ModelAttributeValueType.ENUM || typeof expressions[operation.operator] === "string") {
|
|
318
254
|
values = expressions[operation.operator].trim().split(/\s+/).map(value => convertValue(valueType, value));
|
|
319
|
-
|
|
320
255
|
if (objectId === "CLUSTER" && attrId === "type") {
|
|
321
256
|
values = values.map(value => _constants.clusterMap[value]);
|
|
322
257
|
}
|
|
323
258
|
}
|
|
324
259
|
}
|
|
325
|
-
|
|
326
260
|
if (typeof values[0] === "string" || typeof values[0] === "number" || typeof values[0] === "boolean") {
|
|
327
261
|
queryValuesStr = values.join(" ");
|
|
328
262
|
values = values.map(value => {
|
|
329
263
|
if (operation.prefix && value.startsWith(operation.prefix)) {
|
|
330
264
|
value = value.slice(operation.prefix.length);
|
|
331
265
|
}
|
|
332
|
-
|
|
333
266
|
if (operation.suffix && value.endsWith(operation.suffix)) {
|
|
334
267
|
value = value.slice(0, value.length - operation.suffix.length);
|
|
335
268
|
}
|
|
336
|
-
|
|
337
269
|
return value;
|
|
338
270
|
});
|
|
339
271
|
value = [_ModelAttributeFormControl.ModelAttributeValueType.ENUM, _ModelAttributeFormControl.ModelAttributeValueType.ARR].includes(valueType) ? values : values.join(" ");
|
|
@@ -341,7 +273,6 @@ function getFieldConditionsAndValues(fieldQueryOperatorExpressionsMap, id, value
|
|
|
341
273
|
} else {
|
|
342
274
|
value = operation.fixedValue !== undefined ? operation.fixedValue : null;
|
|
343
275
|
}
|
|
344
|
-
|
|
345
276
|
return value;
|
|
346
277
|
});
|
|
347
278
|
const disabled = false;
|
|
@@ -353,7 +284,6 @@ function getFieldConditionsAndValues(fieldQueryOperatorExpressionsMap, id, value
|
|
|
353
284
|
disabled
|
|
354
285
|
};
|
|
355
286
|
}
|
|
356
|
-
|
|
357
287
|
class AdvancedSearchForm extends _react.default.Component {
|
|
358
288
|
constructor(props) {
|
|
359
289
|
super(props);
|
|
@@ -374,11 +304,9 @@ class AdvancedSearchForm extends _react.default.Component {
|
|
|
374
304
|
const hasFixedValues = field.currentCondition.operations.some(operation => operation.fixedValue !== undefined);
|
|
375
305
|
const condition = field.availableConditions.find(condition => condition.type === value);
|
|
376
306
|
let newValues = condition.operations.map(operation => operation.fixedValue !== undefined ? operation.fixedValue : null);
|
|
377
|
-
|
|
378
307
|
if (newValues.every(value => value === null) && !hasFixedValues && this.state.fields[fieldIndex].values.length === newValues.length) {
|
|
379
308
|
newValues = this.state.fields[fieldIndex].values;
|
|
380
309
|
}
|
|
381
|
-
|
|
382
310
|
let newFields = (0, _immutabilityHelper.default)(this.state.fields, {
|
|
383
311
|
[fieldIndex]: {
|
|
384
312
|
currentCondition: {
|
|
@@ -390,11 +318,9 @@ class AdvancedSearchForm extends _react.default.Component {
|
|
|
390
318
|
}
|
|
391
319
|
});
|
|
392
320
|
const relatedFieldIndex = newFields.findIndex(f => f.isRelation && f.relationSideId === field.relationSideId && f.id !== field.id);
|
|
393
|
-
|
|
394
321
|
if (relatedFieldIndex !== -1) {
|
|
395
322
|
const relatedField = newFields[relatedFieldIndex];
|
|
396
323
|
const relatedCondition = relatedField.availableConditions.find(condition => condition.type === value);
|
|
397
|
-
|
|
398
324
|
if (condition.operations[0].operator === _cmdbUtils.ElementOperators.Exists) {
|
|
399
325
|
newFields = (0, _immutabilityHelper.default)(newFields, {
|
|
400
326
|
[relatedFieldIndex]: {
|
|
@@ -419,7 +345,6 @@ class AdvancedSearchForm extends _react.default.Component {
|
|
|
419
345
|
});
|
|
420
346
|
}
|
|
421
347
|
}
|
|
422
|
-
|
|
423
348
|
this.setState({
|
|
424
349
|
fields: newFields
|
|
425
350
|
});
|
|
@@ -427,10 +352,8 @@ class AdvancedSearchForm extends _react.default.Component {
|
|
|
427
352
|
});
|
|
428
353
|
(0, _defineProperty2.default)(this, "handleSearch", e => {
|
|
429
354
|
var _this$props;
|
|
430
|
-
|
|
431
355
|
e.preventDefault();
|
|
432
356
|
if ((_this$props = this.props) !== null && _this$props !== void 0 && _this$props.autoSearch) this.props.autoSearch(this.state.fields);
|
|
433
|
-
|
|
434
357
|
if (this.props.onSearch) {
|
|
435
358
|
// 当过滤字段为relation并且过滤条件为ElementOperators.Exists的时候,发起后台请求的搜索queries与负责前端展示的query不同。需要额外处理。
|
|
436
359
|
let queries = [];
|
|
@@ -447,11 +370,9 @@ class AdvancedSearchForm extends _react.default.Component {
|
|
|
447
370
|
let hasValue = false;
|
|
448
371
|
let structQueryId;
|
|
449
372
|
const isStruct = !!field.attrValue.isStruct;
|
|
450
|
-
|
|
451
373
|
if (isStruct) {
|
|
452
374
|
structQueryId = field.attrValue.struct_define.map(struct_item => `${field.id}.${struct_item.id}`);
|
|
453
375
|
}
|
|
454
|
-
|
|
455
376
|
field.values.forEach((value, index) => {
|
|
456
377
|
const operation = field.currentCondition.operations[index];
|
|
457
378
|
const fieldId = field.isRelation && _cmdbUtils.ElementOperators.Exists === operation.operator ? field.relationSideId : field.id;
|
|
@@ -462,13 +383,10 @@ class AdvancedSearchForm extends _react.default.Component {
|
|
|
462
383
|
fieldQueryToShow = {
|
|
463
384
|
[fieldIdToShow]: expressions
|
|
464
385
|
};
|
|
465
|
-
|
|
466
386
|
if (value !== null && value !== "" && !(Array.isArray(value) && value.length === 0)) {
|
|
467
387
|
const multiValueSearchOperator = multiValueSearchOperators.find(operator => operator.comparisonOperator === operation.operator);
|
|
468
|
-
|
|
469
388
|
if (multiValueSearchOperator) {
|
|
470
389
|
let values;
|
|
471
|
-
|
|
472
390
|
if (field.attrValue.type === _ModelAttributeFormControl.ModelAttributeValueType.ENUM || field.attrValue.type === _ModelAttributeFormControl.ModelAttributeValueType.ARR) {
|
|
473
391
|
values = value;
|
|
474
392
|
} else if (typeof value === "string") {
|
|
@@ -480,7 +398,6 @@ class AdvancedSearchForm extends _react.default.Component {
|
|
|
480
398
|
} else {
|
|
481
399
|
values = [value];
|
|
482
400
|
}
|
|
483
|
-
|
|
484
401
|
if (values.length) {
|
|
485
402
|
if (isStruct) {
|
|
486
403
|
fieldQuery = {
|
|
@@ -488,11 +405,9 @@ class AdvancedSearchForm extends _react.default.Component {
|
|
|
488
405
|
if (operation.prefix) {
|
|
489
406
|
value = operation.prefix + value;
|
|
490
407
|
}
|
|
491
|
-
|
|
492
408
|
if (operation.suffix) {
|
|
493
409
|
value += operation.suffix;
|
|
494
410
|
}
|
|
495
|
-
|
|
496
411
|
return structQueryId.map(structId => ({
|
|
497
412
|
[structId]: {
|
|
498
413
|
[operation.operator]: value
|
|
@@ -506,11 +421,9 @@ class AdvancedSearchForm extends _react.default.Component {
|
|
|
506
421
|
if (operation.prefix) {
|
|
507
422
|
value = operation.prefix + value;
|
|
508
423
|
}
|
|
509
|
-
|
|
510
424
|
if (operation.suffix) {
|
|
511
425
|
value += operation.suffix;
|
|
512
426
|
}
|
|
513
|
-
|
|
514
427
|
return {
|
|
515
428
|
[fieldId]: {
|
|
516
429
|
[operation.operator]: value
|
|
@@ -519,17 +432,14 @@ class AdvancedSearchForm extends _react.default.Component {
|
|
|
519
432
|
})
|
|
520
433
|
};
|
|
521
434
|
}
|
|
522
|
-
|
|
523
435
|
fieldQueryToShow = {
|
|
524
436
|
[multiValueSearchOperator.logicalOperator]: values.map(value => {
|
|
525
437
|
if (operation.prefix) {
|
|
526
438
|
value = operation.prefix + value;
|
|
527
439
|
}
|
|
528
|
-
|
|
529
440
|
if (operation.suffix) {
|
|
530
441
|
value += operation.suffix;
|
|
531
442
|
}
|
|
532
|
-
|
|
533
443
|
return {
|
|
534
444
|
[fieldIdToShow]: {
|
|
535
445
|
[operation.operator]: value
|
|
@@ -544,15 +454,12 @@ class AdvancedSearchForm extends _react.default.Component {
|
|
|
544
454
|
}
|
|
545
455
|
} else {
|
|
546
456
|
value = convertValue(field.attrValue.type, value);
|
|
547
|
-
|
|
548
457
|
if (operation.prefix) {
|
|
549
458
|
value = operation.prefix + value;
|
|
550
459
|
}
|
|
551
|
-
|
|
552
460
|
if (operation.suffix) {
|
|
553
461
|
value += operation.suffix;
|
|
554
462
|
}
|
|
555
|
-
|
|
556
463
|
expressions[operation.operator] = value;
|
|
557
464
|
hasValue = true;
|
|
558
465
|
fieldToShow.push({
|
|
@@ -561,18 +468,15 @@ class AdvancedSearchForm extends _react.default.Component {
|
|
|
561
468
|
}
|
|
562
469
|
}
|
|
563
470
|
});
|
|
564
|
-
|
|
565
471
|
if (hasValue) {
|
|
566
472
|
queries.push(fieldQuery);
|
|
567
473
|
queriesToShow.push(fieldQueryToShow);
|
|
568
474
|
}
|
|
569
475
|
});
|
|
570
|
-
|
|
571
476
|
if (queries.length === 0) {
|
|
572
477
|
queries = undefined;
|
|
573
478
|
queriesToShow = undefined;
|
|
574
479
|
}
|
|
575
|
-
|
|
576
480
|
if (!(0, _lodash.isEqual)(this.props.q, queries)) {
|
|
577
481
|
this.props.onSearch(queries, queriesToShow, fieldToShow);
|
|
578
482
|
}
|
|
@@ -585,7 +489,6 @@ class AdvancedSearchForm extends _react.default.Component {
|
|
|
585
489
|
});
|
|
586
490
|
this.state = this.computeState();
|
|
587
491
|
}
|
|
588
|
-
|
|
589
492
|
componentDidUpdate(prevProps) {
|
|
590
493
|
if (!(0, _lodash.isEqual)(this.props.q, prevProps.q)) {
|
|
591
494
|
const newState = this.computeState();
|
|
@@ -593,59 +496,50 @@ class AdvancedSearchForm extends _react.default.Component {
|
|
|
593
496
|
this.setFormFieldValues(newState.fields);
|
|
594
497
|
}
|
|
595
498
|
}
|
|
596
|
-
|
|
597
499
|
computeState() {
|
|
598
500
|
const fieldQueryOperatorExpressionsMap = {};
|
|
599
501
|
const fields = [];
|
|
600
|
-
|
|
601
502
|
if (this.props.q) {
|
|
602
503
|
this.props.q.forEach(query => {
|
|
603
504
|
Object.entries(query).forEach(([key, expressions]) => {
|
|
604
505
|
if (key === _cmdbUtils.LogicalOperators.Or || key === _cmdbUtils.LogicalOperators.And) {
|
|
605
506
|
const firstSubQuery = expressions[0];
|
|
606
|
-
const fieldId = Object.keys(firstSubQuery)[0];
|
|
607
|
-
|
|
507
|
+
const fieldId = Object.keys(firstSubQuery)[0];
|
|
508
|
+
// 由于 ConditionType.Between 这边的 operator 是两个,由于需要支持选择一个的时候也要显示出来,这边不能将选择器合并成str吐出去
|
|
608
509
|
const compareOperators = Object.keys(firstSubQuery[fieldId]);
|
|
609
510
|
const compareOperator = compareOperators.length > 1 ? compareOperators : compareOperators.join("");
|
|
610
511
|
let subQueryValue = "";
|
|
611
512
|
let targetField;
|
|
612
|
-
|
|
613
513
|
if (_processors.ENABLED_CMDB_ADVANCE_SEARCH_WITH_QUOTE) {
|
|
614
514
|
var _this$props$fieldToSh;
|
|
615
|
-
|
|
616
515
|
targetField = (_this$props$fieldToSh = this.props.fieldToShow) === null || _this$props$fieldToSh === void 0 ? void 0 : _this$props$fieldToSh.find(fieldItem => Object.keys(fieldItem)[0] === fieldId);
|
|
617
516
|
}
|
|
618
|
-
|
|
619
517
|
if (!(0, _lodash.isNil)(targetField)) {
|
|
620
518
|
// 二维数组会有问题,
|
|
621
519
|
subQueryValue = (0, _lodash.isArray)(targetField[fieldId]) ? targetField[fieldId].map(item => (0, _lodash.isArray)(item) ? item.join(" ") : item).join("") : targetField[fieldId];
|
|
622
520
|
} else {
|
|
623
521
|
subQueryValue = expressions.map(query => {
|
|
624
522
|
const targetValue = query[fieldId][compareOperator];
|
|
625
|
-
|
|
626
523
|
if (compareOperator === _cmdbUtils.ComparisonOperators.Like || compareOperator === _cmdbUtils.ComparisonOperators.NotLike) {
|
|
627
524
|
return (0, _lodash.isString)(targetValue) && targetValue.includes(" ") ? `${targetValue[0]}"${targetValue.slice(1, targetValue.length - 1)}"${targetValue[targetValue.length - 1]}` : targetValue;
|
|
628
|
-
}
|
|
525
|
+
}
|
|
526
|
+
// 对于时间选择器有两个的,不用特意将值转换成str,因为不需要这里的值
|
|
629
527
|
else {
|
|
630
528
|
return (0, _lodash.isString)(targetValue) && targetValue.includes(" ") ? `"${targetValue}"` : targetValue;
|
|
631
529
|
}
|
|
632
530
|
}).join(" ");
|
|
633
531
|
}
|
|
634
|
-
|
|
635
532
|
key = fieldId;
|
|
636
533
|
expressions = Array.isArray(compareOperator) ? firstSubQuery[fieldId] : {
|
|
637
534
|
[compareOperator]: subQueryValue
|
|
638
535
|
};
|
|
639
536
|
}
|
|
640
|
-
|
|
641
537
|
fieldQueryOperatorExpressionsMap[key] = expressions;
|
|
642
538
|
});
|
|
643
539
|
});
|
|
644
540
|
}
|
|
645
|
-
|
|
646
541
|
(0, _cmdbUtils.forEachAvailableFields)(this.props.modelData, attr => {
|
|
647
542
|
const attrValue = {};
|
|
648
|
-
|
|
649
543
|
switch (attr.value.type) {
|
|
650
544
|
case _ModelAttributeFormControl.ModelAttributeValueType.STRUCT:
|
|
651
545
|
case _ModelAttributeFormControl.ModelAttributeValueType.STRUCT_LIST:
|
|
@@ -653,17 +547,14 @@ class AdvancedSearchForm extends _react.default.Component {
|
|
|
653
547
|
attrValue.struct_define = attr.value.struct_define;
|
|
654
548
|
attrValue.isStruct = true;
|
|
655
549
|
break;
|
|
656
|
-
|
|
657
550
|
case _ModelAttributeFormControl.ModelAttributeValueType.ENUM:
|
|
658
551
|
case _ModelAttributeFormControl.ModelAttributeValueType.ENUMS:
|
|
659
552
|
attrValue.type = attr.value.type;
|
|
660
553
|
attrValue.regex = attr.value.regex;
|
|
661
554
|
break;
|
|
662
|
-
|
|
663
555
|
default:
|
|
664
556
|
attrValue.type = attr.value.type;
|
|
665
557
|
}
|
|
666
|
-
|
|
667
558
|
fields.push({
|
|
668
559
|
id: attr.id,
|
|
669
560
|
name: attr.name,
|
|
@@ -676,7 +567,6 @@ class AdvancedSearchForm extends _react.default.Component {
|
|
|
676
567
|
const showKeys = (0, _cmdbUtils.getInstanceNameKeys)(relationObject);
|
|
677
568
|
showKeys.forEach((showKey, index) => {
|
|
678
569
|
var _find$name, _find;
|
|
679
|
-
|
|
680
570
|
const nameOfShowKey = (_find$name = (_find = (0, _lodash.find)(relationObject === null || relationObject === void 0 ? void 0 : relationObject.attrList, ["id", showKey])) === null || _find === void 0 ? void 0 : _find.name) !== null && _find$name !== void 0 ? _find$name : showKey;
|
|
681
571
|
const id = `${relation[`${sides.this}_id`]}.${showKey}`;
|
|
682
572
|
const type = _ModelAttributeFormControl.ModelAttributeValueType.STRING;
|
|
@@ -696,7 +586,6 @@ class AdvancedSearchForm extends _react.default.Component {
|
|
|
696
586
|
fields
|
|
697
587
|
};
|
|
698
588
|
}
|
|
699
|
-
|
|
700
589
|
setFormFieldValues(fields) {
|
|
701
590
|
const values = fields.reduce((acc, field) => {
|
|
702
591
|
field.values.map((value, valueIndex) => {
|
|
@@ -707,7 +596,6 @@ class AdvancedSearchForm extends _react.default.Component {
|
|
|
707
596
|
}, {});
|
|
708
597
|
this.props.form.setFieldsValue(values);
|
|
709
598
|
}
|
|
710
|
-
|
|
711
599
|
getFields() {
|
|
712
600
|
const {
|
|
713
601
|
getFieldDecorator
|
|
@@ -718,7 +606,6 @@ class AdvancedSearchForm extends _react.default.Component {
|
|
|
718
606
|
let style;
|
|
719
607
|
let attrValue = field.attrValue;
|
|
720
608
|
let multiSelect = false;
|
|
721
|
-
|
|
722
609
|
switch (field.attrValue.type) {
|
|
723
610
|
case _ModelAttributeFormControl.ModelAttributeValueType.INTEGER:
|
|
724
611
|
case _ModelAttributeFormControl.ModelAttributeValueType.FLOAT:
|
|
@@ -726,27 +613,24 @@ class AdvancedSearchForm extends _react.default.Component {
|
|
|
726
613
|
type: _ModelAttributeFormControl.ModelAttributeValueType.STRING
|
|
727
614
|
};
|
|
728
615
|
break;
|
|
729
|
-
|
|
730
616
|
case _ModelAttributeFormControl.ModelAttributeValueType.ENUM:
|
|
731
617
|
case _ModelAttributeFormControl.ModelAttributeValueType.ENUMS:
|
|
732
618
|
type = _ModelAttributeFormControl.FormControlTypeEnum.SELECT;
|
|
733
619
|
multiSelect = true;
|
|
734
620
|
break;
|
|
735
|
-
|
|
736
621
|
case _ModelAttributeFormControl.ModelAttributeValueType.DATETIME:
|
|
737
622
|
style = {
|
|
738
623
|
minWidth: "auto"
|
|
739
624
|
};
|
|
740
625
|
break;
|
|
741
|
-
}
|
|
742
|
-
|
|
743
|
-
|
|
626
|
+
}
|
|
627
|
+
//高级搜索这里即使是json格式,也用input输入框进行搜索
|
|
744
628
|
if (attrValue.type === "json") {
|
|
745
|
-
attrValue = {
|
|
629
|
+
attrValue = {
|
|
630
|
+
...attrValue,
|
|
746
631
|
type: "str"
|
|
747
632
|
};
|
|
748
633
|
}
|
|
749
|
-
|
|
750
634
|
return /*#__PURE__*/_react.default.createElement(_antd.Col, {
|
|
751
635
|
span: hasBetween ? 12 : 8,
|
|
752
636
|
key: field.id
|
|
@@ -791,7 +675,6 @@ class AdvancedSearchForm extends _react.default.Component {
|
|
|
791
675
|
}))));
|
|
792
676
|
});
|
|
793
677
|
}
|
|
794
|
-
|
|
795
678
|
render() {
|
|
796
679
|
return /*#__PURE__*/_react.default.createElement("div", {
|
|
797
680
|
className: _AdvancedSearchModule.default.advancedSearch
|
|
@@ -818,14 +701,10 @@ class AdvancedSearchForm extends _react.default.Component {
|
|
|
818
701
|
"data-testid": "reset-button"
|
|
819
702
|
}, _i18next.default.t(`${_constants2.NS_LIBS_CMDB_INSTANCES}:${_constants2.K.RESET}`))))));
|
|
820
703
|
}
|
|
821
|
-
|
|
822
704
|
}
|
|
823
|
-
|
|
824
705
|
exports.AdvancedSearchForm = AdvancedSearchForm;
|
|
825
|
-
|
|
826
706
|
const AdvancedSearch = _compatible.Form.create({
|
|
827
707
|
name: "advanced_search"
|
|
828
708
|
})(AdvancedSearchForm);
|
|
829
|
-
|
|
830
709
|
exports.AdvancedSearch = AdvancedSearch;
|
|
831
710
|
//# sourceMappingURL=AdvancedSearch.js.map
|