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

update:过滤与项目无关的内容 #588

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

update:过滤与项目无关的内容 #588

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
28 changes: 14 additions & 14 deletions packages/gi-portal/src/components/Banner/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,20 +36,20 @@ const Banner: React.FunctionComponent<any> = props => {
<a href="/#/workspace" className="button">
{$i18n.get({ id: 'gi-portal.components.Banner.EnterTheWorkbench', dm: '进入工作台' })}
</a>
<a className="button github" href="https://github.com/antvis/G6VP" target="_blank">
<svg
viewBox="64 64 896 896"
focusable="false"
data-icon="github"
width="16"
height="16"
fill="currentColor"
aria-hidden="true"
>
<path d="M511.6 76.3C264.3 76.2 64 276.4 64 523.5 64 718.9 189.3 885 363.8 946c23.5 5.9 19.9-10.8 19.9-22.2v-77.5c-135.7 15.9-141.2-73.9-150.3-88.9C215 726 171.5 718 184.5 703c30.9-15.9 62.4 4 98.9 57.9 26.4 39.1 77.9 32.5 104 26 5.7-23.5 17.9-44.5 34.7-60.8-140.6-25.2-199.2-111-199.2-213 0-49.5 16.3-95 48.3-131.7-20.4-60.5 1.9-112.3 4.9-120 58.1-5.2 118.5 41.6 123.2 45.3 33-8.9 70.7-13.6 112.9-13.6 42.4 0 80.2 4.9 113.5 13.9 11.3-8.6 67.3-48.8 121.3-43.9 2.9 7.7 24.7 58.3 5.5 118 32.4 36.8 48.9 82.7 48.9 132.3 0 102.2-59 188.1-200 212.9a127.5 127.5 0 0138.1 91v112.5c.8 9 0 17.9 15 17.9 177.1-59.7 304.6-227 304.6-424.1 0-247.2-200.4-447.3-447.5-447.3z"></path>
</svg>
<span style={{ marginLeft: '8px' }}>github</span>
</a>
{/*<a className="button github" href="https://github.com/antvis/G6VP" target="_blank">*/}
{/* <svg*/}
{/* viewBox="64 64 896 896"*/}
{/* focusable="false"*/}
{/* data-icon="github"*/}
{/* width="16"*/}
{/* height="16"*/}
{/* fill="currentColor"*/}
{/* aria-hidden="true"*/}
{/* >*/}
{/* <path d="M511.6 76.3C264.3 76.2 64 276.4 64 523.5 64 718.9 189.3 885 363.8 946c23.5 5.9 19.9-10.8 19.9-22.2v-77.5c-135.7 15.9-141.2-73.9-150.3-88.9C215 726 171.5 718 184.5 703c30.9-15.9 62.4 4 98.9 57.9 26.4 39.1 77.9 32.5 104 26 5.7-23.5 17.9-44.5 34.7-60.8-140.6-25.2-199.2-111-199.2-213 0-49.5 16.3-95 48.3-131.7-20.4-60.5 1.9-112.3 4.9-120 58.1-5.2 118.5 41.6 123.2 45.3 33-8.9 70.7-13.6 112.9-13.6 42.4 0 80.2 4.9 113.5 13.9 11.3-8.6 67.3-48.8 121.3-43.9 2.9 7.7 24.7 58.3 5.5 118 32.4 36.8 48.9 82.7 48.9 132.3 0 102.2-59 188.1-200 212.9a127.5 127.5 0 0138.1 91v112.5c.8 9 0 17.9 15 17.9 177.1-59.7 304.6-227 304.6-424.1 0-247.2-200.4-447.3-447.5-447.3z"></path>*/}
{/* </svg>*/}
{/* <span style={{ marginLeft: '8px' }}>github</span>*/}
{/*</a>*/}
</div>
)}
</div>
Expand Down
2 changes: 1 addition & 1 deletion packages/gi-site/src/components/Navbar/ExportSdk.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ const SdkContent = () => {
message={$i18n.get(
{
id: 'gi-site.components.Navbar.ExportSdk.GVpSupportsCountsExport',
dm: 'G6VP 支持 {counts} 种导出模式，点击即可体验，建议 UMD 模式',
dm: '支持 {counts} 种导出模式，点击即可体验，建议 UMD 模式',
},
{ counts: counts },
)}
Expand Down
10 changes: 5 additions & 5 deletions packages/gi-site/src/components/Navbar/Links.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,11 @@ const Links: React.FunctionComponent<LinksProps> = props => {
{$i18n.get({ id: 'gi-site.components.Navbar.Links.Workbook', dm: '工作簿' })}
</Link>
</div>
<div style={{ marginRight: '36px', cursor: 'pointer' }} className={active === 'open' ? 'active' : ''}>
<Link to="/open/assets-manage">
{$i18n.get({ id: 'gi-site.components.Navbar.Links.OpenMarket', dm: '开放市场' })}
</Link>
</div>
{/*<div style={{ marginRight: '36px', cursor: 'pointer' }} className={active === 'open' ? 'active' : ''}>*/}
{/* <Link to="/open/assets-manage">*/}
{/* {$i18n.get({ id: 'gi-site.components.Navbar.Links.OpenMarket', dm: '开放市场' })}*/}
{/* </Link>*/}
{/*</div>*/}
</>
);
};
Expand Down
26 changes: 13 additions & 13 deletions packages/gi-site/src/components/Navbar/SiteNav.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import * as React from 'react';
import { useHistory } from 'react-router-dom';
import DataModeCard from '../DataModeCard';
import Github from './Github';
// import Github from './Github';
import Links from './Links';
import Logo from './Logo';
// import Logo from './Logo';

