Merge remote-tracking branch 'origin/master'

.gitignore

@@ -33,6 +33,7 @@
 # Ignore react node_modules
 /public/react/build
 /public/react/build/
+/public/react/.cache
 /public/react/node_modules/
 /public/react/config/stats.json
 /public/react/stats.json

public/react/config/webpack.config.dev.js

@@ -9,6 +9,7 @@ const InterpolateHtmlPlugin = require('react-dev-utils/InterpolateHtmlPlugin');
 const WatchMissingNodeModulesPlugin = require('react-dev-utils/WatchMissingNodeModulesPlugin');
 const eslintFormatter = require('react-dev-utils/eslintFormatter');
 const ModuleScopePlugin = require('react-dev-utils/ModuleScopePlugin');
+const ParallelUglifyPlugin = require('webpack-parallel-uglify-plugin');
 // const MonacoWebpackPlugin = require('monaco-editor-webpack-plugin');
 const getClientEnvironment = require('./env');
 const paths = require('./paths');
@@ -249,6 +250,46 @@ module.exports = {
     // https://github.com/jmblog/how-to-optimize-momentjs-with-webpack
     // You can remove this if you don't use Moment.js:
     new webpack.IgnorePlugin(/^\.\/locale$/, /moment$/),
+    new ParallelUglifyPlugin({
+      // 传递给 UglifyJS的参数如下：
+      uglifyJS: {
+        output: {
+          /*
+           是否输出可读性较强的代码，即会保留空格和制表符，默认为输出，为了达到更好的压缩效果，
+           可以设置为false
+          */
+          beautify: false,
+          /*
+           是否保留代码中的注释，默认为保留，为了达到更好的压缩效果，可以设置为false
+          */
+          comments: false
+        },
+        compress: {
+          /*
+           是否在UglifyJS删除没有用到的代码时输出警告信息，默认为输出，可以设置为false关闭这些作用
+           不大的警告
+          */
+          warnings: false,
+
+          /*
+           是否删除代码中所有的console语句，默认为不删除，开启后，会删除所有的console语句
+          */
+          drop_console: false,
+
+          /*
+           是否内嵌虽然已经定义了，但是只用到一次的变量，比如将 var x = 1; y = x, 转换成 y = 5, 默认为不
+           转换，为了达到更好的压缩效果，可以设置为false
+          */
+          collapse_vars: false,
+
+          /*
+           是否提取出现了多次但是没有定义成变量去引用的静态值，比如将 x = 'xxx'; y = 'xxx'  转换成
+           var a = 'xxxx'; x = a; y = a; 默认为不转换，为了达到更好的压缩效果，可以设置为false
+          */
+          reduce_vars: false
+        }
+      }
+    }),
   ],
   // Some libraries import Node modules but don't use them in the browser.
   // Tell Webpack to provide empty mocks for them so importing them works.

public/react/config/webpack.config.prod.js

@@ -10,6 +10,8 @@ const InterpolateHtmlPlugin = require('react-dev-utils/InterpolateHtmlPlugin');
 const SWPrecacheWebpackPlugin = require('sw-precache-webpack-plugin');
 const eslintFormatter = require('react-dev-utils/eslintFormatter');
 const ModuleScopePlugin = require('react-dev-utils/ModuleScopePlugin');
+const ParallelUglifyPlugin = require('webpack-parallel-uglify-plugin');
+
 const paths = require('./paths');
 const getClientEnvironment = require('./env');
 
