mirror of
https://gitee.com/y_project/RuoYi-Vue.git
synced 2026-06-19 04:59:22 +08:00
Compare commits
4 Commits
19f3c447a1
...
springboot
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
b56597599a | ||
|
|
f918dee610 | ||
|
|
d827a8159e | ||
|
|
ce866bebfb |
6
pom.xml
6
pom.xml
@@ -24,9 +24,9 @@
|
|||||||
<swagger.version>3.0.0</swagger.version>
|
<swagger.version>3.0.0</swagger.version>
|
||||||
<kaptcha.version>2.3.3</kaptcha.version>
|
<kaptcha.version>2.3.3</kaptcha.version>
|
||||||
<pagehelper.boot.version>1.4.7</pagehelper.boot.version>
|
<pagehelper.boot.version>1.4.7</pagehelper.boot.version>
|
||||||
<fastjson.version>2.0.61</fastjson.version>
|
<fastjson.version>2.0.62</fastjson.version>
|
||||||
<oshi.version>6.10.0</oshi.version>
|
<oshi.version>7.3.0</oshi.version>
|
||||||
<commons.io.version>2.21.0</commons.io.version>
|
<commons.io.version>2.22.0</commons.io.version>
|
||||||
<poi.version>4.1.2</poi.version>
|
<poi.version>4.1.2</poi.version>
|
||||||
<velocity.version>2.3</velocity.version>
|
<velocity.version>2.3</velocity.version>
|
||||||
<jwt.version>0.9.1</jwt.version>
|
<jwt.version>0.9.1</jwt.version>
|
||||||
|
|||||||
@@ -30,7 +30,7 @@ public class MimeTypeUtils
|
|||||||
// 图片
|
// 图片
|
||||||
"bmp", "gif", "jpg", "jpeg", "png",
|
"bmp", "gif", "jpg", "jpeg", "png",
|
||||||
// word excel powerpoint
|
// word excel powerpoint
|
||||||
"doc", "docx", "xls", "xlsx", "ppt", "pptx", "html", "htm", "txt",
|
"doc", "docx", "xls", "xlsx", "ppt", "pptx", "txt",
|
||||||
// 压缩文件
|
// 压缩文件
|
||||||
"rar", "zip", "gz", "bz2",
|
"rar", "zip", "gz", "bz2",
|
||||||
// 视频格式
|
// 视频格式
|
||||||
|
|||||||
@@ -315,7 +315,7 @@
|
|||||||
<script setup lang="ts" name="${BusinessName}">
|
<script setup lang="ts" name="${BusinessName}">
|
||||||
import { list${BusinessName}, get${BusinessName}, del${BusinessName}, add${BusinessName}, update${BusinessName} } from "@/api/${moduleName}/${businessName}"
|
import { list${BusinessName}, get${BusinessName}, del${BusinessName}, add${BusinessName}, update${BusinessName} } from "@/api/${moduleName}/${businessName}"
|
||||||
#if($genView)
|
#if($genView)
|
||||||
import ${BusinessName}ViewDrawer from "./view"
|
import ${BusinessName}ViewDrawer from "./view.vue"
|
||||||
#end
|
#end
|
||||||
import type { ${ClassName}, ${BusinessName}QueryParams } from "@/types/api/${moduleName}/${businessName}"
|
import type { ${ClassName}, ${BusinessName}QueryParams } from "@/types/api/${moduleName}/${businessName}"
|
||||||
import type { TreeSelect } from '@/types/api/common'
|
import type { TreeSelect } from '@/types/api/common'
|
||||||
|
|||||||
@@ -394,7 +394,7 @@ import type { ${ClassName}, ${BusinessName}QueryParams } from "@/types/api/${mod
|
|||||||
#end
|
#end
|
||||||
import { list${BusinessName}, get${BusinessName}, del${BusinessName}, add${BusinessName}, update${BusinessName} } from "@/api/${moduleName}/${businessName}"
|
import { list${BusinessName}, get${BusinessName}, del${BusinessName}, add${BusinessName}, update${BusinessName} } from "@/api/${moduleName}/${businessName}"
|
||||||
#if($genView)
|
#if($genView)
|
||||||
import ${BusinessName}ViewDrawer from "./view"
|
import ${BusinessName}ViewDrawer from "./view.vue"
|
||||||
#end
|
#end
|
||||||
|
|
||||||
const { proxy } = getCurrentInstance()
|
const { proxy } = getCurrentInstance()
|
||||||
|
|||||||
@@ -109,7 +109,7 @@ export default {
|
|||||||
return {
|
return {
|
||||||
'--chrome-tab-active-bg': this.mixHexWithWhite(primary, 0.15),
|
'--chrome-tab-active-bg': this.mixHexWithWhite(primary, 0.15),
|
||||||
'--chrome-tab-text-active': primary,
|
'--chrome-tab-text-active': primary,
|
||||||
'--chrome-wing-r': '14px'
|
'--chrome-wing-r': '10px'
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
@@ -610,16 +610,19 @@ $tags-bar-height: 34px;
|
|||||||
background: #f5f7fa !important;
|
background: #f5f7fa !important;
|
||||||
border-radius: 6px 6px 0 0;
|
border-radius: 6px 6px 0 0;
|
||||||
color: #303133 !important;
|
color: #303133 !important;
|
||||||
|
z-index: 2;
|
||||||
}
|
}
|
||||||
|
|
||||||
&.active {
|
&.active {
|
||||||
height: 31px;
|
height: 33px;
|
||||||
min-height: 31px;
|
min-height: 33px;
|
||||||
padding: 0 14px;
|
padding: 0 14px;
|
||||||
|
z-index: 3;
|
||||||
color: var(--chrome-tab-text-active) !important;
|
color: var(--chrome-tab-text-active) !important;
|
||||||
font-weight: 500;
|
font-weight: 500;
|
||||||
background: var(--chrome-tab-active-bg) !important;
|
background: var(--chrome-tab-active-bg) !important;
|
||||||
border: none !important;
|
border: none !important;
|
||||||
|
border-bottom: 2px solid var(--chrome-tab-active-bg) !important;
|
||||||
border-radius: var(--chrome-wing-r) var(--chrome-wing-r) 0 0;
|
border-radius: var(--chrome-wing-r) var(--chrome-wing-r) 0 0;
|
||||||
box-shadow: 0 1px 4px rgba(0, 0, 0, 0.06);
|
box-shadow: 0 1px 4px rgba(0, 0, 0, 0.06);
|
||||||
|
|
||||||
@@ -690,12 +693,33 @@ $tags-bar-height: 34px;
|
|||||||
.el-scrollbar__bar {
|
.el-scrollbar__bar {
|
||||||
opacity: 0;
|
opacity: 0;
|
||||||
transition: opacity 0.3s;
|
transition: opacity 0.3s;
|
||||||
|
z-index: 10;
|
||||||
|
|
||||||
.tags-view-container:hover & {
|
.tags-view-container:hover & {
|
||||||
opacity: 1;
|
opacity: 1;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.tags-view-container--chrome & {
|
||||||
|
.el-scrollbar {
|
||||||
|
position: relative;
|
||||||
|
}
|
||||||
|
|
||||||
|
.el-scrollbar__wrap {
|
||||||
|
&::-webkit-scrollbar {
|
||||||
|
width: 0 !important;
|
||||||
|
height: 0 !important;
|
||||||
|
}
|
||||||
|
scrollbar-width: none;
|
||||||
|
-ms-overflow-style: none;
|
||||||
|
}
|
||||||
|
|
||||||
|
.el-scrollbar__bar.is-horizontal {
|
||||||
|
z-index: 20;
|
||||||
|
height: 6px !important;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
.tags-view-item {
|
.tags-view-item {
|
||||||
.el-icon-close {
|
.el-icon-close {
|
||||||
width: 16px;
|
width: 16px;
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
import store from '@/store'
|
import store from '@/store'
|
||||||
import router from '@/router'
|
import router from '@/router'
|
||||||
import cache from '@/plugins/cache'
|
import cache from '@/plugins/cache'
|
||||||
import { MessageBox, } from 'element-ui'
|
import { MessageBox } from 'element-ui'
|
||||||
import { login, logout, getInfo } from '@/api/login'
|
import { login, logout, getInfo } from '@/api/login'
|
||||||
import { getToken, setToken, removeToken } from '@/utils/auth'
|
import { getToken, setToken, removeToken } from '@/utils/auth'
|
||||||
import { isHttp, isEmpty } from "@/utils/validate"
|
import { isHttp, isEmpty } from "@/utils/validate"
|
||||||
|
|||||||
Reference in New Issue
Block a user