升级element至稳定版

This commit is contained in:
piexlmax
2022-02-08 17:00:20 +08:00
parent 343d3aaaf2
commit a9dec9fe4d
27 changed files with 140 additions and 120 deletions
+6 -6
View File
@@ -22,22 +22,22 @@
</el-select>
</el-form-item>
<el-form-item>
<el-button size="mini" type="primary" icon="search" @click="onSubmit">查询</el-button>
<el-button size="mini" icon="refresh" @click="onReset">重置</el-button>
<el-button size="small" type="primary" icon="search" @click="onSubmit">查询</el-button>
<el-button size="small" icon="refresh" @click="onReset">重置</el-button>
</el-form-item>
</el-form>
</div>
<div class="gva-table-box">
<div class="gva-btn-list">
<el-button size="mini" type="primary" icon="plus" @click="openDialog('addApi')">新增</el-button>
<el-button size="small" type="primary" icon="plus" @click="openDialog('addApi')">新增</el-button>
<el-popover v-model:visible="deleteVisible" placement="top" width="160">
<p>确定要删除吗?</p>
<div style="text-align: right; margin-top: 8px;">
<el-button size="mini" type="text" @click="deleteVisible = false">取消</el-button>
<el-button size="mini" type="primary" @click="onDelete">确定</el-button>
<el-button size="small" type="text" @click="deleteVisible = false">取消</el-button>
<el-button size="small" type="primary" @click="onDelete">确定</el-button>
</div>
<template #reference>
<el-button icon="delete" size="mini" :disabled="!apis.length" style="margin-left: 10px;">删除</el-button>
<el-button icon="delete" size="small" :disabled="!apis.length" style="margin-left: 10px;">删除</el-button>
</template>
</el-popover>
</div>
@@ -3,7 +3,7 @@
<warning-bar title="注:右上角头像下拉可切换角色" />
<div class="gva-table-box">
<div class="gva-btn-list">
<el-button size="mini" type="primary" icon="plus" @click="addAuthority('0')">新增角色</el-button>
<el-button size="small" type="primary" icon="plus" @click="addAuthority('0')">新增角色</el-button>
</div>
<el-table
:data="tableData"
@@ -17,31 +17,31 @@
<template #default="scope">
<el-button
icon="setting"
size="mini"
size="small"
type="text"
@click="opdendrawer(scope.row)"
>设置权限</el-button>
<el-button
icon="plus"
size="mini"
size="small"
type="text"
@click="addAuthority(scope.row.authorityId)"
>新增子角色</el-button>
<el-button
icon="copy-document"
size="mini"
size="small"
type="text"
@click="copyAuthorityFunc(scope.row)"
>拷贝</el-button>
<el-button
icon="edit"
size="mini"
size="small"
type="text"
@click="editAuthority(scope.row)"
>编辑</el-button>
<el-button
icon="delete"
size="mini"
size="small"
type="text"
@click="deleteAuth(scope.row)"
>删除</el-button>
@@ -1,7 +1,7 @@
<template>
<div>
<div class="clearflex">
<el-button class="fl-right" size="mini" type="primary" @click="authApiEnter">确 定</el-button>
<el-button class="fl-right" size="small" type="primary" @click="authApiEnter">确 定</el-button>
</div>
<el-tree
ref="apiTree"
@@ -1,10 +1,10 @@
<template>
<div>
<div class="clearflex" style="margin:18px">
<el-button class="fl-right" size="mini" type="primary" @click="authDataEnter">确 定</el-button>
<el-button class="fl-left" size="mini" type="primary" @click="all">全选</el-button>
<el-button class="fl-left" size="mini" type="primary" @click="self">本角色</el-button>
<el-button class="fl-left" size="mini" type="primary" @click="selfAndChildren">本角色及子角色</el-button>
<el-button class="fl-right" size="small" type="primary" @click="authDataEnter">确 定</el-button>
<el-button class="fl-left" size="small" type="primary" @click="all">全选</el-button>
<el-button class="fl-left" size="small" type="primary" @click="self">本角色</el-button>
<el-button class="fl-left" size="small" type="primary" @click="selfAndChildren">本角色及子角色</el-button>
</div>
<el-checkbox-group v-model="dataAuthorityId" @change="selectAuthority">
<el-checkbox v-for="(item,key) in authoritys" :key="key" :label="item">{{ item.authorityName }}</el-checkbox>
@@ -1,7 +1,7 @@
<template>
<div>
<div class="clearflex">
<el-button class="fl-right" size="mini" type="primary" @click="relation">确 定</el-button>
<el-button class="fl-right" size="small" type="primary" @click="relation">确 定</el-button>
</div>
<el-tree
ref="menuTree"
@@ -20,7 +20,7 @@
<span>
<el-button
type="text"
size="mini"
size="small"
:style="{color:row.defaultRouter === data.name?'#E6A23C':'#85ce61'}"
:disabled="!node.checked"
@click="() => setDefault(data)"
@@ -22,13 +22,13 @@
</el-form-item>
<el-form-item>
<el-button
size="mini"
size="small"
type="primary"
icon="search"
@click="onSubmit"
>查询</el-button>
<el-button
size="mini"
size="small"
icon="refresh"
@click="onReset"
>重置</el-button>
@@ -38,7 +38,7 @@
<div class="gva-table-box">
<div class="gva-btn-list">
<el-button
size="mini"
size="small"
type="primary"
icon="plus"
@click="openDialog"
@@ -83,13 +83,13 @@
<el-table-column align="left" label="按钮组">
<template #default="scope">
<el-button
size="mini"
size="small"
icon="document"
type="text"
@click="toDetile(scope.row)"
>详情</el-button>
<el-button
size="mini"
size="small"
icon="edit"
type="text"
@click="updateSysDictionaryFunc(scope.row)"
@@ -102,13 +102,13 @@
<p>确定要删除吗?</p>
<div style="text-align: right; margin-top: 8px">
<el-button
size="mini"
size="small"
type="text"
@click="scope.row.visible = false"
>取消</el-button>
<el-button
type="primary"
size="mini"
size="small"
@click="deleteSysDictionaryFunc(scope.row)"
>确定</el-button>
</div>
@@ -116,8 +116,9 @@
<el-button
type="text"
icon="delete"
size="mini"
size="small"
style="margin-left: 10px"
@click="scope.row.visible = true"
>删除</el-button>
</template>
</el-popover>
@@ -15,14 +15,14 @@
</el-select>
</el-form-item>
<el-form-item>
<el-button size="mini" type="primary" icon="search" @click="onSubmit">查询</el-button>
<el-button size="mini" icon="refresh" @click="onReset">重置</el-button>
<el-button size="small" type="primary" icon="search" @click="onSubmit">查询</el-button>
<el-button size="small" icon="refresh" @click="onReset">重置</el-button>
</el-form-item>
</el-form>
</div>
<div class="gva-table-box">
<div class="gva-btn-list">
<el-button size="mini" type="primary" icon="plus" @click="openDialog">新增字典项</el-button>
<el-button size="small" type="primary" icon="plus" @click="openDialog">新增字典项</el-button>
</div>
<el-table
ref="multipleTable"
@@ -52,11 +52,11 @@
<el-popover v-model:visible="scope.row.visible" placement="top" width="160">
<p>确定要删除吗?</p>
<div style="text-align: right; margin-top: 8px;">
<el-button size="mini" type="text" @click="scope.row.visible = false">取消</el-button>
<el-button type="primary" size="mini" @click="deleteSysDictionaryDetailFunc(scope.row)">确定</el-button>
<el-button size="small" type="text" @click="scope.row.visible = false">取消</el-button>
<el-button type="primary" size="small" @click="deleteSysDictionaryDetailFunc(scope.row)">确定</el-button>
</div>
<template #reference>
<el-button type="text" icon="delete" size="mini">删除</el-button>
<el-button type="text" icon="delete" size="small" @click="scope.row.visible = true">删除</el-button>
</template>
</el-popover>
</template>
+5 -5
View File
@@ -2,7 +2,7 @@
<div>
<div class="gva-table-box">
<div class="gva-btn-list">
<el-button size="mini" type="primary" icon="plus" @click="addMenu('0')">新增根菜单</el-button>
<el-button size="small" type="primary" icon="plus" @click="addMenu('0')">新增根菜单</el-button>
</div>
<!-- 由于此处菜单跟左侧列表一一对应所以不需要分页 pageSize默认999 -->
@@ -36,19 +36,19 @@
<el-table-column align="left" fixed="right" label="操作" width="300">
<template #default="scope">
<el-button
size="mini"
size="small"
type="text"
icon="plus"
@click="addMenu(scope.row.ID)"
>添加子菜单</el-button>
<el-button
size="mini"
size="small"
type="text"
icon="edit"
@click="editMenu(scope.row.ID)"
>编辑</el-button>
<el-button
size="mini"
size="small"
type="text"
icon="delete"
@click="deleteMenu(scope.row.ID)"
@@ -110,7 +110,7 @@
</el-form-item>
<el-form-item label="文件路径" prop="component" style="width:60%">
<el-input v-model="form.component" autocomplete="off" />
<span style="font-size:12px;margin-right:12px;">如果菜单包含子菜单,请创建router-view二级路由页面或者</span><el-button size="mini" @click="form.component = 'view/routerHolder.vue'">点我设置</el-button>
<span style="font-size:12px;margin-right:12px;">如果菜单包含子菜单,请创建router-view二级路由页面或者</span><el-button style="margin-top:4px" size="small" @click="form.component = 'view/routerHolder.vue'">点我设置</el-button>
</el-form-item>
<el-form-item label="展示名称" prop="meta.title" style="width:30%">
<el-input v-model="form.meta.title" autocomplete="off" />
@@ -12,8 +12,8 @@
<el-input v-model="searchInfo.status" placeholder="搜索条件" />
</el-form-item>
<el-form-item>
<el-button size="mini" type="primary" icon="search" @click="onSubmit">查询</el-button>
<el-button size="mini" icon="refresh" @click="onReset">重置</el-button>
<el-button size="small" type="primary" icon="search" @click="onSubmit">查询</el-button>
<el-button size="small" icon="refresh" @click="onReset">重置</el-button>
</el-form-item>
</el-form>
</div>
@@ -23,11 +23,11 @@
<el-popover v-model:visible="deleteVisible" placement="top" width="160">
<p>确定要删除吗?</p>
<div style="text-align: right; margin-top: 8px;">
<el-button size="mini" type="text" @click="deleteVisible = false">取消</el-button>
<el-button size="mini" type="primary" @click="onDelete">确定</el-button>
<el-button size="small" type="text" @click="deleteVisible = false">取消</el-button>
<el-button size="small" type="primary" @click="onDelete">确定</el-button>
</div>
<template #reference>
<el-button icon="delete" size="mini" style="margin-left: 10px;" :disabled="!multipleSelection.length">删除</el-button>
<el-button icon="delete" size="small" style="margin-left: 10px;" :disabled="!multipleSelection.length">删除</el-button>
</template>
</el-popover>
</div>
@@ -94,11 +94,11 @@
<el-popover v-model:visible="scope.row.visible" placement="top" width="160">
<p>确定要删除吗?</p>
<div style="text-align: right; margin-top: 8px;">
<el-button size="mini" type="text" @click="scope.row.visible = false">取消</el-button>
<el-button size="mini" type="primary" @click="deleteSysOperationRecordFunc(scope.row)">确定</el-button>
<el-button size="small" type="text" @click="scope.row.visible = false">取消</el-button>
<el-button size="small" type="primary" @click="deleteSysOperationRecordFunc(scope.row)">确定</el-button>
</div>
<template #reference>
<el-button icon="delete" size="mini" type="text">删除</el-button>
<el-button icon="delete" size="small" type="text" @click="scope.row.visible = true">删除</el-button>
</template>
</el-popover>
</template>
+6 -6
View File
@@ -3,7 +3,7 @@
<warning-bar title="注:右上角头像下拉可切换角色" />
<div class="gva-table-box">
<div class="gva-btn-list">
<el-button size="mini" type="primary" icon="plus" @click="addUser">新增用户</el-button>
<el-button size="small" type="primary" icon="plus" @click="addUser">新增用户</el-button>
</div>
<el-table :data="tableData">
<el-table-column align="left" label="头像" min-width="50">
@@ -47,17 +47,17 @@
</el-table-column>
<el-table-column align="left" label="操作" min-width="150">
<template #default="scope">
<el-popover v-model:visible="scope.row.visible" placement="top" width="160">
<el-popover v-model:visible="scope.row.visible" placement="top" width="160" trigger="click">
<p>确定要删除此用户吗</p>
<div style="text-align: right; margin-top: 8px;">
<el-button size="mini" type="text" @click="scope.row.visible = false">取消</el-button>
<el-button type="primary" size="mini" @click="deleteUserFunc(scope.row)">确定</el-button>
<el-button size="small" type="text" @click="scope.row.visible = false">取消</el-button>
<el-button type="primary" size="small" @click="deleteUserFunc(scope.row)">确定</el-button>
</div>
<template #reference>
<el-button type="text" icon="delete" size="mini">删除</el-button>
<el-button type="text" icon="delete" size="small" @click="scope.row.visible = true">删除</el-button>
</template>
</el-popover>
<el-button type="text" icon="magic-stick" size="mini" @click="resetPasswordFunc(scope.row)">重置密码</el-button>
<el-button type="text" icon="magic-stick" size="small" @click="resetPasswordFunc(scope.row)">重置密码</el-button>
</template>
</el-table-column>
</el-table>