cli4

2019-12-14 22:12:45 +08:00 · 2019-12-14 22:12:45 +08:00 · 28e7a3b97f
parent b05974bbc2
commit 28e7a3b97f
12 changed files with 13071 additions and 3883 deletions
--- a/.browserslistrc
+++ b/.browserslistrc
@ -1,3 +1,2 @@
 > 1%
 last 2 versions
-not ie <= 8
--- a/.editorconfig
+++ b/.editorconfig
@ -0,0 +1,5 @@
+[*.{js,jsx,ts,tsx,vue}]
+indent_style = space
+indent_size = 2
+trim_trailing_whitespace = true
+insert_final_newline = true
--- a/.eslintrc.js
+++ b/.eslintrc.js
@ -13,5 +13,16 @@ module.exports = {
  },
  parserOptions: {
    parser: 'babel-eslint'
+  },
+  overrides: [
+    {
+      files: [
+        '**/__tests__/*.{j,t}s?(x)',
+        '**/tests/unit/**/*.spec.{j,t}s?(x)'
+      ],
+      env: {
+        jest: true
      }
    }
+  ]
+}
--- a/.gitignore
+++ b/.gitignore
@ -2,6 +2,10 @@
 node_modules
 /dist

+# local env files
+.env.local
+.env.*.local
+
 # Log files
 npm-debug.log*
 yarn-debug.log*
@ -14,4 +18,4 @@ yarn-error.log*
 *.ntvs*
 *.njsproj
 *.sln
