@next-libs/cmdb-instances 6.21.13 → 6.21.16

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (10) hide show
  1. package/CHANGELOG.md +30 -0
  2. package/dist/cjs/cmdb-instances-select-panel/CmdbInstancesSelectPanel.js +12 -4
  3. package/dist/cjs/cmdb-instances-select-panel/CmdbInstancesSelectPanel.js.map +1 -1
  4. package/dist/cjs/instance-list/InstanceList.js +13 -8
  5. package/dist/cjs/instance-list/InstanceList.js.map +1 -1
  6. package/dist/esm/cmdb-instances-select-panel/CmdbInstancesSelectPanel.js +12 -5
  7. package/dist/esm/cmdb-instances-select-panel/CmdbInstancesSelectPanel.js.map +1 -1
  8. package/dist/esm/instance-list/InstanceList.js +11 -6
  9. package/dist/esm/instance-list/InstanceList.js.map +1 -1
  10. package/package.json +4 -4
package/CHANGELOG.md CHANGED
@@ -3,6 +3,36 @@
3
3
  All notable changes to this project will be documented in this file.
4
4
  See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
5
5
 
6
+ ## [6.21.16](https://github.com/easyops-cn/next-libs/compare/@next-libs/cmdb-instances@6.21.15...@next-libs/cmdb-instances@6.21.16) (2022-04-08)
7
+
8
+
9
+ ### Bug Fixes
10
+
11
+ * 添加实例范围，条件过滤删除其中一个条件过滤，另外一个条件过滤也会被删除 ([f597b2f](https://github.com/easyops-cn/next-libs/commit/f597b2f47125030b6963eda242cb9bb123e61112)), closes [Refs#INSTANCE-2253](https://github.com/Refs/issues/INSTANCE-2253)
12
+
13
+
14
+
15
+
16
+
17
+ ## [6.21.15](https://github.com/easyops-cn/next-libs/compare/@next-libs/cmdb-instances@6.21.14...@next-libs/cmdb-instances@6.21.15) (2022-04-08)
18
+
19
+ **Note:** Version bump only for package @next-libs/cmdb-instances
20
+
21
+
22
+
23
+
24
+
25
+ ## [6.21.14](https://github.com/easyops-cn/next-libs/compare/@next-libs/cmdb-instances@6.21.13...@next-libs/cmdb-instances@6.21.14) (2022-04-01)
26
+
27
+
28
+ ### Bug Fixes
29
+
30
+ * **cmdb:** span style ([fa37d19](https://github.com/easyops-cn/next-libs/commit/fa37d1965f5ecf7ad0f2dec7ee8748eeaa2b68e7))
31
+
32
+
33
+
34
+
35
+
6
36
  ## [6.21.13](https://github.com/easyops-cn/next-libs/compare/@next-libs/cmdb-instances@6.21.12...@next-libs/cmdb-instances@6.21.13) (2022-04-01)
7
37
 
8
38
  **Note:** Version bump only for package @next-libs/cmdb-instances
package/dist/cjs/cmdb-instances-select-panel/CmdbInstancesSelectPanel.js CHANGED
@@ -31,6 +31,8 @@ var _constants = require("../i18n/constants");
31
31
 
32
32
  var _lodash = require("lodash");
33
33
 
34
+ var _antd = require("antd");
35
+
34
36
  function CmdbInstancesSelectPanel(props, ref) {
35
37
  var _props$previewMaxNumb, _props$instanceQuery, _props$modalTitle, _props$addTitle;
36
38
 
@@ -199,13 +201,19 @@ function CmdbInstancesSelectPanel(props, ref) {
199
201
  },
200
202
  selectDisabled: true,
201
203
  onCancel: closeAllSelectedInstancesModal
202
- }), /*#__PURE__*/_react.default.createElement("a", {
204
+ }), /*#__PURE__*/_react.default.createElement(_antd.Spin, {
205
+ style: {
206
+ textAlign: "left",
207
+ marginBottom: "12px"
208
+ },
209
+ spinning: (0, _lodash.isEqual)(modelMap, {})
210
+ }, /*#__PURE__*/_react.default.createElement("a", {
203
211
  className: _styleModule.default.addButton,
204
- onClick: openAddInstancesModal,
205
212
  style: {
206
213
  marginBottom: "12px"
207
- }
208
- }, (_props$addTitle = props.addTitle) !== null && _props$addTitle !== void 0 ? _props$addTitle : _i18next.default.t(`${_constants.NS_LIBS_CMDB_INSTANCES}:${_constants.K.CHOOSE_INSTANCE}`)), /*#__PURE__*/_react.default.createElement("div", {
214
+ },
215
+ onClick: openAddInstancesModal
216
+ }, (_props$addTitle = props.addTitle) !== null && _props$addTitle !== void 0 ? _props$addTitle : _i18next.default.t(`${_constants.NS_LIBS_CMDB_INSTANCES}:${_constants.K.CHOOSE_INSTANCE}`))), /*#__PURE__*/_react.default.createElement("div", {
209
217
  className: cs
210
218
  }, /*#__PURE__*/_react.default.createElement(_instanceListTable.InstanceListTable, (0, _extends2.default)({}, props.showDetailUrl ? {
211
219
  detailUrlTemplates: {
package/dist/cjs/cmdb-instances-select-panel/CmdbInstancesSelectPanel.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"sources":["../../../src/cmdb-instances-select-panel/CmdbInstancesSelectPanel.tsx"],"names":["CmdbInstancesSelectPanel","props","ref","modelData","isFilterView","hideModelData","view","hide_columns","attrList","filter","item","includes","id","relation_list","left_id","left_object_id","objectId","right_id","right_object_id","displayedSelectedInstancesMaxNumber","previewMaxNumber","selectedInstanceList","setSelectedInstanceList","partialSelectedInstances","setPartialSelectedInstances","addInstancesModal","setAddInstancesModal","visible","allSelectedInstancesModal","setAllSelectedInstancesModal","modelMap","setModelMap","fetchInstances","instanceIdList","instances","length","query","instanceId","$in","page","page_size","fields","list","initInstances","value","isOperate","slice","onFetchedInstances","getModelMap","data","ref_object","openAddInstancesModal","closeAddInstancesModal","openAllSelectedInstancesModal","closeAllSelectedInstancesModal","handleInstancesSelected","selectedKeys","onChange","fieldIds","map","attr","showPreview","cs","style","selectedInstancesTableWrapper","withPreview","relation","relationLimit","right_max","$size","$lt","instanceQuery","wrapper","modalTitle","i18n","t","NS_LIBS_CMDB_INSTANCES","K","FILTER_FROM_CMDB","name","instance","singleSelect","addInstancesModalPageSize","showSizeChanger","pageSizeOptions","searchDisabled","advancedSearchDisabled","VIEW_ALL_SELECTED_INSTANCES","addButton","marginBottom","addTitle","CHOOSE_INSTANCE","showDetailUrl","detailUrlTemplates","pagination","v","showAllSelectedInstancesButton","VIEW_ALL_DATA","count"],"mappings":"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","sourcesContent":["import React, { useState, useEffect } from \"react\";\nimport classnames from \"classnames\";\n\nimport {\n CmdbModels,\n InstanceApi_postSearch,\n CmdbObjectApi_getObjectRef,\n} from \"@next-sdk/cmdb-sdk\";\nimport { InstanceListTable } from \"../instance-list-table\";\nimport { InstanceListModal } from \"../instance-list-modal/InstanceListModal\";\nimport {\n modifyModelData,\n ModifiedModelObjectRelation,\n} from \"@next-libs/cmdb-utils\";\nimport style from \"./style.module.css\";\nimport i18n from \"i18next\";\nimport { K, NS_LIBS_CMDB_INSTANCES } from \"../i18n/constants\";\nimport { keyBy } from \"lodash\";\n\nexport interface CmdbInstancesSelectPanelProps {\n modelData: Partial<CmdbModels.ModelCmdbObject>;\n objectId: string;\n value?: string[];\n onChange?: (instanceList: any[]) => void;\n instanceQuery?: any;\n fields?: string[];\n singleSelect?: boolean;\n addTitle?: React.ReactNode | string;\n modalTitle?: React.ReactNode | string;\n previewMaxNumber?: number;\n addInstancesModalPageSize?: number;\n showSizeChanger?: boolean;\n pageSizeOptions?: string[];\n isOperate?: boolean; //cmdb实例列表支持删除实例\n showDetailUrl?: boolean;\n isFilterView?: boolean; //是否过滤视图属性\n onFetchedInstances?: (instanceList: any[]) => void; // objectId改变后触发\n relation?: Partial<ModifiedModelObjectRelation>;\n searchDisabled?: boolean;\n advancedSearchDisabled?: boolean;\n}\n\nexport function CmdbInstancesSelectPanel(\n props: CmdbInstancesSelectPanelProps,\n ref: any\n): React.ReactElement {\n let { modelData } = props;\n if (props.isFilterView) {\n //过滤掉视图不可见字段\n const hideModelData = modelData?.view?.hide_columns || [];\n modelData = {\n ...modelData,\n attrList: modelData.attrList.filter(\n (item: any) => !hideModelData.includes(item.id)\n ),\n relation_list: modelData.relation_list.filter(\n (item: any) =>\n !(\n (hideModelData.includes(item.left_id) &&\n item.left_object_id === props.objectId) ||\n (hideModelData.includes(item.right_id) &&\n item.right_object_id === props.objectId)\n )\n ),\n };\n }\n\n const displayedSelectedInstancesMaxNumber = props.previewMaxNumber ?? 5;\n\n const [selectedInstanceList, setSelectedInstanceList] = useState([]);\n const [partialSelectedInstances, setPartialSelectedInstances] = useState([]);\n const [addInstancesModal, setAddInstancesModal] = useState({\n visible: false,\n });\n const [allSelectedInstancesModal, setAllSelectedInstancesModal] = useState({\n visible: false,\n });\n const [modelMap, setModelMap] = useState({});\n const fetchInstances = async (instanceIdList: string[]): Promise<any[]> => {\n let instances: any[] = [];\n if (instanceIdList?.length) {\n instances = (\n await InstanceApi_postSearch(props.objectId, {\n query: {\n instanceId: {\n $in: instanceIdList,\n },\n },\n page: 1,\n page_size: instanceIdList.length,\n // todo(ice): selected confirm with instances\n fields: { \"*\": true },\n })\n ).list;\n }\n\n return instances;\n };\n\n useEffect(() => {\n const initInstances = async (): Promise<void> => {\n const instances = await fetchInstances(props.value);\n setSelectedInstanceList(instances);\n setPartialSelectedInstances(\n props?.isOperate\n ? instances\n : instances.slice(0, displayedSelectedInstancesMaxNumber)\n );\n props.onFetchedInstances?.(instances);\n };\n\n initInstances();\n const getModelMap = async (): Promise<void> => {\n const { data } = await CmdbObjectApi_getObjectRef({\n ref_object: props.objectId,\n });\n setModelMap(keyBy(data, \"objectId\"));\n };\n getModelMap();\n }, [props.objectId]);\n\n const openAddInstancesModal = () => {\n setAddInstancesModal({ visible: true });\n };\n\n const closeAddInstancesModal = () => {\n setAddInstancesModal({ visible: false });\n };\n\n const openAllSelectedInstancesModal = () => {\n setAllSelectedInstancesModal({ visible: true });\n };\n\n const closeAllSelectedInstancesModal = () => {\n setAllSelectedInstancesModal({ visible: false });\n };\n\n const handleInstancesSelected = async (selectedKeys: string[]) => {\n closeAddInstancesModal();\n\n const instances = await fetchInstances(selectedKeys);\n setSelectedInstanceList(instances);\n setPartialSelectedInstances(\n props?.isOperate\n ? instances\n : instances.slice(0, displayedSelectedInstancesMaxNumber)\n );\n\n props.onChange?.(instances);\n };\n\n const fieldIds = modifyModelData(modelData).attrList.map(\n (attr: any) => attr.id\n );\n const showPreview =\n selectedInstanceList.length > displayedSelectedInstancesMaxNumber;\n const cs = classnames({\n [style.selectedInstancesTableWrapper]: true,\n [style.withPreview]: showPreview,\n });\n const { relation } = props;\n let relationLimit;\n if (relation?.right_max === 1) {\n relationLimit = { [relation.right_id]: { $size: { $lt: 1 } } };\n }\n const query = props.instanceQuery ?? relationLimit;\n return (\n <div className={style.wrapper} ref={ref}>\n <InstanceListModal\n objectMap={modelMap}\n objectId={props.objectId}\n visible={addInstancesModal.visible}\n title={\n props.modalTitle ??\n i18n.t(`${NS_LIBS_CMDB_INSTANCES}:${K.FILTER_FROM_CMDB}`, {\n name: modelData.name,\n })\n }\n selectedRowKeys={selectedInstanceList.map(\n (instance) => instance.instanceId\n )}\n onSelected={handleInstancesSelected}\n onCancel={closeAddInstancesModal}\n singleSelect={props.singleSelect}\n presetConfigs={{\n query,\n fieldIds: props.fields,\n }}\n pageSize={props.addInstancesModalPageSize}\n showSizeChanger={props.showSizeChanger}\n pageSizeOptions={props.pageSizeOptions}\n searchDisabled={props.searchDisabled}\n advancedSearchDisabled={props.advancedSearchDisabled}\n />\n <InstanceListModal\n objectMap={modelMap}\n objectId={props.objectId}\n visible={allSelectedInstancesModal.visible}\n title={i18n.t(\n `${NS_LIBS_CMDB_INSTANCES}:${K.VIEW_ALL_SELECTED_INSTANCES}`\n )}\n presetConfigs={{\n query: {\n instanceId: {\n $in: selectedInstanceList.map((instance) => instance.instanceId),\n },\n },\n }}\n selectDisabled={true}\n onCancel={closeAllSelectedInstancesModal}\n />\n <a\n className={style.addButton}\n onClick={openAddInstancesModal}\n style={{ marginBottom: \"12px\" }}\n >\n {props.addTitle ??\n i18n.t(`${NS_LIBS_CMDB_INSTANCES}:${K.CHOOSE_INSTANCE}`)}\n </a>\n <div className={cs}>\n <InstanceListTable\n {...(props.showDetailUrl\n ? {\n detailUrlTemplates: {\n [props.objectId]:\n \"/next-cmdb-instance-management/next/#{objectId}/instance/#{instanceId}\",\n },\n }\n : {})}\n idObjectMap={modelMap}\n modelData={modelData}\n instanceListData={{\n list: partialSelectedInstances,\n }}\n fieldIds={props.fields || fieldIds}\n selectDisabled={true}\n sortDisabled={true}\n configProps={{\n pagination: false,\n }}\n isOperate={props.isOperate}\n handleDeleteFunction={(v) => {\n setSelectedInstanceList(v);\n setPartialSelectedInstances(v);\n props.onChange?.(v);\n }}\n target={\"_blank\"}\n ></InstanceListTable>\n {!props?.isOperate && showPreview && (\n <div\n className={style.showAllSelectedInstancesButton}\n onClick={openAllSelectedInstancesModal}\n >\n <a>\n {i18n.t(`${NS_LIBS_CMDB_INSTANCES}:${K.VIEW_ALL_DATA}`, {\n count: selectedInstanceList.length,\n })}\n </a>\n </div>\n )}\n </div>\n </div>\n );\n}\n"],"file":"CmdbInstancesSelectPanel.js"}
1
+ {"version":3,"sources":["../../../src/cmdb-instances-select-panel/CmdbInstancesSelectPanel.tsx"],"names":["CmdbInstancesSelectPanel","props","ref","modelData","isFilterView","hideModelData","view","hide_columns","attrList","filter","item","includes","id","relation_list","left_id","left_object_id","objectId","right_id","right_object_id","displayedSelectedInstancesMaxNumber","previewMaxNumber","selectedInstanceList","setSelectedInstanceList","partialSelectedInstances","setPartialSelectedInstances","addInstancesModal","setAddInstancesModal","visible","allSelectedInstancesModal","setAllSelectedInstancesModal","modelMap","setModelMap","fetchInstances","instanceIdList","instances","length","query","instanceId","$in","page","page_size","fields","list","initInstances","value","isOperate","slice","onFetchedInstances","getModelMap","data","ref_object","openAddInstancesModal","closeAddInstancesModal","openAllSelectedInstancesModal","closeAllSelectedInstancesModal","handleInstancesSelected","selectedKeys","onChange","fieldIds","map","attr","showPreview","cs","style","selectedInstancesTableWrapper","withPreview","relation","relationLimit","right_max","$size","$lt","instanceQuery","wrapper","modalTitle","i18n","t","NS_LIBS_CMDB_INSTANCES","K","FILTER_FROM_CMDB","name","instance","singleSelect","addInstancesModalPageSize","showSizeChanger","pageSizeOptions","searchDisabled","advancedSearchDisabled","VIEW_ALL_SELECTED_INSTANCES","textAlign","marginBottom","addButton","addTitle","CHOOSE_INSTANCE","showDetailUrl","detailUrlTemplates","pagination","v","showAllSelectedInstancesButton","VIEW_ALL_DATA","count"],"mappings":"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","sourcesContent":["import React, { useState, useEffect } from \"react\";\nimport classnames from \"classnames\";\n\nimport {\n CmdbModels,\n InstanceApi_postSearch,\n CmdbObjectApi_getObjectRef,\n} from \"@next-sdk/cmdb-sdk\";\nimport { InstanceListTable } from \"../instance-list-table\";\nimport { InstanceListModal } from \"../instance-list-modal/InstanceListModal\";\nimport {\n modifyModelData,\n ModifiedModelObjectRelation,\n} from \"@next-libs/cmdb-utils\";\nimport style from \"./style.module.css\";\nimport i18n from \"i18next\";\nimport { K, NS_LIBS_CMDB_INSTANCES } from \"../i18n/constants\";\nimport { keyBy, isEqual } from \"lodash\";\nimport { Spin } from \"antd\";\n\nexport interface CmdbInstancesSelectPanelProps {\n modelData: Partial<CmdbModels.ModelCmdbObject>;\n objectId: string;\n value?: string[];\n onChange?: (instanceList: any[]) => void;\n instanceQuery?: any;\n fields?: string[];\n singleSelect?: boolean;\n addTitle?: React.ReactNode | string;\n modalTitle?: React.ReactNode | string;\n previewMaxNumber?: number;\n addInstancesModalPageSize?: number;\n showSizeChanger?: boolean;\n pageSizeOptions?: string[];\n isOperate?: boolean; //cmdb实例列表支持删除实例\n showDetailUrl?: boolean;\n isFilterView?: boolean; //是否过滤视图属性\n onFetchedInstances?: (instanceList: any[]) => void; // objectId改变后触发\n relation?: Partial<ModifiedModelObjectRelation>;\n searchDisabled?: boolean;\n advancedSearchDisabled?: boolean;\n}\n\nexport function CmdbInstancesSelectPanel(\n props: CmdbInstancesSelectPanelProps,\n ref: any\n): React.ReactElement {\n let { modelData } = props;\n if (props.isFilterView) {\n //过滤掉视图不可见字段\n const hideModelData = modelData?.view?.hide_columns || [];\n modelData = {\n ...modelData,\n attrList: modelData.attrList.filter(\n (item: any) => !hideModelData.includes(item.id)\n ),\n relation_list: modelData.relation_list.filter(\n (item: any) =>\n !(\n (hideModelData.includes(item.left_id) &&\n item.left_object_id === props.objectId) ||\n (hideModelData.includes(item.right_id) &&\n item.right_object_id === props.objectId)\n )\n ),\n };\n }\n\n const displayedSelectedInstancesMaxNumber = props.previewMaxNumber ?? 5;\n\n const [selectedInstanceList, setSelectedInstanceList] = useState([]);\n const [partialSelectedInstances, setPartialSelectedInstances] = useState([]);\n const [addInstancesModal, setAddInstancesModal] = useState({\n visible: false,\n });\n const [allSelectedInstancesModal, setAllSelectedInstancesModal] = useState({\n visible: false,\n });\n const [modelMap, setModelMap] = useState({});\n const fetchInstances = async (instanceIdList: string[]): Promise<any[]> => {\n let instances: any[] = [];\n if (instanceIdList?.length) {\n instances = (\n await InstanceApi_postSearch(props.objectId, {\n query: {\n instanceId: {\n $in: instanceIdList,\n },\n },\n page: 1,\n page_size: instanceIdList.length,\n // todo(ice): selected confirm with instances\n fields: { \"*\": true },\n })\n ).list;\n }\n\n return instances;\n };\n\n useEffect(() => {\n const initInstances = async (): Promise<void> => {\n const instances = await fetchInstances(props.value);\n setSelectedInstanceList(instances);\n setPartialSelectedInstances(\n props?.isOperate\n ? instances\n : instances.slice(0, displayedSelectedInstancesMaxNumber)\n );\n props.onFetchedInstances?.(instances);\n };\n\n initInstances();\n const getModelMap = async (): Promise<void> => {\n const { data } = await CmdbObjectApi_getObjectRef({\n ref_object: props.objectId,\n });\n setModelMap(keyBy(data, \"objectId\"));\n };\n getModelMap();\n }, [props.objectId]);\n\n const openAddInstancesModal = () => {\n setAddInstancesModal({ visible: true });\n };\n\n const closeAddInstancesModal = () => {\n setAddInstancesModal({ visible: false });\n };\n\n const openAllSelectedInstancesModal = () => {\n setAllSelectedInstancesModal({ visible: true });\n };\n\n const closeAllSelectedInstancesModal = () => {\n setAllSelectedInstancesModal({ visible: false });\n };\n\n const handleInstancesSelected = async (selectedKeys: string[]) => {\n closeAddInstancesModal();\n\n const instances = await fetchInstances(selectedKeys);\n setSelectedInstanceList(instances);\n setPartialSelectedInstances(\n props?.isOperate\n ? instances\n : instances.slice(0, displayedSelectedInstancesMaxNumber)\n );\n\n props.onChange?.(instances);\n };\n\n const fieldIds = modifyModelData(modelData).attrList.map(\n (attr: any) => attr.id\n );\n const showPreview =\n selectedInstanceList.length > displayedSelectedInstancesMaxNumber;\n const cs = classnames({\n [style.selectedInstancesTableWrapper]: true,\n [style.withPreview]: showPreview,\n });\n const { relation } = props;\n let relationLimit;\n if (relation?.right_max === 1) {\n relationLimit = { [relation.right_id]: { $size: { $lt: 1 } } };\n }\n const query = props.instanceQuery ?? relationLimit;\n return (\n <div className={style.wrapper} ref={ref}>\n <InstanceListModal\n objectMap={modelMap}\n objectId={props.objectId}\n visible={addInstancesModal.visible}\n title={\n props.modalTitle ??\n i18n.t(`${NS_LIBS_CMDB_INSTANCES}:${K.FILTER_FROM_CMDB}`, {\n name: modelData.name,\n })\n }\n selectedRowKeys={selectedInstanceList.map(\n (instance) => instance.instanceId\n )}\n onSelected={handleInstancesSelected}\n onCancel={closeAddInstancesModal}\n singleSelect={props.singleSelect}\n presetConfigs={{\n query,\n fieldIds: props.fields,\n }}\n pageSize={props.addInstancesModalPageSize}\n showSizeChanger={props.showSizeChanger}\n pageSizeOptions={props.pageSizeOptions}\n searchDisabled={props.searchDisabled}\n advancedSearchDisabled={props.advancedSearchDisabled}\n />\n <InstanceListModal\n objectMap={modelMap}\n objectId={props.objectId}\n visible={allSelectedInstancesModal.visible}\n title={i18n.t(\n `${NS_LIBS_CMDB_INSTANCES}:${K.VIEW_ALL_SELECTED_INSTANCES}`\n )}\n presetConfigs={{\n query: {\n instanceId: {\n $in: selectedInstanceList.map((instance) => instance.instanceId),\n },\n },\n }}\n selectDisabled={true}\n onCancel={closeAllSelectedInstancesModal}\n />\n <Spin\n style={{ textAlign: \"left\", marginBottom: \"12px\" }}\n spinning={isEqual(modelMap, {})}\n >\n <a\n className={style.addButton}\n style={{\n marginBottom: \"12px\",\n }}\n onClick={openAddInstancesModal}\n >\n {props.addTitle ??\n i18n.t(`${NS_LIBS_CMDB_INSTANCES}:${K.CHOOSE_INSTANCE}`)}\n </a>\n </Spin>\n <div className={cs}>\n <InstanceListTable\n {...(props.showDetailUrl\n ? {\n detailUrlTemplates: {\n [props.objectId]:\n \"/next-cmdb-instance-management/next/#{objectId}/instance/#{instanceId}\",\n },\n }\n : {})}\n idObjectMap={modelMap}\n modelData={modelData}\n instanceListData={{\n list: partialSelectedInstances,\n }}\n fieldIds={props.fields || fieldIds}\n selectDisabled={true}\n sortDisabled={true}\n configProps={{\n pagination: false,\n }}\n isOperate={props.isOperate}\n handleDeleteFunction={(v) => {\n setSelectedInstanceList(v);\n setPartialSelectedInstances(v);\n props.onChange?.(v);\n }}\n target={\"_blank\"}\n ></InstanceListTable>\n {!props?.isOperate && showPreview && (\n <div\n className={style.showAllSelectedInstancesButton}\n onClick={openAllSelectedInstancesModal}\n >\n <a>\n {i18n.t(`${NS_LIBS_CMDB_INSTANCES}:${K.VIEW_ALL_DATA}`, {\n count: selectedInstanceList.length,\n })}\n </a>\n </div>\n )}\n </div>\n </div>\n );\n}\n"],"file":"CmdbInstancesSelectPanel.js"}
package/dist/cjs/instance-list/InstanceList.js CHANGED
@@ -864,15 +864,18 @@ function InstanceList(props) {
864
864
  return () => {
865
865
  var _props$onAdvancedSear2;
866
866
 
867
- const queries = [];
868
- const queriesToShow = [];
867
+ let queries = [];
868
+ let queriesToShow = [];
869
+
870
+ const isValueEqual = query => Object.values(query[attrId]).join(" ") !== valuesStr;
871
+
872
+ const filterAq = queries => queries.filter(v => isValueEqual(v));
873
+
869
874
  state.aq.forEach(query => {
870
875
  const key = Object.keys(query)[0];
871
876
 
872
877
  if ((key === "$or" || key === "$and") && Object.keys(query[key][0])[0] === attrId) {
873
- const filteredSubQueries = query[key].filter(query => {
874
- return Object.values(query[attrId]).join(" ") !== valuesStr;
875
- });
878
+ const filteredSubQueries = filterAq(query[key]);
876
879
 
877
880
  if (filteredSubQueries.length > 0) {
878
881
  queries.push({
@@ -881,15 +884,15 @@ function InstanceList(props) {
881
884
  }
882
885
  } else if (key !== attrId && !(0, _lodash.startsWith)(attrId, `${key}.`)) {
883
886
  queries.push(query);
887
+ } else if (key === attrId && isValueEqual(query)) {
888
+ queries = filterAq(state.aq);
884
889
  }
885
890
  });
886
891
  state.aqToShow.forEach(query => {
887
892
  const key = Object.keys(query)[0];
888
893
 
889
894
  if ((key === "$or" || key === "$and") && Object.keys(query[key][0])[0] === attrId) {
890
- const filteredSubQueries = query[key].filter(query => {
891
- return Object.values(query[attrId]).join(" ") !== valuesStr;
892
- });
895
+ const filteredSubQueries = filterAq(query[key]);
893
896
 
894
897
  if (filteredSubQueries.length > 0) {
895
898
  queriesToShow.push({
@@ -898,6 +901,8 @@ function InstanceList(props) {
898
901
  }
899
902
  } else if (key !== attrId) {
900
903
  queriesToShow.push(query);
904
+ } else if (key === attrId && isValueEqual(query)) {
905
+ queriesToShow = filterAq(state.aqToShow);
901
906
  }
902
907
  });
903
908
  setState({