sh-view 2.7.9 → 2.8.1

package/packages/vxeTable/render/mixin/filter-hooks.js

@@ -1,28 +1,46 @@
-import { computed, onBeforeMount, ref, watch } from 'vue'
+import { computed, ref, watch } from 'vue'
 
-export default function (props, context, proxy) {
+export default function (props, context, proxy, initRenderData) {
 	const { $vUtils } = proxy
-	const renderValue = ref({})
+
+	let renderOption = ref({})
 
 	// 初始化
 	const initData = () => {
 		const { column, $panel } = props.rparams
 		const option = column.filters[0]
-		renderValue.value = option
-		$panel.changeOption(null, Boolean(renderValue.value.data), option)
+		renderOption.value = option
+		$panel.changeOption(null, Boolean(renderOption.value.data), option)
+	}
+
+	// 过滤回调option
+	const vxeFilterChange = ({ value, $event }) => {
+		const { $panel } = props.rparams
+		$panel.changeOption(null, Boolean(renderOption.value.data), renderOption.value)
 	}
-	// 过滤回调
-	const vxeFilterCallback = ({ value, $event }) => {
+
+	// 过滤确认
+	const vxeFilterConfirm = () => {
+		const { $panel } = props.rparams
+		$panel.confirmFilter()
+	}
+
+	// 过滤充值
+	const vxeFilterReset = () => {
 		const { $panel } = props.rparams
-		$panel.changeOption(null, Boolean(renderValue.value.data), renderValue.value)
+		$panel.resetFilter()
 	}
 
-	onBeforeMount(() => {
-		initData()
-	})
+	watch(
+		() => props.rkey,
+		() => (initRenderData ? initRenderData() : initData()),
+		{ deep: true, immediate: true }
+	)
 
 	return {
-		renderValue,
-		vxeFilterCallback
+		renderOption,
+		vxeFilterChange,
+		vxeFilterConfirm,
+		vxeFilterReset
 	}
 }