XiaoMo/x-php-Admin
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

no message

Browse Source
This commit is contained in:
小陌 2023-07-28 19:02:19 +08:00
parent 24683adc2e
commit ed079b313b
11 changed files with 37 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/scFileSelect/index.vue
View File

@ -44,7 +44,7 @@
<el-image v-if="_isImg(item[fileProps.url])" :src="item[fileProps.url]" fit="contain" lazy></el-image> <el-image v-if="_isImg(item[fileProps.url])" :src="item[fileProps.url]" fit="contain" lazy></el-image>
<div v-else class="item-file item-file-doc"> <div v-else class="item-file item-file-doc">
<i v-if="files[_getExt(item[fileProps.url])]" :class="files[_getExt(item[fileProps.url])].icon" :style="{color:files[_getExt(item[fileProps.url])].color}"></i> <i v-if="files[_getExt(item[fileProps.url])]" :class="files[_getExt(item[fileProps.url])].icon" :style="{color:files[_getExt(item[fileProps.url])].color}"></i>
<i v-else class="sc-icon-file-list-fill" style="color: #999;"></i> <i v-else class="x-icon-file-list-fill" style="color: #999;"></i>
</div> </div>
</div> </div>
<p :title="item[fileProps.fileName]">{{item[fileProps.fileName]}}</p> <p :title="item[fileProps.fileName]">{{item[fileProps.fileName]}}</p>

12
src/config/fileSelect.js
View File

@ -42,27 +42,27 @@ export default {
}, },
files: { files: {
doc: { doc: {
icon: 'sc-icon-file-word-2-fill', icon: 'x-icon-file-word-2-fill',
color: '#409eff' color: '#409eff'
}, },
docx: { docx: {
icon: 'sc-icon-file-word-2-fill', icon: 'x-icon-file-word-2-fill',
color: '#409eff' color: '#409eff'
}, },
xls: { xls: {
icon: 'sc-icon-file-excel-2-fill', icon: 'x-icon-file-excel-2-fill',
color: '#67C23A' color: '#67C23A'
}, },
xlsx: { xlsx: {
icon: 'sc-icon-file-excel-2-fill', icon: 'x-icon-file-excel-2-fill',
color: '#67C23A' color: '#67C23A'
}, },
ppt: { ppt: {
icon: 'sc-icon-file-ppt-2-fill', icon: 'x-icon-file-ppt-2-fill',
color: '#F56C6C' color: '#F56C6C'
}, },
pptx: { pptx: {
icon: 'sc-icon-file-ppt-2-fill', icon: 'x-icon-file-ppt-2-fill',
color: '#F56C6C' color: '#F56C6C'
} }
} }

22
src/config/iconSelect.js
View File

@ -291,17 +291,17 @@ export default {
{ {
name: '扩展', name: '扩展',
icons: [ icons: [
'sc-icon-vue', 'x-icon-vue',
'sc-icon-code', 'x-icon-code',
'sc-icon-wechat', 'x-icon-wechat',
'sc-icon-bug-fill', 'x-icon-bug-fill',
'sc-icon-bug-line', 'x-icon-bug-line',
'sc-icon-file-word', 'x-icon-file-word',
'sc-icon-file-excel', 'x-icon-file-excel',
'sc-icon-file-ppt', 'x-icon-file-ppt',
'sc-icon-organization', 'x-icon-organization',
'sc-icon-upload', 'x-icon-upload',
'sc-icon-download' 'x-icon-download'
] ]
} }
] ]

4
src/style/app.scss
View File

