sh-view 2.5.4 → 2.5.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sh-view",
-  "version": "2.5.4",
+  "version": "2.5.6",
   "description": "基于vxe-table二次封装",
   "main": "packages/index.js",
   "scripts": {
@@ -29,7 +29,7 @@
     "jszip": "^3.10.1",
     "popper.js": "^1.16.1",
     "resize-observer-polyfill": "^1.5.1",
-    "sh-tools": "^2.1.4",
+    "sh-tools": "^2.1.5",
     "tinymce": "^5.10.5",
     "vue": "^3.3.4",
     "vue-masonry": "^0.16.0",

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

@@ -63,15 +63,8 @@ export default function (props, context, proxy, isForm) {
 	}
 	// 表单项编辑回调
 	const onFormEditClosed = async (obj, renderbox) => {
-		let { property, data } = obj
-		if (props.valid && formRules.value[property]) {
-			let valerr = await formRef.value.validateField(property)
-			if (!valerr) {
-				formRef.value.clearValidate(property)
-			}
-		}
 		emit('edit-closed', obj, renderbox)
-		Object.assign(props.data, data)
+		Object.assign(props.data, obj.data)
 	}
 	// 表单校验不通过
 	const onFormSubmitInvalid = params => {

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

@@ -71,12 +71,9 @@ export default function (props, context, proxy, isGrid) {
 	const tableViewData = computed(() => tableFilterData.value || props.dataSourse)
 	const tablePrevColumns = computed(() => {
 		let prevColumns = []
-		let prevFields = ['seq', 'selectType']
-		prevFields.forEach(prev => {
-			if (tableGlobalConfig.value[prev]) {
-				prevColumns.push(columnsMapDefault[prev])
-			}
-		})
+		const { seq, selectType } = tableGlobalConfig.value
+		if (seq) prevColumns.push(columnsMapDefault.seq)
+		if (selectType) prevColumns.push(columnsMapDefault[selectType])
 		return prevColumns
 	})
 	const tableColumns = computed(() => {
@@ -155,7 +152,8 @@ export default function (props, context, proxy, isGrid) {
 		return selectionRows.value || []
 	}
 	// 获取全部数据
-	const getFullData = () => {
+	// visible为true获取视图数据
+	const getFullData = ({ visible }) => {
 		let data = $vUtils.clone(tableRef.value.getTableData().fullData, true)
 		const columns = tableRef.value.getColumns()
 		let rnameColumns = columns.filter(col => col.rname)
@@ -165,7 +163,7 @@ export default function (props, context, proxy, isGrid) {
 				let cellValue = $vUtils.get(row, property)
 				if (!$vUtils.isNone(cellValue)) {
 					let { rvalue, rtext } = $vUtils.formatRender(cellValue, property, row, rname, rprops, proxy)
-					$vUtils.set(row, property, ['$vMoney'].includes(rname) ? rtext : rvalue)
+					$vUtils.set(row, property, visible || ['$vMoney'].includes(rname) ? rtext : rvalue)
 				}
 			})
 		})
@@ -261,7 +259,13 @@ export default function (props, context, proxy, isGrid) {
 	}
 	// 只对 edit-config 配置时有效，单元格编辑状态下被关闭时会触发该事件
 	const onEditClosed = params => {
-		// 此操作火狐浏览器（bug(vxe):编辑后不触发渲染器的blur问题）待后续修复,目前没有啥好办法
+		// 此操作火狐浏览器（bug(vxe):编辑后不触发渲染器的blur问题）
+		let { row, column } = params
+		let editModel = $vUtils.get(column, 'params.__RowEditModelValue')
+		if (editModel !== undefined) {
+			$vUtils.set(row, column.property, editModel)
+			delete column.params.__RowEditModelValue
+		}
 		emit('edit-closed', params)
 	}
 	// 只对 edit-config 配置时有效，单元格被激活编辑时会触发该事件
@@ -391,13 +395,10 @@ export default function (props, context, proxy, isGrid) {
 					searchFields.push({ rkey: col.property, rname: renderObj.name, rprops: Object.assign({}, renderObj.props, col.rprops) })
 				}
 			})
-			filterData = $vUtils.searchTree(props.dataSourse, row => {
+			let fullVisibleData = getFullData({ visible: true })
+			filterData = $vUtils.searchTree(fullVisibleData, row => {
 				return searchFields.some(item => {
 					let cellValue = $vUtils.get(row, item.rkey)
-					if ($vxePluginNames.expendRenders && $vxePluginNames.expendRenders.includes(item.rname)) {
-						let { rtext } = $vUtils.formatRender(cellValue, item.rkey, row, item.rname, item.rprops, proxy)
-						return String(rtext).toLowerCase().indexOf(filterText) > -1
-					}
 					return $vUtils.trim(cellValue).toLowerCase().indexOf(filterText) > -1
 				})
 			})

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

@@ -53,7 +53,12 @@ export default function (props, context, proxy) {
 	}
 
 	// 输入框变化
-	const vxeInputChange = async ({ value, $event }) => {}
+	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)