feat: 优化代码

JackySoft · Aug 9, 2024 · 06464ad · 06464ad
1 parent 21b28af
commit 06464ad
Show file tree

Hide file tree

Showing 54 changed files with 226 additions and 255 deletions.
diff --git a/dist/admin/index.html b/dist/admin/index.html
@@ -1,8 +1,10 @@
-<!DOCTYPE html><html lang="en" data-van-env="stg"><head>
-    <meta charset="UTF-8">
-    <link rel="icon" type="image/svg+xml" href="/vite.svg">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>Mars搭建平台</title>
+<!DOCTYPE html>
+<html lang="en" data-van-env="stg">
+  <head>
+    <meta charset="UTF-8" />
+    <link rel="icon" type="image/svg+xml" href="/vite.svg" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <title>Marsview低代码平台</title>
     <style>
       html,
       body {
@@ -23,12 +25,12 @@
       }
     </style>
     <script type="text/javascript" src="https://cdn.staticfile.net/react/18.2.0/umd/react.production.min.js" defer="defer"></script>
-<script type="text/javascript" src="https://cdn.staticfile.net/react-dom/18.2.0/umd/react-dom.production.min.js" defer="defer"></script>
-<script type="text/javascript" src="https://cdn.staticfile.net/dayjs/1.11.10/dayjs.min.js" defer="defer"></script>
-<script type="text/javascript" src="https://cdn.staticfile.net/antd/5.13.2/antd.min.js" defer="defer"></script>
-<script type="text/javascript" src="http://www.marsview.cc/ahooks.js" defer="defer"></script>
-<script type="text/javascript" src="https://cdn.staticfile.net/axios/1.6.5/axios.min.js" defer="defer"></script>
-<script>
+    <script type="text/javascript" src="https://cdn.staticfile.net/react-dom/18.2.0/umd/react-dom.production.min.js" defer="defer"></script>
+    <script type="text/javascript" src="https://cdn.staticfile.net/dayjs/1.11.10/dayjs.min.js" defer="defer"></script>
+    <script type="text/javascript" src="https://cdn.staticfile.net/antd/5.13.2/antd.min.js" defer="defer"></script>
+    <script type="text/javascript" src="http://www.marsview.cc/ahooks.js" defer="defer"></script>
+    <script type="text/javascript" src="https://cdn.staticfile.net/axios/1.6.5/axios.min.js" defer="defer"></script>
+    <script>
       var _hmt = _hmt || [];
       (function () {
         var hm = document.createElement('script');
@@ -38,16 +40,28 @@
       })();
     </script>
     <script type="module" crossorigin="" src="/assets/index-BMoS0DUA.js"></script>
-    <link rel="stylesheet" crossorigin="" href="/assets/index-hTeyzoH6.css">
+    <link rel="stylesheet" crossorigin="" href="/assets/index-hTeyzoH6.css" />
   </head>
   <body>
     <div id="root"></div>
     <div id="loading" style="display: none">
