sh-view 2.6.2 → 2.6.4

package/packages/vxeTable/render/cell/vxe-render-textarea.vue

@@ -1,26 +1,28 @@
-<template>
-	<span class="vxe-render--inner" :class="{ 'form-render': rform, 'td-render': !rform }">
-		<template v-if="redit || isEditAll">
-			<vxe-textarea v-model="renderValue" v-bind="rprops" :size="rsize" @change="vxeInputChange" @blur="vxeBlurCallback" @clear="vxeBlurCallback" />
-		</template>
-		<template v-else>
-			<span>{{ renderText }}</span>
-		</template>
-	</span>
-</template>
-
-<script>
-import { defineComponent, getCurrentInstance } from 'vue'
-import cellProps from '../mixin/cell-props'
-import cellHooks from '../mixin/cell-hooks'
-export default defineComponent({
-	name: 'VxeRenderTextarea',
-	props: cellProps,
-	setup(props, context) {
-		const { proxy } = getCurrentInstance()
-		const useCell = cellHooks(props, context, proxy)
-
-		return Object.assign({}, useCell)
-	}
-})
-</script>
+<template>
+	<span class="vxe-render--inner" :class="{ 'form-render': rform, 'td-render': !rform }">
+		<template v-if="redit || isEditAll">
+			<vxe-textarea v-model="renderValue" v-bind="rprops" :size="rsize" @change="vxeInputChange" @blur="vxeBlurCallback" @clear="vxeBlurCallback" />
+		</template>
+		<template v-else>
+			<span>{{ renderText }}</span>
+		</template>
+	</span>
+</template>
+
+<script>
+import { defineComponent, getCurrentInstance } from 'vue'
+import cellProps from '../mixin/cell-props'
+import cellHooks from '../mixin/cell-hooks'
+export default defineComponent({
+	name: 'VxeRenderTextarea',
+	props: cellProps,
+	setup(props, context) {
+		const { proxy } = getCurrentInstance()
+		const useCell = cellHooks(props, context, proxy)
+
+		return {
+			...useCell
+		}
+	}
+})
+</script>

package/packages/vxeTable/render/cell/vxe-render-time.vue

@@ -1,41 +1,44 @@
-<template>
-	<span class="vxe-render--inner" :class="{ 'form-render': rform, 'td-render': !rform }">
-		<template v-if="redit || isEditAll">
-			<vxe-input v-model="renderValue" v-bind="rprops" :size="rsize" :disabled-method="vxeDisabledMethod" @change="vxeChangeCallBack"></vxe-input>
-		</template>
-		<template v-else>
-			<span v-html="renderText"></span>
-		</template>
-	</span>
-</template>
-
-<script>
-import { defineComponent, getCurrentInstance } from 'vue'
-import cellProps from '../mixin/cell-props'
-import cellHooks from '../mixin/cell-hooks'
-export default defineComponent({
-	name: 'VxeRenderTime',
-	props: cellProps,
-	setup(props, context) {
-		const { proxy } = getCurrentInstance()
-		const { $vUtils } = proxy
-		const useCell = cellHooks(props, context, proxy)
-
-		// 禁用事件
-		const vxeDisabledMethod = ({ date, viewType }) => {
-			let { startTime, endTime } = props.rprops
-			if (startTime) {
-				startTime = $vUtils.format(startTime, props.rdata)
-				let { done, time } = $vUtils.getDateDiff(startTime, date)
-				return startTime ? !done : false
-			} else if (endTime) {
-				endTime = $vUtils.format(endTime, props.rdata)
-				let { done, time } = $vUtils.getDateDiff(endTime, date)
-				return done
-			}
-		}
-
-		return Object.assign({}, useCell, { vxeDisabledMethod })
-	}
-})
-</script>
+<template>
+	<span class="vxe-render--inner" :class="{ 'form-render': rform, 'td-render': !rform }">
+		<template v-if="redit || isEditAll">
+			<vxe-input v-model="renderValue" v-bind="rprops" :size="rsize" :disabled-method="vxeDisabledMethod" @change="vxeChangeCallBack"></vxe-input>
+		</template>
+		<template v-else>
+			<span v-html="renderText"></span>
+		</template>
+	</span>
+</template>
+
+<script>
+import { defineComponent, getCurrentInstance } from 'vue'
+import cellProps from '../mixin/cell-props'
+import cellHooks from '../mixin/cell-hooks'
+export default defineComponent({
+	name: 'VxeRenderTime',
+	props: cellProps,
+	setup(props, context) {
+		const { proxy } = getCurrentInstance()
+		const { $vUtils } = proxy
+		const useCell = cellHooks(props, context, proxy)
+
+		// 禁用事件
+		const vxeDisabledMethod = ({ date, viewType }) => {
+			let { startTime, endTime } = props.rprops
+			if (startTime) {
+				startTime = $vUtils.format(startTime, props.rdata)
+				let { done, time } = $vUtils.getDateDiff(startTime, date)
+				return startTime ? !done : false
+			} else if (endTime) {
+				endTime = $vUtils.format(endTime, props.rdata)
+				let { done, time } = $vUtils.getDateDiff(endTime, date)
+				return done
+			}
+		}
+
+		return {
+			...useCell,
+			vxeDisabledMethod
+		}
+	}
+})
+</script>

