sh-view 2.5.5 → 2.5.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sh-view",
-  "version": "2.5.5",
+  "version": "2.5.7",
   "description": "基于vxe-table二次封装",
   "main": "packages/index.js",
   "scripts": {

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)
 				}
 			})
 		})
@@ -397,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/cell/vxe-render-code.vue

@@ -1,28 +1,36 @@
-<template>
-	<span class="vxe-render--inner" :class="{ 'form-render': rform, 'td-render': !rform }">
-		<template v-if="redit || isEditAll">
-			<sh-code-editor v-model="renderValue" v-bind="rprops" @change="vxeInputChange" @blur="vxeBlurCallback"></sh-code-editor>
-		</template>
-		<template v-else>
-			<span>{{ renderText }}</span>
-		</template>
-	</span>
-</template>
-
-<script>
-import { defineComponent, getCurrentInstance } from 'vue'
-import cellProps from '../mixin/cell-props'
-import cellHooks from '../mixin/cell-hooks'
-export default defineComponent({
-	name: 'VxeRenderCode',
-	props: cellProps,
-	setup(props, context) {
-		const { proxy } = getCurrentInstance()
-		const useCell = cellHooks(props, context, proxy)
-
-		return {
-			...useCell
-		}
-	}
-})
-</script>
+<template>
+	<span class="vxe-render--inner" :class="{ 'form-render': rform, 'td-render': !rform }">
+		<template v-if="redit || isEditAll">
+			<span v-if="rprops.prefixText && rform" class="prefix">
+				<vxe-button v-if="prefixButton" v-bind="psButtonConfig" @click="vxeInputPrefixClick">{{ rprops.prefixText }}</vxe-button>
+				<span v-else @click="vxeInputPrefixClick">{{ rprops.prefixText }}</span>
+			</span>
+			<sh-code-editor v-model="renderValue" v-bind="rprops" @change="vxeInputChange" @blur="vxeBlurCallback"></sh-code-editor>
+			<span v-if="rprops.suffixText && rform" class="suffix">
+				<vxe-button v-if="suffixButton" v-bind="psButtonConfig" @click="vxeInputSuffixClick">{{ rprops.suffixText }}</vxe-button>
+				<span v-else @click="vxeInputSuffixClick">{{ rprops.suffixText }}</span>
+			</span>
+		</template>
+		<template v-else>
+			<span>{{ renderText }}</span>
+		</template>
+	</span>
+</template>
+
+<script>
+import { defineComponent, getCurrentInstance } from 'vue'
+import cellProps from '../mixin/cell-props'
+import cellHooks from '../mixin/cell-hooks'
+export default defineComponent({
+	name: 'VxeRenderCode',
+	props: cellProps,
+	setup(props, context) {
+		const { proxy } = getCurrentInstance()
+		const useCell = cellHooks(props, context, proxy)
+
+		return {
+			...useCell
+		}
+	}
+})
+</script>

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

