sh-view 2.8.1 → 2.8.2

package/packages/utils/resize.js

@@ -1,70 +1,69 @@
-import { utils } from 'sh-tools'
-
-let resizeTimeout = null
-const eventStore = []
-const defaultInterval = 500
-
-function eventHandle() {
-	if (eventStore.length) {
-		eventStore.forEach(item => {
-			item.tarList.forEach(observer => {
-				const { target, width, heighe } = observer
-				const clientWidth = target.clientWidth
-				const clientHeight = target.clientHeight
-				const rWidth = clientWidth && width !== clientWidth
-				const rHeight = clientHeight && heighe !== clientHeight
-				if (rWidth || rHeight) {
-					observer.width = clientWidth
-					observer.heighe = clientHeight
-					setTimeout(item.callback)
-				}
-			})
-		})
-		eventListener()
-	}
-}
-
-function eventListener() {
-	clearTimeout(resizeTimeout)
-	resizeTimeout = setTimeout(eventHandle, defaultInterval)
-}
-
-export class XEResizeObserver {
-	// target: Element, width: number, heighe: number
-	tarList = []
-	callback = () => {}
-	constructor(callback) {
-		this.callback = callback
-	}
-	observe(target) {
-		if (target) {
-			const { tarList } = this
-			if (!tarList.some(observer => observer.target === target)) {
-				tarList.push({
-					target,
-					width: target.clientWidth,
-					heighe: target.clientHeight
-				})
-			}
-			if (!eventStore.length) {
-				eventListener()
-			}
-			if (!eventStore.some(item => item === this)) {
-				eventStore.push(this)
-			}
-		}
-	}
-	unobserve(target) {
-		utils.remove(eventStore, item => item.tarList.some(observer => observer.target === target))
-	}
-	disconnect() {
-		utils.remove(eventStore, item => item === this)
-	}
-}
-
-export function createResizeEvent(callback) {
-	if (window.ResizeObserver) {
-		return new window.ResizeObserver(callback)
-	}
-	return new XEResizeObserver(callback)
-}
+import { utils } from 'sh-tools'
+
+let resizeTimeout = null
+const eventStore = []
+const defaultInterval = 500
+
+function eventHandle() {
+	if (eventStore.length) {
+		eventStore.forEach(item => {
+			item.tarList.forEach(observer => {
+				const { target, width, heighe } = observer
+				const clientWidth = target.clientWidth
+				const clientHeight = target.clientHeight
+				const rWidth = clientWidth && width !== clientWidth
+				const rHeight = clientHeight && heighe !== clientHeight
+				if (rWidth || rHeight) {
+					observer.width = clientWidth
+					observer.heighe = clientHeight
+					setTimeout(item.callback)
+				}
+			})
+		})
+		eventListener()
+	}
+}
+
+function eventListener() {
+	clearTimeout(resizeTimeout)
+	resizeTimeout = setTimeout(eventHandle, defaultInterval)
+}
+
+export class XEResizeObserver {
+	// target: Element, width: number, heighe: number
+	constructor(callback) {
+		this.tarList = []
+		this.callback = callback
+	}
+	observe(target) {
+		if (target) {
+			const { tarList } = this
+			if (!tarList.some(observer => observer.target === target)) {
+				tarList.push({
+					target,
+					width: target.clientWidth,
+					heighe: target.clientHeight
+				})
+			}
+			if (!eventStore.length) {
+				eventListener()
+			}
+			if (!eventStore.some(item => item === this)) {
+				eventStore.push(this)
+			}
+		}
+	}
+	unobserve(target) {
+		utils.remove(eventStore, item => item.tarList.some(observer => observer.target === target))
+	}
+	disconnect() {
+		utils.remove(eventStore, item => item === this)
+	}
+}
+
+export function createResizeEvent(callback) {
+	if (window.ResizeObserver) {
+		return new window.ResizeObserver(callback)
+	}
+	return new XEResizeObserver(callback)
+}

package/packages/utils/transfer-queue.js

@@ -1,12 +1,12 @@
-let transferIndex = 0
-let lastVisibleIndex = 0
-
-function transferIncrease() {
-	transferIndex++
-}
-
-function lastVisibleIncrease() {
-	lastVisibleIndex++
-}
-
-export { transferIndex, transferIncrease, lastVisibleIndex, lastVisibleIncrease }
+let transferIndex = 0
+let lastVisibleIndex = 0
+
+function transferIncrease() {
+	transferIndex++
+}
+
+function lastVisibleIncrease() {
+	lastVisibleIndex++
+}
+
+export { transferIndex, transferIncrease, lastVisibleIndex, lastVisibleIncrease }

package/packages/vxeTable/index.js

