sh-view 2.8.1 → 2.8.2

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

@@ -1,198 +1,198 @@
-import { computed, ref, watch } from 'vue'
-
-let moneyUnitConstants = [
-	{ value: 1, label: '元' },
-	{ value: 1000, label: '千元' },
-	{ value: 10000, label: '万元' }
-]
-let cnGroups = [
-	{ shortText: '兆', fullText: '兆', value: '' },
-	{ shortText: '千', fullText: '千亿', value: '' },
-	{ shortText: '百', fullText: '百亿', value: '' },
-	{ shortText: '十', fullText: '十亿', value: '' },
-	{ shortText: '亿', fullText: '亿', value: '' },
-	{ shortText: '千', fullText: '千万', value: '' },
-	{ shortText: '百', fullText: '百万', value: '' },
-	{ shortText: '十', fullText: '十万', value: '' },
-	{ shortText: '万', fullText: '万', value: '' },
-	{ shortText: '千', fullText: '千', value: '' },
-	{ shortText: '百', fullText: '百', value: '' },
-	{ shortText: '十', fullText: '十', value: '' },
-	{ shortText: '元', fullText: '元', value: '' },
-	{ shortText: '角', fullText: '角', value: '' },
-	{ shortText: '分', fullText: '分', value: '' },
-	{ shortText: '毫', fullText: '毫', value: '' },
-	{ shortText: '厘', fullText: '厘', value: '' }
-]
-
-export default function (props, context, proxy) {
-	const { $vUtils } = 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 moneyUnitText = computed(() => {
-		let moneyConstant = moneyUnitConstants.find(item => item.value === props.rprops.moneyUnit)
-		return moneyConstant && moneyConstant.label
-	})
-	const billGroups = computed(() => {
-		let { billStart = '分', billEnd = '亿' } = props.rprops
-		let startIndex = cnGroups.findIndex(cn => cn.fullText === billEnd)
-		let endIndex = cnGroups.findIndex(cn => cn.fullText === billStart)
-		return cnGroups.slice(startIndex, endIndex)
-	})
-	const psButtonConfig = computed(() => {
-		return { disabled: props.rprops.disabled, size: props.rsize, status: 'primary' }
-	})
-	const prefixButton = computed(() => props.rprops.prefixType?.toLowerCase() === 'button')
-	const suffixButton = computed(() => props.rprops.suffixType?.toLowerCase() === 'button')
-
-	// 初始化数据
-	const initData = () => {
-		let keyValue = $vUtils.get(props.rdata, props.rkey)
-		formatValueFun(keyValue)
-	}
-
-	// 输入框前缀点击事件
-	const vxeInputPrefixClick = () => {
-		if (props.rprops.disabled) return
-		if (rform.value) {
-			let { $form } = props.rparams
-			$form.context.emit('prefix-click', props.rparams)
-		}
-	}
-	// 输入框后缀点击事件
-	const vxeInputSuffixClick = () => {
-		if (props.rprops.disabled) return
-		if (rform.value) {
-			let { $form } = props.rparams
-			$form.context.emit('suffix-click', props.rparams)
-		}
-	}
-	// 输入框变化
-	const vxeInputChange = async ({ value, $event }) => {
-		// 此操作火狐浏览器（bug(vxe):编辑后不触发渲染器的blur问题）触发edit-closed，故在edit-close重新赋值
-		if (!rform.value) {
-			$vUtils.set(props.rparams.column, 'params.__RowEditModelValue', value)
-		}
-	}
-	// 输入框变化回调
-	const vxeChangeCallBack = async ({ value, $event }) => {
-		setRenderValue(value)
-	}
-	// radio 变化回调
-	const vxeRadioCallBack = async ({ label, $event }) => {
-		setRenderValue(label)
-	}
-	// check变化回调
-	const vxeCheckCallBack = async ({ checklist, checked, label, $event }) => {
-		setRenderValue(checklist)
-	}
-	// 输入框失去焦点回调
-	const vxeBlurCallback = async ({ value, $event }) => {
-		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
-		}
-		if (rform.value) {
-			let { $form } = props.rparams
-			$form.context.emit('edit-closed', props.rparams)
-		}
-		$vUtils.set(props.rdata, props.rkey, cellValue)
-	}
-	// 格式化值formatValue
-	const formatValueFun = (value, editable) => {
-		let formatObj = $vUtils.formatRender(value, props.rkey, props.rdata, props.rname, props.rprops, proxy, editable)
-		renderValue.value = ['$vMoney'].includes(props.rname) ? formatObj.rtext : formatObj.rvalue
-		renderText.value = formatObj.rtext
-		return formatObj
-	}
-	// 格式化底部值
-	const getFooterData = (qianfen = true) => {
-		let { $table, items, itemIndex, column } = props.rparams
-		let tableData = $table.internalData.afterFullData
-		let { rname, rprops, rfooter, property } = column
-		let { digits, moneyUnit, commafy, type, calculate } = rprops
-		let footerValue = items[itemIndex]
-		if (rfooter) {
-			let caculateObj = rfooter[items[rfooter.index || 0]]
-			if (caculateObj && (rname === '$vMoney' || (['number', 'float', 'integer'].includes(type) && calculate))) {
-				let tableColumnData = $vUtils.mapTree(tableData, row => row[property])
-				let { computeType, result, typeObj } = caculateObj
-				switch (computeType) {
-					case 'subTotal':
-						footerValue = $vUtils.sum(tableColumnData)
-						break
-					case 'allTotal':
-						footerValue = typeObj[property] || result
-						break
-					case 'mean':
-						footerValue = $vUtils.mean(tableColumnData)
-						break
-					default:
-						footerValue = result
-						break
-				}
-				if (rname === '$vMoney') footerValue = $vUtils.truncate($vUtils.divide(footerValue, moneyUnit), digits)
-				if (qianfen && commafy) footerValue = $vUtils.commafy(footerValue, { digits })
-			}
-		}
-		return footerValue
-	}
-	const getBillClass = bil => {
-		return { basic: bil.fullText === '元', commafy: ['千', '百万', '十亿', '兆'].includes(bil.fullText) }
-	}
-	// 获取单据值
-	const getBillValue = (index, total = false) => {
-		let value = total ? getFooterData(false) : renderValue.value
-		if (!value) return ''
-		let fullValue = $vUtils.formatMoneyPad(value)
-		let fullList = fullValue.replace('.', '').split('')
-		return fullList[index]
-	}
-
-	watch(
-		() => props.rdata,
-		() => initData(),
-		{ deep: true, immediate: true }
-	)
-
-	return {
-		renderValue,
-		renderText,
-		rsize,
-		rform,
-		isEditAll,
-		moneyUnitText,
-		billGroups,
-		psButtonConfig,
-		prefixButton,
-		suffixButton,
-		vxeInputPrefixClick,
-		vxeInputSuffixClick,
-		vxeInputChange,
-		vxeChangeCallBack,
-		vxeRadioCallBack,
-		vxeCheckCallBack,
-		vxeBlurCallback,
-		getFooterData,
-		getBillClass,
-		getBillValue,
-		setRenderValue
-	}
-}
+import { computed, ref, watch } from 'vue'
+
+let moneyUnitConstants = [
+	{ value: 1, label: '元' },
+	{ value: 1000, label: '千元' },
+	{ value: 10000, label: '万元' }
+]
+let cnGroups = [
+	{ shortText: '兆', fullText: '兆', value: '' },
+	{ shortText: '千', fullText: '千亿', value: '' },
+	{ shortText: '百', fullText: '百亿', value: '' },
+	{ shortText: '十', fullText: '十亿', value: '' },
+	{ shortText: '亿', fullText: '亿', value: '' },
+	{ shortText: '千', fullText: '千万', value: '' },
+	{ shortText: '百', fullText: '百万', value: '' },
+	{ shortText: '十', fullText: '十万', value: '' },
+	{ shortText: '万', fullText: '万', value: '' },
+	{ shortText: '千', fullText: '千', value: '' },
+	{ shortText: '百', fullText: '百', value: '' },
+	{ shortText: '十', fullText: '十', value: '' },
+	{ shortText: '元', fullText: '元', value: '' },
+	{ shortText: '角', fullText: '角', value: '' },
+	{ shortText: '分', fullText: '分', value: '' },
+	{ shortText: '毫', fullText: '毫', value: '' },
+	{ shortText: '厘', fullText: '厘', value: '' }
+]
+
+export default function (props, context, proxy) {
+	const { $vUtils } = 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 moneyUnitText = computed(() => {
+		let moneyConstant = moneyUnitConstants.find(item => item.value === props.rprops.moneyUnit)
+		return moneyConstant && moneyConstant.label
+	})
+	const billGroups = computed(() => {
+		let { billStart = '分', billEnd = '亿' } = props.rprops
+		let startIndex = cnGroups.findIndex(cn => cn.fullText === billEnd)
+		let endIndex = cnGroups.findIndex(cn => cn.fullText === billStart)
+		return cnGroups.slice(startIndex, endIndex)
+	})
+	const psButtonConfig = computed(() => {
+		return { disabled: props.rprops.disabled, size: props.rsize, status: 'primary' }
+	})
+	const prefixButton = computed(() => props.rprops.prefixType?.toLowerCase() === 'button')
+	const suffixButton = computed(() => props.rprops.suffixType?.toLowerCase() === 'button')
+
+	// 初始化数据
+	const initData = () => {
+		let keyValue = $vUtils.get(props.rdata, props.rkey)
+		formatValueFun(keyValue)
+	}
+
+	// 输入框前缀点击事件
+	const vxeInputPrefixClick = () => {
+		if (props.rprops.disabled) return
+		if (rform.value) {
+			let { $form } = props.rparams
+			$form.context.emit('prefix-click', props.rparams)
+		}
+	}
+	// 输入框后缀点击事件
+	const vxeInputSuffixClick = () => {
+		if (props.rprops.disabled) return
+		if (rform.value) {
+			let { $form } = props.rparams
+			$form.context.emit('suffix-click', props.rparams)
+		}
+	}
+	// 输入框变化
+	const vxeInputChange = async ({ value, $event }) => {
+		// 此操作火狐浏览器（bug(vxe):编辑后不触发渲染器的blur问题）触发edit-closed，故在edit-close重新赋值
+		if (!rform.value) {
+			$vUtils.set(props.rparams.column, 'params.__RowEditModelValue', value)
+		}
+	}
+	// 输入框变化回调
+	const vxeChangeCallBack = async ({ value, $event }) => {
+		setRenderValue(value)
+	}
+	// radio 变化回调
+	const vxeRadioCallBack = async ({ label, $event }) => {
+		setRenderValue(label)
+	}
+	// check变化回调
+	const vxeCheckCallBack = async ({ checklist, checked, label, $event }) => {
+		setRenderValue(checklist)
+	}
+	// 输入框失去焦点回调
+	const vxeBlurCallback = async ({ value, $event }) => {
+		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
+		}
+		if (rform.value) {
+			let { $form } = props.rparams
+			$form.context.emit('edit-closed', props.rparams)
+		}
+		$vUtils.set(props.rdata, props.rkey, cellValue)
+	}
+	// 格式化值formatValue
+	const formatValueFun = (value, editable) => {
+		let formatObj = $vUtils.formatRender(value, props.rkey, props.rdata, props.rname, props.rprops, proxy, editable)
+		renderValue.value = ['$vMoney'].includes(props.rname) ? formatObj.rtext : formatObj.rvalue
+		renderText.value = formatObj.rtext
+		return formatObj
+	}
+	// 格式化底部值
+	const getFooterData = (qianfen = true) => {
+		let { $table, items, itemIndex, column } = props.rparams
+		let tableData = $table.internalData.afterFullData
+		let { rname, rprops, rfooter, property } = column
+		let { digits, moneyUnit, commafy, type, calculate } = rprops
+		let footerValue = items[itemIndex]
+		if (rfooter) {
+			let caculateObj = rfooter[items[rfooter.index || 0]]
+			if (caculateObj && (rname === '$vMoney' || (['number', 'float', 'integer'].includes(type) && calculate))) {
+				let tableColumnData = $vUtils.mapTree(tableData, row => row[property])
+				let { computeType, result, typeObj } = caculateObj
+				switch (computeType) {
+					case 'subTotal':
+						footerValue = $vUtils.sum(tableColumnData)
+						break
+					case 'allTotal':
+						footerValue = typeObj[property] || result
+						break
+					case 'mean':
+						footerValue = $vUtils.mean(tableColumnData)
+						break
+					default:
+						footerValue = result
+						break
+				}
+				if (rname === '$vMoney') footerValue = $vUtils.truncate($vUtils.divide(footerValue, moneyUnit), digits)
+				if (qianfen && commafy) footerValue = $vUtils.commafy(footerValue, { digits })
+			}
+		}
+		return footerValue
+	}
+	const getBillClass = bil => {
+		return { basic: bil.fullText === '元', commafy: ['千', '百万', '十亿', '兆'].includes(bil.fullText) }
+	}
+	// 获取单据值
+	const getBillValue = (index, total = false) => {
+		let value = total ? getFooterData(false) : renderValue.value
+		if (!value) return ''
+		let fullValue = $vUtils.formatMoneyPad(value)
+		let fullList = fullValue.replace('.', '').split('')
+		return fullList[index]
+	}
+
+	watch(
+		() => props.rdata,
+		() => initData(),
+		{ deep: true, immediate: true }
+	)
+
+	return {
+		renderValue,
+		renderText,
+		rsize,
+		rform,
+		isEditAll,
+		moneyUnitText,
+		billGroups,
+		psButtonConfig,
+		prefixButton,
+		suffixButton,
+		vxeInputPrefixClick,
+		vxeInputSuffixClick,
+		vxeInputChange,
+		vxeChangeCallBack,
+		vxeRadioCallBack,
+		vxeCheckCallBack,
+		vxeBlurCallback,
+		getFooterData,
+		getBillClass,
+		getBillValue,
+		setRenderValue
+	}
+}

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

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

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