import Theme from './Theme';
import UserInfo from './UserInfo';
Expand Down Expand Up @@ -35,21 +35,21 @@ const SiteNav: React.FunctionComponent<WorkbookBarProps> = props => {
return (
<header style={styles.container} className="gi-navbar-container">
<div style={styles.left}>
<SlotComponent name="SLOT_LAYOUT_LOGO">
<Logo
title="AntV Insight"
handleClick={() => {
history.push('/home');
}}
size={30}
style={{ padding: '0px 8px', cursor: 'pointer' }}
/>
</SlotComponent>
{/*<SlotComponent name="SLOT_LAYOUT_LOGO">*/}
{/* <Logo*/}
{/* title="AntV Insight"*/}
{/* handleClick={() => {*/}
{/* history.push('/home');*/}
{/* }}*/}
{/* size={30}*/}
{/* style={{ padding: '0px 8px', cursor: 'pointer' }}*/}
{/* />*/}
{/*</SlotComponent>*/}
<Links active={active} />
</div>
<div style={styles.right}>
<DataModeCard />
<Github />
{/*<Github />*/}
<Theme />
<Language />
<UserInfo />
Expand Down
18 changes: 9 additions & 9 deletions packages/gi-site/src/components/Navbar/WorkbookNav.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import ProjectTitle from '../ProjectTitle';
import useTheme from '../ThemeVars/useTheme';
import DatasetInfo from './DatasetInfo';
import ExportSdk from './ExportSdk';
import Github from './Github';
// import Github from './Github';
import Language from './Language';
import Logo from './Logo';
import Preview from './Preview';
Expand Down Expand Up @@ -46,13 +46,13 @@ const WorkbookBar: React.FunctionComponent<WorkbookBarProps> = props => {
return (
<header style={styles.container}>
<div style={styles.left}>
<Logo
handleClick={() => {
history.push('/workbook/project');
}}
size={30}
style={{ padding: '0px 8px', cursor: 'pointer' }}
/>
{/*<Logo*/}
{/* handleClick={() => {*/}
{/* history.push('/workbook/project');*/}
{/* }}*/}
{/* size={30}*/}
{/* style={{ padding: '0px 8px', cursor: 'pointer' }}*/}
{/*/>*/}
<DatasetInfo context={context} history={history}></DatasetInfo>
</div>
<div style={styles.left}>
Expand All @@ -64,7 +64,7 @@ const WorkbookBar: React.FunctionComponent<WorkbookBarProps> = props => {
<Preview context={context} />
<ExportSdk />
<SaveWorkbook workbookId={workbookId} context={context} />
<Github />
{/*<Github />*/}
<Theme changeTheme={changeTheme} />
<Language />
</div>
Expand Down
2 changes: 1 addition & 1 deletion packages/gi-site/src/i18n/strings/en-US.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@
"gi-site.components.FileServerEngine.utils.EdgetypeEdgeType": "EdgeType (edge's schema type)",
"gi-site.components.Navbar.DatasetInfo.UnnamedDataCollection": "Unnamed data collection",
"gi-site.components.Navbar.DatasetInfo.UnknownType": "Unknown type",
"gi-site.components.Navbar.ExportSdk.GVpSupportsCountsExport": "G6VP supports {counts} export modes. Click to experience them. UMD mode is recommended.",
"gi-site.components.Navbar.ExportSdk.GVpSupportsCountsExport": "supports {counts} export modes. Click to experience them. UMD mode is recommended.",
"gi-site.components.Navbar.ExportSdk.Open": "Open",
"gi-site.components.Navbar.ExportSdk.OpenIntegrationCanvasSdkSource": "Open Integration: canvas SDK source code export",
"gi-site.components.Navbar.Github.OpenSourceIsNotEasy": "Thanks for encouraging us with GitHub Star⭐",
Expand Down
2 changes: 1 addition & 1 deletion packages/gi-site/src/i18n/strings/zh-CN.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@
"gi-site.components.FileServerEngine.utils.EdgetypeEdgeType": "EdgeType (边的类型)",
"gi-site.components.Navbar.DatasetInfo.UnnamedDataCollection": "未命名的数据集合",
"gi-site.components.Navbar.DatasetInfo.UnknownType": "未知类型",
"gi-site.components.Navbar.ExportSdk.GVpSupportsCountsExport": "G6VP 支持 {counts} 种导出模式，点击即可体验，建议 UMD 模式",
"gi-site.components.Navbar.ExportSdk.GVpSupportsCountsExport": "支持 {counts} 种导出模式，点击即可体验，建议 UMD 模式",
"gi-site.components.Navbar.ExportSdk.Open": "开放",
"gi-site.components.Navbar.ExportSdk.OpenIntegrationCanvasSdkSource": "开放集成：画布 SDK 源码导出",
"gi-site.components.Navbar.Github.OpenSourceIsNotEasy": "开源不易，给个鼓励，加个 ⭐️ 吧！",
Expand Down
20 changes: 10 additions & 10 deletions packages/gi-site/src/layouts/SideNav.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,16 +27,16 @@ const DATASET_ITEMS = [
key: '/dataset/create',
icon: <PlusOutlined />,
},
{
label: $i18n.get({ id: 'gi-site.src.layouts.SideNav.CaseData', dm: '案例数据' }),
key: '/dataset/case',
icon: <AppstoreOutlined />,
},
{
label: $i18n.get({ id: 'gi-site.src.layouts.SideNav.DirectSystemConnection', dm: '系统直连' }),
key: '/dataset/SYSTEM_DIRECT_CONNECT',
icon: <GlobalOutlined />,
},
// {
// label: $i18n.get({ id: 'gi-site.src.layouts.SideNav.CaseData', dm: '案例数据' }),
// key: '/dataset/case',
// icon: <AppstoreOutlined />,
// },
// {
// label: $i18n.get({ id: 'gi-site.src.layouts.SideNav.DirectSystemConnection', dm: '系统直连' }),
// key: '/dataset/SYSTEM_DIRECT_CONNECT',
// icon: <GlobalOutlined />,
// },
{
label: $i18n.get({ id: 'gi-site.src.layouts.SideNav.RecycleBin', dm: '回收站' }),
key: '/dataset/delete',
Expand Down
12 changes: 6 additions & 6 deletions packages/gi-site/src/pages/Dataset/Case.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,12 +31,12 @@ const Cases: React.FunctionComponent<CasesProps> = props => {
label: $i18n.get({ id: 'gi-site.pages.Dataset.Case.RelationalData', dm: '关系数据' }),
children: <DatasetTable data={lists} deletable={false} />,
},
{
key: 'geo',
icon: <EnvironmentOutlined />,
label: $i18n.get({ id: 'gi-site.pages.Dataset.Case.GeographicData', dm: '地理数据' }),
children: <>{$i18n.get({ id: 'gi-site.pages.Dataset.Case.UnderConstruction', dm: '正在建设中...' })}</>,
},
// {
// key: 'geo',
// icon: <EnvironmentOutlined />,
// label: $i18n.get({ id: 'gi-site.pages.Dataset.Case.GeographicData', dm: '地理数据' }),
// children: <>{$i18n.get({ id: 'gi-site.pages.Dataset.Case.UnderConstruction', dm: '正在建设中...' })}</>,
// },
]}
/>
</>
Expand Down
28 changes: 17 additions & 11 deletions packages/gi-site/src/pages/Dataset/Create.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,10 @@
import { ApiOutlined, DeploymentUnitOutlined, FileExcelOutlined, GlobalOutlined } from '@ant-design/icons';
import {
ApiOutlined,
DatabaseOutlined,
DeploymentUnitOutlined,
FileExcelOutlined,
GlobalOutlined
} from '@ant-design/icons';
import { utils } from '@antv/gi-sdk';
import type { EngineServer } from '@antv/gi-sdk/lib/typing';
import { Spin, Tabs } from 'antd';
Expand Down Expand Up @@ -42,21 +48,21 @@ const ITEMS = [
name: $i18n.get({ id: 'gi-site.pages.Dataset.Create.GraphDatabase', dm: '图数据库' }),
icon: <DeploymentUnitOutlined />,
},
{
id: 'GEO',
name: $i18n.get({ id: 'gi-site.pages.Dataset.Create.GeographicDatabase', dm: '地理数据库' }),
icon: <GlobalOutlined />,
},
// {
// id: 'GEO',
// name: $i18n.get({ id: 'gi-site.pages.Dataset.Create.GeographicDatabase', dm: '地理数据库' }),
// icon: <GlobalOutlined />,
// },
// {
// id: 'DB',
// name: '关系型数据库',
// icon: <DatabaseOutlined />,
// },
{
id: 'API',
name: $i18n.get({ id: 'gi-site.pages.Dataset.Create.ApiService', dm: 'API 服务' }),
icon: <ApiOutlined />,
},
// {
// id: 'API',
// name: $i18n.get({ id: 'gi-site.pages.Dataset.Create.ApiService', dm: 'API 服务' }),
// icon: <ApiOutlined />,
// },
];

const { TabPane } = Tabs;
Expand Down
60 changes: 30 additions & 30 deletions packages/gi-site/src/pages/Home/GuideCards.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,11 +57,11 @@ const ITEMS = [
icon: <DeploymentUnitOutlined />,
name: $i18n.get({ id: 'gi-site.pages.Home.GuideCards.GraphDatabase', dm: '图数据库' }),
},
{
id: 'GEO',
icon: <EnvironmentOutlined />,
name: $i18n.get({ id: 'gi-site.pages.Home.GuideCards.GeographicDatabase', dm: '地理数据库' }),
},
// {
// id: 'GEO',
// icon: <EnvironmentOutlined />,
// name: $i18n.get({ id: 'gi-site.pages.Home.GuideCards.GeographicDatabase', dm: '地理数据库' }),
// },
],
},
{
Expand Down Expand Up @@ -89,31 +89,31 @@ const ITEMS = [
},
],
},
{
name: $i18n.get({ id: 'gi-site.pages.Home.GuideCards.StepDiscoverMorePossibilities', dm: 'Step 3：发现更多可能' }),
items: [
{
id: 'AVA',
icon: <RobotOutlined />,
name: $i18n.get({ id: 'gi-site.pages.Home.GuideCards.IntelligentInterpretation', dm: '智能解读' }),
},
{
id: 'DEVELOPMENT',
icon: <CodeOutlined />,
name: $i18n.get({ id: 'gi-site.pages.Home.GuideCards.CustomDevelopment', dm: '定制开发' }),
},
{
id: 'DEPLOY',
icon: <AliyunOutlined />,
name: $i18n.get({ id: 'gi-site.pages.Home.GuideCards.IntegratedDeployment', dm: '集成部署' }),
},
{
id: 'VIP_ASSETS',
icon: <GiftOutlined />,
name: $i18n.get({ id: 'gi-site.pages.Home.GuideCards.VipAssets', dm: 'VIP 资产' }),
},
],
},
// {
// name: $i18n.get({ id: 'gi-site.pages.Home.GuideCards.StepDiscoverMorePossibilities', dm: 'Step 3：发现更多可能' }),
// items: [
// {
// id: 'AVA',
// icon: <RobotOutlined />,
// name: $i18n.get({ id: 'gi-site.pages.Home.GuideCards.IntelligentInterpretation', dm: '智能解读' }),
// },
// {
// id: 'DEVELOPMENT',
// icon: <CodeOutlined />,
// name: $i18n.get({ id: 'gi-site.pages.Home.GuideCards.CustomDevelopment', dm: '定制开发' }),
// },
// {
// id: 'DEPLOY',
// icon: <AliyunOutlined />,
// name: $i18n.get({ id: 'gi-site.pages.Home.GuideCards.IntegratedDeployment', dm: '集成部署' }),
// },
// {
// id: 'VIP_ASSETS',
// icon: <GiftOutlined />,
// name: $i18n.get({ id: 'gi-site.pages.Home.GuideCards.VipAssets', dm: 'VIP 资产' }),
// },
// ],
// },
];

