Commit 91fb4120 authored by 周远喜's avatar 周远喜

ok

parent 62ba4b0e
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
</div> </div>
<div class="fg" ref="ftable"> <div class="fg" ref="ftable">
<div v-if="type=='card'" class="table-card"> <div v-if="type=='card'" class="table-card">
<Row> <Row :gutter="gutter">
<Col :span="span" v-for="(row,i) in list" :key="i"> <Col :span="span" v-for="(row,i) in list" :key="i">
<slot name="card" :row="row"> <slot name="card" :row="row">
<span>{{row.id}}</span> <span>{{row.id}}</span>
...@@ -237,6 +237,10 @@ export default { ...@@ -237,6 +237,10 @@ export default {
return ["table", "card", "list"].indexOf(value) !== -1; return ["table", "card", "list"].indexOf(value) !== -1;
} }
}, },
gutter:{
type:Number,
default:0
},
span: { span: {
type: Number, type: Number,
default: 24 default: 24
...@@ -589,6 +593,9 @@ export default { ...@@ -589,6 +593,9 @@ export default {
} }
.fg { .fg {
overflow: auto; overflow: auto;
.table-card{
overflow: hidden;
}
} }
.tableCommon tr td { .tableCommon tr td {
line-height: 25px; line-height: 25px;
......
...@@ -13,6 +13,7 @@ ...@@ -13,6 +13,7 @@
:conditions="easySearch" :conditions="easySearch"
:action="action" :action="action"
:set="false" :set="false"
:gutter="30"
> >
<template slot="easySearch"> <template slot="easySearch">
<Form ref="formInline" :model="easySearch" inline> <Form ref="formInline" :model="easySearch" inline>
...@@ -280,17 +281,15 @@ export default { ...@@ -280,17 +281,15 @@ export default {
</script> </script>
<style lang="less"> <style lang="less">
.aps-r { .aps-r {
width: 100%; // width: 100%;
height: 100%; // height: 100%;
overflow: auto; // overflow: auto;
padding: 15px 0 15px 15px; // padding: 15px 0 15px 15px;
.body { .body {
background: white; background: white;
border-radius: 4px; border-radius: 4px;
border: #cacbd0 solid 1px; border: #cacbd0 solid 1px;
margin-left: 40px; margin-bottom: 30px;
margin-right: 40px;
margin-bottom: 39px;
.title-i { .title-i {
padding: 0 8px; padding: 0 8px;
height: 38px; height: 38px;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment