sh-view 2.9.8 → 2.9.11

package/packages/vxeTable/index.js

@@ -19,11 +19,7 @@ import ShValidators from 'sh-tools/packages/utils/validate'
 import { utils } from 'sh-tools'
 import { publicRenders, extraRenders, filterRenders, publicRendersNames } from './render/globalRenders.jsx'
 
-let uiOptions = {}
-
-let tableOptions = {
-	zIndex: 1500,
-	version: 0,
+let uiOptions = {
 	input: {
 		controls: false,
 		clearable: true
@@ -34,6 +30,55 @@ let tableOptions = {
 			keyField: 'value'
 		}
 	},
+	numberInput: {
+		clearable: true,
+		controlConfig: { enabled: false }
+	},
+	pager: {
+		currentPage: 1,
+		pageSize: 50,
+		total: 0,
+		layouts: ['Sizes', 'PrevJump', 'PrevPage', 'Number', 'NextPage', 'NextJump', 'FullJump', 'Total'],
+		pagerCount: 7,
+		pageSizes: [
+			{ label: '50条', value: 50 },
+			{ label: '100条', value: 100 },
+			{ label: '500条', value: 500 },
+			{ label: '1000条', value: 1000 },
+			{ label: '10000条', value: 10000 },
+			{ label: '10万条', value: 100000 }
+		],
+		align: 'right',
+		border: true,
+		background: false,
+		perfect: true,
+		autoHidden: false,
+		enabled: true
+	},
+	toolbar: {
+		custom: {
+			immediate: false
+		}
+	},
+	form: {},
+	modal: {
+		lockView: true,
+		resize: true,
+		mask: true,
+		duration: 3000,
+		dblclickZoom: true,
+		showTitleOverflow: true
+	},
+	icon: {},
+	loading: {
+		icon: 'vxe-icon-spinner roll',
+		text: '加载中...'
+	}
+}
+
+let tableOptions = {
+	zIndex: 1500,
+	version: 0,
 	table: {
 		fit: true,
 		stripe: false,
@@ -44,14 +89,40 @@ let tableOptions = {
 		rowConfig: {
 			useKey: true,
 			keyField: '_XID',
-			isCurrent: true,
-			isHover: true
+			isHover: true,
+			drag: false,
+			resizable: false
+		},
+		columnConfig: {
+			useKey: true,
+			isHover: true,
+			drag: false,
+			resizable: false
 		},
+		currentRowConfig: {},
 		sortConfig: {
 			multiple: false,
 			chronological: false,
 			trigger: 'cell'
 		},
+		rowDragConfig: {
+			showIcon: true,
+			showDragTip: true,
+			isPeerDrag: false,
+			isCrossDrag: false,
+			isToChildDrag: false,
+			isSelfToChildDrag: false,
+			showGuidesStatus: true
+		},
+		columnDragConfig: {
+			showIcon: true,
+			showDragTip: true,
+			isPeerDrag: false,
+			isCrossDrag: false,
+			isToChildDrag: false,
+			isSelfToChildDrag: false,
+			showGuidesStatus: true
+		},
 		radioConfig: {
 			strict: true,
 			highlight: true
@@ -99,6 +170,7 @@ let tableOptions = {
 			mode: 'cell'
 		},
 		customConfig: {
+			enabled: true,
 			storage: true
 		},
 		seqConfig: {
@@ -107,48 +179,8 @@ let tableOptions = {
 		resizeConfig: {
 			refreshDelay: 200
 		},
-		scrollX: { enabled: false, gt: 40, oSize: 0 },
-		scrollY: { enabled: true, gt: 60, oSize: 0 }
-	},
-	pager: {
-		currentPage: 1,
-		pageSize: 50,
-		total: 0,
-		layouts: ['Sizes', 'PrevJump', 'PrevPage', 'Number', 'NextPage', 'NextJump', 'FullJump', 'Total'],
-		pagerCount: 7,
-		pageSizes: [
-			{ label: '50条', value: 50 },
-			{ label: '100条', value: 100 },
-			{ label: '500条', value: 500 },
-			{ label: '1000条', value: 1000 },
-			{ label: '10000条', value: 10000 },
-			{ label: '10万条', value: 100000 }
-		],
-		align: 'right',
-		border: true,
-		background: false,
-		perfect: true,
-		autoHidden: false,
-		enabled: true
-	},
-	toolbar: {
-		custom: {
-			immediate: false
-		}
-	},
-	form: {},
-	modal: {
-		lockView: true,
-		resize: true,
-		mask: true,
-		duration: 3000,
-		dblclickZoom: true,
-		showTitleOverflow: true
-	},
-	icon: {},
-	loading: {
-		icon: 'vxe-icon-spinner roll',
-		text: '加载中...'
+		virtualXConfig: { enabled: false, gt: 40, oSize: 0 },
+		virtualYConfig: { enabled: true, gt: 60, oSize: 0 }
 	},
 	moneyConfig: {
 		enabled: false,

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

@@ -6,9 +6,9 @@
 			</vxe-checkbox-group>
 		</template>
 		<template v-else-if="!redit && showType">
-			<div v-for="roption in rprops.options" :key="roption">
+			<template v-for="roption in rprops.options" :key="roption">
 				<sh-tag v-if="roptionShow(roption)" :color="roption.tagColor || rprops.tagColor" :type="roption.tagType || rprops.tagType">{{ roption.label }}</sh-tag>
-			</div>
+			</template>
 		</template>
 		<template v-else>
 			<span v-html="renderText"></span>
@@ -27,10 +27,10 @@ export default defineComponent({
 		const { proxy } = getCurrentInstance()
 		const useCell = cellHooks(props, context, proxy)
 
-		const showType = computed(() => props.rprops.showType === 'tag')
+		const showType = computed(() => useCell.rprops.value.showType === 'tag')
 
 		const roptionShow = roption => {
-			return useCell.renderText.value.split(props.rprops.split).includes(roption.label)
+			return useCell.renderText.value.split(useCell.rprops.value.split).includes(roption.label)
 		}
 
 		return {

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

@@ -1,7 +1,7 @@
 <template>
 	<span class="vxe-render--inner">
 		<template v-for="renderBtn in renderBtns" :key="renderBtn.code">
-			<sh-button
+			<vxe-button
 				v-if="isBtnRender(renderBtn)"
 				v-ripple
 				:type="rprops.type"
@@ -10,7 +10,7 @@
 				:status="getBtnContent(renderBtn).status"
 				@click="vxeBtnCallback($event, renderBtn)">
 				{{ getBtnContent(renderBtn).content }}
-			</sh-button>
+			</vxe-button>
 		</template>
 	</span>
 </template>
@@ -29,7 +29,7 @@ export default defineComponent({
 
 		const renderBtns = computed(() => {
 			let renderBtns = []
-			let { btnContain, btnsConfig } = props.rprops
+			let { btnContain, btnsConfig } = useCell.rprops.value
 			if (btnsConfig && Array.isArray(btnsConfig)) {
 				renderBtns = btnsConfig
 			}

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

@@ -7,18 +7,22 @@
 <script>
 import { computed, defineComponent, getCurrentInstance } from 'vue'
 import cellProps from '../mixin/cell-props'
+import cellHooks from '../mixin/cell-hooks'
 export default defineComponent({
 	name: 'VxeRenderImg',
 	props: cellProps,
 	setup(props, context) {
 		const { proxy } = getCurrentInstance()
 		const { $vUtils } = proxy
-		const imgSrc = computed(() => $vUtils.get(props.rdata, props.rkey))
+		const useCell = cellHooks(props, context, proxy)
+
+		const imgSrc = computed(() => $vUtils.get(useCell.rdata.value, useCell.rkey.value))
 		const imgHeight = computed(() => {
-			return props.rprops.square ? props.rprops.width : props.rprops.height
+			return useCell.rprops.value.square ? useCell.rprops.value.width : useCell.rprops.value.height
 		})
 
 		return {
+			...useCell,
 			imgSrc,
 			imgHeight
 		}

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

@@ -33,11 +33,11 @@ export default defineComponent({
 		const { $vUtils } = proxy
 		const useCell = cellHooks(props, context, proxy)
 
-		const controlButton = computed(() => props.rprops.control && ['number', 'float', 'integer'].includes(props.rprops.type))
+		const controlButton = computed(() => useCell.rprops.value.control && ['number', 'float', 'integer'].includes(useCell.rprops.value.type))
 
 		// 输入框数字加减控制
 		const vxeControlClick = bol => {
-			const { step = 1, min, max } = props.rprops
+			const { step = 1, min, max } = useCell.rprops.value
 			let value = bol ? $vUtils.add(useCell.renderValue.value, step) : $vUtils.subtract(useCell.renderValue.value, step)
 			if ((min !== undefined && value < min) || (max !== undefined && value > max)) return
 			useCell.setRenderValue(value)

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

@@ -1,7 +1,7 @@
 <template>
 	<span class="vxe-render--inner" :class="{ 'form-render': rform, 'td-render': !rform, 'td-all': rprops.bill }">
 		<template v-if="redit || isEditAll">
-			<vxe-input v-model="renderValue" type="number" v-bind="rprops" :size="rsize" :immediate="false" @change="vxeInputChange" @blur="vxeBlurCallback" @clear="vxeBlurCallback" />
+			<vxe-number-input v-model="renderText" v-bind="rprops" :size="rsize" :immediate="false" @change="vxeInputChange" @blur="vxeMoneyCallback" @clear="vxeMoneyCallback" />
 		</template>
 		<template v-else-if="rprops.bill">
 			<template v-for="(bil, bilindex) in billGroups" :key="bilindex">
@@ -9,7 +9,7 @@
 			</template>
 		</template>
 		<template v-else>
-			<span class="blue" v-html="renderText"></span>
+			<span class="blue" v-html="cellFormatValue"></span>
 		</template>
 	</span>
 </template>
@@ -23,10 +23,26 @@ export default defineComponent({
 	props: cellProps,
 	setup(props, context) {
 		const { proxy } = getCurrentInstance()
+		const { $vUtils } = proxy
 		const useCell = cellHooks(props, context, proxy)
 
+		const cellFormatValue = computed(() => {
+			let cellValue = useCell.renderText.value
+			if (useCell.rprops.value.commafy) {
+				return $vUtils.commafy(Number(cellValue), { digits: useCell.rprops.value.digits })
+			}
+			return cellValue
+		})
+
+		const vxeMoneyCallback = async ({ value, $event }) => {
+			let cellValue = $vUtils.multiply(value, useCell.rprops.value.moneyUnit || 1)
+			useCell.setRenderValue(cellValue)
+		}
+
 		return {
-			...useCell
+			...useCell,
+			cellFormatValue,
+			vxeMoneyCallback
 		}
 	}
 })

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

@@ -6,9 +6,9 @@
 			</vxe-radio-group>
 		</template>
 		<template v-else-if="!redit && showType">
-			<div v-for="roption in rprops.options" :key="roption">
+			<template v-for="roption in rprops.options" :key="roption">
 				<sh-tag v-if="roptionShow(roption)" :color="roption.tagColor || rprops.tagColor" :type="roption.tagType || rprops.tagType">{{ roption.label }}</sh-tag>
-			</div>
+			</template>
 		</template>
 		<template v-else>
 			<span v-html="renderText"></span>
@@ -27,10 +27,10 @@ export default defineComponent({
 		const { proxy } = getCurrentInstance()
 		const useCell = cellHooks(props, context, proxy)
 
-		const showType = computed(() => props.rprops.showType === 'tag')
+		const showType = computed(() => useCell.rprops.value.showType === 'tag')
 
 		const roptionShow = roption => {
-			return useCell.renderText.value.split(props.rprops.split).includes(roption.label)
+			return useCell.renderText.value.split(useCell.rprops.value.split).includes(roption.label)
 		}
 
 		return {

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

@@ -31,11 +31,11 @@ export default defineComponent({
 		const { proxy } = getCurrentInstance()
 		const useCell = cellHooks(props, context, proxy)
 
-		const showType = computed(() => props.rprops.showType === 'tag')
+		const showType = computed(() => useCell.rprops.value.showType === 'tag')
 
 		const showTags = computed(() => {
 			const renderValue = useCell.renderValue.value
-			const { options = [], multiple } = props.rprops
+			const { options = [], multiple } = useCell.rprops.value
 			if (multiple && Array.isArray(renderValue)) {
 				return options.filter(option => renderValue.includes(option.value))
 			}

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

@@ -6,7 +6,7 @@
 			v-bind="rprops"
 			:size="rsize"
 			:data-sourse="renderValue"
-			@edit-closed="vxeInputCallback"
+			@edit-closed="vxeTableCallback"
 			@toolbaroption="onToolbaroption"></sh-table>
 	</span>
 </template>
@@ -24,22 +24,23 @@ export default defineComponent({
 		const shTableRef = ref()
 
 		// 输入框回调
-		const vxeInputCallback = ({ $table, row }) => {
-			driveBackData()
-		}
+		const vxeTableCallback = params => {}
+
 		// 新增、删除行回调
 		const onToolbaroption = (code, data, $table) => {
 			driveBackData()
 		}
+
 		// 回填数据
 		const driveBackData = value => {
-			useCell.setRenderValue(shTableRef.value.getFullData(), true)
+			let cellValue = shTableRef.value.getFullData()
+			useCell.setRenderValue(cellValue)
 		}
 
 		return {
 			...useCell,
 			shTableRef,
-			vxeInputCallback,
+			vxeTableCallback,
 			onToolbaroption
 		}
 	}

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

@@ -23,13 +23,13 @@ export default defineComponent({
 
 		// 禁用事件
 		const vxeDisabledMethod = ({ date, viewType }) => {
-			let { startTime, endTime } = props.rprops
+			let { startTime, endTime } = useCell.rprops.value
 			if (startTime) {
-				startTime = $vUtils.format(startTime, props.rdata)
+				startTime = $vUtils.format(startTime, useCell.rdata.value)
 				let { done, time } = $vUtils.getDateDiff(startTime, date)
 				return startTime ? !done : false
 			} else if (endTime) {
-				endTime = $vUtils.format(endTime, props.rdata)
+				endTime = $vUtils.format(endTime, useCell.rdata.value)
 				let { done, time } = $vUtils.getDateDiff(endTime, date)
 				return done
 			}

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

@@ -31,7 +31,7 @@ export default defineComponent({
 
 		// 输入框回调
 		const vxeTreeCallback = (selectedKeys, selectedRows) => {
-			let { valueKeys, multiple } = props.rprops
+			let { valueKeys, multiple } = useCell.rprops.value
 			let rvalue = selectedKeys
 			if (!multiple) {
 				rvalue = selectedKeys[0] || ''

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

@@ -1,9 +1,9 @@
 <template>
-	<span v-html="renderText"></span>
+	<span v-html="cellFormatValue"></span>
 </template>
 
 <script>
-import { defineComponent, getCurrentInstance } from 'vue'
+import { computed, defineComponent, getCurrentInstance } from 'vue'
 import cellProps from '../mixin/cell-props'
 import cellHooks from '../mixin/cell-hooks'
 export default defineComponent({
@@ -11,10 +11,20 @@ export default defineComponent({
 	props: cellProps,
 	setup(props, context) {
 		const { proxy } = getCurrentInstance()
+		const { $vUtils } = proxy
 		const useCell = cellHooks(props, context, proxy)
 
+		const cellFormatValue = computed(() => {
+			let cellValue = useCell.renderText.value
+			if (useCell.rprops.value.commafy) {
+				return $vUtils.commafy(Number(cellValue), { digits: useCell.rprops.value.digits })
+			}
+			return cellValue
+		})
+
 		return {
-			...useCell
+			...useCell,
+			cellFormatValue
 		}
 	}
 })

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

@@ -5,12 +5,12 @@
 		</template>
 	</div>
 	<template v-else>
-		<span class="blue" v-html="renderText"></span>
+		<span class="blue" v-html="cellFormatValue"></span>
 	</template>
 </template>
 
 <script>
-import { defineComponent, getCurrentInstance } from 'vue'
+import { computed, defineComponent, getCurrentInstance } from 'vue'
 import cellProps from '../mixin/cell-props'
 import cellHooks from '../mixin/cell-hooks'
 export default defineComponent({
@@ -18,10 +18,20 @@ export default defineComponent({
 	props: cellProps,
 	setup(props, context) {
 		const { proxy } = getCurrentInstance()
+		const { $vUtils } = proxy
 		const useCell = cellHooks(props, context, proxy)
 
+		const cellFormatValue = computed(() => {
+			let cellValue = useCell.renderText.value
+			if (useCell.rprops.value.commafy) {
+				return $vUtils.commafy(Number(cellValue), { digits: useCell.rprops.value.digits })
+			}
+			return cellValue
+		})
+
 		return {
-			...useCell
+			...useCell,
+			cellFormatValue
 		}
 	}
 })