@next-libs/cmdb-instances 6.47.12 → 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.
Files changed (212) hide show
  1. package/dist/cjs/attribute-form-control-url/AttributeFormControlUrl.js +8 -23
  2. package/dist/cjs/attribute-form-control-url/AttributeFormControlUrl.js.map +1 -1
  3. package/dist/cjs/cmdb-instances-input-form/CmdbInstancesInputFormItem.js +3 -43
  4. package/dist/cjs/cmdb-instances-input-form/CmdbInstancesInputFormItem.js.map +1 -1
  5. package/dist/cjs/cmdb-instances-select-panel/CmdbInstancesSelectPanel.js +6 -45
  6. package/dist/cjs/cmdb-instances-select-panel/CmdbInstancesSelectPanel.js.map +1 -1
  7. package/dist/cjs/cmdb-url-link/CmdbUrlLink.js +0 -11
  8. package/dist/cjs/cmdb-url-link/CmdbUrlLink.js.map +1 -1
  9. package/dist/cjs/components/index.js +0 -4
  10. package/dist/cjs/components/index.js.map +1 -1
  11. package/dist/cjs/components/instance-format/index.js +0 -15
  12. package/dist/cjs/components/instance-format/index.js.map +1 -1
  13. package/dist/cjs/components/user-or-user-group-select/UserOrUserGroupSelect.js +33 -92
  14. package/dist/cjs/components/user-or-user-group-select/UserOrUserGroupSelect.js.map +1 -1
  15. package/dist/cjs/data-providers/fetchCmdbInstanceDetail.js +0 -3
  16. package/dist/cjs/data-providers/fetchCmdbInstanceDetail.js.map +1 -1
  17. package/dist/cjs/data-providers/fetchCmdbInstanceSearch.js +0 -2
  18. package/dist/cjs/data-providers/fetchCmdbInstanceSearch.js.map +1 -1
  19. package/dist/cjs/data-providers/fetchCmdbObjectDetail.js +0 -2
  20. package/dist/cjs/data-providers/fetchCmdbObjectDetail.js.map +1 -1
  21. package/dist/cjs/data-providers/fetchCmdbObjectList.js +0 -2
  22. package/dist/cjs/data-providers/fetchCmdbObjectList.js.map +1 -1
  23. package/dist/cjs/data-providers/fetchCmdbObjectRef.js +0 -2
  24. package/dist/cjs/data-providers/fetchCmdbObjectRef.js.map +1 -1
  25. package/dist/cjs/data-providers/index.js +0 -10
  26. package/dist/cjs/data-providers/index.js.map +1 -1
  27. package/dist/cjs/float-display-brick/FloatDisplayBrick.js +0 -7
  28. package/dist/cjs/float-display-brick/FloatDisplayBrick.js.map +1 -1
  29. package/dist/cjs/i18n/constants.js +0 -1
  30. package/dist/cjs/i18n/constants.js.map +1 -1
  31. package/dist/cjs/i18n/index.js +0 -7
  32. package/dist/cjs/i18n/index.js.map +1 -1
  33. package/dist/cjs/i18n/locales/en.js +0 -2
  34. package/dist/cjs/i18n/locales/en.js.map +1 -1
  35. package/dist/cjs/i18n/locales/zh.js +0 -2
  36. package/dist/cjs/i18n/locales/zh.js.map +1 -1
  37. package/dist/cjs/index.js +0 -29
  38. package/dist/cjs/index.js.map +1 -1
  39. package/dist/cjs/instance-attribute-form/InstanceAttributeForm.js +4 -25
  40. package/dist/cjs/instance-attribute-form/InstanceAttributeForm.js.map +1 -1
  41. package/dist/cjs/instance-detail/InstanceDetail.js +42 -124
  42. package/dist/cjs/instance-detail/InstanceDetail.js.map +1 -1
  43. package/dist/cjs/instance-detail/components/instance-relation-field-display/constants.js.map +1 -1
  44. package/dist/cjs/instance-detail/components/instance-relation-field-display/instance-relation-field-display.js +4 -19
  45. package/dist/cjs/instance-detail/components/instance-relation-field-display/instance-relation-field-display.js.map +1 -1
  46. package/dist/cjs/instance-detail/components/instance-relation-table-show/instance-relation-table-show.js +4 -11
  47. package/dist/cjs/instance-detail/components/instance-relation-table-show/instance-relation-table-show.js.map +1 -1
  48. package/dist/cjs/instance-detail/constants/index.js.map +1 -1
  49. package/dist/cjs/instance-list/IconButton.js +0 -18
  50. package/dist/cjs/instance-list/IconButton.js.map +1 -1
  51. package/dist/cjs/instance-list/InstanceList.js +60 -210
  52. package/dist/cjs/instance-list/InstanceList.js.map +1 -1
  53. package/dist/cjs/instance-list/constants.js +0 -7
  54. package/dist/cjs/instance-list/constants.js.map +1 -1
  55. package/dist/cjs/instance-list-modal/InstanceListModal.js +8 -32
  56. package/dist/cjs/instance-list-modal/InstanceListModal.js.map +1 -1
  57. package/dist/cjs/instance-list-table/AdvancedSearch.js +12 -133
  58. package/dist/cjs/instance-list-table/AdvancedSearch.js.map +1 -1
  59. package/dist/cjs/instance-list-table/AdvancedSearchCondition.js +3 -45
  60. package/dist/cjs/instance-list-table/AdvancedSearchCondition.js.map +1 -1
  61. package/dist/cjs/instance-list-table/DisplaySettings.js +0 -24
  62. package/dist/cjs/instance-list-table/DisplaySettings.js.map +1 -1
  63. package/dist/cjs/instance-list-table/DisplaySettingsModal.js +0 -10
  64. package/dist/cjs/instance-list-table/DisplaySettingsModal.js.map +1 -1
  65. package/dist/cjs/instance-list-table/DynamicSearch.js +4 -44
  66. package/dist/cjs/instance-list-table/DynamicSearch.js.map +1 -1
  67. package/dist/cjs/instance-list-table/InstanceListTable.js +30 -151
  68. package/dist/cjs/instance-list-table/InstanceListTable.js.map +1 -1
  69. package/dist/cjs/instance-list-table/MoreButtonsContainer.js +0 -15
  70. package/dist/cjs/instance-list-table/MoreButtonsContainer.js.map +1 -1
  71. package/dist/cjs/instance-list-table/constants.js +0 -2
  72. package/dist/cjs/instance-list-table/constants.js.map +1 -1
  73. package/dist/cjs/instance-list-table/data-providers/fetchCmdbInstanceAggregateCount.js +0 -2
  74. package/dist/cjs/instance-list-table/data-providers/fetchCmdbInstanceAggregateCount.js.map +1 -1
  75. package/dist/cjs/instance-list-table/data-providers/fetchCmdbInstanceCount.js +0 -2
  76. package/dist/cjs/instance-list-table/data-providers/fetchCmdbInstanceCount.js.map +1 -1
  77. package/dist/cjs/instance-list-table/data-providers/fetchCmdbInstanceDetail.js +0 -2
  78. package/dist/cjs/instance-list-table/data-providers/fetchCmdbInstanceDetail.js.map +1 -1
  79. package/dist/cjs/instance-list-table/data-providers/fetchCmdbObjectDetail.js +0 -2
  80. package/dist/cjs/instance-list-table/data-providers/fetchCmdbObjectDetail.js.map +1 -1
  81. package/dist/cjs/instance-list-table/data-providers/fetchPermRoleList.js +0 -2
  82. package/dist/cjs/instance-list-table/data-providers/fetchPermRoleList.js.map +1 -1
  83. package/dist/cjs/instance-list-table/data-providers/fetchPermissionList.js +0 -2
  84. package/dist/cjs/instance-list-table/data-providers/fetchPermissionList.js.map +1 -1
  85. package/dist/cjs/instance-list-table/data-providers/getDefaultValueTemplate.js +1 -2
  86. package/dist/cjs/instance-list-table/data-providers/getDefaultValueTemplate.js.map +1 -1
  87. package/dist/cjs/instance-list-table/data-providers/index.js +0 -16
  88. package/dist/cjs/instance-list-table/data-providers/index.js.map +1 -1
  89. package/dist/cjs/instance-list-table/data-providers/searchCmdbInstances.js +0 -2
  90. package/dist/cjs/instance-list-table/data-providers/searchCmdbInstances.js.map +1 -1
  91. package/dist/cjs/instance-list-table/index.js +0 -12
  92. package/dist/cjs/instance-list-table/index.js.map +1 -1
  93. package/dist/cjs/instance-list-table/utils.js +0 -24
  94. package/dist/cjs/instance-list-table/utils.js.map +1 -1
  95. package/dist/cjs/model-attribute-form/ModelAttributeForm.js +27 -99
  96. package/dist/cjs/model-attribute-form/ModelAttributeForm.js.map +1 -1
  97. package/dist/cjs/model-attribute-form/constants.js.map +1 -1
  98. package/dist/cjs/model-attribute-form-control/ModelAttributeFormControl.js +13 -94
  99. package/dist/cjs/model-attribute-form-control/ModelAttributeFormControl.js.map +1 -1
  100. package/dist/cjs/model-relation-form/ModelRelationForm.js +0 -18
  101. package/dist/cjs/model-relation-form/ModelRelationForm.js.map +1 -1
  102. package/dist/cjs/processors.js +2 -21
  103. package/dist/cjs/processors.js.map +1 -1
  104. package/dist/cjs/struct-components/AddStruct.js +4 -15
  105. package/dist/cjs/struct-components/AddStruct.js.map +1 -1
  106. package/dist/cjs/struct-components/AddStructModal.js +0 -48
  107. package/dist/cjs/struct-components/AddStructModal.js.map +1 -1
  108. package/dist/cjs/struct-components/StructTable.js +2 -32
  109. package/dist/cjs/struct-components/StructTable.js.map +1 -1
  110. package/dist/cjs/struct-components/index.js +0 -8
  111. package/dist/cjs/struct-components/index.js.map +1 -1
  112. package/dist/cjs/struct-components/interfaces.js +0 -1
  113. package/dist/cjs/struct-components/interfaces.js.map +1 -1
  114. package/dist/cjs/struct-components/mockData.js.map +1 -1
  115. package/dist/esm/attribute-form-control-url/AttributeFormControlUrl.js +8 -18
  116. package/dist/esm/attribute-form-control-url/AttributeFormControlUrl.js.map +1 -1
  117. package/dist/esm/cmdb-instances-input-form/CmdbInstancesInputFormItem.js +3 -35
  118. package/dist/esm/cmdb-instances-input-form/CmdbInstancesInputFormItem.js.map +1 -1
  119. package/dist/esm/cmdb-instances-select-panel/CmdbInstancesSelectPanel.js +4 -32
  120. package/dist/esm/cmdb-instances-select-panel/CmdbInstancesSelectPanel.js.map +1 -1
  121. package/dist/esm/cmdb-url-link/CmdbUrlLink.js +0 -3
  122. package/dist/esm/cmdb-url-link/CmdbUrlLink.js.map +1 -1
  123. package/dist/esm/components/index.js.map +1 -1
  124. package/dist/esm/components/instance-format/index.js +0 -5
  125. package/dist/esm/components/instance-format/index.js.map +1 -1
  126. package/dist/esm/components/user-or-user-group-select/UserOrUserGroupSelect.js +19 -74
  127. package/dist/esm/components/user-or-user-group-select/UserOrUserGroupSelect.js.map +1 -1
  128. package/dist/esm/data-providers/fetchCmdbInstanceDetail.js.map +1 -1
  129. package/dist/esm/data-providers/fetchCmdbInstanceSearch.js.map +1 -1
  130. package/dist/esm/data-providers/fetchCmdbObjectDetail.js.map +1 -1
  131. package/dist/esm/data-providers/fetchCmdbObjectList.js.map +1 -1
  132. package/dist/esm/data-providers/fetchCmdbObjectRef.js.map +1 -1
  133. package/dist/esm/data-providers/index.js.map +1 -1
  134. package/dist/esm/float-display-brick/FloatDisplayBrick.js +0 -1
  135. package/dist/esm/float-display-brick/FloatDisplayBrick.js.map +1 -1
  136. package/dist/esm/i18n/constants.js +0 -1
  137. package/dist/esm/i18n/constants.js.map +1 -1
  138. package/dist/esm/i18n/index.js +2 -1
  139. package/dist/esm/i18n/index.js.map +1 -1
  140. package/dist/esm/i18n/locales/en.js.map +1 -1
  141. package/dist/esm/i18n/locales/zh.js.map +1 -1
  142. package/dist/esm/index.js +2 -2
  143. package/dist/esm/index.js.map +1 -1
  144. package/dist/esm/instance-attribute-form/InstanceAttributeForm.js +4 -10
  145. package/dist/esm/instance-attribute-form/InstanceAttributeForm.js.map +1 -1
  146. package/dist/esm/instance-detail/InstanceDetail.js +36 -111
  147. package/dist/esm/instance-detail/InstanceDetail.js.map +1 -1
  148. package/dist/esm/instance-detail/components/instance-relation-field-display/constants.js.map +1 -1
  149. package/dist/esm/instance-detail/components/instance-relation-field-display/instance-relation-field-display.js +4 -10
  150. package/dist/esm/instance-detail/components/instance-relation-field-display/instance-relation-field-display.js.map +1 -1
  151. package/dist/esm/instance-detail/components/instance-relation-table-show/instance-relation-table-show.js +2 -2
  152. package/dist/esm/instance-detail/components/instance-relation-table-show/instance-relation-table-show.js.map +1 -1
  153. package/dist/esm/instance-detail/constants/index.js.map +1 -1
  154. package/dist/esm/instance-list/IconButton.js +0 -8
  155. package/dist/esm/instance-list/IconButton.js.map +1 -1
  156. package/dist/esm/instance-list/InstanceList.js +54 -180
  157. package/dist/esm/instance-list/InstanceList.js.map +1 -1
  158. package/dist/esm/instance-list/constants.js +0 -2
  159. package/dist/esm/instance-list/constants.js.map +1 -1
  160. package/dist/esm/instance-list-modal/InstanceListModal.js +8 -20
  161. package/dist/esm/instance-list-modal/InstanceListModal.js.map +1 -1
  162. package/dist/esm/instance-list-table/AdvancedSearch.js +10 -119
  163. package/dist/esm/instance-list-table/AdvancedSearch.js.map +1 -1
  164. package/dist/esm/instance-list-table/AdvancedSearchCondition.js +1 -31
  165. package/dist/esm/instance-list-table/AdvancedSearchCondition.js.map +1 -1
  166. package/dist/esm/instance-list-table/DisplaySettings.js +0 -16
  167. package/dist/esm/instance-list-table/DisplaySettings.js.map +1 -1
  168. package/dist/esm/instance-list-table/DisplaySettingsModal.js +0 -3
  169. package/dist/esm/instance-list-table/DisplaySettingsModal.js.map +1 -1
  170. package/dist/esm/instance-list-table/DynamicSearch.js +0 -34
  171. package/dist/esm/instance-list-table/DynamicSearch.js.map +1 -1
  172. package/dist/esm/instance-list-table/InstanceListTable.js +23 -138
  173. package/dist/esm/instance-list-table/InstanceListTable.js.map +1 -1
  174. package/dist/esm/instance-list-table/MoreButtonsContainer.js +0 -7
  175. package/dist/esm/instance-list-table/MoreButtonsContainer.js.map +1 -1
  176. package/dist/esm/instance-list-table/constants.js +0 -2
  177. package/dist/esm/instance-list-table/constants.js.map +1 -1
  178. package/dist/esm/instance-list-table/data-providers/fetchCmdbInstanceAggregateCount.js.map +1 -1
  179. package/dist/esm/instance-list-table/data-providers/fetchCmdbInstanceCount.js.map +1 -1
  180. package/dist/esm/instance-list-table/data-providers/fetchCmdbInstanceDetail.js.map +1 -1
  181. package/dist/esm/instance-list-table/data-providers/fetchCmdbObjectDetail.js.map +1 -1
  182. package/dist/esm/instance-list-table/data-providers/fetchPermRoleList.js.map +1 -1
  183. package/dist/esm/instance-list-table/data-providers/fetchPermissionList.js.map +1 -1
  184. package/dist/esm/instance-list-table/data-providers/getDefaultValueTemplate.js +1 -1
  185. package/dist/esm/instance-list-table/data-providers/getDefaultValueTemplate.js.map +1 -1
  186. package/dist/esm/instance-list-table/data-providers/index.js.map +1 -1
  187. package/dist/esm/instance-list-table/data-providers/searchCmdbInstances.js.map +1 -1
  188. package/dist/esm/instance-list-table/index.js.map +1 -1
  189. package/dist/esm/instance-list-table/utils.js +0 -15
  190. package/dist/esm/instance-list-table/utils.js.map +1 -1
  191. package/dist/esm/model-attribute-form/ModelAttributeForm.js +19 -92
  192. package/dist/esm/model-attribute-form/ModelAttributeForm.js.map +1 -1
  193. package/dist/esm/model-attribute-form/constants.js.map +1 -1
  194. package/dist/esm/model-attribute-form-control/ModelAttributeFormControl.js +27 -102
  195. package/dist/esm/model-attribute-form-control/ModelAttributeFormControl.js.map +1 -1
  196. package/dist/esm/model-relation-form/ModelRelationForm.js +0 -10
  197. package/dist/esm/model-relation-form/ModelRelationForm.js.map +1 -1
  198. package/dist/esm/processors.js +2 -7
  199. package/dist/esm/processors.js.map +1 -1
  200. package/dist/esm/struct-components/AddStruct.js +4 -9
  201. package/dist/esm/struct-components/AddStruct.js.map +1 -1
  202. package/dist/esm/struct-components/AddStructModal.js +0 -36
  203. package/dist/esm/struct-components/AddStructModal.js.map +1 -1
  204. package/dist/esm/struct-components/StructTable.js +2 -26
  205. package/dist/esm/struct-components/StructTable.js.map +1 -1
  206. package/dist/esm/struct-components/index.js.map +1 -1
  207. package/dist/esm/struct-components/interfaces.js +0 -1
  208. package/dist/esm/struct-components/interfaces.js.map +1 -1
  209. package/dist/esm/struct-components/mockData.js.map +1 -1
  210. package/dist/types/instance-list/InstanceList.d.ts +10 -0
  211. package/package.json +9 -9
  212. package/CHANGELOG.md +0 -3676
