sh-view 1.5.3 → 1.6.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sh-view",
-  "version": "1.5.3",
+  "version": "1.6.0",
   "description": "基于vxe-table、view-ui-plus二次封装",
   "main": "packages/index.js",
   "scripts": {
@@ -19,25 +19,26 @@
     "@tinymce/tinymce-vue": "^5.0.0",
     "babel-polyfill": "^6.26.0",
     "codemirror": "^6.0.1",
-    "core-js": "^3.8.3",
+    "core-js": "^3.32.0",
     "cron-parser": "^4.8.1",
-    "docx-preview": "^0.1.11",
+    "docx-preview": "^0.1.18",
     "exceljs": "^4.3.0",
     "file-saver": "^2.0.5",
     "jspdf": "^2.5.1",
     "jszip": "^3.10.1",
-    "tinymce": "^5.10.5",
     "sh-tools": "^1.2.0",
+    "tinymce": "^5.10.5",
     "view-ui-plus": "^1.3.14",
     "vue": "^3.3.4",
+    "vue-masonry": "^0.16.0",
     "vue-ripple-directive": "^2.0.1",
     "vue-router": "^4.2.2",
-    "vue-masonry": "^0.16.0",
     "vuex": "^4.1.0",
-    "vxe-table": "^4.5.0-beta.10",
+    "vxe-table": "^4.5.0-beta.16",
     "vxe-table-plugin-export-pdf": "^3.0.4",
     "vxe-table-plugin-export-xlsx": "^3.0.5",
     "xe-clipboard": "^1.10.2",
+    "xe-utils": "^3.5.11",
     "xlsx": "^0.18.5"
   },
   "devDependencies": {

package/packages/components/global-components/sh-code-editor/index.vue

@@ -198,7 +198,7 @@ export default {
 			let result = '',
 				error = null
 			try {
-				if (typeof modelValue === 'object') {
+				if (typeof modelValue === 'object' && value) {
 					result = out ? JSON.parse(value, null, indent) : JSON.stringify(value, null, indent)
 				} else {
 					result = value

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

@@ -3,7 +3,7 @@
 </template>
 
 <script>
-import Icons from './icons'
+import Icons from './icons.vue'
 export default {
 	name: 'ShIcon',
 	components: { Icons },

package/packages/components/global-components/sh-iv-form/index.vue

@@ -39,7 +39,7 @@
 </template>
 
 <script>
-import ivGroupItem from './components/iv-group-item'
+import ivGroupItem from './components/iv-group-item.vue'
 export default {
 	name: 'ShIvForm',
 	components: {

package/packages/components/global-components/sh-upload/components/u-list.vue

@@ -29,7 +29,7 @@
 </template>
 
 <script>
-import UImg from './u-img'
+import UImg from './u-img.vue'
 export default {
 	name: 'UList',
 	components: {

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

@@ -58,7 +58,7 @@
 </template>
 
 <script>
-import UList from './components/u-list'
+import UList from './components/u-list.vue'
 export default {
 	name: 'ShUpload',
 	components: {

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

@@ -178,7 +178,7 @@
 import defaultData from './mixin/defaultData'
 import props from './js/props'
 import methods from './js/methods'
-import importModal from './components/importModal'
+import importModal from './components/importModal.vue'
 export default {
 	name: 'ShTable',
 	components: {

package/packages/components/global-components/sh-vxe-tree/index.vue

@@ -13,8 +13,8 @@
 </template>
 
 <script>
-import vxeDirectTree from './vxe-direct-tree'
-import vxeSelectTree from './vxe-select-tree'
+import vxeDirectTree from './vxe-direct-tree.vue'
+import vxeSelectTree from './vxe-select-tree.vue'
 import props from './js/props'
 export default {
 	name: 'ShTree',

package/packages/components/global-components/sh-vxe-tree/vxe-direct-tree.vue

@@ -22,7 +22,7 @@
 
 <script>
 import defaultData from './mixin/defaultData'
-import tableTree from './components/table-tree'
+import tableTree from './components/table-tree.vue'
 import treeMethods from './js/treeMethods'
 export default {
 	name: 'ShDirectTree',

package/packages/components/global-components/sh-vxe-tree/vxe-select-tree.vue

@@ -44,7 +44,7 @@
 
 <script>
 import defaultData from './mixin/defaultData'
-import tableTree from './components/table-tree'
+import tableTree from './components/table-tree.vue'
 import treeMethods from './js/treeMethods'
 export default {
 	name: 'ShSelectTree',

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

@@ -3,7 +3,7 @@
 </template>
 
 <script>
-let docxPreview = require('docx-preview')
+import * as docx from 'docx-preview'
 export default {
 	name: 'ShWord',
 	props: {
@@ -82,17 +82,13 @@ export default {
 	},
 	methods: {
 		async wordRender() {
-			const that = this
+			if(!this.url) return
 			try {
-				if (that.url) {
-					let content = await that.getFileContent()
-					docxPreview
-						.renderAsync(content, that.$refs[that.wordRef], null, that.wordOption)
-						.then(res => {})
-						.catch(err => {})
-				}
+				let content = await this.getFileContent()
+				let res = await docx.renderAsync(content, this.$refs[this.wordRef], null, this.wordOption)
+				console.log(res)
 			} catch (e) {
-				that.msgerror(`初始化失败：${e.message}`)
+				this.msgerror(`初始化失败：${e.message}`)
 			}
 		},
 		// 获取文件流

package/packages/components/index.js

@@ -1,29 +1,29 @@
 // 全局公共封装组件
-import ShCard from './global-components/sh-card'
-import ShCodeEditor from './global-components/sh-code-editor'
-import ShCorner from './global-components/sh-corner'
-import ShCountTo from './global-components/sh-count-to'
-import ShEmpty from './global-components/sh-empty'
-import ShHeader from './global-components/sh-header'
-import ShIcon from './global-components/sh-icon'
-import ShIvForm from './global-components/sh-iv-form'
-import ShLayout from './global-components/sh-layout'
-import ShLoading from './global-components/sh-loading'
-import ShNoticeBar from './global-components/sh-noticebar'
-import ShPreview from './global-components/sh-preview'
-import ShPullRefresh from './global-components/sh-pull-refresh'
-import ShResult from './global-components/sh-result'
-import ShSheet from './global-components/sh-sheet'
-import ShUpload from './global-components/sh-upload'
-import ShForm from './global-components/sh-vxe-form'
-import ShList from './global-components/sh-vxe-list'
-import ShModal from './global-components/sh-vxe-modal'
-import ShQuery from './global-components/sh-vxe-query'
-import ShTable from './global-components/sh-vxe-table'
-import ShToolbar from './global-components/sh-vxe-toolbar'
-import ShTree from './global-components/sh-vxe-tree'
-import ShWaterFall from './global-components/sh-water-fall'
-import ShWord from './global-components/sh-word'
+import ShCard from './global-components/sh-card/index.vue'
+import ShCodeEditor from './global-components/sh-code-editor/index.vue'
+import ShCorner from './global-components/sh-corner/index.vue'
+import ShCountTo from './global-components/sh-count-to/index.vue'
+import ShEmpty from './global-components/sh-empty/index.vue'
+import ShHeader from './global-components/sh-header/index.vue'
+import ShIcon from './global-components/sh-icon/index.vue'
+import ShIvForm from './global-components/sh-iv-form/index.vue'
+import ShLayout from './global-components/sh-layout/index.vue'
+import ShLoading from './global-components/sh-loading/index.vue'
+import ShNoticeBar from './global-components/sh-noticebar/index.vue'
+import ShPreview from './global-components/sh-preview/index.vue'
+import ShPullRefresh from './global-components/sh-pull-refresh/index.vue'
+import ShResult from './global-components/sh-result/index.vue'
+import ShSheet from './global-components/sh-sheet/index.vue'
+import ShUpload from './global-components/sh-upload/index.vue'
+import ShForm from './global-components/sh-vxe-form/index.vue'
+import ShList from './global-components/sh-vxe-list/index.vue'
+import ShModal from './global-components/sh-vxe-modal/index.vue'
+import ShQuery from './global-components/sh-vxe-query/index.vue'
+import ShTable from './global-components/sh-vxe-table/index.vue'
+import ShToolbar from './global-components/sh-vxe-toolbar/index.vue'
+import ShTree from './global-components/sh-vxe-tree/index.vue'
+import ShWaterFall from './global-components/sh-water-fall/index.vue'
+import ShWord from './global-components/sh-word/index.vue'
 
 const components = {
 	ShCard,

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

@@ -43,7 +43,7 @@
 </template>
 
 <script>
-import menuBox from './menu-box'
+import menuBox from './menu-box.vue'
 export default {
 	name: 'MenuCard',
 	components: {

package/packages/vxeTable/index.js

@@ -3,7 +3,7 @@ import './css/index.scss'
 import VXETablePluginExportXLSX from 'vxe-table-plugin-export-xlsx'
 import VXETablePluginExportPDF from 'vxe-table-plugin-export-pdf'
 import XEClipboard from 'xe-clipboard'
-import { defaultPublicRenders, defaultExtraRenders, defaultFilterRenders, defaultPublicRendersNames } from './render/globalRenders'
+import { defaultPublicRenders, defaultExtraRenders, defaultFilterRenders, defaultPublicRendersNames } from './render/globalRenders.jsx'
 
 let vxeOptions = {
 	zIndex: 599,

package/packages/vxeTable/render/{globalRenders.js → globalRenders.jsx}

@@ -1,32 +1,32 @@
 // 渲染器组件封装
-import vxeRenderInput from './cell/vxe-render-input'
-import vxeRenderTextarea from './cell/vxe-render-textarea'
-import vxeRenderSelect from './cell/vxe-render-select'
-import vxeRenderTree from './cell/vxe-render-tree'
-import vxeRenderTime from './cell/vxe-render-time'
-import vxeRenderProgress from './cell/vxe-render-progress'
-import vxeRenderSwitch from './cell/vxe-render-switch'
-import vxeRenderMoney from './cell/vxe-render-money'
-import vxeRenderCheckbox from './cell/vxe-render-checkbox'
-import vxeRenderCheckgroup from './cell/vxe-render-checkgroup'
-import vxeRenderRadio from './cell/vxe-render-radio'
-import vxeRenderRadiogroup from './cell/vxe-render-radiogroup'
-import vxeRenderTable from './cell/vxe-render-table'
-import vxeRenderImg from './cell/vxe-render-img'
-import vxeRenderHref from './cell/vxe-render-href'
-import vxeRenderUpload from './cell/vxe-render-upload'
-import vxeRenderCode from './cell/vxe-render-code'
-import vxeRenderGoption from './cell/vxe-render-goption'
+import vxeRenderInput from './cell/vxe-render-input.vue'
+import vxeRenderTextarea from './cell/vxe-render-textarea.vue'
+import vxeRenderSelect from './cell/vxe-render-select.vue'
+import vxeRenderTree from './cell/vxe-render-tree.vue'
+import vxeRenderTime from './cell/vxe-render-time.vue'
+import vxeRenderProgress from './cell/vxe-render-progress.vue'
+import vxeRenderSwitch from './cell/vxe-render-switch.vue'
+import vxeRenderMoney from './cell/vxe-render-money.vue'
+import vxeRenderCheckbox from './cell/vxe-render-checkbox.vue'
+import vxeRenderCheckgroup from './cell/vxe-render-checkgroup.vue'
+import vxeRenderRadio from './cell/vxe-render-radio.vue'
+import vxeRenderRadiogroup from './cell/vxe-render-radiogroup.vue'
+import vxeRenderTable from './cell/vxe-render-table.vue'
+import vxeRenderImg from './cell/vxe-render-img.vue'
+import vxeRenderHref from './cell/vxe-render-href.vue'
+import vxeRenderUpload from './cell/vxe-render-upload.vue'
+import vxeRenderCode from './cell/vxe-render-code.vue'
+import vxeRenderGoption from './cell/vxe-render-goption.vue'
 
 // 头部渲染器封装
-import vxeHeaderMoney from './header/vxe-header-money'
+import vxeHeaderMoney from './header/vxe-header-money.vue'
 
 // 底部渲染器封装
-import vxeFooterInput from './footer/vxe-footer-input'
-import vxeFooterMoney from './footer/vxe-footer-money'
+import vxeFooterInput from './footer/vxe-footer-input.vue'
+import vxeFooterMoney from './footer/vxe-footer-money.vue'
 
 // 过滤器组件封装
-import vxeFilterInput from './filters/vxe-filter-input'
+import vxeFilterInput from './filters/vxe-filter-input.vue'
 
 // 系统图片
 import imgPlaceholder from '../../assets/img/square-image.png'