free-sun
/
FS-IOT
16
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

microApp

release_1.3.0
巴林闲侠 3 years ago
parent
3b4e90c91c
commit
4086422ed2
19 changed files with 178 additions and 70 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      code/VideoAccess-VCMP/web/client/index.ejs
  2. 6
      code/VideoAccess-VCMP/web/client/index.html
  3. 6
      code/VideoAccess-VCMP/web/client/src/index.jsx
  4. 6
      code/VideoAccess-VCMP/web/client/src/layout/index.jsx
  5. 5
      code/VideoAccess-VCMP/web/client/src/public-path.js
  6. 1
      code/VideoAccess-VCMP/web/client/src/sections/equipmentWarehouse/containers/camera.jsx
  7. 5
      code/VideoAccess-VCMP/web/client/src/sections/microApp/actions/index.js
  8. 5
      code/VideoAccess-VCMP/web/client/src/sections/microApp/containers/index.js
  9. 24
      code/VideoAccess-VCMP/web/client/src/sections/microApp/containers/microApp.jsx
  10. 15
      code/VideoAccess-VCMP/web/client/src/sections/microApp/index.js
  11. 13
      code/VideoAccess-VCMP/web/client/src/sections/microApp/nav-item.jsx
  12. 5
      code/VideoAccess-VCMP/web/client/src/sections/microApp/reducers/index.js
  13. 12
      code/VideoAccess-VCMP/web/client/src/sections/microApp/routes.js
  14. 2
      code/VideoAccess-VCMP/web/client/src/sections/offline/containers/statuscode.jsx
  15. 17
      code/VideoAccess-VCMP/web/middlewares/webpack-dev.js
  16. 5
      code/VideoAccess-VCMP/web/package.json
  17. 3
      code/VideoAccess-VCMP/web/webpack.config.js

2
code/VideoAccess-VCMP/web/client/index.ejs
View File

@ -11,7 +11,7 @@
</head> </head>
<body> <body>
<div id='App'></div> <div id='VcmpApp'></div>
</body> </body>
</html> </html>

6
code/VideoAccess-VCMP/web/client/index.html
View File

@ -11,12 +11,12 @@
</head> </head>
<body> <body>
<div id='App'></div> <div id='VcmpApp'></div>
<!-- Webpack --> <!-- Webpack -->
<script type="text/javascript" src="http://localhost:5001/client/build/app.js"></script> <script type="text/javascript" src="http://localhost:5001/client/build/app.js"></script>
<!-- Vite --> <!-- Vite -->
<script type="module"> <!-- <script type="module">
import RefreshRuntime from "http://localhost:5002/@react-refresh" import RefreshRuntime from "http://localhost:5002/@react-refresh"
RefreshRuntime.injectIntoGlobalHook(window) RefreshRuntime.injectIntoGlobalHook(window)
window.$RefreshReg$ = () => { } window.$RefreshReg$ = () => { }
@ -24,7 +24,7 @@
window.__vite_plugin_react_preamble_installed__ = true window.__vite_plugin_react_preamble_installed__ = true
const global = window const global = window
</script> </script>
<script type="module" src="http://localhost:5002/src/index.jsx"></script> <script type="module" src="http://localhost:5002/src/index.jsx"></script> -->
<!-- Vite End --> <!-- Vite End -->
<script> <script>
//过滤掉一些无用的警告、没有价值的报错 //过滤掉一些无用的警告、没有价值的报错

6
code/VideoAccess-VCMP/web/client/src/index.jsx
View File

@ -1,8 +1,12 @@
'use strict'; 'use strict';
import './public-path'
import React from 'react'; import React from 'react';
import { render } from 'react-dom'; import { render } from 'react-dom';
import App from './app'; import App from './app';
import './index.less'; import './index.less';
import microApp from '@micro-zoe/micro-app'
render((<App projectName="飞尚物联" />), document.getElementById('App')); microApp.start()
render((<App projectName="飞尚物联" />), document.getElementById('VcmpApp'));

6
code/VideoAccess-VCMP/web/client/src/layout/index.jsx
View File