@@ -1,9 +1,7 @@
1
1
  "use strict";
2
2
 
3
3
  var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard").default;
4
-
5
4
  var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
6
-
7
5
  Object.defineProperty(exports, "__esModule", {
8
6
  value: true
9
7
  });
@@ -13,41 +11,23 @@ exports.getQuery = getQuery;
13
11
  exports.isValueEqualFn = exports.isSpecialFn = exports.initAqToShow = void 0;
14
12
  exports.joinRelationFieldAndShowkey = joinRelationFieldAndShowkey;
15
13
  exports.specialQueryHandler = void 0;
16
-
17
14
  var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
18
-
19
15
  var _react = _interopRequireWildcard(require("react"));
20
-
21
16
  var _lodash = require("lodash");
22
-
23
17
  var _brickKit = require("@next-core/brick-kit");
24
-
25
18
  var _i18next = _interopRequireDefault(require("i18next"));
26
-
27
19
  var _constants = require("../i18n/constants");
28
-
29
20
  var _cmdbSdk = require("@next-sdk/cmdb-sdk");
30
-
31
21
  var _compatible = require("@ant-design/compatible");
32
-
33
22
  var _antd = require("antd");
34
-
35
23
  var _cmdbUtils = require("@next-libs/cmdb-utils");
36
-
37
24
  var _storage = require("@next-libs/storage");