@@ -1,184 +1,193 @@
-import VXETable from 'vxe-table'
-import './css/index.scss'
-import VXETablePluginExportXLSX from './plugins/export'
-import VXETablePluginExportPDF from 'vxe-table-plugin-export-pdf'
-import XEClipboard from 'xe-clipboard'
-import { publicRenders, extraRenders, filterRenders, publicRendersNames } from './render/globalRenders.jsx'
-
-let vxeOptions = {
-	zIndex: 1500,
-	version: 0,
-	input: {
-		controls: false,
-		clearable: true
-	},
-	select: {
-		optionConfig: {
-			useKey: false,
-			keyField: 'value'
-		}
-	},
-	table: {
-		fit: true,
-		stripe: false,
-		border: 'full',
-		round: false,
-		keepSource: false,
-		minHeight: 30,
-		rowConfig: {
-			useKey: false,
-			keyField: '_XID',
-			isCurrent: true,
-			isHover: true
-		},
-		sortConfig: {
-			multiple: false,
-			chronological: false,
-			trigger: 'cell'
-		},
-		radioConfig: {
-			strict: true,
-			highlight: true
-		},
-		checkboxConfig: {
-			checkStrictly: false,
-			highlight: true,
-			reserve: true,
-			checkAll: false
-		},
-		tooltipConfig: {
-			showAll: false,
-			theme: 'dark',
-			enterable: true
-		},
-		treeConfig: {
-			indent: 20,
-			showLine: false,
-			expandAll: false,
-			expandRowKeys: [],
-			accordion: true,
-			showIcon: true,
-			childrenField: 'children',
-			// 若为平行数据结构不是嵌套结构则使用下面配置 transform 需要为true
-			transform: false,
-			rowField: 'id',
-			parentField: 'parentId'
-		},
-		mouseConfig: {
-			selected: true
-		},
-		keyboardConfig: {
-			isArrow: true,
-			isEsc: true,
-			isDel: false,
-			isEnter: true,
-			isTab: true,
-			isEdit: true,
-			isChecked: true,
-			enterToTab: false
-		},
-		editConfig: {
-			enabled: true,
-			trigger: 'click',
-			mode: 'cell'
-		},
-		customConfig: {
-			storage: true
-		},
-		seqConfig: {
-			startIndex: 1,
-			seqMethod: obj => {
-				let { $table, seq, $seq, $$seq, $rowIndex } = obj
-				const grid = $table.xegrid || {}
-				const propsData = $table.props || {}
-				const { seqConfig, treeConfig } = propsData
-				const tablePage = grid.props?.pagerConfig?.enabled
-				if ($$seq) {
-					return $$seq
-				} else if (tablePage) {
-					const { pagerConfig } = grid.props
-					const pageStart = seqConfig?.startIndex || (+pagerConfig.pageSize || 50) * ((+pagerConfig.currentPage || 1) - 1)
-					return treeConfig && $seq ? Number(pageStart) + Number($seq) + '.' + seq : Number(pageStart) + Number(seq)
-				} else if (treeConfig) {
-					return $seq ? $seq + '.' + seq : seq
-				}
-				return seq === -1 ? $rowIndex + (seqConfig.startIndex || 1) : seq
-			}
-		},
-		resizeConfig: {
-			refreshDelay: 200
-		},
-		scrollX: {
-			enabled: true,
-			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
-	},
-	form: {},
-	modal: {
-		lockView: true,
-		resize: true,
-		mask: true,
-		duration: 3000,
-		dblclickZoom: true,
-		showTitleOverflow: true
-	},
-	icon: {},
-	loading: {
-		icon: 'vxe-icon-spinner roll',
-		text: '加载中...'
-	}
-}
-
-let vxePdfOptions = {
-	// 设置全局默认字体
-	fontName: 'SourceHanSans-Normal',
-	beforeMethod: ({ $pdf, options, columns, datas }) => {}
-}
-
-VXETable.renderer.mixin(publicRenders)
-VXETable.renderer.mixin(extraRenders)
-VXETable.renderer.mixin(filterRenders)
-VXETable.use(VXETablePluginExportXLSX)
-VXETable.use(VXETablePluginExportPDF)
-
-const index = {
-	install(Vue, { vxeOption = {}, vxePdfOption = {} }) {
-		let setupOption = Object.assign(vxeOptions, vxeOption)
-		let pdfSetUpOption = Object.assign(vxePdfOptions, vxePdfOption)
-		VXETable.setup(setupOption)
-		VXETablePluginExportPDF.setup(pdfSetUpOption)
-		Vue.use(VXETable)
-		Vue.config.globalProperties.$vTable = VXETable
-		Vue.config.globalProperties.$vTableSetup = setupOption
-		Vue.config.globalProperties.$vxePluginNames = publicRendersNames
-		Vue.config.globalProperties.$vClipboard = XEClipboard
-	}
-}
-export default index
+import VXETable from 'vxe-table'
+import './css/index.scss'
+import VXETablePluginExportXLSX from './plugins/export'
+import VXETablePluginExportPDF from 'vxe-table-plugin-export-pdf'
+import XEClipboard from 'xe-clipboard'
+import ShValidators from 'sh-tools/packages/utils/validate'
+import { publicRenders, extraRenders, filterRenders, publicRendersNames } from './render/globalRenders.jsx'
+
+let vxeOptions = {
+	zIndex: 1500,
+	version: 0,
+	input: {
+		controls: false,
+		clearable: true
+	},
+	select: {
+		optionConfig: {
+			useKey: false,
+			keyField: 'value'
+		}
+	},
+	table: {
+		fit: true,
+		stripe: false,
+		border: 'full',
+		round: false,
+		keepSource: false,
+		minHeight: 30,
+		rowConfig: {
+			useKey: false,
+			keyField: '_XID',
+			isCurrent: true,
+			isHover: true
+		},
+		sortConfig: {
+			multiple: false,
+			chronological: false,
+			trigger: 'cell'
+		},
+		radioConfig: {
+			strict: true,
+			highlight: true
+		},
+		checkboxConfig: {
+			checkStrictly: false,
+			highlight: true,
+			reserve: true,
+			checkAll: false
+		},
+		tooltipConfig: {
+			showAll: false,
+			theme: 'dark',
+			enterable: true
+		},
+		treeConfig: {
+			indent: 20,
+			showLine: false,
+			expandAll: false,
+			expandRowKeys: [],
+			accordion: true,
+			showIcon: true,
+			childrenField: 'children',
+			// 若为平行数据结构不是嵌套结构则使用下面配置 transform 需要为true
+			transform: false,
+			rowField: 'id',
+			parentField: 'parentId'
+		},
+		mouseConfig: {
+			selected: true
+		},
+		keyboardConfig: {
+			isArrow: true,
+			isEsc: true,
+			isDel: false,
+			isEnter: true,
+			isTab: true,
+			isEdit: true,
+			isChecked: true,
+			enterToTab: false
+		},
+		editConfig: {
+			enabled: true,
+			trigger: 'click',
+			mode: 'cell'
+		},
+		customConfig: {
+			storage: true
+		},
+		seqConfig: {
+			startIndex: 1,
+			seqMethod: obj => {
+				let { $table, seq, $seq, $$seq, $rowIndex } = obj
+				const grid = $table.xegrid || {}
+				const propsData = $table.props || {}
+				const { seqConfig, treeConfig } = propsData
+				const tablePage = grid.props?.pagerConfig?.enabled
+				if ($$seq) {
+					return $$seq
+				} else if (tablePage) {
+					const { pagerConfig } = grid.props
+					const pageStart = seqConfig?.startIndex || (+pagerConfig.pageSize || 50) * ((+pagerConfig.currentPage || 1) - 1)
+					return treeConfig && $seq ? Number(pageStart) + Number($seq) + '.' + seq : Number(pageStart) + Number(seq)
+				} else if (treeConfig) {
+					return $seq ? $seq + '.' + seq : seq
+				}
+				return seq === -1 ? $rowIndex + (seqConfig.startIndex || 1) : seq
+			}
+		},
+		resizeConfig: {
+			refreshDelay: 200
+		},
+		scrollX: {
+			enabled: true,
+			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
+	},
+	form: {},
+	modal: {
+		lockView: true,
+		resize: true,
+		mask: true,
+		duration: 3000,
+		dblclickZoom: true,
+		showTitleOverflow: true
+	},
+	icon: {},
+	loading: {
+		icon: 'vxe-icon-spinner roll',
+		text: '加载中...'
+	}
+}
+
+let vxePdfOptions = {
+	// 设置全局默认字体
+	fontName: 'SourceHanSans-Normal',
+	beforeMethod: ({ $pdf, options, columns, datas }) => {}
+}
+
+Object.keys(ShValidators).forEach(key => {
+	VXETable.validators.add(key, {
+		cellValidatorMethod({ cellValue }) {
+			return ShValidators[key](cellValue)
+		}
+	})
+})
+
+VXETable.renderer.mixin(publicRenders)
+VXETable.renderer.mixin(extraRenders)
+VXETable.renderer.mixin(filterRenders)
+VXETable.use(VXETablePluginExportXLSX)
+VXETable.use(VXETablePluginExportPDF)
+
+const index = {
+	install(Vue, { vxeOption = {}, vxePdfOption = {} }) {
+		let setupOption = Object.assign(vxeOptions, vxeOption)
+		let pdfSetUpOption = Object.assign(vxePdfOptions, vxePdfOption)
+		VXETable.setup(setupOption)
+		VXETablePluginExportPDF.setup(pdfSetUpOption)
+		Vue.use(VXETable)
+		Vue.config.globalProperties.$vTable = VXETable
+		Vue.config.globalProperties.$vTableSetup = setupOption
+		Vue.config.globalProperties.$vxePluginNames = publicRendersNames
+		Vue.config.globalProperties.$vClipboard = XEClipboard
+	}
+}
+export default index