sh-view 2.5.8 → 2.6.0

package/package.json

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

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

@@ -3,8 +3,8 @@
 		<div v-if="isicon || slots.icon" class="sh-result-icon" :class="resultType">
 			<slot name="icon"><sh-icon :type="resultIcon" :size="iconSize" /></slot>
 		</div>
-		<div v-if="resultTitle || slots.title" class="sh-result-title" :title="resultTitle">
-			<slot name="title">{{ resultTitle }}</slot>
+		<div v-if="title || slots.title" class="sh-result-title" :title="title">
+			<slot name="title">{{ title }}</slot>
 		</div>
 		<div v-if="text || slots.text" v-line-clamp="clamp" class="sh-result-text" :title="text">
 			<slot name="text">{{ text }}</slot>
@@ -35,8 +35,7 @@ export default defineComponent({
 			default: 50
 		},
 		title: {
-			type: [Boolean, String],
-			default: true
+			type: String
 		},
 		text: {
 			type: String,
@@ -66,9 +65,6 @@ export default defineComponent({
 		const resultType = computed(() => {
 			return types.includes(props.type) ? props.type : 'info'
 		})
-		const resultTitle = computed(() => {
-			return props.title ? props.title || resultTitleMap[resultType.value] : false
-		})
 		const resultIcon = computed(() => {
 			return resultIconMap[resultType.value]
 		})
@@ -76,7 +72,6 @@ export default defineComponent({
 		return {
 			slots,
 			resultType,
-			resultTitle,
 			resultIcon
 		}
 	}

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

@@ -153,7 +153,8 @@ export default function (props, context, proxy, isGrid) {
 	}
 	// 获取全部数据
 	// visible为true获取视图数据
-	const getFullData = ({ visible }) => {
+	const getFullData = params => {
+		const { visible = false, deleteXid = false } = params || {}
 		let data = $vUtils.clone(tableRef.value.getTableData().fullData, true)
 		const columns = tableRef.value.getColumns()
 		let rnameColumns = columns.filter(col => col.rname)
@@ -165,6 +166,7 @@ export default function (props, context, proxy, isGrid) {
 					let { rvalue, rtext } = $vUtils.formatRender(cellValue, property, row, rname, rprops, proxy)
 					$vUtils.set(row, property, visible || ['$vMoney'].includes(rname) ? rtext : rvalue)
 				}
+				if (deleteXid) delete row._XID
 			})
 		})
 		return data
@@ -479,7 +481,7 @@ export default function (props, context, proxy, isGrid) {
 		}
 		let { row: newRow } = await tableRef.value.insertAt(addRows, index)
 		await tableRef.value.setActiveRow(newRow)
-		if (!isTool) emit('toolbaroption', 'add', newRow, tableRef.value)
+		if (isTool) emit('toolbaroption', 'add', newRow, tableRef.value)
 	}
 	// 删除行按钮
 	const handleTableDeleteRow = async (rows, isTool = false) => {
@@ -501,7 +503,7 @@ export default function (props, context, proxy, isGrid) {
 			let keyField = props.rowConfig.keyField || proxy.$vTableSetup.table.rowConfig.keyField
 			selectionRows.value = selectionRows.value.filter(sr => !deleteRows.find(dr => dr[keyField] === sr[keyField]))
 		}
-		if (!isTool) emit('toolbaroption', 'delete', deleteRows, tableRef.value)
+		if (isTool) emit('toolbaroption', 'delete', deleteRows, tableRef.value)
 	}
 
 	watch(

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

@@ -208,12 +208,9 @@ export default defineComponent({
 				})
 				searchData = $vUtils.searchTree(treeData.value, row => {
 					return searchProps.some(item => {
-						let cellValue = item.format ? $vUtils.format(item.format, row) : $vUtils.get(row, item.rkey)
-						if ($vxePluginNames.expendRenders && $vxePluginNames.expendRenders.includes(item.rname)) {
-							let { rtext } = $vUtils.formatRender(cellValue, item.rkey, row, item.rname, item.rprops, proxy)
-							return String(rtext).toLowerCase().indexOf(filterText) > -1
-						}
-						return $vUtils.trim(cellValue).toLowerCase().indexOf(filterText) > -1
+						let cellValue = $vUtils.get(row, item.rkey)
+						let { rtext } = $vUtils.formatRender(cellValue, item.rkey, row, item.rname, item.rprops, proxy)
+						return $vUtils.trim(rtext).toLowerCase().indexOf(filterText) > -1
 					})
 				})
 			}

package/packages/components/global-components/sh-water-mark/index.vue

@@ -16,7 +16,7 @@ export default defineComponent({
 		},
 		color: {
 			type: String,
-			default: '#666'
+			default: 'rgba(0,0,0,0.4)'
 		},
 		rotate: {
 			type: Number,

package/packages/vxeTable/render/mixin/cell-hooks.js

@@ -102,7 +102,7 @@ export default function (props, context, proxy) {
 	const setRenderValue = (value, isCall) => {
 		let cellValue = value || renderValue.value
 		if (!isCall) {
-			if (['$vMoney'].includes(props.rname) && cellValue !== '') cellValue = $vUtils.multiply(cellValue, props.rprops.moneyUnit || 1)
+			if (['$vMoney'].includes(props.rname) && !$vUtils.isNone(cellValue)) cellValue = $vUtils.multiply(cellValue, props.rprops.moneyUnit || 1)
 			let { rvalue, rtext } = formatValueFun(cellValue, true)
 			cellValue = rvalue
 		}