sh-view 2.9.17 → 2.9.19

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "sh-view",
-	"version": "2.9.17",
+	"version": "2.9.19",
 	"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-table/js/useTable.js

@@ -118,7 +118,7 @@ export default function (props, context, proxy, isGrid) {
 	const tableColumnObjConfig = computed(() => Object.assign({}, columnObjDefault, props.columnObj))
 	const tableColumnConfig = computed(() => Object.assign({ isHover: true, resizable: true }, props.columnConfig))
 	const tablePagerConfig = computed(() =>
-		Object.assign({ enabled: Boolean(props.pagerConfig), total: 0, className: 'sh-table-footer', slots: { left: 'pagerLeft', right: 'pagerRight' } }, props.pagerConfig)
+		Object.assign({ enabled: Boolean(props.pagerConfig), total: 0, className: 'sh-table-footer', slots: { left: 'pagerLeft', right: 'pagerRight' } }, props.pagerConfig, tableVmConfig.value)
 	)
 	const tableCheckboxConfig = computed(() => {
 		return Object.assign({ range: !hasTree.value }, props.checkboxConfig)

package/packages/css/animated.scss

@@ -1,33 +1,4 @@
 /* 设置持续时间和动画函数 */
-.sh-pop-in-enter-active,
-.sh-pop-in-leave-active,
-.sh-pop-out-enter-active,
-.sh-pop-out-leave-active,{
-	will-change: transform;
-	transform-origin: center;
-	transition: all 0.1s;
-	backface-visibility: hidden;
-	perspective: 1000px;
-	width: 100%;
-	height: 100%;
-	position: absolute;
-}
-.sh-pop-in-enter-from, .sh-pop-out-leave-to {
-	transform: translateX(50%);
-	opacity: 0;
-}
-.sh-pop-in-enter-to {
-	transform: translateX(0);
-	opacity: 1;
-}
-.sh-pop-out-enter-from, .sh-pop-in-leave-to {
-	transform: translateX(-50%);
-	opacity: 0;
-}
-.sh-pop-out-enter-to {
-	transform: translateX(0);
-	opacity: 1;
-}
 $animation-time: .3s;
 $animation-time-quick: .15s;
 $transition-time: .2s;

package/packages/vxeTable/index.js

@@ -257,6 +257,7 @@ const index = {
 		Vue.config.globalProperties.$vModal = VXEUI.modal
 		Vue.config.globalProperties.$vUi = VXEUI
 		Vue.config.globalProperties.$vTable = VXETable
+		Vue.config.globalProperties.$vUiSetup = vuiOption
 		Vue.config.globalProperties.$vTableSetup = vtableOption
 		Vue.config.globalProperties.$vxePluginNames = publicRendersNames
 	}