npm - @next-libs/cmdb-instances - Versions diffs - 6.17.2 → 6.18.3 - Mend

@next-libs/cmdb-instances 6.17.2 → 6.18.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (21) hide show

package/dist/esm/cmdb-instances-select-panel/CmdbInstancesSelectPanel.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"sources":["../../../src/cmdb-instances-select-panel/CmdbInstancesSelectPanel.tsx"],"names":["React","useState","useEffect","classnames","InstanceApi_postSearch","InstanceListTable","InstanceListModal","modifyModelData","style","i18n","K","NS_LIBS_CMDB_INSTANCES","CmdbInstancesSelectPanel","props","ref","modelData","objectMap","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","fetchInstances","instanceIdList","instances","length","query","instanceId","$in","page","page_size","fields","list","initInstances","value","isOperate","slice","onFetchedInstances","openAddInstancesModal","closeAddInstancesModal","openAllSelectedInstancesModal","closeAllSelectedInstancesModal","handleInstancesSelected","selectedKeys","onChange","fieldIds","map","attr","showPreview","cs","selectedInstancesTableWrapper","withPreview","wrapper","modalTitle","t","FILTER_FROM_CMDB","name","instance","singleSelect","instanceQuery","addInstancesModalPageSize","showSizeChanger","pageSizeOptions","VIEW_ALL_SELECTED_INSTANCES","addButton","marginBottom","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 { CmdbModels, InstanceApi_postSearch } from \"@next-sdk/cmdb-sdk\";\nimport { InstanceListTable } from \"../instance-list-table\";\nimport { InstanceListModal } from \"../instance-list-modal/InstanceListModal\";\nimport { modifyModelData } from \"@next-libs/cmdb-utils\";\nimport style from \"./style.module.css\";\nimport i18n from \"i18next\";\nimport { K, NS_LIBS_CMDB_INSTANCES } from \"../i18n/constants\";\n\nexport interface CmdbInstancesSelectPanelProps {\n objectMap: { [key: string]: 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}\n\nexport function CmdbInstancesSelectPanel(\n props: CmdbInstancesSelectPanelProps,\n ref: any\n): React.ReactElement {\n let modelData = props.objectMap[props.objectId];\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\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 }, [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\n return (\n <div className={style.wrapper} ref={ref}>\n <InstanceListModal\n objectMap={props.objectMap}\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: props.instanceQuery,\n fieldIds: props.fields,\n }}\n pageSize={props.addInstancesModalPageSize}\n showSizeChanger={props.showSizeChanger}\n pageSizeOptions={props.pageSizeOptions}\n />\n <InstanceListModal\n objectMap={props.objectMap}\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 <a\n className={style.addButton}\n onClick={openAddInstancesModal}\n style={{ marginBottom: \"12px\" }}\n >\n {props.addTitle ??\n i18n.t(`${NS_LIBS_CMDB_INSTANCES}:${K.CHOOSE_INSTANCE}`)}\n </a>\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={props.objectMap}\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"}
1	+ {"version":3,"sources":["../../../src/cmdb-instances-select-panel/CmdbInstancesSelectPanel.tsx"],"names":["React","useState","useEffect","classnames","InstanceApi_postSearch","InstanceListTable","InstanceListModal","modifyModelData","style","i18n","K","NS_LIBS_CMDB_INSTANCES","CmdbInstancesSelectPanel","props","ref","modelData","objectMap","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","fetchInstances","instanceIdList","instances","length","query","instanceId","$in","page","page_size","fields","list","initInstances","value","isOperate","slice","onFetchedInstances","openAddInstancesModal","closeAddInstancesModal","openAllSelectedInstancesModal","closeAllSelectedInstancesModal","handleInstancesSelected","selectedKeys","onChange","fieldIds","map","attr","showPreview","cs","selectedInstancesTableWrapper","withPreview","relation","relationLimit","right_max","$size","$lt","instanceQuery","wrapper","modalTitle","t","FILTER_FROM_CMDB","name","instance","singleSelect","addInstancesModalPageSize","showSizeChanger","pageSizeOptions","VIEW_ALL_SELECTED_INSTANCES","addButton","marginBottom","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 { CmdbModels, InstanceApi_postSearch } 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\";\n\nexport interface CmdbInstancesSelectPanelProps {\n objectMap: { [key: string]: 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}\n\nexport function CmdbInstancesSelectPanel(\n props: CmdbInstancesSelectPanelProps,\n ref: any\n): React.ReactElement {\n let modelData = props.objectMap[props.objectId];\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\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 }, [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={props.objectMap}\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 />\n <InstanceListModal\n objectMap={props.objectMap}\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 <a\n className={style.addButton}\n onClick={openAddInstancesModal}\n style={{ marginBottom: \"12px\" }}\n >\n {props.addTitle ??\n i18n.t(`${NS_LIBS_CMDB_INSTANCES}:${K.CHOOSE_INSTANCE}`)}\n </a>\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={props.objectMap}\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/esm/instance-detail/index.module.css CHANGED Viewed

@@ -4,8 +4,8 @@
 .detailCard .basicInfoGroupLabel {
   display: inline-block;
   height: 26px;
-  background: #f5f5f5;
-  color: #333;
+  background: var(--cmdb-instance-detail-group-label-bg, #f5f5f5);
+  color: var(--cmdb-instance-detail-group-label-color, #333);
   margin: 8px 5px;
   border-radius: 13px;
   line-height: 26px;
@@ -17,8 +17,8 @@
   text-decoration: none;
 }
 .detailCard .basicInfoGroupLabel.active {
-  background: #167be0;
-  color: #fff;
+  background: var(--cmdb-instance-detail-group-label-active-bg, #167be0);
+  color: var(--cmdb-instance-detail-group-label-active-color, #fff);
 }
 .detailCard h6 {
   line-height: 20px;
@@ -32,7 +32,7 @@
   padding: 0 0 12px 0;
   font-size: 14px;
   font-weight: bold;
-  color: #404143;
+  color: var(--cmdb-instance-detail-description-group-color, #404143);
   grid-column: 1 / 5;
 }
 .detailCard dl {
@@ -43,7 +43,10 @@
   margin-bottom: 0;
 }
 .detailCard dt {
-  color: rgba(0, 0, 0, 0.65);
+  color: var(
+    --cmdb-instance-detail-detail-description-item-label,
+    rgba(0, 0, 0, 0.65)
+  );
   font-weight: normal;
   text-align: right;
 }
@@ -59,7 +62,10 @@
 .detailCard dd {
   margin-bottom: 0;
   word-break: break-all;
-  color: rgba(0, 0, 0, 0.85);
+  color: var(
+    --cmdb-instance-detail-detail-description-item-content,
+    rgba(0, 0, 0, 0.85)
+  );
 }
 .detailCard dd .structAttr:nth-of-type(2n + 1) {
   grid-column: 2;

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

@@ -2,7 +2,7 @@ import _extends from "@babel/runtime/helpers/extends";
 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, omit } from "lodash";
+import { difference, isEmpty, isEqual, isString, map, uniq, union, filter, reject, sortBy, uniqueId, findIndex, find, startsWith, compact, omit, keyBy } from "lodash";
 import { BrickAsComponent, handleHttpError } from "@next-core/brick-kit";
 import i18n from "i18next";
 import { K, NS_LIBS_CMDB_INSTANCES } from "../i18n/constants";
@@ -14,6 +14,7 @@ import { ConditionType, LogicalOperators, AdvancedSearch, getFieldConditionsAndV
 import styles from "./InstanceList.module.css";
 import { extraFieldAttrs } from "./constants";
 import { JsonStorage } from "@next-libs/storage";
+import { ModelAttributeValueType } from "../model-attribute-form-control/ModelAttributeFormControl";
 import { IconButton } from "./IconButton";
 import { changeQueryWithCustomRules } from "../processors";
 export function getQuery(modelData, idObjectMap, q, fields, onlySearchByIp) {
@@ -178,7 +179,15 @@ var isOfStruct = (modelData, fieldId) => {
   return structFields.includes(fieldId);
 };
-export var initAqToShow = (aq, modelData) => {
+var isOfBoolean = (attrList, fieldId) => {
+  var _keyAttrMap$fieldId;
+  var keyAttrMap = keyBy(attrList, "id");
+  return ((_keyAttrMap$fieldId = keyAttrMap[fieldId]) === null || _keyAttrMap$fieldId === void 0 ? void 0 : _keyAttrMap$fieldId.value.type) === ModelAttributeValueType.BOOLEAN;
+};
+export var initAqToShow = function (aq, modelData) {
+  var isToShow = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : true;
   var newAqToShow = [];
   if (aq) {
@@ -191,13 +200,29 @@ export var initAqToShow = (aq, modelData) => {
           var firstSubQuery = expressions[0];
           var _fieldId = Object.keys(firstSubQuery)[0];
           var isStruct = isOfStruct(modelData, _fieldId);
+          var isBool = isOfBoolean(modelData.attrList, _fieldId);
           var structQueries = expressions.filter(expression => Object.keys(expression)[0] === _fieldId);
-          if (isStruct) {
+          if (isStruct && isToShow) {
             var structExpressions = structQueries.map(item => ({
               [_fieldId.split(".")[0]]: item[_fieldId]
             }));
             newExpressions = [...newExpressions, ...structExpressions];
+          } else if (isBool && !isToShow) {
+            var boolExpressions = expressions.map(expression => {
+              var targetValue = expression[_fieldId];
+              if (typeof Object.values(targetValue)[0] === "string") {
+                return {
+                  [_fieldId]: {
+                    [Object.keys(targetValue)[0]]: Object.values(targetValue)[0] === "true" ? true : false
+                  }
+                };
+              } else {
+                return expression;
+              }
+            });
+            newExpressions = [...newExpressions, ...boolExpressions];
           } else {
             newExpressions = [...newExpressions, ...expressions];
           }
@@ -338,7 +363,7 @@ export function InstanceList(props) {
     return {
       objectId: props.objectId,
       q: props.q,
-      aq: props.aq,
+      aq: initAqToShow(props.aq, modelData, false),
       aqToShow: props.aqToShow || initAqToShow(props.aq, modelData),
       instanceSourceQuery: props.instanceSourceQuery,
       asc: props.asc,
@@ -412,7 +437,7 @@ export function InstanceList(props) {
       if (props.presetConfigs) {
         if (!isEmpty(props.presetConfigs.query)) {
-          if (query) {
+          if (Object.keys(query).length) {
             query = {
               $and: [query, props.presetConfigs.query]
             };
@@ -795,7 +820,9 @@ export function InstanceList(props) {
   }, [props.notifyCurrentFields]); // istanbul ignore next
   useEffect(() => {
-    props.selectedRowKeys && _asyncToGenerator(function* () {
+    var _props$selectedRowKey3;
+    ((_props$selectedRowKey3 = props.selectedRowKeys) === null || _props$selectedRowKey3 === void 0 ? void 0 : _props$selectedRowKey3.length) && _asyncToGenerator(function* () {
       var data = {};
       var v3Data = {
         fields: ["instanceId"]