Compare commits

..

No commits in common. "a438469c6bf75268671ca9742e9417cc31958555" and "c37a6de593d876179f4ac5f2cd228554560d41e4" have entirely different histories.

6 changed files with 109 additions and 116 deletions

View File

@ -1,6 +1,6 @@
{ {
"name": "code-brick-zj", "name": "code-brick-zj",
"version": "0.0.5", "version": "0.0.3",
"private": false, "private": false,
"description": "组件封装", "description": "组件封装",
"main": "index.js" "main": "index.js"

View File

@ -66,32 +66,34 @@ export default {
} }
} }
</script> </script>
<style> <style lang="scss">
.baseDialog .el-dialog__header { .baseDialog {
font-size: 16px; .el-dialog__header {
color: rgba(0, 0, 0, 0.85); font-size: 16px;
font-weight: 500; color: rgba(0, 0, 0, 0.85);
padding: 13px 24px; font-weight: 500;
border-bottom: 1px solid #e9e9e9; padding: 13px 24px;
} border-bottom: 1px solid #e9e9e9;
.baseDialog .el-dialog__header .titleStyle::before{ .titleStyle::before{
content: ''; content: '';
display: inline-block; display: inline-block;
width: 4px; width: 4px;
height: 16px; height: 16px;
background-color: #0B58FF; background-color: #0B58FF;
border-radius: 1px; border-radius: 1px;
margin-right: 8px; margin-right: 8px;
position: relative; position: relative;
top: 2px; top: 2px;
} }
.baseDialog .el-dialog__body { }
padding-left: 24px; .el-dialog__body {
padding-right: 24px; padding-left: 24px;
} padding-right: 24px;
.baseDialog .btnTextStyle { }
letter-spacing:6px; .btnTextStyle {
padding: 9px 10px 9px 16px; letter-spacing:6px;
font-size: 14px; padding: 9px 10px 9px 16px;
font-size: 14px;
}
} }
</style> </style>

View File

@ -1,10 +1,8 @@
<template> <template>
<div class="baseTable"> <div class="baseTable">
<el-table <el-table
:ref="id"
:data="renderData" :data="renderData"
v-bind="$attrs" v-bind="$attrs"
:border="cancelBorder ? false : true"
@current-change="currentChange" @current-change="currentChange"
@selection-change="handleSelectionChange" @selection-change="handleSelectionChange"
style="width: 100%" style="width: 100%"
@ -117,10 +115,6 @@ export default {
} }
}, },
props: { props: {
cancelBorder: {
type: Boolean,
default: false
},
tableData: { tableData: {
type: Array, type: Array,
required: true, required: true,
@ -134,11 +128,6 @@ export default {
return [] return []
} }
}, },
id: {
type: String,
required: false,
default: ''
},
page: { page: {
type: Number, type: Number,
required: false, required: false,
@ -200,51 +189,49 @@ export default {
}, },
emitButtonClick() { emitButtonClick() {
this.$emit('emitButtonClick') this.$emit('emitButtonClick')
},
setCurrent(name, index) {
let _this = this
let obj = _this.$refs[name].data[index]
_this.$refs[name].setCurrentRow(obj)
} }
} }
} }
</script> </script>
<style scoped> <style lang="scss" scoped>
.baseTable .show-col-btn { .baseTable {
margin-right: 5px; .show-col-btn {
line-height: inherit; margin-right: 5px;
cursor: pointer; line-height: inherit;
} cursor: pointer;
.baseTable .el-icon-refresh { }
cursor: pointer; .el-icon-refresh {
cursor: pointer;
}
} }
</style> </style>
<style> <style lang="scss">
.baseTable .el-table__body tr.current-row>td.el-table__cell { .baseTable {
background-color: #EAF1FC; .el-table__body tr.current-row>td.el-table__cell {
background-color: #EAF1FC;
}
.el-table .el-table__cell {
padding: 0;
height: 35px;
}
.addButton {
width: 100%;
height: 35px;
border-top: none;
color: #0b58ff;
border-color: #ebeef5;
border-radius: 0;
}
.addButton:hover {
color: #0b58ff;
border-color: #ebeef5;
background-color: #fff;
}
.addButton:focus {
border-color: #ebeef5;
background-color: #fff;
}
} }
.baseTable .el-table .el-table__cell {
padding: 0;
height: 35px;
}
.baseTable .addButton {
width: 100%;
height: 35px;
border-top: none;
color: #0b58ff;
border-color: #ebeef5;
border-radius: 0;
}
.baseTable .addButton:hover {
color: #0b58ff;
border-color: #ebeef5;
background-color: #fff;
}
.baseTable .addButton:focus {
border-color: #ebeef5;
background-color: #fff;
}
.el-tooltip__popper.is-dark { .el-tooltip__popper.is-dark {
background: rgba(0, 0, 0, 0.6) !important; background: rgba(0, 0, 0, 0.6) !important;
} }

View File

@ -28,7 +28,7 @@ export default {
} }
} }
</script> </script>
<style> <style lang="css">
.tableInner .el-input__inner { .tableInner .el-input__inner {
border: none; border: none;
padding: 0; padding: 0;

View File

@ -77,26 +77,28 @@ export default {
text-align: right; text-align: right;
} }
</style> </style>
<style> <style lang='scss'>
.pagination-container .el-pagination { .pagination-container {
position: relative; .el-pagination {
} position: relative;
}
.pagination-container .el-pagination__jump { .el-pagination__jump {
margin-left: 125px; margin-left: 125px;
} }
.pagination-container .el-pagination__sizes { .el-pagination__sizes {
position: absolute; position: absolute;
right: 100px; right: 100px;
} }
.pagination-container .el-pager li.active { .el-pager li.active {
background-color: #0b58ff; background-color: #0b58ff;
color: #fff; color: #fff;
} }
.pagination-container .el-input--mini .el-input__inner { .el-input--mini .el-input__inner {
height: 22px; height: 22px;
}
} }
</style> </style>

View File

@ -231,26 +231,28 @@ export default {
} }
} }
</script> </script>
<style> <style lang="scss">
.searchBar .blue-block { .searchBar {
display: inline-block; .blue-block {
float: left; float: left;
width: 4px; display: inline-block;
height: 16px; width: 4px;
background-color: #0B58FF; height: 16px;
border-radius: 1px; background-color: #0B58FF;
margin-right: 8px; border-radius: 1px;
margin-top: 12px; margin-right: 8px;
} margin-top: 12px;
.searchBar .el-form-item { }
margin-bottom: 10px; .el-form-item {
} margin-bottom: 10px;
.searchBar .el-date-editor .el-range__icon { }
font-size: 16px; .el-date-editor .el-range__icon {
color:#0B58FF; font-size: 16px;
} color:#0B58FF;
.searchBar .el-input__prefix .el-icon-date { }
font-size: 16px; .el-input__prefix .el-icon-date {
color:#0B58FF; font-size: 16px;
color:#0B58FF;
}
} }
</style> </style>