package/packages/vxeTable/render/cell/vxe-render-tree.vue

@@ -1,60 +1,63 @@
-<template>
-	<span class="vxe-render--inner" :class="{ 'form-render': rform, 'td-render': !rform }">
-		<template v-if="redit || isEditAll">
-			<span v-if="rprops.prefixText && rform" class="prefix">
-				<vxe-button v-if="prefixButton" v-bind="psButtonConfig" @click="vxeInputPrefixClick">{{ rprops.prefixText }}</vxe-button>
-				<span v-else @click="vxeInputPrefixClick">{{ rprops.prefixText }}</span>
-			</span>
-			<sh-tree v-model="renderValue" v-bind="rprops" :field="rkey" :value-data="rdata" :size="rsize" is-select @change="vxeTreeCallback"></sh-tree>
-			<span v-if="rprops.suffixText && rform" class="suffix">
-				<vxe-button v-if="suffixButton" v-bind="psButtonConfig" @click="vxeInputSuffixClick">{{ rprops.suffixText }}</vxe-button>
-				<span v-else @click="vxeInputSuffixClick">{{ rprops.suffixText }}</span>
-			</span>
-		</template>
-		<template v-else>
-			<span v-html="renderText"></span>
-		</template>
-	</span>
-</template>
-
-<script>
-import { defineComponent, getCurrentInstance } from 'vue'
-import cellProps from '../mixin/cell-props'
-import cellHooks from '../mixin/cell-hooks'
-export default defineComponent({
-	name: 'VxeRenderTree',
-	props: cellProps,
-	setup(props, context) {
-		const { proxy } = getCurrentInstance()
-		const { $vUtils } = proxy
-		const useCell = cellHooks(props, context, proxy)
-
-		// 输入框回调
-		const vxeTreeCallback = (selectedKeys, selectedRows) => {
-			let { valueKeys, multiple } = props.rprops
-			if (!multiple) {
-				selectedKeys = selectedKeys[0] || ''
-			}
-			if (valueKeys && selectedRows && selectedRows.length > 0) {
-				let prefixKey = props.rkey.endsWith('Id') ? String(props.rkey).replace('Id', '') : props.rkey
-				let valueks = Array.isArray(valueKeys) ? valueKeys : valueKeys.split(',')
-				valueks.forEach(key => {
-					let keySplits = key.split('=')
-					let fromDefaultKey = String(keySplits[0]).replace(/@/gi, '').toLowerCase()
-					let fromKey = keySplits[1] || String(keySplits[0]).replace(/@/gi, prefixKey)
-					let fromvalue = null
-					if (multiple) {
-						fromvalue = selectedRows.map(item => $vUtils.get(item, fromKey) || $vUtils.get(item, fromDefaultKey))
-					} else {
-						fromvalue = $vUtils.get(selectedRows[0], fromKey) || $vUtils.get(selectedRows[0], fromDefaultKey)
-					}
-					$vUtils.set(props.rdata, fromKey, fromvalue)
-				})
-			}
-			useCell.setRenderValue(selectedKeys, true)
-		}
-
-		return Object.assign({}, useCell, { vxeTreeCallback })
-	}
-})
-</script>
+<template>
+	<span class="vxe-render--inner" :class="{ 'form-render': rform, 'td-render': !rform }">
+		<template v-if="redit || isEditAll">
+			<span v-if="rprops.prefixText && rform" class="prefix">
+				<vxe-button v-if="prefixButton" v-bind="psButtonConfig" @click="vxeInputPrefixClick">{{ rprops.prefixText }}</vxe-button>
+				<span v-else @click="vxeInputPrefixClick">{{ rprops.prefixText }}</span>
+			</span>
+			<sh-tree v-model="renderValue" v-bind="rprops" :field="rkey" :value-data="rdata" :size="rsize" is-select @change="vxeTreeCallback"></sh-tree>
+			<span v-if="rprops.suffixText && rform" class="suffix">
+				<vxe-button v-if="suffixButton" v-bind="psButtonConfig" @click="vxeInputSuffixClick">{{ rprops.suffixText }}</vxe-button>
+				<span v-else @click="vxeInputSuffixClick">{{ rprops.suffixText }}</span>
+			</span>
+		</template>
+		<template v-else>
+			<span v-html="renderText"></span>
+		</template>
+	</span>
+</template>
+
+<script>
+import { defineComponent, getCurrentInstance } from 'vue'
+import cellProps from '../mixin/cell-props'
+import cellHooks from '../mixin/cell-hooks'
+export default defineComponent({
+	name: 'VxeRenderTree',
+	props: cellProps,
+	setup(props, context) {
+		const { proxy } = getCurrentInstance()
+		const { $vUtils } = proxy
+		const useCell = cellHooks(props, context, proxy)
+
+		// 输入框回调
+		const vxeTreeCallback = (selectedKeys, selectedRows) => {
+			let { valueKeys, multiple } = props.rprops
+			if (!multiple) {
+				selectedKeys = selectedKeys[0] || ''
+			}
+			if (valueKeys && selectedRows && selectedRows.length > 0) {
+				let prefixKey = props.rkey.endsWith('Id') ? String(props.rkey).replace('Id', '') : props.rkey
+				let valueks = Array.isArray(valueKeys) ? valueKeys : valueKeys.split(',')
+				valueks.forEach(key => {
+					let keySplits = key.split('=')
+					let fromDefaultKey = String(keySplits[0]).replace(/@/gi, '').toLowerCase()
+					let fromKey = keySplits[1] || String(keySplits[0]).replace(/@/gi, prefixKey)
+					let fromvalue = null
+					if (multiple) {
+						fromvalue = selectedRows.map(item => $vUtils.get(item, fromKey) || $vUtils.get(item, fromDefaultKey))
+					} else {
+						fromvalue = $vUtils.get(selectedRows[0], fromKey) || $vUtils.get(selectedRows[0], fromDefaultKey)
+					}
+					$vUtils.set(props.rdata, fromKey, fromvalue)
+				})
+			}
+			useCell.setRenderValue(selectedKeys, true)
+		}
+
+		return {
+			...useCell,
+			vxeTreeCallback
+		}
+	}
+})
+</script>

