back

# Conflicts:
#	src/AppConfig.js

.gitignore

@@ -12,6 +12,11 @@ pids
 *.seed
 *.pid.lock
 
+# Ignore master key for decrypting credentials and more.
+/config/master.key
+/config/database.yml
+/.idea/*
+
 # Directory for instrumented libs generated by jscoverage/JSCover
 lib-cov
 
@@ -80,3 +85,4 @@ typings/
 .dynamodb/
 
 .DS_Store
+.idea/*

LICENSE

@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) [year] [fullname]
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.

README.md

@@ -1,16 +0,0 @@
-<h3>前端react环境安装：</h3>
-<p>1、 安装node v6.9.x；此安装包含了node和npm。</p>
-<p>2、 安装cnpm（命令行）： npm install -g cnpm --registry=https://registry.npm.taobao.org</p>
-<p>3、 安装依赖的js库（public/react目录下<即项目package.json所在目录>，开启命令行）： cnpm install</p>
-<p>4、 如果你的ruby服务使用的是3000端口，则需要在package.json中修改"port"参数的值</p>
-<p>5、 启动服务（命令行-目录同3）： npm start</p>
-<p>6、 build初始化 npm run build</p>
-
-
-<h3>分支信息：</h3>
-<p>相关代码提交到对应分支，能上线的代码先提交到develop分支上测试版，测试通过后合并提交到master分支上线正式版</p>
-<p>master:开发环境（正式环境）</p>
-<p>develop:测试环境</p>
-<p>dev_local:本地版本</p>
-<p>dev_chain:含有区块链相关内容的分支</p>
-<p>PS:新增加的需求功能先新建新分支开发，在测试版测试没问题后再分别合并到develop和master分支</p>

config/env.js

@@ -76,7 +76,7 @@ function getClientEnvironment(publicUrl) {
 				// For example, <img src={process.env.PUBLIC_URL + '/img/logo.png'} />.
 				// This should only be used as an escape hatch. Normally you would put
 				// images into the `src` and `import` them in code to get their paths.
-				PUBLIC_URL: '/forgeplus-react/build/.',
+				PUBLIC_URL: publicUrl,
 			}
 		);
 	// Stringify all values so we can feed into Webpack DefinePlugin

config/webpack.config.dev.js

@@ -1,44 +1,55 @@
-'use strict';
+"use strict";
 
-const autoprefixer = require('autoprefixer');
-const path = require('path');
-const webpack = require('webpack');
-const HtmlWebpackPlugin = require('html-webpack-plugin');
-const CaseSensitivePathsPlugin = require('case-sensitive-paths-webpack-plugin');
-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 MonacoWebpackPlugin = require('monaco-editor-webpack-plugin');
-const getClientEnvironment = require('./env');
-const paths = require('./paths');
+const autoprefixer = require("autoprefixer");
+const path = require("path");
+const webpack = require("webpack");
+const HtmlWebpackPlugin = require("html-webpack-plugin");
+const CaseSensitivePathsPlugin = require("case-sensitive-paths-webpack-plugin");
+const InterpolateHtmlPlugin = require("react-dev-utils/InterpolateHtmlPlugin");
+const WatchMissingNodeModulesPlugin = require("react-dev-utils/WatchMissingNodeModulesPlugin");
+const ModuleScopePlugin = require("react-dev-utils/ModuleScopePlugin");
+const MonacoWebpackPlugin = require("monaco-editor-webpack-plugin");
 
-// Webpack uses `publicPath` to determine where the app is being served from.
-// In development, we always serve from the root. This makes config easier.
-const publicPath = '/';
-// `publicUrl` is just like `publicPath`, but we will provide it to our app
-// as %PUBLIC_URL% in `index.html` and `process.env.PUBLIC_URL` in JavaScript.
-// Omit trailing slash as %PUBLIC_PATH%/xyz looks better than %PUBLIC_PATH%xyz.
-const publicUrl = '';
-// Get environment variables to inject into our app.
-const env = getClientEnvironment(publicUrl);
+const getClientEnvironment = require("./env");
+
+const paths = require("./paths");
+
+const publicPath = "/";
+const env = getClientEnvironment("/");
 
-// This is the development configuration.
-// It is focused on developer experience and fast rebuilds.
-// The production configuration is different and lives in a separate file.
-// 测试用的
 module.exports = {
-  // You may want 'eval' instead if you prefer to see the compiled output in DevTools.
-  // See the discussion in https://github.com/facebookincubator/create-react-app/issues/343.s
-	 //devtool: "cheap-module-eval-source-map",
+  optimization: {
+    splitChunks: {
+      chunks: "async",
+      // 大于30KB才单独分离成chunk
+      minSize: 30000,
+      maxAsyncRequests: 5,
+      maxInitialRequests: 3,
+      name: true,
+      cacheGroups: {
+        default: {
+          priority: -20,
+          reuseExistingChunk: true,
+        },
+        vendors: {
+          name: "vendors",
+          test: /[\\/]node_modules[\\/]/,
+          priority: -10,
+          chunks: "all",
+        },
+      },
+    },
+    runtimeChunk: true,
+  },
+  mode: "development",
   // 开启调试
-	devtool: "source-map",  // 开启调试
+  devtool: "source-map", // 开启调试
   // These are the "entry points" to our application.
   // This means they will be the "root" imports that are included in JS bundle.
   // The first two entry points enable "hot" CSS and auto-refreshes for JS.
   entry: [
     // We ship a few polyfills by default:
-    require.resolve('./polyfills'),
+    require.resolve("./polyfills"),
     // Include an alternative client for WebpackDevServer. A client's job is to
     // connect to WebpackDevServer by a socket and get notified about changes.
     // When you save a file, the client will either apply hot updates (in case
@@ -49,7 +60,7 @@ module.exports = {
     // the line below with these two lines if you prefer the stock client:
     // require.resolve('webpack-dev-server/client') + '?/',
     // require.resolve('webpack/hot/dev-server'),
-    require.resolve('react-dev-utils/webpackHotDevClient'),
+    require.resolve("react-dev-utils/webpackHotDevClient"),
     // Finally, this is your app's code:
     paths.appIndexJs,
     // We include the app code last so that if there is a runtime error during
@@ -59,24 +70,25 @@ module.exports = {
   output: {
     // Add /* filename */ comments to generated require()s in the output.
     pathinfo: true,
+    globalObject: "this",
     // This does not produce a real file. It's just the virtual path that is
     // served by WebpackDevServer in development. This is the JS bundle
     // containing code from all our entry points, and the Webpack runtime.
-    filename: 'static/js/bundle.js',
+    filename: "static/js/bundle.js",
     // There are also additional JS chunk files if you use code splitting.
-    chunkFilename: 'static/js/[name].chunk.js',
+    chunkFilename: "static/js/[name].chunk.js",
     // This is the URL that app is served from. We use "/" in development.
-    publicPath: publicPath,
+    publicPath,
     // Point sourcemap entries to original disk location (format as URL on Windows)
-    devtoolModuleFilenameTemplate: info =>
-      path.resolve(info.absoluteResourcePath).replace(/\\/g, '/'),
+    devtoolModuleFilenameTemplate: (info) =>
+      path.resolve(info.absoluteResourcePath).replace(/\\/g, "/"),
   },
   resolve: {
     // This allows you to set a fallback for where Webpack should look for modules.
     // We placed these paths second because we want `node_modules` to "win"
     // if there are any conflicts. This matches Node resolution mechanism.
     // https://github.com/facebookincubator/create-react-app/issues/253
-    modules: ['node_modules', paths.appNodeModules].concat(
+    modules: ["node_modules", paths.appNodeModules].concat(
       // It is guaranteed to exist because we tweak it in `env.js`
       process.env.NODE_PATH.split(path.delimiter).filter(Boolean)
     ),
@@ -86,13 +98,12 @@ module.exports = {
     // https://github.com/facebookincubator/create-react-app/issues/290
     // `web` extension prefixes have been added for better support
     // for React Native Web.
-    extensions: ['.web.js', '.mjs', '.js', '.json', '.web.jsx', '.jsx'],
+    extensions: [".web.js", ".mjs", ".js", ".json", ".web.jsx", ".jsx"],
     alias: {
-
-      "educoder": __dirname + "/../src/common/educoder.js",
+      educoder: __dirname + "/../src/common/educoder.js",
       // Support React Native Web
       // https://www.smashingmagazine.com/2016/08/a-glimpse-into-the-future-with-react-native-for-web/
-      'react-native': 'react-native-web',
+      "react-native": "react-native-web",
     },
     plugins: [
       // Prevents users from importing files from outside of src/ (or node_modules/).
@@ -101,36 +112,11 @@ module.exports = {
       // please link the files into your node_modules/ and let module-resolution kick in.
       // Make sure your source files are compiled, as they will not be processed in any way.
       new ModuleScopePlugin(paths.appSrc, [paths.appPackageJson]),
-      // MonacoEditor
-      // https://github.com/Microsoft/monaco-editor/blob/master/docs/integrate-esm.md
-      // https://github.com/Microsoft/monaco-editor-webpack-plugin/issues/56
-      // new MonacoWebpackPlugin(),
     ],
   },
   module: {
     strictExportPresence: true,
     rules: [
-      // TODO: Disable require.ensure as it's not a standard language feature.
-      // We are waiting for https://github.com/facebookincubator/create-react-app/issues/2176.
-      // { parser: { requireEnsure: false } },
-
-      // First, run the linter.
-      // It's important to do this before Babel processes the JS.
-      // {
-      //   test: /\.(js|jsx|mjs)$/,
-      //   enforce: 'pre',
-      //   use: [
-      //     {
-      //       options: {
-      //         formatter: eslintFormatter,
-      //         eslintPath: require.resolve('eslint'),
-			//
-      //       },
-      //       loader: require.resolve('eslint-loader'),
-      //     },
-      //   ],
-      //   include: paths.appSrc,
-      // },
       {
         // "oneOf" will traverse all following loaders until one will
         // match the requirements. When no loader matches it will fall
@@ -141,23 +127,33 @@ module.exports = {
           // A missing `test` is equivalent to a match.
           {
             test: [/\.bmp$/, /\.gif$/, /\.jpe?g$/, /\.png$/],
-            loader: require.resolve('url-loader'),
+            loader: require.resolve("url-loader"),
             options: {
               limit: 10000,
-              name: 'static/media/[name].[hash:8].[ext]',
+              name: "static/media/[name].[hash:8].[ext]",
             },
           },
           // Process JS with Babel.
           {
             test: /\.(js|jsx|mjs)$/,
             include: paths.appSrc,
-            loader: require.resolve('babel-loader'),
+            exclude: /node_modules/,
+            loader: require.resolve("babel-loader"),
             options: {
-
-							// This is a feature of `babel-loader` for webpack (not Babel itself).
+              // This is a feature of `babel-loader` for webpack (not Babel itself).
               // It enables caching results in ./node_modules/.cache/babel-loader/
               // directory for faster rebuilds.
               cacheDirectory: true,
+              plugins: [
+                [
+                  "import",
+                  {
+                    libraryName: "antd",
+                    libraryDirectory: "es",
+                    style: "css",
+                  },
+                ],
+              ],
             },
           },
           // "postcss" loader applies autoprefixer to our CSS.
@@ -168,29 +164,29 @@ module.exports = {
           {
             test: /\.css$/,
             use: [
-              require.resolve('style-loader'),
+              require.resolve("style-loader"),
               {
-                loader: require.resolve('css-loader'),
+                loader: require.resolve("css-loader"),
                 options: {
                   importLoaders: 1,
                 },
               },
               {
-                loader: require.resolve('postcss-loader'),
+                loader: require.resolve("postcss-loader"),
                 options: {
                   // Necessary for external CSS imports to work
                   // https://github.com/facebookincubator/create-react-app/issues/2677
-                  ident: 'postcss',
+                  ident: "postcss",
                   plugins: () => [
-                    require('postcss-flexbugs-fixes'),
+                    require("postcss-flexbugs-fixes"),
                     autoprefixer({
                       browsers: [
-                        '>1%',
-                        'last 4 versions',
-                        'Firefox ESR',
-                        'not ie < 9', // React doesn't support IE8 anyway
+                        ">1%",
+                        "last 4 versions",
+                        "Firefox ESR",
+                        "not ie < 9", // React doesn't support IE8 anyway
                       ],
-                      flexbox: 'no-2009',
+                      flexbox: "no-2009",
                     }),
                   ],
                 },
@@ -208,8 +204,8 @@ module.exports = {
                 },
               },
               {
-                loader: require.resolve("sass-loader")
-              }
+                loader: require.resolve("sass-loader"),
+              },
             ],
           },
           // "file" loader makes sure those assets get served by WebpackDevServer.
@@ -223,9 +219,9 @@ module.exports = {
             // Also exclude `html` and `json` extensions so they get processed
             // by webpacks internal loaders.
             exclude: [/\.(js|jsx|mjs)$/, /\.html$/, /\.json$/],
-            loader: require.resolve('file-loader'),
+            loader: require.resolve("file-loader"),
             options: {
-              name: 'static/media/[name].[hash:8].[ext]',
+              name: "static/media/[name].[hash:8].[ext]",
             },
           },
         ],
@@ -239,12 +235,13 @@ module.exports = {
     // The public URL is available as %PUBLIC_URL% in index.html, e.g.:
     // <link rel="shortcut icon" href="%PUBLIC_URL%/favicon.ico">
     // In development, this will be an empty string.
-    new InterpolateHtmlPlugin(env.raw),
     // Generates an `index.html` file with the <script> injected.
     new HtmlWebpackPlugin({
-      inject: true,
+      inject: false,
       template: paths.appHtml,
     }),
+    new InterpolateHtmlPlugin(HtmlWebpackPlugin, env.raw),
+
     // Add module names to factory functions so they appear in browser profiler.
     new webpack.NamedModulesPlugin(),
     // Makes some environment variables available to the JS code, for example:
@@ -267,16 +264,19 @@ 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 MonacoWebpackPlugin(),
-	],
+    new MonacoWebpackPlugin({
+      features: ["coreCommands", "find"],
+      languages: ['plaintext','apex', 'azcli', 'bat', 'clojure', 'coffee', 'cpp', 'csharp', 'csp', 'css', 'dockerfile', 'fsharp', 'go', 'handlebars', 'html', 'ini', 'java', 'javascript', 'json', 'less', 'lua', 'markdown', 'msdax', 'mysql', 'objective', 'perl', 'pgsql', 'php', 'postiats', 'powerquery', 'powershell', 'pug', 'python', 'r', 'razor', 'redis', 'redshift', 'ruby', 'rust', 'sb', 'scheme', 'scss', 'shell', 'solidity', 'sql', 'st', 'swift', 'typescript', 'vb', 'xml', 'yaml']
+    }),
+  ],
   // 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.
   node: {
-    dgram: 'empty',
-    fs: 'empty',
-    net: 'empty',
-    tls: 'empty',
-    child_process: 'empty',
+    dgram: "empty",
+    fs: "empty",
+    net: "empty",
+    tls: "empty",
+    child_process: "empty",
   },
   // Turn off performance hints during development because we don't do any
   // splitting or minification in interest of speed. These warnings become

config/webpack.config.prod.js

@@ -1,391 +1,336 @@
-'use strict';
-// extract-css-assets-webpack-plugin
-const autoprefixer = require('autoprefixer');
-const path = require('path');
-const webpack = require('webpack');
-const HtmlWebpackPlugin = require('html-webpack-plugin');
-const ExtractTextPlugin = require('extract-text-webpack-plugin');
-const ManifestPlugin = require('webpack-manifest-plugin');
-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 MonacoWebpackPlugin = require('monaco-editor-webpack-plugin');
-// const TerserPlugin = require('terser-webpack-plugin');
+"use strict";
+const autoprefixer = require("autoprefixer");
+const path = require("path");
+const webpack = require("webpack");
+const HtmlWebpackPlugin = require("html-webpack-plugin");
+const MiniCssExtractPlugin = require("mini-css-extract-plugin");
+const ManifestPlugin = require("webpack-manifest-plugin");
+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 MonacoWebpackPlugin = require("monaco-editor-webpack-plugin");
 
-const paths = require('./paths');
-const getClientEnvironment = require('./env');
+const TerserJSPlugin = require("terser-webpack-plugin");
+const OptimizeCSSAssetsPlugin = require("optimize-css-assets-webpack-plugin");
+
+const paths = require("./paths");
+const getClientEnvironment = require("./env");
 
-// Webpack uses `publicPath` to determine where the app is being served from.
-// It requires a trailing slash, or the file assets will get an incorrect path.
-const publicPath = paths.servedPath;
 // Some apps do not use client-side routing with pushState.
 // For these, "homepage" can be set to "." to enable relative asset paths.
-const shouldUseRelativeAssetPaths = publicPath === './';
-// Source maps are resource heavy and can cause out of memory issue for large source files.
-const shouldUseSourceMap = process.env.GENERATE_SOURCEMAP !== 'false';
-// `publicUrl` is just like `publicPath`, but we will provide it to our app
-// as %PUBLIC_URL% in `index.html` and `process.env.PUBLIC_URL` in JavaScript.
-// Omit trailing slash as %PUBLIC_URL%/xyz looks better than %PUBLIC_URL%xyz.
+let publicPath = "/react/build/";
+// let nodeEnv = process.env.NODE_ENV
+// if (nodeEnv === 'testBuild') {
+// 	publicPath = 'https://testforgeplus.trustie.net/react/build/';
+// }
+// if (nodeEnv === 'production') {
+// 	publicPath = 'https://forgeplus.trustie.net/react/build/';
+// }
 const publicUrl = publicPath.slice(0, -1);
-// Get environment variables to inject into our app.
-const env = getClientEnvironment(publicUrl);
-
-// Assert this just to be safe.
-// Development builds of React are slow and not intended for production.
-if (env.stringified['process.env'].NODE_ENV !== '"production"') {
-	throw new Error('Production builds must have NODE_ENV=production.');
-}
-
-// Note: defined here because it will be used more than once.
-const cssFilename = './static/css/[name].[contenthash:8].css';
-
-// ExtractTextPlugin expects the build output to be flat.
-// (See https://github.com/webpack-contrib/extract-text-webpack-plugin/issues/27)
-// However, our output is structured with css, js and media folders.
-// To have this structure working with relative paths, we have to use custom options.
-const extractTextPluginOptions = shouldUseRelativeAssetPaths
-	? // Making sure that the publicPath goes back to to build folder.
-	{ publicPath: Array(cssFilename.split('/').length).join('../') }
-	: {};
+const shouldUseSourceMap = process.env.GENERATE_SOURCEMAP !== "false";
+const env = getClientEnvironment(publicPath);
 
 // This is the production configuration.
 // It compiles slowly and is focused on producing a fast and minimal bundle.
 // The development configuration is different and lives in a separate file.
 // 上线用的
-// console.log('publicPath ', publicPath)
 module.exports = {
-	// optimization: {
-  //   minimize: true,
-  //   minimizer: [new TerserPlugin()],
-  // },
-	// externals: {
-	//   'react': 'window.React'
-	// },
-	// Don't attempt to continue if there are any errors.
-	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:false,//测试版
-	// In production, we only want to load the polyfills and the app code.
-	entry: [require.resolve('./polyfills'), paths.appIndexJs],
-	output: {
-		// The build folder.
-		path: paths.appBuild,
-		// Generated JS file names (with nested folders).
-		// There will be one main bundle, and one file per asynchronous chunk.
-		// We don't currently advertise code splitting but Webpack supports it.
-		filename: './static/js/[name].[chunkhash:8].js',
-		chunkFilename: './static/js/[name].[chunkhash:8].chunk.js',
-		// We inferred the "public path" (such as / or /my-project) from homepage.
-		// cdn
-		// publicPath: 'https://shixun.educoder.net/react/build/', //publicPath,   https://cdn.educoder.net
-		// publicPath: 'https://cdn-testeduplus2.educoder.net/react/build/', //publicPath,   https://cdn.educoder.net
-		publicPath: '/forgeplus-react/build/', //publicPath,   https://cdn.educoder.net
+  optimization: {
+    minimizer: [new TerserJSPlugin({}), new OptimizeCSSAssetsPlugin({})],
+    splitChunks: {
+      chunks: "async",
+      // 大于30KB才单独分离成chunk
+      minSize: 30000,
+      maxAsyncRequests: 5,
+      maxInitialRequests: 3,
+      name: true,
+      cacheGroups: {
+        default: {
+          minChunks: 2,
+          priority: -20,
+          reuseExistingChunk: true,
+        },
+        // vendors: {
+        // 	name: 'vendors',
+        // 	test: /[\\/]node_modules[\\/]/,
+        // 	priority: -10,
+        // 	chunks: "all"
+        // }
+      },
+    },
+    runtimeChunk: true,
+  },
+  bail: true,
+  mode: "production",
+  devtool: false, //测试版
+  entry: [require.resolve("./polyfills"), paths.appIndexJs],
+  output: {
+    path: paths.appBuild,
+    globalObject: "this",
+    filename: "./static/js/[name].[contenthash:8].js",
+    chunkFilename: "./static/js/[name].[contenthash:8].chunk.js",
+    publicPath,
 
-		// Point sourcemap entries to original disk location (format as URL on Windows)
-		devtoolModuleFilenameTemplate: info =>
-			path
-				.relative(paths.appSrc, info.absoluteResourcePath)
-				.replace(/\\/g, '/'),
-	},
-	resolve: {
-		// This allows you to set a fallback for where Webpack should look for modules.
-		// We placed these paths second because we want `node_modules` to "win"
-		// if there are any conflicts. This matches Node resolution mechanism.
-		// https://github.com/facebookincubator/create-react-app/issues/253
-		modules: ['node_modules', paths.appNodeModules].concat(
-			// It is guaranteed to exist because we tweak it in `env.js`
-			process.env.NODE_PATH.split(path.delimiter).filter(Boolean)
-		),
-		// These are the reasonable defaults supported by the Node ecosystem.
-		// We also include JSX as a common component filename extension to support
-		// some tools, although we do not recommend using it, see:
-		// https://github.com/facebookincubator/create-react-app/issues/290
-		// `web` extension prefixes have been added for better support
-		// for React Native Web.
-		extensions: ['.web.js', '.mjs', '.js', '.json', '.web.jsx', '.jsx'],
-		alias: {
-			"educoder": __dirname + "/../src/common/educoder.js",
-			// Support React Native Web
-			// https://www.smashingmagazine.com/2016/08/a-glimpse-into-the-future-with-react-native-for-web/
-			'react-native': 'react-native-web',
-		},
-		plugins: [
-			// Prevents users from importing files from outside of src/ (or node_modules/).
-			// This often causes confusion because we only process files within src/ with babel.
-			// To fix this, we prevent you from importing files out of src/ -- if you'd like to,
-			// please link the files into your node_modules/ and let module-resolution kick in.
-			// Make sure your source files are compiled, as they will not be processed in any way.
-			new ModuleScopePlugin(paths.appSrc, [paths.appPackageJson]),
-		],
-	},
-	module: {
-		strictExportPresence: true,
-		rules: [
-			// TODO: Disable require.ensure as it's not a standard language feature.
-			// We are waiting for https://github.com/facebookincubator/create-react-app/issues/2176.
-			// { parser: { requireEnsure: false } },
+    // Point sourcemap entries to original disk location (format as URL on Windows)
+    devtoolModuleFilenameTemplate: (info) =>
+      path
+        .relative(paths.appSrc, info.absoluteResourcePath)
+        .replace(/\\/g, "/"),
+  },
+  resolve: {
+    // This allows you to set a fallback for where Webpack should look for modules.
+    // We placed these paths second because we want `node_modules` to "win"
+    // if there are any conflicts. This matches Node resolution mechanism.
+    // https://github.com/facebookincubator/create-react-app/issues/253
+    modules: ["node_modules", paths.appNodeModules].concat(
+      // It is guaranteed to exist because we tweak it in `env.js`
+      process.env.NODE_PATH.split(path.delimiter).filter(Boolean)
+    ),
+    // These are the reasonable defaults supported by the Node ecosystem.
+    // We also include JSX as a common component filename extension to support
+    // some tools, although we do not recommend using it, see:
+    // https://github.com/facebookincubator/create-react-app/issues/290
+    // `web` extension prefixes have been added for better support
+    // for React Native Web.
+    extensions: [".web.js", ".mjs", ".js", ".json", ".web.jsx", ".jsx"],
+    alias: {
+      educoder: __dirname + "/../src/common/educoder.js",
+      // Support React Native Web
+      // https://www.smashingmagazine.com/2016/08/a-glimpse-into-the-future-with-react-native-for-web/
+      "react-native": "react-native-web",
+    },
+    plugins: [
+      // Prevents users from importing files from outside of src/ (or node_modules/).
+      // This often causes confusion because we only process files within src/ with babel.
+      // To fix this, we prevent you from importing files out of src/ -- if you'd like to,
+      // please link the files into your node_modules/ and let module-resolution kick in.
+      // Make sure your source files are compiled, as they will not be processed in any way.
+      new ModuleScopePlugin(paths.appSrc, [paths.appPackageJson]),
+    ],
+  },
+  module: {
+    strictExportPresence: true,
+    rules: [
+      {
+        test: /\.(js|jsx|mjs)$/,
+        enforce: "pre",
+        use: [
+          {
+            options: {
+              formatter: eslintFormatter,
+              eslintPath: require.resolve("eslint"),
+            },
+            loader: require.resolve("eslint-loader"),
+          },
+        ],
+        include: paths.appSrc,
+      },
+      {
+        // "oneOf" will traverse all following loaders until one will
+        // match the requirements. When no loader matches it will fall
+        // back to the "file" loader at the end of the loader list.
+        oneOf: [
+          // "url" loader works just like "file" loader but it also embeds
+          // assets smaller than specified size as data URLs to avoid requests.
+          {
+            test: [/\.bmp$/, /\.gif$/, /\.jpe?g$/, /\.png$/],
+            loader: require.resolve("url-loader"),
+            options: {
+              limit: 10000,
+              name: "static/media/[name].[hash:8].[ext]",
+            },
+          },
+          // Process JS with Babel.
+          {
+            test: /\.(js|jsx|mjs)$/,
+            include: paths.appSrc,
+            exclude: /node_modules/,
+            loader: require.resolve("babel-loader"),
+            options: {
+              compact: true,
+              plugins: [
+                [
+                  "import",
+                  {
+                    libraryName: "antd",
+                    libraryDirectory: "es",
+                    style: "css",
+                  },
+                ],
+              ],
+            },
+          },
 
-			// First, run the linter.
-			// It's important to do this before Babel processes the JS.
-			{
-				test: /\.(js|jsx|mjs)$/,
-				enforce: 'pre',
-				use: [
-					{
-						options: {
-							formatter: eslintFormatter,
-							eslintPath: require.resolve('eslint'),
+          {
+            test: /\.css$/,
 
-						},
-						loader: require.resolve('eslint-loader'),
-					},
-				],
-				include: paths.appSrc,
-			},
-			{
-				// "oneOf" will traverse all following loaders until one will
-				// match the requirements. When no loader matches it will fall
-				// back to the "file" loader at the end of the loader list.
-				oneOf: [
-					// "url" loader works just like "file" loader but it also embeds
-					// assets smaller than specified size as data URLs to avoid requests.
-					{
-						test: [/\.bmp$/, /\.gif$/, /\.jpe?g$/, /\.png$/],
-						loader: require.resolve('url-loader'),
-						options: {
-							limit: 10000,
-							name: 'static/media/[name].[hash:8].[ext]',
-						},
-					},
-					// Process JS with Babel.
-					{
-						test: /\.(js|jsx|mjs)$/,
-						include: paths.appSrc,
-						loader: require.resolve('babel-loader'),
-						options: {
+            use: [
+              {
+                loader: MiniCssExtractPlugin.loader,
+                options: {
+                  publicPath,
+                },
+              },
+              {
+                loader: require.resolve("css-loader"),
+                options: {
+                  importLoaders: 1,
+                  sourceMap: shouldUseSourceMap,
+                },
+              },
+              {
+                loader: require.resolve("postcss-loader"),
+                options: {
+                  ident: "postcss",
+                  plugins: () => [
+                    require("postcss-flexbugs-fixes"),
+                    autoprefixer({
+                      browsers: [
+                        ">1%",
+                        "last 4 versions",
+                        "Firefox ESR",
+                        "not ie < 9", // React doesn't support IE8 anyway
+                      ],
+                      flexbox: "no-2009",
+                    }),
+                  ],
+                },
+              },
+            ],
+          },
+          {
+            test: /\.scss$/,
+            use: [
+              {
+                loader: MiniCssExtractPlugin.loader,
+                options: {
+                  publicPath,
+                },
+              },
+              {
+                loader: require.resolve("css-loader"),
+                options: {
+                  importLoaders: 1,
+                  sourceMap: shouldUseSourceMap,
+                },
+              },
+              {
+                loader: require.resolve("sass-loader"),
+              },
+            ],
+          },
+          // "file" loader makes sure assets end up in the `build` folder.
+          // When you `import` an asset, you get its filename.
+          // This loader doesn't use a "test" so it will catch all modules
+          // that fall through the other loaders.
+          {
+            loader: require.resolve("file-loader"),
+            // Exclude `js` files to keep "css" loader working as it injects
+            // it's runtime that would otherwise processed through "file" loader.
+            // Also exclude `html` and `json` extensions so they get processed
+            // by webpacks internal loaders.
+            exclude: [/\.(js|jsx|mjs)$/, /\.html$/, /\.json$/],
+            options: {
+              name: "static/media/[name].[contenthash:8].[ext]",
+            },
+          },
+          // ** STOP ** Are you adding a new loader?
+          // Make sure to add the new loader(s) before the "file" loader.
+        ],
+      },
+    ],
+  },
+  plugins: [
+    // Makes some environment variables available in index.html.
+    // The public URL is available as %PUBLIC_URL% in index.html, e.g.:
+    // <link rel="shortcut icon" href="%PUBLIC_URL%/favicon.ico">
+    // In production, it will be an empty string unless you specify "homepage"
+    // in `package.json`, in which case it will be the pathname of that URL.
+    // Generates an `index.html` file with the <script> injected.
+    new HtmlWebpackPlugin({
+      inject: false,
+      template: paths.appHtml,
+      minify: {
+        removeComments: true,
+        collapseWhitespace: true,
+        removeRedundantAttributes: true,
+        useShortDoctype: true,
+        removeEmptyAttributes: true,
+        removeStyleLinkTypeAttributes: true,
+        keepClosingSlash: true,
+        minifyJS: true,
+        minifyCSS: true,
+        minifyURLs: true,
+      },
+    }),
+    new InterpolateHtmlPlugin(HtmlWebpackPlugin, env.raw),
+    // Makes some environment variables available to the JS code, for example:
+    // if (process.env.NODE_ENV === 'production') { ... }. See `./env.js`.
+    // It is absolutely essential that NODE_ENV was set to production here.
+    // Otherwise React will be compiled in the very slow development mode.
+    new webpack.DefinePlugin(env.stringified),
 
-							compact: true,
-						},
-					},
-					// The notation here is somewhat confusing.
-					// "postcss" loader applies autoprefixer to our CSS.
-					// "css" loader resolves paths in CSS and adds assets as dependencies.
-					// "style" loader normally turns CSS into JS modules injecting <style>,
-					// but unlike in development configuration, we do something different.
-					// `ExtractTextPlugin` first applies the "postcss" and "css" loaders
-					// (second argument), then grabs the result CSS and puts it into a
-					// separate file in our build process. This way we actually ship
-					// a single CSS file in production instead of JS code injecting <style>
-					// tags. If you use code splitting, however, any async bundles will still
-					// use the "style" loader inside the async code so CSS from them won't be
-					// in the main CSS file.
-					{
-						test: /\.css$/,
-						loader: ExtractTextPlugin.extract(
-							Object.assign(
-								{
-									fallback: {
-										loader: require.resolve('style-loader'),
-										options: {
-											hmr: false,
-										},
-									},
-									use: [
-										{
-											loader: require.resolve('css-loader'),
-											options: {
-												importLoaders: 1,
-												minimize: true,
-												sourceMap: shouldUseSourceMap,
-											},
-										},
-										{
-											loader: require.resolve('postcss-loader'),
-											options: {
-												// Necessary for external CSS imports to work
-												// https://github.com/facebookincubator/create-react-app/issues/2677
-												ident: 'postcss',
-												plugins: () => [
-													require('postcss-flexbugs-fixes'),
-													autoprefixer({
-														browsers: [
-															'>1%',
-															'last 4 versions',
-															'Firefox ESR',
-															'not ie < 9', // React doesn't support IE8 anyway
-														],
-														flexbox: 'no-2009',
-													}),
-												],
-											},
-										},
-									],
-								},
-								extractTextPluginOptions
-							)
-						),
-						// Note: this won't work without `new ExtractTextPlugin()` in `plugins`.
-					},
-					{
-						test: /\.scss$/,
-						use: [
-							require.resolve("style-loader"),
-							{
-								loader: require.resolve("css-loader"),
-								options: {
-									importLoaders: 1,
-									minimize: true,
-									sourceMap: shouldUseSourceMap,
-								},
-							},
-							{
-								loader: require.resolve("sass-loader")
-							}
-						],
-					},
-					// "file" loader makes sure assets end up in the `build` folder.
-					// When you `import` an asset, you get its filename.
-					// This loader doesn't use a "test" so it will catch all modules
-					// that fall through the other loaders.
-					{
-						loader: require.resolve('file-loader'),
-						// Exclude `js` files to keep "css" loader working as it injects
-						// it's runtime that would otherwise processed through "file" loader.
-						// Also exclude `html` and `json` extensions so they get processed
-						// by webpacks internal loaders.
-						exclude: [/\.(js|jsx|mjs)$/, /\.html$/, /\.json$/],
-						options: {
-							name: 'static/media/[name].[hash:8].[ext]',
-						},
-					},
-					// ** STOP ** Are you adding a new loader?
-					// Make sure to add the new loader(s) before the "file" loader.
-				],
-			},
-		],
-	},
-	plugins: [
-		// Makes some environment variables available in index.html.
-		// The public URL is available as %PUBLIC_URL% in index.html, e.g.:
-		// <link rel="shortcut icon" href="%PUBLIC_URL%/favicon.ico">
-		// In production, it will be an empty string unless you specify "homepage"
-		// in `package.json`, in which case it will be the pathname of that URL.
-		new InterpolateHtmlPlugin(env.raw),
-		// Generates an `index.html` file with the <script> injected.
-		new HtmlWebpackPlugin({
-			inject: true,
-			template: paths.appHtml,
-			minify: {
-				removeComments: true,
-				collapseWhitespace: true,
-				removeRedundantAttributes: true,
-				useShortDoctype: true,
-				removeEmptyAttributes: true,
-				removeStyleLinkTypeAttributes: true,
-				keepClosingSlash: true,
-				minifyJS: true,
-				minifyCSS: true,
-				minifyURLs: true,
-			},
-		}),
-		// Makes some environment variables available to the JS code, for example:
-		// if (process.env.NODE_ENV === 'production') { ... }. See `./env.js`.
-		// It is absolutely essential that NODE_ENV was set to production here.
-		// 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,
-		//   },
-		//   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
-		// 		},
-		// 		compress: {
-		// 			drop_debugger: true,
-		// 			drop_console: true
-		// 		}
-		// 	}
-		// }),
-		// Note: this won't work without ExtractTextPlugin.extract(..) in `loaders`.
-		new ExtractTextPlugin({
-			filename: cssFilename,
-		}),
-		// Generate a manifest file which contains a mapping of all asset filenames
-		// to their corresponding output file so that tools can pick it up without
-		// having to parse `index.html`.
-		new ManifestPlugin({
-			fileName: 'asset-manifest.json',
-		}),
-		// Generate a service worker script that will precache, and keep up to date,
-		// the HTML & assets that are part of the Webpack build.
-		new SWPrecacheWebpackPlugin({
-			// By default, a cache-busting query parameter is appended to requests
-			// used to populate the caches, to ensure the responses are fresh.
-			// If a URL is already hashed by Webpack, then there is no concern
-			// about it being stale, and the cache-busting can be skipped.
-			dontCacheBustUrlsMatching: /\.\w{8}\./,
-			filename: 'service-worker.js',
-			logger(message) {
-				if (message.indexOf('Total precache size is') === 0) {
-					// This message occurs for every build and is a bit too noisy.
-					return;
-				}
-				if (message.indexOf('Skipping static resource') === 0) {
-					// This message obscures real errors so we ignore it.
-					// https://github.com/facebookincubator/create-react-app/issues/2612
-					return;
-				}
-				// console.log(message);
-			},
-			minify: true,
-			// For unknown URLs, fallback to the index page
-			navigateFallback: publicUrl + '/index.html',
-			// Ignores URLs starting from /__ (useful for Firebase):
-			// https://github.com/facebookincubator/create-react-app/issues/2237#issuecomment-302693219
-			navigateFallbackWhitelist: [/^(?!\/__).*/],
-			// Don't precache sourcemaps (they're large) and build asset manifest:
-			staticFileGlobsIgnorePatterns: [/\.map$/, /asset-manifest\.json$/],
-		}),
-		// Moment.js is an extremely popular library that bundles large locale files
-		// by default due to how Webpack interprets its code. This is a practical
-		// solution that requires the user to opt into importing specific locales.
-		// 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 MonacoWebpackPlugin(),
-	],
-	// 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.
-	node: {
-		dgram: 'empty',
-		fs: 'empty',
-		net: 'empty',
-		tls: 'empty',
-		child_process: 'empty',
-	},
+    new MiniCssExtractPlugin({
+      filename: "static/css/[name].[contenthash:8].css",
+      chunkFilename: "static/css/[name].[contenthash:8].chunk.css",
+    }),
+    // Generate a manifest file which contains a mapping of all asset filenames
+    // to their corresponding output file so that tools can pick it up without
+    // having to parse `index.html`.
+    new ManifestPlugin({
+      fileName: "asset-manifest.json",
+    }),
+    // Generate a service worker script that will precache, and keep up to date,
+    // the HTML & assets that are part of the Webpack build.
+    new SWPrecacheWebpackPlugin({
+      // By default, a cache-busting query parameter is appended to requests
+      // used to populate the caches, to ensure the responses are fresh.
+      // If a URL is already hashed by Webpack, then there is no concern
+      // about it being stale, and the cache-busting can be skipped.
+      dontCacheBustUrlsMatching: /\.\w{8}\./,
+      filename: "service-worker.js",
+      logger(message) {
+        if (message.indexOf("Total precache size is") === 0) {
+          // This message occurs for every build and is a bit too noisy.
+          return;
+        }
+        if (message.indexOf("Skipping static resource") === 0) {
+          // This message obscures real errors so we ignore it.
+          // https://github.com/facebookincubator/create-react-app/issues/2612
+          return;
+        }
+        // console.log(message);
+      },
+      minify: true,
+      // For unknown URLs, fallback to the index page
+      navigateFallback: publicUrl + "/index.html",
+      // Ignores URLs starting from /__ (useful for Firebase):
+      // https://github.com/facebookincubator/create-react-app/issues/2237#issuecomment-302693219
+      navigateFallbackWhitelist: [/^(?!\/__).*/],
+      // Don't precache sourcemaps (they're large) and build asset manifest:
+      staticFileGlobsIgnorePatterns: [/\.map$/, /asset-manifest\.json$/],
+    }),
+    // Moment.js is an extremely popular library that bundles large locale files
+    // by default due to how Webpack interprets its code. This is a practical
+    // solution that requires the user to opt into importing specific locales.
+    // 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 MonacoWebpackPlugin({
+      features: ["coreCommands", "find"],
+      languages: ['plaintext','apex', 'azcli', 'bat', 'clojure', 'coffee', 'cpp', 'csharp', 'csp', 'css', 'dockerfile', 'fsharp', 'go', 'handlebars', 'html', 'ini', 'java', 'javascript', 'json', 'less', 'lua', 'markdown', 'msdax', 'mysql', 'objective', 'perl', 'pgsql', 'php', 'postiats', 'powerquery', 'powershell', 'pug', 'python', 'r', 'razor', 'redis', 'redshift', 'ruby', 'rust', 'sb', 'scheme', 'scss', 'shell', 'solidity', 'sql', 'st', 'swift', 'typescript', 'vb', 'xml', 'yaml']
+    }),
+    new webpack.NamedChunksPlugin(),
+    new webpack.HashedModuleIdsPlugin(),
+  ],
+  // 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.
+  node: {
+    dgram: "empty",
+    fs: "empty",
+    net: "empty",
+    tls: "empty",
+    child_process: "empty",
+  },
 };

index.js

@@ -1,46 +0,0 @@
-import React from 'react';
-import ReactDOM from 'react-dom';
-
-import './index.css';
-import './indexPlus.css';
-import App from './App';
-
-// 加之前main.js 18.1MB
-// import { message } from 'antd';
-import message from 'antd/lib/message';
-import 'antd/lib/message/style/css';
-
-import { AppContainer } from 'react-hot-loader';
-
-import registerServiceWorker from './registerServiceWorker';
-
-import { configureUrlQuery } from 'react-url-query';
-
-import history from './history';
-
-// link the history used in our app to url-query so it can update the URL with it.
-configureUrlQuery({ history });
-// -----------------------------------------------------------------------------------	请求配置
-
-window.__useKindEditor = false;
-
-
-const render = (Component) => {
-  ReactDOM.render(
-    <AppContainer {...this.props}  {...this.state}>
-      <Component {...this.props} {...this.state}/>
-    </AppContainer>,
-    document.getElementById('root')
-  );
-}
-
-
-// ReactDOM.render(
-// 	,
-// 	document.getElementById('root'));
-// registerServiceWorker();
-
-render(App);
-if (module.hot) {
-  module.hot.accept('./App', () => { render(App) });
-}

package.json

@@ -3,116 +3,121 @@
   "version": "0.1.0",
   "private": true,
   "dependencies": {
-    "@icedesign/base": "^0.2.5",
     "@monaco-editor/react": "^2.3.0",
     "@novnc/novnc": "^1.1.0",
-    "antd": "^3.23.2",
+    "actioncable": "^5.2.4-3",
+    "antd": "^3.26.15",
     "array-flatten": "^2.1.2",
     "autoprefixer": "7.1.6",
-    "axios": "^0.18.0",
+    "axios": "^0.18.1",
     "babel-core": "6.26.0",
     "babel-eslint": "7.2.3",
     "babel-jest": "20.0.3",
     "babel-loader": "7.1.2",
+    "code-prettify": "^0.1.0",
     "babel-plugin-syntax-dynamic-import": "^6.18.0",
     "babel-preset-react-app": "^3.1.1",
     "babel-runtime": "6.26.0",
-    "bizcharts": "^3.5.5",
+    "bizcharts": "^3.5.8",
     "bundle-loader": "^0.5.6",
     "case-sensitive-paths-webpack-plugin": "2.1.1",
     "chalk": "1.1.3",
     "classnames": "^2.2.5",
-    "clipboard": "^2.0.4",
-    "codemirror": "^5.46.0",
+    "clipboard": "^2.0.6",
+    "codemirror": "^5.53.0",
     "connected-react-router": "4.4.1",
-    "css-loader": "0.28.7",
+    "css-loader": "^3.5.2",
     "dotenv": "4.0.0",
     "dotenv-expand": "4.2.0",
-    "echarts": "^4.2.0-rc.2",
+    "echarts": "^4.7.0",
     "editor.md": "^1.5.0",
     "eslint": "4.10.0",
     "eslint-config-react-app": "^2.1.0",
-    "eslint-loader": "1.9.0",
+    "eslint-loader": "^4.0.0",
     "eslint-plugin-flowtype": "2.39.1",
     "eslint-plugin-import": "2.8.0",
     "eslint-plugin-jsx-a11y": "5.1.1",
     "eslint-plugin-react": "7.4.0",
-    "extract-text-webpack-plugin": "3.0.2",
-    "file-loader": "1.1.5",
+    "file-loader": "^6.0.0",
+    "flv.js": "^1.5.0",
     "fs-extra": "3.0.1",
-    "html-webpack-plugin": "2.29.0",
+    "html-webpack-plugin": "^4.0.4",
     "immutability-helper": "^2.6.6",
     "install": "^0.12.2",
     "jest": "20.0.4",
-    "js-base64": "^2.5.1",
+    "js-base64": "^2.5.2",
     "katex": "^0.11.1",
-    "lodash": "^4.17.5",
-    "loglevel": "^1.6.1",
+    "lodash": "^4.17.15",
+    "loglevel": "^1.6.8",
+    "marked": "^1.0.0",
     "material-ui": "^1.0.0-beta.40",
     "md5": "^2.2.1",
+    "mini-css-extract-plugin": "^0.9.0",
     "moment": "^2.23.0",
-    "monaco-editor": "0.13",
-    "monaco-editor-webpack-plugin": "^1.8.1",
-    "npm": "^6.10.1",
+    "monaco-editor": "^0.20.0",
+    "monaco-editor-webpack-plugin": "^1.9.0",
     "numeral": "^2.0.6",
     "object-assign": "4.1.1",
     "postcss-flexbugs-fixes": "3.2.0",
     "postcss-loader": "2.0.8",
     "promise": "8.0.1",
     "prop-types": "^15.6.1",
-    "qs": "^6.6.0",
+    "qrcode.react": "^1.0.0",
+    "qs": "^6.9.3",
     "quill": "^1.3.7",
     "quill-delta-to-html": "^0.11.0",
     "raf": "3.4.0",
-    "rc-form": "^2.1.7",
-    "rc-pagination": "^1.16.2",
-    "rc-rate": "^2.4.0",
+    "rc-form": "^2.4.11",
+    "rc-pagination": "^1.21.0",
+    "rc-rate": "^2.6.0",
     "rc-select": "^8.0.12",
-    "rc-tree": "^1.7.11",
-    "rc-upload": "^2.5.1",
-    "react": "^16.9.0",
+    "rc-tree": "^1.15.3",
+    "rc-upload": "^2.9.4",
+    "react": "^16.13.1",
     "react-beautiful-dnd": "^10.0.4",
     "react-codemirror": "^1.0.0",
-    "react-codemirror2": "^6.0.0",
+    "react-codemirror2": "^6.0.1",
     "react-color": "^2.18.0",
     "react-content-loader": "^3.1.1",
     "react-cookies": "^0.1.1",
-    "react-dev-utils": "^5.0.0",
-    "react-dom": "^16.9.0",
-    "react-hot-loader": "^4.0.0",
+    "react-datepicker": "^2.14.1",
+    "react-dev-utils": "^9.2.0-next.80",
+    "react-dom": "^16.13.1",
+    "react-hot-loader": "^4.12.20",
     "react-infinite-scroller": "^1.2.4",
     "react-loadable": "^5.3.1",
-    "react-monaco-editor": "^0.25.1",
-    "react-player": "^1.11.1",
+    "react-monaco-editor": "0.37",
+    "react-player": "^1.15.3",
     "react-redux": "5.0.7",
+    "react-resizable": "^1.10.1",
     "react-router": "^4.2.0",
     "react-router-dom": "^4.2.2",
-    "react-split-pane": "^0.1.89",
-    "react-url-query": "^1.4.0",
-    "redux": "^4.0.0",
+    "react-split-pane": "^0.1.91",
+    "react-url-query": "^1.5.0",
+    "react-zmage": "^0.8.5-beta.31",
+    "redux": "^4.0.5",
     "redux-thunk": "2.3.0",
-    "rsuite": "^4.0.1",
-    "sass-loader": "^7.3.1",
-    "scroll-into-view": "^1.12.3",
-    "source-map-support": "^0.5.16",
+    "rsuite": "^4.3.4",
+    "sass-loader": "7.3.1",
+    "scroll-into-view": "^1.14.2",
     "showdown": "^1.9.1",
-    "showdown-katex": "^0.6.0",
+    "showdown-katex": "^0.8.0",
     "store": "^2.0.12",
     "style-loader": "0.19.0",
-    "styled-components": "^4.1.3",
+    "styled-components": "^4.4.1",
     "sw-precache-webpack-plugin": "0.11.4",
     "url-loader": "0.6.2",
-    "webpack": "3.8.1",
-    "webpack-dev-server": "2.9.4",
-    "webpack-manifest-plugin": "1.3.2",
-    "webpack-parallel-uglify-plugin": "^1.1.0",
+    "webpack-cli": "^3.3.11",
+    "webpack-dev-server": "^3.10.3",
+    "webpack-manifest-plugin": "^2.2.0",
     "whatwg-fetch": "2.0.3",
     "wrap-md-editor": "^0.2.20"
   },
   "scripts": {
-    "start": "node --max_old_space_size=20000 scripts/start.js",
-    "build": "node --max_old_space_size=15360 scripts/build.js",
-    "concat": "node scripts/concat.js",
+    "start": "node --max_old_space_size=15360 scripts/start.js",
+    "build": "NODE_ENV=production node --max_old_space_size=15360 scripts/build.js",
+    "test-build": "NODE_ENV=testBuild node --max_old_space_size=15360 scripts/build.js",
+    "pre-build": "NODE_ENV=preBuild node --max_old_space_size=15360 scripts/build.js",
     "gen_stats": "NODE_ENV=production webpack --profile --config=./config/webpack.config.prod.js --json > stats.json",
     "ana": "webpack-bundle-analyzer ./stats.json",
     "analyze": "npm run build -- --stats && webpack-bundle-analyzer build/bundle-stats.json",
@@ -177,14 +182,19 @@
   "port": "3007",
   "devDependencies": {
     "@babel/runtime": "7.0.0-beta.51",
-    "babel-plugin-import": "^1.11.0",
+    "babel-plugin-import": "^1.13.0",
     "compression-webpack-plugin": "^1.1.12",
     "concat": "^1.0.3",
     "happypack": "^5.0.1",
     "mockjs": "^1.1.0",
     "node-sass": "^4.12.0",
+    "optimize-css-assets-webpack-plugin": "^5.0.3",
+    "purgecss": "^2.1.2",
     "reqwest": "^2.0.5",
-    "webpack-bundle-analyzer": "^3.0.3",
-    "webpack-parallel-uglify-plugin": "^1.1.0"
+    "resize-observer-polyfill": "^1.5.1",
+    "terser-webpack-plugin": "^2.3.5",
+    "uglifyjs-webpack-plugin": "^2.2.0",
+    "webpack": "^4.42.1",
+    "webpack-bundle-analyzer": "^3.7.0"
   }
 }

public/assets/kindeditor/lang/zh_CN.js

@@ -0,0 +1,239 @@
+/*******************************************************************************
+* KindEditor - WYSIWYG HTML Editor for Internet
+* Copyright (C) 2006-2011 kindsoft.net
+*
+* @author Roddy <luolonghao@gmail.com>
+* @site http://www.kindsoft.net/
+* @licence http://www.kindsoft.net/license.php
+*******************************************************************************/
+
+KindEditor.lang({
+    imagedirectupload:'本地图片',
+    more: '切换到更多功能',
+    less: '切换到简单功能',
+	source : 'HTML代码',
+	preview : '预览',
+	undo : '后退(Ctrl+Z)',
+	redo : '前进(Ctrl+Y)',
+	cut : '剪切(Ctrl+X)',
+	copy : '复制(Ctrl+C)',
+	paste : '粘贴(Ctrl+V)',
+	plainpaste : '粘贴为无格式文本',
+	wordpaste : '从Word粘贴',
+	selectall : '全选(Ctrl+A)',
+	justifyleft : '左对齐',
+	justifycenter : '居中',
+	justifyright : '右对齐',
+	justifyfull : '两端对齐',
+	insertorderedlist : '编号',
+	insertunorderedlist : '项目符号',
+	indent : '增加缩进',
+	outdent : '减少缩进',
+	subscript : '下标',
+	superscript : '上标',
+	formatblock : '段落',
+	fontname : '字体',
+	fontsize : '文字大小',
+	forecolor : '文字颜色',
+	hilitecolor : '文字背景',
+	bold : '粗体(Ctrl+B)',
+	italic : '斜体(Ctrl+I)',
+	underline : '下划线(Ctrl+U)',
+	strikethrough : '删除线',
+	removeformat : '删除格式',
+	image : '图片',
+	multiimage : '批量图片上传',
+	flash : 'Flash',
+	media : '视音频',
+	table : '表格',
+	tablecell : '单元格',
+	hr : '插入横线',
+	emoticons : '插入表情',
+	link : '超级链接',
+	unlink : '取消超级链接',
+	fullscreen : '全屏显示',
+	about : '关于',
+	print : '打印(Ctrl+P)',
+	filemanager : '文件空间',
+	code : '插入程序代码',
+	map : 'Google地图',
+	baidumap : '百度地图',
+	lineheight : '行距',
+	clearhtml : '清理HTML代码',
+	pagebreak : '插入分页符',
+	quickformat : '一键排版',
+	insertfile : '插入文件',
+	template : '插入模板',
+	anchor : '锚点',
+	yes : '确定',
+	no : '取消',
+	close : '关闭',
+	editImage : '图片属性',
+	deleteImage : '删除图片',
+	editFlash : 'Flash属性',
+	deleteFlash : '删除Flash',
+	editMedia : '视音频属性',
+	deleteMedia : '删除视音频',
+	editLink : '超级链接属性',
+	deleteLink : '取消超级链接',
+	editAnchor : '锚点属性',
+	deleteAnchor : '删除锚点',
+	tableprop : '表格属性',
+	tablecellprop : '单元格属性',
+	tableinsert : '插入表格',
+	tabledelete : '删除表格',
+	tablecolinsertleft : '左侧插入列',
+	tablecolinsertright : '右侧插入列',
+	tablerowinsertabove : '上方插入行',
+	tablerowinsertbelow : '下方插入行',
+	tablerowmerge : '向下合并单元格',
+	tablecolmerge : '向右合并单元格',
+	tablerowsplit : '拆分行',
+	tablecolsplit : '拆分列',
+	tablecoldelete : '删除列',
+	tablerowdelete : '删除行',
+	noColor : '无颜色',
+	pleaseSelectFile : '请选择文件。',
+	invalidImg : "请输入有效的URL地址。\n只允许jpg,gif,bmp,png格式。",
+	invalidMedia : "请输入有效的URL地址。\n只允许swf,flv,mp3,wav,wma,wmv,mid,avi,mpg,asf,rm,rmvb格式。",
+	invalidWidth : "宽度必须为数字。",
+	invalidHeight : "高度必须为数字。",
+	invalidBorder : "边框必须为数字。",
+	invalidUrl : "请输入有效的URL地址。",
+	invalidRows : '行数为必选项，只允许输入大于0的数字。',
+	invalidCols : '列数为必选项，只允许输入大于0的数字。',
+	invalidPadding : '边距必须为数字。',
+	invalidSpacing : '间距必须为数字。',
+	invalidJson : '服务器发生故障。',
+	uploadSuccess : '上传成功。',
+	cutError : '您的浏览器安全设置不允许使用剪切操作，请使用快捷键(Ctrl+X)来完成。',
+	copyError : '您的浏览器安全设置不允许使用复制操作，请使用快捷键(Ctrl+C)来完成。',
+	pasteError : '您的浏览器安全设置不允许使用粘贴操作，请使用快捷键(Ctrl+V)来完成。',
+	ajaxLoading : '加载中，请稍候 ...',
+	uploadLoading : '上传中，请稍候 ...',
+	uploadError : '上传错误',
+	'plainpaste.comment' : '请使用快捷键(Ctrl+V)把内容粘贴到下面的方框里。',
+	'wordpaste.comment' : '请使用快捷键(Ctrl+V)把内容粘贴到下面的方框里。',
+	'code.pleaseInput' : '请输入程序代码。',
+	'link.url' : 'URL',
+	'link.linkType' : '打开类型',
+	'link.newWindow' : '新窗口',
+	'link.selfWindow' : '当前窗口',
+	'flash.url' : 'URL',
+	'flash.width' : '宽度',
+	'flash.height' : '高度',
+	'flash.upload' : '上传',
+	'flash.viewServer' : '文件空间',
+	'media.url' : 'URL',
+	'media.width' : '宽度',
+	'media.height' : '高度',
+	'media.autostart' : '自动播放',
+	'media.upload' : '上传',
+	'media.viewServer' : '文件空间',
+	'image.remoteImage' : '网络图片',
+	'image.localImage' : '本地上传',
+	'image.remoteUrl' : '图片地址',
+	'image.localUrl' : '上传文件',
+	'image.size' : '图片大小',
+	'image.width' : '宽',
+	'image.height' : '高',
+	'image.resetSize' : '重置大小',
+	'image.align' : '对齐方式',
+	'image.defaultAlign' : '默认方式',
+	'image.leftAlign' : '左对齐',
+	'image.rightAlign' : '右对齐',
+	'image.imgTitle' : '图片说明',
+	'image.upload' : '浏览...',
+	'image.viewServer' : '图片空间',
+	'multiimage.uploadDesc' : '允许用户同时上传<%=uploadLimit%>张图片，单张图片容量不超过<%=sizeLimit%>',
+	'multiimage.startUpload' : '开始上传',
+	'multiimage.clearAll' : '全部清空',
+	'multiimage.insertAll' : '全部插入',
+	'multiimage.queueLimitExceeded' : '文件数量超过限制。',
+	'multiimage.fileExceedsSizeLimit' : '文件大小超过限制。',
+	'multiimage.zeroByteFile' : '无法上传空文件。',
+	'multiimage.invalidFiletype' : '文件类型不正确。',
+	'multiimage.unknownError' : '发生异常，无法上传。',
+	'multiimage.pending' : '等待上传',
+	'multiimage.uploadError' : '上传失败',
+	'filemanager.emptyFolder' : '空文件夹',
+	'filemanager.moveup' : '移到上一级文件夹',
+	'filemanager.viewType' : '显示方式：',
+	'filemanager.viewImage' : '缩略图',
+	'filemanager.listImage' : '详细信息',
+	'filemanager.orderType' : '排序方式：',
+	'filemanager.fileName' : '名称',
+	'filemanager.fileSize' : '大小',
+	'filemanager.fileType' : '类型',
+	'insertfile.url' : 'URL',
+	'insertfile.title' : '文件说明',
+	'insertfile.upload' : '上传',
+	'insertfile.viewServer' : '文件空间',
+	'table.cells' : '单元格数',
+	'table.rows' : '行数',
+	'table.cols' : '列数',
+	'table.size' : '大小',
+	'table.width' : '宽度',
+	'table.height' : '高度',
+	'table.percent' : '%',
+	'table.px' : 'px',
+	'table.space' : '边距间距',
+	'table.padding' : '边距',
+	'table.spacing' : '间距',
+	'table.align' : '对齐方式',
+	'table.textAlign' : '水平对齐',
+	'table.verticalAlign' : '垂直对齐',
+	'table.alignDefault' : '默认',
+	'table.alignLeft' : '左对齐',
+	'table.alignCenter' : '居中',
+	'table.alignRight' : '右对齐',
+	'table.alignTop' : '顶部',
+	'table.alignMiddle' : '中部',
+	'table.alignBottom' : '底部',
+	'table.alignBaseline' : '基线',
+	'table.border' : '边框',
+	'table.borderWidth' : '边框',
+	'table.borderColor' : '颜色',
+	'table.backgroundColor' : '背景颜色',
+	'map.address' : '地址: ',
+	'map.search' : '搜索',
+	'baidumap.address' : '地址: ',
+	'baidumap.search' : '搜索',
+	'baidumap.insertDynamicMap' : '插入动态地图',
+	'anchor.name' : '锚点名称',
+	'formatblock.formatBlock' : {
+		h1 : '标题 1',
+		h2 : '标题 2',
+		h3 : '标题 3',
+		h4 : '标题 4',
+		p : '正 文'
+	},
+	'fontname.fontName' : {
+		'SimSun' : '宋体',
+		'NSimSun' : '新宋体',
+		'FangSong_GB2312' : '仿宋_GB2312',
+		'KaiTi_GB2312' : '楷体_GB2312',
+		'SimHei' : '黑体',
+		'Microsoft YaHei' : '微软雅黑',
+		'Arial' : 'Arial',
+		'Arial Black' : 'Arial Black',
+		'Times New Roman' : 'Times New Roman',
+		'Courier New' : 'Courier New',
+		'Tahoma' : 'Tahoma',
+		'Verdana' : 'Verdana'
+	},
+	'lineheight.lineHeight' : [
+		{'1' : '单倍行距'},
+		{'1.5' : '1.5倍行距'},
+		{'2' : '2倍行距'},
+		{'2.5' : '2.5倍行距'},
+		{'3' : '3倍行距'}
+	],
+	'template.selectTemplate' : '可选模板',
+	'template.replaceContent' : '替换当前内容',
+	'template.fileList' : {
+		'1.html' : '图片和文字',
+		'2.html' : '表格',
+		'3.html' : '项目编号'
+	}
+}, 'zh_CN');

public/assets/kindeditor/plugins/autoheight/autoheight.js

@@ -0,0 +1,71 @@
+/*******************************************************************************
+* KindEditor - WYSIWYG HTML Editor for Internet
+* Copyright (C) 2006-2011 kindsoft.net
+*
+* @author Roddy <luolonghao@gmail.com>
+* @site http://www.kindsoft.net/
+* @licence http://www.kindsoft.net/license.php
+*******************************************************************************/
+
+KindEditor.plugin('autoheight', function(K) {
+	var self = this;
+    //self.autoHeightMode = true;
+	if (!self.autoHeightMode) {
+		return;
+	}
+
+	var minHeight;
+
+	function hideScroll() {
+		var edit = self.edit;
+		var body = edit.doc.body;
+		edit.iframe[0].scroll = 'no';
+		body.style.overflowY = 'hidden';
+	}
+
+	function resetHeight() {
+		var edit = self.edit;
+		var body = edit.doc.body;
+		edit.iframe.height(minHeight);
+
+        //最高418 超过用滚动条
+		self.resize(null, Math.max(
+            (K.IE ? body.scrollHeight : body.offsetHeight) > 385 ? 385+33 : (K.IE ? body.scrollHeight : body.offsetHeight)
+                + 33, minHeight));
+
+        if( self.height == "418px" ){
+            edit.iframe[0].scroll = 'yes';
+            body.style.overflowY = 'auto';
+        }
+        else{
+            hideScroll();
+        }
+	}
+
+	function init() {
+		minHeight = K.removeUnit(self.height);
+
+		self.edit.afterChange(resetHeight);
+		hideScroll();
+        var edit = self.edit;
+        var body = edit.doc.body;
+        edit.iframe.height(minHeight);
+        self.resize(null, Math.max(
+                ((K.IE ? body.scrollHeight : body.offsetHeight) > 250 ? 250 : (K.IE ? body.scrollHeight : body.offsetHeight)) //限制初始化太高的情况
+                + 33, minHeight));
+	}
+
+	if (self.isCreated) {
+		init();
+	} else {
+		self.afterCreate(init);
+	}
+});
+
+/*
+* 如何实现真正的自动高度？
+* 修改编辑器高度之后，再次获取body内容高度时，最小值只会是当前iframe的设置高度，这样就导致高度只增不减。
+* 所以每次获取body内容高度之前，先将iframe的高度重置为最小高度，这样就能获取body的实际高度。
+* 由此就实现了真正的自动高度
+* 测试：chrome、firefox、IE9、IE8
+* */

public/assets/kindeditor/plugins/code/previewcode.css

@@ -0,0 +1,56 @@
+.ke-content {
+    font-family: "微软雅黑","宋体";
+}
+.ke-content pre {
+    font-size:9pt;
+    font-family:Courier New,Arial;
+    border:1px solid #ddd;
+    border-left:5px solid #6CE26C;
+    background:#f6f6f6;
+    padding:5px;
+}
+
+.ke-content code {
+    margin: 0 2px;
+    padding: 0 5px;
+    white-space: nowrap;
+    border: 1px solid #DDD;
+    background-color: #F6F6F6;
+    border-radius: 3px;
+}
+
+.ke-content pre>code {
+    margin: 0;
+    padding: 0;
+    white-space: pre;
+    border: none;
+    background: transparent;
+}
+
+.ke-content pre code {
+    background-color: transparent;
+    border: none;
+}
+
+.ke-content p {
+    /*margin: 0 0 15px 0;*/
+    /*margin-bottom:15pt;*/
+    line-height:1.5;
+    /*letter-spacing: 1px;*/
+}
+
+.ke-content div.ref {border:1px solid #ddd;margin:0 0 10px 0;padding:2px;font-size:9pt;background:#ffe;}
+.ke-content div.ref h4 {margin:0;padding:1px 3px;background:#CC9966;color:#fff;font-size:9pt;font-weight:normal;}
+.ke-content div.ref .ref_body {margin:0;padding:2px;line-height:20px;color:#666;font-size:9pt;}
+
+
+.ke-content blockquote{background: none;border: none;padding: 0px;margin: 0 0 0 40px;}
+span.at {color:#269ac9;}
+span.at a{color:#269ac9;text-decoration: none;}
+
+/*yk*/
+.ke-content ol li{list-style-type: decimal;}
+.ke-content ul li{list-style-type: disc;}
+.ke-content ol,.ke-content ul,.ke-content h1,.ke-content h2,.ke-content h3,.ke-content h4{margin-top:0;margin-bottom: 0;}
+.ke-content a{color: #136ec2;}
+.ke-content a:link,.ke-content a:visited{text-decoration:none;}

public/assets/kindeditor/plugins/paste/paste.js

@@ -0,0 +1,361 @@
+// Generated by CoffeeScript 1.9.0
+
+/* 
+paste.js is an interface to read data ( text / image ) from clipboard in different browsers. It also contains several hacks.
+https://github.com/layerssss/paste.js
+ */
+
+(function() {
+    var $, Paste, createHiddenEditable, dataURLtoBlob;
+
+    $ = window.jQuery;
+
+    $.paste = function(pasteContainer) {
+        var pm;
+        if (typeof console !== "undefined" && console !== null) {
+            console.log("DEPRECATED: This method is deprecated. Please use $.fn.pastableNonInputable() instead.");
+        }
+        pm = Paste.mountNonInputable(pasteContainer);
+        return pm._container;
+    };
+
+    $.fn.pastableNonInputable = function() {
+        var el, _i, _len;
+        for (_i = 0, _len = this.length; _i < _len; _i++) {
+            el = this[_i];
+            Paste.mountNonInputable(el);
+        }
+        return this;
+    };
+
+    $.fn.pastableTextarea = function() {
+        var el, _i, _len;
+        for (_i = 0, _len = this.length; _i < _len; _i++) {
+            el = this[_i];
+            Paste.mountTextarea(el);
+        }
+        return this;
+    };
+
+    $.fn.pastableContenteditable = function() {
+        var el, _i, _len;
+        for (_i = 0, _len = this.length; _i < _len; _i++) {
+            el = this[_i];
+            Paste.mountContenteditable(el);
+        }
+        return this;
+    };
+
+    dataURLtoBlob = function(dataURL, sliceSize) {
+        var b64Data, byteArray, byteArrays, byteCharacters, byteNumbers, contentType, i, m, offset, slice, _ref;
+        if (sliceSize == null) {
+            sliceSize = 512;
+        }
+        if (!(m = dataURL.match(/^data\:([^\;]+)\;base64\,(.+)$/))) {
+            return null;
+        }
+        _ref = m, m = _ref[0], contentType = _ref[1], b64Data = _ref[2];
+        byteCharacters = atob(b64Data);
+        byteArrays = [];
+        offset = 0;
+        while (offset < byteCharacters.length) {
+            slice = byteCharacters.slice(offset, offset + sliceSize);
+            byteNumbers = new Array(slice.length);
+            i = 0;
+            while (i < slice.length) {
+                byteNumbers[i] = slice.charCodeAt(i);
+                i++;
+            }
+            byteArray = new Uint8Array(byteNumbers);
+            byteArrays.push(byteArray);
+            offset += sliceSize;
+        }
+        return new Blob(byteArrays, {
+            type: contentType
+        });
+    };
+
+    createHiddenEditable = function() {
+        return $(document.createElement('div')).attr('contenteditable', true).css({
+            width: 1,
+            height: 1,
+            position: 'fixed',
+            left: -100,
+            overflow: 'hidden'
+        });
+    };
+
+    Paste = (function() {
+        Paste.prototype._target = null;
+
+        Paste.prototype._container = null;
+
+        Paste.mountNonInputable = function(nonInputable) {
+            var paste;
+            paste = new Paste(createHiddenEditable().appendTo(nonInputable), nonInputable);
+            $(nonInputable).on('click', (function(_this) {
+                return function() {
+                    return paste._container.focus();
+                };
+            })(this));
+            paste._container.on('focus', (function(_this) {
+                return function() {
+                    return $(nonInputable).addClass('pastable-focus');
+                };
+            })(this));
+            return paste._container.on('blur', (function(_this) {
+                return function() {
+                    return $(nonInputable).removeClass('pastable-focus');
+                };
+            })(this));
+        };
+
+        Paste.mountTextarea = function(textarea) {
+            var ctlDown, paste;
+            if (-1 !== navigator.userAgent.toLowerCase().indexOf('chrome')) {
+                return this.mountContenteditable(textarea);
+            }
+            paste = new Paste(createHiddenEditable().insertBefore(textarea), textarea);
+            ctlDown = false;
+            $(textarea).on('keyup', function(ev) {
+                var _ref;
+                if ((_ref = ev.keyCode) === 17 || _ref === 224) {
+                    return ctlDown = false;
+                }
+            });
+            $(textarea).on('keydown', function(ev) {
+                var _ref;
+                if ((_ref = ev.keyCode) === 17 || _ref === 224) {
+                    ctlDown = true;
+                }
+                if (ctlDown && ev.keyCode === 86) {
+                    return paste._container.focus();
+                }
+            });
+            $(paste._target).on('pasteImage', (function(_this) {
+                return function() {
+                    return $(textarea).focus();
+                };
+            })(this));
+            $(paste._target).on('pasteText', (function(_this) {
+                return function() {
+                    return $(textarea).focus();
+                };
+            })(this));
+            $(textarea).on('focus', (function(_this) {
+                return function() {
+                    return $(textarea).addClass('pastable-focus');
+                };
+            })(this));
+            return $(textarea).on('blur', (function(_this) {
+                return function() {
+                    return $(textarea).removeClass('pastable-focus');
+                };
+            })(this));
+        };
+
+        Paste.mountContenteditable = function(contenteditable) {
+            var paste;
+            paste = new Paste(contenteditable, contenteditable);
+            $(contenteditable).on('focus', (function(_this) {
+                return function() {
+                    return $(contenteditable).addClass('pastable-focus');
+                };
+            })(this));
+            return $(contenteditable).on('blur', (function(_this) {
+                return function() {
+                    return $(contenteditable).removeClass('pastable-focus');
+                };
+            })(this));
+        };
+
+        function Paste(_at__container, _at__target) {
+            this._container = _at__container;
+            this._target = _at__target;
+            this._container = $(this._container);
+            this._target = $(this._target).addClass('pastable');
+            this._container.on('paste', (function(_this) {
+                return function(ev) {
+                    var clipboardData, file, item, reader, text, _i, _j, _len, _len1, _ref, _ref1, _ref2, _ref3, _results;
+                    if (((_ref = ev.originalEvent) != null ? _ref.clipboardData : void 0) != null) {
+                        clipboardData = ev.originalEvent.clipboardData;
+                        if (clipboardData.items) {
+                            _ref1 = clipboardData.items;
+                            for (_i = 0, _len = _ref1.length; _i < _len; _i++) {
+                                item = _ref1[_i];
+                                if (item.type.match(/^image\//)) {
+                                    reader = new FileReader();
+                                    reader.onload = function(event) {
+                                        return _this._handleImage(event.target.result);
+                                    };
+                                    reader.readAsDataURL(item.getAsFile());
+                                }
+                                if (item.type === 'text/plain') {
+                                    item.getAsString(function(string) {
+                                        return _this._target.trigger('pasteText', {
+                                            text: string
+                                        });
+                                    });
+                                }
+                            }
+                        } else {
+                            if (-1 !== Array.prototype.indexOf.call(clipboardData.types, 'text/plain')) {
+                                text = clipboardData.getData('Text');
+                                _this._target.trigger('pasteText', {
+                                    text: text
+                                });
+                            }
+                            _this._checkImagesInContainer(function(src) {
+                                return _this._handleImage(src);
+                            });
+                        }
+                    }
+                    if (clipboardData = window.clipboardData) {
+                        if ((_ref2 = (text = clipboardData.getData('Text'))) != null ? _ref2.length : void 0) {
+                            return _this._target.trigger('pasteText', {
+                                text: text
+                            });
+                        } else {
+                            _ref3 = clipboardData.files;
+                            _results = [];
+                            for (_j = 0, _len1 = _ref3.length; _j < _len1; _j++) {
+                                file = _ref3[_j];
+                                _this._handleImage(URL.createObjectURL(file));
+                                _results.push(_this._checkImagesInContainer(function() {}));
+                            }
+                            return _results;
+                        }
+                    }
+                };
+            })(this));
+        }
+
+        Paste.prototype._handleImage = function(src) {
+            var loader;
+            loader = new Image();
+            loader.onload = (function(_this) {
+                return function() {
+                    var blob, canvas, ctx, dataURL;
+                    canvas = document.createElement('canvas');
+                    canvas.width = loader.width;
+                    canvas.height = loader.height;
+                    ctx = canvas.getContext('2d');
+                    ctx.drawImage(loader, 0, 0, canvas.width, canvas.height);
+                    dataURL = null;
+                    try {
+                        dataURL = canvas.toDataURL('image/png');
+                        blob = dataURLtoBlob(dataURL);
+                    } catch (_error) {}
+                    if (dataURL) {
+                        return _this._target.trigger('pasteImage', {
+                            blob: blob,
+                            dataURL: dataURL,
+                            width: loader.width,
+                            height: loader.height
+                        });
+                    }
+                };
+            })(this);
+            return loader.src = src;
+        };
+
+        Paste.prototype._checkImagesInContainer = function(cb) {
+            var img, timespan, _i, _len, _ref;
+            timespan = Math.floor(1000 * Math.random());
+            _ref = this._container.find('img');
+            for (_i = 0, _len = _ref.length; _i < _len; _i++) {
+                img = _ref[_i];
+                img["_paste_marked_" + timespan] = true;
+            }
+            return setTimeout((function(_this) {
+                return function() {
+                    var _j, _len1, _ref1, _results;
+                    _ref1 = _this._container.find('img');
+                    _results = [];
+                    for (_j = 0, _len1 = _ref1.length; _j < _len1; _j++) {
+                        img = _ref1[_j];
+                        if (!img["_paste_marked_" + timespan]) {
+                            cb(img.src);
+                        }
+                        //firefox问题处理，因为采用了 pastableContenteditable 模式，故只需要删除默认的粘贴
+                        if ($(img).attr('src').startsWith('data:image/')) {
+                           _results.push($(img).remove()); 
+                        };
+                    }
+                    return _results;
+                };
+            })(this), 1);
+        };
+
+        return Paste;
+
+    })();
+
+}).call(this);
+
+KindEditor.plugin('paste', function(K) {
+    var editor = this,
+        name = 'paste';
+    if(editor.edit == undefined || editor.edit.iframe == undefined){
+        return;
+    }
+    var contentWindow = editor.edit.iframe[0].contentWindow;
+    //var contentWindow = editor.iframeDoc;
+    //var contentWindow = document.getElementsByTagName('iframe')[0].contentWindow;
+    var nodeBody = contentWindow.document.getElementsByTagName('body')[0];
+    console.log(nodeBody);
+    $(nodeBody).pastableContenteditable();
+    
+    dataURItoBlob = function(dataURI) {
+      // convert base64/URLEncoded data component to raw binary data held in a string
+      var byteString;
+      if (dataURI.split(',')[0].indexOf('base64') >= 0)
+        byteString = atob(dataURI.split(',')[1]);
+      else
+        byteString = unescape(dataURI.split(',')[1]);
+
+      // separate out the mime component
+      var mimeString = dataURI.split(',')[0].split(':')[1].split(';')[0];
+
+      // write the bytes of the string to a typed array
+      var ia = new Uint8Array(byteString.length);
+      for (var i = 0; i < byteString.length; i++) {
+        ia[i] = byteString.charCodeAt(i);
+      }
+
+      return new Blob([ia], {type:mimeString});
+    };
+
+    $(nodeBody).on('pasteImage', function(ev, data) {
+        console.log('pasteImage');
+        console.log("dataURL: " + data.dataURL);
+        console.log("width: " + data.width);
+        console.log("height: " + data.height);
+        var blob = dataURItoBlob(data.dataURL);
+        if (data.blob !== null) {
+            var data = new FormData();
+            // data.append("imgFile",blob, "imageFilename.png");
+            data.append("file",blob, "imageFilename.png");
+            console.log(data);
+            $.ajax({
+              url: '/kindeditor/upload?dir=image',
+              url: '/api/attachments.json',
+              contentType: false,
+              type: 'POST',
+              data: data,
+              processData: false,
+              success: function(data) {
+                console.log(data);
+                // editor.exec('insertimage', JSON.parse(data).url);
+
+                // /api/attachments/227362
+                editor.exec('insertimage', '/api/attachments/' + data.id);
+              }
+            });
+        }
+
+    });
+    return;
+    
+});
+

public/css/iconfont.json

@@ -5,6 +5,706 @@
   "css_prefix_text": "icon-",
   "description": "",
   "glyphs": [
+    {
+      "icon_id": "15792809",
+      "name": "准备中",
+      "font_class": "zhunbeizhong",
+      "unicode": "e797",
+      "unicode_decimal": 59287
+    },
+    {
+      "icon_id": "15792805",
+      "name": "运行中",
+      "font_class": "yunhangzhong",
+      "unicode": "e796",
+      "unicode_decimal": 59286
+    },
+    {
+      "icon_id": "15792803",
+      "name": "已通过",
+      "font_class": "yitongguo",
+      "unicode": "e795",
+      "unicode_decimal": 59285
+    },
+    {
+      "icon_id": "15792796",
+      "name": "未通过",
+      "font_class": "weitongguo",
+      "unicode": "e794",
+      "unicode_decimal": 59284
+    },
+    {
+      "icon_id": "15762732",
+      "name": "工作流",
+      "font_class": "gongzuoliu",
+      "unicode": "e793",
+      "unicode_decimal": 59283
+    },
+    {
+      "icon_id": "15689245",
+      "name": "更新成绩",
+      "font_class": "gengxinchengji",
+      "unicode": "e790",
+      "unicode_decimal": 59280
+    },
+    {
+      "icon_id": "15605136",
+      "name": "文件",
+      "font_class": "wenjian1",
+      "unicode": "e78e",
+      "unicode_decimal": 59278
+    },
+    {
+      "icon_id": "15605133",
+      "name": "编辑",
+      "font_class": "bianji6",
+      "unicode": "e78d",
+      "unicode_decimal": 59277
+    },
+    {
+      "icon_id": "15591171",
+      "name": "统计",
+      "font_class": "tongji2",
+      "unicode": "e78c",
+      "unicode_decimal": 59276
+    },
+    {
+      "icon_id": "15591167",
+      "name": "签到",
+      "font_class": "qiandao",
+      "unicode": "e78b",
+      "unicode_decimal": 59275
+    },
+    {
+      "icon_id": "15591165",
+      "name": "分班",
+      "font_class": "fenban1",
+      "unicode": "e78a",
+      "unicode_decimal": 59274
+    },
+    {
+      "icon_id": "15591163",
+      "name": "讨论",
+      "font_class": "taolun1",
+      "unicode": "e789",
+      "unicode_decimal": 59273
+    },
+    {
+      "icon_id": "15591161",
+      "name": "视频直播",
+      "font_class": "shipinzhibo",
+      "unicode": "e788",
+      "unicode_decimal": 59272
+    },
+    {
+      "icon_id": "15591155",
+      "name": "学习资源",
+      "font_class": "xuexiziyuan",
+      "unicode": "e787",
+      "unicode_decimal": 59271
+    },
+    {
+      "icon_id": "15591132",
+      "name": "考试问卷",
+      "font_class": "kaoshiwenjuan",
+      "unicode": "e786",
+      "unicode_decimal": 59270
+    },
+    {
+      "icon_id": "15590984",
+      "name": "考试试卷",
+      "font_class": "kaoshishijuan",
+      "unicode": "e785",
+      "unicode_decimal": 59269
+    },
+    {
+      "icon_id": "15590922",
+      "name": "毕业作业",
+      "font_class": "biyezuoye",
+      "unicode": "e784",
+      "unicode_decimal": 59268
+    },
+    {
+      "icon_id": "15590919",
+      "name": "分组作业",
+      "font_class": "fenzuzuoye1",
+      "unicode": "e783",
+      "unicode_decimal": 59267
+    },
+    {
+      "icon_id": "15590916",
+      "name": "普通作业",
+      "font_class": "putongzuoye1",
+      "unicode": "e782",
+      "unicode_decimal": 59266
+    },
+    {
+      "icon_id": "15590913",
+      "name": "实训作业",
+      "font_class": "shixunzuoye",
+      "unicode": "e781",
+      "unicode_decimal": 59265
+    },
+    {
+      "icon_id": "15590860",
+      "name": "公告栏",
+      "font_class": "gonggaolan",
+      "unicode": "e780",
+      "unicode_decimal": 59264
+    },
+    {
+      "icon_id": "15465934",
+      "name": "组织项目",
+      "font_class": "zuzhixiangmu",
+      "unicode": "e77f",
+      "unicode_decimal": 59263
+    },
+    {
+      "icon_id": "15465923",
+      "name": "组织成员",
+      "font_class": "zuzhichengyuan",
+      "unicode": "e774",
+      "unicode_decimal": 59252
+    },
+    {
+      "icon_id": "14332762",
+      "name": "合并请求",
+      "font_class": "hebingqingqiu",
+      "unicode": "e7f2",
+      "unicode_decimal": 59378
+    },
+    {
+      "icon_id": "15226856",
+      "name": "实训详情",
+      "font_class": "shixunxiangqing",
+      "unicode": "e775",
+      "unicode_decimal": 59253
+    },
+    {
+      "icon_id": "15226857",
+      "name": "立即发布",
+      "font_class": "lijifabu",
+      "unicode": "e776",
+      "unicode_decimal": 59254
+    },
+    {
+      "icon_id": "15226858",
+      "name": "开启中",
+      "font_class": "kaiqizhong",
+      "unicode": "e777",
+      "unicode_decimal": 59255
+    },
+    {
+      "icon_id": "15226859",
+      "name": "导出",
+      "font_class": "daochu",
+      "unicode": "e778",
+      "unicode_decimal": 59256
+    },
+    {
+      "icon_id": "15226860",
+      "name": "一键点评",
+      "font_class": "yijiandianping",
+      "unicode": "e779",
+      "unicode_decimal": 59257
+    },
+    {
+      "icon_id": "15226861",
+      "name": "查看实训报告",
+      "font_class": "chakanshixunbaogao",
+      "unicode": "e77a",
+      "unicode_decimal": 59258
+    },
+    {
+      "icon_id": "15226862",
+      "name": "提交总结",
+      "font_class": "tijiaozongjie",
+      "unicode": "e77b",
+      "unicode_decimal": 59259
+    },
+    {
+      "icon_id": "15226863",
+      "name": "代码查重",
+      "font_class": "daimachazhong",
+      "unicode": "e77c",
+      "unicode_decimal": 59260
+    },
+    {
+      "icon_id": "15226864",
+      "name": "编辑作业",
+      "font_class": "bianjizuoye",
+      "unicode": "e77d",
+      "unicode_decimal": 59261
+    },
+    {
+      "icon_id": "15226865",
+      "name": "立即截止",
+      "font_class": "lijijiezhi",
+      "unicode": "e77e",
+      "unicode_decimal": 59262
+    },
+    {
+      "icon_id": "15115208",
+      "name": "镜像",
+      "font_class": "jingxiang",
+      "unicode": "e773",
+      "unicode_decimal": 59251
+    },
+    {
+      "icon_id": "15097291",
+      "name": "新建",
+      "font_class": "xinjian1",
+      "unicode": "e772",
+      "unicode_decimal": 59250
+    },
+    {
+      "icon_id": "11488063",
+      "name": "left arrow",
+      "font_class": "leftarrow",
+      "unicode": "e771",
+      "unicode_decimal": 59249
+    },
+    {
+      "icon_id": "338692",
+      "name": "显示器",
+      "font_class": "zhongqingdianxinicon10",
+      "unicode": "e770",
+      "unicode_decimal": 59248
+    },
+    {
+      "icon_id": "12099623",
+      "name": "设置",
+      "font_class": "huabanfuben",
+      "unicode": "eb7b",
+      "unicode_decimal": 60283
+    },
+    {
+      "icon_id": "14818827",
+      "name": "选中购",
+      "font_class": "check-square-fill3x",
+      "unicode": "e76e",
+      "unicode_decimal": 59246
+    },
+    {
+      "icon_id": "14818833",
+      "name": "展开",
+      "font_class": "play-square-fill3x",
+      "unicode": "e76f",
+      "unicode_decimal": 59247
+    },
+    {
+      "icon_id": "14812518",
+      "name": "选中框",
+      "font_class": "xuanzhongkuang",
+      "unicode": "e76c",
+      "unicode_decimal": 59244
+    },
+    {
+      "icon_id": "14812519",
+      "name": "未选框",
+      "font_class": "weixuankuang",
+      "unicode": "e76d",
+      "unicode_decimal": 59245
+    },
+    {
+      "icon_id": "14775518",
+      "name": "导出",
+      "font_class": "daochu3x",
+      "unicode": "e75f",
+      "unicode_decimal": 59231
+    },
+    {
+      "icon_id": "14775519",
+      "name": "立即截止",
+      "font_class": "lijijiezhi3x",
+      "unicode": "e760",
+      "unicode_decimal": 59232
+    },
+    {
+      "icon_id": "14775520",
+      "name": "编辑试卷",
+      "font_class": "bianjishijuan3x",
+      "unicode": "e761",
+      "unicode_decimal": 59233
+    },
+    {
+      "icon_id": "14775521",
+      "name": "打回重做",
+      "font_class": "dahuizhongzuo3x",
+      "unicode": "e762",
+      "unicode_decimal": 59234
+    },
+    {
+      "icon_id": "14775567",
+      "name": "集中批量批阅",
+      "font_class": "filedone2X",
+      "unicode": "e764",
+      "unicode_decimal": 59236
+    },
+    {
+      "icon_id": "14775587",
+      "name": "组内顺序批阅",
+      "font_class": "filesync3x",
+      "unicode": "e766",
+      "unicode_decimal": 59238
+    },
+    {
+      "icon_id": "14775664",
+      "name": "筛选-下",
+      "font_class": "bianzu19xia3x",
+      "unicode": "e767",
+      "unicode_decimal": 59239
+    },
+    {
+      "icon_id": "14775724",
+      "name": "筛选-上",
+      "font_class": "bianzu193x",
+      "unicode": "e768",
+      "unicode_decimal": 59240
+    },
+    {
+      "icon_id": "14776461",
+      "name": "搜索",
+      "font_class": "Search3x",
+      "unicode": "e769",
+      "unicode_decimal": 59241
+    },
+    {
+      "icon_id": "14788714",
+      "name": "筛选-默认",
+      "font_class": "bianzu19",
+      "unicode": "e76a",
+      "unicode_decimal": 59242
+    },
+    {
+      "icon_id": "14776069",
+      "name": "TAR",
+      "font_class": "TAR",
+      "unicode": "e75e",
+      "unicode_decimal": 59230
+    },
+    {
+      "icon_id": "14776044",
+      "name": "ZIP",
+      "font_class": "ZIP",
+      "unicode": "e75d",
+      "unicode_decimal": 59229
+    },
+    {
+      "icon_id": "14706564",
+      "name": "文件夹",
+      "font_class": "wenjianjia1",
+      "unicode": "e75c",
+      "unicode_decimal": 59228
+    },
+    {
+      "icon_id": "14706563",
+      "name": "文件",
+      "font_class": "wenjia",
+      "unicode": "e75b",
+      "unicode_decimal": 59227
+    },
+    {
+      "icon_id": "14706484",
+      "name": "下载",
+      "font_class": "xiazai2",
+      "unicode": "e75a",
+      "unicode_decimal": 59226
+    },
+    {
+      "icon_id": "14706480",
+      "name": "复制",
+      "font_class": "fuzhi5",
+      "unicode": "e759",
+      "unicode_decimal": 59225
+    },
+    {
+      "icon_id": "14706430",
+      "name": "仓库",
+      "font_class": "cangku",
+      "unicode": "e758",
+      "unicode_decimal": 59224
+    },
+    {
+      "icon_id": "14706421",
+      "name": "贡献者",
+      "font_class": "gongxianzhe",
+      "unicode": "e757",
+      "unicode_decimal": 59223
+    },
+    {
+      "icon_id": "14706420",
+      "name": "发行版",
+      "font_class": "fahangban",
+      "unicode": "e755",
+      "unicode_decimal": 59221
+    },
+    {
+      "icon_id": "14706416",
+      "name": "标签",
+      "font_class": "biaoqian3",
+      "unicode": "e754",
+      "unicode_decimal": 59220
+    },
+    {
+      "icon_id": "14706413",
+      "name": "分支",
+      "font_class": "fenzhi1",
+      "unicode": "e753",
+      "unicode_decimal": 59219
+    },
+    {
+      "icon_id": "14599181",
+      "name": "项目类别",
+      "font_class": "xiangmuleibie",
+      "unicode": "e751",
+      "unicode_decimal": 59217
+    },
+    {
+      "icon_id": "1687276",
+      "name": "点赞",
+      "font_class": "ziyuan1",
+      "unicode": "e752",
+      "unicode_decimal": 59218
+    },
+    {
+      "icon_id": "14599229",
+      "name": "项目类型",
+      "font_class": "xiangmuleixing",
+      "unicode": "e750",
+      "unicode_decimal": 59216
+    },
+    {
+      "icon_id": "14514445",
+      "name": "选中",
+      "font_class": "xuanzhong",
+      "unicode": "e74b",
+      "unicode_decimal": 59211
+    },
+    {
+      "icon_id": "14514446",
+      "name": "未选中",
+      "font_class": "weixuanzhong",
+      "unicode": "e74d",
+      "unicode_decimal": 59213
+    },
+    {
+      "icon_id": "14484580",
+      "name": "复制",
+      "font_class": "fuzhi4",
+      "unicode": "e74a",
+      "unicode_decimal": 59210
+    },
+    {
+      "icon_id": "14484287",
+      "name": "设置",
+      "font_class": "shezhi4",
+      "unicode": "e74e",
+      "unicode_decimal": 59214
+    },
+    {
+      "icon_id": "14476133",
+      "name": "编辑-优化icon",
+      "font_class": "bianji2X",
+      "unicode": "e749",
+      "unicode_decimal": 59209
+    },
+    {
+      "icon_id": "14364807",
+      "name": "多行公式",
+      "font_class": "duohanggongshi",
+      "unicode": "e748",
+      "unicode_decimal": 59208
+    },
+    {
+      "icon_id": "14364804",
+      "name": "行内公式",
+      "font_class": "hangneigongshi",
+      "unicode": "e747",
+      "unicode_decimal": 59207
+    },
+    {
+      "icon_id": "14269491",
+      "name": "取消置顶",
+      "font_class": "quxiaozhiding",
+      "unicode": "e746",
+      "unicode_decimal": 59206
+    },
+    {
+      "icon_id": "14269490",
+      "name": "置顶",
+      "font_class": "zhiding1",
+      "unicode": "e745",
+      "unicode_decimal": 59205
+    },
+    {
+      "icon_id": "14240818",
+      "name": "新建简历、我的简历",
+      "font_class": "xinjianjianliwodejianli",
+      "unicode": "e744",
+      "unicode_decimal": 59204
+    },
+    {
+      "icon_id": "14108259",
+      "name": "回复",
+      "font_class": "huifu",
+      "unicode": "e743",
+      "unicode_decimal": 59203
+    },
+    {
+      "icon_id": "14102491",
+      "name": "图片",
+      "font_class": "tupian",
+      "unicode": "e742",
+      "unicode_decimal": 59202
+    },
+    {
+      "icon_id": "14102400",
+      "name": "问题列表",
+      "font_class": "wentiliebiao",
+      "unicode": "e741",
+      "unicode_decimal": 59201
+    },
+    {
+      "icon_id": "14101755",
+      "name": "职称",
+      "font_class": "zhicheng",
+      "unicode": "e73f",
+      "unicode_decimal": 59199
+    },
+    {
+      "icon_id": "11488156",
+      "name": "upload",
+      "font_class": "upload",
+      "unicode": "e76b",
+      "unicode_decimal": 59243
+    },
+    {
+      "icon_id": "13839898",
+      "name": "发布职位",
+      "font_class": "fabuzhiwei",
+      "unicode": "e73e",
+      "unicode_decimal": 59198
+    },
+    {
+      "icon_id": "13839895",
+      "name": "职位要求",
+      "font_class": "zhiweiyaoqiu",
+      "unicode": "e73d",
+      "unicode_decimal": 59197
+    },
+    {
+      "icon_id": "13839892",
+      "name": "公司介绍",
+      "font_class": "gongsijieshao",
+      "unicode": "e73c",
+      "unicode_decimal": 59196
+    },
+    {
+      "icon_id": "13839888",
+      "name": "公司地址",
+      "font_class": "gongsidizhi",
+      "unicode": "e73b",
+      "unicode_decimal": 59195
+    },
+    {
+      "icon_id": "13515025",
+      "name": "局部刷新键头",
+      "font_class": "jubushuaxinjiantou",
+      "unicode": "e73a",
+      "unicode_decimal": 59194
+    },
+    {
+      "icon_id": "13458315",
+      "name": "返回",
+      "font_class": "fanhui",
+      "unicode": "e739",
+      "unicode_decimal": 59193
+    },
+    {
+      "icon_id": "13458287",
+      "name": "统计",
+      "font_class": "tongji1",
+      "unicode": "e738",
+      "unicode_decimal": 59192
+    },
+    {
+      "icon_id": "13428689",
+      "name": "签到-02",
+      "font_class": "qiandao-1",
+      "unicode": "e736",
+      "unicode_decimal": 59190
+    },
+    {
+      "icon_id": "13428658",
+      "name": "下箭头",
+      "font_class": "xiajiantou2",
+      "unicode": "e737",
+      "unicode_decimal": 59191
+    },
+    {
+      "icon_id": "13427273",
+      "name": "签到-01",
+      "font_class": "qiandao-",
+      "unicode": "e735",
+      "unicode_decimal": 59189
+    },
+    {
+      "icon_id": "13353315",
+      "name": "移动",
+      "font_class": "yidong",
+      "unicode": "e734",
+      "unicode_decimal": 59188
+    },
+    {
+      "icon_id": "13247262",
+      "name": "下移2",
+      "font_class": "xiayi1",
+      "unicode": "e732",
+      "unicode_decimal": 59186
+    },
+    {
+      "icon_id": "13247261",
+      "name": "上移2",
+      "font_class": "shangyi1",
+      "unicode": "e731",
+      "unicode_decimal": 59185
+    },
+    {
+      "icon_id": "13247178",
+      "name": "下移",
+      "font_class": "xiayi",
+      "unicode": "e730",
+      "unicode_decimal": 59184
+    },
+    {
+      "icon_id": "13247175",
+      "name": "上移",
+      "font_class": "shangyi",
+      "unicode": "e72f",
+      "unicode_decimal": 59183
+    },
+    {
+      "icon_id": "13247173",
+      "name": "编辑",
+      "font_class": "bianji5",
+      "unicode": "e72e",
+      "unicode_decimal": 59182
+    },
+    {
+      "icon_id": "13247168",
+      "name": "删除",
+      "font_class": "shanchu3",
+      "unicode": "e72d",
+      "unicode_decimal": 59181
+    },
+    {
+      "icon_id": "13183780",
+      "name": "选择",
+      "font_class": "xuanze",
+      "unicode": "e72c",
+      "unicode_decimal": 59180
+    },
     {
       "icon_id": "2077714",
       "name": "编辑",

public/css/iconfont.svg

@@ -20,6 +20,306 @@ Created by iconfont
   />
     <missing-glyph />
     
+    <glyph glyph-name="zhunbeizhong" unicode="&#59287;" d="M512 384m-480 0a480 480 0 1 1 960 0 480 480 0 1 1-960 0ZM512-128c-281.6 0-512 230.4-512 512s230.4 512 512 512 512-230.4 512-512-230.4-512-512-512zM512 832C262.4 832 64 633.6 64 384s198.4-448 448-448 448 198.4 448 448-198.4 448-448 448zM320 384m-64 0a64 64 0 1 1 128 0 64 64 0 1 1-128 0ZM512 384m-64 0a64 64 0 1 1 128 0 64 64 0 1 1-128 0ZM704 384m-64 0a64 64 0 1 1 128 0 64 64 0 1 1-128 0Z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="yunhangzhong" unicode="&#59286;" d="M512 384m-480 0a480 480 0 1 1 960 0 480 480 0 1 1-960 0ZM512-128c-281.6 0-512 230.4-512 512s230.4 512 512 512 512-230.4 512-512-230.4-512-512-512zM512 832C262.4 832 64 633.6 64 384s198.4-448 448-448 448 198.4 448 448-198.4 448-448 448zM505.6 640v-313.6h294.4c-19.2-128-134.4-230.4-268.8-230.4-153.6 0-275.2 121.6-275.2 268.8C256 512 364.8 627.2 505.6 640z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="yitongguo" unicode="&#59285;" d="M512 384m-480 0a480 480 0 1 1 960 0 480 480 0 1 1-960 0ZM512-128c-281.6 0-512 230.4-512 512s230.4 512 512 512 512-230.4 512-512-230.4-512-512-512zM512 832C262.4 832 64 633.6 64 384s198.4-448 448-448 448 198.4 448 448-198.4 448-448 448zM486.4 172.8c-6.4 0-19.2 6.4-25.6 12.8L294.4 358.4c-12.8 12.8-12.8 32 0 44.8 12.8 12.8 32 12.8 44.8 0L486.4 256l262.4 281.6c12.8 12.8 32 12.8 44.8 0 12.8-12.8 12.8-32 0-44.8L512 185.6c-6.4-6.4-12.8-6.4-25.6-12.8z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="weitongguo" unicode="&#59284;" d="M512 384m-480 0a480 480 0 1 1 960 0 480 480 0 1 1-960 0ZM512-128c-281.6 0-512 230.4-512 512s230.4 512 512 512 512-230.4 512-512-230.4-512-512-512zM512 832C262.4 832 64 633.6 64 384s198.4-448 448-448 448 198.4 448 448-198.4 448-448 448zM678.4 172.8L544 332.8l-134.4-160-51.2 38.4L499.2 384 358.4 556.8l51.2 38.4 134.4-160 134.4 160 51.2-38.4L588.8 384l140.8-172.8z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="gongzuoliu" unicode="&#59283;" d="M837.270588 600.847059H499.952941C421.647059 600.847059 355.388235 667.105882 355.388235 745.411765 349.364706 829.741176 415.623529 896 499.952941 896H843.294118c78.305882 0 144.564706-66.258824 144.564706-144.564706-6.023529-84.329412-72.282353-150.588235-150.588236-150.588235zM499.952941 805.647059c-30.117647 0-54.211765-24.094118-54.211765-54.211765s24.094118-54.211765 54.211765-54.211765H843.294118c30.117647 0 54.211765 24.094118 54.211764 54.211765s-24.094118 54.211765-54.211764 54.211765H499.952941zM548.141176-128H204.8C126.494118-128 60.235294-61.741176 60.235294 16.564706s66.258824 144.564706 144.564706 144.564706h343.341176c78.305882 0 144.564706-66.258824 144.564706-144.564706S626.447059-128 548.141176-128z m-343.341176 204.8c-30.117647 0-54.211765-24.094118-54.211765-54.211765s24.094118-54.211765 54.211765-54.211764h343.341176c30.117647 0 54.211765 24.094118 54.211765 54.211764s-24.094118 54.211765-54.211765 54.211765H204.8zM903.529412-49.694118h-210.82353v90.352942H903.529412c42.164706 0 72.282353 36.141176 72.282353 72.282352v150.588236c0 42.164706-36.141176 72.282353-72.282353 72.282353H180.705882C90.352941 335.811765 12.047059 408.094118 12.047059 498.447059V655.058824C12.047059 745.411765 84.329412 823.717647 180.705882 823.717647h168.658824v-90.352941H180.705882C138.541176 727.341176 108.423529 697.223529 108.423529 655.058824v-144.564706c0-42.164706 36.141176-72.282353 72.282353-72.282353h722.82353c90.352941 0 168.658824-72.282353 168.658823-162.635294v-150.588236c0-102.4-78.305882-174.682353-168.658823-174.682353zM493.929412 384a120.470588 120.470588 0 1 1 240.941176 0 120.470588 120.470588 0 1 1-240.941176 0Z"  horiz-adv-x="1084" />
+
+    
+    <glyph glyph-name="gengxinchengji" unicode="&#59280;" d="M768-84.8c-96 0-166.4 70.4-166.4 166.4v25.6l64-6.4v-12.8c0-57.6 44.8-102.4 102.4-102.4 19.2 0 44.8 6.4 57.6 19.2l38.4-57.6c-25.6-25.6-64-32-96-32z m147.2 89.6l-57.6 25.6c6.4 19.2 12.8 32 12.8 51.2 0 57.6-44.8 102.4-102.4 102.4-19.2 0-32-6.4-44.8-12.8l-32 57.6c25.6 12.8 51.2 19.2 76.8 19.2 89.6 0 166.4-76.8 166.4-166.4 0-25.6-6.4-57.6-19.2-76.8zM633.6 158.4l57.6-76.8H569.6zM908.8-14.4l64 76.8h-128zM544-57.6H64V864h537.6L864 601.6v-275.2h-64V576L576 800h-448v-793.6H544zM243.2 614.4h198.4v-64H243.2zM242.624 438.08l383.936 6.976 1.152-64-383.936-6.912zM243.2 275.2h326.4v-64H243.2zM857.6 550.4h-320l6.4 320 313.6-320z m-256 64h102.4L601.6 716.8v-102.4z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="wenjian1" unicode="&#59278;" d="M574.330435-119.095652H151.373913c-44.521739 0-84.591304 40.069565-84.591304 84.591304V811.408696C66.782609 855.930435 106.852174 896 151.373913 896h681.182609c44.521739 0 84.591304-40.069565 84.591304-84.591304v-436.313044c0-26.713043-17.808696-44.521739-44.521739-44.521739s-44.521739 17.808696-44.521739 44.521739V806.956522H155.826087v-837.008696h418.504348c26.713043 0 44.521739-17.808696 44.521739-44.521739s-22.26087-44.521739-44.521739-44.521739zM249.321739 410.713043h471.930435v-66.782608H249.321739zM512 148.034783m-44.521739 0a44.521739 44.521739 0 1 1 89.043478 0 44.521739 44.521739 0 1 1-89.043478 0ZM690.086957 148.034783m-44.52174 0a44.521739 44.521739 0 1 1 89.043479 0 44.521739 44.521739 0 1 1-89.043479 0ZM850.365217 148.034783m-44.521739 0a44.521739 44.521739 0 1 1 89.043479 0 44.521739 44.521739 0 1 1-89.043479 0ZM249.321739 655.582609h471.930435v-66.782609H249.321739zM249.321739 188.104348h146.921739v-66.782609H249.321739z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="bianji6" unicode="&#59277;" d="M803.044865-97.363698H154.576481c-86.802855 0-153.181508 66.378654-153.181508 153.181508V740.028546c0 86.802855 66.378654 153.181508 153.181508 153.181508h403.377971c30.636302 0 51.060503-20.424201 51.060503-51.060503s-20.424201-51.060503-51.060503-51.060502H154.576481c-30.636302 0-51.060503-20.424201-51.060503-51.060503v-684.210736c0-30.636302 20.424201-51.060503 51.060503-51.060503h648.468384c30.636302 0 51.060503 20.424201 51.060503 51.060503V438.77158c0 30.636302 20.424201 51.060503 51.060503 51.060503s51.060503-20.424201 51.060503-51.060503v-382.95377c0-86.802855-71.484704-153.181508-153.181509-153.181508zM476.257648 362.180826c-10.212101 0-25.530251 5.10605-35.742352 20.424201-20.424201 20.424201-15.318151 51.060503 5.10605 71.484704L930.696122 882.997954c20.424201 20.424201 51.060503 15.318151 71.484704-5.106051 20.424201-20.424201 15.318151-51.060503-5.10605-71.484703L512 377.498977c-10.212101-10.212101-20.424201-15.318151-35.742352-15.318151z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="tongji2" unicode="&#59276;" d="M9.142857 896h1024v-1024H9.142857zM873.142857 377.6H514.742857V736c0 6.4-6.4 6.4-6.4 6.4h-25.6c-51.2 0-108.8-12.8-153.6-32-51.2-19.2-96-44.8-128-83.2S137.142857 550.4 117.942857 499.2C92.342857 448 79.542857 396.8 79.542857 345.6S92.342857 236.8 111.542857 192s51.2-89.6 83.2-128 76.8-64 128-83.2c51.2-19.2 102.4-32 153.6-32s108.8 12.8 153.6 32 89.6 51.2 128 83.2c38.4 38.4 64 76.8 83.2 128 19.2 51.2 32 102.4 32 153.6v25.6c6.4 6.4 6.4 6.4 0 6.4zM713.142857 108.8c-64-64-147.2-96-236.8-96-89.6 0-172.8 32-230.4 96-64 64-96 147.2-96 236.8S181.942857 518.4 245.942857 576c57.6 57.6 128 89.6 198.4 96v-364.8h364.8c-6.4-70.4-38.4-147.2-96-198.4z m249.6 326.4v25.6C949.942857 556.8 911.542857 640 841.142857 704 777.142857 768 687.542857 812.8 597.942857 819.2h-25.6c-6.4 0-6.4 0-6.4-6.4v-384c0-6.4 6.4-6.4 6.4-6.4h384s6.4 6.4 6.4 12.8z m-332.8 57.6v256c64-12.8 121.6-44.8 166.4-89.6s76.8-102.4 89.6-166.4h-256z"  horiz-adv-x="1170" />
+
+    
+    <glyph glyph-name="qiandao" unicode="&#59275;" d="M9.142857 896h1024v-1024H9.142857zM892.342857 710.4h-166.4v64c0 6.4-6.4 6.4-6.4 6.4h-57.6c-6.4 0-6.4-6.4-6.4-6.4v-64H393.142857v64c0 6.4-6.4 6.4-6.4 6.4H329.142857c-6.4 0-6.4-6.4-6.4-6.4v-64H149.942857c-12.8 0-25.6-12.8-25.6-32v-665.6c0-19.2 12.8-32 32-32h736c19.2 0 32 12.8 32 32V678.4c-6.4 19.2-19.2 32-32 32z m-44.8-652.8H194.742857V640h128v-51.2c0-6.4 6.4-6.4 6.4-6.4h57.6l6.4 6.4V640h256v-51.2c0-6.4 6.4-6.4 6.4-6.4h57.6c6.4 0 6.4 6.4 6.4 6.4V640h128v-582.4zM700.342857 473.6h-57.6c-6.4 0-12.8 0-12.8-6.4L476.342857 262.4l-64 89.6c0 6.4-6.4 6.4-12.8 6.4h-57.6c-6.4 0-12.8-6.4-6.4-12.8l128-172.8c6.4-6.4 19.2-6.4 25.6 0l211.2 294.4c6.4 0 6.4 6.4 0 6.4z"  horiz-adv-x="1170" />
+
+    
+    <glyph glyph-name="fenban1" unicode="&#59274;" d="M9.142857 896h1024v-1024H9.142857zM834.742857 198.4c-25.6 25.6-57.6 44.8-89.6 57.6 44.8 38.4 76.8 89.6 76.8 153.6 0 108.8-89.6 204.8-204.8 198.4-108.8 0-198.4-89.6-198.4-198.4 0-64 32-121.6 76.8-153.6-32-12.8-64-32-83.2-57.6-57.6-57.6-83.2-128-89.6-204.8 0-6.4 6.4-6.4 6.4-6.4h57.6c6.4 0 6.4 6.4 6.4 6.4 0 57.6 25.6 115.2 64 153.6 44.8 44.8 102.4 64 160 64s115.2-25.6 160-64c38.4-38.4 64-96 64-153.6 0-6.4 6.4-6.4 6.4-6.4h57.6c6.4 0 6.4 6.4 6.4 6.4 6.4 76.8-25.6 147.2-76.8 204.8zM623.542857 281.6c-38.4 0-70.4 12.8-96 38.4-19.2 25.6-32 57.6-32 96 0 32 12.8 64 38.4 89.6 19.2 19.2 51.2 32 83.2 32s64-12.8 89.6-38.4c25.6-25.6 38.4-57.6 38.4-89.6 0-32-12.8-64-38.4-89.6-19.2-25.6-51.2-38.4-83.2-38.4zM367.542857 384v25.6c0 12.8 0 32 6.4 44.8 0 6.4 0 6.4-6.4 6.4-12.8 12.8-25.6 19.2-38.4 32-25.6 25.6-38.4 57.6-38.4 96 0 32 12.8 64 38.4 83.2 25.6 25.6 57.6 38.4 96 38.4 32 0 64-12.8 83.2-32 6.4-6.4 12.8-19.2 19.2-25.6 0 0 6.4-6.4 6.4 0 19.2 6.4 38.4 12.8 57.6 12.8 6.4 0 6.4 6.4 6.4 12.8C565.942857 742.4 501.942857 787.2 425.142857 787.2 316.342857 787.2 220.342857 697.6 220.342857 588.8c0-64 32-121.6 76.8-153.6-32-19.2-64-38.4-89.6-64-57.6-57.6-83.2-128-89.6-204.8 0-6.4 6.4-6.4 6.4-6.4h57.6c6.4 0 6.4 6.4 6.4 6.4 0 57.6 25.6 115.2 64 153.6 32 32 64 51.2 102.4 57.6 12.8 0 19.2 6.4 12.8 6.4z"  horiz-adv-x="1170" />
+
+    
+    <glyph glyph-name="taolun1" unicode="&#59273;" d="M9.142857 896h1024v-1024H9.142857zM469.942857 384c0-25.6 19.2-51.2 51.2-51.2 25.6 0 51.2 19.2 51.2 51.2 0 25.6-19.2 51.2-51.2 51.2-25.6 0-51.2-25.6-51.2-51.2z m204.8 0c0-25.6 19.2-51.2 51.2-51.2s51.2 19.2 51.2 51.2c0 25.6-19.2 51.2-51.2 51.2s-51.2-25.6-51.2-51.2zM271.542857 384c0-25.6 19.2-51.2 51.2-51.2s44.8 25.6 44.8 51.2-19.2 51.2-51.2 51.2-44.8-25.6-44.8-51.2z m665.6 172.8c-25.6 57.6-57.6 102.4-96 147.2-38.4 38.4-89.6 76.8-140.8 96C642.742857 819.2 578.742857 832 521.142857 832 457.142857 832 399.542857 819.2 341.942857 793.6c-51.2-19.2-96-51.2-140.8-96S130.742857 608 105.142857 556.8C85.942857 499.2 73.142857 441.6 73.142857 384c0-70.4 19.2-140.8 51.2-198.4v-153.6c0-25.6 19.2-44.8 44.8-44.8h153.6c64-32 128-44.8 198.4-51.2 57.6 0 115.2 12.8 172.8 32 51.2 19.2 102.4 51.2 140.8 96 38.4 38.4 76.8 89.6 96 140.8 25.6 57.6 38.4 115.2 38.4 179.2 0 57.6-12.8 115.2-32 172.8z m-153.6-435.2C713.142857 51.2 617.142857 12.8 521.142857 12.8c-57.6 0-121.6 12.8-172.8 44.8l-6.4 6.4H194.742857V204.8l-6.4 6.4C162.742857 262.4 149.942857 320 149.942857 384c0 102.4 38.4 192 108.8 262.4C329.142857 716.8 418.742857 755.2 521.142857 755.2c51.2 0 96-12.8 147.2-32 44.8-19.2 83.2-44.8 121.6-76.8 32-32 64-76.8 76.8-121.6 19.2-44.8 32-96 32-147.2-6.4-96-44.8-185.6-115.2-256z"  horiz-adv-x="1170" />
+
+    
+    <glyph glyph-name="shipinzhibo" unicode="&#59272;" d="M21.333333 896h1024v-1024H21.333333zM930.133333 595.2l-128-76.8V672c0 38.4-25.6 64-64 64H149.333333c-38.4 0-64-25.6-64-64v-576c0-38.4 25.6-64 64-64h588.8c38.4 0 64 25.6 64 64V249.6l128-76.8c19.2-12.8 51.2 0 51.2 25.6V563.2c0 25.6-25.6 44.8-51.2 32z m-198.4-492.8h-576V665.6h576v-563.2z m179.2 166.4l-102.4 57.6V435.2l102.4 57.6v-224zM226.133333 537.6H341.333333c6.4 0 6.4 6.4 6.4 6.4v44.8c0 6.4-6.4 6.4-6.4 6.4H226.133333c-6.4 0-6.4-6.4-6.4-6.4v-51.2h6.4z"  horiz-adv-x="1365" />
+
+    
+    <glyph glyph-name="xuexiziyuan" unicode="&#59271;" d="M9.142857 896h1024v-1024H9.142857zM969.142857-19.2H73.142857V780.8h332.8l128-128c6.4-6.4 12.8-6.4 25.6-6.4H969.142857v-665.6zM143.542857 57.6h755.2V576H559.542857c-25.6 0-51.2 6.4-76.8 25.6L373.942857 710.4H143.542857v-652.8zM834.742857 710.4h-256c-19.2 0-38.4 19.2-38.4 38.4s19.2 38.4 38.4 38.4h256c19.2 0 38.4-19.2 38.4-38.4s-19.2-38.4-38.4-38.4zM937.142857 403.2H117.942857c-19.2 0-38.4 19.2-38.4 38.4s19.2 38.4 38.4 38.4h819.2c19.2 0 38.4-19.2 38.4-38.4s-19.2-38.4-38.4-38.4zM431.542857 121.6H245.942857c-19.2 0-38.4 19.2-38.4 38.4s19.2 32 38.4 32h185.6c19.2 0 38.4-19.2 38.4-38.4s-19.2-32-38.4-32z"  horiz-adv-x="1170" />
+
+    
+    <glyph glyph-name="kaoshiwenjuan" unicode="&#59270;" d="M18.285714 896h1024v-1024H18.285714zM709.485714 582.4v51.2c0 6.4-6.4 6.4-6.4 6.4h-384c-6.4 0-12.8-6.4-12.8-6.4v-51.2l6.4-6.4h384c6.4 0 12.8 6.4 12.8 6.4zM312.685714 499.2c-6.4 0-6.4-6.4-6.4-6.4v-51.2c0-6.4 6.4-6.4 6.4-6.4h185.6c6.4 0 6.4 6.4 6.4 6.4v44.8c0 6.4-6.4 6.4-6.4 6.4H312.685714z m147.2-454.4H223.085714v704H786.285714v-345.6c0-6.4 6.4-6.4 6.4-6.4h57.6c6.4 0 6.4 6.4 6.4 6.4v384c0 19.2-12.8 32-32 32H184.685714C165.485714 819.2 152.685714 806.4 152.685714 787.2v-780.8c0-19.2 12.8-32 32-32h268.8c6.4 0 6.4 6.4 6.4 6.4v57.6c6.4 0 0 6.4 0 6.4z m441.6-51.2l-96 96c19.2 32 38.4 64 38.4 108.8 0 96-76.8 179.2-179.2 179.2S491.885714 288 491.885714 192s76.8-179.2 179.2-179.2c38.4 0 70.4 12.8 96 32l96-96h12.8l32 32c0 6.4 0 6.4-6.4 12.8z m-230.4 83.2c-64 0-115.2 51.2-115.2 115.2s51.2 115.2 115.2 115.2S786.285714 256 786.285714 192s-51.2-115.2-115.2-115.2z"  horiz-adv-x="1170" />
+
+    
+    <glyph glyph-name="kaoshishijuan" unicode="&#59269;" d="M18.285714 896h1024v-1024H18.285714zM709.485714 633.6c0 6.4-6.4 6.4-6.4 6.4h-384c-6.4 0-12.8-6.4-12.8-6.4v-51.2l6.4-6.4h384c6.4 0 6.4 6.4 6.4 6.4v51.2z m-12.8-134.4h-384c-6.4 0-6.4-6.4-6.4-6.4v-51.2c0-6.4 6.4-6.4 6.4-6.4h384c6.4 0 6.4 6.4 6.4 6.4v44.8c6.4 6.4 0 12.8-6.4 12.8zM498.285714 352H312.685714c-6.4 0-6.4-6.4-6.4-6.4v-51.2c0-6.4 6.4-6.4 6.4-6.4h185.6c6.4 0 6.4 6.4 6.4 6.4v51.2s0 6.4-6.4 6.4z m-44.8-307.2H223.085714v704H786.285714v-345.6c0-6.4 6.4-6.4 6.4-6.4h57.6c6.4 0 6.4 6.4 6.4 6.4v384c0 19.2-12.8 32-32 32H184.685714C165.485714 819.2 152.685714 806.4 152.685714 787.2v-780.8c0-19.2 12.8-32 32-32h262.4c6.4 0 6.4 6.4 6.4 6.4v57.6c6.4 0 0 6.4 0 6.4z m352 76.8c32 25.6 44.8 64 44.8 108.8 0 76.8-64 140.8-140.8 140.8s-140.8-64-140.8-140.8c0-44.8 19.2-83.2 44.8-108.8-57.6-32-96-89.6-102.4-160 0-6.4 6.4-6.4 6.4-6.4h51.2c6.4 0 6.4 6.4 6.4 6.4 6.4 70.4 64 121.6 134.4 121.6s128-57.6 134.4-121.6c0-6.4 6.4-6.4 6.4-6.4h51.2c6.4 0 6.4 6.4 6.4 6.4-6.4 64-44.8 121.6-102.4 160zM709.485714 307.2c44.8 0 76.8-38.4 76.8-76.8s-38.4-76.8-76.8-76.8-76.8 38.4-76.8 76.8 32 76.8 76.8 76.8z"  horiz-adv-x="1170" />
+
+    
+    <glyph glyph-name="biyezuoye" unicode="&#59268;" d="M9.142857 896h1024v-1024H9.142857zM521.142857 326.4c-12.8 0-19.2 0-32 6.4L111.542857 518.4c-12.8 6.4-25.6 19.2-32 38.4-6.4 19.2-6.4 38.4 0 51.2 6.4 12.8 19.2 25.6 32 32l377.6 185.6c19.2 6.4 44.8 6.4 64 0L930.742857 640c32-19.2 44.8-57.6 32-89.6-6.4-12.8-19.2-25.6-32-32L553.142857 332.8c-12.8 0-19.2-6.4-32-6.4z m-371.2 256L521.142857 403.2l371.2 179.2L521.142857 761.6 149.942857 582.4zM783.542857 121.6c-12.8 6.4-19.2 12.8-38.4 12.8s-32 12.8-32 32 12.8 32 32 32c70.4 0 128-57.6 128-121.6 0-19.2-12.8-32-32-32s-32 12.8-32 32c0 12.8-6.4 32-12.8 38.4 0-6.4-6.4-19.2-12.8-32-64-89.6-160-147.2-275.2-147.2-115.2 0-211.2 57.6-268.8 140.8-19.2 25.6-12.8 57.6 0 44.8 70.4-57.6 166.4-102.4 268.8-102.4 108.8 0 204.8 44.8 275.2 102.4zM130.742857 217.6m-64 0a64 64 0 1 1 128 0 64 64 0 1 1-128 0ZM105.142857 544h57.6v-326.4h-57.6z"  horiz-adv-x="1170" />
+
+    
+    <glyph glyph-name="fenzuzuoye1" unicode="&#59267;" d="M21.333333 896h1024v-1024H21.333333zM949.333333 736H718.933333c-51.2 0-96-12.8-140.8-38.4l-44.8-32-51.2 25.6C443.733333 723.2 392.533333 736 347.733333 736H117.333333C98.133333 736 85.333333 723.2 85.333333 704v-569.6c0-19.2 12.8-32 32-32h230.4c51.2 0 96-12.8 140.8-38.4l44.8-25.6h12.8l38.4 25.6c38.4 25.6 89.6 38.4 140.8 38.4h230.4c19.2 0 32 12.8 32 32V704c-6.4 19.2-19.2 32-38.4 32zM347.733333 172.8h-192V665.6H341.333333c38.4 0 70.4-12.8 102.4-32l51.2-32 6.4-6.4v-460.8c-44.8 25.6-102.4 38.4-153.6 38.4z m563.2 0H725.333333c-57.6 0-108.8-12.8-153.6-38.4V595.2l6.4 6.4 51.2 32c32 19.2 64 32 102.4 32H917.333333v-492.8zM418.133333 537.6H232.533333c-6.4 0-6.4-6.4-6.4-6.4v-44.8c0-6.4 0-6.4 6.4-6.4h185.6c6.4 0 6.4 6.4 6.4 6.4v38.4c0 6.4 0 12.8-6.4 12.8z m224-12.8v-44.8c0-6.4 6.4-6.4 6.4-6.4h185.6c6.4 0 6.4 6.4 6.4 6.4v44.8c0 6.4-6.4 6.4-6.4 6.4H648.533333c-6.4 6.4-6.4 0-6.4-6.4z m-224-128H232.533333c-6.4 0-6.4-6.4-6.4-6.4v-44.8c0-6.4 0-6.4 6.4-6.4h185.6c6.4 0 6.4 6.4 6.4 6.4v44.8s0 6.4-6.4 6.4z m416 0H648.533333c-6.4 0-6.4-6.4-6.4-6.4v-44.8c0-6.4 6.4-6.4 6.4-6.4h185.6c6.4 0 6.4 6.4 6.4 6.4v44.8s0 6.4-6.4 6.4z"  horiz-adv-x="1365" />
+
+    
+    <glyph glyph-name="putongzuoye1" unicode="&#59266;" d="M4.266667 896h1024v-1024H4.266667zM650.666667 832v-70.4h-512v-755.2h652.8v320h70.4v-358.4c0-19.2-12.8-32-32-32H100.266667c-19.2 0-32 12.8-32 32v832c0 19.2 12.8 32 32 32h550.4zM420.266667 454.4H260.266667c-19.2 0-38.4 19.2-38.4 38.4s19.2 32 38.4 32h160c19.2 0 32-12.8 32-32s-12.8-38.4-32-38.4zM516.266667 601.6H260.266667c-19.2 0-38.4 19.2-38.4 38.4s19.2 32 38.4 32h256c19.2 0 38.4-19.2 38.4-38.4s-19.2-32-38.4-32zM714.666667 89.6H260.266667c-19.2 0-38.4 19.2-38.4 38.4s19.2 38.4 38.4 38.4h454.4c19.2 0 38.4-19.2 38.4-38.4s-19.2-38.4-38.4-38.4zM522.666667 185.6c-25.6 0-51.2 19.2-64 44.8-6.4 12.8-6.4 19.2-6.4 32l12.8 134.4c0 12.8 6.4 25.6 12.8 32l236.8 345.6c19.2 32 51.2 51.2 89.6 57.6 38.4 6.4 70.4 0 102.4-19.2l12.8-6.4c57.6-44.8 70.4-128 32-185.6L708.266667 268.8c-6.4-12.8-19.2-19.2-32-25.6l-134.4-51.2c-6.4 0-12.8-6.4-19.2-6.4z m300.8 576h-12.8c-19.2 0-32-12.8-38.4-25.6L535.466667 390.4l-6.4-128L644.266667 307.2l243.2 345.6c19.2 25.6 12.8 64-12.8 89.6l-6.4 6.4 19.2 25.6-25.6-25.6c-12.8 6.4-25.6 12.8-38.4 12.8z"  horiz-adv-x="1092" />
+
+    
+    <glyph glyph-name="shixunzuoye" unicode="&#59265;" d="M4.266667 896h1024v-1024H4.266667zM964.266667 128H68.266667V832h896v-704zM138.666667 204.8h755.2V761.6H138.666667v-556.8zM708.266667-64H324.266667c-19.2 0-38.4 19.2-38.4 38.4s19.2 38.4 38.4 38.4h384c19.2 0 38.4-19.2 38.4-38.4s-19.2-38.4-38.4-38.4zM708.266667 403.2c-12.8 0-19.2 6.4-25.6 12.8-12.8 12.8-12.8 38.4 6.4 51.2L772.266667 544 682.666667 620.8c-12.8 12.8-12.8 38.4 0 51.2 12.8 12.8 38.4 12.8 51.2 0l89.6-83.2c12.8-12.8 19.2-32 19.2-44.8 0-19.2-6.4-38.4-19.2-51.2l-6.4-6.4-83.2-76.8c-12.8 0-19.2-6.4-25.6-6.4zM330.666667 403.2c-6.4 0-19.2 0-25.6 6.4L215.466667 492.8c-25.6 25.6-25.6 70.4 0 96l89.6 83.2c12.8 12.8 38.4 12.8 51.2 0 12.8-12.8 12.8-38.4 0-51.2L266.666667 537.6l83.2-70.4c12.8-12.8 19.2-38.4 6.4-51.2-6.4-6.4-19.2-12.8-25.6-12.8zM465.066667 384H452.266667c-19.2 12.8-25.6 32-19.2 51.2l102.4 243.2c6.4 19.2 25.6 32 44.8 19.2 19.2-6.4 25.6-25.6 19.2-44.8L503.466667 409.6c-6.4-12.8-19.2-25.6-38.4-25.6zM925.866667 256H119.466667c-19.2 0-38.4 19.2-38.4 38.4s19.2 38.4 38.4 38.4h800c19.2 0 38.4-19.2 38.4-38.4s-12.8-38.4-32-38.4zM401.066667 160h70.4V-64H401.066667zM586.666667 160h70.4V-64H586.666667z"  horiz-adv-x="1092" />
+
+    
+    <glyph glyph-name="gonggaolan" unicode="&#59264;" d="M870.4-119.466667L426.666667 153.6c-8.533333 0-17.066667 8.533333-25.6 8.533333H0V614.4h409.6c8.533333 0 17.066667 0 25.6 8.533333L870.4 887.466667v-1006.933334zM93.866667 256h307.2c25.6 0 51.2-8.533333 68.266666-17.066667l307.2-187.733333V716.8L486.4 537.6c-25.6-17.066667-51.2-25.6-76.8-25.6H93.866667v-256zM998.4 699.733333c-17.066667 0-42.666667 17.066667-42.666667 34.133334-8.533333 25.6 8.533333 51.2 34.133334 59.733333l153.6 42.666667c25.6 8.533333 51.2-8.533333 59.733333-34.133334 8.533333-25.6-8.533333-51.2-34.133333-59.733333l-153.6-42.666667h-17.066667zM1152-59.733333h-8.533333l-153.6 42.666666c-25.6 8.533333-42.666667 34.133333-34.133334 59.733334 8.533333 25.6 34.133333 42.666667 59.733334 34.133333l153.6-42.666667c25.6-8.533333 42.666667-34.133333 34.133333-59.733333-17.066667-17.066667-34.133333-34.133333-51.2-34.133333zM1152 332.8h-153.6c-25.6 0-51.2 25.6-51.2 51.2s25.6 51.2 51.2 51.2h153.6c25.6 0 42.666667-25.6 42.666667-51.2s-17.066667-51.2-42.666667-51.2zM375.466667 554.666667h93.866666v-349.866667H375.466667z"  horiz-adv-x="1205" />
+
+    
+    <glyph glyph-name="zuzhixiangmu" unicode="&#59263;" d="M487.619048-128c-243.809524 0-438.857143 195.047619-438.857143 438.857143s195.047619 438.857143 438.857143 438.857143 438.857143-195.047619 438.857142-438.857143-195.047619-438.857143-438.857142-438.857143z m0 799.695238c-199.92381 0-360.838095-160.914286-360.838096-360.838095 0-199.92381 160.914286-360.838095 360.838096-360.838095 199.92381 0 360.838095 160.914286 360.838095 360.838095 0 199.92381-160.914286 360.838095-360.838095 360.838095zM195.047619 67.047619m-156.038095 0a156.038095 156.038095 0 1 1 312.07619 0 156.038095 156.038095 0 1 1-312.07619 0ZM195.047619-128c-107.27619 0-195.047619 87.771429-195.047619 195.047619s87.771429 195.047619 195.047619 195.047619 195.047619-87.771429 195.047619-195.047619-87.771429-195.047619-195.047619-195.047619z m0 312.07619c-63.390476 0-117.028571-53.638095-117.028571-117.028571s53.638095-117.028571 117.028571-117.028571 117.028571 53.638095 117.028571 117.028571-53.638095 117.028571-117.028571 117.028571zM390.095238 700.952381m-156.038095 0a156.038095 156.038095 0 1 1 312.07619 0 156.038095 156.038095 0 1 1-312.07619 0ZM390.095238 505.904762C282.819048 505.904762 195.047619 593.67619 195.047619 700.952381s87.771429 195.047619 195.047619 195.047619 195.047619-87.771429 195.047619-195.047619-87.771429-195.047619-195.047619-195.047619z m0 312.07619C326.704762 817.980952 273.066667 764.342857 273.066667 700.952381S326.704762 583.92381 390.095238 583.92381s117.028571 53.638095 117.028572 117.028571S453.485714 817.980952 390.095238 817.980952zM926.47619 310.857143m-156.038095 0a156.038095 156.038095 0 1 1 312.076191 0 156.038095 156.038095 0 1 1-312.076191 0ZM926.47619 115.809524c-107.27619 0-195.047619 87.771429-195.047619 195.047619s87.771429 195.047619 195.047619 195.047619 195.047619-87.771429 195.04762-195.047619-87.771429-195.047619-195.04762-195.047619z m0 312.07619c-63.390476 0-117.028571-53.638095-117.028571-117.028571s53.638095-117.028571 117.028571-117.028572 117.028571 53.638095 117.028572 117.028572-53.638095 117.028571-117.028572 117.028571z"  horiz-adv-x="1121" />
+
+    
+    <glyph glyph-name="zuzhichengyuan" unicode="&#59252;" d="M1029.389474-117.221053H231.747368c-70.063158 0-123.957895 53.894737-123.957894 123.957895v102.4h86.231579v-102.4c0-21.557895 16.168421-37.726316 37.726315-37.726316h797.642106c21.557895 0 37.726316 16.168421 37.726315 37.726316v754.526316c0 21.557895-16.168421 37.726316-37.726315 37.726316H231.747368c-16.168421 0-32.336842-16.168421-32.336842-37.726316v-199.410526H113.178947V761.263158c0 70.063158 53.894737 123.957895 123.957895 123.957895h797.642105c70.063158 0 123.957895-53.894737 123.957895-123.957895v-759.91579c-5.389474-64.673684-59.284211-118.568421-129.347368-118.568421zM635.742316 305.152c-102.4 0-188.631579 86.231579-188.631579 188.631579s86.231579 188.631579 188.631579 188.631579 188.631579-86.231579 188.631579-188.631579-86.231579-188.631579-188.631579-188.631579z m0 291.031579c-53.894737 0-102.4-48.505263-102.4-102.4 0-53.894737 48.505263-102.4 102.4-102.4 53.894737 0 102.4 48.505263 102.4 102.4 0 53.894737-48.505263 102.4-102.4 102.4zM872.879158 78.794105c-21.557895 0-43.115789 21.557895-43.11579 43.11579 0 107.789474-86.231579 194.021053-194.021052 194.021052s-194.021053-86.231579-194.021053-194.021052c0-21.557895-21.557895-43.115789-43.115789-43.11579s-43.115789 21.557895-43.11579 43.11579c0 156.294737 129.347368 280.252632 280.252632 280.252631 156.294737 0 280.252632-129.347368 280.252631-280.252631 0-26.947368-21.557895-43.115789-43.115789-43.11579zM231.747368 518.736842h-161.68421c-21.557895 0-43.115789 21.557895-43.11579 43.11579s21.557895 43.115789 43.11579 43.115789h161.68421c21.557895 0 43.115789-21.557895 43.11579-43.115789s-16.168421-43.115789-43.11579-43.11579zM231.747368 82.189474h-161.68421c-21.557895 0-43.115789 21.557895-43.11579 43.115789s21.557895 43.115789 43.11579 43.11579h161.68421c21.557895 0 43.115789-21.557895 43.11579-43.11579s-16.168421-43.115789-43.11579-43.115789zM231.747368 319.326316h-161.68421c-21.557895 0-43.115789 21.557895-43.11579 43.115789s21.557895 43.115789 43.11579 43.11579h161.68421c21.557895 0 43.115789-21.557895 43.11579-43.11579s-16.168421-43.115789-43.11579-43.115789z"  horiz-adv-x="1185" />
+
+    
+    <glyph glyph-name="hebingqingqiu" unicode="&#59378;" d="M224 832c88.366 0 160-71.634 160-160 0-75.987-52.97-139.602-124-155.934v-264.132C331.03 235.602 384 171.987 384 96c0-88.366-71.634-160-160-160S64 7.634 64 96c0 75.987 52.97 139.602 124 155.934V516.066C116.97 532.398 64 596.013 64 672c0 88.366 71.634 160 160 160z m0-648c-48.601 0-88-39.399-88-88s39.399-88 88-88 88 39.399 88 88-39.399 88-88 88z m0 576c-48.601 0-88-39.399-88-88s39.399-88 88-88 88 39.399 88 88-39.399 88-88 88z m416-232.855c0-11.046-8.954-20-20-20a20 20 0 0 0-12.925 4.737L436.023 656.737c-8.43 7.139-9.476 19.759-2.338 28.188a20 20 0 0 0 2.338 2.338L607.075 832.118c8.43 7.138 21.05 6.091 28.188-2.338A20 20 0 0 0 640 816.855V708h68c69.986 0 126.853-56.167 127.983-125.883L836 580v-328.066C907.03 235.602 960 171.987 960 96c0-88.366-71.634-160-160-160s-160 71.634-160 160c0 75.987 52.97 139.602 124 155.934V580c0 30.619-24.573 55.498-55.074 55.992L708 636h-68v-108.855zM800 184c-48.601 0-88-39.399-88-88s39.399-88 88-88 88 39.399 88 88-39.399 88-88 88z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="shixunxiangqing" unicode="&#59253;" d="M928.036571 832c17.627429 0 31.963429-14.336 31.963429-32.036571v-636.928a31.963429 31.963429 0 0 0-32.036571-32.036572l-272.822858 0.073143v-126.171429h47.835429a35.986286 35.986286 0 0 0 6.509714-71.460571l-6.509714-0.585143H322.998857a35.986286 35.986286 0 0 0-6.436571 71.387429l6.436571 0.585143 74.093714 0.073142v126.171429l-301.129142-0.073143a31.963429 31.963429 0 0 0-31.963429 32.036572V800.036571c0 17.627429 14.336 31.963429 32.036571 31.963429h831.926858zM583.021714 4.9005710000000136v126.171429H469.138286v-126.171429h113.956571z m304.859429 248.978286H135.972571v-50.834286H887.954286v50.834286z m0 506.148572H135.972571v-434.176H887.954286V760.027429z m-310.125714-60.269715c16.237714-6.729143 25.014857-24.137143 21.357714-40.813714l-1.901714-6.217143-101.010286-244.004571a35.986286 35.986286 0 0 0-68.461714 21.357714l1.901714 6.217143L530.724571 680.228571a35.986286 35.986286 0 0 0 47.030858 19.456z m114.541714-29.184a35.986286 35.986286 0 0 0 50.907428 1.682286l86.674286-81.188571 5.851429-6.217143a68.022857 68.022857 0 0 0-2.706286-89.965715c-2.267429-2.340571-2.267429-2.340571-4.754286-4.608l-85.942857-75.337142-5.266286-3.803429a35.986286 35.986286 0 0 0-45.568 7.094857l-3.803428 5.266286a35.986286 35.986286 0 0 0 7.168 45.568l82.651428 72.484571-83.529142 78.189715-4.388572 4.827428a35.986286 35.986286 0 0 0 2.706286 46.08z m-342.601143 0a35.986286 35.986286 0 0 0 2.633143-46.006857l-4.315429-4.827428-83.529143-78.189715 82.651429-72.411428c13.312-11.702857 15.945143-31.012571 7.168-45.641143l-3.803429-5.266286a35.986286 35.986286 0 0 0-45.568-7.094857l-5.266285 3.803429-87.771429 77.019428-2.925714 2.925714a68.022857 68.022857 0 0 0-2.706286 89.965715l5.851429 6.217143 86.674285 81.188571a35.986286 35.986286 0 0 0 50.907429-1.682286z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="lijifabu" unicode="&#59254;" d="M846.375385 822.902154a70.262154 70.262154 0 0 0 98.067692-73.255385l-1.890462-9.452307-188.022153-691.357539a70.262154 70.262154 0 0 0-100.43077-43.795692l-6.537846 3.938461-107.047384 71.837539-51.751385-134.537846a70.262154 70.262154 0 0 0-82.471385-42.929231l-8.428307 2.599384a70.262154 70.262154 0 0 0-44.347077 56.083693l-0.630154 9.452307V239.852308c0 18.904615 7.640615 37.021538 20.952615 50.09723l7.089231 6.144 303.261538 227.485539a37.179077 37.179077 0 0 0 49.624616-55.059692l-4.962462-4.489847-301.607384-226.146461v-244.105846l45.686154 118.626461a70.262154 70.262154 0 0 0 3.308307 7.168l3.938462 6.774154a70.262154 70.262154 0 0 0 89.954461 23.630769l7.561846-4.489846 106.496-71.364923 184.241231 677.415385L137.058462 428.268308l131.623384-84.519385c15.36-9.846154 21.031385-29.144615 14.336-45.449846l-3.150769-5.907692a37.179077 37.179077 0 0 0-45.449846-14.336l-5.907693 3.150769L90.427077 369.82153800000003a70.262154 70.262154 0 0 0 2.284308 119.729231l7.325538 3.702154L846.375385 822.902154z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="kaiqizhong" unicode="&#59255;" d="M941.312 625.493333h-298.666667V757.333333a37.290667 37.290667 0 0 1-37.290666 37.376H129.365333V841.301333a9.386667 9.386667 0 0 1-9.386666 9.386667H54.698667a9.386667 9.386667 0 0 1-9.386667-9.386667v-914.602666c0-5.12 4.266667-9.386667 9.386667-9.386667h65.28c5.12 0 9.386667 4.266667 9.386666 9.386667V234.666667h289.28v-131.84c0-20.650667 16.725333-37.290667 37.376-37.290667h485.290667a37.290667 37.290667 0 0 1 37.376 37.290667V588.202667a37.290667 37.290667 0 0 1-37.376 37.290666zM129.365333 318.634667V710.656h429.226667v-392.021333h-429.226667z m765.269334-169.130667H502.698667V234.666667h130.56c5.205333 0 9.386667 4.266667 9.386666 9.386666V541.44h251.989334v-392.021333z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="daochu" unicode="&#59256;" d="M651.946667 166.656l165.546666 130.645333a9.386667 9.386667 0 0 1 0 14.677334L651.946667 442.709333a9.386667 9.386667 0 0 1-15.104-7.338666v-88.746667h-378.026667a9.386667 9.386667 0 0 1-9.386667-9.301333v-65.365334c0-5.12 4.266667-9.301333 9.386667-9.301333h378.026667V174.08a9.386667 9.386667 0 0 1 15.189333-7.338667z m304.896 472.490667L767.146667 828.842667a74.325333 74.325333 0 0 1-31.146667 18.688V850.688H82.688A37.290667 37.290667 0 0 1 45.226667 813.226667v-324.266667c0-5.12 4.266667-9.386667 9.386666-9.386667h65.28c5.12 0 9.386667 4.266667 9.386667 9.386667V766.549333h158.634667v-158.634666c0-20.650667 16.725333-37.376 37.376-37.376h373.248a37.290667 37.290667 0 0 1 37.376 37.376V741.205333l158.72-158.634666V488.96c0-5.12 4.181333-9.301333 9.301333-9.301333h65.28c5.12 0 9.386667 4.266667 9.386667 9.386666V586.325333a74.410667 74.410667 0 0 1-21.845334 52.736zM661.333333 645.290667h-298.666666V766.634667h298.666666v-121.258667z m308.053334-508.586667h-65.365334a9.386667 9.386667 0 0 1-9.386666-9.386667v-125.952H129.365333V127.317333a9.386667 9.386667 0 0 1-9.386666 9.386667H54.698667a9.386667 9.386667 0 0 1-9.386667-9.386667v-172.629333c0-20.650667 16.725333-37.376 37.376-37.376H941.226667a37.290667 37.290667 0 0 1 37.376 37.376V127.317333a9.386667 9.386667 0 0 1-9.386667 9.386667z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="yijiandianping" unicode="&#59257;" d="M260.010667 689.664a9.386667 9.386667 0 0 1-9.386667-9.386667v-55.978666c0-5.12 4.266667-9.301333 9.386667-9.301334h448c5.12 0 9.386667 4.266667 9.386666 9.386667v55.978667a9.386667 9.386667 0 0 1-9.386666 9.301333h-448z m214.613333-168.021333H260.010667a9.386667 9.386667 0 0 1-9.386667-9.386667v-55.893333c0-5.12 4.266667-9.386667 9.386667-9.386667h214.613333c5.12 0 9.386667 4.266667 9.386667 9.386667v55.978666a9.386667 9.386667 0 0 1-9.386667 9.386667z m-55.978667-534.272H157.354667V808.704H810.666667v-373.333333c0-5.12 4.266667-9.386667 9.386666-9.386667h65.28c5.12 0 9.386667 4.266667 9.386667 9.386667V855.296a37.290667 37.290667 0 0 1-37.376 37.376h-746.666667a37.290667 37.290667 0 0 1-37.376-37.376v-914.602667c0-20.650667 16.725333-37.376 37.376-37.376h308.053334c5.12 0 9.301333 4.266667 9.301333 9.386667v65.28a9.386667 9.386667 0 0 1-9.386667 9.386667z m513.365334 102.656H763.989333v42.666666a130.730667 130.730667 0 1 1-74.666666 0v-42.666666H521.386667a18.773333 18.773333 0 0 1-18.602667-18.773334v-177.237333c0-10.24 8.362667-18.688 18.602667-18.688h410.709333a18.773333 18.773333 0 0 1 18.688 18.688V71.33866699999999a18.773333 18.773333 0 0 1-18.773333 18.688z m-263.68 167.936a58.368 58.368 0 1 0 116.736 0 58.368 58.368 0 0 0-116.736 0z m210.005333-310.272H574.976v69.973333h303.36v-69.973333z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="chakanshixunbaogao" unicode="&#59258;" d="M717.312 673.28a9.386667 9.386667 0 0 1-9.386667 9.386667h-448a9.386667 9.386667 0 0 1-9.216-9.386667v-55.978667c0-5.12 4.181333-9.301333 9.301334-9.301333h448c5.12 0 9.386667 4.266667 9.386666 9.386667V673.28z m-9.386667-158.634667h-448a9.386667 9.386667 0 0 1-9.216-9.386666v-55.893334c0-5.12 4.181333-9.386667 9.301334-9.386666h448c5.12 0 9.386667 4.266667 9.386666 9.386666v55.978667a9.386667 9.386667 0 0 1-9.386666 9.386667zM474.794667 346.709333H259.925333a9.386667 9.386667 0 0 1-9.386666-9.386666v-55.978667c0-5.12 4.266667-9.386667 9.386666-9.386667h214.613334c5.12 0 9.386667 4.266667 9.386666 9.386667v55.978667a9.386667 9.386667 0 0 1-9.386666 9.386666z m-56.064-359.338666H157.354667V808.704H810.666667v-401.408c0-5.12 4.266667-9.301333 9.386666-9.301333h65.28c5.12 0 9.386667 4.266667 9.386667 9.386666V855.296a37.290667 37.290667 0 0 1-37.376 37.290667h-746.666667a37.290667 37.290667 0 0 1-37.376-37.376v-914.602667c0-20.650667 16.725333-37.376 37.376-37.376h308.053334c5.12 0 9.301333 4.266667 9.301333 9.386667v65.28a9.386667 9.386667 0 0 1-9.386667 9.386666z m416.256 86.784a168.106667 168.106667 0 1 1-225.877334 0 229.290667 229.290667 0 0 1-115.712-189.098667 9.386667 9.386667 0 0 1 9.386667-9.728h56.064a9.386667 9.386667 0 0 1 9.386667 8.874667c4.522667 80.725333 71.850667 145.066667 153.856 145.066666s149.333333-64.341333 153.856-145.066666a9.386667 9.386667 0 0 1 9.386666-8.874667h56.064a9.301333 9.301333 0 0 1 9.386667 9.728 228.864 228.864 0 0 1-115.797333 189.098667z m-112.896 217.6a93.269333 93.269333 0 1 0 0-186.538667 93.269333 93.269333 0 0 0 0 186.624z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="tijiaozongjie" unicode="&#59259;" d="M717.312 617.301333v56.064a9.386667 9.386667 0 0 1-9.386667 9.301334h-448a9.386667 9.386667 0 0 1-9.216-9.386667v-55.978667c0-5.12 4.181333-9.301333 9.301334-9.301333h448c5.12 0 9.386667 4.266667 9.386666 9.386667z m-457.386667-102.656a9.386667 9.386667 0 0 1-9.216-9.386666v-55.893334c0-5.12 4.181333-9.386667 9.301334-9.386666h214.613333c5.12 0 9.386667 4.266667 9.386667 9.386666v55.978667a9.386667 9.386667 0 0 1-9.386667 9.386667H260.010667z m438.784-135.338666a251.989333 251.989333 0 1 1 0-503.978667 251.989333 251.989333 0 0 1 0 503.978667z m125.44-377.429334a176.213333 176.213333 0 0 0-125.44-51.882666 176.213333 176.213333 0 0 0-125.44 51.882666 176.213333 176.213333 0 0 0-51.968 125.44c0 47.36 18.432 91.989333 51.968 125.44a176.213333 176.213333 0 0 0 125.44 51.882667c47.36 0 91.904-18.432 125.44-51.882667 33.450667-33.450667 51.882667-78.08 51.882667-125.44 0-47.36-18.432-91.904-51.968-125.44z m-21.674666 214.186667H750.933333a9.216 9.216 0 0 1-7.68-3.925333l-73.984-102.4-26.965333 37.205333a9.216 9.216 0 0 1-7.68 3.84h-51.370667a9.386667 9.386667 0 0 1-7.594666-14.848l86.186666-119.125333c3.669333-5.12 11.264-5.12 14.933334 0l133.290666 184.32a9.301333 9.301333 0 0 1-7.509333 14.848z m-374.442667-228.693333H157.354667V808.704H810.666667v-401.408c0-5.12 4.266667-9.301333 9.386666-9.301333h65.28c5.12 0 9.386667 4.266667 9.386667 9.386666V855.296a37.290667 37.290667 0 0 1-37.376 37.290667h-746.666667a37.290667 37.290667 0 0 1-37.376-37.376v-914.602667c0-20.650667 16.725333-37.376 37.376-37.376h317.354667c5.12 0 9.301333 4.266667 9.301333 9.386667v65.28a9.386667 9.386667 0 0 1-9.386666 9.386666z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="daimachazhong" unicode="&#59260;" d="M810.377846 284.435692c97.910154 0 171.480615-51.672615 219.136-152.339692a46.158769 46.158769 0 0 0-0.078769-38.990769c-47.576615-100.352-121.147077-152.182154-218.978462-152.182154-97.988923 0-171.480615 51.672615-219.136 152.024615a46.473846 46.473846 0 0 0 0 39.384616c47.655385 100.352 121.147077 152.103385 219.057231 152.103384z m0-68.923077c-66.875077 0-115.790769-32.295385-151.945846-102.793846 36.233846-70.577231 85.070769-102.872615 152.024615-102.872615 66.796308 0 115.712 32.295385 151.867077 102.872615-36.233846 70.498462-85.070769 102.793846-151.945846 102.793846z m0.551385-43.086769a60.337231 60.337231 0 1 0 0-120.516923 60.337231 60.337231 0 0 0 0 120.516923zM947.593846 836.923077c19.062154 0 34.500923-15.438769 34.500923-34.500923v-315.470769h-77.587692V759.414154H146.510769V147.692308h336.029539v-77.508923H103.345231a34.422154 34.422154 0 0 0-34.422154 34.422153v697.895385c0 18.983385 15.438769 34.422154 34.500923 34.422154zM667.805538 622.907077l2.756924-1.181539 152.260923-120.123076a11.342769 11.342769 0 0 0 0-17.644308L670.562462 363.756308a5.513846 5.513846 0 0 0-3.465847-1.181539 5.592615 5.592615 0 0 0-5.513846 5.592616v57.028923c0 1.811692 0.787692 3.387077 2.126769 4.411077l79.95077 63.172923-79.95077 63.094154a5.513846 5.513846 0 0 0-2.126769 4.411076v57.028924a5.513846 5.513846 0 0 0 1.181539 3.465846 5.513846 5.513846 0 0 0 7.798154 0.94523z m-304.521846-1.181539a5.513846 5.513846 0 0 0 7.798154-0.94523 5.513846 5.513846 0 0 0 1.181539-3.465846v-57.028924c0-1.732923-0.787692-3.387077-2.12677-4.411076l-80.029538-63.094154 80.029538-63.172923a5.513846 5.513846 0 0 0 2.12677-4.411077V368.246154c0-3.072-2.520615-5.513846-5.513847-5.513846a5.513846 5.513846 0 0 0-3.465846 1.102769L211.101538 484.036923a11.421538 11.421538 0 0 0 0 17.644308z m226.776616-0.94523l-22.134154-64.827077-18.825846-55.217231-1.417846-4.174769-1.181539-3.387077-1.181538-3.465846-1.024-3.072-0.945231-2.678154-18.510769-54.272-1.496616-4.411077-19.456-57.028923-0.787692-2.205539-0.551385-1.732923-0.157538-0.472615-0.315077-0.787692v-0.07877l-35.682462-104.448-0.315077-0.866461-0.315076-0.945231v-0.393846l-0.551385-1.417846a5.592615 5.592615 0 0 0-5.277539-3.859693h-47.104a5.592615 5.592615 0 0 0-5.513846 5.671385c0 0.630154 0 1.260308 0.236308 1.811692l160.925538 471.197539a5.592615 5.592615 0 0 0 5.277539 3.859692h46.946461a5.671385 5.671385 0 0 0 5.356308-7.561846l-5.198769-14.966154-0.236308-1.181538-29.932307-87.276308-0.630154-1.811692z"  horiz-adv-x="1102" />
+
+    
+    <glyph glyph-name="bianjizuoye" unicode="&#59261;" d="M969.386667 384h-65.365334a9.386667 9.386667 0 0 1-9.386666-9.386667v-373.248H129.365333V766.634667H502.613333c5.12 0 9.301333 4.266667 9.301334 9.386666V841.301333a9.386667 9.386667 0 0 1-9.386667 9.386667H82.773333A37.290667 37.290667 0 0 1 45.226667 813.226667V-45.226667c0-20.650667 16.725333-37.376 37.376-37.376H941.226667a37.290667 37.290667 0 0 1 37.376 37.376V374.613333a9.386667 9.386667 0 0 1-9.386667 9.301334zM329.898667 357.290667L327.68 218.453333a18.773333 18.773333 0 0 1 18.688-18.858666h0.426667l137.642666 3.413333a9.642667 9.642667 0 0 1 6.314667 2.56l485.205333 484.266667a9.386667 9.386667 0 0 1 0 13.141333L830.890667 847.957333a9.642667 9.642667 0 0 1-13.312 0L332.629333 363.776a9.728 9.728 0 0 1-2.645333-6.485333z m74.069333-27.562667L824.32 749.226667l52.736-52.565334-420.608-419.669333-53.333333-1.28 0.853333 54.101333z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="lijijiezhi" unicode="&#59262;" d="M1018.53952 500.650667h-298.666667a9.386667 9.386667 0 0 1-9.386666-9.386667v-55.893333c0-5.12 4.266667-9.386667 9.386666-9.386667h298.666667c5.12 0 9.386667 4.266667 9.386667 9.386667v55.978666a9.386667 9.386667 0 0 1-9.386667 9.386667z m-156.330667-158.72H719.872853a9.386667 9.386667 0 0 1-9.386666-9.301334v-55.978666c0-5.12 4.266667-9.386667 9.386666-9.386667h142.336c5.12 0 9.386667 4.266667 9.386667 9.386667v55.978666a9.386667 9.386667 0 0 1-9.386667 9.386667zM472.918187 605.184h-50.517334a13.056 13.056 0 0 1-13.141333-13.056v-289.28c0-4.266667 2.048-8.106667 5.376-10.581333L588.45952 165.461333c5.802667-4.181333 13.994667-2.986667 18.176 2.816l30.037333 40.96v0.085334a13.056 13.056 0 0 1-2.901333 18.261333L485.80352 334.421333V592.042667a12.970667 12.970667 0 0 1-12.885333 13.056z m382.037333-409.941333h-67.413333a19.2 19.2 0 0 1-16.213334-9.045334 374.528 374.528 0 0 0-170.154666-144.64 369.664 369.664 0 0 0-144.64-29.184 370.005333 370.005333 0 0 0-262.826667 108.885334A370.005333 370.005333 0 0 0 84.822187 384a369.237333 369.237333 0 0 0 108.885333 262.826667 370.005333 370.005333 0 0 0 262.826667 108.885333 370.005333 370.005333 0 0 0 262.826666-108.885333c19.882667-19.797333 37.12-41.472 51.968-64.938667a19.2 19.2 0 0 1 16.213334-9.045333h67.413333a10.666667 10.666667 0 0 1 9.557333 15.530666A456.277333 456.277333 0 0 1 461.99552 840.106667C209.920853 843.093333 0.512853 636.757333 0.000853 384.853333a456.362667 456.362667 0 0 1 456.448-457.130666 456.362667 456.362667 0 0 1 408.064 251.733333 10.666667 10.666667 0 0 1-9.557333 15.616z"  horiz-adv-x="1110" />
+
+    
+    <glyph glyph-name="jingxiang" unicode="&#59251;" d="M776.084211 1.347368H258.694737c-75.452632 0-134.736842 59.284211-134.736842 134.736843V734.315789C123.957895 809.768421 183.242105 869.052632 258.694737 869.052632h517.389474c75.452632 0 134.736842-59.284211 134.736842-134.736843v-598.231578c0-75.452632-59.284211-134.736842-134.736842-134.736843zM258.694737 815.157895c-43.115789 0-80.842105-37.726316-80.842105-80.842106v-598.231578c0-43.115789 37.726316-80.842105 80.842105-80.842106h517.389474c43.115789 0 80.842105 37.726316 80.842105 80.842106V734.315789c0 43.115789-37.726316 80.842105-80.842105 80.842106H258.694737zM334.147368 146.863158h194.021053v-264.084211l-97.010526 70.063158-97.010527-70.063158zM420.378947 772.042105h107.789474v-107.789473h-107.789474zM420.378947 637.305263h107.789474v-107.789474h-107.789474zM420.378947 507.957895h107.789474v-107.789474h-107.789474zM420.378947 378.610526h107.789474v-107.789473h-107.789474zM123.957895 286.989474h776.08421v-53.894737H123.957895zM274.863158 847.494737h53.894737v-609.010526h-53.894737z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="xinjian1" unicode="&#59250;" d="M614.4-97.882353H301.176471c-156.611765 0-289.129412 126.494118-289.129412 289.129412V877.929412h764.988235c156.611765 0 289.129412-126.494118 289.129412-289.129412v-246.964706h-90.352941V444.235294H108.423529v-252.988235C108.423529 82.823529 192.752941-7.529412 301.176471-7.529412h313.223529v-90.352941zM108.423529 534.588235h867.388236V594.823529c0 108.423529-90.352941 192.752941-192.752941 192.752942H108.423529V534.588235z m758.964706-590.305882h-90.352941v150.588235h-144.564706v90.352941H783.058824V329.788235h90.352941v-150.588235H1024v-90.352941h-150.588235v-144.564706z"  horiz-adv-x="1084" />
+
+    
+    <glyph glyph-name="leftarrow" unicode="&#59249;" d="M783.872 353.877333l-0.042667 64.405334-477.610666 0.298666 225.28 225.322667-45.568 45.568L182.506667 386.048l303.829333-303.829333 45.525333 45.504-226.474666 226.453333 478.506666-0.298667z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="zhongqingdianxinicon10" unicode="&#59248;" d="M65.201489 686.91105l893.595998 0 0-647.830595-893.595998 0L65.201489 686.91105 65.201489 686.91105zM118.817618 631.509253l0-539.708062 786.364765 0 0 542.388101-785.468348 0C118.671285 634.038866 118.7378 632.780199 118.817618 631.509253L118.817618 631.509253zM236.77003-34.191338l565.648874 0 0-52.720735-566.53915 0 0 50.039673C235.803006-35.602478 235.729328-34.337671 236.77003-34.191338L236.77003-34.191338zM236.77003-34.191338"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="huabanfuben" unicode="&#60283;" d="M98 642.62h0.57c0.72 0 66.48 1 163.69 1.22a126.54 126.54 0 0 1 243.37-0.6h436.24a35 35 0 0 1 0 70H505.62a126.54 126.54 0 0 1-243 0.61c-98-0.19-164.43-1.23-165.15-1.24a35 35 0 0 1 0.54-70z m286 92.16a56.59 56.59 0 0 0 56.4-52.91 36.49 36.49 0 0 1 0-7.24 56.52 56.52 0 1 0-56.4 60.15zM98 349h486.25a126.55 126.55 0 0 1 243.38 0.6c87.55-0.19 112.49-1.19 112.76-1.2h1.51a35 35 0 0 1 1.48 70c-1.12 0-26 1.07-116.11 1.26a126.54 126.54 0 0 1-243-0.6H98a35 35 0 0 1 0-70z m607.85 91.53A56.53 56.53 0 1 0 649.32 384a56.59 56.59 0 0 0 56.53 56.53zM941.87 124.21H505.62a126.54 126.54 0 0 1-243 0.61c-98-0.19-164.43-1.23-165.15-1.24a35 35 0 0 1 0.54-70h0.57c0.72 0 66.51 1 163.69 1.23a126.54 126.54 0 0 1 243.37-0.6h436.23a35 35 0 0 1 0 70zM384 32.68a56.53 56.53 0 1 0 56.4 60.15 36.49 36.49 0 0 1 0-7.24 56.6 56.6 0 0 0-56.4-52.91z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="check-square-fill3x" unicode="&#59246;" d="M940.202667 725.333333l-491.52-681.301333a74.24 74.24 0 0 0-120.490667 0L37.205333 447.317333a18.773333 18.773333 0 0 0 15.189334 29.525334h109.226666c23.893333 0 46.592-11.434667 60.586667-31.061334l166.058667-230.4 366.933333 508.586667a74.581333 74.581333 0 0 0 60.416 31.061333h109.226667c15.36 0 24.234667-17.237333 15.36-29.696z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="play-square-fill3x" unicode="&#59247;" d="M969.142857-36.571429V804.571429a36.571429 36.571429 0 0 1-36.571428 36.571428H91.428571a36.571429 36.571429 0 0 1-36.571428-36.571428v-841.142858a36.571429 36.571429 0 0 1 36.571428-36.571428h841.142858a36.571429 36.571429 0 0 1 36.571428 36.571428zM501.979429 235.739429L322.779429 463.725714a12.946286 12.946286 0 0 0 10.020571 20.918857h358.253714c10.752 0 16.822857-12.434286 10.093715-20.918857L522.020571 235.739429a12.8 12.8 0 0 0-20.041142 0z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="xuanzhongkuang" unicode="&#59244;" d="M941.312 850.688H82.773333A37.290667 37.290667 0 0 1 45.226667 813.226667V-45.226667c0-20.650667 16.725333-37.376 37.376-37.376H941.226667a37.290667 37.290667 0 0 1 37.376 37.376V813.226667A37.290667 37.290667 0 0 1 941.226667 850.773333zM726.186667 554.666667l-245.76-340.650667a37.12 37.12 0 0 0-60.245334 0L274.602667 415.658667a9.386667 9.386667 0 0 0 7.594666 14.762666h54.613334c11.946667 0 23.296-5.717333 30.293333-15.530666l83.029333-115.2 183.466667 254.293333a37.290667 37.290667 0 0 0 30.208 15.530667h54.613333c7.68 0 12.117333-8.618667 7.68-14.848z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="weixuankuang" unicode="&#59245;" d="M941.312 850.688H82.773333A37.290667 37.290667 0 0 1 45.226667 813.226667V-45.226667c0-20.650667 16.725333-37.376 37.376-37.376H941.226667a37.290667 37.290667 0 0 1 37.376 37.376V813.226667A37.290667 37.290667 0 0 1 941.226667 850.773333z m-46.677333-849.322667H129.365333V766.634667h765.269334v-765.269334z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="daochu3x" unicode="&#59231;" d="M651.946667 166.656l165.546666 130.645333a9.386667 9.386667 0 0 1 0 14.677334L651.946667 442.709333a9.386667 9.386667 0 0 1-15.104-7.338666v-88.746667h-378.026667a9.386667 9.386667 0 0 1-9.386667-9.301333v-65.365334c0-5.12 4.266667-9.301333 9.386667-9.301333h378.026667V174.08a9.386667 9.386667 0 0 1 15.189333-7.338667z m304.896 472.490667L767.146667 828.842667a74.325333 74.325333 0 0 1-31.146667 18.688V850.688H82.688A37.290667 37.290667 0 0 1 45.226667 813.226667v-324.266667c0-5.12 4.266667-9.386667 9.386666-9.386667h65.28c5.12 0 9.386667 4.266667 9.386667 9.386667V766.549333h158.634667v-158.634666c0-20.650667 16.725333-37.376 37.376-37.376h373.248a37.290667 37.290667 0 0 1 37.376 37.376V741.205333l158.72-158.634666V488.96c0-5.12 4.181333-9.301333 9.301333-9.301333h65.28c5.12 0 9.386667 4.266667 9.386667 9.386666V586.325333a74.410667 74.410667 0 0 1-21.845334 52.736zM661.333333 645.290667h-298.666666V766.634667h298.666666v-121.258667z m308.053334-508.586667h-65.365334a9.386667 9.386667 0 0 1-9.386666-9.386667v-125.952H129.365333V127.317333a9.386667 9.386667 0 0 1-9.386666 9.386667H54.698667a9.386667 9.386667 0 0 1-9.386667-9.386667v-172.629333c0-20.650667 16.725333-37.376 37.376-37.376H941.226667a37.290667 37.290667 0 0 1 37.376 37.376V127.317333a9.386667 9.386667 0 0 1-9.386667 9.386667z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="lijijiezhi3x" unicode="&#59232;" d="M1018.53952 500.650667h-298.666667a9.386667 9.386667 0 0 1-9.386666-9.386667v-55.893333c0-5.12 4.266667-9.386667 9.386666-9.386667h298.666667c5.12 0 9.386667 4.266667 9.386667 9.386667v55.978666a9.386667 9.386667 0 0 1-9.386667 9.386667z m-156.330667-158.72H719.872853a9.386667 9.386667 0 0 1-9.386666-9.301334v-55.978666c0-5.12 4.266667-9.386667 9.386666-9.386667h142.336c5.12 0 9.386667 4.266667 9.386667 9.386667v55.978666a9.386667 9.386667 0 0 1-9.386667 9.386667zM472.918187 605.184h-50.517334a13.056 13.056 0 0 1-13.141333-13.056v-289.28c0-4.266667 2.048-8.106667 5.376-10.581333L588.45952 165.461333c5.802667-4.181333 13.994667-2.986667 18.176 2.816l30.037333 40.96v0.085334a13.056 13.056 0 0 1-2.901333 18.261333L485.80352 334.421333V592.042667a12.970667 12.970667 0 0 1-12.885333 13.056z m382.037333-409.941333h-67.413333a19.2 19.2 0 0 1-16.213334-9.045334 374.528 374.528 0 0 0-170.154666-144.64 369.664 369.664 0 0 0-144.64-29.184 370.005333 370.005333 0 0 0-262.826667 108.885334A370.005333 370.005333 0 0 0 84.822187 384a369.237333 369.237333 0 0 0 108.885333 262.826667 370.005333 370.005333 0 0 0 262.826667 108.885333 370.005333 370.005333 0 0 0 262.826666-108.885333c19.882667-19.797333 37.12-41.472 51.968-64.938667a19.2 19.2 0 0 1 16.213334-9.045333h67.413333a10.666667 10.666667 0 0 1 9.557333 15.530666A456.277333 456.277333 0 0 1 461.99552 840.106667C209.920853 843.093333 0.512853 636.757333 0.000853 384.853333a456.362667 456.362667 0 0 1 456.448-457.130666 456.362667 456.362667 0 0 1 408.064 251.733333 10.666667 10.666667 0 0 1-9.557333 15.616z"  horiz-adv-x="1110" />
+
+    
+    <glyph glyph-name="bianjishijuan3x" unicode="&#59233;" d="M969.386667 384h-65.365334a9.386667 9.386667 0 0 1-9.386666-9.386667v-373.248H129.365333V766.634667H502.613333c5.12 0 9.301333 4.266667 9.301334 9.386666V841.301333a9.386667 9.386667 0 0 1-9.386667 9.386667H82.773333A37.290667 37.290667 0 0 1 45.226667 813.226667V-45.226667c0-20.650667 16.725333-37.376 37.376-37.376H941.226667a37.290667 37.290667 0 0 1 37.376 37.376V374.613333a9.386667 9.386667 0 0 1-9.386667 9.301334zM329.898667 357.290667L327.68 218.453333a18.773333 18.773333 0 0 1 18.688-18.858666h0.426667l137.642666 3.413333a9.642667 9.642667 0 0 1 6.314667 2.56l485.205333 484.266667a9.386667 9.386667 0 0 1 0 13.141333L830.890667 847.957333a9.642667 9.642667 0 0 1-13.312 0L332.629333 363.776a9.728 9.728 0 0 1-2.645333-6.485333z m74.069333-27.562667L824.32 749.226667l52.736-52.565334-420.608-419.669333-53.333333-1.28 0.853333 54.101333z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="dahuizhongzuo3x" unicode="&#59234;" d="M260.010667 682.666667a9.386667 9.386667 0 0 1-9.386667-9.386667v-55.978667c0-5.12 4.266667-9.301333 9.386667-9.301333h448c5.12 0 9.386667 4.266667 9.386666 9.386667V673.28a9.386667 9.386667 0 0 1-9.386666 9.301333h-448zM484.010667 449.365333v55.978667a9.386667 9.386667 0 0 1-9.386667 9.386667H260.010667a9.386667 9.386667 0 0 1-9.386667-9.386667v-55.978667c0-5.12 4.266667-9.386667 9.386667-9.386666h214.613333c5.12 0 9.386667 4.266667 9.386667 9.386666zM428.032-12.629333H157.354667V808.704H810.666667v-401.408c0-5.12 4.266667-9.301333 9.386666-9.301333h65.28c5.12 0 9.386667 4.266667 9.386667 9.386666V855.296a37.290667 37.290667 0 0 1-37.376 37.290667h-746.666667a37.290667 37.290667 0 0 1-37.376-37.376v-914.602667c0-20.650667 16.725333-37.376 37.376-37.376h317.354667c5.12 0 9.301333 4.266667 9.301333 9.386667v65.28a9.386667 9.386667 0 0 1-9.386666 9.386666zM549.461333 122.197333a162.133333 162.133333 0 0 0 47.616 106.666667 163.84 163.84 0 0 0 241.92-11.776l-26.965333-20.906667a9.386667 9.386667 0 0 1 3.498667-16.469333l108.885333-26.282667a9.386667 9.386667 0 0 1 11.52 9.045334l0.768 111.274666a9.386667 9.386667 0 0 1-15.104 7.509334l-23.637333-18.517334a238.250667 238.250667 0 0 1-423.253334-139.776 9.386667 9.386667 0 0 1 9.301334-9.642666h56.064a9.301333 9.301333 0 0 1 9.386666 8.874666zM941.312 113.322667h-56.064a9.301333 9.301333 0 0 1-9.386667-8.874667 162.133333 162.133333 0 0 0-47.616-106.666667 163.84 163.84 0 0 0-241.92 11.861334l26.965334 20.821333a9.386667 9.386667 0 0 1-3.498667 16.469333L500.906667 73.216a9.386667 9.386667 0 0 1-11.52-8.96l-0.682667-111.36a9.386667 9.386667 0 0 1 15.018667-7.424l23.637333 18.432a238.250667 238.250667 0 0 1 423.253333 139.776 9.386667 9.386667 0 0 1-9.301333 9.642667z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="filedone2X" unicode="&#59236;" d="M717.312 617.301333v56.064a9.386667 9.386667 0 0 1-9.386667 9.301334h-448a9.386667 9.386667 0 0 1-9.216-9.386667v-55.978667c0-5.12 4.181333-9.301333 9.301334-9.301333h448c5.12 0 9.386667 4.266667 9.386666 9.386667z m-457.386667-102.656a9.386667 9.386667 0 0 1-9.216-9.386666v-55.893334c0-5.12 4.181333-9.386667 9.301334-9.386666h214.613333c5.12 0 9.386667 4.266667 9.386667 9.386666v55.978667a9.386667 9.386667 0 0 1-9.386667 9.386667H260.010667z m438.784-135.338666a251.989333 251.989333 0 1 1 0-503.978667 251.989333 251.989333 0 0 1 0 503.978667z m125.44-377.429334a176.213333 176.213333 0 0 0-125.44-51.882666 176.213333 176.213333 0 0 0-125.44 51.882666 176.213333 176.213333 0 0 0-51.968 125.44c0 47.36 18.432 91.989333 51.968 125.44a176.213333 176.213333 0 0 0 125.44 51.882667c47.36 0 91.904-18.432 125.44-51.882667 33.450667-33.450667 51.882667-78.08 51.882667-125.44 0-47.36-18.432-91.904-51.968-125.44z m-21.674666 214.186667H750.933333a9.216 9.216 0 0 1-7.68-3.925333l-73.984-102.4-26.965333 37.205333a9.216 9.216 0 0 1-7.68 3.84h-51.370667a9.386667 9.386667 0 0 1-7.594666-14.848l86.186666-119.125333c3.669333-5.12 11.264-5.12 14.933334 0l133.290666 184.32a9.301333 9.301333 0 0 1-7.509333 14.848z m-374.442667-228.693333H157.354667V808.704H810.666667v-401.408c0-5.12 4.266667-9.301333 9.386666-9.301333h65.28c5.12 0 9.386667 4.266667 9.386667 9.386666V855.296a37.290667 37.290667 0 0 1-37.376 37.290667h-746.666667a37.290667 37.290667 0 0 1-37.376-37.376v-914.602667c0-20.650667 16.725333-37.376 37.376-37.376h317.354667c5.12 0 9.301333 4.266667 9.301333 9.386667v65.28a9.386667 9.386667 0 0 1-9.386666 9.386666z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="filesync3x" unicode="&#59238;" d="M302.677333 682.666667a9.386667 9.386667 0 0 1-9.386666-9.386667v-55.978667c0-5.12 4.266667-9.301333 9.386666-9.301333h448c5.12 0 9.386667 4.266667 9.386667 9.386667V673.28a9.386667 9.386667 0 0 1-9.386667 9.301333h-448z m224-233.301334v55.978667a9.386667 9.386667 0 0 1-9.386666 9.386667H302.677333a9.386667 9.386667 0 0 1-9.386666-9.386667v-55.978667c0-5.12 4.266667-9.386667 9.386666-9.386666h214.613334c5.12 0 9.386667 4.266667 9.386666 9.386666z m-55.978666-461.994666H200.021333V808.704H853.333333v-401.408c0-5.12 4.266667-9.301333 9.386667-9.301333h65.28c5.12 0 9.386667 4.266667 9.386667 9.386666V855.296a37.290667 37.290667 0 0 1-37.376 37.290667h-746.666667a37.290667 37.290667 0 0 1-37.376-37.376v-914.602667c0-20.650667 16.725333-37.376 37.376-37.376h317.354667c5.12 0 9.301333 4.266667 9.301333 9.386667v65.28a9.386667 9.386667 0 0 1-9.386667 9.386666zM928 202.666667A10.666667 10.666667 0 0 1 938.666667 213.333333v74.666667A10.666667 10.666667 0 0 1 928 298.666667H692.650667l62.976 80.213333a10.666667 10.666667 0 0 1-8.362667 17.237333l-96.853333-0.085333a21.76 21.76 0 0 1-16.810667-8.192l-91.306667-116.053333a42.752 42.752 0 0 1 33.706667-69.12h352zM544 117.333333a10.666667 10.666667 0 0 1-10.666667-10.666666v-74.666667c0-5.888 4.778667-10.666667 10.666667-10.666667h235.349333l-62.976-80.213333a10.666667 10.666667 0 0 1 8.362667-17.237333l96.853333 0.085333a21.76 21.76 0 0 1 16.810667 8.192l91.306667 116.053333a42.752 42.752 0 0 1-33.706667 69.12H544z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="bianzu19xia3x" unicode="&#59239;" d="M709.060096 564.0192H315.024896c-11.8784 0-18.432 12.4928-11.1616 20.992L500.983296 813.4656a15.0528 15.0528 0 0 0 22.1184 0l197.12-228.4544c7.2704-8.4992 0.7168-20.992-11.1616-20.992zM709.060096 203.9808H315.024896c-11.8784 0-18.432-12.4928-11.1616-20.992l197.12-228.4544a15.0528 15.0528 0 0 1 22.1184 0l197.12 228.4544c7.2704 8.4992 0.7168 20.992-11.1616 20.992z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="bianzu193x" unicode="&#59240;" d="M709.060096 203.9808H315.024896c-11.8784 0-18.432-12.4928-11.1616-20.992l197.12-228.4544a15.0528 15.0528 0 0 1 22.1184 0l197.12 228.4544c7.2704 8.4992 0.7168 20.992-11.1616 20.992zM709.060096 564.0192H315.024896c-11.8784 0-18.432 12.4928-11.1616 20.992L500.983296 813.4656a15.0528 15.0528 0 0 0 22.1184 0l197.12-228.4544c7.2704-8.4992 0.7168-20.992-11.1616-20.992z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="Search3x" unicode="&#59241;" d="M966.436571-7.460571L669.622857 289.353143c46.08 59.538286 70.948571 132.388571 70.948572 208.969143a340.845714 340.845714 0 0 1-100.425143 242.395428A340.333714 340.333714 0 0 1 397.677714 841.142857a340.845714 340.845714 0 0 1-242.395428-100.425143A340.114286 340.114286 0 0 1 54.857143 498.322286c0-91.574857 35.84-177.737143 100.425143-242.468572a340.114286 340.114286 0 0 1 242.395428-100.425143 340.114286 340.114286 0 0 1 208.822857 70.875429l296.813715-296.667429c3.657143-3.657143 9.581714-3.657143 13.238857 0l49.810286 49.737143a9.362286 9.362286 0 0 1 0 13.165715z m-387.657142 324.754285a254.610286 254.610286 0 0 0-181.101715-75.044571 254.610286 254.610286 0 0 0-181.028571 75.044571 254.610286 254.610286 0 0 0-74.971429 180.955429c0 68.388571 26.697143 132.754286 74.971429 181.028571a254.610286 254.610286 0 0 0 181.028571 75.044572c68.388571 0 132.754286-26.550857 181.028572-74.971429a254.610286 254.610286 0 0 0 75.044571-181.028571c0-68.388571-26.697143-132.754286-75.044571-181.028572z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="bianzu19" unicode="&#59242;" d="M709.060096 203.9808H315.024896c-11.8784 0-18.432-12.4928-11.1616-20.992l197.12-228.4544a15.0528 15.0528 0 0 1 22.1184 0l197.12 228.4544c7.2704 8.4992 0.7168 20.992-11.1616 20.992zM709.060096 564.0192H315.024896c-11.8784 0-18.432 12.4928-11.1616 20.992L500.983296 813.4656a15.0528 15.0528 0 0 0 22.1184 0l197.12-228.4544c7.2704-8.4992 0.7168-20.992-11.1616-20.992z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="TAR" unicode="&#59230;" d="M916.945455-109.381818H139.636364c-69.818182 0-130.327273 55.854545-130.327273 130.327273V756.363636C9.309091 826.181818 65.163636 886.690909 139.636364 886.690909h572.509091l330.472727-302.545454v-563.2c0-69.818182-55.854545-130.327273-125.672727-130.327273zM139.636364 812.218182c-32.581818 0-55.854545-23.272727-55.854546-55.854546v-735.418181c0-32.581818 27.927273-55.854545 55.854546-55.854546h777.309091c32.581818 0 55.854545 27.927273 55.854545 55.854546V551.563636l-288.581818 260.654546H139.636364zM1010.036364 556.218182h-344.436364V849.454545h69.818182v-223.418181h274.618182zM386.327273 356.072727h-93.090909v-293.236363h-37.236364v293.236363h-93.090909v37.236364h228.072727v-37.236364zM660.945455 67.490909h-41.89091l-32.581818 93.090909h-139.636363l-32.581819-93.090909H372.363636l125.672728 325.818182h37.236363l125.672728-325.818182z m-88.436364 125.672727l-51.2 139.636364c0 4.654545-4.654545 13.963636-4.654546 23.272727 0-9.309091-4.654545-18.618182-4.654545-23.272727l-51.2-139.636364h111.709091zM940.218182 67.490909h-46.545455l-55.854545 93.090909c-4.654545 9.309091-9.309091 13.963636-13.963637 23.272727l-13.963636 13.963637c-4.654545 4.654545-9.309091 4.654545-13.963636 9.309091-4.654545 0-13.963636 4.654545-18.618182 4.654545H744.727273v-139.636363h-37.236364v325.818181h97.745455c13.963636 0 27.927273 0 37.236363-4.654545 13.963636-4.654545 23.272727-9.309091 32.581818-13.963636 9.309091-9.309091 13.963636-18.618182 18.618182-27.927273 4.654545-9.309091 9.309091-23.272727 9.309091-37.236364 0-9.309091 0-23.272727-4.654545-32.581818-4.654545-9.309091-9.309091-18.618182-13.963637-23.272727-4.654545-9.309091-13.963636-13.963636-23.272727-18.618182l-27.927273-13.963636c4.654545-4.654545 9.309091-4.654545 13.963637-9.309091 4.654545-4.654545 9.309091-4.654545 9.309091-9.309091s9.309091-9.309091 9.309091-13.963637c4.654545-4.654545 9.309091-9.309091 13.963636-18.618181l60.509091-107.054546zM744.727273 356.072727v-116.363636h51.2c9.309091 0 18.618182 0 27.927272 4.654545 9.309091 4.654545 13.963636 9.309091 23.272728 13.963637 4.654545 4.654545 9.309091 13.963636 13.963636 18.618182 4.654545 9.309091 4.654545 18.618182 4.654546 27.927272 0 18.618182-4.654545 32.581818-18.618182 41.890909-9.309091 9.309091-27.927273 13.963636-51.2 13.963637H744.727273z"  horiz-adv-x="1070" />
+
+    
+    <glyph glyph-name="ZIP" unicode="&#59229;" d="M916.945455-109.381818H139.636364c-69.818182 0-130.327273 55.854545-130.327273 130.327273V756.363636C9.309091 826.181818 65.163636 886.690909 139.636364 886.690909h572.509091l330.472727-302.545454v-563.2c0-69.818182-55.854545-130.327273-125.672727-130.327273zM139.636364 812.218182c-32.581818 0-55.854545-23.272727-55.854546-55.854546v-735.418181c0-32.581818 27.927273-55.854545 55.854546-55.854546h777.309091c32.581818 0 55.854545 27.927273 55.854545 55.854546V551.563636l-288.581818 260.654546H139.636364zM1010.036364 556.218182h-344.436364V849.454545h69.818182v-223.418181h274.618182zM456.145455 384l-190.836364-283.927273h186.181818v-32.581818H209.454545v9.309091l190.836364 279.272727H223.418182v37.236364h232.727273v-9.309091zM544.581818 67.490909h-37.236363v325.818182h37.236363v-325.818182zM670.254545 188.509091v-121.018182h-37.236363v325.818182h88.436363c32.581818 0 60.509091-9.309091 79.127273-23.272727 18.618182-18.618182 27.927273-41.890909 27.927273-69.818182s-9.309091-55.854545-32.581818-74.472727c-23.272727-18.618182-51.2-27.927273-88.436364-27.927273h-37.236364z m0 167.563636v-134.981818h41.89091c27.927273 0 46.545455 4.654545 60.50909 18.618182 13.963636 13.963636 18.618182 27.927273 18.618182 51.2 0 41.890909-23.272727 65.163636-74.472727 65.163636h-46.545455z"  horiz-adv-x="1070" />
+
+    
+    <glyph glyph-name="wenjianjia1" unicode="&#59228;" d="M529.709176 896a12.047059 12.047059 0 0 0 7.228236-2.409412l129.204706-97.219764h280.877176a120.470588 120.470588 0 0 0 120.470588-120.470589v-605.665882a120.470588 120.470588 0 0 0-120.470588-120.470588H120.470588a120.470588 120.470588 0 0 0-120.470588 120.470588V835.764706a60.235294 60.235294 0 0 0 60.235294 60.235294h469.473882z m357.376-197.150118H98.605176v-591.390117h788.48V698.849882zM0 600.244706h1084.235294v-599.582118a90.352941 90.352941 0 0 0-90.352941-90.352941h-903.529412a90.352941 90.352941 0 0 0-90.352941 90.352941V600.304941z"  horiz-adv-x="1084" />
+
+    
+    <glyph glyph-name="wenjia" unicode="&#59227;" d="M824.888889-128H199.111111c-62.577778 0-113.777778 51.2-113.777778 113.777778V782.222222C85.333333 844.8 136.533333 896 199.111111 896h506.311111L938.666667 651.377778V-14.222221999999988c0-62.577778-51.2-113.777778-113.777778-113.777778zM199.111111 810.666667c-17.066667 0-28.444444-11.377778-28.444444-28.444445v-796.444444c0-17.066667 11.377778-28.444444 28.444444-28.444445h625.777778c17.066667 0 28.444444 11.377778 28.444444 28.444445V617.2444439999999l-182.044444 193.422223H199.111111zM739.555556 99.55555600000002h-455.111112c-17.066667 0-28.444444 11.377778-28.444444 28.444444s11.377778 28.444444 28.444444 28.444444h455.111112c17.066667 0 28.444444-11.377778 28.444444-28.444444s-11.377778-28.444444-28.444444-28.444444zM625.777778 554.666667h-341.333334c-17.066667 0-28.444444 11.377778-28.444444 28.444444s11.377778 28.444444 28.444444 28.444445h341.333334c17.066667 0 28.444444-11.377778 28.444444-28.444445s-11.377778-28.444444-28.444444-28.444444zM739.555556 327.11111100000005h-455.111112c-17.066667 0-28.444444 11.377778-28.444444 28.444445s11.377778 28.444444 28.444444 28.444444h455.111112c17.066667 0 28.444444-11.377778 28.444444-28.444444s-11.377778-28.444444-28.444444-28.444445z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="xiazai2" unicode="&#59226;" d="M602.352941 155.105882c-24.094118 0-48.188235 18.070588-48.188235 48.188236V835.764706c0 24.094118 18.070588 48.188235 48.188235 48.188235s48.188235-24.094118 48.188235-48.188235v-638.494118c0-24.094118-18.070588-42.164706-48.188235-42.164706zM602.352941 137.035294L222.870588 486.4c-18.070588 12.047059-18.070588 42.164706-6.023529 60.235294 18.070588 18.070588 48.188235 18.070588 66.258823 6.02353l319.247059-295.152942 325.270588 289.129412c18.070588 18.070588 48.188235 18.070588 66.258824-6.023529 18.070588-18.070588 18.070588-48.188235-6.023529-66.258824L602.352941 137.035294zM1017.976471-109.929412H180.705882c-90.352941 0-168.658824 72.282353-168.658823 168.658824v186.729412c0 24.094118 18.070588 48.188235 48.188235 48.188235s48.188235-18.070588 48.188235-48.188235v-186.729412c0-42.164706 36.141176-72.282353 72.282353-72.282353h837.270589c42.164706 0 72.282353 36.141176 72.282353 72.282353v186.729412c0 24.094118 18.070588 48.188235 48.188235 48.188235s48.188235-18.070588 48.188235-48.188235v-186.729412c0-90.352941-78.305882-168.658824-168.658823-168.658824z"  horiz-adv-x="1204" />
+
+    
+    <glyph glyph-name="fuzhi5" unicode="&#59225;" d="M939.670588 149.082353H481.882353c-90.352941 0-168.658824 72.282353-168.658824 168.658823V727.341176C313.223529 823.717647 391.529412 896 481.882353 896h457.788235c90.352941 0 168.658824-72.282353 168.658824-168.658824v-415.623529c-6.023529-90.352941-78.305882-162.635294-168.658824-162.635294zM481.882353 805.647059c-42.164706 0-72.282353-36.141176-72.282353-72.282353v-415.62353c0-42.164706 36.141176-72.282353 72.282353-72.282352h457.788235c42.164706 0 72.282353 36.141176 72.282353 72.282352V727.341176c0 42.164706-36.141176 72.282353-72.282353 72.282353H481.882353zM728.847059-91.858824h-602.352941c-60.235294 0-108.423529 42.164706-108.42353 102.4V649.035294c0 54.211765 48.188235 102.4 108.42353 102.4h108.423529V655.058824H126.494118c-12.047059 0-18.070588-6.023529-18.070589-6.02353v-638.494118c0-6.023529 6.023529-12.047059 18.070589-12.047058h602.352941c12.047059 0 18.070588 6.023529 18.070588 12.047058v90.352942h90.352941v-90.352942c0-54.211765-48.188235-102.4-108.423529-102.4z"  horiz-adv-x="1144" />
+
+    
+    <glyph glyph-name="cangku" unicode="&#59224;" d="M512-128C246.964706-128 36.141176-1.505882 36.141176 155.105882c0 42.164706 12.047059 78.305882 42.164706 120.470589l78.305883-60.235295c-12.047059-18.070588-24.094118-42.164706-24.094118-60.235294 0-90.352941 156.611765-186.729412 379.482353-186.729411 222.870588 0 379.482353 96.376471 379.482353 186.729411 0 18.070588-6.023529 36.141176-18.070588 54.211765l78.305882 54.211765c24.094118-36.141176 36.141176-66.258824 36.141177-108.42353 0-156.611765-210.823529-283.105882-475.858824-283.105882zM512 131.011765c-265.035294 0-475.858824 120.470588-475.858824 271.058823 0 48.188235 24.094118 96.376471 66.258824 138.541177L168.658824 474.352941c-24.094118-24.094118-36.141176-48.188235-36.141177-72.282353 0-84.329412 156.611765-174.682353 379.482353-174.682353 222.870588 0 379.482353 90.352941 379.482353 174.682353 0 36.141176-24.094118 60.235294-48.188235 78.305883l60.235294 72.282353c54.211765-42.164706 84.329412-96.376471 84.329412-156.611765 0-144.564706-210.823529-265.035294-475.858824-265.035294zM512 359.905882c-271.058824 0-481.882353 120.470588-481.882353 265.035294S240.941176 896 512 896s481.882353-120.470588 481.882353-265.035294-210.823529-271.058824-481.882353-271.058824z m0 439.717647c-228.894118 0-385.505882-90.352941-385.505882-168.658823S283.105882 456.282353 512 456.282353c228.894118 0 385.505882 90.352941 385.505882 168.658823S740.894118 799.623529 512 799.623529z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="gongxianzhe" unicode="&#59223;" d="M498.346667 254.293333C341.333333 254.293333 211.626667 377.173333 211.626667 541.013333S341.333333 827.733333 498.346667 827.733333s286.72-129.706667 286.72-286.72-122.88-286.72-286.72-286.72z m0 464.213334c-95.573333 0-177.493333-81.92-177.493334-177.493334s81.92-177.493333 177.493334-177.493333S682.666667 438.613333 682.666667 541.013333 600.746667 718.506667 498.346667 718.506667zM885.282133 260.846933v109.226667c95.573333 0 177.493333 81.92 177.493334 177.493333s-81.92 177.493333-177.493334 177.493334v109.226666c157.013333 0 286.72-129.706667 286.72-286.72s-129.706667-286.72-286.72-286.72zM1212.962133 15.086933c-20.48 163.84-163.84 286.72-327.68 286.72v109.226667c218.453333 0 402.773333-163.84 436.906667-375.466667l-109.226667-20.48zM880.64-121.173333c-27.306667 211.626667-191.146667 368.64-375.466667 368.64s-348.16-157.013333-375.466666-368.64l-109.226667 13.653333c34.133333 259.413333 245.76 464.213333 484.693333 464.213333s450.56-197.973333 484.693334-464.213333l-109.226667-13.653333z"  horiz-adv-x="1365" />
+
+    
+    <glyph glyph-name="fahangban" unicode="&#59221;" d="M881.777778-93.866667l-318.577778 170.666667 45.511111 79.644444 199.111111-108.088888 68.266667 665.6L204.8 435.2l142.222222-113.777778-56.888889-73.955555L22.755556 463.644444 984.177778 850.488889zM466.488889-25.6H375.466667v261.688889l517.688889 574.577778 68.266666-56.888889-494.933333-551.822222z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="biaoqian3" unicode="&#59220;" d="M597.333333-76.8c-34.133333 0-68.266667 11.377778-91.022222 34.133333L5.688889 418.133333 79.644444 878.933333h438.044445l426.666667-455.111111c45.511111-51.2 51.2-130.844444 0-182.044444l-244.622223-278.755556c-22.755556-22.755556-56.888889-39.822222-102.4-39.822222 5.688889 0 5.688889 0 0 0zM108.088889 457.955556L568.888889 25.6c11.377778-5.688889 17.066667-11.377778 34.133333-11.377778 11.377778 0 22.755556 5.688889 34.133334 17.066667l244.622222 278.755555c17.066667 17.066667 17.066667 45.511111 0 62.577778L483.555556 799.288889H159.288889l-51.2-341.333333zM398.222222 543.288889m-113.777778 0a113.777778 113.777778 0 1 1 227.555556 0 113.777778 113.777778 0 1 1-227.555556 0Z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="fenzhi1" unicode="&#59219;" d="M267.377778 531.911111C164.977778 531.911111 85.333333 611.555556 85.333333 713.955556S164.977778 896 267.377778 896s182.044444-79.644444 182.044444-182.044444S369.777778 531.911111 267.377778 531.911111z m0 273.066667c-51.2 0-91.022222-39.822222-91.022222-91.022222s39.822222-91.022222 91.022222-91.022223 91.022222 39.822222 91.022222 91.022223-39.822222 91.022222-91.022222 91.022222zM267.377778-105.244444c-102.4 0-182.044444 79.644444-182.044445 182.044444s79.644444 182.044444 182.044445 182.044444 182.044444-79.644444 182.044444-182.044444-79.644444-182.044444-182.044444-182.044444z m0 273.066666c-51.2 0-91.022222-39.822222-91.022222-91.022222 0-51.2 39.822222-91.022222 91.022222-91.022222s91.022222 39.822222 91.022222 91.022222c0 51.2-39.822222 91.022222-91.022222 91.022222zM750.933333 213.333333C665.6 213.333333 597.333333 281.6 597.333333 366.933333c0 85.333333 68.266667 153.6 153.6 153.6 85.333333 0 153.6-68.266667 153.6-153.6 0-85.333333-68.266667-153.6-153.6-153.6z m0 216.177778c-34.133333 0-62.577778-28.444444-62.577777-62.577778 0-34.133333 28.444444-62.577778 62.577777-62.577777s62.577778 28.444444 62.577778 62.577777c0 34.133333-28.444444 62.577778-62.577778 62.577778zM194.446222 160.995556l5.802667 432.298666 91.022222-1.251555-5.802667-432.355556zM330.524444 590.734222l50.801778 75.548445 287.971556-193.649778-50.801778-75.548445z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="xiangmuleibie" unicode="&#59217;" d="M542.117647 317.741176c-6.023529 0-12.047059 0-18.070588 6.02353l-481.882353 246.964706C24.094118 576.752941 12.047059 594.823529 12.047059 612.894118c0 18.070588 12.047059 30.117647 24.094117 42.164706L505.976471 877.929412c12.047059 6.023529 24.094118 6.023529 42.164705 0l493.929412-234.917647c18.070588-6.023529 24.094118-24.094118 24.094118-42.164706s-12.047059-30.117647-24.094118-42.164706L566.211765 323.764706c-6.023529-6.023529-18.070588-6.023529-24.094118-6.02353zM162.635294 612.894118L542.117647 414.117647l373.458824 186.729412-385.505883 186.729412-367.435294-174.682353zM542.117647 124.988235c-6.023529 0-12.047059 0-18.070588 6.02353L42.164706 353.882353C18.070588 365.929412 12.047059 390.023529 18.070588 414.117647s36.141176 30.117647 60.235294 24.094118l457.788236-216.847059 457.788235 240.941176c24.094118 12.047059 48.188235 6.023529 60.235294-18.070588 12.047059-24.094118 6.023529-48.188235-18.070588-60.235294l-481.882353-252.988235s-6.023529-6.023529-12.047059-6.02353zM542.117647-85.835294c-6.023529 0-12.047059 0-18.070588 6.023529l-481.882353 222.870589c-24.094118 12.047059-30.117647 36.141176-24.094118 60.235294 12.047059 24.094118 36.141176 30.117647 60.235294 24.094117l457.788236-216.847059 457.788235 240.941177c24.094118 12.047059 48.188235 6.023529 60.235294-18.070588 12.047059-24.094118 6.023529-48.188235-18.070588-60.235294l-481.882353-252.988236c0-6.023529-6.023529-6.023529-12.047059-6.023529z"  horiz-adv-x="1084" />
+
+    
+    <glyph glyph-name="ziyuan1" unicode="&#59218;" d="M627.638-127.995c-0.002-0-0.004-0-0.006-0-41.274 0-79.315 13.84-109.737 37.132-351.096 269.596-625.954 622.565-797.004 1029.886 250.325-459.871 250.891-232.19 392.484-124.58 212.388 161.415 413.449 50.407 514.829-56.637 101.38 104.778 302.441 215.787 514.829 56.637 141.026-107.61 141.592-335.29 47.575-459.892-274.547-346.797-631.598-616.683-1042.062-781.805 559.118 312.875 521.353 299.254 480.407 299.254-0.462 0-0.925 0.002-1.386 0.005zM336.524 813.31c-67.62-1.528-129.121-26.527-176.957-67.135-96.599-73.325-97.732-250.032-28.068-341.784 264.168-335.001 607.892-595.919 1003.221-756.039-551.982 312.962-531.271 305.34-508.781 305.34 22.491 0 43.201 7.622 59.69 20.423 338.927 260.212 604.142 600.67 769.28 993.557-263.734-472.096-264.867-295.389-364.548-219.495-231.645 178.406-421.945-65.132-429.874-75.893-7.61-10-19.509-16.397-32.903-16.425-0.033-0.001-0.137-0.001-0.24-0.001-13.179 0-24.918 6.166-32.489 15.771-5.731 8.583-110.509 141.68-258.331 141.68z"  horiz-adv-x="1255" />
+
+    
+    <glyph glyph-name="xiangmuleixing" unicode="&#59216;" d="M844.8-128H179.2C76.8-128 0-51.2 0 44.8V716.8C0 819.2 76.8 896 179.2 896h672C947.2 896 1024 819.2 1024 716.8v-672c0-96-76.8-172.8-179.2-172.8zM179.2 800c-44.8 0-76.8-38.4-76.8-76.8v-672c0-44.8 38.4-76.8 76.8-76.8h672c44.8 0 76.8 38.4 76.8 76.8V716.8c0 44.8-38.4 76.8-76.8 76.8H179.2zM812.8 153.6H256c-19.2 0-38.4 19.2-38.4 38.4s19.2 38.4 38.4 38.4h556.8c19.2 0 38.4-19.2 38.4-38.4s-19.2-38.4-38.4-38.4zM556.8 473.6H256c-19.2 0-38.4 19.2-38.4 38.4s19.2 38.4 38.4 38.4h300.8c19.2 0 38.4-19.2 38.4-38.4s-19.2-38.4-38.4-38.4zM812.8 473.6H704c-19.2 0-38.4 19.2-38.4 38.4s19.2 38.4 38.4 38.4h108.8c19.2 0 38.4-19.2 38.4-38.4s-19.2-38.4-38.4-38.4z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="xuanzhong" unicode="&#59211;" d="M512 866.461538C245.563077 866.461538 29.538462 650.436923 29.538462 384S245.563077-98.461538 512-98.461538 994.461538 117.563077 994.461538 384 778.436923 866.461538 512 866.461538zM720.384 541.538462l-226.816-314.44677a34.264615 34.264615 0 0 0-55.650462 0l-134.301538 186.092308a8.664615 8.664615 0 0 0 7.010462 13.666462h50.491076a34.264615 34.264615 0 0 0 27.884308-14.296616l76.681846-106.417231 169.314462 234.771693a34.422154 34.422154 0 0 0 27.884308 14.336h50.491076a8.664615 8.664615 0 0 0 7.010462-13.705846z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="weixuanzhong" unicode="&#59213;" d="M713.373538 555.244308h-50.491076a34.264615 34.264615 0 0 1-27.884308-14.336l-169.314462-234.771693-76.681846 106.417231a34.422154 34.422154 0 0 1-27.884308 14.296616H310.626462a8.664615 8.664615 0 0 1-7.010462-13.666462l134.183385-186.092308a34.264615 34.264615 0 0 1 55.689846 0L720.265846 541.538462a8.585846 8.585846 0 0 1-6.892308 13.705846zM512 866.461538C245.563077 866.461538 29.538462 650.436923 29.538462 384S245.563077-98.461538 512-98.461538 994.461538 117.563077 994.461538 384 778.436923 866.461538 512 866.461538z m0-883.081846C290.816-16.620308 111.379692 162.816 111.379692 384 111.379692 605.184 290.816 784.620308 512 784.620308c221.184 0 400.620308-179.436308 400.620308-400.620308 0-221.184-179.436308-400.620308-400.620308-400.620308z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="fuzhi4" unicode="&#59210;" d="M791.978667 701.3546670000001H82.773333a37.290667 37.290667 0 0 1-37.376-37.376v-709.290667c0-20.650667 16.725333-37.376 37.376-37.376H791.893333a37.290667 37.290667 0 0 1 37.376 37.376V663.893333a37.290667 37.290667 0 0 1-37.376 37.376z m-46.677334-699.989334H129.365333V617.301333h615.936v-615.936zM941.312 850.688H222.72a9.386667 9.386667 0 0 1-9.301333-9.386667v-65.28c0-5.12 4.266667-9.386667 9.386666-9.386666h671.914667V94.72000000000003c0-5.12 4.266667-9.301333 9.386667-9.301333h65.28c5.12 0 9.386667 4.266667 9.386666 9.386666V813.226667A37.290667 37.290667 0 0 1 941.226667 850.773333z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="shezhi4" unicode="&#59214;" d="M983.630276 253.910842l-74.802755 63.980852a410.866748 410.866748 0 0 1 0 132.129598l74.802755 63.980852a36.560487 36.560487 0 0 1 10.602541 40.216535l-1.023693 2.924839a506.947706 506.947706 0 0 1-91.035612 157.575697l-2.047387 2.412992a36.706728 36.706728 0 0 1-40.143414 10.821904l-92.863636-32.977559a402.604078 402.604078 0 0 1-113.922476 65.808876L635.281961 857.89008a36.560487 36.560487 0 0 1-29.467753 29.32151L602.670007 887.796558a516.160949 516.160949 0 0 1-181.705618 0l-3.071081-0.584968a36.560487 36.560487 0 0 1-29.467753-29.32151l-18.06088-97.616499a402.01911 402.01911 0 0 1-113.118145-65.516392l-93.594846 33.196922a36.560487 36.560487 0 0 1-40.070293-10.821904l-2.047387-2.412992A509.653182 509.653182 0 0 1 30.571513 557.143518l-1.023693-2.924839a36.706728 36.706728 0 0 1 10.602541-40.216535l75.753328-64.712062a402.01911 402.01911 0 0 1 0-130.447816l-75.753328-64.63894a36.560487 36.560487 0 0 1-10.602541-40.216535l1.023693-2.99796A508.263884 508.263884 0 0 1 121.534004 53.340013l2.047387-2.412992a36.706728 36.706728 0 0 1 40.070293-10.821904l93.594846 33.270043a399.240513 399.240513 0 0 1 113.118145-65.589513l18.06088-97.616499a36.560487 36.560487 0 0 1 29.467753-29.32151l3.071081-0.584968a513.455473 513.455473 0 0 1 181.705618 0l3.07108 0.584968a36.560487 36.560487 0 0 1 29.467753 29.32151l17.914638 97.177773a399.898602 399.898602 0 0 1 113.922476 65.808876l92.863636-33.05068a36.560487 36.560487 0 0 1 40.143414 10.821904l2.047387 2.412992a509.653182 509.653182 0 0 1 91.035612 157.575697l1.023693 2.924839a36.414245 36.414245 0 0 1-10.602541 39.997172zM827.663241 436.493912a323.340943 323.340943 0 0 0 0-105.294201l-7.53146-45.84685 85.332175-72.974731c-12.869291-29.833357-29.248389-57.911811-48.625447-84.089119l-106.025411 37.58418-35.902398-29.467752c-27.274123-22.448139-57.765569-39.997172-90.670006-52.354617l-43.433858-16.305977-20.473873-110.851395c-32.173228-3.656049-64.931424-3.656049-97.104652 0l-20.473873 111.070758-43.141374 16.52534a319.611773 319.611773 0 0 0-89.938797 52.208375l-35.829276 29.613994-106.756621-37.949785a431.706225 431.706225 0 0 0-48.698568 84.089119l86.282748 73.705941-7.458339 45.700608a314.932031 314.932031 0 0 0 0 103.978023l7.458339 45.700609-86.282748 73.70594c12.942412 29.833357 29.248389 57.911811 48.698568 84.08912l106.756621-37.949786 35.829276 29.613995c27.05476 22.228776 57.326843 39.85093 89.938797 52.208374l43.287616 16.305977 20.473873 111.070758c32.026986 3.656049 64.858303 3.656049 97.031531 0l20.473873-110.851395 43.506979-16.305977c32.831317-12.357444 63.322763-29.979599 90.670006-52.354616l35.829277-29.467753 106.025411 37.584181c19.450179-26.177308 35.683035-54.402004 48.698568-84.089119l-85.332175-72.974732 7.385218-45.627487zM512 596.336359a201.082676 201.082676 0 1 1 0-402.165352 201.082676 201.082676 0 0 1 0 402.165352zM602.523765 304.876161c-24.276163-24.129921-56.303149-37.511059-90.523765-37.51106-34.147494 0-66.247602 13.381138-90.450644 37.51106a127.522977 127.522977 0 0 0-37.511059 90.450643c0 34.147494 13.381138 66.320723 37.511059 90.523765 24.129921 24.203042 56.303149 37.437938 90.450644 37.437938 34.147494 0 66.247602-13.234896 90.523765-37.437938 24.129921-24.276163 37.437938-56.303149 37.437938-90.523765 0-34.147494-13.381138-66.247602-37.437938-90.450643z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="bianji2X" unicode="&#59209;" d="M859.025066 604.880668L733.465686 730.293794a57.18546 57.18546 0 0 0 0 80.805542l68.227665 68.227665a57.18546 57.18546 0 0 0 80.732415 0l125.486253-125.486253c22.303792-22.230665 22.303792-58.50175 0-80.732414l-68.227666-68.227666a56.819824 56.819824 0 0 0-80.659287 0z m-73.858459-153.786474c21.499393 21.426266 26.910805 50.823395 12.065986 65.52196l-152.689567 152.835821c-14.698565 14.698565-44.095694 9.36028-65.595086-12.065986L19.74434 113.100336a63.913161 63.913161 0 0 1-18.866814-38.318646l0.292509-152.835821a43.803185 43.803185 0 0 1 48.629579-48.702707l152.835821-1.243162a63.620653 63.620653 0 0 1 38.318646 18.866814l544.285653 560.154253z m180.258516-432.254802H566.516318c-15.356709 0-29.982147-6.069557-40.658716-16.965508-19.598086-19.598086-51.774048-52.870956-78.611726-80.732414a28.373349 28.373349 0 0 1 20.475612-48.117689h497.264872a58.355495 58.355495 0 0 1 58.209241 58.136113v30.055274a58.062987 58.062987 0 0 1-57.770478 57.624224z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="duohanggongshi" unicode="&#59208;" d="M665.6 418.133333h17.066667v113.777778H295.822222l193.422222-227.555555-216.177777-216.177778h409.6l34.133333 130.844444h-22.755556c0-11.377778-5.688889-17.066667-11.377777-28.444444s-17.066667-17.066667-28.444445-22.755556H426.666667l164.977777 164.977778-136.533333 159.288889H597.333333c22.755556-5.688889 45.511111-11.377778 56.888889-22.755556 5.688889-17.066667 11.377778-34.133333 11.377778-51.2zM807.822222-116.622222H233.244444c-62.577778 0-119.466667 51.2-119.466666 119.466666V748.088889C113.777778 810.666667 164.977778 867.555556 233.244444 867.555556h443.733334l244.622222-233.244445v-637.155555c0-62.577778-51.2-113.777778-113.777778-113.777778zM233.244444 810.666667c-34.133333 0-62.577778-28.444444-62.577777-62.577778v-750.933333c0-34.133333 28.444444-62.577778 62.577777-62.577778h574.577778c34.133333 0 62.577778 28.444444 62.577778 62.577778V611.555556L654.222222 810.666667H233.244444zM898.844444 594.488889h-176.355555c-45.511111 0-85.333333 39.822222-85.333333 85.333333V839.111111h56.888888v-159.288889c0-17.066667 11.377778-28.444444 28.444445-28.444444h176.355555v-56.888889z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="hangneigongshi" unicode="&#59207;" d="M907.946667 636.586667h34.133333V896H54.613333l443.733334-525.653333L0-128h942.08l81.92 307.2h-54.613333c0-20.48-13.653333-40.96-27.306667-68.266667s-34.133333-40.96-68.266667-47.786666H348.16l382.293333 375.466666-327.68 375.466667h327.68c61.44-6.826667 102.4-27.306667 129.706667-54.613333 34.133333-34.133333 47.786667-75.093333 47.786667-122.88z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="quxiaozhiding" unicode="&#59206;" d="M480.492308 29.538462c-31.507692 0-63.015385 15.753846-86.646154 31.507692v7.876923L86.646154 407.630769C70.892308 431.261538 55.138462 462.769231 55.138462 494.276923c0 31.507692 15.753846 63.015385 39.384615 78.769231 23.630769 15.753846 47.261538 31.507692 78.769231 31.507692h102.4V738.461538c0 63.015385 55.138462 118.153846 118.153846 118.153847h228.430769c63.015385 0 118.153846-55.138462 118.153846-118.153847v-133.907692h78.769231c63.015385 0 118.153846-55.138462 118.153846-118.153846 0-31.507692-15.753846-63.015385-31.507692-86.646154l-338.707692-338.707692c-23.630769-23.630769-55.138462-39.384615-86.646154-31.507692zM173.292308 525.784615c-7.876923 0-15.753846 0-23.63077-7.876923-15.753846-15.753846-15.753846-39.384615 0-55.138461l307.2-338.707693c7.876923-15.753846 15.753846-15.753846 23.63077-15.753846 15.753846 0 23.630769 0 31.507692 7.876923l338.707692 338.707693c7.876923 7.876923 7.876923 15.753846 7.876923 31.507692 0 23.630769-15.753846 39.384615-39.384615 39.384615h-157.538462V738.461538c0 23.630769-15.753846 39.384615-39.384615 39.384616H401.723077c-23.630769 0-39.384615-15.753846-39.384615-39.384616v-212.676923H173.292308zM913.723077-96.492308H102.4c-23.630769 0-39.384615 15.753846-39.384615 39.384616s15.753846 39.384615 39.384615 39.384615h811.323077c23.630769 0 39.384615-15.753846 39.384615-39.384615s-23.630769-39.384615-39.384615-39.384616z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="zhiding1" unicode="&#59205;" d="M622.276923-88.615385H401.723077c-70.892308 0-118.153846 55.138462-118.153846 118.153847V163.446154H173.292308c-31.507692 0-55.138462 7.876923-78.769231 31.507692-47.261538 39.384615-47.261538 118.153846-7.876923 165.415385L393.846154 699.076923c23.630769 23.630769 55.138462 39.384615 86.646154 39.384615 31.507692 0 63.015385-15.753846 86.646154-31.507692l338.707692-338.707692c23.630769-23.630769 31.507692-55.138462 31.507692-86.646154 0-63.015385-55.138462-118.153846-118.153846-118.153846h-78.769231V29.538462c0-63.015385-47.261538-118.153846-118.153846-118.153847zM480.492308 659.692308c-7.876923 0-15.753846 0-23.63077-7.876923L149.661538 305.230769c-7.876923-7.876923-15.753846-15.753846-15.753846-23.630769 0-7.876923 7.876923-23.630769 15.753846-23.630769 7.876923-15.753846 15.753846-15.753846 23.63077-15.753846h181.16923V29.538462c0-23.630769 15.753846-39.384615 39.384616-39.384616h228.430769c23.630769 0 39.384615 15.753846 39.384615 39.384616V242.215385h157.538462c23.630769 0 39.384615 15.753846 39.384615 39.384615 0 7.876923-7.876923 23.630769-7.876923 31.507692L512 651.815385c-7.876923 7.876923-15.753846 15.753846-31.507692 7.876923zM913.723077 785.723077H102.4C78.769231 785.723077 63.015385 801.476923 63.015385 825.107692s15.753846 39.384615 39.384615 39.384616h811.323077c23.630769 0 39.384615-15.753846 39.384615-39.384616s-23.630769-39.384615-39.384615-39.384615z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="xinjianjianliwodejianli" unicode="&#59204;" d="M698.181818-104.727273H139.636364c-79.127273 0-139.636364 60.509091-139.636364 139.636364V756.363636c0 79.127273 60.509091 139.636364 139.636364 139.636364h712.145454c79.127273 0 139.636364-60.509091 139.636364-139.636364v-595.781818L698.181818-104.727273zM139.636364 802.909091c-27.927273 0-46.545455-18.618182-46.545455-46.545455v-721.454545c0-27.927273 18.618182-46.545455 46.545455-46.545455h521.309091l237.381818 214.109091V756.363636c0 27.927273-18.618182 46.545455-46.545455 46.545455H139.636364zM735.418182-11.636364h-69.818182v181.527273c0 46.545455 37.236364 83.781818 83.781818 83.781818h153.6v-69.818182H744.727273c-4.654545 0-9.309091-4.654545-9.309091-9.30909v-186.181819zM451.490909 160.581818H279.272727c-18.618182 0-37.236364 13.963636-37.236363 37.236364s13.963636 37.236364 37.236363 37.236363h172.218182c18.618182 0 37.236364-13.963636 37.236364-37.236363s-13.963636-37.236364-37.236364-37.236364zM730.763636 356.072727H279.272727c-18.618182 0-37.236364 13.963636-37.236363 37.236364s18.618182 32.581818 37.236363 32.581818h451.490909c18.618182 0 37.236364-13.963636 37.236364-37.236364s-13.963636-32.581818-37.236364-32.581818zM730.763636 551.563636H279.272727c-18.618182 0-37.236364 13.963636-37.236363 37.236364s18.618182 32.581818 37.236363 32.581818h451.490909c18.618182 0 37.236364-13.963636 37.236364-37.236363s-13.963636-32.581818-37.236364-32.581819z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="huifu" unicode="&#59203;" d="M512-96H166.4c-44.8 6.4-70.4 51.2-64 96 19.2 96 12.8 121.6 12.8 121.6-12.8 25.6-32 51.2-44.8 83.2C44.8 256 32 320 32 384 32 646.4 249.6 864 512 864s480-217.6 480-480-217.6-480-480-480z m0 896C281.6 800 96 614.4 96 384c0-57.6 12.8-108.8 32-160 12.8-25.6 25.6-51.2 38.4-70.4 12.8-19.2 19.2-51.2-6.4-166.4 0-6.4 6.4-19.2 12.8-19.2H512c230.4 0 416 185.6 416 416S742.4 800 512 800zM288 384m-76.8 0a76.8 76.8 0 1 1 153.6 0 76.8 76.8 0 1 1-153.6 0ZM512 384m-76.8 0a76.8 76.8 0 1 1 153.6 0 76.8 76.8 0 1 1-153.6 0ZM736 384m-76.8 0a76.8 76.8 0 1 1 153.6 0 76.8 76.8 0 1 1-153.6 0Z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="tupian" unicode="&#59202;" d="M1185.684211-128H215.578947c-118.568421 0-215.578947 97.010526-215.578947 215.578947V680.421053c0 118.568421 97.010526 215.578947 215.578947 215.578947h970.105264c118.568421 0 215.578947-97.010526 215.578947-215.578947v-592.842106c0-118.568421-97.010526-215.578947-215.578947-215.578947zM215.578947 788.210526c-59.284211 0-107.789474-48.505263-107.789473-107.789473v-592.842106c0-59.284211 48.505263-107.789474 107.789473-107.789473h970.105264c59.284211 0 107.789474 48.505263 107.789473 107.789473V680.421053c0 59.284211-48.505263 107.789474-107.789473 107.789473H215.578947zM0 179.2l247.915789 145.515789c64.673684 37.726316 145.515789 37.726316 210.189474 5.389474l274.863158-145.515789 258.694737 274.863158c43.115789 43.115789 102.4 59.284211 161.68421 43.115789L1401.263158 427.115789V33.684211c0-91.621053-70.063158-161.684211-161.684211-161.684211H161.684211c-91.621053 0-161.684211 70.063158-161.684211 161.684211M210.189474 578.021053a107.789474 107.789474 0 1 1 215.578947 0 107.789474 107.789474 0 1 1-215.578947 0Z"  horiz-adv-x="1401" />
+
+    
+    <glyph glyph-name="wentiliebiao" unicode="&#59201;" d="M512 384m-512 0a512 512 0 1 1 1024 0 512 512 0 1 1-1024 0ZM512 175.261538c-55.138462 0-98.461538 19.692308-129.969231 55.138462-31.507692 35.446154-51.2 82.707692-51.2 141.784615 0 63.015385 15.753846 110.276923 51.2 149.661539 35.446154 35.446154 78.769231 55.138462 137.846154 55.138461 51.2 0 94.523077-19.692308 129.969231-55.138461s47.261538-82.707692 47.261538-141.784616c0-63.015385-15.753846-114.215385-51.2-149.661538l-23.630769-23.630769 110.276923-78.769231h-82.707692l-70.892308 55.138462c-23.630769-3.938462-43.323077-7.876923-66.953846-7.876924z m3.938462 358.4c-39.384615 0-74.830769-15.753846-98.461539-43.323076s-39.384615-66.953846-39.384615-114.215385 11.815385-86.646154 35.446154-114.215385c23.630769-27.569231 55.138462-43.323077 98.461538-43.323077s74.830769 15.753846 98.461538 43.323077c23.630769 27.569231 35.446154 66.953846 35.446154 114.215385 0 51.2-11.815385 90.584615-35.446154 118.153846-19.692308 23.630769-51.2 39.384615-94.523076 39.384615z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="zhicheng" unicode="&#59199;" d="M1331.2-128h-1160.533333C75.093333-128 0-52.906667 0 42.666667v682.666666C0 820.906667 75.093333 896 170.666667 896h1160.533333C1426.773333 896 1501.866667 820.906667 1501.866667 725.333333v-682.666666c0-95.573333-75.093333-170.666667-170.666667-170.666667zM170.666667 827.733333C116.053333 827.733333 68.266667 779.946667 68.266667 725.333333v-682.666666c0-54.613333 47.786667-102.4 102.4-102.4h1160.533333c54.613333 0 102.4 47.786667 102.4 102.4v682.666666c0 54.613333-47.786667 102.4-102.4 102.4h-1160.533333zM750.933333 56.32c-20.48 0-34.133333 13.653333-34.133333 34.133333 0 129.706667-109.226667 238.933333-238.933333 238.933334s-238.933333-109.226667-238.933334-238.933334c0-20.48-13.653333-34.133333-34.133333-34.133333s-34.133333 13.653333-34.133333 34.133333c0 170.666667 136.533333 307.2 307.2 307.2s307.2-136.533333 307.2-307.2c0-20.48-13.653333-34.133333-34.133334-34.133333zM477.866667 363.52c-88.746667 0-163.84 75.093333-163.84 163.84S389.12 691.2 477.866667 691.2s163.84-75.093333 163.84-163.84S566.613333 363.52 477.866667 363.52zM477.866667 622.933333c-54.613333 0-95.573333-40.96-95.573334-95.573333S423.253333 431.786667 477.866667 431.786667s95.573333 40.96 95.573333 95.573333S532.48 622.933333 477.866667 622.933333zM1262.933333 76.8h-341.333333c-20.48 0-34.133333 13.653333-34.133333 34.133333s13.653333 34.133333 34.133333 34.133334h341.333333c20.48 0 34.133333-13.653333 34.133334-34.133334s-13.653333-34.133333-34.133334-34.133333zM1194.666667 315.733333h-273.066667c-20.48 0-34.133333 13.653333-34.133333 34.133334s13.653333 34.133333 34.133333 34.133333h273.066667c20.48 0 34.133333-13.653333 34.133333-34.133333s-13.653333-34.133333-34.133333-34.133334zM1058.133333 520.533333h-136.533333c-20.48 0-34.133333 13.653333-34.133333 34.133334s13.653333 34.133333 34.133333 34.133333h136.533333c20.48 0 34.133333-13.653333 34.133334-34.133333s-13.653333-34.133333-34.133334-34.133334z"  horiz-adv-x="1501" />
+
+    
+    <glyph glyph-name="upload" unicode="&#59243;" d="M704 554.666667h64a64 64 0 0 0 64-64v-362.666667a64 64 0 0 0-64-64H256a64 64 0 0 0-64 64V490.666667a64 64 0 0 0 64 64h64v-64h-64v-362.666667h512V490.666667h-64v64zM517.653333 771.370667l150.826667-150.826667-45.226667-45.269333-74.026666 74.005333v-304.768h-64V648.384l-73.173334-73.130667-45.248 45.248 150.826667 150.848z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="fabuzhiwei" unicode="&#59198;" d="M851.781818-118.690909H139.636364c-79.127273 0-139.636364 60.509091-139.636364 139.636364V751.709091c0 79.127273 60.509091 139.636364 139.636364 139.636364h470.109091c27.927273 0 46.545455-18.618182 46.545454-46.545455s-18.618182-46.545455-46.545454-46.545455H139.636364c-27.927273 0-46.545455-18.618182-46.545455-46.545454v-730.763636c0-27.927273 18.618182-46.545455 46.545455-46.545455h712.145454c27.927273 0 46.545455 18.618182 46.545455 46.545455V528.290909c0 27.927273 18.618182 46.545455 46.545454 46.545455s46.545455-18.618182 46.545455-46.545455v-507.345454c0-74.472727-60.509091-139.636364-139.636364-139.636364zM721.454545 109.381818H269.963636c-18.618182 0-37.236364 13.963636-37.236363 37.236364s13.963636 37.236364 37.236363 37.236363h451.490909c18.618182 0 37.236364-13.963636 37.236364-37.236363s-13.963636-37.236364-37.236364-37.236364zM721.454545 342.109091H269.963636c-18.618182 0-37.236364 13.963636-37.236363 37.236364s13.963636 37.236364 37.236363 37.236363h451.490909c18.618182 0 37.236364-13.963636 37.236364-37.236363s-13.963636-37.236364-37.236364-37.236364zM442.181818 560.872727H269.963636c-18.618182 0-37.236364 13.963636-37.236363 32.581818s13.963636 37.236364 37.236363 37.236364h172.218182c18.618182 0 37.236364-13.963636 37.236364-37.236364s-13.963636-32.581818-37.236364-32.581818zM656.290909 528.290909c-13.963636 0-23.272727 4.654545-32.581818 13.963636-18.618182 18.618182-18.618182 46.545455 0 65.163637L893.672727 863.418182c18.618182 18.618182 46.545455 18.618182 65.163637 0 18.618182-18.618182 18.618182-46.545455 0-65.163637l-269.963637-256c-9.309091-9.309091-18.618182-13.963636-32.581818-13.963636z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="zhiweiyaoqiu" unicode="&#59197;" d="M823.652174-128H200.347826c-75.686957 0-133.565217 57.878261-133.565217 133.565217V628.869565c0 75.686957 57.878261 133.565217 133.565217 133.565218h623.304348c75.686957 0 133.565217-57.878261 133.565217-133.565218v-623.304348c0-75.686957-57.878261-133.565217-133.565217-133.565217zM200.347826 673.391304c-26.713043 0-44.521739-17.808696-44.521739-44.521739v-623.304348c0-26.713043 17.808696-44.521739 44.521739-44.521739h623.304348c26.713043 0 44.521739 17.808696 44.521739 44.521739V628.869565c0 26.713043-17.808696 44.521739-44.521739 44.521739H200.347826zM311.652174 642.226087c-26.713043 0-44.521739 17.808696-44.521739 44.521739V838.121739c0 26.713043 17.808696 44.521739 44.521739 44.521739s44.521739-17.808696 44.521739-44.521739v-146.921739c0-26.713043-17.808696-48.973913-44.521739-48.973913zM756.869565 642.226087c-26.713043 0-44.521739 17.808696-44.521739 44.521739V838.121739c0 26.713043 17.808696 44.521739 44.521739 44.521739s44.521739-17.808696 44.521739-44.521739v-146.921739c0-26.713043-17.808696-48.973913-44.521739-48.973913zM721.252174 486.4H302.747826c-17.808696 0-35.617391 13.356522-35.617391 35.617391s13.356522 35.617391 35.617391 35.617392h414.052174c17.808696 0 35.617391-13.356522 35.617391-35.617392s-13.356522-35.617391-31.165217-35.617391zM721.252174 263.791304H302.747826c-17.808696 0-35.617391 13.356522-35.617391 35.617392s13.356522 35.617391 35.617391 35.617391h414.052174c17.808696 0 35.617391-13.356522 35.617391-35.617391s-13.356522-35.617391-31.165217-35.617392zM645.565217 58.991304H302.747826c-17.808696 0-35.617391 13.356522-35.617391 35.617392s13.356522 35.617391 35.617391 35.617391H645.565217c17.808696 0 35.617391-13.356522 35.617392-35.617391s-17.808696-35.617391-35.617392-35.617392z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="gongsijieshao" unicode="&#59196;" d="M487.619048 569.295238H414.47619c-39.009524 0-68.266667 34.133333-68.266666 73.142857s29.257143 68.266667 68.266666 68.266667H487.619048c39.009524 0 68.266667-29.257143 68.266666-68.266667s-29.257143-73.142857-68.266666-73.142857zM414.47619 661.942857c-9.752381 0-19.504762-9.752381-19.504761-19.504762s9.752381-19.504762 19.504761-19.504762H487.619048c9.752381 0 19.504762 9.752381 19.504762 19.504762s-9.752381 19.504762-19.504762 19.504762H414.47619zM487.619048 340.114286H414.47619c-39.009524 0-68.266667 29.257143-68.266666 68.266666s29.257143 68.266667 68.266666 68.266667H487.619048c39.009524 0 68.266667-29.257143 68.266666-68.266667s-29.257143-68.266667-68.266666-68.266666zM414.47619 427.885714c-9.752381 0-19.504762-9.752381-19.504761-19.504762s9.752381-19.504762 19.504761-19.504762H487.619048c9.752381 0 19.504762 9.752381 19.504762 19.504762s-9.752381 19.504762-19.504762 19.504762H414.47619zM487.619048 106.057143H414.47619c-39.009524 0-68.266667 29.257143-68.266666 68.266667s29.257143 68.266667 68.266666 68.266666H487.619048c39.009524 0 68.266667-29.257143 68.266666-68.266666s-29.257143-68.266667-68.266666-68.266667z m-73.142858 92.647619c-9.752381 0-19.504762-9.752381-19.504761-19.504762s9.752381-19.504762 19.504761-19.504762H487.619048c9.752381 0 19.504762 9.752381 19.504762 19.504762s-9.752381 19.504762-19.504762 19.504762H414.47619zM809.447619-79.238095h-633.904762V798.47619c0 53.638095 43.885714 97.52381 97.52381 97.52381h438.857143c53.638095 0 97.52381-43.885714 97.523809-97.52381v-877.714285z m-536.380952 97.523809h438.857143V798.47619h-438.857143v-780.190476zM1189.790476-79.238095h-463.238095V427.885714c0 53.638095 43.885714 97.52381 97.523809 97.52381h268.190477c53.638095 0 97.52381-43.885714 97.523809-97.52381V-79.238095z m-365.714286 97.523809h268.190477V427.885714h-268.190477V18.285714zM1297.066667-103.619048H68.266667c-29.257143 0-48.761905 19.504762-48.761905 48.761905s19.504762 48.761905 48.761905 48.761905h1223.923809c29.257143 0 48.761905-19.504762 48.761905-48.761905s-19.504762-48.761905-43.885714-48.761905z"  horiz-adv-x="1365" />
+
+    
+    <glyph glyph-name="gongsidizhi" unicode="&#59195;" d="M1015.466667-128H93.866667c-46.933333 0-85.333333 38.4-85.333334 85.333333v17.066667l59.733334 307.2c8.533333 38.4 42.666667 68.266667 85.333333 68.266667h85.333333v-85.333334h-85.333333L93.866667-42.666667h921.6l-59.733334 307.2h-89.6v85.333334h89.6c42.666667 0 76.8-29.866667 85.333334-68.266667l59.733333-307.2c4.266667-21.333333 0-46.933333-12.8-64-12.8-17.066667-34.133333-29.866667-55.466667-34.133333-8.533333-4.266667-12.8-4.266667-17.066666-4.266667zM554.666667 76.8l-29.866667 34.133333c-149.333333 153.6-243.2 264.533333-281.6 324.266667-34.133333 42.666667-46.933333 98.133333-46.933333 149.333333C196.266667 755.2 354.133333 896 554.666667 896s358.4-140.8 358.4-311.466667c0-55.466667-17.066667-110.933333-46.933334-157.866666-38.4-55.466667-132.266667-166.4-281.6-320l-29.866666-29.866667zM554.666667 810.666667C401.066667 810.666667 281.6 708.266667 281.6 584.533333c0-38.4 12.8-72.533333 34.133333-106.666666s85.333333-110.933333 243.2-277.333334c157.866667 166.4 217.6 238.933333 238.933334 273.066667 21.333333 34.133333 34.133333 68.266667 34.133333 106.666667-4.266667 128-123.733333 230.4-277.333333 230.4zM550.4 409.6c-72.533333 0-128 55.466667-128 128s55.466667 128 128 128 128-55.466667 128-128-59.733333-128-128-128z m0 213.333333c-46.933333 0-85.333333-38.4-85.333333-85.333333s38.4-85.333333 85.333333-85.333333 85.333333 38.4 85.333333 85.333333-38.4 85.333333-85.333333 85.333333z"  horiz-adv-x="1109" />
+
+    
+    <glyph glyph-name="jubushuaxinjiantou" unicode="&#59194;" d="M783.090347-128a35.498667 35.498667 0 0 0-22.528 8.192l-546.133334 477.866667a32.768 32.768 0 0 0-8.874666 22.528 34.133333 34.133333 0 0 0 11.605333 25.941333l546.133333 477.866667a32.768 32.768 0 0 0 47.786667 0 34.133333 34.133333 0 0 0 0-48.469334L288.83968 384l516.778667-449.194667a34.816 34.816 0 0 0 3.413333-48.469333 35.498667 35.498667 0 0 0-25.941333-14.336z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="fanhui" unicode="&#59193;" d="M590.769231-107.362462H315.076923c-31.507692 0-63.015385 23.630769-63.015385 63.015385s23.630769 63.015385 63.015385 63.015385h275.692308c259.938462 0 378.092308 7.876923 378.092307 252.061538s-118.153846 252.061538-378.092307 252.061539H315.076923c-31.507692 0-63.015385 23.630769-63.015385 63.015384s31.507692 55.138462 63.015385 55.138462h275.692308c228.430769 0 496.246154 0 496.246154-378.092308s-267.815385-370.215385-496.246154-370.215385zM47.261538 514.914462l259.938462-196.923077c39.384615-23.630769 86.646154-15.753846 110.276923 15.753846 7.876923 15.753846 15.753846 31.507692 15.753846 47.261538v393.846154c0 47.261538-31.507692 78.769231-78.769231 78.769231-15.753846 0-31.507692-7.876923-47.261538-15.753846l-259.938462-196.923077c-39.384615-31.507692-47.261538-78.769231-15.753846-110.276923 0-7.876923 7.876923-15.753846 15.753846-15.753846z"  horiz-adv-x="1102" />
+
+    
+    <glyph glyph-name="tongji1" unicode="&#59192;" d="M702.171429 52.419048c-78.019048 0-141.409524 63.390476-141.409524 141.409523V754.590476c0 78.019048 63.390476 141.409524 141.409524 141.409524 78.019048 0 141.409524-63.390476 141.409523-141.409524v-565.638095c-4.87619-73.142857-68.266667-136.533333-141.409523-136.533333z m0 746.057142c-24.380952 0-43.885714-19.504762-43.885715-43.885714v-565.638095c0-24.380952 19.504762-43.885714 43.885715-43.885714s43.885714 19.504762 43.885714 43.885714V754.590476c-4.87619 24.380952-24.380952 43.885714-43.885714 43.885714zM1067.885714 52.419048c-78.019048 0-141.409524 63.390476-141.409524 141.409523V447.390476c0 78.019048 63.390476 141.409524 141.409524 141.409524s141.409524-63.390476 141.409524-141.409524v-253.561905c0-78.019048-63.390476-141.409524-141.409524-141.409523z m0 433.980952c-24.380952 0-43.885714-19.504762-43.885714-43.885714v-253.561905c0-24.380952 19.504762-43.885714 43.885714-43.885714s43.885714 19.504762 43.885715 43.885714V447.390476c0 19.504762-19.504762 39.009524-43.885715 39.009524zM331.580952 52.419048C253.561905 52.419048 195.047619 115.809524 195.047619 193.828571V447.390476c0 78.019048 63.390476 141.409524 141.409524 141.409524 78.019048 0 141.409524-63.390476 141.409524-141.409524v-253.561905c-4.87619-78.019048-68.266667-141.409524-146.285715-141.409523z m0 433.980952c-19.504762 0-39.009524-19.504762-39.009523-39.009524v-253.561905c0-24.380952 19.504762-43.885714 43.885714-43.885714s43.885714 19.504762 43.885714 43.885714V447.390476c-4.87619 19.504762-24.380952 39.009524-48.761905 39.009524zM1297.066667-108.495238H48.761905c-29.257143 0-48.761905 19.504762-48.761905 48.761905v536.380952c0 29.257143 19.504762 48.761905 48.761905 48.761905s48.761905-19.504762 48.761905-48.761905v-487.619048h1199.542857c29.257143 0 48.761905-19.504762 48.761904-48.761904s-24.380952-48.761905-48.761904-48.761905z"  horiz-adv-x="1365" />
+
+    
+    <glyph glyph-name="qiandao-1" unicode="&#59190;" d="M881.509434-128h-724.528302a157.584906 157.584906 0 0 0-156.981132 156.981132v603.773585a157.584906 157.584906 0 0 0 156.981132 156.981132h724.528302a157.584906 157.584906 0 0 0 156.981132-156.981132v-603.773585a157.584906 157.584906 0 0 0-156.981132-156.981132z m-724.528302 845.283019a84.528302 84.528302 0 0 1-84.528302-84.528302v-603.773585a84.528302 84.528302 0 0 1 84.528302-84.528302h724.528302a84.528302 84.528302 0 0 1 84.528302 84.528302v603.773585a84.528302 84.528302 0 0 1-84.528302 84.528302zM277.735849 859.773585v-241.509434M277.735849 582.037736a36.226415 36.226415 0 0 0-36.226415 36.226415v241.509434a36.226415 36.226415 0 1 0 72.45283 0v-241.509434a36.226415 36.226415 0 0 0-36.226415-36.226415zM760.754717 859.773585v-241.509434M760.754717 582.037736a36.226415 36.226415 0 0 0-36.226415 36.226415v241.509434a36.226415 36.226415 0 0 0 72.45283 0v-241.509434a36.226415 36.226415 0 0 0-36.226415-36.226415zM486.641509 149.735849a37.433962 37.433962 0 0 0-27.773584 10.867925l-175.09434 181.132075a36.226415 36.226415 0 0 0 0 51.320755 36.830189 36.830189 0 0 0 51.320755 0l152.754717-158.792453 281.962264 221.584906a36.226415 36.226415 0 0 0 50.716981-6.037736 36.830189 36.830189 0 0 0-6.037736-51.320755l-307.320755-241.509434a38.037736 38.037736 0 0 0-20.528302-7.245283z"  horiz-adv-x="1038" />
+
+    
+    <glyph glyph-name="xiajiantou2" unicode="&#59191;" d="M796.390468-127.928326a113.768929 113.768929 0 0 0-86.464386 39.819126l-682.613575 796.382503A113.768929 113.768929 0 1 0 200.24128 856.172911L796.390468 156.493997 1392.539656 851.622154a113.768929 113.768929 0 0 0 172.928773-147.899608l-682.613575-796.382504A113.768929 113.768929 0 0 0 796.390468-127.928326z"  horiz-adv-x="1592" />
+
+    
+    <glyph glyph-name="qiandao-" unicode="&#59189;" d="M881.509434-128h-724.528302a157.584906 157.584906 0 0 0-156.981132 156.981132v603.773585a157.584906 157.584906 0 0 0 156.981132 156.981132h724.528302a157.584906 157.584906 0 0 0 156.981132-156.981132v-603.773585a157.584906 157.584906 0 0 0-156.981132-156.981132z m-724.528302 845.283019a84.528302 84.528302 0 0 1-84.528302-84.528302v-603.773585a84.528302 84.528302 0 0 1 84.528302-84.528302h724.528302a84.528302 84.528302 0 0 1 84.528302 84.528302v603.773585a84.528302 84.528302 0 0 1-84.528302 84.528302zM277.735849 859.773585v-241.509434M277.735849 582.037736a36.226415 36.226415 0 0 0-36.226415 36.226415v241.509434a36.226415 36.226415 0 1 0 72.45283 0v-241.509434a36.226415 36.226415 0 0 0-36.226415-36.226415zM760.754717 859.773585v-241.509434M760.754717 582.037736a36.226415 36.226415 0 0 0-36.226415 36.226415v241.509434a36.226415 36.226415 0 0 0 72.45283 0v-241.509434a36.226415 36.226415 0 0 0-36.226415-36.226415zM486.641509 149.73584900000003a37.433962 37.433962 0 0 0-27.773584 10.867925l-175.09434 181.132075a36.226415 36.226415 0 0 0 0 51.320755 36.830189 36.830189 0 0 0 51.320755 0l152.754717-158.792453 281.962264 221.584906a36.226415 36.226415 0 0 0 50.716981-6.037736 36.830189 36.830189 0 0 0-6.037736-51.320755l-307.320755-241.509434a38.037736 38.037736 0 0 0-20.528302-7.245283z"  horiz-adv-x="1038" />
+
+    
+    <glyph glyph-name="yidong" unicode="&#59188;" d="M855.341176-121.976471H174.682353c-90.352941 0-156.611765 72.282353-156.611765 156.611765V721.317647C18.070588 811.670588 90.352941 877.929412 174.682353 877.929412h680.658823c90.352941 0 156.611765-72.282353 156.611765-156.611765v-78.305882h-90.352941V721.317647c0 36.141176-30.117647 66.258824-66.258824 66.258824H174.682353c-36.141176 0-66.258824-30.117647-66.258824-66.258824v-680.658823c0-36.141176 30.117647-66.258824 66.258824-66.258824h680.658823c36.141176 0 66.258824 30.117647 66.258824 66.258824v78.305882h90.352941v-78.305882c6.023529-90.352941-66.258824-162.635294-156.611765-162.635295zM951.717647 299.670588H271.058824c-24.094118 0-48.188235 18.070588-48.188236 48.188236s18.070588 48.188235 48.188236 48.188235h680.658823c24.094118 0 48.188235-18.070588 48.188235-48.188235s-24.094118-48.188235-48.188235-48.188236zM1084.235294 347.858824L921.6 173.176471V534.588235L1084.235294 359.905882v-12.047058z"  horiz-adv-x="1084" />
+
+    
+    <glyph glyph-name="xiayi1" unicode="&#59186;" d="M512 384m-481.882353 0a481.882353 481.882353 0 1 1 963.764706 0 481.882353 481.882353 0 1 1-963.764706 0ZM512-128C228.894118-128 0 100.894118 0 384S228.894118 896 512 896 1024 667.105882 1024 384 795.105882-128 512-128z m0 963.764706C265.035294 835.764706 60.235294 630.964706 60.235294 384S265.035294-67.764706 512-67.764706 963.764706 137.035294 963.764706 384 758.964706 835.764706 512 835.764706zM502.964706 143.058824c-18.070588 0-30.117647 12.047059-30.117647 30.117647V588.8c0 18.070588 12.047059 30.117647 30.117647 30.117647s30.117647-12.047059 30.117647-30.117647V173.176471c0-18.070588-12.047059-30.117647-30.117647-30.117647zM502.964706 88.847059c-6.023529 0-12.047059 0-18.070588 6.023529l-144.564706 132.517647c-12.047059 12.047059-12.047059 30.117647 0 42.164706 12.047059 12.047059 30.117647 12.047059 42.164706 0l126.494117-108.423529 132.517647 108.423529c12.047059 12.047059 30.117647 12.047059 42.164706-6.023529 6.023529-6.023529 6.023529-30.117647-12.047059-36.141177l-150.588235-132.517647c-6.023529 0-12.047059-6.023529-18.070588-6.023529z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="shangyi1" unicode="&#59185;" d="M512 384m-481.882353 0a481.882353 481.882353 0 1 1 963.764706 0 481.882353 481.882353 0 1 1-963.764706 0ZM512-128C228.894118-128 0 100.894118 0 384S228.894118 896 512 896 1024 667.105882 1024 384 795.105882-128 512-128z m0 963.764706C265.035294 835.764706 60.235294 630.964706 60.235294 384S265.035294-67.764706 512-67.764706 963.764706 137.035294 963.764706 384 758.964706 835.764706 512 835.764706zM502.964706 106.917647c-18.070588 0-30.117647 12.047059-30.117647 30.117647V552.658824c0 18.070588 12.047059 30.117647 30.117647 30.117647s30.117647-12.047059 30.117647-30.117647v-415.62353c0-18.070588-12.047059-30.117647-30.117647-30.117647zM653.552941 444.235294c-6.023529 0-12.047059 0-18.070588 6.02353l-132.517647 114.447058-126.494118-108.423529c-12.047059-12.047059-30.117647-12.047059-42.164706 0-12.047059 12.047059-12.047059 30.117647 0 42.164706l144.564706 126.494117c12.047059 12.047059 30.117647 12.047059 42.164706 0l150.588235-126.494117c12.047059-12.047059 12.047059-30.117647 6.02353-42.164706-6.023529-6.023529-12.047059-12.047059-24.094118-12.047059z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="xiayi" unicode="&#59184;" d="M512 384m-481.882353 0a481.882353 481.882353 0 1 1 963.764706 0 481.882353 481.882353 0 1 1-963.764706 0ZM512-128C228.894118-128 0 100.894118 0 384S228.894118 896 512 896 1024 667.105882 1024 384 795.105882-128 512-128z m0 963.764706C265.035294 835.764706 60.235294 630.964706 60.235294 384S265.035294-67.764706 512-67.764706 963.764706 137.035294 963.764706 384 758.964706 835.764706 512 835.764706zM502.964706 143.058824c-18.070588 0-30.117647 12.047059-30.117647 30.117647V588.8c0 18.070588 12.047059 30.117647 30.117647 30.117647s30.117647-12.047059 30.117647-30.117647V173.176471c0-18.070588-12.047059-30.117647-30.117647-30.117647zM502.964706 88.847059c-6.023529 0-12.047059 0-18.070588 6.023529l-144.564706 132.517647c-12.047059 12.047059-12.047059 30.117647 0 42.164706 12.047059 12.047059 30.117647 12.047059 42.164706 0l126.494117-108.423529 132.517647 108.423529c12.047059 12.047059 30.117647 12.047059 42.164706-6.023529 6.023529-6.023529 6.023529-30.117647-12.047059-36.141177l-150.588235-132.517647c-6.023529 0-12.047059-6.023529-18.070588-6.023529z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="shangyi" unicode="&#59183;" d="M512 384m-481.882353 0a481.882353 481.882353 0 1 1 963.764706 0 481.882353 481.882353 0 1 1-963.764706 0ZM512-128C228.894118-128 0 100.894118 0 384S228.894118 896 512 896 1024 667.105882 1024 384 795.105882-128 512-128z m0 963.764706C265.035294 835.764706 60.235294 630.964706 60.235294 384S265.035294-67.764706 512-67.764706 963.764706 137.035294 963.764706 384 758.964706 835.764706 512 835.764706zM502.964706 106.917647c-18.070588 0-30.117647 12.047059-30.117647 30.117647V552.658824c0 18.070588 12.047059 30.117647 30.117647 30.117647s30.117647-12.047059 30.117647-30.117647v-415.62353c0-18.070588-12.047059-30.117647-30.117647-30.117647zM653.552941 444.235294c-6.023529 0-12.047059 0-18.070588 6.02353l-132.517647 114.447058-126.494118-108.423529c-12.047059-12.047059-30.117647-12.047059-42.164706 0-12.047059 12.047059-12.047059 30.117647 0 42.164706l144.564706 126.494117c12.047059 12.047059 30.117647 12.047059 42.164706 0l150.588235-126.494117c12.047059-12.047059 12.047059-30.117647 6.02353-42.164706-6.023529-6.023529-12.047059-12.047059-24.094118-12.047059z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="bianji5" unicode="&#59182;" d="M704.752941-97.882353H198.776471c-78.305882 0-138.541176 60.235294-138.541177 132.517647V667.105882c0 72.282353 66.258824 132.517647 138.541177 132.517647h319.247058c18.070588 0 30.117647-12.047059 30.117647-30.117647s-12.047059-24.094118-30.117647-24.094117H198.776471c-42.164706 0-78.305882-36.141176-78.305883-72.282353v-632.470588c0-42.164706 36.141176-72.282353 78.305883-72.282353h499.952941c42.164706 0 78.305882 36.141176 78.305882 72.282353V293.647059c0 18.070588 12.047059 30.117647 30.117647 30.117647s30.117647-12.047059 30.117647-30.117647v-259.011765c6.023529-72.282353-60.235294-132.517647-132.517647-132.517647zM313.223529 161.129412c-24.094118 0-54.211765 18.070588-60.235294 48.188235v30.117647l36.141177 126.494118 445.741176 445.741176c48.188235 48.188235 120.470588 48.188235 168.658824 0 48.188235-48.188235 48.188235-120.470588 0-168.658823l-445.741177-445.741177-126.494117-30.117647c-6.023529-6.023529-12.047059-6.023529-18.070589-6.023529z m36.141177 174.682353l-36.141177-114.447059 120.470589 30.117647 433.694117 433.694118c12.047059 12.047059 18.070588 24.094118 18.070589 42.164705 0 18.070588-6.023529 30.117647-18.070589 42.164706-24.094118 24.094118-60.235294 24.094118-84.329411 0L349.364706 335.811765z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="shanchu3" unicode="&#59181;" d="M654.222222-99.555556H375.466667c-68.266667 0-125.155556 56.888889-136.533334 142.222223L142.222222 571.733333c0 17.066667 5.688889 28.444444 22.755556 34.133334 17.066667 0 28.444444-5.688889 34.133333-22.755556l91.022222-534.755555c11.377778-51.2 45.511111-91.022222 85.333334-91.022223h278.755555c39.822222 0 73.955556 39.822222 85.333334 91.022223l91.022222 534.755555c0 17.066667 17.066667 28.444444 34.133333 22.755556 17.066667 0 28.444444-17.066667 22.755556-34.133334L796.444444 42.666667c-17.066667-85.333333-73.955556-142.222222-142.222222-142.222223zM597.333333 708.266667v5.688889c0 51.2-39.822222 96.711111-85.333333 96.711111s-85.333333-45.511111-85.333333-102.4h-56.888889C369.777778 793.6 432.355556 867.555556 512 867.555556c73.955556 0 136.533333-68.266667 142.222222-147.911112v-5.688888l-56.888889-5.688889zM398.222222 36.977778c-11.377778 0-28.444444 11.377778-28.444444 22.755555L284.444444 577.422222c0 17.066667 11.377778 34.133333 22.755556 34.133334 17.066667 5.688889 34.133333-5.688889 34.133333-22.755556l85.333334-517.688889c0-17.066667-5.688889-34.133333-28.444445-34.133333 5.688889 0 0 0 0 0zM625.777778 36.977778s-5.688889 0 0 0c-22.755556 5.688889-28.444444 17.066667-28.444445 34.133333L682.666667 588.8c0 17.066667 17.066667 28.444444 34.133333 22.755556 11.377778 0 22.755556-17.066667 22.755556-34.133334l-85.333334-517.688889c0-11.377778-17.066667-22.755556-28.444444-22.755555zM512 36.977778c-17.066667 0-28.444444 11.377778-28.444444 28.444444V583.111111c0 17.066667 11.377778 28.444444 28.444444 28.444445s28.444444-11.377778 28.444444-28.444445v-517.688889c0-17.066667-11.377778-28.444444-28.444444-28.444444zM938.666667 645.688889H85.333333c-17.066667 0-28.444444 17.066667-28.444444 28.444444s11.377778 28.444444 28.444444 28.444445h853.333334c17.066667 0 28.444444-11.377778 28.444444-28.444445s-11.377778-28.444444-28.444444-28.444444z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="xuanze" unicode="&#59180;" d="M870.4 896H153.6C66.56 896 0 829.44 0 742.4v-716.8c0-87.04 66.56-153.6 153.6-153.6h716.8c87.04 0 153.6 66.56 153.6 153.6V742.4c0 87.04-66.56 153.6-153.6 153.6z m-40.96-394.24l-337.92-358.4c-10.24-10.24-25.6-15.36-40.96-15.36-10.24 0-20.48 5.12-30.72 10.24L174.08 332.8c-20.48 15.36-25.6 51.2-10.24 71.68 15.36 20.48 51.2 25.6 71.68 10.24l209.92-163.84 307.2 327.68c20.48 20.48 51.2 20.48 71.68 0 20.48-20.48 25.6-56.32 5.12-76.8z"  horiz-adv-x="1024" />
+
+    
     <glyph glyph-name="bianji4" unicode="&#59178;" d="M934.724189 617.173271L834.414864 516.863946 653.380212 697.898598l100.394659 100.351991A42.257063 42.257063 0 0 0 783.769535 810.666588c6.527999 0 19.157332-1.621333 29.951997-12.415999l121.002657-121.002656a42.538663 42.538663 0 0 0 0-60.074662zM299.374908-18.176009l-200.661316-19.626665 19.669331 200.661316L593.049551 637.52527 774.084202 456.533285l-474.709294-474.709294z m695.679942 755.79727L874.09486 858.581251A127.317323 127.317323 0 0 1 783.769535 895.999915c-32.725331 0-65.407995-12.458666-90.367993-37.418664l-646.229279-646.229279c-7.082666-7.082666-11.434666-16.469332-12.287999-26.495998l-26.197331-267.818645c-2.133333-25.002665 17.706665-46.037329 42.239996-46.037329 1.194667 0 2.432 0.042667 3.626666 0.128l267.818645 26.239998a42.12053 42.12053 0 0 1 26.495998 12.287999l646.186612 646.186613c49.919996 49.919996 49.919996 130.858656 0 180.778651z"  horiz-adv-x="1032" />
 
     

public/css/merge.css

@@ -1,111 +1,40 @@
 
-.CodeMirror-merge {
-  position: relative;
-  white-space: pre;
+.maxW50{max-width: 50%;}
+.minW50{min-width: 50%;}
+.width70{width: 70%;}
+.width30{width: 30%;}
+.custom-commit-tabs .ant-tabs-bar{border-bottom: none;}
+.maxW200px{max-width: 200px;}
+.pr_tags_open{
+  background: #28BD6C !important;
+  color: #fff !important;
+  border: none !important;
 }
-
-.CodeMirror-merge, .CodeMirror-merge .CodeMirror {
-  min-height:50px;
+.pr_tags_closed{
+  background: #FA6400 !important;
+  color: #fff !important;
+  border: none !important;
 }
-
-.CodeMirror-merge-2pane .CodeMirror-merge-pane { width: 48%; }
-.CodeMirror-merge-2pane .CodeMirror-merge-gap { width: 4%; }
-.CodeMirror-merge-3pane .CodeMirror-merge-pane { width: 31%; }
-.CodeMirror-merge-3pane .CodeMirror-merge-gap { width: 3.5%; }
-
-.CodeMirror-merge-pane {
-  display: inline-block;
-  white-space: normal;
-  vertical-align: top;
+.pr_tags_merged{
+  background: #4C9ED3 !important;
+  color: #fff !important;
+  border: none !important;
 }
-.CodeMirror-merge-pane-rightmost {
-  position: absolute;
-  right: 0px;
-  z-index: 1;
+.ant-btn-success{
+  border: 1px solid #28BD6C !important;
+  color: #28BD6C !important;
 }
-
-.CodeMirror-merge-gap {
-    z-index: 2;
-    display: inline-block;
-    height: 100%;
-    -moz-box-sizing: border-box;
-    box-sizing: border-box;
-    overflow: hidden;
-    position: relative;
-    background: #515151;
+.ant-btn-success:hover{
+  background: #28BD6C !important;
+  color:#fff !important;
 }
-
-.CodeMirror-merge-scrolllock-wrap {
-  position: absolute;
-  bottom: 0; left: 50%;
-}
-.CodeMirror-merge-scrolllock {
-  position: relative;
-  left: -50%;
-  cursor: pointer;
-  color: #d8d8d8;
-  line-height: 1;
-}
-
-.CodeMirror-merge-copybuttons-left, .CodeMirror-merge-copybuttons-right {
-  position: absolute;
-  left: 0; top: 0;
-  right: 0; bottom: 0;
-  line-height: 1;
-}
-
-.CodeMirror-merge-copy {
-  position: absolute;
-  cursor: pointer;
-  color: #ce374b;
-  z-index: 3;
-}
-
-.CodeMirror-merge-copy-reverse {
-  position: absolute;
-  cursor: pointer;
-  color: #44c;
-}
-
-.CodeMirror-merge-copybuttons-left .CodeMirror-merge-copy { left: 2px; }
-.CodeMirror-merge-copybuttons-right .CodeMirror-merge-copy { right: 2px; }
-
-.CodeMirror-merge-r-inserted, .CodeMirror-merge-l-inserted {
-  background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAMAAAACCAYAAACddGYaAAAAGUlEQVQI12MwuCXy3+CWyH8GBgYGJgYkAABZbAQ9ELXurwAAAABJRU5ErkJggg==);
-  background-position: bottom left;
-  background-repeat: repeat-x;
-}
-
-.CodeMirror-merge-r-deleted, .CodeMirror-merge-l-deleted {
-  background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAMAAAACCAYAAACddGYaAAAAGUlEQVQI12M4Kyb2/6yY2H8GBgYGJgYkAABURgPz6Ks7wQAAAABJRU5ErkJggg==);
-  background-position: bottom left;
-  background-repeat: repeat-x;
-}
-
-.CodeMirror-merge-r-chunk { background: #9a6868; }
-.CodeMirror-merge-r-chunk-start { /*border-top: 1px solid #ee8; */}
-.CodeMirror-merge-r-chunk-end {/* border-bottom: 1px solid #ee8; */}
-.CodeMirror-merge-r-connect { fill:#9a6868;}
-
-.CodeMirror-merge-l-chunk { background: #eef; }
-.CodeMirror-merge-l-chunk-start { border-top: 1px solid #88e; }
-.CodeMirror-merge-l-chunk-end { border-bottom: 1px solid #88e; }
-.CodeMirror-merge-l-connect { fill: #eef; stroke: #88e; stroke-width: 1px; }
-
-.CodeMirror-merge-l-chunk.CodeMirror-merge-r-chunk { background: #dfd; }
-.CodeMirror-merge-l-chunk-start.CodeMirror-merge-r-chunk-start { border-top: 1px solid #4e4; }
-.CodeMirror-merge-l-chunk-end.CodeMirror-merge-r-chunk-end { border-bottom: 1px solid #4e4; }
-
-.CodeMirror-merge-collapsed-widget:before {
-  content: "(...)";
-}
-.CodeMirror-merge-collapsed-widget {
-  cursor: pointer;
-  color: #88b;
-  background: #eef;
-  border: 1px solid #ddf;
-  font-size: 90%;
-  padding: 0 3px;
-  border-radius: 4px;
-}
-.CodeMirror-merge-collapsed-line .CodeMirror-gutter-elt { display: none; }
+.display-flex{display: flex !important;}
+.merge-flex1{flex:1}
+.ant-tag.pr-branch-tag{
+  border-radius: 12px;
+  height: 24px;
+  background: rgba(241,248,255,1);
+  border: none;
+  font-size: 13px;
+  padding: 0 10px;
+}

public/css/taskstyle.css

@@ -1,524 +0,0 @@
-/************新版公共****************/
-/************新版公共****************/
-html{height:100%;}
-/*.newContainer{ min-height:100%; height: auto !important; height: 100%;  position: relative;}
-.newMain{ margin: 0 auto; padding-bottom: 155px; }
-.newFooter{ position: absolute; bottom: 0; width: 100%; height: 155px;background: #323232; clear:both; min-width: 1200px}
-.newHeader{background: #46484c;width:100%; height: 50px; min-width: 1200px}*/
-.w20_center{ width: 20px;text-align: center; }
-.task-container{ min-width:1300px; margin:0 auto; background: #f5f9fc; position: relative;}
-/*左侧导航*/
-.leftbar{  height: 100%; background: #1f212d; width:80px;}
-.user-info{ width:80px; height:100px;  padding-top:15px;}
-a.user-info-img{ display: block; width: 50px; height: 50px; margin:0 auto;  }
-a.user-info-img img{border-radius:100px;border:2px solid #666;}
-a.user-info-img img:hover{border:2px solid #888;}
-a.user-info-name{ display: block; font-size: 16px; color: #fff; max-width:100px; margin: 10px auto; text-align: center;    overflow: hidden;white-space: nowrap;text-overflow: ellipsis;}
-.leftnav-box{ width: 80px; height: 60px; background:#292b3a; padding:10px 0; margin-bottom:2px;}
-a.leftnav-box-inner{ display: block; width:77px;  border-left:3px solid #292b3a; background:#292b3a;  text-align: center; padding:10px 0; color:#575f6c;}
-a:hover.leftnav-box-inner,a.leftnav-active{border-left:3px solid #3498db;color: #fff!important;}
-a:hover.leftnav-box-inner .btn-cir{background:#fff;color:#333333}
-a.leftnav-box-reset-inner{ display: block; width:77px;  border-left:3px solid #292b3a; background:#292b3a;  text-align: center; color:#575f6c;}
-a:hover.leftnav-box-reset-inner{border-left:3px solid #3498db;color: #fff!important;}
-
-
-
-/*右侧头部*/
-.rightbar-header{width: 100%; background:#282c37; height:60px; min-width:1000px;}
-.rightbar-score{ margin-top: 17px; font-size: 14px; margin-right:20px;}
-.rightbar-score li{ float: left; color:#fff; margin-right: 20px;}
-.rightbar-score li a{ color:#fff;}
-a.rightbar-pause{ color:#29bd8b; font-size: 18px; margin-right:15px; margin-top: 12px;}
-.rightbar-h2{ color:#fff; margin:12px 0 0 20px;  font-weight: normal;}
-.rightbar{background:#f5f9fc; color:#333; position: relative;}
-/*右侧内容*/
-.content{ min-width:1000px;  }
-.content-row{ padding:15px; }
-.content-info{ width:49.5%; min-width:250px;}
-.content-editor{  width:49.3%; min-width:250px; margin-left:15px; }
-.panel-header{  border-bottom:1px solid #eee; padding:10px 15px; color:#898989;}
-.panel-header-border{  border:1px solid #eee; padding:10px 15px; border-bottom:none; }
-/* tab */
-.tab_content{ width: 100%;  margin: 0 auto;  background:#fff;  }
-#tab_nav {height:42px;background: #fff; border-bottom: 1px solid #EEEEEE}
-#tab_nav li {float:left; padding:0 30px;text-align:center;height: 40px;line-height: 40px;  }
-#tab_nav li a{font-size:14px; }
-.tab_hover {border-bottom:2px solid #3498db; background: #fff;color: #3498db}
-/*.tab_hover_setting{background:#FC7033;}*/
-.tab_hover a{ color:#3498db!important;}
-/*.tab_hover_setting a{color:#fff;}*/
-.undis {display:none;}
-.dis {display:block;}
-.tab-info{ }
-.content-editor-inner{ overflow:auto;}
-.tab-info-inner{ overflow:auto; height:600px;  margin:0 0 0px 15px;padding-top: 15px}
-.content-history-inner{height:120px; overflow:auto; padding:15px;}
-.content-history{width:48.7%; min-width:500px; }
-.history-success{ width: 100%; height:40px; line-height: 40px;  background:#eef1f2; color:#666; }
-.history-fail{ width: 100%; height:40px; line-height: 40px;  background:#fdebeb; color:#e53238; }
-.icon-fail{ display:inline-block; padding:0 8px; background:#e53238; color:#fff;}
-.icon-success{ display:inline-block; padding:0 8px; background:#252e38; color:#fff;}
-.info-partly{display: block;box-flex:1;flex:1;-webkit-flex:1;position: relative;}
-.content-output{width:37.5%; min-width:200px;  }
-.content-submit{width:10%; min-width:135px; }
-.content-submitbox{ width:120px; margin: 15px auto; height:135px;}
-.panel-inner{ background:#EFF2F7; margin:15px; padding:15px;}
-.panel-inner-title{ font-size: 14px; color: #666; max-width:85%; line-height:30px;word-wrap: break-word; margin-bottom: 10px}
-.panel-footer{ min-width:1000px; height: 210px!important;}
-/* 弹框 */
-.task-popup-text-center{ text-align: center; color: #333;}
-.task-popup-title{ border-bottom: 1px solid #eee; padding:10px 15px; }
-.task-popup-submit{ margin: 0 auto 15px; width: 120px;}
-/* TPM */
-.task-header{ width: 100%;min-width:1200px; background:url("/images/task/task-bg-header.png");height: 180px;background-size: cover;display: flex;align-items: center;}
-.task-header-info{ width: 1200px; margin: 0 auto; color:#fff}
-.task-header-info h2 a,.task-header-info h2{ font-weight: normal;color:#fff;}
-a.task-header-name{ max-width:200px;}
-.task-header-title{ display: block; max-width:750px;word-wrap: break-word;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;}
-.task-header-nav{ width: 100%;min-width:1200px; height:50px;}
-.task-header-navs{ width: 1200px; margin: 0 auto;}
-
-.task-header-navs li{ float: left;}
-.task-header-navs li{ display: block; height: 50px; padding:0 50px; color:#666; text-align: center; font-size: 16px; line-height: 50px;}
-.task-header-navs li:hover,.task-header-navs li:hover a{ color:#FC7033!important;}
-.task-header-navs li.active{border-bottom: 2px solid #FC7033;color:#FC7033;}
-.task-header-navs li.active a{color:#FC7033!important;}
-.task-header-navs li.active .edu-cir-grey,.task-header-navs li:hover .edu-cir-grey,.edu-cir-grey.active{background: #FF7500;color: #FFFFff}
-
-.task-pm-content{ width: 1200px; margin: 0 auto; min-height:566px}
-.task-pm-box{ width: 100%; background: #fff; border: 1px solid #e8e8e8;}
-.task-paner-con{ padding:15px; color:#666; line-height:2.0;}
-.task-paner-con img{ max-width: 100%}
-.panel-form{margin:0 30px 0px 20px; padding:30px 0;  }.panel-form li{ margin-bottom:20px; font-size: 14px; color:#666;}
-
-
-.panel-form-label{ display:inline-block; width:10%; min-width:90px; text-align:right; line-height:40px; color: #666;}
-.panel-form-label1{ display:inline-block; width:20%; min-width:90px; text-align:right; line-height:40px; }
-.panel-form input,.panel-form textarea{ border:1px solid #e2e2e2;color:#666;line-height: 1.9;}
-.panel-box-sizing{-moz-box-sizing: border-box;  /*Firefox3.5+*/-webkit-box-sizing: border-box; /*Safari3.2+*/-o-box-sizing: border-box; /*Opera9.6*/-ms-box-sizing: border-box; /*IE8*/box-sizing: border-box; }
-input.panel-form-width-690{ padding:5px;width:90%; height:40px; min-width:700px;}
-input.panel-form-width-200{ padding:5px; height:40px; width:200px;}
-input.panel-form-width-100{ padding:5px;width:100%; height:40px; min-width:700px;}
-textarea.panel-form-width-100{ padding:5px;width:100%; height:150px; min-width:700px;}
-textarea.panel-form-width-40{ padding:5px;width:100%; height: 40px; min-width:700px;}
-textarea.panel-form-width-690{ padding:5px;width:90%; height:150px; min-width:700px;}
-textarea.panel-form-width2-100{ padding:5px;width:100%; height:40px; min-width:700px;}
-textarea.panel-form-width2-690{ padding:5px;width:90%; height:40px; min-width:700px;}
-textarea.panel-form-width2-695{ padding:5px;width:95%; height:40px; min-width:700px;}
-.panel-form-width-670{ width: 670px; padding:5px;}
-.panel-form-height-150{ height: 150px;}
-.panel-form-height-30{height: 30px;}
-.task-bg-grey{ background:#f3f3f3!important; width:90%; min-width:700px; padding:10px; border:1px solid #f3f3f3;}
-.task-bg-grey-ligh{line-height: 1.9;padding:5px 10px;}
-.task-bg-grey li{ margin-bottom: 0}
-.task-bd-grey{width:680px; padding:10 0px;}
-.panel-form-width-690{ padding:5px;width:90%; min-height:40px; min-width:700px;}
-input.task-tag-input{ border:none; background: none; height:30px; padding:0 5px; color:#888; line-height: 30px;}
-textarea.task-textarea-pd{ padding-bottom: 0; padding-top:0;}
-.task-setting-tab{ min-height:600px;}
-.task-pd15-box{ padding:15px;}
-.mb20{margin-bottom: 20px;}
-input.knowledge_frame{height:28px;line-height:28px;border:none;background:#f3f5f7;}
-/* TPi全屏展示css */
-.content-all-fix{  position: absolute; top:75px; left:15px; right:15px; z-index:99; height: 91%; width: 98.5%;}
-.content-all-fix .big-tab-info-inner{ display: block; height:50%; overflow:auto; margin:15px 0 0px 15px; }
-.content-half-fix{ min-width:450px; margin:0; position: absolute; top:75px; left:15px; z-index:99;}
-.content-half-fix .content-history-inner{height:100%; overflow:auto; }
-.content-half-fix02{margin:0; position: absolute; top:65px; z-index:99; right:45px;}
-.content-history-extend{ height: 98%;overflow:auto;}
-.task-bg-grey .prettyprint{font-size: 9pt;font-family: Courier New,Arial;border: 1px solid #ddd;border-left: 5px solid #6CE26C;background: #f6f6f6;padding: 5px;}
-/* 左右版TPI 20170410byLB */
-#game_task_pass img{cursor: pointer}
-.-fit { position: absolute; top: 0;  right: 0;  bottom: 0;  left: 0;}
-.-layout-v { display: flex; flex-direction: column;box-flex-direction: column;-webkit-flex-direction: column;}
-.page--header { position: fixed;top: 0; left:80px; right: 0; z-index: 7000;background:#33485F; height:44px; padding:10px 0; color:#fff;}
-.page--leftnav{position: fixed;top:0; left:0; right: 0; z-index: 9001;width:80px; height:100%;background:#282c37;}
-.page--body { position: relative;}
-.-margin-t-64 { margin-top: 64px;}
-.-flex { box-flex:1;flex:1;-webkit-flex:1;}
-/*.-flex-auto{flex-basis:100%;}*/
-.split-panel.-fit {position: absolute;}
-.split-panel { position: relative;  overflow: hidden;  min-height: 200px; height: 100%;}
-.-stretch { align-items: stretch;}
-.-layout { display: flex;}
-.split-panel--first { overflow: hidden;}
-.-relative { position: relative;}
-.-bg-white { background-color: #eee;}
-.split-panel.-handle .split-panel--second { padding-left: 2px;}
-/* .split-panel--second { overflow: hidden;} */
-.task-answer-view { position: absolute; top: 0; right: 0; bottom: 0;left: 0; display: flex;
-    flex-direction: column; border-top: 1px solid #515151;}
-.-vertical { flex-direction: column;box-flex-direction: column;-webkit-flex-direction: column;}
-.-layout-h { display: flex;flex-direction: row;box-flex-direction: row;-webkit-flex-direction: row;}
-.-horizontal {flex-direction: row-reverse;box-flex-direction: row-reverse;-webkit-flex-direction: row-reverse;}
-.-scroll{ overflow:auto;}
-.-flex-basic0{flex-basis: 0%!important;box-flex-basis: 0%!important;-webkit-flex-basis: 0%!important; display: none}
-/*王昌------------拖拽增加样式---------------修改*/
-.-flex-basic40{width:40%;box-flex:auto;flex:auto;-webkit-flex:auto;}
-.-flex-basic50{width:60%;box-flex:auto;flex:auto;-webkit-flex:auto;}
-.b-label{width:4px;cursor:ew-resize;background:#2b2b2b;}
-.h-center{height:4px;cursor:ns-resize;background:#333;}
-.-changebg{height:3px;}
-.-brother{width:100%;height:100%;position:absolute;left:0;top:0;z-index:999;}
-.-bg-weightblack{background:#000;}
-.-flex-basic70{box-flex:4 9 auto;flex:4 9 auto;-webkit-flex:4 9 auto;height:70%;}
-/*---------------------------------------------*/
-.-flex-basic60{box-flex:2 1 auto;flex:2 1 auto;-webkit-flex:2 1 auto;height:30%;}
-.-flex-basic100{flex-basis: 100%!important;box-flex-basis: 100%!important;-webkit-flex-basis: 100%!important;}
-.-header-title{ max-width:500px; font-weight: normal;}
-.-header-right{ background:#333;border-radius:25px; padding:5px 15px; height: 30px; position: absolute; right:10px;line-height: 30px;}
-.-header-right-info{ padding:10px; background:#fff; border-radius:3px; top:50px; right:10px;   position: relative;display:none;color:#666;}
-.-header-right-info font { border: 1px solid #dddddd; display: block;border-width: 8px;  position: absolute;  top: -15px;right:20px;border-style: solid; border-color: transparent transparent #fff transparent;  font-size: 0; line-height: 0;}
-.-header-right-box:hover .-header-right-info{ display: block;}
-.-task-bar-bg{ width: 160px; height:15px; border-radius:15px; background:#ff9932; color:#fff; font-size: 12px; line-height: 15px; text-align: right; position: relative; padding-right:10px;}
-.-task-bar-inner{background:#ffc100; display: block; height: 15px;border-radius:15px; position: absolute; top:0; left:0;}
-.-task-widht-10{ width: 10%;}
-.-task-widht-20{ width: 20%;}
-.-task-widht-30{ width: 30%;}
-.-task-widht-40{ width: 40%;}
-.-task-widht-50{ width: 50%;}
-.-task-widht-60{ width: 60%;}
-.-task-widht-70{ width: 70%;}
-.-task-widht-80{ width: 80%;}
-.-task-widht-90{ width: 90%;}
-.-task-widht-100{ width: 100%;}
-.-footer-left{min-height:48px;background:#f5f5f5;}
-.-footer-left ul {width: 100%}
-.-footer-left ul li{ cursor: pointer; color:#666;}
-.-footer-left ul li:hover{ color:#888;}
-.-bg-black{ background:#2b2b2b; color:#f4f1ed;}
-.-bg-darkblack{background:#1D1D1D; color: #fff;}
-.task-answer-view{ border-top:1px solid #515151; background:#333;}
-#blacktab_nav {height:40px;background:#292929; }
-#blacktab_nav li {float:left; padding:0px 50px;text-align:center;height: 40px;line-height: 40px;  }
-#blacktab_nav .add-webssh{position:relative;}
-#blacktab_nav .add-webssh span{position:absolute;top:0;right:5px;color:#fff;cursor:pointer;}
-#blacktab_nav li a{font-size:14px; }
-#blacktab_nav li.code-file-tab{padding: 0px;width: 120px;box-sizing: border-box;padding: 0px 15px;}
-.code-flie-list{display:none;position: absolute;z-index: 5;top:40px;background: #515151;width: 300px;left: 0px;color: #fff;}
-.blue-line{border-left: 3px solid #199ED8!important;padding-left: 5px;}
-.codefile-all{max-height: 122px;overflow-y: auto;overflow-x: hidden;}
-.codefile-all p{text-align: left;cursor: pointer;height: 22px;line-height: 22px;margin-bottom: 3px;padding-left: 5px;border-left: 3px solid #515151;width: 273px;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;}
-.codefile-all p:hover{background: #CCCCCC;color: #333;}
-
-.blacktab_hover { background: #333;}
-.blacktab_hover a{ color:#fff; }
-.-task-ces-top{ padding:5px 15px; background:#515151; color:#bfbfbf;}
-.-task-ces-info-left{ display: inline-block; width:100px; text-align: right; }
-.-position-a-r15{ position: absolute; top:5px; right:15px;}
-.-task-ml80{ margin-left: 80px;}
-.page--over { position: fixed;top: 0; left:80px; right: 0; z-index:8000; height:100%; color:#fff;}
-.-task-list-header{  border-bottom:1px solid #eee; padding:5px 15px; color:#898989; font-size: 14px; font-weight: normal;}
-.-task-list-header h3{ font-weight: normal; font-size:16px; color:#333;}
-.-task-list-inner{ background:#EFF2F7; margin:10px; padding:5px;}
-.-task-list-title{ font-size: 14px; color: #666;word-wrap: break-word; font-weight: normal; max-width: 80%;}
-.greytab-inner{ background:#fff; }
-.blacktab-inner{ background:#333;}
-.task-padding16{ padding:16px;}
-.task-padding10{ padding:10px;}
-.task-padding-new{ padding-top: 16px}
-/* TPM统计 20170321byLB */
-.panel-warp-3{ width: 30%; background:#23b181; color:#fff; margin:2.5%; margin-right:0; position: relative; }
-.panel-warp-3-over{ background:#fff;opacity:0.8; color:#29bd8b; width: 100%; height:135px; position: absolute; top:0; left:0;  text-align: center; padding-top:130px;}
-.panel-warp-3-over a{color:#29bd8b; font-size: 18px; text-align:center; font-weight: bold;}
-.panel-warp-img{width: 30px; height: 30px; border-radius:100px;}
-.panel-warp-name{ display:block; max-width:100px;}
-.panel-warp-inner{ padding:15px;}
-.panel-warp-dbg{ background:#29bd8b; padding:15px; height:120px;}
-.panel-warp-dbg li{ margin-bottom:15px; }
-.panel-warp-dbg li:last-child{ margin-bottom:0;}
-.fa-icons-trophy{ position:relative; padding-top:10px;}
-.fa-icons-trophy span{ position:absolute; top:12px; right:10px; color:#f04b27; font-size:14px; font-weight: bold;}
-.fa-icons-flower{ display: inline-block; width: 14px; height: 14px; background:url("../images/task/icons-flower.png") 0 0 no-repeat;}
-.fa-icons-flower:hover{display:inline-block; width: 14px; height: 14px;background:url("../images/task/icons-flower.png") -18px 0 no-repeat;}
-/* 实训首页 20170330byLB */
-.task-index{ width: 1200px; margin:0 auto;}
-.task-index-head{     box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.15); }
-/*.task-index-head-top{background-image: linear-gradient(to right, rgb(106, 177, 216) 0%, rgb(1, 74, 78) 100%);background-color: rgb(1, 70, 74); padding:30px;}*/
-
-/*background: linear-gradient(to right, rgb(104, 177, 215) 0%, rgb(1,75,79) 100%);*/
-/*background: linear-gradient(to right,#5DDAE4,#23ADC9);*/
-.task-index-head-top{ padding:30px;background:#FCA24B;background: linear-gradient(to right, rgb(104, 177, 215) 0%, rgb(1,75,79) 100%);}
-
-/*.task-index-head-top{ padding:30px;background:#FFA65E;}*/
-.top-xz{position: absolute;border:14px solid #FFFFFF;border-radius: 50%;box-shadow: 0px 2px 10px rgba(142,142,142,0.6);
-    opacity: 0.4;}
-
-.task-index-head-top-course{padding:30px;background:linear-gradient(to right, rgb(69, 191, 165) 0%, rgb(164, 175, 247) 100%);}
-/*linear-gradient(to right, rgb(69, 191, 165) 0%, rgb(164, 175, 247) 100%);*/
-.task-inde-head-title{ color:#fff; }
-.task-index-head-info{ background:#fff; padding:10px 30px;}
-.task-index-head-info li{ width:100px; float: left; text-align: center;  color:#666;}
-
-.task-index-list{ width: 1200px;}
-
-
-.task-index-list-box{box-sizing:border-box; width:23.87%;margin: 0 1.5% 30px 0px; border-radius:2px;border:1px solid #eee; box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.15); color:#666; position:relative; }
-.task-index-list-box:hover{-webkit-animation: bounce-down 1s linear 1;animation: bounce-down 1s linear 1; }
-.task-index-list-box:hover .black-half{display: block;}
-.task-index-list-box:nth-child(4n+0) {margin: 0 0 30px 0;}
-.task-mg8{ margin:0 15px 15px 0px; border-radius:2px; border:1px solid #eee;    box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.15); color:#666; position:relative; }
-.task-index-list-box-top{padding:16px; padding-top:30px; background:#fff; text-align: center; position:relative; height: 160px;}
-.task-index-list-title{ max-width:80%; display: block; margin:10px auto 0px; font-size:14px; font-weight: bold;}
-.task-index-list-user{padding:5px 10px; border-radius:25px;background: #F5F6F7; margin:0px auto 20px; display: inline-block;}
-.task-index-list-box-bottom{ background: #F5F6F7; color:#666; padding:10px 10%; text-align: center;}
-.task-index-list-box-bottom li{ display: inline; margin: 0 5px;}
-.task-index-list-box-bottom2{ background: #fff; color:#666; padding:10px 10%; text-align: center;}
-.task-index-list-box-bottom2 li{ display: inline; margin: 0 5px;}
-.task-vip{ position: absolute; right:15px; top:15px;}
-@-webkit-keyframes bounce-down {
-    25% {-webkit-transform: translateY(-10px);}
-    50%, 100% {-webkit-transform: translateY(0);}
-}
-
-@keyframes bounce-down {
-    25% {transform: translateY(-10px);}
-    50%, 100% {transform: translateY(0);}
-}
-.task-index-list-hover{ position:absolute; top:0; left:0; color:#fff;  width: 100%; height: 100%; border-radius:2px 2px 0 0; }
-.task-index-list-hover p{ margin:15px;overflow:hidden; text-align: left; height: 85%;}
-.task-index-list-hover{ display: none; }
-.task-mg8:hover .task-index-list-hover{display: block;}
-.task-mg8:hover{ box-shadow: 0 5px 15px 0 rgba(0, 0, 0, 0.15);cursor: pointer;}
-.task-dropdown{}
-.task-dropdown-menu{ min-width: 100px; border: 1px solid rgba(0,0,0,.05);box-shadow: 0 6px 12px rgba(0,0,0,.15);}
-.task-dropdown-menu li a{ color:#666; }
-/* 伸展型搜索 20170330byLB */
-.search-wrapper {position: absolute; font-size:14px; }
-.search-wrapper .input-holder { overflow: hidden; height: 30px;  position: relative; width:32px;background: none;}
-.search-wrapper.active .input-holder { width:320px; border:none; border-bottom:2px solid #ccc;  }
-.search-wrapper .input-holder .search-input { width:100%; height: 30px; font-size:14px;   position: absolute; top:0px; left:0; border:none;   opacity: 0; }
-.search-wrapper.active .input-holder .search-input {  opacity: 1; outline:none; background: none;}
-.search-wrapper .search-icon { width:20px;  height:20px;  border:none;  padding:0px;  outline:none;  position: relative;  z-index: 2;  float:right;  cursor: pointer; background: none; color: #666; top:2px;}
-.search-wrapper .close { position: absolute; z-index: 1;  top:2px; right:20px; width:25px; height:25px; cursor: pointer; opacity: 0;color: #666;}
-.search-wrapper.active .close {right:-35px; opacity: 1;}
-a.sortArrowActiveD {background:url(../images/post_image_list.png) -0px -20px no-repeat; width:7px; height:9px; float:left; margin-top: 10px;margin-left: 5px;}
-a.sortArrowActiveU {background:url(../images/post_image_list.png) -17px -20px no-repeat; width:7px; height:9px; float:left; margin-left:5px; margin-top:10px;}
-.postSort {width:75px; float:right}
-.shixunPostSort {width:60px; float:right}
-.remove_li li{ list-style-type: none!important;}
-
-a.shixun-task-btn { display: inline-block;font-weight: bold;border: none;padding: 0 12px;color: #666;letter-spacing: 1px;text-align: center;font-size: 14px;height: 30px;line-height: 30px;border-radius: 3px; }
-a.shixun-task-ban-btn{background-color: #c2c4c6;display: inline-block;font-weight: bold;border: none;padding: 0 12px;color: #666;letter-spacing: 1px;text-align: center;font-size: 14px;height: 30px;line-height: 30px;border-radius: 3px;  cursor: default;}
-.shixun-panel-list > div:nth-child(odd){ background:#f9f9f9; }
-.shixun-panel-list > div:nth-child(even){ background:#fff; }
-.shixun-panel-list {background: #fff; margin: 0 1px;}
-.shixun-panel-inner { background: #EFF2F7; padding: 15px; height: 70px;}
-.challange_operate{display: none}
-.shixun-panel-inner:hover .challange_operate{display: block}
-.shixun_title {color: #333;font-size: 16px;}
-.g_frame{border: 1px solid #29bd8b;color: #29bd8b;padding:0 5px;border-radius: 3px;text-align:center;}
-.loading-center{text-align: center; align-items: center;justify-content: center;}
-.center{vertical-align: middle;text-align: center; }
-.itoblock_w150{ display: block; float:left; width:150px }
-.itoblock_w75{ display: block; float:left; width:75px }
-
-/*实训--技能勋章*/
-.modal-list li{float: left;padding: 0px 15px;background:#ff7500;color: #ffffff;border-radius: 4px;margin-right: 10px}
-.modal-list li:before{content: '●';color: #FFFFFF;margin-right: 5px;font-size: 14px}
-.modal-list span{width: 8px;height: 8px;border-radius: 50%;background: #ffffff;display: block;float: left;margin-right: 5px;margin-top:10px;}
-
-/* 合作者 20170516byLB */
-.task-partner-list{ padding:15px; border-bottom:1px solid #eee;}
-.task-width33{ width:33.3%;}
-
-.read_only{ -moz-user-select: none; -webkit-user-select: none; }
-
-.task-form-28{width: 28%;padding:0px 10px}
-
-
-/* 实训首页的搜索 */
-.xy_box{padding:16px;height:180px}
-.task_yx_bo{margin: 0px auto 13px;}
-.course-nav-box{padding:0px 10px;margin:30px 0px}
-.xy_level{width: 80%;margin: 0px auto;border-top: 1px solid #eee;margin-top: 5px;line-height: 35px;}
-.course-nav-row{padding:7px 0px}
-.course-nav-row_item li{width:auto;height: 30px;line-height: 30px;margin: 5px;padding:0px 15px;}
-.course-nav-row_item label{cursor: pointer;}
-.check_item{height:40px;line-height: 40px;padding: 0px 15px;}
-.more_check{position: absolute;bottom: 5px;right: 10px;cursor: pointer;}
-
-
-.bottomdashed1{border-bottom: 1px dashed #eeeeee;}
-
-/*更多和收起*/
-.two_line_lesson{height: 80px;overflow: hidden;}
-.more_line_lesson{max-height: 200px;display: block;}
-.scroll_lesson{overflow-x: hidden;overflow-y: scroll;}
-
-.searchFor{width:auto;}
-.searchFor .searchCon{width:250px;border-bottom:1px solid #cccccc;float: left;height: 30px;}
-.searchFor .searchCon input{border: none;outline: none;height: 29px;width:91%;}
-.searchFor .searchImg{margin:5px 10px 0px 0px;cursor: pointer;}
-.searchFor .search_close{font-size: 18px;float: right;color: #666;height: 29px;line-height: 29px;cursor: pointer;}
-
-.tab_color{color: #bfbfbf!important;}
-
-/*_game_show.html.erb页面新增的一个tab*/
-.comments_item_content img{border-radius: 50%;margin-right: 5px}
-.comment_item_one{flex: 1;}
-.comment_item_bottom{border-bottom: 1px solid #efefef;display: flex}
-.comment_item_top{border-top: 1px solid #efefef}
-.comment_item_left_green{border-left: 3px solid #29bd8b}
-.return_item{height: 20px;line-height: 20px;margin-top: 5px;}
-.comment-input{width: 100%;margin: 10px;margin-right: 17px;}
-.comment-input textarea{border: none !important;width:100%; outline: none;height: 30px;border-radius: 4px;padding-left: 5px;float:left}
-.comment_position{ position: absolute;bottom: 8px;right: 20px}
-
-/*-------新建阶段添加选项部分----------*/
-.option-item{border:1px solid #e2e2e2;}
-.option-item,.add-option-item{display: block;width: 38px;height: 38px;text-align: center;line-height: 38px;border-radius: 4px}
-.check-option-bg{background: #FF7500;color: #ffffff!important;border: 1px solid #FF7500}
-.add-option-input{padding: 5px;width: 90%;height: 40px;min-width: 700px;}
-.add-option-input a{display: block;width: 100%;height: 100%;cursor: pointer}
-.position-delete{position: absolute;right: -22px;top: 12px;cursor: pointer}
-
-/*--------TPI的答案选项卡------*/
-.quiz-task-options:not(.-compact) {padding:10px;}
-.card {position: relative;border-radius: 2px;overflow: hidden;}
-/*.card:hover{background: #3f3f3f;}*/
-.card-check{background: #3498db!important;}
-.-justify {justify-content: space-between;}
-.-center { align-items: center;min-height: 66px;}
-.markdown {letter-spacing: 0;line-height: 1.6;word-wrap: break-word;word-break: break-word;}
-.markdown code {padding:0;line-height: 23px;margin: 0;font-family: "微软雅黑","宋体";}
-
-
-/*模拟实战---加载等待*/
-.loading_all{background:#ffffff;z-index: 100000;width: 100%;height: 100%;position: fixed;left: 0px;top:0px;text-align: center;}
-.loading_main img{border-radius: 4px;}
-.loading_main span{font-size: 44px;font-weight: bold;color: #ff7500;letter-spacing: 5px;margin-left: 5px;}
-.load{width: auto;top:50%;margin-top:-100px;position: relative;}
-.loading_seconde{color: #ff7500;letter-spacing: 3px;font-size: 16px;}
-#ajax-indicator-base {
-    position: absolute; /* fixed not supported by IE*//*
-
-    top: 50%;
-    left: 50%;
-    margin-left: -20px;
-    margin-top: -40px;
-    width: 20%;
-    height: 5%; */
-    width: 100%;
-    height: 100%;
-    font-weight:bold;
-    text-align:center;
-    /*padding:0.6em;*/
-    z-index:9999;
-    background: rgba(225,225,225,0);
-}
-html>body #ajax-indicator-base { position: fixed; }
-
-#ajax-indicator-base embed{
-    position: relative;
-    top: 40%;
-    width: 40px;
-    height: 40px;
-    margin-left: -40px;
-    left: 50%;
-}
-/*#ajax-indicator-base span{
-    color:#fff;
-    background-position: 0% 40%;
-    background-repeat: no-repeat;
-    *//*background-image: url(/images/loading.gif);*//*
-    padding-left: 26px;
-    vertical-align: bottom;
-    z-index:999;
-}*/
-
-.save-tip{display:none;position: fixed;top:0px;left: 0px;width: 100%;height: 100%;}
-.save-tip-content{position: absolute;top:50%;left: 50%;margin-left: -36px;margin-top:-19px;background: rgba(0,0,0,0.7);color:#fff;padding:5px 15px;border-radius: 4px}
-.empty{background: #494A4C;display: inline; margin: 0 2px; padding: 0 3px;}
-.tab-key{background: #494A4C;display: inline; margin: 0 2px; padding: 0 6px;}
-
-/*二次回复的提示语的样式*/
-.points-data-tip-top{position:absolute;left:100px;top:-30px;opacity:.7;width:150px;height:30px;z-index:9999;display:none;}
-.data-tip-top1{position:relative;box-shadow:0px 0px 8px #000;background:#000;color:#fff;word-wrap: break-word;
-    text-align:center;border-radius:4px;padding:0 10px;border:1px solid #000;}
-.data-tip-top1:after,.data-tip-top1:before{position: absolute;content:'';width:0;height:0;left: 45%;bottom:-10px;border-left: 5px solid transparent;
-    border-right: 5px solid transparent;border-top: 10px solid #000;}
-.data-tip-top1:before{bottom:-11px;}
-/*选择题tab切换*/
-.nav_option li{overflow: hidden;width: 110px; text-align: center;cursor: pointer;height: 38px;line-height: 38px;border-top-right-radius: 5px;border-top-left-radius: 5px;border:1px solid #e2e2e2;border-bottom: 0px;color: #FF7500;border-right: none;}
-.nav_option li:last-child{border-right: 1px solid #e2e2e2;}
-.nav_option li a{width: 100%;height: 100%;display: block;}
-
-/*---------------------试卷----------------------*/
-.question_item_con{font-weight: normal!important;border:1px solid #EEEEEE!important;color: #333!important;background: #FFFFff!important;position: relative}
-.exam_operator{cursor: pointer;position: absolute;right: 15px;top: 11px;}
-.question_item_con .write_answer{border-top:1px solid #EEEEEE;background:#EFF9FD;padding: 10px 15px;text-align:justify;}
-.add_item_part{width: auto;padding: 2px 20px;border: 1px solid #ff7500;border-radius: 3px;margin-left: 15px;cursor: pointer;color: #ff7500!important;}
-.add_item_part:hover{color:#fff!important;background-color: #ff7500}
-
-/*作业问答*/
-.work_search_ul{border: 1px solid #EEEEEE;border-radius: 4px;}
-.work_search_ul li span{display:block;float: left;height: 38px;line-height: 38px}
-.work_search_ul li{border-bottom: 1px dashed #EEEEEE;}
-.work_search_ul li:last-child{border-bottom: none}
-.work_search_ul .magic-radio + label,.work_search_ul .magic-checkbox + label{top:5px}
-
-/*更新提示*/
-.update_back_main{display: none;position: fixed;left: 0px;top:0px;background: rgba(0,0,0,0.3);width: 100%;z-index: 7001;height: 100%;}
-.tip-panel-animate-left{position: absolute;z-index: 9000;left: 80px;top:290px;background: #FFFFff;width: 430px;height: 140px;border-radius: 3px;}
-.tip-panel-animate{position: absolute;z-index: 10001;right: 4px;top:40px;background: #FFFFff;width: 430px;height: 140px;border-radius: 3px;display: none}
-.tip-panel-animate .tip-img,.tip-panel-animate-left .tip-img{width: 130px;text-align: center;background-color: #E8E9ED;height: 100%;}
-.tip-panel-animate .tip-img img,.tip-panel-animate-left .tip-img img{width: 70px;height: 70px;margin: 35px 30px;}
-.tip-right-con{width: 69.7%;height: 100%;}
-.tip-operator-btn{width:100%;border-top: 1px solid #eee;height: 40px;position: absolute;right: 0px;bottom: 0px;text-align: center;}
-.tip-operator-btn a,.tip-operator-btn span{height: 100%;text-align: center;line-height: 40px;width: 50%}
-.tip-operator-btn a:hover,.tip-operator-btn span:hover{background-color:#f9f9f9}
-.tip-operator-btn a:first-child,.tip-operator-btn span:first-child{border-right: 1px solid #eee;width: 49.5%}
-.animate-tip{animation:rightToleft 1s;}
-.animate-tip-hide{animation:leftToright 1s;}
-@keyframes rightToleft
-{
-    from {right: -400px;}
-    to {right: 4px;}
-}
-@keyframes leftToright
-{
-    from {right: 4px;}
-    to {right: -420px;}
-}
-.animate-tip-l{animation:rightToleft-l 1s;}
-.animate-tip-hide-l{animation:leftToright-l 1s;}
-@keyframes rightToleft-l
-{
-    from {left: -400px;}
-    to {left: 80px;}
-}
-@keyframes leftToright-l
-{
-    from {left: 80px;}
-    to {left: -420px;}
-}
-
-
-/*----------实训TPI图片查看效果--------------*/
-.photo_display{box-sizing: border-box;width: 100%;position: fixed;top: 0px;left: 0px;padding-top: 64px;padding-left: 80px;background: rgba(0,0,0,0);height: 100%;z-index: 100}
-.photo_display .task-popup{width: 100%!important;height: 100%!important;}
-#picture-content img{max-width: 100%;height: 400px;display: block; margin:0px auto;margin-bottom: 20px;}
-#box-img{width:100%;height:100%;display:table;text-align:center;background:#fff;}
-#box-img span{display:table-cell;vertical-align:middle;}
-
-/*-------------学员统计  通关排行榜------------*/
-.rankings_num{position: absolute;width: 100%;top: 3px;height: 15px;line-height: 15px;left: 0px;font-size: 12px;color: #F24B27;text-align: center}
-
-.census_main{width: 1086px;overflow: hidden;position: relative;min-height: 350px;margin:0px 45px;}
-.census_main ul{position: absolute;min-width: 1086px;}
-.census_main ul>li{float:left;width: 260px;margin:6px 6px;min-height: 335px}
-.census_main ul>li:nth-child(4n){margin-right: 0px;}
-.part_main{border-radius: 5px;background: #FFFFff;border:1px solid #EEEEEE}
-.part_main .part_top{background: #FF9E6A;color: #FFFFff;padding: 10px 15px;border-radius: 5px 5px 0px 0px;}
-.wipe{display: none;cursor: pointer;line-height: 332px;color:#FFFFff!important;font-size:16px ;width: 100%;position: absolute;left: 0px;top:0px;background:rgba(0,0,0,0.3);height: 100%;z-index: 3;text-align: center;border-radius: 5px; }
-.part_main:hover .wipe{display: block;}
-
-
-#census_left,#census_right{display: none;position: absolute;cursor: pointer;background: #FCF2EC;padding: 10px 5px;width: 35px;box-sizing: border-box;top:122.5px;text-align: center}
-#census_left i,#census_right i{color:#FBBD81;}
-
-
-/*-----------实训配置、评测脚本-------------*/
-.edit_script_text .test_script_text{word-break: break-all;background-color: #f7f7f7;}
-.edit_script_text .CodeMirror-lines{padding: 0px!important;padding-bottom: 4px}

public/index.html

@@ -1,213 +1,53 @@
 <!DOCTYPE html>
 <html lang="en">
-  <head>
 
-    <meta charset="utf-8">
-      <!--<meta http-equiv="Content-Security-Policy" content="upgrade-insecure-requests">-->
-    <meta name="viewport" content="width=device-width, initial-scale=1">
+<head>
 
-      <!-- width=device-width, initial-scale=1 , shrink-to-fit=no -->
-    <!-- <meta name="viewport" content=""> -->
-    <meta name=”Keywords” Content=”EduCoder,信息技术实践教学,精品课程网,慕课MOOC″>
-    <meta name=”Keywords” Content=”实践课程,项目实战,java实训,python实战,人工智能技术,后端开发学习,移动开发入门″>
-    <meta name=”Keywords” Content=”翻转课堂,高效课堂创建,教学模式″>
-    <meta name=”Keywords” Content=”实训项目,python教程,C语言入门,java书,php后端开发,app前端开发,数据库技术″>
-    <meta name=”Keywords” Content=”在线竞赛,计算机应用大赛,编程大赛,大学生计算机设计大赛,全国高校绿色计算机大赛″>
-    <meta name=”Description” Content=”EduCoder是信息技术类实践教学平台。EduCoder涵盖了计算机、大数据、云计算、人工智能、软件工程、物联网等专业课程。超10000个实训案例及22000个技能评测点，建立学、练、评、测一体化实验环境。”>
-    <meta name=”Description” Content=”EduCoder实践课程，旨在于通过企业级实战实训案例，帮助众多程序员提升各项业务能力。解决学生、学员、企业员工等程序设计能力、算法设计能力、问题求解能力、应用开发能力、系统运维能力等。”>
-    <meta name=”Description” Content=”EduCoder翻转课堂教学模式，颠覆了传统教学模式，让教师与学生的关系由“权威”变成了“伙伴”。将学习的主动权转交给学生，使学生可个性化化学，学生的学习主体得到了彰显。”>
-    <meta name=”Description” Content=”EduCoder实训项目为单个知识点关卡实践训练，帮助学生巩固单一弱点，强化学习。 ”>
-    <meta name=”Description” Content=”EduCoder实践教学平台，各类大赛为进一步提高各类学生综合运用高级语言程序设计能力，培养创新意识和实践探索精神，发掘优秀软件人才。 ”>
-<!--    <meta name="viewport" id="viewport" content="width=device-width, initial-scale=0.3, maximum-scale=0.3, user-scalable=no">-->
-    <meta name="viewport" id="viewport" content="width=device-width, initial-scale=0.3, maximum-scale=0.3">
+  <meta charset="utf-8">
+  <meta name=”Keywords” Content=”EduCoder,信息技术实践教学,精品课程网,慕课MOOC″>
+  <meta name=”Keywords” Content=”实践课程,项目实战,java实训,python实战,人工智能技术,后端开发学习,移动开发入门″>
+  <meta name=”Keywords” Content=”翻转课堂,高效课堂创建,教学模式″>
+  <meta name=”Keywords” Content=”实训项目,python教程,C语言入门,java书,php后端开发,app前端开发,数据库技术″>
+  <meta name=”Keywords” Content=”在线竞赛,计算机应用大赛,编程大赛,大学生计算机设计大赛,全国高校绿色计算机大赛″>
+  <meta name=”Description”
+    Content=”EduCoder是信息技术类实践教学平台。EduCoder涵盖了计算机、大数据、云计算、人工智能、软件工程、物联网等专业课程。超10000个实训案例及22000个技能评测点，建立学、练、评、测一体化实验环境。”>
+  <meta name=”Description”
+    Content=”EduCoder实践课程，旨在于通过企业级实战实训案例，帮助众多程序员提升各项业务能力。解决学生、学员、企业员工等程序设计能力、算法设计能力、问题求解能力、应用开发能力、系统运维能力等。”>
+  <meta name=”Description”
+    Content=”EduCoder翻转课堂教学模式，颠覆了传统教学模式，让教师与学生的关系由“权威”变成了“伙伴”。将学习的主动权转交给学生，使学生可个性化化学，学生的学习主体得到了彰显。”>
+  <meta name=”Description” Content=”EduCoder实训项目为单个知识点关卡实践训练，帮助学生巩固单一弱点，强化学习。 ”>
+  <meta name=”Description” Content=”EduCoder实践教学平台，各类大赛为进一步提高各类学生综合运用高级语言程序设计能力，培养创新意识和实践探索精神，发掘优秀软件人才。 ”>
+  <meta name="theme-color" content="#000000">
+  <link rel="manifest" href="%PUBLIC_URL%/manifest.json">
 
-    <meta name="theme-color" content="#000000">
-    <!--<meta http-equiv="cache-control" content="no-cache,no-store, must-revalidate" />-->
-    <!--<meta http-equiv="pragma" content="no-cache" />-->
-    <!--<meta http-equiv="Expires" content="0" />-->
+  <script type="text/javascript">
+    window.__isR = true;
+    if (
+      (navigator.userAgent.indexOf('MSIE 9') != -1
+        || navigator.userAgent.indexOf('MSIE 10') != -1)
+      &&
+      location.pathname.indexOf("/compatibility") == -1) {
+      location.href = '/compatibility.html'
+    }
+  </script>
 
-    <link rel="manifest" href="%PUBLIC_URL%/manifest.json">
+  <link rel=" stylesheet" type="text/css" href="%PUBLIC_URL%css/iconfont.css">
+  <link rel=" stylesheet" type="text/css" href="%PUBLIC_URL%css/edu-purge.css">
+  <link rel="stylesheet" type="text/css" href="%PUBLIC_URL%css/editormd.min.css">
+  <link rel="stylesheet" type="text/css" href="%PUBLIC_URL%css/merge.css">
+  <%= htmlWebpackPlugin.tags.headTags %>
+</head>
 
-<!--    <link rel="shortcut icon" href="%PUBLIC_URL%/favicon.ico">-->
-    <!--
-      Notice the use of %PUBLIC_URL% in the tags above.
-      It will be replaced with the URL of the `public` folder during the build.
-      Only files inside the `public` folder can be referenced from the HTML.
+<body>
+  <!--用于markdown转html -->
+  <div id="md_div" style="display: none;"></div>
+  <div id="root" class="page -layout-v -fit widthunit"></div>
+  <div id="picture_display" style="display: none;"></div>
+  <script src="%PUBLIC_URL%js/js_min_all.js"></script>
+  <script src="%PUBLIC_URL%js/codemirror/codemirror.js"></script>
+  <script src="%PUBLIC_URL%js/editormd/editormd.min.js"></script>
+  <script src="%PUBLIC_URL%js/codemirror/merge/merge.js"></script>
+  <%= htmlWebpackPlugin.tags.bodyTags %>
+</body>
 
-      Unlike "/favicon.ico" or "favicon.ico", "%PUBLIC_URL%/favicon.ico" will
-      work correctly both with client-side routing and a non-root public URL.
-      Learn how to configure a non-root public URL by running `npm run build`.
-    -->
-<!--    <title>EduCoder</title>-->
-    <!--react-ssr-head-->
-    <script type="text/javascript">
-
-      window.__isR = true;
-      // 不支持ie9 ie10
-      if (
-          ( navigator.userAgent.indexOf('MSIE 9') != -1
-            || navigator.userAgent.indexOf('MSIE 10') != -1 )
-          &&
-          location.pathname.indexOf("/compatibility") == -1) {
-        debugger;
-        // location.href = './compatibility'
-        location.href = '/compatibility.html'
-      }
-      // const isMobile = (/android|webos|iphone|ipad|ipod|blackberry|iemobile|opera mini/i.test(navigator.userAgent.toLowerCase()));
-      const isWeiXin = (/MicroMessenger/i.test(navigator.userAgent.toLowerCase()));
-      if (isWeiXin) {
-        document.write('<script type="text/javascript" src="/javascripts/wx/jweixin-1.3.0.js"><\/script>');
-      }
-    </script>
-
-    <!-- <link rel="stylesheet" type="text/css" href="/css/edu-common.css">
-    <link rel="stylesheet" type="text/css" href="/css/edu-public.css">
-
-    <link rel="stylesheet" type="text/css" href="/css/taskstyle.css">
-
-    <link rel="stylesheet" type="text/css" href="/css/font-awesome.css">
-
-    <link rel="stylesheet" type="text/css" href="/css/editormd.min.css">
-
-    <link rel="stylesheet" type="text/css" href="/css/merge.css"> -->
-
-    <link rel="stylesheet" type="text/css" href="/css/css_min_all.css">
-
-    <!--<link rel="stylesheet" type="text/css" href="/css/css_min_all.css">-->
-
-    <!--<link rel="stylesheet" type="text/css" href="//at.alicdn.com/t/font_653600_nm6lho7nxxq.css">-->
-
-    <!-- <link href="/react/build/css/iconfont.css" rel="stylesheet" type="text/css"> -->
-
-    <!--<link href="http://47.96.87.25:48080/stylesheets/educoder/edu-all.css" rel="stylesheet" type="text/css">-->
-
-    <!--<link href="https://pandao.github.io/editor.md/examples/css/style.css" rel="stylesheet" type="text/css">-->
-
-    <!--<link href="https://pandao.github.io/editor.md/css/editormd.preview.css" rel="stylesheet" type="text/css">-->
-    <!-- <link href="https://testeduplus2.educoder.net/stylesheets/css/edu-common.css" rel="stylesheet" type="text/css">
-
-    <link href="https://testeduplus2.educoder.net/stylesheets/educoder/edu-main.css" rel="stylesheet" type="text/css">
-    <link href="https://testeduplus2.educoder.net/stylesheets/educoder/antd.min.css" rel="stylesheet" type="text/css"> -->
-
-      <!-- <link rel="stylesheet" type="text/css" href="https://www.educoder.net/stylesheets/css/font-awesome.css?1510652321"> -->
-
-      <!--<link rel="stylesheet" type="text/css" href="http://47.96.87.25:48080/stylesheets/educoder/iconfont/iconfont.css">-->
-
-      <!--需要去build js配置-->
-      <link rel="stylesheet" type="text/css" href="/css/iconfont.css">
-      <link rel="stylesheet" type="text/css" href="https://cdn.bootcss.com/quill/1.3.7/quill.core.min.css">
-    <style>
-        /*<!--去除浏览器点击操作后有蓝色的底块-->*/
-        -moz-user-select: none;
-        -webkit-user-select: none;
-        -ms-user-select: none;
-        user-select: none;
-    </style>
-
-  </head>
-  <body>
-    <noscript>
-      You need to enable JavaScript to run this app.
-    </noscript>
-	<!--用于markdown转html -->
-    <div id="md_div" style="display: none;"></div>
-    <div id="root" class="page -layout-v -fit widthunit">
-      <!--<div class="d2-home">-->
-        <!--<div class="d2-home__main">-->
-          <!--&lt;!&ndash;<img  class="d2-home__loading"&ndash;&gt;-->
-                <!--&lt;!&ndash;src="loading-spin.svg"&ndash;&gt;-->
-                <!--&lt;!&ndash;alt="loading">&ndash;&gt;-->
-          <!--<div class="lds-ripple"><div></div><div></div></div>-->
-          <!--<div class="d2-home__title">-->
-            <!--正在加载资源-->
-          <!--</div>-->
-          <!--<div class="d2-home__sub-title">-->
-            <!--加载资源可能需要较多时间 请耐心等待-->
-          <!--</div>-->
-        <!--</div>-->
-        <!--<div class="d2-home__footer">-->
-          <!--&lt;!&ndash;<a href="www.educoder.net"&ndash;&gt;-->
-             <!--&lt;!&ndash;target="_blank">&ndash;&gt;-->
-        <!--&lt;!&ndash;&ndash;&gt;-->
-          <!--&lt;!&ndash;</a>&ndash;&gt;-->
-          <!--EduCoder-->
-        <!--</div>-->
-      <!--</div>-->
-    </div>
-    <div id="picture_display" style="display: none;"></div>
-    <!-- js css合并  文件优先级的问题 -->
-    <script type="text/javascript" src="/js/js_min_all.js"></script>
-    <!--  <script type="text/javascript" src="/js/js_min_all_2.js"></script> -->
-
-    <!--
-    <script type="text/javascript" src="/js/jquery-1.8.3.min.js"></script>
-
-
-    <script type="text/javascript" src="/js/editormd/underscore.min.js"></script>
-
-    <script type="text/javascript" src="/js/editormd/marked.min.js"></script>
-    <script type="text/javascript" src="/js/editormd/prettify.min.js"></script>
-    <script type="text/javascript" src="/js/editormd/raphael.min.js"></script>
-    <script type="text/javascript" src="/js/editormd/sequence-diagram.min.js"></script>
-
-    <script type="text/javascript" src="/js/editormd/flowchart.min.js"></script>
-    <script type="text/javascript" src="/js/editormd/jquery.flowchart.min.js"></script>
-
-
-
-    <script type="text/javascript" src="/js/editormd/editormd.min.js"></script>
-  -->
-    <!-- codemirror addon -->
-     <!--
-    <script type="text/javascript" src="/js/codemirror/codemirror.js"></script>
-    <script type="text/javascript" src="/js/codemirror/mode/javascript.js"></script>
-
-    <script type="text/javascript" src="/js/diff_match_patch.js"></script>
-
-    <script type="text/javascript" src="/js/merge.js"></script>
-
-    <script type="text/javascript" src="/js/edu_tpi.js"></script>
-    -->
-    <!-- testbdweb.trustie.net testbdweb.educoder.net -->
-
-    <!-- 在tpi js里加载这3个脚本 -->
-    <script>
-      (function() { // Scoping function to avoid globals
-	    var href = location.href;
-        if(window.location.port === "3007"){
-            if (href.indexOf('/tasks/') != -1) {
-                document.write('<script type="text/javascript" src="https://newweb.educoder.net/assets/kindeditor/kindeditor.js"><\/script>');
-                // build.js中会将这个url附加一个前缀 react/build
-                document.write('<script type="text/javascript" src="/js/create_kindeditor.js"><\/script>');
-                document.write('<script type="text/javascript" src="https://newweb.educoder.net/javascripts/educoder/edu_application.js"><\/script>');
-            } else if (href.indexOf('/paths/') != -1) {
-                document.write('<script type="text/javascript" src="https://newweb.educoder.net/javascripts/educoder/edu_application.js"><\/script>');
-
-            }
-        }else{
-            if (href.indexOf('/tasks/') != -1) {
-                document.write('<script type="text/javascript" src="/assets/kindeditor/kindeditor.js"><\/script>');
-                // build.js中会将这个url附加一个前缀 react/build
-                document.write('<script type="text/javascript" src="/js/create_kindeditor.js"><\/script>');
-                document.write('<script type="text/javascript" src="/javascripts/educoder/edu_application.js"><\/script>');
-            } else if (href.indexOf('/paths/') != -1) {
-                document.write('<script type="text/javascript" src="/javascripts/educoder/edu_application.js"><\/script>');
-
-            }
-        }
-
-
-      })();
-    </script>
-    <!-- <script type="text/javascript" src="https://testeduplus2.educoder.net/assets/kindeditor/kindeditor.js"></script>
-    <script type="text/javascript" src="/js/create_kindeditor.js"></script>
-    <script type="text/javascript" src="https://testeduplus2.educoder.net/javascripts/educoder/edu_application.js"></script> -->
-    <script type="text/javascript" src="https://cdn.bootcss.com/quill/1.3.7/quill.core.min.js"></script>
-
-<!--    <script>-->
-<!--      document.body.addEventListener('touchmove', function (e) {-->
-<!--        e.preventDefault(); //阻止默认的处理方式(阻止下拉滑动的效果)-->
-<!--      }, {passive: false});-->
-<!--    </script>-->
-  </body>
-</html>
+</html>

public/js/applications.js

@@ -11267,7 +11267,7 @@ Copyright © 2018 Basecamp, LLC
       type: "GET",
       dataType: "script",
       cache: true,
-      async: false,
+      async: true,
       global: false,
 
       // Only evaluate the response if it is successful (gh-4126)
@@ -17573,7 +17573,7 @@ Copyright © 2018 Basecamp, LLC
 
           var actualPadding = document.body.style.paddingRight;
           var calculatedPadding = $(document.body).css('padding-right');
-          $(document.body).data('padding-right', actualPadding).css('padding-right', parseFloat(calculatedPadding) + this._scrollbarWidth + "px");
+          // $(document.body).data('padding-right', actualPadding).css('padding-right', parseFloat(calculatedPadding) + this._scrollbarWidth + "px");
         }
 
         $(document.body).addClass(ClassName.OPEN);
@@ -17597,9 +17597,9 @@ Copyright © 2018 Basecamp, LLC
           }
         }); // Restore body padding
 
-        var padding = $(document.body).data('padding-right');
-        $(document.body).removeData('padding-right');
-        document.body.style.paddingRight = padding ? padding : '';
+        // var padding = $(document.body).data('padding-right');
+        // $(document.body).removeData('padding-right');
+        // document.body.style.paddingRight = padding ? padding : '';
       };
 
       _proto._getScrollbarWidth = function _getScrollbarWidth() {

public/js/create_kindeditor.js

@@ -1,5 +1,5 @@
 //需求：表情栏可以隐藏显示，高度只要一点高
-function sd_create_editor(params){
+function sd_create_editor(params) {
     // var minHeight;  //最小高度
     var paramsHeight = params.height; //设定的高度
     var id = arguments[1] ? arguments[1] : undefined;
@@ -7,40 +7,40 @@ function sd_create_editor(params){
     var paramsWidth = params.width == undefined ? "100%" : params.width;
 
     var editor = params.kindutil.create(params.textarea, {
-        resizeType : 1,minWidth:"1px",width:"94%",
-        height:"33px",// == undefined ? "30px":paramsHeight+"px",
-        minHeight:"33px",// == undefined ? "30px":paramsHeight+"px",
-        width:params.width,
+        resizeType: 1, minWidth: "1px", width: "94%",
+        height: "33px",// == undefined ? "30px":paramsHeight+"px",
+        minHeight: "33px",// == undefined ? "30px":paramsHeight+"px",
+        width: params.width,
         /*
         items:['emoticons','fontname',
             'forecolor', 'hilitecolor', 'bold', '|', 'justifyleft', 'justifycenter', 'insertorderedlist','insertunorderedlist', '|',
             'formatblock', 'fontsize', '|','indent', 'outdent',
             '|','imagedirectupload','more'],*/
-        items : ['code','emoticons','fontname',
-            'forecolor', 'hilitecolor', 'bold', '|', 'justifyleft', 'justifycenter', 'insertorderedlist','insertunorderedlist', '|',
-            'formatblock', 'fontsize', '|','indent', 'outdent',
-            '|','imagedirectupload','table',   'media', 'preview',"more"
+        items: ['code', 'emoticons', 'fontname',
+            'forecolor', 'hilitecolor', 'bold', '|', 'justifyleft', 'justifycenter', 'insertorderedlist', 'insertunorderedlist', '|',
+            'formatblock', 'fontsize', '|', 'indent', 'outdent',
+            '|', 'imagedirectupload', 'table', 'media', 'preview', "more"
         ],
-        afterChange:function(){//按键事件
+        afterChange: function () {//按键事件
             var edit = this.edit;
             var body = edit.doc.body;
             edit.iframe.height(paramsHeight);
-            this.resize(null, Math.max((params.kindutil.IE ? body.scrollHeight : (params.kindutil.GECKO ? body.offsetHeight+26:body.offsetHeight+7))  , paramsHeight));
+            this.resize(null, Math.max((params.kindutil.IE ? body.scrollHeight : (params.kindutil.GECKO ? body.offsetHeight + 26 : body.offsetHeight + 7)), paramsHeight));
         },
-        afterBlur:function(){
+        afterBlur: function () {
             //params.toolbar_container.hide();
             params.textarea.blur();
-            sd_check_editor_form_field({content:this,contentmsg:params.contentmsg,textarea:params.textarea});
-            if(this.isEmpty()) {
+            sd_check_editor_form_field({ content: this, contentmsg: params.contentmsg, textarea: params.textarea });
+            if (this.isEmpty()) {
                 this.edit.html("<span id='hint' style='color:#999999;font-size:12px;'>我要回复</span>");
             }
             //params.toolbar_container.hide();
             $('#reply_image_' + id).addClass('imageFuzzy');
-            if(/^\s*<\w*\s*\w*\=\"\w*\"\s*\w*\=\"\w*\:\s*\#\d*\;\s*\w*\-\w*\:\s*\w*\;\"\>[\u4e00-\u9fa5]*<\/\w*\>\s*$/.test(this.edit.html())){
+            if (/^\s*<\w*\s*\w*\=\"\w*\"\s*\w*\=\"\w*\:\s*\#\d*\;\s*\w*\-\w*\:\s*\w*\;\"\>[\u4e00-\u9fa5]*<\/\w*\>\s*$/.test(this.edit.html())) {
                 params.submit_btn.hide();
                 params.toolbar_container.hide();
                 this.resize("100%", null);
-            }else if(this.edit.html().trim() != ""){
+            } else if (this.edit.html().trim() != "") {
                 params.submit_btn.show();
                 params.toolbar_container.show();
             }
@@ -48,10 +48,10 @@ function sd_create_editor(params){
             //params.submit_btn.css("display","none");
 
         },
-        afterFocus: function(){
+        afterFocus: function () {
             var edit = this.edit;
             var body = edit.doc.body;
-            if(/^\s*<\w*\s*\w*\=\"\w*\"\s*\w*\=\"\w*\:\s*\#\d*\;\s*\w*\-\w*\:\s*\w*\;\"\>[\u4e00-\u9fa5]*<\/\w*\>\s*$/.test(edit.html())){
+            if (/^\s*<\w*\s*\w*\=\"\w*\"\s*\w*\=\"\w*\:\s*\#\d*\;\s*\w*\-\w*\:\s*\w*\;\"\>[\u4e00-\u9fa5]*<\/\w*\>\s*$/.test(edit.html())) {
                 edit.html('');
             }
             params.submit_btn.show();
@@ -67,12 +67,12 @@ function sd_create_editor(params){
 
         },
 
-        afterCreate:function(){
+        afterCreate: function () {
             //params.submit_btn.hide();
-            var toolbar = $("div[class='ke-toolbar']",params.div_form);
-            toolbar.css('display','inline');
-            toolbar.css('padding',0);
-            $(".ke-outline>.ke-toolbar-icon",toolbar).append('表情');
+            var toolbar = $("div[class='ke-toolbar']", params.div_form);
+            toolbar.css('display', 'inline');
+            toolbar.css('padding', 0);
+            $(".ke-outline>.ke-toolbar-icon", toolbar).append('表情');
             params.toolbar_container.append(toolbar);
             params.toolbar_container.hide();
             params.submit_btn.hide();
@@ -85,9 +85,9 @@ function sd_create_editor(params){
             paramsHeight = paramsHeight == undefined ? params.kindutil.removeUnit(this.height) : paramsHeight;
             edit.iframe.height(paramsHeight);
             edit.html("<span id='hint' style='color:#999999;font-size:12px;'>我要回复</span>");
-            this.resize(null,paramsHeight);// Math.max((params.kindutil.IE ? body.scrollHeight : body.offsetHeight)+ paramsHeight , paramsHeight)
+            this.resize(null, paramsHeight);// Math.max((params.kindutil.IE ? body.scrollHeight : body.offsetHeight)+ paramsHeight , paramsHeight)
             // params.toolbar_container.hide();
-            if(typeof enableAt === 'function'){
+            if (typeof enableAt === 'function') {
                 enableAt(this, id, type);
             }
         }
@@ -95,7 +95,7 @@ function sd_create_editor(params){
     return editor;
 }
 
-function sd_create_shixun_editor(params){
+function sd_create_shixun_editor(params) {
     // var minHeight;  //最小高度
     var paramsHeight = params.height; //设定的高度
     var id = arguments[1] ? arguments[1] : undefined;
@@ -103,20 +103,20 @@ function sd_create_shixun_editor(params){
     var paramsWidth = params.width == undefined ? "100%" : params.width;
 
     var editor = params.kindutil.create(params.textarea, {
-        resizeType : 1,minWidth:"1px",width:"94%",
-        height:"33px",// == undefined ? "30px":paramsHeight+"px",
-        minHeight:"33px",// == undefined ? "30px":paramsHeight+"px",
-        width:params.width,
+        resizeType: 1, minWidth: "1px", width: "94%",
+        height: "33px",// == undefined ? "30px":paramsHeight+"px",
+        minHeight: "33px",// == undefined ? "30px":paramsHeight+"px",
+        width: params.width,
         /*
          items:['emoticons','fontname',
          'forecolor', 'hilitecolor', 'bold', '|', 'justifyleft', 'justifycenter', 'insertorderedlist','insertunorderedlist', '|',
          'formatblock', 'fontsize', '|','indent', 'outdent',
          '|','imagedirectupload','more'],*/
-        items : ['imagedirectupload'],
-        afterChange:function(){//按键事件
-            if(this.isEmpty() || this.edit.doc.body.innerText == '说点什么') {
-                $('#mini_comment_section').height('auto') 
-            } else { 
+        items: ['imagedirectupload'],
+        afterChange: function () {//按键事件
+            if (this.isEmpty() || this.edit.doc.body.innerText == '说点什么') {
+                $('#mini_comment_section').height('auto')
+            } else {
                 var edit = this.edit;
                 var body = edit.doc.body;
                 var newHeight = 0;
@@ -125,14 +125,14 @@ function sd_create_shixun_editor(params){
                 if (FF) {   // 火狐下处理方式不一样
                     newHeight = $(body).height()
                 } else {
-                    $(body).children().each(function(){newHeight+=$(this).height()});
+                    $(body).children().each(function () { newHeight += $(this).height() });
                 }
                 // var newHeight = $(body).height()
-                
+
                 var maxHeight = 357 // $(window).height() - 150 - 57; //  150 上部距离  57 下部距离
 
                 newHeight = newHeight <= maxHeight ? newHeight : maxHeight
-                
+
 
                 if (newHeight > 150) {
                     if (FF) {   // 火狐下处理方式不一样
@@ -140,9 +140,9 @@ function sd_create_shixun_editor(params){
                     } else {
                         this.resize("100%", newHeight + 'px');
                     }
-                    $('#mini_comment_section').height(newHeight+57)
+                    $('#mini_comment_section').height(newHeight + 57)
                 } else {
-                    this.resize("100%",  '150px');
+                    this.resize("100%", '150px');
                     $('#mini_comment_section').height('auto')
                 }
             }
@@ -150,19 +150,19 @@ function sd_create_shixun_editor(params){
             //edit.iframe.height(paramsHeight);
             //this.resize(null, Math.max((params.kindutil.IE ? body.scrollHeight : (params.kindutil.GECKO ? body.offsetHeight+26:body.offsetHeight+7))  , 15));
         },
-        afterBlur:function(){
+        afterBlur: function () {
             //params.toolbar_container.hide();
             params.textarea.blur();
-            sd_check_editor_form_field({content:this,contentmsg:params.contentmsg,textarea:params.textarea});
-            if(this.isEmpty()) {
+            sd_check_editor_form_field({ content: this, contentmsg: params.contentmsg, textarea: params.textarea });
+            if (this.isEmpty()) {
                 $('#mini_comment_section').height('auto')
                 this.edit.html("<span id='hint' style='color:#999999;font-size:14px;'>说点什么</span>");
                 params.submit_btn.hide();
                 params.toolbar_container.hide();
                 this.resize("100%", "30px");
                 $("#dis_reply_id").val("");
-                if($("#editor_panel").length>0){
-                    $("#editor_panel").attr("style","margin-top:9px;flex: 1;");
+                if ($("#editor_panel").length > 0) {
+                    $("#editor_panel").attr("style", "margin-top:9px;flex: 1;");
                     $("#editor_panel").parents("form").addClass("df")
                 }
             }
@@ -180,10 +180,10 @@ function sd_create_shixun_editor(params){
 
             // $('#mini_comment_section').height('auto')
         },
-        afterFocus: function(){
+        afterFocus: function () {
             var edit = this.edit;
             var body = edit.doc.body;
-            if(/^\s*<\w*\s*\w*\=\"\w*\"\s*\w*\=\"\w*\:\s*\#\d*\;\s*\w*\-\w*\:\s*\w*\;\"\>[\u4e00-\u9fa5]*<\/\w*\>\s*$/.test(edit.html())){
+            if (/^\s*<\w*\s*\w*\=\"\w*\"\s*\w*\=\"\w*\:\s*\#\d*\;\s*\w*\-\w*\:\s*\w*\;\"\>[\u4e00-\u9fa5]*<\/\w*\>\s*$/.test(edit.html())) {
                 edit.html("");
             }
             params.submit_btn.show();
@@ -192,14 +192,14 @@ function sd_create_shixun_editor(params){
             // params.toolbar_container.show();
             $('#reply_image_' + id).removeClass('imageFuzzy');
             //edit.iframe.width(paramsWidth);
-            
+
             var newHeight = $(body).height()
             if (newHeight < 150) {
                 this.resize("100%", "150px");
                 this.resize(paramsWidth, "150px");
             }
-            if($("#editor_panel").length>0){
-                $("#editor_panel").attr("style","width:100%;margin-top:9px;");
+            if ($("#editor_panel").length > 0) {
+                $("#editor_panel").attr("style", "width:100%;margin-top:9px;");
                 $("#editor_panel").parents("form").removeClass("df")
             }
             //params.submit_btn.show();
@@ -207,12 +207,12 @@ function sd_create_shixun_editor(params){
             // $('#mini_comment_section').height('244px')
         },
 
-        afterCreate:function(){
+        afterCreate: function () {
             //params.submit_btn.hide();
-            var toolbar = $("div[class='ke-toolbar']",params.div_form);
-            toolbar.css('display','inline');
-            toolbar.css('padding',0);
-            $(".ke-outline>.ke-toolbar-icon",toolbar).append('表情');
+            var toolbar = $("div[class='ke-toolbar']", params.div_form);
+            toolbar.css('display', 'inline');
+            toolbar.css('padding', 0);
+            $(".ke-outline>.ke-toolbar-icon", toolbar).append('表情');
             params.toolbar_container.append(toolbar);
             params.toolbar_container.hide();
             params.submit_btn.hide();
@@ -221,16 +221,16 @@ function sd_create_shixun_editor(params){
             var body = edit.doc.body;
             edit.iframe[0].scroll = 'no';
             // body.style.overflowY = 'hidden';
-            body.style['padding-top']= '2px';
-            body.style['padding-left']= '5px';
+            body.style['padding-top'] = '2px';
+            body.style['padding-left'] = '5px';
             // <style type='text/css'>body{padding-top: 2px;padding-left: 5px;}</style> 
             //reset height
             paramsHeight = paramsHeight == undefined ? params.kindutil.removeUnit(this.height) : paramsHeight;
             edit.iframe.height(paramsHeight);
             edit.html("<span id='hint' style='color:#999999;font-size:14px;'>说点什么</span>");
-            this.resize(null,paramsHeight);// Math.max((params.kindutil.IE ? body.scrollHeight : body.offsetHeight)+ paramsHeight , paramsHeight)
+            this.resize(null, paramsHeight);// Math.max((params.kindutil.IE ? body.scrollHeight : body.offsetHeight)+ paramsHeight , paramsHeight)
             // params.toolbar_container.hide();
-            if(typeof enableAt === 'function'){
+            if (typeof enableAt === 'function') {
                 enableAt(this, id, type);
             }
 
@@ -242,43 +242,43 @@ function sd_create_shixun_editor(params){
     return editor;
 }
 
-function sd_check_editor_form_field(params){
-    var result=true;
-    if(params.content!=undefined){
-        if(params.content.isEmpty()){
-            result=false;
+function sd_check_editor_form_field(params) {
+    var result = true;
+    if (params.content != undefined) {
+        if (params.content.isEmpty()) {
+            result = false;
         }
-        if(params.content.html()!=params.textarea.html() || params.issubmit==true){
+        if (params.content.html() != params.textarea.html() || params.issubmit == true) {
             params.textarea.html(params.content.html());
             params.content.sync();
-            if(params.content.isEmpty() || /^\s*<\w*\s*\w*\=\"\w*\"\s*\w*\=\"\w*\:\s*\#\d*\;\s*\w*\-\w*\:\s*\w*\;\"\>[\u4e00-\u9fa5]*<\/\w*\>\s*$/.test(params.textarea.html())){
+            if (params.content.isEmpty() || /^\s*<\w*\s*\w*\=\"\w*\"\s*\w*\=\"\w*\:\s*\#\d*\;\s*\w*\-\w*\:\s*\w*\;\"\>[\u4e00-\u9fa5]*<\/\w*\>\s*$/.test(params.textarea.html())) {
                 params.contentmsg.html('内容不能为空');
-                params.contentmsg.css({color:'#ff0000'});
-            }else{
+                params.contentmsg.css({ color: '#ff0000' });
+            } else {
                 params.contentmsg.html('填写正确');
-                params.contentmsg.css({color:'#008000'});
+                params.contentmsg.css({ color: '#008000' });
             }
             params.contentmsg.show();
         }
     }
     return result;
 }
-function sd_create_form(params){
-    params.form.submit(function(){
+function sd_create_form(params) {
+    params.form.submit(function () {
         var flag = false;
-        if(params.form.attr('data-remote') != undefined ){
+        if (params.form.attr('data-remote') != undefined) {
             flag = true
         }
         var is_checked = sd_check_editor_form_field({
-            issubmit:true,
-            content:params.editor,
-            contentmsg:params.contentmsg,
-            textarea:params.textarea
+            issubmit: true,
+            content: params.editor,
+            contentmsg: params.contentmsg,
+            textarea: params.textarea
         });
-        if(is_checked){
-            if(flag){
+        if (is_checked) {
+            if (flag) {
                 return true;
-            }else{
+            } else {
                 $(this)[0].submit();
                 return false;
             }
@@ -286,144 +286,142 @@ function sd_create_form(params){
         return false;
     });
 }
-function sd_reset_editor_form(params){
+function sd_reset_editor_form(params) {
     params.form[0].reset();
     params.textarea.empty();
-    if(params.editor != undefined){
+    if (params.editor != undefined) {
         params.editor.html(params.textarea.html());
     }
     params.contentmsg.hide();
 }
 //第二个参数是高度，可以传，可以不传
-function sd_create_editor_from_data(id){
+function sd_create_editor_from_data(id) {
     var height = arguments[1] ? arguments[1] : undefined;
     var width = arguments[2] ? arguments[2] : undefined;
     var type = arguments[3] ? arguments[3] : undefined;
-    // KindEditor.ready(function (K) {
-        // react 环境不需要ready方法，页面已经加载完了才执行sd_create_editor_from_data
-        var K = KindEditor;
-        $("div[nhname='new_message_" + id + "']").each(function () {
-            var params = {};
-            params.kindutil = K;
-            params.div_form = $(this);
-            params.form = $("form", params.div_form);
-            if (params.form == undefined || params.form.length == 0) {
-                return;
-            }
-            params.textarea = $("textarea[nhname='new_message_textarea_" + id + "']", params.div_form);
-            params.contentmsg = $("span[nhname='contentmsg_" + id + "']", params.div_form);
-            params.toolbar_container = $("div[nhname='toolbar_container_" + id + "']", params.div_form);
-            params.cancel_btn = $("#new_message_cancel_btn_" + id);
-            params.submit_btn = $("#new_message_submit_btn_" + id);
-            params.height = height;
-            params.width = width;
-            if (params.textarea.data('init') == undefined) {
-                params.editor = sd_create_editor(params,id, type);
-                sd_create_form(params);
-                params.cancel_btn.click(function () {
-                    sd_reset_editor_form(params);
-                });
-                params.submit_btn.click(function () {
-                    var tContents = $("#comment_news_" + id).val();
-                    if(tContents != undefined){
-                        var beforeImage = tContents.split("<img");
-                        var afterImage = tContents.split("/>");
-                        if(beforeImage[0] == "" && afterImage[1] == ""){
-                            notice_box('不支持纯图片评论<br/>请在评论中增加文字信息');
-                            return;
-                        }
-
-                        if (tContents.startsWith('<') && tContents.endsWith('>') 
-                            && (tContents.indexOf('<link') != -1 || tContents.indexOf('<script') != -1 )) {
-                            notice_box('不支持包含link或script标签的html内容');
-                            return;    
-                        }
+    var K = KindEditor;
+    $("div[nhname='new_message_" + id + "']").each(function () {
+        var params = {};
+        params.kindutil = K;
+        params.div_form = $(this);
+        params.form = $("form", params.div_form);
+        if (params.form == undefined || params.form.length == 0) {
+            return;
+        }
+        params.textarea = $("textarea[nhname='new_message_textarea_" + id + "']", params.div_form);
+        params.contentmsg = $("span[nhname='contentmsg_" + id + "']", params.div_form);
+        params.toolbar_container = $("div[nhname='toolbar_container_" + id + "']", params.div_form);
+        params.cancel_btn = $("#new_message_cancel_btn_" + id);
+        params.submit_btn = $("#new_message_submit_btn_" + id);
+        params.height = height;
+        params.width = width;
+        if (params.textarea.data('init') == undefined) {
+            params.editor = sd_create_editor(params, id, type);
+            sd_create_form(params);
+            params.cancel_btn.click(function () {
+                sd_reset_editor_form(params);
+            });
+            params.submit_btn.click(function () {
+                var tContents = $("#comment_news_" + id).val();
+                if (tContents != undefined) {
+                    var beforeImage = tContents.split("<img");
+                    var afterImage = tContents.split("/>");
+                    if (beforeImage[0] == "" && afterImage[1] == "") {
+                        notice_box('不支持纯图片评论<br/>请在评论中增加文字信息');
+                        return;
                     }
-                    // react环境下，发消息给react组件
-                    if (window['__isR'] === true) {
-                        $(document).trigger("onReply", { commentContent:tContents, id:id, editor:params.editor } );
-                    } else {
-                        params.form.submit();
-                    }
-                });
-                params.textarea.focus(function (){
-                    params.editor.focus();
-                });
-                params.textarea.data('init', 1);
-                $(this).show();
 
-                __editor = params.editor
-            }
-        });
+                    if (tContents.startsWith('<') && tContents.endsWith('>')
+                        && (tContents.indexOf('<link') != -1 || tContents.indexOf('<script') != -1)) {
+                        notice_box('不支持包含link或script标签的html内容');
+                        return;
+                    }
+                }
+                // react环境下，发消息给react组件
+                if (window['__isR'] === true) {
+                    $(document).trigger("onReply", { commentContent: tContents, id: id, editor: params.editor });
+                } else {
+                    params.form.submit();
+                }
+            });
+            params.textarea.focus(function () {
+                params.editor.focus();
+            });
+            params.textarea.data('init', 1);
+            $(this).show();
+
+            __editor = params.editor
+        }
+    });
     // });
 
     div_form = $("div[nhname='new_message_" + id + "']");
-    $(".ke-edit", div_form).css("height","33px");
-    $(".ke-edit-iframe",div_form).css("height","33px");
+    $(".ke-edit", div_form).css("height", "33px");
+    $(".ke-edit-iframe", div_form).css("height", "33px");
 
     return __editor;
 }
 
 
 //第二个参数是高度，可以传，可以不传
-function sd_create_editor_from_shixun_data(id){
+function sd_create_editor_from_shixun_data(id) {
     var height = arguments[1] ? arguments[1] : undefined;
     var width = arguments[2] ? arguments[2] : undefined;
     var type = arguments[3] ? arguments[3] : undefined;
     // KindEditor.ready(function (K) {
-        // react 环境不需要ready方法，页面已经加载完了才执行sd_create_editor_from_data
-        var K = KindEditor;
-    
-        $("div[nhname='new_message_" + id + "']").each(function () {
-            var params = {};
-            params.kindutil = K;
-            params.div_form = $(this);
-            params.form = $("form", params.div_form);
-            if (params.form == undefined || params.form.length == 0) {
-                return;
-            }
-            params.textarea = $("textarea[nhname='new_message_textarea_" + id + "']", params.div_form);
-            params.contentmsg = $("span[nhname='contentmsg_" + id + "']", params.div_form);
-            params.toolbar_container = $("div[nhname='toolbar_container_" + id + "']", params.div_form);
-            params.cancel_btn = $("#new_message_cancel_btn_" + id);
-            params.submit_btn = $("#new_message_submit_btn_" + id);
-            params.height = height;
-            params.width = width;
-            if (params.textarea.data('init') == undefined) {
-                params.editor = sd_create_shixun_editor(params,id, type);
-                window._commentInput = params.editor;
-                sd_create_form(params);
-                params.cancel_btn.click(function () {
-                    sd_reset_editor_form(params);
-                });
-                // 在react组件中hide
-                // params.submit_btn.click(function () {
-                    // $(this).hide()
-                // });
-                // 非react环境才监听这个click
-                !window['__isR'] && params.submit_btn.click(function () {
-                    var tContents = $("#comment_news_" + id).val();
-                    
-                    if(tContents != undefined){
-                        var beforeImage = tContents.split("<img");
-                        var afterImage = tContents.split("/>");
-                        if(beforeImage[0] == "" && afterImage[1] == ""){
-                            notice_box('不支持纯图片评论<br/>请在评论中增加文字信息');
-                            return;
-                        }
+    // react 环境不需要ready方法，页面已经加载完了才执行sd_create_editor_from_data
+    var K = KindEditor;
+
+    $("div[nhname='new_message_" + id + "']").each(function () {
+        var params = {};
+        params.kindutil = K;
+        params.div_form = $(this);
+        params.form = $("form", params.div_form);
+        if (params.form == undefined || params.form.length == 0) {
+            return;
+        }
+        params.textarea = $("textarea[nhname='new_message_textarea_" + id + "']", params.div_form);
+        params.contentmsg = $("span[nhname='contentmsg_" + id + "']", params.div_form);
+        params.toolbar_container = $("div[nhname='toolbar_container_" + id + "']", params.div_form);
+        params.cancel_btn = $("#new_message_cancel_btn_" + id);
+        params.submit_btn = $("#new_message_submit_btn_" + id);
+        params.height = height;
+        params.width = width;
+        if (params.textarea.data('init') == undefined) {
+            params.editor = sd_create_shixun_editor(params, id, type);
+            window._commentInput = params.editor;
+            sd_create_form(params);
+            params.cancel_btn.click(function () {
+                sd_reset_editor_form(params);
+            });
+            // 在react组件中hide
+            // params.submit_btn.click(function () {
+            // $(this).hide()
+            // });
+            // 非react环境才监听这个click
+            !window['__isR'] && params.submit_btn.click(function () {
+                var tContents = $("#comment_news_" + id).val();
+
+                if (tContents != undefined) {
+                    var beforeImage = tContents.split("<img");
+                    var afterImage = tContents.split("/>");
+                    if (beforeImage[0] == "" && afterImage[1] == "") {
+                        notice_box('不支持纯图片评论<br/>请在评论中增加文字信息');
+                        return;
                     }
-                    params.form.submit();
-                });
-                params.textarea.focus(function (){
-                    params.editor.focus();
-                });
-                params.textarea.data('init', 1);
-                $(this).show();
-            }
-        });
+                }
+                params.form.submit();
+            });
+            params.textarea.focus(function () {
+                params.editor.focus();
+            });
+            params.textarea.data('init', 1);
+            $(this).show();
+        }
+    });
     // });
 
     div_form = $("div[nhname='new_message_" + id + "']");
-    $(".ke-edit", div_form).css("height","33px");
-    $(".ke-edit-iframe",div_form).css("height","33px");
+    $(".ke-edit", div_form).css("height", "33px");
+    $(".ke-edit-iframe", div_form).css("height", "33px");
 }

public/js/jsFromMiddleLayer/main.js

@@ -13,7 +13,7 @@
  */
 function openTerminal(options) {
     // 为了多个实例能同时存在
-    (function () { 
+    (function () {
         var heartBeatInterval;
         var force_close_socket = false;
         //var CONNECT_TIME = 0; // 请求连接次数
@@ -21,20 +21,21 @@ function openTerminal(options) {
         var parentDomId = options.parentDomId || ''
         var client = new WSSHClient();
         var base64 = new Base64();
-        var term = new Terminal({cols: options.columns, rows: Rows, screenKeys: true, useStyle: true
-        // TODO 默认是canvas，可能被其他样式影响了 canvas用不了
+        var term = new Terminal({
+            cols: options.columns, rows: Rows, screenKeys: true, useStyle: true
+            // TODO 默认是canvas，可能被其他样式影响了 canvas用不了
             , rendererType: 'dom'
             , fontSize: 16
-            });
+        });
         term.on('data', function (data) {
             console.log("xterm data: ");
             console.log(data);
             client.sendClientData(data);
-        
-            window.parent.postMessage({tp: 'sshWorking'}, "*");
+
+            window.parent.postMessage({ tp: 'sshWorking' }, "*");
         });
         term.open();
-        $('body>.terminal').detach().appendTo( parentDomId + ' #term' );
+        $('body>.terminal').detach().appendTo(parentDomId + ' #term');
         $(parentDomId + " #term").show();
         term.write("Connecting...");
         console.log(options)
@@ -43,7 +44,7 @@ function openTerminal(options) {
         //var interTime = setInterval(client_connect, 1000)
         setTimeout(client_connect, 3000);
 
-        heartBeatInterval = setInterval(function(){
+        heartBeatInterval = setInterval(function () {
             client.sendHeartBeat()
         }, 30 * 1000)
         /**
@@ -67,13 +68,13 @@ function openTerminal(options) {
         window.addEventListener("message", function (event) {
             console.log("post message: ");
             console.log(event.data);
-            if(event.data.tp === 'resize'){
+            if (event.data.tp === 'resize') {
                 resizeTerminal(event.data);
             } else if (event.data.tp === 'reload') {
                 window.location.reload()
             } else if (event.data.tp === 'close_ssh_cocket') {
                 force_close_socket = true;  // 强制关闭socket，用于不开启自动重连
-                client && client.close(); 
+                client && client.close();
             }
         }, false);
 
@@ -94,10 +95,9 @@ function openTerminal(options) {
                     term.focus();
                 },
                 onClose: function () {
-                    debugger;
 
                     clearInterval(heartBeatInterval);
-                    
+
                     console.log("连接关闭");
                     term.write("\r\nconnection closed");
                     if (CONNECTED) {
@@ -106,7 +106,7 @@ function openTerminal(options) {
                     }
                     if (force_close_socket === false) {
                         // $(window).trigger('setSSHConnectStatus');
-                        window.parent.postMessage({tp: 'setSSHConnectStatus', tab: options.tab}, "*");
+                        window.parent.postMessage({ tp: 'setSSHConnectStatus', tab: options.tab }, "*");
                     } else {
                         // 主动关闭连接时，不自动重连
                         force_close_socket = false;
@@ -116,10 +116,10 @@ function openTerminal(options) {
                     if (!CONNECTED) {
                         console.log("first connected.");
                         // 问题重现的实训 带代码tab的 命令行实训 https://www.educoder.net/tasks/83hflni9es7tl
-                        setTimeout(function() {
+                        setTimeout(function () {
                             // TODO canvas模式下，没有body
-                            if ( term && term.body && term.body.innerText 
-                                    && term.body.innerText.indexOf('Connecting') != -1 ) {
+                            if (term && term.body && term.body.innerText
+                                && term.body.innerText.indexOf('Connecting') != -1) {
                                 term.clear();   // 有的连上后还出现了“Connecting。。。”
                             }
                         }, 1000)
@@ -179,10 +179,10 @@ function connect() {
         username: $("#username").val(),
         secret: $("#password").val(),
         gameid: $("#gameid").val(),
-        rows: parseInt( $("#terminalRow").val() ),
-        columns: parseInt( $("#terminalColumn").val() ),
-        width: parseInt( $("#terminalWidth").val() ),
-        height: parseInt( $("#terminalHeight").val() ),
+        rows: parseInt($("#terminalRow").val()),
+        columns: parseInt($("#terminalColumn").val()),
+        width: parseInt($("#terminalWidth").val()),
+        height: parseInt($("#terminalHeight").val()),
         tab: $("#terminalTab").val(),
     }
     if (remember) {

scripts/build.js

@@ -2,7 +2,6 @@
 
 // Do this as the first thing so that any code reading it knows the right env.
 process.env.BABEL_ENV = 'production';
-process.env.NODE_ENV = 'production';
 
 // Makes the script crash on unhandled rejections instead of silently
 // ignoring them. In the future, promise rejections that are not handled will
@@ -46,10 +45,10 @@ if (!checkRequiredFiles([paths.appHtml, paths.appIndexJs])) {
 function removeExceptGitDir(dir) {
   // readdirSync
   const list = fs2.readdirSync(dir)
-    // if (err) return done(err);
+  // if (err) return done(err);
   var pending = list.length;
   // if (!pending) return done(null, results);
-  list.forEach(function(file) {
+  list.forEach(function (file) {
     if (file.indexOf('.git') == -1) {
       file = path.resolve(dir, file);
       fs.removeSync(file)
@@ -80,13 +79,13 @@ measureFileSizesBeforeBuild(paths.appBuild)
         console.log(warnings.join('\n\n'));
         console.log(
           '\nSearch for the ' +
-            chalk.underline(chalk.yellow('keywords')) +
-            ' to learn more about each warning.'
+          chalk.underline(chalk.yellow('keywords')) +
+          ' to learn more about each warning.'
         );
         console.log(
           'To ignore, add ' +
-            chalk.cyan('// eslint-disable-next-line') +
-            ' to the line before.\n'
+          chalk.cyan('// eslint-disable-next-line') +
+          ' to the line before.\n'
         );
       } else {
         console.log(chalk.green('Compiled successfully.\n'));
@@ -149,14 +148,12 @@ function build(previousFileSizes) {
         console.log(
           chalk.yellow(
             '\nTreating warnings as errors because process.env.CI = true.\n' +
-              'Most CI servers set it automatically.\n'
+            'Most CI servers set it automatically.\n'
           )
         );
         return reject(new Error(messages.warnings.join('\n\n')));
       }
 
-      generateNewIndexJsp();
-
       return resolve({
         stats,
         previousFileSizes,
@@ -170,82 +167,5 @@ function copyPublicFolder() {
   fs.copySync(paths.appPublic, paths.appBuild, {
     dereference: true,
     filter: file => file !== paths.appHtml,
-  });
-}
-
-// 给build脚本增加的方法，对其生成的index.html做一些文本替换，以及cdn处理
-function generateNewIndexJsp() {
-  // var combinedStream = CombinedStream.create();
-  var filePath = paths.appBuild + '/index.html';
-  // var htmlContent = fs2.createReadStream( filePath )
-
-  // stream没有replace方法
-  // htmlContent = htmlContent.replace('/js/js_min_all.js', '/react/build/js/js_min_all.js')
-  // htmlContent = htmlContent.replace('/css/css_min_all.css', '/react/build/css/css_min_all.css')
-
-  // combinedStream.append(htmlContent);
-  // combinedStream.pipe(fs2.createWriteStream( filePath ));
-
-  var outputPath = paths.appBuild  + '/../../../index.html'
-  fs2.readFile(filePath, 'utf8', function (err,data) {
-    if (err) {
-      return console.log(err);
-    }
-    const newVersion = '1.1.1'
-    let cdnHost = 'https://shixun.educoder.net'
-    cdnHost = 'https://ali-cdn.educoder.net'
-    cdnHost = ''
-
-
-    var mainRegex = /<script type="text\/javascript" src="\/forgeplus-react\/build\/.\/static\/js\/main.([a-zA-Z0-9]{8,}).js"><\/script>/
-    var matchResult = data.match(mainRegex)
-    var code = `
-      <script>
-         (function() {
-            var _host = '/forgeplus-react/build/'
-            /**/
-            if (window.location.host == 'pre-newweb.educoder.net') {
-                _host = 'https://testali-cdn.educoder.net/react/build/'
-            } else if (window.location.host == 'www.educoder.net') {
-                _host = 'https://ali-cdn.educoder.net/react/build/'
-            }
-            document.write('<script type="text/javascript" src="' + _host + 'js/js_min_all.js"><\\/script>');
-            document.write('<script type="text/javascript" src="' + _host + 'static/js/main.${matchResult[1]}.js"><\\/script>');
-         })()
-      </script>
-    `
-    var jsMinAllRegex = /<script type="text\/javascript" src="\/js\/js_min_all.js"><\/script>/
-    // <script type="text/javascript" src="/js/js_min_all.js"></script>
-    var result = data
-        .replace(jsMinAllRegex, code)
-        // .replace('/js/js_min_all.js', `${cdnHost}/react/build/js/js_min_all.js?v=${newVersion}`)
-        // .replace('/js/js_min_all_2.js', `${cdnHost}/react/build/js/js_min_all_2.js?v=${newVersion}`)
-
-        // ${cdnHost}  加了cdn后，这个文件里的字体文件加载会有跨域的报错   ../fonts/fontawesome-webfont.eot
-        // TODO tpi 评测结果关闭也使用了fontawesome
-        .replace('/css/css_min_all.css', `${cdnHost}/react/build/css/css_min_all.css?v=${newVersion}`)
-			  .replace('/css/iconfont.css', `${cdnHost}/react/build/css/iconfont.css?v=${newVersion}`)
-        .replace(/\/js\/create_kindeditor.js/g, `${cdnHost}/react/build/js/create_kindeditor.js?v=${newVersion}`)
-
-        .replace(mainRegex, '')
-        // .replace('/react/build/./static/css/main', `${cdnHost}/react/build/./static/css/main`)
-        // .replace('/react/build/./static/js/main', `${cdnHost}/react/build/./static/js/main`)
-
-        // .replace(/https:\/\/testeduplus2.educoder.net/g, '');
-        // .replace(/http:\/\/testbdweb.educoder.net/g, '');
-
-        // .replace('/css/css_min_all.css', '/react/build/css/css_min_all.css');
-
-    fs2.writeFile(outputPath, result, 'utf8', function (err) {
-       if (err) return console.log(err);
-      //  commitAndPush();
-    });
-  });
-}
-
-function commitAndPush() {
-  var exec = require('child_process').exec;
-  function puts(error, stdout, stderr) { console.log(stdout) }
-  var options = {cwd:"./build"};
-  exec("git status && git commit -am 'b' && git push", options, puts);
+  })
 }

scripts/concat.js

@@ -1,31 +1,31 @@
 var fs = require('fs');
 var uglify = require("uglify-js");
 var path = require('path');
-var concat = require('concat')    
+var concat = require('concat')
 
 var results = [];
-var walk = function(dir, done) {
-  
-  fs.readdir(dir, function(err, list) {
-  	console.log(list)
-    if (err) return done(err);
-    var pending = list.length;
-    if (!pending) return done(null, results);
-    list.forEach(function(file) {
-      file = path.resolve(dir, file);
-      fs.stat(file, function(err, stat) {
-        if (stat && stat.isDirectory()) {
-          walk(file, function(err, res) {
-            // results = results.concat(res);
-            if (!--pending) done(null, results);
-          });
-        } else {
-          results.push(file);
-          if (!--pending) done(null, results);
-        }
-      });
-    });
-  });
+var walk = function (dir, done) {
+
+	fs.readdir(dir, function (err, list) {
+		console.log(list)
+		if (err) return done(err);
+		var pending = list.length;
+		if (!pending) return done(null, results);
+		list.forEach(function (file) {
+			file = path.resolve(dir, file);
+			fs.stat(file, function (err, stat) {
+				if (stat && stat.isDirectory()) {
+					walk(file, function (err, res) {
+						// results = results.concat(res);
+						if (!--pending) done(null, results);
+					});
+				} else {
+					results.push(file);
+					if (!--pending) done(null, results);
+				}
+			});
+		});
+	});
 };
 
 // 需要输出文件名数组时改为true
@@ -34,65 +34,51 @@ var cssDir = './public/css'
 
 // true && 
 false &&
-walk(cssDir, function() {
-	console.log('results', results.length, results)
-})
+	walk(cssDir, function () {
+		console.log('results', results.length, results)
+	})
 // return;
 
 // ----------------------------------------------------------------------------- CSS 
-	var cssResults = [ 
-	
-  'D:\\Code\\trustieplus\\public\\react\\public\\css\\edu-common.css',
-  'D:\\Code\\trustieplus\\public\\react\\public\\css\\edu-public.css',
-  'D:\\Code\\trustieplus\\public\\react\\public\\css\\taskstyle.css' ,
+var cssResults = [
 
-  'D:\\Code\\trustieplus\\public\\react\\public\\css\\font-awesome.css',
-  
-  'D:\\Code\\trustieplus\\public\\react\\public\\css\\editormd.min.css',
-  'D:\\Code\\trustieplus\\public\\react\\public\\css\\merge.css',
-  
-  ]
-   concat(cssResults, './public/css/css_min_all.css')
+	'D:\\Code\\trustieplus\\public\\react\\public\\css\\edu-common.css',
+	'D:\\Code\\trustieplus\\public\\react\\public\\css\\edu-public.css',
+	'D:\\Code\\trustieplus\\public\\react\\public\\css\\taskstyle.css',
+
+	'D:\\Code\\trustieplus\\public\\react\\public\\css\\font-awesome.css',
+
+	'D:\\Code\\trustieplus\\public\\react\\public\\css\\editormd.min.css',
+	'D:\\Code\\trustieplus\\public\\react\\public\\css\\merge.css',
+
+]
+concat(cssResults, './public/css/css_min_all.css')
 
 return;
 
 // ----------------------------------------------------------------------------- JS
-	var _results = [ 
+var _results = [
 
 	'D:\\Code\\trustieplus\\public\\react\\public\\js\\jquery-1.8.3.min.js',
 	'D:\\Code\\trustieplus\\public\\react\\public\\js\\editormd\\underscore.min.js',
 	'D:\\Code\\trustieplus\\public\\react\\public\\js\\editormd\\marked.min.js',
 	'D:\\Code\\trustieplus\\public\\react\\public\\js\\editormd\\prettify.min.js',
-	  'D:\\Code\\trustieplus\\public\\react\\public\\js\\editormd\\raphael.min.js',
-	  'D:\\Code\\trustieplus\\public\\react\\public\\js\\editormd\\sequence-diagram.min.js',
+	'D:\\Code\\trustieplus\\public\\react\\public\\js\\editormd\\raphael.min.js',
+	'D:\\Code\\trustieplus\\public\\react\\public\\js\\editormd\\sequence-diagram.min.js',
 	'D:\\Code\\trustieplus\\public\\react\\public\\js\\editormd\\flowchart.min.js',
-	  'D:\\Code\\trustieplus\\public\\react\\public\\js\\editormd\\jquery.flowchart.min.js',
-	  'D:\\Code\\trustieplus\\public\\react\\public\\js\\editormd\\editormd.min.js',
+	'D:\\Code\\trustieplus\\public\\react\\public\\js\\editormd\\jquery.flowchart.min.js',
+	'D:\\Code\\trustieplus\\public\\react\\public\\js\\editormd\\editormd.min.js',
 
 	'D:\\Code\\trustieplus\\public\\react\\public\\js\\codemirror\\codemirror.js',
 	'D:\\Code\\trustieplus\\public\\react\\public\\js\\codemirror\\mode\\javascript.js',
 
 	'D:\\Code\\trustieplus\\public\\react\\public\\js\\diff_match_patch.js',
-	  
-	  
-	  'D:\\Code\\trustieplus\\public\\react\\public\\js\\merge.js',
-	  
-	  'D:\\Code\\trustieplus\\public\\react\\public\\js\\edu_tpi.js',
-
-	  ]
-	
-	concat(_results, './public/js/js_min_all.js')
-
-	// var uglified = uglify.minify(['./public/js/merge.js']);
-	// console.log('uglified', uglified)
-	// fs.writeFile('concat.min.js', uglified.code, function (err){
-	//   if(err) {
-	//     console.log(err);
-	//   } else {
-	//     console.log("Script generated and saved:", 'concat.min.js');
-	//   }      
-	// });
 
 
-// var uglified = uglify.minify(['file1.js', 'file2.js', 'file3.js']);
+	'D:\\Code\\trustieplus\\public\\react\\public\\js\\merge.js',
 
+	'D:\\Code\\trustieplus\\public\\react\\public\\js\\edu_tpi.js',
+
+]
+
+concat(_results, './public/js/js_min_all.js')

scripts/purge-css.js

@@ -0,0 +1,21 @@
+const { PurgeCSS } = require('purgecss')
+var fs = require('fs');
+
+async function purgeBuild() {
+  const purgeCSSResult = await new PurgeCSS().purge({
+    content: ['../src/**/*.js', '../src/**/*.jsx',],
+    css: ['../public/css/edu-public.css', '../public/css/taskstyle.css', '../public/css/edu-main.css', '../public/css/edu-all.css']
+  })
+
+  let result = []
+  for (let i = 0; i < purgeCSSResult.length; i++) {
+    let item = purgeCSSResult[i]
+    result.push(item.css)
+  }
+
+  fs.writeFile('../public/css/edu-purge.css', result.join(''), 'utf8', function (err) {
+    if (err) return console.log(err)
+  })
+}
+
+purgeBuild()

scripts/start.js

@@ -36,7 +36,7 @@ const useYarn = fs.existsSync(paths.yarnLockFile);
 const isInteractive = process.stdout.isTTY;
 
 const portSetting = require(paths.appPackageJson).port
-if ( portSetting ) {
+if (portSetting) {
   process.env.port = portSetting
 }
 
@@ -76,10 +76,9 @@ choosePort(HOST, DEFAULT_PORT)
     const appName = require(paths.appPackageJson).name;
     const urls = prepareUrls(protocol, HOST, port);
     // Create a webpack compiler that is configured with custom messages.
-    const compiler = createCompiler(webpack, config, appName, urls, useYarn);
+    const compiler = createCompiler({ webpack, config, appName, urls, useYarn });
     // Load proxy config
     const proxySetting = require(paths.appPackageJson).proxy;
-    console.log('-------------------------proxySetting:', proxySetting)
     const proxyConfig = prepareProxy(proxySetting, paths.appPublic);
     // Serve webpack assets generated by the compiler over a web sever.
     const serverConfig = createDevServerConfig(
@@ -99,8 +98,8 @@ choosePort(HOST, DEFAULT_PORT)
       openBrowser(urls.localUrlForBrowser);
     });
 
-    ['SIGINT', 'SIGTERM'].forEach(function(sig) {
-      process.on(sig, function() {
+    ['SIGINT', 'SIGTERM'].forEach(function (sig) {
+      process.on(sig, function () {
         devServer.close();
         process.exit();
       });

src/App.css

@@ -23,8 +23,13 @@
 }
 
 @keyframes App-logo-spin {
-  from { transform: rotate(0deg); }
-  to { transform: rotate(360deg); }
+  from {
+    transform: rotate(0deg);
+  }
+
+  to {
+    transform: rotate(360deg);
+  }
 }
 
 
@@ -35,63 +40,80 @@
 .editormd .CodeMirror-linenumbers {
   padding: 0;
 }
-.editormd-html-preview hr, .editormd-preview-container hr {
+
+.editormd-html-preview hr,
+.editormd-preview-container hr {
   /* 颜色加深 */
   border-top: 1px solid #ccc;
 }
 
 /* 重置掉antd的一些样式 */
-html, body {
+html,
+body {
   -webkit-font-smoothing: auto !important;
 }
 
 .ant-progress-textyes {
   color: #52c41a;
 }
-.ant-progress-textno{
+
+.ant-progress-textno {
   color: #f5222d;
 }
+
 /* md多空格 */
 .markdown-body p {
+  margin:10px 0px!important;
+  font-size: 16px !important;
+  line-height: 2 !important;
   white-space: pre-wrap;
-  font-size: 16px!important
 }
-.markdown-body > p {
+
+.markdown-body>p {
   line-height: 25px;
 }
+
 /* https://www.educoder.net/courses/2346/group_homeworks/34405/question */
 .renderAsHtml.markdown-body p {
   white-space: inherit;
 }
+
 /* resize */
 .editormd .CodeMirror {
   border-right: none !important;
 }
+
 .editormd-preview {
   border-left: 1px solid rgb(221, 221, 221);
   /* 某些情况下，被cm盖住了 */
   z-index: 99;
 }
+
 /* 图片点击放大的场景，隐藏图片链接 */
 .editormd-image-click-expand .editormd-image-dialog {
   height: 234px !important;
 }
-  .editormd-image-click-expand .editormd-image-dialog .image-link {
-    display: none;
-  }
+
+.editormd-image-click-expand .editormd-image-dialog .image-link {
+  display: none;
+}
+
 /* 解决鼠标框选时，左边第一列没高亮的问题 */
-.CodeMirror .CodeMirror-lines pre.CodeMirror-line, .CodeMirror .CodeMirror-lines pre.CodeMirror-line-like {
-  padding: 0 12px ;
+.CodeMirror .CodeMirror-lines pre.CodeMirror-line,
+.CodeMirror .CodeMirror-lines pre.CodeMirror-line-like {
+  padding: 0 12px;
 }
 
 
 /* antd扩展 */
-.formItemInline.ant-form-item {    
+.formItemInline.ant-form-item {
   display: flex;
 }
+
 .formItemInline .ant-form-item-control-wrapper {
   flex: 1;
 }
+
 /* AutoComplete  placeholder 不显示的问题 */
 .ant-select-auto-complete.ant-select .ant-select-selection__placeholder {
   z-index: 2;

src/App.js

@@ -1,8 +1,6 @@
-import React, {Component} from 'react';
-import './public-path';
-import logo from './logo.svg';
+import React, { Component } from 'react';
 import './App.css';
-import {ConfigProvider} from 'antd'
+import { ConfigProvider } from 'antd'
 import zhCN from 'antd/lib/locale-provider/zh_CN';
 import {
 	BrowserRouter as Router,
@@ -10,216 +8,54 @@ import {
 	Switch
 } from 'react-router-dom';
 import axios from 'axios';
-import '@icedesign/base/dist/ICEDesignBase.css';
-
-import '@icedesign/base/index.scss';
-
 import LoginDialog from './modules/login/LoginDialog';
 import Notcompletedysl from './modules/user/Notcompletedysl';
 import Trialapplicationysl from './modules/login/Trialapplicationysl';
 import Trialapplicationreview from './modules/user/Trialapplicationreview';
-import Addcourses from "./modules/courses/coursesPublic/Addcourses";
 import AccountProfile from "./modules/user/AccountProfile";
 import Accountnewprofile from './modules/user/Accountnewprofile';
-import Trialapplication from './modules/login/Trialapplication';
 import Certifiedprofessional from './modules/modals/Certifiedprofessional';
-import NotFoundPage from './NotFoundPage'
 
 import Loading from './Loading'
 
 import Loadable from 'react-loadable';
-
-
+import marked from './common/marked';
 import moment from 'moment'
 
-import {MuiThemeProvider, createMuiTheme} from 'material-ui/styles';
-
-// import './AppConfig'
+import { MuiThemeProvider, createMuiTheme } from 'material-ui/styles';
 
 import history from './history';
 
-import {SnackbarHOC} from 'educoder'
-import {initAxiosInterceptors} from './AppConfig'
+import { SnackbarHOC } from 'educoder'
+import { initAxiosInterceptors } from './AppConfig'
 import { Provider } from 'react-redux';
 import configureStore from './redux/stores/configureStore';
-// ！！！tpi需要这个来加载css
-import {TPMIndexHOC} from './modules/tpm/TPMIndexHOC';
 const store = configureStore();
-
+window.marked = marked;
 const theme = createMuiTheme({
 	palette: {
 		primary: {
 			main: '#4CACFF',
 			contrastText: 'rgba(255, 255, 255, 0.87)'
 		},
-		secondary: {main: '#4CACFF'}, // #11cb5f This is just green.A700 as hex.
+		secondary: { main: '#4CACFF' }, // #11cb5f This is just green.A700 as hex.
 	},
 });
-//
-// const Trialapplication= Loadable({
-//     loader: () =>import('./modules/login/Trialapplication'),
-//     loading:Loading,
-// })
-//登入
-const EducoderLogin = Loadable({
-	loader: () => import('./modules/login/EducoderLogin'),
-	loading: Loading,
-})
-
-
-//微信登录
-const Otherlogin=Loadable({
-	loader: () => import('./modules/login/Otherlogin'),
-	loading: Loading,
-})
-
-//微信登录
-const  Loginqq=Loadable({
-	loader: () => import('./modules/login/Loginqq'),
-	loading: Loading,
-})
-
-
-const Otherloginstart=Loadable({
-	loader: () => import('./modules/login/Otherloginstart'),
-	loading: Loading,
-})
-const Otherloginsqq=Loadable({
-	loader: () => import('./modules/login/Otherloginqq'),
-	loading: Loading,
-})
-// const TestIndex = Loadable({
-// 	loader: () => import('./modules/test'),
-// 	loading: Loading,
-// })
-
-const IndexWrapperComponent = Loadable({
-	loader: () => import('./modules/page/IndexWrapper'),
-	loading: Loading,
-})
-
-const CommentComponent = Loadable({
-	loader: () => import('./modules/comment/CommentContainer'),
-	loading: Loading,
-})
-
-// const TestMaterialDesignComponent = Loadable({
-// 	loader: () => import('./modules/test/md/TestMaterialDesign'),
-// 	loading: Loading,
-// })
-// const TestCodeMirrorComponent = Loadable({
-// 	loader: () => import('./modules/test/codemirror/TestCodeMirror'),
-// 	loading: Loading,
-// })
-
-// const TestComponent = Loadable({
-// 	loader: () => import('./modules/test/TestRC'),
-// 	loading: Loading,
-// })
-// const TestUrlQueryComponent = Loadable({
-// 	loader: () => import('./modules/test/urlquery/TestUrlQuery'),
-// 	loading: Loading,
-// })
-
-const TPMIndexComponent = Loadable({
-	loader: () => import('./modules/tpm/TPMIndex'),
-	loading: Loading,
-})
-const TPMShixunsIndexComponent = Loadable({
-	loader: () => import('./modules/tpm/shixuns/ShixunsIndex'),
-	loading: Loading,
-})
-
-//实训课程（原实训路径）
-const ShixunPaths = Loadable({
-	loader: () => import('./modules/paths/Index'),
-	loading: Loading,
-})
-
-//在线课堂
-const CoursesIndex = Loadable({
-	loader: () => import('./modules/courses/Index'),
-	loading: Loading,
-})
-const SearchPage = Loadable({
-	loader: () => import('./search/SearchPage'),
-	loading: Loading,
-})
-
-// 课堂讨论
-// const BoardIndex = Loadable({
-//   loader: () => import('./modules/courses/boards/BoardIndex'),
-//   loading:Loading,
-// })
-
-// //课堂普通作业&分组作业
-// const CoursesWorkIndex = Loadable({
-//   loader: () => import('./modules/courses/busyWork/Index'),
-//   loading:Loading,
-// })
-//
-
-// const TPMShixunchildIndexComponent = Loadable({
-//     loader: () => import('./modules/tpm/shixunchild/ShixunChildIndex'),
-//     loading: Loading,
-//   })
-
-
-// const TPMshixunfork_listIndexComponent = Loadable({
-//     loader: () => import('./modules/tpm/shixunchild/Shixunfork_list'),
-//     loading: Loading,
-//   })
-
-
-const ForumsIndexComponent = Loadable({
-	loader: () => import('./modules/forums/ForumsIndex'),
-	loading: Loading,
-})
-
-const ProjectIndex = Loadable({
+//forge项目
+const Projects = Loadable({
 	loader: () => import('./forge/Index'),
 	loading: Loading,
 })
-
-// trustie plus forum
-// const TPForumsIndexComponent = Loadable({
-//   loader: () => import('./modules/tp-forums/TPForumsIndex'),
-//   loading: Loading,
-// })
-
-
-// const TestPageComponent = Loadable({
-//   loader: () => import('./modules/page/Index'),
-//   loading: Loading,
-// })
-
-
-//新建实训
-const Newshixuns = Loadable({
-	loader: () => import('./modules/tpm/newshixuns/Newshixuns'),
+//forge项目-devOps详情
+const OpsDetail = Loadable({
+	loader: () => import('./forge/DevOps/opsDetail'),
 	loading: Loading,
 })
-
-
-//实训首页
-const ShixunsHome = Loadable({
-	loader: () => import('./modules/home/shixunsHome'),
-	loading: Loading,
-})
-
-
-const CompatibilityPageLoadable = Loadable({
-	loader: () => import('./modules/common/CompatibilityPage'),
-	loading: Loading,
-})
-
 //403页面
 const Shixunauthority = Loadable({
 	loader: () => import('./modules/403/Shixunauthority'),
 	loading: Loading,
 })
-
-
 //404页面
 const Shixunnopage = Loadable({
 	loader: () => import('./modules/404/Shixunnopage'),
@@ -231,205 +67,57 @@ const http500 = Loadable({
 	loader: () => import('./modules/500/http500'),
 	loading: Loading,
 })
-
-// 登录注册
-const LoginRegisterPage = Loadable({
-	loader: () => import('./modules/user/LoginRegisterPage'),
-	loading: Loading,
-})
-const AccountPage = Loadable({
-	loader: () => import('./modules/user/AccountPage'),
-	loading: Loading,
-})
-
-// 个人主页
-const UsersInfo = Loadable({
-	loader: () => import('./modules/user/usersInfo/Infos'),
-	loading: Loading,
-})
 const InfosIndex = Loadable({
-	loader: () => import('./modules/user/usersInfo/InfosIndex'),
+	loader: () => import('./forge/users/Index'),
 	loading: Loading,
 })
-// 题库
-const BanksIndex = Loadable({
-	loader: () => import('./modules/user/usersInfo/banks/BanksIndex'),
+// 组织
+const OrganizeIndex = Loadable({
+	loader: () => import('./forge/Team/Index'),
 	loading: Loading,
 })
 
-
-// 教学案例
-const MoopCases =  Loadable({
-	loader: () => import('./modules/moop_cases/index'),
-	loading: Loading,
-})
-
-// 兴趣页面
-const Interestpage = Loadable({
-	loader: () => import('./modules/login/EducoderInteresse'),
-	loading: Loading,
-})
-
-//众包创新
-// const ProjectPackages=Loadable({
-// 	loader: () => import('./modules/projectPackages/ProjectPackageIndex'),
-// 	loading: Loading,
-// })
-
-//竞赛
-const NewCompetitions=Loadable({
-	loader: () => import('./modules/competitions/Competitions'),
-	loading: Loading,
-})
-
-//黑客松定制竞赛
-const Osshackathon=Loadable({
-	loader: () => import('./modules/osshackathon/Osshackathon'),
-	loading: Loading,
-})
-
-const Messagerouting= Loadable({
-	loader: () => import('./modules/message/js/Messagerouting'),
-	loading: Loading,
-})
-
-const Topicbank= Loadable({
-	loader: () => import('./modules/topic_bank/Topic_bank'),
-	loading: Loading,
-})
-
-const Help = Loadable({
-	loader: () => import('./modules/help/Help'),
-	loading: Loading,
-})
-
-const Ecs = Loadable({
-	loader: () => import('./modules/ecs/Ecs'),
-	loading: Loading,
-})
-
-// 添加开发者社区
-const Developer = Loadable({
-	loader: () => import('./modules/developer'),
-	loading: Loading
-})
-// 试题库
-const Headplugselection = Loadable({
-	loader: () => import('./modules/question/Question'),
-	loading: Loading
-})
-
-//试题库新建 //题库编辑
-const Questionitem_banks = Loadable({
-	loader: () => import('./modules/question/Questionitem_banks'),
-	loading: Loading
-})
-
-//试卷库
-const Testpaperlibrary= Loadable({
-	loader: () => import('./modules/testpaper/Testpaperlibrary'),
-	loading: Loading
-})
-//试卷编辑
-const Paperlibraryeditid= Loadable({
-	loader: () => import('./modules/testpaper/Paperlibraryeditid'),
-	loading: Loading
-})
-//试卷查看
-const Paperlibraryseeid= Loadable({
-	loader: () => import('./modules/testpaper/Paperlibraryseeid'),
-	loading: Loading
-})
-//人工组卷
-const Paperreview= Loadable({
-	loader: () => import('./modules/question/Paperreview'),
-	loading: Loading
-})
-
-//智能组卷
-const Integeneration= Loadable({
-	loader: () => import('./modules/testpaper/Intecomponents'),
-	loading: Loading
-})
-
-// 学院统计
-const College = Loadable({
-	loader: () => import('./college/College'),
-	loading: Loading
-})
-
-// 开发者编辑模块
-const NewOrEditTask = Loadable({
-	loader: () => import('./modules/developer/newOrEditTask'),
-	loading: Loading
-});
-// 学员学习
-const StudentStudy = Loadable({
-	loader: () => import('./modules/developer/studentStudy'),
-	loading: Loading
-});
-// 提交记录详情
-const RecordDetail = Loadable({
-	loader: () => import('./modules/developer/recordDetail'),
-	loading: Loading
-});
-// jupyter tpi
-const JupyterTPI = Loadable({
-	loader: () => import('./modules/tpm/jupyter'),
-	loading: Loading
-});
-// 微信代码编辑器
-// const WXCode = Loadable({
-// 	loader: () => import('./modules/wxcode'),
-// 	loading: Loading
-// });
-// //个人竞赛报名
-// const PersonalCompetit = Loadable({
-// 	loader: () => import('./modules/competition/personal/PersonalCompetit.js'),
-// 	loading: Loading,
-// });
 class App extends Component {
 	constructor(props) {
-		super(props)
+		super(props);
 		this.state = {
-			Addcoursestype:false,
-			Addcoursestypes:false,
-			mydisplay:false,
-			occupation:0,
+			Addcoursestype: false,
+			Addcoursestypes: false,
+			mydisplay: false,
+			occupation: 0,
 			mygetHelmetapi: null,
 		}
-
 	}
-	HideAddcoursestypess=(i)=>{
-		console.log("调用了");
+
+	HideAddcoursestypess = (i) => {
 		this.setState({
-			Addcoursestype:false,
-			Addcoursestypes:false,
-			mydisplay:true,
-			occupation:i,
+			Addcoursestype: false,
+			Addcoursestypes: false,
+			mydisplay: true,
+			occupation: i,
 		})
 	};
-	hideAddcoursestypes=()=>{
+	hideAddcoursestypes = () => {
 		this.setState({
-			Addcoursestypes:false
+			Addcoursestypes: false
 		})
 	};
-	ModalCancelsy=()=>{
+	ModalCancelsy = () => {
 		this.setState({
-			mydisplay:false,
+			mydisplay: false,
 		})
 		window.location.href = "/";
 	};
-	ModalshowCancelsy=()=>{
+	ModalshowCancelsy = () => {
 		this.setState({
-			mydisplay:true,
+			mydisplay: true,
 		})
 	};
 
 	disableVideoContextMenu = () => {
-		window.$( "body" ).on( "mousedown", "video",  function(event) {
-			if(event.which === 3) {
-				window.$('video').bind('contextmenu',function () { return false; });
+		window.$("body").on("mousedown", "video", function (event) {
+			if (event.which === 3) {
+				window.$('video').bind('contextmenu', function () { return false; });
 			} else {
 				window.$('video').unbind('contextmenu');
 			}
@@ -438,41 +126,23 @@ class App extends Component {
 	componentDidMount() {
 		document.title = "loading...";
 		this.disableVideoContextMenu();
-		// force an update if the URL changes
 		history.listen(() => {
 			this.forceUpdate()
 			const $ = window.$
-			// https://www.trustie.net/issues/21919 可能会有问题
 			$("html").animate({ scrollTop: $('html').scrollTop() - 0 })
 		});
 
 		initAxiosInterceptors(this.props);
-		// 顶部和底部的动态设置
-		//  this.getAppdata();
-		//
-		// axios.interceptors.response.use((response) => {
-		// 	// console.log("response"+response);
-		// 	if(response!=undefined)
-		// 		// console.log("response"+response.data.statu);
-		// 	if (response&&response.data.status === 407) {
-		// 		this.setState({
-		// 			isRenders: true,
-		// 		})
-		// 	}
-		// 	return response;
-		// }, (error) => {
-		// 	//TODO 这里如果样式变了会出现css不加载的情况
-		// });
+		this.getAppdata();
 
 		window.addEventListener('error', (event) => {
 			const msg = `${event.type}: ${event.message}`;
-			console.log(msg)
 		});
 	}
 	//修改登录方法
-	Modifyloginvalue=()=>{
+	Modifyloginvalue = () => {
 		this.setState({
-			isRender:false,
+			isRender: false,
 		})
 	};
 
@@ -481,12 +151,12 @@ class App extends Component {
 		this.setState({
 			mygetHelmetapi: undefined
 		});
-		document.title = "EduCoder";
+		document.title = "Forge";
 		var link = document.createElement('link'),
 			oldLink = document.getElementById('dynamic-favicon');
 		link.id = 'dynamic-favicon';
 		link.rel = 'shortcut icon';
-		link.href = "/forgeplus-react/build/./favicon.ico";
+		link.href = "/react/build/./favicon.ico";
 		if (oldLink) {
 			document.head.removeChild(oldLink);
 		}
@@ -506,20 +176,18 @@ class App extends Component {
 		}
 		document.head.appendChild(link);
 	}
-  //获取当前定制信息
-	getAppdata=()=>{
+	//获取当前定制信息
+	getAppdata = () => {
 		let url = "/setting.json";
 		axios.get(url).then((response) => {
-			// console.log("app.js开始请求/setting.json");
-			// console.log("获取当前定制信息");
-			if(response){
-				if(response.data){
+			if (response) {
+				if (response.data) {
 					this.setState({
-						mygetHelmetapi:response.data.setting
+						mygetHelmetapi: response.data.setting
 					});
 					//存储配置到游览器
-					localStorage.setItem('chromesetting',JSON.stringify(response.data.setting));
-					localStorage.setItem('chromesettingresponse',JSON.stringify(response));
+					localStorage.setItem('chromesetting', JSON.stringify(response.data.setting));
+					localStorage.setItem('chromesettingresponse', JSON.stringify(response));
 					try {
 						if (response.data.setting.tab_logo_url) {
 							this.gettablogourldata(response);
@@ -529,22 +197,14 @@ class App extends Component {
 					} catch (e) {
 						this.gettablogourlnull();
 					}
-
-
 				} else {
-
 					this.gettablogourlnull();
-
 				}
-
 			} else {
 				this.gettablogourlnull();
-
 			}
-
 		}).catch((error) => {
 			this.gettablogourlnull();
-
 		});
 	};
 
@@ -553,239 +213,62 @@ class App extends Component {
 			<Provider store={store}>
 				<ConfigProvider locale={zhCN}>
 					<MuiThemeProvider theme={theme}>
-						<Accountnewprofile {...this.props}{...this.state}/>
-						<LoginDialog {...this.props} {...this.state}  Modifyloginvalue={()=>this.Modifyloginvalue()}></LoginDialog>
+						<Accountnewprofile {...this.props}{...this.state} />
+						<LoginDialog {...this.props} {...this.state} Modifyloginvalue={() => this.Modifyloginvalue()}></LoginDialog>
 						<Notcompletedysl {...this.props} {...this.state}></Notcompletedysl>
 						<Trialapplicationysl  {...this.props} {...this.state}></Trialapplicationysl>
 						<Trialapplicationreview  {...this.props} {...this.state}></Trialapplicationreview>
-						<Addcourses {...this.props} {...this.state}  HideAddcoursestypess={(i)=>this.HideAddcoursestypess(i)}/>
-						<AccountProfile {...this.props} {...this.state}   />
-						<Certifiedprofessional {...this.props} {...this.state}  ModalCancelsy={this.ModalCancelsy} ModalshowCancelsy={this.ModalshowCancelsy}/>
+						<AccountProfile {...this.props} {...this.state} />
+						<Certifiedprofessional {...this.props} {...this.state} ModalCancelsy={this.ModalCancelsy} ModalshowCancelsy={this.ModalshowCancelsy} />
 						<Router>
 							<Switch>
-
-								{/* 项目 */}
-								<Route path="/projects"
+								{/*项目*/}
+								<Route
+									path={"/projects/:projectId/ops/:opsId/detail"}
 									render={
 										(props) => {
-
-											return (<ProjectIndex {...this.props} {...props} {...this.state} />)
+											return (<OpsDetail {...this.props} {...props} {...this.state} />)
 										}
-									}></Route>
-
-								<Route exact path="/"
-									// component={ShixunsHome}
-									render={
-										(props)=>(<ProjectIndex {...this.props} {...props} {...this.state}></ProjectIndex>)
-									}
-								/>
-								{/*题库*/}
-								<Route path="/topicbank/:username/:topicstype"
-											render={
-												(props) => {
-
-													return (<Topicbank {...this.props} {...props} {...this.state} />)
-												}
-											}></Route>
-								{/*题库*/}
-								<Route path="/topicbank/:topicstype"
-											render={
-												(props) => {
-
-													return (<Topicbank {...this.props} {...props} {...this.state} />)
-												}
-											}></Route>
-								{/*/!*众包创新*!/*/}
-								{/*<Route path={"/crowdsourcing"} component={ProjectPackages}/>*/}
-								{/*竞赛*/}
-								<Route path={"/competitions"}
-											render={
-												(props) => {
-
-													return (<NewCompetitions {...this.props} {...props} {...this.state} />)
-												}
-											}></Route>
-
-								{/*黑客松定制竞赛*/}
+									}>
+								</Route>
+								{/*项目*/}
 								<Route
-									path={"/osshackathon"}
+									path={"/projects"}
 									render={
-										(props)=>{
-											return(
-												<Osshackathon {...this.props} {...props} {...this.state} />
-											)
+										(props) => {
+											return (<Projects {...this.props} {...props} {...this.state} />)
 										}
-									}
-								/>
-
-								{/*认证*/}
-								<Route path="/account" component={AccountPage}/>
-
+									}>
+								</Route>
+								
 								{/*403*/}
-								<Route path="/403" component={Shixunauthority}/>
-
-								<Route path="/500" component={http500}/>
+								<Route path="/403" component={Shixunauthority} />
 
+								<Route path="/500" component={http500} />
+								<Route path={"/organize"}
+									render={
+										(props) => {
+											return (<OrganizeIndex {...this.props} {...props} {...this.state} />)
+										}
+									}>
+								</Route>
 								{/*404*/}
-								<Route path="/nopage" component={Shixunnopage}/>
-
-								<Route path="/compatibility" component={CompatibilityPageLoadable}/>
-								<Route
-									path="/login"
-									render={
-										(props) => {
-
-											return (<EducoderLogin {...this.props} {...props} {...this.state} />)
-										}
-									}
-								/>
-								<Route
-									path="/register"
-									render={
-										(props) => {
-
-											return (<EducoderLogin {...this.props} {...props} {...this.state} />)
-										}
-									}
-								/>
-								<Route
-									path="/otherloginstart" component={Otherloginstart}
-								/>
-								<Route
-									path={"/otherloginqq"} component={Otherloginsqq}
-								/>
-								<Route
-									path="/otherlogin" component={Otherlogin}
-								/>
-								<Route
-									path="/loginqq" component={Loginqq}
-								/>
-
+								<Route path="/nopage" component={Shixunnopage} />
+								{/* 个人主页 */}
 								<Route path="/users/:username"
 									render={
 										(props) => {
-
-											return (<InfosIndex {...this.props} {...props} {...this.state} />)
+											return (<InfosIndex {...this.props} {...this.state} />)
 										}
 								}></Route>
-
-								<Route path="/banks"
-									render={
-										(props) => {
-											return (<BanksIndex {...this.props} {...props} {...this.state} />)
-										}
-								}></Route>
-								{/*<Route*/}
-									{/*path="/personalcompetit"*/}
-									{/*render={*/}
-										{/*(props) => (<PersonalCompetit {...this.props} {...props} {...this.state}></PersonalCompetit>)*/}
-									{/*}*/}
-								{/*/>*/}
-								<Route
-									path="/changepassword"
-									render={
-										(props) => {
-
-											return (<EducoderLogin {...this.props} {...props} {...this.state} />)
-										}
-									}
-								/>
-								{/*<Route*/}
-								{/*	path="/interesse" component={Interestpage}*/}
-
-								{/*/>*/}
-								<Route path="/shixuns/new" component={Newshixuns}>
-								</Route>
-								<Route path="/colleges/:id/statistics"
-											 render={
-												 (props) => (<College  {...this.props} {...props} {...this.state} />)
-											 }/>
-								{/* jupyter */}
-								<Route path="/tasks/:identifier/jupyter/"
-									render={
-										(props) => {
-										return (<JupyterTPI {...this.props} {...props} {...this.state}/>)
-									}
-								}
-								/>
-
-								<Route path="/myproblems/record_detail/:id"
-											 render={
-												 (props) => (<RecordDetail  {...this.props} {...props} {...this.state} />)
-											 }
-								/>
-								<Route
-									path="/problems/:id/edit"
-									render={
-										(props) => (<NewOrEditTask {...this.props} {...props} {...this.state} />)
-									} />
-								<Route path="/Integeneration/:type/:id"
-											 render={
-												 (props) => (<Paperreview  {...this.props} {...props} {...this.state} />)
-											 }/>
-								<Route path="/paperreview/:type"
-											 render={
-												 (props) => (<Paperreview  {...this.props} {...props} {...this.state} />)
-											 }/>
-								<Route path="/paperlibrary/edit/:id"
-											 render={
-												 (props) => (<Paperlibraryeditid  {...this.props} {...props} {...this.state} />)
-											 }/>
-
-								<Route path="/paperlibrary/see/:id"
-											 render={
-												 (props) => (<Paperlibraryseeid  {...this.props} {...props} {...this.state} />)
-											 }/>
-
-								<Route path="/myproblems/:id/:tab?"
-											 render={
-												 (props) => (<StudentStudy  {...this.props} {...props} {...this.state} />)
-											 } />
-								<Route path="/question/edit/:id"
-											 render={
-												 (props) => (<Questionitem_banks  {...this.props} {...props} {...this.state} />)
-											 } />
-
-								<Route path="/question/newitem"
-											 render={
-												 (props) => (<Questionitem_banks  {...this.props} {...props} {...this.state} />)
-											 } />
-								<Route path="/question/:type"
-											 render={
-												 (props) => (<Headplugselection  {...this.props} {...props} {...this.state} />)
-											 } />
-								<Route path="/paperlibrary"
-											 render={
-												 (props) => (<Testpaperlibrary  {...this.props} {...props} {...this.state} />)
-											 }/>
-
-								<Route path="/Integeneration"
-											 render={
-												 (props) => (<Integeneration  {...this.props} {...props} {...this.state} />)
-											 }/>
-
-								<Route path="/problems"
-											 render={
-												 (props) => (<Developer  {...this.props} {...props} {...this.state} />)
-											 }/>
-
-								<Route path="/question"
-											 render={
-												 (props) => (<Headplugselection  {...this.props} {...props} {...this.state} />)
-											 }/>
-								{/*<Route path="/wxcode/:identifier?" component={WXCode}*/}
-								{/*	render={*/}
-								{/*		(props)=>(<WXCode {...this.props} {...props} {...this.state}></WXCode>)*/}
-								{/*	}*/}
-								{/*/>*/}
 								<Route exact path="/"
-											// component={ShixunsHome}
-											render={
-												(props)=>(<ShixunsHome {...this.props} {...props} {...this.state}></ShixunsHome>)
-											}
+									render={
+										(props) => (
+											<Projects {...this.props} {...props} {...this.state}></Projects>
+										)
+									}
 								/>
-								<Route component={Shixunnopage}/>
-
+								<Route component={Shixunnopage} />
 							</Switch>
 						</Router>
 					</MuiThemeProvider>
@@ -906,4 +389,4 @@ moment.defineLocale('zh-cn', {
 		doy: 4  // The week that contains Jan 4th is the first week of the year.
 	}
 });
-export default SnackbarHOC()(App) ;
+export default SnackbarHOC()(App);

src/AppConfig.js

@@ -1,420 +1,194 @@
-import React from "react";
-
 import axios from 'axios';
-import md5 from 'md5';
 import { requestProxy } from "./indexEduplus2RequestProxy";
-import { broadcastChannelOnmessage ,SetAppModel, isDev, queryString } from 'educoder';
-import {  notification } from 'antd';
+import { broadcastChannelOnmessage , isDev, queryString } from 'educoder';
+import { notification } from 'antd';
 import cookie from 'react-cookies';
 import './index.css';
 const $ = window.$;
-const opens ="79e33abd4b6588941ab7622aed1e67e8";
 let timestamp;
 let checkSubmitFlg = false;
-let message501=false;
+let message501 = false;
 
 broadcastChannelOnmessage('refreshPage', () => {
-    window.location.reload()
+  window.location.reload()
 })
 
-function locationurl(list){
+function locationurl(list) {
   if (window.location.port === "3007") {
 
   } else {
-      window.location.href=list
+    window.location.href = list
   }
 }
-
-
-
-
-
 // TODO 开发期多个身份切换
- let debugType =""
+let debugType = ""
 if (isDev) {
   const _search = window.location.search;
   let parsed = {};
   if (_search) {
     parsed = queryString.parse(_search);
   }
-  debugType = window.location.search.indexOf('debug=t') != -1 ? 'teacher' :
-    window.location.search.indexOf('debug=s') != -1 ? 'student' :
-      window.location.search.indexOf('debug=a') != -1 ? 'admin' : parsed.debug || 'admin'
+  debugType = window.location.search.indexOf('debug=t') !== -1 ? 'teacher' :
+    window.location.search.indexOf('debug=s') !== -1 ? 'student' :
+      window.location.search.indexOf('debug=a') !== -1 ? 'admin' : parsed.debug || 'admin'
 }
-// 超管
-// debugType="admin";
-// 老师
-//debugType="teacher";
-// 学生
-//debugType="student";
-
-
-
-
-
 function clearAllCookie() {
-  cookie.remove('_educoder_session', {path: '/'});
-  cookie.remove('autologin_trustie', {path: '/'});
+  cookie.remove('_educoder_session', { path: '/' });
+  cookie.remove('autologin_trustie', { path: '/' });
   setpostcookie()
 }
 clearAllCookie();
 function setpostcookie() {
 
-  const  str =window.location.pathname;
-  // console.log(str.indexOf("/wxcode"))
-  let newdomain=".educoder.net"
-  if(str.indexOf("/wxcode") !== -1){
+  const str = window.location.pathname;
+  let newdomain = ".educoder.net"
+  if (str.indexOf("/wxcode") !== -1) {
     console.log("123")
-    cookie.remove('_educoder_session', {path: '/'});
-    cookie.remove('autologin_trustie', {path: '/'});
-    // console.log("开始重写cookis");
+    cookie.remove('_educoder_session', { path: '/' });
+    cookie.remove('autologin_trustie', { path: '/' });
     const _params = window.location.search;
-    // console.log("1111");
     if (_params) {
-      // console.log("22222");
       let _search = _params.split('?')[1];
-      let _educoder_sessions= _search.split('&')[0].split('=');
-       cookie.save('_educoder_session',_educoder_sessions[1], { domain:'.educoder.net', path: '/'});
-      let autologin_trusties=_search.split('&')[1].split('=');
-        cookie.save('autologin_trustie',autologin_trusties[1], { domain:'.educoder.net', path: '/'});
+      let _educoder_sessions = _search.split('&')[0].split('=');
+      cookie.save('_educoder_session', _educoder_sessions[1], { domain: '.educoder.net', path: '/' });
+      let autologin_trusties = _search.split('&')[1].split('=');
+      cookie.save('autologin_trustie', autologin_trusties[1], { domain: '.educoder.net', path: '/' });
 
     }
   }
 }
 setpostcookie();
 
-
- function railsgettimes(proxy) {
-
-   clearAllCookie()
-
-     if(timestamp&&checkSubmitFlg===false){
-       $.ajax({url:proxy,async:false,success:function(data){
-           if(data.status===0){
-             timestamp=data.message;
-             setpostcookie();
-           }
-         }})
-       checkSubmitFlg=true
-       window.setTimeout(()=>{
-         checkSubmitFlg=false;
-       }, 2000);
-     }else if(checkSubmitFlg===false){
-       $.ajax({url:proxy,async:false,success:function(data){
-           if(data.status===0){
-             timestamp=data.message;
-             setpostcookie();
-           }
-         }})
-       checkSubmitFlg=true
-       window.setTimeout( ()=>{
-         checkSubmitFlg=false;
-       }, 2000);
-     }
-
-}
-
-
-
-
-
 window._debugType = debugType;
 export function initAxiosInterceptors(props) {
-    initOnlineOfflineListener()
+  initOnlineOfflineListener()
+  // TODO 避免重复的请求 https://github.com/axios/axios#cancellation
+  var 
+  proxy = "http://localhost:3000"
+  proxy = "http://39.105.176.215:49999"
 
-    // TODO 避免重复的请求 https://github.com/axios/axios#cancellation
-    //      https://github.com/axios/axios/issues/1497
+  const requestMap = {};
+  window.setfalseInRequestMap = function (keyName) {
+    requestMap[keyName] = false;
+  }
+  //响应前的设置
+  axios.interceptors.request.use(
+    config => {
+      setpostcookie()
+      clearAllCookie()
 
-    // TODO 读取到package.json中的配置？
-			var proxy = "http://localhost:3000"
-			// proxy = "http://testbdweb.trustie.net"
-			// proxy = "http://testbdweb.educoder.net"
-			// proxy = "https://testeduplus2.educoder.net"
-			//proxy="http://47.96.87.25:48080"
-			// proxy="https://pre-newweb.educoder.net"
-      // proxy="https://test-newweb.educoder.net"
-      // proxy="https://test-jupyterweb.educoder.net"
-      // proxy="https://test-newweb.educoder.net"
-      // proxy="https://test-jupyterweb.educoder.net"
-	     //proxy="http://192.168.2.63:3001"
+      if (config.url.indexOf(proxy) !== -1 || config.url.indexOf(':') !== -1) {
+        return config
+      }
+      requestProxy(config)
 
-			var //proxy = "http://localhost:3000"
-               // proxy="http://123.59.135.93:56666"
-            proxy="http://localhost:3000"
+      let url = `/api${config.url}`;
 
-    // 在这里使用requestMap控制，避免用户通过双击等操作发出重复的请求；
-    // 如果需要支持重复的请求，考虑config里面自定义一个allowRepeat参考来控制
-    const requestMap = {};
+      if (`${config[0]}` !== `true`) {
+        if (window.location.port === "3007") {
+          config.url = `${proxy}${url}`;
+          if (config.url.indexOf('?') === -1) {
+            config.url = `${config.url}?debug=${debugType}`;
+          } else {
+            config.url = `${config.url}&debug=${debugType}`;
+          }
+        } else {
+          config.url = url;
+        }
+        setpostcookie();
+      }
+      if (config.url.indexOf('update_file') === -1) {
+        requestMap[config.url] = true;
 
-    window.setfalseInRequestMap = function(keyName) {
-        requestMap[keyName] = false;
+        window.setTimeout("setfalseInRequestMap('" + config.url + "')", 900)
+      }
+      return config;
+    },
+    err => {
+      return Promise.reject(err);
+    });
+
+  axios.interceptors.response.use(function (response) {
+
+    // console.log(".............")
+    if (response === undefined) {
+      return
+    }
+    const config = response.config
+    if (response.data.status === -1) {
+      if (window.location.pathname.startsWith('/tasks/')) {
+        props.showSnackbar(response.data.message || '服务器异常，请联系管理员。')
+      } else {
+        notification.open({
+          message: "提示",
+          description: response.data.message || '服务器异常，请联系管理员。',
+          style: {
+            zIndex: 99999999
+          },
+        });
+      }
+
+      throw new axios.Cancel('Operation canceled by the user.');
     }
 
-     //响应前的设置
-    axios.interceptors.request.use(
-        config => {
-            setpostcookie()
-            clearAllCookie()
-            // config.headers['Content-Type']= 'no-cache'
-            // if (token) {  // 每次发送请求之前判断是否存在token，如果存在，则统一在http请求的header都加上token，不用每次请求都手动添加了
-            //     config.headers.Authorization = token;
-            // }
+    if (response.data.status === 403 || response.data.status === "403") {
 
-            // ---------------------------------------------    測試3007连测试服的代码
-            // if (url.indexOf('file_update') != -1 || url.indexOf('game_build') != -1 || url.indexOf('game_status') != -1) {
-            //     proxy = 'https://testbdweb.trustie.net'
-            // } else {
-            //     proxy = 'http://localhost:3000'
-            // }
-            // ---------------------------------------------
-					  // console.log("开始请求了");
-					  // console.log(config.url);
-					  // console.log(window.location.pathname);
-					  //
+      locationurl('/403');
+    }
 
-					// try {
-					// 	const  str =window.location.pathname;
-					// 	if(str.indexOf("/wxcode") !== -1){
-					// 		// console.log("开始重写cookis");
-					// 		const _params = window.location.search;
-					// 		// console.log("1111");
-					// 		if (_params) {
-					// 			// console.log("22222");
-					// 			let _search = _params.split('?')[1];
-					// 			var  _educoder_sessionmys="";
-					// 			var  autologin_trusties="";
-					// 			_search.split('&').forEach(item => {
-					// 				const _arr = item.split('=');
-					// 				if(_arr[0]==='_educoder_session'){
-					// 					cookie.save('_educoder_session',_arr[1], { domain: '.educoder.net', path: '/'});
-					// 					_educoder_sessionmys=_arr[1];
-					// 				}else{
-					// 					cookie.save('autologin_trustie',_arr[1], { domain: '.educoder.net', path: '/'});
-					// 					autologin_trusties=_arr[1];
-					// 				}
-					// 			});
-					// 			try {
-					// 				const autlogins= `_educoder_session=${_educoder_sessionmys}; autologin_trustie=${autologin_trusties} `;
-					// 				config.params = {'Cookie': autlogins}
-					// 				config.headers['Cookie'] =autlogins;
-          //          // console.log("设置了cookis");
-					// 			}	catch (e) {
-					//
-					// 			}
-					// 			try {
-					// 				const autloginysls= `_educoder_session=${_educoder_sessionmys}; autologin_trustie=${autologin_trusties} `;
-					// 				config.params = {'autloginysls': autloginysls}
-					// 				config.headers['Cookie'] =autloginysls;
-					// 				// console.log("设置了cookis");
-					// 			}catch (e) {
-					//
-					// 			}
-					// 		}
-					// 	}
-					// }catch (e) {
-					//
-					// }
+    if (response.data.status === 404) {
+      locationurl('/nopage');
+    }
 
+    if (response.data.status === 500) {
+      locationurl('/500');
+    }
 
-
-            if (config.url.indexOf(proxy) != -1 || config.url.indexOf(':') != -1) {
-                return config
-            }
-            requestProxy(config)
-
-            let url = `/api${config.url}`;
-
-            //qq登录去掉api
-					  	 if(config.params&&config.params.redirect_uri!=undefined){
-								if(config.params.redirect_uri.indexOf('otherloginqq')!=-1){
-									url = `${config.url}`;
-								}
-							}
-            if(`${config[0]}`!=`true`){
-                let timestamp = Date.parse(new Date())/1000;
-                if (window.location.port === "3007") {
-                  // let timestamp=railsgettimes(proxy);
-                 // console.log(timestamp)
-                 // `https://api.m.taobao.com/rest/api3.do?api=mtop.common.getTimestamp`
-                  railsgettimes( `${proxy}/api/main/first_stamp.json`);
-                  let newopens=md5(opens+timestamp)
-                    config.url = `${proxy}${url}`;
-                    if (config.url.indexOf('?') == -1) {
-                        config.url = `${config.url}?debug=${debugType}&randomcode=${timestamp}&client_key=${newopens}`;
-                    } else {
-                        config.url = `${config.url}&debug=${debugType}&randomcode=${timestamp}&client_key=${newopens}`;
-                    }
-                } else {
-                    // 加api前缀
-                  // railsgettimes(`http://api.m.taobao.com/rest/api3.do?api=mtop.common.getTimestamp`);
-
-                  railsgettimes( `/api/main/first_stamp.json`);
-                  let newopens=md5(opens+timestamp)
-                  config.url = url;
-                  if (config.url.indexOf('?') == -1) {
-                    config.url = `${config.url}?randomcode=${timestamp}&client_key=${newopens}`;
-                  } else {
-                    config.url = `${config.url}&randomcode=${timestamp}&client_key=${newopens}`;
-                  }
-                }
-              setpostcookie();
-            }
-            //
-					// console.log(config);
-					if (config.method === "post") {
-						if (requestMap[config.url] === true) { // 避免重复的请求  导致页面f5刷新 也会被阻止  显示这个方法会影响到定制信息
-							// console.log(config);
-							// console.log(JSON.parse(config));
-							// console.log(config.url);
-							// console.log("被阻止了是重复请求=================================");
-							return false;
-						}
-					}
-            // 非file_update请求
-            if (config.url.indexOf('update_file') === -1) {
-                requestMap[config.url] = true;
-
-                window.setTimeout("setfalseInRequestMap('"+config.url+"')", 900)
-            }
-            // setTimeout("setfalseInRequestMap(" + config.url + ")", 1200)
-            return config;
-        },
-        err => {
-            return Promise.reject(err);
-        });
-
-    axios.interceptors.response.use(function (response) {
-
-        // console.log(".............")
-        if(response===undefined){
-           return
-       }
-       const config = response.config
-        if (response.data.status === -1) {
-        //     console.error('error:', response.data.message)
-        //     throw new Error()
-
-        // https://github.com/axios/axios/issues?utf8=%E2%9C%93&q=cancel+request+in+response+interceptors+
-        // https://github.com/axios/axios/issues/583
-            // message.info(response.data.message || '服务端返回status -1，请联系管理员。');
-            // props.showSnackbar( response.data.message || '服务器异常，请联系管理员。' )
-            if (window.location.pathname.startsWith('/tasks/')) {
-                props.showSnackbar( response.data.message || '服务器异常，请联系管理员。' )
-            } else {
-                notification.open({
-                    message:"提示",
-                    description: response.data.message || '服务器异常，请联系管理员。',
-                    style: {
-                    zIndex: 99999999
-                  },
-                });
-                // notification['error']({
-                //   message:"提示",
-                //   description: response.data.message || '服务器异常，请联系管理员。',
-                // });
-            }
-
-            throw new axios.Cancel('Operation canceled by the user.');
-        } else {
-            // hash跳转
-            // var hash = window.location.hash;
-						// if (hash) {
-						// 	hashTimeout && window.clearTimeout(hashTimeout)
-						// 	hashTimeout = setTimeout(() => {
-						// 		var element = document.querySelector(hash);
-						// 		if (element) {
-						// 			element.scrollIntoView();
-						// 		}
-						// 	}, 400)
-						// }
-        }
-        // if(response.data.status === 401){
-        //   console.log("401401401")
-        // }
-        if (response.data.status === 403||response.data.status === "403") {
-
-           locationurl('/403');
-        }
-
-        if (response.data.status === 404) {
-            locationurl('/nopage');
-        }
-
-        if (response.data.status === 500) {
-            locationurl('/500');
-        }
-
-        if (response.data.status === 501) {
-          if(message501===false){
-            message501=true
-            notification.open({
-              message:"提示",
-              description:response.data.message || '访问异常，请求不合理',
-              style: {
-                zIndex: 99999999
-              }
-            })
+    if (response.data.status === 501) {
+      if (message501 === false) {
+        message501 = true
+        notification.open({
+          message: "提示",
+          description: response.data.message || '访问异常，请求不合理',
+          style: {
+            zIndex: 99999999
           }
-          window.setTimeout(function () {
-              message501=false
-          }, 2000);
-        }
+        })
+      }
+      window.setTimeout(function () {
+        message501 = false
+      }, 2000);
+    }
 
 
-        // if (response.data.status === 402) {
-        //   console.log(response.data.status);
-        //   console.log(response.data);
-        //   // locationurl(402);
-        // }
-
-        //
-				// if (response.data.status === 401) {
-        //   console.log("161");
-        //   console.log(config);
-				// 	return config;
-				// }
-        // if (response.data.status === 407) {
-        // 在app js 中解决   Trialapplication
-        //     // </Trialapplication>
-        // ///在appjs
-        //     notification.open({
-        //         message:"提示",
-        //         description: "账号未认证",
-        //     });
-        //  throw new axios.Cancel('Operation canceled by the user.');
-        // //
-        // }
-
-        requestMap[response.config.url] = false;
-        setpostcookie();
-        return response;
-    }, function (error) {
-        return Promise.reject(error);
-    });
-// -----------------------------------------------------------------------------------
-
+    requestMap[response.config.url] = false;
+    setpostcookie();
+    return response;
+  }, function (error) {
+    return Promise.reject(error);
+  });
 }
 
 
 function initOnlineOfflineListener() {
-    const $ = window.$
-    $(window).bind("online", () => {
-        notification.destroy()
-        notification.success({
-            duration: 2,
-            message: '网络恢复正常',
-            description:
-            '网络恢复正常，感谢使用。',
-        })
-    });
-    $(window).bind("offline", () => {
-        notification.destroy()
+  const $ = window.$
+  $(window).bind("online", () => {
+    notification.destroy()
+    notification.success({
+      duration: 2,
+      message: '网络恢复正常',
+      description:
+        '网络恢复正常，感谢使用。',
+    })
+  });
+  $(window).bind("offline", () => {
+    notification.destroy()
 
-        notification.warning({
-            duration: null,
-            message: '网络异常',
-            description:
-            '网络异常，请检测网络后重试。',
-        })
-    });
+    notification.warning({
+      duration: null,
+      message: '网络异常',
+      description:
+        '网络异常，请检测网络后重试。',
+    })
+  });
 }

src/Loading.js

@@ -5,17 +5,16 @@ import { BrowserRouter as Router, Route, Link } from "react-router-dom";
 import { Spin } from 'antd';
 
 class Loading extends Component {
-  componentDidUpdate(prevProps, prevState) {
-	if (!prevProps.error && this.props.error) {
-		console.log(this.props.error)
-		window.location.reload()
+	componentDidUpdate(prevProps, prevState) {
+		if (!prevProps.error && this.props.error) {
+			console.log(this.props.error)
+		}
 	}
-  }
-  
-  render() {
-  	// Loading
-    return (
-      <div className="App" style={{minHeight: '800px',width:"100%"}}>
+
+	render() {
+		// Loading
+		return (
+			<div className="App" style={{ minHeight: '800px', width: "100%" }}>
 				<style>
 					{
 						`
@@ -25,10 +24,10 @@ class Loading extends Component {
 						`
 					}
 				</style>
-				<Spin size="large" className={"margintop"}/>
-      </div>
-    );
-  }
+				<Spin size="large" className={"margintop"} />
+			</div>
+		);
+	}
 }
 
 export default Loading;

src/app-test.jsx

@@ -0,0 +1,9 @@
+import React from 'react'
+import MiniPagination from './components/mini-pagination'
+
+export default () => {
+  function onPageChange(page) {
+    console.log(page, '-----------')
+  }
+  return <MiniPagination onChange={onPageChange} current={1} total={100} pageSize={16} />
+}

src/college/College.js

@@ -29,7 +29,7 @@ class College extends Component {
 					align: 'center',
 					className: "edu-txt-center font-14 maxnamewidth247",
 					render: (text, record) => (
-						<a href={`/courses/${record.id}/students`} title={record.name} target="_blank" className="d-inline-block text-truncate maxnamewidth247"
+						<a href={`/classrooms/${record.id}/students`} title={record.name} target="_blank" className="d-inline-block text-truncate maxnamewidth247"
 							 style={{
 								 maxWidth:'220px',
 								 color:'#007bff',
@@ -895,7 +895,7 @@ class College extends Component {
 								共建实训
 							</p>
 							<p className="yslstatistic-base-item-label">
-								实习报告
+								实训报告
 							</p>
 							<p className="yslstatistic-base-item-label">
 								学员实战时间
@@ -907,7 +907,7 @@ class College extends Component {
 						<div className="jibenshiyong100 sortinxdirection yinyin">
 							<div className="yslstatistic-base-item-labels">
 								{
-									teachers_count?
+									teachers_count || teachers_count===0?
 										<div className="yslstatistic-base-item-labelsp"> {teachers_count}<span className="yslstatistic-base-item-labelsspan">人</span></div>
 										:
 										<Spin/>
@@ -915,7 +915,7 @@ class College extends Component {
 							</div>
 							<div className="yslstatistic-base-item-labels">
 								{
-									students_count?
+									students_count || students_count===0?
 										<div className="yslstatistic-base-item-labelsp">{students_count}<span  className="yslstatistic-base-item-labelsspan">人</span></div>
 										:
 										<Spin/>
@@ -923,7 +923,7 @@ class College extends Component {
 							</div>
 							<div className="yslstatistic-base-item-labels">
 								{
-									courses_count?
+									courses_count || courses_count === 0?
 										<div className="yslstatistic-base-item-labelsp">{courses_count}<span  className="yslstatistic-base-item-labelsspan">个</span></div>
 										:
 										<Spin/>
@@ -931,7 +931,7 @@ class College extends Component {
 							</div>
 							<div className="yslstatistic-base-item-labels">
 								{
-									shixuns_count?
+									shixuns_count || shixuns_count === 0?
 										<div className="yslstatistic-base-item-labelsp">{shixuns_count}<span  className="yslstatistic-base-item-labelsspan">个</span></div>
 										:
 										<Spin/>
@@ -939,7 +939,7 @@ class College extends Component {
 							</div>
 							<div className="yslstatistic-base-item-labels">
 								{
-									shixun_report_count?
+									shixun_report_count || shixun_report_count===0?
 										<div className="yslstatistic-base-item-labelsp">{shixun_report_count}<span  className="yslstatistic-base-item-labelsspan">个</span></div>
 										:
 										<Spin/>
@@ -947,8 +947,8 @@ class College extends Component {
 							</div>
 							<div className="yslstatistic-base-item-labels">
 								{
-									shixun_time?
-										<div className="yslstatistic-base-item-labelsp">{shixun_time}<span  className="yslstatistic-base-item-labelsspan">天</span></div>
+									shixun_time || shixun_time === 0 ?
+										<div className="yslstatistic-base-item-labelsp">{shixun_time}<span  className="yslstatistic-base-item-labelsspan">分钟</span></div>
 										:
 										<Spin/>
 								}

src/college/colleagecss/colleage.css

@@ -1,112 +1,129 @@
 .yslstatistic-header {
-    width: 100%;
-    height: 240px;
-    background-image: url('/images/educoder/statistics.jpg');
-    background-size: 100% 100%;
-}
-.yslborder{
-    border: 1px solid;
-}
-.yslstatistic-header-title{
-    flex: 1;
-    display: flex;
-    align-items: center;
-    color: #4CACFF;
-    font-size: 32px;
-}
-.yslstatistic-header-content{
-    width: 100%;
-    display: flex;
-    justify-content: space-around;
-}
-.yslstatistic-header-item{
-    margin-bottom: 22px;
-    display: flex;
-    flex-direction: column;
-    align-items: center;
-    color: #fff;
-}
-.yslstatistic-header-item-label{
-    color: #989898;
+  width: 100%;
+  height: 240px;
+  background-image: url('/images/educoder/statistics.jpg');
+  background-size: 100% 100%;
 }
 
-.yslstatistic-base-item-label{
-    width: 217px;
-    text-align: center;
-    font-size: 16px;
-    height: 48px;
-    line-height: 48px;
-    color: #686868;
-    background: #F5F5F5;
-    border-top: 1px solid #EBEBEB;
-}
-.yslstatistic-base-item-labels{
-    width: 217px;
-    text-align: center;
-    height: 100px;
-    line-height: 100px;
-    background: #ffffff;
-    border-top: 1px solid #EBEBEB;
-    border-bottom: 1px solid #EBEBEB;
-}
-.yslstatistic-base-item-labelsp{
-    color: #000000;
-    font-size: 24px;
-}
-.yslstatistic-base-item-labelsspan{
-    color: #000000;
-    margin-left: 5px;
-    font-size: 16px;
-}
-.jibenshiyong100{
-    width: 100%;
+.yslborder {
+  border: 1px solid;
 }
 
-.yslstatistic-header-item-content{
-    font-size: 24px;
+.yslstatistic-header-title {
+  flex: 1;
+  display: flex;
+  align-items: center;
+  color: #4CACFF;
+  font-size: 32px;
 }
+
+.yslstatistic-header-content {
+  width: 100%;
+  display: flex;
+  justify-content: space-around;
+}
+
+.yslstatistic-header-item {
+  margin-bottom: 22px;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  color: #fff;
+}
+
+.yslstatistic-header-item-label {
+  color: #989898;
+}
+
+.yslstatistic-base-item-label {
+  width: 217px;
+  text-align: center;
+  font-size: 16px;
+  height: 48px;
+  line-height: 48px;
+  color: #686868;
+  background: #F5F5F5;
+  border-top: 1px solid #EBEBEB;
+}
+
+.yslstatistic-base-item-labels {
+  width: 217px;
+  text-align: center;
+  height: 100px;
+  line-height: 100px;
+  background: #ffffff;
+  border-top: 1px solid #EBEBEB;
+  border-bottom: 1px solid #EBEBEB;
+}
+
+.yslstatistic-base-item-labelsp {
+  color: #000000;
+  font-size: 24px;
+}
+
+.yslstatistic-base-item-labelsspan {
+  color: #000000;
+  margin-left: 5px;
+  font-size: 16px;
+}
+
+.jibenshiyong100 {
+  width: 100%;
+}
+
+.yslstatistic-header-item-content {
+  font-size: 24px;
+}
+
 /* 中间居中 */
-.intermediatecenter{
-    display: flex;
-    flex-direction: column;
-    align-items: center;
-    justify-content: center;
+.intermediatecenter {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
 }
+
 /* 简单居中 */
-.intermediatecenterysls{
-    display: flex;
-    align-items: center;
+.intermediatecenterysls {
+  display: flex;
+  align-items: center;
 }
-.spacearound{
-    display: flex;
-    justify-content: space-around;
+
+.spacearound {
+  display: flex;
+  justify-content: space-around;
 
 }
-.spacebetween{
-    display: flex;
-    justify-content: space-between;
+
+.spacebetween {
+  display: flex;
+  justify-content: space-between;
 }
+
 /* 头顶部居中 */
-.topcenter{
-    display: -webkit-flex;
-    flex-direction: column;
-    align-items: center;
+.topcenter {
+  display: -webkit-flex;
+  flex-direction: column;
+  align-items: center;
 
 }
 
 
 /* x轴正方向排序 */
 /* 一 二 三 四 五 六 七 八 */
-.sortinxdirection{
-    display: flex;
-    flex-direction:row;
+.sortinxdirection {
+  display: flex;
+  flex-direction: row;
+  align-items: center;
 }
+
 /* x轴反方向排序 */
 /* 八    七   六  五   四  三  二 一 */
-.xaxisreverseorder{
-    display: flex;
-    flex-direction:row-reverse;
+.xaxisreverseorder {
+  display: flex;
+  flex-direction: row-reverse;
 }
+
 /* 垂直布局 正方向*/
 /* 一
  二
@@ -116,98 +133,118 @@
  六
  七
  八 */
-.verticallayout{
-    display: flex;
-    flex-direction:column;
+.verticallayout {
+  display: flex;
+  flex-direction: column;
 }
+
 /* 垂直布局 反方向*/
-.reversedirection{
-    display: flex;
-    flex-direction:column-reverse;
+.reversedirection {
+  display: flex;
+  flex-direction: column-reverse;
 }
 
-.h4{
-    font-size: 1.5rem;
-    font-weight: 500 !important;
-}
-.ysllinjibenshiyong{
-    font-weight: 500;
-    line-height: 1.2;
-    padding: 2rem 1.25rem;
-    border-bottom: unset;
-    background:#fff;
-}
-.linjibenshiyong{
-    font-weight: 500;
-    line-height: 1.2;
-    padding: 2rem 1.25rem;
-    border-bottom: unset;
-    background:#fff;
-    box-shadow:0px 6px 12px 0px rgba(0,0,0,0.1);
-    border-radius:2px;
-}
-.yslslinjibenshiyong{
-    font-weight: 500;
-    line-height: 1.2;
-    border-bottom: unset;
-    box-shadow:0px 6px 12px 0px rgba(0,0,0,0.1);
-    border-radius:2px;
-}
-.yinyin{
-    background: #fff;
-    box-shadow:0px 6px 12px 0px rgba(0,0,0,0.1);
-    border-radius:2px;
-}
-.edu-back-eeee{
-    background:#EEEEEE !important;
-}
-.mt-4{
-    margin-top: 1.5rem !important;
+.h4 {
+  font-size: 1.5rem;
+  font-weight: 500 !important;
 }
 
-.statistic-label{
-    padding: 2rem 1.25rem;
-    font-size: 1.5rem;
-    font-weight: 400 !important;
-}
-.mb50{
-    padding-bottom: 50px !important;
-}
-.mt40{
-    margin-top: 40px;
-}
-.mb80{
-    margin-bottom: 80px;
-}
-.task-hide{overflow:hidden; white-space: nowrap; text-overflow:ellipsis;}
-a:hover{
-    color:#0056b3;
-}
-.color-blue{
-    color: #4CACFF;
+.ysllinjibenshiyong {
+  font-weight: 500;
+  line-height: 1.2;
+  padding: 2rem 1.25rem;
+  border-bottom: unset;
+  background: #fff;
 }
 
-.color-huang{
-    color:#ffc107 !important
+.linjibenshiyong {
+  font-weight: 500;
+  line-height: 1.2;
+  padding: 2rem 1.25rem;
+  border-bottom: unset;
+  background: #fff;
+  box-shadow: 0px 6px 12px 0px rgba(0, 0, 0, 0.1);
+  border-radius: 2px;
 }
-.maxnamewidth105{
-    max-width: 105px;
-    overflow:hidden;
-    text-overflow:ellipsis;
-    white-space:nowrap;
-    cursor: default;
+
+.yslslinjibenshiyong {
+  font-weight: 500;
+  line-height: 1.2;
+  border-bottom: unset;
+  box-shadow: 0px 6px 12px 0px rgba(0, 0, 0, 0.1);
+  border-radius: 2px;
 }
-.maxnamewidth247{
-    max-width: 247px;
-    overflow:hidden;
-    text-overflow:ellipsis;
-    white-space:nowrap;
-    cursor: default;
+
+.yinyin {
+  background: #fff;
+  box-shadow: 0px 6px 12px 0px rgba(0, 0, 0, 0.1);
+  border-radius: 2px;
 }
-.maxnamewidth340{
-    max-width: 340px;
-    overflow:hidden;
-    text-overflow:ellipsis;
-    white-space:nowrap;
-    cursor: default;
+
+.edu-back-eeee {
+  background: #EEEEEE !important;
 }
+
+.mt-4 {
+  margin-top: 1.5rem !important;
+}
+
+.statistic-label {
+  padding: 2rem 1.25rem;
+  font-size: 1.5rem;
+  font-weight: 400 !important;
+}
+
+.mb50 {
+  padding-bottom: 50px !important;
+}
+
+.mt40 {
+  margin-top: 40px;
+}
+
+.mb80 {
+  margin-bottom: 80px;
+}
+
+.task-hide {
+  overflow: hidden;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+}
+
+a:hover {
+  color: #0056b3;
+}
+
+.color-blue {
+  color: #4CACFF;
+}
+
+.color-huang {
+  color: #ffc107 !important
+}
+
+.maxnamewidth105 {
+  max-width: 105px;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  cursor: default;
+}
+
+.maxnamewidth247 {
+  max-width: 247px;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  cursor: default;
+}
+
+.maxnamewidth340 {
+  max-width: 340px;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  cursor: default;
+}

src/common/DateUtil.js

@@ -38,6 +38,36 @@ export function getNextHalfHourOfMoment(moment) {
   return moment
 }
 
+ export function formatSeconds(value) {
+
+          var theTime = parseInt(value);// 秒
+          var middle= 0;// 分
+          var hour= 0;// 小时
+      
+          if(theTime > 60) {
+              middle= parseInt(theTime/60);
+              theTime = parseInt(theTime%60);
+              if(middle> 60) {
+                  hour= parseInt(middle/60);
+                  middle= parseInt(middle%60);
+              }
+          }
+          var result = ""+parseInt(theTime)+"秒";
+          if(middle > 0) {
+            if(hour>0){
+              result = ""+parseInt(middle)+"分";
+            }else{
+              result = ""+parseInt(middle)+"分"+result;
+            }
+              
+          }
+          if(hour> 0) {
+              result = ""+parseInt(hour)+"小时"+result;
+          }
+          return result;
+      }
+  
+
 export function formatDuring(mss){
   var days = parseInt(mss / (1000 * 60 * 60 * 24));
   var hours = parseInt((mss % (1000 * 60 * 60 * 24)) / (1000 * 60 * 60));
@@ -66,4 +96,4 @@ export function formatDuring(mss){
 
 	}
   return days + "天" + hours + "小时" + minutes + "分";
-}
+}

src/common/LoadingSpin.js

@@ -21,9 +21,9 @@ class LoadingSpin extends Component{
             }
           `}
 				</style>
-				<Spin tip="正在获取相关数据..."/>
+				<Spin/>
 			</div>
 		)
 	}
 }
-export default LoadingSpin;
+export default LoadingSpin;

src/common/LogUtil.js

@@ -17,14 +17,14 @@ const timeStamp = () => {
 /*
     带trace的、默认折叠起来的控制台输出
     第一个参数最好传入string类型的标识，接着可以跟任意类型任意个数的参数，各个参数都会打印到控制台
-*/ 
+*/
 export function trace_collapse(content) {
     if (console.groupCollapsed) {
-        console.groupCollapsed(typeof content == 'string' ? content : 'trace_collapse');
-        log.trace(arguments);
-        console.groupEnd();
+        // console.groupCollapsed(typeof content == 'string' ? content : 'trace_collapse');
+        // log.trace(arguments);
+        // console.groupEnd();
     } else {
-        trace(content)
+        // trace(content)
     }
 }
 

src/common/SnackbarHOC.js

@@ -2,19 +2,23 @@ import React, { Component } from 'react';
 import Snackbar from 'material-ui/Snackbar';
 import Fade from 'material-ui/transitions/Fade';
 import { notification } from 'antd'
+
+const snackbarProp = { 'aria-describedby': 'message-id' }
+
 export function SnackbarHOC(options = {}) {
 	return function wrap(WrappedComponent) {
-	    return class Wrapper extends Component {
-	      	constructor(props) {
-		        super(props);
-		       	this.showSnackbar = this.showSnackbar.bind(this)
-		        this.state = {
-		        	 snackbarText: '',
-		        	 snackbarOpen: false,
-		        }
-	      	}
+		return class Wrapper extends Component {
+			constructor(props) {
+				super(props);
+				this.showSnackbar = this.showSnackbar.bind(this)
+				this.handleSnackbarClose = this.handleSnackbarClose.bind(this)
+				this.state = {
+					snackbarText: '',
+					snackbarOpen: false,
+				}
+			}
 
-	      	handleSnackbarClose() {
+			handleSnackbarClose() {
 				this.setState({
 					snackbarOpen: false,
 					snackbarVertical: '',
@@ -22,70 +26,50 @@ export function SnackbarHOC(options = {}) {
 				})
 			}
 
-	      	// 全局的snackbar this.props.showSnackbar调用即可
-			// showSnackbar(description, message = "提示",icon) {
-			// 	// this.setState({
-			// 	// 	snackbarOpen: true,
-			// 	// 	snackbarText: text,
-			// 	// 	snackbarVertical: vertical,
-			// 	// 	snackbarHorizontal: horizontal,
-			// 	// })
-			// 	const data = {
-			// 		message,
-			// 		description
-			// 	}
-			// 	if (icon) {
-			// 		data.icon = icon;
-			// 	}
-			// 	notification.open(data);
-			// }
-
-				showSnackbar(text, vertical, horizontal) {
-					this.setState({
-						snackbarOpen: true,
-						snackbarText: text,
-						snackbarVertical: vertical,
-						snackbarHorizontal: horizontal,
-					})
+			showSnackbar(text, vertical, horizontal) {
+				this.setState({
+					snackbarOpen: true,
+					snackbarText: text,
+					snackbarVertical: vertical,
+					snackbarHorizontal: horizontal,
+				})
+			}
+			//个别情况需要走
+			showNotification = (description, message = "提示", icon) => {
+				const data = {
+					message,
+					description
 				}
-				//个别情况需要走
-				showNotification = (description, message = "提示", icon) => {
-					const data = {
-						message,
-						description
-					}
-					if (icon) {
-						data.icon = icon;
-					}
-					notification.open(data);
+				if (icon) {
+					data.icon = icon;
 				}
-	      	render() {
-		        const { snackbarOpen, snackbarText, snackbarHorizontal, snackbarVertical } = this.state;
+				notification.open(data);
+			}
+			render() {
 
-		        
-		        return (
-		        	<React.Fragment>
-		        		<Snackbar
-                    className={"rootSnackbar"}
-                    style={{zIndex:30000}}
-				          	open={this.state.snackbarOpen}
-				          	autoHideDuration={3000}
-				          	anchorOrigin={{ vertical: this.state.snackbarVertical || 'top'
-				          			, horizontal: this.state.snackbarHorizontal || 'center' }}
-				          	onClose={() => this.handleSnackbarClose()}
-				          	transition={Fade}
-				          	SnackbarContentProps={{
-				            	'aria-describedby': 'message-id',
-				          	}}
-				          	resumeHideDuration={2000}
-				        	message={<span id="message-id">{this.state.snackbarText}</span>}
-				        />
-			            <WrappedComponent {...this.props} showSnackbar={ this.showSnackbar }	showNotification= { this.showNotification } >
-			       	
-			            </WrappedComponent>
-		          	</React.Fragment>
-		        )
-	      	}
-	    }
+				return (
+					<React.Fragment>
+						<Snackbar
+							className={"rootSnackbar"}
+							style={{ zIndex: 30000 }}
+							open={this.state.snackbarOpen}
+							autoHideDuration={3000}
+							anchorOrigin={{
+								vertical: this.state.snackbarVertical || 'top'
+								, horizontal: this.state.snackbarHorizontal || 'center'
+							}}
+							onClose={this.handleSnackbarClose}
+							transition={Fade}
+							SnackbarContentProps={snackbarProp}
+							resumeHideDuration={2000}
+							message={<span id="message-id">{this.state.snackbarText}</span>}
+						/>
+						<WrappedComponent {...this.props} showSnackbar={this.showSnackbar} showNotification={this.showNotification} >
+
+						</WrappedComponent>
+					</React.Fragment>
+				)
+			}
+		}
 	}
 }

src/common/TextUtil.js

@@ -1,79 +1,167 @@
-import { bytesToSize, getUrl, getUrl2 } from 'educoder';
-const $ = window.$
-
-export function isImageExtension(fileName) {
-    return fileName ? !!(fileName.match(/.(jpg|jpeg|png|gif)$/i)) : false
-}
-
-export function markdownToHTML(oldContent, selector) {
-    window.$('#md_div').html('')
-    // markdown to html
-    if (selector && oldContent && oldContent.startsWith('<p')) {  // 普通html处理
-        window.$('#' + selector).addClass('renderAsHtml')
-        window.$('#' + selector).html(oldContent)
-    } else {
-        try {    
-        $("#"+selector).html('')
-            // selector || 
-        var markdwonParser = window.editormd.markdownToHTML(selector || "md_div", {
-            markdown: oldContent, // .replace(/▁/g,"▁▁▁"),
-            emoji: true,
-            htmlDecode: "style,script,iframe",  // you can filter tags decode
-            taskList: true,
-            tex: true,  // 默认不解析
-            flowChart: true,  // 默认不解析
-            sequenceDiagram: true // 默认不解析
-        });
-
-        } catch(e) {
-            console.error(e)
-        }
-        // selector = '.' + selector
-        if (selector) {
-            return;
-        }
-        
-        const content = window.$('#md_div').html()
-        if (selector) {
-            window.$(selector).html(content)
-        }
-        return content
-    }
-}
-function _doDownload(options) {
-    $.fileDownload(getUrl() + "/api" + options.url, {
-        successCallback: options.successCallback,
-        failCallback: options.failCallback
-    });
-}
-export function downloadFile(options) {
-    if ($.fileDownload) {
-        _doDownload(options)
-    } else {
-        const _url_origin = getUrl2()
-        $.getScript(
-            `${_url_origin}/javascripts/download/jquery.fileDownload.min.js`,
-            (data, textStatus, jqxhr) => {
-            _doDownload(options)
-        });
-    }
-        
-}
-
-export function appendFileSizeToUploadFile(item) {
-    return `${item.title}${uploadNameSizeSeperator}${item.filesize}`
-}
-export function appendFileSizeToUploadFileAll(fileList) {
-    return fileList.map(item => {
-        if (item.name.indexOf(uploadNameSizeSeperator) == -1) {
-          return Object.assign({}, item, {name: `${item.name}${uploadNameSizeSeperator}${bytesToSize(item.size)}`})
-        } 
-        return item
-    }) 
-}
-export const uploadNameSizeSeperator = '　　'
-
-export const sortDirections = ["ascend", "descend", "ascend", "descend", "ascend", "descend", "ascend", "descend", "ascend", "descend", "ascend", "descend", "ascend", "descend", 
-      "ascend", "descend", "ascend", "descend", "ascend", "descend", "ascend", "descend", "ascend", "descend", "ascend", "descend", "ascend", "descend", 
-      "ascend", "descend", "ascend", "descend", "ascend", "descend", "ascend", "descend", "ascend", "descend", "ascend", "descend", "ascend", "descend", 
-      "ascend", "descend", "ascend", "descend", "ascend", "descend", "ascend", "descend", "ascend", "descend", "ascend", "descend", "ascend", "descend", ]
+import { bytesToSize, getUrl, getUrl2 } from 'educoder'
+import showdown from 'showdown'
+const $ = window.$
+
+export function isImageExtension(fileName) {
+    return fileName ? !!(fileName.match(/.(jpg|jpeg|png|gif)$/i)) : false
+}
+
+export function markdownToHTML(oldContent, selector) {
+    try {
+        window.$('#md_div').html('')
+        if (selector && oldContent && oldContent.startsWith('<p')) {  // 普通html处理
+            window.$('#' + selector).addClass('renderAsHtml')
+            window.$('#' + selector).html(oldContent)
+        } else {
+            try {
+                $("#" + selector).html('')
+                // selector ||
+                var markdwonParser = window.editormd.markdownToHTML(selector || "md_div", {
+                    markdown: oldContent, // .replace(/▁/g,"▁▁▁"),
+                    emoji: true,
+                    htmlDecode: "style,script,iframe",  // you can filter tags decode
+                    taskList: true,
+                    tex: true,  // 默认不解析
+                    flowChart: true,  // 默认不解析
+                    sequenceDiagram: true // 默认不解析
+                });
+
+            } catch (e) {
+                console.error(e)
+            }
+            // selector = '.' + selector
+            if (selector) {
+                return;
+            }
+
+            const content = window.$('#md_div').html()
+            if (selector) {
+                window.$(selector).html(content)
+            }
+            return content
+        }
+    } catch (e) {
+
+    }
+}
+function _doDownload(options) {
+    $.fileDownload(getUrl() + "/api" + options.url, {
+        successCallback: options.successCallback,
+        failCallback: options.failCallback
+    });
+}
+export function downloadFile(options) {
+    if ($.fileDownload) {
+        _doDownload(options)
+    } else {
+        const _url_origin = getUrl2()
+        $.getScript(
+            `${_url_origin}/javascripts/download/jquery.fileDownload.min.js`,
+            (data, textStatus, jqxhr) => {
+                _doDownload(options)
+            });
+    }
+
+}
+
+export function appendFileSizeToUploadFile(item) {
+    return `${item.title}${uploadNameSizeSeperator}${item.filesize}`
+}
+export function appendFileSizeToUploadFileAll(fileList) {
+    return fileList.map(item => {
+        if (item.name.indexOf(uploadNameSizeSeperator) == -1) {
+            return Object.assign({}, item, { name: `${item.name}${uploadNameSizeSeperator}${bytesToSize(item.size)}` })
+        }
+        return item
+    })
+}
+export const uploadNameSizeSeperator = '　　'
+
+export const sortDirections = ["ascend", "descend", "ascend", "descend", "ascend", "descend", "ascend", "descend", "ascend", "descend", "ascend", "descend", "ascend", "descend",
+    "ascend", "descend", "ascend", "descend", "ascend", "descend", "ascend", "descend", "ascend", "descend", "ascend", "descend", "ascend", "descend",
+    "ascend", "descend", "ascend", "descend", "ascend", "descend", "ascend", "descend", "ascend", "descend", "ascend", "descend", "ascend", "descend",
+    "ascend", "descend", "ascend", "descend", "ascend", "descend", "ascend", "descend", "ascend", "descend", "ascend", "descend", "ascend", "descend",]
+
+export function validateLength(str = '', length = 100) {
+    let len = 0
+    if (str) {
+        len = str.length
+        for (let i = 0; i < len; i++) {
+            let charCode = str.charCodeAt(i)
+            if (charCode >= 0xD800 && charCode <= 0xDBFF) {
+                len--
+                i++
+            }
+        }
+    }
+    return len <= length
+}
+
+export function mdJSONParse(str) {
+    let val = "";
+    try {
+        return val = JSON.parse(str)
+    } catch (error) {
+        if (str) {
+            return val = str;
+        } else {
+            return "";
+        }
+
+    }
+}
+
+showdown.extension('prettify', function () {
+    return [{
+        type: 'output',
+        filter: function (source) {
+            return source.replace(/(<pre[^>]*>)?[\n\s]?<code([^>]*)>/gi, function (match, pre, codeClass) {
+                if (pre) {
+                    return '<pre class="prettyprint linenums"><code' + codeClass + '>'
+                } else {
+                    return ' <code class="prettyprint">'
+                }
+            })
+        }
+    }]
+})
+
+const showdownKatex = require('showdown-katex')
+const CONVERTER = new showdown.Converter({
+    tables: true,
+    simpleLineBreaks: false,
+    underline: true,
+    extensions: [
+        'prettify',
+        showdownKatex({
+            throwOnError: false,
+            displayMode: false,
+            errorColor: '#1500ff',
+        }),
+    ]
+})
+
+const oldKatexMode = /(?:`?\$\$)([^`\$]+)(?:\$\$`?)/g
+
+export function exportMdtoHtml(md = '') {
+    if (typeof md === 'string') {
+        let rs = md.replace(oldKatexMode, (_, p1) => {
+            return "$$" + p1 + "$$"
+        })
+        return CONVERTER.makeHtml(rs)
+    }
+    return md + ''
+}
+
+function escapeText(text) {
+    return text.replace(/[&<>"']/g, s => {
+        const entityMap = {
+            '&': '&amp;',
+            '<': '&lt;',
+            '>': '&gt;',
+            '"': '',
+            "'": '',
+        };
+        return entityMap[s]
+    })
+}

src/common/UrlTool.js

@@ -5,39 +5,80 @@ const { Search } = Input;
 
 const $ = window.$;
 const isDev = window.location.port == 3007;
-export const TEST_HOST = "https://test-newweb.educoder.net"
+const isdev2= window.location.hostname ==='www.educoder.net'
+export const TEST_HOST = "https://testforgeplus.trustie.net/"
 export function getImageUrl(path) {
 	// https://www.educoder.net
 	// https://testbdweb.trustie.net
   // const local = 'http://localhost:3000'
-  const local = 'https://test-newweb.educoder.net'
+  const local = 'https://testforgeplus.trustie.net/'
 	if (isDev) {
 		return `${local}/${path}`
 	}
 	return `/${path}`;
 }
 
-export function setImagesUrl(path){
-	const local = 'https://test-newweb.educoder.net'
+export function getcdnImageUrl(path) {
+	// https://www.educoder.net
+	// https://testbdweb.trustie.net
+  // const local = 'http://localhost:3000'
+  const testlocal = 'https://testali-cdn.educoder.net'
+  const  local='https://ali-cdn.educoder.net'
 	let firstStr=path.substr(0,1);
-	// console.log(firstStr);
-	if(firstStr=="/"){
-		return isDev?`${local}${path}`:`${path}`;
+	if (isdev2) {
+		return `${local}/${path}`;
 	}else{
-		return isDev?`${local}/${path}`:`/${path}`;
+		if(firstStr=="/"){
+			return `${path}`
+		}else{
+			return `/${path}`
+		}
+	}
+	// return `${local}/${path}`;
+}
+
+export function setcndImagesUrl(path){
+	const testlocal = 'https://testali-cdn.educoder.net'
+	const  local='https://ali-cdn.educoder.net'
+	let firstStr=path.substr(0,1);
+	if(firstStr=="/"){
+		if (!isdev2) {
+			return `${path}`
+		}
+		return `${local}${path}`;
+		 //return isDev?`${testlocal}${path}`:`${local}${path}`;
+	}else{
+		if (!isdev2) {
+			return `/${path}`
+		}
+		return `${local}/${path}`;
+		// return isDev?`${testlocal}/${path}`:`${local}/${path}`;
+	}
+}
+
+
+
+export function setImagesUrl(path){
+	const testlocal = 'https://testali-cdn.educoder.net'
+	 const  local='https://ali-cdn.educoder.net'
+	let firstStr=path.substr(0,1);
+	if(firstStr=="/"){
+		if (!isdev2) {
+			return `${path}`
+		}
+		return `${local}${path}`;
+		// return isDev?`${testlocal}${path}`:`${path}`;
+	}else{
+		if (!isdev2) {
+			return `/${path}`
+		}
+		return `${local}/${path}`;
+		 //return isDev?`${testlocal}/${path}`:`/${path}`;
 	}
 }
 
 export function getUrl(path, goTest) {
-	// https://www.educoder.net
-	// https://testbdweb.trustie.net
-
-	// 如果想所有url定位到测试版，可以反注释掉下面这行
-	//goTest = true
-	// testbdweb.educoder.net testbdweb.trustie.net
-  // const local = goTest ? 'https://testeduplus2.educoder.net' : 'http://localhost:3000'
-  // const local = 'https://testeduplus2.educoder.net'
-	const local = 'http://localhost:3007'
+	const local = 'https://testforgeplus.trustie.net'
 	if (isDev) {
 		return `${local}${path?path:''}`
 	}
@@ -97,7 +138,7 @@ function railsgettimess(proxy) {
 
 
 export function Railsgettimes() {
-	railsgettimess(`${getUrl()}/api/main/first_stamp.json`);
+	// railsgettimess(`${getUrl()}/api/main/first_stamp.json`);
 	// railsgettimess(`https://api.m.taobao.com/rest/api3.do?api=mtop.common.getTimestamp`);
 }
 export function getmyUrl(geturl) {
@@ -106,31 +147,31 @@ export function getmyUrl(geturl) {
 }
 
 export function getUploadActionUrl(path, goTest) {
-	Railsgettimes()
-	let anewopens=md5(newopens+newtimestamp);
-	return `${getUrl()}/api/attachments.json${isDev ? `?debug=${window._debugType || 'admin'}&randomcode=${newtimestamp}&client_key=${anewopens}` : `?randomcode=${newtimestamp}&client_key=${anewopens}`}`;
+	return `${getUrl()}/api/attachments.json?debug=${window._debugType || 'admin'}`;
+}
+
+export function getUploadLogoActionUrl() {
+	return `${getUrl()}/api/resumes/logo.json?debug=${window._debugType || 'admin'}`;
 }
 
 export function getUploadActionUrltwo(id) {
-	Railsgettimes()
-	let anewopens=md5(newopens+newtimestamp);
-	return `${getUrlmys()}/api/shixuns/${id}/upload_data_sets.json${isDev ? `?debug=${window._debugType || 'admin'}&randomcode=${newtimestamp}&client_key=${anewopens}` : `?randomcode=${newtimestamp}&client_key=${anewopens}`}`
+	return `${getUrlmys()}/api/shixuns/${id}/upload_data_sets.json?debug=${window._debugType || 'admin'}`
 }
 
 export function getUploadActionUrlthree() {
-	Railsgettimes()
-	let anewopens=md5(newopens+newtimestamp);
-	return `${getUrlmys()}/api/jupyters/import_with_tpm.json${isDev ? `?debug=${window._debugType || 'admin'}&randomcode=${newtimestamp}&client_key=${anewopens}` : `?randomcode=${newtimestamp}&client_key=${anewopens}`}`
+	return `${getUrlmys()}/api/jupyters/import_with_tpm.json?debug=${window._debugType || 'admin'}`
 }
 
+export function getupload_git_file(id) {
+	return `${getUrlmys()}/api/shixuns/${id}/upload_git_file.json?debug=${window._debugType || 'admin'}`
+}
+
+
 export function getUploadActionUrlOfAuth(id) {
-	Railsgettimes()
-	let anewopens=md5(newopens+newtimestamp);
-	return `${getUrl()}/api/users/accounts/${id}/auth_attachment.json${isDev ? `?debug=${window._debugType || 'admin'}&randomcode=${newtimestamp}&client_key=${anewopens}` : `?randomcode=${newtimestamp}&client_key=${anewopens}`}`
+	return `${getUrl()}/api/users/accounts/${id}/auth_attachment.json?debug=${window._debugType || 'admin'}`
 }
 
 export function getRandomNumber(type) {
-	 Railsgettimes()
 	let anewopens=md5(newopens+newtimestamp);
 	return type===true?`randomcode=${newtimestamp}&client_key=${anewopens}`:`?randomcode=${newtimestamp}&client_key=${anewopens}`
 }
@@ -149,15 +190,7 @@ export function getTaskUrlById(id) {
 }
 
 export function getRandomcode(url) {
-	Railsgettimes()
-	let anewopens=md5(newopens+newtimestamp);
-
-	if (url.indexOf('?') == -1) {
-		return `${url}?randomcode=${newtimestamp}&client_key=${anewopens}`
-	}else {
-		return `${url}&randomcode=${newtimestamp}&client_key=${anewopens}`
-	}
-
+	return url;
 }
 
 export function htmlEncode(str) {

src/common/components/Cropper.js

@@ -1,52 +1,11 @@
 import React, { Component } from 'react';
-
 import { getUrl2, isDev } from 'educoder'
 const $ = window.$
 
 let _url_origin = getUrl2()
-// let _url_origin = `http://47.96.87.25:48080`;
 
 
 
-function save_avatar(){        
-        
-    // if($(img_lg).html().trim() == ""){            
-        // $("#avatar-name").html("请先选择图片上传").css("color", 'red');        
-    // } else {            
-        // $("#avatar-name").html("").css("color", '#333');    
-        const previewId = this.props.previewId
-        var img_lg = document.getElementById(previewId || 'img-preview');           
-        // 截图小的显示框内的内容          
-        window.html2canvas(img_lg).then(function(canvas) {
-            // for test
-            // document.getElementById('canvasWrap').appendChild(canvas);
-
-            var dataUrl = canvas.toDataURL("image/jpeg");    
-            console.log(dataUrl)   
-            // TODO upload base64 image data to server
-        });  
-        return
-
-        // 老版接口：
-        // html2canvas(img_lg, {               
-        //     allowTaint: true,                
-        //     taintTest: false,                
-        //     onrendered: function(canvas) {                    
-        //         canvas.id = "mycanvas";                    
-        //         //生成base64图片数据                    
-        //         var dataUrl = canvas.toDataURL("image/jpeg");    
-        //         console.log(dataUrl)   
-
-        //         var newImg = document.getElementById("showImg");                    
-        //         newImg.src = dataUrl;    
-        //         return;   
-
-        //         imagesAjax(dataUrl);                    
-        //         $(".avatar-save").attr("disabled","true");                
-        //     }            
-        // });       
-    // }    
-}   
 /** 
     props 说明：
     imageId 源图片标签的id
@@ -54,64 +13,50 @@ function save_avatar(){
     imageSrc 源图片src
     width  数字格式
     height 数字格式 
-*/ 
+*/
 class Cropper extends Component {
-  state = {
-  };
-
-  handleChange = (info) => {
-  }
 
   componentDidMount() {
-      this.options = {
-        aspectRatio: 1,
-        crop(event) {
-            // console.log(event.detail.x);
-            // console.log(event.detail.y);
-            // console.log(event.detail.width);
-            // console.log(event.detail.height);
-            // console.log(event.detail.rotate);
-            // console.log(event.detail.scaleX);
-            // console.log(event.detail.scaleY);
-        },
-        preview: this.props.previewId ? `#${this.props.previewId}` : '.img-preview',
-      }
+    this.options = {
+      aspectRatio: 1,
+      preview: this.props.previewId ? `#${this.props.previewId}` : '.img-preview',
+    }
+
+    if (!window.Cropper) {
+      $.ajaxSetup({
+        cache: true
+      });
+      const _isDev = isDev()
+      let _path = _isDev ? 'public' : 'build'
+
+      $('head').append($('<link rel="stylesheet" type="text/css" />')
+        .attr('href', `${_url_origin}/react/${_path}/js/cropper/cropper.min.css`));
+
+      $.getScript(
+        `${_url_origin}/react/${_path}/js/cropper/cropper.js`,
+        (data, textStatus, jqxhr) => {
 
-      if (!window.Cropper) {
-        $.ajaxSetup({
-            cache: true
         });
-        const _isDev = isDev()
-        let _path = _isDev ? 'public' : 'build'
+      $.getScript(
+        `${_url_origin}/react/${_path}/js/cropper/html2canvas.min.js`,
+        (data, textStatus, jqxhr) => {
 
-        $('head').append($('<link rel="stylesheet" type="text/css" />')
-            .attr('href', `${_url_origin}/react/${_path}/js/cropper/cropper.min.css`));
-
-        $.getScript(
-          `${_url_origin}/react/${_path}/js/cropper/cropper.js`,
-          (data, textStatus, jqxhr) => {
-          
         });
-        $.getScript(
-          `${_url_origin}/react/${_path}/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);
-      }, 1200)
+    setTimeout(() => {
+      const image = document.getElementById(this.props.imageId || '__image');
+      this.cropper = new window.Cropper(image, this.options);
+    }, 1200)
   }
-  
+
   renew = (image) => {
     this.cropper && this.cropper.destroy();
     this.cropper = new window.Cropper(image, this.options);
 
   }
   render() {
-    
+
     const { width, height, previewId, imageSrc } = this.props;
 
     return (
@@ -119,8 +64,8 @@ class Cropper extends Component {
         {/* This rule is very important, please do not ignore this! */}
         <style>{`
             .wrapper {
-                width: ${ width ? (width+'px') : '500px'};
-                height: ${ height ? (height+'px') : '500px'};
+                width: ${ width ? (width + 'px') : '500px'};
+                height: ${ height ? (height + 'px') : '500px'};
                 border: 1px solid #eee;
             }
             img {
@@ -134,155 +79,13 @@ class Cropper extends Component {
             }
         `}</style>
         <div className="wrapper">
-            {/* http://localhost:3007/images/footNavLogo.png  图片转了后不对 
-                || "/images/testPicture.jpg"
-                || "/images/shixun0.jpg"
-            */}
-            <img id={this.props.imageId || "__image"} src={`${imageSrc }`}></img>
+          <img id={this.props.imageId || "__image"} src={`${imageSrc}`}></img>
         </div>
-        {/* background: 'aquamarine', 
-            'border-radius': '128px'
-        */}
-        {!previewId && <div id="img-preview" className="img-preview preview-lg" style={{width: '128px', height: '128px',  }}>
+        {!previewId && <div id="img-preview" className="img-preview preview-lg" style={{ width: '128px', height: '128px', }}>
         </div>}
-
-        {/* <img id="showImg" src="http://localhost:3007/images/testPicture.jpg"></img> */}
-
-        {/* <div id="canvasWrap"></div> */}
-        {/* <button onClick={save_avatar.bind(this)}>save </button> */}
       </div>
     );
   }
 }
 
-export default  Cropper;
-
-
-// function aaa () {
-//     function showedit_headphoto() {
-//         var html = `
-//         <script src=\"../head/jquery.min.js\"><\/script>\n
-//         <link href=\"../head/cropper.min.css\" rel=\"stylesheet\">\n
-//         <link href=\"../head/sitelogo.css\" rel=\"stylesheet\">\n
-//         <script src=\"../head/bootstrap.min.js\"><\/script>\n
-//         <script src=\"../head/cropper.js\"><\/script>\n
-//         <script src=\"../head/sitelogo.js\"><\/script>\n
-//         <script src=\"../head/html2canvas.min.js\" type=\"text/javascript\" charset=\"utf-8\"><\/script>\n\n
-
-//         <div class=\"task-popup\" style=\"width: 550px;\">\n  <div class=\"task-popup-title clearfix task-popup-bggrey\">上传头像<\/div>\n  <div class=\"clearfix\">\n    
-//         <div class=\"modal fade\" style=\"outline: none;\" id=\"avatar-modal\" aria-hidden=\"true\" aria-labelledby=\"avatar-modal-label\" role=\"dialog\" tabindex=\"-1\">\n      
-//         <div class=\"modal-dialog modal-lg\">\n        <div class=\"modal-content\">\n          <form class=\"avatar-form\">\n            <div class=\"modal-body\">\n              
-//         <div class=\"padding20\">\n                <div class=\"avatar-upload\">\n                  <input class=\"avatar-src\" name=\"avatar_src\" type=\"hidden\">\n                  
-//         <input class=\"avatar-data\" name=\"avatar_data\" type=\"hidden\">\n\n                  <span id=\"avatar-name\"><\/span>\n                  
-//         <input class=\"avatar-input\" style=\"display:none;\" id=\"avatarInput\" value=\"avatars/User/116\" name=\"avatar_file\" type=\"file\">\n                  
-//         <input type=\"hidden\" id=\"source_id\" value=\"116\"/>\n                  <input type=\"hidden\" id=\"source_type\" value=\"User\"/>\n                <\/div>\n                
-//         <div class=\"row clearfix mt20 pl20\">\n                  <div class=\"task-form-45 fl panel-box-sizing uplaodImg\">\n                    
-//         <div class=\"avatar-wrapper\" id=\"wrapper_image_show\">\n                      <!--<span style=\"display: block;\">\n                                             选择你要上传的图片<br/>
-//         \n                                             仅支持JPG、GIF、PNG，且文件小于2M\n                                           <\/span>-->\n                    <\/div>\n                    
-//         <div class=\"row avatar-btns clearfix\">\n                      <a href=\"javascript:void(0);\" class=\"fl\" type=\"button\" onClick=\"$(\'input[id=avatarInput]\').click();\">重新上传<\/a>\n
-//                               <!--<div class=\"btn-group\">\n                        <a href=\"javascript:void(0);\" class=\"fa fa-repeat fr mt5 color-grey-9\" data-method=\"rotate\" data-option=\"90\" 
-//                               type=\"button\" title=\"Rotate 90 degrees\">\n                          <\/a>\n                      <\/div>-->\n                    <\/div>\n                  <\/div>\n   
-//                                              <div class=\"task-form-50 panel-box-sizing fr color-grey pr20\" style=\"width: 128px;\">\n                    <div class=\"edu-txt-center\">\n                     
-//                                               <div class=\"avatar-preview preview-lg radius\" id=\"imageHead\">\n                        
-//                                               <img alt=\"头像\" height=\"128\" nhname=\"avatar_image\" src=\"/images/avatars/User/116?1556802838\" width=\"128\" />\n                      <\/div>\n  
-//                                                                   <span>头像预览<\/span>\n                    <\/div>\n                    
-//                                                                   <p class=\"color-grey-9 font-12 mt110 justify\">仅支持JPG、GIF、PNG，且文件小于2M<\/p>\n                  <\/div>\n                <\/div>\n
-//                                                                                 <\/div>\n              <div class=\"clearfix edu-txt-center mb20 mt10\">\n                
-//                                                                                 <a href=\"javascript:void(0);\" class=\"task-btn mr20\" onclick=\"hideModal()\">取消<\/a>\n               
-//                                                                                 <a href=\"javascript:void(0);\" class=\"avatar-save task-btn task-btn-orange\" data-dismiss=\"modal\">确定<\/a>\n              
-//                                                                                 <\/div>\n            <\/div>\n          <\/form>\n        <\/div>\n      <\/div>\n    <\/div>\n  <\/div>\n<\/div>\n\n<script>\n 
-//                                                                                    $(function () {\n        new CropAvatar($(\'#crop-avatar\'), 1/1);\n\n        //---------------------------头像上传-----------------------------//\n        //做个下简易的验证  大小 格式\n        $(\'#avatarInput\').on(\'change\', function(e) {\n            var filemaxsize = 1024 * 5;//5M\n            var target = $(e.target);\n            var Size = target[0].files[0].size / 1024;\n            if(Size > filemaxsize) {\n                alert(\'图片过大，请重新选择!\');\n                $(\".avatar-wrapper\").children().remove;\n                return false;\n            }\n            if(!this.files[0].type.match(/image.*/)) {\n                alert(\'请选择正确的图片!\')\n            } else {\n                /*var filename = document.querySelector(\"#avatar-name\");*/\n                var texts = document.querySelector(\"#avatarInput\").value;\n                var teststr = texts; //你这里的路径写错了\n                testend = teststr.match(/[^\\\\]+\\.[^\\(]+/i); //直接完整文件名的\n                /*filename.innerHTML = testend;\n                $(filename).css(\"color\", \'#333\');*/\n                $(\".avatar-save\").removeClass(\"task-btn-grey\").addClass(\"task-btn-orange\");\n                $(\".avatar-save\").on(\"click\", save_avatar);\n            }\n\n        });\n    });\n\n    function save_avatar(){\n        var img_lg = document.getElementById(\'imageHead\');\n        if($(img_lg).html().trim() == \"\"){\n            $(\"#avatar-name\").html(\"请先选择图片上传\").css(\"color\", \'red\');\n        } else {\n            $(\"#avatar-name\").html(\"\").css(\"color\", \'#333\');\n            // 截图小的显示框内的内容\n            html2canvas(img_lg, {\n                allowTaint: true,\n                taintTest: false,\n                onrendered: function(canvas) {\n                    canvas.id = \"mycanvas\";\n                    //生成base64图片数据\n                    var dataUrl = canvas.toDataURL(\"image/jpeg\");\n                    var newImg = document.createElement(\"img\");\n                    newImg.src = dataUrl;\n                    imagesAjax(dataUrl);\n                    $(\".avatar-save\").attr(\"disabled\",\"true\");\n                }\n            });\n        }\n    }\n\n    function imagesAjax(src) {\n        var data = {};\n        data.img = src;\n        data.source_id = $(\'#source_id\').val();\n        data.source_type = $(\'#source_type\').val();\n        data.is_direct = 0;\n        $.ajax({\n            url: \"/upload_avatar\",\n            beforeSend: function(xhr) {xhr.setRequestHeader(\'X-CSRF-Token\', $(\'meta[name=\"csrf-token\"]\').attr(\'content\'))},\n            data: data,\n            type: \"POST\",\n            success: function (re) {\n                console.log(re);\n                console.log(1562050370);\n                if(re){\n                    var o = JSON.parse(re);\n                    if (o.status !=0 ){\n                        console.log(o.message);\n                    } else {\n                        var imgSpan = $(\"img[nhname=\'avatar_image\']\");\n                        imgSpan.attr({\"src\": o.url + \'?1562050370\'});\n                        $(\"#user_code\").html(o.grade);\n                        notice_box_redirect(\"/users/shitou\", \"上传成功\");\n                    }\n                } else {\n                    notice_box(\"上传出错\");\n                }\n\n            },\n            error: function (e) {\n                alert(e);\n            }\n        });\n    }\n
-//                                                                                    <\/script>`;
-//         pop_box_new(html, 550, 510);
-//         $("#imageHead img").attr({"src": $("#user_avatar_show").attr("src")});
-//         $("#wrapper_image_show img").attr({"src": $("#user_avatar_show").attr("src")});
-
-        
-//     }
-
-//     $(function () {        
-//         new CropAvatar($('#crop-avatar'), 1/1);        
-//         //---------------------------头像上传-----------------------------//        
-//         //做个下简易的验证  大小 格式        
-//         $('#avatarInput').on('change', function(e) {            
-//             var filemaxsize = 1024 * 5;//5M            
-//             var target = $(e.target);            
-//             var Size = target[0].files[0].size / 1024;            
-//             if(Size > filemaxsize) {                
-//                 alert('图片过大，请重新选择!');                
-//                 $(".avatar-wrapper").children().remove;                
-//                 return false;            
-//             }            
-//             if(!this.files[0].type.match(/image.*/)) {                
-//                 alert('请选择正确的图片!')            
-//             } else {                
-//                 /*var filename = document.querySelector("#avatar-name");*/                
-//                 var texts = document.querySelector("#avatarInput").value;                
-//                 var teststr = texts; //你这里的路径写错了                
-//                 testend = teststr.match(/[^\\\\]+\\.[^\\(]+/i); //直接完整文件名的                
-//                 /*filename.innerHTML = testend;                $(filename).css("color", '#333');*/                
-//                 $(".avatar-save").removeClass("task-btn-grey").addClass("task-btn-orange");                
-//                 $(".avatar-save").on("click", save_avatar);            
-//             }        
-//         });    
-//     });    
-//     function save_avatar(){        
-//         var img_lg = document.getElementById('imageHead');        
-//         if($(img_lg).html().trim() == ""){            
-//             $("#avatar-name").html("请先选择图片上传").css("color", 'red');        
-//         } else {            
-//             $("#avatar-name").html("").css("color", '#333');           
-//             // 截图小的显示框内的内容            
-//             html2canvas(img_lg, {               
-//                 allowTaint: true,                
-//                 taintTest: false,                
-//                 onrendered: function(canvas) {                    
-//                     canvas.id = "mycanvas";                    
-//                     //生成base64图片数据                    
-//                     var dataUrl = canvas.toDataURL("image/jpeg");                    
-//                     var newImg = document.createElement("img");                    
-//                     newImg.src = dataUrl;                    
-//                     imagesAjax(dataUrl);                    
-//                     $(".avatar-save").attr("disabled","true");                
-//                 }            
-//             });       
-//         }    
-//     }    
-//     function imagesAjax(src) {        
-//         var data = {};        
-//         data.img = src;        
-//         data.source_id = $('#source_id').val();        
-//         data.source_type = $('#source_type').val();        
-//         data.is_direct = 0;        
-//         $.ajax({            
-//             url: "/upload_avatar",            
-//             beforeSend: function(xhr) {
-//                 xhr.setRequestHeader('X-CSRF-Token', $('meta[name="csrf-token"]').attr('content'))
-//             },            
-//             data: data,            
-//             type: "POST",            
-//             success: function (re) {                
-//                 console.log(re);                
-//                 // console.log(1562050370);                
-//                 if(re){                    
-//                     var o = JSON.parse(re);                    
-//                     if (o.status !=0 ){                        
-//                         console.log(o.message);                    
-//                     } else {                        
-//                         var imgSpan = $("img[nhname='avatar_image']");                        
-//                         imgSpan.attr({"src": o.url + '?1562050370'});                        
-//                         $("#user_code").html(o.grade);                        
-//                         notice_box_redirect("/users/shitou", "上传成功");                    
-//                     }                
-//                 } else {                    
-//                     notice_box("上传出错");                
-//                 }            
-//             },            
-//             error: function (e) {                
-//                 alert(e);            
-//             }        
-//         });    
-//     }
-
-
-// }
+export default Cropper;

src/common/components/DragValidator.js

@@ -1,116 +0,0 @@
-import React, { Component } from 'react';
-
-const $ = window.jQuery
-const jQuery = $;
-// if () {
-// !$.drag
-  // (function($){
-  //   $.fn.dragValidator = function(options){
-  //       var x, drag = this, isMove = false, defaults = {
-  //       };
-  //       var options = $.extend(defaults, options);
-  //       //添加背景，文字，滑块
-  //       var html = '<div class="drag_bg"></div>'+
-  //           '<div class="drag_text" onselectstart="return false;" unselectable="on">拖动滑块验证</div>'+
-  //           '<div class="handler handler_bg"></div>';
-  //       this.append(html);
-	//
-  //       var handler = drag.find('.handler');
-  //       var drag_bg = drag.find('.drag_bg');
-  //       var text = drag.find('.drag_text');
-  //       var maxWidth = text.width() - handler.width();  //能滑动的最大间距
-  //       //鼠标按下时候的x轴的位置
-  //       handler.mousedown(function(e){
-  //           isMove = true;
-  //           x = e.pageX - parseInt(handler.css('left'), 10);
-  //       });
-	//
-  //       //鼠标指针在上下文移动时，移动距离大于0小于最大间距，滑块x轴位置等于鼠标移动距离
-  //       $(document).mousemove(function(e){
-  //           var _x = e.pageX - x;
-  //           var handler_offset = handler.offset();
-  //           var lastX = e.clientX -x;
-  //           lastX = Math.max(0,Math.min(maxWidth,lastX));
-  //           if(isMove){
-  //               if(_x > 0 && _x <= maxWidth){
-  //                   handler.css({'left': lastX});
-  //                   drag_bg.css({'width': lastX});
-  //               }
-  //               else if(lastX > maxWidth - 5 && lastX < maxWidth + 5 ){  //鼠标指针移动距离达到最大时清空事件
-  //                   dragOk();
-	//
-  //               }
-  //           }
-  //       });
-  //       handler.mouseup(function(e){
-  //           isMove = false;
-  //           var _x = e.pageX - x;
-  //           if(text.text() != '验证通过' && _x < maxWidth){ //鼠标松开时，如果没有达到最大距离位置，滑块就返回初始位置
-  //               handler.animate({'left': 0});
-  //               drag_bg.animate({'width': 0});
-  //           }
-  //       });
-	//
-  //       //清空事件
-  //       function dragOk(){
-  //           options.dragOkCallback && options.dragOkCallback()
-  //           var kuaiwidth=drag.width() - handler.width() - 2;
-  //           handler.removeClass('handler_bg').addClass('handler_ok_bg');
-  //           handler.css({'left':kuaiwidth+'px'})
-  //           text.css({'width':kuaiwidth+'px'});
-  //           text.text('验证通过');
-  //           drag.css({'color': '#fff'});
-  //           drag_bg.css({'width':kuaiwidth+'px'})
-  //           handler.unbind('mousedown');
-  //           $(document).unbind('mousemove');
-  //           $(document).unbind('mouseup');
-  //           $("#user_verification_notice").html("");
-  //           $('#user_verification_notice').parent().hide();
-  //       }
-  //   };
-  // })(jQuery);
-// }
-
-class DragValidator extends Component {
-  componentDidMount () {
-    // if($("#reg-drag").length>0 && IsPC()){
-    // $("#reg-drag").dragValidator({
-    //   height: this.props.height,
-    //   dragOkCallback: () => {
-    //     this.props.dragOkCallback && this.props.dragOkCallback()
-    //   }
-    // });
-    // }else{
-    //     $("#reg-drag").empty();
-    // }
-  }
-  empty() {
-    // $("#reg-drag").empty();
-  }
-  render() {
-    const height =  this.props.height || 45;
-    const className =  this.props.className
-    const successGreenColor = this.props.successGreenColor || '#29bd8b'
-    // newMain clearfix
-    return (
-      <div id="reg-drag" style={{	width:"287px",}} className={`drag_slider ${className}`}>
-        <style>{`
-          .drag_slider .handler {
-            height: 100%;
-          }
-          .drag_slider {
-            height: ${height}px;
-            line-height: ${height}px;
-          }
-          .drag_slider .drag_bg {
-            height: ${height}px;
-            background-color: ${successGreenColor};
-          }
-        `}</style>
-      
-      </div>
-    );
-  }
-}
-
-export default  ( DragValidator );

src/common/components/LinkAfterLogin.js

@@ -6,23 +6,23 @@ class LinkAfterLogin extends Component {
 	constructor(props) {
 		super(props);
 	}
-    checkAuth = () => {
-        if (this.props.checkIfLogin()) {
-					if(this.props.checkProfileComplete){
-						if(this.props.checkIfProfileCompleted()){
-							this.props.history.push(this.props.to)
-						}else{
-							this.props.showProfileCompleteDialog();
-						}
-					}else{
-						this.props.history.push(this.props.to)
-					}
-        } else {
-            this.props.showLoginDialog()
-        }
-    }
+	checkAuth = () => {
+		if (this.props.checkIfLogin()) {
+			if (this.props.checkProfileComplete) {
+				if (this.props.checkIfProfileCompleted()) {
+					this.props.history.push(this.props.to)
+				} else {
+					this.props.showProfileCompleteDialog();
+				}
+			} else {
+				this.props.history.push(this.props.to)
+			}
+		} else {
+			this.props.showLoginDialog()
+		}
+	}
 	render() {
-		return(
+		return (
 			<a {...this.props} onClick={this.checkAuth}>{this.props.children}</a>
 		)
 	}

src/common/components/comment/CommentForm.js

@@ -1,7 +1,7 @@
 /*
  * @Description: 评论表单
  * @Author: tangjiang
- * @Github: 
+ * @Github:
  * @Date: 2019-12-17 17:32:55
  * @LastEditors  : tangjiang
  * @LastEditTime : 2020-01-06 18:42:09
@@ -10,15 +10,13 @@ import './index.scss';
 import React, { useState } from 'react';
 import { Form, Button, Input } from 'antd';
 import QuillForEditor from '../../quillForEditor';
-// import { QuillDeltaToHtmlConverter } from 'quill-delta-to-html'
-// import {formatDelta} from './util';
 const FormItem = Form.Item;
 
-function CommentForm (props) {
+function CommentForm(props) {
 
   const {
     onCancel,
-    onSubmit, 
+    onSubmit,
     form,
     type
   } = props;
@@ -28,9 +26,6 @@ function CommentForm (props) {
   const [focus, setFocus] = useState(false);
 
   const options = [
-    // ['bold', 'italic', 'underline'],
-    // [{header: [1,2,3,false]}],
-    'code-block',
     'link',
     'image',
     'formula'
@@ -47,20 +42,30 @@ function CommentForm (props) {
     setShowQuill(false);
     setCtx('');
     props.form.resetFields();
-    onCancel && onCancel(); 
+    onCancel && onCancel();
   }
 
   // 编辑器内容变化时
-  const handleContentChange = (content) => {
-    console.log('编辑器内容', content);
-    setCtx(content);
-    try {
-      // const _html = new QuillDeltaToHtmlConverter(content.ops, {}).convert();
-      // props.form.setFieldsValue({'comment': _html.replace(/<\/?[^>]*>/g, '')});
-      props.form.setFieldsValue({'comment': content});
-    } catch (error) {
-      console.log(error);
+  const handleContentChange=(quill,html,mydata)=>{
+    const reg = /^[\s\S]*.*[^\s][\s\S]*$/;
+    if (!reg.test(html)) {
+      setCtx(html);
+      try {
+        // const _html = new QuillDeltaToHtmlConverter(content.ops, {}).convert();
+        props.form.setFieldsValue({ 'comment': html });
+      } catch (error) {
+        console.log(error);
+      }
+    }else{
+      setCtx(html);
+      try {
+        // const _html = new QuillDeltaToHtmlConverter(content.ops, {}).convert();
+        props.form.setFieldsValue({ 'comment': html });
+      } catch (error) {
+        console.log(error);
+      }
     }
+
   }
   // 发送
   const handleSubmit = (e) => {
@@ -69,7 +74,7 @@ function CommentForm (props) {
       if (!err) {
         setShowQuill(false);
         const content = ctx;
-        props.form.setFieldsValue({'comment': ''});
+        props.form.setFieldsValue({ 'comment': '' });
         setCtx('');
         // const _html = formatDelta(content.ops);
         // console.log('保存的内容=====》》》》', content);
@@ -95,10 +100,10 @@ function CommentForm (props) {
         {
           getFieldDecorator('comment', {
             rules: [
-              { required: true, message: '评论内容不能为空'}
+              { required: true, message: '评论内容不能为空' }
             ],
           })(
-            <Input 
+            <Input
               onClick={() => handleInputClick(type)}
               placeholder="说点儿什么~"
               className={showQuill ? '' : 'show_input'}
@@ -110,13 +115,13 @@ function CommentForm (props) {
             />
           )
         }
-        
+
         <QuillForEditor
-          imgAttrs={{width: '60px', height: '30px'}}
+          imgAttrs={{ width: '60px', height: '30px' }}
           wrapStyle={{
             height: showQuill ? 'auto' : '0px',
             opacity: showQuill ? 1 : 0,
-            overflow: showQuill ? 'none' : 'hidden',
+            overflow: showQuill ? 'none' : 'none',
             transition: 'all 0.3s'
           }}
           autoFocus={focus}
@@ -130,7 +135,7 @@ function CommentForm (props) {
       </FormItem>
       <FormItem style={{ textAlign: 'right', display: showQuill ? 'block' : 'none' }}>
         <Button onClick={handleCancle}>取消</Button>
-        <Button onClick={handleSubmit} type="primary" style={{ marginLeft: '10px'}}>发送</Button>
+        <Button onClick={handleSubmit} type="primary" style={{ marginLeft: '10px' }}>发送</Button>
       </FormItem>
     </Form>
   );

src/common/components/comment/CommentItem.js

@@ -1,24 +1,21 @@
 /*
  * @Description: 评论单列
  * @Author: tangjiang
- * @Github: 
+ * @Github:
  * @Date: 2019-12-17 17:35:17
  * @LastEditors  : tangjiang
  * @LastEditTime : 2019-12-27 11:05:17
  */
 import './index.scss';
-import 'quill/dist/quill.core.css'; // 核心样式
-import 'quill/dist/quill.snow.css'; // 有工具栏
-import 'quill/dist/quill.bubble.css'; // 无工具栏
-import 'katex/dist/katex.min.css'; // katex 表达式样式
 import React, { useState } from 'react';
 import CommentIcon from './CommentIcon';
 import { getImageUrl, CNotificationHOC } from 'educoder'
 import { Icon } from 'antd';
 import CommentForm from './CommentForm';
-import QuillForEditor from '../../quillForEditor';
+import {markdownToHTML} from 'educoder'
+// import QuillForEditor from '../../quillForEditor';
 
-function CommentItem ({
+function CommentItem({
   isAdmin,
   options,
   confirm,
@@ -39,7 +36,7 @@ function CommentItem ({
   // 上传图片的ulr
   const [url, setUrl] = useState('');
 
-  const { 
+  const {
     author = {}, // 作者
     id, // 评论id
     content, // 回复内容
@@ -57,22 +54,21 @@ function CommentItem ({
     confirm({
       title: '提示',
       content: ('确定要删除该条回复吗?'),
-      onOk () {
-        console.log('点击了删除', id);
+      onOk() {
         submitDeleteComment && submitDeleteComment(id);
       }
     });
   }
 
   // 评论头像
-  const commentAvatar = (author) => ( 
-    <img 
-      className="item-flex flex-image" 
+  const commentAvatar = (author) => (
+    <img
+      className="item-flex flex-image"
       src={author.image_url ? getImageUrl(`images/${author.image_url}`) : 'https://b-ssl.duitang.com/uploads/item/201511/13/20151113110434_kyReJ.jpeg'}
       alt=""
     />
   );
-  
+
   // 评论信息
   const commentInfo = (id, author, time, can_delete) => {
     const _classNames = can_delete ? 'item-close' : 'item-close hide';
@@ -84,11 +80,10 @@ function CommentItem ({
           <span className="iconfont icon-shanchu icon_font_size_14" onClick={() => deleteComment(id)}></span>
         </span>
       </div>
-    );  
+    );
   };
 
   const handleShowUploadImage = (url) => {
-    // console.log('==============>>>>>>>>>>>>',url);
     setUrl(url);
   }
   // 评论内容
@@ -99,13 +94,15 @@ function CommentItem ({
     } catch (e) {
       _ctx = ctx;
     }
+    //      <QuillForEditor
+    //         readOnly={true}
+    //         value={_ctx}
+    //         showUploadImage={handleShowUploadImage}
+    //       />
     return (
-      <QuillForEditor
-        readOnly={true}
-        value={_ctx}
-        showUploadImage={handleShowUploadImage}
-      />
-  )};
+      <div className={"mt15 ml15"} style={{wordBreak: "break-word",fontWeight:"bold"}} dangerouslySetInnerHTML={{__html: markdownToHTML(_ctx).replace(/▁/g, "▁▁▁")}}></div>
+    )
+  };
 
   // 加载更多
   const handleOnLoadMore = (len) => {
@@ -154,7 +151,7 @@ function CommentItem ({
         <li className={_moreClass} onClick={() => handleOnLoadMore(len)}>
           <p className="loadmore-txt">展开其余{lastTxt}条评论</p>
           <p className="loadmore-icon">
-            <Icon type={!arrow ? 'down' : 'up'}/>
+            <Icon type={!arrow ? 'down' : 'up'} />
           </p>
         </li>
       </ul>
@@ -169,7 +166,7 @@ function CommentItem ({
   const handleClickLick = (id) => {
     likeComment && likeComment(id);
   }
-  
+
   // 点击评论icon
   const handleClickMessage = () => {
     setShowQuill(true);
@@ -198,33 +195,33 @@ function CommentItem ({
       <div className="item-flex item-desc">
         {commentInfo(id, author, time, can_delete)}
         {commentCtx(content)}
-        
+
         {commentAppend(children)}
 
         <div className="comment_icon_area">
           <CommentIcon
-            style={{ display: isAdmin ? 'inline-block' : 'none'}}
-            className='comment-icon-margin' 
-            type={!hidden ? "xianshi" : 'yincang1'} 
+            style={{ display: isAdmin ? 'inline-block' : 'none' }}
+            className='comment-icon-margin'
+            type={!hidden ? "xianshi" : 'yincang1'}
             iconClick={() => handleShowOrHide(id, !hidden ? 1 : 0)}
           />
 
           <CommentIcon
-            style={{ display: can_delete ? 'inline-block' : 'none'}}
-            className='comment-icon-margin' 
-            type={'shanchu'} 
+            style={{ display: can_delete ? 'inline-block' : 'none' }}
+            className='comment-icon-margin'
+            type={'shanchu'}
             iconClick={() => deleteComment(id)}
           />
           {/* 回复 */}
-          <CommentIcon 
-            className='comment-icon-margin' 
+          <CommentIcon
+            className='comment-icon-margin'
             type="huifu1"
-            count={children.length} 
+            count={children.length}
             iconClick={handleClickMessage}
           />
           {/* 点赞 */}
-          <CommentIcon 
-            iconColor={ user_praise ? '#5091FF' : '' }
+          <CommentIcon
+            iconColor={user_praise ? '#5091FF' : ''}
             className='comment-icon-margin'
             theme={user_praise ? 'filled' : ''}
             type="dianzan"
@@ -234,7 +231,7 @@ function CommentItem ({
         </div>
 
         <div
-          style={{ display: showQuill ? 'block' : 'none'}}
+          style={{ display: showQuill ? 'block' : 'none' }}
           className="comment_item_quill">
           <CommentForm
             onCancel={handleClickCancel}
@@ -242,11 +239,10 @@ function CommentItem ({
           />
         </div>
 
-        {/* 显示上传的图片信息 */}
-        <div className="show_upload_image" style={{ display: url ? 'block' : 'none'}}>
-          <Icon type="close" className="image_close" onClick={handleClose}/>
+        <div className="show_upload_image" style={{ display: url ? 'block' : 'none' }}>
+          <Icon type="close" className="image_close" onClick={handleClose} />
           <div className="image_info">
-            <img className="image" src={url} alt=""/>
+            <img className="image" src={url} alt="" />
           </div>
         </div>
       </div>
@@ -254,4 +250,4 @@ function CommentItem ({
   );
 }
 
-export default CNotificationHOC() (CommentItem);
+export default CNotificationHOC()(CommentItem);

src/common/components/comment/index.js

@@ -7,39 +7,28 @@
  * @LastEditTime : 2019-12-24 18:03:21
  */
 import React from 'react';
-// import CommentForm from './CommentForm';
 import CommentList from './CommentList';
-function Comment (props) {
+function Comment(props) {
 
-  const { 
+  const {
     commentLists,
-    // addComment,
-    // cancelComment,
     isAdmin,
     addChildComment,
     likeComment,
     showOrHideComment,
     submitDeleteComment
   } = props;
-  
-  // const handleCancelComment = () => {
-  //   cancelComment && cancelComment();
-  // };
+
   return (
-    <React.Fragment>
-      {/* <CommentForm 
-        onCancel={handleCancelComment}
-        onSubmit={addComment}
-      /> */}
-      <CommentList 
-        isAdmin={isAdmin}
-        likeComment={likeComment}
-        showOrHideComment={showOrHideComment}
-        commentLists={commentLists}
-        submitChildComment={addChildComment}
-        submitDeleteComment={submitDeleteComment}
-      />
-    </React.Fragment>
+    <CommentList
+      isAdmin={isAdmin}
+      likeComment={likeComment}
+      showOrHideComment={showOrHideComment}
+      commentLists={commentLists}
+      submitChildComment={addChildComment}
+      submitDeleteComment={submitDeleteComment}
+    />
+
   );
 }
 

src/common/components/comment/util.js

@@ -1,7 +1,7 @@
 /*
  * @Description: quill delta -> html
  * @Author: tangjiang
- * @Github: 
+ * @Github:
  * @Date: 2019-12-24 08:51:25
  * @LastEditors  : tangjiang
  * @LastEditTime : 2019-12-26 09:30:11
@@ -55,7 +55,7 @@ export const formatDelta = (deltas) => {
  */
 export const operate = (text, key, value) => {
   let operatedText = null;
-  debugger;
+
   switch (key) {
     case 'bold':
       operatedText = `<strong>${text}</strong>`;
@@ -72,7 +72,7 @@ export const operate = (text, key, value) => {
     case 'link':
       operatedText = `<a href="${value}" style="color: #5091ff; text-decoration: underline;" target="bland">${text}</a>`;
       break;
-    default: 
+    default:
       operatedText = text;
   }
 

src/common/components/custom-editor/index.jsx

@@ -0,0 +1,64 @@
+import React, { useMemo, useState, useEffect } from 'react'
+
+import TPMMDEditor from '../../../modules/tpm/challengesnew/tpm-md-editor'
+import { markdownToHTML } from 'educoder'
+import './index.scss'
+
+function noop() { }
+
+export const defaultQuillOpt = [
+  'bold', 'italic', 'underline',
+  { list: 'ordered' }, { list: 'bullet' },
+  { script: 'sub' }, { script: 'super' },
+  { 'color': [] },
+  { 'background': [] },
+  'image', 'code-block', 'formula', 'clean'
+]
+export default ({ is_md, value, onChange, placeholder, autoFocus = true, isError, isShowEditor, height = 160, options = defaultQuillOpt, index, onActiveOption = noop, md_id, showResizeBar = false }) => {
+  let html = useMemo(() => {
+    if (value) {
+      return is_md ? markdownToHTML(value) : value
+    }
+    return placeholder
+  }, [is_md, placeholder, value])
+
+  const [isFocus, setIsFocus] = useState(false)
+  useEffect(() => {
+    if (isShowEditor) {
+      setIsFocus(autoFocus)
+    } else {
+      setIsFocus(false)
+    }
+  }, [autoFocus, isShowEditor])
+
+
+  function onMdContentChangeHandler(v) {
+    onChange(v, index)
+  }
+
+  function onActiveHandler(e) {
+    e.preventDefault()
+    e.stopPropagation()
+    onActiveOption(index)
+  }
+  return (
+    <div className='editor-content-panel-wrapper'>
+      <div className={`editor-content-panel markdown-body ${isShowEditor ? 'hide' : null} ${isError ? 'error' : null} ${value ? 'hasValue' : null} `}
+        dangerouslySetInnerHTML={{ __html: html }} onClick={onActiveHandler} />
+
+      {is_md ?
+        <TPMMDEditor
+          initValue={value}
+          height={height}
+          mdID={md_id}
+          noStorage={true}
+          className={`${isShowEditor ? null : 'hideMd'} ${isError ? 'md-error' : null} `}
+          onChange={onMdContentChangeHandler}
+          showResizeBar={showResizeBar}
+          placeholder={placeholder}
+        /> : null
+      }
+
+    </div>
+  )
+}

src/common/components/custom-editor/index.scss

@@ -0,0 +1,46 @@
+.editor-content-panel-wrapper {
+  margin-bottom: 12px;
+
+  .editor-content-panel {
+    display: flex;
+    align-items: center;
+    word-break: break-all;
+
+    border-radius: 2px;
+    max-width: 1056px;
+    text-align: justify;
+
+    height: auto;
+    min-height: 38px;
+    border: 1px solid rgba(234, 234, 234, 1);
+    padding: 4px;
+    width: 100%;
+
+    p {
+      width: 100%;
+    }
+  }
+
+  .hide {
+    display: none;
+  }
+
+  .hasValue {
+    color: rgb(153, 153, 153);
+  }
+
+}
+
+.md-error {
+  .edu-back-greyf5 {
+    border: 1px solid red;
+  }
+}
+
+.hideMd {
+  display: none;
+}
+
+.error {
+  border: 1px solid red;
+}

src/common/components/form/City.js

@@ -524,8 +524,8 @@ const options = [{
     value: '天水',
     label: '天水'
   },{
-    value: '武都',
-    label: '武都'
+    value: '陇南',
+    label: '陇南'
   },{
     value: '武威',
     label: '武威'
@@ -1746,7 +1746,6 @@ class City extends Component{
     }
   }
   onChange = (r1, r2) => {
-    // debugger
     this.props.onChange(r1, r2)
     this.setState({ value: r1 })
   }

src/common/components/markdown/DMDEditor.css

@@ -1,12 +0,0 @@
-.hideMd {
-    display: none !important;
-}
-.content_editorMd_show {
-    height: auto;
-    min-height: 38px;
-    width: 800px;
-    border: 1px solid rgba(234,234,234,1);
-    margin-top: 2px;
-    padding: 4px;
-    width: 100%;
-}

src/common/components/markdown/DMDEditor.js

@@ -1,83 +0,0 @@
-import React,{ Component } from "react";
-import TPMMDEditor from '../../../modules/tpm/challengesnew/TPMMDEditor'
-import {markdownToHTML} from 'educoder'
-import './DMDEditor.css'
-// 需要父组件通过toShowMode、toMDMode 来控制，一次只能打开一个DMDEditor
-class DMDEditor extends Component{
-  constructor(props){
-    super(props);
-    this.mdRef = React.createRef()
-    this.state={
-        mdMode: false,
-        // value: this.props.initValue
-    }
-  }
-  componentDidUpdate(prevProps, prevState) {
-    
-  }
-  componentDidMount() {
-    // if(this.props.initValue != this.mdRef.current.getValue()) {
-    //   this.mdRef.current.setValue(this.props.initValue)
-    // }
-  }
-  
-  
-  toMDMode = () => {
-    this.setState({mdMode: true}, () => {
-        this.mdRef.current.resize()
-        this.mdRef.current.setValue(this.props.initValue)
-    })
-    this.props.toMDMode(this)    
-  }
-  toShowMode = () => {
-    this.setState({mdMode: false})
-    this.props.toShowMode && this.props.toShowMode(this)
-  }
-  onCMBlur = () => {
-      this.toShowMode()
-  }
-  onChange = (val) => {
-    //   this.setState({ value: val })
-    this.props.onChange(val)
-    if (this.state.showError == true) {
-      this.setState({showError: false})
-    }
-  }
-  showError = () => {
-    this.mdRef.current.showError()
-    this.setState({showError: true})
-  }
-  render(){
-    const { mdMode, showError } = this.state;
-    const { initValue } = this.props;
-    let _style = {}
-    if (showError) {
-        _style.border = '1px solid red'
-    }
-    _style = Object.assign(_style, {display: mdMode == true ? 'none' : '', color: initValue? '': '#999', alignItems: 'center',  wordBreak: 'break-all'})
-    return(
-      <React.Fragment>
-        <style>{`
-            
-        `}</style>
-        <div id="content_editorMd_show" className="new_li content_editorMd_show markdown-body"
-                style={_style}
-                dangerouslySetInnerHTML={{__html: initValue ? markdownToHTML(initValue):this.props.placeholder}}
-                onClick={this.toMDMode}
-        >
-
-        </div>
-        {/* 
-          onCMBlur={this.onCMBlur} */}
-        <TPMMDEditor
-          ref={this.mdRef}
-          {...this.props}
-          initValue={initValue}
-          className={`${this.props.className} ${mdMode == true ? '' : 'hideMd'}`}
-          onChange={this.onChange}
-        ></TPMMDEditor>
-      </React.Fragment>
-    )
-  }
-}
-export default DMDEditor;

src/common/components/media/AliyunUploader.js

@@ -8,12 +8,12 @@ let _path = isDev() ? 'public' : 'build'
 
 let uploader
 
-let _testHost = '' ; '192.168.2.63:3001/api'
+let _testHost = ''; '192.168.2.63:3001/api'
 
 
 const login = 'innov'
 
-function createUploader () {
+function createUploader() {
     uploader = new window.AliyunUpload.Vod({
         timeout: $('#timeout').val() || 60000,
         partSize: $('#partSize').val() || 1048576,
@@ -35,12 +35,12 @@ function createUploader () {
         },
         // 开始上传
         onUploadstarted: function (uploadInfo) {
-        // 如果是 UploadAuth 上传方式, 需要调用 uploader.setUploadAuthAndAddress 方法
-        // 如果是 UploadAuth 上传方式, 需要根据 uploadInfo.videoId是否有值，调用点播的不同接口获取uploadauth和uploadAddress
-        // 如果 uploadInfo.videoId 有值，调用刷新视频上传凭证接口，否则调用创建视频上传凭证接口
-        // 注意: 这里是测试 demo 所以直接调用了获取 UploadAuth 的测试接口, 用户在使用时需要判断 uploadInfo.videoId 存在与否从而调用 openApi
-        // 如果 uploadInfo.videoId 存在, 调用 刷新视频上传凭证接口(https://help.aliyun.com/document_detail/55408.html)
-        // 如果 uploadInfo.videoId 不存在,调用 获取视频上传地址和凭证接口(https://help.aliyun.com/document_detail/55407.html)
+            // 如果是 UploadAuth 上传方式, 需要调用 uploader.setUploadAuthAndAddress 方法
+            // 如果是 UploadAuth 上传方式, 需要根据 uploadInfo.videoId是否有值，调用点播的不同接口获取uploadauth和uploadAddress
+            // 如果 uploadInfo.videoId 有值，调用刷新视频上传凭证接口，否则调用创建视频上传凭证接口
+            // 注意: 这里是测试 demo 所以直接调用了获取 UploadAuth 的测试接口, 用户在使用时需要判断 uploadInfo.videoId 存在与否从而调用 openApi
+            // 如果 uploadInfo.videoId 存在, 调用 刷新视频上传凭证接口(https://help.aliyun.com/document_detail/55408.html)
+            // 如果 uploadInfo.videoId 不存在,调用 获取视频上传地址和凭证接口(https://help.aliyun.com/document_detail/55407.html)
             if (!uploadInfo.videoId) {
                 // var createUrl = 'https://demo-vod.cn-shanghai.aliyuncs.com/voddemo/CreateUploadVideo?Title=testvod1&FileName=aa.mp4&BusinessType=vodai&TerminalType=pc&DeviceModel=iPhone9,2&UUID=59ECA-4193-4695-94DD-7E1247288&AppVersion=1.0.0&VideoId=5bfcc7864fc14b96972842172207c9e6'
                 // $.get(createUrl, function (data) {
@@ -49,9 +49,9 @@ function createUploader () {
                 //     var videoId = data.VideoId
                 //     uploader.setUploadAuthAndAddress(uploadInfo, uploadAuth, uploadAddress,videoId)
                 // }, 'json')
-                
+
                 var createUrl = `${_testHost}/users/${login}/video_auths.json?debug=true`
-                
+
                 axios.post(createUrl, {
                     title: 'testvod1',
                     file_name: 'aa.mp4'
@@ -65,7 +65,7 @@ function createUploader () {
                 }).catch((error) => {
                     console.log(error)
                 })
-                
+
 
                 $('#status').text('文件开始上传...')
                 console.log("onUploadStarted:" + uploadInfo.file.name + ", endpoint:" + uploadInfo.endpoint + ", bucket:" + uploadInfo.bucket + ", object:" + uploadInfo.object)
@@ -81,7 +81,7 @@ function createUploader () {
                 // }, 'json')
 
                 var refreshUrl = `${_testHost}/users/${login}/video_auths.json?debug=true`
-                
+
                 axios.put(refreshUrl, {
                     video_id: uploadInfo.videoId,
                 }).then((response) => {
@@ -132,7 +132,7 @@ function createUploader () {
             // }, 'json')
 
             var refreshUrl = `${_testHost}/users/${login}/video_auths.json?debug=true`
-                
+
             axios.put(refreshUrl, {
                 video_id: uploadInfo.videoId,
             }).then((response) => {
@@ -152,24 +152,24 @@ function createUploader () {
     return uploader
 }
 function AliyunUploader(props) {
-    
+
     useEffect(() => {
         if (window.AliyunUpload && window.AliyunUpload.Vod) {
 
         } else {
             $.getScript(
-            `${_url_origin}/react/${_path}/js/aliyun-upload/lib/es6-promise.min.js`,
-            (data, textStatus, jqxhr) => {
-                $.getScript(
-                    `${_url_origin}/react/${_path}/js/aliyun-upload/lib/aliyun-oss-sdk-5.3.1.min.js`,
+                `${_url_origin}/react/${_path}/js/aliyun-upload/lib/es6-promise.min.js`,
                 (data, textStatus, jqxhr) => {
                     $.getScript(
-                        `${_url_origin}/react/${_path}/js/aliyun-upload/aliyun-upload-sdk-1.5.0.min.js`,
-                    (data, textStatus, jqxhr) => {
-                    
-                    });
+                        `${_url_origin}/react/${_path}/js/aliyun-upload/lib/aliyun-oss-sdk-5.3.1.min.js`,
+                        (data, textStatus, jqxhr) => {
+                            $.getScript(
+                                `${_url_origin}/react/${_path}/js/aliyun-upload/aliyun-upload-sdk-1.5.0.min.js`,
+                                (data, textStatus, jqxhr) => {
+
+                                });
+                        });
                 });
-            });
         }
 
         $('#fileUpload').on('change', function (e) {
@@ -201,7 +201,7 @@ function AliyunUploader(props) {
     }, [])
 
     let { source, id, className, type } = props;
-    
+
     function onStop() {
         $('#resumeUpload').attr('disabled', false)
         // $('#pauseUpload').attr('disabled', true)
@@ -212,26 +212,26 @@ function AliyunUploader(props) {
         // $('#pauseUpload').attr('disabled', false)
         uploader.startUpload()
     }
-    return(
+    return (
         <React.Fragment>
             <div>
                 <input type="file" id="fileUpload"></input>
-                <label class="status">上传状态: <span id="status"></span></label>
+                <label className="status">上传状态: <span id="status"></span></label>
             </div>
-            <div class="upload-type">
+            <div className="upload-type">
                 上传方式一, 使用 UploadAuth 上传:
                 {/* <button id="authUpload" disabled="true">开始上传</button>
                 <button id="pauseUpload" disabled="true" onClick={onStop}>暂停</button>
                 <button id="resumeUpload" disabled="true" onClick={onResume}>恢复上传</button> */}
                 <button id="authUpload" >开始上传</button>
-                <button id="pauseUpload"  onClick={onStop}>暂停</button>
-                <button id="resumeUpload"  onClick={onResume}>恢复上传</button>
-                <span class="progress">上传进度: <i id="auth-progress">0</i> %</span>
+                <button id="pauseUpload" onClick={onStop}>暂停</button>
+                <button id="resumeUpload" onClick={onResume}>恢复上传</button>
+                <span className="progress">上传进度: <i id="auth-progress">0</i> %</span>
                 <span></span>
             </div>
 
         </React.Fragment>
     )
-  
+
 }
 export default AliyunUploader

src/common/components/media/AliyunUploaderDemo.js

@@ -8,7 +8,7 @@ let _path = _isDev ? 'public' : 'build'
 
 let uploader
 
-function createUploader () {
+function createUploader() {
     uploader = new AliyunUpload.Vod({
         timeout: $('#timeout').val() || 60000,
         partSize: $('#partSize').val() || 1048576,
@@ -30,19 +30,19 @@ function createUploader () {
         },
         // 开始上传
         onUploadstarted: function (uploadInfo) {
-        // 如果是 UploadAuth 上传方式, 需要调用 uploader.setUploadAuthAndAddress 方法
-        // 如果是 UploadAuth 上传方式, 需要根据 uploadInfo.videoId是否有值，调用点播的不同接口获取uploadauth和uploadAddress
-        // 如果 uploadInfo.videoId 有值，调用刷新视频上传凭证接口，否则调用创建视频上传凭证接口
-        // 注意: 这里是测试 demo 所以直接调用了获取 UploadAuth 的测试接口, 用户在使用时需要判断 uploadInfo.videoId 存在与否从而调用 openApi
-        // 如果 uploadInfo.videoId 存在, 调用 刷新视频上传凭证接口(https://help.aliyun.com/document_detail/55408.html)
-        // 如果 uploadInfo.videoId 不存在,调用 获取视频上传地址和凭证接口(https://help.aliyun.com/document_detail/55407.html)
+            // 如果是 UploadAuth 上传方式, 需要调用 uploader.setUploadAuthAndAddress 方法
+            // 如果是 UploadAuth 上传方式, 需要根据 uploadInfo.videoId是否有值，调用点播的不同接口获取uploadauth和uploadAddress
+            // 如果 uploadInfo.videoId 有值，调用刷新视频上传凭证接口，否则调用创建视频上传凭证接口
+            // 注意: 这里是测试 demo 所以直接调用了获取 UploadAuth 的测试接口, 用户在使用时需要判断 uploadInfo.videoId 存在与否从而调用 openApi
+            // 如果 uploadInfo.videoId 存在, 调用 刷新视频上传凭证接口(https://help.aliyun.com/document_detail/55408.html)
+            // 如果 uploadInfo.videoId 不存在,调用 获取视频上传地址和凭证接口(https://help.aliyun.com/document_detail/55407.html)
             if (!uploadInfo.videoId) {
                 var createUrl = 'https://demo-vod.cn-shanghai.aliyuncs.com/voddemo/CreateUploadVideo?Title=testvod1&FileName=aa.mp4&BusinessType=vodai&TerminalType=pc&DeviceModel=iPhone9,2&UUID=59ECA-4193-4695-94DD-7E1247288&AppVersion=1.0.0&VideoId=5bfcc7864fc14b96972842172207c9e6'
                 $.get(createUrl, function (data) {
-                var uploadAuth = data.UploadAuth
-                var uploadAddress = data.UploadAddress
-                var videoId = data.VideoId
-                uploader.setUploadAuthAndAddress(uploadInfo, uploadAuth, uploadAddress,videoId)
+                    var uploadAuth = data.UploadAuth
+                    var uploadAddress = data.UploadAddress
+                    var videoId = data.VideoId
+                    uploader.setUploadAuthAndAddress(uploadInfo, uploadAuth, uploadAddress, videoId)
                 }, 'json')
                 $('#status').text('文件开始上传...')
                 console.log("onUploadStarted:" + uploadInfo.file.name + ", endpoint:" + uploadInfo.endpoint + ", bucket:" + uploadInfo.bucket + ", object:" + uploadInfo.object)
@@ -51,10 +51,10 @@ function createUploader () {
                 // https://help.aliyun.com/document_detail/55408.html?spm=a2c4g.11186623.6.630.BoYYcY
                 var refreshUrl = 'https://demo-vod.cn-shanghai.aliyuncs.com/voddemo/RefreshUploadVideo?BusinessType=vodai&TerminalType=pc&DeviceModel=iPhone9,2&UUID=59ECA-4193-4695-94DD-7E1247288&AppVersion=1.0.0&Title=haha1&FileName=xxx.mp4&VideoId=' + uploadInfo.videoId
                 $.get(refreshUrl, function (data) {
-                var uploadAuth = data.UploadAuth
-                var uploadAddress = data.UploadAddress
-                var videoId = data.VideoId
-                uploader.setUploadAuthAndAddress(uploadInfo, uploadAuth, uploadAddress,videoId)
+                    var uploadAuth = data.UploadAuth
+                    var uploadAddress = data.UploadAddress
+                    var videoId = data.VideoId
+                    uploader.setUploadAuthAndAddress(uploadInfo, uploadAuth, uploadAddress, videoId)
                 }, 'json')
             }
         },
@@ -103,24 +103,24 @@ function createUploader () {
     return uploader
 }
 function AliyunUploaderDemo(props) {
-    
+
     useEffect(() => {
         if (window.AliyunUpload && window.AliyunUpload.Vod) {
 
         } else {
             $.getScript(
-            `${_url_origin}/react/${_path}/js/aliyun-upload/lib/es6-promise.min.js`,
-            (data, textStatus, jqxhr) => {
-                $.getScript(
-                    `${_url_origin}/react/${_path}/js/aliyun-upload/lib/aliyun-oss-sdk-5.3.1.min.js`,
+                `${_url_origin}/react/${_path}/js/aliyun-upload/lib/es6-promise.min.js`,
                 (data, textStatus, jqxhr) => {
                     $.getScript(
-                        `${_url_origin}/react/${_path}/js/aliyun-upload/aliyun-upload-sdk-1.5.0.min.js`,
-                    (data, textStatus, jqxhr) => {
-                    
-                    });
+                        `${_url_origin}/react/${_path}/js/aliyun-upload/lib/aliyun-oss-sdk-5.3.1.min.js`,
+                        (data, textStatus, jqxhr) => {
+                            $.getScript(
+                                `${_url_origin}/react/${_path}/js/aliyun-upload/aliyun-upload-sdk-1.5.0.min.js`,
+                                (data, textStatus, jqxhr) => {
+
+                                });
+                        });
                 });
-            });
         }
 
         $('#fileUpload').on('change', function (e) {
@@ -152,7 +152,7 @@ function AliyunUploaderDemo(props) {
     }, [])
 
     let { source, id, className, type } = props;
-    
+
     function onStop() {
         $('#resumeUpload').attr('disabled', false)
         // $('#pauseUpload').attr('disabled', true)
@@ -163,26 +163,26 @@ function AliyunUploaderDemo(props) {
         // $('#pauseUpload').attr('disabled', false)
         uploader.startUpload()
     }
-    return(
+    return (
         <React.Fragment>
             <div>
                 <input type="file" id="fileUpload"></input>
-                <label class="status">上传状态: <span id="status"></span></label>
+                <label className="status">上传状态: <span id="status"></span></label>
             </div>
-            <div class="upload-type">
+            <div className="upload-type">
                 上传方式一, 使用 UploadAuth 上传:
                 {/* <button id="authUpload" disabled="true">开始上传</button>
                 <button id="pauseUpload" disabled="true" onClick={onStop}>暂停</button>
                 <button id="resumeUpload" disabled="true" onClick={onResume}>恢复上传</button> */}
                 <button id="authUpload" >开始上传</button>
-                <button id="pauseUpload"  onClick={onStop}>暂停</button>
-                <button id="resumeUpload"  onClick={onResume}>恢复上传</button>
-                <span class="progress">上传进度: <i id="auth-progress">0</i> %</span>
+                <button id="pauseUpload" onClick={onStop}>暂停</button>
+                <button id="resumeUpload" onClick={onResume}>恢复上传</button>
+                <span className="progress">上传进度: <i id="auth-progress">0</i> %</span>
                 <span></span>
             </div>
 
         </React.Fragment>
     )
-  
+
 }
 export default AliyunUploaderDemo

src/common/course/ActionBtn.js

@@ -1,26 +1,23 @@
 import React, { Component } from 'react';
-import {Link} from 'react-router-dom'
+import { Link } from 'react-router-dom'
 
-const map={"blue":"blueFull","greyBack":"greyBack","grey":"greyWidthFixed","green":"greenBack",'greyLine':"greyLine",'orangeLine':"orangeLine",
+const map = {
+  "blue": "blueFull", "greyBack": "greyBack", "grey": "greyWidthFixed", "green": "greenBack", 'greyLine': "greyLine", 'orangeLine': "orangeLine",
   'colorBlue': 'colorBlue',   // 蓝字白底
 }
 class ActionBtn extends Component {
-  constructor(props) {
-    super(props);
-  }
-
   render() {
-    let{to, children, style, className, ...others}=this.props
-    return(
+    let { to, children, style, className, ...others } = this.props
+    return (
       <React.Fragment>
         {
-          to==undefined ? 
-          <a href="javascript:void(0)" onClick={this.props.onClick} 
-            {...others}
-            className={"Actionbtn "+`${map[style || 'blue']} ${this.props.className}`}
-          >{children}</a>
-          :
-          <Link to={to} className={"btn "+`${map[this.props.style]} ${this.props.className}`} {...others}>{this.props.children}</Link>
+          to === undefined ?
+            <a onClick={this.props.onClick}
+              {...others}
+              className={`Actionbtn ${map[style || 'blue']} ${this.props.className}`}
+            >{children}</a>
+            :
+            <Link to={to} className={`btn ${map[this.props.style]} ${this.props.className}`} {...others}>{this.props.children}</Link>
         }
       </React.Fragment>
     )

src/common/course/WordsBtn.js

@@ -1,28 +1,28 @@
 import React, { Component } from 'react';
-import {Link} from 'react-router-dom'
+import { Link } from 'react-router-dom'
 
-const map={"blue":"colorblue","white":"colorwhite","grey":"colorgrey", 'orange': "color-orange",'colorgrey9':'color-grey-9'}
+const map = { "blue": "colorblue", "white": "colorwhite", "grey": "colorgrey", 'orange': "color-orange", 'colorgrey9': 'color-grey-9' }
 class WordsBtn extends Component {
   constructor(props) {
     super(props);
   }
 
   render() {
-    let{to, href,targets, style2, style, className, ...others }=this.props
-    return(
+    let { to, href, targets, style2, style, className, ...others } = this.props
+    return (
       <React.Fragment>
         {
-          to==undefined&&targets==undefined ?
-          <a href={href || "javascript:void(0)"} onClick={this.props.onClick} className={"btn "+`${map[this.props.style]} ${this.props.className}`}
+          to == undefined && targets == undefined ?
+            <a onClick={this.props.onClick} className={"btn " + `${map[this.props.style]} ${this.props.className || ""}`}
               style={style2} {...others}
-          >{this.props.children}</a>:
-						targets!=undefined? <a href={to} target="_blank" className={"btn "+`${map[this.props.style]} ${this.props.className}`}
+            >{this.props.children}</a> :
+            targets != undefined ? <a href={to} target="_blank" className={"btn " + `${map[this.props.style]} ${this.props.className}`}
               style={style2} {...others}
             >{this.props.children}</a>
-          :
-          <Link to={to} className={"btn "+`${map[this.props.style]} ${this.props.className}`}
-            style={style2} {...others}
-          >{this.props.children}</Link>
+              :
+              <Link to={to} className={"btn " + `${map[this.props.style]} ${this.props.className || ""}`}
+                style={style2} {...others}
+              >{this.props.children}</Link>
         }
       </React.Fragment>
     )

src/common/educoder.js

@@ -2,64 +2,72 @@
 
 // export { default as OrderStateUtil } from          '../routes/Order/components/OrderStateUtil';
 
-export { getImageUrl as getImageUrl,getmyUrl as getmyUrl, getRandomNumber as getRandomNumber,getUrl as getUrl, publicSearchs as publicSearchs,getRandomcode as getRandomcode,getUrlmys as getUrlmys, getUrl2 as getUrl2, setImagesUrl as setImagesUrl
-	, getUploadActionUrl as getUploadActionUrl,getUploadActionUrltwo as getUploadActionUrltwo ,getUploadActionUrlthree as getUploadActionUrlthree, getUploadActionUrlOfAuth as getUploadActionUrlOfAuth
-	, getTaskUrlById as getTaskUrlById, TEST_HOST ,htmlEncode as htmlEncode ,getupload_git_file as getupload_git_file} from                './UrlTool';
+export {
+	getUploadLogoActionUrl as getUploadLogoActionUrl,
+	getImageUrl as getImageUrl, getmyUrl as getmyUrl, getRandomNumber as getRandomNumber, getUrl as getUrl, publicSearchs as publicSearchs, getRandomcode as getRandomcode, getUrlmys as getUrlmys, getUrl2 as getUrl2, setImagesUrl as setImagesUrl
+	, getUploadActionUrl as getUploadActionUrl, getUploadActionUrltwo as getUploadActionUrltwo, getUploadActionUrlthree as getUploadActionUrlthree, getUploadActionUrlOfAuth as getUploadActionUrlOfAuth
+	, getTaskUrlById as getTaskUrlById, TEST_HOST, htmlEncode as htmlEncode, getupload_git_file as getupload_git_file, getcdnImageUrl as getcdnImageUrl
+} from './UrlTool';
 
-export {setmiyah as setmiyah} from './Component';
-export { default as queryString } from                './UrlTool2';
+export { setmiyah as setmiyah } from './Component';
+export { default as queryString } from './UrlTool2';
 
-export { SnackbarHOC as SnackbarHOC } from                './SnackbarHOC';
+export { SnackbarHOC as SnackbarHOC } from './SnackbarHOC';
 
-export { trigger as trigger, on as on, off as off
-	, broadcastChannelPostMessage, broadcastChannelOnmessage } from                './EventUtil';
+export {
+	trigger as trigger, on as on, off as off
+	, broadcastChannelPostMessage, broadcastChannelOnmessage
+} from './EventUtil';
 
-export { updatePageParams as updatePageParams } from                './RouterUtil';
+export { updatePageParams as updatePageParams } from './RouterUtil';
 
-export { bytesToSize as bytesToSize } from                './UnitUtil';
+export { bytesToSize as bytesToSize } from './UnitUtil';
 
-export { markdownToHTML, uploadNameSizeSeperator, appendFileSizeToUploadFile, appendFileSizeToUploadFileAll, isImageExtension,
-	downloadFile, sortDirections } from 	'./TextUtil'
-export { handleDateString, getNextHalfHourOfMoment,formatDuring } from 	'./DateUtil'
+export {
+	markdownToHTML, uploadNameSizeSeperator, appendFileSizeToUploadFile, appendFileSizeToUploadFileAll, isImageExtension,
+	downloadFile, sortDirections, validateLength, mdJSONParse, exportMdtoHtml
+} from './TextUtil'
+export { handleDateString, getNextHalfHourOfMoment, formatDuring, formatSeconds } from './DateUtil'
 
-export { configShareForIndex, configShareForPaths, configShareForShixuns, configShareForCourses, configShareForCustom } from 	'./util/ShareUtil'
+export { configShareForIndex, configShareForPaths, configShareForShixuns, configShareForCourses, configShareForCustom } from './util/ShareUtil'
 
-export { isDev as isDev, isMobile } from 					'./Env'
+export { isDev as isDev, isMobile } from './Env'
 
-export { toStore as toStore, fromStore as fromStore } from 	'./Store'
+export { toStore as toStore, fromStore as fromStore } from './Store'
 
-export { trace_collapse, trace, debug, info, warn, error, trace_c, debug_c, info_c, warn_c, error_c } from 	'./LogUtil'
+export { trace_collapse, trace, debug, info, warn, error, trace_c, debug_c, info_c, warn_c, error_c } from './LogUtil'
 
-export { EDU_ADMIN, EDU_BUSINESS, EDU_SHIXUN_MANAGER, EDU_SHIXUN_MEMBER, EDU_CERTIFICATION_TEACHER
-	, EDU_GAME_MANAGER, EDU_TEACHER, EDU_NORMAL} from 	'./Const'
+export {
+	EDU_ADMIN, EDU_BUSINESS, EDU_SHIXUN_MANAGER, EDU_SHIXUN_MEMBER, EDU_CERTIFICATION_TEACHER
+	, EDU_GAME_MANAGER, EDU_TEACHER, EDU_NORMAL
+} from './Const'
 
 
 export { default as AttachmentList } from './components/attachment/AttachmentList'
 
-export { themes, ThemeContext } from 	'./context/ThemeContext'
+export { themes, ThemeContext } from './context/ThemeContext'
 
-export { ModalHOC } from 	'./components/ModalHOC'
+export { ModalHOC } from './components/ModalHOC'
 
-export { SetAppModel } from 	'./components/SetAppModel'
+export { SetAppModel } from './components/SetAppModel'
 
-export { default as LinkAfterLogin } from 	'./components/LinkAfterLogin'
-export { default as Cropper } from 	'./components/Cropper'
-export { default as ConditionToolTip } from 	'./components/ConditionToolTip'
-// export { default as DragValidator } from 	'./components/DragValidator'
+export { default as LinkAfterLogin } from './components/LinkAfterLogin'
+export { default as Cropper } from './components/Cropper'
+export { default as ConditionToolTip } from './components/ConditionToolTip'
 
-export { default as PopInstruction } from 	'./components/instruction/PopInstruction'
+export { default as PopInstruction } from './components/instruction/PopInstruction'
 
-export { default as City } from 	'./components/form/City'
+export { default as City } from './components/form/City'
 
 
 // course
-export { default as WordsBtn } from 	'./course/WordsBtn'
+export { default as WordsBtn } from './course/WordsBtn'
 
 export { default as ActionBtn } from './course/ActionBtn'
 
 export { default as MarkdownToHtml } from './components/markdown/MarkdownToHtml'
 
-export { default as DMDEditor } from './components/markdown/DMDEditor'
+export { default as QuillForEditor } from './quillForEditor'
 
 export { default as Clappr } from './components/media/Clappr'
 export { default as AliyunUploader } from './components/media/AliyunUploader'
@@ -73,5 +81,5 @@ export { CNotificationHOC as CNotificationHOC } from '../modules/courses/common/
 export { default as ModalWrapper } from '../modules/courses/common/ModalWrapper'
 export { default as NoneData } from '../modules/courses/coursesPublic/NoneData'
 
-export {default as WordNumberTextarea} from '../modules/modals/WordNumberTextarea'
+export { default as WordNumberTextarea } from '../modules/modals/WordNumberTextarea'
 

src/common/hooks/ImageLayer2.js

@@ -12,36 +12,29 @@ function ImageLayer2(props) {
         setShowImage(false)
         setImageSrc('')
     }
-    const onDelegateClick = (event) => {
-        const imageSrc = event.target.src || event.target.getAttribute('src') || event.target.getAttribute('href')
-        // 判断imageSrc是否是图片
-        const fileName = event.target.innerHTML.trim()
-        if (isImageExtension(imageSrc.trim()) || isImageExtension(fileName) || event.target.tagName == 'IMG' || imageSrc.indexOf('base64,') != -1) {
-            // 非回复里的头像图片; 非emoticons
-            if (imageSrc.indexOf('/images/avatars/User') === -1 && 
-                imageSrc.indexOf('kindeditor/plugins/emoticons') === -1 ) {  
-                setShowImage(true)
-                setImageSrc(imageSrc)
-            }
-            event.stopPropagation()
-            event.preventDefault && event.preventDefault()
-            event.originalEvent.preventDefault()
-            // event.originalEvent.stopPropagation()
-            // event.originalEvent.cancelBubble = true
-            return false;
-        }
-    }
     useEffect(() => {
-        $(parentSel)
-            .delegate(childSel, "click", onDelegateClick);
-
-        return () => {
-            $(parentSel).undelegate(childSel, "click", onDelegateClick )
-        }
+        $(parentSel).delegate(childSel, "click", (event) => {
+            const imageSrc = event.target.src || event.target.getAttribute('src') || event.target.getAttribute('href')
+            // 判断imageSrc是否是图片
+            const fileName = event.target.innerHTML.trim();
+    
+            if (isImageExtension((imageSrc && imageSrc.trim())) || isImageExtension(fileName) || event.target.tagName == 'IMG' || (imageSrc && imageSrc.indexOf('base64,')) != -1) {
+                // 非回复里的头像图片; 非emoticons
+                if (imageSrc.indexOf('/images/avatars/User') === -1 &&
+                    imageSrc.indexOf('kindeditor/plugins/emoticons') === -1 ) {
+                    setShowImage(true)
+                    setImageSrc(imageSrc)
+                }
+                event.stopPropagation()
+                event.preventDefault && event.preventDefault()
+                event.originalEvent.preventDefault()
+                return false;
+            }
+        })
     })
 
     return (
-        <ImageLayer showImage={showImage} imageSrc={imageSrc} onImageLayerClose={onImageLayerClose}></ImageLayer>
+      showImage?<ImageLayer showImage={showImage} imageSrc={imageSrc} onImageLayerClose={onImageLayerClose}></ImageLayer>:""
     )
 }
 

src/common/marked.js

@@ -0,0 +1,170 @@
+import marked from 'marked'
+import { escape } from 'marked/src/helpers'
+
+function indentCodeCompensation(raw, text) {
+  const matchIndentToCode = raw.match(/^(\s+)(?:```)/);
+  if (matchIndentToCode === null) {
+    return text;
+  }
+  const indentToCode = matchIndentToCode[1];
+  return text
+    .split('\n')
+    .map(node => {
+      const matchIndentInNode = node.match(/^\s+/);
+      if (matchIndentInNode === null) {
+        return node;
+      }
+      const [indentInNode] = matchIndentInNode;
+      if (indentInNode.length >= indentToCode.length) {
+        return node.slice(indentToCode.length);
+      }
+      return node;
+    })
+    .join('\n');
+}
+
+//兼容之前的 ##标题式写法
+let toc = []
+let ctx = ["<ul>"]
+const renderer = new marked.Renderer()
+const headingRegex = /^ *(#{1,6}) *([^\n]+?) *(?:#+ *)?(?:\n+|$)/
+
+export function cleanToc() {
+  toc = []
+  ctx = ["<ul>"]
+}
+
+function buildToc(coll, k, level, ctx) {
+  if (k >= coll.length || coll[k].level <= level) { return k }
+  var node = coll[k]
+  ctx.push("<li><a href='#" + node.anchor + "'>" + node.text + "</a>")
+  k++
+  var childCtx = []
+  k = buildToc(coll, k, node.level, childCtx)
+  if (childCtx.length > 0) {
+    ctx.push("<ul>")
+    childCtx.forEach(function (idm) {
+      ctx.push(idm)
+    });
+    ctx.push("</ul>")
+  }
+  ctx.push("</li>")
+  k = buildToc(coll, k, level, ctx)
+  return k
+}
+
+export function getTocContent() {
+  buildToc(toc, 0, 0, ctx)
+  ctx.push("</ul>")
+  return ctx.join("")
+}
+
+const tokenizer = {
+  heading(src) {
+    const cap = headingRegex.exec(src)
+    if (cap) {
+      return {
+        type: 'heading',
+        raw: cap[0],
+        depth: cap[1].length,
+        text: cap[2]
+      }
+    }
+  },
+  fences(src) {
+    const cap = this.rules.block.fences.exec(src)
+    if (cap) {
+      const raw = cap[0]
+      let text = indentCodeCompensation(raw, cap[3] || '')
+      const lang = cap[2] ? cap[2].trim() : cap[2]
+      if (['latex', 'katex', 'math'].indexOf(lang) >= 0) {
+        const id = next_id()
+        const expression = text
+        text = id
+        math_expressions[id] = { type: 'block', expression }
+      }
+      return {
+        type: 'code',
+        raw,
+        lang,
+        text
+      }
+    }
+  }
+}
+
+const latexRegex = /(?:\${2})([^\n`]+?)(?:\${2})/gi
+let katex_count = 0
+const next_id = () => `__special_katext_id_${katex_count++}__`
+let math_expressions = {}
+
+export function getMathExpressions() {
+  return math_expressions
+}
+
+export function resetMathExpressions() {
+  katex_count = 0
+  math_expressions = {}
+}
+
+function replace_math_with_ids(text) {
+  let rs = text.replace(latexRegex, (_match, expression) => {
+    const id = next_id()
+    math_expressions[id] = { type: 'inline', expression }
+    return id
+  })
+
+  return rs
+}
+
+const original_listitem = renderer.listitem
+renderer.listitem = function (text, task, checked) {
+  return original_listitem(replace_math_with_ids(text), task, checked)
+}
+
+const original_paragraph = renderer.paragraph
+renderer.paragraph = function (text) {
+  return original_paragraph(replace_math_with_ids(text))
+}
+
+const original_tablecell = renderer.tablecell
+renderer.tablecell = function (content, flags) {
+  return original_tablecell(replace_math_with_ids(content), flags)
+}
+
+renderer.code = function (code, infostring, escaped) {
+  const lang = (infostring || '').match(/\S*/)[0];
+  if (!lang) {
+    return '<pre class="prettyprint linenums"><code>'
+      + (escaped ? code : escape(code, true))
+      + '</code></pre>';
+  }
+
+  if (['latex', 'katex', 'math'].indexOf(lang) >= 0) {
+    return `<p class='editormd-tex'>${code}</p>`
+  } else {
+    return `<pre class="prettyprint linenums"><code class="language-${infostring}">${escaped ? code : escape(code, true)}</code></pre>\n`
+  }
+
+}
+
+renderer.heading = function (text, level, raw) {
+  let anchor = this.options.headerPrefix + raw.toLowerCase().replace(/[^\w\\u4e00-\\u9fa5]]+/g, '-');
+  toc.push({
+    anchor: anchor,
+    level: level,
+    text: text
+  })
+  return '<h' + level + ' id="' + anchor + '">' + text + '</h' + level + '>'
+}
+
+marked.setOptions({
+  silent: true,
+  smartypants: true,
+  gfm: true,
+  pedantic: false
+})
+
+marked.use({ tokenizer, renderer });
+
+export default marked

src/common/mediator.js

@@ -0,0 +1,46 @@
+function Mediator(obj) {
+  const channels = {}
+
+  const mediator = {
+    subscribe: function (channel, cb) {
+      if (!channels[channel]) {
+        channels[channel] = []
+      }
+      channels[channel].push(cb)
+      return this.unsubscribe.bind(null, channel, cb)
+    },
+
+    unsubscribe: function (channel, cb) {
+      let rs = channels[channel]
+      let index = -1
+      if (rs) {
+        for (let i = 0; i < rs.length; i++) {
+          if (rs[i].name === cb.name) {
+            index = i
+            break
+          }
+        }
+        if (index >= 0) {
+          channels[channel].splice(index, 1)
+          return true
+        }
+      }
+      return false
+    },
+
+    publish: function (channel) {
+      if (!channels[channel]) {
+        return false
+      }
+      const args = Array.prototype.slice.call(arguments, 1)
+      channels[channel].forEach(subscription => {
+        subscription.apply(null, args)
+      })
+      return this
+    },
+  }
+
+  return obj ? Object.assign(obj, mediator) : mediator
+}
+const mediator = new Mediator()
+export default mediator  

src/common/quillForEditor/FillBlot.js

@@ -6,28 +6,27 @@
  * @LastEditors  : tangjiang
  * @LastEditTime : 2020-02-05 10:44:01
  */
-import Quill from 'quill';
-let Inline = Quill.import('blots/inline');
-// const BlockEmbed = Quill.import('blots/embed');
-class FillBlot extends Inline {
-  static create (value) {
-    const node = super.cerate(value);
-    // node.classList.add('icon icon-bianji2');
-    // node.setAttribute('data-fill', 'fill');
-    console.log('编辑器值===》》》》》', value);
-    node.setAttribute('data_index', value.data_index);
-    node.nodeValue = value.text; 
+
+import Quill from "quill"
+
+const InlineBlot = Quill.import('blots/inline')
+const Prop = 'data-index'
+class FillBlot extends InlineBlot {
+
+  static create(value) {
+    const node = super.create()
+    node.setAttribute(Prop, value.data_index);
+    node.innerText = value.text;
     return node;
   }
-  
-  static value (node) {
+
+  static value(node) {
     return {
-      // dataSet: node.getAttribute('data-fill'),
-      data_index: node.getAttribute('data_index')
+      fill_index: node.getAttribute(Prop)
     }
   }
-}
 
+}
 
 FillBlot.blotName = "fill";
 FillBlot.tagName = "span";

src/common/quillForEditor/ImageBlot.js

@@ -1,70 +1,54 @@
 /*
  * @Description: 重写图片
  * @Author: tangjiang
- * @Github: 
+ * @Github:
  * @Date: 2019-12-16 15:50:45
  * @LastEditors  : tangjiang
  * @LastEditTime : 2019-12-31 13:59:02
  */
 import Quill from "quill";
+import mediator from "../mediator";
 
 const BlockEmbed = Quill.import('blots/block/embed');
-
+//stringify 序列化，其中的onclick函数会丢失。
 export default class ImageBlot extends BlockEmbed {
 
   static create(value) {
 
-    const node = super.create();
-    node.setAttribute('alt', value.alt);
-    node.setAttribute('src', value.url);
-    // console.log('~~~~~~~~~~~', node, value);
-    node.addEventListener('click', function () {
-      value.onclick(value.url);
-    }, false);
-    if (value.width) {
-      node.setAttribute('width', value.width);
-    }
-    if (value.height) {
-      node.setAttribute('height', value.height);
-    }
+    const node = super.create()
+    const { alt, url, width, height, id } = value
+
+    node.setAttribute('alt', alt)
+    node.setAttribute('src', url)
 
     if (value.id) {
       node.setAttribute('id', value.id);
     }
-    // 宽度和高度都不存在时，
-    if (!value.width && !value.height) {
-      // node.setAttribute('display', 'block');
-      node.setAttribute('width', '100%');
+
+    node.setAttribute('style', 'max-width: 100%, cursor:pointer');
+    node.onload = function () {
+      node.setAttribute('width', width ? width : this.width)
+      node.setAttribute('height', height ? height : this.height)
     }
 
-    // node.setAttribute('style', { cursor: 'pointer' });
-
-    // if (node.onclick) {
-    //   console.log('image 有图片点击事件======》》》》》》');
-    //   // node.setAttribute('onclick', node.onCLick);
-    // }
-    // 给图片添加点击事件
-    // node.onclick = () => {
-    //   value.onClick && value.onClick(value.url);
-    // }
+    node.addEventListener('click', () => {
+      mediator.publish('on-preview-image', value.url)
+    })
     return node;
   }
 
   // 获取节点值
-  static value (node) {
+  static value(node) {
 
     return {
       alt: node.getAttribute('alt'),
       url: node.getAttribute('src'),
-      onclick: node.onclick,
       width: node.width,
       height: node.height,
-      display: node.getAttribute('display'),
       id: node.id,
-      // style: node.style
     };
   }
 }
 
 ImageBlot.blotName = 'image';
-ImageBlot.tagName = 'img';
+ImageBlot.tagName = 'img';

src/common/quillForEditor/font.css

@@ -0,0 +1,66 @@
+@charset "utf-8";
+.ql-snow .ql-picker.ql-font .ql-picker-label[data-value=SimSun]::before,
+.ql-snow .ql-picker.ql-font .ql-picker-item[data-value=SimSun]::before {
+    content: "宋体";
+    font-family:SimSun !important;
+}
+.ql-snow .ql-picker.ql-font .ql-picker-label[data-value=SimHei]::before,
+.ql-snow .ql-picker.ql-font .ql-picker-item[data-value=SimHei]::before {
+    content: "黑体";
+    font-family:SimHei !important;
+}
+.ql-snow .ql-picker.ql-font .ql-picker-label[data-value=Microsoft-YaHei]::before,
+.ql-snow .ql-picker.ql-font .ql-picker-item[data-value=Microsoft-YaHei]::before {
+    content: "微软雅黑";
+    font-family:Microsoft YaHei !important;
+}
+.ql-snow .ql-picker.ql-font .ql-picker-label[data-value=KaiTi]::before,
+.ql-snow .ql-picker.ql-font .ql-picker-item[data-value=KaiTi]::before {
+    content: "楷体";
+    font-family:KaiTi !important;
+}
+.ql-snow .ql-picker.ql-font .ql-picker-label[data-value=FangSong]::before,
+.ql-snow .ql-picker.ql-font .ql-picker-item[data-value=FangSong]::before {
+    content: "仿宋";
+    font-family:FangSong !important;
+}
+.ql-snow .ql-picker.ql-font .ql-picker-label[data-value=Arial]::before,
+.ql-snow .ql-picker.ql-font .ql-picker-item[data-value=Arial]::before {
+    content: "Arial";
+    font-family:Arial !important;
+}
+.ql-snow .ql-picker.ql-font .ql-picker-label[data-value=Times-New-Roman]::before,
+.ql-snow .ql-picker.ql-font .ql-picker-item[data-value=Times-New-Roman]::before {
+    content: "Times New Roman";
+    font-family:Times New Roman !important;
+}
+.ql-snow .ql-picker.ql-font .ql-picker-label[data-value=sans-serif]::before,
+.ql-snow .ql-picker.ql-font .ql-picker-item[data-value=sans-serif]::before {
+    content: "sans-serif";
+    font-family:sans-serif !important;
+}
+
+.ql-font-SimSun {
+    font-family:SimSun !important;
+}
+.ql-font-SimHei {
+    font-family:SimHei !important;
+}
+.ql-font-Microsoft-YaHei {
+    font-family:Microsoft YaHei !important;
+}
+.ql-font-KaiTi {
+    font-family:KaiTi !important;
+}
+.ql-font-FangSong {
+    font-family:FangSong !important;
+}
+.ql-font-Arial {
+    font-family:Arial !important;
+}
+.ql-font-Times-New-Roman {
+    font-family:Times New Roman   !important;
+}
+.ql-font-sans-serif {
+    font-family:sans-serif  !important;
+}

src/common/quillForEditor/index.js

@@ -1,43 +1,100 @@
-/*
- * @Description: quill 编辑器
- * @Author: tangjiang
- * @Github:
- * @Date: 2019-12-18 08:49:30
- * @LastEditors  : tangjiang
- * @LastEditTime : 2020-02-05 11:23:03
- */
-import './index.scss';
-import 'quill/dist/quill.core.css'; // 核心样式
-import 'quill/dist/quill.snow.css'; // 有工具栏
-import 'quill/dist/quill.bubble.css'; // 无工具栏
-import 'katex/dist/katex.min.css'; // katex 表达式样式
-import React, { useState, useRef, useEffect } from 'react';
-import Quill from 'quill';
-import katex from 'katex';
-import deepEqual from './deepEqual.js'
-import { fetchUploadImage } from '../../services/ojService.js';
-import { getImageUrl } from 'educoder'
-import ImageBlot from './ImageBlot';
-import FillBlot from './FillBlot';
-const Size = Quill.import('attributors/style/size');
-const Font = Quill.import('formats/font');
-// const Color = Quill.import('attributes/style/color');
-Size.whitelist = ['12px', '14px', '16px', '18px', '20px', false];
-Font.whitelist = ['SimSun', 'SimHei','Microsoft-YaHei','KaiTi','FangSong','Arial','Times-New-Roman','sans-serif'];
+import './index.scss'
+import 'quill/dist/quill.core.css' // 核心样式
+import 'quill/dist/quill.snow.css' // 有工具栏
+import 'quill/dist/quill.bubble.css' // 无工具栏
+import './font.css'
+import React, { useState, useRef, useEffect } from 'react'
+import Quill from 'quill'
+import katex from 'katex'
 
+import { fetchUploadImage } from '../../services/ojService.js'
+import { getImageUrl } from 'educoder'
+import ImageBlot from './ImageBlot'
+import FillBlot from './FillBlot'
+import LinkBlot from './link-blot'
+import mediator from '../mediator'
+import { defaultQuillOpt } from '../components/custom-editor'
+
+let Size = Quill.import('attributors/style/size')
+Size.whitelist = ['14px', '16px', '18px', '20px', false]
+let fonts = ['Microsoft-YaHei', 'SimSun', 'SimHei', 'KaiTi', 'FangSong']
+let Font = Quill.import('formats/font')
+
+Font.whitelist = fonts; //将字体加入到白名单
 window.Quill = Quill;
 window.katex = katex;
 Quill.register(ImageBlot);
 Quill.register(Size);
+Quill.register(LinkBlot);
 Quill.register(Font, true);
-// Quill.register({'modules/toolbar': Toolbar});
-Quill.register({
-  'formats/fill': FillBlot
-});
-// Quill.register(Color);
 
+Quill.register(FillBlot)
 
-function QuillForEditor ({
+const FillStr = '▁'
+const FillReg = new RegExp(FillStr, 'g')
+const BRSTR = '<p><br></p>'
+
+//hack 
+function quillSetValue(el, value) {
+  if (value && value.hasOwnProperty('ops')) {
+    el.setContents(value)
+  } else {
+    if (value) {
+      let rs = value
+      if (rs.endsWith(BRSTR)) {
+        rs += BRSTR
+      }
+      el.clipboard.dangerouslyPasteHTML(rs);
+    }
+  }
+}
+
+const BUTTONTIP = {
+  'bold': '加粗',
+  'strike': '删除线',
+  'italic': '斜体',
+  'underline': '下划线',
+  'ordered': '有序列表',
+  'bullet': '无序列表',
+  'color': '字体颜色',
+  'background': '背景色',
+  'sub': '下标',
+  'super': '上标',
+  'image': '上传图片',
+  'code-block': '代码块',
+  'formula': '公式',
+  'clean': '清除格式',
+  'fill': '插入填空项',
+  'align': '对齐',
+  'header1': '标题一',
+  'header2': '标题二',
+  'header3': '标题三',
+  'header4': '标题四',
+  'header5': '标题五',
+  'header6': '标题六'
+}
+function insertAfter(newNode, referenceNode) {
+  referenceNode.parentNode.insertBefore(newNode, referenceNode.nextSibling);
+}
+
+function initButtonTip(el) {
+  const container = el.getModule('toolbar').container
+  const btns = container.querySelectorAll('.ql-formats > button,.ql-formats>span')
+  Array.from(btns).forEach(btn => {
+    let value = btn.getAttribute('value')
+    let cls = btn.classList[0].replace('ql-', '')
+    btn.setAttribute('title', BUTTONTIP[value || cls] || BUTTONTIP[`${cls}${value}`])
+    if (cls === 'fill') {
+      let span = document.createElement('span')
+      span.setAttribute('class', 'fill-tip')
+      span.innerText = '点击插入填空项'
+      span.addEventListener('click', () => { btn.click() })
+      insertAfter(span, btn)
+    }
+  })
+}
+export default ({
+  defaultValue,
   placeholder,
   readOnly,
   autoFocus = false,
@@ -48,46 +105,16 @@ function QuillForEditor ({
   wrapStyle = {},
   showUploadImage,
   onContentChange,
-  addFill, // 点击填空成功的回调
-  deleteFill // 删除填空，返回删除的下标
-  // getQuillContent
-}) {
-  // toolbar 默认值
-  const defaultConfig = [
-    'bold', 'italic', 'underline',
-    {size: ['12px', '14px', '16px', '18px', '20px']},
-    {align: []}, {list: 'ordered'}, {list: 'bullet'}, // 列表
-    {script: 'sub'}, {script: 'super'},
-    { 'color': [] }, { 'background': [] },
-    {header: [1,2,3,4,5,false]},
-    'blockquote', 'code-block',
-    'link', 'image', 'video',
-    'formula',
-    'clean'
-  ];
+  className,
+  onAddFill,
+  onDeleteFill
+}) => {
 
-  const editorRef = useRef(null);
+  const editorRef = useRef(null)
   // quill 实例
-  const [quill, setQuill] = useState(null);
-  const [selection, setSelection] = useState(null);
-  const [fillCount, setFillCount] = useState(0);
-  const [quillCtx, setQuillCtx] = useState({});
-
-  // 文本内容变化时
-  const handleOnChange = content => {
-    // getQuillContent && getQuillContent(quill);
-    onContentChange && onContentChange(content, quill);
-  };
-
-  const renderOptions = options || defaultConfig;
+  const [quill, setQuill] = useState(null)
 
   const bindings = {
-    tab: {
-      key: 9,
-      handler: function () {
-        console.log('调用了tab=====>>>>');
-      }
-    },
     backspace: {
       key: 'Backspace',
       /**
@@ -98,183 +125,150 @@ function QuillForEditor ({
        * @param {*} context 上下文
        */
       handler: function (range, context) {
-        /**
-         * index: 删除元素的位置 
-         * length: 删除元素的个数
-         */
-        const {index, length} = range;
-        const _start = length === 0 ? index - 1 : index;
-        const _length = length || 1;
-        let delCtx = this.quill.getText(_start, _length); // 删除的元素
-        // aa
-        const reg = /▁/g;
-        const delArrs = delCtx.match(reg);
+        const [index, delArrs] = getFillInfo(range, this.quill)
         if (delArrs) {
-          const r = window.confirm('确定要删除吗?');
-          if (r) {
-            let leaveCtx; // 获取删除元素之前的内容
-            if (length === 0) {
-              leaveCtx = this.quill.getText(0, index - 1);
-            } else {
-              leaveCtx = this.quill.getText(0, index);
-            }
-            const leaveArrs = leaveCtx.match(reg);
-            const leaveLen = (leaveArrs || []).length;
-            let delIndexs = [];
-            // 获取删除元素的下标
-            delArrs.forEach((item, i) => {
-              leaveLen === 0 ? delIndexs.push(i) : delIndexs.push(leaveLen + i); 
-            });
-            deleteFill && deleteFill(delIndexs); // 调用删除回调, 返回删除的元素下标[]
+          if (window.confirm('确定要删除这个填空吗?')) {
+            onDeleteFill && onDeleteFill(index, delArrs.length) // 调用删除回调, 返回删除的元素下标[]
             return true
           } else {
-            return false;
+            return false
           }
         }
-        return true;
+        return true
       }
     }
-  };
-  // quill 配置信息
+  }
   const quillOption = {
     modules: {
-      toolbar: renderOptions,
+      toolbar: options || defaultQuillOpt,
+      'syntax': false,
       keyboard: {
         bindings: bindings
       }
-      // toolbar: {
-      //   container: renderOptions
-      // }
     },
     readOnly,
     placeholder,
     theme: readOnly ? 'bubble' : 'snow',
-  };
+  }
 
+  //返回当前选中文件之前填空的索引，和选中的文本内有多少个填空
+  function getFillInfo(range, quill) {
+    const { index, length } = range
+    const start = length === 0 ? index - 1 : index
+    const selectionText = quill.getText(start, Math.max(1, length))
+    const beforeSelectionText = quill.getText(0, start)
+    return [(beforeSelectionText.match(FillReg) || []).length, selectionText.match(FillReg)]
+  }
 
   useEffect(() => {
-
-    const quillNode = document.createElement('div');
-    editorRef.current.appendChild(quillNode);
-    const _quill = new Quill(editorRef.current, quillOption);
-
-    setQuill(_quill);
+    const quillInstance = new Quill(editorRef.current, quillOption)
+    setQuill(quillInstance)
     // 处理图片上传功能
-    _quill.getModule('toolbar').addHandler('image', (e) => {
-      const input = document.createElement('input');
-      input.setAttribute('type', 'file');
-      input.setAttribute('accept', 'image/*');
-      input.click();
-
+    quillInstance.getModule('toolbar').addHandler('image', (e) => {
+      const input = document.createElement('input')
+      input.setAttribute('type', 'file')
+      input.setAttribute('accept', 'image/*')
+      input.click()
       input.onchange = async (e) => {
-        const file = input.files[0]; // 获取文件信息
-        const formData = new FormData();
-        formData.append('file', file);
+        const file = input.files[0] // 获取文件信息
+        const formData = new FormData()
+        formData.append('file', file)
 
-        const range = _quill.getSelection(true);
-        let fileUrl = ''; // 保存上传成功后图片的url
-        // 上传文件
-        const result = await fetchUploadImage(formData);
+        const range = quillInstance.getSelection(true)
+        let fileUrl = '' // 保存上传成功后图片的url
+
+        const result = await fetchUploadImage(formData)
         // 获取上传图片的url
         if (result.data && result.data.id) {
-          fileUrl = getImageUrl(`api/attachments/${result.data.id}`);
+          fileUrl = getImageUrl(`api/attachments/${result.data.id}`)
         }
-        // 根据id获取文件路径
-        const { width, height } = imgAttrs;
-        // console.log('上传图片的url:', fileUrl);
+        const { width, height } = imgAttrs
         if (fileUrl) {
-          _quill.insertEmbed(range.index, 'image', {
+          let imgOption = {
             url: fileUrl,
             alt: '图片信息',
-            onClick: showUploadImage,
             width,
             height
-          });
+          }
+          quillInstance.insertEmbed(range.index, 'image', imgOption)
         }
       }
-    });
-    // 处理填空
-    _quill.getModule('toolbar').addHandler('fill', (e) => {
-      // alert(1111);
-      setFillCount(fillCount + 1);
-      const range = _quill.getSelection(true);
-      _quill.insertText(range.index, '▁');
-      addFill && addFill(); // 调用添加回调
-    });
-  }, []);
+    })
+    quillInstance.getModule('toolbar').addHandler('fill', (e) => {
+      const range = quillInstance.getSelection(true)
+      const [fillIndex, _] = getFillInfo(range, quillInstance)
+      quillInstance.insertEmbed(range.index, 'fill', { "data-index": fillIndex, text: FillStr })
+      quillInstance.setSelection(quillInstance.getLength(), 0, 'api')
+      onAddFill && onAddFill(fillIndex) // 调用添加回调
+    })
 
-  // 设置值
-  useEffect(() => {
-    if (!quill) return
+    initButtonTip(quillInstance)
 
-    const previous = quill.getContents()
+    quillSetValue(quillInstance, value)
 
-    if (value && value.hasOwnProperty('ops')) {
-      // console.log(value.ops);
-      const ops = value.ops || [];
-      ops.forEach((item, i) => {
-        if (item.insert['image']) {
-          item.insert['image'] = Object.assign({}, item.insert['image'], {style: { cursor: 'pointer' }, onclick: (url) => showUploadImage(url)});
-        }
-      });
+    if (autoFocus) {
+      quillInstance.focus()
     }
 
-    const current = value
-    if (!deepEqual(previous, current)) {
-      setSelection(quill.getSelection())
-      if (typeof value === 'string' && value) {
-      	// debugger
-        quill.clipboard.dangerouslyPasteHTML(value, 'api');
-        if (autoFocus) {
-          quill.focus();
-        } else {
-          quill.blur();
-        }
-      } else {
-        quill.setContents(value)
-        if (autoFocus) quill.focus();
+    function onPreview(url) {
+      if (showUploadImage) {
+        showUploadImage(url)
       }
     }
-  }, [quill, value, setQuill, autoFocus]);
 
-  // 清除选择区域
-  useEffect(() => {
-    if (quill && selection) {
-      quill.setSelection(selection)
-      setSelection(null)
-    }
-  }, [quill, selection, setSelection]);
-
-  // 设置placeholder值
-  useEffect(() => {
-    if (!quill || !quill.root) return;
-    quill.root.dataset.placeholder = placeholder;
-  }, [quill, placeholder]);
-
-  // 处理内容变化
-  useEffect(() => {
-    if (!quill) return;
-    if (typeof handleOnChange !== 'function') return;
-    let handler;
-    quill.on(
-      'text-change',
-      (handler = (delta, oldDelta, source) => {
-        const _ctx = quill.getContents();
-        setQuillCtx(_ctx);
-        handleOnChange(quill.getContents()); // getContents: 检索编辑器内容
-      })
-    );
+    let unsub = mediator.subscribe('on-preview-image', onPreview)
     return () => {
-      quill.off('text-change', handler);
+      unsub()
     }
-  }, [quill, handleOnChange]);
+  }, [])
+
+  useEffect(() => {
+    if (quill) {
+      if (readOnly === true) {
+        quill.enable(false)
+      } else {
+        quill.enable(true)
+      }
+    }
+  }, [quill, readOnly])
+
+  useEffect(() => {
+    quillSetValue(quill, defaultValue)
+  }, [quill, defaultValue])
+
+  useEffect(() => {
+    if (quill) {
+      quill.root.dataset.placeholder = placeholder;
+    }
+  }, [quill, placeholder])
+
+  useEffect(() => {
+    if (quill) {
+      autoFocus ? quill.focus() : quill.blur()
+    }
+  }, [quill, autoFocus])
+
+  useEffect(() => {
+    if (quill && onContentChange) {
+      function onChangeHandler(delta, oldDelta, source) {
+        let html = editorRef.current.children[0].innerHTML
+        let text = quill.getText()
+        if (html === '<p><br></p>') html = ''
+        if (onContentChange) {
+          onContentChange(quill.getContents(), html, { quill, text, delta, oldDelta, source })
+        }
+      }
+      quill.on('text-change', onChangeHandler)
+      return () => {
+        quill.off('text-change', onChangeHandler)
+      }
+    }
+  }, [quill, onContentChange])
 
   // 返回结果
   return (
-      <div className='quill_editor_for_react_area' style={wrapStyle}>
-        <div ref={editorRef} style={style}></div>
-      </div>
-  );
-}
-
-export default QuillForEditor;
+    <div className={`quill_editor_for_react_area ${className} `} style={wrapStyle}>
+      <div ref={editorRef} style={style}></div>
+    </div>
+  )
+}

src/common/quillForEditor/index.scss

@@ -1,132 +1,200 @@
-.quill_editor_for_react_area{
+.quill_editor_for_react_area {
+
   // background: #fff;
   // margin: 0 15px;
-  .ql-editing{
+  .ql-editing {
     left: 0 !important;
   }
-  .ql-editor{
-    img{
+
+  .ql-editor {
+    img {
       cursor: pointer;
     }
   }
+
   .ql-snow .ql-picker.ql-size .ql-picker-label[data-value="12px"]::before,
   .ql-snow .ql-picker.ql-size .ql-picker-item[data-value="12px"]::before {
-      content: '12px';
-      font-size: 12px;
+    content: '12px';
+    font-size: 12px;
   }
+
   .ql-snow .ql-picker.ql-size .ql-picker-label[data-value="14px"]::before,
   .ql-snow .ql-picker.ql-size .ql-picker-item[data-value="14px"]::before {
-      content: '14px';
-      font-size: 14px;
+    content: '14px';
+    font-size: 14px;
   }
+
   .ql-snow .ql-picker.ql-size .ql-picker-label[data-value="16px"]::before,
   .ql-snow .ql-picker.ql-size .ql-picker-item[data-value="16px"]::before {
-      content: '16px';
-      font-size: 16px;
+    content: '16px';
+    font-size: 16px;
   }
+
   .ql-snow .ql-picker.ql-size .ql-picker-label[data-value="18px"]::before,
   .ql-snow .ql-picker.ql-size .ql-picker-item[data-value="18px"]::before {
-      content: '18px';
-      font-size: 18px;
+    content: '18px';
+    font-size: 18px;
   }
+
   .ql-snow .ql-picker.ql-size .ql-picker-label[data-value="20px"]::before,
   .ql-snow .ql-picker.ql-size .ql-picker-item[data-value="20px"]::before {
-      content: '20px';
-      font-size: 20px;
+    content: '20px';
+    font-size: 20px;
   }
+
   //默认的样式
   .ql-snow .ql-picker.ql-size .ql-picker-label::before,
   .ql-snow .ql-picker.ql-size .ql-picker-item::before {
-      content: '14px';
-      font-size: 14px;
-  }  
+    content: '14px';
+    font-size: 14px;
+  }
 
   .ql-snow .ql-picker.ql-font .ql-picker-label[data-value=SimSun]::before,
   .ql-snow .ql-picker.ql-font .ql-picker-item[data-value=SimSun]::before {
-      content: "宋体";
-      font-family: "SimSun";
+    content: "宋体";
+    font-family: "SimSun";
   }
+
   .ql-snow .ql-picker.ql-font .ql-picker-label[data-value=SimHei]::before,
   .ql-snow .ql-picker.ql-font .ql-picker-item[data-value=SimHei]::before {
     content: "黑体";
     font-family: "SimHei";
   }
+
   .ql-snow .ql-picker.ql-font .ql-picker-label[data-value=Microsoft-YaHei]::before,
   .ql-snow .ql-picker.ql-font .ql-picker-item[data-value=Microsoft-YaHei]::before {
     content: "微软雅黑";
     font-family: "Microsoft YaHei";
   }
+
   .ql-snow .ql-picker.ql-font .ql-picker-label[data-value=KaiTi]::before,
   .ql-snow .ql-picker.ql-font .ql-picker-item[data-value=KaiTi]::before {
     content: "楷体";
     font-family: "KaiTi";
   }
+
   .ql-snow .ql-picker.ql-font .ql-picker-label[data-value=FangSong]::before,
   .ql-snow .ql-picker.ql-font .ql-picker-item[data-value=FangSong]::before {
     content: "仿宋";
     font-family: "FangSong";
   }
+
   .ql-snow .ql-picker.ql-font .ql-picker-label[data-value=Arial]::before,
   .ql-snow .ql-picker.ql-font .ql-picker-item[data-value=Arial]::before {
     content: "Arial";
     font-family: "Arial";
   }
+
   .ql-snow .ql-picker.ql-font .ql-picker-label[data-value=Times-New-Roman]::before,
   .ql-snow .ql-picker.ql-font .ql-picker-item[data-value=Times-New-Roman]::before {
     content: "Times New Roman";
     font-family: "Times New Roman";
   }
+
   .ql-snow .ql-picker.ql-font .ql-picker-label[data-value=sans-serif]::before,
   .ql-snow .ql-picker.ql-font .ql-picker-item[data-value=sans-serif]::before {
     content: "sans-serif";
     font-family: "sans-serif";
   }
-  
+
   .ql-font-SimSun {
-      font-family: "SimSun";
+    font-family: "SimSun";
   }
+
   .ql-font-SimHei {
-      font-family: "SimHei";
+    font-family: "SimHei";
   }
+
   .ql-font-Microsoft-YaHei {
-      font-family: "Microsoft YaHei";
+    font-family: "Microsoft YaHei";
   }
+
   .ql-font-KaiTi {
-      font-family: "KaiTi";
+    font-family: "KaiTi";
   }
+
   .ql-font-FangSong {
-      font-family: "FangSong";
+    font-family: "FangSong";
   }
+
   .ql-font-Arial {
-      font-family: "Arial";
+    font-family: "Arial";
   }
+
   .ql-font-Times-New-Roman {
-      font-family: "Times New Roman";
+    font-family: "Times New Roman";
   }
+
   .ql-font-sans-serif {
-      font-family: "sans-serif";
+    font-family: "sans-serif";
   }
 
   .ql-snow .ql-picker.ql-font .ql-picker-label::before,
   .ql-snow .ql-picker.ql-font .ql-picker-item::before {
     content: "微软雅黑";
     font-family: "Microsoft YaHei";
-  } 
+  }
 
   // 填空图标
-  .ql-snow .ql-fill{
+  .ql-snow .ql-fill {
     display: inline-block;
     position: relative;
     color: #05101A;
     // font-size: 18px;
     vertical-align: top;
-    &::before{
+
+    &::before {
       position: absolute;
       left: 50%;
       top: -1px;
-      content: '\e709';
+      content: '\e691';
       font-family: 'iconfont';
       margin-left: -7px;
     }
   }
+
+  //块点不动
+  .ql-toolbar .ql-formats .ql-code-block svg {
+    pointer-events: none;
+  }
+}
+
+.fill-tip {
+  cursor: pointer;
+  font-size: 12px;
+  display: inline-block;
+  padding: 5px;
+  border: 1px solid #eaeaea;
+  border-radius: 5px;
+  box-sizing: border-box;
+  line-height: 16px;
+  color: #666;
+  position: relative;
+  justify-content: center;
+  margin-left: 10px;
+
+  &::before {
+    content: ' ';
+    width: 0;
+    height: 0;
+    border-top: 6px solid transparent;
+    border-bottom: 6px solid transparent;
+    border-right: 6px solid #fff;
+    position: absolute;
+    left: -6px;
+    top: 6px;
+    z-index: 10;
+  }
+
+  &::after {
+    content: ' ';
+    width: 0;
+    height: 0;
+    border-top: 6px solid transparent;
+    border-bottom: 6px solid transparent;
+    border-right: 6px solid #cccbcb;
+    position: absolute;
+    left: -7px;
+    top: 6px;
+  }
 }

src/common/quillForEditor/link-blot.js

@@ -0,0 +1,21 @@
+import Quill from "quill";
+const Inline = Quill.import('blots/inline');
+
+export default class LinkBlot extends Inline {
+  static create(value) {
+    let node = super.create()
+    let rs = value
+    if (rs.indexOf('http://') < 0) {
+      rs = 'http://' + rs
+    }
+    node.setAttribute('href', rs)
+    node.setAttribute('target', '_blank')
+    return node;
+  }
+
+  static formats(node) {
+    return node.getAttribute('href');
+  }
+}
+LinkBlot.blotName = 'link'
+LinkBlot.tagName = 'a'

src/common/quillForEditor/quill.core.css

@@ -0,0 +1,18 @@
+.ql-editor .ql-font-Microsoft-YaHei {
+    font-family: "Microsoft YaHei";
+}
+.ql-editor .ql-font-SimSun {
+    font-family: "SimSun";
+}
+.ql-editor .ql-font-SimHei {
+    font-family: "SimHei";
+}
+.ql-editor .ql-font-KaiTi {
+    font-family: "KaiTi";
+}
+.ql-editor .ql-font-Arial {
+    font-family: "Arial";
+}
+.ql-editor .Times-New-Roman {
+    font-family: "Times New Roman";
+}

src/common/quillForEditor/quill.snow.css

@@ -0,0 +1,28 @@
+.ql-snow .ql-picker.ql-font .ql-picker-label::before,
+.ql-snow .ql-picker.ql-font .ql-picker-item::before {
+    content: '微软雅黑';
+}
+.ql-snow .ql-picker.ql-font .ql-picker-label[data-value=Microsoft-YaHei]::before,
+.ql-snow .ql-picker.ql-font .ql-picker-item[data-value=Microsoft-YaHei]::before {
+    content: "微软雅黑";
+}
+.ql-snow .ql-picker.ql-font .ql-picker-label[data-value=SimSun]::before,
+.ql-snow .ql-picker.ql-font .ql-picker-item[data-value=SimSun]::before {
+    content: "宋体";
+}
+.ql-snow .ql-picker.ql-font .ql-picker-label[data-value=SimHei]::before,
+.ql-snow .ql-picker.ql-font .ql-picker-item[data-value=SimHei]::before {
+    content: "黑体";
+}
+.ql-snow .ql-picker.ql-font .ql-picker-label[data-value=KaiTi]::before,
+.ql-snow .ql-picker.ql-font .ql-picker-item[data-value=KaiTi]::before {
+    content: "楷体";
+}
+.ql-snow .ql-picker.ql-font .ql-picker-label[data-value=Arial]::before,
+.ql-snow .ql-picker.ql-font .ql-picker-item[data-value=Arial]::before {
+    content: "Arial";
+}
+.ql-snow .ql-picker.ql-font .ql-picker-label[data-value=Times-New-Roman]::before,
+.ql-snow .ql-picker.ql-font .ql-picker-item[data-value=Times-New-Roman]::before {
+    content: "Times New Roman";
+}

src/common/reactQuill/ImageBlot.js

@@ -1,54 +0,0 @@
-/*
- * @Description: 重写图片
- * @Author: tangjiang
- * @Github: 
- * @Date: 2019-12-16 15:50:45
- * @LastEditors: tangjiang
- * @LastEditTime: 2019-12-17 16:44:48
- */
-import Quill from "quill";
-
-const BlockEmbed = Quill.import('blots/block/embed');
-
-export default class ImageBlot extends BlockEmbed {
-
-  static create(value) {
-
-    const node = super.create();
-
-    node.setAttribute('alt', value.alt);
-    node.setAttribute('src', value.url);
-    
-    if (value.width) {
-      node.setAttribute('width', value.width);
-    }
-    if (value.height) {
-      node.setAttribute('height', value.height);
-    }
-    // 宽度和高度都不存在时，
-    if (!value.width && !value.height) {
-      node.setAttribute('display', 'block');
-      node.setAttribute('width', '100%');
-    }
-    // 给图片添加点击事件
-    node.onclick = () => {
-      value.onClick && value.onClick(value.url);
-    }
-    return node;
-  }
-
-  static value (node) {
-
-    return {
-      alt: node.getAttribute('alt'),
-      url: node.getAttribute('src'),
-      onclick: node.onclick,
-      // width: node.width,
-      // height: node.height,
-      display: node.getAttribute('display')
-    };
-  }
-}
-
-ImageBlot.blotName = 'image';
-ImageBlot.tagName = 'img';

src/common/reactQuill/ReactQuill.js

@@ -1,45 +0,0 @@
-/*
- * @Description: 
- * @Author: tangjiang
- * @Github: 
- * @Date: 2019-12-09 09:09:42
- * @LastEditors: tangjiang
- * @LastEditTime: 2019-12-18 08:46:20
- */
-import 'quill/dist/quill.core.css'; // 核心样式
-import 'quill/dist/quill.snow.css'; // 有工具栏
-import 'quill/dist/quill.bubble.css'; // 无工具栏
-import 'katex/dist/katex.min.css'; // katex 表达式样式
-import React, { useState, useReducer, useEffect } from 'react';
-import useQuill from './useQuill';
-
-function ReactQuill ({
-  disallowColors,  // 不可见时颜色
-  placeholder, // 提示信息
-  uploadImage, // 图片上传
-  onChange, // 内容变化时
-  options, // 配置信息 
-  value, // 显示的内容
-  style,
-  showUploadImage // 显示上传图片
-}) {
-
-  const [element, setElement] = useState(); // quill 渲染节点
-
-  useQuill({
-    disallowColors,
-    placeholder,
-    uploadImage,
-    onChange,
-    options,
-    value,
-    showUploadImage,
-    element
-  });
-
-  return (
-    <div className='react_quill_area' ref={setElement} style={style}/>
-  );
-}
-
-export default ReactQuill;

src/common/reactQuill/deepEqual.js

@@ -1,47 +0,0 @@
-function deepEqual (prev, current) {
-  if (prev === current) { // 基本类型比较，值，类型都相同 或者同为 null or undefined
-    return true;
-  }
-
-  if ((!prev && current) 
-    || (prev && !current)
-    || (!prev && !current)
-  ) {
-    return false;
-  }
-
-  if (Array.isArray(prev)) {
-    if (!Array.isArray(current)) return false;
-    if (prev.length !== current.length) return false;
-    
-    for (let i = 0; i < prev.length; i++) {
-      if (!deepEqual(current[i], prev[i])) {
-        return false;
-      }
-    }
-    return true;
-  }
-
-  if (typeof current === 'object') {
-    if (typeof prev !== 'object') return false;
-    const prevKeys = Object.keys(prev);
-    const curKeys = Object.keys(current);
-
-    if (prevKeys.length !== curKeys.length) return false;
-
-    prevKeys.sort();
-    curKeys.sort();
-
-    for (let i = 0; i < prevKeys.length; i++) {
-      if (prevKeys[i] !== curKeys[i]) return false;
-      const key = prevKeys[i];
-      if (!deepEqual(prev[key], current[key])) return false;
-    }
-
-    return true;
-  }
-
-  return false;
-}
-
-export default deepEqual;

src/common/reactQuill/flatten.js

@@ -1,26 +0,0 @@
-/*
- * @Description: 将多维数组转变成一维数组
- * @Author: tangjiang
- * @Github: 
- * @Date: 2019-12-09 09:35:01
- * @LastEditors: tangjiang
- * @LastEditTime: 2019-12-16 11:36:22
- */
-function flatten (array) {
-  return flatten.rec(array, []);
-}
-
-flatten.rec = function flatten (array, result) {
-
-  for (let item of array) {
-    if (Array.isArray(item)) {
-      flatten(item, result);
-    } else {
-      result.push(item);
-    }
-  }
-
-  return result;
-}
-
-export default flatten;

src/common/reactQuill/index.js

@@ -1,108 +0,0 @@
-/*
- * @Description: 入口文件
- * @Author: tangjiang
- * @Github: 
- * @Date: 2019-12-17 10:41:48
- * @LastEditors: tangjiang
- * @LastEditTime: 2019-12-17 20:34:40
- */
-import React, { useState, useCallback, useEffect } from 'react';
-import ReactQuill from './lib';
-
-function Wrapper (props) {
-  // 默认工具栏配置项
-  const toolbarConfig = [
-    ['bold', 'italic', 'underline'],
-    [{align: []}, {list: 'ordered'}, {list: 'bullet'}], // 列表
-    [{script: 'sub'}, {script: 'super'}],
-    [{header: [1,2,3,4,5,false]}],
-    ['blockquote', 'code-block'],
-    ['link', 'image', 'video'],
-    ['formula'],
-    ['clean']
-  ];
-  
-  const [placeholder] = useState(props.placeholder || 'placeholder');
-  const [disableBold] = useState(false);
-  const [value, setValue] = useState(props.value || '');
-  const [toolbar, setToolbar] = useState(toolbarConfig);
-  const [theme, setTheme] = useState(props.theme || 'snow');
-  const [readOnly] = useState(props.readOnly || false);
-
-  const {
-    onContentChagne, // 当编辑器内容变化时调用该函数
-    showUploadImage, // 显示上传图片, 返回url，主要用于点击图片放大
-  } = props;
-
-  // 配置信息
-  const options = {
-    modules: {
-      toolbar: toolbar,
-      clipboard: {
-        matchVisual: false
-      }
-    },
-    readOnly: readOnly,
-    theme: theme
-  }
-  // 配置信息  
-  useEffect (() => {
-    if (props.options) {
-      setToolbar(props.options);
-    }
-    setTheme(props.theme || 'snow');
-    setValue(props.value);
-  }, [props]);
-
-  // 当内容变化时
-  const handleOnChange = useCallback(
-    contents => {
-      if (disableBold) {
-        setValue({
-          ops: contents.ops.map(x => {
-            x = {...x};
-            if (x && x.attributes && x.attributes.bold) {
-              x.attributes = { ...x.attributes };
-              delete x.attributes.bold;
-              if (!Object.keys(x.attributes).length) {
-                delete x.attributes;
-              }
-            }
-            return x;
-          })
-        });
-      } else {
-        setValue(contents);
-      }
-      onContentChagne && onContentChagne(contents);
-    }, [disableBold]
-  );
-
-  // 图片上传
-  const handleUploadImage = (files) => {
-    console.log('选择的图片信息', files);
-  }
-
-  // 显示图片
-  const handleShowUploadImage = (url) => {
-    // console.log('上传的图片url:', url);
-    showUploadImage && showUploadImage(url);
-  }
-
-  return (
-    <React.Fragment>
-      <ReactQuill 
-        value={value}
-        style={props.style}
-        onChange={handleOnChange}
-        placeholder={`${placeholder}`}
-        options={options}
-        uploadImage={handleUploadImage}
-        showUploadImage={(url) => handleShowUploadImage(url)}
-      />
-    </React.Fragment>
-  );
-}
-
-export default Wrapper;
-// ReactDOM.render(<Wrapper />, document.querySelector('#root'));

src/common/reactQuill/index.scss

@@ -1,32 +0,0 @@
-#quill-toolbar{
-  .quill-btn{
-    vertical-align: middle;
-  }
-  .quill_image{
-    display: inline-block;
-    position: relative;
-    vertical-align: middle;
-    width: 28px;
-    height: 24px;
-    overflow: hidden;
-    .image_input{
-      position: absolute;
-      left: 0;
-      right: 0;
-      top: 0;
-      bottom: 0;
-      opacity: 0;
-    }
-    .ql-image{
-      position: relative;
-      left: 0;
-      top: 0;
-    }
-  }
-}
-
-.react_quill_area{
-  .ql-toolbar:not(:last-child) {
-    display: none;
-  }
-}

src/common/reactQuill/lib.js

@@ -1,13 +0,0 @@
-/*
- * @Description: 导出 ReactQuill
- * @Author: tangjiang
- * @Github: 
- * @Date: 2019-12-09 09:08:24
- * @LastEditors: tangjiang
- * @LastEditTime: 2019-12-16 11:37:13
- */
-import ReactQuill from './ReactQuill';
-import useQuill from './useQuill';
-
-export default ReactQuill;
-export { useQuill };

src/common/reactQuill/useDeepEqualMemo.js

@@ -1,27 +0,0 @@
-/*
- * @Description: 
- * @Author: tangjiang
- * @Github: 
- * @Date: 2019-12-12 19:48:55
- * @LastEditors: tangjiang
- * @LastEditTime: 2019-12-16 11:38:16
- */
-import { useState, useEffect } from 'react';
-import deepEqual from './deepEqual';
-
-function useDeepEqual (input) {
-
-  const [value, setValue] = useState(input);
-
-  useEffect(() => {
-
-    if (!deepEqual(input, value)) {
-      setValue(input)
-    }
-    
-  }, [input, value]);
-
-  return value;
-}
-
-export default useDeepEqual;

src/common/reactQuill/useMountQuill.js

@@ -1,148 +0,0 @@
-/*
- * @Description: 创建 reactQuill实例
- * @Author: tangjiang
- * @Github: 
- * @Date: 2019-12-09 09:31:42
- * @LastEditors: tangjiang
- * @LastEditTime: 2019-12-17 20:42:05
- */
-import Quill from 'quill'; // 导入quill
-import { useState, useEffect, useMemo } from 'react';
-import flatten from './flatten.js';
-import useDeepEqualMemo from './useDeepEqualMemo';
-import Katex from 'katex';
-import ImageBlot from './ImageBlot';
-import { fetchUploadImage } from '../../services/ojService.js';
-import { getImageUrl } from 'educoder'
-window.katex = Katex;
-
-Quill.register(ImageBlot);
-
-function useMountQuill ({
-  element,
-  options: passedOptions,
-  uploadImage,
-  showUploadImage,
-  imgAttrs = {} // 指定图片的宽高属性
-}) {
-
-  // 是否引入 katex
-  const [katexLoaded, setKatexLoaded] = useState(Boolean(window.katex))
-  const [quill, setQuill] = useState(null);
-
-  const options = useDeepEqualMemo(passedOptions);
-  console.log('use mount quill: ', passedOptions);
-
-  // 判断options中是否包含公式
-  const requireKatex = useMemo(() => {
-    return flatten(options.modules.toolbar).includes('formula');
-  }, [options]);
-
-  // 加载katex
-  useEffect(() => {
-    if (!requireKatex) return;
-    if (katexLoaded) return;
-
-    const interval = setInterval(() => {
-      if (window.katex) {
-        setKatexLoaded(true);
-        clearInterval(interval); 
-      }
-    });
-
-    return () => { // 定义回调清除定时器
-      clearInterval(interval);
-    }
-
-  }, [
-    setKatexLoaded,
-    katexLoaded,
-    requireKatex
-  ]);
-
-  // 加载 quill
-  useEffect(() => {
-    if (!element) return;
-    if (requireKatex && !katexLoaded) {
-      element.innerHTML = `
-        <div style="color: #ddd">
-          Loading Katex...
-        </div>
-      `
-    }
-    // 清空内容
-    element.innerHTML = '';
-    console.log(element);
-    // 创建 quill 节点
-    const quillNode = document.createElement('div');
-    element.appendChild(quillNode);  // 将quill节点追回到 element 元素中
-
-    const quill = new Quill(element, options);
-    setQuill(quill);
-    // 加载上传图片功能
-    if (typeof uploadImage === 'function') {
-      quill.getModule('toolbar').addHandler('image', (e) => {
-        // 创建type类型输入框加载本地图片
-        const input = document.createElement('input');
-        input.setAttribute('type', 'file');
-        input.setAttribute('accept', 'image/*');
-        input.click();
-
-        input.onchange = async (e) => {
-          const file = input.files[0]; // 获取文件信息
-          const formData = new FormData();
-          formData.append('file', file);
-
-          // const reader = new FileReader();
-          // reader.readAsDataURL(file);
-          // console.log('文件信息===>>', reader);
-          // reader.onload = function (e) {
-          //   debugger;
-          //   console.log('文件信息===>>', e.target.result);
-          //   const image = new Image();
-          //   image.src = e.target.result;
-
-          //   image.onload = function () {
-          //     // file.width = 
-          //     console.log(image.width, image.height);
-          //   }
-          // }
-
-          const range = quill.getSelection(true);
-          let fileUrl = ''; // 保存上传成功后图片的url
-          // 上传文件
-          const result = await fetchUploadImage(formData);
-          // 获取上传图片的url
-          if (result.data && result.data.id) {
-            fileUrl = getImageUrl(`api/attachments/${result.data.id}`);
-          }
-          // 根据id获取文件路径
-          const { width, height } = imgAttrs;
-          // console.log('上传图片的url:', fileUrl);
-          if (fileUrl) {
-            quill.insertEmbed(range.index, 'image', {
-              url: fileUrl,
-              alt: '',
-              onClick: showUploadImage,
-              width,
-              height
-            }); 
-          }
-        }
-      });
-    }
-
-    return () => {
-      element.innerHTML = '';
-    }
-  }, [
-    element,
-    options,
-    requireKatex,
-    katexLoaded,
-  ]);
-
-  return quill;
-}
-
-export default useMountQuill;

src/common/reactQuill/useQuill.js

@@ -1,60 +0,0 @@
-/*
- * @Description: 
- * @Author: tangjiang
- * @Github: 
- * @Date: 2019-12-09 09:09:50
- * @LastEditors: tangjiang
- * @LastEditTime: 2019-12-17 15:46:50
- */
-import useQuillPlaceholder from './useQuillPlaceholder';
-import useQuillValueSync from './useQuillValueSync';
-import useQuillOnChange from './useQuillOnChange';
-import useMountQuill from './useMountQuill';
-import { useEffect } from 'react';
-
-function useQuill ({
-  disallowColors,
-  placeholder,
-  uploadImage,
-  onChange,
-  options,
-  value,
-  element,
-  showUploadImage
-}) {
-
-  // 获取 quill 实例
-  const quill = useMountQuill({
-    element,
-    options,
-    uploadImage,
-    showUploadImage
-  });
-
-  useEffect(() => {
-    if (disallowColors && quill) {
-      quill.clipboard.addMatcher(Node.ELEMENT_NODE, (node, delta) => {
-        delta.ops = delta.ops.map(op => {
-          if (op.attributes && op.attributes.color) {
-            const { color, ...attributes } = op.attributes;
-            return {
-              ...op,
-              attributes
-            }
-          }
-          return op;
-        });
-        return delta;
-      });
-    }
-  }, [
-    disallowColors,
-    quill
-  ]);
-  
-  useQuillPlaceholder(quill, placeholder);
-  useQuillValueSync(quill, value);
-  useQuillOnChange(quill, onChange);
-}
-
-export default useQuill;

src/common/reactQuill/useQuillOnChange.js

@@ -1,33 +0,0 @@
-/*
- * @Description: 
- * @Author: tangjiang
- * @Github: 
- * @Date: 2019-12-12 19:49:11
- * @LastEditors: tangjiang
- * @LastEditTime: 2019-12-16 11:39:27
- */
-import { useEffect } from 'react';
-
-function useQuillOnChange (quill, onChange) {
-  
-  useEffect(() => {
-
-    if (!quill) return;
-    if (typeof onChange !== 'function') return;
-
-    let handler;
-
-    quill.on(
-      'text-change', 
-      (handler = () => {
-        onChange(quill.getContents()); // getContents: 检索编辑器内容
-      })
-    );
-
-    return () => {
-      quill.off('text-change', handler);
-    }
-  }, [quill, onChange]);
-}
-
-export default useQuillOnChange;

src/common/reactQuill/useQuillPlaceholder.js

@@ -1,22 +0,0 @@
-/*
- * @Description: 
- * @Author: tangjiang
- * @Github: 
- * @Date: 2019-12-09 09:28:34
- * @LastEditors: tangjiang
- * @LastEditTime: 2019-12-16 11:39:48
- */
-import { useEffect } from 'react'
-
-function useQuillPlaceholder (
-  quill,
-  placeholder
-) {
-
-  useEffect(() => {
-    if (!quill || !quill.root) return;
-    quill.root.dataset.placeholder = placeholder;
-  }, [quill, placeholder]);
-}
-
-export default useQuillPlaceholder;

src/common/reactQuill/useQuillValueSync.js

@@ -1,31 +0,0 @@
-import { useEffect, useState } from 'react'
-import deepEqual from './deepEqual.js'
-
-function useQuillValueSync(quill, value) {
-  const [selection, setSelection] = useState(null)
-
-  useEffect(() => {
-    if (!quill) return
-
-    const previous = quill.getContents()
-    const current = value
-
-    if (!deepEqual(previous, current)) {
-      setSelection(quill.getSelection())
-      if (typeof value === 'string') {
-        quill.clipboard.dangerouslyPasteHTML(value, 'api')
-      } else {
-        quill.setContents(value)
-      }
-    }
-  }, [quill, value, setSelection])
-
-  useEffect(() => {
-    if (quill && selection) {
-      quill.setSelection(selection)
-      setSelection(null)
-    }
-  }, [quill, selection, setSelection])
-}
-
-export default useQuillValueSync

src/common/util/ShareUtil.js

@@ -60,17 +60,17 @@ function requestForSignatrue (callback) {
 /**
     实践课程	平台提供涵盖基础入门、案例实践和创新应用的完整实训项目体系，通过由浅入深的实训路径，帮助学生快速提升实战能力。
     实训项目	覆盖不同专业的IT实验和实训，每周更新，无需配置本机实验环境，随时随地开启企业级真实实训。
-    翻转课堂	自动评测实训任务，支持技能统计，提供教学活动分析报告，减轻教师和助教的辅导压力，免去作业发布和批改的困扰，实时了解学生学习情况，全面提升教师施教效率和水平。
+ 教学课堂	自动评测实训任务，支持技能统计，提供教学活动分析报告，减轻教师和助教的辅导压力，免去作业发布和批改的困扰，实时了解学生学习情况，全面提升教师施教效率和水平。
     单个课程和实训	获取课程/实训的简介	该课程或者实训展示的缩略图
 
  */
-export function configShareForIndex (path) {  
+export function configShareForIndex (path) {
     requestForSignatrue(() => {
         var shareData = {
             title: 'EduCoder - 首页',
             desc: 'Educoder是一个面向计算机类的互联网IT教育和实战平台，提供企业级工程实训，以实现工程化专业教学的自动化和智能化。高校和企业人员可以在此开展计算机实践性教学活动，将传统的知识传授和时兴的工程实战一体化。',
             link: host + (path || ''),
-            imgUrl: window.__testImageUrl 
+            imgUrl: window.__testImageUrl
                 || host + '/react/build/images/share_logo_icon.jpg'
         };
         share(shareData)
@@ -83,7 +83,7 @@ export function configShareForPaths () {
             title: 'EduCoder - 实践课程',
             desc: '平台提供涵盖基础入门、案例实践和创新应用的完整实训项目体系，通过由浅入深的实训路径，帮助学生快速提升实战能力。',
             link: `${host}/paths`,
-            imgUrl: window.__testImageUrl 
+            imgUrl: window.__testImageUrl
                 || host + '/react/build/images/share_logo_icon.jpg'
         };
         share(shareData)
@@ -97,7 +97,7 @@ export function configShareForShixuns () {
             title: 'EduCoder - 实训项目',
             desc: '覆盖不同专业的IT实验和实训，每周更新，无需配置本机实验环境，随时随地开启企业级真实实训。',
             link: `${host}/shixuns`,
-            imgUrl: window.__testImageUrl 
+            imgUrl: window.__testImageUrl
                 || host + '/react/build/images/share_logo_icon.jpg'
         };
         share(shareData)
@@ -108,10 +108,10 @@ export function configShareForCourses () {
         console.log('configShareForCourses', host)
 
         var shareData = {
-            title: 'EduCoder - 翻转课堂',
+            title: 'EduCoder - 教学课堂',
             desc: '自动评测实训任务，支持技能统计，提供教学活动分析报告，减轻教师和助教的辅导压力，免去作业发布和批改的困扰，实时了解学生学习情况，全面提升教师施教效率和水平。',
-            link: `${host}/courses`,
-            imgUrl: window.__testImageUrl 
+            link: `${host}/classrooms`,
+            imgUrl: window.__testImageUrl
                 || host + '/react/build/images/share_logo_icon.jpg'
         };
         share(shareData)
@@ -127,7 +127,7 @@ export function configShareForCustom (title, desc, imgUrl, path) {
             title: title,
             desc: desc,
             link: path ? `${host}/${path}` : _url,
-            imgUrl: imgUrl || window.__testImageUrl 
+            imgUrl: imgUrl || window.__testImageUrl
                 || host + '/react/build/images/share_logo_icon.jpg'
         };
         share(shareData)