38
-
39
25
  var _instanceListTable = require("../instance-list-table");
40
-
41
26
  var _InstanceListModule = _interopRequireDefault(require("./InstanceList.module.css"));
42
-
43
27
  var _constants2 = require("./constants");
44
-
45
28
  var _ModelAttributeFormControl = require("../model-attribute-form-control/ModelAttributeFormControl");
46
-
47
29
  var _IconButton = require("./IconButton");
48
-
49
30
  var _processors = require("../processors");
50
-
51
31
  function joinRelationFieldAndShowkey(fields, modelData, objectList) {
52
32
  const attrIdMap = (0, _lodash.keyBy)(modelData.attrList, "id");
53
33
  return fields.map(field => {
@@ -55,10 +35,8 @@ function joinRelationFieldAndShowkey(fields, modelData, objectList) {
55
35
  return field;
56
36
  } else {
57
37
  const relation = modelData.relation_list.find(relation => relation.left_id === field || relation.right_id === field);
58
-
59
38
  if (relation) {
60
39
  var _otherSideObject$view, _otherSideObject$view2, _otherSideObject$view3;
61
-
62
40
  const isLeft = relation.left_object_id === modelData.objectId;
63
41
  const otherSideObjectId = isLeft ? relation.right_object_id : relation.left_object_id;
64
42
  const otherSideObject = objectList.find(object => object.objectId === otherSideObjectId);
@@ -70,16 +48,13 @@ function joinRelationFieldAndShowkey(fields, modelData, objectList) {
70
48
  }
71
49
  });
72
50
  }
73
-
74
51
  function getQuery(modelData, idObjectMap, q, fields, onlySearchByIp) {
75
52
  const query = {
76
53
  $or: []
77
54
  };
78
55
  const queryValues = q.trim().split(/\s+/);
79
-
80
56
  if (onlySearchByIp) {
81
57
  var _getRuntime$getCurren;
82
-
83
58
  const searchIpFields = ((_getRuntime$getCurren = (0, _brickKit.getRuntime)().getCurrentApp().config) === null || _getRuntime$getCurren === void 0 ? void 0 : _getRuntime$getCurren.searchIpFields) || [];
84
59
  const queryOrs = [...new Set(["ip", ...searchIpFields])];
85
60
  const searchValue = {
@@ -92,7 +67,6 @@ function getQuery(modelData, idObjectMap, q, fields, onlySearchByIp) {
92
67
  });
93
68
  return query;
94
69
  }
95
-
96
70
  (0, _cmdbUtils.forEachAvailableFields)(modelData, attr => {
97
71
  queryValues.forEach(queryValue => query.$or.push({
98
72
  [attr.id]: {
@@ -114,41 +88,31 @@ function getQuery(modelData, idObjectMap, q, fields, onlySearchByIp) {
114
88
  }, fields);
115
89
  return query;
116
90
  }
117
-
118
91
  const isSpecialFn = (query, attrId) => {
119
92
  return Object.keys(query[attrId]).some(v => v === "$exists" || v === "$gte" || v === "$lte");
120
93
  };
121
-
122
94
  exports.isSpecialFn = isSpecialFn;
123
-
124
95
  const specialQueryHandler = (query, key, queries) => {
125
96
  // $exists $gte $lte 针对为空,不为空,时间范围特殊处理
126
97
  const isSpecial = isSpecialFn(query, key);
127
-
128
98
  if (isSpecial) {
129
99
  return;
130
100
  }
131
-
132
101
  queries.push(query);
133
102
  };
134
-
135
103
  exports.specialQueryHandler = specialQueryHandler;
136
-
137
104
  const isValueEqualFn = (query, attrId, valuesStr) => {
138
105
  const isSpecial = isSpecialFn(query, attrId);
139
106
  if (isSpecial) return false;
140
107
  return query[attrId] ? valuesStr && Object.values(query[attrId]).join(" ") !== valuesStr // 当条件是为空和不为空时,需要判断valuesStr是否存在
141
108
  : false;
142
109
  };
143
-
144
110
  exports.isValueEqualFn = isValueEqualFn;
145
-
146
111
  function translateConditions(aq, idObjectMap, modelData, t) {
147
112
  const conditions = [];
148
113
  const relations = [];
149
114
  modelData.relation_list.forEach(relation => {
150
115
  let sidesArr = [];
151
-
152
116
  if ((0, _cmdbUtils.isSelfRelation)(relation)) {
153
117
  sidesArr = [{
154
118
  this: "left",
@@ -160,14 +124,12 @@ function translateConditions(aq, idObjectMap, modelData, t) {
160
124
  } else {
161
125
  sidesArr = [(0, _cmdbUtils.getRelationObjectSides)(relation, modelData)];
162
126
  }
163
-
164
127
  sidesArr.forEach(sides => {
165
128
  const objectId = relation[`${sides.this}_id`];
166
129
  const relationObject = idObjectMap[relation[`${sides.that}_object_id`]];
167
130
  const nameKeys = (0, _cmdbUtils.getInstanceNameKeys)(relationObject);
168
131
  nameKeys.forEach(nameKey => {
169
132
  var _find$name, _find;
170
-
171
133
  const nameOfNameKey = (_find$name = (_find = (0, _lodash.find)(relationObject === null || relationObject === void 0 ? void 0 : relationObject.attrList, ["id", nameKey])) === null || _find === void 0 ? void 0 : _find.name) !== null && _find$name !== void 0 ? _find$name : nameKey;
172
134
  const id = `${objectId}.${nameKey}`;
173
135
  const name = `${relation[`${sides.this}_name`]}(${nameOfNameKey})`;
@@ -191,45 +153,35 @@ function translateConditions(aq, idObjectMap, modelData, t) {
191
153
  });
192
154
  });
193
155
  const attrAndRelationList = [...modelData.attrList, ...relations];
194
-
195
156
  if (!(0, _lodash.isEmpty)(aq)) {
196
157
  for (const query of aq) {
197
158
  let queries = [query];
198
-
199
159
  if (Object.keys(query)[0] === "$or" || Object.keys(query)[0] === "$and") {
200
160
  queries = query[Object.keys(query)[0]];
201
161
  }
202
-
203
162
  queries.forEach(query => {
204
163
  const key = Object.keys(query)[0];
205
164
  const value = Object.values(query)[0];
206
165
  let attr = attrAndRelationList.find(attr => attr.id === key || attr.relationSideId === key);
207
-
208
166
  if (Object.keys(value)[0] === _cmdbUtils.ElementOperators.Exists && attr.relationSideId) {
209
167
  const relationSideId = attr.relationSideId;
210
168
  attr = attrAndRelationList.find(attr => attr.id === `${relationSideId}.`) || attr;
211
169
  }
212
-
213
170
  if (attr) {
214
171
  query = (0, _processors.changeQueryWithCustomRules)(modelData.objectId, attr.id, query);
215
172
  const info = (0, _instanceListTable.getFieldConditionsAndValues)(query, key, attr.value.type, undefined, undefined, modelData.objectId, attr.id);
216
-
217
173
  if (![_instanceListTable.ConditionType.Between, _instanceListTable.ConditionType.Empty, _instanceListTable.ConditionType.NotEmpty, _instanceListTable.ConditionType.False, _instanceListTable.ConditionType.True].includes(info.currentCondition.type)) {
218
174
  info.values = info.values.map(v => (0, _lodash.isString)(v) && v.includes(" ") ? v.replace(/^"+|"+$/g, "") : v);
219
175
  }
220
-
221
176
  let condition = `${attr.name}: ${info.currentCondition.label}`;
222
-
223
177
  if (![_instanceListTable.ConditionType.Empty, _instanceListTable.ConditionType.NotEmpty].includes(info.currentCondition.type)) {
224
178
  condition += `"${info.values.join(" ~ ")}"`;
225
179
  }
226
-
227
180
  const curCondition = {
228
181
  attrId: key,
229
182
  condition,
230
183
  valuesStr: info.queryValuesStr
231
184
  };
232
-
233
185
  if (conditions.every(v => !(0, _lodash.isEqual)((0, _lodash.omit)(v, "attrId"), (0, _lodash.omit)(curCondition, "attrId")))) {
234
186
  conditions.push(curCondition);
235
187
  }
@@ -237,27 +189,20 @@ function translateConditions(aq, idObjectMap, modelData, t) {
237
189
  });
238
190
  }
239
191
  }
240
-
241
192
  return conditions;
242
193
  }
243
-
244
194
  function newKey(fieldIds, aq) {
245
195
  let key = "";
246
-
247
196
  if (!(0, _lodash.isEmpty)(fieldIds)) {
248
197
  key += fieldIds.join("-");
249
198
  }
250
-
251
199
  if (!(0, _lodash.isEmpty)(aq)) {
252
200
  key += `-${aq.length}`;
253
201
  }
254
-
255
202
  return key;
256
203
  }
257
-
258
204
  const isOfStruct = (modelData, fieldId) => {
259
205
  var _modelData$attrList$f;
260
-
261
206
  const structFields = (_modelData$attrList$f = modelData.attrList.filter(attr => attr.value.type === "struct" || attr.value.type === "structs")) === null || _modelData$attrList$f === void 0 ? void 0 : _modelData$attrList$f.map(attr => {
262
207
  const structs = [];
263
208
  attr.value.struct_define.forEach(struct => {
@@ -267,29 +212,23 @@ const isOfStruct = (modelData, fieldId) => {
267
212
  }).flat();
268
213
  return structFields.includes(fieldId);
269
214
  };
270
-
271
215
  const isOfBoolean = (attrList, fieldId) => {
272
216
  var _keyAttrMap$fieldId;
273
-
274
217
  const keyAttrMap = (0, _lodash.keyBy)(attrList, "id");
275
218
  return ((_keyAttrMap$fieldId = keyAttrMap[fieldId]) === null || _keyAttrMap$fieldId === void 0 ? void 0 : _keyAttrMap$fieldId.value.type) === _ModelAttributeFormControl.ModelAttributeValueType.BOOLEAN;
276
219
  };
277
-
278
220
  const initAqToShow = (aq, modelData, isToShow = true) => {
279
221
  let newAqToShow = [];
280
-
281
222
  if (aq) {
282
223
  aq.forEach(query => {
283
224
  const aqToShow = Object.entries(query).map(([key, expressions]) => {
284
225
  let newExpressions = [];
285
-
286
226
  if (key === _cmdbUtils.LogicalOperators.Or || key === _cmdbUtils.LogicalOperators.And) {
287
227
  const firstSubQuery = expressions[0];
288
228
  const fieldId = Object.keys(firstSubQuery)[0];
289
229
  const isStruct = isOfStruct(modelData, fieldId);
290
230
  const isBool = isOfBoolean(modelData.attrList, fieldId);
291
231
  const structQueries = expressions.filter(expression => Object.keys(expression)[0] === fieldId);
292
-
293
232
  if (isStruct && isToShow) {
294
233
  const structExpressions = structQueries.map(item => ({
295
234
  [fieldId.split(".")[0]]: item[fieldId]
@@ -298,7 +237,6 @@ const initAqToShow = (aq, modelData, isToShow = true) => {
298
237
  } else if (isBool && !isToShow) {
299
238
  const boolExpressions = expressions.map(expression => {
300
239
  const targetValue = expression[fieldId];
301
-
302
240
  if (typeof Object.values(targetValue)[0] === "string") {
303
241
  return {
304
242
  [fieldId]: {
@@ -313,7 +251,6 @@ const initAqToShow = (aq, modelData, isToShow = true) => {
313
251
  } else {
314
252
  newExpressions = [...newExpressions, ...expressions];
315
253
  }
316
-
317
254
  return {
318
255
  [key]: newExpressions
319
256
  };
@@ -325,15 +262,11 @@ const initAqToShow = (aq, modelData, isToShow = true) => {
325
262
  });
326
263
  return newAqToShow;
327
264
  }
328
-
329
265
  return;
330
266
  };
331
-
332
267
  exports.initAqToShow = initAqToShow;
333
-
334
268
  function LegacyInstanceList(props) {
335
269
  var _props$selectedRowKey, _state$appList, _props$extraFilterBri;
336
-
337
270
  const {
338
271
  showTooltip = true
339
272
  } = props;
@@ -342,16 +275,19 @@ function LegacyInstanceList(props) {
342
275
  name: _i18next.default.t(`${_constants.NS_LIBS_CMDB_INSTANCES}:${_constants.K.ALL_CLUSTER}`)
343
276
  }];
344
277
  const jsonLocalStorage = new _storage.JsonStorage(localStorage);
345
-
346
278
  const reducer = (prevState, updatedProperty) => {
347
- return { ...prevState,
279
+ return {
280
+ ...prevState,
348
281
  ...updatedProperty
349
282
  };
350
- }; // 资源自动发现页面24小时发现主机抽屉的实例列表处,通用的postSearchV3接口无法查到正确结果,需要用下面的接口替换,参数里也要加上jobId:***
283
+ };
284
+ // 资源自动发现页面24小时发现主机抽屉的实例列表处,通用的postSearchV3接口无法查到正确结果,需要用下面的接口替换,参数里也要加上jobId:***
351
285
  // 为了不影响其他地方的实例列表,在该处加一个useAutoDiscoveryProvider参数,该参数为undefined或false的,仍调用原接口
352
286
 
353
-
354
287
  const listProvider = (0, _brickKit.useProvider)("easyops.api.cmdb.job@SearchResource:1.0.1");
288
+ const instanceArchiveListProvider = (0, _brickKit.useProvider)("providers-of-cmdb.instance-archive-api-list-archive-instance", {
289
+ cache: false
290
+ });
355
291
  const {
356
292
  modelData,
357
293
  idObjectMap
@@ -360,7 +296,6 @@ function LegacyInstanceList(props) {
360
296
  const idObjectMap = {};
361
297
  props.objectList.forEach(object => {
362
298
  idObjectMap[object.objectId] = object;
363
-
364
299
  if (object.objectId === props.objectId) {
365
300
  modelData = object;
366
301
  modelData.attrList = !props.disabledDefaultFields ? (0, _lodash.union)(object.attrList, _constants2.extraFieldAttrs) : object.attrList;
@@ -373,23 +308,18 @@ function LegacyInstanceList(props) {
373
308
  }, [props.objectList, props.objectId]);
374
309
  const [inheritanceModelIdNameMap, setInheritanceModelIdNameMap] = (0, _react.useState)({});
375
310
  const [fixedHeader, setFixHeader] = (0, _react.useState)(false);
376
-
377
311
  const fetchInheritanceModelIdNameMap = async modelData => {
378
312
  let idNameMap = {};
379
-
380
313
  if (modelData.isAbstract) {
381
314
  idNameMap = await (0, _cmdbSdk.CmdbObjectApi_getIdMapName)({
382
315
  parentObjectId: modelData.objectId
383
316
  });
384
317
  }
385
-
386
318
  setInheritanceModelIdNameMap(idNameMap);
387
319
  };
388
-
389
320
  (0, _react.useEffect)(() => {
390
321
  fetchInheritanceModelIdNameMap(modelData);
391
322
  }, [modelData]);
392
-
393
323
  const computeDefaultFields = ({
394
324
  inModal
395
325
  } = {
@@ -404,22 +334,18 @@ function LegacyInstanceList(props) {
404
334
  return {
405
335
  fieldIds
406
336
  };
407
- }; // 根据用户预定义的 presetConfigs.fieldIds 进行排序,如果不在预定义的字段,则根据 modelData.view.attr_order 进行排序
408
-
337
+ };
409
338
 
339
+ // 根据用户预定义的 presetConfigs.fieldIds 进行排序,如果不在预定义的字段,则根据 modelData.view.attr_order 进行排序
410
340
  const _sortFieldIds = fieldIds => {
411
341
  var _props$presetConfigs;
412
-
413
342
  let frontFields = [];
414
343
  let restFields = [];
415
-
416
344
  if ((_props$presetConfigs = props.presetConfigs) !== null && _props$presetConfigs !== void 0 && _props$presetConfigs.fieldIds) {
417
345
  frontFields = (0, _lodash.filter)(props.presetConfigs.fieldIds, id => fieldIds.includes(id));
418
346
  }
419
-
420
347
  restFields = (0, _lodash.sortBy)((0, _lodash.reject)(fieldIds, id => frontFields.includes(id)), fieldId => {
421
348
  const foundIndex = (0, _lodash.findIndex)(modelData.view.attr_order, orderId => orderId === fieldId);
422
-
423
349
  if (foundIndex === -1) {
424
350
  return null;
425
351
  } else {
@@ -428,25 +354,19 @@ function LegacyInstanceList(props) {
428
354
  });
429
355
  return [...frontFields, ...restFields];
430
356
  };
431
-
432
357
  const getFields = () => {
433
358
  var _props$presetConfigs2, _props$extraFixedFiel;
434
-
435
359
  let fieldIds = (_props$presetConfigs2 = props.presetConfigs) === null || _props$presetConfigs2 === void 0 ? void 0 : _props$presetConfigs2.fieldIds;
436
360
  const extraFixedFieldIds = (_props$extraFixedFiel = props.extraFixedFields) !== null && _props$extraFixedFiel !== void 0 ? _props$extraFixedFiel : [];
437
-
438
361
  if ((0, _lodash.isEmpty)(fieldIds)) {
439
362
  fieldIds = jsonLocalStorage.getItem(`${modelData.objectId}-selectAttrIds`);
440
363
  }
441
-
442
364
  if ((0, _lodash.isEmpty)(fieldIds)) {
443
365
  fieldIds = computeDefaultFields().fieldIds;
444
366
  }
445
-
446
367
  if (!(0, _lodash.isEmpty)(extraFixedFieldIds)) {
447
368
  fieldIds = (0, _lodash.uniq)([...fieldIds, ...extraFixedFieldIds]);
448
369
  }
449
-
450
370
  fieldIds = props.extraDisabledField ? (0, _lodash.uniq)([...fieldIds, props.extraDisabledField]) : fieldIds;
451
371
  fieldIds = _sortFieldIds(fieldIds);
452
372
  const hideModelData = modelData.view.hide_columns || [];
@@ -454,11 +374,9 @@ function LegacyInstanceList(props) {
454
374
  modelData.isAbstract && fieldIds.push("_object_id");
455
375
  return fieldIds;
456
376
  };
457
-
458
377
  const [q, setQ] = (0, _react.useState)(props.q);
459
378
  const [state, setState] = (0, _react.useReducer)(reducer, undefined, () => {
460
379
  var _ref, _props$dataSource$pag, _props$dataSource, _ref2, _props$dataSource$pag2, _props$dataSource2, _props$presetConfigs3;
461
-
462
380
  return {
463
381
  objectId: props.objectId,
464
382
  q: props.q,
@@ -493,25 +411,21 @@ function LegacyInstanceList(props) {
493
411
  const [selectedRowKeys, setSelectedRowKeys] = (0, _react.useState)((_props$selectedRowKey = props.selectedRowKeys) !== null && _props$selectedRowKey !== void 0 ? _props$selectedRowKey : []);
494
412
  const cache = (0, _react.useRef)(new Map());
495
413
  const isFirstRunRef = (0, _react.useRef)(true);
496
-
497
414
  const getInstanceListData = async (sort, asc, page) => {
498
415
  var _modelData$attrList, _modelData$attrList$f2, _modelData$attrList$f3, _props$onSearchExecut;
499
-
500
416
  const data = {};
501
417
  const v3Data = {
502
418
  fields: props !== null && props !== void 0 && props.extraFixedFields ? (0, _lodash.uniq)(["instanceId"].concat(props === null || props === void 0 ? void 0 : props.extraFixedFields)) : ["instanceId"]
503
419
  };
504
-
505
420
  if (!(0, _lodash.isEmpty)(props.permission)) {
506
421
  v3Data.permission = data.permission = props.permission;
507
422
  }
508
-
423
+ const archiveData = {};
509
424
  let query = {};
510
- v3Data.page = data.page = page;
511
- v3Data["page_size"] = data["page_size"] = state.pageSize;
425
+ v3Data.page = data.page = archiveData.page = page;
426
+ v3Data["page_size"] = data["page_size"] = archiveData["page_size"] = state.pageSize;
512
427
  const sortType = modelData === null || modelData === void 0 ? void 0 : (_modelData$attrList = modelData.attrList) === null || _modelData$attrList === void 0 ? void 0 : (_modelData$attrList$f2 = _modelData$attrList.find(attr => attr.id === sort)) === null || _modelData$attrList$f2 === void 0 ? void 0 : (_modelData$attrList$f3 = _modelData$attrList$f2.value) === null || _modelData$attrList$f3 === void 0 ? void 0 : _modelData$attrList$f3.default_type;
513
428
  const order = ["series-number", "auto-increment-id"].includes(sortType) ? asc ? 2 : -2 : asc ? 1 : -1;
514
-
515
429
  if (sort) {
516
430
  data.sort = {
517
431
  [sort]: order
@@ -521,19 +435,18 @@ function LegacyInstanceList(props) {
521
435
  order
522
436
  }];
523
437
  }
524
-
525
438
  if (state.q) {
526
439
  query = getQuery(modelData, idObjectMap, state.q, state.fieldIds, props.onlySearchByIp);
527
440
  }
528
-
441
+ if (state.q && props.useInstanceArchiveProvider) {
442
+ archiveData.key_word = state.q;
443
+ }
529
444
  if (!(0, _lodash.isEmpty)(state.aq)) {
530
445
  query[_cmdbUtils.LogicalOperators.And] = state.aq;
531
446
  }
532
-
533
447
  if (!(0, _lodash.isEmpty)(props.defaultQuery)) {
534
448
  query[_cmdbUtils.LogicalOperators.And] = [...(query[_cmdbUtils.LogicalOperators.And] || []), ...props.defaultQuery];
535
449
  }
536
-
537
450
  if (props.presetConfigs) {
538
451
  if (!(0, _lodash.isEmpty)(props.presetConfigs.query)) {
539
452
  if (Object.keys(query).length) {
@@ -545,47 +458,44 @@ function LegacyInstanceList(props) {
545
458
  }
546
459
  }
547
460
  }
548
-
549
461
  if (state.fieldIds) {
550
462
  data.fields = Object.fromEntries(state.fieldIds.map(fieldId => [fieldId, true]));
551
463
  v3Data.fields = [...state.fieldIds, ...v3Data.fields];
552
464
  v3Data.ignore_missing_field_error = true;
553
465
  }
554
-
555
466
  if (props.useAutoDiscoveryProvider) {
556
467
  v3Data.fields = joinRelationFieldAndShowkey(v3Data.fields, modelData, props.objectList);
557
468
  }
558
-
469
+ if (props.useInstanceArchiveProvider) {
470
+ archiveData.fields = v3Data.fields.join(",");
471
+ }
559
472
  if (state.aliveHosts && props.objectId === "HOST") {
560
- query = { ...query,
473
+ query = {
474
+ ...query,
561
475
  _agentStatus: "正常"
562
476
  };
563
477
  }
564
-
565
478
  if (state.instanceSourceQuery) {
566
- query = { ...query,
479
+ query = {
480
+ ...query,
567
481
  _object_id: state.instanceSourceQuery
568
482
  };
569
483
  }
570
-
571
484
  if (!(0, _lodash.isEmpty)(query)) {
572
485
  v3Data.query = data.query = query;
573
- } // useAutoDiscoveryProvider=true, 使用useProvider的接口,请求参数里加上extraParams
574
-
486
+ }
487
+ // useAutoDiscoveryProvider=true, 使用useProvider的接口,请求参数里加上extraParams
575
488
 
576
489
  if (props.useAutoDiscoveryProvider && !(0, _lodash.isEmpty)(props.extraParams)) {
577
490
  Object.assign(v3Data, props.extraParams);
578
491
  }
579
-
580
492
  if (state.relatedToMe) {
581
493
  v3Data.only_my_instance = data.only_my_instance = state.relatedToMe;
582
- } //按应用筛选
494
+ }
495
+ //按应用筛选
583
496
  // istanbul ignore next (state is not updated)
584
-
585
-
586
497
  if (state.searchByApp) {
587
498
  var _props$presetConfigs4, _props$presetConfigs5, _props$presetConfigs6, _props$presetConfigs7, _props$presetConfigs8;
588
-
589
499
  const hostRange = (_props$presetConfigs4 = props.presetConfigs) === null || _props$presetConfigs4 === void 0 ? void 0 : (_props$presetConfigs5 = _props$presetConfigs4.query) === null || _props$presetConfigs5 === void 0 ? void 0 : (_props$presetConfigs6 = _props$presetConfigs5["$and"]) === null || _props$presetConfigs6 === void 0 ? void 0 : (_props$presetConfigs7 = _props$presetConfigs6.find(i => i.instanceId)) === null || _props$presetConfigs7 === void 0 ? void 0 : (_props$presetConfigs8 = _props$presetConfigs7.instanceId) === null || _props$presetConfigs8 === void 0 ? void 0 : _props$presetConfigs8["$in"];
590
500
  v3Data.query = {
591
501
  [state.currentChangeSelect === "App" || state.currentChangeSelect === "Cluster" && state.clusterValue === "all" ? "_deviceList_CLUSTER.appId.instanceId" : "_deviceList_CLUSTER.instanceId"]: state.appSearchInstanceId,
@@ -599,17 +509,17 @@ function LegacyInstanceList(props) {
599
509
  } : {})
600
510
  };
601
511
  }
602
-
603
- const promise = (_props$onSearchExecut = props.onSearchExecute) === null || _props$onSearchExecut === void 0 ? void 0 : _props$onSearchExecut.call(props, data, v3Data); // useAutoDiscoveryProvider=true, 使用useProvider的接口
604
-
512
+ if (props.useInstanceArchiveProvider) {
513
+ return instanceArchiveListProvider.query([props.objectId, archiveData]);
514
+ }
515
+ const promise = (_props$onSearchExecut = props.onSearchExecute) === null || _props$onSearchExecut === void 0 ? void 0 : _props$onSearchExecut.call(props, data, v3Data);
516
+ // useAutoDiscoveryProvider=true, 使用useProvider的接口
605
517
  return promise ? promise : props.useAutoDiscoveryProvider ? listProvider.query([props.objectId, v3Data]) : (0, _cmdbSdk.InstanceApi_postSearchV3)(props.objectId, v3Data);
606
518
  };
607
-
608
519
  const refreshInstanceList = async (sort, asc, page) => {
609
520
  setState({
610
521
  loading: true
611
522
  });
612
-
613
523
  try {
614
524
  if (props.dataSource) {
615
525
  setState({
@@ -643,16 +553,13 @@ function LegacyInstanceList(props) {
643
553
  });
644
554
  }
645
555
  };
646
-
647
556
  (0, _react.useEffect)(() => {
648
557
  var _props$presetConfigs9;
649
-
650
558
  const fieldIds = getFields();
651
-
652
- if ( // 当 props.objectId 改变时,总是更新 state.fieldIds
559
+ if (
560
+ // 当 props.objectId 改变时,总是更新 state.fieldIds
653
561
  props.objectId !== state.objectId || !(0, _lodash.isEqual)(fieldIds, state.fieldIds) || !(0, _lodash.isEqual)((_props$presetConfigs9 = props.presetConfigs) === null || _props$presetConfigs9 === void 0 ? void 0 : _props$presetConfigs9.query, state.presetConfigsQuery)) {
654
562
  var _props$presetConfigs10;
655
-
656
563
  setState({
657
564
  fieldIds,
658
565
  presetConfigsQuery: (_props$presetConfigs10 = props.presetConfigs) === null || _props$presetConfigs10 === void 0 ? void 0 : _props$presetConfigs10.query
@@ -661,21 +568,18 @@ function LegacyInstanceList(props) {
661
568
  }, [props.objectId, props.presetConfigs]);
662
569
  (0, _react.useEffect)(() => {
663
570
  var _props$selectedRowKey2;
664
-
665
571
  setSelectedRowKeys((_props$selectedRowKey2 = props.selectedRowKeys) !== null && _props$selectedRowKey2 !== void 0 ? _props$selectedRowKey2 : []);
666
- }, [props.objectId, props.selectedRowKeys]); // on filter condition change
572
+ }, [props.objectId, props.selectedRowKeys]);
667
573
 
574
+ // on filter condition change
668
575
  (0, _react.useEffect)(() => {
669
576
  if (isFirstRunRef.current) {
670
577
  isFirstRunRef.current = false;
671
578
  return;
672
579
  }
673
-
674
580
  let skip = false;
675
-
676
581
  if (state.page !== 1) {
677
582
  var _props$onPaginationCh;
678
-
679
583
  setState({
680
584
  page: 1
681
585
  });
@@ -684,45 +588,40 @@ function LegacyInstanceList(props) {
684
588
  pageSize: state.pageSize
685
589
  });
686
590
  skip = true;
687
- } // 当 prop.objectId 改变时先跳过,等 state.fieldIds 更新后再获取数据
688
-
591
+ }
689
592
 
593
+ // 当 prop.objectId 改变时先跳过,等 state.fieldIds 更新后再获取数据
690
594
  if (props.objectId !== state.objectId) {
691
595
  setState({
692
596
  objectId: props.objectId
693
597
  });
694
598
  skip = true;
695
599
  }
696
-
697
600
  if (skip) {
698
601
  return;
699
602
  }
700
-
701
603
  refreshInstanceList(state.sort, state.asc, 1);
702
- }, [state.q, state.aq, state.instanceSourceQuery, state.pageSize, state.aliveHosts, state.relatedToMe, props.objectId, props.permission, props.defaultQuery]); // on other condition change
604
+ }, [state.q, state.aq, state.instanceSourceQuery, state.pageSize, state.aliveHosts, state.relatedToMe, props.objectId, props.permission, props.defaultQuery]);
703
605
 
606
+ // on other condition change
704
607
  (0, _react.useEffect)(() => {
705
608
  if ((0, _lodash.isEmpty)(state.fieldIds)) return;
706
609
  refreshInstanceList(state.sort, state.asc, state.page);
707
610
  }, [state.page, state.sort, state.asc, state.fieldIds, state.appSearchInstanceId, state.currentChangeSelect, state.searchByApp, props.dataSource, state.presetConfigsQuery]);
708
-
709
611
  const onChange = e => {
710
612
  setQ(e.target.value);
711
- }; // istanbul ignore next
712
-
613
+ };
713
614
 
615
+ // istanbul ignore next
714
616
  const onSelectionChange = (0, _react.useCallback)(async selected => {
715
617
  var _props$onSelectionCha;
716
-
717
618
  let {
718
619
  selectedItems,
719
620
  selectedKeys
720
621
  } = selected;
721
622
  setSelectedRowKeys(selectedKeys);
722
-
723
623
  if (selectedKeys.length > (0, _lodash.compact)(selectedItems).length) {
724
624
  const ids = selectedKeys.filter(id => !cache.current.has(id));
725
-
726
625
  if (ids.length) {
727
626
  let resp;
728
627
  const params = {
@@ -733,39 +632,32 @@ function LegacyInstanceList(props) {
733
632
  }
734
633
  },
735
634
  page_size: ids.length
736
- }; // useAutoDiscoveryProvider=true, 使用useProvider的接口,虽然这里列表用不到选择功能,但还是加上保持统一
737
-
635
+ };
636
+ // useAutoDiscoveryProvider=true, 使用useProvider的接口,虽然这里列表用不到选择功能,但还是加上保持统一
738
637
  if (props.useAutoDiscoveryProvider) {
739
638
  resp = await listProvider.query([props.objectId, Object.assign(params, props.extraParams)]);
740
639
  } else {
741
640
  resp = await (0, _cmdbSdk.InstanceApi_postSearchV3)(props.objectId, params);
742
641
  }
743
-
744
642
  resp.list.forEach(i => cache.current.set(i.instanceId, i));
745
643
  }
746
-
747
644
  selectedItems = selectedKeys.map(id => cache.current.get(id));
748
645
  }
749
-
750
646
  (_props$onSelectionCha = props.onSelectionChange) === null || _props$onSelectionCha === void 0 ? void 0 : _props$onSelectionCha.call(props, {
751
647
  selectedItems,
752
648
  selectedKeys
753
649
  });
754
650
  }, []);
755
-
756
651
  const onSearch = value => {
757
652
  var _props$onSearch;
758
-
759
653
  const q = value.trim();
760
654
  setState({
761
655
  q
762
656
  });
763
657
  (_props$onSearch = props.onSearch) === null || _props$onSearch === void 0 ? void 0 : _props$onSearch.call(props, q);
764
658
  };
765
-
766
659
  const onAdvancedSearch = (queries, queriesToShow, fieldToShow) => {
767
660
  var _props$onAdvancedSear;
768
-
769
661
  setState({
770
662
  aq: queries,
771
663
  fieldToShow,
@@ -773,18 +665,14 @@ function LegacyInstanceList(props) {
773
665
  });
774
666
  (_props$onAdvancedSear = props.onAdvancedSearch) === null || _props$onAdvancedSear === void 0 ? void 0 : _props$onAdvancedSear.call(props, queries);
775
667
  };
776
-
777
668
  const onSortingChange = (0, _react.useCallback)(info => {
778
669
  var _props$onSortingChang;
779
-
780
670
  let asc;
781
671
  let sort;
782
-
783
672
  if (info.asc === undefined) {
784
673
  if (!state.sort) {
785
674
  return;
786
675
  }
787
-
788
676
  setState({
789
677
  asc: undefined,
790
678
  sort: undefined
@@ -797,12 +685,10 @@ function LegacyInstanceList(props) {
797
685
  asc = info.asc;
798
686
  sort = info.sort;
799
687
  }
800
-
801
688
  (_props$onSortingChang = props.onSortingChange) === null || _props$onSortingChang === void 0 ? void 0 : _props$onSortingChang.call(props, info);
802
689
  }, [state.sort]);
803
690
  const onPaginationChange = (0, _react.useCallback)(pagination => {
804
691
  var _props$onPaginationCh2;
805
-
806
692
  setState({
807
693
  page: pagination.page,
808
694
  pageSize: pagination.pageSize
@@ -811,42 +697,34 @@ function LegacyInstanceList(props) {
811
697
  }, []);
812
698
  const onInstanceSourceChange = (0, _react.useCallback)(instanceSourceQuery => {
813
699
  var _props$onInstanceSour;
814
-
815
700
  setState({
816
701
  instanceSourceQuery
817
702
  });
818
703
  (_props$onInstanceSour = props.onInstanceSourceChange) === null || _props$onInstanceSour === void 0 ? void 0 : _props$onInstanceSour.call(props, instanceSourceQuery);
819
704
  }, []);
820
-
821
705
  const onRelatedToMeChange = checked => {
822
706
  var _props$onRelatedToMeC;
823
-
824
707
  setState({
825
708
  relatedToMe: checked
826
709
  });
827
710
  (_props$onRelatedToMeC = props.onRelatedToMeChange) === null || _props$onRelatedToMeC === void 0 ? void 0 : _props$onRelatedToMeC.call(props, checked);
828
711
  };
829
-
830
712
  const onAliveHostsChange = checked => {
831
713
  var _props$onAliveHostsCh;
832
-
833
714
  setState({
834
715
  aliveHosts: checked
835
716
  });
836
717
  (_props$onAliveHostsCh = props.onAliveHostsChange) === null || _props$onAliveHostsCh === void 0 ? void 0 : _props$onAliveHostsCh.call(props, checked);
837
718
  };
838
-
839
719
  const toggleAutoBreakLine = autoBreakLine => {
840
720
  setState({
841
721
  autoBreakLine
842
722
  });
843
- }; // istanbul ignore next (state is not updated)
844
-
845
-
723
+ };
724
+ // istanbul ignore next (state is not updated)
846
725
  const toggleSearchMode = _react.default.useCallback(async () => {
847
726
  if (!state.searchByApp) {
848
727
  var _appListResp$list, _appListResp$list2, _appListResp$list3;
849
-
850
728
  const appListResp = await (0, _cmdbSdk.InstanceApi_postSearchV3)("APP", {
851
729
  fields: ["clusters", "instanceId", "name"],
852
730
  sort: [{
@@ -871,9 +749,8 @@ function LegacyInstanceList(props) {
871
749
  page: 1
872
750
  });
873
751
  }
874
- }, [state.searchByApp]); // istanbul ignore next (state is not updated)
875
-
876
-
752
+ }, [state.searchByApp]);
753
+ // istanbul ignore next (state is not updated)
877
754
  const appSelectChange = v => {
878
755
  setState({
879
756
  appSearchInstanceId: v,
@@ -882,9 +759,8 @@ function LegacyInstanceList(props) {
882
759
  clusterValue: "all",
883
760
  clusterList: [...baseList, ...state.appList.find(r => r.instanceId === v).clusters]
884
761
  });
885
- }; // istanbul ignore next (state is not updated)
886
-
887
-
762
+ };
763
+ // istanbul ignore next (state is not updated)
888
764
  const clusterSelectChange = v => {
889
765
  setState({
890
766
  appSearchInstanceId: v === "all" ? state.appSelectValue : v,
@@ -892,27 +768,23 @@ function LegacyInstanceList(props) {
892
768
  clusterValue: v
893
769
  });
894
770
  };
895
-
896
771
  const defaultFields = (0, _react.useMemo)(() => {
897
772
  var _props$presetConfigs11, _props$extraFixedFiel2;
898
-
899
773
  let defaultFields;
900
774
  const fieldIds = (_props$presetConfigs11 = props.presetConfigs) === null || _props$presetConfigs11 === void 0 ? void 0 : _props$presetConfigs11.fieldIds,
901
- extraFixedFieldIds = (_props$extraFixedFiel2 = props.extraFixedFields) !== null && _props$extraFixedFiel2 !== void 0 ? _props$extraFixedFiel2 : [];
902
-
775
+ extraFixedFieldIds = (_props$extraFixedFiel2 = props.extraFixedFields) !== null && _props$extraFixedFiel2 !== void 0 ? _props$extraFixedFiel2 : [];
903
776
  if (!(0, _lodash.isEmpty)(fieldIds)) {
904
777
  defaultFields = props.presetConfigs.fieldIds;
905
778
  } else {
906
779
  defaultFields = computeDefaultFields().fieldIds;
907
780
  }
908
-
909
781
  if (!(0, _lodash.isEmpty)(extraFixedFieldIds)) {
910
782
  defaultFields = (0, _lodash.uniq)([...defaultFields, ...extraFixedFieldIds]);
911
783
  }
912
-
913
784
  return defaultFields;
914
- }, [props.presetConfigs, modelData]); // istanbul ignore next
785
+ }, [props.presetConfigs, modelData]);
915
786
 
787
+ // istanbul ignore next
916
788
  const handleConfirm = ({
917
789
  fields,
918
790
  isReset
@@ -933,78 +805,61 @@ function LegacyInstanceList(props) {
933
805
  props.onFieldsModalConfirm(fields);
934
806
  }
935
807
  };
936
-
937
808
  (0, _react.useEffect)(() => {
938
809
  var _props$notifyCurrentF;
939
-
940
810
  (_props$notifyCurrentF = props.notifyCurrentFields) === null || _props$notifyCurrentF === void 0 ? void 0 : _props$notifyCurrentF.call(props, state.fieldIds);
941
- }, [props.notifyCurrentFields]); // istanbul ignore next
811
+ }, [props.notifyCurrentFields]);
942
812
 
813
+ // istanbul ignore next
943
814
  (0, _react.useEffect)(() => {
944
815
  var _props$selectedRowKey3;
945
-
946
816
  ((_props$selectedRowKey3 = props.selectedRowKeys) === null || _props$selectedRowKey3 === void 0 ? void 0 : _props$selectedRowKey3.length) && (async () => {
947
817
  const data = {};
948
818
  const v3Data = {
949
819
  fields: ["instanceId"]
950
820
  };
951
-
952
821
  if (!(0, _lodash.isEmpty)(props.permission)) {
953
822
  v3Data.permission = data.permission = props.permission;
954
823
  }
955
-
956
824
  if (state.fieldIds) {
957
825
  data.fields = Object.fromEntries(state.fieldIds.map(fieldId => [fieldId, true]));
958
826
  v3Data.fields = [...state.fieldIds, ...v3Data.fields];
959
827
  v3Data.ignore_missing_field_error = true;
960
828
  }
961
-
962
829
  v3Data.query = {
963
830
  instanceId: {
964
831
  $in: props.selectedRowKeys
965
832
  }
966
833
  };
967
834
  v3Data.page_size = props.selectedRowKeys.length;
968
-
969
835
  if (state.relatedToMe) {
970
836
  v3Data.only_my_instance = data.only_my_instance = state.relatedToMe;
971
837
  }
972
-
973
838
  if (props.extraParams) {
974
839
  Object.assign(v3Data, props.extraParams);
975
840
  }
976
-
977
841
  let resp;
978
-
979
842
  if (props.useAutoDiscoveryProvider) {
980
843
  resp = await listProvider.query([props.objectId, v3Data]);
981
844
  } else {
982
845
  resp = await (0, _cmdbSdk.InstanceApi_postSearchV3)(props.objectId, v3Data);
983
846
  }
984
-
985
847
  resp.list.forEach(i => cache.current.set(i.instanceId, i));
986
848
  })();
987
849
  }, [props.selectedRowKeys]);
988
-
989
850
  const handleToggleFixHeader = () => {
990
851
  setFixHeader(!fixedHeader);
991
852
  };
992
-
993
853
  const onAdvancedSearchCloseGen = (attrId, valuesStr) => {
994
854
  return () => {
995
855
  var _props$onAdvancedSear2;
996
-
997
856
  const queries = [];
998
857
  const queriesToShow = [];
999
-
1000
858
  const filterAq = queries => queries.filter(v => isValueEqualFn(v, attrId, valuesStr));
1001
-
1002
859
  state.aq.forEach(query => {
1003
860
  const key = Object.keys(query)[0];
1004
-
1005
861
  if ((key === "$or" || key === "$and") && Object.keys(query[key][0])[0] === attrId) {
1006
862
  const filteredSubQueries = filterAq(query[key]);
1007
-
1008
863
  if (filteredSubQueries.length > 0) {
1009
864
  queries.push({
1010
865
  [key]: filteredSubQueries
@@ -1015,10 +870,10 @@ function LegacyInstanceList(props) {
1015
870
  if (!Array.isArray(query[key]) && isSpecialFn(query, key)) {
1016
871
  queries.push(query);
1017
872
  } else {
1018
- const fieldId = Object.keys(query[key][0])[0]; // 判断是否为结构体
1019
-
1020
- const isStruct = isOfStruct(modelData, fieldId); // 结构体情况处理
1021
-
873
+ const fieldId = Object.keys(query[key][0])[0];
874
+ // 判断是否为结构体
875
+ const isStruct = isOfStruct(modelData, fieldId);
876
+ // 结构体情况处理
1022
877
  if (!((key === "$or" || key === "$and") && (0, _lodash.startsWith)(fieldId, `${attrId}.`) && isStruct)) {
1023
878
  queries.push(query);
1024
879
  }
@@ -1029,10 +884,8 @@ function LegacyInstanceList(props) {
1029
884
  });
1030
885
  state.aqToShow.forEach(query => {
1031
886
  const key = Object.keys(query)[0];
1032
-
1033
887
  if ((key === "$or" || key === "$and") && Object.keys(query[key][0])[0] === attrId) {
1034
888
  const filteredSubQueries = filterAq(query[key]);
1035
-
1036
889
  if (filteredSubQueries.length > 0) {
1037
890
  queriesToShow.push({
1038
891
  [key]: filteredSubQueries
@@ -1051,7 +904,6 @@ function LegacyInstanceList(props) {
1051
904
  (_props$onAdvancedSear2 = props.onAdvancedSearch) === null || _props$onAdvancedSear2 === void 0 ? void 0 : _props$onAdvancedSear2.call(props, queries);
1052
905
  };
1053
906
  };
1054
-
1055
907
  const conditions = translateConditions(state.aqToShow, idObjectMap, modelData);
1056
908
  return /*#__PURE__*/_react.default.createElement(_antd.Spin, {
1057
909
  spinning: state.loading
@@ -1060,6 +912,7 @@ function LegacyInstanceList(props) {
1060
912
  }, /*#__PURE__*/_react.default.createElement("div", {
1061
913
  className: _InstanceListModule.default.searchRelated
1062
914
  }, !state.searchByApp ? /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, !props.searchDisabled && /*#__PURE__*/_react.default.createElement(_antd.Input.Search, {
915
+ placeholder: props.placeholder,
1063
916
  enterButton: true,
1064
917
  value: q,
1065
918
  onChange: onChange,
@@ -1226,13 +1079,12 @@ function LegacyInstanceList(props) {
1226
1079
  rowSelectionType: props.rowSelectionType
1227
1080
  })) : null);
1228
1081
  }
1082
+
1229
1083
  /**
1230
1084
  * 把 objectList 封装到构件中请求,废弃掉通过老模板使用的方式,可直接使用构件。
1231
1085
  * 同时也兼容之前的使用方式,对于外部传进来的会优先使用外部的数据,构件内部不会额外请求,
1232
1086
  * 不传的话构件内部做请求,并作缓存
1233
1087
  */
1234
-
1235
-
1236
1088
  function InstanceList(props) {
1237
1089
  const [objectList, setObjectList] = (0, _react.useState)(props.objectList);
1238
1090
  (0, _react.useEffect)(() => {
@@ -1242,7 +1094,6 @@ function InstanceList(props) {
1242
1094
  (async () => {
1243
1095
  if (!props.objectList) {
1244
1096
  const cacheData = _constants2.objectListCache.get(props.objectId);
1245
-
1246
1097
  if (cacheData) {
1247
1098
  setObjectList(cacheData);
1248
1099
  } else {
@@ -1251,7 +1102,6 @@ function InstanceList(props) {
1251
1102
  ref_object: props.objectId
1252
1103
  })).data;
1253
1104
  setObjectList(list);
1254
-
1255
1105
  _constants2.objectListCache.set(props.objectId, list);
1256
1106
  } catch (e) {
1257
1107
  // istanbul ignore next