@next-libs/cmdb-instances 6.6.1 → 6.6.5

package/CHANGELOG.md

@@ -3,6 +3,44 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [6.6.5](https://github.com/easyops-cn/next-libs/compare/@next-libs/cmdb-instances@6.6.4...@next-libs/cmdb-instances@6.6.5) (2021-10-13)
+
+**Note:** Version bump only for package @next-libs/cmdb-instances
+
+
+
+
+
+## [6.6.4](https://github.com/easyops-cn/next-libs/compare/@next-libs/cmdb-instances@6.6.3...@next-libs/cmdb-instances@6.6.4) (2021-10-11)
+
+**Note:** Version bump only for package @next-libs/cmdb-instances
+
+
+
+
+
+## [6.6.3](https://github.com/easyops-cn/next-libs/compare/@next-libs/cmdb-instances@6.6.2...@next-libs/cmdb-instances@6.6.3) (2021-09-29)
+
+
+### Bug Fixes
+
+* **cmdb-instances:** 实例列表自增id流水号属性排序使用自然排序 ([1eeada1](https://github.com/easyops-cn/next-libs/commit/1eeada18741c0564fb03d84b5622f8b77576ed46))
+
+
+
+
+
+## [6.6.2](https://github.com/easyops-cn/next-libs/compare/@next-libs/cmdb-instances@6.6.1...@next-libs/cmdb-instances@6.6.2) (2021-09-27)
+
+
+### Bug Fixes
+
+* **cmdb-instances:** 修复实例列表高级搜索-关系字段查询回填不正确 ([1fed048](https://github.com/easyops-cn/next-libs/commit/1fed0482fb166e345b6ff5230d3b933dd7cff187))
+
+
+
+
+
 ## [6.6.1](https://github.com/easyops-cn/next-libs/compare/@next-libs/cmdb-instances@6.6.0...@next-libs/cmdb-instances@6.6.1) (2021-09-26)
 
 **Note:** Version bump only for package @next-libs/cmdb-instances

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

@@ -101,6 +101,14 @@ function translateConditions(aq, idObjectMap, modelData, t) {
         relationSideId: relation[`${sides.this}_id`]
       });
     });
+    relations.push({
+      id: `${objectId}.`,
+      name: `${relation[`${sides.this}_name`]}`,
+      value: {
+        type: "str"
+      },
+      relationSideId: relation[`${sides.this}_id`]
+    });
   });
   const attrAndRelationList = [...modelData.attrList, ...relations];
 
@@ -114,7 +122,13 @@ function translateConditions(aq, idObjectMap, modelData, t) {
 
       queries.forEach(query => {
         const key = Object.keys(query)[0];
-        const attr = attrAndRelationList.find(attr => attr.id === key || attr.relationSideId === key);
+        const value = Object.values(query)[0];
+        let attr = attrAndRelationList.find(attr => attr.id === key || attr.relationSideId === key);
+
+        if (Object.keys(value)[0] === _instanceListTable.ElementOperators.Exists && attr.relationSideId) {
+          const relationSideId = attr.relationSideId;
+          attr = attrAndRelationList.find(attr => attr.id === `${relationSideId}.`) || attr;
+        }
 
         if (attr) {
           query = (0, _processors.changeQueryWithCustomRules)(modelData.objectId, attr.id, query);
@@ -130,11 +144,15 @@ function translateConditions(aq, idObjectMap, modelData, t) {
             condition += `"${info.values.join(" ~ ")}"`;
           }
 
-          conditions.push({
+          const curCondition = {
             attrId: key,
             condition,
             valuesStr: info.queryValuesStr
-          });
+          };
+
+          if (conditions.every(v => !(0, _lodash.isEqual)((0, _lodash.omit)(v, "attrId"), (0, _lodash.omit)(curCondition, "attrId")))) {
+            conditions.push(curCondition);
+          }
         }
       });
     }
@@ -341,7 +359,7 @@ function InstanceList(props) {
   const isFirstRunRef = (0, _react.useRef)(true);
 
   const getInstanceListData = async (sort, asc, page) => {
-    var _props$onSearchExecut;
+    var _modelData$attrList, _modelData$attrList$f2, _modelData$attrList$f3, _props$onSearchExecut;
 
     const data = {};
     const v3Data = {
@@ -355,14 +373,16 @@ function InstanceList(props) {
     let query = {};
     v3Data.page = data.page = page;
     v3Data["page_size"] = data["page_size"] = state.pageSize;
+    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;
+    const order = ["series-number", "auto-increment-id"].includes(sortType) ? asc ? 2 : -2 : asc ? 1 : -1;
 
     if (sort) {
       data.sort = {
-        [sort]: asc ? 1 : -1
+        [sort]: order
       };
       v3Data.sort = [{
         key: sort,
-        order: asc ? 1 : -1
+        order
       }];
     }
 

package/dist/cjs/instance-list-table/AdvancedSearch.js

@@ -7,7 +7,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.convertValue = convertValue;
 exports.getFieldConditionsAndValues = getFieldConditionsAndValues;
-exports.AdvancedSearch = exports.AdvancedSearchForm = exports.ConditionType = exports.LogicalOperators = void 0;
+exports.AdvancedSearch = exports.AdvancedSearchForm = exports.ConditionType = exports.LogicalOperators = exports.ElementOperators = void 0;
 
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 
@@ -50,11 +50,12 @@ var ComparisonOperators;
   ComparisonOperators["NotIn"] = "$nin";
 })(ComparisonOperators || (ComparisonOperators = {}));
 
-var ElementOperators;
+let ElementOperators;
+exports.ElementOperators = ElementOperators;
 
 (function (ElementOperators) {
   ElementOperators["Exists"] = "$exists";
-})(ElementOperators || (ElementOperators = {}));
+})(ElementOperators || (exports.ElementOperators = ElementOperators = {}));
 
 let LogicalOperators;
 exports.LogicalOperators = LogicalOperators;
