sh-view 2.8.7 → 2.8.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sh-view",
-  "version": "2.8.7",
+  "version": "2.8.9",
   "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-image/index.vue

@@ -127,7 +127,6 @@ export default defineComponent({
 	&-img {
 		width: 100%;
 		height: 100%;
-		vertical-align: middle;
 	}
 }
 </style>

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

@@ -57,16 +57,16 @@
 						<div v-if="slots.toolbarRight" class="sh-table-toolbar-item">
 							<slot name="toolbarRight"></slot>
 						</div>
-						<div v-if="tableMoneyConfig.enabled" class="sh-table-toolbar-item">单位：<sh-select v-model="tableMoneyUnit" v-bind="tableMoneyConfig" /></div>
-						<div v-if="tableGlobalConfig.zoom" class="sh-table-toolbar-item">
-							<vxe-button v-if="!tableIsFullscreen" v-ripple :size="size" icon="vxe-icon-zoom-out" @click="handleTableZoomBtn(true)">全屏</vxe-button>
-							<vxe-button v-else v-ripple :size="size" icon="vxe-icon-zoom-in" @click="handleTableZoomBtn(false)">退出全屏</vxe-button>
-						</div>
 						<template v-for="(tool, toolIndex) in tableTools" :key="toolIndex">
 							<div class="sh-table-toolbar-item">
 								<vxe-button v-ripple :size="size" v-bind="tool" @click="handleTableTool(tool)"></vxe-button>
 							</div>
 						</template>
+						<div v-if="tableMoneyConfig.enabled" class="sh-table-toolbar-item">单位：<sh-select v-model="tableMoneyUnit" v-bind="tableMoneyConfig" /></div>
+						<div v-if="tableGlobalConfig.zoom" class="sh-table-toolbar-item">
+							<vxe-button v-if="!tableIsFullscreen" v-ripple :size="size" icon="vxe-icon-zoom-out" @click="handleTableZoomBtn(true)">全屏</vxe-button>
+							<vxe-button v-else v-ripple :size="size" icon="vxe-icon-zoom-in" @click="handleTableZoomBtn(false)">退出全屏</vxe-button>
+						</div>
 					</div>
 				</div>
 			</template>

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

@@ -122,7 +122,7 @@ export default function (props, context, proxy, isGrid) {
 		}
 	})
 	const tableMoneyConfig = computed(() => {
-		return Object.assign({ enabled: true, options: $vTableSetup.moneyUnitConstants, style: { width: '60px' } }, props.moneyConfig, tableVmConfig.value)
+		return Object.assign({ style: { width: '60px' } }, $vTableSetup.moneyConfig, props.moneyConfig, tableVmConfig.value)
 	})
 	const tableExportConfig = computed(() =>
 		Object.assign(
@@ -259,6 +259,17 @@ export default function (props, context, proxy, isGrid) {
 		else if (tableGlobalConfig.value.selectType === 'checkbox' && checkRecords) selections = checkRecords
 		selectionRows.value = selections
 	}
+	const updateExpended = () => {
+		if (tableRef.value && tableTreeConfig.value.expandAll) {
+			setTimeout(() => {
+				tableRef.value.setAllTreeExpand(true)
+			})
+		} else if (tableRef.value && props.expandConfig && props.expandConfig.expandAll) {
+			setTimeout(() => {
+				tableRef.value.setAllRowExpand(true)
+			})
+		}
+	}
 
 	// -------- 表格
 	// 当前行变化
@@ -552,6 +563,7 @@ export default function (props, context, proxy, isGrid) {
 		() => props.dataSourse,
 		value => {
 			updateSelection([])
+			updateExpended()
 		},
 		{
 			immediate: true

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

@@ -31,12 +31,12 @@
 						<div v-if="slots.toolbarRight" class="sh-table-toolbar-item">
 							<slot name="toolbarRight"></slot>
 						</div>
-						<div v-if="tableMoneyConfig.enabled" @click.stop class="sh-table-toolbar-item">单位：<sh-select v-model="tableMoneyUnit" v-bind="tableMoneyConfig" /></div>
 						<template v-for="(tool, toolIndex) in tableTools" :key="toolIndex">
 							<div class="sh-table-toolbar-item">
 								<vxe-button v-ripple :size="size" v-bind="tool" @click="handleTableTool(tool)"></vxe-button>
 							</div>
 						</template>
+						<div v-if="tableMoneyConfig.enabled" @click.stop class="sh-table-toolbar-item">单位：<sh-select v-model="tableMoneyUnit" v-bind="tableMoneyConfig" /></div>
 					</div>
 				</div>
 			</slot>

package/packages/vxeTable/css/index.scss

@@ -84,7 +84,7 @@ button:focus, .vxe-button.type--button:not(.is--disabled):focus{
 
 // 下拉容器
 .vxe-pulldown--panel{
-    .vxe-pulldown--wrapper{
+    &-wrapper{
         box-shadow: 0 0 6px 2px rgba(0,0,0,0.1);
         padding: 0;
         border-radius: 4px;

package/packages/vxeTable/index.js

@@ -156,11 +156,14 @@ let vxeOptions = {
 		icon: 'vxe-icon-spinner roll',
 		text: '加载中...'
 	},
-	moneyUnitConstants: [
-		{ value: 1, label: '元', digits: 2 },
-		{ value: 1000, label: '千元', digits: 4 },
-		{ value: 10000, label: '万元', digits: 6 }
-	],
+	moneyConfig: {
+		enabled: false,
+		options: [
+			{ value: 1, label: '元', digits: 2 },
+			{ value: 1000, label: '千元', digits: 4 },
+			{ value: 10000, label: '万元', digits: 6 }
+		]
+	},
 	cnGroups: [
 		{ shortText: '兆', fullText: '兆', value: '' },
 		{ shortText: '千', fullText: '千亿', value: '' },

package/packages/vxeTable/render/globalRenders.jsx

@@ -504,7 +504,7 @@ const filterRenders = {
 				case 'has':
 					return String(rtext).indexOf(valueSt) > -1
 				case 'eq':
-					return utils.isEqual(rvalue, valueSt)
+					return utils.isEqual(String(rvalue), valueSt)
 				case 'gt':
 					return isDate ? utils.getDateDiff(valueSt, rvalue).done : Number(rvalue) > Number(valueSt)
 				case 'lt':