sh-view 2.4.6 → 2.4.8

package/package.json

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

package/packages/components/global-components/sh-modal/index.vue

@@ -1,29 +1,7 @@
 <template>
 	<vxe-modal
-		:id="id"
 		ref="modalRef"
-		v-model="modalVisible"
-		:title="title"
-		:size="size"
-		:class-name="className"
-		:width="width"
-		:height="height"
-		:type="type"
-		:status="status"
-		:loading="loading"
-		:destroy-on-close="destroyOnClose"
-		:transfer="transfer"
-		:fullscreen="fullscreen"
-		:show-header="showHeader"
-		:show-zoom="showZoom"
-		:show-close="showClose"
-		:show-footer="showFooter"
-		:resize="resize"
-		:mask="mask"
-		:mask-closable="maskClosable"
-		:esc-closable="escClosable"
-		:position="position"
-		:before-hide-method="beforeHideMethod"
+		v-bind="modalConfig"
 		@show="onModalShow"
 		@hide="onModalHide"
 		@zoom="onModalZoom"
@@ -49,7 +27,7 @@
 </template>
 
 <script>
-import { defineComponent, watch, ref } from 'vue'
+import { defineComponent, watch, ref, computed, getCurrentInstance } from 'vue'
 export default defineComponent({
 	name: 'ShModal',
 	props: {
@@ -149,9 +127,15 @@ export default defineComponent({
 	},
 	emits: ['update:modelValue', 'show', 'hide', 'zoom', 'confirm', 'close'],
 	setup(props, context) {
+		const { proxy } = getCurrentInstance()
+		const { $vUtils } = proxy
 		const { emit, slots } = context
 		const modalRef = ref()
-		const modalVisible = ref(props.modelValue)
+
+		const modalConfig = computed(() => {
+			let modelProps = $vUtils.omit(props, ['readonly', 'confirmButtonText', 'cancelButtonText'])
+			return $vUtils.omit(modelProps, val => val === undefined)
+		})
 
 		// 弹窗显示回调
 		const onModalShow = () => {
@@ -176,22 +160,16 @@ export default defineComponent({
 		}
 
 		watch(
-			() => props.modelValue,
-			value => {
-				modalVisible.value = value
-			}
-		)
-		watch(
-			() => modalVisible.value,
+			() => modalConfig.value.modelValue,
 			value => {
 				if (!value) onModalClose()
 			}
 		)
 
 		return {
-			modalRef,
 			slots,
-			modalVisible,
+			modalRef,
+			modalConfig,
 			onModalShow,
 			onModalHide,
 			onModalZoom,

package/packages/components/global-components/sh-split/index.vue

@@ -137,7 +137,7 @@ export default defineComponent({
 			let outerWidth = splitRef.value[offsetSize.value]
 			let value = valueIsPx.value ? `${parseFloat(oldOffset.value) + offset}px` : px2percent(outerWidth * oldOffset.value + offset, outerWidth)
 			let anotherValue = getAnotherOffset(value)
-			if (parseFloat(value) <= parseFloat(computedMin.value)) value = getMax(value, computedMin.value)
+			if (parseFloat(value) <= parseFloat(computedMin.value)) value = getMin(value, computedMin.value)
 			if (parseFloat(anotherValue) <= parseFloat(computedMax.value)) value = getAnotherOffset(getMax(anotherValue, computedMax.value))
 			e.atMin = currentValue.value === computedMin.value
 			e.atMax = valueIsPx.value ? getAnotherOffset(currentValue.value) === computedMax.value : getAnotherOffset(currentValue.value).toFixed(5) === computedMax.value.toFixed(5)

package/packages/vxeTable/render/cell/vxe-render-table.vue

@@ -12,7 +12,7 @@
 </template>
 
 <script>
-import { defineComponent, getCurrentInstance } from 'vue'
+import { defineComponent, getCurrentInstance, ref } from 'vue'
 import cellProps from '../mixin/cell-props'
 import cellHooks from '../mixin/cell-hooks'
 export default defineComponent({