- 
-
+
+
D2Admin is a fully open source and free enterprise back-end product front-end integration solution, using the latest front-end technology stack, has prepared most of the project preparations, and with a lot of sample code to help the management system agile development.
[中文介绍](https://github.com/d2-projects/d2-admin/blob/master/README.zh.md) | **English**
## Document
-[document](https://doc.d2admin.fairyever.com)
+[Document](https://doc.d2admin.fairyever.com)
## Preview
-[preview](https://d2admin.fairyever.com)
+* [Preview](https://d2-admin.netlify.com) Deployed in Netlify CDN
+* [Preview For Chinese](https://d2admin.fairyever.com) Deployed in qiniu CDN
## Features
@@ -90,6 +99,7 @@ D2Admin is a fully open source and free enterprise back-end product front-end in
| Name | HomePage | Preview | Introduction |
| --- | --- | --- | --- |
| Starter template | [Github](https://github.com/d2-projects/d2-admin-start-kit) | [Preview](https://start-kit.d2admin.fairyever.com) | |
+| D2 Admin Renren | [Github](https://github.com/d2-projects/d2-admin-renren-security-enterprise) | [Preview](https://renren.d2admin.fairyever.com) | [renren](https://www.renren.io) |
| Alibaba Ice scaffold | [Ice](https://alibaba.github.io/ice/scaffold?type=vue) | [Preview](https://ice.d2admin.fairyever.com) | [Introduction](https://juejin.im/post/5b6349716fb9a04f834669d6) |
## Ecology
diff --git a/README.zh.md b/README.zh.md
index 6cae25b5..4732ddce 100644
--- a/README.zh.md
+++ b/README.zh.md
@@ -3,7 +3,6 @@
-
+
+
[D2Admin](https://github.com/d2-projects/d2-admin) 是一个完全 **开源免费** 的企业中后台产品前端集成方案，使用最新的前端技术栈，已经做好大部分项目前期准备工作，并且带有大量示例代码，助力管理系统敏捷开发。
**中文介绍** | [English](https://github.com/d2-projects/d2-admin)
@@ -27,7 +35,8 @@
## 预览
-[预览地址](https://d2admin.fairyever.com)
+* [预览 | 中国](https://d2admin.fairyever.com) 在七牛 CDN 部署
+* [预览 | 其它国家](https://d2-admin.netlify.com) 在 Netlify CDN 部署
## 码云仓库
@@ -96,6 +105,7 @@
| 名称 | Github / 主页 | 预览 | 介绍 |
| --- | --- | --- | --- |
| 简化版模板 | [Github](https://github.com/d2-projects/d2-admin-start-kit) | [预览](https://start-kit.d2admin.fairyever.com) | 无 |
+| 人人开源适配 | [Github](https://github.com/d2-projects/d2-admin-renren-security-enterprise) | [预览](https://renren.d2admin.fairyever.com) | [人人开源](https://www.renren.io) |
| 飞冰脚手架 | [飞冰](https://alibaba.github.io/ice/scaffold?type=vue) | [预览](https://ice.d2admin.fairyever.com) | [介绍](https://juejin.im/post/5b6349716fb9a04f834669d6) |
## 生态
diff --git a/babel.config.js b/babel.config.js
index eceb4cef..ba179669 100644
--- a/babel.config.js
+++ b/babel.config.js
@@ -1,9 +1,5 @@
module.exports = {
presets: [
'@vue/app'
- ],
- plugins: [
- // https://babeljs.io/docs/en/babel-plugin-transform-runtime/
- '@babel/plugin-transform-runtime'
]
}
diff --git a/d2-admin.babel.REMOVED.git-id b/d2-admin.babel.REMOVED.git-id
new file mode 100644
index 00000000..ddba107b
--- /dev/null
+++ b/d2-admin.babel.REMOVED.git-id
@@ -0,0 +1 @@
+681ffc71f82857c857c50891b8f73e04e345c7db
\ No newline at end of file
diff --git a/doc/image/js-now@2x.png.REMOVED.git-id b/doc/image/js-now@2x.png.REMOVED.git-id
new file mode 100644
index 00000000..192da77e
--- /dev/null
+++ b/doc/image/js-now@2x.png.REMOVED.git-id
@@ -0,0 +1 @@
+b60dfdaf4dde7db3b323abf7d6bad7522b655862
\ No newline at end of file
diff --git a/doc/image/reward-me@2x.png.REMOVED.git-id b/doc/image/reward-me@2x.png.REMOVED.git-id
new file mode 100644
index 00000000..955d2fff
--- /dev/null
+++ b/doc/image/reward-me@2x.png.REMOVED.git-id
@@ -0,0 +1 @@
+b3640a7bbe4c0dc38c99be5462d9663ade363433
\ No newline at end of file
diff --git a/package-lock.json.REMOVED.git-id b/package-lock.json.REMOVED.git-id
index f3f6c2ff..c0fb3668 100644
--- a/package-lock.json.REMOVED.git-id
+++ b/package-lock.json.REMOVED.git-id
@@ -1 +1 @@
-4bf0a6ad67e67ee39dd5594ca0e4d1965d5a2de6
\ No newline at end of file
+fed37778e9514dc3dec6b8c767aa01b05250a597
\ No newline at end of file
diff --git a/package.json b/package.json
index ef647820..eb464fcf 100644
--- a/package.json
+++ b/package.json
@@ -1,84 +1,77 @@
{
"name": "d2-admin",
- "version": "1.6.18",
- "private": true,
+ "version": "1.7.0",
"scripts": {
"serve": "vue-cli-service serve --open",
- "start": "npm run serve",
- "dev": "npm run serve",
"build": "vue-cli-service build",
+ "lint": "vue-cli-service lint --fix",
+ "build:netlify": "vue-cli-service build --mode netlify",
"build:nomock": "vue-cli-service build --mode nomock",
"build:travis": "vue-cli-service build --mode travis",
- "lint": "vue-cli-service lint --fix",
+ "dev": "npm run serve",
+ "i18n:report": "vue-cli-service i18n:report --src './src/**/*.?(js|vue)' --locales './src/locales/**/*.json'",
+ "start": "npm run serve",
"test:unit": "vue-cli-service test:unit"
},
"dependencies": {
- "@babel/runtime": "^7.2.0",
"@d2-admin/filters-dayjs": "^1.0.3",
- "@d2-projects/d2-crud": "^2.0.3",
+ "@d2-projects/d2-crud": "^2.0.5",
"@d2-projects/vue-table-export": "^1.0.1",
"@d2-projects/vue-table-import": "^1.0.0",
- "axios": "^0.17.1",
- "better-scroll": "^1.12.1",
- "clipboard-polyfill": "^2.4.1",
- "countup.js": "^1.9.3",
- "dayjs": "^1.6.7",
- "echarts": "^4.1.0",
- "element-ui": "^2.4.11",
+ "axios": "^0.18.0",
+ "better-scroll": "^1.15.2",
+ "clipboard-polyfill": "^2.8.0",
+ "core-js": "^2.6.5",
+ "countup.js": "^2.0.4",
+ "dayjs": "^1.8.12",
+ "echarts": "^4.2.1",
+ "element-ui": "^2.7.2",
"flex.css": "^1.1.7",
- "fuse.js": "^3.2.1",
- "github-markdown-css": "^2.10.0",
- "highlight.js": "^9.12.0",
- "hotkeys-js": "^3.3.6",
+ "fuse.js": "^3.4.4",
+ "github-markdown-css": "^3.0.1",
+ "highlight.js": "^9.15.6",
+ "hotkeys-js": "^3.6.2",
"js-cookie": "^2.2.0",
- "lodash": "^4.17.10",
+ "lodash": "^4.17.11",
"lowdb": "^1.0.0",
- "marked": "^0.3.9",
+ "marked": "^0.6.2",
"mockjs": "^1.0.1-beta3",
"nprogress": "^0.2.0",
- "qs": "^6.6.0",
- "quill": "^1.3.4",
- "screenfull": "^4.0.0",
+ "qs": "^6.7.0",
+ "quill": "^1.3.6",
+ "screenfull": "^4.2.0",
"simplemde": "^1.11.2",
- "ua-parser-js": "^0.7.18",
- "v-charts": "^1.17.6",
- "v-contextmenu": "^2.7.0",
- "vue": "^2.5.17",
- "vue-grid-layout": "^2.1.11",
- "vue-i18n": "^7.4.2",
+ "ua-parser-js": "^0.7.19",
+ "v-charts": "^1.19.0",
+ "v-contextmenu": "^2.8.0",
+ "vue": "^2.6.10",
+ "vue-grid-layout": "^2.3.4",
+ "vue-i18n": "^8.0.0",
"vue-json-tree-view": "^2.1.4",
- "vue-router": "^3.0.1",
- "vue-splitpane": "^1.0.2",
- "vue-ueditor-wrap": "^1.5.0",
+ "vue-router": "^3.0.3",
+ "vue-splitpane": "^1.0.4",
+ "vue-ueditor-wrap": "^2.4.1",
"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",
- "@vue/cli-plugin-unit-jest": "^3.2.3",
- "@vue/cli-service": "^3.0.0",
- "@vue/eslint-config-standard": "^3.0.0",
- "@vue/test-utils": "^1.0.0-beta.28",
+ "@vue/cli-plugin-babel": "^3.6.0",
+ "@vue/cli-plugin-eslint": "^3.6.0",
+ "@vue/cli-plugin-unit-jest": "^3.6.0",
+ "@vue/cli-service": "^3.6.0",
+ "@vue/eslint-config-standard": "^4.0.0",
+ "@vue/test-utils": "1.0.0-beta.29",
"babel-core": "7.0.0-bridge.0",
- "babel-jest": "^23.0.1",
- "lint-staged": "^7.2.0",
- "node-sass": "^4.9.0",
- "sass-loader": "^7.0.1",
- "svg-sprite-loader": "^3.8.0",
+ "babel-eslint": "^10.0.1",
+ "babel-jest": "^23.6.0",
+ "eslint": "^5.16.0",
+ "eslint-plugin-vue": "^5.0.0",
+ "sass": "^1.18.0",
+ "sass-loader": "^7.1.0",
+ "svg-sprite-loader": "^4.1.3",
"text-loader": "0.0.1",
- "uglifyjs-webpack-plugin": "^2.1.1",
- "vue-template-compiler": "^2.5.17"
- },
- "lint-staged": {
- "*.js": [
- "vue-cli-service lint",
- "git add"
- ],
- "*.vue": [
- "vue-cli-service lint",
- "git add"
- ]
+ "uglifyjs-webpack-plugin": "^2.1.2",
+ "vue-cli-plugin-i18n": "^0.6.0",
+ "vue-template-compiler": "^2.5.21"
}
}
diff --git a/public/index.html b/public/index.html
index 01589055..fd333b0c 100644
--- a/public/index.html
+++ b/public/index.html
@@ -13,8 +13,6 @@
.d2-home__footer { width: 100%; flex-grow: 0; text-align: center; padding: 1em 0; }
.d2-home__footer > a { font-size: 12px; color: #ABABAB; text-decoration: none; }
.d2-home__loading { height: 32px; width: 32px; margin-bottom: 20px; }
- .d2-home__title { color: #FFF; font-size: 14px; margin-bottom: 10px; }
- .d2-home__sub-title { color: #ABABAB; font-size: 12px; }
diff --git a/src/assets/style/animate/vue-transition.scss b/src/assets/style/animate/vue-transition.scss
index a396d0bf..8921a1e7 100644
--- a/src/assets/style/animate/vue-transition.scss
+++ b/src/assets/style/animate/vue-transition.scss
@@ -15,7 +15,7 @@
// 过渡动画 缩放渐变
.fade-scale-leave-active,
.fade-scale-enter-active {
- transition: all .5s;
+ transition: all .3s;
}
.fade-scale-enter {
opacity: 0;
@@ -24,4 +24,4 @@
.fade-scale-leave-to {
opacity: 0;
transform: scale(0.8);
-}
\ No newline at end of file
+}
diff --git a/src/components/d2-container/components/d2-container-ghost-bs.vue b/src/components/d2-container/components/d2-container-ghost-bs.vue
index 93ca21c1..0fcbaf2d 100644
--- a/src/components/d2-container/components/d2-container-ghost-bs.vue
+++ b/src/components/d2-container/components/d2-container-ghost-bs.vue
@@ -4,7 +4,10 @@
404 page not found
+ 
- 
- 
- 
+ 
+ D2 Admin {{$version}}
-优雅的中后台集成方案
-FINAL BUILD TIME {{$buildTime}}
+{{ $t('views.system.index.cover.title') }} {{$version}}
+{{ $t('views.system.index.cover.sub-title') }}
+{{ $t('views.system.index.cover.build-time') }} {{$buildTime}}
+ :alt="$t('views.system.index.cover.github-fork-alt')">
D2Projects
-
- 微信公众号
+ {{ $t('views.system.index.page.we.title') }}
+
+
+ - 官方公众号，主要推送前端技术类文章、框架资源、学习教程，以及 D2 系列项目更新信息 + {{ $t('views.system.index.page.we.introduce') }}