sh-view 2.5.3 → 2.5.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sh-view",
-  "version": "2.5.3",
+  "version": "2.5.5",
   "description": "基于vxe-table二次封装",
   "main": "packages/index.js",
   "scripts": {
@@ -29,12 +29,12 @@
     "jszip": "^3.10.1",
     "popper.js": "^1.16.1",
     "resize-observer-polyfill": "^1.5.1",
-    "sh-tools": "^2.0.1",
+    "sh-tools": "^2.1.5",
     "tinymce": "^5.10.5",
     "vue": "^3.3.4",
     "vue-masonry": "^0.16.0",
     "vue-router": "^4.2.4",
-    "vxe-table": "^4.5.10",
+    "vxe-table": "^4.5.11",
     "vxe-table-plugin-export-pdf": "^3.0.4",
     "vxe-table-plugin-export-xlsx": "^3.0.5",
     "xe-clipboard": "^1.10.2",

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-result/index.vue

@@ -67,7 +67,7 @@ export default defineComponent({
 			return types.includes(props.type) ? props.type : 'info'
 		})
 		const resultTitle = computed(() => {
-			return typeof props.title === 'string' ? props.title : resultTitleMap[resultType.value]
+			return props.title ? props.title || resultTitleMap[resultType.value] : false
 		})
 		const resultIcon = computed(() => {
 			return resultIconMap[resultType.value]

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

@@ -165,7 +165,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, rtext)
+					$vUtils.set(row, property, ['$vMoney'].includes(rname) ? rtext : rvalue)
 				}
 			})
 		})
@@ -261,7 +261,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 配置时有效，单元格被激活编辑时会触发该事件

package/packages/components/global-components/sh-tree/components/table-tree.vue

@@ -1,6 +1,7 @@
 <template>
+	<sh-result v-if="queryErrorText" class="sh-tree-result" type="error" :title="false" :text="queryErrorText"></sh-result>
 	<vxe-grid
-		v-if="treeServerComplate && !queryErrorText"
+		v-else
 		ref="tableRef"
 		:key="renderKey"
 		:class="{ 'sh-vxe-tree-table': true, 'is--hidecheck': globalConfig.checkHide }"
@@ -15,7 +16,6 @@
 			<sh-empty :icon="emptyIcon" :content="emptyText"></sh-empty>
 		</template>
 	</vxe-grid>
-	<sh-result v-else-if="queryErrorText" class="sh-tree-result" type="error" :text="queryErrorText"></sh-result>
 </template>
 
 <script>
@@ -109,7 +109,7 @@ export default defineComponent({
 		}
 		// 获取请求配置数据
 		const getServerConfigDataSourse = async () => {
-			const { serverConfig, serverParams, parseParams, queryCacheParams, serverCache, valueData, globalConfig, multiple, nodeKey, labelField } = props
+			const { serverConfig, serverParams, parseParams, serverCache, valueData, globalConfig, multiple, nodeKey, labelField } = props
 			if (!serverConfig.url) {
 				treeServerComplate.value = true
 				return true
@@ -123,7 +123,7 @@ export default defineComponent({
 					params[key] = $vUtils.format(params[key], valueData)
 				}
 			})
-			if (!$vUtils.isEqual(queryCacheParams, params)) {
+			if (!$vUtils.isEqual(queryCacheParams.value, params)) {
 				treeServerComplate.value = false
 			}
 			if (serverCache && treeServerComplate.value) {

package/packages/components/global-components/sh-tree/css/index.scss

@@ -34,10 +34,6 @@
 }
 
 .sh-tree-select-dropdown {
-    .tree-skeleton{
-        width: 100%;
-        height: 230px;
-    }
 }
 
 .sh-vxe-tree-table{
@@ -49,6 +45,4 @@
 
 .sh-tree-result{
     position: relative;
-    top: 50%;
-    transform: translateY(-60%);
 }

package/packages/components/global-components/sh-tree/index.vue

@@ -13,7 +13,6 @@
 					</div>
 					<div class="sh-tree-select-dropdown-content">
 						<table-tree v-if="pulldownDrop" v-bind="tableTreeProps" @datacall="onDataCall" @select="onChange"></table-tree>
-						<div v-else class="tree-skeleton"></div>
 					</div>
 				</template>
 			</vxe-pulldown>

package/packages/vxeTable/render/globalRenders.jsx

@@ -69,7 +69,7 @@ const getFixedProp = (renderOpts, params) => {
 		name = props.colRenderName
 	}
 	let rturnProps = Object.assign({}, defaultPublicProps, defaultProps[name], props)
-	let transKeys = ['disabled', 'multiple', 'isLeaf', 'commafy', 'border', 'calculate']
+	let transKeys = ['transfer', 'disabled', 'multiple', 'isLeaf', 'commafy', 'border', 'filterable', 'showWordCount', 'editable']
 	transKeys.forEach(key => {
 		if (rturnProps[key] !== null && rturnProps[key] !== undefined && typeof rturnProps[key] === 'string') {
 			rturnProps[key] = Boolean(+rturnProps[key])

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)