@@ -1,83 +1,53 @@
-<template>
-	<span class="vxe-render--inner" :class="{ 'form-render': rform, 'td-render': !rform, 'flex-render': controlButton }">
-		<template v-if="redit || isEditAll">
-			<span v-if="rprops.prefixText && rform" class="prefix">
-				<vxe-button v-if="prefixButton" v-bind="psButtonConfig" @click="vxeInputPrefixClick">{{ rprops.prefixText }}</vxe-button>
-				<span v-else @click="vxeInputPrefixClick">{{ rprops.prefixText }}</span>
-			</span>
-			<span v-else-if="controlButton" class="control-btn before" @click="vxeControlClick(false)">-</span>
-			<vxe-input v-model="renderValue" v-bind="rprops" :size="rsize" @change="vxeInputChange" @blur="vxeBlurCallback" @clear="vxeBlurCallback"></vxe-input>
-			<span v-if="rprops.suffixText && rform" class="suffix">
-				<vxe-button v-if="suffixButton" v-bind="psButtonConfig" @click="vxeInputSuffixClick">{{ rprops.suffixText }}</vxe-button>
-				<span v-else @click="vxeInputSuffixClick">{{ rprops.suffixText }}</span>
-			</span>
-			<span v-else-if="controlButton" class="control-btn after" @click="vxeControlClick(true)">+</span>
-		</template>
-		<template v-else>
-			<span v-if="rprops.prefixText && renderText" class="prefix">{{ rprops.prefixText }}</span>
-			<span v-html="renderText"></span>
-			<span v-if="rprops.suffixText && renderText" class="suffix">{{ rprops.suffixText }}</span>
-		</template>
-	</span>
-</template>
-
-<script>
-import { computed, defineComponent, getCurrentInstance } from 'vue'
-import cellProps from '../mixin/cell-props'
-import cellHooks from '../mixin/cell-hooks'
-export default defineComponent({
-	name: 'VxeRenderInput',
-	props: cellProps,
-	setup(props, context) {
-		const { proxy } = getCurrentInstance()
-		const { $vUtils } = proxy
-		const useCell = cellHooks(props, context, proxy)
-
-		const controlButton = computed(() => props.rprops.control && ['number', 'float', 'integer'].includes(props.rprops.type))
-		const psButtonConfig = computed(() => {
-			return {
-				disabled: props.rprops.disabled,
-				size: props.rsize,
-				status: 'theme'
-			}
-		})
-		const prefixButton = computed(() => props.rprops.prefixType.toLowerCase() === 'button')
-		const suffixButton = computed(() => props.rprops.suffixType.toLowerCase() === 'button')
-
-		// 输入框前缀点击事件
-		const vxeInputPrefixClick = () => {
-			if (props.rprops.disabled) return
-			if (useCell.rform.value) {
-				let { $form } = props.rparams
-				$form.context.emit('prefix-click', props.rparams)
-			}
-		}
-		// 输入框后缀点击事件
-		const vxeInputSuffixClick = () => {
-			if (props.rprops.disabled) return
-			if (useCell.rform.value) {
-				let { $form } = props.rparams
-				$form.context.emit('suffix-click', props.rparams)
-			}
-		}
-		// 输入框数字加减控制
-		const vxeControlClick = bol => {
-			const { step = 1, min, max } = props.rprops
-			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)
-		}
-
-		return {
-			...useCell,
-			controlButton,
-			psButtonConfig,
-			prefixButton,
-			suffixButton,
-			vxeInputPrefixClick,
-			vxeInputSuffixClick,
-			vxeControlClick
-		}
-	}
-})
-</script>
+<template>
+	<span class="vxe-render--inner" :class="{ 'form-render': rform, 'td-render': !rform, 'flex-render': controlButton }">
+		<template v-if="redit || isEditAll">
+			<span v-if="rprops.prefixText && rform" class="prefix">
+				<vxe-button v-if="prefixButton" v-bind="psButtonConfig" @click="vxeInputPrefixClick">{{ rprops.prefixText }}</vxe-button>
+				<span v-else @click="vxeInputPrefixClick">{{ rprops.prefixText }}</span>
+			</span>
+			<span v-else-if="controlButton" class="control-btn before" @click="vxeControlClick(false)">-</span>
+			<vxe-input v-model="renderValue" v-bind="rprops" :size="rsize" @change="vxeInputChange" @blur="vxeBlurCallback" @clear="vxeBlurCallback"></vxe-input>
+			<span v-if="rprops.suffixText && rform" class="suffix">
+				<vxe-button v-if="suffixButton" v-bind="psButtonConfig" @click="vxeInputSuffixClick">{{ rprops.suffixText }}</vxe-button>
+				<span v-else @click="vxeInputSuffixClick">{{ rprops.suffixText }}</span>
+			</span>
+			<span v-else-if="controlButton" class="control-btn after" @click="vxeControlClick(true)">+</span>
+		</template>
+		<template v-else>
+			<span v-if="rprops.prefixText && renderText" class="prefix">{{ rprops.prefixText }}</span>
+			<span v-html="renderText"></span>
+			<span v-if="rprops.suffixText && renderText" class="suffix">{{ rprops.suffixText }}</span>
+		</template>
+	</span>
+</template>
+
+<script>
+import { computed, defineComponent, getCurrentInstance } from 'vue'
+import cellProps from '../mixin/cell-props'
+import cellHooks from '../mixin/cell-hooks'
+export default defineComponent({
+	name: 'VxeRenderInput',
+	props: cellProps,
+	setup(props, context) {
+		const { proxy } = getCurrentInstance()
+		const { $vUtils } = proxy
+		const useCell = cellHooks(props, context, proxy)
+
+		const controlButton = computed(() => props.rprops.control && ['number', 'float', 'integer'].includes(props.rprops.type))
+
+		// 输入框数字加减控制
+		const vxeControlClick = bol => {
+			const { step = 1, min, max } = props.rprops
+			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)
+		}
+
+		return {
+			...useCell,
+			controlButton,
+			vxeControlClick
+		}
+	}
+})
+</script>

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

