no message

This commit is contained in:
小陌 2023-07-08 00:23:19 +08:00
parent 6a8d59e7a7
commit 84529c5529
10 changed files with 278 additions and 284 deletions

View File

@ -5,7 +5,7 @@
<el-skeleton v-if="renderLoading || Object.keys(form).length==0" animated />
<el-form v-else ref="form" :model="form" :label-width="config.labelWidth" :label-position="config.labelPosition" v-loading="loading" element-loading-text="Loading...">
<el-row :gutter="15">
<template v-for="(item, index) in config.formItems" :key="index">
<template v-for="(item, index) in config.column" :key="index">
<el-col :span="item.span || 24" v-if="!hideHandle(item)">
<sc-title v-if="item.component=='title'" :title="item.label"></sc-title>
<el-form-item v-else-if="item.component" :prop="item.name" :rules="rulesHandle(item)">
@ -79,10 +79,8 @@
methods: {
//form
render() {
this.config.formItems.forEach((item) => {
this.config.column.forEach((item) => {
item.options = item.options?item.options:[];
if(item.component == 'checkbox'){
if(item.name){
const value = {}
@ -110,7 +108,7 @@
getData() {
this.renderLoading = true
var remoteData = []
this.config.formItems.forEach((item) => {
this.config.column.forEach((item) => {
if(item.options && item.options.remote){
var req = http.get(item.options.remote.api, item.options.remote.data).then(res=>{
item.options.items = res.data

View File

@ -88,11 +88,9 @@
<template v-else-if="item.component=='text'">
<el-link type="info" :underline="false">{{ data[item.name] }}</el-link>
</template>
<!-- avatar -->
<template v-else-if="item.component=='avatar'">
<el-avatar :src="data[item.name]" size="small"></el-avatar>
<el-link v-if="item.options.subfield" type="info" style="padding: 0 10px;" :underline="false">
{{ data[item.options.subfield] }}
</el-link>
<x-avatar v-model="data" :options="item.options" size="small"></x-avatar>
</template>
<template v-else-if="item.component=='formtable'">
<sc-form-table ref="videostable" v-model="data[item.name]" v-bind="item.options"> </sc-form-table>

View File

@ -1,22 +1,25 @@
<!--
* @Descripttion: 用户头像
-->
<template>
<div style="display: flex;align-items: center;cursor: pointer; " @click="getUser(data)">
<div class="xavatar" @click="getUser(data)">
<el-avatar v-if="data.anonymous" title="匿名发布" size="small"></el-avatar>
<el-avatar v-else :src="data[name]" size="small"></el-avatar>
<label v-if="options.subfield" style="position: absolute;left: 42px;">
<el-avatar v-else :src="data[name]" size="small"></el-avatar>
<label v-if="options.subfield" class="input-mask">
<input class="el-input__inner" type="text" readonly :value="data[options.subfield]">
</label>
</div>
<el-drawer type="primary" :with-header="false" append-to-body="true" v-model="visible" :size="options.size || 1000" :show-close="false" style="overflow: initial;" destroy-on-close @closed="$emit('closed')">
<el-button type="danger" @click="closeUser" class="userdrawerclose" icon="el-icon-close"> </el-button>
<x-user v-model="data"></x-user>
</el-drawer>
</template>
<el-drawer type="primary" :with-header="false" append-to-body="true" v-model="visible" :size="1000" :show-close="false" style="overflow: initial;" destroy-on-close @closed="$emit('closed')">
<el-button type="danger" @click="closeUser" class="userdrawerclose" icon="el-icon-close"> </el-button>
<x-user v-model="visibleInfo"></x-user>
</el-drawer>
<script>
export default {
@ -29,7 +32,6 @@
return {
data: this.modelValue,
visible:false,
visibleInfo:{},
}
},
watch:{
@ -42,19 +44,51 @@
closeUser(){
this.visible = false;
},
getUser(o){
this.visible = true
this.visibleInfo = {
uid:o.uid,
avatar:o.avatar,
nickname:o.nickname,
username:o.username,
getUser(){
//
if (!this.data.uid && !this.data.uin) {
return false;
}
this.visible = true
},
}
}
</script>
<style scoped>
.userdrawerclose {position: absolute; position: absolute; top: 148px; left: -36px; z-index: 10000; border-top-right-radius: 0px; border-bottom-right-radius: 0px; padding: 6px; font-size: 22px; font-weight: bolder;}
.xavatar{
display: flex;align-items: center;cursor: pointer;
}
.userdrawerclose {
position: absolute;
position: absolute;
top: 148px;
left: -36px;
z-index: 10000;
border-top-right-radius: 0px;
border-bottom-right-radius: 0px;
padding: 6px;
font-size: 22px;
font-weight: bolder;
}
.xavatar .input-mask {
margin-left: 28px;
z-indexz: 1;
position: absolute;
}
.xavatar .input-mask::before {
content: "";
position: absolute;
top: 0;
right: 0;
bottom: 0;
left: 0;
pointer-events: auto;
cursor: pointer;
}
</style>

View File

@ -1,31 +1,30 @@
<!--
* @Descripttion: 弹窗扩展组件
-->
<template>
<div class="x-dialog" ref="xDialog">
<el-dialog ref="dialog" v-model="dialogVisible" :fullscreen="isFullscreen" v-bind="$attrs" :show-close="false">
<template #header>
<slot name="header">
<span class="el-dialog__title">{{ title }}</span>
</slot>
<div class="x-dialog__headerbtn">
<button v-if="showFullscreen" aria-label="fullscreen" type="button" @click="setFullscreen">
<el-icon v-if="isFullscreen" class="el-dialog__close"><el-icon-bottom-left /></el-icon>
<el-icon v-else class="el-dialog__close"><el-icon-full-screen /></el-icon>
</button>
<button v-if="showClose" aria-label="close" type="button" @click="closeDialog">
<el-icon class="el-dialog__close"><el-icon-close /></el-icon>
</button>
<el-dialog ref="dialog" v-model="dialogVisible" :fullscreen="isFullscreen" v-bind="$attrs" :show-close="false">
<template #header>
<slot name="header">
<span class="el-dialog__title">{{ title }}</span>
</slot>
<div class="x-dialog__headerbtn">
<button v-if="showFullscreen" aria-label="fullscreen" type="button" @click="setFullscreen">
<el-icon v-if="isFullscreen" class="el-dialog__close"><el-icon-bottom-left /></el-icon>
<el-icon v-else class="el-dialog__close"><el-icon-full-screen /></el-icon>
</button>
<button v-if="showClose" aria-label="close" type="button" @click="closeDialog">
<el-icon class="el-dialog__close"><el-icon-close /></el-icon>
</button>
</div>
</template>
<div v-loading="loading">
<slot></slot>
</div>
</template>
<div v-loading="loading">
<slot></slot>
</div>
<template #footer>
<slot name="footer"></slot>
</template>
</el-dialog>
<template #footer>
<slot name="footer"></slot>
</template>
</el-dialog>
</div>
</template>
@ -69,11 +68,66 @@
</script>
<style scoped>
.x-dialog__headerbtn {position: absolute;top: var(--el-dialog-padding-primary);right: var(--el-dialog-padding-primary);}
.x-dialog__headerbtn button {padding: 0;background: transparent;border: none;outline: none;cursor: pointer;font-size: var(--el-message-close-size,16px);margin-left: 15px;color: var(--el-color-info);}
.x-dialog__headerbtn button:hover .el-dialog__close {color: var(--el-color-primary);}
.x-dialog:deep(.el-dialog).is-fullscreen {display: flex;flex-direction: column;top:0px !important;left:0px !important;}
.x-dialog__headerbtn {
position: absolute;
top: var(--el-dialog-padding-primary);
right: var(--el-dialog-padding-primary);
}
.x-dialog__headerbtn button {
padding: 0;
background: transparent;
border: none;
outline: none;
cursor: pointer;
font-size: var(--el-message-close-size,16px);
margin-left: 15px;
color: var(--el-color-info);
}
.x-dialog__headerbtn button:hover .el-dialog__close {
color: var(--el-color-primary);
}
.x-dialog:deep(.el-dialog){
--el-dialog-margin-top: 0;
--el-dialog-width:60%;
--el-border-color-base: rgb(231 235 241 / 50%);
margin-bottom: 0;
max-height: calc(100% - 80px);
overflow: auto;
display: flex;
flex-direction: column;
top: 60px !important;
left: 0px !important;
}
.x-dialog:deep(.el-dialog) .el-dialog__header {
padding: 15px 20px;
}
.x-dialog:deep(.el-dialog) .el-dialog__body {
flex:1;overflow: auto;
padding:10px 16px;
}
.x-dialog:deep(.el-dialog) .el-dialog__footer {
padding: 10px 20px;
border-top: 1px solid var(--el-border-color-base);
}
.x-dialog:deep(.el-dialog).is-fullscreen {
display: flex;
flex-direction: column;
top:0px !important;
left:0px !important;
height: 100% !important;
--el-dialog-width:100%;
}
.x-dialog:deep(.el-dialog).is-fullscreen {
max-height:100%;
}
.x-dialog:deep(.el-dialog).is-fullscreen .el-dialog__header {}
.x-dialog:deep(.el-dialog).is-fullscreen .el-dialog__body {flex:1;overflow: auto;}
.x-dialog:deep(.el-dialog).is-fullscreen .el-dialog__footer {padding-bottom: 10px;border-top: 1px solid var(--el-border-color-base);}
</style>

View File

@ -2,39 +2,119 @@
* @Descripttion: 编辑
-->
<template>
<el-container v-loading="loading">
<el-main style="padding:0 20px 20px 20px">
<sc-form ref="formref" :config="config" v-model="data" :loading="loading"> </sc-form>
</el-main>
<el-footer>
<x-dialog :title="(config.name || titleMap[mode]) || '编辑'" v-model="visible" :size="960" destroy-on-close @closed="$emit('closed')">
<el-skeleton v-if="loading" :rows="4" />
<sc-form ref="formref" :config="config" v-model="data" v-if="!loading" :loading="loading"> </sc-form>
<template #footer>
<el-button type="primary" :loading="isSaveing" @click="submit">保存</el-button>
<el-button @click="visible=false">取消</el-button>
</el-footer>
</el-container>
</template>
</x-dialog>
</template>
<script>
export default {
emits: ['success', 'closed'],
props: {
modelValue: { type: Object, default: () => {} },
config: { type: Object, default: () => {} },
column: { type: Array, default: () => [] },
name: { type: String, default: "id" },
},
data() {
return {
data: this.modelValue,
isSaveing: false
loading: false,
mode: "plus",
token: '',
key: this.name,
titleMap: {
plus: '新增',
edit: '编辑'
},
data: {},
config: {
column : this.column,
labelPosition : "right",
labelWidth : "120px",
size : "medium",
url:''
},
visible: false,
isSaveing: false,
}
},
watch:{
modelValue(){
watch: {
column(){
this.config.column = this.column;
}
},
mounted() {
// this.data = this.modelValue
},
methods: {
//
open(mode='add'){
this.mode = mode;
this.visible = true;
return this;
},
//
submit(){
this.$refs.formref.validate(async (valid) => {
if (valid) {
this.isSaveing = true;
if (!this.config.url) {
console.log(this.data, this.token)
this.$alert('没有编辑相关配置', "提示", {type: 'error'});
return;
}
this.$http.post(this.config.url, {token:this.token, info:this.data}).then((res) => {
if (res.code == 200 ) {
this.isSaveing = false;
this.visible = false;
this.$emit('success', res.data, this.mode, res.message || "操作成功");
return;
}
this.$alert(res.message, "提示", {type: 'error'});
})
}
})
},
//
setConfig(o){
Object.assign(this.config, o);
//
if (this.config.remoteurl) {
this.loading = true;
setTimeout(async ()=>{
var res = await this.$http.get(this.config.remoteurl, {[this.key]: this.data[this.key]})
if (res.code == 200 ) {
this.loading = false;
if (res.data.config) {
Object.assign(this.config, res.data.config);
}
if (res.data.data) {
this.setData(res.data.data);
}
if (res.data.token) {
this.token = res.data.token
}
return;
}
this.$alert(res.message, "提示", {type: 'error'});
}, 100)
return false;
}
},
//
setData(data){
this.data = data;
return this;
},
}
}
</script>

View File

@ -21,7 +21,6 @@ export default {
prop: 'prop', //规定排序字段名字段
order: 'order' //规定排序规格字段
},
configUrl: 'system/table/get',
/**
* 自定义列保存处理
* @tablename scTable组件的props->tablename

View File

@ -1,68 +0,0 @@
<template>
<el-dialog :title="titleMap[mode]" v-model="visible" :size="960" destroy-on-close @closed="$emit('closed')">
<el-container v-loading="loading">
<el-main style="padding:0 20px 20px 20px">
<sc-form ref="formref" :config="config" v-model="info" :loading="loading"> </sc-form>
</el-main>
<el-footer>
<el-button type="primary" :loading="isSaveing" @click="submit">保存</el-button>
<el-button @click="visible=false">取消</el-button>
</el-footer>
</el-container>
</el-dialog>
</template>
<script>
export default {
emits: ['success', 'closed'],
props: {
column: { type: Object, default: () => {} },
},
data() {
return {
loading: false,
mode: "plus",
titleMap: {
plus: '新增',
edit: '编辑'
},
info: {},
visible: false,
isSaveing: false,
}
},
watch: {
column(){
this.config.column = this.column;
}
},
mounted() {
this.config = {
formItems : this.column,
labelPosition : "right",
labelWidth : "120px",
size : "medium",
}
},
methods: {
//
open(mode='add'){
this.mode = mode;
this.visible = true;
return this;
},
//
submit(){
this.$refs.formref.validate(async (valid) => {
if (valid) {
// this.isSaveing = true;
this.$emit('success', this.info, this.mode);
}
})
},
//
setData(info){
this.info = info;
},
}
}
</script>

View File

@ -49,23 +49,23 @@
</el-main>
</el-container>
</el-container>
<save-dialog v-if="dialog.save" :column="column" ref="saveDialog" @success="handleSuccess" @closed="dialog.save=false"></save-dialog>
<stat-dialog v-if="dialog.stat" ref="statDialog" @closed="dialog.stat=false"></stat-dialog>
<x-update v-if="dialog.save" :column="column" :name="key" ref="saveDialog" @success="handleSuccess" @closed="dialog.save=false"></x-update>
<x-dialog v-if="dialog.stat" ref="xStat" @closed="dialog.stat=false"></x-dialog>
<a @click="plus">fdsafdfa</a>
</template>
<script>
import saveDialog from './save'
import statDialog from './stat'
import xStat from './stat'
import scFilterBar from '@/components/scFilterBar';
import scEcharts from '@/components/scEcharts'
import XItem from '@/components/scForm/item'
export default {
name: 'propertyAuth',
components: {
saveDialog,
statDialog,
xStat,
scEcharts,
XItem,
scFilterBar
},
data() {
@ -148,47 +148,48 @@
tabChange(){
this.$refs.table.reload(this.search)
},
//
handleSuccess(data, mode, message){
if(mode=='plus'){
if (data) {
this.$refs.table.tableData.unshift(data)
}else{
this.$refs.table.reload({})
}
}else if(mode=='edit'){
if (data) {
this.$refs.table.tableData.filter(item => item.id===data.id ).forEach(item => {
Object.assign(item, data, data)
})
}else{
this.$refs.table.refresh()
}
}
this.$message.success(message || "操作成功")
return;
},
//
plus(){
this.dialog.save = true
this.$nextTick(() => {
if (this.operation.plus.remoteurl) {
setTimeout(async ()=>{
var res = await this.$http.get(this.operation.plus.remoteurl)
if (res.code == 200 ) {
this.$refs.saveDialog.open('plus').setData(res.data);
return;
}
this.$alert(res.message, "提示", {type: 'error'});
}, 100)
return false;
}
this.$refs.saveDialog.open();
this.$refs.saveDialog.open().setData({}).setConfig({remoteurl:'/system/user/demo'})
})
},
//
operationEdit(row){
this.dialog.save = true
this.$nextTick(() => {
this.$refs.saveDialog.open('edit').setData(row).setConfig(this.operation.edit)
})
},
//
openStat(o){
this.dialog.stat = true
this.$nextTick(() => {
this.$refs.statDialog.open().setData(o);
})
},
//
operationEdit(row,index){
this.dialog.save = true
this.$nextTick(() => {
if (this.operation.edit.remoteurl) {
setTimeout(async ()=>{
var res = await this.$http.get(this.operation.edit.remoteurl, {[this.key]: row[this.key], index: index})
if (res.code == 200 ) {
this.$refs.saveDialog.open('edit').setData(res.data);
return;
}
this.$alert(res.message, "提示", {type: 'error'});
}, 100)
return false;
}
this.$refs.saveDialog.open('edit').setData(row)
this.$refs.xStat.open().setData(o);
})
},
//
@ -241,42 +242,6 @@
selectionChange(selection){
this.selection = selection;
},
//
handleSuccess(data, mode){
if (!this.operation.edit.url) {
this.$alert('没有编辑相关配置', "提示", {type: 'error'});
return;
}
this.$http.post(this.operation.edit.url, {type:mode, info:data}).then((res) => {
if (res.code == 200 ) {
if(mode=='plus'){
if (res.data) {
this.$refs.table.tableData.unshift(res.data)
}else{
this.$refs.table.reload({})
}
}else if(mode=='edit'){
if (res.data) {
this.$refs.table.tableData.filter(item => item.id===data.id ).forEach(item => {
Object.assign(item, data, res.data)
})
}else{
this.$refs.table.refresh()
}
}
this.$refs.saveDialog.isSaveing = false;
this.$refs.saveDialog.visible = false;
this.$message.success(res.message || "操作成功")
return;
}
this.$alert(res.message, "提示", {type: 'error'});
})
}
}
}
</script>

View File

@ -1,66 +0,0 @@
<template>
<el-drawer :title="titleMap[mode]" v-model="visible" :size="960" destroy-on-close @closed="$emit('closed')">
<x-update v-model="info" :config="config"></x-update>
</el-drawer>
</template>
<script>
export default {
emits: ['success', 'closed'],
props: {
column: { type: Object, default: () => {} },
},
data() {
return {
loading: false,
mode: "plus",
titleMap: {
plus: '新增',
edit: '编辑'
},
info: {},
config: {
formItems : this.column,
labelPosition : "right",
labelWidth : "120px",
size : "medium",
},
visible: false,
isSaveing: false,
}
},
watch: {
column(){
this.config.column = this.column;
}
},
mounted() {
// this.config = {
// formItems : this.column,
// labelPosition : "right",
// labelWidth : "120px",
// size : "medium",
// }
},
methods: {
//
open(mode='add'){
this.mode = mode;
this.visible = true;
return this;
},
//
submit(){
this.$refs.formref.validate(async (valid) => {
if (valid) {
// this.isSaveing = true;
this.$emit('success', this.info, this.mode);
}
})
},
//
setData(info){
this.info = info;
},
}
}
</script>

View File

@ -48,7 +48,7 @@
labelWidth: '130px',
labelPosition: 'right',
size: 'medium',
formItems: [
column: [
{
label: "ElementPlus",
component: "title",
@ -385,8 +385,8 @@
this.form.name = "New Title"
},
setConfig(){
this.config.formItems[2].span = this.config.formItems[2].span==24?12:24
this.config.formItems[3].span = this.config.formItems[3].span==24?12:24
this.config.column[2].span = this.config.column[2].span==24?12:24
this.config.column[3].span = this.config.column[3].span==24?12:24
},
save(){
this.$refs.formref.validate((valid, obj) => {