@lambo-design/pro-layout 1.0.0-beta.310 → 1.0.0-beta.312

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 (6) hide show
  1. package/package.json +3 -3
  2. package/src/components/pro-layout-sider/components/pro-layout-sider-menu-item.vue +12 -20
  3. package/src/components/pro-layout-sider/index.vue +8 -16
  4. package/src/styles/other-menu.css +5 -2
  5. package/src/styles/other-menu.css.map +1 -1
  6. package/src/styles/other-menu.less +3 -2
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@lambo-design/pro-layout",
3
- "version": "1.0.0-beta.310",
3
+ "version": "1.0.0-beta.312",
4
4
  "description": "",
5
5
  "main": "index.js",
6
6
  "author": "lambo",
@@ -10,8 +10,8 @@
10
10
  "registry": "https://registry.npmjs.org/"
11
11
  },
12
12
  "devDependencies": {
13
- "@lambo-design/shared": "^1.0.0-beta.162",
14
- "@lambo-design/core": "^4.7.1-beta.131"
13
+ "@lambo-design/core": "^4.7.1-beta.131",
14
+ "@lambo-design/shared": "^1.0.0-beta.162"
15
15
  },
16
16
  "scripts": {}
17
17
  }
package/src/components/pro-layout-sider/components/pro-layout-sider-menu-item.vue CHANGED
@@ -6,11 +6,11 @@
6
6
  <ProLayoutSiderIcon v-if="systemInfo.menuLogo == '1'" :icon-type="parentItem.meta.icon"></ProLayoutSiderIcon>
7
7
  </Col>
8
8
  <Col span="21">
9
- <div :class="systemInfo.titleShow === 'wrap' ? 'menu-title-wrap' : 'menu-title-ellipsis'">
10
- <Tooltip v-if="systemInfo.titleShow ==='ellipsis'" placement="right" :content="showTitle(parentItem)">
11
- <span>{{ showTitle(parentItem)}}</span>
9
+ <div>
10
+ <Tooltip style="width: 100%" v-if="systemInfo.titleShow ==='ellipsis'" placement="right" :content="showTitle(parentItem)">
11
+ <div class="menu-title-ellipsis">{{ showTitle(parentItem)}}</div>
12
12
  </Tooltip>
13
- <span v-else>{{ showTitle(parentItem)}}</span>
13
+ <span v-else class="menu-title-wrap">{{ showTitle(parentItem)}}</span>
14
14
  </div>
15
15
  </Col>
16
16
  </Row>
@@ -30,15 +30,11 @@
30
30
  @click="toggleCollect(item)"></Icon>
31
31
  </Col>
32
32
  <Col span="21">
33
- <div :class="[
34
- systemInfo.titleShow === 'wrap' ? 'menu-title-nochildren-wrap' : 'menu-title-nochildren-ellipsis',
35
- 'menu-title-' + item.children[0].permissionId,
36
- 'draggable-text'
37
- ]" v-draggable="dragOptions(item.children[0])">
38
- <Tooltip v-if="systemInfo.titleShow ==='ellipsis'" placement="right" :content="showTitle(item.children[0])">
39
- <span>{{ showTitle(item.children[0]) }}</span>
33
+ <div :class="['menu-title-' + item.children[0].permissionId,'draggable-text']" v-draggable="dragOptions(item.children[0])">
34
+ <Tooltip style="width: 100%" v-if="systemInfo.titleShow ==='ellipsis'" placement="right" :content="showTitle(item.children[0])">
35
+ <div class="menu-title-nochildren-ellipsis">{{ showTitle(item.children[0]) }}</div>
40
36
  </Tooltip>
41
- <span v-else>{{ showTitle(item.children[0]) }}</span>
37
+ <span v-else class="menu-title-nochildren-wrap">{{ showTitle(item.children[0])}}</span>
42
38
  </div>
43
39
  </Col>
44
40
  </Row>
@@ -58,15 +54,11 @@
58
54
  @click="toggleCollect(item)"></Icon>
59
55
  </Col>
60
56
  <Col span="21">
61
- <div :class="[
62
- systemInfo.titleShow === 'wrap' ? 'menu-title-nochildren-wrap' : 'menu-title-nochildren-ellipsis',
63
- 'menu-title-' + item.permissionId,
64
- 'draggable-text'
65
- ]" v-draggable="dragOptions(item)">
66
- <Tooltip v-if="systemInfo.titleShow ==='ellipsis'" placement="right" :content="showTitle(item)">
67
- <span>{{ showTitle(item)}}</span>
57
+ <div :class="['menu-title-' + item.permissionId,'draggable-text']" v-draggable="dragOptions(item)">
58
+ <Tooltip style="width: 100%" v-if="systemInfo.titleShow ==='ellipsis'" placement="right" :content="showTitle(item)">
59
+ <div class="menu-title-nochildren-ellipsis">{{ showTitle(item) }}</div>
68
60
  </Tooltip>