@ -76,9 +76,9 @@ a,button,input,textarea{-webkit-tap-highlight-color:rgba(0,0,0,0);box-sizing: bo
.right-panel-search {display: flex;align-items: center;} .right-panel-search {display: flex;align-items: center;}
.right-panel-search > * + * {margin-left:10px;} .right-panel-search > * + * {margin-left:10px;}
.adminui-tags {height:34px;background: #fff;border-bottom: 1px solid #e6e6e6;} .adminui-tags {height:35px;background: #fff;border-bottom: 1px solid #e6e6e6;}
.adminui-tags ul {display: flex;overflow: hidden;} .adminui-tags ul {display: flex;overflow: hidden;}
.adminui-tags li {cursor: pointer;display: inline-block;float: left;height:34px;line-height: 34px;position: relative;flex-shrink: 0;} .adminui-tags li {cursor: pointer;display: inline-block;float: left;height:35px;line-height: 35px;position: relative;flex-shrink: 0;}
.adminui-tags li::after {content: " ";width:1px;height:100%;position: absolute;right:0px;background-image: linear-gradient(#fff, #e6e6e6);} .adminui-tags li::after {content: " ";width:1px;height:100%;position: absolute;right:0px;background-image: linear-gradient(#fff, #e6e6e6);}
.adminui-tags li a {display: inline-block;padding:0 10px;width:100%;height:100%;color: #999;text-decoration:none;display: flex;align-items: center;} .adminui-tags li a {display: inline-block;padding:0 10px;width:100%;height:100%;color: #999;text-decoration:none;display: flex;align-items: center;}
.adminui-tags li i {margin-left:10px;border-radius: 3px;width:18px;height:18px;display: flex;align-items: center;justify-content: center;} .adminui-tags li i {margin-left:10px;border-radius: 3px;width:18px;height:18px;display: flex;align-items: center;justify-content: center;}

1
src/views/home/index.vue
View File

@ -41,4 +41,5 @@
</script> </script>
<style> <style>
</style> </style>

2
src/views/login/index.vue
View File

@ -43,7 +43,7 @@
<template v-if="$config.MY_SHOW_LOGIN_OAUTH"> <template v-if="$config.MY_SHOW_LOGIN_OAUTH">
<el-divider>{{ $t('login.signInOther') }}</el-divider> <el-divider>{{ $t('login.signInOther') }}</el-divider>
<div class="login-oauth"> <div class="login-oauth">
<el-button type="success" icon="sc-icon-wechat" circle @click="wechatLogin"></el-button> <el-button type="success" icon="x-icon-wechat" circle @click="wechatLogin"></el-button>
</div> </div>
</template> </template>
</div> </div>

12
src/views/system/menu/index.vue
View File

@ -7,30 +7,28 @@
</el-input> </el-input>
</el-header> </el-header>
<el-main class="nopadding"> <el-main class="nopadding">
<el-tree :data="menuList" :expand-on-click-node="false" :filter-node-method="menuFilterNode" :props="menuProps" @node-click="menuClick" @node-drop="nodeDrop" check-strictly="" class="menu" draggable="" highlight-current="" node-key="id" ref="menu" show-checkbox=""> <el-tree :data="menuList" :expand-on-click-node="false" :filter-node-method="menuFilterNode" :props="menuProps" @node-click="menuClick" @node-drop="nodeDrop" check-strictly="" class="menu" draggable="" highlight-current="" node-key="id" ref="menu" :show-checkbox="false">
<template #default="{node, data}"> <template #default="{node, data}">
<span class="custom-tree-node"> <span class="custom-tree-node">
<span class="label"> <span class="label">
<el-icon style="margin-right: 2px;"> <el-icon style="margin-right: 2px;">
<component :is="data.meta.icon || 'el-icon-menu'"> <component :is="data.meta.icon || 'el-icon-menu'"> </component>
</component>
</el-icon> </el-icon>
{{ node.label }} {{ node.label }}
</span> </span>
<span class="do" v-if="!data.parentid"> <span class="do" v-if="!data.parentid">
<el-button @click.stop="add(node, data)" icon="el-icon-plus" size="small"> <!-- <el-button @click.stop="add(node, data)" icon="el-icon-plus" size="small"> </el-button> -->
</el-button>
</span> </span>
</span> </span>
</template> </template>
</el-tree> </el-tree>
</el-main> </el-main>
<el-footer style="height:51px;"> <!-- <el-footer style="height:51px;">
<el-button @click="add()" icon="el-icon-plus" size="small" type="primary"> <el-button @click="add()" icon="el-icon-plus" size="small" type="primary">
</el-button> </el-button>
<el-button @click="delMenu" icon="el-icon-delete" plain="" size="small" type="danger"> <el-button @click="delMenu" icon="el-icon-delete" plain="" size="small" type="danger">
</el-button> </el-button>
</el-footer> </el-footer> -->
</el-container> </el-container>
</el-aside> </el-aside>
<el-container> <el-container>

2
src/views/system/menu/save.vue
View File

@ -180,7 +180,7 @@
let obj = Object.assign({}, this.form); let obj = Object.assign({}, this.form);
delete obj.children; delete obj.children;
var res = await this.$http.post('system/menu/submit',obj) var res = await this.$http.post('menu/submit',obj)
this.loading = false this.loading = false
if(res.code == 200){ if(res.code == 200){
this.$message.success("保存成功") this.$message.success("保存成功")

2
src/views/vab/iconfont.vue
View File

@ -24,7 +24,7 @@
}, },
mounted() { mounted() {
for(let icon in scIcons){ for(let icon in scIcons){
this.icons.push('sc-icon'+icon.replace(/[A-Z]/g,(match)=>'-'+match.toLowerCase())) this.icons.push('x-icon'+icon.replace(/[A-Z]/g,(match)=>'-'+match.toLowerCase()))
} }
} }
} }

8
src/views/vab/importexport.vue
View File

@ -6,10 +6,10 @@
<sc-file-import :apiObj="$api.common.importFile" templateUrl="http://www.scuiadmin/file.xlsx" @success="success"></sc-file-import> <sc-file-import :apiObj="$api.common.importFile" templateUrl="http://www.scuiadmin/file.xlsx" @success="success"></sc-file-import>
<sc-file-import :apiObj="$api.common.importFile" :data="{otherData:'demo'}" templateUrl="http://www.scuiadmin/file.xlsx" accept=".xls, .xlsx" :maxSize="30" tip="请上传小于或等于 30M 的 .xls, .xlsx 格式文件(自定义TIP)" @success="success"> <sc-file-import :apiObj="$api.common.importFile" :data="{otherData:'demo'}" templateUrl="http://www.scuiadmin/file.xlsx" accept=".xls, .xlsx" :maxSize="30" tip="请上传小于或等于 30M 的 .xls, .xlsx 格式文件(自定义TIP)" @success="success">
<template #default="{open}"> <template #default="{open}">
<el-button type="primary" icon="sc-icon-upload" @click="open">导入(全配置)</el-button> <el-button type="primary" icon="x-icon-upload" @click="open">导入(全配置)</el-button>
</template> </template>
<template #uploader> <template #uploader>
<el-icon class="el-icon--upload"><sc-icon-file-excel /></el-icon> <el-icon class="el-icon--upload"><x-icon-file-excel /></el-icon>
<div class="el-upload__text"> <div class="el-upload__text">
将文件拖到此处或 <em>点击选择文件上传</em> 将文件拖到此处或 <em>点击选择文件上传</em>
</div> </div>
@ -42,12 +42,12 @@
<sc-file-export :apiObj="$api.common.exportFile"></sc-file-export> <sc-file-export :apiObj="$api.common.exportFile"></sc-file-export>
<sc-file-export :apiObj="$api.common.exportFile" fileName="人员列表(异步)" async> <sc-file-export :apiObj="$api.common.exportFile" fileName="人员列表(异步)" async>
<template #default="{open}"> <template #default="{open}">
<el-button type="primary" icon="sc-icon-download" @click="open">导出(异步)</el-button> <el-button type="primary" icon="x-icon-download" @click="open">导出(异步)</el-button>
</template> </template>
</sc-file-export> </sc-file-export>
<sc-file-export :apiObj="$api.common.exportFile" blob fileName="人员列表" :data="{otherData:'demo'}" showData :column="column" :fileTypes="['xlsx','docx','pdf']"> <sc-file-export :apiObj="$api.common.exportFile" blob fileName="人员列表" :data="{otherData:'demo'}" showData :column="column" :fileTypes="['xlsx','docx','pdf']">
<template #default="{open}"> <template #default="{open}">
<el-button type="primary" icon="sc-icon-download" @click="open">导出(blob文件流)</el-button> <el-button type="primary" icon="x-icon-download" @click="open">导出(blob文件流)</el-button>
</template> </template>
<template #form="{formData}"> <template #form="{formData}">
<el-form-item label="导出条数"> <el-form-item label="导出条数">

8
src/x.js
View File

@ -40,7 +40,7 @@ import time from './directives/time'
import copy from './directives/copy' import copy from './directives/copy'
import errorHandler from './utils/errorHandler' import errorHandler from './utils/errorHandler'
import * as elIcons from '@element-plus/icons-vue' import * as elIcons from '@element-plus/icons-vue'
import * as scIcons from './assets/icons' import * as xIcons from './assets/icons'
export default { export default {
install(app) { install(app) {
//挂载全局对象 //挂载全局对象
@ -86,9 +86,9 @@ export default {
for (let icon in elIcons) { for (let icon in elIcons) {
app.component(`ElIcon${icon}`, elIcons[icon]) app.component(`ElIcon${icon}`, elIcons[icon])
} }
//统一注册sc-icon图标 //统一注册x-icon图标
for (let icon in scIcons) { for (let icon in xIcons) {
app.component(`ScIcon${icon}`, scIcons[icon]) app.component(`xIcon${icon}`, xIcons[icon])
} }
//关闭async-validator全局控制台警告 //关闭async-validator全局控制台警告
window.ASYNC_VALIDATOR_NO_WARNING = 1 window.ASYNC_VALIDATOR_NO_WARNING = 1