Compare commits

..

10 Commits

Author SHA1 Message Date
liy
b724969912 docs: 更新文档地址
Some checks are pending
Release pipeline / publish (push) Waiting to run
Release pipeline / Always run job (push) Waiting to run
2023-05-18 07:44:31 +08:00
FairyEver
404fad81e8 docs: remove cdn.d2.pub 2022-12-29 14:07:58 +08:00
semantic-release-bot
91d04bddb2 chore(release): 1.25.0 [skip ci]
# [1.25.0](https://github.com/d2-projects/d2-admin/compare/v1.24.3...v1.25.0) (2022-08-23)

### Features

* update packages minor ([85bdc01](85bdc019ea))
* update packages patch ([24a2f64](24a2f64d27))
2022-08-23 14:21:14 +00:00
FairyEver
508c1a58f3 Merge branch 'feature/update_packages' into develop 2022-08-23 22:19:24 +08:00
FairyEver
85bdc019ea feat: update packages minor 2022-08-23 22:18:53 +08:00
FairyEver
24a2f64d27 feat: update packages patch 2022-08-23 22:12:26 +08:00
semantic-release-bot
30b442e16c chore(release): 1.24.3 [skip ci]
## [1.24.3](https://github.com/d2-projects/d2-admin/compare/v1.24.2...v1.24.3) (2022-08-23)

### Bug Fixes

* 🐛 注销用户清空vuex用户信息失效 ([a7784d4](a7784d4a32))
* remove never used code ([57534be](57534be3fb))
* remove simplemde ([dd99b57](dd99b57b6e))
2022-08-23 13:56:30 +00:00
FairyEver
57534be3fb fix: remove never used code 2022-08-23 21:55:34 +08:00
FairyEver
dd99b57b6e fix: remove simplemde 2022-08-23 21:55:00 +08:00
FairyEver
e2ed7e95fd build: semantic-release 2022-08-23 21:46:40 +08:00
26 changed files with 29246 additions and 6789 deletions

View File