const GuideCards: React.FunctionComponent<IGuideCardsProps> = props => {
Expand Down
32 changes: 16 additions & 16 deletions packages/gi-site/src/pages/Home/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ const Home = props => {
<section className="greeting">
{$i18n.get({
id: 'gi-site.pages.Home.BringDataToLifeIn',
dm: '让数据栩栩如生，三步完成从「数据可视分析」到「数据产品构建」～',
dm: '欢迎您来到学员知识图谱分析端(v1.0.0)',
})}
</section>
<div className="container">
Expand All @@ -55,21 +55,21 @@ const Home = props => {
/>
</div>
</section>
<section className="flex-right">
<Card
title={$i18n.get({ id: 'gi-site.pages.Home.AnnouncementNotice', dm: '公告通知' })}
style={{ borderRadius: '8px', marginTop: '8px' }}
>
<Notification items={NOTIFICATION_ITEMS} />
<img src={`${window['GI_PUBLIC_PATH']}image/QRCode.jpg`} width={'100%'} />
</Card>
<Card
title={$i18n.get({ id: 'gi-site.pages.Home.LearningZone', dm: '学习专区' })}
style={{ marginTop: '12px', borderRadius: '8px' }}
>
<Notification items={STUDY_ITEMS} />
</Card>
</section>
{/*<section className="flex-right">*/}
{/* <Card*/}
{/* title={$i18n.get({ id: 'gi-site.pages.Home.AnnouncementNotice', dm: '公告通知' })}*/}
{/* style={{ borderRadius: '8px', marginTop: '8px' }}*/}
{/* >*/}
{/* <Notification items={NOTIFICATION_ITEMS} />*/}
{/* <img src={`${window['GI_PUBLIC_PATH']}image/QRCode.jpg`} width={'100%'} />*/}
{/* </Card>*/}
{/* <Card*/}
{/* title={$i18n.get({ id: 'gi-site.pages.Home.LearningZone', dm: '学习专区' })}*/}
{/* style={{ marginTop: '12px', borderRadius: '8px' }}*/}
{/* >*/}
{/* <Notification items={STUDY_ITEMS} />*/}
{/* </Card>*/}
{/*</section>*/}
</div>
</div>
</SlotComponent>
Expand Down
Loading