@@ -262,7 +263,7 @@ function getFieldConditionsAndValues(fieldQueryOperatorExpressionsMap, id, value
 
   if (!expressions && isRelation) {
     isRelationWithNoExpression = true;
-    const relatedKey = (0, _lodash.findKey)(fieldQueryOperatorExpressionsMap, (v, k) => (0, _lodash.startsWith)(k, `${relationSideId}.`));
+    const relatedKey = (0, _lodash.findKey)(fieldQueryOperatorExpressionsMap, (v, k) => (0, _lodash.startsWith)(k, `${relationSideId}.`) || k === relationSideId);
     const relatedExpressions = fieldQueryOperatorExpressionsMap[relatedKey];
 
     if (relatedExpressions && !(0, _lodash.isNil)(relatedExpressions[ElementOperators.Exists])) {
@@ -303,7 +304,7 @@ function getFieldConditionsAndValues(fieldQueryOperatorExpressionsMap, id, value
   }
 
   let queryValuesStr = "";
-  let values = currentCondition.operations.map(operation => {
+  const values = currentCondition.operations.map(operation => {
     var _expressions;
 
     let value; // istanbul ignore else
@@ -344,14 +345,17 @@ function getFieldConditionsAndValues(fieldQueryOperatorExpressionsMap, id, value
 
     return value;
   });
-  let disabled = false;
-
-  if (isRelation && expressions && currentCondition.operations[0].operator === ElementOperators.Exists && isRelationWithNoExpression) {
-    disabled = true;
-    currentCondition = availableConditions[0];
-    values = [null];
-    queryValuesStr = "";
-  }
+  const disabled = false; // if (
+  //   isRelation &&
+  //   expressions &&
+  //   currentCondition.operations[0].operator === ElementOperators.Exists &&
+  //   isRelationWithNoExpression
+  // ) {
+  //   disabled = true;
+  //   currentCondition = availableConditions[0];
+  //   values = [null];
+  //   queryValuesStr = "";
+  // }
 
   return {
     availableConditions,
@@ -401,26 +405,27 @@ class AdvancedSearchForm extends _react.default.Component {
 
       if (relatedFieldIndex !== -1) {
         const relatedField = newFields[relatedFieldIndex];
+        const relatedCondition = relatedField.availableConditions.find(condition => condition.type === value);
 
         if (condition.operations[0].operator === ElementOperators.Exists) {
           newFields = (0, _immutabilityHelper.default)(newFields, {
             [relatedFieldIndex]: {
               currentCondition: {
-                $set: relatedField.availableConditions[0]
+                $set: relatedCondition
               },
               values: {
                 $set: [null]
-              },
-              disabled: {
-                $set: true
               }
             }
           });
-        } else {
+        } else if (relatedField.currentCondition.operations[0].operator === ElementOperators.Exists) {
           newFields = (0, _immutabilityHelper.default)(newFields, {
             [relatedFieldIndex]: {
-              disabled: {
-                $set: false
+              currentCondition: {
+                $set: relatedField.availableConditions[0]
+              },
+              values: {
+                $set: [null]
               }
             }
           });

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

@@ -1,7 +1,7 @@
 import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 import _objectSpread from "@babel/runtime/helpers/objectSpread2";
 import React, { useEffect, useReducer, useState, useRef, useMemo } from "react";
-import { difference, isEmpty, isEqual, isString, map, uniq, union, filter, reject, sortBy, uniqueId, findIndex, find, startsWith, compact } from "lodash";
+import { difference, isEmpty, isEqual, isString, map, uniq, union, filter, reject, sortBy, uniqueId, findIndex, find, startsWith, compact, omit } from "lodash";
 import { BrickAsComponent, handleHttpError } from "@next-core/brick-kit";
 import i18n from "i18next";
 import { K, NS_LIBS_CMDB_INSTANCES } from "../i18n/constants";
@@ -9,7 +9,7 @@ import { InstanceApi_postSearchV3 } from "@next-sdk/cmdb-sdk";
 import { Icon as LegacyIcon } from "@ant-design/compatible";
 import { Button, Spin, Input, Tag, Select } from "antd";
 import { getRelationObjectSides, forEachAvailableFields, getInstanceNameKeys } from "@next-libs/cmdb-utils";
-import { ConditionType, LogicalOperators, AdvancedSearch, getFieldConditionsAndValues, MoreButtonsContainer, InstanceListTable } from "../instance-list-table";
+import { ConditionType, LogicalOperators, AdvancedSearch, getFieldConditionsAndValues, MoreButtonsContainer, InstanceListTable, ElementOperators } from "../instance-list-table";
 import styles from "./InstanceList.module.css";
 import { extraFieldAttrs, CMDB_MODAL_FIELDS_SETTINGS, CMDB_RESOURCE_FIELDS_SETTINGS, MAX_DEFAULT_FIELDS_COUNT, MAX_DEFAULT_MODAL_FIELDS_COUNT } from "./constants";
 import { JsonStorage } from "@next-libs/storage";
@@ -75,6 +75,14 @@ function translateConditions(aq, idObjectMap, modelData, t) {
         relationSideId: relation["".concat(sides.this, "_id")]
       });
     });
+    relations.push({
+      id: "".concat(objectId, "."),
+      name: "".concat(relation["".concat(sides.this, "_name")]),
+      value: {
+        type: "str"
+      },
+      relationSideId: relation["".concat(sides.this, "_id")]
+    });
   });
   var attrAndRelationList = [...modelData.attrList, ...relations];
 
@@ -88,8 +96,14 @@ function translateConditions(aq, idObjectMap, modelData, t) {
 
       _queries.forEach(query => {
         var key = Object.keys(query)[0];
+        var value = Object.values(query)[0];
         var attr = attrAndRelationList.find(attr => attr.id === key || attr.relationSideId === key);
 
+        if (Object.keys(value)[0] === ElementOperators.Exists && attr.relationSideId) {
+          var relationSideId = attr.relationSideId;
+          attr = attrAndRelationList.find(attr => attr.id === "".concat(relationSideId, ".")) || attr;
+        }
+
         if (attr) {
           query = changeQueryWithCustomRules(modelData.objectId, attr.id, query);
           var info = getFieldConditionsAndValues(query, key, attr.value.type, undefined, undefined, modelData.objectId, attr.id);
@@ -104,11 +118,15 @@ function translateConditions(aq, idObjectMap, modelData, t) {
             condition += "\"".concat(info.values.join(" ~ "), "\"");
           }
 
-          conditions.push({
+          var curCondition = {
             attrId: key,
             condition,
             valuesStr: info.queryValuesStr
-          });
+          };
+
+          if (conditions.every(v => !isEqual(omit(v, "attrId"), omit(curCondition, "attrId")))) {
+            conditions.push(curCondition);
+          }
         }
       });
     }
@@ -311,7 +329,7 @@ export function InstanceList(props) {
 
   var getInstanceListData = /*#__PURE__*/function () {
     var _ref3 = _asyncToGenerator(function* (sort, asc, page) {
-      var _props$onSearchExecut;
+      var _modelData$attrList, _modelData$attrList$f2, _modelData$attrList$f3, _props$onSearchExecut;
 
       var data = {};
       var v3Data = {
@@ -325,14 +343,16 @@ export function InstanceList(props) {
       var query = {};
       v3Data.page = data.page = page;
       v3Data["page_size"] = data["page_size"] = state.pageSize;
+      var 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;
+      var order = ["series-number", "auto-increment-id"].includes(sortType) ? asc ? 2 : -2 : asc ? 1 : -1;
 
       if (sort) {
         data.sort = {
-          [sort]: asc ? 1 : -1
+          [sort]: order
         };
         v3Data.sort = [{
           key: sort,
-          order: asc ? 1 : -1
+          order
         }];
       }
 

package/dist/esm/instance-list-table/AdvancedSearch.js

@@ -27,7 +27,7 @@ var ComparisonOperators;
   ComparisonOperators["NotIn"] = "$nin";
 })(ComparisonOperators || (ComparisonOperators = {}));
 
-var ElementOperators;
+export var ElementOperators;
 
 (function (ElementOperators) {
   ElementOperators["Exists"] = "$exists";
@@ -236,7 +236,7 @@ export function getFieldConditionsAndValues(fieldQueryOperatorExpressionsMap, id
 
   if (!expressions && isRelation) {
     isRelationWithNoExpression = true;
-    var relatedKey = findKey(fieldQueryOperatorExpressionsMap, (v, k) => startsWith(k, "".concat(relationSideId, ".")));
+    var relatedKey = findKey(fieldQueryOperatorExpressionsMap, (v, k) => startsWith(k, "".concat(relationSideId, ".")) || k === relationSideId);
     var relatedExpressions = fieldQueryOperatorExpressionsMap[relatedKey];
 
     if (relatedExpressions && !isNil(relatedExpressions[ElementOperators.Exists])) {
@@ -318,14 +318,17 @@ export function getFieldConditionsAndValues(fieldQueryOperatorExpressionsMap, id
 
     return value;
   });
-  var disabled = false;
-
-  if (isRelation && expressions && currentCondition.operations[0].operator === ElementOperators.Exists && isRelationWithNoExpression) {
-    disabled = true;
-    currentCondition = availableConditions[0];
-    values = [null];
-    queryValuesStr = "";
-  }
+  var disabled = false; // if (
+  //   isRelation &&
+  //   expressions &&
+  //   currentCondition.operations[0].operator === ElementOperators.Exists &&
+  //   isRelationWithNoExpression
+  // ) {
+  //   disabled = true;
+  //   currentCondition = availableConditions[0];
+  //   values = [null];
+  //   queryValuesStr = "";
+  // }
 
   return {
     availableConditions,
@@ -376,26 +379,27 @@ export class AdvancedSearchForm extends React.Component {
 
       if (relatedFieldIndex !== -1) {
         var relatedField = newFields[relatedFieldIndex];
+        var relatedCondition = relatedField.availableConditions.find(condition => condition.type === value);
 
         if (condition.operations[0].operator === ElementOperators.Exists) {
           newFields = update(newFields, {
             [relatedFieldIndex]: {
               currentCondition: {
-                $set: relatedField.availableConditions[0]
+                $set: relatedCondition
               },
               values: {
                 $set: [null]
-              },
-              disabled: {
-                $set: true
               }
             }
           });
-        } else {
+        } else if (relatedField.currentCondition.operations[0].operator === ElementOperators.Exists) {
           newFields = update(newFields, {
             [relatedFieldIndex]: {
-              disabled: {
-                $set: false
+              currentCondition: {
+                $set: relatedField.availableConditions[0]
+              },
+              values: {
+                $set: [null]
               }
             }
           });

package/dist/types/instance-list-table/AdvancedSearch.d.ts

@@ -14,7 +14,7 @@ declare enum ComparisonOperators {
     In = "$in",
     NotIn = "$nin"
 }
-declare enum ElementOperators {
+export declare enum ElementOperators {
     Exists = "$exists"
 }
 export declare enum LogicalOperators {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@next-libs/cmdb-instances",
-  "version": "6.6.1",
+  "version": "6.6.5",
   "description": "> TODO: description",
   "homepage": "https://github.com/easyops-cn/next-libs/tree/master/libs/cmdb-instances",
   "license": "GPL-3.0",
@@ -36,12 +36,12 @@
   },
   "dependencies": {
     "@next-core/brick-types": "^2.16.0",
-    "@next-libs/basic-components": "^3.2.3",
+    "@next-libs/basic-components": "^3.2.4",
     "@next-libs/cmdb-utils": "^3.0.2",
-    "@next-libs/code-editor-components": "^4.0.7",
-    "@next-libs/forms": "^3.2.5",
+    "@next-libs/code-editor-components": "^4.0.9",
+    "@next-libs/forms": "^3.2.6",
     "@next-libs/storage": "^2.0.2",
-    "@next-sdk/cmdb-sdk": "^2.1.1",
+    "@next-sdk/cmdb-sdk": "^2.1.13",
     "@next-sdk/permission-sdk": "^2.1.1",
     "@types/file-saver": "^2.0.3",
     "classnames": "^2.3.1",
@@ -50,5 +50,5 @@
     "immutability-helper": "^3.1.1",
     "marked": "^2.1.3"
   },
-  "gitHead": "3b343ce2f9cab18091539c81f62517b792621f6e"
+  "gitHead": "69b77c3b8d38591913d4b92b755f44ceb908a761"
 }