Merge pull request #35 from dengliming/spring_cloud_plugin

Make springCloud plugin using common plugin handle
apache · Nov 29, 2020 · 23a4d83 · 23a4d83
2 parents b9c895c + e7a2d0c
commit 23a4d83
Show file tree

Hide file tree

Showing 7 changed files with 2 additions and 1,477 deletions.
diff --git a/src/common/menu.js b/src/common/menu.js
@@ -12,11 +12,6 @@ const menuData = [
         path: 'divide',
         id: 'divide6'
       },
-      {
-        name: 'springCloud',
-        path: 'springCloud',
-        id: 'springCloud8'
-      },
       {
         name: 'hystrix',
         path: 'hystrix',

diff --git a/src/common/router.js b/src/common/router.js
@@ -83,9 +83,6 @@ export const getRouterData = app => {
     '/plug/divide': {
       component: dynamicWrapper(app, ['divide'], () => import('../routes/Plugin/Divide')),
     },
-    '/plug/springCloud': {
-      component: dynamicWrapper(app, ['spring'], () => import('../routes/Plugin/Spring')),
-    },
     '/plug/:id': {
       component: dynamicWrapper(app, ['common'], () => import('../routes/Plugin/Common')),
     },

diff --git a/src/layouts/BasicLayout.js b/src/layouts/BasicLayout.js
@@ -155,7 +155,7 @@ class BasicLayout extends React.PureComponent {
   render() {
     const { collapsed, routerData, match, location, plugins, dispatch, } = this.props;
     const bashRedirect = this.getBaseRedirect();
-    const systemRoute = ["divide", "springCloud", "hystrix"];
+    const systemRoute = ["divide", "hystrix"];
     let menus = getMenuData();
     plugins.forEach((item) => {
       if (systemRoute.indexOf(item.name) === -1) {

diff --git a/src/models/pluginHandle.js b/src/models/pluginHandle.js
@@ -83,7 +83,7 @@ export default {
       let handle = payload.handle;
       let callback = payload.callBack;
       let handleJson;
-      if (handle != null && handle !== "" && typeof (handle) !== "undefined") {
+      if (handle != null && handle !== "" && typeof (handle) !== "undefined" && handle.indexOf("{") !== -1) {
         handleJson = JSON.parse(handle);
       }
       const json = yield call(fetchPluginHandleByPluginId, payload);