@lambo-design/pro-layout 1.0.0-beta.471 → 1.0.0-beta.473

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.471",
3
+ "version": "1.0.0-beta.473",
4
4
  "description": "",
5
5
  "main": "index.js",
6
6
  "author": "lambo",
@@ -11,7 +11,7 @@
11
11
  },
12
12
  "devDependencies": {
13
13
  "@lambo-design/core": "^4.7.1-beta.183",
14
- "@lambo-design/shared": "^1.0.0-beta.375"
14
+ "@lambo-design/shared": "^1.0.0-beta.382"
15
15
  },
16
16
  "scripts": {
17
17
  "release-pro-layout": "pnpm release-beta && git push --follow-tags && pnpm re-publish",
@@ -72,6 +72,7 @@ import sider from '../../../utils/sider'
72
72
  import menuItem from '../../../utils/menuItem'
73
73
  import Bus from '@lambo-design/shared/utils/bus'
74
74
  import Locale from "@lambo-design/core/src/mixins/locale";
75
+ import {addOttCode} from "@lambo-design/shared/utils/platform";
75
76
 
76
77
  export default {
77
78
  name: 'ProLayoutSiderMenuItem',
@@ -110,16 +111,18 @@ export default {
110
111
  toggleCollect(item) {
111
112
  Bus.$emit('toggle-collect-menu',!this.collectMap[item.name],item)
112
113
  },
113
- dragOptions(item){
114
+ async dragOptions(item) {
114
115
  if (!item) {
115
116
  item = {}
116
117
  }
117
118
  item.navList = this.navList;
119
+ item = await addOttCode(item);
118
120
  return {
119
121
  trigger: '.menu-title-' + item.permissionId,
120
122
  body: '.menu-title-' + item.permissionId,
121
123
  recover: true,
122
- item: item
124
+ item: item,
125
+ canMove: this.systemInfo?.menuDraggable !== '0'
123
126
  }
124
127
  },
125
128
  },
@@ -106,7 +106,7 @@ import ProLayoutSiderMenuItem from './components/pro-layout-sider-menu-item'
106
106
  import ProLayoutSiderCollapsedMenu from './components/pro-layout-sider-collapsed-menu'
107
107
  import {
108
108
  filterMenuName, filterMenuUri, tagExists,
109
- isOpenBlank, buildSinglePermission,arraysEqual
109
+ isOpenBlank, buildSinglePermission, arraysEqual, addOttCode
110
110
  } from "@lambo-design/shared/utils/platform";
111
111
  import config from "@lambo-design/shared/config/config";
112
112
  import {getThemeVarByKey} from "@lambo-design/shared/utils/theme";
@@ -406,16 +406,18 @@ export default {
406
406
  const targetElement = this.$refs.listenWidth; // 获取 DOM 元素的引用
407
407
  this.otherWidth = targetElement.clientWidth+'px'; // 获取 div 元素的宽度
408
408
  },
409
- dragOptions(item){
409
+ async dragOptions(item) {
410
410
  if (!item) {
411
411
  item = {}
412
412
  }
413
413
  item.navList = this.navList;
414
+ item = await addOttCode(item);
414
415
  return {
415
416
  trigger: '.menu-title-' + item.permissionId,
416
417
  body: '.menu-title-' + item.permissionId,
417
418
  recover: true,
418
- item: item
419
+ item: item,
420
+ canMove: this.systemInfo?.menuDraggable !== '0'
419
421
  }
420
422
  },
421
423
  toggleCollect(item) {