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