sh-view 2.4.17 → 2.4.19

package/package.json

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

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

@@ -1,13 +1,5 @@
 <template>
-	<vxe-modal
-		ref="modalRef"
-		v-bind="modalConfig"
-		@show="onModalShow"
-		@hide="onModalHide"
-		@zoom="onModalZoom"
-		@close="onModalClose"
-		@cancel="onModalClose"
-		@confirm="onModalConfirm">
+	<vxe-modal ref="modalRef" v-bind="modalConfig" @show="onModalShow" @hide="onModalHide" @zoom="onModalZoom" @close="onModalClose" @cancel="onModalClose" @confirm="onModalConfirm">
 		<template v-for="slot in Object.keys(slots)" #[slot]="scope">
 			<!-- 以之前的名字命名插槽，同时把数据原样绑定 -->
 			<slot :name="slot" v-bind="scope"></slot>

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

@@ -224,11 +224,14 @@ export default defineComponent({
 		const isPagerSlot = computed(() => useTableHooks.tablePagerConfig.value.enabled)
 		const isBottomSlot = computed(() => Boolean(slots.bottom))
 
-		provide('ShTableInstance', reactive({
-			columnObjConfig: useTableHooks.tableColumnObjConfig,
-			turnColumnItemFilters: useTableHooks.turnColumnItemFilters,
-			slots: useTableHooks.slots
-		}))
+		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

@@ -113,14 +113,17 @@ export default defineComponent({
 			openedNames.value = []
 		}
 
-		provide('MenuInstance', reactive({
-			props,
-			activeName,
-			activeNames,
-			openedNames,
-			onMenuSelect,
-			onMenuExpand
-		}))
+		provide(
+			'MenuInstance',
+			reactive({
+				props,
+				activeName,
+				activeNames,
+				openedNames,
+				onMenuSelect,
+				onMenuExpand
+			})
+		)
 
 		watch(
 			() => props.modelValue,

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

@@ -169,10 +169,13 @@ export default defineComponent({
 			emit('select', menu)
 		}
 
-		provide('MenuCardInstance', reactive({
-			props,
-			onMenuSelect
-		}))
+		provide(
+			'MenuCardInstance',
+			reactive({
+				props,
+				onMenuSelect
+			})
+		)
 
 		return {
 			cardActive,

package/packages/components/other-components/sh-preview/js/data-hook.js

@@ -8,12 +8,15 @@ export default function (props, context, state) {
 		if (!props.src) return
 		let container = rootRef.value
 		try {
-			let fileRes = null
 			if (typeof props.src === 'string') {
-				fileRes = await fetch(props.src, props.serverConfig)
+				fetch(props.src, props.serverConfig).then(async res => {
+					await state.domRender(res, container)
+					emit('rendered')
+				})
+			} else {
+				await state.domRender(props.src, container)
+				emit('rendered')
 			}
-			await state.domRender(fileRes, container)
-			emit('rendered')
 		} catch (e) {
 			await state.domRender('', container)
 			emit('error', e)