Merge remote-tracking branch 'origin/master'

base-manager-ui/admin/.env

@@ -9,4 +9,5 @@ VUE_APP_TBAS_KEY=admin.tabs
 VUE_APP_TBAS_TITLES_KEY=admin.tabs.titles
 #VUE_APP_API_BASE_URL=http://api.iczer.com
 #门户
-VUE_APP_API_portal_URL=http://192.168.0.98:11072
+#VUE_APP_API_portal_URL=http://192.168.0.98:11072
\ No newline at end of file
+VUE_APP_API_portal_URL=http://10.12.185.213:11072
\ No newline at end of file

base-manager-ui/admin/.env.development

 #开发环境
 NODE_ENV = "development"
-VUE_APP_API_BASE_URL=http://192.168.0.98:11078
+#VUE_APP_API_BASE_URL=http://192.168.0.98:11078
\ No newline at end of file
+VUE_APP_API_BASE_URL=http://10.12.185.213:11071
\ No newline at end of file

base-manager-ui/admin/vue.config.js

@@ -4,11 +4,9 @@ const ThemeColorReplacer = require("webpack-theme-color-replacer");
 const { getThemeColors, modifyVars } = require("./src/utils/themeUtil");
 const { resolveCss } = require("./src/utils/theme-color-replacer-extend");
 const CompressionWebpackPlugin = require("compression-webpack-plugin");
-
 const productionGzipExtensions = ["js", "css"];
 const isProd = process.env.NODE_ENV === "production";
 
-
 const assetsCDN = {
   // webpack build externals
   // externals: {
@@ -34,9 +32,8 @@ const assetsCDN = {
   ],
 };
 
-
-
-const BundleAnalyzerPlugin = require('webpack-bundle-analyzer').BundleAnalyzerPlugin
+const BundleAnalyzerPlugin = require("webpack-bundle-analyzer")
+  .BundleAnalyzerPlugin;
 module.exports = {
   devServer: {
     disableHostCheck: true,
@@ -59,7 +56,15 @@ module.exports = {
       patterns: [path.resolve(__dirname, "./src/theme/theme.less")],
     },
   },
-
+  //富文本改变图片大小插件
+  configureWebpack: {
+    plugins: [
+      new webpack.ProvidePlugin({
+        "window.Quill": "quill/dist/quill.js",
+        Quill: "quill/dist/quill.js",
+      }),
+    ],
+  },
   css: {
     loaderOptions: {
       less: {