@lambo-design/pro-layout 1.0.0-beta.467 → 1.0.0-beta.469

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 (3) hide show
  1. package/package.json +3 -3
  2. package/src/components/pro-layout-sider/components/pro-layout-sider-menu-item.vue +2 -2
  3. package/src/components/pro-layout-sider/index.vue +9 -2
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@lambo-design/pro-layout",
3
- "version": "1.0.0-beta.467",
3
+ "version": "1.0.0-beta.469",
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.182",
14
- "@lambo-design/shared": "^1.0.0-beta.367"
13
+ "@lambo-design/shared": "^1.0.0-beta.372",
14
+ "@lambo-design/core": "^4.7.1-beta.183"
15
15
  },
16
16
  "scripts": {
17
17
  "release-pro-layout": "pnpm release-beta && git push --follow-tags && pnpm re-publish",
package/src/components/pro-layout-sider/components/pro-layout-sider-menu-item.vue CHANGED
@@ -27,7 +27,7 @@
27
27
  <Row type="flex" justify="center" align="top">
28
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
- @click="toggleCollect(item)"></Icon>
30
+ @click.stop="toggleCollect(item)"></Icon>
31
31
  </Col>
32
32
  <Col :span="getSpanNum(systemInfo,'title')">
33
33
  <div :class="['menu-title-' + item.children[0].permissionId,'draggable-text']" v-draggable="dragOptions(item.children[0])">
@@ -51,7 +51,7 @@
51
51
  <Row type="flex" justify="center" align="top">
52
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
- @click="toggleCollect(item)"></Icon>
54
+ @click.stop="toggleCollect(item)"></Icon>
55
55
  </Col>
56
56
  <Col :span="getSpanNum(systemInfo,'title')">
57
57
  <div :class="['menu-title-' + item.permissionId,'draggable-text']" v-draggable="dragOptions(item)">
package/src/components/pro-layout-sider/index.vue CHANGED
@@ -19,7 +19,9 @@
19
19
  :name="getNameOrHref(item, true)">
20
20
  <Row type="flex" justify="center" align="top">
21
21
  <Col :span="getSpanNum(systemInfo,'icon')">
22
- <ProLayoutSiderIcon v-if="systemInfo.menuLogo == '1'" :icon-type="item.type == 2 ? (isCollected.hasOwnProperty(item.name) ? 'ios-star' : 'ios-star-outline') : item.meta.icon"></ProLayoutSiderIcon>
22
+ <Icon v-if="systemInfo.menuLogo == '1' && item.type == 2" :type="isCollected.hasOwnProperty(item.name) ? 'ios-star' : 'ios-star-outline'"
23
+ @click.stop="toggleCollect(item)"></Icon>
24
+ <ProLayoutSiderIcon v-else-if="systemInfo.menuLogo == '1'" :icon-type="item.meta.icon"></ProLayoutSiderIcon>
23
25
  </Col>
24
26
  <Col :span="getSpanNum(systemInfo,'title')">
25
27
  <div :class="['menu-title-' + item.children[0].permissionId,'draggable-text']" v-draggable="dragOptions(item.children[0])">
@@ -44,7 +46,9 @@
44
46
  :name="getNameOrHref(item)">
45
47
  <Row type="flex" justify="center" align="top">
46
48
  <Col :span="getSpanNum(systemInfo,'icon')">
47
- <ProLayoutSiderIcon v-if="systemInfo.menuLogo == '1'" :icon-type="item.type == 2 ? (isCollected.hasOwnProperty(item.name) ? 'ios-star' : 'ios-star-outline') : item.meta.icon"></ProLayoutSiderIcon>
49
+ <Icon v-if="systemInfo.menuLogo == '1' && item.type == 2" :type="isCollected.hasOwnProperty(item.name) ? 'ios-star' : 'ios-star-outline'"
50
+ @click.stop="toggleCollect(item)"></Icon>
51
+ <ProLayoutSiderIcon v-else-if="systemInfo.menuLogo == '1'" :icon-type="item.meta.icon"></ProLayoutSiderIcon>
48
52
  </Col>
49
53
  <Col :span="getSpanNum(systemInfo,'title')">
50
54
  <div :class="['menu-title-' + item.permissionId,'draggable-text']" v-draggable="dragOptions(item)">
@@ -414,6 +418,9 @@ export default {
414
418
  item: item
415
419
  }
416
420
  },
421
+ toggleCollect(item) {
422
+ Bus.$emit('toggle-collect-menu', !this.isCollected[item.name], item)
423
+ },
417
424
  loadingCustomStyle(){
418
425
  let themeKey = localStorage.getItem("theme") ? localStorage.getItem("theme") : "default"
419
426
  let tabsHeight = getThemeVarByKey(themeKey,'--layout-tabs-height');