@lambo-design/pro-layout 1.0.0-beta.234 → 1.0.0-beta.236

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.
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@lambo-design/pro-layout",
3
- "version": "1.0.0-beta.234",
3
+ "version": "1.0.0-beta.236",
4
4
  "description": "",
5
5
  "main": "index.js",
6
6
  "author": "lambo",
@@ -6,15 +6,15 @@
6
6
  <div class="logo-box">
7
7
  <LamboProLogo></LamboProLogo>
8
8
  </div>
9
- <div v-if="systemInfo && systemInfo.navType && systemInfo.navType == 'slide'">
10
- <LamboProNavSildeBtn></LamboProNavSildeBtn>
11
- </div>
12
- <div class="nav-box" v-else>
9
+ <div class="nav-box" v-if="!systemInfo || !systemInfo.navType || systemInfo.navType == 'dropdown'">
13
10
  <LamboProNav></LamboProNav>
14
11
  </div>
15
12
  <div class="tools-box">
16
13
  <LamboProTools></LamboProTools>
17
14
  </div>
15
+ <div v-if="systemInfo && systemInfo.navType && systemInfo.navType == 'slide'">
16
+ <LamboProNavSildeBtn></LamboProNavSildeBtn>
17
+ </div>
18
18
  </div>
19
19
  </template>
20
20
 
@@ -7,17 +7,17 @@
7
7
  <div class="tools-box-slide">
8
8
  <div style="margin-right: 50px;">
9
9
  <Icon
10
- class="more-menu"
11
- style="margin-right: 10px"
12
- type="md-arrow-dropleft-circle"
13
- v-if="arrowFlag"
14
- @click="moveMenu('left')"
10
+ class="more-menu"
11
+ style="margin-right: 10px"
12
+ type="md-arrow-dropleft-circle"
13
+ v-if="arrowFlag"
14
+ @click="moveMenu('left')"
15
15
  />
16
16
  <Icon
17
- type="md-arrow-dropright-circle"
18
- class="more-menu"
19
- v-if="arrowFlag"
20
- @click="moveMenu('right')"
17
+ type="md-arrow-dropright-circle"
18
+ class="more-menu"
19
+ v-if="arrowFlag"
20
+ @click="moveMenu('right')"
21
21
  />
22
22
  </div>
23
23
  </div>
@@ -20,10 +20,6 @@ import { deepCopy } from '@lambo-design/shared/utils/assist'
20
20
  export default {
21
21
  name: 'pro-layout-tqm',
22
22
  props: {
23
- acceptAppId: {
24
- type: String,
25
- default: ''
26
- },
27
23
  acceptInt: {
28
24
  type: Number,
29
25
  default: 0
@@ -38,7 +34,7 @@ export default {
38
34
  pointer:0,
39
35
  flag:true,
40
36
  arrowFlag: true,
41
-
37
+ acceptAppId: '',
42
38
  navList: [],
43
39
  topMenList: [],
44
40
  topTqmMenList:[],
@@ -104,6 +100,9 @@ export default {
104
100
  this.selectApp(appId)
105
101
  }
106
102
  },
103
+ changeApp(appId, appInfo){
104
+ this.activeName = appId
105
+ },
107
106
  selectApp(appId) {
108
107
  this.activeName = appId
109
108
  let res = this.navList.filter(app => app.appId == appId)
@@ -111,11 +110,6 @@ export default {
111
110
  },
112
111
  },
113
112
  watch: {
114
- activeName() {
115
- this.$nextTick(() => {
116
- this.$refs.topNav.updateActiveName()
117
- })
118
- },
119
113
  acceptInt(val){
120
114
  this.pointer = val;
121
115
  },