-      <svg t="1682858040467" class="icon loading" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="7810" width="64" height="64">
-        <path d="M511.882596 287.998081h-0.361244a31.998984 31.998984 0 0 1-31.659415-31.977309v-0.361244c0-0.104761 0.115598-11.722364 0.115598-63.658399V96.000564a31.998984 31.998984 0 1 1 64.001581 0V192.001129c0 52.586273-0.111986 63.88237-0.119211 64.337537a32.002596 32.002596 0 0 1-31.977309 31.659415zM511.998194 959.99842a31.998984 31.998984 0 0 1-31.998984-31.998984v-96.379871c0-51.610915-0.111986-63.174332-0.115598-63.286318s0-0.242033 0-0.361243a31.998984 31.998984 0 0 1 63.997968-0.314283c0 0.455167 0.11921 11.711527 0.11921 64.034093v96.307622a31.998984 31.998984 0 0 1-32.002596 31.998984zM330.899406 363.021212a31.897836 31.897836 0 0 1-22.866739-9.612699c-0.075861-0.075861-8.207461-8.370021-44.931515-45.094076L195.198137 240.429485a31.998984 31.998984 0 0 1 45.256635-45.253022L308.336112 263.057803c37.182834 37.182834 45.090463 45.253022 45.41197 45.578141A31.998984 31.998984 0 0 1 330.899406 363.021212zM806.137421 838.11473a31.901448 31.901448 0 0 1-22.628318-9.374279L715.624151 760.859111c-36.724054-36.724054-45.018214-44.859267-45.097687-44.93874a31.998984 31.998984 0 0 1 44.77618-45.729864c0.32512 0.317895 8.395308 8.229136 45.578142 45.411969l67.88134 67.88134a31.998984 31.998984 0 0 1-22.624705 54.630914zM224.000113 838.11473a31.901448 31.901448 0 0 0 22.628317-9.374279l67.88134-67.88134c36.724054-36.724054 45.021826-44.859267 45.097688-44.93874a31.998984 31.998984 0 0 0-44.776181-45.729864c-0.32512 0.317895-8.395308 8.229136-45.578142 45.411969l-67.88134 67.884953a31.998984 31.998984 0 0 0 22.628318 54.627301zM255.948523 544.058589h-0.361244c-0.104761 0-11.722364-0.115598-63.658399-0.115598H95.942765a31.998984 31.998984 0 1 1 0-64.00158h95.996952c52.586273 0 63.88237 0.111986 64.337538 0.11921a31.998984 31.998984 0 0 1 31.659414 31.97731v0.361244a32.002596 32.002596 0 0 1-31.988146 31.659414zM767.939492 544.058589a32.002596 32.002596 0 0 1-31.995372-31.666639v-0.361244a31.998984 31.998984 0 0 1 31.659415-31.970085c0.455167 0 11.754876-0.11921 64.34115-0.11921h96.000564a31.998984 31.998984 0 0 1 0 64.00158H831.944685c-51.936034 0-63.553638 0.111986-63.665624 0.115598h-0.335957zM692.999446 363.0176a31.998984 31.998984 0 0 1-22.863126-54.381656c0.317895-0.32512 8.229136-8.395308 45.41197-45.578141l67.88134-67.884953A31.998984 31.998984 0 1 1 828.693489 240.429485l-67.892177 67.88134c-31.020013 31.023625-41.644196 41.759794-44.241539 44.393262l-0.697201 0.722488a31.908673 31.908673 0 0 1-22.863126 9.591025z" fill="#1677ff" p-id="7811"></path>
+      <svg
+        t="1682858040467"
+        class="icon loading"
+        viewBox="0 0 1024 1024"
+        version="1.1"
+        xmlns="http://www.w3.org/2000/svg"
+        p-id="7810"
+        width="64"
+        height="64"
+      >
+        <path
+          d="M511.882596 287.998081h-0.361244a31.998984 31.998984 0 0 1-31.659415-31.977309v-0.361244c0-0.104761 0.115598-11.722364 0.115598-63.658399V96.000564a31.998984 31.998984 0 1 1 64.001581 0V192.001129c0 52.586273-0.111986 63.88237-0.119211 64.337537a32.002596 32.002596 0 0 1-31.977309 31.659415zM511.998194 959.99842a31.998984 31.998984 0 0 1-31.998984-31.998984v-96.379871c0-51.610915-0.111986-63.174332-0.115598-63.286318s0-0.242033 0-0.361243a31.998984 31.998984 0 0 1 63.997968-0.314283c0 0.455167 0.11921 11.711527 0.11921 64.034093v96.307622a31.998984 31.998984 0 0 1-32.002596 31.998984zM330.899406 363.021212a31.897836 31.897836 0 0 1-22.866739-9.612699c-0.075861-0.075861-8.207461-8.370021-44.931515-45.094076L195.198137 240.429485a31.998984 31.998984 0 0 1 45.256635-45.253022L308.336112 263.057803c37.182834 37.182834 45.090463 45.253022 45.41197 45.578141A31.998984 31.998984 0 0 1 330.899406 363.021212zM806.137421 838.11473a31.901448 31.901448 0 0 1-22.628318-9.374279L715.624151 760.859111c-36.724054-36.724054-45.018214-44.859267-45.097687-44.93874a31.998984 31.998984 0 0 1 44.77618-45.729864c0.32512 0.317895 8.395308 8.229136 45.578142 45.411969l67.88134 67.88134a31.998984 31.998984 0 0 1-22.624705 54.630914zM224.000113 838.11473a31.901448 31.901448 0 0 0 22.628317-9.374279l67.88134-67.88134c36.724054-36.724054 45.021826-44.859267 45.097688-44.93874a31.998984 31.998984 0 0 0-44.776181-45.729864c-0.32512 0.317895-8.395308 8.229136-45.578142 45.411969l-67.88134 67.884953a31.998984 31.998984 0 0 0 22.628318 54.627301zM255.948523 544.058589h-0.361244c-0.104761 0-11.722364-0.115598-63.658399-0.115598H95.942765a31.998984 31.998984 0 1 1 0-64.00158h95.996952c52.586273 0 63.88237 0.111986 64.337538 0.11921a31.998984 31.998984 0 0 1 31.659414 31.97731v0.361244a32.002596 32.002596 0 0 1-31.988146 31.659414zM767.939492 544.058589a32.002596 32.002596 0 0 1-31.995372-31.666639v-0.361244a31.998984 31.998984 0 0 1 31.659415-31.970085c0.455167 0 11.754876-0.11921 64.34115-0.11921h96.000564a31.998984 31.998984 0 0 1 0 64.00158H831.944685c-51.936034 0-63.553638 0.111986-63.665624 0.115598h-0.335957zM692.999446 363.0176a31.998984 31.998984 0 0 1-22.863126-54.381656c0.317895-0.32512 8.229136-8.395308 45.41197-45.578141l67.88134-67.884953A31.998984 31.998984 0 1 1 828.693489 240.429485l-67.892177 67.88134c-31.020013 31.023625-41.644196 41.759794-44.241539 44.393262l-0.697201 0.722488a31.908673 31.908673 0 0 1-22.863126 9.591025z"
+          fill="#1677ff"
+          p-id="7811"
+        ></path>
       </svg>
       <p>Loading....</p>
     </div>