@ -6,7 +6,7 @@ import { Provider } from 'react-redux';
import { createBrowserHistory } from 'history'; import { createBrowserHistory } from 'history';
import { ConnectedRouter } from 'connected-react-router' import { ConnectedRouter } from 'connected-react-router'
import { Layout, NoMatch } from './containers'; import { Layout, NoMatch } from './containers';
import { Switch, Route } from "react-router-dom"; import { BrowserRouter, Switch, Route } from "react-router-dom";
import { ConfigProvider } from '@douyinfe/semi-ui'; import { ConfigProvider } from '@douyinfe/semi-ui';
import layoutActions from './actions'; import layoutActions from './actions';
import zhCN from '@douyinfe/semi-ui/lib/es/locale/source/zh_CN'; import zhCN from '@douyinfe/semi-ui/lib/es/locale/source/zh_CN';
@ -174,7 +174,9 @@ const Root = props => {
store ? store ?
<ConfigProvider locale={zhCN}> <ConfigProvider locale={zhCN}>
<Provider store={store}> <Provider store={store}>
<BrowserRouter basename={window.__MICRO_APP_BASE_ROUTE__ || '/'}>
<ConnectedRouter history={history}> <ConnectedRouter history={history}>
<Switch> <Switch>
{outerRoutes} {outerRoutes}
<Layout <Layout
@ -189,7 +191,9 @@ const Root = props => {
component={NoMatch} component={NoMatch}
/> />
</Switch> </Switch>
</ConnectedRouter> </ConnectedRouter>
</BrowserRouter>
</Provider> </Provider>
</ConfigProvider> </ConfigProvider>
: '' : ''

5
code/VideoAccess-VCMP/web/client/src/public-path.js
View File

@ -0,0 +1,5 @@
// __MICRO_APP_ENVIRONMENT__和__MICRO_APP_PUBLIC_PATH__是由micro-app注入的全局变量
if (window.__MICRO_APP_ENVIRONMENT__) {
// eslint-disable-next-line
__webpack_public_path__ = window.__MICRO_APP_PUBLIC_PATH__
}

1
code/VideoAccess-VCMP/web/client/src/sections/equipmentWarehouse/containers/camera.jsx
View File

@ -19,7 +19,6 @@ import CameraModal from "../components/cameraModal";
import RemarksModal from "../components/remarksModal"; import RemarksModal from "../components/remarksModal";
import { Setup } from "$components"; import { Setup } from "$components";
import SideSheets from "../components/sideSheet"; import SideSheets from "../components/sideSheet";
import { skeletonScreen } from "../../../components/skeletonScreen";
import { accessType } from "./nvr"; import { accessType } from "./nvr";
const CameraHeader = (props) => { const CameraHeader = (props) => {

5
code/VideoAccess-VCMP/web/client/src/sections/microApp/actions/index.js
View File

@ -0,0 +1,5 @@
'use strict';
export default {
}

5
code/VideoAccess-VCMP/web/client/src/sections/microApp/containers/index.js
View File

@ -0,0 +1,5 @@
'use strict';
import MicroApp from './microApp';
export { MicroApp };

24
code/VideoAccess-VCMP/web/client/src/sections/microApp/containers/microApp.jsx
View File

@ -0,0 +1,24 @@
import React, { useEffect } from 'react';
import { connect } from 'react-redux';
import { Spin, Card } from '@douyinfe/semi-ui';
import '../style.less'
const { Meta } = Card;
const Example = (props) => {
const { dispatch, actions, } = props
return (
<Spin>
MicroApp
</Spin>
)
}
function mapStateToProps (state) {
const { auth, global } = state;
return {
};
}
export default connect(mapStateToProps)(Example);

15
code/VideoAccess-VCMP/web/client/src/sections/microApp/index.js
View File

@ -0,0 +1,15 @@
'use strict';
import reducers from './reducers';
import routes from './routes';
import actions from './actions';
import { getNavItem } from './nav-item';
export default {
key: 'microApp',
name: 'MicroApp',
reducers: reducers,
routes: routes,
actions: actions,
getNavItem: getNavItem
};

13
code/VideoAccess-VCMP/web/client/src/sections/microApp/nav-item.jsx
View File

@ -0,0 +1,13 @@
import React from 'react';
import { IconCode } from '@douyinfe/semi-icons';
export function getNavItem (user, dispatch) {
return (
[
{
itemKey: 'MicroApp', text: 'MicroApp', icon: <IconCode />,
to: '/microApp',
},
]
);
}

5
code/VideoAccess-VCMP/web/client/src/sections/microApp/reducers/index.js
View File

@ -0,0 +1,5 @@
'use strict';
export default {
}

12
code/VideoAccess-VCMP/web/client/src/sections/microApp/routes.js
View File

@ -0,0 +1,12 @@
'use strict';
import { MicroApp, } from './containers';
export default [{
type: 'inner',
route: {
path: '/microApp',
key: 'microApp',
breadcrumb: 'microApp',
component: MicroApp,
}
}];

2
code/VideoAccess-VCMP/web/client/src/sections/offline/containers/statuscode.jsx
View File

@ -8,7 +8,6 @@ import {Setup} from "$components";
import ProgrammeModal from "../components/programmeModal"; import ProgrammeModal from "../components/programmeModal";
import NotesModal from "../components/notesModal"; import NotesModal from "../components/notesModal";
// import { skeletonScreen } from "../components/skeletonScreen";
export const accessType = { export const accessType = {
"yingshi": "萤石云", "yingshi": "萤石云",
@ -463,7 +462,6 @@ const Statuscode = (props) => {
</div> </div>
<Skeleton <Skeleton
loading={loading} loading={loading}
// placeholder={skeletonScreen()}
active={true} active={true}
> >
<Table <Table

17
code/VideoAccess-VCMP/web/middlewares/webpack-dev.js
View File

@ -29,8 +29,23 @@ module.exports = {
})); }));
const server = express(); const server = express();
server.use(middleware(compiler));
// server.use(require("webpack-hot-middleware")(compiler)); // server.use(require("webpack-hot-middleware")(compiler));
server.all("*", function (req, res, next) {
//设置允许跨域的域名，*代表允许任意域名跨域
res.header("Access-Control-Allow-Origin", "*");
//允许的header类型
res.header("Access-Control-Allow-Headers", "content-type");
//跨域允许的请求方式
res.header("Access-Control-Allow-Methods", "DELETE,PUT,POST,GET,OPTIONS");
if (req.method == 'OPTIONS')
res.sendStatus(200); //让options尝试请求快速结束
else
next();
});
server.use(middleware(compiler));
server.listen('5001', function (err) { server.listen('5001', function (err) {
if (err) { if (err) {
console.error(err); console.error(err);

5
code/VideoAccess-VCMP/web/package.json
View File

@ -10,7 +10,7 @@
"start-params": "node server -p 5000 -u http://localhost:4000 --apiVcmpUrl http://localhost:4000 --apiAuthUrl http://localhost:4200 --apiAnxinyunUrl http://localhost:4100 --iotAuthWeb http://localhost:5200 --iotVideoServer http://221.230.55.27:8081", "start-params": "node server -p 5000 -u http://localhost:4000 --apiVcmpUrl http://localhost:4000 --apiAuthUrl http://localhost:4200 --apiAnxinyunUrl http://localhost:4100 --iotAuthWeb http://localhost:5200 --iotVideoServer http://221.230.55.27:8081",
"deploy": "export NODE_ENV=production&& npm run build && node server", "deploy": "export NODE_ENV=production&& npm run build && node server",
"build-dev": "cross-env NODE_ENV=development&&webpack --config webpack.config.js", "build-dev": "cross-env NODE_ENV=development&&webpack --config webpack.config.js",
"build": "export NODE_ENV=production&&webpack --config webpack.config.prod.js" "build": "cross-env NODE_ENV=production&&webpack --config webpack.config.prod.js"
}, },
"keywords": [ "keywords": [
"app" "app"
@ -50,8 +50,9 @@
"@douyinfe/semi-ui": "^2.8.0", "@douyinfe/semi-ui": "^2.8.0",
"@douyinfe/semi-webpack-plugin": "^2.13.0", "@douyinfe/semi-webpack-plugin": "^2.13.0",
"@fs/attachment": "^1.0.0", "@fs/attachment": "^1.0.0",
"@micro-zoe/micro-app": "^1.0.0-alpha.1",
"@peace/components": "0.0.35", "@peace/components": "0.0.35",
"@peace/utils": "^0.0.48", "@peace/utils": "0.0.53",
"@semi-bot/semi-theme-fscamera": "^1.0.0", "@semi-bot/semi-theme-fscamera": "^1.0.0",
"@vitejs/plugin-react": "^1.3.1", "@vitejs/plugin-react": "^1.3.1",
"@vitejs/plugin-react-refresh": "^1.3.6", "@vitejs/plugin-react-refresh": "^1.3.6",

3
code/VideoAccess-VCMP/web/webpack.config.js
View File

@ -12,6 +12,9 @@ module.exports = {
devtool: 'source-map', devtool: 'source-map',
devServer: { devServer: {
historyApiFallback: true, historyApiFallback: true,
// 为 MicroApp 配置跨域
'Access-Control-Allow-Origin': '*',
allowedHosts: ['127.0.0.1:5100'],
}, },
entry: { entry: {
app: ["@babel/polyfill", PATHS.app] app: ["@babel/polyfill", PATHS.app]

Write Preview
Loading…
Cancel
Save