Merge branch 'dev_upgrade' of http://172.16.10.76/station/amos-convertor-view into develop_x

package.json

@@ -54,6 +54,7 @@
     "amos-build": "^3.x",
     "amos-framework": "^1.2.2",
     "amos-iot-3dgraph": "^1.0.0",
+    "amos-designer": "^1.x",
     "amos-iot-webstudio": "^1.0.4",
     "eslint-config-ray": "^1.0.26",
     "mockjs": "^1.0.1-beta3",

src/consts/imgStatic.js

@@ -152,7 +152,12 @@ export default {
     'blue-chang': '/src/assets/3dview/prePlan/jiaohuqu-2anniu-lan-chang.png',
     'yellow-chang': '/src/assets/3dview/prePlan/jiaohuqu-2anniu-cheng-chang.png',
     onlyOne: '/src/assets/3dview/prePlan/jiaohuqu-2anniu-cheng-chang.png'
-  }
+  },
+  main: {
+    user: require('./../assets/main/user.png'),
+    notice: require('./../assets/main/notice.png'),
+    setting: require('./../assets/main/setting.png')
+  },
 };
 
 export const marker3DIoncMapper = {

src/consts/securityConsts.js

+import { SysConsts } from 'amos-processor';
+
+/**
+ * 额外配置
+ */
+const security = {
+  USER: '__user__',
+  BIZ_PERMISSION: 'BIZ_PERMISSION'
+};
+
+const SecurityConsts = Object.assign({}, SysConsts, security);
+
+export const UNIFIED_PLATFORM = {
+  token: 'token',
+  /** 应用 key，平台应用填入 `AMOS_ADMIN` */
+  appKey: 'appKey',
+  /** 应用，平台的应用填入 `AMOS-WEB-ADMIN` */
+  product: 'product'
+};
+
+export default SecurityConsts;

src/consts/urlConsts.js

@@ -33,6 +33,7 @@ export const secExtUrl = {
   opSearchMenusUrl: completePrefix(securityBaseURI, 'permissionItem/searchPermission-tree?nodeName={nodeName}&type={type}'),
   // 根据父菜单 code 获取子菜单
   opSearchBizMenusUrl: completePrefix(securityBaseURI, 'permissionItem/searchSubmenuPermission/{code}'),
+  menusRoutesUrl: completePrefix(baseURI,'privilege/v1/permission/tree/me?menuAgent=WEB&permissionType=MENU,SUBMENU&path='),
 
   // 获取厂区集合 get
   regionListUrl: completePrefix(patrolURI, 'api/group/queryAuthCompanyLeaves'),
@@ -44,10 +45,7 @@ export const secExtUrl = {
   // 登陆用户系统权限菜单-
   permissionsMenusUrl: completePrefix(securityBaseURI, `privilege/${secExVerson}/permission/tree/role?roleSeq={roleSeq}`), 
 
-
-
-
-
+  loginOutUrl: completePrefix(baseURI,'privilege/v1/auth/token'), // 注销 delete
 
 };
 

src/entry/index.js

@@ -43,24 +43,17 @@ class App extends Component {
   }
 
   componentWillMount() {
-    debugger
     let token = LocationParam.getLocationParamByName('token');
     if (!token) {
-      // let systemMenu = JSON.parse(lsTool.read(sessionConsts.systemMenu));
-      // if (!systemMenu) {
-      //   window.location.href = loginURI;
-      //   return;
-      // }
-      // this.setState({ rootRoutes: rootRoutes(systemMenu), visible: true });
-      // return;
+      AmosAlert.error('警告', 'toke已失效!');
     }else{
       lsTool.write(SysConsts.token, token);
+      lsTool.write('token', token);
     }
 
     getSystemAllMenu().then(
       
       menus => {
-        debugger
         let systemMuens = this.filterSystemMenus(menus);
         let routeMenus = [];
         systemMuens.forEach(item => {

src/entry/index.prod.js

@@ -43,20 +43,19 @@ class App extends Component {
   }
 
   componentWillMount() {
-    debugger
     let token = LocationParam.getLocationParamByName('token');
     if (!token) {
      
-      AmosAlert.error('警告', err || 'toke已失效!');
+      AmosAlert.error('警告', 'toke已失效!');
       
     } else {
       lsTool.write(SysConsts.token, token);
+      lsTool.write('token', token);
     }
 
     getSystemAllMenu().then(
       
       menus => {
-        debugger
         let systemMuens = this.filterSystemMenus(menus);
         let routeMenus = [];
         systemMuens.forEach(item => {

src/routes/asyncRoutes.js

@@ -53,7 +53,6 @@ const onEnterValidate = (next, replace, callback) => {
     pathname
   });
   console.log('pathname|flag', pathname, flag);
-  debugger
   if (!flag ) {
     replace('/login');
   }

src/routes/calcRoutes.js

 
 const compeleteMenus = (pageCompontent) => {
-  debugger
   return function convertMenus(menus, resRoutes, level) {
     menus.map(menu => {
       if (menu.path) {
@@ -47,7 +46,6 @@ const filterGroupMenus = (routes, groups) => {
  * @return {object|array} group存在： { main: [...], other: [...] }, group 不存在: []
  */
 export default function calcRoutes(menus = [], pageCompontent, groups) {
-  debugger
   const _routes = [];
   if (menus && menus.length > 0) {
     compeleteMenus(pageCompontent)(menus, _routes, 1);

src/routes/customRoutes.js

@@ -11,7 +11,6 @@ import TextPlan from './../view/planMgmt/view/TextPlan';
 import PlanDrill from './../view/planMgmt/view/PlanDrill';
 import LeaderStruct from './../view/planMgmt/view/leaderStruct';
 
-
 /**
  * 系统自定义路由
  */
@@ -24,12 +23,11 @@ export const customRoutes = [
   { path: 'checkdetail', parent: 'patrolpoint', component: CheckDetail },
   { path: 'differentiateDetail', parent: 'biz', component: DifferentiateDetail },
   { path: 'leaderStruct', parent: 'biz', component: LeaderStruct },
-  { path: 'pubview', parent: 'planDrill', component: PlanDrill },
-  { path: 'textview', parent: 'planDrill', component: TextPlan },
+  // { path: 'pubview', parent: 'planDrill', component: PlanDrill },
+  // { path: 'textview', parent: 'planDrill', component: TextPlan },
   ...parseCusotmRoutes()
 ];
 
-
 /**
  * path mapping
  *

src/routes/index.js

 // @author ilex.h
 import RProgress from 'ray-progress';
+import { genOnRouteEnter, genOnRouteChange } from 'amos-designer/lib/utils/routerValidate';
 import PublishView from './../view/planMgmt/view';
 import AutoLogin from './../view/autoLogin/AutoLogin';
 import calcRoutes from './calcRoutes';
-import addCustomRoutes, { customRoutes, customRoutesPubView } from './customRoutes';
+import addCustomRoutes, { customRoutes } from './customRoutes';
 import pageCompontent, {
   RootView,
   Login,
@@ -22,7 +23,6 @@ const groups = [
 ];
 
 const injectRoutes = menus => {
-  debugger
   const { main = [], biz = [], console: consoleRoutes = [] } = calcRoutes(menus, pageCompontent, groups) || {};
   const mainChilds = addCustomRoutes(main);
   const bizChilds = addCustomRoutes(biz);
@@ -58,39 +58,19 @@ const injectRoutes = menus => {
   return routes;
 };
 
-const progressStart = () => {
-  RProgress.start();
-};
+const whiteList = ['login' ,'autologin' ,'signup'];
 
-const onEnterValidate = (next, replace, callback) => {
-  debugger
-  progressStart();
-  const pathname = next.location.pathname;
-  const flag = routerFilter({
-    filterPath: [].concat(signupRouters, 'login', '/autologin', 'conver/patrol','/biz/assessment/'),
-    pathname
-  });
-  console.log('pathname|flag', pathname, flag);
-  // if (!checkLogin() && flag ) {
-  //   replace('/login');
-  // }
-  if (!flag ) {
-    replace('/login');
-  }
-  callback();
-};
+const loginLink = '/login';
 
 const rootRoutes = menus => {
-  debugger
   return {
     path: '/',
-    //onEnter: onEnterValidate,
-    onChange: progressStart,
+    onEnter: genOnRouteEnter(whiteList, loginLink),
+    onChange: genOnRouteChange(whiteList, loginLink),
     indexRedirect: Login,
     indexRoute: {
-      // component: Login,
       onEnter(nextState, replace) {
-        replace('/login');
+        replace(loginLink);
       }
     },
     childRoutes: injectRoutes(menus)

src/services/securityService.js

@@ -4,14 +4,13 @@ import {
 } from 'amos-security/lib/services';
 
 import formatUrl from 'amos-processor/lib/utils/urlFormat';
+import { Store } from 'amos-tool';
 import { secExtUrl } from './../consts/urlConsts';
-import { commonGet, commonPost } from './../utils/request';
+import { commonGet, commonPost, commonDelete } from './../utils/request';
 import { FasSerUrl } from './../consts/urlConsts';
+import SecurityConsts from './../consts/securityConsts';
 
-// export const getMenusAction = () => {
-//   const url = formatUrl(secExtUrl.opSearchMenusUrl, { nodeName: '', type: window.V3DpermissionType });
-//   return opSearchMenusAction(url);
-// };
+const lsTool = Store.lsTool;
 
 export const getBizMenusAction = (parentKey) => {
   const url = formatUrl(secExtUrl.opSearchBizMenusUrl, { code: parentKey });
@@ -28,7 +27,16 @@ export const getSystemAllMenu = () => {
 };
 
 export const getCurrentUser = () => {
-  return commonGet(secExtUrl.currentUserUrl);
+  const user = getUser();
+  if (user) {
+    return new Promise(resolve => {
+      resolve(user);
+    });
+  }
+  return commonGet(secExtUrl.currentUserUrl).then(user => {
+    saveUser(user);
+    return user;
+  });
 };
 
 export const regionSelectAction = (body) => {
@@ -45,4 +53,70 @@ export const getSelectedOrgInfoAction = (id) => {
  */
 export const getPermissionsMenus = (roleSeq) => {
   return commonGet(formatUrl(secExtUrl.permissionsMenusUrl, { roleSeq }));
+};
+
+/**
+ * 获取Biz 用户 菜单
+ */
+export const currentUserBizPermissions = () => {
+  const perm = getBizPermissions();
+  if (perm) {
+    return new Promise(resolve => {
+      resolve(perm);
+    });
+  }
+  return commonGet(secExtUrl.menusRoutesUrl).then(perm => {
+    perm = perm.filter( e => e.frontComponent === "biz")
+    if(perm && perm.length > 0){
+      const bizMenu = perm[0].children;
+      saveBizPermissions(bizMenu);
+      return bizMenu;
+    }
+  });
+};
+
+export const getBizPermissions = () => {
+  const perm = lsTool.read(SecurityConsts.BIZ_PERMISSION);
+  if (perm){
+    return JSON.parse(perm);
+  }
+  return null;
+};
+
+export const saveBizPermissions = (perm) => {
+  lsTool.write(SecurityConsts.BIZ_PERMISSION, JSON.stringify(perm));
+};
+
+/**
+ * 获取当前用户信息
+ */
+export const currentUserAction = () => {
+  const user = getUser();
+  if (user) {
+    return new Promise(resolve => {
+      resolve(user);
+    });
+  }
+  return commonGet(secExtUrl.userInfoUrl).then(user => {
+    saveUser(user);
+    return user;
+  });
+};
+
+export const getUser = () => {
+  const user = lsTool.read(SecurityConsts.USER);
+  if (user){
+    return JSON.parse(user);
+  }
+  return null;
+};
+
+export const saveUser = (user) => {
+  lsTool.write(SecurityConsts.USER, JSON.stringify(user));
+};
+
+export const logoutAction = () => {
+  // 清空所有
+  lsTool.clearAll();
+  return commonDelete(secExtUrl.loginOutUrl);
 };
\ No newline at end of file

src/styles/view/biz/header.scss

@@ -5,7 +5,7 @@
     background: $core-color;
 
     .sys-tools {
-      display: none;
+      //display: none;
     }
 
     .header-row {

src/utils/payload.js

 export default function(data, delRequest){
   window.setLoading && window.setLoading(false);
   return new Promise((resolve, reject) => {
-    debugger
     if (data) {
       if (data.dataList || data.dataList === null){
         if(data.result==='SUCCESS'){

src/utils/request.js

@@ -28,7 +28,6 @@ const compleHeaders = () => {
  * 获取 token
  */
 const getToken = () => {
-  debugger
   return lsTool.read(SysConsts.token);
 }
 

src/view/3dview/datapane/setting/UserSetting.js

@@ -43,14 +43,12 @@ class UserSetting extends Component {
     this.getSelectedOrgInfo();
   }
   componentWillReceiveProps(nextProps) {
-    debugger
     if (nextProps.isLoginout) {
       browserHistory.push('/login');
     }
   }
 
   getSelectedOrgInfo =()=>{
-    debugger
     getSelectedOrgInfoAction().then(data=>{
       // const { user } = this.state;
       // user.company = data.company;

src/view/3dview/points/markers/StatisticsMarkerIcon.js

@@ -29,7 +29,6 @@ class StatisticsMarkerIcon extends Component {
   };
 
   renderTitle = statistics => {
-    // debugger
     const style = {
       background: `url(${getIcon(statistics.level)}) no-repeat`,
       backgroundSize: 'contain'

src/view/autoLogin/AutoLogin.js

@@ -37,7 +37,6 @@ class AutoLogin extends Component {
   // }
 
   componentWillMount() {
-    debugger
     let token = LocationParam.getLocationParamByName('token');
     if (token) {
       browserHistory.push('/region');

src/view/mainframe/BizFrame.js

 import React, { Component } from 'react';
 import { browserHistory } from 'amos-react-router';
 import { utils, Store } from 'amos-tool';
-import MainFrame from '../common/mainframe';
+// import MainFrame from '../common/mainframe';
+import { MainFrame } from 'amos-designer';
 import formatUrl from 'amos-processor/lib/utils/urlFormat';
-import { Connect, IFrame } from 'amos-framework';
+import { Connect, IFrame, Toast, Menu } from 'amos-framework';
 import PropTypes from 'prop-types';
 import storageConsts, { CONSTS } from './../../consts/storageConsts';
 import { secExtUrl, SecurityUrl, getOutterURL } from './../../consts/urlConsts';
 import { pathMapping } from './../../routes/customRoutes';
+import { getCurrentUser, currentUserBizPermissions, logoutAction } from './../../services/securityService'
+import imgStatic from './../../consts/imgStatic';
+
 import '../../styles/view/mainframe/mainframe.scss';
 
 
 const enhanceStorage = Connect.enhanceStorage;
 const lsTool = Store.lsTool;
 
-
+const MenuItem = Menu.Item;
 
 @enhanceStorage({
   storageItems: storageConsts(CONSTS)
@@ -147,7 +151,6 @@ class BizFrame extends Component {
 
 
   getFrameConfig = () => {
-    debugger
     return {
       opSearchMenusUrl: formatUrl(secExtUrl.opSearchMenusUrl, { nodeName: '', type: window.BizPermissionType }),
       defaultLink: '/biz',
@@ -158,18 +161,35 @@ class BizFrame extends Component {
   getSysToolProps = () => {
     return {
       userPic: require('./../../assets/user/normal.png'),
-      loginOutUrl: SecurityUrl.loginOutUrl,
-      userInfoLink: '/main/securityConfig',
-      userExtra: true,
-      height: '350px'
+      // userExtra: true,
+      loginLink: '/login',
+      currentUserAction:getCurrentUser,
+      // 自行处理注销
+      handleLogout: this.handleLogOut
     };
   };
 
+  handleLogOut = () => {
+    logoutAction().then(d => {
+      browserHistory.push('/login');
+      Toast.success({
+        title: '注销成功'
+      });
+    }, err => {
+      Toast.error({
+        title: '错误',
+        cotnent: err || '注销错误！'
+      });
+      browserHistory.push('/login');
+    });
+  };
+
   render() {
     const frameConfig = this.getFrameConfig();
     const sysToolPorps = this.getSysToolProps();
     const { siderMenusList, selectedSubMenuKey, showPrePlan } = this.state;
     const url = formatUrl(getOutterURL('prePlan'));
+
     if (showPrePlan) {
       return (
         <IFrame
@@ -182,15 +202,22 @@ class BizFrame extends Component {
           scrolling="auto"
         />);
     } else {
-      return (<MainFrame
-        {...frameConfig}
-        onMenuLoadCompleted={this.openDefaultPage}
-        sysToolPorps={sysToolPorps}
-        siderMenusList={siderMenusList}
-        selectedSubMenuKey={selectedSubMenuKey}
-        // menuWidth="160px"
+      return (
+      // <MainFrame
+      //   {...frameConfig}
+      //   onMenuLoadCompleted={this.openDefaultPage}
+      //   sysToolPorps={sysToolPorps}
+      //   siderMenusList={siderMenusList}
+      //   selectedSubMenuKey={selectedSubMenuKey}
+      //   // menuWidth="160px"
+      //   {...this.props}
+      // />
+      <MainFrame
         {...this.props}
-      />);
+        userMenusAction={currentUserBizPermissions}
+        sysToolPorps={sysToolPorps}
+      />
+      );
     }
   }
 }

src/view/mainframe/index.js

@@ -34,7 +34,6 @@ class RootView extends Component {
   };
 
   getFrameConfig = () => {
-    debugger
     return {
       opSearchMenusUrl: formatUrl(secExtUrl.opSearchMenusUrl, { nodeName: '', type: window.V3DpermissionType }),
       //logoImg: require('./../../assets/logo/amos-logo.png'),