resolve conflict alibaba#281

classfly · Nov 15, 2018 · 2d36cae · 2d36cae
1 parent 2f8db47
commit 2d36cae
Show file tree

Hide file tree

Showing 84 changed files with 250,862 additions and 13,069 deletions.
diff --git a/console/src/main/resources/static/console-fe/.eslintignore b/console/src/main/resources/static/console-fe/.eslintignore
@@ -1,2 +1,5 @@
-node_modules
+*.svg
+*.ejs
+.DS_Store
 build
+node_modules
diff --git a/console/src/main/resources/static/console-fe/.prettierignore b/console/src/main/resources/static/console-fe/.prettierignore
@@ -1,3 +1,5 @@
 *.svg
 *.ejs
-.DS_Store
+.DS_Store
+build
+node_modules
diff --git a/console/src/main/resources/static/console-fe/build.js b/console/src/main/resources/static/console-fe/build.js
@@ -1,3 +1,4 @@
+#! /usr/bin/env node
 /*
  * Copyright 1999-2018 Alibaba Group Holding Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/console/src/main/resources/static/console-fe/src/layouts/MainLayout.js b/console/src/main/resources/static/console-fe/src/layouts/MainLayout.js
@@ -376,9 +376,7 @@ export default class MainLayout extends React.Component {
     const language = aliwareGetCookieByKeyName('docsite_language') || siteConfig.defaultLanguage;
 
     const { headerType, showLink, navRow, leftBarClose, noChild } = this.state;
-    const headerLogo = `${
-      process.env.NODE_ENV === 'development' ? '' : 'public/'
-    }img/TB118jPv_mWBKNjSZFBXXXxUFXa-2000-390.svg`;
+    const headerLogo = 'img/TB118jPv_mWBKNjSZFBXXXxUFXa-2000-390.svg';
     return (
       <div className="viewFramework-product" style={{ top: 66 }}>
         <Header

diff --git a/console/src/main/resources/static/console-fe/src/lib.js b/console/src/main/resources/static/console-fe/src/lib.js
@@ -99,7 +99,7 @@ request.middleWare((_config = {}) => {
  * 配置 monaco
  */
 window.require.config({
-  paths: { vs: process.env.NODE_ENV === 'development' ? 'js/vs' : 'public/js/vs' },
+  paths: { vs: 'js/vs' },
 });
 window.require.config({
   'vs/nls': {

diff --git a/.../static/console-fe/src/pages/ConfigurationManagement/ListeningToQuery/ListeningToQuery.js b/.../static/console-fe/src/pages/ConfigurationManagement/ListeningToQuery/ListeningToQuery.js
@@ -104,7 +104,7 @@ class ListeningToQuery extends React.Component {
           }
           self.setState({
             dataSource: dataSoureTmp || [],
-            total: data.length,
+            total: dataSoureTmp.length || 0,
           });
         }
       },