sh-view 2.9.23 → 2.10.0

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "sh-view",
-	"version": "2.9.23",
+	"version": "2.10.0",
 	"description": "基于vxe-table二次封装,更包含Alert,Badge,Card,CodeEditor,Col,Corner,CountTo,Drawer,Empty,Form,Header,Icon,List,Loading,Modal,Noticebar,Poptip,Progress,PullRefresh,Query,Result,Row,Split,Grid,Table,Tabs,Tag,Toolbar,Tree,Upload,WaterFall,WaterMark等丰富组件库",
 	"main": "packages/index.js",
 	"typings": "types/index.d.ts",
@@ -36,12 +36,12 @@
 		"jszip": "^3.10.1",
 		"lunar-typescript": "^1.6.10",
 		"popper.js": "^1.16.1",
-		"sh-tools": "^2.2.19",
+		"sh-tools": "^2.3.0",
 		"vue": "^3.5.20",
 		"vue-masonry": "^0.16.0",
 		"vue-router": "^4.5.1",
 		"vxe-pc-ui": "^4.11.24",
-		"vxe-table": "^4.17.36"
+		"vxe-table": "^4.17.38"
 	},
 	"devDependencies": {
 		"@typescript-eslint/eslint-plugin": "^6.9.0",

package/packages/components/sh-form/js/useForm.js

@@ -92,6 +92,15 @@ export default function (props, context, proxy, isForm) {
 	const validate = callback => {
 		return formRef.value.validate(callback)
 	}
+	// 表单验证抛异常
+	const validateCatch = async callback => {
+		return formRef.value.validate(callback)
+		let validateResult = await formRef.value.validate(callback)
+		if (validateResult) {
+			return Promise.reject(validateResult)
+		}
+		return Promise.resolve()
+	}
 	// 初始化表单项
 	const initFormItems = () => {
 		let formItemsArr = props.items
@@ -211,6 +220,7 @@ export default function (props, context, proxy, isForm) {
 		formCollapsed,
 		formToggleBtnShow,
 		validate,
+		validateCatch,
 		formBtnCollapsed,
 		onFormSubmit,
 		onFormSubmitInvalid,

package/packages/components/sh-table/js/tableMethods.js

@@ -128,10 +128,14 @@ export const turnColumnItemFilters = (column, props) => {
 // 转换表头校验规则
 export const getFieldRules = (ori, rules) => {
 	if (isTrue(ori['renderRequire'])) {
+		let propsType = $vUtils.get(ori, 'renderProps.type')
 		let dataType = 'string'
 		let arrayType = ['$vCheckgroup', '$vUpload', '$vTable']
+		let numberType = ['$vProgress', '$vMoney']
 		if (arrayType.includes(ori['renderName']) || (['$vSelect', '$vTree'].includes(ori['renderName']) && isTrue(ori.renderProps?.multiple))) {
 			dataType = 'array'
+		} else if (numberType.includes(ori['renderName']) || ['number', 'integer', 'float'].includes(propsType)) {
+			dataType = 'number'
 		}
 		let defaultRuleOption = { message: getDefaultMessage(ori['renderName'], ori['title']), type: dataType, trigger: 'blur' }
 		let fieldRules = [{ required: true, ...defaultRuleOption }]

package/packages/components/sh-table/js/useTable.js

@@ -514,6 +514,14 @@ export default function (props, context, proxy, isGrid) {
 	const validate = (rows = true) => {
 		return tableRef.value.validate(rows)
 	}
+	// 表格验证抛异常
+	const validateCatch = async (rows = true) => {
+		let validateResult = await tableRef.value.validate(rows)
+		if (validateResult) {
+			return Promise.reject(validateResult)
+		}
+		return Promise.resolve()
+	}
 	// 刷新表格视图
 	const refreshRender = data => {
 		return tableRef.value.reloadData(data || props.dataSourse)
@@ -710,6 +718,7 @@ export default function (props, context, proxy, isGrid) {
 		setImportData,
 		refreshRender,
 		validate,
+		validateCatch,
 		getSelectionData,
 		getFullData,
 		handleTableAddRow,

package/packages/index.js

@@ -16,7 +16,7 @@ const install = function (root, option = {}) {
 	root.use(components, option)
 }
 
-const ShUI = {
+const ShView = {
 	name: packageConfig.name,
 	version: packageConfig.version,
 	install
@@ -27,10 +27,10 @@ let defaultBg = 'padding: 5px; color: #111; background: #f5f7f9; font-weight: bo
 let tagBg1 = 'padding: 5px; color: #fff; background: #8e2eff; font-weight: bold;'
 let tagBg2 = 'padding: 5px; color: #333; background: #ffee2e; font-weight: bold;'
 if ((window.navigator.language || window.navigator.browserLanguage).toLowerCase() === 'zh-cn') {
-	consInfo = `%c由%c${ShUI.name}%c提供技术支持，版本%c${ShUI.version}%c`
+	consInfo = `%c由%c${ShView.name}%c提供技术支持，版本%c${ShView.version}%c`
 } else {
-	consInfo = `%cPowered by%c${ShUI.name}%c，version%c${ShUI.version}%c`
+	consInfo = `%cPowered by%c${ShView.name}%c，version%c${ShView.version}%c`
 }
 console.info(consInfo, defaultBg, tagBg1, defaultBg, tagBg2, defaultBg)
 
-export default ShUI
+export default ShView

package/packages/vxeTable/index.js

@@ -286,26 +286,8 @@ VXETable.renderer.mixin(filterRenders)
 // 便捷化全局提示
 const statusList = ['info', 'success', 'warning', 'error']
 const vModal = VXEUI.modal
-let vMessage = {
-	confirm: options => {
-		return new Promise(async resolve => {
-			let opts = Object.assign({}, uiOptions.message, typeof options === 'string' ? { content: options } : options)
-			let type = await vModal.confirm({ showHeader: Boolean(opts.title), ...opts })
-			if (type === 'confirm') resolve(type)
-		})
-	}
-}
+let vMessage = {}
 let vNotice = {}
-statusList.forEach(status => {
-	vMessage[status] = options => {
-		let opts = Object.assign({ status }, uiOptions.message, typeof options === 'string' ? { content: options } : options)
-		return vModal.message(opts)
-	}
-	vNotice[status] = options => {
-		let opts = Object.assign({ status }, uiOptions.message, typeof options === 'string' ? { content: options } : options)
-		return vModal.notification(opts)
-	}
-})
 
 const index = {
 	install(Vue, { uiOption, tableOption, pdfOption, xlsxOption, menuOption, editorOption }) {
@@ -324,6 +306,24 @@ const index = {
 		Vue.use(VXEUI)
 		Vue.use(VXETable)
 
+		vMessage.confirm = options => {
+			return new Promise(async resolve => {
+				let opts = Object.assign({}, vuiOption.message, typeof options === 'string' ? { content: options } : options)
+				let type = await vModal.confirm({ showHeader: Boolean(opts.title), ...opts })
+				if (type === 'confirm') resolve(type)
+			})
+		}
+		statusList.forEach(status => {
+			vMessage[status] = options => {
+				let opts = Object.assign({ status }, vuiOption.message, typeof options === 'string' ? { content: options } : options)
+				return vModal.message(opts)
+			}
+			vNotice[status] = options => {
+				let opts = Object.assign({ status }, vuiOption.message, typeof options === 'string' ? { content: options } : options)
+				return vModal.notification(opts)
+			}
+		})
+
 		Vue.config.globalProperties.$vUtils = utils
 		Vue.config.globalProperties.$vModal = vModal
 		Vue.config.globalProperties.$vMessage = vMessage
@@ -333,6 +333,9 @@ const index = {
 		Vue.config.globalProperties.$vUiSetup = vuiOption
 		Vue.config.globalProperties.$vTableSetup = vtableOption
 		Vue.config.globalProperties.$vxePluginNames = publicRendersNames
-	}
+	},
+	vModal,
+	vMessage,
+	vNotice
 }
 export default index

package/packages/vxeTable/render/globalRenders.jsx

@@ -271,8 +271,8 @@ const extraRenders = {
 		},
 		renderEdit(renderOpts, params) {
 			let field = params.row[params.column.property + 'field'] || params.column.property
-			let renderName = params.row[field + 'RenderName'] || ''
-			return renderName ? publicRenders[renderName].renderEdit(renderOpts, params) : publicRenders[renderName].renderDefault(renderOpts, params)
+			let renderName = params.row[field + 'RenderName'] || '$vInput'
+			return publicRenders[renderName].renderEdit(renderOpts, params)
 		},
 		renderItemContent(renderOpts, params) {
 			let field = params.data[params.property + 'field'] || params.property