Skip to content

B
bkunyun
Commit e980fa8b authored by chenshouchao's avatar chenshouchao
Browse files
Options

feat: icon替换

parent 2397305a
Hide whitespace changes
Inline Side-by-side
Showing with 55 additions and 157 deletions
src/assets/project/card.svg deleted 100644 → 0
View file @ 2397305a
<?xml version="1.0" encoding="UTF-8"?>
<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<title>编组 8备份 5</title>
<g id="上线UI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="1.Base基础/Icon图标/图表排序">
<rect id="矩形" x="0" y="0" width="16" height="16"></rect>
<g id="编组-4" transform="translate(1.000000, 1.000000)">
<rect id="矩形" stroke="#8A9099" stroke-width="1.5" x="0.75" y="0.75" width="12.5" height="12.5" rx="1"></rect>
<rect id="矩形备份-3" fill="#8A9099" x="3" y="3" width="3.25" height="3.25"></rect>
<rect id="矩形备份-7" fill="#8A9099" x="3" y="7.75" width="3.25" height="3.25"></rect>
<rect id="矩形备份-4" fill="#8A9099" x="7.75" y="3" width="3.25" height="3.25"></rect>
<rect id="矩形备份-9" fill="#8A9099" x="7.75" y="7.75" width="3.25" height="3.25"></rect>
</g>
</g>
</g>
</svg>
\ No newline at end of file
src/assets/project/cardActive.svg deleted 100644 → 0
View file @ 2397305a
<?xml version="1.0" encoding="UTF-8"?>
<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<title>1.Base基础/Icon图标/图表排序备份</title>
<g id="上线UI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="1.Base基础/Icon图标/图表排序备份">
<rect id="矩形" x="0" y="0" width="16" height="16"></rect>
<g id="编组-4" transform="translate(1.000000, 1.000000)">
<rect id="矩形" stroke="#1370FF" stroke-width="1.5" x="0.75" y="0.75" width="12.5" height="12.5" rx="1"></rect>
<rect id="矩形备份-3" fill="#1370FF" x="3" y="3" width="3.25" height="3.25"></rect>
<rect id="矩形备份-7" fill="#1370FF" x="3" y="7.75" width="3.25" height="3.25"></rect>
<rect id="矩形备份-4" fill="#1370FF" x="7.75" y="3" width="3.25" height="3.25"></rect>
<rect id="矩形备份-9" fill="#1370FF" x="7.75" y="7.75" width="3.25" height="3.25"></rect>
</g>
</g>
</g>
</svg>
\ No newline at end of file
src/assets/project/delete.svg deleted 100644 → 0
View file @ 2397305a
<?xml version="1.0" encoding="UTF-8"?>
<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<title>编组 58备份 7</title>
<g id="上线UI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="编组-58备份-7">
<rect id="矩形" x="0" y="0" width="16" height="16"></rect>
<g id="编组-50" transform="translate(1.000000, 1.605109)" stroke="#C2C6CC" stroke-width="1.5">
<line x1="0" y1="2.39431484" x2="14" y2="2.39431484" id="路径-16"></line>
<path d="M3.37934347,2.39431484 L3.37934347,1 C3.37934347,0.44771525 3.82705872,1.01453063e-16 4.37934347,0 L9.63329305,0 C10.1855778,-1.01453063e-16 10.6332931,0.44771525 10.6332931,1 L10.6332931,2.39431484 L10.6332931,2.39431484" id="路径-17"></path>
<path d="M2.45321216,3.89402686 L2.45321216,11.9292428 C2.45321216,12.4815275 2.90092741,12.9292428 3.45321216,12.9292428 L10.4872657,12.9292428 C11.0395505,12.9292428 11.4872657,12.4815275 11.4872657,11.9292428 L11.4872657,3.89402686 L11.4872657,3.89402686" id="路径-20"></path>
<line x1="5.49894415" y1="3.89402686" x2="5.49894415" y2="10.3954667" id="路径-21"></line>
<line x1="8.49836822" y1="3.89402686" x2="8.49836822" y2="10.3954667" id="路径-22"></line>
</g>
</g>
</g>
</svg>
\ No newline at end of file
src/assets/project/filter.svg deleted 100644 → 0
View file @ 2397305a
<?xml version="1.0" encoding="UTF-8"?>
<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<title>1.Base基础/Icon图标/筛选备份</title>
<g id="上线UI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="1.Base基础/Icon图标/筛选备份">
<rect id="矩形" x="0" y="0" width="16" height="16"></rect>
<g id="编组" transform="translate(1.780000, 2.250000)" stroke="#565C66" stroke-linejoin="round" stroke-width="1.5">
<polygon id="路径-37" points="0 0 12.4359884 0 7.73913801 5.73968697 7.73913801 12 4.97439538 10.7631496 4.97439538 5.85023682"></polygon>
</g>
</g>
</g>
</svg>
\ No newline at end of file
src/assets/project/refresh.svg deleted 100644 → 0
View file @ 2397305a
<?xml version="1.0" encoding="UTF-8"?>
<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<title>刷新备份</title>
<g id="上线UI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="刷新备份">
<rect id="矩形" x="0" y="0" width="16" height="16"></rect>
<path d="M14.1034483,5.0750097 L12.3103448,6.87501758 C11.862069,4.9250128 10.0689767,3.42499873 7.97701897,3.42499873 C5.51150172,3.42499873 3.49426034,5.45000759 3.49426034,7.92501842 C3.49426034,10.3999842 5.51150172,12.4249931 7.97701897,12.4249931 C10.3678534,12.4249931 12.3850948,10.5500599 12.4597328,8.15001941 L13.8045603,6.8000135 C13.8793103,7.17501139 13.9540603,7.55002053 13.9540603,8.0000225 C13.9540603,11.2999882 11.2644052,14 7.97701897,14 C4.68965517,14 2,11.2999882 2,8.0000225 C2,4.70001181 4.68965517,2 7.97701897,2 C9.91954397,2 11.712681,2.97499677 12.7586207,4.40000675 L12.9080086,4.17500577 L15,4.17500577 L14.1034483,5.0750097 Z" id="路径" fill="#8A9099"></path>
</g>
</g>
</svg>
\ No newline at end of file
src/assets/project/table.svg deleted 100644 → 0
View file @ 2397305a
<?xml version="1.0" encoding="UTF-8"?>
<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<title>1.Base基础/Icon图标/列表排序备份</title>
<g id="上线UI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="1.Base基础/Icon图标/列表排序备份">
<rect id="矩形" x="0" y="0" width="16" height="16"></rect>
<g id="编组-4" transform="translate(1.000000, 1.000000)">
<rect id="矩形" stroke="#8A9099" stroke-width="1.5" x="0.75" y="0.75" width="12.5" height="12.5" rx="1"></rect>
<rect id="矩形" fill="#8A9099" x="3" y="3" width="8" height="1.5"></rect>
<rect id="矩形备份-10" fill="#8A9099" x="3" y="6.25" width="8" height="1.5"></rect>
<rect id="矩形备份-11" fill="#8A9099" x="3" y="9.5" width="8" height="1.5"></rect>
</g>
</g>
</g>
</svg>
\ No newline at end of file
src/assets/project/tableActive.svg deleted 100644 → 0
View file @ 2397305a
<?xml version="1.0" encoding="UTF-8"?>
<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<title>1.Base基础/Icon图标/列表排序备份 2</title>
<g id="上线UI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="1.Base基础/Icon图标/列表排序备份">
<rect id="矩形" x="0" y="0" width="16" height="16"></rect>
<g id="编组-4" transform="translate(1.000000, 1.000000)">
<rect id="矩形" stroke="#1370FF" stroke-width="1.5" x="0.75" y="0.75" width="12.5" height="12.5" rx="1"></rect>
<rect id="矩形" fill="#1370FF" x="3" y="3" width="8" height="1.5"></rect>
<rect id="矩形备份-10" fill="#1370FF" x="3" y="6.25" width="8" height="1.5"></rect>
<rect id="矩形备份-11" fill="#1370FF" x="3" y="9.5" width="8" height="1.5"></rect>
</g>
</g>
</g>
</svg>
\ No newline at end of file
src/components/BusinessComponents/SearchInput/index.tsx
View file @ e980fa8b
...@@ -8,7 +8,6 @@ ...@@ -8,7 +8,6 @@
*/ */
import OutlinedInput, { OutlinedInputProps } from "@mui/material/OutlinedInput"; import OutlinedInput, { OutlinedInputProps } from "@mui/material/OutlinedInput";
import { ThemeProvider, createTheme } from "@mui/material/styles"; import { ThemeProvider, createTheme } from "@mui/material/styles";
import SearchIcon from "@mui/icons-material/Search";
// 使用该搜索框组件时，width、height、font-size等样式属性可以在组件sx属性中覆盖掉当前组件内的样式 // 使用该搜索框组件时，width、height、font-size等样式属性可以在组件sx属性中覆盖掉当前组件内的样式
// 该组件默认搜索框高度为32px，宽度和容器一致，字体大小14px // 该组件默认搜索框高度为32px，宽度和容器一致，字体大小14px
...@@ -37,7 +36,7 @@ const SearchInput = (props: SearchInputProps) => { ...@@ -37,7 +36,7 @@ const SearchInput = (props: SearchInputProps) => {
root: { root: {
height: "32px", height: "32px",
fontSize: "14px", fontSize: "14px",
paddingRight: "8px", paddingRight: "12px",
"&.Mui-focused .MuiOutlinedInput-notchedOutline": { "&.Mui-focused .MuiOutlinedInput-notchedOutline": {
borderWidth: "1px", borderWidth: "1px",
}, },
...@@ -65,7 +64,10 @@ const SearchInput = (props: SearchInputProps) => { ...@@ -65,7 +64,10 @@ const SearchInput = (props: SearchInputProps) => {
size={size} size={size}
placeholder={placeholder} placeholder={placeholder}
fullWidth={fullWidth} fullWidth={fullWidth}
endAdornment={<SearchIcon style={{ color: "#8A9099", fontSize: "22px" }} />} endAdornment={<span
style={{ fontSize: "16px", color: "rgba(153, 153, 153, 1)" }}
className="iconfont icon-sousuo"
></span>}
{...other} {...other}
/> />
</ThemeProvider> </ThemeProvider>
......
src/views/Project/ProjectData/SeeDataset/index.module.css
View file @ e980fa8b
...@@ -71,20 +71,18 @@ ...@@ -71,20 +71,18 @@
} }
.deleteIcon { .deleteIcon {
cursor: pointer; cursor: pointer;
width: 16px; font-size: 16px;
height: 16px; color: rgba(151, 151, 151, 1);
background-image: url(../../../../assets/project/delete.svg);
background-repeat: no-repeat;
} }
.deleteIcon:hover { .deleteIcon:hover {
background-image: url(../../../../assets/project/deleteHover.svg); color: rgba(30, 38, 51, 1);
} }
.deleteIconDisabled { .deleteIconDisabled {
background-image: url(../../../../assets/project/deleteDisable.svg); color: rgba(151, 151, 151, 0.5);
cursor: not-allowed; cursor: not-allowed;
} }
.deleteIconDisabled:hover { .deleteIconDisabled:hover {
background-image: url(../../../../assets/project/deleteDisable.svg); color: rgba(151, 151, 151, 0.5);
} }
.searchTop { .searchTop {
margin-bottom: 12px; margin-bottom: 12px;
......
src/views/Project/ProjectData/SeeDataset/index.tsx
View file @ e980fa8b
...@@ -14,12 +14,6 @@ import Save from "./components/Save"; ...@@ -14,12 +14,6 @@ import Save from "./components/Save";
import Download from "./components/Download"; import Download from "./components/Download";
import DatasetCardTable from "./components/DatasetCardTable"; import DatasetCardTable from "./components/DatasetCardTable";
import DatasetTable from "./components/DatasetTable"; import DatasetTable from "./components/DatasetTable";
import table from "@/assets/project/table.svg";
import tableActive from "@/assets/project/tableActive.svg";
import card from "@/assets/project/card.svg";
import cardActive from "@/assets/project/cardActive.svg";
import filter from "@/assets/project/filter.svg";
import jobDel from "@/assets/project/jobDel.svg";
import style from "./index.module.css"; import style from "./index.module.css";
import _ from "lodash"; import _ from "lodash";
import AddIcon from "@mui/icons-material/Add"; import AddIcon from "@mui/icons-material/Add";
...@@ -297,13 +291,22 @@ const SeeDataset = observer((props: ISeeDatasetProps) => { ...@@ -297,13 +291,22 @@ const SeeDataset = observer((props: ISeeDatasetProps) => {
onChange={(e) => handleQueryChange(e, index)} onChange={(e) => handleQueryChange(e, index)}
sx={{ marginRight: "16px", width: "180px" }} sx={{ marginRight: "16px", width: "180px" }}
></MyInput> ></MyInput>
<div <span
className={classNames({
[style.deleteIcon]: true,
[style.deleteIconDisabled]: querylist.length === 1,
iconfont: true,
"icon-shanchu": true,
})}
onClick={() => handleDeleteQuery(index)}
></span>
{/* <div
onClick={() => handleDeleteQuery(index)} onClick={() => handleDeleteQuery(index)}
className={classNames({ className={classNames({
[style.deleteIcon]: true, [style.deleteIcon]: true,
[style.deleteIconDisabled]: querylist.length === 1, [style.deleteIconDisabled]: querylist.length === 1,
})} })}
></div> ></div> */}
</div> </div>
); );
})} })}
...@@ -364,19 +367,31 @@ const SeeDataset = observer((props: ISeeDatasetProps) => { ...@@ -364,19 +367,31 @@ const SeeDataset = observer((props: ISeeDatasetProps) => {
{ {
value: "table", value: "table",
label: ( label: (
<img <span
src={tableType === "table" ? tableActive : table} style={{
alt="" fontSize: "16px",
></img> color:
tableType === "table"
? "#1370ff"
: "rgba(151, 151, 151, 1)",
}}
className="iconfont icon-liebiaopaixu"
></span>
), ),
}, },
{ {
value: "card", value: "card",
label: ( label: (
<img <span
src={tableType === "card" ? cardActive : card} style={{
alt="" fontSize: "16px",
></img> color:
tableType === "card"
? "#1370ff"
: "rgba(151, 151, 151, 1)",
}}
className="iconfont icon-tubiaopaixu"
></span>
), ),
}, },
]} ]}
...@@ -441,11 +456,14 @@ const SeeDataset = observer((props: ISeeDatasetProps) => { ...@@ -441,11 +456,14 @@ const SeeDataset = observer((props: ISeeDatasetProps) => {
variant="outlined" variant="outlined"
color="secondary" color="secondary"
img={ img={
<img <span
src={filter} style={{
alt="" fontSize: "16px",
style={{ marginRight: "10px" }} color: "rgba(30, 38, 51, 1)",
></img> marginRight: "8px",
}}
className="iconfont icon-shaixuan"
></span>
} }
style={{ margin: "4px 0" }} style={{ margin: "4px 0" }}
></MyButton> ></MyButton>
......
src/views/Project/ProjectData/index.module.css
View file @ e980fa8b
...@@ -56,11 +56,6 @@ ...@@ -56,11 +56,6 @@
align-items: center; align-items: center;
} }
.refreshIcon {
width: 16px;
height: 16px;
}
.folderIconBox { .folderIconBox {
display: flex; display: flex;
justify-content: flex-start; justify-content: flex-start;
......
src/views/Project/ProjectData/index.tsx
View file @ e980fa8b
...@@ -4,7 +4,6 @@ import classnames from "classnames"; ...@@ -4,7 +4,6 @@ import classnames from "classnames";
import { IconButton } from "@mui/material"; import { IconButton } from "@mui/material";
import MyTable from "@/components/mui/MyTableNew"; import MyTable from "@/components/mui/MyTableNew";
import dataSetIcon from "@/assets/project/dataSetIcon.svg"; import dataSetIcon from "@/assets/project/dataSetIcon.svg";
import refresh from "@/assets/project/refresh.svg";
import fileIcon from "@/assets/project/fileIcon.svg"; import fileIcon from "@/assets/project/fileIcon.svg";
import folderIcon from "@/assets/project/folderIcon.svg"; import folderIcon from "@/assets/project/folderIcon.svg";
import AddFolder from "./AddFolder"; import AddFolder from "./AddFolder";
...@@ -593,7 +592,10 @@ const ProjectData = observer(() => { ...@@ -593,7 +592,10 @@ const ProjectData = observer(() => {
}, },
}} }}
> >
<img className={style.refreshIcon} src={refresh} alt="" /> <span
style={{ fontSize: "16px", color: "rgba(138, 144, 153, 1)" }}
className="iconfont icon-shuaxin"
></span>
</IconButton> </IconButton>
</div> </div>
</div> </div>
......
src/views/demo/IconfontDemo/index.tsx
View file @ e980fa8b
...@@ -2,19 +2,9 @@ const IconfontDemo = () => { ...@@ -2,19 +2,9 @@ const IconfontDemo = () => {
return ( return (
<div> <div>
IconfontDemo IconfontDemo
<div style={{ fontSize: "50px", color: "red" }}>
<svg className="icon" aria-hidden="true">
<use xlinkHref="#icon-sousuo-223"></use>
</svg>
</div>
<div style={{ fontSize: "50px", color: "red" }}>
<svg className="icon" aria-hidden="true">
<use xlinkHref="#icon-dianzan"></use>
</svg>
</div>
<span <span
style={{ fontSize: "50px", color: "red" }} style={{ fontSize: "16px", color: "red" }}
className="iconfont icon-dianzan" className="iconfont icon-bangzhuwendang"
></span> ></span>
</div> </div>
); );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment