CN-1551 feat: 升级element-ui版本
This commit is contained in:
@@ -7,9 +7,13 @@
|
||||
>
|
||||
<template v-if="meta.meta === condition">
|
||||
<!-- 删除按钮 -->
|
||||
<div class="condition__delete" @click="removeCondition(index)"><i class="el-icon-error"></i></div>
|
||||
<div class="condition__delete" @click="removeCondition(index)">
|
||||
<el-icon><CircleCloseFilled /></el-icon>
|
||||
<!--<i class="el-icon-error"></i>-->
|
||||
</div>
|
||||
<!-- 字段选择 -->
|
||||
<div v-if="meta.column.show" class="condition__column">
|
||||
<!-- <div>-->
|
||||
<div v-show="meta.column.isEditing">
|
||||
<el-select
|
||||
allow-create
|
||||
@@ -155,10 +159,12 @@
|
||||
</el-popover>
|
||||
</span>
|
||||
<span v-show="metaList.length>0" class="search__suffix search__suffix-close" @click="cleanMetaList">
|
||||
<i class="el-icon-error"></i>
|
||||
<el-icon><CircleCloseFilled /></el-icon>
|
||||
<!--<i class="el-icon-error"></i>-->
|
||||
</span>
|
||||
<span test-id="tag-search" class="search__suffix" @click="search">
|
||||
<i class="el-icon-search"></i>
|
||||
<el-icon><Search /></el-icon>
|
||||
<!--<i class="el-icon-search"></i>-->
|
||||
</span>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
<el-popover
|
||||
popper-class="my-popper-class"
|
||||
placement="top"
|
||||
trigger="hover"
|
||||
trigger="click"
|
||||
:content="$t('overall.switchToTag')"
|
||||
>
|
||||
<template #reference>
|
||||
@@ -21,11 +21,13 @@
|
||||
</span>
|
||||
<!--删除图标-->
|
||||
<span v-show="isCloseIcon" class="search__suffix search__suffix-close" @click="cleanParams">
|
||||
<i class="el-icon-error"></i>
|
||||
<el-icon><CircleCloseFilled /></el-icon>
|
||||
<!--<i class="el-icon-error"></i>-->
|
||||
</span>
|
||||
<!--搜索图标-->
|
||||
<span class="search__suffix" test-id="text-search" @click.stop="search">
|
||||
<i class="el-icon-search"></i>
|
||||
<el-icon><Search /></el-icon>
|
||||
<!--<i class="el-icon-search"></i>-->
|
||||
</span>
|
||||
</div>
|
||||
|
||||
|
||||
@@ -29,7 +29,7 @@
|
||||
action=""
|
||||
class="upload-demo"
|
||||
drag>
|
||||
<i class="el-icon-upload"></i>
|
||||
<el-icon><UploadFilled /></el-icon>
|
||||
<div class="el-upload__text">{{$t('overall.dragFileTip')}},{{$t('overall.or')}} <em>{{$t('overall.clickUpload')}}</em></div>
|
||||
<template #tip>
|
||||
<div class="el-upload__tip" >
|
||||
|
||||
@@ -35,6 +35,12 @@
|
||||
<el-dropdown-item>
|
||||
<div id="header-to-logout" @click="logout">{{ $t('overall.logout') }}</div>
|
||||
</el-dropdown-item>
|
||||
<el-dropdown-item>
|
||||
<div id="header-to-theme" @click="switchTheme">
|
||||
<span>暗黑模式</span>
|
||||
<el-switch v-model="isDark" size="large" class="mt-2" style="margin-left: 24px" inline-prompt />
|
||||
</div>
|
||||
</el-dropdown-item>
|
||||
</el-dropdown-menu>
|
||||
</template>
|
||||
</el-dropdown>
|
||||
@@ -46,8 +52,9 @@
|
||||
<el-breadcrumb-item class="header__left-breadcrumb-item" :id="`breadcrumb${item.value}`" :title="index===3?item.value:''"
|
||||
v-for="(item,index) in breadcrumb" :key="item.value">
|
||||
<template v-if="index===3" >
|
||||
<div class="header__left-breadcrumb-item-select" >
|
||||
<div class="header__left-breadcrumb-item-select" style="position: relative">
|
||||
<el-popover placement="bottom-start"
|
||||
style="position: absolute"
|
||||
ref="breadcrumbPopover"
|
||||
:show-arrow="false"
|
||||
:append-to-body="false"
|
||||
@@ -222,6 +229,7 @@ import {
|
||||
import { getNowTime, getSecond } from '@/utils/date-util'
|
||||
import _ from 'lodash'
|
||||
import { useRoute } from 'vue-router'
|
||||
import { useDark, useToggle } from '@vueuse/core'
|
||||
|
||||
export default {
|
||||
name: 'Header',
|
||||
@@ -307,7 +315,8 @@ export default {
|
||||
wholeScreenRouterMapping,
|
||||
logo: 'images/logo-header.svg',
|
||||
ZH,
|
||||
EN
|
||||
EN,
|
||||
isDark: useDark()
|
||||
}
|
||||
},
|
||||
computed: {
|
||||
@@ -474,10 +483,16 @@ export default {
|
||||
this.showChangePin = true
|
||||
},
|
||||
logout () {
|
||||
//
|
||||
sessionStorage.removeItem(storageKey.tokenExpireCurrentPath)
|
||||
localStorage.removeItem(storageKey.token)
|
||||
axios.get(api.logout)
|
||||
},
|
||||
switchTheme () {
|
||||
useToggle(this.isDark)
|
||||
const theme = this.isDark ? 'light' : 'dark'
|
||||
localStorage.setItem(storageKey.theme, theme)
|
||||
},
|
||||
refreshLang () {
|
||||
this.language = localStorage.getItem(storageKey.language)
|
||||
this.$i18n.locale = this.language
|
||||
|
||||
@@ -18,7 +18,7 @@
|
||||
<el-input maxlength="255" show-word-limit :rows="2" size='mini' type="textarea" v-model="editRole.remark" id="role-box-input-remark"/>
|
||||
</el-form-item>
|
||||
|
||||
<el-form-item :label="$t('config.roles.permission')">
|
||||
<el-form-item :label="$t('config.roles.permission')" class="my-form-item">
|
||||
<!--<div class="tree-option">
|
||||
<button type="button" class="cn-btn cn-btn-size-small-new cn-btn-style-light-new option-btn" style="margin-left: 0px;" @click="expandAllOrNone" :class="{'btn-active':expandAllFlag}">展开/收缩</button>
|
||||
<button type="button" class="cn-btn cn-btn-size-small-new cn-btn-style-light-new option-btn" @click="selectAllOrNone" :class="{'btn-active':selectAllFlag}"><span ><i class="cn-icon cn-icon-delete"></i></span></button>
|
||||
@@ -27,8 +27,8 @@
|
||||
<el-tree :data="menus" :default-expand-all="expandAllFlag" check-strictly="true" :props="{label:labelFormatter}" @check-change="selectChange" class="tree-border" node-key="id" ref="menuTree" show-checkbox id="role-box-input-menus">
|
||||
<template #default="{ data }">
|
||||
<span>
|
||||
<i v-if="data.type === '1'" class="el-icon-menu"></i>
|
||||
<i v-if="data.type === '2'" class="el-icon-edit"></i>
|
||||
<el-icon v-if="data.type === 1"><Menu /></el-icon>
|
||||
<el-icon v-if="data.type === 2"><Edit /></el-icon>
|
||||
</span>
|
||||
{{$t(data.i18n)}}
|
||||
</template>
|
||||
|
||||
@@ -11,8 +11,9 @@
|
||||
<div style="display: flex">
|
||||
<el-input v-model="keyWord" size="small" @keyup.enter="onSearch"></el-input>
|
||||
<!-- <el-button icon="el-icon-search" @click="onSearch" size="small"></el-button>-->
|
||||
<button class="top-tool-btn top-tool-btn--search" style="border-radius: 0 2px 2px 0 !important;" @click="onSearch">
|
||||
<i class="el-icon-search"></i>
|
||||
<button class="top-tool-btn top-tool-btn--search" style="border-radius: 0 2px 2px 0 !important;" @click="onSearch">
|
||||
<el-icon><Search /></el-icon>
|
||||
<!--<i class="el-icon-search"></i>-->
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -48,7 +48,7 @@
|
||||
<span style="color: #41ABFD">{...}</span>
|
||||
</template>
|
||||
<div class="highlight-box">
|
||||
<span class="highlight-box__copy-btn" @click="copyValue(scope.row[item.prop])"><i class="el-icon-document-copy"></i></span>
|
||||
<span class="highlight-box__copy-btn" @click="copyValue(scope.row[item.prop])"><el-icon><CopyDocument /></el-icon></span>
|
||||
<highlightjs
|
||||
language="json"
|
||||
:code="scope.row[item.prop]"
|
||||
@@ -70,7 +70,7 @@
|
||||
<span style="color: #41ABFD">{...}</span>
|
||||
</template>
|
||||
<div class="highlight-box">
|
||||
<span class="highlight-box__copy-btn" @click="copyValue(scope.row[item.prop])"><i class="el-icon-document-copy"></i></span>
|
||||
<span class="highlight-box__copy-btn" @click="copyValue(scope.row[item.prop])"><el-icon><CopyDocument /></el-icon></span>
|
||||
<highlightjs
|
||||
language="js"
|
||||
:code="scope.row[item.prop]"
|
||||
|
||||
Reference in New Issue
Block a user