diff --git a/src/rename.ts b/src/rename.ts index 1f2d04f..d29ece3 100644 --- a/src/rename.ts +++ b/src/rename.ts @@ -27,12 +27,6 @@ export async function renameProject(dir: string, name: string, title: string, pl const newHtmlContent = htmlContent.replace(new RegExp(placeholderTitle, 'g'), title).replace(new RegExp(placeholderTitle.toLowerCase(), 'g'), title.toLowerCase()); writeFileSync(htmlFilePath, newHtmlContent, 'utf-8'); - // index.tsx下的title - const indexTsxPath = join(dir, 'web', 'src/index.tsx'); - const tsxContent = readFileSync(indexTsxPath, 'utf-8'); - const newTsxlContent = tsxContent.replace(new RegExp(placeholderName, 'g'), name).replace(new RegExp(placeholderName.toLowerCase(), 'g'), name.toLowerCase()); - writeFileSync(indexTsxPath, newTsxlContent, 'utf-8'); - // replace wechatMp下project.config.json中的projectname // todo,现在这个是在wechatMp/src目录下的,可能是搞错了,待修正 const pcjFilePath = join(dir, 'wechatMp', 'src', 'project.config.json'); diff --git a/template/src/components/login/index.json b/template/src/components/login/index.json new file mode 100644 index 0000000..9e26dfe --- /dev/null +++ b/template/src/components/login/index.json @@ -0,0 +1 @@ +{} \ No newline at end of file diff --git a/template/src/components/login/index.ts b/template/src/components/login/index.ts new file mode 100644 index 0000000..c5971b4 --- /dev/null +++ b/template/src/components/login/index.ts @@ -0,0 +1 @@ +export default OakComponent({}); \ No newline at end of file diff --git a/template/src/components/login/index.xml b/template/src/components/login/index.xml new file mode 100644 index 0000000..f029c5e --- /dev/null +++ b/template/src/components/login/index.xml @@ -0,0 +1 @@ +edit components/login/index.xml \ No newline at end of file diff --git a/template/src/components/login/web.module.less b/template/src/components/login/web.module.less new file mode 100644 index 0000000..74ea662 --- /dev/null +++ b/template/src/components/login/web.module.less @@ -0,0 +1,6 @@ +.container { + height: 100%; + display: flex; + align-items: center; + justify-content: center; +} \ No newline at end of file diff --git a/template/src/components/login/web.pc.module.less b/template/src/components/login/web.pc.module.less new file mode 100644 index 0000000..74ea662 --- /dev/null +++ b/template/src/components/login/web.pc.module.less @@ -0,0 +1,6 @@ +.container { + height: 100%; + display: flex; + align-items: center; + justify-content: center; +} \ No newline at end of file diff --git a/template/src/components/login/web.pc.tsx b/template/src/components/login/web.pc.tsx new file mode 100644 index 0000000..bbda0e0 --- /dev/null +++ b/template/src/components/login/web.pc.tsx @@ -0,0 +1,13 @@ +import React from 'react'; +import { WebComponentProps } from 'oak-frontend-base'; +import { EntityDict } from '@project/oak-app-domain'; +import Styles from './web.pc.module.less'; + +export default function render(props: WebComponentProps) { + const { t, navigateTo } = props.methods; + return ( +
+ edit src/components/login/web.pc.tsx +
+ ); +} \ No newline at end of file diff --git a/template/src/components/login/web.tsx b/template/src/components/login/web.tsx new file mode 100644 index 0000000..a471e3b --- /dev/null +++ b/template/src/components/login/web.tsx @@ -0,0 +1,11 @@ +import React from 'react'; +import { ErrorBlock, Space } from 'antd-mobile'; +import Styles from './web.module.less'; + +export default function render() { + return ( +
+ edit src/components/login/web.tsx +
+ ); +} \ No newline at end of file diff --git a/template/src/pages/frontend/home/index.json b/template/src/pages/frontend/home/index.json new file mode 100644 index 0000000..9e26dfe --- /dev/null +++ b/template/src/pages/frontend/home/index.json @@ -0,0 +1 @@ +{} \ No newline at end of file diff --git a/template/src/pages/frontend/home/index.ts b/template/src/pages/frontend/home/index.ts new file mode 100644 index 0000000..c5971b4 --- /dev/null +++ b/template/src/pages/frontend/home/index.ts @@ -0,0 +1 @@ +export default OakComponent({}); \ No newline at end of file diff --git a/template/src/pages/frontend/home/locales/zh-CN.json b/template/src/pages/frontend/home/locales/zh-CN.json new file mode 100644 index 0000000..883376c --- /dev/null +++ b/template/src/pages/frontend/home/locales/zh-CN.json @@ -0,0 +1,5 @@ +{ + "notFound": "页面不存在", + "desc": "本页面路由并不存在,请合法访问", + "back": "回首页" +} \ No newline at end of file diff --git a/template/src/pages/frontend/home/web.module.less b/template/src/pages/frontend/home/web.module.less new file mode 100644 index 0000000..74ea662 --- /dev/null +++ b/template/src/pages/frontend/home/web.module.less @@ -0,0 +1,6 @@ +.container { + height: 100%; + display: flex; + align-items: center; + justify-content: center; +} \ No newline at end of file diff --git a/template/src/pages/frontend/home/web.pc.module.less b/template/src/pages/frontend/home/web.pc.module.less new file mode 100644 index 0000000..74ea662 --- /dev/null +++ b/template/src/pages/frontend/home/web.pc.module.less @@ -0,0 +1,6 @@ +.container { + height: 100%; + display: flex; + align-items: center; + justify-content: center; +} \ No newline at end of file diff --git a/template/src/pages/frontend/home/web.pc.tsx b/template/src/pages/frontend/home/web.pc.tsx new file mode 100644 index 0000000..f8a8477 --- /dev/null +++ b/template/src/pages/frontend/home/web.pc.tsx @@ -0,0 +1,13 @@ +import React from 'react'; +import { WebComponentProps } from 'oak-frontend-base'; +import { EntityDict } from '@project/oak-app-domain'; +import Styles from './web.pc.module.less'; + +export default function render(props: WebComponentProps) { + const { t, navigateTo } = props.methods; + return ( +
+ edit src/pages/home/web.pc.tsx +
+ ); +} \ No newline at end of file diff --git a/template/src/pages/frontend/home/web.tsx b/template/src/pages/frontend/home/web.tsx new file mode 100644 index 0000000..7f3740a --- /dev/null +++ b/template/src/pages/frontend/home/web.tsx @@ -0,0 +1,11 @@ +import React from 'react'; +import { ErrorBlock, Space } from 'antd-mobile'; +import Styles from './web.module.less'; + +export default function render() { + return ( +
+ edit src/pages/home/web.tsx +
+ ); +} \ No newline at end of file diff --git a/template/src/pages/frontend/login/index.json b/template/src/pages/frontend/login/index.json new file mode 100644 index 0000000..7c9dc99 --- /dev/null +++ b/template/src/pages/frontend/login/index.json @@ -0,0 +1,6 @@ +{ + "enablePullDownRefresh": false, + "usingComponents": { + "login": "@project/components/login/index" + } +} \ No newline at end of file diff --git a/template/src/pages/frontend/login/index.less b/template/src/pages/frontend/login/index.less new file mode 100644 index 0000000..3ce01ef --- /dev/null +++ b/template/src/pages/frontend/login/index.less @@ -0,0 +1,7 @@ +.container { + display: flex; + width: 100%; + height: 100%; + align-items: center; + justify-content: center; +} \ No newline at end of file diff --git a/template/src/pages/frontend/login/index.ts b/template/src/pages/frontend/login/index.ts new file mode 100644 index 0000000..4bc3e67 --- /dev/null +++ b/template/src/pages/frontend/login/index.ts @@ -0,0 +1,2 @@ +export default OakComponent({ +}); diff --git a/template/src/pages/frontend/login/index.xml b/template/src/pages/frontend/login/index.xml new file mode 100644 index 0000000..c835475 --- /dev/null +++ b/template/src/pages/frontend/login/index.xml @@ -0,0 +1,3 @@ + \ No newline at end of file diff --git a/template/src/pages/frontend/login/locales/zh_CN.json b/template/src/pages/frontend/login/locales/zh_CN.json new file mode 100644 index 0000000..e76ebce --- /dev/null +++ b/template/src/pages/frontend/login/locales/zh_CN.json @@ -0,0 +1,3 @@ +{ + "pageTitle": "登录" +} \ No newline at end of file diff --git a/template/src/pages/frontend/login/mobile.module.less b/template/src/pages/frontend/login/mobile.module.less new file mode 100644 index 0000000..fabedb4 --- /dev/null +++ b/template/src/pages/frontend/login/mobile.module.less @@ -0,0 +1,7 @@ +.container { + height: 100%; + display: flex; + align-items: center; + justify-content: center; + padding: 10px; +} \ No newline at end of file diff --git a/template/src/pages/frontend/login/pc.module.less b/template/src/pages/frontend/login/pc.module.less new file mode 100644 index 0000000..5f6625d --- /dev/null +++ b/template/src/pages/frontend/login/pc.module.less @@ -0,0 +1,7 @@ +.container { + height: 100%; + display: flex; + align-items: center; + justify-content: center; + padding: 22px; +} \ No newline at end of file diff --git a/template/src/pages/frontend/login/web.pc.tsx b/template/src/pages/frontend/login/web.pc.tsx new file mode 100644 index 0000000..6d0dd9b --- /dev/null +++ b/template/src/pages/frontend/login/web.pc.tsx @@ -0,0 +1,11 @@ +import React from 'react'; +import Login from '@project/components/login'; +import Styles from './pc.module.less'; + +export default function Render() { + return ( +
+ +
+ ) +} \ No newline at end of file diff --git a/template/src/pages/frontend/login/web.tsx b/template/src/pages/frontend/login/web.tsx new file mode 100644 index 0000000..6d0dd9b --- /dev/null +++ b/template/src/pages/frontend/login/web.tsx @@ -0,0 +1,11 @@ +import React from 'react'; +import Login from '@project/components/login'; +import Styles from './pc.module.less'; + +export default function Render() { + return ( +
+ +
+ ) +} \ No newline at end of file diff --git a/template/src/pages/frontend/result/notFound/index.json b/template/src/pages/frontend/result/notFound/index.json new file mode 100644 index 0000000..9e26dfe --- /dev/null +++ b/template/src/pages/frontend/result/notFound/index.json @@ -0,0 +1 @@ +{} \ No newline at end of file diff --git a/template/src/pages/frontend/result/notFound/index.ts b/template/src/pages/frontend/result/notFound/index.ts new file mode 100644 index 0000000..c5971b4 --- /dev/null +++ b/template/src/pages/frontend/result/notFound/index.ts @@ -0,0 +1 @@ +export default OakComponent({}); \ No newline at end of file diff --git a/template/src/pages/frontend/result/notFound/locales/zh-CN.json b/template/src/pages/frontend/result/notFound/locales/zh-CN.json new file mode 100644 index 0000000..883376c --- /dev/null +++ b/template/src/pages/frontend/result/notFound/locales/zh-CN.json @@ -0,0 +1,5 @@ +{ + "notFound": "页面不存在", + "desc": "本页面路由并不存在,请合法访问", + "back": "回首页" +} \ No newline at end of file diff --git a/template/src/pages/frontend/result/notFound/web.module.less b/template/src/pages/frontend/result/notFound/web.module.less new file mode 100644 index 0000000..74ea662 --- /dev/null +++ b/template/src/pages/frontend/result/notFound/web.module.less @@ -0,0 +1,6 @@ +.container { + height: 100%; + display: flex; + align-items: center; + justify-content: center; +} \ No newline at end of file diff --git a/template/src/pages/frontend/result/notFound/web.pc.module.less b/template/src/pages/frontend/result/notFound/web.pc.module.less new file mode 100644 index 0000000..74ea662 --- /dev/null +++ b/template/src/pages/frontend/result/notFound/web.pc.module.less @@ -0,0 +1,6 @@ +.container { + height: 100%; + display: flex; + align-items: center; + justify-content: center; +} \ No newline at end of file diff --git a/template/src/pages/frontend/result/notFound/web.pc.tsx b/template/src/pages/frontend/result/notFound/web.pc.tsx new file mode 100644 index 0000000..d0dfd4e --- /dev/null +++ b/template/src/pages/frontend/result/notFound/web.pc.tsx @@ -0,0 +1,28 @@ +import React from 'react'; +import { Button, Result } from 'antd'; +import { WebComponentProps } from 'oak-frontend-base'; +import { EntityDict } from '@project/oak-app-domain'; +import Styles from './web.pc.module.less'; + +export default function render(props: WebComponentProps) { + const { t, navigateTo } = props.methods; + return ( +
+ navigateTo({ + url: '/', + })} + > + {t('back')} + + } + /> +
+ ); +} \ No newline at end of file diff --git a/template/src/pages/frontend/result/notFound/web.tsx b/template/src/pages/frontend/result/notFound/web.tsx new file mode 100644 index 0000000..5ea103d --- /dev/null +++ b/template/src/pages/frontend/result/notFound/web.tsx @@ -0,0 +1,11 @@ +import React from 'react'; +import { ErrorBlock, Space } from 'antd-mobile'; +import Styles from './web.module.less'; + +export default function render() { + return ( +
+ +
+ ); +} \ No newline at end of file diff --git a/template/web/src/app/components/consoleHeader/index.tsx b/template/web/src/app/components/consoleHeader/index.tsx index 9b5de4b..4706971 100644 --- a/template/web/src/app/components/consoleHeader/index.tsx +++ b/template/web/src/app/components/consoleHeader/index.tsx @@ -29,18 +29,15 @@ export default function render() { className={Styles.logo} onClick={() => { features.navigator.namespace = ""; - features.navigator.navigateTo({ - url: "/home", - }); + features.navigator.navigateTo( + { + url: "/", + }, + undefined, + true + ); }} > - {/* */}
{features.locales.t('common::name')}
@@ -72,27 +69,27 @@ export default function render() { - setOpen(false)} - destroyOnClose={true} - footer={ - - } - closeIcon={null} - > - { - setOpen(false) - }} - /> - + setOpen(false)} + destroyOnClose={true} + footer={ + + } + closeIcon={null} + > + { + setOpen(false) + }} + /> + ); } diff --git a/template/web/src/app/components/consoleHeader/web.pc.module.less b/template/web/src/app/components/consoleHeader/web.pc.module.less index ba43e6c..a1d5c50 100644 --- a/template/web/src/app/components/consoleHeader/web.pc.module.less +++ b/template/web/src/app/components/consoleHeader/web.pc.module.less @@ -5,7 +5,6 @@ flex-direction: row; align-items: center; .logo { - width: 160px; display: flex; cursor: pointer; align-items: center; diff --git a/template/web/src/app/components/footer/index.tsx b/template/web/src/app/components/footer/index.tsx index bb519a0..893f2bc 100644 --- a/template/web/src/app/components/footer/index.tsx +++ b/template/web/src/app/components/footer/index.tsx @@ -1,22 +1,18 @@ import React from 'react'; -import { Layout } from 'antd'; import Style from './index.module.less'; import useFeatures from '@project/hooks/useFeatures'; -const { Footer } = Layout; export default function Render() { const features = useFeatures(); return ( -
-
- - Copyright © {new Date().getFullYear()}{' '} - {features.locales.t('copyright')} - -
-
+
+ + Copyright © {new Date().getFullYear()}{' '} + {features.locales.t('copyright')} + +
); } diff --git a/template/web/src/app/components/header/index.ts b/template/web/src/app/components/header/index.ts index cce5d5d..095f4a6 100644 --- a/template/web/src/app/components/header/index.ts +++ b/template/web/src/app/components/header/index.ts @@ -1,11 +1,4 @@ export default OakComponent({ isList: false, - formData({ features }) { - return { - loggedIn: '', - avatar: '', - modeTitle: '控制台', - }; - }, features: ['console'], }) \ No newline at end of file diff --git a/template/web/src/app/components/header/locales/zh_CN.json b/template/web/src/app/components/header/locales/zh_CN.json index ea480d8..f4332c6 100644 --- a/template/web/src/app/components/header/locales/zh_CN.json +++ b/template/web/src/app/components/header/locales/zh_CN.json @@ -1 +1,3 @@ -{"name":"Oak模板项目", "close": "关闭","modeUnset": "取消设置"} \ No newline at end of file +{ + "console": "控制台" +} \ No newline at end of file diff --git a/template/web/src/app/components/header/web.pc.module.less b/template/web/src/app/components/header/web.pc.module.less index c454b12..730cfaf 100644 --- a/template/web/src/app/components/header/web.pc.module.less +++ b/template/web/src/app/components/header/web.pc.module.less @@ -9,7 +9,10 @@ .home { font-size: 22px; - font-weight: bold; + font-weight: bolder; + color: var(--oak-color-primary); + margin-left: 15px; + font-family: 中文黑体; } .right{ diff --git a/template/web/src/app/components/header/web.pc.tsx b/template/web/src/app/components/header/web.pc.tsx index 20e03b2..4f2d95e 100644 --- a/template/web/src/app/components/header/web.pc.tsx +++ b/template/web/src/app/components/header/web.pc.tsx @@ -16,10 +16,7 @@ export default function Render(props: WebComponentProps< modeTitle?: string; } >) { - const { modeTitle, avatar } = props.data; const { t, navigateTo } = props.methods; - const location = useLocation(); - const [open, setOpen] = useState(false); return ( @@ -31,26 +28,27 @@ export default function Render(props: WebComponentProps< { url: '/', }, - undefined, - true ); }} >
- {t('name')} + {t('common::name')}
diff --git a/template/web/src/app/namespaces/frontend/index.json b/template/web/src/app/namespaces/frontend/index.json index 3b13099..e70b3e5 100644 --- a/template/web/src/app/namespaces/frontend/index.json +++ b/template/web/src/app/namespaces/frontend/index.json @@ -1,4 +1,5 @@ { "path": "/", - "first": "/" + "first": "/home", + "notFound": "/result/notFound" } \ No newline at end of file diff --git a/template/web/src/app/namespaces/frontend/index.ts b/template/web/src/app/namespaces/frontend/index.ts new file mode 100644 index 0000000..c5971b4 --- /dev/null +++ b/template/web/src/app/namespaces/frontend/index.ts @@ -0,0 +1 @@ +export default OakComponent({}); \ No newline at end of file diff --git a/template/web/src/app/namespaces/frontend/locales/zh-CN.json b/template/web/src/app/namespaces/frontend/locales/zh-CN.json new file mode 100644 index 0000000..f4332c6 --- /dev/null +++ b/template/web/src/app/namespaces/frontend/locales/zh-CN.json @@ -0,0 +1,3 @@ +{ + "console": "控制台" +} \ No newline at end of file diff --git a/template/web/src/app/namespaces/frontend/web.module.less b/template/web/src/app/namespaces/frontend/web.module.less new file mode 100644 index 0000000..79aef90 --- /dev/null +++ b/template/web/src/app/namespaces/frontend/web.module.less @@ -0,0 +1,14 @@ +.container { + height: 100%; + display: flex; + flex-direction: column; + + .content { + flex: 1; + } + + .footer { + padding: 22px; + background-color: var(--oak-bg-color-component); + } +} \ No newline at end of file diff --git a/template/web/src/app/namespaces/frontend/web.pc.module.less b/template/web/src/app/namespaces/frontend/web.pc.module.less new file mode 100644 index 0000000..15eaa21 --- /dev/null +++ b/template/web/src/app/namespaces/frontend/web.pc.module.less @@ -0,0 +1,22 @@ +.container { + height: 100%; + + .header { + background-color: var(--oak-bg-color-container); + padding: 0; + } + + .content { + background-color: var(--oak-bg-color-page); + padding: 2px 140px; + + .page { + background-color: var(--oak-bg-color-container); + height: 100%; + } + } + + .footer { + background-color: var(--oak-bg-color-container); + } +} \ No newline at end of file diff --git a/template/web/src/app/namespaces/frontend/web.pc.tsx b/template/web/src/app/namespaces/frontend/web.pc.tsx new file mode 100644 index 0000000..d212dc4 --- /dev/null +++ b/template/web/src/app/namespaces/frontend/web.pc.tsx @@ -0,0 +1,27 @@ + +import React from 'react'; +import { Flex, Layout } from 'antd'; +import Styles from './web.pc.module.less'; + +const { Header, Footer, Content } = Layout; +import { Outlet, Route } from 'react-router-dom'; +import FrontHeader from '../../components/header'; +import FrontFooter from '../../components/footer'; + +export default function render() { + return ( + +
+ +
+ +
+ +
+
+
+ +
+
+ ); +} \ No newline at end of file diff --git a/template/web/src/app/namespaces/frontend/web.tsx b/template/web/src/app/namespaces/frontend/web.tsx new file mode 100644 index 0000000..1ccd137 --- /dev/null +++ b/template/web/src/app/namespaces/frontend/web.tsx @@ -0,0 +1,20 @@ + +import React from 'react'; +import { Outlet, Route } from 'react-router-dom'; +import FrontHeader from '../../components/header'; +import FrontFooter from '../../components/footer'; +import Styles from './web.module.less'; + +export default function render() { + return ( +
+ +
+ +
+
+ +
+
+ ); +} \ No newline at end of file diff --git a/template/web/src/index.tsx b/template/web/src/index.tsx index 75e1e76..fe3247d 100644 --- a/template/web/src/index.tsx +++ b/template/web/src/index.tsx @@ -34,7 +34,7 @@ const init = async () => { error = err; } - initialize(features, 'oak_template', routers, undefined, error); + initialize(features, 'bm-smart', routers, undefined, error); }; init(); \ No newline at end of file