@@ -1,44 +1,52 @@
-<template>
-	<span class="vxe-render--inner" :class="{ 'form-render': rform, 'td-render': !rform }">
-		<template v-if="redit || isEditAll">
-			<vxe-select v-model="renderValue" v-bind="rprops" :size="rsize" @change="vxeChangeCallBack" />
-		</template>
-		<template v-else-if="!redit && showType">
-			<template v-for="showTag in showTags" :key="showTag.value">
-				<sh-tag :color="showTag.tagColor || rprops.tagColor" :type="showTag.tagType || rprops.tagType">{{ showTag.label }}</sh-tag>
-			</template>
-		</template>
-		<span v-else v-html="renderText"></span>
-	</span>
-</template>
-
-<script>
-import { computed, defineComponent, getCurrentInstance } from 'vue'
-import cellProps from '../mixin/cell-props'
-import cellHooks from '../mixin/cell-hooks'
-export default defineComponent({
-	name: 'VxeRenderSelect',
-	props: cellProps,
-	setup(props, context) {
-		const { proxy } = getCurrentInstance()
-		const useCell = cellHooks(props, context, proxy)
-
-		const showType = computed(() => props.rprops.showType === 'tag')
-
-		const showTags = computed(() => {
-			const renderValue = useCell.renderValue.value
-			const { options = [], multiple } = props.rprops
-			if (multiple && Array.isArray(renderValue)) {
-				return options.filter(option => renderValue.includes(option.value))
-			}
-			return options.filter(option => String(option.value) === String(renderValue))
-		})
-
-		return {
-			...useCell,
-			showType,
-			showTags
-		}
-	}
-})
-</script>
+<template>
+	<span class="vxe-render--inner" :class="{ 'form-render': rform, 'td-render': !rform }">
+		<template v-if="redit || isEditAll">
+			<span v-if="rprops.prefixText && rform" class="prefix">
+				<vxe-button v-if="prefixButton" v-bind="psButtonConfig" @click="vxeInputPrefixClick">{{ rprops.prefixText }}</vxe-button>
+				<span v-else @click="vxeInputPrefixClick">{{ rprops.prefixText }}</span>
+			</span>
+			<vxe-select v-model="renderValue" v-bind="rprops" :size="rsize" @change="vxeChangeCallBack" />
+			<span v-if="rprops.suffixText && rform" class="suffix">
+				<vxe-button v-if="suffixButton" v-bind="psButtonConfig" @click="vxeInputSuffixClick">{{ rprops.suffixText }}</vxe-button>
+				<span v-else @click="vxeInputSuffixClick">{{ rprops.suffixText }}</span>
+			</span>
+		</template>
+		<template v-else-if="!redit && showType">
+			<template v-for="showTag in showTags" :key="showTag.value">
+				<sh-tag :color="showTag.tagColor || rprops.tagColor" :type="showTag.tagType || rprops.tagType">{{ showTag.label }}</sh-tag>
+			</template>
+		</template>
+		<span v-else v-html="renderText"></span>
+	</span>
+</template>
+
+<script>
+import { computed, defineComponent, getCurrentInstance } from 'vue'
+import cellProps from '../mixin/cell-props'
+import cellHooks from '../mixin/cell-hooks'
+export default defineComponent({
+	name: 'VxeRenderSelect',
+	props: cellProps,
+	setup(props, context) {
+		const { proxy } = getCurrentInstance()
+		const useCell = cellHooks(props, context, proxy)
+
+		const showType = computed(() => props.rprops.showType === 'tag')
+
+		const showTags = computed(() => {
+			const renderValue = useCell.renderValue.value
+			const { options = [], multiple } = props.rprops
+			if (multiple && Array.isArray(renderValue)) {
+				return options.filter(option => renderValue.includes(option.value))
+			}
+			return options.filter(option => String(option.value) === String(renderValue))
+		})
+
+		return {
+			...useCell,
+			showType,
+			showTags
+		}
+	}
+})
+</script>

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

