Skip to content

Commit 75ae467

Browse files
committed
修复 column 组件
1 parent a6ae8d7 commit 75ae467

File tree

6 files changed

+11
-64
lines changed

6 files changed

+11
-64
lines changed

public/app.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

public/mix-manifest.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"/app.js": "/app.js?id=868d166b1127889c43e9",
2+
"/app.js": "/app.js?id=190b46b5c5b17be83269",
33
"/manifest.js": "/manifest.js?id=8991394a854ee5cdffc3",
44
"/vendor.js": "/vendor.js?id=df0be4950fcb717193ba"
55
}

resources/js/components/layout/Column.vue

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,6 @@
44
:offset="attrs.offset"
55
:push='attrs.push'
66
:pull='attrs.pull'
7-
:xs='attrs.xs'
8-
:sm='attrs.sm'
9-
:md='attrs.md'
10-
:lg='attrs.lg'
11-
:xl='attrs.xl'
127
:tag='attrs.tag'
138
:style="attrs.style"
149
:class="attrs.className"
@@ -22,13 +17,10 @@
2217
/>
2318
</el-col>
2419
</template>
25-
2620
<script>
2721
export default {
2822
props: {
2923
attrs: Object,
3024
},
3125
};
3226
</script>
33-
34-
<style></style>

src/Layout/Column.php

Lines changed: 6 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,12 @@ class Column extends Component
1313

1414
protected $width = 24;
1515

16-
protected $span;
17-
protected $offset;
18-
protected $push;
19-
protected $pull;
20-
protected $xs;
21-
protected $md;
22-
protected $lg;
23-
protected $xl;
24-
protected $tag;
16+
protected $span=24;
17+
protected $offset=0;
18+
protected $push=0;
19+
protected $pull=0;
20+
21+
protected $tag="div";
2522

2623
protected $contents = [];
2724

@@ -93,46 +90,6 @@ public function pull($pull)
9390
return $this;
9491
}
9592

96-
/**
97-
* @param mixed $xs
98-
* @return $this
99-
*/
100-
public function xs($xs)
101-
{
102-
$this->xs = $xs;
103-
return $this;
104-
}
105-
106-
/**
107-
* @param mixed $md
108-
* @return $this
109-
*/
110-
public function md($md)
111-
{
112-
$this->md = $md;
113-
return $this;
114-
}
115-
116-
/**
117-
* @param mixed $lg
118-
* @return $this
119-
*/
120-
public function lg($lg)
121-
{
122-
$this->lg = $lg;
123-
return $this;
124-
}
125-
126-
/**
127-
* @param mixed $xl
128-
* @return $this
129-
*/
130-
public function xl($xl)
131-
{
132-
$this->xl = $xl;
133-
return $this;
134-
}
135-
13693
/**
13794
* @param mixed $tag
13895
* @return $this

src/Layout/Row.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ class Row extends Component
1616
protected $columns = [];
1717

1818
protected $gutter = 0;
19-
protected $type;
19+
protected $rowType;
2020
protected $justify = "start";
2121
protected $align = "top";
2222
protected $tag = "div";
@@ -71,9 +71,9 @@ public function gutter($gutter)
7171
* @param mixed $type
7272
* @return $this
7373
*/
74-
public function type($type)
74+
public function rowType($type)
7575
{
76-
$this->type = $type;
76+
$this->rowType = $type;
7777
return $this;
7878
}
7979

webpack.mix.js

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@ const mix = require("laravel-mix");
33
mix.config.webpackConfig.output = {
44
publicPath: "/vendor/laravel-vue-admin/",
55
};
6-
7-
86
mix
97
.js("resources/js/app.js", "public")
108
.extract(["axios", "vue", "vuex", "vue-router", "element-ui"])

0 commit comments

Comments
 (0)