fix applayout

config/dist/proxy.dev.js

+"use strict";
+
+module.exports = {
+  dev: {
+    '/CityInterface': {
+      // target: 'http://192.168.10.150:8050',
+      target: 'https://panda-water.cn',
+      // target: 'http://192.168.19.103:8112',
+      // target: 'http://192.168.12.8:8098',
+      changeOrigin: true,
+      headers: {
+        'Access-Control-Allow-Origin': '*'
+      },
+      pathRewrite: {
+        '/CityInterface': '/CityInterface'
+      }
+    },
+    '/cityinterface': {
+      // target: 'http://192.168.10.151:8055',
+      target: 'https://panda-water.cn',
+      // target: 'http://192.168.12.8:8098',
+      changeOrigin: true,
+      headers: {
+        'Access-Control-Allow-Origin': '*'
+      },
+      pathRewrite: {
+        '/cityinterface': '/cityinterface'
+      }
+    }
+  }
+};
\ No newline at end of file

config/proxy.js

+module.exports = {
+  dev: {
+    '/CityInterface': {
+      // target: 'http://192.168.10.150:8050',
+      target: 'https://panda-water.cn',
+      // target: 'http://192.168.19.103:8112',
+      // target: 'http://192.168.12.8:8098',
+      changeOrigin: true,
+      headers: {
+        'Access-Control-Allow-Origin': '*',
+      },
+      pathRewrite: {
+        '/CityInterface': '/CityInterface',
+      },
+    },
+    '/cityinterface': {
+      // target: 'http://192.168.10.151:8055',
+      target: 'https://panda-water.cn',
+      // target: 'http://192.168.12.8:8098',
+      changeOrigin: true,
+      headers: {
+        'Access-Control-Allow-Origin': '*',
+      },
+      pathRewrite: {
+        '/cityinterface': '/cityinterface',
+      },
+    },
+  },
+};

internals/webpack/dist/webpack.base.babel.dev.js

@@ -6,13 +6,15 @@ var webpack = require('webpack');
 
 var slash = require('slash2');
 