@@ -1,46 +1,46 @@
-import { computed, ref, watch } from 'vue'
-
-export default function (props, context, proxy, initRenderData) {
-	const { $vUtils } = proxy
-
-	let renderOption = ref({})
-
-	// 初始化
-	const initData = () => {
-		const { column, $panel } = props.rparams
-		const option = column.filters[0]
-		renderOption.value = option
-		$panel.changeOption(null, Boolean(renderOption.value.data), option)
-	}
-
-	// 过滤回调option
-	const vxeFilterChange = ({ value, $event }) => {
-		const { $panel } = props.rparams
-		$panel.changeOption(null, Boolean(renderOption.value.data), renderOption.value)
-	}
-
-	// 过滤确认
-	const vxeFilterConfirm = () => {
-		const { $panel } = props.rparams
-		$panel.confirmFilter()
-	}
-
-	// 过滤充值
-	const vxeFilterReset = () => {
-		const { $panel } = props.rparams
-		$panel.resetFilter()
-	}
-
-	watch(
-		() => props.rkey,
-		() => (initRenderData ? initRenderData() : initData()),
-		{ deep: true, immediate: true }
-	)
-
-	return {
-		renderOption,
-		vxeFilterChange,
-		vxeFilterConfirm,
-		vxeFilterReset
-	}
-}
+import { computed, ref, watch } from 'vue'
+
+export default function (props, context, proxy, initRenderData) {
+	const { $vUtils } = proxy
+
+	let renderOption = ref({})
+
+	// 初始化
+	const initData = () => {
+		const { column, $panel } = props.rparams
+		const option = column.filters[0]
+		renderOption.value = option
+		$panel.changeOption(null, Boolean(renderOption.value.data), option)
+	}
+
+	// 过滤回调option
+	const vxeFilterChange = ({ value, $event }) => {
+		const { $panel } = props.rparams
+		$panel.changeOption(null, Boolean(renderOption.value.data), renderOption.value)
+	}
+
+	// 过滤确认
+	const vxeFilterConfirm = () => {
+		const { $panel } = props.rparams
+		$panel.confirmFilter()
+	}
+
+	// 过滤充值
+	const vxeFilterReset = () => {
+		const { $panel } = props.rparams
+		$panel.resetFilter()
+	}
+
+	watch(
+		() => props.rkey,
+		() => (initRenderData ? initRenderData() : initData()),
+		{ deep: true, immediate: true }
+	)
+
+	return {
+		renderOption,
+		vxeFilterChange,
+		vxeFilterConfirm,
+		vxeFilterReset
+	}
+}

package/tsconfig.json

@@ -0,0 +1,25 @@
+{
+  "compilerOptions": {
+    "target": "esnext",
+    "module": "esnext",
+    "strict": true,
+    "jsx": "preserve",
+    "importHelpers": true,
+    "moduleResolution": "node",
+    "skipLibCheck": true,
+    "esModuleInterop": true,
+    "resolveJsonModule": true,
+    "allowSyntheticDefaultImports": true,
+    "forceConsistentCasingInFileNames": true,
+    "useDefineForClassFields": true,
+    "sourceMap": true,
+    "baseUrl": ".",
+    "types": ["webpack-env",],
+    "paths": {
+      "@/*": ["packages/*"]
+    },
+    "lib": ["esnext", "dom", "dom.iterable", "scripthost"]
+  },
+  "include": ["packages/**/*.ts", "packages/**/*.tsx", "packages/**/*.vue" ],
+  "exclude": ["node_modules"]
+}

package/types/component.d.ts

@@ -0,0 +1 @@
+export type ShType = 'info' | 'success' | 'warning' | 'error'