sh-view 2.4.0 → 2.4.2

package/package.json

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

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/global-components/sh-table/table.vue

@@ -154,7 +154,7 @@
 </template>
 
 <script>
-import { computed, defineComponent, getCurrentInstance, provide, ref } from 'vue'
+import { computed, defineComponent, getCurrentInstance, provide, ref, reactive } from 'vue'
 import './css/index.scss'
 
 import props from './js/props'
@@ -224,11 +224,11 @@ export default defineComponent({
 		const isPagerSlot = computed(() => useTableHooks.tablePagerConfig.value.enabled)
 		const isBottomSlot = computed(() => Boolean(slots.bottom))
 
-		provide('ShTableInstance', {
+		provide('ShTableInstance', reactive({
 			columnObjConfig: useTableHooks.tableColumnObjConfig,
 			turnColumnItemFilters: useTableHooks.turnColumnItemFilters,
 			slots: useTableHooks.slots
-		})
+		}))
 
 		const handleResize = e => {
 			if (useTableHooks.wrapHeight.value === 'auto') return

package/packages/components/other-components/sh-menu/index.vue

@@ -9,7 +9,7 @@
 </template>
 
 <script>
-import { defineComponent, computed, provide, ref, getCurrentInstance, watch, onMounted } from 'vue'
+import { defineComponent, computed, provide, ref, reactive, getCurrentInstance, watch, onMounted } from 'vue'
 import menuGroupContent from './menu-group-content.vue'
 export default defineComponent({
 	name: 'ShMenu',
@@ -113,14 +113,14 @@ export default defineComponent({
 			openedNames.value = []
 		}
 
-		provide('MenuInstance', {
+		provide('MenuInstance', reactive({
 			...props,
 			activeName,
 			activeNames,
 			openedNames,
 			onMenuSelect,
 			onMenuExpand
-		})
+		}))
 
 		watch(
 			() => props.modelValue,

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

@@ -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(() => {

package/packages/components/other-components/sh-menu-card/index.vue

@@ -42,7 +42,7 @@
 </template>
 
 <script>
-import { defineComponent, computed, provide, getCurrentInstance, ref, onMounted } from 'vue'
+import { defineComponent, computed, provide, getCurrentInstance, ref, reactive, onMounted } from 'vue'
 import menuBox from './menu-box.vue'
 export default defineComponent({
 	name: 'MenuCard',
@@ -169,10 +169,10 @@ export default defineComponent({
 			emit('select', menu)
 		}
 
-		provide('MenuCardInstance', {
+		provide('MenuCardInstance', reactive({
 			...props,
 			onMenuSelect
-		})
+		}))
 
 		return {
 			cardActive,

package/packages/directive/module/resize.js

@@ -1,10 +1,11 @@
 import ResizeObserver from 'resize-observer-polyfill'
-import { utils } from 'sh-tools'
-const throttleTime = 200
+// import { utils } from 'sh-tools'
+// const throttleTime = 200
 
 export default {
 	beforeMount(el, binding) {
-		const _callback = utils.throttle(binding.value, throttleTime)
+		// const _callback = utils.throttle(binding.value, throttleTime)
+		const _callback = binding.value
 		el.__observer__ = new ResizeObserver(_callback)
 		el.__observer__.observe(el)
 	},