@@ -1,7 +1,15 @@
 <template>
 	<span class="vxe-render--inner" :class="{ 'form-render': rform, 'td-render': !rform }">
 		<template v-if="redit || isEditAll">
+			<span v-if="rprops.prefixText && rform" class="prefix">
+				<vxe-button v-if="prefixButton" v-bind="psButtonConfig" @click="vxeInputPrefixClick">{{ rprops.prefixText }}</vxe-button>
+				<span v-else @click="vxeInputPrefixClick">{{ rprops.prefixText }}</span>
+			</span>
 			<sh-tree v-model="renderValue" v-bind="rprops" :field="rkey" :value-data="rdata" :size="rsize" is-select @change="vxeTreeCallback"></sh-tree>
+			<span v-if="rprops.suffixText && rform" class="suffix">
+				<vxe-button v-if="suffixButton" v-bind="psButtonConfig" @click="vxeInputSuffixClick">{{ rprops.suffixText }}</vxe-button>
+				<span v-else @click="vxeInputSuffixClick">{{ rprops.suffixText }}</span>
+			</span>
 		</template>
 		<template v-else>
 			<span v-html="renderText"></span>

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

@@ -45,6 +45,11 @@ export default function (props, context, proxy) {
 		let endIndex = cnGroups.findIndex(cn => cn.fullText === billStart)
 		return cnGroups.slice(startIndex, endIndex)
 	})
+	const psButtonConfig = computed(() => {
+		return { disabled: props.rprops.disabled, size: props.rsize, status: 'theme' }
+	})
+	const prefixButton = computed(() => props.rprops.prefixType.toLowerCase() === 'button')
+	const suffixButton = computed(() => props.rprops.suffixType.toLowerCase() === 'button')
 
 	// 初始化数据
 	const initData = () => {
@@ -52,6 +57,22 @@ export default function (props, context, proxy) {
 		formatValueFun(keyValue)
 	}
 
+	// 输入框前缀点击事件
+	const vxeInputPrefixClick = () => {
+		if (props.rprops.disabled) return
+		if (rform.value) {
+			let { $form } = props.rparams
+			$form.context.emit('prefix-click', props.rparams)
+		}
+	}
+	// 输入框后缀点击事件
+	const vxeInputSuffixClick = () => {
+		if (props.rprops.disabled) return
+		if (rform.value) {
+			let { $form } = props.rparams
+			$form.context.emit('suffix-click', props.rparams)
+		}
+	}
 	// 输入框变化
 	const vxeInputChange = async ({ value, $event }) => {
 		// 此操作火狐浏览器（bug(vxe):编辑后不触发渲染器的blur问题）触发edit-closed，故在edit-close重新赋值
@@ -154,6 +175,11 @@ export default function (props, context, proxy) {
 		isEditAll,
 		moneyUnitText,
 		billGroups,
+		psButtonConfig,
+		prefixButton,
+		suffixButton,
+		vxeInputPrefixClick,
+		vxeInputSuffixClick,
 		vxeInputChange,
 		vxeChangeCallBack,
 		vxeRadioCallBack,