-
-
-</body></html>
+  </body>
+</html>
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "private": true,
-  "name": "mars",
+  "name": "marsview",
   "description": "低代码平台，包含可视化编辑器、可视化后台管理，支持自定义组件开发",
   "version": "1.0.0",
   "license": "MIT",

diff --git a/packages/admin/.env.development b/packages/admin/.env.development
@@ -1,4 +1,5 @@
 # 接口地址
 VITE_BASE_API=http://localhost:5000/api
+#VITE_BASE_API=http://mars-api.marsview.cc/api
 # 后台访问地址
 VITE_ADMIN_URL=http://admin.marsview.cc
diff --git a/packages/admin/index.html b/packages/admin/index.html
@@ -2,9 +2,13 @@
 <html lang="en" data-van-env="stg">
   <head>
     <meta charset="UTF-8" />
-    <link rel="icon" type="image/svg+xml" href="/vite.svg" />
+    <link rel="icon" type="image/svg+xml" href="/imgs/mars-logo.png" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>Mars搭建平台</title>
+    <title>Marsview低代码平台</title>
+    <link rel="preconnect" href="http://admin.marsview.cc" />
+    <link rel="preconnect" href="https://cdn.staticfile.net" />
+    <link rel="preconnect" href="http://mars-api.marsview.cc" />
+    <link rel="preconnect" href="https://marsview.cdn.bcebos.com/" />
     <style>
       html,
       body {
@@ -35,7 +39,7 @@
     </script>
   </head>
   <body>
-    <div id="root"></div>
+    <div id="rootHAHA"></div>
     <div id="loading" style="display: none">
       <svg
         t="1682858040467"

diff --git a/packages/admin/package.json b/packages/admin/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "@mars/admin",
+  "name": "@marsview/admin",
   "private": true,
   "scripts": {
     "dev": "vite",
@@ -20,7 +20,7 @@
     ]
   },
   "dependencies": {
-    "@mars/materials": "workspace:^",
+    "@marsview/materials": "workspace:^",
     "dayjs": "^1.11.10",
     "immer": "^10.0.3"
   },

diff --git a/packages/admin/public/ahooks.js b/packages/admin/public/ahooks.js
diff --git a/packages/admin/public/vite.svg b/packages/admin/public/vite.svg
diff --git a/packages/admin/src/App.tsx b/packages/admin/src/App.tsx
@@ -1,7 +1,7 @@
 import { RouterProvider } from 'react-router-dom';
 import { App as AntdApp } from 'antd';
 import router from './router';
-import AntdGlobal from '@mars/materials/utils/AntdGlobal';
+import AntdGlobal from '@marsview/materials/utils/AntdGlobal';
 import './App.less';
 import './index.less';
 