@@ -6,56 +6,11 @@ on:
jobs:
cdn:
name: CDN
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v1
- uses: bahmutov/npm-install@v1
- name: Set vue cli env
shell: bash
run: |
echo -e "\
VUE_APP_PUBLIC_PATH=/d2-admin/preview/\
" > .env.preview.local
cat .env.preview.local | while read line
do
echo $line
done
- name: Build
run: yarn build:preview --report
- name: Setup qshell
uses: foxundermoon/setup-qshell@v1
env:
ACTIONS_ALLOW_UNSECURE_COMMANDS: 'true'
with:
qshell-version: '2.4.0'
- name: Test qshell
run: qshell version
- name: Login
run: qshell account ${{ secrets.AK }} ${{ secrets.SK }} GITHUB_ACTION
- name: CDN upload
run: |
qshell qupload2 \
--src-dir=$GITHUB_WORKSPACE/dist \
--bucket=d2-cdn \
--key-prefix=${GITHUB_REPOSITORY//*\//}/preview/ \
--overwrite=true \
--check-exists=true \
--check-hash=true \
--check-size=true \
--rescan-local=true \
--thread-count=32
- name: CDN refresh
run: |
echo "https://cdn.d2.pub/${GITHUB_REPOSITORY//*\//}/preview/" > cdnrefresh.txt
qshell cdnrefresh --dirs -i ./cdnrefresh.txt
ftp:
name: FTP
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v1
- uses: actions/checkout@v3
- uses: bahmutov/npm-install@v1
- name: Set vue cli env
shell: bash
@@ -85,7 +40,7 @@ jobs:
name: Github Pages
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v1
- uses: actions/checkout@v3
- uses: bahmutov/npm-install@v1
- name: Set vue cli env
shell: bash

View File

@@ -10,13 +10,13 @@ jobs:
if: "! contains(github.event.head_commit.message, '[skip ci]')"
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v1
- uses: actions/checkout@v3
- name: Semantic Release
uses: cycjimmy/semantic-release-action@v2
uses: cycjimmy/semantic-release-action@v3
with:
extra_plugins: |
@semantic-release/changelog@3.0.6
@semantic-release/git@7.0.18
@semantic-release/changelog
@semantic-release/git
env:
GITHUB_TOKEN: ${{ secrets.ACCESS_TOKEN }}

View File

@@ -31,15 +31,12 @@ The following access addresses are built and deployed by the latest master branc
| server | link | server |
| --- | --- | --- |
| d2.pub | [Link](https://d2.pub/d2-admin/preview) | China server |
| cdn.d2.pub | [Link](https://cdn.d2.pub/d2-admin/preview) | qiniu CDN |
| github | [Link](https://d2-projects.github.io/d2-admin) | GitHub pages |
| netlify | [Link](https://d2-admin.netlify.com) | Netlify CDN |
## Document
[document on https://d2.pub](https://d2.pub/zh/doc/d2-admin/)
> d2.pub CDN mirror deployment [https://cdn.d2.pub](https://cdn.d2.pub)
[document on https://d2.pub](https://d2.pub/doc/d2-admin/)
## Features

View File

@@ -31,15 +31,12 @@
| 位置 | 链接 | 部署位置 |
| --- | --- | --- |
| d2.pub | [preview](https://d2.pub/d2-admin/preview) | 中国服务器 |
| cdn.d2.pub | [preview](https://cdn.d2.pub/d2-admin/preview) | 七牛云 CDN |
| github | [preview](https://d2-projects.github.io/d2-admin) | GitHub pages |
| netlify | [preview](https://d2-admin.netlify.com) | Netlify CDN |
## 文档
[在 https://d2.pub 上的本项目文档](https://d2.pub/zh/doc/d2-admin/)
> d2.pub CDN 镜像部署 [https://cdn.d2.pub](https://cdn.d2.pub)
[在 https://d2.pub 上的本项目文档](https://d2.pub/doc/d2-admin/)
## 功能

View File

@@ -2,6 +2,23 @@
All notable changes to this project will be documented in this file.
# [1.25.0](https://github.com/d2-projects/d2-admin/compare/v1.24.3...v1.25.0) (2022-08-23)
### Features
* update packages minor ([85bdc01](https://github.com/d2-projects/d2-admin/commit/85bdc019ea5e2c7afde157fd278a98add7868c03))
* update packages patch ([24a2f64](https://github.com/d2-projects/d2-admin/commit/24a2f64d275e7e5992588b305bafdf99be40b5c6))
## [1.24.3](https://github.com/d2-projects/d2-admin/compare/v1.24.2...v1.24.3) (2022-08-23)
### Bug Fixes
* 🐛 注销用户清空vuex用户信息失效 ([a7784d4](https://github.com/d2-projects/d2-admin/commit/a7784d4a321138e712a0c2434e2c8a5334de359d))
* remove never used code ([57534be](https://github.com/d2-projects/d2-admin/commit/57534be3fbec2796f998192e26aea3616be2b87c))
* remove simplemde ([dd99b57](https://github.com/d2-projects/d2-admin/commit/dd99b57b6e1330c58c33c57da5785ae4e256847c))
## [1.24.2](https://github.com/d2-projects/d2-admin/compare/v1.24.1...v1.24.2) (2021-07-23)

35725
package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@@ -1,6 +1,6 @@
{
"name": "d2-admin",
"version": "1.24.2",
"version": "1.25.0",
"scripts": {
"serve": "vue-cli-service serve --open",
"start": "npm run serve",
@@ -11,74 +11,73 @@
"test:unit": "vue-cli-service test:unit"
},
"dependencies": {
"@d2-projects/vue-table-export": "^1.1.2",
"@d2-projects/vue-table-export": "^1.1.3",
"@d2-projects/vue-table-import": "^1.0.1",
"axios": "^0.21.1",
"axios-mock-adapter": "^1.18.1",
"axios": "^0.27.2",
"axios-mock-adapter": "^1.21.2",
"better-scroll": "^1.15.2",
"clipboard-polyfill": "^2.8.6",
"core-js": "^3.4.3",
"countup.js": "^2.0.4",
"dayjs": "^1.8.17",
"element-ui": "^2.13.2",
"core-js": "^3.24.1",
"countup.js": "^2.3.2",
"dayjs": "^1.11.5",
"element-ui": "^2.15.9",
"faker": "^4.1.0",
"flex.css": "^1.1.7",
"fuse.js": "^5.2.3",
"github-markdown-css": "^4.0.0",
"highlight.js": "^10.0.2",
"hotkeys-js": "^3.7.3",
"highlight.js": "^10.7.3",
"hotkeys-js": "^3.9.5",
"js-cookie": "^2.2.1",
"lodash": "^4.17.20",
"lodash": "^4.17.21",
"lowdb": "^1.0.0",
"marked": "^2.0.0",
"marked": "^2.1.3",
"nprogress": "^0.2.0",
"qs": "^6.9.4",
"qs": "^6.11.0",
"quill": "^1.3.7",
"screenfull": "^5.0.2",
"simplemde": "^1.11.2",
"sortablejs": "^1.10.1",
"ua-parser-js": "^0.7.20",
"vant": "^2.11.1",
"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.1.3",
"screenfull": "^5.2.0",
"sortablejs": "^1.15.0",
"ua-parser-js": "^0.8.1",
"vant": "^2.12.48",
"vue": "^2.7.10",
"vue-grid-layout": "^2.4.0",
"vue-i18n": "^8.27.2",
"vue-json-tree-view": "^2.1.6",
"vue-router": "^3.6.2",
"vue-splitpane": "^1.0.6",
"vue-ueditor-wrap": "^2.4.1",
"vuex": "^3.1.2"
"vue-ueditor-wrap": "^2.5.6",
"vuex": "^3.6.2"
},
"devDependencies": {
"@d2-projects/vue-filename-injector": "^1.1.0",
"@d2-projects/vue-filename-injector": "^1.1.1",
"@kazupon/vue-i18n-loader": "^0.5.0",
"@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/cli-plugin-babel": "^4.5.19",
"@vue/cli-plugin-eslint": "^4.5.19",
"@vue/cli-plugin-router": "^4.5.19",
"@vue/cli-plugin-unit-jest": "^4.5.19",
"@vue/cli-plugin-vuex": "^4.5.19",
"@vue/cli-service": "^4.5.19",
"@vue/eslint-config-standard": "^5.1.2",
"@vue/test-utils": "^1.0.2",
"@vue/test-utils": "^1.3.0",
"babel-eslint": "^10.0.3",
"babel-plugin-import": "^1.13.3",
"compression-webpack-plugin": "^3.0.1",
"cz-conventional-changelog": "^3.2.0",
"babel-plugin-import": "^1.13.5",
"compression-webpack-plugin": "^3.1.0",
"cz-conventional-changelog": "^3.3.0",
"eslint": "^6.8.0",
"eslint-plugin-import": "^2.20.2",
"eslint-plugin-import": "^2.26.0",
"eslint-plugin-node": "^11.1.0",
"eslint-plugin-promise": "^4.2.1",
"eslint-plugin-standard": "^4.0.1",
"eslint-plugin-promise": "^4.3.1",
"eslint-plugin-standard": "^4.1.0",
"eslint-plugin-vue": "^6.2.2",
"less": "^3.12.2",
"less-loader": "^7.1.0",
"sass": "^1.35.2",
"sass-loader": "^10.1.1",
"svg-sprite-loader": "^4.1.6",
"less": "^3.13.1",
"less-loader": "^7.3.0",
"sass": "^1.54.5",
"sass-loader": "^10.3.1",
"svg-sprite-loader": "^4.3.0",
"text-loader": "^0.0.1",
"vue-cli-plugin-i18n": "^1.0.1",
"vue-template-compiler": "^2.6.10",
"webpack-bundle-analyzer": "^3.6.0",
"webpack-theme-color-replacer": "^1.3.3"
"vue-template-compiler": "^2.7.10",
"webpack-bundle-analyzer": "^3.9.0",
"webpack-theme-color-replacer": "^1.4.1"
},
"config": {
"commitizen": {

View File

@@ -1,6 +1,6 @@
import { find, map, random } from 'lodash'
import faker from 'faker/locale/zh_CN'
import { service, serviceForMock, request, requestForMock, mock } from '@/api/_service.js'
import { requestForMock, mock } from '@/api/_service.js'
import * as tools from '@/api/_tools.js'
const db = [

View File

@@ -1,6 +1,6 @@
import { find, assign } from 'lodash'
import faker from 'faker/locale/zh_CN'
import { service, serviceForMock, request, requestForMock, mock } from '@/api/_service.js'
import { requestForMock, mock } from '@/api/_service.js'
import * as tools from '@/api/_tools.js'
const users = [

View File

@@ -14,7 +14,7 @@ export default {
src: {
type: String,
required: false,
default: 'https://d2.pub/zh/doc/d2-admin'
default: 'https://d2.pub/doc/d2-admin'
}
}
}

View File

@@ -1,64 +0,0 @@
<template>
<textarea ref="mde"></textarea>
</template>
<script>
import { merge } from 'lodash'
import SimpleMDE from 'simplemde'
import 'simplemde/dist/simplemde.min.css'
export default {
name: 'd2-mde',
props: {
// 值
value: {
type: String,
required: false,
default: ''
},
// 配置参数
config: {
type: Object,
required: false,
default: () => ({})
}
},
data () {
return {
// 编辑器实例
mde: null,
// 编辑器默认参数
// 详见 https://github.com/sparksuite/simplemde-markdown-editor#configuration
defaultConfig: {
autoDownloadFontAwesome: false
}
}
},
mounted () {
// 初始化
this.init()
},
destroyed () {
// 在组件销毁后销毁实例
this.mde = null
},
methods: {
// 初始化
init () {
// 合并参数
const config = merge({}, this.defaultConfig, this.config)
// 初始化
this.mde = new SimpleMDE({
...config,
// 初始值
initialValue: this.value,
// 挂载元素
element: this.$refs.mde
})
this.mde.codemirror.on('change', () => {
this.$emit('input', this.mde.value())
})
}
}
}
</script>

View File

@@ -15,7 +15,6 @@ Vue.component('d2-icon-svg', () => import('./d2-icon-svg/index.vue'))
Vue.component('d2-icon-select', () => import('./d2-icon-select/index.vue'))
Vue.component('d2-icon-svg-select', () => import('./d2-icon-svg-select/index.vue'))
Vue.component('d2-markdown', () => import('./d2-markdown'))
Vue.component('d2-mde', () => import('./d2-mde'))
Vue.component('d2-module-index-banner', () => import('./d2-module-index-banner'))
Vue.component('d2-module-index-menu', () => import('./d2-module-index-menu'))
Vue.component('d2-quill', () => import('./d2-quill'))

View File

@@ -7,7 +7,7 @@ export default {
message = [
`当前语言:${this.$t('_name')} [ ${this.$i18n.locale} ]`,
'仅提供切换功能,没有配置具体的语言数据 ',
'文档参考:<a class="el-link el-link--primary is-underline" target="_blank" href="https://d2.pub/zh/doc/d2-admin/locales">《国际化 | D2Admin》</a>'
'文档参考:<a class="el-link el-link--primary is-underline" target="_blank" href="https://d2.pub/doc/d2-admin/locales">《国际化 | D2Admin》</a>'
].join('<br/>')
}
this.$notify({

View File

@@ -57,8 +57,7 @@ export default {
icon: 'pencil-square-o',
children: [
{ path: '/demo/components/editor-ueditor', title: 'UEditor', icon: '' },
{ path: '/demo/components/editor-quill', title: 'Quill', icon: '' },
{ path: '/demo/components/editor-simpleMDE', title: 'simpleMDE', icon: '' }
{ path: '/demo/components/editor-quill', title: 'Quill', icon: '' }
]
},
{

View File

@@ -25,7 +25,6 @@ export default {
{ path: 'countup', name: 'demo-components-countup', component: _import('demo/components/countup'), meta: { ...meta, title: '数字动画' } },
{ path: 'editor-ueditor', name: 'demo-components-editor-ueditor', component: _import('demo/components/editor-ueditor'), meta: { ...meta, title: 'UEditor' } },
{ path: 'editor-quill', name: 'demo-components-editor-quill', component: _import('demo/components/editor-quill'), meta: { ...meta, title: '富文本编辑器' } },
{ path: 'editor-simpleMDE', name: 'demo-components-editor-simpleMDE', component: _import('demo/components/editor-simpleMDE'), meta: { ...meta, title: 'markdown编辑器' } },
{ path: 'highlight', name: 'demo-components-highlight', component: _import('demo/components/highlight'), meta: { ...meta, title: '代码高亮组件' } },
{ path: 'icon/icon', name: 'demo-components-icon-icon', component: _import('demo/components/icon/icon.vue'), meta: { ...meta, title: '图标组件' } },
{ path: 'icon/icon-svg', name: 'demo-components-icon-icon-svg', component: _import('demo/components/icon/icon-svg.vue'), meta: { ...meta, title: 'svg 图标' } },

View File

@@ -10,7 +10,7 @@ export default {
versionShow () {
util.log.capsule('D2Admin', `v${process.env.VUE_APP_VERSION}`)
console.log('D2 Admin https://github.com/d2-projects/d2-admin')
console.log('Document https://d2.pub/zh/doc/d2-admin')
console.log('Document https://d2.pub/doc/d2-admin')
console.log('请不要吝啬您的 star谢谢 ~')
}
}

View File

@@ -1,27 +0,0 @@
<template>
<d2-container>
<d2-mde
v-model="text"
class="mde"/>
<el-card shadow="never" class="d2-card">
<pre>{{text}}</pre>
</el-card>
</d2-container>
</template>
<script>
import text from './text'
export default {
data () {
return {
text
}
}
}
</script>
<style lang="scss" scoped>
.mde {
margin-bottom: -16px;
}
</style>

View File

@@ -1,10 +0,0 @@
export default `# 标题
- 列表
- 列表
\`\`\`
alert('Hello')
\`\`\`
[D2Admin in github](https://github.com/d2-projects/d2-admin)`

View File

@@ -1,3 +1,3 @@
<template>
<d2-container-frame src="https://d2.pub/zh/doc/d2-admin"/>
<d2-container-frame src="https://d2.pub/doc/d2-admin"/>
</template>

View File

@@ -17,6 +17,6 @@
<d2-link-btn
slot="footer"
title="文档"
link="https://d2.pub/zh/doc/d2-admin/locales"/>
link="https://d2.pub/doc/d2-admin/locales"/>
</d2-container>
</template>

View File

@@ -55,7 +55,7 @@ export default {
return false
},
download () {
this.$open('https://cdn.d2.pub/files/d2-admin/demo-csv.csv')
this.$open('https://file.d2.pub/document/d2-admin/demo-csv.csv')
}
}
}

View File

@@ -57,7 +57,7 @@ export default {
return false
},
download () {
this.$open('https://cdn.d2.pub/files/d2-admin/demo-table.xlsx')
this.$open('https://file.d2.pub/document/d2-admin/demo-table.xlsx')
}
}
}

View File

@@ -25,7 +25,6 @@ export default {
],
[
{ img: 'https://github.com/d2-projects/d2-admin/workflows/Deploy%20https%3A%2F%2Fd2.pub/badge.svg', link: `${linkD2Admin}/actions?query=workflow%3A%22Deploy+https%3A%2F%2Fd2.pub%22` },
{ img: 'https://github.com/d2-projects/d2-admin/workflows/Deploy%20https%3A%2F%2Fcdn.d2.pub/badge.svg', link: `${linkD2Admin}/actions?query=workflow%3A%22Deploy+https%3A%2F%2Fcdn.d2.pub%22` },
{ img: 'https://github.com/d2-projects/d2-admin/workflows/Deploy%20Github/badge.svg', link: `${linkD2Admin}/actions?query=workflow%3A%22Deploy+Github%22` },
{ img: 'https://api.netlify.com/api/v1/badges/a5dd4bbd-da3f-4145-98a9-8012577bdcf5/deploy-status', link: 'https://app.netlify.com/sites/d2-admin/deploys' }
],

View File

@@ -14,7 +14,7 @@
这里有一些参考资料
</h2>
<el-button-group>
<el-button @click="$open('https://d2.pub/zh/doc/d2-admin')">
<el-button @click="$open('https://d2.pub/doc/d2-admin')">
<d2-icon name="book" class="d2-mr-5"/>
文档
</el-button>

View File

@@ -5,7 +5,7 @@
<template slot="footer">
<div class="btn-group">
<span class="btn-group__btn" @click="$open('https://github.com/d2-projects')">开源组织</span> |
<span class="btn-group__btn" @click="$open('https://d2.pub/zh/doc/d2-admin')">文档</span> |
<span class="btn-group__btn" @click="$open('https://d2.pub/doc/d2-admin')">文档</span> |
<span class="btn-group__btn" @click="$open('https://github.com/d2-projects/d2-admin-start-kit')">简化版</span> |
<span class="btn-group__btn" @click="$open('https://juejin.im/user/57a48b632e958a006691b946/posts')">掘金</span> |
<el-popover :width="150" trigger="hover">

View File

@@ -26,10 +26,10 @@ describe('d2-container-frame', () => {
const wrapper = mount(D2ContainerFrame, {
stubs: ['d2-container'],
propsData: {
src: 'https://d2.pub/zh/doc/d2-admin'
src: 'https://d2.pub/doc/d2-admin'
}
})
expect(wrapper.props().src).toEqual('https://d2.pub/zh/doc/d2-admin')
expect(wrapper.props().src).toEqual('https://d2.pub/doc/d2-admin')
})
})