sh-view 2.5.2 → 2.5.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sh-view",
-  "version": "2.5.2",
+  "version": "2.5.4",
   "description": "基于vxe-table二次封装",
   "main": "packages/index.js",
   "scripts": {
@@ -29,12 +29,12 @@
     "jszip": "^3.10.1",
     "popper.js": "^1.16.1",
     "resize-observer-polyfill": "^1.5.1",
-    "sh-tools": "^2.0.1",
+    "sh-tools": "^2.1.4",
     "tinymce": "^5.10.5",
     "vue": "^3.3.4",
     "vue-masonry": "^0.16.0",
     "vue-router": "^4.2.4",
-    "vxe-table": "^4.5.10",
+    "vxe-table": "^4.5.11",
     "vxe-table-plugin-export-pdf": "^3.0.4",
     "vxe-table-plugin-export-xlsx": "^3.0.5",
     "xe-clipboard": "^1.10.2",

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

@@ -67,7 +67,7 @@ export default defineComponent({
 			return types.includes(props.type) ? props.type : 'info'
 		})
 		const resultTitle = computed(() => {
-			return typeof props.title === 'string' ? props.title : resultTitleMap[resultType.value]
+			return props.title ? props.title || resultTitleMap[resultType.value] : false
 		})
 		const resultIcon = computed(() => {
 			return resultIconMap[resultType.value]

package/packages/components/global-components/sh-table/js/useTable.js

@@ -4,9 +4,8 @@ import { columnDefaultFilterMethod, tableFooterCompute, getTransfarFields, getFi
 const globalConfigDefault = {
 	tableName: '',
 	title: false, // 是否显示 tableName
-	checkbox: true, // 是否展示复选框
-	radio: false, // 是否展示单选框
-	seq: true, // 是否展示序号列
+	selectType: '', // 是否选择框 空 radio checkbox
+	seq: false, // 是否展示序号列
 	ghost: false, // 是否开启透明
 	search: false, // 表格是否开启查询，默认不开启，根据columns配置字段 search 为 true
 	globalFilter: false, // 表格是否开启全局过滤
@@ -37,11 +36,11 @@ const toolsList = [
 // 表头默认值
 const columnObjDefault = { minWidth: 120, sortable: true, filter: true }
 // 表头默认列
-const columnsConfigDefault = [
-	{ title: '', type: 'checkbox', width: 60, align: 'center', fixed: 'left', sortable: false, resizable: false, className: 'table-row-checkbox' },
-	{ title: '单选', type: 'radio', width: 60, align: 'center', fixed: 'left', sortable: false, resizable: false, className: 'table-row-radio' },
-	{ title: '序号', type: 'seq', width: 70, align: 'center', fixed: 'left', sortable: false, resizable: false, className: 'table-row-seq' }
-]
+const columnsMapDefault = {
+	checkbox: { title: '', type: 'checkbox', width: 60, align: 'center', fixed: 'left', sortable: false, resizable: false, className: 'table-row-checkbox' },
+	radio: { title: '单选', type: 'radio', width: 60, align: 'center', fixed: 'left', sortable: false, resizable: false, className: 'table-row-radio' },
+	seq: { title: '序号', type: 'seq', width: 70, align: 'center', fixed: 'left', sortable: false, resizable: false, className: 'table-row-seq' }
+}
 
 export default function (props, context, proxy, isGrid) {
 	const { $vUtils, $vxePluginNames } = proxy
@@ -70,9 +69,18 @@ export default function (props, context, proxy, isGrid) {
 		return toolsList.filter(tool => tools.includes(tool.code))
 	})
 	const tableViewData = computed(() => tableFilterData.value || props.dataSourse)
+	const tablePrevColumns = computed(() => {
+		let prevColumns = []
+		let prevFields = ['seq', 'selectType']
+		prevFields.forEach(prev => {
+			if (tableGlobalConfig.value[prev]) {
+				prevColumns.push(columnsMapDefault[prev])
+			}
+		})
+		return prevColumns
+	})
 	const tableColumns = computed(() => {
-		let defaultColumns = columnsConfigDefault.filter(item => tableGlobalConfig.value[item.type])
-		return defaultColumns.concat(tableColumnsFixed.value)
+		return tablePrevColumns.value.concat(tableColumnsFixed.value)
 	})
 	const tableColumnObjConfig = computed(() => Object.assign({}, columnObjDefault, props.columnObj))
 	const tableColumnConfig = computed(() => Object.assign({ isCurrent: false, isHover: true, resizable: true }, props.columnConfig))
@@ -157,7 +165,7 @@ export default function (props, context, proxy, isGrid) {
 				let cellValue = $vUtils.get(row, property)
 				if (!$vUtils.isNone(cellValue)) {
 					let { rvalue, rtext } = $vUtils.formatRender(cellValue, property, row, rname, rprops, proxy)
-					$vUtils.set(row, property, rtext)
+					$vUtils.set(row, property, ['$vMoney'].includes(rname) ? rtext : rvalue)
 				}
 			})
 		})
@@ -184,8 +192,7 @@ export default function (props, context, proxy, isGrid) {
 		return footerData
 	}
 	const tableFooterSpanMethod = ({ $rowIndex, column, $columnIndex, data }) => {
-		let defaultColumns = columnsConfigDefault.filter(item => tableGlobalConfig.value[item.type])
-		let colspan = defaultColumns.length || 1
+		let colspan = tablePrevColumns.value.length || 1
 		if (column.type === 'seq') {
 			return { rowspan: 1, colspan: colspan }
 		} else if (column.type === 'checkbox' || column.type === 'radio') {
@@ -533,6 +540,7 @@ export default function (props, context, proxy, isGrid) {
 		renderKey,
 		wrapHeight,
 		tableGlobalConfig,
+		tablePrevColumns,
 		tableColumns,
 		tableColumnConfig,
 		tableColumnObjConfig,
@@ -553,7 +561,6 @@ export default function (props, context, proxy, isGrid) {
 		tableSlots,
 		selectionRows,
 		importVisible,
-		columnsConfigDefault,
 		tableFooterMethod,
 		tableFooterSpanMethod,
 		onCurrentChange,

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

@@ -116,8 +116,8 @@
 			@toolbar-button-click="onToolbarButtonClick"
 			@toolbar-tool-click="onToolbarToolClick"
 			@option-click="handleGoptionClick">
-			<template v-for="(column, columnIndex) in columnsConfigDefault" :key="columnIndex">
-				<vxe-column v-if="!!tableGlobalConfig[column.type]" v-bind="column"></vxe-column>
+			<template v-for="(column, columnIndex) in tablePrevColumns" :key="columnIndex">
+				<vxe-column v-bind="column"></vxe-column>
 			</template>
 			<template v-for="(column, columnIndex) in columns" :key="columnIndex">
 				<sh-column :column="column"></sh-column>

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

@@ -1,6 +1,7 @@
 <template>
+	<sh-result v-if="queryErrorText" class="sh-tree-result" type="error" :title="false" :text="queryErrorText"></sh-result>
 	<vxe-grid
-		v-if="treeServerComplate && !queryErrorText"
+		v-else
 		ref="tableRef"
 		:key="renderKey"
 		:class="{ 'sh-vxe-tree-table': true, 'is--hidecheck': globalConfig.checkHide }"
@@ -15,7 +16,6 @@
 			<sh-empty :icon="emptyIcon" :content="emptyText"></sh-empty>
 		</template>
 	</vxe-grid>
-	<sh-result v-else-if="queryErrorText" class="sh-tree-result" type="error" :text="queryErrorText"></sh-result>
 </template>
 
 <script>
@@ -109,7 +109,7 @@ export default defineComponent({
 		}
 		// 获取请求配置数据
 		const getServerConfigDataSourse = async () => {
-			const { serverConfig, serverParams, parseParams, queryCacheParams, serverCache, valueData, globalConfig, multiple, nodeKey, labelField } = props
+			const { serverConfig, serverParams, parseParams, serverCache, valueData, globalConfig, multiple, nodeKey, labelField } = props
 			if (!serverConfig.url) {
 				treeServerComplate.value = true
 				return true
@@ -123,7 +123,7 @@ export default defineComponent({
 					params[key] = $vUtils.format(params[key], valueData)
 				}
 			})
-			if (!$vUtils.isEqual(queryCacheParams, params)) {
+			if (!$vUtils.isEqual(queryCacheParams.value, params)) {
 				treeServerComplate.value = false
 			}
 			if (serverCache && treeServerComplate.value) {

package/packages/components/global-components/sh-tree/css/index.scss

@@ -34,10 +34,6 @@
 }
 
 .sh-tree-select-dropdown {
-    .tree-skeleton{
-        width: 100%;
-        height: 230px;
-    }
 }
 
 .sh-vxe-tree-table{
@@ -49,6 +45,4 @@
 
 .sh-tree-result{
     position: relative;
-    top: 50%;
-    transform: translateY(-60%);
 }

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

@@ -13,7 +13,6 @@
 					</div>
 					<div class="sh-tree-select-dropdown-content">
 						<table-tree v-if="pulldownDrop" v-bind="tableTreeProps" @datacall="onDataCall" @select="onChange"></table-tree>
-						<div v-else class="tree-skeleton"></div>
 					</div>
 				</template>
 			</vxe-pulldown>

package/packages/vxeTable/render/globalRenders.jsx

@@ -69,7 +69,7 @@ const getFixedProp = (renderOpts, params) => {
 		name = props.colRenderName
 	}
 	let rturnProps = Object.assign({}, defaultPublicProps, defaultProps[name], props)
-	let transKeys = ['disabled', 'multiple', 'isLeaf', 'commafy', 'border', 'calculate']
+	let transKeys = ['transfer', 'disabled', 'multiple', 'isLeaf', 'commafy', 'border', 'filterable', 'showWordCount', 'editable']
 	transKeys.forEach(key => {
 		if (rturnProps[key] !== null && rturnProps[key] !== undefined && typeof rturnProps[key] === 'string') {
 			rturnProps[key] = Boolean(+rturnProps[key])