@next-libs/cmdb-instances 6.36.0 → 6.38.0

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.38.0](https://github.com/easyops-cn/next-libs/compare/@next-libs/cmdb-instances@6.37.1...@next-libs/cmdb-instances@6.38.0) (2022-07-22)
+
+
+### Features
+
+* **cmdb-instances:** 实例列表的presetConfigs添加一个额外固定列的选项 ([b55e667](https://github.com/easyops-cn/next-libs/commit/b55e667a87fac79b0495d391b3a77967c67db7ca))
+
+
+
+
+
+## [6.37.1](https://github.com/easyops-cn/next-libs/compare/@next-libs/cmdb-instances@6.37.0...@next-libs/cmdb-instances@6.37.1) (2022-07-22)
+
+
+### Bug Fixes
+
+* **cmdb-instances:** 动态过滤选择在此期间报错 ([2696092](https://github.com/easyops-cn/next-libs/commit/269609255b6e922919db9a47c86646b171f2def7))
+
+
+
+
+
+# [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)
 
 

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
@@ -382,9 +385,10 @@ function LegacyInstanceList(props) {
   };
 
   const getFields = () => {
-    var _props$presetConfigs2;
+    var _props$presetConfigs2, _props$extraFixedFiel;
 
     let fieldIds = (_props$presetConfigs2 = props.presetConfigs) === null || _props$presetConfigs2 === void 0 ? void 0 : _props$presetConfigs2.fieldIds;
+    const extraFixedFieldIds = (_props$extraFixedFiel = props.extraFixedFields) !== null && _props$extraFixedFiel !== void 0 ? _props$extraFixedFiel : [];
 
     if ((0, _lodash.isEmpty)(fieldIds)) {
       fieldIds = jsonLocalStorage.getItem(`${modelData.objectId}-selectAttrIds`);
@@ -394,6 +398,10 @@ function LegacyInstanceList(props) {
       fieldIds = computeDefaultFields().fieldIds;
     }
 
+    if (!(0, _lodash.isEmpty)(extraFixedFieldIds)) {
+      fieldIds = (0, _lodash.uniq)([...fieldIds, ...extraFixedFieldIds]);
+    }
+
     fieldIds = props.extraDisabledField ? (0, _lodash.uniq)([...fieldIds, props.extraDisabledField]) : fieldIds;
     fieldIds = _sortFieldIds(fieldIds);
     const hideModelData = modelData.view.hide_columns || [];
@@ -512,6 +520,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 +542,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) => {
@@ -647,7 +661,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 +670,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));
       }
 
@@ -807,16 +829,22 @@ function LegacyInstanceList(props) {
   };
 
   const defaultFields = (0, _react.useMemo)(() => {
-    var _props$presetConfigs3;
+    var _props$presetConfigs3, _props$extraFixedFiel2;
 
     let defaultFields;
+    const fieldIds = (_props$presetConfigs3 = props.presetConfigs) === null || _props$presetConfigs3 === void 0 ? void 0 : _props$presetConfigs3.fieldIds,
+          extraFixedFieldIds = (_props$extraFixedFiel2 = props.extraFixedFields) !== null && _props$extraFixedFiel2 !== void 0 ? _props$extraFixedFiel2 : [];
 
-    if (!(0, _lodash.isEmpty)((_props$presetConfigs3 = props.presetConfigs) === null || _props$presetConfigs3 === void 0 ? void 0 : _props$presetConfigs3.fieldIds)) {
+    if (!(0, _lodash.isEmpty)(fieldIds)) {
       defaultFields = props.presetConfigs.fieldIds;
     } else {
       defaultFields = computeDefaultFields().fieldIds;
     }
 
+    if (!(0, _lodash.isEmpty)(extraFixedFieldIds)) {
+      defaultFields = (0, _lodash.uniq)([...defaultFields, ...extraFixedFieldIds]);
+    }
+
     return defaultFields;
   }, [props.presetConfigs, modelData]); // istanbul ignore next
 
@@ -877,7 +905,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]);