Skip to content
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

🐛 fix: color bug #97

Merged
merged 2 commits into from
Mar 31, 2024
Merged

🐛 fix: color bug #97

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6cc17cf
:bug: fix: color bug
Mar 31, 2024
9a7e41b
:bug: fix: rm color
Mar 31, 2024
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
4 changes: 2 additions & 2 deletions docs/caseShow/demos/pipeline/taskPipeline/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ import { Background, FlowView, applyEdgeChanges, applyNodeChanges } from '@ant-d
import { useCallback, useState } from 'react';
import { edges, nodes } from './data';
import StageNode from './nodes/stageNode';
import taskNode from './nodes/taskNode';
import TaskNode from './nodes/taskNode';
import useStyles from './styled';

const nodeTypes = { taskNode, StageNode };
const nodeTypes = { TaskNode, StageNode };

function App() {
const { styles } = useStyles();
Expand Down
7 changes: 3 additions & 4 deletions docs/caseShow/demos/pipeline/taskPipeline/nodes/taskContent.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import { green, red } from '@ant-design/colors';
import { CheckCircleFilled, ClockCircleFilled, CloseCircleFilled } from '@ant-design/icons';
import useStyles from './styled';

Expand All @@ -8,23 +7,23 @@ export const TaskContent = () => {
return (
<ul className={styles.taskContent}>
<li>
<CheckCircleFilled style={{ color: green[5], fontSize: 14 }} />
<CheckCircleFilled style={{ color: '#008000', fontSize: 14 }} />
<div>
<span>七尼尼 已完成</span>
<span>43s</span>
</div>
</li>
<li />
<li>
<CheckCircleFilled style={{ color: green[5], fontSize: 14 }} />
<CheckCircleFilled style={{ color: '#008000', fontSize: 14 }} />
<div>
<span>lydon 已完成</span>
<span>43s</span>
</div>
</li>
<li />
<li>
<CloseCircleFilled style={{ color: red[5], fontSize: 14 }} />
<CloseCircleFilled style={{ color: '#ff4000', fontSize: 14 }} />
<div>
<span>青霓 审批不通过</span>
<span>43s</span>
Expand Down
3 changes: 1 addition & 2 deletions docs/caseShow/demos/pipeline/taskPipeline/nodes/taskNode.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import { green } from '@ant-design/colors';
import { CheckCircleFilled } from '@ant-design/icons';
import { Handle, Position } from '@ant-design/pro-flow';
import { useState } from 'react';
Expand Down Expand Up @@ -35,7 +34,7 @@ const TaskNode = (props: { data: TaskNodeC }) => {
className={styles.taskNode}
style={{ justifyContent: `${data.children ? 'space-between' : 'flex-start'}` }}
>
<CheckCircleFilled style={{ color: green[5], fontSize: 14 }} />
<CheckCircleFilled style={{ color: '#008000', fontSize: 14 }} />
<div className="title">{data.title}</div>
{data.children && (
<div
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@ant-design/pro-flow",
"version": "1.3.4",
"version": "1.3.6",
"description": "A React based Flow components",
"keywords": [
"flow",
Expand Down
Loading