@next-libs/cmdb-instances 6.35.6 → 6.37.0

package/CHANGELOG.md

@@ -3,6 +3,40 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [6.37.0](https://github.com/easyops-cn/next-libs/compare/@next-libs/cmdb-instances@6.36.0...@next-libs/cmdb-instances@6.37.0) (2022-07-21)
+
+
+### Features
+
+* **cmdb-instance:** 实例列表支持调用search-resource接口 ([#394](https://github.com/easyops-cn/next-libs/issues/394)) ([b99758a](https://github.com/easyops-cn/next-libs/commit/b99758a3a5898ff4fc57c966f392c66eb9993028))
+
+
+
+
+
+# [6.36.0](https://github.com/easyops-cn/next-libs/compare/@next-libs/cmdb-instances@6.35.7...@next-libs/cmdb-instances@6.36.0) (2022-07-20)
+
+
+### Features
+
+* cmdb实例新建构件可以设置白名单默认值 refs CD-2777 ([24c2a3d](https://github.com/easyops-cn/next-libs/commit/24c2a3df0bb427f67f49de46bb19bdacebc02d72))
+* cmdb实例新建构件可以设置白名单默认值 refs CD-2777 ([590523a](https://github.com/easyops-cn/next-libs/commit/590523ab4b58ff7458fb2dd49039ddf3be8a9555))
+
+
+
+
+
+## [6.35.7](https://github.com/easyops-cn/next-libs/compare/@next-libs/cmdb-instances@6.35.6...@next-libs/cmdb-instances@6.35.7) (2022-07-15)
+
+
+### Bug Fixes
+
+* instance-list 组件表格数据多导致搜索卡 ([#392](https://github.com/easyops-cn/next-libs/issues/392)) ([1173999](https://github.com/easyops-cn/next-libs/commit/11739992cee6dc5f3af441b4caa0b4f44c6dc0e8))
+
+
+
+
+
 ## [6.35.6](https://github.com/easyops-cn/next-libs/compare/@next-libs/cmdb-instances@6.35.5...@next-libs/cmdb-instances@6.35.6) (2022-07-14)
 
 **Note:** Version bump only for package @next-libs/cmdb-instances

package/dist/cjs/instance-list/InstanceList.js

@@ -302,8 +302,11 @@ function LegacyInstanceList(props) {
     return { ...prevState,
       ...updatedProperty
     };
-  };
+  }; // 资源自动发现页面24小时发现主机抽屉的实例列表处，通用的postSearchV3接口无法查到正确结果，需要用下面的接口替换，参数里也要加上jobId:***
+  // 为了不影响其他地方的实例列表，在该处加一个useAutoDiscoveryProvider参数，该参数为undefined或false的，仍调用原接口
+
 
+  const listProvider = (0, _brickKit.useProvider)("easyops.api.cmdb.job@SearchResource:1.0.1");
   const {
     modelData,
     idObjectMap
@@ -512,6 +515,11 @@ function LegacyInstanceList(props) {
 
     if (!(0, _lodash.isEmpty)(query)) {
       v3Data.query = data.query = query;
+    } // useAutoDiscoveryProvider=true, 使用useProvider的接口，请求参数里加上extraParams
+
+
+    if (props.useAutoDiscoveryProvider && !(0, _lodash.isEmpty)(props.extraParams)) {
+      Object.assign(v3Data, props.extraParams);
     }
 
     if (state.relatedToMe) {
@@ -529,8 +537,9 @@ function LegacyInstanceList(props) {
       };
     }
 
-    const promise = (_props$onSearchExecut = props.onSearchExecute) === null || _props$onSearchExecut === void 0 ? void 0 : _props$onSearchExecut.call(props, data, v3Data);
-    return promise ? promise : (0, _cmdbSdk.InstanceApi_postSearchV3)(props.objectId, v3Data);
+    const promise = (_props$onSearchExecut = props.onSearchExecute) === null || _props$onSearchExecut === void 0 ? void 0 : _props$onSearchExecut.call(props, data, v3Data); // useAutoDiscoveryProvider=true, 使用useProvider的接口
+
+    return promise ? promise : props.useAutoDiscoveryProvider ? listProvider.query([props.objectId, v3Data]) : (0, _cmdbSdk.InstanceApi_postSearchV3)(props.objectId, v3Data);
   };
 
   const refreshInstanceList = async (sort, asc, page) => {
@@ -634,7 +643,7 @@ function LegacyInstanceList(props) {
   }; // istanbul ignore next
 
 
-  const onSelectionChange = async selected => {
+  const onSelectionChange = (0, _react.useCallback)(async selected => {
     var _props$onSelectionCha;
 
     let {
@@ -647,7 +656,8 @@ function LegacyInstanceList(props) {
       const ids = selectedKeys.filter(id => !cache.current.has(id));
 
       if (ids.length) {
-        const resp = await (0, _cmdbSdk.InstanceApi_postSearchV3)(props.objectId, {
+        let resp;
+        const params = {
           fields: ["instanceId"],
           query: {
             instanceId: {
@@ -655,7 +665,14 @@ function LegacyInstanceList(props) {
             }
           },
           page_size: ids.length
-        });
+        }; // useAutoDiscoveryProvider=true, 使用useProvider的接口，虽然这里列表用不到选择功能，但还是加上保持统一
+
+        if (props.useAutoDiscoveryProvider) {
+          resp = await listProvider.query([props.objectId, Object.assign(params, props.extraParams)]);
+        } else {
+          resp = await (0, _cmdbSdk.InstanceApi_postSearchV3)(props.objectId, params);
+        }
+
         resp.list.forEach(i => cache.current.set(i.instanceId, i));
       }
 
@@ -666,7 +683,7 @@ function LegacyInstanceList(props) {
       selectedItems,
       selectedKeys
     });
-  };
+  }, []);
 
   const onSearch = value => {
     var _props$onSearch;
@@ -689,7 +706,7 @@ function LegacyInstanceList(props) {
     (_props$onAdvancedSear = props.onAdvancedSearch) === null || _props$onAdvancedSear === void 0 ? void 0 : _props$onAdvancedSear.call(props, queries);
   };
 
-  const onSortingChange = info => {
+  const onSortingChange = (0, _react.useCallback)(info => {
     var _props$onSortingChang;
 
     let asc;
@@ -714,9 +731,8 @@ function LegacyInstanceList(props) {
     }
 
     (_props$onSortingChang = props.onSortingChange) === null || _props$onSortingChang === void 0 ? void 0 : _props$onSortingChang.call(props, info);
-  };
-
-  const onPaginationChange = pagination => {
+  }, [state.sort]);
+  const onPaginationChange = (0, _react.useCallback)(pagination => {
     var _props$onPaginationCh2;
 
     setState({
@@ -724,16 +740,15 @@ function LegacyInstanceList(props) {
       pageSize: pagination.pageSize
     });
     (_props$onPaginationCh2 = props.onPaginationChange) === null || _props$onPaginationCh2 === void 0 ? void 0 : _props$onPaginationCh2.call(props, pagination);
-  };
-
-  const onInstanceSourceChange = instanceSourceQuery => {
+  }, []);
+  const onInstanceSourceChange = (0, _react.useCallback)(instanceSourceQuery => {
     var _props$onInstanceSour;
 
     setState({
       instanceSourceQuery
     });
     (_props$onInstanceSour = props.onInstanceSourceChange) === null || _props$onInstanceSour === void 0 ? void 0 : _props$onInstanceSour.call(props, instanceSourceQuery);
-  };
+  }, []);
 
   const onRelatedToMeChange = checked => {
     var _props$onRelatedToMeC;
@@ -879,7 +894,18 @@ function LegacyInstanceList(props) {
         v3Data.only_my_instance = data.only_my_instance = state.relatedToMe;
       }
 
-      const resp = await (0, _cmdbSdk.InstanceApi_postSearchV3)(props.objectId, v3Data);
+      if (props.extraParams) {
+        Object.assign(v3Data, props.extraParams);
+      }
+
+      let resp;
+
+      if (props.useAutoDiscoveryProvider) {
+        resp = await listProvider.query([props.objectId, v3Data]);
+      } else {
+        resp = await (0, _cmdbSdk.InstanceApi_postSearchV3)(props.objectId, v3Data);
+      }
+
       resp.list.forEach(i => cache.current.set(i.instanceId, i));
     })();
   }, [props.selectedRowKeys]);