sh-view 2.6.3 → 2.6.4

package/package.json

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

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

@@ -204,7 +204,7 @@ export default function (props, context, proxy, isGrid) {
 				let cellValue = $vUtils.get(row, property)
 				if (!$vUtils.isNone(cellValue)) {
 					let { rvalue, rtext } = $vUtils.formatRender(cellValue, property, row, rname, rprops, proxy)
-					$vUtils.set(row, property, visible || ['$vMoney'].includes(rname) ? rtext : rvalue)
+					$vUtils.set(row, property, visible ? rtext : rvalue)
 				}
 				if (deleteXid) delete row._XID
 			})
@@ -302,11 +302,17 @@ export default function (props, context, proxy, isGrid) {
 	// 只对 edit-config 配置时有效，单元格编辑状态下被关闭时会触发该事件
 	const onEditClosed = params => {
 		// 此操作火狐浏览器（bug(vxe):编辑后不触发渲染器的blur问题）
-		let { row, column } = params
-		let editModel = $vUtils.get(column, 'params.__RowEditModelValue')
-		if (editModel !== undefined) {
-			$vUtils.set(row, column.property, editModel)
-			delete column.params.__RowEditModelValue
+		const userAgent = navigator.userAgent
+		if (userAgent.indexOf('Firefox') !== -1) {
+			let { row, column } = params
+			let editModel = $vUtils.get(column, 'params.__RowEditModelValue')
+			if (editModel !== undefined) {
+				if (['$vMoney'].includes(column.rname) && !$vUtils.isNone(editModel)) editModel = $vUtils.multiply(editModel, column.rprops.moneyUnit || 1)
+				let { rvalue, rtext } = $vUtils.formatRender(editModel, column.property, row, column.rname, column.rprops, proxy, true)
+				editModel = rvalue
+				$vUtils.set(row, column.property, editModel)
+				delete column.params.__RowEditModelValue
+			}
 		}
 		emit('edit-closed', params)
 	}

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

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