@lambo-design/pro-layout 1.0.0-beta.318 → 1.0.0-beta.319

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 (5) hide show
  1. package/CHANGELOG.md +2 -0
  2. package/package.json +3 -3
  3. package/src/components/pro-layout-sider/components/pro-layout-sider-menu-item.vue +6 -6
  4. package/src/components/pro-layout-sider/index.vue +4 -4
  5. package/src/utils/sider.js +15 -0
package/CHANGELOG.md CHANGED
@@ -1,4 +1,6 @@
1
1
  # Changelog
2
+ ## [1.0.0-beta.319](http://git.inspur.com/ecbh/lambo-design/lambo-design/-/compare/@lambo-design/pro-layout@1.0.0-beta.318...@lambo-design/pro-layout@1.0.0-beta.319) (2024-04-29)
3
+
2
4
  ## [1.0.0-beta.318](http://git.inspur.com/ecbh/lambo-design/lambo-design/-/compare/@lambo-design/pro-layout@1.0.0-beta.317...@lambo-design/pro-layout@1.0.0-beta.318) (2024-04-28)
3
5
 
4
6
 
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@lambo-design/pro-layout",
3
- "version": "1.0.0-beta.318",
3
+ "version": "1.0.0-beta.319",
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/core": "^4.7.1-beta.132",
14
- "@lambo-design/shared": "^1.0.0-beta.167"
13
+ "@lambo-design/shared": "^1.0.0-beta.168",
14
+ "@lambo-design/core": "^4.7.1-beta.134"
15
15
  },
16
16
  "scripts": {
17
17
  "release": "pnpm release-beta && git push --follow-tags && pnpm re-publish",
package/src/components/pro-layout-sider/components/pro-layout-sider-menu-item.vue CHANGED
@@ -2,10 +2,10 @@
2
2
  <Submenu :name="`${parentName}`">
3
3
  <template slot="title">
4
4
  <Row type="flex" justify="center" align="top">
5
- <Col span="3">
5
+ <Col :span="getSpanNum(systemInfo,'icon')">
6
6
  <ProLayoutSiderIcon v-if="systemInfo.menuLogo == '1'" :icon-type="parentItem.meta.icon"></ProLayoutSiderIcon>
7
7
  </Col>
8
- <Col span="21">
8
+ <Col :span="getSpanNum(systemInfo,'title')">
9
9
  <div>
10
10
  <Tooltip style="width: 100%" v-if="systemInfo.titleShow ==='ellipsis'" placement="right" transfer :content="showTitle(parentItem)">
11
11
  <div class="menu-title-ellipsis">{{ showTitle(parentItem)}}</div>
@@ -25,11 +25,11 @@
25
25
  </ProLayoutSiderMenuItem>
26
26
  <menu-item v-else :key="`menu-${item.children[0].name}`" :name="getNameOrHref(item, true)">
27
27
  <Row type="flex" justify="center" align="top">
28
- <Col span="3">
28
+ <Col :span="getSpanNum(systemInfo,'icon')">
29
29
  <Icon v-if="systemInfo.menuLogo == '1'" :type="collectMap.hasOwnProperty(item.name) ? 'ios-star' : 'ios-star-outline'"
30
30
  @click="toggleCollect(item)"></Icon>
31
31
  </Col>
32
- <Col span="21">
32
+ <Col :span="getSpanNum(systemInfo,'title')">
33
33
  <div :class="['menu-title-' + item.children[0].permissionId,'draggable-text']" v-draggable="dragOptions(item.children[0])">
34
34
  <Tooltip style="width: 100%" v-if="systemInfo.titleShow ==='ellipsis'" placement="right" transfer :content="showTitle(item.children[0])">
35
35
  <div class="menu-title-nochildren-ellipsis">{{ showTitle(item.children[0]) }}</div>
@@ -49,11 +49,11 @@
49
49
  </ProLayoutSiderMenuItem>
50
50
  <menu-item v-else :key="`menu-${item.name}`" :name="getNameOrHref(item)">
51
51
  <Row type="flex" justify="center" align="top">
52
- <Col span="3">
52
+ <Col :span="getSpanNum(systemInfo,'icon')">
53
53
  <Icon v-if="systemInfo.menuLogo == '1'" :type="collectMap.hasOwnProperty(item.name) ? 'ios-star' : 'ios-star-outline'"
54
54
  @click="toggleCollect(item)"></Icon>
55
55
  </Col>
56
- <Col span="21">
56
+ <Col :span="getSpanNum(systemInfo,'title')">
57
57
  <div :class="['menu-title-' + item.permissionId,'draggable-text']" v-draggable="dragOptions(item)">
58
58
  <Tooltip style="width: 100%" v-if="systemInfo.titleShow ==='ellipsis'" placement="right" transfer :content="showTitle(item)">
59
59
  <div class="menu-title-nochildren-ellipsis">{{ showTitle(item) }}</div>
package/src/components/pro-layout-sider/index.vue CHANGED
@@ -16,10 +16,10 @@
16
16
  <MenuItem v-else :key="`menu-${item.children[0].name}`"
17
17
  :name="getNameOrHref(item, true)">
18
18
  <Row type="flex" justify="center" align="top">
19
- <Col span="3">
19
+ <Col :span="getSpanNum(systemInfo,'icon')">
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
- <Col span="21">
22
+ <Col :span="getSpanNum(systemInfo,'title')">
23
23
  <div :class="['menu-title-' + item.children[0].permissionId,'draggable-text']" v-draggable="dragOptions(item.children[0])">
24
24
  <Tooltip style="width: 100%" v-if="systemInfo.titleShow ==='ellipsis'" placement="right" transfer :content="showTitle(item.children[0])">
25
25
  <div class="menu-title-nochildren-ellipsis">{{ showTitle(item.children[0]) }}</div>
@@ -41,10 +41,10 @@
41
41
  <MenuItem v-else :key="`menu-${item.name}`"
42
42
  :name="getNameOrHref(item)">
43
43
  <Row type="flex" justify="center" align="top">
44
- <Col span="3">
44
+ <Col :span="getSpanNum(systemInfo,'icon')">
45
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>
46
46
  </Col>
47
- <Col span="21">
47
+ <Col :span="getSpanNum(systemInfo,'title')">
48
48
  <div :class="['menu-title-' + item.permissionId,'draggable-text']" v-draggable="dragOptions(item)">
49
49
  <Tooltip style="width: 100%" v-if="systemInfo.titleShow ==='ellipsis'" placement="right" transfer :content="showTitle(item)">
50
50
  <div class="menu-title-nochildren-ellipsis">{{ showTitle(item) }}</div>
package/src/utils/sider.js CHANGED
@@ -20,6 +20,21 @@ export default {
20
20
  return item.href && false ? `isTurnByHref_${item.href}` : (children0 ? item.children[0].name : item.name)
21
21
  }
22
22
  return item.name
23
+ },
24
+ getSpanNum(systemInfo,type){
25
+ if (systemInfo && systemInfo.menuLogo && systemInfo.menuLogo == '1') {
26
+ if (type && type == 'icon') {
27
+ return '3'
28
+ } else {
29
+ return '21'
30
+ }
31
+ } else {
32
+ if (type && type == 'icon') {
33
+ return '0'
34
+ } else {
35
+ return '24'
36
+ }
37
+ }
23
38
  }
24
39
  }
25
40
  }