package/packages/vxeTable/render/cell/vxe-render-upload.vue

@@ -1,26 +1,28 @@
-<template>
-	<span class="vxe-render--inner" :class="{ 'form-render': rform, 'td-render': !rform }">
-		<template v-if="redit || isEditAll">
-			<sh-upload v-model="renderValue" v-bind="rprops" :size="rsize" @input="vxeChangeCallBack({ value: $event })"></sh-upload>
-		</template>
-		<template v-else>
-			<sh-upload :model-value="renderText" v-bind="rprops" :disabled="true" :size="rsize"></sh-upload>
-		</template>
-	</span>
-</template>
-
-<script>
-import { defineComponent, getCurrentInstance } from 'vue'
-import cellProps from '../mixin/cell-props'
-import cellHooks from '../mixin/cell-hooks'
-export default defineComponent({
-	name: 'VxeRenderUpload',
-	props: cellProps,
-	setup(props, context) {
-		const { proxy } = getCurrentInstance()
-		const useCell = cellHooks(props, context, proxy)
-
-		return Object.assign({}, useCell)
-	}
-})
-</script>
+<template>
+	<span class="vxe-render--inner" :class="{ 'form-render': rform, 'td-render': !rform }">
+		<template v-if="redit || isEditAll">
+			<sh-upload v-model="renderValue" v-bind="rprops" :size="rsize" @input="vxeChangeCallBack({ value: $event })"></sh-upload>
+		</template>
+		<template v-else>
+			<sh-upload :model-value="renderText" v-bind="rprops" :disabled="true" :size="rsize"></sh-upload>
+		</template>
+	</span>
+</template>
+
+<script>
+import { defineComponent, getCurrentInstance } from 'vue'
+import cellProps from '../mixin/cell-props'
+import cellHooks from '../mixin/cell-hooks'
+export default defineComponent({
+	name: 'VxeRenderUpload',
+	props: cellProps,
+	setup(props, context) {
+		const { proxy } = getCurrentInstance()
+		const useCell = cellHooks(props, context, proxy)
+
+		return {
+			...useCell
+		}
+	}
+})
+</script>