69
- <span v-else>{{ showTitle(item)}}</span>
61
+ <span v-else class="menu-title-nochildren-wrap">{{ showTitle(item) }}</span>
70
62
  </div>
71
63
  </Col>
72
64
  </Row>
package/src/components/pro-layout-sider/index.vue CHANGED
@@ -20,15 +20,11 @@
20
20
  <ProLayoutSiderIcon v-if="systemInfo.menuLogo == '1'" :icon-type="item.type == 2 ? (isCollected.hasOwnProperty(item.name) ? 'ios-star' : 'ios-star-outline') : item.meta.icon"></ProLayoutSiderIcon>
21
21
  </Col>
22
22
  <Col span="21">
23
- <div :class="[
24
- systemInfo.titleShow === 'wrap' ? 'menu-title-nochildren-wrap' : 'menu-title-nochildren-ellipsis',
25
- 'menu-title-' + item.children[0].permissionId,
26
- 'draggable-text'
27
- ]" v-draggable="dragOptions(item.children[0])">
28
- <Tooltip v-if="systemInfo.titleShow ==='ellipsis'" placement="right" :content="showTitle(item.children[0])">
29
- <span>{{ showTitle(item.children[0]) }}</span>
23
+ <div :class="['menu-title-' + item.children[0].permissionId,'draggable-text']" v-draggable="dragOptions(item.children[0])">
24
+ <Tooltip style="width: 100%" v-if="systemInfo.titleShow ==='ellipsis'" placement="right" :content="showTitle(item.children[0])">
25
+ <div class="menu-title-nochildren-ellipsis">{{ showTitle(item.children[0]) }}</div>
30
26
  </Tooltip>
31
- <span v-else>{{ showTitle(item.children[0]) }}</span>
27
+ <span v-else class="menu-title-nochildren-wrap">{{ showTitle(item.children[0]) }}</span>
32
28
  </div>
33
29
  </Col>
34
30
  </Row>
@@ -49,15 +45,11 @@
49
45
  <ProLayoutSiderIcon v-if="systemInfo.menuLogo == '1'" :icon-type="item.type == 2 ? (isCollected.hasOwnProperty(item.name) ? 'ios-star' : 'ios-star-outline') : item.meta.icon"></ProLayoutSiderIcon>
50
46
  </Col>
51
47
  <Col span="21">
52
- <div :class="[
53
- systemInfo.titleShow === 'wrap' ? 'menu-title-nochildren-wrap' : 'menu-title-nochildren-ellipsis',
54
- 'menu-title-' + item.permissionId,
55
- 'draggable-text'
56
- ]" v-draggable="dragOptions(item)">
57
- <Tooltip v-if="systemInfo.titleShow ==='ellipsis'" placement="right" :content="showTitle(item)">
58
- <span>{{ showTitle(item) }}</span>
48
+ <div :class="['menu-title-' + item.permissionId,'draggable-text']" v-draggable="dragOptions(item)">
49
+ <Tooltip style="width: 100%" v-if="systemInfo.titleShow ==='ellipsis'" placement="right" :content="showTitle(item)">
50
+ <div class="menu-title-nochildren-ellipsis">{{ showTitle(item) }}</div>
59
51
  </Tooltip>
60
- <span v-else>{{ showTitle(item) }}</span>
52
+ <span v-else class="menu-title-nochildren-wrap">{{ showTitle(item) }}</span>
61
53
  </div>
62
54
  </Col>
63
55
  </Row>
package/src/styles/other-menu.css CHANGED
@@ -70,8 +70,11 @@
70
70
  }
71
71
  .menu-title-ellipsis {
72
72
  width: 70%;
73
- word-wrap: break-word;
74
- display: inline-block;
73
+ overflow: hidden;
74
+ white-space: nowrap;
75
+ /* 防止内容换行 */
76
+ text-overflow: ellipsis;
77
+ /* 超出部分省略 */
75
78
  }
