gitee
/
django-vue-admin
mirror of https://gitee.com/liqianglog/django-vue-admin
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev' into dev 

# Conflicts:
#	web/src/components/selector-table/selector-table.vue
pull/107/head
猿小天 2023-08-21 20:38:40 +08:00
parent 88a04980a8 fbb1ae1c04
commit 84a2a781cc
9 changed files with 52 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
backend/application/dispatch.py
View File

@ -4,6 +4,7 @@ from django.conf import settings
from django.db import connection
from django.core.cache import cache
from dvadmin.utils.validator import CustomValidationError
from django.db.models import Q
dispatch_db_type = getattr(settings, 'DISPATCH_DB_TYPE', 'memory') # redis
@ -44,7 +45,7 @@ def _get_all_system_config():
from dvadmin.system.models import SystemConfig
system_config_obj = (
SystemConfig.objects.filter(parent_id__isnull=False)
SystemConfig.objects.filter(~Q(parent_id__form_item_type=11), parent_id__isnull=False)
.values("parent__key", "key", "value", "form_item_type")
.order_by("sort")
)

2
web/.env.development
View File

@ -6,6 +6,6 @@ VUE_APP_TITLE=企业级后台管理系统
VUE_APP_PM_ENABLED = true
# 后端接口地址及端口(域名)
VUE_APP_API = "http://127.0.0.1:8000"
VUE_APP_VERSION = '2.0.4'
VUE_APP_VERSION = '2.1.5'
# 文件存储引擎
VUE_APP_FILE_ENGINE = 'local' # oss、cos、local

2
web/package.json
View File

@ -1,6 +1,6 @@
{
"name": "django-vue-admin",
"version": "2.1.4",
"version": "2.1.5",
"scripts": {
"serve": "vue-cli-service serve --open",
"start": "npm run serve",

17
web/src/components/importExcel/index.vue
View File

@ -3,7 +3,7 @@
<el-button size="small" type="success" icon="el-icon-upload" @click="handleImport">
<slot>导入</slot>
</el-button>
<el-dialog :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body>
<el-dialog :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body destroy-on-close>
<div v-loading="loading">
<el-upload
ref="upload"
@ -25,8 +25,11 @@
<div slot="tip" class="el-upload__tip" style="color:red">提示：仅允许导入“xls”或“xlsx”格式文件！</div>
</el-upload>
<div>
<el-button type="warning" style="font-size:14px;margin-top: 20px" @click="importTemplate">下载导入模板</el-button>
<el-button type="warning" style="font-size:14px;margin-top: 20px" @click="updateTemplate">批量更新模板</el-button>
<el-button type="warning" style="font-size:14px;margin-top: 20px" @click="importTemplate">下载导入模板
</el-button>
<el-button type="warning" style="font-size:14px;margin-top: 20px" @click="updateTemplate" v-if="showUpdate">
批量更新模板
</el-button>
</div>
</div>
<div slot="footer" class="dialog-footer">
@ -75,6 +78,12 @@ export default {
default () {
return []
}
},
showUpdate: {
type: Boolean,
default () {
return true
}
}
},
data () {
@ -131,6 +140,8 @@ export default {
that.refreshView()
}
})
}).finally(() => {
that.loading = false
})
},
// 提交上传文件

10
web/src/components/table-selector/table-selector.vue
View File

@ -440,11 +440,11 @@ export default {
this.selected.length === 0
? sizeInMap + 'px'
: Math.max(
tags
? tags.clientHeight + (tags.clientHeight > sizeInMap ? 6 : 0)
: 0,
sizeInMap
) + 'px'
tags
? tags.clientHeight + (tags.clientHeight > sizeInMap ? 6 : 0)
: 0,
sizeInMap
) + 'px'
input.style.height = height
if (this.visible && this.emptyText !== false) {
this.broadcast('ElSelectDropdown', 'updatePopper')

5
web/src/layout/header-aside/components/header-user/index.vue
View File

@ -9,6 +9,9 @@
<span>
当前租户：{{info.tenant_name}}
</span>
<span style="color: #E6A23C;" v-if="info.tenant_id && info.tenant_id !== 100000" @click="clientInfo">
切换套餐
</span>
<span class="btn-text">{{
info.name ? `你好 ${info.name}` : "未登录"
}}</span>
@ -20,7 +23,7 @@
<el-dropdown-item @click.native="userInfo">
<d2-icon name="cog" class="d2-mr-5" />个人信息
</el-dropdown-item>
<el-dropdown-item @click.native="clientInfo" v-if="info.tenant_id === 100000">
<el-dropdown-item @click.native="clientInfo" v-if="info.tenant_id && info.tenant_id !== 100000">
<d2-icon name="cog" class="d2-mr-5" />租户信息
</el-dropdown-item>
<el-dropdown-item @click.native="logOff" divided>

21
web/src/router/index.js
View File

@ -86,10 +86,27 @@ router.beforeEach(async (to, from, next) => {
})
} else {
const childrenPath = window.qiankunActiveRule || []
// 判断，是否是租户模式
if (to.path !== '/clientRenew' && store.state.d2admin.user.info.tenant_id) {
// 如果租户到期，跳转到续费页面
if (store.state.d2admin.user.info.tenant_expire) {
next({ path: '/clientRenew' })
// 取消当前导航
NProgress.done()
return
// 如果是普通租户，如果没有试用套餐，且是试用阶段
} else if (store.state.d2admin.user.info.tenant_id !== 100000 && !store.state.d2admin.user.info.package_manage && store.state.d2admin.user.info.tenant_experience) {
next({ path: '/clientRenew' })
// 取消当前导航
NProgress.done()
return
}
}
if (to.name) {
if (to.meta.openInNewWindow && (from.query.newWindow && to.query.newWindow !== '1' || from.path === '/')) {
if (to.meta.openInNewWindow && ((from.query.newWindow && to.query.newWindow !== '1') || from.path === '/')) {
to.query.newWindow = '1'
}
// 有 name 属性，说明是主应用的路由
if (to.meta.openInNewWindow && !to.query.newWindow && !from.query.newWindow && from.path !== '/') {
// 在新窗口中打开路由
@ -101,6 +118,8 @@ router.beforeEach(async (to, from, next) => {
NProgress.done()
next(false)
} else {
// 取消当前导航
NProgress.done()
next()
}
} else if (childrenPath.some((item) => to.path.includes(item))) {

6
web/src/store/modules/d2admin/modules/account.js
View File

@ -66,7 +66,7 @@ export default {
* @param {Object} context
* @param {Object} payload confirm {Boolean} 是否需要确认
*/
logout ({ commit, dispatch }, { confirm = false } = {}) {
logout ({ commit, dispatch }, { confirm = false, refresh = true } = {}) {
/**
* @description 注销
*/
@ -87,7 +87,9 @@ export default {
// 跳转路由
router.push({ name: 'login' })
router.go(0)
if (refresh) {
router.go(0)
}
}
// 判断是否需要确认
if (confirm) {

2
web/src/views/dashboard/workbench/components/ver.vue
View File

@ -66,7 +66,7 @@ export default {
},
methods: {
async getVer () {
this.ver = `v${process.env.VUE_APP_VERSION}` || 'v2.1.1'
this.ver = `v${process.env.VUE_APP_VERSION}` || 'v2.1.5'
this.title = this.siteName || process.env.VUE_APP_TITLE
},
// 生成一个颜色