Skip to content

chore(cmdb-instances): 实例详情的url需要支持跳转 #221

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+39 −20
Open

chore(cmdb-instances): 实例详情的url需要支持跳转 #221

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions libs/cmdb-instances/src/instance-detail/InstanceDetail.spec.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,16 @@ describe("InstanceDetail", () => {

expect(instance.isStruct({})).toBeFalsy();
});
it("tests isUrl", () => {
expect(
instance.isUrl({
id: 'url',
name:'URL'
})
).toBeTruthy();

expect(instance.isUrl({})).toBeFalsy();
});

it("tests isSpecialDisplayField", () => {
let data = {
Expand Down
49 changes: 29 additions & 20 deletions libs/cmdb-instances/src/instance-detail/InstanceDetail.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ import {
} from "./constants";
import { isArray } from "util";
import { UseBrickConf } from "@next-core/brick-types";
import { CmdbUrlLink } from "../cmdb-url-link/CmdbUrlLink";

export interface AttrCustomConfigs {
[attrId: string]: LegacyCustomComponent;
Expand Down Expand Up @@ -327,9 +328,9 @@ export class LegacyInstanceDetail extends React.Component<
this.props.isRelationInstanceDetail &&
attr?.tag?.[0] === BASIC_INFO &&
index ===
basicInfoGroup.attrList.findIndex(
(r: any) => !r.__isRelation
)
basicInfoGroup.attrList.findIndex(
(r: any) => !r.__isRelation
)
) {
return this.getAttrListNode(attr, true);
}
Expand Down Expand Up @@ -368,7 +369,7 @@ export class LegacyInstanceDetail extends React.Component<

// istanbul ignore next
getAttrListNode(attr: any, linkFlag?: boolean): React.ReactNode {
const { isStruct, isStructs, isRelation, isMarkdownField } = this;
const { isStruct, isStructs, isRelation, isMarkdownField, isUrl } = this;
const { modelDataMap, modelData, instanceData } = this.state;
let config;
let isComponentMode = false;
Expand Down Expand Up @@ -403,11 +404,11 @@ export class LegacyInstanceDetail extends React.Component<
<dt
className={
isStruct(attr) ||
isStructs(attr) ||
isRelation(attr) ||
attr.__isRelation ||
isMarkdownField(attr) ||
(config && config.isWholeLine)
isStructs(attr) ||
isRelation(attr) ||
attr.__isRelation ||
isMarkdownField(attr) ||
(config && config.isWholeLine)
? style.structAttr
: style.basicAttr
}
Expand All @@ -418,24 +419,29 @@ export class LegacyInstanceDetail extends React.Component<
<dd
className={
isStruct(attr) ||
isStructs(attr) ||
isRelation(attr) ||
attr.__isRelation ||
isMarkdownField(attr) ||
(config && config.isWholeLine)
isStructs(attr) ||
isRelation(attr) ||
attr.__isRelation ||
isMarkdownField(attr) ||
(config && config.isWholeLine)
? style.structAttr
: style.basicAttr
}
>
{/* istanbul ignore next */}
{isMarkdownField(attr) && (
{isUrl(attr) && (
<CmdbUrlLink
linkStr={"[百度](http://www.baidu.com)"}
/>
)}
{isMarkdownField(attr) && !isUrl(attr) && (
<div
dangerouslySetInnerHTML={{
__html: DOMPurify.sanitize(marked(instanceData[attr.id] || "")),
}}
></div>
)}
{attr.__isRelation && (
{attr.__isRelation && !isUrl(attr) && (
<InstanceRelationTableShow
modelDataMap={modelDataMap}
relationData={attr}
Expand All @@ -446,7 +452,7 @@ export class LegacyInstanceDetail extends React.Component<
{!isStructs(attr) &&
!isStruct(attr) &&
!isRelation(attr) &&
isComponentMode &&
isComponentMode && !isUrl(attr) &&
(attrCustomConfig.useBrick ? (
<BrickAsComponent
useBrick={attrCustomConfig.useBrick}
Expand All @@ -469,7 +475,7 @@ export class LegacyInstanceDetail extends React.Component<
!isStruct(attr) &&
!isRelation(attr) &&
!isMarkdownField(attr) &&
!isComponentMode &&
!isComponentMode && !isUrl(attr) &&
(linkFlag ? (
<Link
to={`/next-cmdb-instance-management/next/${instanceData._object_id}/instance/${instanceData.instanceId}`}
Expand All @@ -488,15 +494,15 @@ export class LegacyInstanceDetail extends React.Component<
attrData={instanceData[attr.id]}
/>
))}
{isStruct(attr) && instanceData[attr.id] && (
{isStruct(attr) && instanceData[attr.id] && !isUrl(attr) && (
<StructTable
isLegacy={true}
attribute={attr}
structData={instanceData[attr.id]}
isEditable={false}
/>
)}
{isStructs(attr) && instanceData[attr.id] && (
{isStructs(attr) && instanceData[attr.id] && !isUrl(attr) && (
<StructTable
attribute={attr}
structData={instanceData[attr.id]}
Expand Down Expand Up @@ -726,6 +732,9 @@ export class LegacyInstanceDetail extends React.Component<
isStructs(attr: any) {
return attr.value?.type === "structs";
}
isUrl(attr: any) {
return attr.id === "url" && attr.name === "URL";
}

isRelation(attr: any) {
return attr.value?.type === "FK" || attr.value?.type === "FKs";
Expand Down