feat: 1.x

Author: Boelroy

packages/xconsole-rc-app-layout/package.json

@@ -52,7 +52,6 @@
     "lodash.foreach": "^4.5.0",
     "lodash.isundefined": "^3.0.1",
     "lodash.map": "^4.6.0",
-    "moment": "^2.24.0",
-    "styled-components": "^4.2.1"
+    "moment": "^2.24.0"
   }
 }

packages/xconsole-rc-app-layout/src/Menu.js

@@ -8,6 +8,9 @@ import {
   withDefaultToPath,
 } from './utils'
 
+
+console.log(require.resolve('@alicloud/console-components-console-menu/lib/RoutableMenu'));
+
 const Menu = ({
   header,
   title,

packages/xconsole-rc-app-layout/stories/index.stories.jsx

@@ -2,9 +2,11 @@ import * as React from 'react';
 import { storiesOf } from '@storybook/react';
 import WindProRcAppLayout from '../src/index'
 import "@alicloud/console-components/dist/wind.css";
-import { Router, Route } from 'dva/router'
+import { Router, Route, matchPath } from 'dva/router'
 import createBrowserHistory from 'history/createBrowserHistory'
 
+window.matchPath = matchPath;
+
 const intl = key => key
 
 const sidebar = {
@@ -47,7 +49,8 @@ const sidebar = {
       key: '/test',
       subNav: [{
         title: intl('menu.title.profile.basic'),
-        key: '/basic-profile',
+        key: '/basic-profile?test=1',
+        activePathPatterns: ['/basic-profile']
       }, {
         title: intl('menu.title.profile.tab'),
         key: '/tab-profile/auth',
@@ -78,7 +81,7 @@ const sidebar = {
 }
 
 const App = ({history}) => {
-  return <button onClick={() => history.push('/basic-profile')}>test</button>
+  return <button onClick={() => history.push('/basic-profile?test=1')}>test</button>
 }
 
 storiesOf('WindProRcAppLayout', module)

packages/xconsole-rc-description/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@alicloud/xconsole-rc-description",
-  "version": "1.0.0-beta.1",
+  "version": "1.0.0-beta.2",
   "main": "lib/index.js",
   "module": "es/index.js",
   "license": "MIT",
@@ -52,7 +52,6 @@
   "dependencies": {
     "@alicloud/console-components-data-fields": "^1.0.4",
     "@alicloud/console-components-info": "^1.0.4",
-    "moment": "^2.24.0",
-    "styled-components": "^5.0.1"
+    "moment": "^2.24.0"
   }
 }

packages/xconsole-rc-page-header/package.json

@@ -48,7 +48,6 @@
   "dependencies": {
     "@alicloud/console-components-page": "^1.0.5",
     "lodash.map": "^4.6.0",
-    "moment": "^2.24.0",
-    "styled-components": "^5.0.1"
+    "moment": "^2.24.0"
   }
 }

packages/xconsole-rc-page/package.json

@@ -50,7 +50,6 @@
   },
   "dependencies": {
     "@alicloud/console-components-page": "^1.0.5",
-    "dva": "^2.4.1",
-    "styled-components": "^4.4.0"
+    "dva": "^2.4.1"
   }
 }

packages/xconsole-rc-product-icon/package.json

@@ -50,7 +50,6 @@
   },
   "dependencies": {
     "@alicloud/console-components-page": "^1.0.5",
-    "dva": "^2.4.1",
-    "styled-components": "^4.4.0"
+    "dva": "^2.4.1"
   }
 }

packages/xconsole-service/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@alicloud/xconsole-service",
-  "version": "1.0.0-beta.7",
+  "version": "1.0.0-beta.8",
   "main": "lib/index.js",
   "module": "es/index.js",
   "license": "MIT",

packages/xconsole-service/src/index.tsx

@@ -1,8 +1,8 @@
 // export origin createService 
-export { default as createService } from './createService'
+export { default as createService } from './createService';
 
 // export api Client
-export { default as createApiClient } from './client'
+export { default as createApiClient } from './client';
 
 // export consoleConfig utils
 export {
@@ -14,13 +14,14 @@ export {
   getCollina,
   getRiskInfo,
   getSecToken,
-} from './utils'
+  setGetRegionIdFn,
+} from './utils';
 
 // export reqeust
-export { default as request } from './request'
+export { default as request } from './request';
 
 // export interceptors
-export { default as consoleRequestInterceptor } from './interceptors/consoleRequestInterceptor'
-export { default as searchParamsInterceptor } from './interceptors/searchParamsInterceptor'
-export { default as consoleRiskInterceptor } from './interceptors/consoleRiskInterceptor'
-export { default as consoleResponseInterceptor } from './interceptors/consoleResponseInterceptor'
+export { default as consoleRequestInterceptor } from './interceptors/consoleRequestInterceptor';
+export { default as searchParamsInterceptor } from './interceptors/searchParamsInterceptor';
+export { default as consoleRiskInterceptor } from './interceptors/consoleRiskInterceptor';
+export { default as consoleResponseInterceptor } from './interceptors/consoleResponseInterceptor';

packages/xconsole-service/src/utils/index.ts

@@ -54,6 +54,13 @@ export const getLocale = function() {
   return getConsoleConfig(LOCALE);
 };
 
+let getRegionId = null;
+
+export const setGetRegionIdFn = (fn) => {
+  getRegionId = fn;
+}
+
 export const getActiveRegionId = function() {
-  return Cookies.get(REGION_COOKIE_NAME) || Cookies.get(CURRENT_REGION_COOKIE_NAME) || 'cn-hangzhou';
-};
+  const regionIdFromCookie = Cookies.get(REGION_COOKIE_NAME) || Cookies.get(CURRENT_REGION_COOKIE_NAME) || 'cn-hangzhou';
+  return  getRegionId ? getRegionId() : Cookies.get(REGION_COOKIE_NAME) || Cookies.get(CURRENT_REGION_COOKIE_NAME) || 'cn-hangzhou';
+};