@lambo-design/pro-layout 1.0.0-beta.12 → 1.0.0-beta.14

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (4) hide show
  1. package/package.json +17 -18
  2. package/src/components/pro-layout-header.vue +0 -1
  3. package/src/components/pro-layout-logo.vue +20 -8
  4. package/src/index.vue +1 -3
package/package.json CHANGED
@@ -1,18 +1,17 @@
1
- {
2
- "name": "@lambo-design/pro-layout",
3
- "version": "1.0.0-beta.12",
4
- "description": "",
5
- "main": "index.js",
6
- "scripts": {
7
-
8
- },
9
- "author": "lambo",
10
- "license": "ISC",
11
- "publishConfig": {
12
- "access": "public"
13
- },
14
- "devDependencies": {
15
- "@lambo-design/core": "workspace:*",
16
- "@lambo-design/shared": "workspace:*"
17
- }
18
- }
1
+ {
2
+ "name": "@lambo-design/pro-layout",
3
+ "version": "1.0.0-beta.14",
4
+ "description": "",
5
+ "main": "index.js",
6
+ "author": "lambo",
7
+ "license": "ISC",
8
+ "publishConfig": {
9
+ "access": "public",
10
+ "registry": "https://registry.npmjs.org/"
11
+ },
12
+ "devDependencies": {
13
+ "@lambo-design/shared": "1.0.0-beta.10",
14
+ "@lambo-design/core": "4.7.1-beta.34"
15
+ },
16
+ "scripts": {}
17
+ }
package/src/components/pro-layout-header.vue CHANGED
@@ -38,7 +38,6 @@ export default {
38
38
  .trigger-box{
39
39
  float: left;
40
40
  height: inherit;
41
- border: 1px solid #000000;
42
41
  }
43
42
  .logo-box{
44
43
  float: left;
package/src/components/pro-layout-logo.vue CHANGED
@@ -1,6 +1,6 @@
1
1
  <template>
2
2
  <div class="pro-layout-logo-wrapper">
3
- <div class="logo"></div>
3
+ <div class="logo" :style="logoStyle"></div>
4
4
  <div class="divider"></div>
5
5
  <div class="system-name">{{systemName}}</div>
6
6
  </div>
@@ -12,20 +12,34 @@ export default {
12
12
  name: "pro-layout-logo",
13
13
  data(){
14
14
  return {
15
+ systemInfo: {},
15
16
  systemName: '后台管理系统'
16
17
  }
17
18
  },
19
+ computed:{
20
+ logoStyle(){
21
+ if (this.systemInfo && this.systemInfo.systemLogo) {
22
+ return 'background: url("' + this.systemInfo.systemLogo + '") no-repeat;background-size: 100%;'
23
+ }
24
+ return '';
25
+ }
26
+ },
18
27
  methods: {
19
28
  initListener(){
20
- Bus.$on('system-name-change',(data)=>{
21
- this.systemNameChange(data)
29
+ Bus.$on('system-info',(data)=>{
30
+ this.initSystem(data)
22
31
  });
23
32
  },
24
33
  destroyListener(){
25
- Bus.$off('system-name-change')
34
+ Bus.$off('system-info')
26
35
  },
27
- systemNameChange(data){
28
- this.systemName = data;
36
+ initSystem(data){
37
+ if (data) {
38
+ this.systemInfo = data;
39
+ if (data.systemName) {
40
+ this.systemName = data.systemName;
41
+ }
42
+ }
29
43
  }
30
44
  },
31
45
  created(){
@@ -40,7 +54,6 @@ export default {
40
54
  <style scoped lang="less">
41
55
  .pro-layout-logo-wrapper{
42
56
  overflow: hidden;
43
- border-bottom: 1px solid #000000;
44
57
  .logo{
45
58
  width: 150px;
46
59
  height: 55px;
@@ -48,7 +61,6 @@ export default {
48
61
  background-size: 100%;
49
62
  float: left;
50
63
  margin-top: 8px;
51
- border-bottom: 1px solid #000000;
52
64
  }
53
65
  .divider{
54
66
  height: 33px;
package/src/index.vue CHANGED
@@ -123,9 +123,7 @@ export default {
123
123
  Bus.$off('tag-list')
124
124
  },
125
125
  initEmit(){
126
- if (this.systemInfo && this.systemInfo.systemName) {
127
- Bus.$emit('system-name-change',this.systemInfo.systemName)
128
- }
126
+ Bus.$emit('system-info',this.systemInfo)
129
127
  Bus.$emit('user-info',this.userInfo)
130
128
  Bus.$emit('nav-list',this.navList)
131
129
  Bus.$emit('menu-list',this.menuList)