package/packages/vxeTable/render/filters/vxe-filter-input.vue

@@ -1,23 +1,25 @@
-<template>
-	<div class="vxe-filter--wrap">
-		<span class="vxe-filter--inner">
-			<vxe-input v-model="renderValue.data" v-bind="rprops" :disabled="false" @input="vxeFilterCallback" />
-		</span>
-	</div>
-</template>
-
-<script>
-import { defineComponent, getCurrentInstance } from 'vue'
-import cellProps from '../mixin/cell-props'
-import filterHooks from '../mixin/filter-hooks'
-export default defineComponent({
-	name: 'VxeFilterInput',
-	props: cellProps,
-	setup(props, context) {
-		const { proxy } = getCurrentInstance()
-		const useFilter = filterHooks(props, context, proxy)
-
-		return Object.assign({}, useFilter)
-	}
-})
-</script>
+<template>
+	<div class="vxe-filter--wrap">
+		<span class="vxe-filter--inner">
+			<vxe-input v-model="renderValue.data" v-bind="rprops" :disabled="false" @input="vxeFilterCallback" />
+		</span>
+	</div>
+</template>
+
+<script>
+import { defineComponent, getCurrentInstance } from 'vue'
+import cellProps from '../mixin/cell-props'
+import filterHooks from '../mixin/filter-hooks'
+export default defineComponent({
+	name: 'VxeFilterInput',
+	props: cellProps,
+	setup(props, context) {
+		const { proxy } = getCurrentInstance()
+		const useFilter = filterHooks(props, context, proxy)
+
+		return {
+			...useFilter
+		}
+	}
+})
+</script>

package/packages/vxeTable/render/footer/vxe-footer-input.vue

@@ -1,21 +1,23 @@
-<template>
-	<span>{{ getFooterData() }}</span>
-</template>
-
-<script>
-import { defineComponent, getCurrentInstance } from 'vue'
-import cellProps from '../mixin/cell-props'
-import cellHooks from '../mixin/cell-hooks'
-export default defineComponent({
-	name: 'VxeFooterInput',
-	props: cellProps,
-	setup(props, context) {
-		const { proxy } = getCurrentInstance()
-		const useCell = cellHooks(props, context, proxy)
-
-		return Object.assign({}, useCell)
-	}
-})
-</script>
-
-<style scoped></style>
+<template>
+	<span>{{ getFooterData() }}</span>
+</template>
+
+<script>
+import { defineComponent, getCurrentInstance } from 'vue'
+import cellProps from '../mixin/cell-props'
+import cellHooks from '../mixin/cell-hooks'
+export default defineComponent({
+	name: 'VxeFooterInput',
+	props: cellProps,
+	setup(props, context) {
+		const { proxy } = getCurrentInstance()
+		const useCell = cellHooks(props, context, proxy)
+
+		return {
+			...useCell
+		}
+	}
+})
+</script>
+
+<style scoped></style>

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

