修复透明度覆盖影响设置问题,优化样式
This commit is contained in:
@@ -289,7 +289,7 @@ function htmlToText(email) {
|
||||
|
||||
function cleanSpace(text) {
|
||||
return text
|
||||
.replace(/[\u200B-\u200F\uFEFF]/g, '') // 移除零宽空格、ZWNJ、ZWJ、LRM、RLM、BOM
|
||||
.replace(/[\u200B-\u200F\uFEFF\u034F\u200B-\u200F\u00A0\u3000]/g, '') // 移除零宽空格
|
||||
.replace(/\s+/g, ' ') // 多空白合并成一个空格
|
||||
.trim();
|
||||
}
|
||||
@@ -705,10 +705,7 @@ function loadData() {
|
||||
}
|
||||
|
||||
&:hover {
|
||||
box-shadow: inset 1px 0 0 rgb(218, 220, 224),
|
||||
inset -1px 0 0 rgb(218, 220, 224),
|
||||
0 1px 2px 0 rgba(60, 64, 67, 0.3),
|
||||
0 1px 3px 1px rgba(60, 64, 67, 0.15);
|
||||
background-color: #F2F6FC;
|
||||
z-index: 0;
|
||||
}
|
||||
|
||||
|
||||
@@ -75,6 +75,7 @@ function initEditor() {
|
||||
mobile: {
|
||||
toolbar: 'fullscreen bold emoticons forecolor fontsize | alignleft aligncenter alignright alignjustify | outdent indent | bullist numlist | link image | table code preview ',
|
||||
},
|
||||
font_size_formats: '8pt 10pt 12pt 14pt 16pt 18pt 24pt 36pt',
|
||||
emoticons_search: false,
|
||||
language: 'zh_CN',
|
||||
language_url: '/tinymce/langs/zh_CN.js',
|
||||
|
||||
@@ -127,7 +127,7 @@ const noLoading = ref(false)
|
||||
const loading = ref(false)
|
||||
const followLoading = ref(false);
|
||||
const verifyShow = ref(false)
|
||||
let turnstileId = false
|
||||
let turnstileId = null
|
||||
let verifyToken = ''
|
||||
const addForm = reactive({
|
||||
email: '',
|
||||
|
||||
@@ -69,8 +69,8 @@ const route = useRoute();
|
||||
|
||||
.title {
|
||||
margin: 15px 10px;
|
||||
height: 50px;
|
||||
border-radius: 6px;
|
||||
height: 45px;
|
||||
border-radius: 8px;
|
||||
display: flex;
|
||||
position: relative;
|
||||
font-size: 16px;
|
||||
|
||||
@@ -4,8 +4,14 @@ import {loginUserInfo} from "@/request/my.js";
|
||||
export const useUserStore = defineStore('user', {
|
||||
state: () => ({
|
||||
user: {},
|
||||
refreshList: 0,
|
||||
}),
|
||||
actions: {
|
||||
refreshUserList() {
|
||||
loginUserInfo().then(user => {
|
||||
this.refreshList ++
|
||||
})
|
||||
},
|
||||
refreshUserInfo() {
|
||||
loginUserInfo().then(user => {
|
||||
this.user = user
|
||||
|
||||
@@ -122,7 +122,7 @@ const registerLoading = ref(false)
|
||||
suffix.value = domainList[0]
|
||||
const verifyShow = ref(false)
|
||||
let verifyToken = ''
|
||||
let turnstileId = ''
|
||||
let turnstileId = null
|
||||
|
||||
|
||||
window.onTurnstileSuccess = (token) => {
|
||||
@@ -268,6 +268,7 @@ function submitRegister() {
|
||||
registerForm.password = ''
|
||||
registerForm.confirmPassword = ''
|
||||
registerLoading.value = false
|
||||
turnstileId = null
|
||||
verifyToken = ''
|
||||
ElMessage({
|
||||
message: '注册成功',
|
||||
|
||||
@@ -99,11 +99,13 @@ import {roleAdd, roleDelete, rolePermTree, roleRoleList, roleSet, roleSetDef} fr
|
||||
import {ElMessage, ElMessageBox} from "element-plus";
|
||||
import loading from '@/components/loading/index.vue';
|
||||
import {useRoleStore} from "@/store/role.js";
|
||||
import {useUserStore} from "@/store/user.js";
|
||||
|
||||
defineOptions({
|
||||
name: 'role'
|
||||
})
|
||||
|
||||
const userStore = useUserStore();
|
||||
const roleStore = useRoleStore();
|
||||
const roleFormShow = ref(false)
|
||||
const treeList = reactive([])
|
||||
@@ -175,6 +177,7 @@ function delRole(role) {
|
||||
plain: true
|
||||
})
|
||||
getRoleList()
|
||||
userStore.refreshUserList()
|
||||
roleStore.refreshSelect()
|
||||
})
|
||||
});
|
||||
@@ -218,6 +221,13 @@ function setRole() {
|
||||
type: "success",
|
||||
plain: true
|
||||
})
|
||||
|
||||
const names = roles.value.map(role => role.name)
|
||||
|
||||
if (!names.includes(params.name)) {
|
||||
roleStore.refreshSelect()
|
||||
}
|
||||
|
||||
roleFormShow.value = false
|
||||
getRoleList()
|
||||
}).finally(() => {
|
||||
|
||||
@@ -297,7 +297,7 @@
|
||||
</template>
|
||||
|
||||
<script setup>
|
||||
import {defineOptions, nextTick, onMounted, reactive, ref} from "vue";
|
||||
import {defineOptions, onMounted, reactive, ref} from "vue";
|
||||
import {physicsDeleteAll, setBackground, settingQuery, settingSet} from "@/request/setting.js";
|
||||
import {ElMessage, ElMessageBox} from "element-plus";
|
||||
import {useSettingStore} from "@/store/setting.js";
|
||||
@@ -353,7 +353,7 @@ onMounted(() => {
|
||||
})
|
||||
|
||||
function doOpacityChange() {
|
||||
const form = {...setting.value}
|
||||
const form = {}
|
||||
form.loginOpacity = loginOpacity.value
|
||||
editSetting(form,true)
|
||||
}
|
||||
|
||||
@@ -239,12 +239,14 @@ import {tzDayjs} from "@/utils/day.js";
|
||||
import {useSettingStore} from "@/store/setting.js";
|
||||
import {isEmail} from "@/utils/verify-utils.js";
|
||||
import {useRoleStore} from "@/store/role.js";
|
||||
import {useUserStore} from "@/store/user.js";
|
||||
|
||||
defineOptions({
|
||||
name: 'user'
|
||||
})
|
||||
|
||||
const roleStore = useRoleStore()
|
||||
const userStore = useUserStore()
|
||||
const settingStore = useSettingStore()
|
||||
const filteredValue = ['normal', 'del']
|
||||
const filters = [{text: '正常', value: 'normal'}, {text: '删除', value: 'del'}]
|
||||
@@ -314,6 +316,10 @@ watch(() => roleStore.refresh, () => {
|
||||
})
|
||||
})
|
||||
|
||||
watch(() => userStore.refreshList, () => {
|
||||
getUserList(false)
|
||||
})
|
||||
|
||||
getUserList()
|
||||
|
||||
const filterItem = reactive({
|
||||
@@ -631,7 +637,7 @@ function search() {
|
||||
|
||||
function updatePwd() {
|
||||
|
||||
if (userForm.password.length < 6) {
|
||||
if (!userForm.password) {
|
||||
ElMessage({
|
||||
message: '密码不能为空',
|
||||
type: 'error',
|
||||
@@ -754,6 +760,16 @@ function adjustWidth() {
|
||||
.el-message-box__message {
|
||||
word-break: break-all;
|
||||
}
|
||||
|
||||
.el-table-filter__bottom {
|
||||
button:last-child {
|
||||
display: none;
|
||||
}
|
||||
}
|
||||
|
||||
.el-table-filter__content {
|
||||
min-width: 0;
|
||||
}
|
||||
</style>
|
||||
<style lang="scss" scoped>
|
||||
|
||||
|
||||
Reference in New Issue
Block a user