From b506c0c51e63c1d5454fbb34afd2c807b2a3f397 Mon Sep 17 00:00:00 2001 From: H0nGzA1 <2505811377@qq.com> Date: Sat, 20 May 2023 16:31:38 +0800 Subject: [PATCH 1/8] =?UTF-8?q?docs:=20=E6=96=B0=E5=A2=9Eqq=E7=BE=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index ed618b2..af57df1 100644 --- a/README.md +++ b/README.md @@ -46,7 +46,8 @@ - 插件市场：[戳我](https://bbs.django-vue-admin.com/plugMarket.html)👩‍👦‍👦 - django-vue-admin交流01群(已满)：812482043 [点击链接加入群聊](https://qm.qq.com/cgi-bin/qm/qr?k=aJVwjDvH-Es4MPJQuoO32N0SucK22TE5&jump_from=webapi) -- django-vue-admin交流02群：687252418 [点击链接加入群聊](https://qm.qq.com/cgi-bin/qm/qr?k=4jJN4IjWGfxJ8YJXbb_gTsuWjR34WLdc&jump_from=webapi) +- django-vue-admin交流02群(已满)：687252418 [点击链接加入群聊](https://qm.qq.com/cgi-bin/qm/qr?k=4jJN4IjWGfxJ8YJXbb_gTsuWjR34WLdc&jump_from=webapi) +- django-vue-admin交流03群：442108213 [点击链接加入群聊](http://qm.qq.com/cgi-bin/qm/qr?_wv=1027&k=kwmm0yWKN927XnoMRrfpOM0WQFsrhRHX&authKey=8VzzQW73dHSI%2F2LnN%2Fsiffk%2FMRjesIO%2B6j7by1N%2BoizpAExQAjb887tXfWQa7wbT&noverify=0&group_code=442108213) - 二维码 From b18fd2e99a6034690278f262000115be8692f8a7 Mon Sep 17 00:00:00 2001 From: H0nGzA1 <2505811377@qq.com> Date: Sat, 20 May 2023 16:33:41 +0800 Subject: [PATCH 2/8] =?UTF-8?q?docs:=20=E6=96=B0=E5=A2=9Eqq=E7=BE=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index af57df1..deb0088 100644 --- a/README.md +++ b/README.md @@ -51,7 +51,7 @@ - 二维码 - + ## 源码地址 From 78ee9127a0ee26ddd8aa25ac72c65d7927a04c4a Mon Sep 17 00:00:00 2001 From: Raymond38324 Date: Thu, 8 Jun 2023 02:34:11 +0000 Subject: [PATCH 3/8] =?UTF-8?q?feat:=20=E5=AF=BC=E5=85=A5=E6=97=B6?= =?UTF-8?q?=E5=90=8E=E7=AB=AF=E6=A0=A1=E9=AA=8C=E6=9C=AA=E9=80=9A=E8=BF=87?= =?UTF-8?q?=20=E4=B9=9F=E4=BC=9A=E5=85=B3=E9=97=ADloading,=20=E6=9B=B4?= =?UTF-8?q?=E6=96=B0=E6=A8=A1=E6=9D=BF=E5=8F=AF=E9=80=89=E6=98=AF=E5=90=A6?= =?UTF-8?q?=E9=9A=90=E8=97=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- web/src/components/importExcel/index.vue | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/web/src/components/importExcel/index.vue b/web/src/components/importExcel/index.vue index 06ef430..09cc966 100644 --- a/web/src/components/importExcel/index.vue +++ b/web/src/components/importExcel/index.vue @@ -3,7 +3,7 @@ 导入 - +
提示：仅允许导入“xls”或“xlsx”格式文件！
- 下载导入模板 - 批量更新模板 + 下载导入模板 + + + 批量更新模板 +
@@ -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 }) }, // 提交上传文件 From 3501251117ff22a8170430097a95b80ee5c6d118 Mon Sep 17 00:00:00 2001 From: flyhy Date: Tue, 4 Jul 2023 07:51:52 +0000 Subject: [PATCH 4/8] =?UTF-8?q?update=20backend/application/dispatch.py.?= =?UTF-8?q?=20=E4=BF=AE=E5=A4=8Dapi/init/settings/=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E4=BC=9A=E6=9A=B4=E9=9C=B2=E9=9D=9E=E5=89=8D=E7=AB=AF=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E7=9A=84=E6=95=B0=E7=BB=84=E7=B1=BB=E5=9E=8B=E7=9A=84?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: flyhy --- backend/application/dispatch.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/backend/application/dispatch.py b/backend/application/dispatch.py index 101b3ab..bf3fffe 100644 --- a/backend/application/dispatch.py +++ b/backend/application/dispatch.py @@ -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") ) From 863be2044af7743487eef1cdabca1c4087949a53 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E5=BC=BA?= <1206709430@qq.com> Date: Mon, 21 Aug 2023 14:27:07 +0800 Subject: [PATCH 5/8] =?UTF-8?q?=E5=8A=9F=E8=83=BD=E5=8F=98=E5=8C=96:=20?= =?UTF-8?q?=E5=85=BC=E5=AE=B9=E7=A7=9F=E6=88=B7=E6=A8=A1=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- web/src/router/index.js | 21 ++++++++++++++++++- .../store/modules/d2admin/modules/account.js | 6 ++++-- 2 files changed, 24 insertions(+), 3 deletions(-) diff --git a/web/src/router/index.js b/web/src/router/index.js index 0874562..83fdc2f 100644 --- a/web/src/router/index.js +++ b/web/src/router/index.js @@ -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))) { diff --git a/web/src/store/modules/d2admin/modules/account.js b/web/src/store/modules/d2admin/modules/account.js index bd87a7c..a878ebf 100644 --- a/web/src/store/modules/d2admin/modules/account.js +++ b/web/src/store/modules/d2admin/modules/account.js @@ -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) { From b88af5cfda1b9415b47612af3ee1167a0c9dd703 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E5=BC=BA?= <1206709430@qq.com> Date: Mon, 21 Aug 2023 14:27:52 +0800 Subject: [PATCH 6/8] =?UTF-8?q?=E5=8A=9F=E8=83=BD=E5=8F=98=E5=8C=96:=20?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=AC=AC=E4=B8=89=E6=96=B9=E7=99=BB=E5=BD=95?= =?UTF-8?q?=E6=8F=92=E4=BB=B6=E4=BC=9A=E5=8F=91=E9=80=81=E6=97=A0=E6=95=88?= =?UTF-8?q?=E8=AF=B7=E6=B1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- web/src/layout/header-aside/components/header-user/index.vue | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/web/src/layout/header-aside/components/header-user/index.vue b/web/src/layout/header-aside/components/header-user/index.vue index 1884126..c67ad0e 100644 --- a/web/src/layout/header-aside/components/header-user/index.vue +++ b/web/src/layout/header-aside/components/header-user/index.vue @@ -9,6 +9,9 @@ 当前租户：{{info.tenant_name}} + + 切换套餐 + {{ info.name ? `你好 ${info.name}` : "未登录" }} @@ -20,7 +23,7 @@ 个人信息 - + 租户信息 From 4879e748a9b031d27a481168b7f2ecbd55eb10cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E5=BC=BA?= <1206709430@qq.com> Date: Mon, 21 Aug 2023 14:28:20 +0800 Subject: [PATCH 7/8] =?UTF-8?q?=E5=8A=9F=E8=83=BD=E5=8F=98=E5=8C=96:=20?= =?UTF-8?q?=E5=8F=91=E5=B8=83=E7=89=88=E6=9C=ACv2.1.5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- web/.env.development | 2 +- web/package.json | 2 +- web/src/views/dashboard/workbench/components/ver.vue | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/web/.env.development b/web/.env.development index dc35c7f..0eb4dcb 100644 --- a/web/.env.development +++ b/web/.env.development @@ -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 diff --git a/web/package.json b/web/package.json index 0b751ce..c2a6b78 100644 --- a/web/package.json +++ b/web/package.json @@ -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", diff --git a/web/src/views/dashboard/workbench/components/ver.vue b/web/src/views/dashboard/workbench/components/ver.vue index b868a20..dd02246 100644 --- a/web/src/views/dashboard/workbench/components/ver.vue +++ b/web/src/views/dashboard/workbench/components/ver.vue @@ -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 }, // 生成一个颜色 From 3bedc737bb3bfc3a005e0dfd52196809de5d1918 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E5=BC=BA?= <1206709430@qq.com> Date: Mon, 21 Aug 2023 14:31:27 +0800 Subject: [PATCH 8/8] =?UTF-8?q?=E5=8A=9F=E8=83=BD=E5=8F=98=E5=8C=96:=20lin?= =?UTF-8?q?t?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- web/src/components/selector-table/selector-table.vue | 2 +- web/src/components/table-selector/table-selector.vue | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/web/src/components/selector-table/selector-table.vue b/web/src/components/selector-table/selector-table.vue index c9120b0..a324975 100644 --- a/web/src/components/selector-table/selector-table.vue +++ b/web/src/components/selector-table/selector-table.vue @@ -202,7 +202,7 @@ export default { }, deep: true, immediate: true - }, + } // currentValue (newValue, oldVal) { // const { tableConfig } = this._elProps // const { value } = this.dict diff --git a/web/src/components/table-selector/table-selector.vue b/web/src/components/table-selector/table-selector.vue index 0e1836d..3f63671 100644 --- a/web/src/components/table-selector/table-selector.vue +++ b/web/src/components/table-selector/table-selector.vue @@ -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')