sh-view 2.4.22 → 2.5.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sh-view",
-  "version": "2.4.22",
+  "version": "2.5.0",
   "description": "基于vxe-table二次封装",
   "main": "packages/index.js",
   "scripts": {
@@ -29,15 +29,14 @@
     "jszip": "^3.10.1",
     "popper.js": "^1.16.1",
     "resize-observer-polyfill": "^1.5.1",
-    "sh-tools": "^2.0.0",
+    "sh-tools": "^2.0.1",
     "tinymce": "^5.10.5",
     "vue": "^3.3.4",
     "vue-masonry": "^0.16.0",
     "vue-router": "^4.2.4",
-    "vxe-table": "^4.5.9",
+    "vxe-table": "^4.5.10",
     "vxe-table-plugin-export-pdf": "^3.0.4",
     "vxe-table-plugin-export-xlsx": "^3.0.5",
-    "x-data-spreadsheet": "^1.1.9",
     "xe-clipboard": "^1.10.2",
     "xe-utils": "^3.5.13"
   },

package/packages/components/other-components/sh-preview/components/sh-excel.vue

@@ -2,7 +2,7 @@
 import { defineComponent, computed, getCurrentInstance } from 'vue'
 import dataHook from '../js/data-hook'
 import dataProps from '../js/data-props'
-import Spreadsheet from 'x-data-spreadsheet'
+// import Spreadsheet from 'x-data-spreadsheet'
 import ExcelJS from 'exceljs'
 export default defineComponent({
 	name: 'ShExcel',
@@ -149,10 +149,10 @@ export default defineComponent({
 				})
 				workbookData.push(sheetData)
 			})
-			return new Spreadsheet(rootRef.value, excelOptions).loadData(workbookData)
+			// return new Spreadsheet(rootRef.value, excelOptions).loadData(workbookData)
 		}
 
-		const useData = dataHook(props, context, {
+		const useData = dataHook(props, context, proxy, {
 			domRender
 		})
 

package/packages/components/other-components/sh-preview/components/sh-word.vue

@@ -1,5 +1,5 @@
 <script>
-import { defineComponent, computed } from 'vue'
+import { defineComponent, computed, getCurrentInstance } from 'vue'
 import dataHook from '../js/data-hook'
 import dataProps from '../js/data-props'
 import { renderAsync } from 'docx-preview'
@@ -8,6 +8,8 @@ export default defineComponent({
 	props: dataProps,
 	emits: ['rendered', 'error'],
 	setup(props, context) {
+		const { proxy } = getCurrentInstance()
+
 		let defaultOption = {
 			inWrapper: true, //启用围绕文档内容呈现包装器
 			ignoreWidth: true, //禁用页面的渲染宽度
@@ -16,11 +18,16 @@ export default defineComponent({
 			breakPages: true, //在分页符上启用分页
 			ignoreLastRenderedPageBreak: true, //在lastRenderedPageBreak元素上禁用分页
 			experimental: false, //启用实验功能（制表符停止计算）
-			trimXmlDeclaration: true, //如果为true，则在解析之前将从xml文档中删除xml声明
+			trimXmlDeclaration: false, //如果为true，则在解析之前将从xml文档中删除xml声明
 			useBase64URL: false, //如果为true，图像、字体等将转换为base 64 URL，否则使用URL.createObjectURL
 			useMathMLPolyfill: false, //包括用于铬、边等的MathML多填充。
 			showChanges: false, //启用文档更改的实验渲染（插入/删除）
-			debug: false //启用额外的日志记录
+			debug: false, //启用额外的日志记录
+			renderHeaders: true,
+			renderFooters: true,
+			renderFootnotes: true,
+			renderEndnotes: true,
+			renderChanges: false
 		}
 
 		const docxOptions = computed(() => {
@@ -28,26 +35,26 @@ export default defineComponent({
 		})
 
 		const domRender = async (data, container) => {
-			if (!data) {
-				container.innerHTML = ''
-				return Promise.resolve()
+			if (!data || typeof data === 'string') {
+				container.innerHTML = data
+				return true
 			}
-			let blob
-			if (data instanceof Blob) {
-				blob = data
-			} else if (data instanceof Response) {
-				blob = await data.blob()
+			let blob = data
+			if (data instanceof Response) {
+				blob = data.blob()
 			} else if (data instanceof ArrayBuffer) {
 				blob = new Blob([data])
 			}
 			return renderAsync(blob, container, null, docxOptions.value)
 		}
 
-		const useData = dataHook(props, context, {
+		const useData = dataHook(props, context, proxy, {
 			domRender
 		})
 
-		return useData
+		return {
+			...useData
+		}
 	}
 })
 </script>

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

@@ -1,7 +1,8 @@
 import { onMounted, ref, watch } from 'vue'
 
-export default function (props, context, state) {
+export default function (props, context, proxy, state) {
 	const rootRef = ref(null)
+	const { $vUtils, $http } = proxy
 	const { emit } = context
 
 	const initData = async () => {
@@ -11,11 +12,14 @@ export default function (props, context, state) {
 			let fileRes = props.src
 			if (typeof props.src === 'string') {
 				fileRes = await fetch(props.src, props.serverConfig)
+				if (fileRes && fileRes.status !== 200) {
+					throw new Error(fileRes)
+				}
 			}
 			await state.domRender(fileRes, container)
 			emit('rendered')
 		} catch (e) {
-			await state.domRender('', container)
+			await state.domRender(e.message, container)
 			emit('error', e)
 		}
 	}

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

@@ -2,10 +2,14 @@ export default {
 	src: [String, ArrayBuffer, Blob],
 	options: {
 		type: Object,
-		default: () => ({})
+		default() {
+			return {}
+		}
 	},
 	serverConfig: {
 		type: Object,
-		default: () => ({})
+		default() {
+			return {}
+		}
 	}
 }