github/magic-boot
github/magic-boot
3
0
Fork 0
mirror of https://gitee.com/ssssssss-team/magic-boot.git synced 2025-02-27 04:42:49 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

修改Icon前缀“ElIcon”

Browse Source
This commit is contained in:
zegezy 2022-05-09 21:52:12 +08:00
parent 4500164807
commit 4a0b81e70d
20 changed files with 65 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
magic-boot-ui/src/components/magic/basic/mb-button.vue
View File

@ -74,7 +74,7 @@ export default {
this.requestMethod_ = 'delete'
this.el_.type = 'danger'
this.el_.text = '删除'
this.el_.icon = 'ElDelete'
this.el_.icon = 'ElIconDelete'
this.beforeConfirm_ = '此操作将永久删除该数据, 是否继续?'
this.successTips_ = '删除成功！'
this.failTips_ = '删除失败！'

4
magic-boot-ui/src/components/magic/data/mb-search.vue
View File

@ -22,10 +22,10 @@
</el-form-item>
</span>
<el-form-item>
<el-button class="filter-item" type="primary" icon="ElSearch" @click="search">
<el-button class="filter-item" type="primary" icon="ElIconSearch" @click="search">
搜索
</el-button>
<el-button class="filter-item" icon="ElDelete" @click="reset">
<el-button class="filter-item" icon="ElIconDelete" @click="reset">
清空
</el-button>
<slot name="btns" />

9
magic-boot-ui/src/components/magic/data/mb-tree.vue
View File

@ -1,8 +1,8 @@
<template>
<div>
<div style="margin-bottom: 5px;" v-if="expand || checked">
<el-button v-if="expand" type="primary" icon="ElSort" plain @click="doExpand">展开/折叠</el-button>
<el-button v-if="checked" type="primary" icon="ElCheck" plain @click="() => { treeAllChecked = !treeAllChecked; checkedAll(treeData, treeAllChecked) }">全选/全不选</el-button>
<el-button v-if="expand" type="primary" icon="ElIconSort" plain @click="doExpand">展开/折叠</el-button>
<el-button v-if="checked" type="primary" icon="ElIconCheck" plain @click="() => { treeAllChecked = !treeAllChecked; checkedAll(treeData, treeAllChecked) }">全选/全不选</el-button>
</div>
<div style="margin-bottom: 5px;" v-if="search">
<el-input v-model="searchValue" placeholder="输入关键字进行过滤" @input="tree.filter(searchValue)" :style="{ width: searchWidth }" />
@ -46,8 +46,8 @@ const props = defineProps({
default: ''
},
style: {
type: String,
default: ''
type: Object,
default: () => {}
},
props: {
type: Object,
@ -126,6 +126,7 @@ function checkChange(node) {
for (var i = 0; i < checkedNodes.length; i++) {
selectMenus.push(checkedNodes[i].id)
}
console.log(selectMenus.join(','))
emit('update:select-values', selectMenus.join(','))
emit('check-change', selectMenus.join(','))
}

2
magic-boot-ui/src/components/magic/form/mb-upload-file.vue
View File

@ -16,7 +16,7 @@
:before-upload="beforeAvatarUpload"
:on-success="handleAvatarSuccess"
>
<el-button type="primary" icon="ElUploadFilled" :loading="uploadLoading" :disabled="!multiple && fileList.length == 1">{{ label }}</el-button>
<el-button type="primary" icon="ElIconUploadFilled" :loading="uploadLoading" :disabled="!multiple && fileList.length == 1">{{ label }}</el-button>
<div slot="tip" v-if="showTip" class="el-upload__tip">支持上传{{ getSettingSuffixs().replaceAll(',', '，') }}文件，且不超过{{ maxFileSize }}MB</div>
</el-upload>
</template>

6
magic-boot-ui/src/components/magic/form/mb-upload-image.vue
View File

@ -19,12 +19,12 @@
<div class="tools">
<div class="shadow" @click="handleRemove(element)">
<el-icon>
<ElDelete />
<ElIconDelete />
</el-icon>
</div>
<div class="shadow" @click="beforeCropper(element)">
<el-icon>
<ElScissor />
<ElIconScissor />
</el-icon>
</div>
</div>
@ -47,7 +47,7 @@
:on-exceed="onExceed"
>
<el-icon class="uploadIcon">
<ElPlus />
<ElIconPlus />
<span v-show="isUploading" class="uploading">正在上传...</span>
<span
v-if="!isUploading && limit && limit!==99 && multiple"

2
magic-boot-ui/src/components/magic/template/mb-list.vue
View File

@ -5,7 +5,7 @@
<el-row class="toolbar-container">
<div v-for="(it, i) in tools" :key="i">
<el-button v-if="it.type == 'add'" v-permission="it.permission" class="filter-item" type="primary" icon="ElPlus" @click="it.click">
<el-button v-if="it.type == 'add'" v-permission="it.permission" class="filter-item" type="primary" icon="ElIconPlus" @click="it.click">
{{ it.label || '添加' }}
</el-button>
<mb-button v-if="it.type == 'delete'" v-permission="it.permission" :el="{ plain: true }" :request-url="it.url" :btn-type="'delete'" :request-data="{ id: ids }" :after-handler="reload" />

2
magic-boot-ui/src/scripts/globalProperties.js
View File

@ -23,7 +23,7 @@ const install = (app) => {
app.config.globalProperties.$common = common
app.config.globalProperties.$treeTable = treeTable
for(var key in PlusIcons) {
app.component(`El${key}`, PlusIcons[key])
app.component(`ElIcon${key}`, PlusIcons[key])
}
}
export default install

4
magic-boot-ui/src/views/examples/test-mb-list.vue
View File

@ -92,7 +92,7 @@ const listOptions = reactive({
permission: 'user:save',
label: '修改',
type: 'text',
icon: 'ElEdit',
icon: 'ElIconEdit',
click: (row) => {
// magicForm.value.getDetail(row.id)
formOptions.form.rows[0].cols[1].rules = []
@ -103,7 +103,7 @@ const listOptions = reactive({
permission: 'user:delete',
label: '删除',
type: 'text',
icon: 'ElDelete',
icon: 'ElIconDelete',
click: (row) => {
proxy.$common.handleDelete({
url: '/system/user/delete',

8
magic-boot-ui/src/views/login.vue
View File

@ -59,14 +59,6 @@
showClose: true
})
return
}else if(!loginForm.code){
proxy.$message({
message: '请输入验证码',
type: 'error',
duration: 2000,
showClose: true
})
return
}else{
loading.value = true
login(loginForm).then((res) => {

10
magic-boot-ui/src/views/lowcode/code-gen-form.vue
View File

@ -30,7 +30,7 @@
<template #label>
模块名称
<el-tooltip content="第一级分组名称，例如：系统功能" placement="top">
<el-icon><ElQuestionFilled /></el-icon>
<el-icon><ElIconQuestionFilled /></el-icon>
</el-tooltip>
</template>
<el-input v-model="genInfo.info.moduleName"></el-input>
@ -41,7 +41,7 @@
<template #label>
模块路径
<el-tooltip content="第一级分组的路径，例如：/system" placement="top">
<el-icon><ElQuestionFilled /></el-icon>
<el-icon><ElIconQuestionFilled /></el-icon>
</el-tooltip>
</template>
<el-input v-model="genInfo.info.modulePath"></el-input>
@ -52,7 +52,7 @@
<template #label>
功能名称
<el-tooltip content="第二级分组名称，例如：菜单管理" placement="top">
<el-icon><ElQuestionFilled /></el-icon>
<el-icon><ElIconQuestionFilled /></el-icon>
</el-tooltip>
</template>
<el-input v-model="genInfo.info.businessName"></el-input>
@ -63,7 +63,7 @@
<template #label>
功能路径
<el-tooltip content="第二级分组路径，例如：/menu" placement="top">
<el-icon><ElQuestionFilled /></el-icon>
<el-icon><ElIconQuestionFilled /></el-icon>
</el-tooltip>
</template>
<el-input v-model="genInfo.info.businessPath"></el-input>
@ -79,7 +79,7 @@
<template #label>
代码生成
<el-tooltip content="接口和页面直接生成到magic-api的api,component" placement="top">
<el-icon><ElQuestionFilled /></el-icon>
<el-icon><ElIconQuestionFilled /></el-icon>
</el-tooltip>
</template>
<el-button type="primary" @click="executeGen()" style="margin-bottom: 10px">代码生成</el-button>

4
magic-boot-ui/src/views/lowcode/code-gen-list.vue
View File

@ -60,7 +60,7 @@
permission: 'code:gen:save',
label: '修改',
type: 'text',
icon: 'ElEdit',
icon: 'ElIconEdit',
click: (row) => {
formDialog.value.show()
nextTick(() => magicForm.value.getDetail(row.id))
@ -69,7 +69,7 @@
permission: 'code:gen:delete',
label: '删除',
type: 'text',
icon: 'ElDelete',
icon: 'ElIconDelete',
click: (row) => {
proxy.$common.handleDelete({
url: '/system/code/gen/delete',

10
magic-boot-ui/src/views/system/dict/dict-items.vue
View File

@ -4,7 +4,7 @@
<mb-search :where="tableOptions.where" @search="reloadTable" not-reset="dictId" />
<el-row class="toolbar-container">
<el-button v-permission="'dict:items:save'" class="filter-item" type="primary" icon="ElEdit" @click="handleCreate">
<el-button v-permission="'dict:items:save'" class="filter-item" type="primary" icon="ElIconEdit" @click="handleCreate">
添加
</el-button>
</el-row>
@ -95,7 +95,7 @@ const tableOptions = reactive({
{
label: '上移',
type: 'text',
icon: 'ElSortUp',
icon: 'ElIconSortUp',
click: (row) => {
proxy.$get('/system/dict/items/sort/up',{
id: row.id,
@ -109,7 +109,7 @@ const tableOptions = reactive({
{
label: '下移',
type: 'text',
icon: 'ElSortDown',
icon: 'ElIconSortDown',
click: (row) => {
proxy.$get('/system/dict/items/sort/down',{
id: row.id,
@ -136,7 +136,7 @@ const tableOptions = reactive({
permission: 'dict:items:save',
label: '修改',
type: 'text',
icon: 'ElEdit',
icon: 'ElIconEdit',
click: (row) => {
handleUpdate(row)
}
@ -145,7 +145,7 @@ const tableOptions = reactive({
permission: 'dict:items:delete',
label: '删除',
type: 'text',
icon: 'ElDelete',
icon: 'ElIconDelete',
click: (row) => {
proxy.$common.handleDelete({
url: '/system/dict/items/delete',

8
magic-boot-ui/src/views/system/dict/dict-list.vue
View File

@ -4,7 +4,7 @@
<mb-search :where="tableOptions.where" @search="reloadTable" />
<el-row class="toolbar-container">
<el-button v-permission="'dict:save'" class="filter-item" type="primary" icon="ElPlus" @click="handleCreate">
<el-button v-permission="'dict:save'" class="filter-item" type="primary" icon="ElIconPlus" @click="handleCreate">
添加
</el-button>
</el-row>
@ -111,7 +111,7 @@ const tableOptions = reactive({
permission: 'dict:save',
label: '修改',
type: 'text',
icon: 'ElEdit',
icon: 'ElIconEdit',
click: (row) => {
handleUpdate(row)
}
@ -120,7 +120,7 @@ const tableOptions = reactive({
permission: 'dict:delete',
label: '删除',
type: 'text',
icon: 'ElDelete',
icon: 'ElIconDelete',
click: (row) => {
proxy.$common.handleDelete({
url: '/system/dict/delete',
@ -136,7 +136,7 @@ const tableOptions = reactive({
permission: 'dict:items:view',
label: '字典项',
type: 'text',
icon: 'ElList',
icon: 'ElIconList',
click: (row) => {
dictItemsDialog.value.show()
dictId.value = row.id

20
magic-boot-ui/src/views/system/menu/menu-list.vue
View File

@ -7,10 +7,10 @@
<el-input v-model="searchValue" @input="searchMenu" placeholder="菜单名称、链接、权限标识" style="width: 200px"></el-input>
</el-form-item>
<el-form-item>
<el-button class="filter-item" type="primary" icon="ElSearch" @click="searchMenu">
<el-button class="filter-item" type="primary" icon="ElIconSearch" @click="searchMenu">
搜索
</el-button>
<el-button class="filter-item" icon="ElDelete" @click="() => { searchValue = ''; searchMenu() }">
<el-button class="filter-item" icon="ElIconDelete" @click="() => { searchValue = ''; searchMenu() }">
清空
</el-button>
</el-form-item>
@ -18,10 +18,10 @@
</div>
<el-row class="toolbar-container">
<el-button class="filter-item" type="primary" icon="ElPlus" @click="addSubMenu('0')" v-permission="'menu:save'">
<el-button class="filter-item" type="primary" icon="ElIconPlus" @click="addSubMenu('0')" v-permission="'menu:save'">
添加菜单
</el-button>
<el-button type="primary" icon="ElSort" plain @click="expand">展开/折叠</el-button>
<el-button type="primary" icon="ElIconSort" plain @click="expand">展开/折叠</el-button>
</el-row>
<mb-table ref="table" v-bind="tableOptions" v-if="menuData && menuData.length > 0 && refreshTable" />
@ -95,7 +95,7 @@ const tableOptions = reactive({
{
label: '上移',
type: 'text',
icon: 'ElSortUp',
icon: 'ElIconSortUp',
click: (row) => {
proxy.$get('/system/menu/sort/up',{
id: row.id,
@ -109,7 +109,7 @@ const tableOptions = reactive({
{
label: '下移',
type: 'text',
icon: 'ElSortDown',
icon: 'ElIconSortDown',
click: (row) => {
proxy.$get('/system/menu/sort/down',{
id: row.id,
@ -157,7 +157,7 @@ const tableOptions = reactive({
label: '添加下级菜单',
type: 'text',
permission: 'menu:save',
icon: 'ElPlus',
icon: 'ElIconPlus',
click: (row) => {
addSubMenu(row.id)
}
@ -166,7 +166,7 @@ const tableOptions = reactive({
label: '修改',
type: 'text',
permission: 'menu:save',
icon: 'ElEdit',
icon: 'ElIconEdit',
click: (row) => {
handleUpdate(row)
}
@ -175,7 +175,7 @@ const tableOptions = reactive({
label: '删除',
type: 'text',
permission: 'menu:delete',
icon: 'ElDelete',
icon: 'ElIconDelete',
click: (row) => {
proxy.$common.handleDelete({
url: '/system/menu/delete',
@ -189,7 +189,7 @@ const tableOptions = reactive({
]
})
const dialogTitle = ref('')
var searchTimeout = reactive()
var searchTimeout = null
const menuFormDialog = ref()
const menuFormRef = ref()

2
magic-boot-ui/src/views/system/monitor/online-user.vue
View File

@ -86,7 +86,7 @@
permission: 'online:logout',
label: '踢人',
type: 'text',
icon: 'ElBicycle',
icon: 'ElIconBicycle',
click: (row) => {
// currRow.value = row
// magicDialog.value.show()

2
magic-boot-ui/src/views/system/monitor/oper-log.vue
View File

@ -2,7 +2,7 @@
<div class="app-container">
<mb-search :where="tableOptions.where" @search="reloadTable">
<template #btns>
<el-button class="filter-item" type="primary" icon="ElDownload" @click="table.exportExcel()">
<el-button class="filter-item" type="primary" icon="ElIconDownload" @click="table.exportExcel()">
导出
</el-button>
</template>

20
magic-boot-ui/src/views/system/office/office-list.vue
View File

@ -13,10 +13,10 @@
<el-input v-model="searchValue" @input="searchOffice" placeholder="机构名称、机构编码"></el-input>
</el-form-item>
<el-form-item>
<el-button class="filter-item" type="primary" icon="ElSearch" @click="searchOffice">
<el-button class="filter-item" type="primary" icon="ElIconSearch" @click="searchOffice">
搜索
</el-button>
<el-button class="filter-item" icon="ElDelete" @click="() => { this.searchValue = ''; searchOffice() }">
<el-button class="filter-item" icon="ElIconDelete" @click="() => { this.searchValue = ''; searchOffice() }">
清空
</el-button>
</el-form-item>
@ -24,10 +24,10 @@
</div>
<el-row class="toolbar-container">
<el-button class="filter-item" type="primary" icon="ElEdit" @click="addSubOffice('0')" v-permission="'office:save'">
<el-button class="filter-item" type="primary" icon="ElIconEdit" @click="addSubOffice('0')" v-permission="'office:save'">
添加机构
</el-button>
<el-button type="primary" icon="ElSort" plain @click="expand">展开/折叠</el-button>
<el-button type="primary" icon="ElIconSort" plain @click="expand">展开/折叠</el-button>
</el-row>
<mb-table ref="table" v-bind="tableOptions" v-if="officeData && officeData.length > 0 && refreshTable" />
@ -123,7 +123,7 @@ const tableOptions = reactive({
{
label: '上移',
type: 'text',
icon: 'ElSortUp',
icon: 'ElIconSortUp',
click: (row) => {
proxy.$get('/system/office/sort/up',{
id: row.id,
@ -137,7 +137,7 @@ const tableOptions = reactive({
{
label: '下移',
type: 'text',
icon: 'ElSortDown',
icon: 'ElIconSortDown',
click: (row) => {
proxy.$get('/system/office/sort/down',{
id: row.id,
@ -161,7 +161,7 @@ const tableOptions = reactive({
label: '添加下级机构',
type: 'text',
permission: 'office:save',
icon: 'ElPlus',
icon: 'ElIconPlus',
click: (row) => {
addSubOffice(row.id)
}
@ -170,7 +170,7 @@ const tableOptions = reactive({
label: '修改',
type: 'text',
permission: 'office:save',
icon: 'ElEdit',
icon: 'ElIconEdit',
click: (row) => {
handleUpdate(row)
}
@ -179,7 +179,7 @@ const tableOptions = reactive({
label: '删除',
type: 'text',
permission: 'office:delete',
icon: 'ElDelete',
icon: 'ElIconDelete',
if: (row) => {
return row.pid != '0';
},
@ -195,7 +195,7 @@ const tableOptions = reactive({
permission: 'office:user:list',
label: '用户列表',
type: 'text',
icon: 'ElUserFilled',
icon: 'ElIconUserFilled',
click: (row) => {
proxy.$router.push({
path: '/system/user/user-list',

12
magic-boot-ui/src/views/system/role/role-list.vue
View File

@ -4,7 +4,7 @@
<mb-search :where="tableOptions.where" @search="reloadTable" />
<el-row class="toolbar-container">
<el-button v-permission="'role:save'" class="filter-item" type="primary" icon="ElPlus" @click="handleCreate">
<el-button v-permission="'role:save'" class="filter-item" type="primary" icon="ElIconPlus" @click="handleCreate">
添加
</el-button>
</el-row>
@ -41,7 +41,7 @@
<el-row :gutter="24">
<el-col :span="12">
<el-form-item label="菜单权限" prop="menus">
<mb-tree ref="tree" :props="{ 'show-checkbox': true }" style="height: 270px; overflow: auto" url="/system/menu/tree" :search="true" :select-values="temp.menus" />
<mb-tree ref="tree" :props="{ 'show-checkbox': true }" style="height: 270px; overflow: auto" url="/system/menu/tree" :search="true" v-model:select-values="temp.menus" />
</el-form-item>
</el-col>
<el-col :span="12">
@ -127,7 +127,7 @@ const tableOptions = reactive({
permission: 'role:save',
label: '修改',
type: 'text',
icon: 'ElEdit',
icon: 'ElIconEdit',
click: (row) => {
handleUpdate(row)
}
@ -136,7 +136,7 @@ const tableOptions = reactive({
permission: 'role:delete',
label: '删除',
type: 'text',
icon: 'ElDelete',
icon: 'ElIconDelete',
click: (row) => {
proxy.$common.handleDelete({
url: '/system/role/delete',
@ -149,7 +149,7 @@ const tableOptions = reactive({
permission: 'role:permission',
label: '权限',
type: 'text',
icon: 'ElPlus',
icon: 'ElIconPlus',
click: (row) => {
temp.value.id = row.id
assignPermissionsDialog.value.show()
@ -159,7 +159,7 @@ const tableOptions = reactive({
permission: 'role:user:list',
label: '用户列表',
type: 'text',
icon: 'ElUserFilled',
icon: 'ElIconUserFilled',
click: (row) => {
proxy.$router.push({
path: '/system/user/user-list',

2
magic-boot-ui/src/views/system/test/test-list.vue
View File

@ -3,7 +3,7 @@
<div class="filter-container">
<el-form :inline="true">
<el-form-item>
<el-button class="filter-item" type="primary" icon="ElEdit" @click="handleCreate">
<el-button class="filter-item" type="primary" icon="ElIconEdit" @click="handleCreate">
添加
</el-button>
</el-form-item>

8
magic-boot-ui/src/views/system/user/user-list.vue
View File

@ -28,14 +28,14 @@
<mb-search :where="tableOptions.where" @search="reloadTable">
<template #btns>
<el-button class="filter-item" type="primary" icon="ElDownload" @click="table.exportExcel()">
<el-button class="filter-item" type="primary" icon="ElIconDownload" @click="table.exportExcel()">
导出
</el-button>
</template>
</mb-search>
<el-row class="toolbar-container">
<el-button v-permission="'user:save'" class="filter-item" type="primary" icon="ElEdit" @click="handleCreate">
<el-button v-permission="'user:save'" class="filter-item" type="primary" icon="ElIconEdit" @click="handleCreate">
添加
</el-button>
<mb-button v-permission="'user:delete'" :el="{ plain: true }" :request-url="'/system/user/delete'" :btn-type="'delete'" :request-data="{ id: ids }" :after-handler="reloadTable" />
@ -192,7 +192,7 @@ const tableOptions = reactive({
permission: 'user:save',
label: '修改',
type: 'text',
icon: 'ElEdit',
icon: 'ElIconEdit',
click: (row) => {
handleUpdate(row)
}
@ -201,7 +201,7 @@ const tableOptions = reactive({
permission: 'user:delete',
label: '删除',
type: 'text',
icon: 'ElDelete',
icon: 'ElIconDelete',
if: (row) => {
return row.id != '1'
},