Merge branch 'develop'

Former-commit-id: 274c859e4d9db1e6634dba0d7eee6fb203e628fe [formerly 274c859e4d9db1e6634dba0d7eee6fb203e628fe [formerly 274c859e4d9db1e6634dba0d7eee6fb203e628fe [formerly 274c859e4d9db1e6634dba0d7eee6fb203e628fe [formerly a7bc2d2c58251a6a7e0fe8e5757e1aec1357eece [formerly d58577bf93cb6bedc4fb68528623a93025854c2b]]]]]
Former-commit-id: 24e7e618a87015508620d78cabe379711e420e73
Former-commit-id: e4654008f7b2305bd618cce76cd0a4eeb36a058f
Former-commit-id: c4b43517c1f86fc2096f04b25d9b08d530792e0f [formerly 82559ca9e70c51c432c6089aee9cc7afc2b3e65a]
Former-commit-id: f702061af314fb569fb1d40c3575f56ac6baf20f
Former-commit-id: 485d239dcae625d34896608a817b1cec06e73994
Former-commit-id: a3d94e702204708927e3895fe4e21b1a1732675d
Former-commit-id: e28bdfdea765cb34d4a2857a5b8ae69c6b3ea69a
Former-commit-id: ff6c14a9768df04670321e3f8292469f18451209

babel.config.js

@@ -1,5 +1,9 @@
 module.exports = {
   presets: [
     '@vue/app'
+  ],
+  plugins: [
+    // https://babeljs.io/docs/en/babel-plugin-transform-runtime/
+    '@babel/plugin-transform-runtime'
   ]
 }

package-lock.json.REMOVED.git-id

@@ -1 +1 @@
-7cd90f8e41f5d7205377cf814f08e634d7d234d6
+aba14ba69c1b10aabcba100e3478b48ba9f2c465

package.json

@@ -1,6 +1,6 @@
 {
   "name": "d2-admin",
-  "version": "1.6.13",
+  "version": "1.6.14",
   "private": true,
   "scripts": {
     "serve": "vue-cli-service serve --open",
@@ -13,12 +13,12 @@
     "test:unit": "vue-cli-service test:unit"
   },
   "dependencies": {
+    "@babel/runtime": "^7.2.0",
     "@d2-projects/d2-crud": "^2.0.3",
     "@d2-projects/vue-filters-date": "^1.0.2",
     "@d2-projects/vue-table-export": "^1.0.1",
     "@d2-projects/vue-table-import": "^1.0.0",
     "axios": "^0.17.1",
-    "babel-polyfill": "^6.26.0",
     "better-scroll": "^1.12.1",
     "clipboard-polyfill": "^2.4.1",
     "countup.js": "^1.9.3",
@@ -53,6 +53,7 @@
     "vuex": "^3.0.1"
   },
   "devDependencies": {
+    "@babel/plugin-transform-runtime": "^7.2.0",
     "@kazupon/vue-i18n-loader": "^0.3.0",
     "@vue/cli-plugin-babel": "^3.0.0",
     "@vue/cli-plugin-eslint": "^3.0.0",

src/components/d2-container/components/d2-source.vue

@@ -24,9 +24,7 @@ export default {
   },
   computed: {
     show () {
-      return process.env.VUE_APP_BUILD_MODE === 'TRAVIS' ||
-        process.env.NODE_ENV === 'development' &&
-        this.filename
+      return (process.env.VUE_APP_BUILD_MODE === 'TRAVIS' || process.env.NODE_ENV === 'development') && this.filename
     }
   },
   mounted () {

src/main.js

@@ -1,5 +1,3 @@
-// polyfill
-import 'babel-polyfill'
 // Vue
 import Vue from 'vue'
 import App from './App'

vue.config.js

@@ -98,7 +98,6 @@ module.exports = {
       .end()
     // 重新设置 alias
     config.resolve.alias
-      .set('@', resolve('src'))
       .set('@api', resolve('src/api'))
     // node
     config.node
@@ -106,9 +105,6 @@ module.exports = {
       .set('__filename', true)
     // babel-polyfill 加入 entry
     const entry = config.entry('app')
-    entry
-      .add('babel-polyfill')
-      .end()
     // 判断环境加入模拟数据
     if (process.env.VUE_APP_BUILD_MODE !== 'nomock') {
       entry