sh-view 2.10.6 → 2.10.7

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "sh-view",
-	"version": "2.10.6",
+	"version": "2.10.7",
 	"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.3.10",
+		"sh-tools": "^2.3.11",
 		"vue": "^3.5.20",
 		"vue-masonry": "^0.16.0",
 		"vue-router": "^4.5.1",
-		"vxe-pc-ui": "^4.11.24",
-		"vxe-table": "^4.17.38"
+		"vxe-pc-ui": "^4.11.43",
+		"vxe-table": "^4.17.40"
 	},
 	"devDependencies": {
 		"@typescript-eslint/eslint-plugin": "^6.9.0",

package/packages/components/sh-split/index.vue

@@ -40,20 +40,17 @@ export default defineComponent({
 	},
 	props: {
 		modelValue: {
-			type: [Number, String],
-			default: 0.2
+			type: [Number, String]
 		},
 		mode: {
 			type: String,
-			default: 'horizontal' // horizontal, vertical
+			default: '' // horizontal, vertical
 		},
 		min: {
-			type: [Number, String],
-			default: 0
+			type: [Number, String]
 		},
 		max: {
-			type: [Number, String],
-			default: 0.6
+			type: [Number, String]
 		},
 		disabled: {
 			type: Boolean,
@@ -73,12 +70,15 @@ export default defineComponent({
 		loadingType: {
 			type: String,
 			default: '2'
+		},
+		triggerWin: {
+			type: Boolean
 		}
 	},
 	emits: ['update:modelValue', 'move-start', 'moveing', 'move-end'],
 	setup(props, context) {
 		const vm = getCurrentInstance()
-		const { $vUtils } = vm.proxy
+		const { $vUtils, $vUiSetup } = vm.proxy
 		const { emit, slots } = context
 
 		const splitRef = ref()
@@ -88,34 +88,27 @@ export default defineComponent({
 		const isMoving = ref(false)
 		const computedMin = ref(0)
 		const computedMax = ref(0)
-		const currentValue = ref(props.modelValue)
+		const currentValue = ref(props.modelValue || $vUiSetup.splitConfig?.defaultValue || 0)
 
 		const paneClasses = computed(() => {
 			return {
 				'sh-split-pane': true,
-				'sh-split-pane-moving': props.isMoving
+				'sh-split-pane-moving': isMoving.value
 			}
 		})
-		const isHorizontal = computed(() => {
-			return props.mode === 'horizontal'
-		})
-		const anotherOffset = computed(() => {
-			return 100 - offset.value
-		})
-		const valueIsPx = computed(() => {
-			return typeof props.modelValue === 'string'
-		})
-		const offsetSize = computed(() => {
-			return isHorizontal.value ? 'offsetWidth' : 'offsetHeight'
-		})
+		const isHorizontal = computed(() => (props.mode || $vUiSetup.splitConfig?.mode) === 'horizontal')
+		const anotherOffset = computed(() => 100 - offset.value)
+		const valueIsPx = computed(() => typeof props.modelValue === 'string')
+		const offsetSize = computed(() => (isHorizontal.value ? 'offsetWidth' : 'offsetHeight'))
+		const offsetConfig = computed(() => ({ min: props.min || $vUiSetup.splitConfig?.min || 0, max: props.max || $vUiSetup.splitConfig?.max || 1 }))
 
 		const px2percent = (numerator, denominator) => {
 			return parseFloat(numerator) / parseFloat(denominator)
 		}
 		const getComputedThresholdValue = type => {
 			let size = splitRef.value[offsetSize.value]
-			if (valueIsPx.value) return typeof props[type] === 'string' ? props[type] : size * props[type]
-			else return typeof props[type] === 'string' ? px2percent(props[type], size) : props[type]
+			if (valueIsPx.value) return typeof offsetConfig.value[type] === 'string' ? offsetConfig.value[type] : size * offsetConfig.value[type]
+			else return typeof offsetConfig.value[type] === 'string' ? px2percent(offsetConfig.value[type], size) : offsetConfig.value[type]
 		}
 		const getMin = (value1, value2) => {
 			if (valueIsPx.value) return `${Math.min(parseFloat(value1), parseFloat(value2))}px`
@@ -149,6 +142,7 @@ export default defineComponent({
 			$vUtils.offListener(document, 'mousemove', handleMove)
 			$vUtils.offListener(document, 'mouseup', handleUp)
 			emit('move-end')
+			if (props.triggerWin) window.dispatchEvent(new Event('resize'))
 		}
 		const handleMousedown = e => {
 			initOffset.value = isHorizontal.value ? e.pageX : e.pageY
@@ -162,7 +156,6 @@ export default defineComponent({
 			computedMin.value = getComputedThresholdValue('min')
 			computedMax.value = getComputedThresholdValue('max')
 			offset.value = ((valueIsPx.value ? px2percent(currentValue.value, splitRef.value[offsetSize.value]) : currentValue.value) * 10000) / 100
-			// return nextTick()
 		}
 		const resetOffset = val => {
 			if (val !== currentValue.value) {
@@ -265,6 +258,10 @@ $trigger-bar-con-height: calc(($trigger-bar-weight + $trigger-bar-interval) * 8)
 	}
 	&-trigger {
 		border: 1px solid var(--border-radius);
+		-webkit-user-select: none;
+		-moz-user-select: none;
+		-ms-user-select: none;
+		user-select: none;
 		&-con {
 			position: absolute;
 			transform: translate(-50%, -50%);

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

@@ -620,7 +620,7 @@ export default function (props, context, proxy, isGrid) {
 			delete addRows[keyField.value]
 		}
 		let { row: newRow } = await tableRef.value.insertAt(addRows, index)
-		await tableRef.value.setActiveRow(newRow)
+		await tableRef.value.setEditRow(newRow)
 		if (isTool) emit('toolbaroption', 'add', newRow, tableRef.value)
 	}
 	// 删除行按钮

package/packages/components/sh-toolbar/index.vue

@@ -69,8 +69,8 @@ export default defineComponent({
 		const leftActive = ref(props.modelValue)
 
 		const vmSize = computed(() => props.size || $vUiSetup.size)
-		const leftConfigBtns = computed(() => props.leftConfig || $vUiSetup.toolbarLeftConfig)
-		const rightConfigBtns = computed(() => props.rightConfig || $vUiSetup.toolbarRightConfig)
+		const leftConfigBtns = computed(() => props.leftConfig || $vUiSetup.statusList)
+		const rightConfigBtns = computed(() => props.rightConfig || $vUiSetup.buttonsList)
 		const leftBtns = computed(() => {
 			let lBtns = []
 			if (props.leftContain && Array.isArray(props.leftContain) && props.leftContain.length > 0) {

package/packages/vxeTable/css/index.scss

@@ -249,18 +249,6 @@ button:focus, .vxe-button.type--button:not(.is--disabled):focus{
     .vxe-input, .vxe-select, .vxe-number-input, .vxe-date-picker, .sh-date{
         width: 100%;
     }
-    &.vxe-render--inner--readonly{
-        position: relative;
-        &::before{
-            content: '';
-            position: absolute;
-            left: 0;
-            right: 0;
-            top: 0;
-            bottom: 0;
-            z-index: 2;
-        }
-    }
     &.form-render {
         align-items: stretch;
         .prefix, .suffix{

package/packages/vxeTable/index.js

@@ -76,7 +76,7 @@ let uiOptions = {
 		text: '加载中...'
 	},
 	message: { title: '', className: 'sh-message-box', draggable: false },
-	toolbarLeftConfig: [
+	statusList: [
 		{ value: '1', code: 'wss', content: '未送审' },
 		{ value: '2', code: 'bth', content: '被退回' },
 		{ value: '3', code: 'yss', content: '已送审' },
@@ -85,7 +85,7 @@ let uiOptions = {
 		{ value: '6', code: 'dsh', content: '待审核' },
 		{ value: '7', code: 'ysh', content: '已审核' }
 	],
-	toolbarRightConfig: [
+	buttonsList: [
 		{ code: 'add', content: '新增', status: 'primary', icon: 'vxe-icon-add' },
 		{ code: 'edit', content: '修改', status: 'warning', icon: 'vxe-icon-edit' },
 		{ code: 'delete', content: '删除', status: 'danger', icon: 'vxe-icon-delete' },
@@ -107,7 +107,13 @@ let uiOptions = {
 		{ code: 'batch-audit-back', content: '批量退回', status: 'warning', icon: '' },
 		{ code: 'batch-audit-back-insert', content: '批量退回到录入', status: 'warning', icon: '' },
 		{ code: 'batch-audit-pass', content: '批量审核', status: 'success', icon: '' }
-	]
+	],
+	splitConfig: {
+		defaultValue: 0.2,
+		min: 0,
+		max: 0.6,
+		mode: 'horizontal'
+	}
 }
 
 let tableOptions = {

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

@@ -4,6 +4,7 @@
 			<vxe-button
 				v-if="isBtnRender(renderBtn)"
 				:mode="rprops.type"
+				:round="rprops.round"
 				:size="rsize"
 				:icon="getBtnContent(renderBtn).icon"
 				:status="getBtnContent(renderBtn).status"
@@ -18,12 +19,18 @@
 import { computed, defineComponent, getCurrentInstance } from 'vue'
 import cellProps from '../mixin/cell-props'
 import cellHooks from '../mixin/cell-hooks'
+const buttonDefaultMap = {
+	add: { content: '新增', status: 'primary', icon: 'vxe-icon-add' },
+	edit: { content: '编辑', status: 'warning', icon: 'vxe-icon-edit' },
+	delete: { content: '删除', status: 'danger', icon: 'vxe-icon-delete' },
+	detail: { content: '查看', status: '', icon: 'vxe-icon-information' }
+}
 export default defineComponent({
 	name: 'VxeRenderGoption',
 	props: cellProps,
 	setup(props, context) {
 		const { proxy } = getCurrentInstance()
-		const { $vUtils } = proxy
+		const { $vUtils, $vUiSetup } = proxy
 		const useCell = cellHooks(props, context, proxy)
 
 		const renderBtns = computed(() => {
@@ -44,44 +51,19 @@ export default defineComponent({
 
 		// 按钮是否显示条件
 		const isBtnRender = renderBtn => {
-			if ($vUtils.has(renderBtn, 'condition')) {
-				let condition = $vUtils.get(renderBtn, 'condition')
+			let condition = $vUtils.get(renderBtn, 'condition')
+			if (!$vUtils.isNone(condition)) {
 				return $vUtils.calculate(condition, useCell.rdata.value)
 			}
 			return true
 		}
 		// 规定按钮文字
 		const getBtnContent = renderBtn => {
-			let renderContent = ''
-			let renderStatus = ''
-			let renderIcon = ''
-			switch (renderBtn.code) {
-				case 'add':
-					renderContent = renderBtn.content || '新增'
-					renderStatus = renderBtn.status || 'primary'
-					renderIcon = renderBtn.icon || 'vxe-icon-add'
-					break
-				case 'edit':
-					renderContent = renderBtn.content || '编辑'
-					renderStatus = renderBtn.status || 'warning'
-					renderIcon = renderBtn.icon || 'vxe-icon-edit'
-					break
-				case 'delete':
-					renderContent = renderBtn.content || '删除'
-					renderStatus = renderBtn.status || 'danger'
-					renderIcon = renderBtn.icon || 'vxe-icon-delete'
-					break
-				case 'detail':
-					renderContent = renderBtn.content || '查看'
-					renderStatus = renderBtn.status || ''
-					renderIcon = renderBtn.icon || 'vxe-icon-information'
-					break
-				default:
-					renderContent = renderBtn.content
-					renderStatus = renderBtn.status
-					break
+			let setupBtn = null
+			if (renderBtn.code) {
+				setupBtn = ($vUiSetup.buttonsList || []).find(item => item.code === renderBtn.code)
 			}
-			return { content: renderContent, status: renderStatus, icon: renderIcon }
+			return Object.assign({}, setupBtn, renderBtn)
 		}
 		// 按钮点击回调
 		const vxeBtnCallback = ({ $event }, renderBtn) => {

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

@@ -1,5 +1,7 @@
 <template>
-	<sh-table ref="shTableRef" :disabled="!isEditActive" v-bind="rprops" :size="rsize" :data-sourse="renderValue" @edit-closed="vxeTableCallback" @toolbaroption="onToolbaroption"></sh-table>
+	<span class="vxe-render--inner" style="display: grid; width: 100%">
+		<sh-table ref="shTableRef" :disabled="!isEditActive" v-bind="rprops" :size="rsize" :data-sourse="renderValue" @edit-closed="vxeTableCallback" @toolbaroption="onToolbaroption"></sh-table>
+	</span>
 </template>
 
 <script>