sh-view 2.9.16 → 2.9.18

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "sh-view",
-	"version": "2.9.16",
+	"version": "2.9.18",
 	"description": "基于vxe-table二次封装,更包含Alert,Badge,Card,CodeEditor,Col,Corner,CountTo,Drawer,Empty,Form,Header,Icon,List,Loading,Modal,Noticebar,Poptip,Progress,PullRefresh,Query,Result,Row,Split,Grid,Table,Tabs,Tag,Toolbar,Tree,Upload,WaterFall,WaterMark等丰富组件库",
 	"main": "packages/index.js",
 	"typings": "types/index.d.ts",

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

@@ -92,8 +92,8 @@ export default defineComponent({
 	background-color: var(--bg-main-color);
 	.sh-card-head {
 		@include layoutFlex;
+		flex-wrap: nowrap;
 		.sh-card-head-title {
-			flex: 1;
 			display: block;
 			overflow: hidden;
 			text-overflow: ellipsis;
@@ -104,10 +104,13 @@ export default defineComponent({
 			}
 		}
 		.sh-card-head-extra {
-			@include layoutFlex;
-			flex: 0;
 			display: inline-flex;
+			align-items: center;
+			flex-wrap: nowrap;
+			overflow: hidden;
+			text-overflow: ellipsis;
 			white-space: nowrap;
+			margin-left: auto;
 		}
 	}
 	.sh-card-body {

package/packages/components/sh-date/index.vue

@@ -111,23 +111,24 @@ export default defineComponent({
 		const inputValue = ref(props.modelValue)
 		const rangeValue = ref(Array.isArray(props.modelValue) ? props.modelValue : [])
 
+		const vmConfig = computed(() => ({ size: props.size }))
 		const inputConfig = computed(() => {
 			let defaultProps = {}
 			let vxeProps = $vUtils.omit(props, (val, key) => {
 				return omitProps.includes(key) || $vUtils.isNone(val)
 			})
 			let shProps = {}
-			return Object.assign(defaultProps, vxeProps, shProps)
+			return Object.assign(defaultProps, vxeProps, shProps, vmConfig)
 		})
 		const pulldownConfig = computed(() => {
-			return Object.assign({ transfer: true }, props.pulldown)
+			return Object.assign({ transfer: true }, props.pulldown, vmConfig)
 		})
 		const calendarFormat = computed(() => {
 			if (props.type === 'month') return 'yyyy-MM'
 			else if (props.type === 'year') return 'yyyy'
 			return props.format || 'yyyy-MM-dd'
 		})
-		const rangeInputConfig = computed(() => ({ type: 'text', readonly: true }))
+		const rangeInputConfig = computed(() => ({ type: 'text', readonly: true, ...vmConfig }))
 		const startInputConfig = computed(() => {
 			let startValue = rangeValue.value[0] || ''
 			let startLabel = $vUtils.toDateString(startValue, calendarFormat.value)

package/packages/components/sh-row/css/index.scss

@@ -14,7 +14,7 @@ $uiprefix: sh;
   }
 }
 
-@each $prefix, $value in (start, flex-start), (center, center), (end, flex-end), (around, space-around), (between, space-between) {
+@each $prefix, $value in (start, flex-start), (center, center), (end, flex-end), (around, space-around), (between, space-between), (stretch, stretch) {
   .#{$uiprefix}-row-justify-#{$prefix} {
     justify-content: $value;
   }

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

@@ -39,7 +39,7 @@
 					<vxe-toolbar ref="toolbarRef" v-bind="tableToolbarConfig">
 						<template #buttons>
 							<div v-if="tableGlobalConfig.title" class="sh-table-toolbar-item">
-								<h3 class="tableName">{{ tableGlobalConfig.tableName }}</h3>
+								<h3 class="tableName">{{ tableName }}</h3>
 							</div>
 							<!--ps:全表搜索不支持反转-->
 							<div v-if="tableGlobalConfig.globalFilter" class="sh-table-toolbar-item">

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

@@ -17,7 +17,6 @@ let omitProps = [
 	'onPrintMethod'
 ]
 const globalConfigDefault = {
-	tableName: '',
 	title: false, // 是否显示 tableName
 	selectType: '', // 是否选择框 空 radio checkbox
 	seq: false, // 是否展示序号列
@@ -137,7 +136,7 @@ export default function (props, context, proxy, isGrid) {
 	const tableExportConfig = computed(() =>
 		Object.assign(
 			{
-				filename: tableGlobalConfig.value.tableName,
+				filename: props.tableName,
 				sheetName: 'sheet1',
 				type: 'xlsx',
 				types: ['xlsx', 'csv', 'pdf', 'html', 'xml', 'txt'],
@@ -150,8 +149,8 @@ export default function (props, context, proxy, isGrid) {
 	const tablePrintConfig = computed(() =>
 		Object.assign(
 			{
-				filename: tableGlobalConfig.value.tableName,
-				sheetName: tableGlobalConfig.value.tableName,
+				filename: props.tableName,
+				sheetName: props.tableName,
 				beforePrintMethod: obj => getExportPrintDataByOption(obj, 'print')
 			},
 			exportAndPrintDefault,
@@ -223,7 +222,7 @@ export default function (props, context, proxy, isGrid) {
 		const globalTool = globalFg.title || globalFg.globalFilter
 		const toolbarTool = toolbarFg.import || toolbarFg.export || toolbarFg.print || toolbarFg.refresh || toolbarFg.custom
 		const slotsTool = slots.toolbar || slots.toolbarLeft || slots.toolbarRight
-		return globalTool || toolbarTool || slotsTool || toolsFg.length > 0
+		return globalTool || toolbarTool || slotsTool || toolsFg.length > 0 || tableMoneyConfig.value.enabled
 	})
 
 	// 获取选中数据

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

@@ -14,7 +14,7 @@
 				<vxe-toolbar ref="toolbarRef" v-bind="tableToolbarConfig">
 					<template #buttons>
 						<div v-if="tableGlobalConfig.title" class="sh-table-toolbar-item">
-							<h3 class="tableName">{{ tableGlobalConfig.tableName }}</h3>
+							<h3 class="tableName">{{ tableName }}</h3>
 						</div>
 						<!--ps:全表搜索不支持反转-->
 						<div v-if="tableGlobalConfig.globalFilter" class="sh-table-toolbar-item">