diff --git a/packages/admin/src/components/Header/Header.tsx b/packages/admin/src/components/Header/Header.tsx
@@ -37,7 +37,7 @@ const Header = memo(() => {
       {/* 加载面包屑，左右布局时，面包屑在顶部 */}
       {projectInfo.layout === 1 && (
         <Flex align="center">
-          <div onClick={toggleCollapsed}>
+          <div onClick={toggleCollapsed} style={{ cursor: 'pointer' }}>
             {collapsed ? (
               <MenuUnfoldOutlined style={{ color: isLight ? '#000' : '#fff' }} />
             ) : (

diff --git a/packages/admin/src/main.tsx b/packages/admin/src/main.tsx
@@ -15,7 +15,7 @@ let root: ReactDOM.Root | null = null;
 // microApp 子应用挂载
 window.mount = () => {
   // 初始化渲染
-  root = ReactDOM.createRoot(document.getElementById('root')!);
+  root = ReactDOM.createRoot(document.getElementById('rootHAHA')!);
   root.render(<App />);
   // 监听路由变化
   window.microApp?.addDataListener((data: any) => {

diff --git a/packages/admin/src/pages/403.tsx b/packages/admin/src/pages/403.tsx
@@ -13,7 +13,7 @@ function Forbidden() {
       subTitle={`抱歉，您当前没有权限访问此${searchParams.get('type') === 'project' ? '项目' : '页面'}`}
       extra={
         <Button type="primary" onClick={() => navigate(`http://www.marsview.cc/`)}>
-          返回Mars平台
+          返回Marsview平台
         </Button>
       }
     />

diff --git a/packages/admin/src/pages/console/HomeHeader.tsx b/packages/admin/src/pages/console/HomeHeader.tsx
@@ -7,7 +7,7 @@ function HomeHeader() {
     <div className={style.homeHeader}>
       <div className={style.logo}>
         <img width={38} src="/imgs/mars-logo.png" alt="logo" />
-        Mars用户端
+        Marsview用户端
       </div>
       <div>{userInfo.userName}</div>
     </div>

diff --git a/packages/admin/src/pages/login/Login.tsx b/packages/admin/src/pages/login/Login.tsx
@@ -4,7 +4,6 @@ import style from './index.module.less';
 import { login } from '@/api';
 import storage from '@/utils/storage';
 import { usePageStore } from '@/stores/pageStore';
-import { useNavigate } from 'react-router-dom';
 import { LockOutlined, UserOutlined } from '@ant-design/icons';
 type FieldType = {
   userName: string;
@@ -30,21 +29,24 @@ export default function Login() {
           <img src="/imgs/login-bg.png" />
         </div>
         <div className={style.form}>
-          <div className={style.title}>Marsview</div>
+          <div className={style.title}>
+            <img src="/imgs/mars-logo.png" width={45} />
+            <span>Marsview</span>
+          </div>
           <Form
             name="basic"
             layout="vertical"
             className={style.form}
             onFinish={onFinish}
-            initialValues={{ userName: 'admin@marsview.cc', userPwd: '123456' }}
+            initialValues={{ userName: 'demo@marsview.cc', userPwd: 'marsview' }}
             autoComplete="off"
             size="large"
           >
-            <Form.Item<FieldType> name="userName" rules={[{ required: true, message: 'Please input your username!' }]}>
+            <Form.Item<FieldType> name="userName" rules={[{ required: true, message: '请输入邮箱' }]}>
               <Input prefix={<UserOutlined />} />
             </Form.Item>
 
-            <Form.Item<FieldType> style={{ marginTop: 32 }} name="userPwd" rules={[{ required: true, message: 'Please input your password!' }]}>
+            <Form.Item<FieldType> style={{ marginTop: 32 }} name="userPwd" rules={[{ required: true, message: '请输入密码' }]}>
               <Input.Password prefix={<LockOutlined />} />
             </Form.Item>
 

diff --git a/packages/admin/src/pages/login/index.module.less b/packages/admin/src/pages/login/index.module.less
@@ -27,8 +27,13 @@
     width: 350px;
   }
   .title {
+    display: flex;
+    align-items: center;
+    justify-content: center;
     font-size: 32px;
-    text-align: center;
-    margin-bottom: 20px;
+    margin-bottom: 40px;
+    img {
+      margin-right: 10px;
+    }
   }
 }
diff --git a/packages/admin/src/pages/page/index.tsx b/packages/admin/src/pages/page/index.tsx
@@ -1,8 +1,8 @@
 import { useEffect, useState } from 'react';
 import { useNavigate, useParams } from 'react-router-dom';
 import { ConfigProvider } from 'antd';
-import { Page } from '@mars/materials/Page';
-import { usePageStore as usePageStore2 } from '@mars/materials/stores/pageStore';
+import { Page } from '@marsview/materials/Page';
+import { usePageStore as usePageStore2 } from '@marsview/materials/stores/pageStore';
 import { message } from '@/utils/AntdGlobal';
 import { getPageDetail } from '@/api/index';
 import locale from 'antd/locale/zh_CN';

diff --git a/packages/admin/src/pages/project/index.tsx b/packages/admin/src/pages/project/index.tsx
@@ -1,10 +1,10 @@
 import { getPageDetail } from '@/api/index';
 import { useParams } from 'react-router-dom';
 import { useEffect, useState } from 'react';
-import { usePageStore as usePageStore2 } from '@mars/materials/stores/pageStore';
+import { usePageStore as usePageStore2 } from '@marsview/materials/stores/pageStore';
 import { message } from '@/utils/AntdGlobal';
 import NotFound from './notFound';
-import { Page } from '@mars/materials/Page';
+import { Page } from '@marsview/materials/Page';
 import { useShallow } from 'zustand/react/shallow';
 
 export default function () {

diff --git a/packages/admin/src/pages/welcome/welcome.tsx b/packages/admin/src/pages/welcome/welcome.tsx
@@ -6,11 +6,11 @@ function Welcome() {
   return (
     <div className={style.welcome}>
       <img src="/imgs/welcome.svg" alt="" />
-      <div className={style.title}>欢迎使用 Mars 访问端系统</div>
+      <div className={style.title}>欢迎使用 Marsview 访问端系统</div>
       {location.pathname === '/' && (
         <div className={style.content}>
           <p>
-            当前需要正确的项目地址才可以访问，如果没有创建项目，请先去Mars低代码平台{' '}
+            当前需要正确的项目地址才可以访问，如果没有创建项目，请先去Marsview低代码平台{' '}
             <a href={`http://www.marsview.cc/projects`} target="_blank">
               创建
             </a>

diff --git a/packages/admin/src/utils/AntdGlobal.tsx b/packages/admin/src/utils/AntdGlobal.tsx
@@ -1,2 +1,2 @@
-export * from '@mars/materials/utils/AntdGlobal';
-export { default } from '@mars/materials/utils/AntdGlobal';
+export * from '@marsview/materials/utils/AntdGlobal';
+export { default } from '@marsview/materials/utils/AntdGlobal';
diff --git a/packages/admin/vite.config.ts b/packages/admin/vite.config.ts
@@ -48,7 +48,7 @@ export default defineConfig({
         varName: 'antd',
       },
       ahooks: {
-        src: 'http://www.marsview.cc/ahooks.js',
+        src: 'https://marsview.cdn.bcebos.com/static/ahooks.js',
         varName: 'ahooks',
       },
       axios: {

diff --git a/packages/editor/.env.development b/packages/editor/.env.development
@@ -1,4 +1,5 @@
 # 接口地址
-VITE_BASE_API=http://mars-api.marsview.cc/api
+VITE_BASE_API=http://localhost:5000/api
+# VITE_BASE_API=http://mars-api.marsview.cc/api
 # 后台访问地址
 VITE_ADMIN_URL=http://admin.marsview.cc
diff --git a/packages/editor/index.html b/packages/editor/index.html
@@ -1,13 +1,14 @@
 <!DOCTYPE html>
-<html lang="en" data-van-env="stg" data-van-project="mars">
+<html lang="en">
   <head>
     <meta charset="UTF-8" />
-    <link rel="icon" type="image/svg+xml" href="/vite.svg" />
+    <link rel="icon" type="image/svg+xml" href="/imgs/mars-logo.png" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>Mars搭建平台</title>
+    <title>Marsview低代码平台</title>
     <link rel="preconnect" href="http://www.marsview.cc" />
     <link rel="preconnect" href="https://cdn.staticfile.net" />
     <link rel="preconnect" href="http://mars-api.marsview.cc" />
+    <link rel="preconnect" href="https://marsview.cdn.bcebos.com/" />
     <style>
       * {
         margin: 0;

diff --git a/packages/editor/package.json b/packages/editor/package.json
@@ -1,6 +1,6 @@
 {
   "private": true,
-  "name": "@mars/editor",
+  "name": "@marsview/editor",
   "scripts": {
     "dev": "vite",
     "start": "vite",
@@ -13,7 +13,7 @@
     "@bytemd/plugin-gfm": "^1.21.0",
     "@bytemd/plugin-highlight": "^1.21.0",
     "@bytemd/react": "^1.21.0",
-    "@mars/materials": "workspace:^",
+    "@marsview/materials": "workspace:^",
     "@monaco-editor/react": "^4.6.0",
     "allotment": "^1.19.5",
     "bytemd": "^1.21.0",

diff --git a/packages/editor/public/ahooks.js b/packages/editor/public/ahooks.js