npm - @next-libs/cmdb-instances - Versions diffs - 7.24.5 → 7.24.7 - Mend

@next-libs/cmdb-instances 7.24.5 → 7.24.7

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 (20) hide show

package/dist/cjs/instance-detail/components/instance-relation-table-show/instance-relation-table-show.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"instance-relation-table-show.js","names":["_react","_interopRequireWildcard","require","_cmdbUtils","_instanceListTable","_constants","_i18next","_interopRequireDefault","_lodash","_InstanceListTableModule","_dataProviders","_brickKit","reOrderAttrs","fields","fieldOrder","sortBy","field","index","indexOf","length","getRelationShowFields","defaultRelationFields","oppositeAttrList","attr_order","showFields","map","item","startsWith","slice","InstanceRelationTableShow","props","_oppositeModelData$vi","_oppositeModelData$vi2","modelDataMap","relationData","value","relationFieldUrlTemplate","paginationChange","total","relationTablePagination","externalSourceId","oppositeModelDataMap","setOppositeModelDataMap","useState","useEffect","fetchOppositeModelData","modelListData","fetchCmdbObjectRef","right_object_id","keyBy","data","catch","error","handleHttpError","instanceSourceQuery","setInstanceSourceQuery","modelData","left_object_id","oppositeModelData","modifyModelData","get","__id","fieldIds","attrList","attr","id","hideModelData","view","hide_columns","filter","includes","relation_list","left_id","right_id","default","createElement","style","display","InstanceListTable","detailUrlTemplates","hideRelationLink","idObjectMap","instanceListData","list","onInstanceSourceChange","instanceQuery","filterInstanceSourceDisabled","autoBreakLine","selectDisabled","sortDisabled","configProps","pagination","isPagination","showSizeChanger","pageSizeOptions","onChange","page","pageSize","showTotal","totals","className","styles","totalText","i18n","t","NS_LIBS_CMDB_INSTANCES","K","PAGINATION_TOTAL_TEXT","PAGINATION_TOTAL_UNIT","target","useExternalCmdbApi"],"sources":["../../../../../src/instance-detail/components/instance-relation-table-show/instance-relation-table-show.tsx"],"sourcesContent":["import React, { useEffect, useState } from \"react\";\nimport { Table } from \"antd\";\nimport {\n ModifiedModelObjectRelation,\n modifyModelData,\n} from \"@next-libs/cmdb-utils\";\nimport { CmdbModels } from \"@next-sdk/cmdb-sdk\";\nimport { InstanceListTable } from \"../../../instance-list-table\";\nimport { NS_LIBS_CMDB_INSTANCES, K } from \"../../../i18n/constants\";\nimport i18n from \"i18next\";\nimport { get, sortBy, keyBy } from \"lodash\";\nimport styles from \"../../../instance-list-table/InstanceListTable.module.css\";\nimport { fetchCmdbObjectRef } from \"../../../data-providers\";\nimport { handleHttpError } from \"@next-core/brick-kit\";\nexport interface InstanceRelationTableShowProps {\n modelDataMap: { [objectId: string]: CmdbModels.ModelCmdbObject };\n relationData: ModifiedModelObjectRelation;\n // eslint-disable-next-line @typescript-eslint/no-explicit-any\n value: any[];\n relationFieldUrlTemplate?: string;\n isPagination?: boolean;\n total?: number;\n relationTablePagination?: {\n current?: number;\n pageSize?: number;\n };\n paginationChange?: (\n page: number,\n pageSize: number,\n relationData: ModifiedModelObjectRelation\n ) => Promise<void> \| void;\n hideRelationLink?: boolean;\n onInstanceSourceChange?: (instanceSource: string) => void;\n filterInstanceSourceDisabled?: boolean;\n externalSourceId?: string;\n}\nexport function reOrderAttrs(fields: string[], fieldOrder: string[] = []) {\n return sortBy(fields, (field) => {\n const index = fieldOrder.indexOf(field);\n return index === -1 ? fields.length : index;\n });\n}\nexport function getRelationShowFields(\n defaultRelationFields: string[],\n oppositeAttrList: string[],\n attr_order: string[] = []\n) {\n let showFields = oppositeAttrList;\n if (defaultRelationFields?.length) {\n showFields = reOrderAttrs(\n defaultRelationFields.map((item: string) =>\n item.startsWith(\"#\") ? item.slice(1) : item\n ),\n attr_order\n );\n }\n return showFields;\n}\n//istanbul ignore next\nexport function InstanceRelationTableShow(\n props: InstanceRelationTableShowProps\n): React.ReactElement {\n const {\n modelDataMap,\n relationData,\n value,\n relationFieldUrlTemplate,\n paginationChange,\n total,\n relationTablePagination,\n externalSourceId,\n } = props;\n const [oppositeModelDataMap, setOppositeModelDataMap] = useState({});\n /*\n 实例详情中展示对端实例的关系时，需要重新拉取对端关系所关联的模型。\n * 如在主机详情中展示负责人所在的角色，需要拿到与USER相关的模型ROLE@ONEMODEL\n * 而原来的modelDataMap是与HOST相关的，可能不包括ROLE@ONEMODEL，就造成取不到角色的showKey\n */\n useEffect(() => {\n const fetchOppositeModelData = async () => {\n const modelListData = await fetchCmdbObjectRef(\n relationData.right_object_id,\n externalSourceId\n );\n setOppositeModelDataMap(keyBy(modelListData.data, \"objectId\"));\n };\n fetchOppositeModelData().catch((error) => {\n handleHttpError(error);\n });\n }, [relationData, externalSourceId]);\n const [instanceSourceQuery, setInstanceSourceQuery] = useState(null);\n const modelData = modelDataMap[relationData.left_object_id];\n let oppositeModelData = modifyModelData(\n modelDataMap[relationData.right_object_id]\n );\n // 如果指定了relation_default_attr，则取里面的字段\n const defaultRelationFields = get(modelData, [\n \"view\",\n \"relation_default_attr\",\n relationData.__id,\n ]);\n\n const fieldIds = getRelationShowFields(\n defaultRelationFields,\n oppositeModelData.attrList.map((attr) => attr.id),\n get(oppositeModelData, [\"view\", \"attr_order\"])\n );\n //过滤掉视图不可见字段\n const hideModelData = oppositeModelData.view?.hide_columns ?? [];\n oppositeModelData = {\n ...oppositeModelData,\n attrList: oppositeModelData.attrList.filter(\n (item: any) => !hideModelData.includes(item.id)\n ),\n relation_list: oppositeModelData.relation_list.filter(\n (item: any) =>\n !(\n (hideModelData.includes(item.left_id) &&\n item.left_object_id === props.relationData.right_object_id) \|\|\n (hideModelData.includes(item.right_id) &&\n item.right_object_id === props.relationData.right_object_id)\n )\n ),\n };\n\n return (\n <div style={{ display: \"grid\" }}>\n <InstanceListTable\n detailUrlTemplates={\n props.hideRelationLink\n ? null\n : {\n [relationData.right_object_id]:\n \"/next-cmdb-instance-management/next/#{objectId}/instance/#{instanceId}\",\n }\n }\n idObjectMap={oppositeModelDataMap}\n modelData={oppositeModelData}\n instanceListData={{\n list: value,\n }}\n onInstanceSourceChange={(instanceQuery: any) => {\n props.onInstanceSourceChange(instanceQuery);\n }}\n filterInstanceSourceDisabled={props.filterInstanceSourceDisabled}\n autoBreakLine={true}\n fieldIds={fieldIds}\n selectDisabled={true}\n sortDisabled={true}\n configProps={{\n pagination: props.isPagination\n ? {\n showSizeChanger: true,\n total: total,\n pageSizeOptions: [\"10\", \"20\", \"50\"],\n ...relationTablePagination,\n onChange: (page: number, pageSize: number) => {\n paginationChange(page, pageSize, relationData);\n },\n showTotal: (totals: number) => (\n <span className={styles.totalText}>\n {i18n.t(\n `${NS_LIBS_CMDB_INSTANCES}:${K.PAGINATION_TOTAL_TEXT}`\n )}{\" \"}\n <strong className={styles.total}>{totals}</strong>{\" \"}\n {i18n.t(\n `${NS_LIBS_CMDB_INSTANCES}:${K.PAGINATION_TOTAL_UNIT}`\n )}\n </span>\n ),\n }\n : false,\n }}\n target={\"_blank\"}\n externalSourceId={externalSourceId}\n useExternalCmdbApi={externalSourceId ? true : false}\n ></InstanceListTable>\n </div>\n );\n}\n"],"mappings":"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","ignoreList":[]}
1	+ {"version":3,"file":"instance-relation-table-show.js","names":["_react","_interopRequireWildcard","require","_cmdbUtils","_instanceListTable","_constants","_i18next","_interopRequireDefault","_lodash","_InstanceListTableModule","_dataProviders","_brickKit","reOrderAttrs","fields","fieldOrder","sortBy","field","index","indexOf","length","getRelationShowFields","defaultRelationFields","oppositeAttrList","attr_order","showFields","map","item","startsWith","slice","getHiddenColumns","data","oppositeModelData","relationData","relationGangedConfig","attrList","attr","id","left_max","rightObjectId","right_object_id","objectId","left_object_id","_head","attrData","head","rightControlAttrId","attrType","get","filter","o","isArray","nonIncludedControlFields","control","includes","InstanceRelationTableShow","props","_oppositeModelData$vi","_oppositeModelData$vi2","modelDataMap","value","relationFieldUrlTemplate","paginationChange","total","relationTablePagination","externalSourceId","oppositeModelDataMap","setOppositeModelDataMap","useState","useEffect","fetchOppositeModelData","modelListData","fetchCmdbObjectRef","keyBy","catch","error","handleHttpError","instanceSourceQuery","setInstanceSourceQuery","modelData","modifyModelData","__id","fieldIds","hideModelData","view","hide_columns","relation_list","left_id","right_id","hiddenColumns","default","createElement","style","display","InstanceListTable","detailUrlTemplates","hideRelationLink","idObjectMap","instanceListData","list","onInstanceSourceChange","instanceQuery","filterInstanceSourceDisabled","autoBreakLine","selectDisabled","sortDisabled","configProps","pagination","isPagination","showSizeChanger","pageSizeOptions","onChange","page","pageSize","showTotal","totals","className","styles","totalText","i18n","t","NS_LIBS_CMDB_INSTANCES","K","PAGINATION_TOTAL_TEXT","PAGINATION_TOTAL_UNIT","target","useExternalCmdbApi"],"sources":["../../../../../src/instance-detail/components/instance-relation-table-show/instance-relation-table-show.tsx"],"sourcesContent":["import React, { useEffect, useState } from \"react\";\nimport { Table } from \"antd\";\nimport {\n ModifiedModelObjectRelation,\n modifyModelData,\n} from \"@next-libs/cmdb-utils\";\nimport { CmdbModels } from \"@next-sdk/cmdb-sdk\";\nimport { InstanceListTable } from \"../../../instance-list-table\";\nimport { NS_LIBS_CMDB_INSTANCES, K } from \"../../../i18n/constants\";\nimport i18n from \"i18next\";\nimport { get, sortBy, keyBy, head, isArray, filter } from \"lodash\";\nimport styles from \"../../../instance-list-table/InstanceListTable.module.css\";\nimport { fetchCmdbObjectRef } from \"../../../data-providers\";\nimport { handleHttpError } from \"@next-core/brick-kit\";\nexport interface InstanceRelationTableShowProps {\n modelDataMap: { [objectId: string]: CmdbModels.ModelCmdbObject };\n relationData: ModifiedModelObjectRelation;\n // eslint-disable-next-line @typescript-eslint/no-explicit-any\n value: any[];\n relationFieldUrlTemplate?: string;\n isPagination?: boolean;\n total?: number;\n relationTablePagination?: {\n current?: number;\n pageSize?: number;\n };\n paginationChange?: (\n page: number,\n pageSize: number,\n relationData: ModifiedModelObjectRelation\n ) => Promise<void> \| void;\n hideRelationLink?: boolean;\n onInstanceSourceChange?: (instanceSource: string) => void;\n filterInstanceSourceDisabled?: boolean;\n externalSourceId?: string;\n relationGangedConfig?: Record<string, any>;\n}\nexport function reOrderAttrs(fields: string[], fieldOrder: string[] = []) {\n return sortBy(fields, (field) => {\n const index = fieldOrder.indexOf(field);\n return index === -1 ? fields.length : index;\n });\n}\nexport function getRelationShowFields(\n defaultRelationFields: string[],\n oppositeAttrList: string[],\n attr_order: string[] = []\n) {\n let showFields = oppositeAttrList;\n if (defaultRelationFields?.length) {\n showFields = reOrderAttrs(\n defaultRelationFields.map((item: string) =>\n item.startsWith(\"#\") ? item.slice(1) : item\n ),\n attr_order\n );\n }\n return showFields;\n}\n\nfunction getHiddenColumns(\n data: any[],\n oppositeModelData: any,\n relationData: ModifiedModelObjectRelation,\n relationGangedConfig?: Record<string, any>\n): string[] {\n const oppositeAttrList = oppositeModelData.attrList.map(\n (attr: any) => attr.id\n );\n if (\n relationGangedConfig &&\n relationData?.left_max === 1 &&\n relationGangedConfig?.rightObjectId === relationData?.right_object_id &&\n relationGangedConfig?.objectId === relationData?.left_object_id\n ) {\n const attrData = head(data)?.[relationGangedConfig?.rightControlAttrId];\n const attrType = get(\n filter(\n oppositeModelData.attrList,\n (o: any) => o.id === relationGangedConfig?.rightControlAttrId\n ),\n \"[0].value.type\"\n );\n if (attrData && attrType === \"arr\" && isArray(attrData)) {\n const nonIncludedControlFields = filter(\n relationGangedConfig?.control \|\| [],\n (attr: any) => !attrData.includes(attr)\n );\n return oppositeAttrList.filter((item: any) =>\n nonIncludedControlFields.includes(item)\n );\n }\n }\n\n return [];\n}\n//istanbul ignore next\nexport function InstanceRelationTableShow(\n props: InstanceRelationTableShowProps\n): React.ReactElement {\n const {\n modelDataMap,\n relationData,\n value,\n relationFieldUrlTemplate,\n paginationChange,\n total,\n relationTablePagination,\n externalSourceId,\n relationGangedConfig,\n } = props;\n const [oppositeModelDataMap, setOppositeModelDataMap] = useState({});\n /*\n 实例详情中展示对端实例的关系时，需要重新拉取对端关系所关联的模型。\n * 如在主机详情中展示负责人所在的角色，需要拿到与USER相关的模型ROLE@ONEMODEL\n * 而原来的modelDataMap是与HOST相关的，可能不包括ROLE@ONEMODEL，就造成取不到角色的showKey\n */\n useEffect(() => {\n const fetchOppositeModelData = async () => {\n const modelListData = await fetchCmdbObjectRef(\n relationData.right_object_id,\n externalSourceId\n );\n setOppositeModelDataMap(keyBy(modelListData.data, \"objectId\"));\n };\n fetchOppositeModelData().catch((error) => {\n handleHttpError(error);\n });\n }, [relationData, externalSourceId]);\n const [instanceSourceQuery, setInstanceSourceQuery] = useState(null);\n const modelData = modelDataMap[relationData.left_object_id];\n let oppositeModelData = modifyModelData(\n modelDataMap[relationData.right_object_id]\n );\n // 如果指定了relation_default_attr，则取里面的字段\n const defaultRelationFields = get(modelData, [\n \"view\",\n \"relation_default_attr\",\n relationData.__id,\n ]);\n\n const fieldIds = getRelationShowFields(\n defaultRelationFields,\n oppositeModelData.attrList.map((attr) => attr.id),\n get(oppositeModelData, [\"view\", \"attr_order\"])\n );\n //过滤掉视图不可见字段\n const hideModelData = oppositeModelData.view?.hide_columns ?? [];\n oppositeModelData = {\n ...oppositeModelData,\n attrList: oppositeModelData.attrList.filter(\n (item: any) => !hideModelData.includes(item.id)\n ),\n relation_list: oppositeModelData.relation_list.filter(\n (item: any) =>\n !(\n (hideModelData.includes(item.left_id) &&\n item.left_object_id === props.relationData.right_object_id) \|\|\n (hideModelData.includes(item.right_id) &&\n item.right_object_id === props.relationData.right_object_id)\n )\n ),\n };\n const hiddenColumns = getHiddenColumns(\n value,\n oppositeModelData,\n relationData,\n relationGangedConfig\n );\n\n return (\n <div style={{ display: \"grid\" }}>\n <InstanceListTable\n detailUrlTemplates={\n props.hideRelationLink\n ? null\n : {\n [relationData.right_object_id]:\n \"/next-cmdb-instance-management/next/#{objectId}/instance/#{instanceId}\",\n }\n }\n idObjectMap={oppositeModelDataMap}\n modelData={oppositeModelData}\n instanceListData={{\n list: value,\n }}\n onInstanceSourceChange={(instanceQuery: any) => {\n props.onInstanceSourceChange(instanceQuery);\n }}\n filterInstanceSourceDisabled={props.filterInstanceSourceDisabled}\n autoBreakLine={true}\n fieldIds={fieldIds}\n selectDisabled={true}\n sortDisabled={true}\n configProps={{\n pagination: props.isPagination\n ? {\n showSizeChanger: true,\n total: total,\n pageSizeOptions: [\"10\", \"20\", \"50\"],\n ...relationTablePagination,\n onChange: (page: number, pageSize: number) => {\n paginationChange(page, pageSize, relationData);\n },\n showTotal: (totals: number) => (\n <span className={styles.totalText}>\n {i18n.t(\n `${NS_LIBS_CMDB_INSTANCES}:${K.PAGINATION_TOTAL_TEXT}`\n )}{\" \"}\n <strong className={styles.total}>{totals}</strong>{\" \"}\n {i18n.t(\n `${NS_LIBS_CMDB_INSTANCES}:${K.PAGINATION_TOTAL_UNIT}`\n )}\n </span>\n ),\n }\n : false,\n }}\n target={\"_blank\"}\n externalSourceId={externalSourceId}\n useExternalCmdbApi={externalSourceId ? true : false}\n hiddenColumns={hiddenColumns}\n ></InstanceListTable>\n </div>\n );\n}\n"],"mappings":"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","ignoreList":[]}

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

@@ -199,7 +199,7 @@ function translateConditions(aq, idObjectMap, modelData, t) {
         }
         if (attr) {
           query = (0, _processors.changeQueryWithCustomRules)(modelData.objectId, attr.id, query);
-          const info = (0, _instanceListTable.getFieldConditionsAndValues)(query, key, attr.value.type, undefined, undefined, modelData.objectId, attr.id);
+          const info = (0, _instanceListTable.getFieldConditionsAndValues)(query, key, attr.value.type, undefined, undefined, modelData.objectId, attr.id, attr.value.mode);
           if (![_instanceListTable.ConditionType.Between, _instanceListTable.ConditionType.Empty, _instanceListTable.ConditionType.NotEmpty, _instanceListTable.ConditionType.False, _instanceListTable.ConditionType.True].includes(info.currentCondition.type)) {
             info.values = info.values.map(v => (0, _lodash.isString)(v) && v.includes(" ") ? v.replace(/^"+|"+$/g, "") : v);
           }