-*.sw*
+*.sw?
--- a/README.md
+++ b/README.md
@ -19,30 +19,19 @@ D2Admin is a fully open source and free enterprise back-end product front-end in

 [中文](https://github.com/d2-projects/d2-admin/blob/master/README.zh.md) | **English**

+## Preview
+
+| server | link | server | status |
+| --- | --- | --- | --- |
+| d2.pub | [d2.pub/d2-admin/preview](https://d2.pub/d2-admin/preview) | China server | [![](https://github.com/d2-projects/d2-admin/workflows/Deploy%20https%3A%2F%2Fd2.pub/badge.svg)](https://github.com/d2-projects/d2-admin/actions?query=workflow%3A%22Deploy+https%3A%2F%2Fd2.pub%22) |
+| cdn.d2.pub | [cdn.d2.pub/d2-admin/preview](https://cdn.d2.pub/d2-admin/preview) | qiniu CDN | [![](https://github.com/d2-projects/d2-admin/workflows/Deploy%20cdn/badge.svg)](https://github.com/d2-projects/d2-admin/actions?query=workflow%3A%22Deploy+cdn%22) |
+| github | [d2-projects.github.io/d2-admin](https://d2-projects.github.io/d2-admin) | GitHub pages | [![](https://github.com/d2-projects/d2-admin/workflows/Deploy%20Github/badge.svg)](https://github.com/d2-projects/d2-admin/actions?query=workflow%3A%22Deploy+Github%22) |
+| netlify | [d2-admin.netlify.com](https://d2-admin.netlify.com) | Netlify CDN | [![](https://api.netlify.com/api/v1/badges/a5dd4bbd-da3f-4145-98a9-8012577bdcf5/deploy-status)](https://app.netlify.com/sites/d2-admin/deploys) |
+
 ## Document

 [Document](https://fairyever.com/d2-admin/doc/)

-## Preview
-
-| server | link | info | status |
-| --- | --- | --- | --- |
-| d2.pub | [d2.pub](https://d2.pub/d2-admin/preview/) | China server | [![](https://github.com/d2-projects/d2-admin/workflows/Deploy%20https%3A%2F%2Fd2.pub/badge.svg)](https://github.com/d2-projects/d2-admin/actions?query=workflow%3A%22Deploy+https%3A%2F%2Fd2.pub%22) |
-| cdn.d2.pub | [cdn.d2.pub](https://cdn.d2.pub/d2-admin/preview/) | Using qiniu CDN whole station | [![](https://github.com/d2-projects/d2-admin/workflows/Deploy%20cdn/badge.svg)](https://github.com/d2-projects/d2-admin/actions?query=workflow%3A%22Deploy+cdn%22) |
-| github | [d2-projects.github.io](https://d2-projects.github.io/d2-admin/) | Deploy on GitHub pages | [![](https://github.com/d2-projects/d2-admin/workflows/Deploy%20Github/badge.svg)](https://github.com/d2-projects/d2-admin/actions?query=workflow%3A%22Deploy+Github%22) |
-| netlify | [netlify.com](https://d2-admin.netlify.com/) | Deploy on Netlify CDN | [![](https://api.netlify.com/api/v1/badges/a5dd4bbd-da3f-4145-98a9-8012577bdcf5/deploy-status)](https://app.netlify.com/sites/d2-admin/deploys) |
-
-## Become a sponsor
-
-[Sponsor me on afdian.net](https://afdian.net/@fairyever)
-
-## Other synchronous repositories
-
-| type | link |
-| --- | --- |
-| gitee | [https://gitee.com/fairyever/d2-admin](https://gitee.com/fairyever/d2-admin) |
-| coding | [https://d2-projects.coding.net/p/d2-admin/d/d2-admin/git](https://d2-projects.coding.net/p/d2-admin/d/d2-admin/git) |
-
 ## Features

 * Build with vue-cli3
@ -102,12 +91,19 @@ D2Admin is a fully open source and free enterprise back-end product front-end in
 * Optimize the construction of production environment, load only local JavaScript code less than 60kb on the homepage `1.8.0 +`
 * Built in build file volume checking tool `1.8.0 +`

+## Other synchronous repositories
+
+| type | link |
+| --- | --- |
+| gitee | [https://gitee.com/fairyever/d2-admin](https://gitee.com/fairyever/d2-admin) |
+| coding | [https://d2-projects.coding.net/p/d2-admin/d/d2-admin/git](https://d2-projects.coding.net/p/d2-admin/d/d2-admin/git) |
+
 ## Other version

 | Name | HomePage  | Preview | Introduction |
 | --- | --- | --- | --- |
-| Starter template | [Github](https://github.com/d2-projects/d2-admin-start-kit) | [Preview](https://fairyever.com/d2-admin-start-kit/preview/) |  |
-| D2 Admin Renren | Private project | [Preview](https://fairyever.com/d2-admin-renren-security-enterprise/preview/) | [renren](https://www.renren.io) |
+| Starter template | [Github](https://github.com/d2-projects/d2-admin-start-kit) | [Preview](https://fairyever.com/d2-admin-start-kit/preview) |  |
+| D2 Admin Renren | Private project | [Preview](https://fairyever.com/d2-admin-renren-security-enterprise/preview) | [renren](https://www.renren.io) |

 ## Ecology

@ -161,10 +157,15 @@ At the same time, you can report your project to us. We will place the excellent
 * [@FairyEver](https://github.com/FairyEver)
 * [@sunhaoxiang](https://github.com/sunhaoxiang)
 * [@Aysnine](https://github.com/Aysnine)
+* [@luchaohai](https://github.com/luchaohai)
 * [@han-feng](https://github.com/han-feng)
 * [@rongxingsun](https://github.com/rongxingsun)
 * [@dnyz520](https://github.com/dnyz520)

+## Become a sponsor
+
+[Sponsor me on afdian.net](https://afdian.net/@fairyever)
+
 ## Sponsor

 **cochlea** | **Baron** | **苦行僧** | **吴地安宁** | **KingDong**
--- a/README.zh.md
+++ b/README.zh.md
@ -19,32 +19,19 @@

 **中文** | [English](https://github.com/d2-projects/d2-admin)

+## 预览
+
+| 位置 | 链接 | 部署位置 | 状态 |
+| --- | --- | --- | --- |
+| d2.pub | [d2.pub/d2-admin/preview](https://d2.pub/d2-admin/preview) | 中国服务器 | [![](https://github.com/d2-projects/d2-admin/workflows/Deploy%20https%3A%2F%2Fd2.pub/badge.svg)](https://github.com/d2-projects/d2-admin/actions?query=workflow%3A%22Deploy+https%3A%2F%2Fd2.pub%22) |
+| cdn.d2.pub | [cdn.d2.pub/d2-admin/preview](https://cdn.d2.pub/d2-admin/preview) | 七牛云 CDN | [![](https://github.com/d2-projects/d2-admin/workflows/Deploy%20cdn/badge.svg)](https://github.com/d2-projects/d2-admin/actions?query=workflow%3A%22Deploy+cdn%22) |
+| github | [d2-projects.github.io/d2-admin](https://d2-projects.github.io/d2-admin) | GitHub pages | [![](https://github.com/d2-projects/d2-admin/workflows/Deploy%20Github/badge.svg)](https://github.com/d2-projects/d2-admin/actions?query=workflow%3A%22Deploy+Github%22) |
+| netlify | [d2-admin.netlify.com](https://d2-admin.netlify.com) | Netlify CDN | [![](https://api.netlify.com/api/v1/badges/a5dd4bbd-da3f-4145-98a9-8012577bdcf5/deploy-status)](https://app.netlify.com/sites/d2-admin/deploys) |
+
 ## 文档

 [文档](https://fairyever.com/d2-admin/doc/)

-## 预览
-
-| 位置 | 链接 | 介绍 | 状态 |
-| --- | --- | --- | --- |
-| d2.pub | [d2.pub](https://d2.pub/d2-admin/preview/) | 中国服务器，部分 CDN 依赖 | [![](https://github.com/d2-projects/d2-admin/workflows/Deploy%20https%3A%2F%2Fd2.pub/badge.svg)](https://github.com/d2-projects/d2-admin/actions?query=workflow%3A%22Deploy+https%3A%2F%2Fd2.pub%22) |
-| cdn.d2.pub | [cdn.d2.pub](https://cdn.d2.pub/d2-admin/preview/) | 全站七牛云 CDN | [![](https://github.com/d2-projects/d2-admin/workflows/Deploy%20cdn/badge.svg)](https://github.com/d2-projects/d2-admin/actions?query=workflow%3A%22Deploy+cdn%22) |
-| github | [d2-projects.github.io](https://d2-projects.github.io/d2-admin/) | 部署在 GitHub pages | [![](https://github.com/d2-projects/d2-admin/workflows/Deploy%20Github/badge.svg)](https://github.com/d2-projects/d2-admin/actions?query=workflow%3A%22Deploy+Github%22) |
-| netlify | [netlify.com](https://d2-admin.netlify.com/) | 部署在 Netlify CDN | [![](https://api.netlify.com/api/v1/badges/a5dd4bbd-da3f-4145-98a9-8012577bdcf5/deploy-status)](https://app.netlify.com/sites/d2-admin/deploys) |
-
-## 成为赞助者
-
-[在 "爱发电" 上赞助我](https://afdian.net/@fairyever)
-
-## 其它同步仓库
-
-| 位置 | 链接 |
-| --- | --- |
-| 码云 | [https://gitee.com/fairyever/d2-admin](https://gitee.com/fairyever/d2-admin) |
-| coding | [https://d2-projects.coding.net/p/d2-admin/d/d2-admin/git](https://d2-projects.coding.net/p/d2-admin/d/d2-admin/git) |
-
-> 如果您在 github 仓库下载很慢，可以尝试使用我们的码云仓库克隆代码
-
 ## 功能

 * 使用 vue-cli3 构建
@ -104,12 +91,21 @@
 * 优化生产环境构建，首页只加载小于 60kb 的本地 js 代码 `1.8.0 +`
 * 内置了构建文件体积检查工具 `1.8.0 +`

+## 其它同步仓库
+
+| 位置 | 链接 |
+| --- | --- |
+| 码云 | [https://gitee.com/fairyever/d2-admin](https://gitee.com/fairyever/d2-admin) |
+| coding | [https://d2-projects.coding.net/p/d2-admin/d/d2-admin/git](https://d2-projects.coding.net/p/d2-admin/d/d2-admin/git) |
+
+> 如果您在 github 仓库下载很慢，可以尝试使用我们的码云仓库克隆代码
+
 ## 其它版本

 | 名称 | Github / 主页  | 预览 | 介绍 |
 | --- | --- | --- | --- |
-| 简化版模板 | [Github](https://github.com/d2-projects/d2-admin-start-kit) | [预览](https://fairyever.com/d2-admin-start-kit/preview/) | 无 |
-| 人人开源适配 | 应人人开源的要求，暂不公开 | [预览](https://fairyever.com/d2-admin-renren-security-enterprise/preview/) | [人人开源](https://www.renren.io) |
+| 简化版模板 | [Github](https://github.com/d2-projects/d2-admin-start-kit) | [预览](https://fairyever.com/d2-admin-start-kit/preview) | 无 |
+| 人人开源适配 | 应人人开源的要求，暂不公开 | [预览](https://fairyever.com/d2-admin-renren-security-enterprise/preview) | [人人开源](https://www.renren.io) |

 ## 生态

@ -142,6 +138,15 @@
 | Aooms | Spring Cloud | [码云](https://gitee.com/cyb-javaer/Aooms) | [预览](https://www.yuboon.com/Aooms) | 极速微服务开发，不止像JFinal一样简单 |
 | GOA | Beego | [Github](https://github.com/Qsnh/goa) | [预览](http://goaio.vip/) | 基于 Beego + Vue 开发的在线问答系统 |

+## 加入我们
+
+D2Admin 是完全开源免费的项目，旨在帮助开发者更方便地进行管理系统开发，同时也提供 QQ 交流群和微信群，前后端的朋友可以相互答疑，项目组成员全部在内，所有 D2 相关项目使用问题欢迎在群内提问。
+
+* QQ 1 群 `806395827` ( 2000 人已满 )
+* QQ 2 群 `592981556`
+
+![join](https://raw.githubusercontent.com/FairyEver/d2-admin/master/doc/image/join@2x.png)
+
 ## 徽章

 如果您的开源项目基于 D2Admin 开发，请在您的 README 添加下面的徽章：
@ -158,24 +163,20 @@

 同时您可以将您的项目汇报给我们，优秀项目我们会放置在 D2Admin 相关位置并帮助您宣传。

-## 加入我们
-
-D2Admin 是完全开源免费的项目，旨在帮助开发者更方便地进行管理系统开发，同时也提供 QQ 交流群和微信群，前后端的朋友可以相互答疑，项目组成员全部在内，所有 D2 相关项目使用问题欢迎在群内提问。
-
-* QQ 1 群 `806395827` ( 2000 人已满 )
-* QQ 2 群 `592981556`
-
-![join](https://raw.githubusercontent.com/FairyEver/d2-admin/master/doc/image/join@2x.png)
-
 ## 贡献

 * [@FairyEver](https://github.com/FairyEver)
 * [@sunhaoxiang](https://github.com/sunhaoxiang)
 * [@Aysnine](https://github.com/Aysnine)
+* [@luchaohai](https://github.com/luchaohai)
 * [@han-feng](https://github.com/han-feng)
 * [@rongxingsun](https://github.com/rongxingsun)
 * [@dnyz520](https://github.com/dnyz520)

+## 成为赞助者
+
+[在 "爱发电" 上赞助我](https://afdian.net/@fairyever)
+
 ## 赞助

 **cochlea** | **Baron** | **苦行僧** | **吴地安宁** | **KingDong**
--- a/babel.config.js
+++ b/babel.config.js
@ -1,6 +1,6 @@
 module.exports = {
  presets: [
-    '@vue/app'
+    '@vue/cli-plugin-babel/preset'
  ],
  // 允许两种编码引入方式共存,也就是 common 规范与 es6 规范的共存处理
  sourceType: 'unambiguous'
--- a/jest.config.js
+++ b/jest.config.js
@ -1,23 +1,3 @@
 module.exports = {
-  moduleFileExtensions: [
-    'js',
-    'jsx',
-    'json',
-    'vue'
-  ],
-  transform: {
-    '^.+\\.vue$': 'vue-jest',
-    '.+\\.(css|styl|less|sass|scss|png|jpg|ttf|woff|woff2)$': 'jest-transform-stub',
-    '^.+\\.jsx?$': 'babel-jest'
-  },
-  moduleNameMapper: {
-    '^@/(.*)$': '<rootDir>/src/$1'
-  },
-  snapshotSerializers: [
-    'jest-serializer-vue'
-  ],
-  testMatch: [
-    '**/tests/unit/**/*.spec.(js|jsx|ts|tsx)|**/__tests__/*.(js|jsx|ts|tsx)'
-  ],
-  testURL: 'http://localhost/'
+  preset: '@vue/cli-plugin-unit-jest'
 }
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@ -3,16 +3,16 @@
  "version": "1.8.0",
  "scripts": {
    "serve": "vue-cli-service serve --open",
-    "lint": "vue-cli-service lint --fix",
+    "start": "npm run serve",
+    "dev": "npm run serve",
    "build": "vue-cli-service build",
    "build:nomock": "vue-cli-service build --mode nomock",
    "build:preview": "NODE_OPTIONS=--max_old_space_size=4096 vue-cli-service build --mode preview",
    "build:github": "NODE_OPTIONS=--max_old_space_size=4096 vue-cli-service build --mode github",
    "build:netlify": "NODE_OPTIONS=--max_old_space_size=4096 vue-cli-service build --mode netlify",
-    "dev": "npm run serve",
-    "i18n:report": "vue-cli-service i18n:report --src './src/**/*.?(js|vue)' --locales './src/locales/**/*.json'",
-    "start": "npm run serve",
+    "lint": "vue-cli-service lint --fix",
    "test:unit": "vue-cli-service test:unit",
+    "i18n:report": "vue-cli-service i18n:report --src './src/**/*.?(js|vue)' --locales './src/locales/**/*.json'",
    "analyz": "npm_config_report=true npm run build"
  },
  "dependencies": {
@ -21,60 +21,62 @@
    "@d2-projects/vue-table-import": "^1.0.0",
    "axios": "^0.19.0",
    "better-scroll": "^1.15.2",
-    "clipboard-polyfill": "^2.8.1",
+    "clipboard-polyfill": "^2.8.6",
+    "core-js": "^3.4.3",
    "countup.js": "^2.0.4",
    "dayjs": "^1.8.17",
-    "echarts": "^4.2.1",
+    "echarts": "^4.5.0",
    "element-ui": "^2.13.0",
    "flex.css": "^1.1.7",
-    "fuse.js": "^3.4.5",
+    "fuse.js": "^3.4.6",
    "github-markdown-css": "^3.0.1",
    "highlight.js": "^9.17.1",
-    "hotkeys-js": "^3.6.11",
-    "js-cookie": "^2.2.0",
+    "hotkeys-js": "^3.7.3",
+    "js-cookie": "^2.2.1",
    "lodash": "^4.17.15",
    "lowdb": "^1.0.0",
-    "marked": "^0.6.2",
+    "marked": "^0.8.0",
    "mockjs": "^1.1.0",
    "nprogress": "^0.2.0",
-    "qs": "^6.7.0",
-    "quill": "^1.3.6",
+    "qs": "^6.9.1",
+    "quill": "^1.3.7",
    "screenfull": "^5.0.0",
    "simplemde": "^1.11.2",
    "sortablejs": "^1.10.1",
    "ua-parser-js": "^0.7.20",
    "v-charts": "^1.19.0",
    "v-contextmenu": "^2.9.0",
-    "vue": "^2.6.10",
-    "vue-grid-layout": "^2.3.4",
+    "vue": "^2.6.11",
+    "vue-grid-layout": "^2.3.7",
    "vue-i18n": "^8.15.1",
    "vue-json-tree-view": "^2.1.4",
-    "vue-router": "^3.0.6",
+    "vue-router": "^3.1.3",
    "vue-splitpane": "^1.0.6",
    "vue-ueditor-wrap": "^2.4.1",
-    "vuex": "^3.1.1"
+    "vuex": "^3.1.2"
  },
  "devDependencies": {
-    "@d2-projects/vue-filename-injector": "^1.0.0",
-    "@kazupon/vue-i18n-loader": "^0.3.0",
-    "@vue/cli-plugin-babel": "^3.8.0",
-    "@vue/cli-plugin-eslint": "^3.8.0",
-    "@vue/cli-plugin-unit-jest": "^3.8.0",
-    "@vue/cli-service": "^3.8.0",
+    "@d2-projects/vue-filename-injector": "^1.1.0",
+    "@kazupon/vue-i18n-loader": "^0.4.1",
+    "@vue/cli-plugin-babel": "^4.1.0",
+    "@vue/cli-plugin-eslint": "^4.1.0",
+    "@vue/cli-plugin-router": "^4.1.0",
+    "@vue/cli-plugin-unit-jest": "^4.1.0",
+    "@vue/cli-plugin-vuex": "^4.1.0",
+    "@vue/cli-service": "^4.1.0",
    "@vue/eslint-config-standard": "^4.0.0",
    "@vue/test-utils": "1.0.0-beta.29",
-    "babel-eslint": "^10.0.2",
-    "babel-jest": "^24.8.0",
+    "babel-eslint": "^10.0.3",
    "compression-webpack-plugin": "^3.0.1",
    "eslint": "^5.16.0",
-    "eslint-plugin-vue": "^5.2.2",
-    "sass": "^1.21.0",
-    "sass-loader": "^7.1.0",
+    "eslint-plugin-vue": "^5.0.0",
+    "sass": "^1.23.7",
+    "sass-loader": "^8.0.0",
    "svg-sprite-loader": "^4.1.6",
-    "text-loader": "0.0.1",
+    "text-loader": "^0.0.1",
    "vue-cli-plugin-i18n": "^0.6.0",
    "vue-template-compiler": "^2.6.10",
    "webpack-bundle-analyzer": "^3.6.0",
-    "webpack-theme-color-replacer": "^1.2.15"
+    "webpack-theme-color-replacer": "^1.3.3"
  }
 }
--- a/vue.config.js
+++ b/vue.config.js
@ -35,7 +35,7 @@ module.exports = {
    loaderOptions: {
      // 设置 scss 公用变量文件
      sass: {
-        data: `@import '~@/assets/style/public.scss';`
+        prependData: `@import '~@/assets/style/public.scss';`
      }
    }
  },
--- a/yarn.lock
+++ b/yarn.lock