feat: 还原Logo设计

JackySoft · Sep 18, 2024 · cc6799d · cc6799d
1 parent 559f1f1
commit cc6799d
Show file tree

Hide file tree

Showing 8 changed files with 23 additions and 9 deletions.
diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 <div align="center">
 
-<a href="http://marsview.cc/"><img src="/.github/imgs/logo.png" width="150" alt="marsview logo"></a>
+<a href="http://marsview.cc/"><img src="https://marsview.cdn.bcebos.com/mars-logo.png" width="150" alt="marsview logo"></a>
 
 # Marsview 低代码平台
 

diff --git a/packages/admin/src/pages/console/HomeHeader.tsx b/packages/admin/src/pages/console/HomeHeader.tsx
@@ -8,7 +8,8 @@ function HomeHeader() {
   return (
     <div className={style.homeHeader}>
       <div className={style.logo}>
-        <img width={130} src="/imgs/logo.png" alt="logo" />
+        <img width={40} src="https://marsview.cdn.bcebos.com/mars-logo.png" alt="logo" />
+        <span>工作台</span>
       </div>
       <Dropdown
         menu={{

diff --git a/packages/admin/src/pages/login/Login.tsx b/packages/admin/src/pages/login/Login.tsx
@@ -38,7 +38,7 @@ export default function Login() {
         </div>
         <div className={style.form}>
           <div className={style.title}>
-            <img src="/imgs/logo.png" width={150} />
+            <img src="https://marsview.cdn.bcebos.com/mars-logo.png" width={45} />
           </div>
           <Form name="basic" layout="vertical" className={style.form} onFinish={onFinish} autoComplete="off" size="large" form={form}>
             <Form.Item<FieldType> name="userName" rules={[{ required: true, message: '请输入邮箱' }]}>

diff --git a/packages/editor/src/components/Searchbar/SearchBar.tsx b/packages/editor/src/components/Searchbar/SearchBar.tsx
@@ -1,15 +1,23 @@
 import { memo } from 'react';
-import { Button, Form, Input, Space } from 'antd';
+import { Button, Form, Input, Radio, Space } from 'antd';
 import { PlusOutlined, RedoOutlined } from '@ant-design/icons';
 import styles from './index.module.less';
 
 const SearchBar = memo((props: any) => {
   const { form, from, submit, refresh, onCreate } = props;
+  const options = [
+    { label: '我的', value: 1 },
+    { label: '市场', value: 2 },
+  ];
+
   return (
     <>
       <div className={styles.searchBar}>
         <div className={styles.searchBarForm}>
           <Form form={form} layout="inline" initialValues={{ type: 1 }}>
+            <Form.Item name="type">
+              <Radio.Group options={options} onChange={submit} optionType="button" buttonStyle="solid" />
+            </Form.Item>
             <Form.Item name="keyword" style={{ width: 200 }}>
               <Input placeholder={`请输入${from}名称`} onPressEnter={submit} />
             </Form.Item>

diff --git a/packages/editor/src/layout/components/Header/index.module.less b/packages/editor/src/layout/components/Header/index.module.less
@@ -5,6 +5,7 @@
   gap: 30px;
   background-color: #fff;
   height: 64px;
+  line-height: 64px;
   padding: 0 20px;
   font-size: 14px;
 }
@@ -21,6 +22,7 @@
   font-size: 20px;
   display: flex;
   align-items: center;
+  gap: 10px;
   cursor: pointer;
 }
 .menu {

diff --git a/packages/editor/src/layout/components/Header/index.tsx b/packages/editor/src/layout/components/Header/index.tsx
@@ -1,4 +1,4 @@
-import { Layout, Menu, MenuProps, Button, Popover, Dropdown, Space, Image } from 'antd';
+import { Layout, Menu, MenuProps, Button, Popover, Dropdown, Space, Image, Flex } from 'antd';
 import { memo, useEffect, useState } from 'react';
 import { ProjectOutlined, OneToOneOutlined, CaretDownFilled, DownOutlined, AppstoreOutlined, LoadingOutlined } from '@ant-design/icons';
 import { useLocation, useNavigate, useParams } from 'react-router-dom';
@@ -185,7 +185,8 @@ const Header = memo(() => {
     <>
       <Layout.Header className={isNav ? styles.homeHeader : styles.layoutHeader}>
         <div className={styles.logo} onClick={goHome}>
-          <img src="/imgs/logo.png" width={130} />
+          <img src="https://marsview.cdn.bcebos.com/mars-logo.png" width={42} />
+          <span>Marsview</span>
         </div>
         {/* 首页 - 导航菜单 */}
         {isNav && (

diff --git a/packages/editor/src/pages/login/Login.tsx b/packages/editor/src/pages/login/Login.tsx
@@ -87,7 +87,8 @@ export default function Login() {
         <div className={style.form}>
           {type === 'login' ? (
             <div className={style.title}>
-              <img src="/imgs/logo.png" width={150} />
+              <img src="https://marsview.cdn.bcebos.com/mars-logo.png" width={45} />
+              <span>登录</span>
             </div>
           ) : (
             <div className={style.title}>邮箱注册</div>

diff --git a/packages/editor/src/pages/welcome/Welcome.tsx b/packages/editor/src/pages/welcome/Welcome.tsx
@@ -34,7 +34,8 @@ export default function Welcome() {
         }}
       >
         <div className={style.logo}>
-          <img src="/imgs/logo.png" width="150" />
+          <img src="https://marsview.cdn.bcebos.com/mars-logo-light.png" width="40" />
+          <span>Marsview</span>
         </div>
         <div className={style.doc}>
           <a href="http://docs.marsview.cc" target="_blank">
@@ -122,7 +123,7 @@ export default function Welcome() {
         </div>
       </section>
       <section className={style.footer}>
-        <img src="/imgs/logo.png" />
+        <img src="https://marsview.cdn.bcebos.com/mars-logo-light.png" />
         <h1>欢迎使用 Marsview 零代码搭建平台</h1>
         <Link to="/projects">
           <Button type="primary" size="large">