76
79
  .menu-title-nochildren-wrap {
77
80
  width: 100%;
package/src/styles/other-menu.css.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"sources":["other-menu.less"],"names":[],"mappings":"AACA;EACE,WAAA;EACA,kBAAA;EACA,SAAA;EACA,aAAA;;AACA,WAAC,qBACC;EACE,WAAA;;AAFJ,WAAC,qBACC,iBAEE;EACE,WAAA;;AAJN,WAAC,qBACC,iBAEE,aAEE;EACE,WAAA;;AANR,WAAC,qBACC,iBAQE;EACE,eAAA;;AAVN,WAAC,qBACC,iBAWE;EACE,aAAA;;AAlBR,WAsBE;EACE,kBAAA;EACA,iBAAA;EACA,cAAA;EACA,UAAA;EACA,qBAAA;EACA,eAAA;;AAIJ,uBACE;EACE,WAAA;EACA,YAAA;EACA,iBAAA;EACA,kBAAA;;AALJ,uBACE,wBAKE;EACE,aAAA;EACA,kBAAA;EACA,UAAA;EACA,QAAA;EACA,eAAA;EACA,gBAAA;;AAEF,uBAbF,wBAaG,MACC;EACE,eAAA;EACA,YAAA;EACA,iBAAA;EACA,OAAO,6BAAP;;AALJ,uBAbF,wBAaG,MAOC;EACE,eAAA;;AAMR,uBACE;EACE,WAAA;EACA,QAAQ,kBAAR;EACA,SAAA;EACA,SAAA;EACA,gBAAA;;AAIJ,iCACE;EACE,UAAA;EACA,QAAQ,kBAAR;EACA,SAAA;EACA,SAAA;;AAGJ;EACE,UAAA;EACA,qBAAA;EACA,qBAAA;;AAEF;EACE,UAAA;EACA,qBAAA;EACA,qBAAA;;AAEF;EACE,WAAA;EACA,qBAAA;EACA,qBAAA;;AAEF;EACE,WAAA;EACA,gBAAA;EACA,mBAAA;;EACA,uBAAA;;;AAEF;EACE,yBAAA;;EACA,sBAAA;;EACA,qBAAA;;EACA,iBAAA","file":"other-menu.css"}
1
+ {"version":3,"sources":["other-menu.less"],"names":[],"mappings":"AACA;EACE,WAAA;EACA,kBAAA;EACA,SAAA;EACA,aAAA;;AACA,WAAC,qBACC;EACE,WAAA;;AAFJ,WAAC,qBACC,iBAEE;EACE,WAAA;;AAJN,WAAC,qBACC,iBAEE,aAEE;EACE,WAAA;;AANR,WAAC,qBACC,iBAQE;EACE,eAAA;;AAVN,WAAC,qBACC,iBAWE;EACE,aAAA;;AAlBR,WAsBE;EACE,kBAAA;EACA,iBAAA;EACA,cAAA;EACA,UAAA;EACA,qBAAA;EACA,eAAA;;AAIJ,uBACE;EACE,WAAA;EACA,YAAA;EACA,iBAAA;EACA,kBAAA;;AALJ,uBACE,wBAKE;EACE,aAAA;EACA,kBAAA;EACA,UAAA;EACA,QAAA;EACA,eAAA;EACA,gBAAA;;AAEF,uBAbF,wBAaG,MACC;EACE,eAAA;EACA,YAAA;EACA,iBAAA;EACA,OAAO,6BAAP;;AALJ,uBAbF,wBAaG,MAOC;EACE,eAAA;;AAMR,uBACE;EACE,WAAA;EACA,QAAQ,kBAAR;EACA,SAAA;EACA,SAAA;EACA,gBAAA;;AAIJ,iCACE;EACE,UAAA;EACA,QAAQ,kBAAR;EACA,SAAA;EACA,SAAA;;AAGJ;EACE,UAAA;EACA,qBAAA;EACA,qBAAA;;AAEF;EACE,UAAA;EACA,gBAAA;EACA,mBAAA;;EACA,uBAAA;;;AAEF;EACE,WAAA;EACA,qBAAA;EACA,qBAAA;;AAEF;EACE,WAAA;EACA,gBAAA;EACA,mBAAA;;EACA,uBAAA;;;AAEF;EACE,yBAAA;;EACA,sBAAA;;EACA,qBAAA;;EACA,iBAAA","file":"other-menu.css"}
package/src/styles/other-menu.less CHANGED
@@ -84,8 +84,9 @@
84
84
  }
85
85
  .menu-title-ellipsis{
86
86
  width: 70%;
87
- word-wrap: break-word;
88
- display: inline-block;
87
+ overflow: hidden;
88
+ white-space: nowrap; /* 防止内容换行 */
89
+ text-overflow: ellipsis; /* 超出部分省略 */
89
90
  }
90
91
  .menu-title-nochildren-wrap{
91
92
  width: 100%;