sh-view 2.9.8 → 2.9.10

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

@@ -6,33 +6,42 @@ export default function (props, context, proxy) {
 	const renderValue = ref(null)
 	const renderText = ref('')
 
-	const rsize = computed(() => props.rprops.size || props.rparams.$table?.props?.size || props.rparams.$form?.props?.size)
-	const rform = computed(() => !!props.rparams.$form)
-	const reditmode = computed(() => props.rparams.$table?.props?.editConfig?.mode)
-	const isEditAll = computed(() => {
-		return props.rparams.$table?.props?.editConfig?.enabled && reditmode.value === 'all' && props.rparams.column.editRender
+	const mprops = computed(() => {
+		let { $grid, $table } = props.rparams
+		const contextAttrs = $grid?.context.attrs || $table?.context.attrs || {}
+		return contextAttrs.moneyConfig || {}
 	})
+
+	const rform = computed(() => !!props.rparams.$form)
+	const rkey = computed(() => (rform.value ? props.rparams.property : props.rparams.column.property))
+	const rname = computed(() => props.roptions.name)
+	const rprops = computed(() => Object.assign({}, props.roptions.props, mprops.value))
+	const rdata = computed(() => (rform.value ? props.rparams.data : props.rparams.row))
+	const rsize = computed(() => rprops.value.size || (rform.value ? props.rparams.$form.props.size : props.rparams.$table.props.size))
+
+	const reditmode = computed(() => props.rparams.$table.props.editConfig.mode)
+	const isEditAll = computed(() => props.rparams.$table.props.editConfig.enabled && reditmode.value === 'all' && props.rparams.column.editRender)
 	const billGroups = computed(() => {
-		let { billStart = '分', billEnd = '亿' } = props.rprops
+		let { billStart = '分', billEnd = '亿' } = rprops.value
 		let startIndex = $vTableSetup.cnGroups.findIndex(cn => cn.fullText === billEnd)
 		let endIndex = $vTableSetup.cnGroups.findIndex(cn => cn.fullText === billStart)
 		return $vTableSetup.cnGroups.slice(startIndex, endIndex + 1)
 	})
 	const psButtonConfig = computed(() => {
-		return { disabled: props.rprops.disabled, size: props.rsize, status: 'primary' }
+		return { disabled: rprops.value.disabled, size: rsize.value, status: 'primary' }
 	})
-	const prefixButton = computed(() => props.rprops.prefixType?.toLowerCase() === 'button')
-	const suffixButton = computed(() => props.rprops.suffixType?.toLowerCase() === 'button')
+	const prefixButton = computed(() => String(rprops.value.prefixType).toLowerCase() === 'button')
+	const suffixButton = computed(() => String(rprops.value.suffixType).toLowerCase() === 'button')
 
 	// 初始化数据
 	const initData = () => {
-		let keyValue = $vUtils.get(props.rdata, props.rkey)
+		let keyValue = $vUtils.get(rdata.value, rkey.value)
 		formatValueFun(keyValue)
 	}
 
 	// 输入框前缀点击事件
 	const vxeInputPrefixClick = () => {
-		if (props.rprops.disabled) return
+		if (rprops.value.disabled) return
 		if (rform.value) {
 			let { $form } = props.rparams
 			$form.context.emit('prefix-click', props.rparams)
@@ -40,7 +49,7 @@ export default function (props, context, proxy) {
 	}
 	// 输入框后缀点击事件
 	const vxeInputSuffixClick = () => {
-		if (props.rprops.disabled) return
+		if (rprops.value.disabled) return
 		if (rform.value) {
 			let { $form } = props.rparams
 			$form.context.emit('suffix-click', props.rparams)
@@ -65,48 +74,29 @@ export default function (props, context, proxy) {
 		setRenderValue(value)
 	}
 	// 回调赋值
-	const setRenderValue = (value, isCall) => {
-		let cellValue = value || renderValue.value
-		if (!isCall) {
-			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
-		}
-		$vUtils.set(props.rdata, props.rkey, cellValue)
+	const setRenderValue = value => {
+		let cellValue = !$vUtils.isNone(value) ? value : renderValue.value
+		let { rvalue, rtext } = $vUtils.formatRender(cellValue, rkey.value, rdata.value, rname.value, rprops.value, proxy, true)
+		$vUtils.set(rdata.value, rkey.value, rvalue)
+		renderValue.value = rvalue
+		renderText.value = rtext
 		if (rform.value) {
 			let { $form } = props.rparams
 			$form.context.emit('edit-closed', props.rparams)
 		}
 	}
 	// 格式化值formatValue
-	const formatValueFun = (value, editable) => {
+	const formatValueFun = value => {
+		let cellValue = value
+		let cellProps = rprops.value
 		if (props.rparams.type === 'footer') {
 			const { items, itemIndex } = props.rparams
-			const { moneyUnit, digits, type, commafy } = props.rprops
-			let footerText = items[itemIndex]
-			if (props.rname === '$vMoney') footerText = $vUtils.truncate($vUtils.divide(items[itemIndex], moneyUnit), digits)
-			else if (!$vUtils.isNone(footerText) && ['integer'].includes(type)) footerText = $vUtils.toInteger(footerText)
-			else if (!$vUtils.isNone(footerText) && ['number', 'float'].includes(type)) footerText = $vUtils.truncate(footerText, digits)
-			if (!$vUtils.isNone(footerText) && commafy) footerText = $vUtils.commafy(footerText, { digits })
-			renderValue.value = items[itemIndex]
-			renderText.value = footerText
-			return
-		}
-		const { rvalue, rtext } = $vUtils.formatRender(value, props.rkey, props.rdata, props.rname, props.rprops, proxy, editable)
-		if (props.rname === '$vMoney' && !props.rprops.bill && props.rprops.bill !== '0') {
-			renderValue.value = rtext
-		} else {
-			renderValue.value = rvalue
+			cellValue = items[itemIndex]
+			cellProps = Object.assign({}, rprops.value, { formula: null, formulaMap: null })
 		}
-		if (props.rname === '$vTime' && props.rprops.range && Array.isArray(rtext) && rtext.length > 0) {
-			renderText.value = `${rtext[0] || ''}${props.rprops.separator}${rtext[1] || ''}`
-		} else {
-			renderText.value = rtext
-		}
-		return { rvalue, rtext }
+		const { rvalue, rtext } = $vUtils.formatRender(cellValue, rkey.value, rdata.value, rname.value, cellProps, proxy, false)
+		renderValue.value = rvalue
+		renderText.value = rtext
 	}
 	const getBillClass = bil => {
 		return { basic: bil.fullText === '元', commafy: ['千', '百万', '十亿', '兆'].includes(bil.fullText) }
@@ -120,27 +110,31 @@ export default function (props, context, proxy) {
 	}
 
 	watch(
-		() => props.rdata,
+		() => rdata.value,
 		() => {
-			let keyValue = $vUtils.get(props.rdata, props.rkey)
-			let keyFormula = $vUtils.get(props.rprops, 'formula')
-			if (keyValue && $vUtils.isEqual(keyValue, renderValue.value) && !keyFormula) return
 			initData()
 		},
 		{ deep: true, immediate: true }
 	)
 	watch(
-		() => props.rprops,
-		() => {
-			initData()
+		() => mprops.value.moneyUnit,
+		(nv, ov) => {
+			if (['$vMoney'].includes(rname.value) && !$vUtils.isEqual(nv, ov)) {
+				initData()
+			}
 		}
 	)
 
 	return {
 		renderValue,
 		renderText,
-		rsize,
 		rform,
+		rkey,
+		rname,
+		rprops,
+		rdata,
+		rsize,
+		mprops,
 		isEditAll,
 		billGroups,
 		psButtonConfig,

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

@@ -1,20 +1,12 @@
 export default {
 	redit: { type: Boolean },
-	rkey: { type: String },
-	rname: { type: String },
-	rdata: {
-		type: Object,
-		default() {
-			return {}
-		}
-	},
-	rprops: {
+	rparams: {
 		type: Object,
 		default() {
 			return {}
 		}
 	},
-	rparams: {
+	roptions: {
 		type: Object,
 		default() {
 			return {}

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

@@ -5,6 +5,8 @@ export default function (props, context, proxy, initRenderData) {
 
 	let renderOption = ref({})
 
+	const rprops = computed(() => Object.assign({}, props.roptions.props))
+
 	// 初始化
 	const initData = () => {
 		const { column, $panel } = props.rparams
@@ -38,6 +40,7 @@ export default function (props, context, proxy, initRenderData) {
 	)
 
 	return {
+		rprops,
 		renderOption,
 		vxeFilterChange,
 		vxeFilterConfirm,