@next-libs/cmdb-instances 6.21.17 → 6.21.20

package/CHANGELOG.md

@@ -3,6 +3,39 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [6.21.20](https://github.com/easyops-cn/next-libs/compare/@next-libs/cmdb-instances@6.21.19...@next-libs/cmdb-instances@6.21.20) (2022-04-20)
+
+
+### Bug Fixes
+
+* **CmdbInstancesSelectPanel:** fix value改变后，panel表格数据不更新 ([79dbd3f](https://github.com/easyops-cn/next-libs/commit/79dbd3f41ae2ace79c5114d7a3bdd860187fa67e))
+
+
+
+
+
+## [6.21.19](https://github.com/easyops-cn/next-libs/compare/@next-libs/cmdb-instances@6.21.18...@next-libs/cmdb-instances@6.21.19) (2022-04-18)
+
+
+### Bug Fixes
+
+* 修复高级搜索筛选条件不能清除 ([3fdff7d](https://github.com/easyops-cn/next-libs/commit/3fdff7d6198176e54a11ee8637e6e62706066ae5)), closes [Refs#INSTANCE-2331](https://github.com/Refs/issues/INSTANCE-2331)
+
+
+
+
+
+## [6.21.18](https://github.com/easyops-cn/next-libs/compare/@next-libs/cmdb-instances@6.21.17...@next-libs/cmdb-instances@6.21.18) (2022-04-15)
+
+
+### Bug Fixes
+
+* **CmdbInstancesSelectPanel:** fix breaking change of remove objectMap property ([a034070](https://github.com/easyops-cn/next-libs/commit/a034070859630696b6b2696356c2455384f7d312))
+
+
+
+
+
 ## [6.21.17](https://github.com/easyops-cn/next-libs/compare/@next-libs/cmdb-instances@6.21.16...@next-libs/cmdb-instances@6.21.17) (2022-04-11)
 
 **Note:** Version bump only for package @next-libs/cmdb-instances

package/dist/cjs/cmdb-instances-select-panel/CmdbInstancesSelectPanel.js

@@ -8,6 +8,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.CmdbInstancesSelectPanel = CmdbInstancesSelectPanel;
+exports.isCmdbInstancesSelectPanelPropsWithObjectMap = isCmdbInstancesSelectPanelPropsWithObjectMap;
 
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 
@@ -33,12 +34,20 @@ var _lodash = require("lodash");
 
 var _antd = require("antd");
 
+function isCmdbInstancesSelectPanelPropsWithObjectMap(props) {
+  return !(0, _lodash.isNil)(props.objectMap);
+}
+
 function CmdbInstancesSelectPanel(props, ref) {
   var _props$previewMaxNumb, _props$instanceQuery, _props$modalTitle, _props$addTitle;
 
-  let {
-    modelData
-  } = props;
+  let modelData;
+
+  if (isCmdbInstancesSelectPanelPropsWithObjectMap(props)) {
+    modelData = props.objectMap[props.objectId];
+  } else {
+    modelData = props.modelData;
+  }
 
   if (props.isFilterView) {
     var _modelData, _modelData$view;
@@ -97,16 +106,24 @@ function CmdbInstancesSelectPanel(props, ref) {
     initInstances();
 
     const getModelMap = async () => {
-      const {
-        data
-      } = await (0, _cmdbSdk.CmdbObjectApi_getObjectRef)({
-        ref_object: props.objectId
-      });
-      setModelMap((0, _lodash.keyBy)(data, "objectId"));
+      let modelMap;
+
+      if (isCmdbInstancesSelectPanelPropsWithObjectMap(props)) {
+        modelMap = props.objectMap;
+      } else {
+        const {
+          data
+        } = await (0, _cmdbSdk.CmdbObjectApi_getObjectRef)({
+          ref_object: props.objectId
+        });
+        modelMap = (0, _lodash.keyBy)(data, "objectId");
+      }
+
+      setModelMap(modelMap);
     };
 
     getModelMap();
-  }, [props.objectId]);
+  }, [props.objectId, props.value]);
 
   const openAddInstancesModal = () => {
     setAddInstancesModal({

package/dist/cjs/cmdb-instances-select-panel/CmdbInstancesSelectPanel.js.map

@@ -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","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"}
+{"version":3,"sources":["../../../src/cmdb-instances-select-panel/CmdbInstancesSelectPanel.tsx"],"names":["isCmdbInstancesSelectPanelPropsWithObjectMap","props","objectMap","CmdbInstancesSelectPanel","ref","modelData","objectId","isFilterView","hideModelData","view","hide_columns","attrList","filter","item","includes","id","relation_list","left_id","left_object_id","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, isNil } from \"lodash\";\nimport { Spin } from \"antd\";\n\nexport interface BaseCmdbInstancesSelectPanelProps {\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 interface CmdbInstancesSelectPanelPropsWithObjectMap\n  extends BaseCmdbInstancesSelectPanelProps {\n  objectMap: Record<string, Partial<CmdbModels.ModelCmdbObject>>;\n}\n\nexport interface CmdbInstancesSelectPanelPropsWithModelData\n  extends BaseCmdbInstancesSelectPanelProps {\n  modelData: Partial<CmdbModels.ModelCmdbObject>;\n}\n\nexport type CmdbInstancesSelectPanelProps =\n  | CmdbInstancesSelectPanelPropsWithObjectMap\n  | CmdbInstancesSelectPanelPropsWithModelData;\n\nexport function isCmdbInstancesSelectPanelPropsWithObjectMap(\n  props: CmdbInstancesSelectPanelProps\n): props is CmdbInstancesSelectPanelPropsWithObjectMap {\n  return !isNil(\n    (props as CmdbInstancesSelectPanelPropsWithObjectMap).objectMap\n  );\n}\n\nexport function CmdbInstancesSelectPanel(\n  props: CmdbInstancesSelectPanelProps,\n  ref: any\n): React.ReactElement {\n  let modelData: Partial<CmdbModels.ModelCmdbObject>;\n\n  if (isCmdbInstancesSelectPanelPropsWithObjectMap(props)) {\n    modelData = props.objectMap[props.objectId];\n  } else {\n    modelData = props.modelData;\n  }\n\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      let modelMap: Record<string, Partial<CmdbModels.ModelCmdbObject>>;\n\n      if (isCmdbInstancesSelectPanelPropsWithObjectMap(props)) {\n        modelMap = props.objectMap;\n      } else {\n        const { data } = await CmdbObjectApi_getObjectRef({\n          ref_object: props.objectId,\n        });\n        modelMap = keyBy(data, \"objectId\");\n      }\n      setModelMap(modelMap);\n    };\n    getModelMap();\n  }, [props.objectId, props.value]);\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

@@ -864,13 +864,24 @@ function InstanceList(props) {
     return () => {
       var _props$onAdvancedSear2;
 
-      let queries = [];
-      let queriesToShow = [];
+      const queries = [];
+      const queriesToShow = [];
 
-      const isValueEqual = query => Object.values(query[attrId]).join(" ") !== valuesStr;
+      const isValueEqual = query => query[attrId] ? Object.values(query[attrId]).join(" ") !== valuesStr : false;
 
       const filterAq = queries => queries.filter(v => isValueEqual(v));
 
+      const specialQueryHandler = (query, key, queries) => {
+        // $exists $gte $lte 针对为空，不为空，时间范围特殊处理
+        const isSpecial = Object.keys(query[key]).some(v => v === "$exists" || v === "$gte" || v === "$lte");
+
+        if (isSpecial) {
+          return;
+        }
+
+        queries.push(query);
+      };
+
       state.aq.forEach(query => {
         const key = Object.keys(query)[0];
 
@@ -884,8 +895,8 @@ function InstanceList(props) {
           }
         } else if (key !== attrId && !(0, _lodash.startsWith)(attrId, `${key}.`)) {
           queries.push(query);
-        } else if (key === attrId && isValueEqual(query)) {
-          queries = filterAq(state.aq);
+        } else if (props.isInstanceFilterForm && key === attrId && isValueEqual(query)) {
+          specialQueryHandler(query, key, queries);
         }
       });
       state.aqToShow.forEach(query => {
@@ -901,8 +912,8 @@ function InstanceList(props) {
           }
         } else if (key !== attrId) {
           queriesToShow.push(query);
-        } else if (key === attrId && isValueEqual(query)) {
-          queriesToShow = filterAq(state.aqToShow);
+        } else if (props.isInstanceFilterForm && key === attrId && isValueEqual(query)) {
+          specialQueryHandler(query, key, queriesToShow);
         }
       });
       setState({