@next-libs/cmdb-instances 6.24.0 → 6.25.0

package/CHANGELOG.md

@@ -3,6 +3,17 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [6.25.0](https://github.com/easyops-cn/next-libs/compare/@next-libs/cmdb-instances@6.24.0...@next-libs/cmdb-instances@6.25.0) (2022-05-23)
+
+
+### Features
+
+* move transformConditionsToAq here ([3b91884](https://github.com/easyops-cn/next-libs/commit/3b91884d43966967eb110f8c16830fbffaa9bfad))
+
+
+
+
+
 # [6.24.0](https://github.com/easyops-cn/next-libs/compare/@next-libs/cmdb-instances@6.23.0...@next-libs/cmdb-instances@6.24.0) (2022-05-20)
 
 

package/dist/cjs/index.js

@@ -3,11 +3,49 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+var _exportNames = {
+  ComparisonOperators: true,
+  ElementOperators: true,
+  LogicalOperators: true,
+  Query: true,
+  QueryOperatorExpressions: true
+};
+Object.defineProperty(exports, "ComparisonOperators", {
+  enumerable: true,
+  get: function () {
+    return _cmdbUtils.ComparisonOperators;
+  }
+});
+Object.defineProperty(exports, "ElementOperators", {
+  enumerable: true,
+  get: function () {
+    return _cmdbUtils.ElementOperators;
+  }
+});
+Object.defineProperty(exports, "LogicalOperators", {
+  enumerable: true,
+  get: function () {
+    return _cmdbUtils.LogicalOperators;
+  }
+});
+Object.defineProperty(exports, "Query", {
+  enumerable: true,
+  get: function () {
+    return _cmdbUtils.Query;
+  }
+});
+Object.defineProperty(exports, "QueryOperatorExpressions", {
+  enumerable: true,
+  get: function () {
+    return _cmdbUtils.QueryOperatorExpressions;
+  }
+});
 
 var _InstanceAttributeForm = require("./instance-attribute-form/InstanceAttributeForm");
 
 Object.keys(_InstanceAttributeForm).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
+  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
   if (key in exports && exports[key] === _InstanceAttributeForm[key]) return;
   Object.defineProperty(exports, key, {
     enumerable: true,
@@ -21,6 +59,7 @@ var _ModelAttributeForm = require("./model-attribute-form/ModelAttributeForm");
 
 Object.keys(_ModelAttributeForm).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
+  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
   if (key in exports && exports[key] === _ModelAttributeForm[key]) return;
   Object.defineProperty(exports, key, {
     enumerable: true,
@@ -34,6 +73,7 @@ var _ModelRelationForm = require("./model-relation-form/ModelRelationForm");
 
 Object.keys(_ModelRelationForm).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
+  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
   if (key in exports && exports[key] === _ModelRelationForm[key]) return;
   Object.defineProperty(exports, key, {
     enumerable: true,
@@ -47,6 +87,7 @@ var _AttributeFormControlUrl = require("./attribute-form-control-url/AttributeFo
 
 Object.keys(_AttributeFormControlUrl).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
+  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
   if (key in exports && exports[key] === _AttributeFormControlUrl[key]) return;
   Object.defineProperty(exports, key, {
     enumerable: true,
@@ -60,6 +101,7 @@ var _ModelAttributeFormControl = require("./model-attribute-form-control/ModelAt
 
 Object.keys(_ModelAttributeFormControl).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
+  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
   if (key in exports && exports[key] === _ModelAttributeFormControl[key]) return;
   Object.defineProperty(exports, key, {
     enumerable: true,
@@ -73,6 +115,7 @@ var _structComponents = require("./struct-components");
 
 Object.keys(_structComponents).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
+  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
   if (key in exports && exports[key] === _structComponents[key]) return;
   Object.defineProperty(exports, key, {
     enumerable: true,
@@ -86,6 +129,7 @@ var _instanceListTable = require("./instance-list-table");
 
 Object.keys(_instanceListTable).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
+  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
   if (key in exports && exports[key] === _instanceListTable[key]) return;
   Object.defineProperty(exports, key, {
     enumerable: true,
@@ -99,6 +143,7 @@ var _InstanceListModal = require("./instance-list-modal/InstanceListModal");
 
 Object.keys(_InstanceListModal).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
+  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
   if (key in exports && exports[key] === _InstanceListModal[key]) return;
   Object.defineProperty(exports, key, {
     enumerable: true,
@@ -112,6 +157,7 @@ var _InstanceList = require("./instance-list/InstanceList");
 
 Object.keys(_InstanceList).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
+  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
   if (key in exports && exports[key] === _InstanceList[key]) return;
   Object.defineProperty(exports, key, {
     enumerable: true,
@@ -125,6 +171,7 @@ var _CmdbInstancesInputFormItem = require("./cmdb-instances-input-form/CmdbInsta
 
 Object.keys(_CmdbInstancesInputFormItem).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
+  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
   if (key in exports && exports[key] === _CmdbInstancesInputFormItem[key]) return;
   Object.defineProperty(exports, key, {
     enumerable: true,
@@ -138,6 +185,7 @@ var _CmdbInstancesSelectPanel = require("./cmdb-instances-select-panel/CmdbInsta
 
 Object.keys(_CmdbInstancesSelectPanel).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
+  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
   if (key in exports && exports[key] === _CmdbInstancesSelectPanel[key]) return;
   Object.defineProperty(exports, key, {
     enumerable: true,
@@ -151,6 +199,7 @@ var _InstanceDetail = require("./instance-detail/InstanceDetail");
 
 Object.keys(_InstanceDetail).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
+  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
   if (key in exports && exports[key] === _InstanceDetail[key]) return;
   Object.defineProperty(exports, key, {
     enumerable: true,
@@ -164,6 +213,7 @@ var _FloatDisplayBrick = require("./float-display-brick/FloatDisplayBrick");
 
 Object.keys(_FloatDisplayBrick).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
+  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
   if (key in exports && exports[key] === _FloatDisplayBrick[key]) return;
   Object.defineProperty(exports, key, {
     enumerable: true,
@@ -172,4 +222,6 @@ Object.keys(_FloatDisplayBrick).forEach(function (key) {
     }
   });
 });
+
+var _cmdbUtils = require("@next-libs/cmdb-utils");
 //# sourceMappingURL=index.js.map

package/dist/cjs/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/index.ts"],"names":[],"mappings":";;;;;;AAAA;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;;AACA;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;;AACA;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;;AACA;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;;AACA;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;;AACA;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;;AACA;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;;AACA;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;;AACA;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;;AACA;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;;AACA;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;;AACA;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;;AACA;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA","sourcesContent":["export * from \"./instance-attribute-form/InstanceAttributeForm\";\nexport * from \"./model-attribute-form/ModelAttributeForm\";\nexport * from \"./model-relation-form/ModelRelationForm\";\nexport * from \"./attribute-form-control-url/AttributeFormControlUrl\";\nexport * from \"./model-attribute-form-control/ModelAttributeFormControl\";\nexport * from \"./struct-components\";\nexport * from \"./instance-list-table\";\nexport * from \"./instance-list-modal/InstanceListModal\";\nexport * from \"./instance-list/InstanceList\";\nexport * from \"./cmdb-instances-input-form/CmdbInstancesInputFormItem\";\nexport * from \"./cmdb-instances-select-panel/CmdbInstancesSelectPanel\";\nexport * from \"./instance-detail/InstanceDetail\";\nexport * from \"./float-display-brick/FloatDisplayBrick\";\n"],"file":"index.js"}
+{"version":3,"sources":["../../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;;AACA;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;;AACA;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;;AACA;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;;AACA;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;;AACA;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;;AACA;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;;AACA;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;;AACA;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;;AACA;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;;AACA;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;;AACA;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;;AACA;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;;AAEA","sourcesContent":["export * from \"./instance-attribute-form/InstanceAttributeForm\";\nexport * from \"./model-attribute-form/ModelAttributeForm\";\nexport * from \"./model-relation-form/ModelRelationForm\";\nexport * from \"./attribute-form-control-url/AttributeFormControlUrl\";\nexport * from \"./model-attribute-form-control/ModelAttributeFormControl\";\nexport * from \"./struct-components\";\nexport * from \"./instance-list-table\";\nexport * from \"./instance-list-modal/InstanceListModal\";\nexport * from \"./instance-list/InstanceList\";\nexport * from \"./cmdb-instances-input-form/CmdbInstancesInputFormItem\";\nexport * from \"./cmdb-instances-select-panel/CmdbInstancesSelectPanel\";\nexport * from \"./instance-detail/InstanceDetail\";\nexport * from \"./float-display-brick/FloatDisplayBrick\";\n// For compatibility\nexport {\n  ComparisonOperators,\n  ElementOperators,\n  LogicalOperators,\n  Query,\n  QueryOperatorExpressions,\n} from \"@next-libs/cmdb-utils\";\n"],"file":"index.js"}

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

@@ -31,14 +31,14 @@ var _antd = require("antd");
 
 var _cmdbUtils = require("@next-libs/cmdb-utils");
 
+var _storage = require("@next-libs/storage");
+
 var _instanceListTable = require("../instance-list-table");
 
 var _InstanceListModule = _interopRequireDefault(require("./InstanceList.module.css"));
 
 var _constants2 = require("./constants");
 
-var _storage = require("@next-libs/storage");
-
 var _ModelAttributeFormControl = require("../model-attribute-form-control/ModelAttributeFormControl");
 
 var _IconButton = require("./IconButton");
@@ -144,7 +144,7 @@ function translateConditions(aq, idObjectMap, modelData, t) {
         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) {
+        if (Object.keys(value)[0] === _cmdbUtils.ElementOperators.Exists && attr.relationSideId) {
           const relationSideId = attr.relationSideId;
           attr = attrAndRelationList.find(attr => attr.id === `${relationSideId}.`) || attr;
         }
@@ -222,7 +222,7 @@ const initAqToShow = (aq, modelData, isToShow = true) => {
       const aqToShow = Object.entries(query).map(([key, expressions]) => {
         let newExpressions = [];
 
-        if (key === _instanceListTable.LogicalOperators.Or || key === _instanceListTable.LogicalOperators.And) {
+        if (key === _cmdbUtils.LogicalOperators.Or || key === _cmdbUtils.LogicalOperators.And) {
           const firstSubQuery = expressions[0];
           const fieldId = Object.keys(firstSubQuery)[0];
           const isStruct = isOfStruct(modelData, fieldId);
@@ -453,11 +453,11 @@ function InstanceList(props) {
     }
 
     if (!(0, _lodash.isEmpty)(state.aq)) {
-      query[_instanceListTable.LogicalOperators.And] = state.aq;
+      query[_cmdbUtils.LogicalOperators.And] = state.aq;
     }
 
     if (!(0, _lodash.isEmpty)(props.defaultQuery)) {
-      query[_instanceListTable.LogicalOperators.And] = [...(query[_instanceListTable.LogicalOperators.And] || []), ...props.defaultQuery];
+      query[_cmdbUtils.LogicalOperators.And] = [...(query[_cmdbUtils.LogicalOperators.And] || []), ...props.defaultQuery];
     }
 
     if (props.presetConfigs) {