@@ -56,8 +58,8 @@ module.exports = {
   bail: true,
   // We generate sourcemaps in production. This is slow but gives good results.
   // You can exclude the *.map files from the build during deployment.
-  devtool: shouldUseSourceMap ? 'nosources-source-map' : false,  //正式版
-  // devtool: shouldUseSourceMap ? 'source-map' : false,//测试版
+  // devtool: shouldUseSourceMap ? 'nosources-source-map' : false,  //正式版
+	devtool: shouldUseSourceMap ? 'source-map' : false,//测试版
   // In production, we only want to load the polyfills and the app code.
   entry: [require.resolve('./polyfills'), paths.appIndexJs],
   output: {
@@ -270,25 +272,39 @@ module.exports = {
     // Otherwise React will be compiled in the very slow development mode.
     new webpack.DefinePlugin(env.stringified),
     // Minify the code.
-    new webpack.optimize.UglifyJsPlugin({
-      compress: {
-        warnings: false,
-        // Disabled because of an issue with Uglify breaking seemingly valid code:
-        // https://github.com/facebookincubator/create-react-app/issues/2376
-        // Pending further investigation:
-        // https://github.com/mishoo/UglifyJS2/issues/2011
-        comparisons: false,
-      },
-      mangle: {
-        safari10: true,
-      },
+    // new webpack.optimize.UglifyJsPlugin({
+    //   compress: {
+    //     warnings: false,
+    //     // Disabled because of an issue with Uglify breaking seemingly valid code:
+    //     // https://github.com/facebookincubator/create-react-app/issues/2376
+    //     // Pending further investigation:
+    //     // https://github.com/mishoo/UglifyJS2/issues/2011
+    //     comparisons: false,
+    //   },
+    //   mangle: {
+    //     safari10: true,
+    //   },
+    //   output: {
+    //     comments: false,
+    //     // Turned on because emoji and regex is not minified properly using default
+    //     // https://github.com/facebookincubator/create-react-app/issues/2488
+    //     ascii_only: true,
+    //   },
+    //   sourceMap: shouldUseSourceMap,
+    // }),
+   //正式版上线后打开去掉debuger和console
+    new ParallelUglifyPlugin({
+      cacheDir: '.cache/',
+      uglifyJS:{
         output: {
-        comments: false,
-        // Turned on because emoji and regex is not minified properly using default
-        // https://github.com/facebookincubator/create-react-app/issues/2488
-        ascii_only: true,
+          comments: false
         },
-      sourceMap: shouldUseSourceMap,
+        warnings: false,
+        compress: {
+          drop_debugger: false,
+          drop_console: false
+        }
+      }
     }),
     // Note: this won't work without ExtractTextPlugin.extract(..) in `loaders`.
     new ExtractTextPlugin({

public/react/src/App.js

@@ -224,7 +224,12 @@ class App extends Component {
 
 	componentDidMount() {
 		// force an update if the URL changes
-		history.listen(() => this.forceUpdate());
+		history.listen(() => {
+			this.forceUpdate()
+			const $ = window.$
+			// https://www.trustie.net/issues/21919 可能会有问题
+			$("html").animate({ scrollTop: $('html').scrollTop() - 0 })
+		});
 
 		initAxiosInterceptors(this.props)
 

public/react/src/common/components/Cropper.js

@@ -6,26 +6,7 @@ const $ = window.$
 let _url_origin = getUrl2()
 // let _url_origin = `http://47.96.87.25:48080`;
 
-if (!window.Cropper) {
-    $.ajaxSetup({
-        cache: true
-    });
-
 
-    $('head').append($('<link rel="stylesheet" type="text/css" />')
-        .attr('href', `${_url_origin}/react/public/js/cropper/cropper.min.css`));
-
-    $.getScript(
-      `${_url_origin}/react/public/js/cropper/cropper.js`,
-      (data, textStatus, jqxhr) => {
-      
-    });
-    $.getScript(
-      `${_url_origin}/react/public/js/cropper/html2canvas.min.js`,
-      (data, textStatus, jqxhr) => {
-      
-    });
-}
 
 function save_avatar(){        
         
@@ -93,9 +74,30 @@ class Cropper extends Component {
             // console.log(event.detail.scaleX);
             // console.log(event.detail.scaleY);
         },
-
         preview: this.props.previewId ? `#${this.props.previewId}` : '.img-preview',
       }
+
+      if (!window.Cropper) {
+        $.ajaxSetup({
+            cache: true
+        });
+
+
+        $('head').append($('<link rel="stylesheet" type="text/css" />')
+            .attr('href', `${_url_origin}/react/public/js/cropper/cropper.min.css`));
+
+        $.getScript(
+          `${_url_origin}/react/public/js/cropper/cropper.js`,
+          (data, textStatus, jqxhr) => {
+          
+        });
+        $.getScript(
+          `${_url_origin}/react/public/js/cropper/html2canvas.min.js`,
+          (data, textStatus, jqxhr) => {
+          
+        });
+      }
+
       setTimeout(() => {
         const image = document.getElementById(this.props.imageId || '__image');
         this.cropper = new window.Cropper(image, this.options);

public/react/src/modules/courses/busyWork/commonWork.js

@@ -401,7 +401,7 @@ class commonWork extends Component{
             }
             secondRowLeft={
               <div style={{"display":"inline-block", "marginTop": "22px"}}>
-                <span>共 {mainList&&mainList.all_count} 个作业</span>
+                <span>共 {mainList&&mainList.all_count} 个{moduleChineseName}</span>
                 <span style={{"marginLeft":"16px"}}>已发布：{published_count}个</span>
                 {/* {this.props.isAdmin()?:""} */}
                 <span style={{"marginLeft":"16px"}}>未发布：{unpublished_count}个</span>

public/react/src/modules/courses/graduation/tasks/GraduationTasksappraiseReplyChild.js

@@ -77,7 +77,7 @@ class GraduationTasksappraiseReplyChild extends Component{
 
 						{this.props.ultimate===true ? "": isAdmin && <GraduationTasksappraiseMainEditor {...this.props}
 								addSuccess={() => this.props.addSuccess()}
-								showSameScore={true}																																							
+								showSameScore={this.props.task_type == 2}																																							
 							></GraduationTasksappraiseMainEditor> }
 				</div>