Skip to content

C
CivWeb
Commit ea4f5471 authored by 张苗苗's avatar 张苗苗
Browse files
Options

Merge branch 'master' of https://g.civnet.cn:8443/ReactWeb5/CivWeb

parents 40be2635 6b51167c
Pipeline #22699 skipped with stages
        Hide whitespace changes
        Inline Side-by-side
        Showing with 1315 additions and 578 deletions
        config/defaultSetting.js
        View file @ ea4f5471
        ...@@ -2,8 +2,8 @@ export default { ...@@ -2,8 +2,8 @@ export default {
        navTheme: 'dark', navTheme: 'dark',
        layout: 'side', layout: 'side',
        contentWidth: 'Fluid', contentWidth: 'Fluid',
        fixedHeader: false, fixedHeader: true,
        fixSiderbar: false, fixSiderbar: true,
        menu: { menu: {
        locale: true, locale: true,
        }, },
        ...@@ -11,5 +11,5 @@ export default { ...@@ -11,5 +11,5 @@ export default {
        headerHeight: 48, headerHeight: 48,
        title: '熊猫智慧城市监控管理解决方案', title: '熊猫智慧城市监控管理解决方案',
        iconfontUrl: '', iconfontUrl: '',
        primaryColor: '#1890ff', primaryColor: '#1890ff'
        }; };
        config/micor.js
        View file @ ea4f5471
        ...@@ -5,7 +5,7 @@ export default { ...@@ -5,7 +5,7 @@ export default {
        dev: [ dev: [
        { {
        name: 'web4_console', name: 'web4_console',
        entry: `//${window.location.hostname}:3020/civweb4`, entry: `//${window.location.hostname}:3020/civweb4/`,
        container: '#micro-container', container: '#micro-container',
        activeRule: genActiveRule('/civbase/civweb4'), activeRule: genActiveRule('/civbase/civweb4'),
        props: {}, props: {},
        ......
        config/proxy.js
        View file @ ea4f5471
        module.exports = { module.exports = {
        mock: true,
        dev: { dev: {
        '/CityInterface': { '/CityInterface': {
        // target: 'http://192.168.10.151:8055', // target: 'http://192.168.10.151:8055',
        // target: 'https://panda-water.cn', target: 'https://panda-water.cn',
        // target: 'http://192.168.19.102:8055', // target: 'http://192.168.19.102:8055',
        // target: 'https://panda-water.com', // target: 'https://panda-water.com',
        ...@@ -21,9 +22,9 @@ module.exports = { ...@@ -21,9 +22,9 @@ module.exports = {
        '/cityinterface': { '/cityinterface': {
        // target: 'http://192.168.10.151:8055', // target: 'http://192.168.10.151:8055',
        // target: 'http://192.168.10.150:8050', // target: 'http://192.168.10.150:8050',
        // target: 'https://panda-water.cn', target: 'https://panda-water.cn',
        // target: 'http://192.168.19.102:8055', // target: 'http://192.168.19.102:8055',
        target: 'https://panda-water.com', // target: 'https://panda-water.com',
        // target: 'http://192.168.12.8:8098', // target: 'http://192.168.12.8:8098',
        // target: 'http://192.168.10.20:8888', // target: 'http://192.168.10.20:8888',
        changeOrigin: true, changeOrigin: true,
        ...@@ -52,9 +53,9 @@ module.exports = { ...@@ -52,9 +53,9 @@ module.exports = {
        // target: 'http://192.168.12.8:8098', // target: 'http://192.168.12.8:8098',
        // target: 'http://192.168.10.20:8888', // target: 'http://192.168.10.20:8888',
        // target: 'http://192.168.10.151:8055', // target: 'http://192.168.10.151:8055',
        // target: 'https://panda-water.cn', target: 'https://panda-water.cn',
        // target: 'http://192.168.19.102:8055', // target: 'http://192.168.19.102:8055',
        target: 'https://panda-water.com', // target: 'https://panda-water.com',
        // target: 'http://192.168.10.150:8050', // target: 'http://192.168.10.150:8050',
        changeOrigin: true, changeOrigin: true,
        headers: { headers: {
        ......
        internals/webpack/webpack.dev.babel.js
        View file @ ea4f5471
        ...@@ -49,7 +49,7 @@ module.exports = require('./webpack.base.babel')({ ...@@ -49,7 +49,7 @@ module.exports = require('./webpack.base.babel')({
        fs: 'empty', fs: 'empty',
        net: 'empty', net: 'empty',
        tls: 'empty', tls: 'empty',
        child_process: 'empty' child_process: 'empty',
        }, },
        performance: { performance: {
        hints: false, hints: false,
        ......
        internals/webpack/webpack.prod.babel.js
        View file @ ea4f5471
        ...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
        const path = require('path'); const path = require('path');
        const HtmlWebpackPlugin = require('html-webpack-plugin'); const HtmlWebpackPlugin = require('html-webpack-plugin');
        const WebpackPwaManifest = require('webpack-pwa-manifest'); const WebpackPwaManifest = require('webpack-pwa-manifest');
        const OfflinePlugin = require('offline-plugin'); // const OfflinePlugin = require('offline-plugin');
        const { HashedModuleIdsPlugin } = require('webpack'); const { HashedModuleIdsPlugin } = require('webpack');
        const TerserPlugin = require('terser-webpack-plugin'); const TerserPlugin = require('terser-webpack-plugin');
        const CompressionPlugin = require('compression-webpack-plugin'); const CompressionPlugin = require('compression-webpack-plugin');
        ...@@ -85,25 +85,25 @@ module.exports = require('./webpack.base.babel')({ ...@@ -85,25 +85,25 @@ module.exports = require('./webpack.base.babel')({
        }), }),
        // Put it in the end to capture all the HtmlWebpackPlugin's // Put it in the end to capture all the HtmlWebpackPlugin's
        // assets manipulations and do leak its manipulations to HtmlWebpackPlugin // // assets manipulations and do leak its manipulations to HtmlWebpackPlugin
        // new OfflinePlugin({ // new OfflinePlugin({
        // relativePaths: false, // relativePaths: false,
        // publicPath: '/', // publicPath: '/',
        // appShell: '/', // appShell: '/',
        //
        // // No need to cache .htaccess. See http://mxs.is/googmp, // // No need to cache .htaccess. See http://mxs.is/googmp,
        // // this is applied before any match in `caches` section // // this is applied before any match in `caches` section
        // excludes: ['.htaccess'], // excludes: ['.htaccess'],
        //
        // caches: { // caches: {
        // main: [':rest:'], // main: [':rest:'],
        //
        // // All chunks marked as `additional`, loaded after main section // // All chunks marked as `additional`, loaded after main section
        // // and do not prevent SW to install. Change to `optional` if // // and do not prevent SW to install. Change to `optional` if
        // // do not want them to be preloaded at all (cached only when first loaded) // // do not want them to be preloaded at all (cached only when first loaded)
        // additional: ['*.chunk.js'], // additional: ['*.chunk.js'],
        // }, // },
        //
        // // Removes warning for about `additional` section usage // // Removes warning for about `additional` section usage
        // safeToUseOptionalCaches: true, // safeToUseOptionalCaches: true,
        // }), // }),
        ...@@ -115,26 +115,26 @@ module.exports = require('./webpack.base.babel')({ ...@@ -115,26 +115,26 @@ module.exports = require('./webpack.base.babel')({
        minRatio: 0.8, minRatio: 0.8,
        }), }),
        // new WebpackPwaManifest({ new WebpackPwaManifest({
        // name: '运维管理平台', name: '熊猫智慧城市监控管理解决方案',
        // short_name: '运维管理平台', short_name: '熊猫智慧城市监控管理解决方案',
        // description: '运维管理平台', description: '熊猫智慧城市监控管理解决方案',
        // background_color: '#fafafa', background_color: '#fafafa',
        // theme_color: '#b1624d', theme_color: '#b1624d',
        // inject: true, inject: true,
        // ios: true, ios: true,
        // icons: [ icons: [
        // { {
        // src: path.resolve('src/images/icon-512x512.png'), src: path.resolve('src/images/icon-512x512.png'),
        // sizes: [72, 96, 128, 144, 192, 384, 512], sizes: [72, 96, 128, 144, 192, 384, 512],
        // }, },
        // { {
        // src: path.resolve('src/images/icon-512x512.png'), src: path.resolve('src/images/icon-512x512.png'),
        // sizes: [120, 152, 167, 180], sizes: [120, 152, 167, 180],
        // ios: true, ios: true,
        // }, },
        // ], ],
        // }), }),
        new HashedModuleIdsPlugin({ new HashedModuleIdsPlugin({
        hashFunction: 'sha256', hashFunction: 'sha256',
        ......
        mock/notices.js
        View file @ ea4f5471
        const getNotices = (req, res) => { module.exports = {
        res.json([ 'GET /api/notices': {
        { id: '000000002',
        id: '000000001', avatar:
        avatar: 'https://gw.alipayobjects.com/zos/rmsportal/fcHMVNCjPOsbUGdEduuv.jpeg',
        'https://gw.alipayobjects.com/zos/rmsportal/ThXAXghbEsBCCSDihZxY.png', title: '曲丽丽 评论了你',
        title: '你收到了 14 份新周报', description: '描述信息描述信息描述信息',
        datetime: '2017-08-09', datetime: '2017-08-07',
        type: 'notification', type: 'message',
        }, clickClose: true,
        { },
        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,
        }; };
        package-lock.json
        View file @ ea4f5471
        ...@@ -100,29 +100,25 @@ ...@@ -100,29 +100,25 @@
        } }
        }, },
        "@ant-design/pro-layout": { "@ant-design/pro-layout": {
        "version": "6.10.8", "version": "6.11.1",
        "resolved": "https://g.civnet.cn:4873/@ant-design%2fpro-layout/-/pro-layout-6.10.8.tgz", "resolved": "https://g.civnet.cn:4873/@ant-design%2fpro-layout/-/pro-layout-6.11.1.tgz",
        "integrity": "sha1-6y7/bw7gCtkisxN3KO8LwSO+iQ4=", "integrity": "sha1-JhoaNZXz44zwI1fh5RvL/26CQf4=",
        "dev": true, "dev": true,
        "requires": { "requires": {
        "@ant-design/icons": "^4.0.0", "@ant-design/icons": "^4.0.0",
        "@ant-design/pro-provider": "1.4.2", "@ant-design/pro-provider": "1.4.2",
        "@ant-design/pro-utils": "1.10.4", "@ant-design/pro-utils": "1.11.0",
        "@umijs/route-utils": "^1.0.33", "@umijs/route-utils": "^1.0.33",
        "classnames": "^2.2.6", "classnames": "^2.2.6",
        "history": "^4.10.1",
        "memoize-one": "^5.1.1",
        "omit.js": "^2.0.2", "omit.js": "^2.0.2",
        "path-to-regexp": "2.4.0", "path-to-regexp": "2.4.0",
        "qs": "^6.9.0",
        "rc-resize-observer": "^0.2.1", "rc-resize-observer": "^0.2.1",
        "rc-util": "^5.0.6", "rc-util": "^5.0.6",
        "react-copy-to-clipboard": "^5.0.1", "react-copy-to-clipboard": "^5.0.1",
        "react-responsive": "^8.0.1",
        "react-router-dom": "5.1.2",
        "unstated-next": "^1.1.0", "unstated-next": "^1.1.0",
        "use-json-comparison": "^1.0.3", "use-json-comparison": "^1.0.3",
        "use-media-antd-query": "^1.0.3", "use-media-antd-query": "^1.0.3",
        "use-url-search-params": "^2.3.13",
        "warning": "^4.0.3" "warning": "^4.0.3"
        }, },
        "dependencies": { "dependencies": {
        ...@@ -135,75 +131,19 @@ ...@@ -135,75 +131,19 @@
        "rc-util": "^5.0.1" "rc-util": "^5.0.1"
        } }
        }, },
        "history": { "@ant-design/pro-utils": {
        "version": "4.10.1", "version": "1.11.0",
        "resolved": "https://g.civnet.cn:4873/history/-/history-4.10.1.tgz", "resolved": "https://g.civnet.cn:4873/@ant-design%2fpro-utils/-/pro-utils-1.11.0.tgz",
        "integrity": "sha512-36nwAD620w12kuzPAsyINPWJqlNbij+hpK1k9XRloDtym8mxzGYl2c17LnV6IAGB2Dmg4tEa7G7DlawS0+qjew==", "integrity": "sha1-I+lL4AMRT23jC+axK6fGFE678QI=",
        "dev": true,
        "requires": {
        "@babel/runtime": "^7.1.2",
        "loose-envify": "^1.2.0",
        "resolve-pathname": "^3.0.0",
        "tiny-invariant": "^1.0.2",
        "tiny-warning": "^1.0.0",
        "value-equal": "^1.0.1"
        }
        },
        "react-router": {
        "version": "5.1.2",
        "resolved": "https://g.civnet.cn:4873/react-router/-/react-router-5.1.2.tgz",
        "integrity": "sha512-yjEuMFy1ONK246B+rsa0cUam5OeAQ8pyclRDgpxuSCrAlJ1qN9uZ5IgyKC7gQg0w8OM50NXHEegPh/ks9YuR2A==",
        "dev": true,
        "requires": {
        "@babel/runtime": "^7.1.2",
        "history": "^4.9.0",
        "hoist-non-react-statics": "^3.1.0",
        "loose-envify": "^1.3.1",
        "mini-create-react-context": "^0.3.0",
        "path-to-regexp": "^1.7.0",
        "prop-types": "^15.6.2",
        "react-is": "^16.6.0",
        "tiny-invariant": "^1.0.2",
        "tiny-warning": "^1.0.0"
        },
        "dependencies": {
        "path-to-regexp": {
        "version": "1.8.0",
        "resolved": "https://g.civnet.cn:4873/path-to-regexp/-/path-to-regexp-1.8.0.tgz",
        "integrity": "sha512-n43JRhlUKUAlibEJhPeir1ncUID16QnEjNpwzNdO3Lm4ywrBpBZ5oLD0I6br9evr1Y9JTqwRtAh7JLoOzAQdVA==",
        "dev": true,
        "requires": {
        "isarray": "0.0.1"
        }
        }
        }
        },
        "react-router-dom": {
        "version": "5.1.2",
        "resolved": "https://g.civnet.cn:4873/react-router-dom/-/react-router-dom-5.1.2.tgz",
        "integrity": "sha512-7BPHAaIwWpZS074UKaw1FjVdZBSVWEk8IuDXdB+OkLb8vd/WRQIpA4ag9WQk61aEfQs47wHyjWUoUGGZxpQXew==",
        "dev": true, "dev": true,
        "requires": { "requires": {
        "@babel/runtime": "^7.1.2", "@ant-design/icons": "^4.3.0",
        "history": "^4.9.0", "@ant-design/pro-provider": "1.4.2",
        "loose-envify": "^1.3.1", "classnames": "^2.2.6",
        "prop-types": "^15.6.2", "fast-deep-equal": "^3.1.3",
        "react-router": "5.1.2", "moment": "^2.27.0",
        "tiny-invariant": "^1.0.2", "rc-util": "^5.0.6"
        "tiny-warning": "^1.0.0"
        } }
        },
        "resolve-pathname": {
        "version": "3.0.0",
        "resolved": "https://g.civnet.cn:4873/resolve-pathname/-/resolve-pathname-3.0.0.tgz",
        "integrity": "sha512-C7rARubxI8bXFNB/hqcp/4iUeIXJhJZvFPFPiSPRnhU5UPxzMFIl+2E6yY6c4k9giDJAhtV+enfA+G89N6Csng==",
        "dev": true
        },
        "value-equal": {
        "version": "1.0.1",
        "resolved": "https://g.civnet.cn:4873/value-equal/-/value-equal-1.0.1.tgz",
        "integrity": "sha512-NOJ6JZCAWr0zlxZt+xqCHNTEKOsrks2HQd4MqhP1qy4z1SkbEP467eNx6TgDKXMvUOb+OENfJCZwM+16n7fRfw==",
        "dev": true
        } }
        } }
        }, },
        ...@@ -7237,9 +7177,9 @@ ...@@ -7237,9 +7177,9 @@
        } }
        }, },
        "@wisdom-utils/utils": { "@wisdom-utils/utils": {
        "version": "0.0.26", "version": "0.0.27",
        "resolved": "https://g.civnet.cn:4873/@wisdom-utils%2futils/-/utils-0.0.26.tgz", "resolved": "https://g.civnet.cn:4873/@wisdom-utils%2futils/-/utils-0.0.27.tgz",
        "integrity": "sha512-O3PVT0tX4fng0Jee02ArzcIZrRhvQGbD8iVVjRKuahuWPKQtR1jFIHS7Y1W0gJz9bW+4ECUUlkcev8OXE668Zw==", "integrity": "sha512-UQM/ls66WZizDsZRLh8Q0OMlCB6HfhvaBi6FJcCrQoj0ED3V8LFvKQ/ibqhYnhQvvZQCy8XsSA62E959JtriKQ==",
        "requires": { "requires": {
        "axios": "^0.21.1", "axios": "^0.21.1",
        "cookie": "^0.4.1", "cookie": "^0.4.1",
        ...@@ -7274,6 +7214,41 @@ ...@@ -7274,6 +7214,41 @@
        } }
        } }
        }, },
        "@wisdom-utils/vapp-browser-vm": {
        "version": "0.0.11",
        "resolved": "https://g.civnet.cn:4873/@wisdom-utils%2fvapp-browser-vm/-/vapp-browser-vm-0.0.11.tgz",
        "integrity": "sha512-QRNOiFv2t7VS/08cCqIEC4H3LIZDz8MLQdBOhuleMJsarFqnKWB2DfagBgEbWPCz3IGqsb9kcwA89f9YsZaZ3A==",
        "requires": {
        "axios": "^0.21.1",
        "nanoid": "^3.1.20",
        "tslib": "^2.1.0"
        },
        "dependencies": {
        "tslib": {
        "version": "2.1.0",
        "resolved": "https://g.civnet.cn:4873/tslib/-/tslib-2.1.0.tgz",
        "integrity": "sha1-2mCGDxwuyqVwOrfTm8Bba/mIuXo="
        }
        }
        },
        "@wisdom-utils/vapp-browser-vm-plugins": {
        "version": "0.0.13",
        "resolved": "https://g.civnet.cn:4873/@wisdom-utils%2fvapp-browser-vm-plugins/-/vapp-browser-vm-plugins-0.0.13.tgz",
        "integrity": "sha512-834mxk6sShc7izlDyUYZW0ihAVOJgF0ohFHrTCth2qn4EePhrTE/4apLdvl0emv6tKlOxLVMbnX8mnlNafC9VA==",
        "requires": {
        "@wisdom-utils/vapp-browser-vm": "^0.0.11",
        "axios": "^0.21.1",
        "js-cookie": "^2.2.1",
        "tslib": "^2.1.0"
        },
        "dependencies": {
        "tslib": {
        "version": "2.1.0",
        "resolved": "https://g.civnet.cn:4873/tslib/-/tslib-2.1.0.tgz",
        "integrity": "sha1-2mCGDxwuyqVwOrfTm8Bba/mIuXo="
        }
        }
        },
        "@xobotyi/scrollbar-width": { "@xobotyi/scrollbar-width": {
        "version": "1.9.5", "version": "1.9.5",
        "resolved": "https://g.civnet.cn:4873/@xobotyi%2fscrollbar-width/-/scrollbar-width-1.9.5.tgz", "resolved": "https://g.civnet.cn:4873/@xobotyi%2fscrollbar-width/-/scrollbar-width-1.9.5.tgz",
        ...@@ -8455,26 +8430,59 @@ ...@@ -8455,26 +8430,59 @@
        "dev": true "dev": true
        }, },
        "body-parser": { "body-parser": {
        "version": "1.18.3", "version": "1.19.0",
        "resolved": "https://g.civnet.cn:4873/body-parser/-/body-parser-1.18.3.tgz", "resolved": "https://g.civnet.cn:4873/body-parser/-/body-parser-1.19.0.tgz",
        "integrity": "sha1-WykhmP/dVTs6DyDe0FkrlWlVyLQ=", "integrity": "sha512-dhEPs72UPbDnAQJ9ZKMNTP6ptJaionhP5cBb541nXPlW60Jepo9RV/a4fX4XWW9CuFNK22krhrj1+rgzifNCsw==",
        "dev": true,
        "requires": { "requires": {
        "bytes": "3.0.0", "bytes": "3.1.0",
        "content-type": "~1.0.4", "content-type": "~1.0.4",
        "debug": "2.6.9", "debug": "2.6.9",
        "depd": "~1.1.2", "depd": "~1.1.2",
        "http-errors": "~1.6.3", "http-errors": "1.7.2",
        "iconv-lite": "0.4.23", "iconv-lite": "0.4.24",
        "on-finished": "~2.3.0", "on-finished": "~2.3.0",
        "qs": "6.5.2", "qs": "6.7.0",
        "raw-body": "2.3.3", "raw-body": "2.4.0",
        "type-is": "~1.6.16" "type-is": "~1.6.17"
        }, },
        "dependencies": { "dependencies": {
        "bytes": {
        "version": "3.1.0",
        "resolved": "https://g.civnet.cn:4873/bytes/-/bytes-3.1.0.tgz",
        "integrity": "sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg==",
        "dev": true
        },
        "http-errors": {
        "version": "1.7.2",
        "resolved": "https://g.civnet.cn:4873/http-errors/-/http-errors-1.7.2.tgz",
        "integrity": "sha512-uUQBt3H/cSIVfch6i1EuPNy/YsRSOUBXTVfZ+yR7Zjez3qjBz6i9+i4zjNaoqcoFVI4lQJ5plg63TvGfRSDCRg==",
        "dev": true,
        "requires": {
        "depd": "~1.1.2",
        "inherits": "2.0.3",
        "setprototypeof": "1.1.1",
        "statuses": ">= 1.5.0 < 2",
        "toidentifier": "1.0.0"
        }
        },
        "qs": { "qs": {
        "version": "6.5.2", "version": "6.7.0",
        "resolved": "https://g.civnet.cn:4873/qs/-/qs-6.5.2.tgz", "resolved": "https://g.civnet.cn:4873/qs/-/qs-6.7.0.tgz",
        "integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==" "integrity": "sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ==",
        "dev": true
        },
        "setprototypeof": {
        "version": "1.1.1",
        "resolved": "https://g.civnet.cn:4873/setprototypeof/-/setprototypeof-1.1.1.tgz",
        "integrity": "sha512-JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw==",
        "dev": true
        },
        "statuses": {
        "version": "1.5.0",
        "resolved": "https://g.civnet.cn:4873/statuses/-/statuses-1.5.0.tgz",
        "integrity": "sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow=",
        "dev": true
        } }
        } }
        }, },
        ...@@ -8981,7 +8989,6 @@ ...@@ -8981,7 +8989,6 @@
        "version": "1.0.0", "version": "1.0.0",
        "resolved": "https://g.civnet.cn:4873/call-bind/-/call-bind-1.0.0.tgz", "resolved": "https://g.civnet.cn:4873/call-bind/-/call-bind-1.0.0.tgz",
        "integrity": "sha1-JBJwVLs/m9y0sfuCQYGGBy93uM4=", "integrity": "sha1-JBJwVLs/m9y0sfuCQYGGBy93uM4=",
        "dev": true,
        "requires": { "requires": {
        "function-bind": "^1.1.1", "function-bind": "^1.1.1",
        "get-intrinsic": "^1.0.0" "get-intrinsic": "^1.0.0"
        ...@@ -11531,7 +11538,6 @@ ...@@ -11531,7 +11538,6 @@
        "version": "1.1.3", "version": "1.1.3",
        "resolved": "https://g.civnet.cn:4873/define-properties/-/define-properties-1.1.3.tgz", "resolved": "https://g.civnet.cn:4873/define-properties/-/define-properties-1.1.3.tgz",
        "integrity": "sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==", "integrity": "sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==",
        "dev": true,
        "requires": { "requires": {
        "object-keys": "^1.0.12" "object-keys": "^1.0.12"
        } }
        ...@@ -12280,7 +12286,6 @@ ...@@ -12280,7 +12286,6 @@
        "version": "1.2.1", "version": "1.2.1",
        "resolved": "https://g.civnet.cn:4873/es-to-primitive/-/es-to-primitive-1.2.1.tgz", "resolved": "https://g.civnet.cn:4873/es-to-primitive/-/es-to-primitive-1.2.1.tgz",
        "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==", "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==",
        "dev": true,
        "requires": { "requires": {
        "is-callable": "^1.1.4", "is-callable": "^1.1.4",
        "is-date-object": "^1.0.1", "is-date-object": "^1.0.1",
        ...@@ -13765,7 +13770,6 @@ ...@@ -13765,7 +13770,6 @@
        "requires": { "requires": {
        "accepts": "~1.3.5", "accepts": "~1.3.5",
        "array-flatten": "1.1.1", "array-flatten": "1.1.1",
        "body-parser": "1.18.3",
        "content-disposition": "0.5.2", "content-disposition": "0.5.2",
        "content-type": "~1.0.4", "content-type": "~1.0.4",
        "cookie": "0.3.1", "cookie": "0.3.1",
        ...@@ -14807,8 +14811,7 @@ ...@@ -14807,8 +14811,7 @@
        "function-bind": { "function-bind": {
        "version": "1.1.1", "version": "1.1.1",
        "resolved": "https://g.civnet.cn:4873/function-bind/-/function-bind-1.1.1.tgz", "resolved": "https://g.civnet.cn:4873/function-bind/-/function-bind-1.1.1.tgz",
        "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==", "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="
        "dev": true
        }, },
        "functional-red-black-tree": { "functional-red-black-tree": {
        "version": "1.0.1", "version": "1.0.1",
        ...@@ -14843,7 +14846,6 @@ ...@@ -14843,7 +14846,6 @@
        "version": "1.0.2", "version": "1.0.2",
        "resolved": "https://g.civnet.cn:4873/get-intrinsic/-/get-intrinsic-1.0.2.tgz", "resolved": "https://g.civnet.cn:4873/get-intrinsic/-/get-intrinsic-1.0.2.tgz",
        "integrity": "sha1-aCDaIm5QskiU4IhZRp3Gg2FUXUk=", "integrity": "sha1-aCDaIm5QskiU4IhZRp3Gg2FUXUk=",
        "dev": true,
        "requires": { "requires": {
        "function-bind": "^1.1.1", "function-bind": "^1.1.1",
        "has": "^1.0.3", "has": "^1.0.3",
        ...@@ -15429,7 +15431,6 @@ ...@@ -15429,7 +15431,6 @@
        "version": "1.0.3", "version": "1.0.3",
        "resolved": "https://g.civnet.cn:4873/has/-/has-1.0.3.tgz", "resolved": "https://g.civnet.cn:4873/has/-/has-1.0.3.tgz",
        "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==", "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
        "dev": true,
        "requires": { "requires": {
        "function-bind": "^1.1.1" "function-bind": "^1.1.1"
        } }
        ...@@ -15459,8 +15460,7 @@ ...@@ -15459,8 +15460,7 @@
        "has-symbols": { "has-symbols": {
        "version": "1.0.1", "version": "1.0.1",
        "resolved": "https://g.civnet.cn:4873/has-symbols/-/has-symbols-1.0.1.tgz", "resolved": "https://g.civnet.cn:4873/has-symbols/-/has-symbols-1.0.1.tgz",
        "integrity": "sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg==", "integrity": "sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg=="
        "dev": true
        }, },
        "has-value": { "has-value": {
        "version": "1.0.0", "version": "1.0.0",
        ...@@ -16276,9 +16276,10 @@ ...@@ -16276,9 +16276,10 @@
        "integrity": "sha512-ygGZLjmXfPHj+ZWh6LwbC37l43MhfztxetbFCoYTM2VjkIUpeHgSNn7QIyVFj7YQ1Wl9Cbw5sholVJPzWvC2MQ==" "integrity": "sha512-ygGZLjmXfPHj+ZWh6LwbC37l43MhfztxetbFCoYTM2VjkIUpeHgSNn7QIyVFj7YQ1Wl9Cbw5sholVJPzWvC2MQ=="
        }, },
        "iconv-lite": { "iconv-lite": {
        "version": "0.4.23", "version": "0.4.24",
        "resolved": "https://g.civnet.cn:4873/iconv-lite/-/iconv-lite-0.4.23.tgz", "resolved": "https://g.civnet.cn:4873/iconv-lite/-/iconv-lite-0.4.24.tgz",
        "integrity": "sha512-neyTUVFtahjf0mB3dZT77u+8O0QB89jFdnBkd5P1JgYPbPaia3gXXOVL2fq8VyU2gMMD7SaN7QukTB/pmXYvDA==", "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
        "dev": true,
        "requires": { "requires": {
        "safer-buffer": ">= 2.1.2 < 3" "safer-buffer": ">= 2.1.2 < 3"
        } }
        ...@@ -16653,12 +16654,14 @@ ...@@ -16653,12 +16654,14 @@
        "intl-format-cache": { "intl-format-cache": {
        "version": "2.2.9", "version": "2.2.9",
        "resolved": "https://g.civnet.cn:4873/intl-format-cache/-/intl-format-cache-2.2.9.tgz", "resolved": "https://g.civnet.cn:4873/intl-format-cache/-/intl-format-cache-2.2.9.tgz",
        "integrity": "sha512-Zv/u8wRpekckv0cLkwpVdABYST4hZNTDaX7reFetrYTJwxExR2VyTqQm+l0WmL0Qo8Mjb9Tf33qnfj0T7pjxdQ==" "integrity": "sha512-Zv/u8wRpekckv0cLkwpVdABYST4hZNTDaX7reFetrYTJwxExR2VyTqQm+l0WmL0Qo8Mjb9Tf33qnfj0T7pjxdQ==",
        "dev": true
        }, },
        "intl-messageformat": { "intl-messageformat": {
        "version": "2.2.0", "version": "2.2.0",
        "resolved": "https://g.civnet.cn:4873/intl-messageformat/-/intl-messageformat-2.2.0.tgz", "resolved": "https://g.civnet.cn:4873/intl-messageformat/-/intl-messageformat-2.2.0.tgz",
        "integrity": "sha1-NFvNRt5jC3aDMwwuUhd/9eq0hPw=", "integrity": "sha1-NFvNRt5jC3aDMwwuUhd/9eq0hPw=",
        "dev": true,
        "requires": { "requires": {
        "intl-messageformat-parser": "1.4.0" "intl-messageformat-parser": "1.4.0"
        } }
        ...@@ -16666,12 +16669,14 @@ ...@@ -16666,12 +16669,14 @@
        "intl-messageformat-parser": { "intl-messageformat-parser": {
        "version": "1.4.0", "version": "1.4.0",
        "resolved": "https://g.civnet.cn:4873/intl-messageformat-parser/-/intl-messageformat-parser-1.4.0.tgz", "resolved": "https://g.civnet.cn:4873/intl-messageformat-parser/-/intl-messageformat-parser-1.4.0.tgz",
        "integrity": "sha1-tD1FqXRoytvkQzHXS7Ho3qRPwHU=" "integrity": "sha1-tD1FqXRoytvkQzHXS7Ho3qRPwHU=",
        "dev": true
        }, },
        "intl-relativeformat": { "intl-relativeformat": {
        "version": "2.2.0", "version": "2.2.0",
        "resolved": "https://g.civnet.cn:4873/intl-relativeformat/-/intl-relativeformat-2.2.0.tgz", "resolved": "https://g.civnet.cn:4873/intl-relativeformat/-/intl-relativeformat-2.2.0.tgz",
        "integrity": "sha512-4bV/7kSKaPEmu6ArxXf9xjv1ny74Zkwuey8Pm01NH4zggPP7JHwg2STk8Y3JdspCKRDriwIyLRfEXnj2ZLr4Bw==", "integrity": "sha512-4bV/7kSKaPEmu6ArxXf9xjv1ny74Zkwuey8Pm01NH4zggPP7JHwg2STk8Y3JdspCKRDriwIyLRfEXnj2ZLr4Bw==",
        "dev": true,
        "requires": { "requires": {
        "intl-messageformat": "^2.0.0" "intl-messageformat": "^2.0.0"
        } }
        ...@@ -16795,8 +16800,7 @@ ...@@ -16795,8 +16800,7 @@
        "is-callable": { "is-callable": {
        "version": "1.2.2", "version": "1.2.2",
        "resolved": "https://g.civnet.cn:4873/is-callable/-/is-callable-1.2.2.tgz", "resolved": "https://g.civnet.cn:4873/is-callable/-/is-callable-1.2.2.tgz",
        "integrity": "sha512-dnMqspv5nU3LoewK2N/y7KLtxtakvTuaCsU9FU50/QDmdbHNy/4/JuRtMHqRU22o3q+W89YQndQEeCVwK+3qrA==", "integrity": "sha512-dnMqspv5nU3LoewK2N/y7KLtxtakvTuaCsU9FU50/QDmdbHNy/4/JuRtMHqRU22o3q+W89YQndQEeCVwK+3qrA=="
        "dev": true
        }, },
        "is-ci": { "is-ci": {
        "version": "2.0.0", "version": "2.0.0",
        ...@@ -16853,8 +16857,7 @@ ...@@ -16853,8 +16857,7 @@
        "is-date-object": { "is-date-object": {
        "version": "1.0.2", "version": "1.0.2",
        "resolved": "https://g.civnet.cn:4873/is-date-object/-/is-date-object-1.0.2.tgz", "resolved": "https://g.civnet.cn:4873/is-date-object/-/is-date-object-1.0.2.tgz",
        "integrity": "sha512-USlDT524woQ08aoZFzh3/Z6ch9Y/EWXEHQ/AaRN0SkKq4t2Jw2R2339tSXmwuVoY7LLlBCbOIlx2myP/L5zk0g==", "integrity": "sha512-USlDT524woQ08aoZFzh3/Z6ch9Y/EWXEHQ/AaRN0SkKq4t2Jw2R2339tSXmwuVoY7LLlBCbOIlx2myP/L5zk0g=="
        "dev": true
        }, },
        "is-decimal": { "is-decimal": {
        "version": "1.0.4", "version": "1.0.4",
        ...@@ -17088,7 +17091,6 @@ ...@@ -17088,7 +17091,6 @@
        "version": "1.1.1", "version": "1.1.1",
        "resolved": "https://g.civnet.cn:4873/is-regex/-/is-regex-1.1.1.tgz", "resolved": "https://g.civnet.cn:4873/is-regex/-/is-regex-1.1.1.tgz",
        "integrity": "sha512-1+QkEcxiLlB7VEyFtyBg94e08OAsvq7FUBgApTq/w2ymCLyKJgDPsybBENVtA7XCQEgEXxKPonG+mvYRxh/LIg==", "integrity": "sha512-1+QkEcxiLlB7VEyFtyBg94e08OAsvq7FUBgApTq/w2ymCLyKJgDPsybBENVtA7XCQEgEXxKPonG+mvYRxh/LIg==",
        "dev": true,
        "requires": { "requires": {
        "has-symbols": "^1.0.1" "has-symbols": "^1.0.1"
        } }
        ...@@ -17154,7 +17156,6 @@ ...@@ -17154,7 +17156,6 @@
        "version": "1.0.3", "version": "1.0.3",
        "resolved": "https://g.civnet.cn:4873/is-symbol/-/is-symbol-1.0.3.tgz", "resolved": "https://g.civnet.cn:4873/is-symbol/-/is-symbol-1.0.3.tgz",
        "integrity": "sha512-OwijhaRSgqvhm/0ZdAcXNZt9lYdKFpcRDT5ULUuYXPoT794UNOdU+gpT6Rzo7b4V2HUl/op6GqY894AZwv9faQ==", "integrity": "sha512-OwijhaRSgqvhm/0ZdAcXNZt9lYdKFpcRDT5ULUuYXPoT794UNOdU+gpT6Rzo7b4V2HUl/op6GqY894AZwv9faQ==",
        "dev": true,
        "requires": { "requires": {
        "has-symbols": "^1.0.1" "has-symbols": "^1.0.1"
        } }
        ...@@ -20808,8 +20809,7 @@ ...@@ -20808,8 +20809,7 @@
        "nanoid": { "nanoid": {
        "version": "3.1.20", "version": "3.1.20",
        "resolved": "https://g.civnet.cn:4873/nanoid/-/nanoid-3.1.20.tgz", "resolved": "https://g.civnet.cn:4873/nanoid/-/nanoid-3.1.20.tgz",
        "integrity": "sha1-utwmPGsdzxS3HvqoX2q0wdbPx4g=", "integrity": "sha1-utwmPGsdzxS3HvqoX2q0wdbPx4g="
        "dev": true
        }, },
        "nanomatch": { "nanomatch": {
        "version": "1.2.13", "version": "1.2.13",
        ...@@ -21919,14 +21919,12 @@ ...@@ -21919,14 +21919,12 @@
        "object-inspect": { "object-inspect": {
        "version": "1.9.0", "version": "1.9.0",
        "resolved": "https://g.civnet.cn:4873/object-inspect/-/object-inspect-1.9.0.tgz", "resolved": "https://g.civnet.cn:4873/object-inspect/-/object-inspect-1.9.0.tgz",
        "integrity": "sha1-yQUh104RJ7ZyZt7TOUrWEWmGUzo=", "integrity": "sha1-yQUh104RJ7ZyZt7TOUrWEWmGUzo="
        "dev": true
        }, },
        "object-keys": { "object-keys": {
        "version": "1.1.1", "version": "1.1.1",
        "resolved": "https://g.civnet.cn:4873/object-keys/-/object-keys-1.1.1.tgz", "resolved": "https://g.civnet.cn:4873/object-keys/-/object-keys-1.1.1.tgz",
        "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==", "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA=="
        "dev": true
        }, },
        "object-visit": { "object-visit": {
        "version": "1.0.1", "version": "1.0.1",
        ...@@ -21941,7 +21939,6 @@ ...@@ -21941,7 +21939,6 @@
        "version": "4.1.2", "version": "4.1.2",
        "resolved": "https://g.civnet.cn:4873/object.assign/-/object.assign-4.1.2.tgz", "resolved": "https://g.civnet.cn:4873/object.assign/-/object.assign-4.1.2.tgz",
        "integrity": "sha1-DtVKNC7Os3s4/3brgxoOeIy2OUA=", "integrity": "sha1-DtVKNC7Os3s4/3brgxoOeIy2OUA=",
        "dev": true,
        "requires": { "requires": {
        "call-bind": "^1.0.0", "call-bind": "^1.0.0",
        "define-properties": "^1.1.3", "define-properties": "^1.1.3",
        ...@@ -24482,6 +24479,36 @@ ...@@ -24482,6 +24479,36 @@
        "integrity": "sha1-mEcocL8igTL8vdhoEputEsPAKeM=", "integrity": "sha1-mEcocL8igTL8vdhoEputEsPAKeM=",
        "dev": true "dev": true
        }, },
        "promise.prototype.finally": {
        "version": "3.1.2",
        "resolved": "https://g.civnet.cn:4873/promise.prototype.finally/-/promise.prototype.finally-3.1.2.tgz",
        "integrity": "sha1-uK+JFgycZzzv47TEQ1tTz9AocGc=",
        "requires": {
        "define-properties": "^1.1.3",
        "es-abstract": "^1.17.0-next.0",
        "function-bind": "^1.1.1"
        },
        "dependencies": {
        "es-abstract": {
        "version": "1.17.7",
        "resolved": "https://g.civnet.cn:4873/es-abstract/-/es-abstract-1.17.7.tgz",
        "integrity": "sha512-VBl/gnfcJ7OercKA9MVaegWsBHFjV492syMudcnQZvt/Dw8ezpcOHYZXa/J96O8vx+g4x65YKhxOwDUh63aS5g==",
        "requires": {
        "es-to-primitive": "^1.2.1",
        "function-bind": "^1.1.1",
        "has": "^1.0.3",
        "has-symbols": "^1.0.1",
        "is-callable": "^1.2.2",
        "is-regex": "^1.1.1",
        "object-inspect": "^1.8.0",
        "object-keys": "^1.1.1",
        "object.assign": "^4.1.1",
        "string.prototype.trimend": "^1.0.1",
        "string.prototype.trimstart": "^1.0.1"
        }
        }
        }
        },
        "prompts": { "prompts": {
        "version": "2.4.0", "version": "2.4.0",
        "resolved": "https://g.civnet.cn:4873/prompts/-/prompts-2.4.0.tgz", "resolved": "https://g.civnet.cn:4873/prompts/-/prompts-2.4.0.tgz",
        ...@@ -24736,14 +24763,48 @@ ...@@ -24736,14 +24763,48 @@
        "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==" "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg=="
        }, },
        "raw-body": { "raw-body": {
        "version": "2.3.3", "version": "2.4.0",
        "resolved": "https://g.civnet.cn:4873/raw-body/-/raw-body-2.3.3.tgz", "resolved": "https://g.civnet.cn:4873/raw-body/-/raw-body-2.4.0.tgz",
        "integrity": "sha512-9esiElv1BrZoI3rCDuOuKCBRbuApGGaDPQfjSflGxdy4oyzqghxu6klEkkVIvBje+FF0BX9coEv8KqW6X/7njw==", "integrity": "sha512-4Oz8DUIwdvoa5qMJelxipzi/iJIi40O5cGV1wNYp5hvZP8ZN0T+jiNkL0QepXs+EsQ9XJ8ipEDoiH70ySUJP3Q==",
        "dev": true,
        "requires": { "requires": {
        "bytes": "3.0.0", "bytes": "3.1.0",
        "http-errors": "1.6.3", "http-errors": "1.7.2",
        "iconv-lite": "0.4.23", "iconv-lite": "0.4.24",
        "unpipe": "1.0.0" "unpipe": "1.0.0"
        },
        "dependencies": {
        "bytes": {
        "version": "3.1.0",
        "resolved": "https://g.civnet.cn:4873/bytes/-/bytes-3.1.0.tgz",
        "integrity": "sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg==",
        "dev": true
        },
        "http-errors": {
        "version": "1.7.2",
        "resolved": "https://g.civnet.cn:4873/http-errors/-/http-errors-1.7.2.tgz",
        "integrity": "sha512-uUQBt3H/cSIVfch6i1EuPNy/YsRSOUBXTVfZ+yR7Zjez3qjBz6i9+i4zjNaoqcoFVI4lQJ5plg63TvGfRSDCRg==",
        "dev": true,
        "requires": {
        "depd": "~1.1.2",
        "inherits": "2.0.3",
        "setprototypeof": "1.1.1",
        "statuses": ">= 1.5.0 < 2",
        "toidentifier": "1.0.0"
        }
        },
        "setprototypeof": {
        "version": "1.1.1",
        "resolved": "https://g.civnet.cn:4873/setprototypeof/-/setprototypeof-1.1.1.tgz",
        "integrity": "sha512-JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw==",
        "dev": true
        },
        "statuses": {
        "version": "1.5.0",
        "resolved": "https://g.civnet.cn:4873/statuses/-/statuses-1.5.0.tgz",
        "integrity": "sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow=",
        "dev": true
        }
        } }
        }, },
        "raw-loader": { "raw-loader": {
        ...@@ -25468,6 +25529,7 @@ ...@@ -25468,6 +25529,7 @@
        "version": "2.8.0", "version": "2.8.0",
        "resolved": "https://g.civnet.cn:4873/react-intl/-/react-intl-2.8.0.tgz", "resolved": "https://g.civnet.cn:4873/react-intl/-/react-intl-2.8.0.tgz",
        "integrity": "sha512-1cSasNkHxZOXYYhms9Q1tSEWF8AWZQNq3nPLB/j8mYV0ZTSt2DhGQXHfKrKQMu4cgj9J1Crqg7xFPICTBgzqtQ==", "integrity": "sha512-1cSasNkHxZOXYYhms9Q1tSEWF8AWZQNq3nPLB/j8mYV0ZTSt2DhGQXHfKrKQMu4cgj9J1Crqg7xFPICTBgzqtQ==",
        "dev": true,
        "requires": { "requires": {
        "hoist-non-react-statics": "^2.5.5", "hoist-non-react-statics": "^2.5.5",
        "intl-format-cache": "^2.0.5", "intl-format-cache": "^2.0.5",
        ...@@ -25479,7 +25541,8 @@ ...@@ -25479,7 +25541,8 @@
        "hoist-non-react-statics": { "hoist-non-react-statics": {
        "version": "2.5.5", "version": "2.5.5",
        "resolved": "https://g.civnet.cn:4873/hoist-non-react-statics/-/hoist-non-react-statics-2.5.5.tgz", "resolved": "https://g.civnet.cn:4873/hoist-non-react-statics/-/hoist-non-react-statics-2.5.5.tgz",
        "integrity": "sha512-rqcy4pJo55FTTLWt+bU8ukscqHeE/e9KWvsOW2b/a3afxQZhwkQdT1rPPCJ0rYXdj4vNcasY8zHTH+jF/qStxw==" "integrity": "sha512-rqcy4pJo55FTTLWt+bU8ukscqHeE/e9KWvsOW2b/a3afxQZhwkQdT1rPPCJ0rYXdj4vNcasY8zHTH+jF/qStxw==",
        "dev": true
        } }
        } }
        }, },
        ...@@ -26810,7 +26873,8 @@ ...@@ -26810,7 +26873,8 @@
        "safer-buffer": { "safer-buffer": {
        "version": "2.1.2", "version": "2.1.2",
        "resolved": "https://g.civnet.cn:4873/safer-buffer/-/safer-buffer-2.1.2.tgz", "resolved": "https://g.civnet.cn:4873/safer-buffer/-/safer-buffer-2.1.2.tgz",
        "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==" "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
        "dev": true
        }, },
        "sane": { "sane": {
        "version": "4.1.0", "version": "4.1.0",
        ...@@ -28044,7 +28108,6 @@ ...@@ -28044,7 +28108,6 @@
        "version": "1.0.3", "version": "1.0.3",
        "resolved": "https://g.civnet.cn:4873/string.prototype.trimend/-/string.prototype.trimend-1.0.3.tgz", "resolved": "https://g.civnet.cn:4873/string.prototype.trimend/-/string.prototype.trimend-1.0.3.tgz",
        "integrity": "sha1-oivVPMpcfPRNfJ1ccyEYhz1s0Ys=", "integrity": "sha1-oivVPMpcfPRNfJ1ccyEYhz1s0Ys=",
        "dev": true,
        "requires": { "requires": {
        "call-bind": "^1.0.0", "call-bind": "^1.0.0",
        "define-properties": "^1.1.3" "define-properties": "^1.1.3"
        ...@@ -28054,7 +28117,6 @@ ...@@ -28054,7 +28117,6 @@
        "version": "1.0.3", "version": "1.0.3",
        "resolved": "https://g.civnet.cn:4873/string.prototype.trimstart/-/string.prototype.trimstart-1.0.3.tgz", "resolved": "https://g.civnet.cn:4873/string.prototype.trimstart/-/string.prototype.trimstart-1.0.3.tgz",
        "integrity": "sha1-m0y1kOEjuzZWRAHVmCQpjeUP1ao=", "integrity": "sha1-m0y1kOEjuzZWRAHVmCQpjeUP1ao=",
        "dev": true,
        "requires": { "requires": {
        "call-bind": "^1.0.0", "call-bind": "^1.0.0",
        "define-properties": "^1.1.3" "define-properties": "^1.1.3"
        ...@@ -32016,6 +32078,12 @@ ...@@ -32016,6 +32078,12 @@
        "object-assign": "^4.1.1" "object-assign": "^4.1.1"
        } }
        }, },
        "use-url-search-params": {
        "version": "2.3.13",
        "resolved": "https://g.civnet.cn:4873/use-url-search-params/-/use-url-search-params-2.3.13.tgz",
        "integrity": "sha1-AWAJyIefx/YxpYzepXLF3tghvzU=",
        "dev": true
        },
        "user-home": { "user-home": {
        "version": "2.0.0", "version": "2.0.0",
        "resolved": "https://g.civnet.cn:4873/user-home/-/user-home-2.0.0.tgz", "resolved": "https://g.civnet.cn:4873/user-home/-/user-home-2.0.0.tgz",
        package.json
        View file @ ea4f5471
        ...@@ -79,14 +79,18 @@ ...@@ -79,14 +79,18 @@
        ] ]
        }, },
        "pre-commit": "lint:staged", "pre-commit": "lint:staged",
        "mock": true,
        "resolutions": { "resolutions": {
        "babel-core": "7.0.0-bridge.0" "babel-core": "7.0.0-bridge.0"
        }, },
        "dependencies": { "dependencies": {
        "@babel/polyfill": "7.4.3", "@babel/polyfill": "7.4.3",
        "@babel/runtime": "^7.10.5", "@babel/runtime": "^7.10.5",
        "promise.prototype.finally": "^3.1.2",
        "@wisdom-utils/components": "0.0.6", "@wisdom-utils/components": "0.0.6",
        "@wisdom-utils/utils": "0.0.26", "@wisdom-utils/utils": "0.0.27",
        "@wisdom-utils/vapp-browser-vm": "^0.0.11",
        "@wisdom-utils/vapp-browser-vm-plugins": "^0.0.13",
        "animate.css": "^4.1.1", "animate.css": "^4.1.1",
        "chalk": "2.4.2", "chalk": "2.4.2",
        "compression": "1.7.4", "compression": "1.7.4",
        ...@@ -117,7 +121,6 @@ ...@@ -117,7 +121,6 @@
        "react-dom": "16.12.0", "react-dom": "16.12.0",
        "react-draggable": "^4.4.3", "react-draggable": "^4.4.3",
        "react-helmet": "6.0.0-beta", "react-helmet": "6.0.0-beta",
        "react-intl": "2.8.0",
        "react-redux": "7.0.2", "react-redux": "7.0.2",
        "react-router-dom": "5.1.0", "react-router-dom": "5.1.0",
        "react-use": "^15.3.4", "react-use": "^15.3.4",
        ...@@ -131,7 +134,7 @@ ...@@ -131,7 +134,7 @@
        }, },
        "devDependencies": { "devDependencies": {
        "@ant-design/icons": "^4.0.0", "@ant-design/icons": "^4.0.0",
        "@ant-design/pro-layout": "^6.10.7", "@ant-design/pro-layout": "^6.11.1",
        "@ant-design/pro-skeleton": "^1.0.0-beta.2", "@ant-design/pro-skeleton": "^1.0.0-beta.2",
        "@ant-design/pro-table": "^2.5.3", "@ant-design/pro-table": "^2.5.3",
        "@ant-design/pro-utils": "^1.10.4", "@ant-design/pro-utils": "^1.10.4",
        ...@@ -149,6 +152,8 @@ ...@@ -149,6 +152,8 @@
        "@commitlint/config-conventional": "^9.1.2", "@commitlint/config-conventional": "^9.1.2",
        "@umijs/fabric": "^2.2.0", "@umijs/fabric": "^2.2.0",
        "@umijs/hooks": "^1.9.3", "@umijs/hooks": "^1.9.3",
        "body-parser": "^1.19.0",
        "multer": "^1.4.2",
        "add-asset-html-webpack-plugin": "3.1.3", "add-asset-html-webpack-plugin": "3.1.3",
        "antd": "^4.10.1", "antd": "^4.10.1",
        "babel-core": "7.0.0-bridge.0", "babel-core": "7.0.0-bridge.0",
        ...@@ -227,6 +232,7 @@ ...@@ -227,6 +232,7 @@
        "react-app-polyfill": "0.2.2", "react-app-polyfill": "0.2.2",
        "react-dom": "^16.8.6", "react-dom": "^16.8.6",
        "react-helmet-async": "^1.0.4", "react-helmet-async": "^1.0.4",
        "react-intl": "^2.8.0",
        "react-router-config": "^5.1.1", "react-router-config": "^5.1.1",
        "react-sticky": "^6.0.3", "react-sticky": "^6.0.3",
        "react-test-renderer": "16.8.6", "react-test-renderer": "16.8.6",
        ......
        server/index.js
        View file @ ea4f5471
        /* eslint consistent-return:0 import/order:0 */ /* eslint consistent-return:0 import/order:0 */
        const express = require('express'); const express = require('express');
        const logger = require('./logger'); const logger = require('./logger');
        ...@@ -8,12 +7,17 @@ const port = require('./port'); ...@@ -8,12 +7,17 @@ const port = require('./port');
        const setup = require('./middlewares/frontendMiddleware'); const setup = require('./middlewares/frontendMiddleware');
        const isDev = process.env.NODE_ENV !== 'production'; const isDev = process.env.NODE_ENV !== 'production';
        const pkg = require('../package.json'); const pkg = require('../package.json');
        const proxyConfig = require('../config/proxy');
        const mockMiddewares = require('./mock');
        const ngrok = const ngrok =
        (isDev && process.env.ENABLE_TUNNEL) || argv.tunnel (isDev && process.env.ENABLE_TUNNEL) || argv.tunnel
        ? require('ngrok') ? require('ngrok')
        : false; : false;
        const { resolve } = require('path'); const { resolve } = require('path');
        const app = express(); const app = express();
        if (proxyConfig.mock) {
        app.use('/api/*', mockMiddewares);
        }
        setup(app, { setup(app, {
        outputPath: resolve(process.cwd(), pkg.name.toLocaleLowerCase()), outputPath: resolve(process.cwd(), pkg.name.toLocaleLowerCase()),
        ...@@ -30,6 +34,8 @@ app.get('*.js', (req, res, next) => { ...@@ -30,6 +34,8 @@ app.get('*.js', (req, res, next) => {
        next(); next();
        }); });
        // Start your app. // Start your app.
        app.listen(port, host, async err => { app.listen(port, host, async err => {
        if (err) { if (err) {
        ......
        server/middlewares/dist/addProdMiddlewares.dev.js deleted 100644 → 0
        View file @ 40be2635
        "use strict";
        var path = require('path');
        var express = require('express');
        var compression = require('compression');
        var pkg = require('../../package.json');
        module.exports = function addProdMiddlewares(app, options) {
        var publicPath = options.publicPath || pkg.name.toLocaleLowerCase() || '/';
        var outputPath = options.outputPath || path.resolve(process.cwd(), pkg.name.toLocaleLowerCase()); // compression middleware compresses your server responses which makes them
        // smaller (applies also to assets). You can read more about that technique
        // and other good practices on official Express.js docs http://mxs.is/googmy
        app.use(compression());
        app.use(publicPath, express["static"](outputPath));
        app.get('*', function (req, res) {
        return res.sendFile(path.resolve(outputPath, 'index.html'));
        });
        };
        \ No newline at end of file
        server/middlewares/dist/frontendMiddleware.dev.js deleted 100644 → 0
        View file @ 40be2635
        "use strict";
        /* eslint-disable global-require */
        /**
        * Front-end middleware
        */
        var proxyConfig = require('../../config/proxy');
        var fs = require('fs');
        var path = require('path');
        var apiMocker = require('connect-api-mocker');
        module.exports = function (app, options) {
        var isProd = process.env.NODE_ENV === 'production';
        var _require = require('http-proxy-middleware'),
        createProxyMiddleware = _require.createProxyMiddleware;
        if (isProd) {
        var addProdMiddlewares = require('./addProdMiddlewares');
        addProdMiddlewares(app, options);
        } else {
        var webpackConfig = require('../../internals/webpack/webpack.dev.babel');
        var addDevMiddlewares = require('./addDevMiddlewares');
        Object.keys(proxyConfig.dev).forEach(function (item) {
        app.use(createProxyMiddleware(item, proxyConfig.dev[item]));
        });
        addDevMiddlewares(app, webpackConfig);
        }
        return app;
        };
        \ No newline at end of file
        server/mock/createMiddleware.js 0 → 100644
        View file @ ea4f5471
        const { chokidar, signale, createDebug } = require('@umijs/utils');
        const utils = require('./util');
        const debug = createDebug('preset-build-in:mock:createMiddleware');
        function createMiddleware(opts) {
        const { mockData, mockWatcherPaths, updateMockData } = opts;
        let data = mockData;
        const errors = [];
        debug('mockWatcherPaths', mockWatcherPaths);
        const watcher = chokidar.watch(mockWatcherPaths, {
        ignoreInitial: true,
        });
        watcher
        .on('ready', () => debug('Initial scan complete. Ready for changes'))
        .on('all', async (event, file) => {
        debug(`[${event}] ${file}, reload mock data`);
        errors.splice(0, errors.length);
        utils.cleanRequireCache(mockWatcherPaths);
        // refresh data
        // eslint-disable-next-line no-const-assign
        data = await updateMockData().mockData;
        if (!errors.length) {
        signale.success(`Mock files parse success`);
        }
        });
        process.once('SIGINT', async () => {
        await watcher.close();
        });
        return {
        middleware: (req, res, next) => {
        const match = data && utils.matchMock(req, data);
        if (match) {
        return match.handler(req, res, next);
        }
        return next();
        },
        };
        }
        module.exports = createMiddleware
        server/mock/index.js 0 → 100644
        View file @ ea4f5471
        const utils = require('./util');
        const createMiddleware = require('./createMiddleware');
        function mockMiddewares(req, res, next) {
        const mockResult = utils.getMockData('./');
        const { middleware } = createMiddleware({
        ...mockResult,
        updateMockData: async () => {
        const result = utils.getMockData('./');
        return result;
        },
        });
        return middleware(req, res, next);
        }
        module.exports = mockMiddewares;
        server/mock/util.js 0 → 100644
        View file @ ea4f5471
        const {
        winPath,
        createDebug,
        glob,
        parseRequireDeps,
        } = require('@umijs/utils');
        const pathHeler = require('path');
        const fs = require('fs');
        const assert = require('assert');
        const bodyParser = require('body-parser');
        const pathToRegexp = require('path-to-regexp');
        const multer = require('multer');
        const VALID_METHODS = ['get', 'post', 'put', 'patch', 'delete'];
        const BODY_PARSED_METHODS = ['post', 'put', 'patch', 'delete'];
        const debug = createDebug('preset-build-in:mock:utils');
        const registerBabel = paths => {
        // support
        // clear require cache and set babel register
        const requireDeps = paths.reduce((memo, file) => {
        memo = memo.concat(parseRequireDeps(file));
        return memo;
        }, []);
        requireDeps.forEach(f => {
        if (require.cache[f]) {
        delete require.cache[f];
        }
        });
        };
        const getMockData = cwd => {
        const mockPaths = [
        // eslint-disable-next-line no-undef
        ...glob.sync('mock/*.[jt]s'),
        ]
        .map(p => pathHeler.resolve(cwd, p))
        .filter(p => p && fs.existsSync(p))
        .map(p => winPath(p));
        debug(`load mock data including files ${JSON.stringify(mockPaths)}`);
        // eslint-disable-next-line no-undef
        registerBabel(mockPaths);
        //
        // // eslint-disable-next-line no-use-before-define,no-undef
        const mockData = normalizeConfig(getMockConfig(mockPaths));
        //
        const mockWatcherPaths = [...(mockPaths || [])]
        .filter(p => p && fs.existsSync(p))
        .map(p => winPath(p));
        return {
        mockData,
        mockPaths,
        mockWatcherPaths,
        };
        };
        function parseKey(key) {
        let method = 'get';
        // eslint-disable-next-line no-shadow
        let path = key;
        if (/\s+/.test(key)) {
        const splited = key.split(/\s+/);
        method = splited[0].toLowerCase();
        // eslint-disable-next-line prefer-destructuring
        path = splited[1];
        }
        assert(
        VALID_METHODS.includes(method),
        `Invalid method ${method} for path ${path}, please check your mock files.`,
        );
        return {
        method,
        path,
        };
        }
        function getMockConfig(files) {
        return files.reduce((memo, mockFile) => {
        try {
        const m = require(mockFile); // eslint-disable-line
        memo = {
        ...memo,
        ...(m.default || m),
        };
        return memo;
        } catch (e) {
        throw new Error(e.stack);
        }
        }, {});
        }
        function normalizeConfig(config) {
        return Object.keys(config).reduce((memo, key) => {
        const handler = config[key];
        const type = typeof handler;
        assert(
        type === 'function' || type === 'object',
        `mock value of ${key} should be function or object, but got ${type}`,
        );
        // eslint-disable-next-line no-shadow
        const { method, path } = parseKey(key);
        const keys = [];
        const re = pathToRegexp(path, keys);
        memo.push({
        method,
        path,
        re,
        handler: createHandler(method, path, handler),
        });
        return memo;
        }, []);
        }
        // eslint-disable-next-line no-shadow
        function createHandler(method, path, handler) {
        return function(req, res, next) {
        if (BODY_PARSED_METHODS.includes(method)) {
        bodyParser.json({ limit: '5mb', strict: false })(req, res, () => {
        bodyParser.urlencoded({ limit: '5mb', extended: true })(
        req,
        res,
        () => {
        sendData();
        },
        );
        });
        } else {
        sendData();
        }
        function sendData() {
        if (typeof handler === 'function') {
        multer().any()(req, res, () => {
        handler(req, res, next);
        });
        } else {
        res.json(handler);
        }
        }
        };
        }
        function decodeParam(val) {
        if (typeof val !== 'string' || val.length === 0) {
        return val;
        }
        try {
        return decodeURIComponent(val);
        } catch (err) {
        if (err instanceof URIError) {
        err.message = `Failed to decode param ' ${val} '`;
        // @ts-ignore
        err.status = 400;
        // @ts-ignore
        err.statusCode = 400;
        }
        throw err;
        }
        }
        function cleanRequireCache(paths) {
        Object.keys(require.cache).forEach(file => {
        if (paths.some(p => winPath(file).indexOf(p) > -1)) {
        delete require.cache[file];
        }
        });
        }
        function matchMock(req, mockData) {
        const { method } = req;
        const targetMethod = method.toLowerCase();
        // eslint-disable-next-line no-underscore-dangle
        const resolvepath = req._parsedUrl.path;
        for (const mock of mockData) {
        // eslint-disable-next-line no-shadow
        const { method, re, keys } = mock;
        if (method === targetMethod) {
        // eslint-disable-next-line no-underscore-dangle
        const match = re.exec(resolvepath);
        if (match) {
        const params = {};
        for (let i = 1; i < match.length; i += 1) {
        const key = keys[i - 1];
        const prop = key.name;
        const val = decodeParam(match[i]);
        // @ts-ignore
        // eslint-disable-next-line no-undef
        if (val !== undefined || !hasOwnProdperty.call(params, prop)) {
        params[prop] = val;
        }
        }
        req.params = params;
        return mock;
        }
        }
        }
        }
        function getFlatRoutes(routes) {
        return routes.reduce((memo, route) => {
        // eslint-disable-next-line no-shadow
        const { routes, path } = route;
        if (path && !path.includes('?')) {
        memo.push(route);
        }
        if (routes) {
        memo = memo.concat(
        getFlatRoutes({
        routes,
        }),
        );
        }
        return memo;
        }, []);
        }
        function getConflictPaths({ mockData, routes }) {
        const conflictPaths = [];
        getFlatRoutes({ routes }).forEach(route => {
        const { path, redirect } = route;
        if (path && !path.startsWith(':') && !redirect) {
        const req = {
        path: !path.startsWith('/') ? `/${path}` : path,
        method: 'get',
        };
        const matched = matchMock(req, mockData);
        if (matched) {
        conflictPaths.push({ path: matched.path });
        }
        }
        });
        return conflictPaths;
        }
        module.exports = {
        getMockData,
        matchMock,
        cleanRequireCache,
        };
        src/api/index.js
        View file @ ea4f5471
        import baseService from './service/base'; import { message } from 'antd';
        import { service, request } from '@wisdom-utils/utils';
        import { getRootContext } from '@wisdom-utils/vapp-browser-vm/lib/vm';
        import AppService from './service/base';
        import notificationService from './service/notification'; import notificationService from './service/notification';
        // eslint-disable-next-line no-return-await
        request.reportCodeError = true;
        export { baseService, notificationService }; request.setResponseHandler(response => {
        if (response.code === 401) {
        return window.location.reload();
        }
        return response;
        });
        request.setErrorHandler((resData, { config }) => {
        if (!config.noErrorTip) {
        message.error(resData.message);
        }
        });
        const appService = service(AppService);
        const noticeService = service(notificationService);
        export { appService, noticeService };
        src/api/service/base.js
        View file @ ea4f5471
        import { service, jsonp, request } from '@wisdom-utils/utils'; import { jsonp } from '@wisdom-utils/utils';
        import constants from '../constants'; import constants from '../constants';
        export const API = { export const API = {
        AUTHORIZATION_TOKEN: '/Publish/Identity/AuthorizationToken', AUTHORIZATION_TOKEN: '/Publish/Identity/AuthorizationToken',
        ...@@ -27,9 +27,12 @@ export const API = { ...@@ -27,9 +27,12 @@ export const API = {
        FILE_DOWNLOAD: '/cityinterface/rest/services/filedownload.svc/download', FILE_DOWNLOAD: '/cityinterface/rest/services/filedownload.svc/download',
        GET_VERSION: '/CityInterface/rest/services/OMs.svc/U_GetVersion', GET_VERSION: '/CityInterface/rest/services/OMs.svc/U_GetVersion',
        UPDATE_AVATAR: '/CityInterface/rest/services/OMs.svc/U_EditUser', UPDATE_AVATAR: '/CityInterface/rest/services/OMs.svc/U_EditUser',
        UPLOAD_FILE_URL:
        '/cityinterface/rest/services/filedownload.svc/uploadfile/个人信息/{path}/{filename}',
        AVATAR_FILE_URL: '/cityinterface/rest/services/filedownload.svc/download',
        }; };
        const services = service({ const services = {
        authorizationToken: { authorizationToken: {
        url: API.AUTHORIZATION_TOKEN, url: API.AUTHORIZATION_TOKEN,
        method: constants.REQUEST_METHOD_GET, method: constants.REQUEST_METHOD_GET,
        ...@@ -132,7 +135,7 @@ const services = service({ ...@@ -132,7 +135,7 @@ const services = service({
        method: constants.REQUEST_METHOD_GET, method: constants.REQUEST_METHOD_GET,
        type: constants.REQUEST_HTTP, type: constants.REQUEST_HTTP,
        }, },
        }); };
        export const searchAutoCity = keywords => { export const searchAutoCity = keywords => {
        const url = 'https://restapi.amap.com/v3/assistant/inputtips'; const url = 'https://restapi.amap.com/v3/assistant/inputtips';
        ......
        src/api/service/notification.js
        View file @ ea4f5471
        import { service } from '@wisdom-utils/utils';
        import constants from '../constants'; import constants from '../constants';
        const API = { const API = {
        GET_INFORMATION: GET_INFORMATION:
        '/CityInterface/rest/services/CountyProduct.svc/SCADAOper/GetInformationInfo', '/CityInterface/rest/services/CountyProduct.svc/SCADAOper/GetInformationInfo',
        ...@@ -12,7 +10,7 @@ const API = { ...@@ -12,7 +10,7 @@ const API = {
        '/CityInterface/rest/services/WisdomUnion.svc/CustomerManage/AddOption', '/CityInterface/rest/services/WisdomUnion.svc/CustomerManage/AddOption',
        }; };
        const notificationService = service({ const notificationService = {
        getInformationInfo: { getInformationInfo: {
        url: API.GET_INFORMATION, url: API.GET_INFORMATION,
        method: constants.REQUEST_METHOD_GET, method: constants.REQUEST_METHOD_GET,
        ...@@ -33,6 +31,6 @@ const notificationService = service({ ...@@ -33,6 +31,6 @@ const notificationService = service({
        method: constants.REQUEST_METHOD_POST, method: constants.REQUEST_METHOD_POST,
        type: constants.REQUEST_HTTP, type: constants.REQUEST_HTTP,
        }, },
        }); };
        export default notificationService; export default notificationService;
        src/app.js
        View file @ ea4f5471
        ...@@ -6,6 +6,7 @@ import 'antd/dist/antd.less'; ...@@ -6,6 +6,7 @@ import 'antd/dist/antd.less';
        import 'file-loader?name=.htaccess!./.htaccess'; // eslint-disable-line import/extensions import 'file-loader?name=.htaccess!./.htaccess'; // eslint-disable-line import/extensions
        import 'kit_utils/lib/format'; import 'kit_utils/lib/format';
        import 'sanitize.css/sanitize.css'; import 'sanitize.css/sanitize.css';
        import './locales/zh-CN';
        import React from 'react'; import React from 'react';
        import ReactDOM from 'react-dom'; import ReactDOM from 'react-dom';
        import { ErrorBoundary } from '@ant-design/pro-utils'; import { ErrorBoundary } from '@ant-design/pro-utils';
        ...@@ -18,11 +19,14 @@ import defaultSettings from '../config/defaultSetting'; ...@@ -18,11 +19,14 @@ import defaultSettings from '../config/defaultSetting';
        import Container from './components/Container'; import Container from './components/Container';
        import configureStore from './configureStore'; import configureStore from './configureStore';
        import App from './containers/App'; import App from './containers/App';
        import './loader';
        import './vm';
        import { actionCreators } from './containers/App/store'; import { actionCreators } from './containers/App/store';
        import { initMicroApps } from './micro'; import { initMicroApps } from './micro';
        import history from './utils/history'; import history from './utils/history';
        import { isString } from './utils/utils'; import { isString } from './utils/utils';
        import services from './api/service/base'; import i18n from './utils/share';
        import { appService } from './api';
        const isHttps = document.location.protocol === 'https:'; const isHttps = document.location.protocol === 'https:';
        const { pwa } = defaultSettings; const { pwa } = defaultSettings;
        // eslint-disable-next-line no-restricted-globals // eslint-disable-next-line no-restricted-globals
        ...@@ -32,6 +36,7 @@ window.createStoreage = new Storeage(namespace); ...@@ -32,6 +36,7 @@ window.createStoreage = new Storeage(namespace);
        const initialState = Immutable.Map(); const initialState = Immutable.Map();
        const store = configureStore(initialState, history); const store = configureStore(initialState, history);
        const MOUNT_NODE = document.getElementById('app'); const MOUNT_NODE = document.getElementById('app');
        window.i18n = i18n;
        const render = () => { const render = () => {
        // eslint-disable-next-line react-hooks/rules-of-hooks // eslint-disable-next-line react-hooks/rules-of-hooks
        ...@@ -78,48 +83,36 @@ const initGlobalConfig = () => { ...@@ -78,48 +83,36 @@ const initGlobalConfig = () => {
        store.dispatch(actionCreators.getConfig(config)); store.dispatch(actionCreators.getConfig(config));
        render({ appContent: '', loading: true }); render({ appContent: '', loading: true });
        } else { } else {
        services appService.getWateWayConfig().then(res => {
        const hasGateWay =
        res && res.data && isString(res.data) ? JSON.parse(res.data) : res.data;
        if (res.code === 0) {
        store.dispatch(
        actionCreators.getConfig(
        Object.assign({}, window.globalConfig, {
        hasGateWay,
        apiGatewayDomain: `${window.location.origin}/Publish/GateWay`,
        }),
        ),
        );
        }
        });
        appService
        .queryConfig({ client: params.getParams('client') || 'city' }) .queryConfig({ client: params.getParams('client') || 'city' })
        .then(res => { .then(res => {
        if (res) { if (res) {
        const data = res; const data = res;
        store.dispatch(actionCreators.getConfig(Object.assign({}, data))); if (!data.client) {
        // eslint-disable-next-line no-shadow delete data.client;
        try {
        services
        .getWateWayConfig()
        // eslint-disable-next-line no-shadow
        .then(res => {
        const hasGateWay =
        res && res.data && isString(res.data)
        ? JSON.parse(res.data)
        : res.data;
        // eslint-disable-next-line no-debugger
        if (res.code === 0) {
        store.dispatch(
        actionCreators.getConfig(
        Object.assign({}, data, {
        hasGateWay,
        apiGatewayDomain: `${
        window.location.origin
        }/Publish/GateWay`,
        }),
        ),
        );
        }
        })
        .catch(error => {
        store.dispatch(actionCreators.getConfigError(error));
        store.dispatch(
        actionCreators.getConfig(Object.assign({}, data)),
        );
        });
        } catch (e) {
        console.log(e);
        // eslint-disable-next-line no-empty
        } finally {
        } }
        store.dispatch(
        actionCreators.getConfig(
        Object.assign({}, window.globalConfig, data),
        ),
        );
        // eslint-disable-next-line no-shadow
        } }
        return res;
        }) })
        // eslint-disable-next-line no-shadow // eslint-disable-next-line no-shadow
        .then(res => { .then(res => {
        ...@@ -129,23 +122,25 @@ const initGlobalConfig = () => { ...@@ -129,23 +122,25 @@ const initGlobalConfig = () => {
        store.dispatch(actionCreators.getConfigError(error)); store.dispatch(actionCreators.getConfigError(error));
        }); });
        } }
        if (config.token) { if (config.token) {
        initMicroApps(loader); initMicroApps(loader);
        } }
        }; };
        initGlobalConfig();
        initLocale();
        window.share && window.share &&
        window.share.event && window.share.event &&
        window.share.event.on('triggerMicro', () => { window.share.event.on('triggerMicro', () => {
        initMicroApps(loader); initMicroApps(loader);
        }); });
        initGlobalConfig(); // initGlobalConfig();
        initLocale();
        if (pwa) { if (pwa) {
        const appPWA = window.i18n.getI18n('app');
        window.addEventListener('sw.offline', () => { window.addEventListener('sw.offline', () => {
        message.warning('当前处于离线状态'); message.warning(appPWA.get('pwa.offline'));
        }); });
        window.addEventListener('sw.updated', event => { window.addEventListener('sw.updated', event => {
        ...@@ -178,12 +173,12 @@ if (pwa) { ...@@ -178,12 +173,12 @@ if (pwa) {
        reloadSW(); reloadSW();
        }} }}
        > >
        刷新 {appPWA.get('pwa.serviceworker.updated.ok')}
        </Button> </Button>
        ); );
        notification.open({ notification.open({
        message: '有新内容', message: appPWA.get('pwa.serviceworker.updated'),
        description: '请点击“刷新”按钮或者手动刷新页面', description: appPWA.get('pwa.serviceworker.updated.hint'),
        btn, btn,
        key, key,
        onClose: async () => null, onClose: async () => null,
        ......
        src/components/Authorized/CheckPermissions.js
        View file @ ea4f5471
        ...@@ -7,18 +7,19 @@ const checkPermissions = ( ...@@ -7,18 +7,19 @@ const checkPermissions = (
        target, target,
        Exception, Exception,
        ) => { ) => {
        const client = (window.globalConfig && window.globalConfig.client) || 'city';
        const filterPath = [ const filterPath = [
        { name: '/', path: '/' }, { name: '/', path: '/' },
        { name: '/', path: `/?client=${window.globalConfig.client || 'city'}` }, { name: '/', path: `/?client=${client}` },
        { {
        name: 'civbase', name: 'civbase',
        path: `/civbase/?client=${window.globalConfig.client || 'city'}`, path: `/civbase/?client=${client}`,
        }, },
        { name: 'industry', path: '/industry' }, { name: 'industry', path: '/industry' },
        { name: 'civweb4', path: `/civweb4/` }, { name: 'civweb4', path: `/civweb4/` },
        { {
        name: 'civweb4', name: 'civweb4',
        path: `/civweb4/?client=${window.globalConfig.client || 'city'}`, path: `/civweb4/?client=${client}`,
        }, },
        { name: '404', path: '/404' }, { name: '404', path: '/404' },
        { name: '403', path: '/403' }, { name: '403', path: '/403' },
        ......
        src/components/GlobalHeader/AvatarDropdown.js
        View file @ ea4f5471
        ...@@ -13,15 +13,18 @@ import { ...@@ -13,15 +13,18 @@ import {
        import Cookies from 'js-cookie'; import Cookies from 'js-cookie';
        import { withRouter } from 'react-router-dom'; import { withRouter } from 'react-router-dom';
        import styles from './index.less'; import styles from './index.less';
        import services, { changePassword } from '../../api/service/base'; // eslint-disable-next-line import/named
        import { API } from '../../api/service/base';
        import { appService } from '../../api';
        import i18n from '../../utils/share';
        const app = i18n.getI18n('component');
        const formItemLayout = { const formItemLayout = {
        labelCol: { labelCol: {
        xs: { span: 4 }, xs: { span: 4 },
        sm: { span: 4 }, sm: { span: 4 },
        }, },
        }; };
        const UPLOAD_FILE_URL =
        '/cityinterface/rest/services/filedownload.svc/uploadfile/个人信息/{path}/{filename}';
        /* eslint-disable */ /* eslint-disable */
        const getIOT = () => const getIOT = () =>
        window.globalConfig.loginTemplate === 'Dark - IOTMultiLogin.html'; window.globalConfig.loginTemplate === 'Dark - IOTMultiLogin.html';
        ...@@ -46,7 +49,7 @@ class AvatarDropdown extends React.Component { ...@@ -46,7 +49,7 @@ class AvatarDropdown extends React.Component {
        popVisible: false, popVisible: false,
        path: null, path: null,
        version: null, version: null,
        action: UPLOAD_FILE_URL action: API.UPLOAD_FILE_URL
        } }
        } }
        loginout = event => { loginout = event => {
        ...@@ -114,21 +117,21 @@ class AvatarDropdown extends React.Component { ...@@ -114,21 +117,21 @@ class AvatarDropdown extends React.Component {
        newpassword: res.newPwd, newpassword: res.newPwd,
        token: window.globalConfig.token, token: window.globalConfig.token,
        }; };
        changePassword(params) appService.changePassword(params)
        .then(res => { .then(res => {
        if (res.success) { if (res.success) {
        message.success('修改密码成功'); message.success(app.get('account.password.update.success'));
        setTimeout(() => { setTimeout(() => {
        this.setState({ this.setState({
        visible: false, visible: false,
        }); });
        }, 300); }, 300);
        } else { } else {
        message.error('原密码输入错误'); message.error(app.get('account.oldpassword.errorMessage'));
        } }
        }) })
        .catch(error => { .catch(error => {
        message.error('修改密码失败'); message.error(app.get('account.password.update.fail'));
        }); });
        }) })
        .catch(error => { .catch(error => {
        ...@@ -190,7 +193,7 @@ class AvatarDropdown extends React.Component { ...@@ -190,7 +193,7 @@ class AvatarDropdown extends React.Component {
        } }
        componentDidMount() { componentDidMount() {
        services.getVersion({ appService.getVersion({
        ignoreSite: true ignoreSite: true
        }).then(res => { }).then(res => {
        if(res.success) { if(res.success) {
        ...@@ -199,7 +202,7 @@ class AvatarDropdown extends React.Component { ...@@ -199,7 +202,7 @@ class AvatarDropdown extends React.Component {
        }) })
        } }
        }).catch(error => { }).catch(error => {
        message.error("获取版本号错误，请联系相关开发人员") message.error(app.get('getVersion.errorMessage'))
        }) })
        } }
        ...@@ -263,7 +266,6 @@ class AvatarDropdown extends React.Component { ...@@ -263,7 +266,6 @@ class AvatarDropdown extends React.Component {
        console.log('onStart', file, file.name); console.log('onStart', file, file.name);
        }, },
        onSuccess(res, file) { onSuccess(res, file) {
        debugger
        if(res.success) { if(res.success) {
        const avatarPath = "/个人信息/" + self.state.path + '/' + file.name; const avatarPath = "/个人信息/" + self.state.path + '/' + file.name;
        const params = { const params = {
        ...@@ -278,19 +280,19 @@ class AvatarDropdown extends React.Component { ...@@ -278,19 +280,19 @@ class AvatarDropdown extends React.Component {
        WXid: props.global.get("userInfo.WXid") WXid: props.global.get("userInfo.WXid")
        } }
        services.updateAvatar(params).then(res => { appService.updateAvatar(params).then(res => {
        if(res.success) { if(res.success) {
        message.success("头像修改成功"); message.success(app.get('avatar.update.success'));
        self.setState({ self.setState({
        currentUser: { currentUser: {
        name: self.state.currentUser.name, name: self.state.currentUser.name,
        avatar: `/cityinterface/rest/services/filedownload.svc/download${avatarPath}`, avatar: `${API.AVATAR_FILE_URL}${avatarPath}`,
        action: UPLOAD_FILE_URL action: API.UPLOAD_FILE_URL
        } }
        }) })
        } }
        }).catch(e => { }).catch(e => {
        message.error("头像修改失败") message.error(app.get('avatar.update.fail'))
        }) })
        } else { } else {
        message.error(res.message); message.error(res.message);
        ...@@ -323,30 +325,30 @@ class AvatarDropdown extends React.Component { ...@@ -323,30 +325,30 @@ class AvatarDropdown extends React.Component {
        <ul> <ul>
        <li> <li>
        <span /> <span />
        <span className={styles.label}>账号：</span> <span className={styles.label}>{app.get('avatar.account')}：</span>
        <span className={styles.value}>{userInfo.loginName}</span> <span className={styles.value}>{userInfo.loginName}</span>
        </li> </li>
        <li> <li>
        <span /> <span />
        <span className={styles.label}>姓名：</span> <span className={styles.label}>{app.get('avatar.name')}：</span>
        <span className={styles.value}>{userInfo.fullName}</span> <span className={styles.value}>{userInfo.fullName}</span>
        </li> </li>
        <li> <li>
        <span /> <span />
        <span className={styles.label}>部门：</span> <span className={styles.label}>{app.get('avatar.depart')}：</span>
        <span className={styles.value}> <span className={styles.value}>
        {userInfo && userInfo.depart && userInfo.depart.name} {userInfo && userInfo.depart && userInfo.depart.name}
        </span> </span>
        </li> </li>
        <li> <li>
        <span /> <span />
        <span className={styles.label}>角色：</span> <span className={styles.label}>{app.get('avatar.role')}：</span>
        <span className={styles.value}>{this.getRoles()}</span> <span className={styles.value}>{this.getRoles()}</span>
        </li> </li>
        {site ? ( {site ? (
        <li> <li>
        <span /> <span />
        <span className={styles.label}>企业编号：</span> <span className={styles.label}>{app.get('siteCode')}：</span>
        <span className={styles.value}>{userInfo.site}</span> <span className={styles.value}>{userInfo.site}</span>
        </li> </li>
        ) : null} ) : null}
        ...@@ -354,10 +356,10 @@ class AvatarDropdown extends React.Component { ...@@ -354,10 +356,10 @@ class AvatarDropdown extends React.Component {
        </div> </div>
        <div className={styles.exit}> <div className={styles.exit}>
        {userInfo && userInfo.site === '' && ( {userInfo && userInfo.site === '' && (
        <a onClick={event => this.showModal(event)}>修改密码</a> <a onClick={event => this.showModal(event)}>{app.get('password.update')}</a>
        )} )}
        <a onClick={this.loginout}>退出登录</a> <a onClick={this.loginout}>{app.get('exit.login')}</a>
        </div> </div>
        </div> </div>
        </div> </div>
        ......
        src/components/GlobalHeader/NoticeIconView.js
        View file @ ea4f5471
        ...@@ -10,7 +10,8 @@ import styles from './index.less'; ...@@ -10,7 +10,8 @@ import styles from './index.less';
        import { findPathByWidget, isJSON } from '../../utils/utils'; import { findPathByWidget, isJSON } from '../../utils/utils';
        import { actionCreators } from '../../containers/App/store'; import { actionCreators } from '../../containers/App/store';
        import service from '../../api/service/notification'; import service from '../../api/service/notification';
        import i18n from '../../utils/share';
        const app = i18n.getI18n('component');
        class NoticeIconView extends Component { class NoticeIconView extends Component {
        constructor(props) { constructor(props) {
        super(props); super(props);
        ...@@ -211,8 +212,8 @@ class NoticeIconView extends Component { ...@@ -211,8 +212,8 @@ class NoticeIconView extends Component {
        > >
        <NoticeIcon.Tab <NoticeIcon.Tab
        list={this.state.noticeData} list={this.state.noticeData}
        title="通知" title={app.get('noticeIcon.title')}
        emptyText="你已查看所有通知" emptyText={app.get('noticeIocn.allClear')}
        confirmRead={this.notifier.confirmRead} confirmRead={this.notifier.confirmRead}
        handlerSysDetail={this.handlerSysDetail} handlerSysDetail={this.handlerSysDetail}
        loadMore={this.notifier.loadMore} loadMore={this.notifier.loadMore}
        ...@@ -221,7 +222,7 @@ class NoticeIconView extends Component { ...@@ -221,7 +222,7 @@ class NoticeIconView extends Component {
        </NoticeIcon> </NoticeIcon>
        {this.state.platformVisible && this.state.alarmMessage && ( {this.state.platformVisible && this.state.alarmMessage && (
        <Modal <Modal
        title="报警消息" title={app.get('noticeIcon.modal.alarm.title')}
        visible={this.state.platformVisible} visible={this.state.platformVisible}
        zIndex={5000} zIndex={5000}
        className={styles.platformModal} className={styles.platformModal}
        ...@@ -251,7 +252,7 @@ class NoticeIconView extends Component { ...@@ -251,7 +252,7 @@ class NoticeIconView extends Component {
        this.state.alarmMessage.messageContent.title} this.state.alarmMessage.messageContent.title}
        </a> </a>
        <span <span
        title="点击标为已读" title={app.get('noticeIcon.messsage.statused')}
        onClick={event => onClick={event =>
        this.handlerMointer( this.handlerMointer(
        event, event,
        ...@@ -321,7 +322,7 @@ class NoticeIconView extends Component { ...@@ -321,7 +322,7 @@ class NoticeIconView extends Component {
        {this.state.sysTopVisible && this.state.sysMessage && ( {this.state.sysTopVisible && this.state.sysMessage && (
        <Modal <Modal
        title="系统通知" title={app.get('noticeIcon.model.system.title')}
        visible visible
        zIndex={8000} zIndex={8000}
        className={styles.noticeModal} className={styles.noticeModal}
        ......
        src/components/GlobalHeader/RightContent.js
        View file @ ea4f5471
        ...@@ -6,7 +6,7 @@ import { connect } from 'react-redux'; ...@@ -6,7 +6,7 @@ import { connect } from 'react-redux';
        import { withRouter } from 'react-router-dom'; import { withRouter } from 'react-router-dom';
        import Icon from '@ant-design/icons'; import Icon from '@ant-design/icons';
        import { useIntl } from '../hooks';
        import { actionCreators } from '../../containers/App/store'; import { actionCreators } from '../../containers/App/store';
        import HeaderSearch from '../HeaderSearch'; import HeaderSearch from '../HeaderSearch';
        import Avatar from './AvatarDropdown'; import Avatar from './AvatarDropdown';
        ...@@ -103,6 +103,9 @@ const GlobalHeaderRight = props => { ...@@ -103,6 +103,9 @@ const GlobalHeaderRight = props => {
        if (theme === 'dark' && layout === 'top') { if (theme === 'dark' && layout === 'top') {
        className = `${styles.right} ${styles.dark}`; className = `${styles.right} ${styles.dark}`;
        } }
        const {formatMessage} = useIntl('component');
        /* eslint-disable */ /* eslint-disable */
        const handleSearch = value => { const handleSearch = value => {
        // eslint-disable-next-line no-undef // eslint-disable-next-line no-undef
        ...@@ -175,7 +178,7 @@ const GlobalHeaderRight = props => { ...@@ -175,7 +178,7 @@ const GlobalHeaderRight = props => {
        <div className={className}> <div className={className}>
        <HeaderSearch <HeaderSearch
        className={`${styles.action} ${styles.search}`} className={`${styles.action} ${styles.search}`}
        placeholder="搜索菜单" placeholder={formatMessage('search.menu.placeholder')}
        defaultValue="" defaultValue=""
        options={options} options={options}
        {...props} {...props}
        ...@@ -184,10 +187,10 @@ const GlobalHeaderRight = props => { ...@@ -184,10 +187,10 @@ const GlobalHeaderRight = props => {
        onSearch={handleSearch} onSearch={handleSearch}
        /> />
        <div className={styles.nav}> <div className={styles.nav}>
        <HomeIcon onClick={goHome} title="首页" /> <HomeIcon onClick={goHome} title={formatMessage('header.icon.home')} />
        <OrderIcon onClick={handleOrder} title="工单" /> <OrderIcon onClick={handleOrder} title={formatMessage('header.icon.order')} />
        </div> </div>
        <NoticeIconView title="消息" /> <NoticeIconView title={formatMessage('header.icon.alarm')} />
        <Avatar menu global={props.global} updateCurrentIndex={props.updateCurrentIndex}/> <Avatar menu global={props.global} updateCurrentIndex={props.updateCurrentIndex}/>
        {/* <SelectLang className={styles.action} /> */} {/* <SelectLang className={styles.action} /> */}
        </div> </div>
        ......
        src/components/HeaderSearch/index.less
        View file @ ea4f5471
        ...@@ -31,21 +31,25 @@ ...@@ -31,21 +31,25 @@
        margin-left: 8px; margin-left: 8px;
        } }
        } }
        :global(.ant-select-selection-search .ant-input-affix-wrapper) { :global {
        border: 1px solid #b1b9c7; .ant-select-selection-search {
        border-radius: 28px; .ant-input-affix-wrapper {
        width: 320px !important; border: 1px solid #b1b9c7;
        color: #555555; border-radius: 28px;
        } width: 320px !important;
        :global(.ant-input-affix-wrapper) { color: #555555;
        padding-right: 12px; }
        width: 320px; }
        min-width: 120px; .ant-input-affix-wrapper {
        max-width: 320px; padding-right: 12px;
        border-radius: 28px; width: 320px;
        } min-width: 120px;
        :global(.anticon-search) { max-width: 320px;
        color: #888888; border-radius: 28px;
        }
        .anticon-search {
        color: #888888;
        }
        } }
        } }
        ......
        src/components/HeaderSearch/panel.js
        View file @ ea4f5471
        import React, { useState } from 'react'; import React, { useState } from 'react';
        import classNames from 'classnames'; import classNames from 'classnames';
        ......
        src/components/Notifier/index.js
        View file @ ea4f5471
        ...@@ -22,7 +22,7 @@ import { ...@@ -22,7 +22,7 @@ import {
        VIDEO_LEVEL, VIDEO_LEVEL,
        } from './constants'; } from './constants';
        import createMessage from './message'; import createMessage from './message';
        import service from '../../api/service/notification'; import { noticeService } from '../../api';
        import { isJSON } from '../../utils/utils'; import { isJSON } from '../../utils/utils';
        /* eslint-disable */ /* eslint-disable */
        // eslint-disable-next-line no-undef // eslint-disable-next-line no-undef
        ...@@ -132,7 +132,7 @@ class Notifier { ...@@ -132,7 +132,7 @@ class Notifier {
        if (isAll) hisIDs = this.messageCache.messages.map(item => item.id); if (isAll) hisIDs = this.messageCache.messages.map(item => item.id);
        const self = this; const self = this;
        // eslint-disable-next-line no-undef // eslint-disable-next-line no-undef
        service.postInformationStatus({ noticeService.postInformationStatus({
        userID: this.userInfo.OID, userID: this.userInfo.OID,
        hisID: hisIDs.join(','), hisID: hisIDs.join(','),
        isAll: isAll ? 1 : '', isAll: isAll ? 1 : '',
        ...@@ -500,7 +500,7 @@ class Notifier { ...@@ -500,7 +500,7 @@ class Notifier {
        // 工具类 // 工具类
        async loadHisMessages(pageIndex, pageSize) { async loadHisMessages(pageIndex, pageSize) {
        const self = this; const self = this;
        return service.getInformationInfo({ return noticeService.getInformationInfo({
        userID: self.getUserInfo().OID, userID: self.getUserInfo().OID,
        pageIndex, pageIndex,
        pageSize, pageSize,
        ...@@ -533,7 +533,7 @@ class Notifier { ...@@ -533,7 +533,7 @@ class Notifier {
        async getMqttSiteCode() { async getMqttSiteCode() {
        const self = this; const self = this;
        return service.getMqttSiteCode({ 'request.preventCache': Date.now() }).then( return noticeService.getMqttSiteCode({ 'request.preventCache': Date.now() }).then(
        res => { res => {
        if (res && res.say.statusCode === ERR_OK) { if (res && res.say.statusCode === ERR_OK) {
        let mqttConfig = { let mqttConfig = {
        ......
        src/components/hooks/index.js 0 → 100644
        View file @ ea4f5471
        import useIntl from './useIntl';
        import useRootContext from './useRootContext';
        export { useIntl, useRootContext };
        src/components/hooks/useIntl/index.js 0 → 100644
        View file @ ea4f5471
        import * as React from 'react';
        import i18n from '../../../utils/share';
        export default function useIntl(namespace) {
        const language = i18n.getI18n(namespace);
        return {
        formatMessage: id => language.get(id),
        };
        }
        src/components/hooks/useRootContext/index.js 0 → 100644
        View file @ ea4f5471
        import { getRootContext } from '@wisdom-utils/vapp-browser-vm/lib/vm';
        window.getRootContext = getRootContext;
        export default function useRootContext() {
        return getRootContext();
        };
        src/constants.js 0 → 100644
        View file @ ea4f5471
        export const SERVICE_APP_GET_UI_META = 'app.getUIMeta';
        export const SERVICE_APP_LOGIN_MODE = {
        password: 'password',
        dingding: 'dingding',
        weixin: 'weixin',
        phone: 'phone',
        }
        export const SERVICE_APP_CLOSE_ALL_TABS = 'app.close.tabs';
        src/containers/App/index.js
        View file @ ea4f5471
        ...@@ -3,14 +3,18 @@ import { Helmet } from 'react-helmet'; ...@@ -3,14 +3,18 @@ import { Helmet } from 'react-helmet';
        import { connect } from 'react-redux'; import { connect } from 'react-redux';
        import { renderRoutes } from 'react-router-config'; import { renderRoutes } from 'react-router-config';
        import { BrowserRouter as Router, Switch } from 'react-router-dom'; import { BrowserRouter as Router, Switch } from 'react-router-dom';
        import defaultSetting from '../../../config/defaultSetting';
        import { dyRoutes } from '../../routes/config'; import { dyRoutes } from '../../routes/config';
        function App(props) { function App(props) {
        return ( return (
        <> <>
        <Helmet title={`${props.global && props.global.title}`}> <Helmet
        <title>{`${props.global && props.global.title}`}</title> title={`${(props.global && props.global.title) ||
        defaultSetting.title}`}
        >
        <title>{`${(props.global && props.global.title) ||
        defaultSetting.title}`}</title>
        <link <link
        rel="shortcut icon" rel="shortcut icon"
        href={`https://panda-water.cn/web4/${props.global && href={`https://panda-water.cn/web4/${props.global &&
        ......
        src/containers/App/store/reducer.js
        View file @ ea4f5471
        ...@@ -39,6 +39,7 @@ const recentProductStorage = new Storage( ...@@ -39,6 +39,7 @@ const recentProductStorage = new Storage(
        const currentProduct = new Store( const currentProduct = new Store(
        `__global__recent_productIndex__micro_${window.location.hostname}`, `__global__recent_productIndex__micro_${window.location.hostname}`,
        ); );
        Cookies.set('loginMode', 'pdw');
        export const initialState = fromJS({ export const initialState = fromJS({
        globalConfig: {}, globalConfig: {},
        globalConfigError: '', globalConfigError: '',
        ...@@ -89,7 +90,7 @@ const appReducer = (state = initialState, action) => { ...@@ -89,7 +90,7 @@ const appReducer = (state = initialState, action) => {
        // eslint-disable-next-line no-undef // eslint-disable-next-line no-undef
        createStoreage.set('globalConfig', window.globalConfig); createStoreage.set('globalConfig', window.globalConfig);
        // eslint-disable-next-line no-undef,no-case-declarations // eslint-disable-next-line no-undef,no-case-declarations
        const config = createStoreage.get('globalConfig'); const config = window.globalConfig;
        // eslint-disable-next-line no-case-declarations // eslint-disable-next-line no-case-declarations
        const generMenu = generRoutes(config.widgets || []); const generMenu = generRoutes(config.widgets || []);
        // eslint-disable-next-line no-case-declarations // eslint-disable-next-line no-case-declarations
        ......
        src/images/icon-512x512.png 100755 → 100644
        View file @ ea4f5471
        This diff was suppressed by a .gitattributes entry.
        src/index.html
        View file @ ea4f5471
        ...@@ -9,6 +9,7 @@ ...@@ -9,6 +9,7 @@
        <meta name="mobile-web-app-capable" content="yes" /> <meta name="mobile-web-app-capable" content="yes" />
        <!-- <link rel="icon" href="/favicon.ico" /> --> <!-- <link rel="icon" href="/favicon.ico" /> -->
        <script src="//cdn-service.datav.aliyun.com/datav-static/2.37.6_4/libs/event.js"></script> <script src="//cdn-service.datav.aliyun.com/datav-static/2.37.6_4/libs/event.js"></script>
        <script crossorigin src="//g.alicdn.com/bone/libs/1.2.3/??isomorphic-fetch@2.js"></script>
        <script type="text/javascript"> <script type="text/javascript">
        window.share = { window.share = {
        event: new EventEmitter(), event: new EventEmitter(),
        ...@@ -108,7 +109,6 @@ ...@@ -108,7 +109,6 @@
        > >
        <!-- The app hooks into this div --> <!-- The app hooks into this div -->
        <div id="app"></div> <div id="app"></div>
        <!-- Open Sans Font --> <!-- Open Sans Font -->
        <!-- <link href="https://fonts.googleapis.com/css?family=Open+Sans:400,700" rel="stylesheet"> --> <!-- <link href="https://fonts.googleapis.com/css?family=Open+Sans:400,700" rel="stylesheet"> -->
        <!-- A lot of magic happens in this file. HtmlWebpackPlugin automatically injects all assets (e.g. bundle.js, main.css) with the correct HTML tags, which is why they are missing in this file. Don't add any assets here! (Check out webpack.dev.babel.js and webpack.prod.babel.js if you want to know more) --> <!-- A lot of magic happens in this file. HtmlWebpackPlugin automatically injects all assets (e.g. bundle.js, main.css) with the correct HTML tags, which is why they are missing in this file. Don't add any assets here! (Check out webpack.dev.babel.js and webpack.prod.babel.js if you want to know more) -->
        ......
        src/layouts/BasicLayout.js
        View file @ ea4f5471
        ...@@ -9,16 +9,14 @@ import React, { ...@@ -9,16 +9,14 @@ import React, {
        import { Anchor, Button, Popover, Radio, Result, Spin } from 'antd'; import { Anchor, Button, Popover, Radio, Result, Spin } from 'antd';
        import classNames from 'classnames'; import classNames from 'classnames';
        import { dom } from 'kit_utils'; import { dom } from 'kit_utils';
        import _ from 'lodash';
        import { connect } from 'react-redux'; import { connect } from 'react-redux';
        import { renderRoutes } from 'react-router-config'; import { renderRoutes } from 'react-router-config';
        import { useHistory } from 'react-router-dom'; import { useHistory } from 'react-router-dom';
        import { useMountedState } from 'react-use'; import { useMountedState } from 'react-use';
        import { LeftOutlined, MenuFoldOutlined } from '@ant-design/icons'; import { LeftOutlined, MenuFoldOutlined } from '@ant-design/icons';
        import ProLayout from '@ant-design/pro-layout'; import ProLayout, { getPageTitle } from '@ant-design/pro-layout';
        import { getMatchMenu } from '@umijs/route-utils'; import { getMatchMenu } from '@umijs/route-utils';
        import pkg from '../../package.json'; import pkg from '../../package.json';
        import RightContent from '../components/GlobalHeader/RightContent'; import RightContent from '../components/GlobalHeader/RightContent';
        import { Panel } from '../components/SliderPanel'; import { Panel } from '../components/SliderPanel';
        ...@@ -29,7 +27,7 @@ import { findPathByLeafId, getBaseName } from '../utils/utils'; ...@@ -29,7 +27,7 @@ import { findPathByLeafId, getBaseName } from '../utils/utils';
        import SecurityLayout from './SecurityLayout'; import SecurityLayout from './SecurityLayout';
        import Site from './Site'; import Site from './Site';
        import styles from './UserLayout.less'; import styles from './UserLayout.less';
        import defaultSetting from '../../config/defaultSetting';
        const baseURI = isProd const baseURI = isProd
        ? window.location.origin ? window.location.origin
        : `http://${window.location.hostname}:3020`; : `http://${window.location.hostname}:3020`;
        ...@@ -302,7 +300,6 @@ const BasicLayout = props => { ...@@ -302,7 +300,6 @@ const BasicLayout = props => {
        const [siteLoading, setSiteLoading] = useState(false); const [siteLoading, setSiteLoading] = useState(false);
        const [complexCollapsed, setComplexCollapsed] = useState(false); const [complexCollapsed, setComplexCollapsed] = useState(false);
        const isMounted = useMountedState(); const isMounted = useMountedState();
        const [siteAction, setSiteAction] = useState( const [siteAction, setSiteAction] = useState(
        () => new Site(props, setSiteLoading), () => new Site(props, setSiteLoading),
        ); );
        ...@@ -359,7 +356,7 @@ const BasicLayout = props => { ...@@ -359,7 +356,7 @@ const BasicLayout = props => {
        }, [props.currentMenuIndex]); }, [props.currentMenuIndex]);
        useEffect(() => { useEffect(() => {
        if (_.isEmpty(props.global.get('token'))) { if (!props.global.token) {
        history.replace(`/user/login?client=${props.global.get('client')}`); history.replace(`/user/login?client=${props.global.get('client')}`);
        return; return;
        } }
        ...@@ -378,7 +375,7 @@ const BasicLayout = props => { ...@@ -378,7 +375,7 @@ const BasicLayout = props => {
        }, [props.pathname]); }, [props.pathname]);
        useMemo(() => { useMemo(() => {
        window.share.event.on('listenerRemoveSigleTab', url => { window.share.event.on(' `', url => {
        const config = findPathByLeafId( const config = findPathByLeafId(
        `${props.location.pathname}`, `${props.location.pathname}`,
        [currentRoutes], [currentRoutes],
        ...@@ -499,6 +496,10 @@ const BasicLayout = props => { ...@@ -499,6 +496,10 @@ const BasicLayout = props => {
        } }
        }; };
        const title = getPageTitle({
        title: props.global && props.global.get('title') || defaultSetting.title
        });
        const renderComplexLayout = children => { const renderComplexLayout = children => {
        const complexConfig = props.complexConfig.toJS const complexConfig = props.complexConfig.toJS
        ? props.complexConfig.toJS() ? props.complexConfig.toJS()
        ...@@ -506,7 +507,7 @@ const BasicLayout = props => { ...@@ -506,7 +507,7 @@ const BasicLayout = props => {
        return ( return (
        <ProLayout <ProLayout
        logo={false} logo={false}
        title={props.global && props.global.get('title')} title={title}
        headerRender={false} headerRender={false}
        rightContentRender={() => null} rightContentRender={() => null}
        collapsedButtonRender={false} collapsedButtonRender={false}
        ...@@ -616,6 +617,7 @@ const BasicLayout = props => { ...@@ -616,6 +617,7 @@ const BasicLayout = props => {
        ); );
        }; };
        const { openKeys } = props; const { openKeys } = props;
        return ( return (
        <SecurityLayout loading updateCurrentIndex={props.updateCurrentIndex}> <SecurityLayout loading updateCurrentIndex={props.updateCurrentIndex}>
        <ProLayout <ProLayout
        ...@@ -625,7 +627,7 @@ const BasicLayout = props => { ...@@ -625,7 +627,7 @@ const BasicLayout = props => {
        : 'assets/images/logo/单独图案-白色.svg' : 'assets/images/logo/单独图案-白色.svg'
        }`} }`}
        siderWidth="145px" siderWidth="145px"
        title={props.global && props.global.get('title')} title={title}
        onCollapse={collapse => handlerCollapsed(collapse)} onCollapse={collapse => handlerCollapsed(collapse)}
        onMenuHeaderClick={event => handleLogo(event)} onMenuHeaderClick={event => handleLogo(event)}
        menuExtraRender={props.menu.length > 0 ? extraRender.render : null} menuExtraRender={props.menu.length > 0 ? extraRender.render : null}
        ...@@ -721,6 +723,7 @@ const BasicLayout = props => { ...@@ -721,6 +723,7 @@ const BasicLayout = props => {
        menuDataRef.current = menuData || []; menuDataRef.current = menuData || [];
        return menuData || []; return menuData || [];
        }} }}
        settings={defaultSetting}
        {...others} {...others}
        {...settings} {...settings}
        > >
        ......
        src/layouts/SecurityLayout.js
        View file @ ea4f5471
        ...@@ -2,7 +2,7 @@ import React from 'react'; ...@@ -2,7 +2,7 @@ import React from 'react';
        import { connect } from 'react-redux'; import { connect } from 'react-redux';
        import { Redirect } from 'react-router-dom'; import { Redirect } from 'react-router-dom';
        import PageLoading from '@ant-design/pro-layout';
        import { getBaseName } from '../utils/utils'; import { getBaseName } from '../utils/utils';
        class SecurityLayout extends React.Component { class SecurityLayout extends React.Component {
        ...@@ -21,18 +21,20 @@ class SecurityLayout extends React.Component { ...@@ -21,18 +21,20 @@ class SecurityLayout extends React.Component {
        const { children, global, loading } = this.props; const { children, global, loading } = this.props;
        const isLogin = const isLogin =
        global.token !== null || global.token !== null ||
        (global.qrcodeData && ((global.qrcodeData &&
        global.qrcodeData.state !== '' && global.qrcodeData.state !== '' &&
        global.qrcodeData.code !== ''); global.qrcodeData.code !== '') ||
        !global.userInfo);
        // eslint-disable-next-line no-undef
        // if(Cookie.get("token")==="") { // if(Cookie.get("token")==="") {
        // return ( // return (
        // <Redirect to={`/user/login?client=${global.client}`} /> // <Redirect to={`/user/login?client=${global.client}`} />
        // ); // );
        // } // }
        // if((!isLogin && loading) || !isReady) { if((!isLogin && loading) || !isReady) {
        // return <PageLoading/> return <PageLoading/>
        // } }
        if ( if (
        !isLogin && !isLogin &&
        window.location.pathname !== `/${getBaseName()}/user/login` window.location.pathname !== `/${getBaseName()}/user/login`
        ......
        src/layouts/Site.js
        View file @ ea4f5471
        ...@@ -9,7 +9,7 @@ import CitySelector from '../components/CitySelector'; ...@@ -9,7 +9,7 @@ import CitySelector from '../components/CitySelector';
        import Login from '../pages/user/login/login'; import Login from '../pages/user/login/login';
        import cityJson from './city.json'; import cityJson from './city.json';
        import styles from './UserLayout.less'; import styles from './UserLayout.less';
        import services from '../api/service/base'; import { appService } from '../api';
        const { Link } = Anchor; const { Link } = Anchor;
        ...@@ -37,7 +37,7 @@ class Site { ...@@ -37,7 +37,7 @@ class Site {
        this.globalConfig.userInfo.site this.globalConfig.userInfo.site
        ) { ) {
        // eslint-disable-next-line no-undef // eslint-disable-next-line no-undef
        services.getCity().then(res => { appService.getCity().then(res => {
        // eslint-disable-next-line no-restricted-globals // eslint-disable-next-line no-restricted-globals
        if (res && !isNaN(res.cid)) { if (res && !isNaN(res.cid)) {
        const cityResult = JSON.parse(cityJson); const cityResult = JSON.parse(cityJson);
        ...@@ -57,7 +57,7 @@ class Site { ...@@ -57,7 +57,7 @@ class Site {
        const self = this; const self = this;
        return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
        // eslint-disable-next-line no-undef // eslint-disable-next-line no-undef
        services appService
        .getAllGroupsInfoForUser({ .getAllGroupsInfoForUser({
        loginName, loginName,
        'request.preventCache': new Date().getTime(), 'request.preventCache': new Date().getTime(),
        ...@@ -182,7 +182,7 @@ class Site { ...@@ -182,7 +182,7 @@ class Site {
        if (city) { if (city) {
        // eslint-disable-next-line no-undef // eslint-disable-next-line no-undef
        services appService
        .getWeather({ .getWeather({
        city, city,
        'request.preventCache': new Date().getTime(), 'request.preventCache': new Date().getTime(),
        ...@@ -347,7 +347,7 @@ class Site { ...@@ -347,7 +347,7 @@ class Site {
        const { loginName } = this.globalConfig.userInfo; const { loginName } = this.globalConfig.userInfo;
        this.setLoading(true); this.setLoading(true);
        // eslint-disable-next-line no-undef // eslint-disable-next-line no-undef
        services appService
        .generateTokenQuick({ .generateTokenQuick({
        loginName, loginName,
        ignoreSite: true, ignoreSite: true,
        ...@@ -366,7 +366,7 @@ class Site { ...@@ -366,7 +366,7 @@ class Site {
        beforeChangeCheck(token, site) { beforeChangeCheck(token, site) {
        // eslint-disable-next-line no-undef // eslint-disable-next-line no-undef
        services appService
        .getUserInfo({ .getUserInfo({
        token, token,
        subOID: 'subOID', subOID: 'subOID',
        ......
        src/layouts/UserLayout.less
        View file @ ea4f5471
        ...@@ -101,6 +101,9 @@ ...@@ -101,6 +101,9 @@
        padding: 0 14px; padding: 0 14px;
        // margin-bottom: 0px; // margin-bottom: 0px;
        } }
        :global(.@{ant-prefix}-layout-sider-collapsed .@{ant-prefix}-menu-item.@{ant-prefix}-menu-item-only-child) {
        padding-left: 0px!important;
        }
        :global(.@{ant-prefix}-layout-sider-collapsed :global(.@{ant-prefix}-layout-sider-collapsed
        .@{ant-prefix}-menu-inline-collapsed .@{ant-prefix}-menu-inline-collapsed
        .@{ant-prefix}-menu-item-only-child.@{ant-prefix}-menu-item-selected) { .@{ant-prefix}-menu-item-only-child.@{ant-prefix}-menu-item-selected) {
        ...@@ -349,8 +352,29 @@ ...@@ -349,8 +352,29 @@
        display: none; display: none;
        } }
        //:global(.@{ant-prefix}-layout-sider-collapsed
        //// .@{ant-prefix}-menu-dark.@{ant-prefix}-menu-vertical
        //// .@{ant-prefix}-menu-item) {
        //// display: flex;
        //// align-items: center;
        //// justify-content: space-between;
        //// text-align: center;
        //// padding: 0;
        ////}
        ////:global(.@{ant-prefix}-layout-sider-collapsed
        //// .@{ant-prefix}-menu-dark.@{ant-prefix}-menu-vertical
        //// .@{ant-prefix}-pro-sider-collapsed-button) {
        //// display: block;
        ////}
        ////
        ////:global(.@{ant-prefix}-layout-sider-collapsed
        //// .@{ant-prefix}-menu-vertical
        //// .@{ant-prefix}-menu-item) {
        //// line-height: 14px;
        ////}
        :global(.@{ant-prefix}-layout-sider-collapsed :global(.@{ant-prefix}-layout-sider-collapsed
        .@{ant-prefix}-menu-dark.@{ant-prefix}-menu-vertical .@{ant-prefix}-menu-dark
        .@{ant-prefix}-menu-item) { .@{ant-prefix}-menu-item) {
        display: flex; display: flex;
        align-items: center; align-items: center;
        ...@@ -359,13 +383,12 @@ ...@@ -359,13 +383,12 @@
        padding: 0; padding: 0;
        } }
        :global(.@{ant-prefix}-layout-sider-collapsed :global(.@{ant-prefix}-layout-sider-collapsed
        .@{ant-prefix}-menu-dark.@{ant-prefix}-menu-vertical .@{ant-prefix}-menu-dark
        .@{ant-prefix}-pro-sider-collapsed-button) { .@{ant-prefix}-pro-sider-collapsed-button) {
        display: block; display: block;
        } }
        :global(.@{ant-prefix}-layout-sider-collapsed :global(.@{ant-prefix}-layout-sider-collapsed
        .@{ant-prefix}-menu-vertical
        .@{ant-prefix}-menu-item) { .@{ant-prefix}-menu-item) {
        line-height: 14px; line-height: 14px;
        } }
        ...@@ -391,21 +414,28 @@ ...@@ -391,21 +414,28 @@
        } }
        :global(.@{ant-prefix}-menu-inline-collapsed :global(.@{ant-prefix}-menu-inline-collapsed
        .@{ant-prefix}-menu-submenu.@{ant-prefix}-menu-submenu-vertical .@{ant-prefix}-menu-submenu
        .@{ant-prefix}-menu-submenu-title) { .@{ant-prefix}-menu-submenu-title) {
        display: flex; display: flex;
        align-items: center; align-items: center;
        justify-content: center; justify-content: center;
        flex-direction: column; flex-direction: column;
        text-align: center; text-align: center;
        flex-wrap: inherit !important; flex-wrap: inherit !important;
        padding: 0; padding: 0;
        width: 100%; width: 100%;
        line-height: 24px; line-height: 24px;
        } }
        //:global(.@{ant-prefix}-menu-inline-collapsed
        // .@{ant-prefix}-menu-submenu.@{ant-prefix}-menu-submenu-vertical
        // .@{ant-prefix}-menu-submenu-title
        // img) {
        // margin-right: 0px !important;
        //}
        :global(.@{ant-prefix}-menu-inline-collapsed :global(.@{ant-prefix}-menu-inline-collapsed
        .@{ant-prefix}-menu-submenu.@{ant-prefix}-menu-submenu-vertical .@{ant-prefix}-menu-submenu
        .@{ant-prefix}-menu-submenu-title .@{ant-prefix}-menu-submenu-title
        img) { img) {
        margin-right: 0px !important; margin-right: 0px !important;
        ...@@ -439,9 +469,8 @@ ...@@ -439,9 +469,8 @@
        .panda-pro-layouts-user-layout-minixName) { .panda-pro-layouts-user-layout-minixName) {
        font-size: 12px !important; font-size: 12px !important;
        } }
        :global(.@{ant-prefix}-menu-inline-collapsed :global(.@{ant-prefix}-menu-inline-collapsed
        .@{ant-prefix}-menu-submenu.@{ant-prefix}-menu-submenu-vertical .@{ant-prefix}-menu-submenu
        .@{ant-prefix}-menu-submenu-title .@{ant-prefix}-menu-submenu-title
        .@{ant-prefix}-pro-menu-item) { .@{ant-prefix}-pro-menu-item) {
        top: 0 !important; top: 0 !important;
        ...@@ -450,6 +479,16 @@ ...@@ -450,6 +479,16 @@
        overflow: hidden; overflow: hidden;
        white-space: nowrap; white-space: nowrap;
        } }
        //:global(.@{ant-prefix}-menu-inline-collapsed
        // .@{ant-prefix}-menu-submenu.@{ant-prefix}-menu-submenu-vertical
        // .@{ant-prefix}-menu-submenu-title
        // .@{ant-prefix}-pro-menu-item) {
        // top: 0 !important;
        // font-size: 12px !important;
        // text-overflow: ellipsis;
        // overflow: hidden;
        // white-space: nowrap;
        //}
        .complexLayout { .complexLayout {
        :global { :global {
        .@{ant-prefix}-pro-sider-menu { .@{ant-prefix}-pro-sider-menu {
        ......
        src/loader.js 0 → 100644
        View file @ ea4f5471
        import {
        BrowserVMLoader,
        setLogStatus,
        } from '@wisdom-utils/vapp-browser-vm/lib/loader';
        import plugins from '@wisdom-utils/vapp-browser-vm-plugins';
        setLogStatus(false);
        (async () => {
        const loader = new BrowserVMLoader({
        plugins,
        });
        await loader.waitReady();
        })();
        src/locales/zh-CN.js 0 → 100644
        View file @ ea4f5471
        import globalHeader from './zh-CN/globalHeader';
        import pwa from './zh-CN/pwa';
        import pages from './zh-CN/pages';
        import settings from './zh-CN/settings';
        const packs = {
        globalHeader,
        pwa,
        pages,
        settings,
        }
        function registerLanguge() {
        Object.keys(packs).forEach(pack => {
        const script = document.createElement('script');
        script.type = 'json/i18n';
        script.innerHTML = JSON.stringify(packs[pack]);
        document.head.appendChild(script);
        });
        }
        registerLanguge();
        src/locales/zh-CN/globalHeader.js 0 → 100644
        View file @ ea4f5471
        export default {
        'component.noticeIcon.clear': '清空',
        'component.noticeIcon.cleared': '清空了',
        'component.noticeIcon.empty': '暂无数据',
        'component.noticeIcon.view-more': '查看更多',
        'component.noticeIcon.title': '通知',
        'component.noticeIocn.allClear': '你已查看所有通知',
        'component.noticeIcon.modal.alarm.title': '报警消息',
        'component.noticeIcon.model.system.title': '系统通知',
        'component.noticeIcon.messsage.statused': '点击标为已读',
        'component.avatar.account': '账号',
        'component.avatar.name': '姓名',
        'component.avatar.depart': '部门',
        'component.avatar.role': '角色',
        'component.siteCode': '企业编号',
        'component.avatar.update.success': '头像修改成功',
        'component.avatar.update.fail': '头像修改失败',
        'component.account.password.update.success': '修改密码成功',
        'component.account.oldpassword.errorMessage': '原密码输入错误',
        'component.account.password.update.fail': '修改密码失败',
        'component.getVersion.errorMessage': '获取版本号错误，请联系相关开发人员',
        'component.password.update': '修改密码',
        'component.exit.login': '退出登录',
        'component.search.menu.placeholder': '搜索菜单',
        'component.header.icon.home': '首页',
        'component.header.icon.order': '工单',
        'component.header.icon.alarm': '报警',
        };
        src/locales/zh-CN/pages.js 0 → 100644
        View file @ ea4f5471
        export default {
        'pages.login.welcome': '欢迎登录',
        'pages.login.accountLogin.errorMessage': '账户或密码错误',
        'pages.login.username.placeholder': '请输入用户名',
        'pages.login.username.required': '请输入用户名!',
        'pages.login.password.placeholder': '请输入密码',
        'pages.login.password.required': '请输入密码！',
        'pages.login.phoneLogin.errorMessage': '验证码填写错误，请重新获取',
        'pages.login.phoneLogin.errorCodeMessage': '获取验证码失败',
        'pages.login.phoneNumber.placeholder': '请输入手机号！',
        'pages.login.phoneNumber.required': '手机号是必填项！',
        'pages.login.phoneNumber.invalid': '不合法的手机号！',
        'pages.login.captcha.placeholder': '请输入短信验证码！',
        'pages.login.phoneLogin.getVerificationCode': '获取验证码',
        'pages.login.phoneLogin.sendCationCode': '验证码已发送',
        'pages.getCaptchaSecondText': '秒后重新获取',
        'pages.login.rememberMe': '下次自动登录',
        'pages.login.forgotPassword': '忘记密码 ?',
        'pages.login.submit': '登录',
        'pages.login.accountLogin.tab': '账号密码登录',
        'pages.login.phoneLogin.tab': '手机号登录',
        'pages.login.weChart.tab': '微信扫码登录',
        };
        src/locales/zh-CN/pwa.js 0 → 100644
        View file @ ea4f5471
        export default {
        'app.pwd.offline': '当前处于离线状态',
        'app.pwa.serviceworker.updated': '有新内容',
        'app.pwa.serviceworker.updated.hint': '请点击“刷新”按钮或者手动刷新页面',
        'app.pwa.serviceworker.updated.ok': '刷新',
        };
        src/locales/zh-CN/settings.js 0 → 100644
        View file @ ea4f5471
        export default {
        'app.settings.bootpage.title': '熊猫智慧城市监控管理解决方案',
        }
        src/pages/bootpage/index.js
        View file @ ea4f5471
        ...@@ -8,7 +8,8 @@ import { actionCreators } from '../../containers/App/store'; ...@@ -8,7 +8,8 @@ import { actionCreators } from '../../containers/App/store';
        import SecurityLayout from '../../layouts/SecurityLayout'; import SecurityLayout from '../../layouts/SecurityLayout';
        import LoginAction from '../user/login/login'; import LoginAction from '../user/login/login';
        import styles from './index.less'; import styles from './index.less';
        import i18n from '../../utils/share';
        const pages = i18n.getI18n('app');
        const industries = ['供水', '排水', '消防', '暖通', '节水', '实验室']; const industries = ['供水', '排水', '消防', '暖通', '节水', '实验室'];
        const renderIndustries = (config, callback) => const renderIndustries = (config, callback) =>
        industries.map(item => ( industries.map(item => (
        ...@@ -79,7 +80,7 @@ const BootPage = props => { ...@@ -79,7 +80,7 @@ const BootPage = props => {
        <img src="https://panda-water.cn/web4/assets/images/bootPage/熊猫图标.png" /> <img src="https://panda-water.cn/web4/assets/images/bootPage/熊猫图标.png" />
        <div className={styles.bootPageTitle}> <div className={styles.bootPageTitle}>
        <span className={styles.bootPageZh}> <span className={styles.bootPageZh}>
        熊猫智慧城市监控管理解决方案 {pages.get('settings.bootpage.title')}
        </span> </span>
        <span className={styles.bootPageEn}> <span className={styles.bootPageEn}>
        Panda Smart City Monitoring Management Platform & Solution Panda Smart City Monitoring Management Platform & Solution
        ......
        src/pages/user/login/components/Login/LoginItem.js
        View file @ ea4f5471
        ...@@ -7,7 +7,8 @@ import styles from './index.less'; ...@@ -7,7 +7,8 @@ import styles from './index.less';
        import LoginContext from './LoginContext'; import LoginContext from './LoginContext';
        import ItemMap from './map'; import ItemMap from './map';
        import services from '../../../../../api/service/base'; import services from '../../../../../api/service/base';
        import i18n from '../../../../../utils/share';
        const pages = i18n.getI18n('pages');
        const FormItem = Form.Item; const FormItem = Form.Item;
        // eslint-disable-next-line no-undef // eslint-disable-next-line no-undef
        const Logger = logger('loginForm'); const Logger = logger('loginForm');
        ...@@ -62,7 +63,7 @@ const LoginItem = props => { ...@@ -62,7 +63,7 @@ const LoginItem = props => {
        } }
        }) })
        .catch(error => { .catch(error => {
        message.error('获取验证码失败'); message.error(pages.get('login.phoneLogin.errorCodeMessage'));
        }); });
        }, []); }, []);
        ...@@ -98,7 +99,7 @@ const LoginItem = props => { ...@@ -98,7 +99,7 @@ const LoginItem = props => {
        return Promise.resolve(); return Promise.resolve();
        } }
        // eslint-disable-next-line prefer-promise-reject-errors // eslint-disable-next-line prefer-promise-reject-errors
        return Promise.reject('验证码填写错误，请重新获取'); return Promise.reject(pages.get('login.phoneLogin.errorMessage'));
        }; };
        // eslint-disable-next-line no-shadow // eslint-disable-next-line no-shadow
        const rules = [ const rules = [
        ...@@ -130,7 +131,9 @@ const LoginItem = props => { ...@@ -130,7 +131,9 @@ const LoginItem = props => {
        }); });
        }} }}
        > >
        {timing ? `验证码已发送(${count})` : '获取短信验证码'} {timing
        ? `${pages.get('login.phoneLogin.sendCationCode')}(${count})`
        : pages.get('login.phoneLogin.getVerificationCode')}
        </Button> </Button>
        </> </>
        )} )}
        ......
        src/pages/user/login/components/Login/index.js
        View file @ ea4f5471
        ...@@ -7,7 +7,8 @@ import styles from './index.less'; ...@@ -7,7 +7,8 @@ import styles from './index.less';
        import LoginContext from './LoginContext'; import LoginContext from './LoginContext';
        import LoginItem from './LoginItem'; import LoginItem from './LoginItem';
        import LoginSubmit from './LoginSubmit'; import LoginSubmit from './LoginSubmit';
        import i18n from '../../../../../utils/share';
        const pages = i18n.getI18n('pages');
        const Login = props => { const Login = props => {
        const { className } = props; const { className } = props;
        const otherChildren = []; const otherChildren = [];
        ...@@ -20,7 +21,7 @@ const Login = props => { ...@@ -20,7 +21,7 @@ const Login = props => {
        return ( return (
        <LoginContext.Provider> <LoginContext.Provider>
        <div className={classNames(className, styles.login)}> <div className={classNames(className, styles.login)}>
        <div className={styles.desc}>欢迎登录</div> <div className={styles.desc}>{pages.get('login.welcome')}</div>
        <Form <Form
        form={props.from} form={props.from}
        onFinish={values => { onFinish={values => {
        ......
        src/pages/user/login/index.js
        View file @ ea4f5471
        ...@@ -16,7 +16,7 @@ import LoginForm from './components/Login'; ...@@ -16,7 +16,7 @@ import LoginForm from './components/Login';
        import WxLogin from './components/WxLogin'; import WxLogin from './components/WxLogin';
        import LoginAction from './login'; import LoginAction from './login';
        import styles from './style.less'; import styles from './style.less';
        import i18n from '../../../utils/share';
        const { UserName, Password, Mobile, Captcha, Submit } = LoginForm; const { UserName, Password, Mobile, Captcha, Submit } = LoginForm;
        const Display = { const Display = {
        Account: 'Account', Account: 'Account',
        ...@@ -28,6 +28,7 @@ const LoginWay = { ...@@ -28,6 +28,7 @@ const LoginWay = {
        WeChart: 'iotWechat', WeChart: 'iotWechat',
        Mobile: 'iotPhone', Mobile: 'iotPhone',
        }; };
        const pages = i18n.getI18n('pages');
        const LoginMessage = ({ content }) => ( const LoginMessage = ({ content }) => (
        <Alert <Alert
        style={{ style={{
        ...@@ -215,29 +216,31 @@ const useRenderQcode = props => { ...@@ -215,29 +216,31 @@ const useRenderQcode = props => {
        }); });
        return element; return element;
        }; };
        /* eslint-disable */
        const Account = props => ( const Account = props => (
        <LoginForm onSubmit={props.onSubmit}> <LoginForm onSubmit={props.onSubmit}>
        {props.status === 'error' && {props.status === 'error' &&
        props.type === 'account' && props.type === 'account' &&
        !props.submitting && <LoginMessage content="账户或密码错误" />} !props.submitting && (
        <LoginMessage content={pages.get('login.accountLogin.errorMessage')} />
        )}
        <UserName <UserName
        name="userName" name="userName"
        placeholder="请输入你的用户名" placeholder={pages.get('login.username.placeholder')}
        rules={[ rules={[
        { {
        required: true, required: true,
        message: '请输入用户名!', message: pages.get('login.username.required'),
        }, },
        ]} ]}
        /> />
        <Password <Password
        name="password" name="password"
        placeholder="请输入你的密码" placeholder={pages.get('login.password.placeholder')}
        rules={[ rules={[
        { {
        required: true, required: true,
        message: '请输入密码！', message: pages.get('login.password.required'),
        }, },
        ]} ]}
        /> />
        ...@@ -246,10 +249,10 @@ const Account = props => ( ...@@ -246,10 +249,10 @@ const Account = props => (
        checked={props.autoLogin} checked={props.autoLogin}
        onChange={e => props.setAutoLogin(e.target.checked)} onChange={e => props.setAutoLogin(e.target.checked)}
        > >
        下次自动登录 {pages.get('login.rememberMe')}
        </Checkbox> </Checkbox>
        </div> </div>
        <Submit loading={props.submitting}>登录</Submit> <Submit loading={props.submitting}>{pages.get('login.submit')}</Submit>
        </LoginForm> </LoginForm>
        ); );
        ...@@ -339,7 +342,7 @@ const IotComponent = props => { ...@@ -339,7 +342,7 @@ const IotComponent = props => {
        display: props.type === Display.Account ? 'none' : 'block', display: props.type === Display.Account ? 'none' : 'block',
        }} }}
        > >
        账号密码登录 {pages.get('login.accountLogin.tab')}
        </a> </a>
        <a <a
        onClick={() => handlerType('WeChart')} onClick={() => handlerType('WeChart')}
        ...@@ -347,7 +350,7 @@ const IotComponent = props => { ...@@ -347,7 +350,7 @@ const IotComponent = props => {
        display: props.type === Display.WeChart ? 'none' : 'block', display: props.type === Display.WeChart ? 'none' : 'block',
        }} }}
        > >
        微信扫码登录 {pages.get('login.weChart.tab')}
        </a> </a>
        <a <a
        onClick={() => handlerType('Mobile')} onClick={() => handlerType('Mobile')}
        ...@@ -355,7 +358,7 @@ const IotComponent = props => { ...@@ -355,7 +358,7 @@ const IotComponent = props => {
        display: props.type === Display.Mobile ? 'none' : 'block', display: props.type === Display.Mobile ? 'none' : 'block',
        }} }}
        > >
        手机验证码登录 {pages.get('login.phoneLogin.tab')}
        </a> </a>
        </div> </div>
        </div> </div>
        ...@@ -381,6 +384,10 @@ const Login = forwardRef((props, _ref) => { ...@@ -381,6 +384,10 @@ const Login = forwardRef((props, _ref) => {
        () => new LoginAction(props, setVisible, true), () => new LoginAction(props, setVisible, true),
        ); );
        useEffect(() => {
        action.globalConfig = props.global;
        }, [props.global]);
        const handleSubmit = values => { const handleSubmit = values => {
        /* eslint-disable */ /* eslint-disable */
        action && action &&
        ...@@ -419,13 +426,11 @@ const Login = forwardRef((props, _ref) => { ...@@ -419,13 +426,11 @@ const Login = forwardRef((props, _ref) => {
        if (props.loginMode === LoginWay.WeChart) { if (props.loginMode === LoginWay.WeChart) {
        action && action &&
        action.events.on('loginSuccess', event => { action.events.on('loginSuccess', event => {
        console.log('登录成功');
        props.history.push(`/?client=${props.global.client}`); props.history.push(`/?client=${props.global.client}`);
        window.share.event.emit('triggerMicro', props.global); window.share.event.emit('triggerMicro', props.global);
        }); });
        action && action &&
        action.events.on('loginError', event => { action.events.on('loginError', event => {
        console.log('登录失败');
        setVisible(false); setVisible(false);
        setSubmitting(false); setSubmitting(false);
        }); });
        ......
        src/pages/user/login/login.js
        View file @ ea4f5471
        ...@@ -2,9 +2,10 @@ import { message } from 'antd'; ...@@ -2,9 +2,10 @@ import { message } from 'antd';
        import { decode, encode } from 'js-base64'; import { decode, encode } from 'js-base64';
        import Cookies from 'js-cookie'; import Cookies from 'js-cookie';
        import sha1 from 'sha1'; import sha1 from 'sha1';
        import services from '../../../api/service/base'; import { appService } from '../../../api';
        import 'kit_logger'; import 'kit_logger';
        import SlideVerify from '../../../components/SlideVerify'; import SlideVerify from '../../../components/SlideVerify';
        import { SERVICE_APP_LOGIN_MODE } from '../../../constants';
        // eslint-disable-next-line no-undef // eslint-disable-next-line no-undef
        const Logger = logger('login'); const Logger = logger('login');
        ...@@ -64,7 +65,7 @@ class Login { ...@@ -64,7 +65,7 @@ class Login {
        this.globalConfig.token = token; this.globalConfig.token = token;
        const self = this; const self = this;
        // eslint-disable-next-line no-undef // eslint-disable-next-line no-undef
        services appService
        .getUserInfo({ .getUserInfo({
        token: this.globalConfig.token, token: this.globalConfig.token,
        subOID: 'subOID', subOID: 'subOID',
        ...@@ -102,7 +103,7 @@ class Login { ...@@ -102,7 +103,7 @@ class Login {
        if (this.globalConfig.userInfo.site) { if (this.globalConfig.userInfo.site) {
        // eslint-disable-next-line no-undef // eslint-disable-next-line no-undef
        services appService
        .writeLogs({ .writeLogs({
        origin: window.location.origin, origin: window.location.origin,
        client: this.globalConfig.client, client: this.globalConfig.client,
        ...@@ -152,9 +153,9 @@ class Login { ...@@ -152,9 +153,9 @@ class Login {
        getWebConfig(token, getIndustry) { getWebConfig(token, getIndustry) {
        const self = this; const self = this;
        // eslint-disable-next-line no-undef // eslint-disable-next-line no-undef
        services appService
        .getWebSiteConfig({ .getWebSiteConfig({
        client: this.globalConfig.client, client: self.globalConfig.client,
        token, token,
        'request.preventCache': Date.now(), 'request.preventCache': Date.now(),
        }) })
        ...@@ -192,7 +193,7 @@ class Login { ...@@ -192,7 +193,7 @@ class Login {
        self.globalConfig.userInfo.site.length > 0 self.globalConfig.userInfo.site.length > 0
        ) { ) {
        // eslint-disable-next-line no-undef,no-underscore-dangle // eslint-disable-next-line no-undef,no-underscore-dangle
        services appService
        .getWebSiteConfig( .getWebSiteConfig(
        { {
        client: self.globalConfig.client, client: self.globalConfig.client,
        ...@@ -244,9 +245,10 @@ class Login { ...@@ -244,9 +245,10 @@ class Login {
        } }
        }) })
        .catch(error => { .catch(error => {
        Logger.log(error); console.log(error)
        // Logger.log(error);
        this.handleLoginError(); this.handleLoginError();
        Logger.log('获取网络配置失败'); // Logger.log('获取网络配置失败');
        }); });
        } }
        ...@@ -428,7 +430,7 @@ class Login { ...@@ -428,7 +430,7 @@ class Login {
        qrcodeLogin(code) { qrcodeLogin(code) {
        const self = this; const self = this;
        // eslint-disable-next-line no-undef // eslint-disable-next-line no-undef
        services appService
        .generatetokenByqrcode({ .generatetokenByqrcode({
        f: 'json', f: 'json',
        expiration: self.globalConfig.expiration || 43200000, expiration: self.globalConfig.expiration || 43200000,
        ...@@ -472,8 +474,7 @@ class Login { ...@@ -472,8 +474,7 @@ class Login {
        const password = decode(pwd.substring(0, pwd.length - 3)); const password = decode(pwd.substring(0, pwd.length - 3));
        const self = this; const self = this;
        // eslint-disable-next-line no-undef // eslint-disable-next-line no-undef
        appService
        services
        .generateToken({ .generateToken({
        f: 'json', f: 'json',
        expiration: this.globalConfig.expiration, // token过期时间(单位：秒) expiration: this.globalConfig.expiration, // token过期时间(单位：秒)
        ...@@ -488,7 +489,7 @@ class Login { ...@@ -488,7 +489,7 @@ class Login {
        const tk = response.token; const tk = response.token;
        this.globalConfig.token = tk; this.globalConfig.token = tk;
        // eslint-disable-next-line no-undef,no-debugger // eslint-disable-next-line no-undef,no-debugger
        services appService
        .getUserInfo( .getUserInfo(
        { {
        token: tk, token: tk,
        ...@@ -566,7 +567,7 @@ class Login { ...@@ -566,7 +567,7 @@ class Login {
        if (self.isSignIn || !!industry) { if (self.isSignIn || !!industry) {
        // eslint-disable-next-line no-undef // eslint-disable-next-line no-undef
        services.getUserInfo( appService.getUserInfo(
        { {
        token, token,
        subOID: 'subOID', subOID: 'subOID',
        ...@@ -638,57 +639,93 @@ class Login { ...@@ -638,57 +639,93 @@ class Login {
        } }
        } }
        login(usr, pwd, userPhone, isRememberPWD) { transformLoginHander(response, isRememberPWD) {
        this.events.removeAllListeners('loginError');
        const self = this; const self = this;
        debugger const token = response && ( response.token ? response.token: ( response.access_token !== null && response.user_token !== null) ? response.user_token: '');
        services.generateToken( if (token) {
        { Cookies.set('token', token);
        f: 'json', const exp = 86400000;
        expiration: this.globalConfig.expiration, // token过期时间(单位：秒) self.globalConfig.token = token;
        client: 'referer', if(response.access_token!== "") {
        username: usr, self.globalConfig.access_token = response.access_token;
        password: pwd ? sha1(pwd).toUpperCase() : '', }
        referer: this.globalConfig.client, if (isRememberPWD) {
        skipMenuTest: 1, Cookies.set(self.globalConfig.client, token, {
        userPhone, expires: exp / (24 * 60 * 60 * 1000),
        'request.preventCache': Date.now(), path: '/',
        ignoreSite: true, });
        },
        )
        .then(response => {
        if (response && response.token) {
        const { token } = response;
        Cookies.set('token', token);
        const exp = 86400000;
        this.globalConfig.token = token;
        if (isRememberPWD) {
        Cookies.set(this.globalConfig.client, token, {
        expires: exp / (24 * 60 * 60 * 1000),
        path: '/',
        });
        Cookies.set('token', token, { Cookies.set('token', token, {
        expires: exp / (24 * 60 * 60 * 1000), expires: exp / (24 * 60 * 60 * 1000),
        path: '/', path: '/',
        }); });
        } }
        this.isSignIn = true; self.isSignIn = true;
        this.updateConfig && this.updateConfig(this.globalConfig); self.updateConfig && self.updateConfig(self.globalConfig);
        this.getUserInfoAndConfig(); self.getUserInfoAndConfig();
        } else {
        self.hasTry = true;
        self.events.emit('loginError', response);
        message.error(response.error.message);
        self.callback && self.callback(false);
        }
        }
        login(usr, pwd, userPhone, isRememberPWD, mode = SERVICE_APP_LOGIN_MODE.password) {
        this.events.removeAllListeners('loginError');
        const self = this;
        if(window.globalConfig && window.globalConfig.hasGateWay) {
        usr = userPhone ? userPhone: usr;
        appService.authorizationToken({
        loginName: usr,
        password: pwd ? sha1(pwd).toUpperCase(): '',
        type: mode
        }).then(res => {
        if(res.code === 0) {
        const data = res.data;
        self.updateConfig && self.updateConfig(Object.assign({}, self.globalConfig, {
        access_token: data.access_token,
        token: data.user_token,
        }));
        return data
        } else { } else {
        self.hasTry = true; message.error({
        self.events.emit('loginError', response); duration: 2000,
        message.error(response.error.message); content: `授权失败:${res.msg}`
        self.callback && self.callback(false); });
        self.events.emit('loginError', res.msg);
        return Promise.reject(res)
        } }
        }).then((res) => {
        self.transformLoginHander(res, isRememberPWD)
        }) })
        .catch(error => { } else {
        self.hasTry = true; appService.generateToken(
        self.handleLoginError(); {
        self.events.emit('loginError', error.message); f: 'json',
        message.error('登录服务异常'); expiration: this.globalConfig.expiration, // token过期时间(单位：秒)
        }); client: 'referer',
        username: usr,
        password: pwd ? sha1(pwd).toUpperCase() : '',
        referer: this.globalConfig.client,
        skipMenuTest: 1,
        userPhone,
        'request.preventCache': Date.now(),
        ignoreSite: true,
        },
        )
        .then(response => {
        self.transformLoginHander(response, isRememberPWD)
        })
        .catch(error => {
        self.hasTry = true;
        self.handleLoginError();
        self.events.emit('loginError', error.message);
        message.error('登录服务异常');
        });
        }
        } }
        loginHandler(user, pwd, userPhone, isRememberPWD, ref) { loginHandler(user, pwd, userPhone, isRememberPWD, ref) {
        ...@@ -707,7 +744,7 @@ class Login { ...@@ -707,7 +744,7 @@ class Login {
        } }
        phoneLoginFormHandler(userPhone, captcha) { phoneLoginFormHandler(userPhone, captcha) {
        this.login('', '', userPhone); this.login('', '', userPhone, '', SERVICE_APP_LOGIN_MODE.phone);
        } }
        slideVerify(ref, onSuccess, onFail, onRefresh) { slideVerify(ref, onSuccess, onFail, onRefresh) {
        ......
        src/polyfills.js 0 → 100644
        View file @ ea4f5471
        import 'core-js/features/array/flat';
        import 'core-js/features/array/flat-map';
        import 'core-js/features/object/from-entries';
        import promiseFinally from 'promise.prototype.finally';
        promiseFinally.shim();
        src/utils/routes.js
        View file @ ea4f5471
        import { isUrl } from '@ant-design/pro-utils';
        import { FILTER_FOLER_REG } from './constants';
        import { transformURL } from './utils'; import { transformURL } from './utils';
        export const isURL = function(url) {
        // eslint-disable-next-line no-useless-escape
        return /^(http|https)?:\/\/([\w-]+\.)+[\w-]+(\/[\w- .\/?%&=]*)?/.test(url);
        }
        /* eslint-disable */ /* eslint-disable */
        export const guid = function(prefix) { export const guid = function(prefix) {
        let date = new Date().getTime(); let date = new Date().getTime();
        ...@@ -60,7 +63,7 @@ const generRotes = (widgets, parent, level = 0) => { ...@@ -60,7 +63,7 @@ const generRotes = (widgets, parent, level = 0) => {
        } else { } else {
        const baseURL = item.product || 'civweb4'; const baseURL = item.product || 'civweb4';
        let url = item.hasOwnProperty('url') ? `/${baseURL}/${item.url.replace(/\s*/g, '')}` let url = item.hasOwnProperty('url') ? `/${baseURL}/${item.url.replace(/\s*/g, '')}`
        : !item.hasOwnProperty('url') : !item.hasOwnProperty('url')
        ? guid('web_console') ? guid('web_console')
        : ''; : '';
        if (url.includes('url=')) { if (url.includes('url=')) {
        ...@@ -68,7 +71,7 @@ const generRotes = (widgets, parent, level = 0) => { ...@@ -68,7 +71,7 @@ const generRotes = (widgets, parent, level = 0) => {
        url = getURL(url); url = getURL(url);
        } }
        if(isUrl(item.url)) { if(isURL(item.url)) {
        url = item.url url = item.url
        } }
        ...@@ -79,7 +82,7 @@ const generRotes = (widgets, parent, level = 0) => { ...@@ -79,7 +82,7 @@ const generRotes = (widgets, parent, level = 0) => {
        component: 'BasicLayout', component: 'BasicLayout',
        path: baseURL !== '' ? transformURL(url) : '', path: baseURL !== '' ? transformURL(url) : '',
        href: url, href: url,
        target: isUrl(url) ? '_blank' : '', target: isURL(url) ? '_blank' : '',
        key: guid('panda'), key: guid('panda'),
        hideInMenu: l > 3, hideInMenu: l > 3,
        application: item.product, application: item.product,
        ......
        src/utils/share.js 0 → 100644
        View file @ ea4f5471
        import _ from 'lodash';
        /* eslint-disable */
        function defineProperty(obj, key, value) {
        return key in obj ? Object.defineProperty(obj, value, {
        value: value,
        enumerable: !0,
        configurable: !0,
        writable: !0
        }) : obj[key] = value,
        obj
        }
        const isSymbol = "function" === typeof Symbol && "symbol" === typeof Symbol.iterator ? function(value) {
        return typeof value
        } : function(value) {
        return value && "function" === typeof Symbol && value.constructor === Symbol && value !== Symbol.prototype ? "symbol" : typeof value
        };
        function I18n() {
        this._attr = {};
        this.prepareI18n();
        }
        I18n.prototype.prepareI18n = function() {
        let ret = {};
        const i18ns = document.querySelectorAll("script[type=\"json/i18n\"]");
        Array.prototype.forEach.call(i18ns, i18ns => {
        try {
        ret = Object.assign({}, ret, JSON.parse(i18ns.textContent))
        } catch (e) {
        console && console.warn && console.warn("\u6587\u6848\u89E3\u6790\u5931\u8D25\uFF0C\u8282\u70B9\u5185\u5BB9\uFF1A\n%s", item.outerHTML)
        }
        })
        this.set("i18n", ret);
        }
        I18n.prototype.getI18n = function(key, value) {
        const name = key + (value ? "_plain": "");
        if(this.i18nMap || (this.i18nMap = {}), !this.i18nMap[name] && this.get("i18n")) {
        if(value) {
        let ret = {};
        let i18 = this.get("i18n");
        Object.keys(i18).forEach(item => {
        0 == item.indexOf(key + ".") && (ret[item.replace(key +".", "")] = i18[item])
        });
        this.i18nMap[name] = ret;
        } else {
        const obj = {
        namespace: key,
        parsePage: !1,
        locale: "zh_CN",
        langPacks: {},
        region:"CN",
        source: this.get("source") || null
        }
        obj.langPacks[obj.locale] = this.get("i18n");
        this.i18nMap[name] = new Intl(obj)
        }
        }
        return this.i18nMap[name] || null;
        }
        I18n.prototype.set = function(key, value) {
        _.set(this._attr, key, value);
        return _.get(this._attr, key)
        }
        I18n.prototype.get = function(key) {
        return _.get(this._attr, key)
        }
        function Intl(option) {
        this._config = option;
        this._setNamespace(option.namespace)
        this._setLocale(option.locale)
        this._setDefaultLocale(option.defaultLocale)
        this._setDefaultValue(option.defaultValue)
        this._setLangPacks(option.parsePage ? this._parsePage(): {});
        this._setLangPacks(option.langPacks);
        this._setData(option.data)
        }
        Intl.prototype._inspectValue = function(value) {
        return value && "string" === typeof value ? value : ""
        }
        Intl.prototype._parsePage = function() {
        let ret = {};
        const i18ns = document.querySelectorAll("script[type=\"json/i18n\"]");
        return Array.prototype.forEach.call(i18ns, item => {
        const locale = this._inspectValue(item.getAttribute("locale"));
        try {
        const content = JSON.parse(item.textContent);
        ret[locale] ? Object.assign(ret[locale], content): ret[locale] = content
        }catch (e) {
        console && console.warn && console.warn("\u6587\u6848\u89E3\u6790\u5931\u8D25\uFF0C\u8282\u70B9\u5185\u5BB9\uFF1A\n%s", b.outerHTML)
        }
        }), ret;
        }
        Intl.prototype._setNamespace = function(name) {
        this._namespace = this._inspectValue(name)
        }
        Intl.prototype._setLocale = function(locale) {
        this._locale = this._inspectValue(locale)
        }
        Intl.prototype._setDefaultLocale = function(locale) {
        this._defaultLocale = this._inspectValue(locale)
        }
        Intl.prototype._setDefaultValue = function(value) {
        this._defaultValue = this._inspectValue(value)
        }
        Intl.prototype._setLangPacks = function(pack) {
        this._langPacks || (this._langPacks = {});
        "object" !== ("undefined" === typeof pack ? "undefined" : isSymbol(pack)) && (pack = {});
        Object.keys(pack).forEach(item => {
        const data = pack[item];
        item = item || this._getLocal();
        this._langPacks[item] ? Object.assign(this._langPacks[item], data): this._langPacks[item] = data
        })
        }
        Intl.prototype._setData = function(data) {
        this._data || (this._data = {});
        Object.assign(this._data, data);
        }
        Intl.prototype._getCookieLocal = function() {
        return ("zh_CN").replace(/_/, "-").toLowerCase()
        }
        Intl.prototype._getBrowserLanguage = function() {
        return (navigator.language || navigator.browserLanguage || "").replace(/_/, "-").toLowerCase()
        }
        Intl.prototype._getLocal = function() {
        const locale = this._locale || this._defaultLocale || this._getCookieLocal() || this._getBrowserLanguage() || "zh-cn";
        return locale
        }
        Intl.prototype._getLangPack = function(key) {
        key= key && "undefined" !== typeof key ? key : this._getLocal();
        return this._langPacks[key]
        }
        Intl.prototype._getName = function(name) {
        const namespace = this._namespace;
        return "" === namespace ? name : namespace + "." + name
        }
        Intl.prototype._getValue = function(key, value) {
        if ("string" !== typeof key)
        return console && console.warn && console.warn("\u6587\u6848\u7D22\u5F15 [%s] \u4E0D\u5408\u7B26\u8981\u6C42\u3002", key), !1;
        const pack = this._getLangPack(value)
        const name = this._getName(key);
        return pack ? pack[name] : void 0
        }
        Intl.prototype._getCopy = function(a, b) {
        if ("string" === typeof a) {
        var c = "__i18n-react-split__"
        , e = {}
        , f = this
        , g = a.replace(/\{\s*(?:([^}\s]+)\s+)?([^}\s]+)(?:\s+([^}]+))*\s*\}/g, function(a, g, h, i) {
        var j;
        if (b && (j = b[h]),
        "undefined" === typeof j && (j = f._data[h] || "--"),
        g) {
        var k = Helpers[g];
        if (k)
        try {
        j = k.bind(f)(h, j, i)
        } catch (a) {
        console && console.warn && console.warn("\u8F85\u52A9\u65B9\u6CD5 [%s] \u6267\u884C\u5F02\u5E38\uFF0C\u8BF7\u68C0\u67E5\u65B9\u6CD5\u4F53\u4EE3\u7801\u3002", g)
        }
        else
        console && console.warn && console.warn("\u8F85\u52A9\u65B9\u6CD5 [%s] \u4E0D\u5B58\u5728\uFF0C\u8BF7\u786E\u8BA4\u6587\u6848\u5B9A\u4E49\u662F\u5426\u6B63\u786E\u3002", g)
        } else
        j && "symbol" === d(j.$$typeof) && (e[h] = j,
        j = c + h + c);
        return "" + j || a
        });
        return -1 < g.indexOf(c) ? g.split(c).map(function(a, b) {
        return e[a] ? cloneElement(e[a], {
        key: b
        }) : a
        }).filter(function(a) {
        return !!a
        }) : g
        }
        return a
        }
        Intl.prototype.parsePage = function() {
        const parsePack = this._parsePage();
        this._setLangPacks(parsePack)
        }
        Intl.prototype.has = function(key, value) {
        const data = this._getValue(key, value);
        return "undefined" !== typeof data
        }
        Intl.prototype.get = function(obj, key, value) {
        try {
        key && "object" === ("undefined" === typeof key ? "undefined" : isSymbol(key)) && (value = key, key = this._getLocal());
        const original = this.getOriginal(obj, key);
        return original && value ? this._getCopy(original, value) : original
        } catch (c) {
        console.warn("i18n not found", obj, key, this._locale)
        }
        }
        Intl.prototype.getKeys = function(key) {
        let ret = []
        let namespace = "" + key
        const region = this._config.region.toUpperCase()
        const source = (this._config.source || "").toUpperCase();
        ret.push(namespace)
        namespace = namespace + "_" + region
        ret.push(namespace);
        return ret;
        }
        Intl.prototype.getOriginal = function(key, c) {
        c = c || this._getLocal();
        for (var d = void 0, e = void 0, data = this.getKeys(key), g = data[data.length - 1]; data.length && (e = data.pop(),
        d = this._getValue(e, c),
        !d); )
        ;
        return e && e !== g && this._setLangPacks(defineProperty({}, c, defineProperty({}, this._namespace + "." + g, d))),
        !d && console && console.warn && console.warn("[" + this._namespace + "].[" + key + "] not found in [" + c + "]"),
        d
        }
        Intl.prototype.getLocale = function() {
        return this._getLocal()
        }
        Intl.prototype.setConfig = function(config) {
        "object" !== ("undefined" === typeof config ? "undefined" : isSymbol(config)) && (config = {}),
        Object.keys(config).forEach((item) => {
        const data = "_set" + item.replace(/^(.)/, function(match) {
        return match.toUpperCase()
        });
        this[data] && this[data](config[item])
        })
        }
        export default new I18n();
        src/vm.js 0 → 100644
        View file @ ea4f5471
        import '@babel/polyfill';
        import './polyfills';
        import {
        initializeBrowserVM,
        setLogStatus,
        } from '@wisdom-utils/vapp-browser-vm/lib/vm';
        import plugins from '@wisdom-utils/vapp-browser-vm-plugins';
        setLogStatus(false);
        (async () => {
        await initializeBrowserVM({ plugins });
        })();
        Markdown is supported
        0% or
        You are about to add 0 people to the discussion. Proceed with caution.
        Finish editing this message first!
        Please register or to comment