sh-view 2.9.8 → 2.9.10

package/packages/vxeTable/render/globalRenders.jsx

@@ -31,190 +31,105 @@ import vxeFooterMoney from './footer/vxe-footer-money.vue'
 import vxeFilterInput from './filters/vxe-filter-input.vue'
 import vxeFilterComplex from './filters/vxe-filter-complex.vue'
 
-// 渲染器通用默认配置
-let defaultPublicProps = {
-	// 转视图字段扩展名字
-	colExpendName: '_view'
-}
-
-// 渲染器个性化默认配置
-let defaultProps = {
-	$vInput: { type: 'text', placeholder: '请输入', transfer: true, digits: 2, prefixType: 'text', suffixType: 'text' },
-	$vTextArea: { placeholder: '请输入', rows: 2, transfer: true, resize: 'none', showWordCount: true },
-	$vSelect: { placeholder: '请选择', filterable: true, transfer: true, showType: 'text', tagColor: 'default', split: ',', options: [] },
-	$vTree: { placeholder: '请选择', transfer: true, split: ',', nodeKey: 'id', labelField: 'label' },
-	$vTime: { type: 'date', placeholder: '请选择时间', transfer: true, editable: false, prefixType: 'text', suffixType: 'text', separator: '至' },
-	$vProgress: { strokeWidth: 20, strokeColor: ['#108ee9', '#87d068'], textInside: true, min: 0, max: 100, digits: 2 },
-	$vSwitch: { placeholder: '请选择', openLabel: '是', openValue: '1', closeLabel: '否', closeValue: '0' },
-	$vMoney: { type: 'number', placeholder: '请输入', transfer: true, commafy: true, digits: 2, moneyUnit: 1, min: 0, max: 1000000000000 },
-	$vCheckbox: { placeholder: '请选择', uncheckedValue: '0', checkedValue: '1' },
-	$vCheckgroup: { placeholder: '请选择', showType: 'text', tagColor: 'default', tagType: '', split: ',' },
-	$vRadio: { placeholder: '请选择' },
-	$vRadiogroup: { placeholder: '请选择', showType: 'text', tagColor: 'default', tagType: '' },
-	$vImg: { square: false, preview: true, width: '100%', height: '34px', fit: 'scale-down' },
-	$vHref: { disabled: true, target: '_blank' },
-	$vUpload: { split: ',' },
-	$vFilterInput: { placeholder: '请输入关键词' },
-	$vFilterTime: { range: true },
-	$vTable: { size: 'mini' },
-	$vCode: { placeholder: '请输入', border: true, height: '100px' },
-	$vGlobalOption: { type: 'text' }
-}
-
-// 统一处理传参boolean与配置String问题
-const getFixedProp = (renderOpts, params) => {
-	let { name, props = {} } = renderOpts
-	let { column, $grid, $table } = params
-	let rturnProps = Object.assign({}, defaultPublicProps, defaultProps[name], props)
-	let transKeys = ['transfer', 'disabled', 'multiple', 'isLeaf', 'commafy', 'border', 'filterable', 'showWordCount', 'editable']
-	transKeys.forEach(key => {
-		if (rturnProps[key] !== null && rturnProps[key] !== undefined && typeof rturnProps[key] === 'string') {
-			rturnProps[key] = Boolean(+rturnProps[key])
-		}
-	})
-	const contextAttrs = $grid?.context?.attrs || $table?.context?.attrs || {}
-	if (['$vMoney'].includes(name) && contextAttrs.moneyConfig?.enabled && contextAttrs.moneyUnit) {
-		let moneyOption = contextAttrs.moneyConfig?.options.find(item => item.value === contextAttrs.moneyUnit)
-		rturnProps.moneyUnit = contextAttrs.moneyUnit
-		rturnProps.moneyOption = moneyOption
-		if (moneyOption && moneyOption.digits) rturnProps.digits = moneyOption.digits
-	}
-	rturnProps.formulaMap = contextAttrs.formulaMap
-	if (column) {
-		column.rname = name
-		column.rprops = rturnProps
-	}
-	return {
-		rkey: $table ? column.property : params.property,
-		rdata: $table ? params.row : params.data,
-		rprops: rturnProps
-	}
-}
-
 // 全局渲染器
 const publicRenders = {
 	$vInput: {
 		autofocus: '.td-render .vxe-input--inner',
 		autoselect: true,
 		renderDefault(renderOpts, params) {
-			let props = getFixedProp(renderOpts, params)
-			return [<vxeRenderInput redit={false} rparams={params} rname={renderOpts.name} rprops={props.rprops} rkey={props.rkey} rdata={props.rdata} />]
+			return [<vxeRenderInput rparams={params} roptions={renderOpts} />]
 		},
 		renderCell(renderOpts, params) {
-			let props = getFixedProp(renderOpts, params)
-			return [<vxeRenderInput redit={false} rparams={params} rname={renderOpts.name} rprops={props.rprops} rkey={props.rkey} rdata={props.rdata} />]
+			return [<vxeRenderInput rparams={params} roptions={renderOpts} />]
 		},
 		renderEdit(renderOpts, params) {
-			let props = getFixedProp(renderOpts, params)
-			return [<vxeRenderInput redit={true} rparams={params} rname={renderOpts.name} rprops={props.rprops} rkey={props.rkey} rdata={props.rdata} />]
+			return [<vxeRenderInput rparams={params} roptions={renderOpts} redit />]
 		},
 		renderItemContent(renderOpts, params) {
-			let props = getFixedProp(renderOpts, params)
-			return [<vxeRenderInput redit={true} rparams={params} rname={renderOpts.name} rprops={props.rprops} rkey={props.rkey} rdata={props.rdata} />]
+			return [<vxeRenderInput rparams={params} roptions={renderOpts} redit />]
 		},
 		renderFooter(renderOpts, params) {
-			let props = getFixedProp(renderOpts, params)
-			return [<vxeFooterInput rparams={params} rname={renderOpts.name} rprops={props.rprops} rkey={props.rkey} />]
+			return [<vxeFooterInput rparams={params} roptions={renderOpts} />]
 		}
 	},
 	$vTextArea: {
 		autofocus: '.td-render .vxe-textarea--inner',
 		autoselect: true,
 		renderDefault(renderOpts, params) {
-			let props = getFixedProp(renderOpts, params)
-			return [<vxeRenderTextarea redit={false} rparams={params} rname={renderOpts.name} rprops={props.rprops} rkey={props.rkey} rdata={props.rdata} />]
+			return [<vxeRenderTextarea rparams={params} roptions={renderOpts} />]
 		},
 		renderCell(renderOpts, params) {
-			let props = getFixedProp(renderOpts, params)
-			return [<vxeRenderTextarea redit={false} rparams={params} rname={renderOpts.name} rprops={props.rprops} rkey={props.rkey} rdata={props.rdata} />]
+			return [<vxeRenderTextarea rparams={params} roptions={renderOpts} />]
 		},
 		renderEdit(renderOpts, params) {
-			let props = getFixedProp(renderOpts, params)
-			return [<vxeRenderTextarea redit={true} rparams={params} rname={renderOpts.name} rprops={props.rprops} rkey={props.rkey} rdata={props.rdata} />]
+			return [<vxeRenderTextarea rparams={params} roptions={renderOpts} redit />]
 		},
 		renderItemContent(renderOpts, params) {
-			let props = getFixedProp(renderOpts, params)
-			return [<vxeRenderTextarea redit={true} rparams={params} rname={renderOpts.name} rprops={props.rprops} rkey={props.rkey} rdata={props.rdata} />]
+			return [<vxeRenderTextarea rparams={params} roptions={renderOpts} redit />]
 		}
 	},
 	$vSelect: {
 		autofocus: '.td-render .vxe-input--inner',
 		autoselect: true,
 		renderDefault(renderOpts, params) {
-			let props = getFixedProp(renderOpts, params)
-			return [<vxeRenderSelect redit={false} rparams={params} rname={renderOpts.name} rprops={props.rprops} rkey={props.rkey} rdata={props.rdata} />]
+			return [<vxeRenderSelect rparams={params} roptions={renderOpts} />]
 		},
 		renderCell(renderOpts, params) {
-			let props = getFixedProp(renderOpts, params)
-			return [<vxeRenderSelect redit={false} rparams={params} rname={renderOpts.name} rprops={props.rprops} rkey={props.rkey} rdata={props.rdata} />]
+			return [<vxeRenderSelect rparams={params} roptions={renderOpts} />]
 		},
 		renderEdit(renderOpts, params) {
-			let props = getFixedProp(renderOpts, params)
-			return [<vxeRenderSelect redit={true} rparams={params} rname={renderOpts.name} rprops={props.rprops} rkey={props.rkey} rdata={props.rdata} />]
+			return [<vxeRenderSelect rparams={params} roptions={renderOpts} redit />]
 		},
 		renderItemContent(renderOpts, params) {
-			let props = getFixedProp(renderOpts, params)
-			return [<vxeRenderSelect redit={true} rparams={params} rname={renderOpts.name} rprops={props.rprops} rkey={props.rkey} rdata={props.rdata} />]
+			return [<vxeRenderSelect rparams={params} roptions={renderOpts} redit />]
 		}
 	},
 	$vTree: {
 		autofocus: '.td-render .vxe-input--inner',
 		autoselect: true,
 		renderDefault(renderOpts, params) {
-			let props = getFixedProp(renderOpts, params)
-			return [<vxeRenderTree redit={false} rparams={params} rname={renderOpts.name} rprops={props.rprops} rkey={props.rkey} rdata={props.rdata} />]
+			return [<vxeRenderTree rparams={params} roptions={renderOpts} />]
 		},
 		renderCell(renderOpts, params) {
-			let props = getFixedProp(renderOpts, params)
-			return [<vxeRenderTree redit={false} rparams={params} rname={renderOpts.name} rprops={props.rprops} rkey={props.rkey} rdata={props.rdata} />]
+			return [<vxeRenderTree rparams={params} roptions={renderOpts} />]
 		},
 		renderEdit(renderOpts, params) {
-			let props = getFixedProp(renderOpts, params)
-			return [<vxeRenderTree redit={true} rparams={params} rname={renderOpts.name} rprops={props.rprops} rkey={props.rkey} rdata={props.rdata} />]
+			return [<vxeRenderTree rparams={params} roptions={renderOpts} redit />]
 		},
 		renderItemContent(renderOpts, params) {
-			let props = getFixedProp(renderOpts, params)
-			return [<vxeRenderTree redit={true} rparams={params} rname={renderOpts.name} rprops={props.rprops} rkey={props.rkey} rdata={props.rdata} />]
+			return [<vxeRenderTree rparams={params} roptions={renderOpts} redit />]
 		}
 	},
 	$vTime: {
 		autofocus: '.td-render .vxe-input--inner',
 		autoselect: true,
 		renderDefault(renderOpts, params) {
-			let props = getFixedProp(renderOpts, params)
-			return [<vxeRenderTime redit={false} rparams={params} rname={renderOpts.name} rprops={props.rprops} rkey={props.rkey} rdata={props.rdata} />]
+			return [<vxeRenderTime rparams={params} roptions={renderOpts} />]
 		},
 		renderCell(renderOpts, params) {
-			let props = getFixedProp(renderOpts, params)
-			return [<vxeRenderTime redit={false} rparams={params} rname={renderOpts.name} rprops={props.rprops} rkey={props.rkey} rdata={props.rdata} />]
+			return [<vxeRenderTime rparams={params} roptions={renderOpts} />]
 		},
 		renderEdit(renderOpts, params) {
-			let props = getFixedProp(renderOpts, params)
-			return [<vxeRenderTime redit={true} rparams={params} rname={renderOpts.name} rprops={props.rprops} rkey={props.rkey} rdata={props.rdata} />]
+			return [<vxeRenderTime rparams={params} roptions={renderOpts} redit />]
 		},
 		renderItemContent(renderOpts, params) {
-			let props = getFixedProp(renderOpts, params)
-			return [<vxeRenderTime redit={true} rparams={params} rname={renderOpts.name} rprops={props.rprops} rkey={props.rkey} rdata={props.rdata} />]
+			return [<vxeRenderTime rparams={params} roptions={renderOpts} redit />]
 		}
 	},
 	$vProgress: {
 		autofocus: '.td-render .vxe-input--inner',
 		autoselect: true,
 		renderDefault(renderOpts, params) {
-			let props = getFixedProp(renderOpts, params)
-			return [<vxeRenderProgress redit={false} rparams={params} rname={renderOpts.name} rprops={props.rprops} rkey={props.rkey} rdata={props.rdata} />]
+			return [<vxeRenderProgress rparams={params} roptions={renderOpts} />]
 		},
 		renderCell(renderOpts, params) {
-			let props = getFixedProp(renderOpts, params)
-			return [<vxeRenderProgress redit={false} rparams={params} rname={renderOpts.name} rprops={props.rprops} rkey={props.rkey} rdata={props.rdata} />]
+			return [<vxeRenderProgress rparams={params} roptions={renderOpts} />]
 		},
 		renderEdit(renderOpts, params) {
-			let props = getFixedProp(renderOpts, params)
-			return [<vxeRenderProgress redit={true} rparams={params} rname={renderOpts.name} rprops={props.rprops} rkey={props.rkey} rdata={props.rdata} />]
+			return [<vxeRenderProgress rparams={params} roptions={renderOpts} redit />]
 		},
 		renderItemContent(renderOpts, params) {
-			let props = getFixedProp(renderOpts, params)
-			return [<vxeRenderProgress redit={true} rparams={params} rname={renderOpts.name} rprops={props.rprops} rkey={props.rkey} rdata={props.rdata} />]
+			return [<vxeRenderProgress rparams={params} roptions={renderOpts} redit />]
 		},
 		exportMethod({ row, column }) {
 			return utils.get(row, column.property)
@@ -223,48 +138,38 @@ const publicRenders = {
 	$vSwitch: {
 		autoselect: true,
 		renderDefault(renderOpts, params) {
-			let props = getFixedProp(renderOpts, params)
-			return [<vxeRenderSwitch redit={false} rparams={params} rname={renderOpts.name} rprops={props.rprops} rkey={props.rkey} rdata={props.rdata} />]
+			return [<vxeRenderSwitch rparams={params} roptions={renderOpts} />]
 		},
 		renderCell(renderOpts, params) {
-			let props = getFixedProp(renderOpts, params)
-			return [<vxeRenderSwitch redit={false} rparams={params} rname={renderOpts.name} rprops={props.rprops} rkey={props.rkey} rdata={props.rdata} />]
+			return [<vxeRenderSwitch rparams={params} roptions={renderOpts} />]
 		},
 		renderEdit(renderOpts, params) {
-			let props = getFixedProp(renderOpts, params)
-			return [<vxeRenderSwitch redit={true} rparams={params} rname={renderOpts.name} rprops={props.rprops} rkey={props.rkey} rdata={props.rdata} />]
+			return [<vxeRenderSwitch rparams={params} roptions={renderOpts} redit />]
 		},
 		renderItemContent(renderOpts, params) {
-			let props = getFixedProp(renderOpts, params)
-			return [<vxeRenderSwitch redit={true} rparams={params} rname={renderOpts.name} rprops={props.rprops} rkey={props.rkey} rdata={props.rdata} />]
+			return [<vxeRenderSwitch rparams={params} roptions={renderOpts} redit />]
 		}
 	},
 	$vMoney: {
 		autofocus: '.td-render .vxe-input--inner',
 		autoselect: true,
 		renderDefault(renderOpts, params) {
-			let props = getFixedProp(renderOpts, params)
-			return [<vxeRenderMoney redit={false} rparams={params} rname={renderOpts.name} rprops={props.rprops} rkey={props.rkey} rdata={props.rdata} />]
+			return [<vxeRenderMoney rparams={params} roptions={renderOpts} />]
 		},
 		renderCell(renderOpts, params) {
-			let props = getFixedProp(renderOpts, params)
-			return [<vxeRenderMoney redit={false} rparams={params} rname={renderOpts.name} rprops={props.rprops} rkey={props.rkey} rdata={props.rdata} />]
+			return [<vxeRenderMoney rparams={params} roptions={renderOpts} />]
 		},
 		renderEdit(renderOpts, params) {
-			let props = getFixedProp(renderOpts, params)
-			return [<vxeRenderMoney redit={true} rparams={params} rname={renderOpts.name} rprops={props.rprops} rkey={props.rkey} rdata={props.rdata} />]
+			return [<vxeRenderMoney rparams={params} roptions={renderOpts} redit />]
 		},
 		renderItemContent(renderOpts, params) {
-			let props = getFixedProp(renderOpts, params)
-			return [<vxeRenderMoney redit={true} rparams={params} rname={renderOpts.name} rprops={props.rprops} rkey={props.rkey} rdata={props.rdata} />]
+			return [<vxeRenderMoney rparams={params} roptions={renderOpts} redit />]
 		},
 		renderHeader(renderOpts, params) {
-			let props = getFixedProp(renderOpts, params)
-			return [<vxeHeaderMoney rparams={params} rname={renderOpts.name} rprops={props.rprops} rkey={props.rkey} />]
+			return [<vxeHeaderMoney rparams={params} roptions={renderOpts} />]
 		},
 		renderFooter(renderOpts, params) {
-			let props = getFixedProp(renderOpts, params)
-			return [<vxeFooterMoney rparams={params} rname={renderOpts.name} rprops={props.rprops} rkey={props.rkey} />]
+			return [<vxeFooterMoney rparams={params} roptions={renderOpts} />]
 		},
 		exportMethod({ row, column }) {
 			return utils.get(row, column.property)
@@ -273,101 +178,80 @@ const publicRenders = {
 	$vCheckbox: {
 		autoselect: true,
 		renderDefault(renderOpts, params) {
-			let props = getFixedProp(renderOpts, params)
-			return [<vxeRenderCheckbox redit={false} rparams={params} rname={renderOpts.name} rprops={props.rprops} rkey={props.rkey} rdata={props.rdata} />]
+			return [<vxeRenderCheckbox rparams={params} roptions={renderOpts} />]
 		},
 		renderCell(renderOpts, params) {
-			let props = getFixedProp(renderOpts, params)
-			return [<vxeRenderCheckbox redit={false} rparams={params} rname={renderOpts.name} rprops={props.rprops} rkey={props.rkey} rdata={props.rdata} />]
+			return [<vxeRenderCheckbox rparams={params} roptions={renderOpts} />]
 		},
 		renderEdit(renderOpts, params) {
-			let props = getFixedProp(renderOpts, params)
-			return [<vxeRenderCheckbox redit={true} rparams={params} rname={renderOpts.name} rprops={props.rprops} rkey={props.rkey} rdata={props.rdata} />]
+			return [<vxeRenderCheckbox rparams={params} roptions={renderOpts} redit />]
 		},
 		renderItemContent(renderOpts, params) {
-			let props = getFixedProp(renderOpts, params)
-			return [<vxeRenderCheckbox redit={true} rparams={params} rname={renderOpts.name} rprops={props.rprops} rkey={props.rkey} rdata={props.rdata} />]
+			return [<vxeRenderCheckbox rparams={params} roptions={renderOpts} redit />]
 		}
 	},
 	$vCheckgroup: {
 		autoselect: true,
 		renderDefault(renderOpts, params) {
-			let props = getFixedProp(renderOpts, params)
-			return [<vxeRenderCheckgroup redit={false} rparams={params} rname={renderOpts.name} rprops={props.rprops} rkey={props.rkey} rdata={props.rdata} />]
+			return [<vxeRenderCheckgroup rparams={params} roptions={renderOpts} />]
 		},
 		renderCell(renderOpts, params) {
-			let props = getFixedProp(renderOpts, params)
-			return [<vxeRenderCheckgroup redit={false} rparams={params} rname={renderOpts.name} rprops={props.rprops} rkey={props.rkey} rdata={props.rdata} />]
+			return [<vxeRenderCheckgroup rparams={params} roptions={renderOpts} />]
 		},
 		renderEdit(renderOpts, params) {
-			let props = getFixedProp(renderOpts, params)
-			return [<vxeRenderCheckgroup redit={true} rparams={params} rname={renderOpts.name} rprops={props.rprops} rkey={props.rkey} rdata={props.rdata} />]
+			return [<vxeRenderCheckgroup rparams={params} roptions={renderOpts} redit />]
 		},
 		renderItemContent(renderOpts, params) {
-			let props = getFixedProp(renderOpts, params)
-			return [<vxeRenderCheckgroup redit={true} rparams={params} rname={renderOpts.name} rprops={props.rprops} rkey={props.rkey} rdata={props.rdata} />]
+			return [<vxeRenderCheckgroup rparams={params} roptions={renderOpts} redit />]
 		}
 	},
 	$vRadio: {
 		autoselect: true,
 		renderDefault(renderOpts, params) {
-			let props = getFixedProp(renderOpts, params)
-			return [<vxeRenderRadio redit={false} rparams={params} rname={renderOpts.name} rprops={props.rprops} rkey={props.rkey} rdata={props.rdata} />]
+			return [<vxeRenderRadio rparams={params} roptions={renderOpts} />]
 		},
 		renderCell(renderOpts, params) {
-			let props = getFixedProp(renderOpts, params)
-			return [<vxeRenderRadio redit={false} rparams={params} rname={renderOpts.name} rprops={props.rprops} rkey={props.rkey} rdata={props.rdata} />]
+			return [<vxeRenderRadio rparams={params} roptions={renderOpts} />]
 		},
 		renderEdit(renderOpts, params) {
-			let props = getFixedProp(renderOpts, params)
-			return [<vxeRenderRadio redit={true} rparams={params} rname={renderOpts.name} rprops={props.rprops} rkey={props.rkey} rdata={props.rdata} />]
+			return [<vxeRenderRadio rparams={params} roptions={renderOpts} redit />]
 		},
 		renderItemContent(renderOpts, params) {
-			let props = getFixedProp(renderOpts, params)
-			return [<vxeRenderRadio redit={true} rparams={params} rname={renderOpts.name} rprops={props.rprops} rkey={props.rkey} rdata={props.rdata} />]
+			return [<vxeRenderRadio rparams={params} roptions={renderOpts} redit />]
 		}
 	},
 	$vRadiogroup: {
 		autoselect: true,
 		renderDefault(renderOpts, params) {
-			let props = getFixedProp(renderOpts, params)
-			return [<vxeRenderRadiogroup redit={false} rparams={params} rname={renderOpts.name} rprops={props.rprops} rkey={props.rkey} rdata={props.rdata} />]
+			return [<vxeRenderRadiogroup rparams={params} roptions={renderOpts} />]
 		},
 		renderCell(renderOpts, params) {
-			let props = getFixedProp(renderOpts, params)
-			return [<vxeRenderRadiogroup redit={false} rparams={params} rname={renderOpts.name} rprops={props.rprops} rkey={props.rkey} rdata={props.rdata} />]
+			return [<vxeRenderRadiogroup rparams={params} roptions={renderOpts} />]
 		},
 		renderEdit(renderOpts, params) {
-			let props = getFixedProp(renderOpts, params)
-			return [<vxeRenderRadiogroup redit={true} rparams={params} rname={renderOpts.name} rprops={props.rprops} rkey={props.rkey} rdata={props.rdata} />]
+			return [<vxeRenderRadiogroup rparams={params} roptions={renderOpts} redit />]
 		},
 		renderItemContent(renderOpts, params) {
-			let props = getFixedProp(renderOpts, params)
-			return [<vxeRenderRadiogroup redit={true} rparams={params} rname={renderOpts.name} rprops={props.rprops} rkey={props.rkey} rdata={props.rdata} />]
+			return [<vxeRenderRadiogroup rparams={params} roptions={renderOpts} redit />]
 		}
 	},
 	$vTable: {
 		renderExpand(renderOpts, params) {
-			let props = getFixedProp(renderOpts, params)
-			return [<vxeRenderTable redit={false} rparams={params} rname={renderOpts.name} rprops={props.rprops} rkey={props.rkey} rdata={props.rdata} />]
+			return [<vxeRenderTable rparams={params} roptions={renderOpts} />]
 		},
 		renderItemContent(renderOpts, params) {
-			let props = getFixedProp(renderOpts, params)
-			return [<vxeRenderTable redit={true} rparams={params} rname={renderOpts.name} rprops={props.rprops} rkey={props.rkey} rdata={props.rdata} />]
+			return [<vxeRenderTable rparams={params} roptions={renderOpts} redit />]
 		}
 	},
 	$vImg: {
 		renderDefault(renderOpts, params) {
-			let props = getFixedProp(renderOpts, params)
-			return [<vxeRenderImg redit={false} rparams={params} rname={renderOpts.name} rprops={props.rprops} rkey={props.rkey} rdata={props.rdata} />]
+			return [<vxeRenderImg rparams={params} roptions={renderOpts} />]
 		},
 		renderCell(renderOpts, params) {
-			let props = getFixedProp(renderOpts, params)
-			return [<vxeRenderImg redit={false} rparams={params} rname={renderOpts.name} rprops={props.rprops} rkey={props.rkey} rdata={props.rdata} />]
+			return [<vxeRenderImg rparams={params} roptions={renderOpts} />]
 		},
 		renderEdit(renderOpts, params) {
-			let props = getFixedProp(renderOpts, params)
-			return [<vxeRenderImg redit={true} rparams={params} rname={renderOpts.name} rprops={props.rprops} rkey={props.rkey} rdata={props.rdata} />]
+			return [<vxeRenderImg rparams={params} roptions={renderOpts} redit />]
 		},
 		exportMethod({ row, column }) {
 			return utils.get(row, column.property)
@@ -376,68 +260,54 @@ const publicRenders = {
 	$vHref: {
 		autoselect: true,
 		renderDefault(renderOpts, params) {
-			let props = getFixedProp(renderOpts, params)
-			return [<vxeRenderHref redit={false} rparams={params} rname={renderOpts.name} rprops={props.rprops} rkey={props.rkey} rdata={props.rdata} />]
+			return [<vxeRenderHref rparams={params} roptions={renderOpts} />]
 		},
 		renderCell(renderOpts, params) {
-			let props = getFixedProp(renderOpts, params)
-			return [<vxeRenderHref redit={false} rparams={params} rname={renderOpts.name} rprops={props.rprops} rkey={props.rkey} rdata={props.rdata} />]
+			return [<vxeRenderHref rparams={params} roptions={renderOpts} />]
 		},
 		renderEdit(renderOpts, params) {
-			let props = getFixedProp(renderOpts, params)
-			return [<vxeRenderHref redit={false} rparams={params} rname={renderOpts.name} rprops={props.rprops} rkey={props.rkey} rdata={props.rdata} />]
+			return [<vxeRenderHref rparams={params} roptions={renderOpts} redit />]
 		}
 	},
 	$vUpload: {
 		autoselect: true,
 		renderDefault(renderOpts, params) {
-			let props = getFixedProp(renderOpts, params)
-			return [<vxeRenderUpload redit={false} rparams={params} rname={renderOpts.name} rprops={props.rprops} rkey={props.rkey} rdata={props.rdata} />]
+			return [<vxeRenderUpload rparams={params} roptions={renderOpts} />]
 		},
 		renderCell(renderOpts, params) {
-			let props = getFixedProp(renderOpts, params)
-			return [<vxeRenderUpload redit={false} rparams={params} rname={renderOpts.name} rprops={props.rprops} rkey={props.rkey} rdata={props.rdata} />]
+			return [<vxeRenderUpload rparams={params} roptions={renderOpts} />]
 		},
 		renderEdit(renderOpts, params) {
-			let props = getFixedProp(renderOpts, params)
-			return [<vxeRenderUpload redit={true} rparams={params} rname={renderOpts.name} rprops={props.rprops} rkey={props.rkey} rdata={props.rdata} />]
+			return [<vxeRenderUpload rparams={params} roptions={renderOpts} redit />]
 		},
 		renderItemContent(renderOpts, params) {
-			let props = getFixedProp(renderOpts, params)
-			return [<vxeRenderUpload redit={true} rparams={params} rname={renderOpts.name} rprops={props.rprops} rkey={props.rkey} rdata={props.rdata} />]
+			return [<vxeRenderUpload rparams={params} roptions={renderOpts} redit />]
 		}
 	},
 	$vGlobalOption: {
 		renderDefault(renderOpts, params) {
-			let props = getFixedProp(renderOpts, params)
-			return [<vxeRenderGoption redit={false} rparams={params} rname={renderOpts.name} rprops={props.rprops} rkey={props.rkey} rdata={props.rdata} />]
+			return [<vxeRenderGoption rparams={params} roptions={renderOpts} />]
 		},
 		renderCell(renderOpts, params) {
-			let props = getFixedProp(renderOpts, params)
-			return [<vxeRenderGoption redit={false} rparams={params} rname={renderOpts.name} rprops={props.rprops} rkey={props.rkey} rdata={props.rdata} />]
+			return [<vxeRenderGoption rparams={params} roptions={renderOpts} />]
 		},
 		renderEdit(renderOpts, params) {
-			let props = getFixedProp(renderOpts, params)
-			return [<vxeRenderGoption redit={true} rparams={params} rname={renderOpts.name} rprops={props.rprops} rkey={props.rkey} rdata={props.rdata} />]
+			return [<vxeRenderGoption rparams={params} roptions={renderOpts} redit />]
 		}
 	},
 	$vCode: {
 		autoselect: true,
 		renderDefault(renderOpts, params) {
-			let props = getFixedProp(renderOpts, params)
-			return [<vxeRenderCode redit={false} rparams={params} rname={renderOpts.name} rprops={props.rprops} rkey={props.rkey} rdata={props.rdata} />]
+			return [<vxeRenderCode rparams={params} roptions={renderOpts} />]
 		},
 		renderCell(renderOpts, params) {
-			let props = getFixedProp(renderOpts, params)
-			return [<vxeRenderCode redit={false} rparams={params} rname={renderOpts.name} rprops={props.rprops} rkey={props.rkey} rdata={props.rdata} />]
+			return [<vxeRenderCode rparams={params} roptions={renderOpts} />]
 		},
 		renderEdit(renderOpts, params) {
-			let props = getFixedProp(renderOpts, params)
-			return [<vxeRenderCode redit={true} rparams={params} rname={renderOpts.name} rprops={props.rprops} rkey={props.rkey} rdata={props.rdata} />]
+			return [<vxeRenderCode rparams={params} roptions={renderOpts} redit />]
 		},
 		renderItemContent(renderOpts, params) {
-			let props = getFixedProp(renderOpts, params)
-			return [<vxeRenderCode redit={true} rparams={params} rname={renderOpts.name} rprops={props.rprops} rkey={props.rkey} rdata={props.rdata} />]
+			return [<vxeRenderCode rparams={params} roptions={renderOpts} redit />]
 		}
 	}
 }
@@ -472,7 +342,7 @@ const extraRenders = {
 const filterRenders = {
 	$vFilterInput: {
 		renderFilter(renderOpts, params) {
-			return [<vxeFilterInput rparams={params} rprops={renderOpts.props} />]
+			return [<vxeFilterInput rparams={params} roptions={renderOpts} />]
 		},
 		filterResetMethod({ options, column }) {
 			options.forEach(option => {
@@ -488,7 +358,7 @@ const filterRenders = {
 	},
 	$vFilterComplex: {
 		renderFilter(renderOpts, params) {
-			return [<vxeFilterComplex rparams={params} rprops={renderOpts.props} />]
+			return [<vxeFilterComplex rparams={params} roptions={renderOpts} />]
 		},
 		filterResetMethod({ options, column }) {
 			options.forEach(option => {
@@ -523,9 +393,7 @@ const filterRenders = {
 // 全局渲染器名称
 const publicRendersNames = {
 	allPlugins: Object.keys(publicRenders),
-	expendRenders: ['$vSelect', '$vCheckgroup', '$vMoney', '$vRadiogroup', '$vSwitch', '$vTree', '$vTime'], // 需要转换视图字段的渲染器
-	expendName: defaultPublicProps.colExpendName,
-	sortByExpendName: defaultPublicProps.colExpendName
+	expendRenders: ['$vSelect', '$vCheckgroup', '$vMoney', '$vRadiogroup', '$vSwitch', '$vTree', '$vTime'] // 需要转换视图字段的渲染器
 }
 
 export { publicRenders, extraRenders, filterRenders, publicRendersNames }

package/packages/vxeTable/render/header/vxe-header-money.vue

@@ -1,7 +1,7 @@
 <template>
 	<span>
 		{{ rparams.column.title }}
-		<span v-if="rprops.moneyOption?.label && !rprops.bill" class="header-money-unit-text">({{ rprops.moneyOption?.label }})</span>
+		<span v-if="mprops.moneyOption?.label && !rprops.bill" class="header-money-unit-text">({{ mprops.moneyOption?.label }})</span>
 	</span>
 	<div v-if="rprops.bill" class="header-bill-box">
 		<template v-for="(bil, bilindex) in billGroups" :key="bilindex">