sh-view 2.4.8 → 2.4.10

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": "sh-view",
3
- "version": "2.4.8",
3
+ "version": "2.4.10",
4
4
  "description": "基于vxe-table二次封装",
5
5
  "main": "packages/index.js",
6
6
  "scripts": {
@@ -225,6 +225,7 @@ export default function (props, context, proxy, isForm) {
225
225
  formBindConfig,
226
226
  formCollapsed,
227
227
  formToggleBtnShow,
228
+ validate,
228
229
  formBtnCollapsed,
229
230
  onFormSubmit,
230
231
  onFormSubmitInvalid,
@@ -114,7 +114,7 @@ export default defineComponent({
114
114
  }
115
115
 
116
116
  provide('MenuInstance', reactive({
117
- ...props,
117
+ props,
118
118
  activeName,
119
119
  activeNames,
120
120
  openedNames,
@@ -1,7 +1,7 @@
1
1
  <template>
2
2
  <div v-if="showChildren(menuItem)" class="sh-menu-group" :class="groupClass">
3
3
  <menuItemContent ref="groupItemRef" :menu-item="menuItem" :menu-level="menuLevel" :arrow="isArrow" @click="onMenuExpand(!expand)" />
4
- <div v-show="expand" ref="groupList" class="sh-menu-group-list" :class="groupListClass" :style="groupListStyle">
4
+ <div v-show="expand" ref="groupListRef" class="sh-menu-group-list" :class="groupListClass" :style="groupListStyle">
5
5
  <template v-for="(item, index) in menuItem.children" :key="`sh-menu-${menuLevel}-${index}`">
6
6
  <menuGroupContent :menu-item="item" :menu-level="menuNextLevel" />
7
7
  </template>
@@ -39,12 +39,13 @@ export default defineComponent({
39
39
  const MenuInstance = inject('MenuInstance')
40
40
 
41
41
  const groupItemRef = ref()
42
+ const groupListRef = ref()
42
43
  const expand = ref(false)
43
44
  const groupListStyle = ref({})
44
45
 
45
46
  const menuNextLevel = computed(() => props.menuLevel + 1)
46
47
  const isArrow = computed(() => {
47
- return MenuInstance.collapsed ? !!props.menuLevel : true
48
+ return MenuInstance.props.collapsed ? !!props.menuLevel : true
48
49
  })
49
50
  const groupClass = computed(() => {
50
51
  return {
@@ -54,7 +55,7 @@ export default defineComponent({
54
55
  }
55
56
  })
56
57
  const groupListClass = computed(() => {
57
- const { mode, collapsed } = MenuInstance
58
+ const { mode, collapsed } = MenuInstance.props
58
59
  return {
59
60
  'sh-menu-group-dropdown': mode === 'horizontal',
60
61
  'sh-menu-group-dropright': mode === 'vertical' && collapsed
@@ -62,11 +63,12 @@ export default defineComponent({
62
63
  })
63
64
 
64
65
  const setMenuExpand = () => {
65
- const { mode, collapsed, openedNames } = MenuInstance
66
- expand.value = openedNames.includes(props.menuItem.name)
66
+ const { mode, collapsed } = MenuInstance.props
67
+ expand.value = MenuInstance.openedNames.includes(props.menuItem.name)
67
68
  if (expand.value && groupItemRef.value && ((mode === 'vertical' && collapsed) || mode === 'horizontal')) {
68
69
  nextTick(() => {
69
- const { offsetHeight, offsetWidth, itemRef } = groupItemRef.value
70
+ const { offsetHeight, offsetWidth } = groupListRef.value
71
+ const { itemRef } = groupItemRef.value
70
72
  const { left, right, top, bottom } = itemRef.getBoundingClientRect()
71
73
  const winWidth = window.innerWidth
72
74
  const winHeight = window.innerHeight
@@ -116,6 +118,7 @@ export default defineComponent({
116
118
 
117
119
  return {
118
120
  groupItemRef,
121
+ groupListRef,
119
122
  groupClass,
120
123
  groupListClass,
121
124
  groupListStyle,
@@ -46,14 +46,14 @@ export default defineComponent({
46
46
  })
47
47
  const itemStyle = computed(() => {
48
48
  let result = {}
49
- const { mode, collapsed, indent } = MenuInstance
49
+ const { mode, collapsed, indent } = MenuInstance.props
50
50
  if (mode === 'vertical' && !collapsed && props.menuLevel) {
51
51
  result.paddingLeft = `${indent * props.menuLevel}px`
52
52
  }
53
53
  return result
54
54
  })
55
55
  const itemTitle = computed(() => {
56
- const { labelField, labelFormat } = MenuInstance
56
+ const { labelField, labelFormat } = MenuInstance.props
57
57
  return labelFormat ? labelFormat(props.menuItem) : $vUtils.get(props.menuItem, labelField)
58
58
  })
59
59
 
@@ -170,7 +170,7 @@ export default defineComponent({
170
170
  }
171
171
 
172
172
  provide('MenuCardInstance', reactive({
173
- ...props,
173
+ props,
174
174
  onMenuSelect
175
175
  }))
176
176
 
@@ -48,7 +48,7 @@ export default defineComponent({
48
48
  return menu && menu.children && Array.isArray(menu.children) && menu.children.length > 0
49
49
  }
50
50
  const getItemTitle = menu => {
51
- const { labelField, labelFormat } = MenuCardInstance
51
+ const { labelField, labelFormat } = MenuCardInstance.props
52
52
  return labelFormat ? labelFormat(menu) : $vUtils.get(menu, labelField) || ''
53
53
  }
54
54
  const handleMenuClick = item => {