sh-view 2.5.1 → 2.5.3

package/package.json

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

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

@@ -21,6 +21,9 @@
 							<div class="sh-drawer-body" :style="styles">
 								<slot v-if="modelValue || !destroyOnClose"></slot>
 							</div>
+							<div v-if="slots.footer" class="sh-drawer-footer">
+								<slot name="footer"></slot>
+							</div>
 						</div>
 						<div v-if="draggable && (placement === 'left' || placement === 'right')" class="sh-drawer-drag" :class="'sh-drawer-drag-' + placement" @mousedown="handleTriggerMousedown">
 							<slot name="trigger">
@@ -337,6 +340,7 @@ export default defineComponent({
 		})
 
 		return {
+			slots,
 			visible,
 			handleMask,
 			wrapClasses,
@@ -422,9 +426,8 @@ export default defineComponent({
 	&-content {
 		width: 100%;
 		height: 100%;
-		position: absolute;
-		top: 0;
-		bottom: 0;
+		display: flex;
+		flex-direction: column;
 		background-color: var(--vxe-table-body-background-color);
 		border: 0;
 		background-clip: padding-box;
@@ -463,16 +466,19 @@ export default defineComponent({
 	}
 	&-body {
 		width: 100%;
-		height: calc(100% - 51px);
+		flex: 1;
 		padding: 16px;
 		font-size: var(--vxe-font-size);
 		line-height: 1.5;
 		word-wrap: break-word;
-		position: absolute;
+		position: relative;
 		overflow: auto;
 	}
-	&-no-header &-body {
-		height: 100%;
+	&-footer {
+		position: relative;
+		border-top: 1px solid var(--vxe-table-border-color);
+		padding: 14px 16px;
+		line-height: 1;
 	}
 	&-no-mask {
 		pointer-events: none;

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))
@@ -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>