diff --git a/template/native/initialize.ts b/template/native/initialize.ts index 4cd3ebe..4db22ce 100644 --- a/template/native/initialize.ts +++ b/template/native/initialize.ts @@ -1,7 +1,6 @@ import initialize from '@project/initialize'; import { createComponent } from '@project/page'; -import { host } from './configuration'; -const { features } = initialize('native', host); +const { features } = initialize(); Object.assign(global, { features, diff --git a/template/scripts/initServer.js b/template/scripts/initServer.js index 4724b55..0405b02 100644 --- a/template/scripts/initServer.js +++ b/template/scripts/initServer.js @@ -1,7 +1,4 @@ const { initialize } = require('@xuchangzju/oak-cli/lib/server/initialize'); -const { - BackendRuntimeContext, -} = require('../lib/context/BackendRuntimeContext'); const pwd = process.cwd(); diff --git a/template/web/src/AppError.tsx b/template/web/src/AppError.tsx index 222e277..f59eac7 100644 --- a/template/web/src/AppError.tsx +++ b/template/web/src/AppError.tsx @@ -8,9 +8,7 @@ import { OakServerProxyException, } from 'oak-domain/lib/types/Exception'; import { ECode } from 'oak-frontend-base/es/types/ErrorPage'; -const ErrorPage = lazy( - () => import('oak-frontend-base/es/components/errorPage') -); +const ErrorPage = lazy(() => import('oak-frontend-base/es/components/errorPage')); interface ErrorProps { error: any; diff --git a/template/web/src/AppRouter.tsx b/template/web/src/AppRouter.tsx index d58fdd1..f9581f1 100644 --- a/template/web/src/AppRouter.tsx +++ b/template/web/src/AppRouter.tsx @@ -2,7 +2,7 @@ import React from 'react'; import { Routes, Route, Outlet, useLocation } from 'react-router-dom'; import { IRouter, IBrowserRouterProps, IMeta } from './types/router'; import routers from './app/routers'; -import Loading from './components/Loading'; +import Loading from './app/components/Loading'; import useFeatures from '@project/hooks/useFeatures'; type TRenderRoutes = ( diff --git a/template/web/src/components/Loading.tsx b/template/web/src/app/components/Loading.tsx similarity index 100% rename from template/web/src/components/Loading.tsx rename to template/web/src/app/components/Loading.tsx diff --git a/template/web/src/app/components/consoleHeader/index.ts b/template/web/src/app/components/header/index.ts similarity index 100% rename from template/web/src/app/components/consoleHeader/index.ts rename to template/web/src/app/components/header/index.ts diff --git a/template/web/src/app/components/consoleHeader/locales/zh_CN.json b/template/web/src/app/components/header/locales/zh_CN.json similarity index 100% rename from template/web/src/app/components/consoleHeader/locales/zh_CN.json rename to template/web/src/app/components/header/locales/zh_CN.json diff --git a/template/web/src/app/components/consoleHeader/web.pc.module.less b/template/web/src/app/components/header/web.pc.module.less similarity index 100% rename from template/web/src/app/components/consoleHeader/web.pc.module.less rename to template/web/src/app/components/header/web.pc.module.less diff --git a/template/web/src/app/components/consoleHeader/web.pc.tsx b/template/web/src/app/components/header/web.pc.tsx similarity index 100% rename from template/web/src/app/components/consoleHeader/web.pc.tsx rename to template/web/src/app/components/header/web.pc.tsx diff --git a/template/web/src/app/components/consoleHeader/web.tsx b/template/web/src/app/components/header/web.tsx similarity index 100% rename from template/web/src/app/components/consoleHeader/web.tsx rename to template/web/src/app/components/header/web.tsx diff --git a/template/web/src/app/namespaces/console/index.tsx b/template/web/src/app/namespaces/console/index.tsx index 4dafa34..ca083d8 100644 --- a/template/web/src/app/namespaces/console/index.tsx +++ b/template/web/src/app/namespaces/console/index.tsx @@ -1,7 +1,7 @@ import React, { useEffect, useState } from 'react'; import { Routes, Route, Outlet, useLocation } from 'react-router-dom'; -import Header from '../../components/consoleHeader'; +import Header from '../../components/header'; import Styles from './web.pc.module.less'; import useFeatures from '@project/hooks/useFeatures'; // import Menu from '@project/components/console/menu'; diff --git a/template/web/src/app/routers/allRoutersTemplate.ts b/template/web/src/app/routers/allRoutersTemplate.ts deleted file mode 100644 index 2a314cd..0000000 --- a/template/web/src/app/routers/allRoutersTemplate.ts +++ /dev/null @@ -1,5 +0,0 @@ -"use oak router builder"; // 这行备注说明是用oak的router builder来生成allRouters -import React from 'react'; -import { IRouter } from '../../types/router'; -let allRouters: IRouter[] = []; -export default allRouters; diff --git a/template/wechatMp/src/initialize.ts b/template/wechatMp/src/initialize.ts index 5637202..6d5e66e 100644 --- a/template/wechatMp/src/initialize.ts +++ b/template/wechatMp/src/initialize.ts @@ -1,12 +1,8 @@ import initialize from '@project/initialize'; import { createComponent } from '@project/page'; -import { host } from './configuration'; -import { getAppType } from './utils/env'; -const appType = getAppType(); - -const { features } = initialize(appType, host); +const { features } = initialize(); Object.assign(global, { features,