sh-view 2.4.1 → 2.4.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sh-view",
-  "version": "2.4.1",
+  "version": "2.4.3",
   "description": "基于vxe-table二次封装",
   "main": "packages/index.js",
   "scripts": {

package/packages/components/global-components/sh-pull-refresh/index.vue

@@ -17,7 +17,7 @@
 </template>
 
 <script>
-import { defineComponent, computed, onMounted, getCurrentInstance, ref, reactive, watch } from 'vue'
+import { defineComponent, computed, onMounted, getCurrentInstance, ref, reactive, watch, nextTick } from 'vue'
 export default defineComponent({
 	name: 'ShPullRefresh',
 	props: {

package/packages/components/global-components/sh-table/components/sh-column.vue

@@ -18,7 +18,7 @@ export default defineComponent({
 		})
 		const columnConfig = computed(() => {
 			let renderObj = { name: props.column.renderName, props: props.column.renderProps }
-			let config = Object.assign({}, shTable.columnObjConfig.value, props.column)
+			let config = Object.assign({}, shTable.columnObjConfig, props.column)
 			if (props.column.readonly) {
 				config.cellRender = config.cellRender || renderObj
 			} else {

package/packages/components/other-components/sh-menu/menu-group-content.vue

@@ -13,7 +13,7 @@
 </template>
 
 <script>
-import { defineComponent, computed, getCurrentInstance, ref, watch, onMounted, inject } from 'vue'
+import { defineComponent, computed, getCurrentInstance, ref, watch, onMounted, inject, nextTick } from 'vue'
 import menuItemContent from './menu-item-content.vue'
 export default defineComponent({
 	name: 'MenuGroupContent',
@@ -49,7 +49,7 @@ export default defineComponent({
 		const groupClass = computed(() => {
 			return {
 				is__level: !props.menuLevel,
-				is__active: MenuInstance.activeNames.value.includes(props.menuItem.name),
+				is__active: MenuInstance.activeNames.includes(props.menuItem.name),
 				is__expand: expand.value
 			}
 		})
@@ -63,8 +63,7 @@ export default defineComponent({
 
 		const setMenuExpand = () => {
 			const { mode, collapsed, openedNames } = MenuInstance
-			let names = openedNames.value
-			expand.value = names.includes(props.menuItem.name)
+			expand.value = openedNames.includes(props.menuItem.name)
 			if (expand.value && groupItemRef.value && ((mode === 'vertical' && collapsed) || mode === 'horizontal')) {
 				nextTick(() => {
 					const { offsetHeight, offsetWidth, itemRef } = groupItemRef.value
@@ -105,7 +104,7 @@ export default defineComponent({
 		}
 
 		watch(
-			() => MenuInstance.openedNames.value,
+			() => MenuInstance.openedNames,
 			() => {
 				setMenuExpand()
 			}

package/packages/components/other-components/sh-menu/menu-item-content.vue

@@ -41,7 +41,7 @@ export default defineComponent({
 		const itemClass = computed(() => {
 			return {
 				'sh-menu-item-level': !props.menuLevel,
-				'sh-menu-item-active': MenuInstance.activeName.value === props.menuItem.name
+				'sh-menu-item-active': MenuInstance.activeName === props.menuItem.name
 			}
 		})
 		const itemStyle = computed(() => {