@@ -1,28 +1,30 @@
-<template>
-	<div v-if="rprops.bill" class="header-bill-box">
-		<template v-for="(bil, bilindex) in billGroups" :key="bilindex">
-			<span class="cell-bill-number" :class="getBillClass(bil)">{{ getBillValue(bilindex, true) }}</span>
-		</template>
-	</div>
-	<template v-else>
-		<span class="blue">{{ getFooterData() }}</span>
-	</template>
-</template>
-
-<script>
-import { defineComponent, getCurrentInstance } from 'vue'
-import cellProps from '../mixin/cell-props'
-import cellHooks from '../mixin/cell-hooks'
-export default defineComponent({
-	name: 'VxeFooterMoney',
-	props: cellProps,
-	setup(props, context) {
-		const { proxy } = getCurrentInstance()
-		const useCell = cellHooks(props, context, proxy)
-
-		return Object.assign({}, useCell)
-	}
-})
-</script>
-
-<style scoped></style>
+<template>
+	<div v-if="rprops.bill" class="header-bill-box">
+		<template v-for="(bil, bilindex) in billGroups" :key="bilindex">
+			<span class="cell-bill-number" :class="getBillClass(bil)">{{ getBillValue(bilindex, true) }}</span>
+		</template>
+	</div>
+	<template v-else>
+		<span class="blue">{{ getFooterData() }}</span>
+	</template>
+</template>
+
+<script>
+import { defineComponent, getCurrentInstance } from 'vue'
+import cellProps from '../mixin/cell-props'
+import cellHooks from '../mixin/cell-hooks'
+export default defineComponent({
+	name: 'VxeFooterMoney',
+	props: cellProps,
+	setup(props, context) {
+		const { proxy } = getCurrentInstance()
+		const useCell = cellHooks(props, context, proxy)
+
+		return {
+			...useCell
+		}
+	}
+})
+</script>
+
+<style scoped></style>

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

@@ -1,29 +1,31 @@
-<template>
-	<span>
-		{{ rparams.column.title }}
-		<span v-if="moneyUnitText" class="header-money-unit-text">({{ moneyUnitText }})</span>
-	</span>
-	<div v-if="rprops.bill" class="header-bill-box">
-		<template v-for="(bil, bilindex) in billGroups" :key="bilindex">
-			<span class="cell-bill-number" :class="getBillClass(bil)">{{ bil.shortText }}</span>
-		</template>
-	</div>
-</template>
-
-<script>
-import { defineComponent, getCurrentInstance } from 'vue'
-import cellProps from '../mixin/cell-props'
-import cellHooks from '../mixin/cell-hooks'
-export default defineComponent({
-	name: 'VxeHeaderMoney',
-	props: cellProps,
-	setup(props, context) {
-		const { proxy } = getCurrentInstance()
-		const useCell = cellHooks(props, context, proxy)
-
-		return Object.assign({}, useCell)
-	}
-})
-</script>
-
-<style scoped></style>
+<template>
+	<span>
+		{{ rparams.column.title }}
+		<span v-if="moneyUnitText" class="header-money-unit-text">({{ moneyUnitText }})</span>
+	</span>
+	<div v-if="rprops.bill" class="header-bill-box">
+		<template v-for="(bil, bilindex) in billGroups" :key="bilindex">
+			<span class="cell-bill-number" :class="getBillClass(bil)">{{ bil.shortText }}</span>
+		</template>
+	</div>
+</template>
+
+<script>
+import { defineComponent, getCurrentInstance } from 'vue'
+import cellProps from '../mixin/cell-props'
+import cellHooks from '../mixin/cell-hooks'
+export default defineComponent({
+	name: 'VxeHeaderMoney',
+	props: cellProps,
+	setup(props, context) {
+		const { proxy } = getCurrentInstance()
+		const useCell = cellHooks(props, context, proxy)
+
+		return {
+			...useCell
+		}
+	}
+})
+</script>
+
+<style scoped></style>

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
 		}