+var pkg = require('../../package.json');
+
 module.exports = function (options) {
   return {
     mode: options.mode,
     entry: options.entry,
     output: Object.assign({
-      path: path.resolve(process.cwd(), 'civweb'),
-      publicPath: '/'
+      path: path.resolve(process.cwd(), pkg.name.toLocaleLowerCase()),
+      publicPath: "/".concat(pkg.name.toLocaleLowerCase())
     }, options.output),
     // Merge with env dependent settings
     optimization: options.optimization,
@@ -93,28 +95,29 @@ module.exports = function (options) {
             // Inline files smaller than 10 kB
             limit: 10 * 1024
           }
-        }, {
-          loader: 'image-webpack-loader',
-          options: {
-            mozjpeg: {
-              enabled: false // NOTE: mozjpeg is disabled as it causes errors in some Linux environments
-              // Try enabling it in your environment by switching the config to:
-              // enabled: true,
-              // progressive: true,
-
-            },
-            gifsicle: {
-              interlaced: false
-            },
-            optipng: {
-              optimizationLevel: 7
-            },
-            pngquant: {
-              quality: '65-90',
-              speed: 4
-            }
-          }
-        }]
+        } // {
+        //   loader: 'image-webpack-loader',
+        //   options: {
+        //     mozjpeg: {
+        //       enabled: false,
+        //       // NOTE: mozjpeg is disabled as it causes errors in some Linux environments
+        //       // Try enabling it in your environment by switching the config to:
+        //       // enabled: true,
+        //       // progressive: true,
+        //     },
+        //     gifsicle: {
+        //       interlaced: false,
+        //     },
+        //     optipng: {
+        //       optimizationLevel: 7,
+        //     },
+        //     pngquant: {
+        //       quality: '65-90',
+        //       speed: 4,
+        //     },
+        //   },
+        // },
+        ]
       }, {
         test: /\.html$/,
         use: 'html-loader'

internals/webpack/webpack.base.babel.js

 const path = require('path');
 const webpack = require('webpack');
 const slash = require('slash2');
-module.exports = options => ({
+const pkg = require('../../package.json');
+module.exports = (options) => ({
   mode: options.mode,
   entry: options.entry,
   output: Object.assign(
     {
-      path: path.resolve(process.cwd(), 'civweb'),
-      publicPath: '/',
+      path: path.resolve(process.cwd(), pkg.name.toLocaleLowerCase()),
+      publicPath: `/${pkg.name.toLocaleLowerCase()}`,
     },
     options.output,
   ), // Merge with env dependent settings
@@ -15,7 +16,7 @@ module.exports = options => ({
   module: {
     rules: [
       {
-        test: /\.jsx?$/, 
+        test: /\.jsx?$/,
         exclude: /node_modules/,
         use: {
           loader: 'babel-loader',
@@ -42,7 +43,6 @@ module.exports = options => ({
             loader: 'css-loader',
             options: {
               modules: {
-               
                 // localIdentName: '[name]__[local]___[hash:base64:5]'
                 // modules: true,
                 getLocalIdent: (context, _, localName) => {
@@ -53,22 +53,24 @@ module.exports = options => ({
                   ) {
                     return localName;
                   }
-            
+
                   const match = context.resourcePath.match(/src(.*)/);
-            
+
                   if (match && match[1]) {
                     const antdProPath = match[1].replace('.less', '');
                     const arr = slash(antdProPath)
                       .split('/')
-                      .map(a => a.replace(/([A-Z])/g, '-$1'))
-                      .map(a => a.toLowerCase());
-                    return `panda-pro${arr.join('-')}-${localName}`.replace(/--/g, '-');
+                      .map((a) => a.replace(/([A-Z])/g, '-$1'))
+                      .map((a) => a.toLowerCase());
+                    return `panda-pro${arr.join('-')}-${localName}`.replace(
+                      /--/g,
+                      '-',
+                    );
                   }
-            
+
                   return localName;
                 },
-              }
-              
+              },
             },
           },
           {
@@ -111,28 +113,28 @@ module.exports = options => ({
               limit: 10 * 1024,
             },
           },
-          {
-            loader: 'image-webpack-loader',
-            options: {
-              mozjpeg: {
-                enabled: false,
-                // NOTE: mozjpeg is disabled as it causes errors in some Linux environments
-                // Try enabling it in your environment by switching the config to:
-                // enabled: true,
-                // progressive: true,
-              },
-              gifsicle: {
-                interlaced: false,
-              },
-              optipng: {
-                optimizationLevel: 7,
-              },
-              pngquant: {
-                quality: '65-90',
-                speed: 4,
-              },
-            },
-          },
+          // {
+          //   loader: 'image-webpack-loader',
+          //   options: {
+          //     mozjpeg: {
+          //       enabled: false,
+          //       // NOTE: mozjpeg is disabled as it causes errors in some Linux environments
+          //       // Try enabling it in your environment by switching the config to:
+          //       // enabled: true,
+          //       // progressive: true,
+          //     },
+          //     gifsicle: {
+          //       interlaced: false,
+          //     },
+          //     optipng: {
+          //       optimizationLevel: 7,
+          //     },
+          //     pngquant: {
+          //       quality: '65-90',
+          //       speed: 4,
+          //     },
+          //   },
+          // },
         ],
       },
       {

mock/dist/notices.dev.js

+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports["default"] = void 0;
+
+var getNotices = function getNotices(req, res) {
+  res.json([{
+    id: '000000001',
+    avatar: 'https://gw.alipayobjects.com/zos/rmsportal/ThXAXghbEsBCCSDihZxY.png',
+    title: '你收到了 14 份新周报',
+    datetime: '2017-08-09',
+    type: 'notification'
+  }, {
+    id: '000000002',
+    avatar: 'https://gw.alipayobjects.com/zos/rmsportal/OKJXDXrmkNshAMvwtvhu.png',
+    title: '你推荐的 曲妮妮 已通过第三轮面试',
+    datetime: '2017-08-08',
+    type: 'notification'
+  }, {
+    id: '000000003',
+    avatar: 'https://gw.alipayobjects.com/zos/rmsportal/kISTdvpyTAhtGxpovNWd.png',
+    title: '这种模板可以区分多种通知类型',
+    datetime: '2017-08-07',
+    read: true,
+    type: 'notification'
+  }, {
+    id: '000000004',
+    avatar: 'https://gw.alipayobjects.com/zos/rmsportal/GvqBnKhFgObvnSGkDsje.png',
+    title: '左侧图标用于区分不同的类型',
+    datetime: '2017-08-07',
+    type: 'notification'
+  }, {
+    id: '000000005',
+    avatar: 'https://gw.alipayobjects.com/zos/rmsportal/ThXAXghbEsBCCSDihZxY.png',
+    title: '内容不要超过两行字，超出时自动截断',
+    datetime: '2017-08-07',
+    type: 'notification'
+  }, {
+    id: '000000006',
+    avatar: 'https://gw.alipayobjects.com/zos/rmsportal/fcHMVNCjPOsbUGdEduuv.jpeg',
+    title: '曲丽丽 评论了你',
+    description: '描述信息描述信息描述信息',
+    datetime: '2017-08-07',
+    type: 'message',
+    clickClose: true
+  }, {
+    id: '000000007',
+    avatar: 'https://gw.alipayobjects.com/zos/rmsportal/fcHMVNCjPOsbUGdEduuv.jpeg',
+    title: '朱偏右 回复了你',
+    description: '这种模板用于提醒谁与你发生了互动，左侧放『谁』的头像',
+    datetime: '2017-08-07',
+    type: 'message',
+    clickClose: true
+  }, {
+    id: '000000008',
+    avatar: 'https://gw.alipayobjects.com/zos/rmsportal/fcHMVNCjPOsbUGdEduuv.jpeg',
+    title: '标题',
+    description: '这种模板用于提醒谁与你发生了互动，左侧放『谁』的头像',
+    datetime: '2017-08-07',
+    type: 'message',
+    clickClose: true
+  }, {
+    id: '000000009',
+    title: '任务名称',
+    description: '任务需要在 2017-01-12 20:00 前启动',
+    extra: '未开始',
+    status: 'todo',
+    type: 'event'
+  }, {
+    id: '000000010',
+    title: '第三方紧急代码变更',
+    description: '冠霖提交于 2017-01-06，需在 2017-01-07 前完成代码变更任务',
+    extra: '马上到期',
+    status: 'urgent',
+    type: 'event'
+  }, {
+    id: '000000011',
+    title: '信息安全考试',
+    description: '指派竹尔于 2017-01-09 前完成更新并发布',
+    extra: '已耗时 8 天',
+    status: 'doing',
+    type: 'event'
+  }, {
+    id: '000000012',
+    title: 'ABCD 版本发布',
+    description: '冠霖提交于 2017-01-06，需在 2017-01-07 前完成代码变更任务',
+    extra: '进行中',
+    status: 'processing',
+    type: 'event'
+  }]);
+};
+
+var _default = {
+  'GET /api/notices': getNotices
+};
+exports["default"] = _default;
\ No newline at end of file

mock/notices.js

+const getNotices = (req, res) => {
+  res.json([
+    {
+      id: '000000001',
+      avatar:
+        'https://gw.alipayobjects.com/zos/rmsportal/ThXAXghbEsBCCSDihZxY.png',
+      title: '你收到了 14 份新周报',
+      datetime: '2017-08-09',
+      type: 'notification',
+    },
+    {
+      id: '000000002',
+      avatar:
+        'https://gw.alipayobjects.com/zos/rmsportal/OKJXDXrmkNshAMvwtvhu.png',
+      title: '你推荐的 曲妮妮 已通过第三轮面试',
+      datetime: '2017-08-08',
+      type: 'notification',
+    },
+    {
+      id: '000000003',
+      avatar:
+        'https://gw.alipayobjects.com/zos/rmsportal/kISTdvpyTAhtGxpovNWd.png',
+      title: '这种模板可以区分多种通知类型',
+      datetime: '2017-08-07',
+      read: true,
+      type: 'notification',
+    },
+    {
+      id: '000000004',
+      avatar:
+        'https://gw.alipayobjects.com/zos/rmsportal/GvqBnKhFgObvnSGkDsje.png',
+      title: '左侧图标用于区分不同的类型',
+      datetime: '2017-08-07',
+      type: 'notification',
+    },
+    {
+      id: '000000005',
+      avatar:
+        'https://gw.alipayobjects.com/zos/rmsportal/ThXAXghbEsBCCSDihZxY.png',
+      title: '内容不要超过两行字，超出时自动截断',
+      datetime: '2017-08-07',
+      type: 'notification',
+    },
+    {
+      id: '000000006',
+      avatar:
+        'https://gw.alipayobjects.com/zos/rmsportal/fcHMVNCjPOsbUGdEduuv.jpeg',
+      title: '曲丽丽 评论了你',
+      description: '描述信息描述信息描述信息',
+      datetime: '2017-08-07',
+      type: 'message',
+      clickClose: true,
+    },
+    {
+      id: '000000007',
+      avatar:
+        'https://gw.alipayobjects.com/zos/rmsportal/fcHMVNCjPOsbUGdEduuv.jpeg',
+      title: '朱偏右 回复了你',
+      description: '这种模板用于提醒谁与你发生了互动，左侧放『谁』的头像',
+      datetime: '2017-08-07',
+      type: 'message',
+      clickClose: true,
+    },
+    {
+      id: '000000008',
+      avatar:
+        'https://gw.alipayobjects.com/zos/rmsportal/fcHMVNCjPOsbUGdEduuv.jpeg',
+      title: '标题',
+      description: '这种模板用于提醒谁与你发生了互动，左侧放『谁』的头像',
+      datetime: '2017-08-07',
+      type: 'message',
+      clickClose: true,
+    },
+    {
+      id: '000000009',
+      title: '任务名称',
+      description: '任务需要在 2017-01-12 20:00 前启动',
+      extra: '未开始',
+      status: 'todo',
+      type: 'event',
+    },
+    {
+      id: '000000010',
+      title: '第三方紧急代码变更',
+      description: '冠霖提交于 2017-01-06，需在 2017-01-07 前完成代码变更任务',
+      extra: '马上到期',
+      status: 'urgent',
+      type: 'event',
+    },
+    {
+      id: '000000011',
+      title: '信息安全考试',
+      description: '指派竹尔于 2017-01-09 前完成更新并发布',
+      extra: '已耗时 8 天',
+      status: 'doing',
+      type: 'event',
+    },
+    {
+      id: '000000012',
+      title: 'ABCD 版本发布',
+      description: '冠霖提交于 2017-01-06，需在 2017-01-07 前完成代码变更任务',
+      extra: '进行中',
+      status: 'processing',
+      type: 'event',
+    },
+  ]);
+};
+
+export default {
+  'GET /api/notices': getNotices,
+};