sh-view 2.10.9 → 2.10.10

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "sh-view",
-	"version": "2.10.9",
+	"version": "2.10.10",
 	"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",
@@ -38,11 +38,11 @@
 		"lunar-typescript": "^1.8.6",
 		"popper.js": "^1.16.1",
 		"sh-tools": "^2.3.12",
-		"vue": "^3.5.20",
+		"vue": "^3.5.29",
 		"vue-masonry": "^0.16.0",
 		"vue-router": "^4.6.4",
-		"vxe-pc-ui": "^4.12.31",
-		"vxe-table": "^4.17.48"
+		"vxe-pc-ui": "^4.13.0",
+		"vxe-table": "^4.17.49"
 	},
 	"devDependencies": {
 		"@typescript-eslint/eslint-plugin": "^6.21.0",

package/packages/components/sh-code-editor/index.vue

@@ -6,7 +6,7 @@
 </template>
 
 <script>
-import { defineComponent, ref, computed, watch, onMounted, onUnmounted, nextTick, getCurrentInstance } from 'vue'
+import { defineComponent, ref, computed, watch, onMounted, onUnmounted, nextTick, getCurrentInstance, reactive } from 'vue'
 import { basicSetup } from 'codemirror'
 import { keymap, placeholder, EditorView } from '@codemirror/view'
 import { Compartment, EditorState, StateEffect } from '@codemirror/state'
@@ -147,6 +147,10 @@ export default defineComponent({
 		const codeEditor = ref(null)
 		const codeError = ref(null)
 		const codeRef = ref()
+		const reactData = reactive({
+			isComposed: false,
+			isActivated: false
+		})
 
 		const styles = computed(() => {
 			return {
@@ -247,7 +251,8 @@ export default defineComponent({
 				tabSize.of(EditorState.tabSize.of(props.indent)),
 				EditorState.allowMultipleSelections.of(props.multipleSelection),
 				EditorView.editable.of(!disabled),
-				customKeymap()
+				customKeymap(),
+				domEventHandlers
 			]
 			// 括号自动补全
 			if (autoclose) innerExtensions.push(closeBrackets())
@@ -283,10 +288,9 @@ export default defineComponent({
 
 		const codeRender = async () => {
 			const docValue = getTransformValue(props.modelValue)
-			let editExtensions = [EditorView.focusChangeEffect.of(focusListener), EditorView.updateListener.of(updateListener)].concat(codeExtensions.value)
 			const codeState = EditorState.create({
 				doc: docValue,
-				extensions: editExtensions
+				extensions: codeExtensions.value
 			})
 			codeEditor.value = new EditorView({
 				parent: codeRef.value,
@@ -296,21 +300,42 @@ export default defineComponent({
 			dispatchEvent('loaded', props.modelValue)
 		}
 
-		const focusListener = (state, focusing) => {
-			const valueStr = state.doc.toString()
-			if (focusing) {
+		const domEventHandlers = EditorView.domEventHandlers({
+			focus: (event, view) => {
+				reactData.isActivated = true
+				const valueStr = view.state.doc.toString()
 				dispatchEvent('focus', valueStr)
-			} else {
+				return false
+			},
+			blur: (event, view) => {
+				reactData.isActivated = false
+				const valueStr = view.state.doc.toString()
 				dispatchValue(valueStr)
 				dispatchEvent('blur', valueStr)
+				return false
+			},
+			input: (event, view) => {
+				if (reactData.isComposed) {
+					return
+				}
+				const valueStr = view.state.doc.toString()
+				dispatchEvent('change', valueStr)
+				return false
+			},
+			compositionstart: (event, view) => {
+				reactData.isComposed = true
+				return false
+			},
+			compositionend: (event, view) => {
+				if (!reactData.isComposed) {
+					return
+				}
+				reactData.isComposed = false
+				const valueStr = view.state.doc.toString()
+				dispatchEvent('change', valueStr)
+				return false
 			}
-		}
-
-		const updateListener = ({ state, changes, docChanged }) => {
-			if (changes.empty || !docChanged) return
-			const valueStr = state.doc.toString()
-			dispatchEvent('change', valueStr)
-		}
+		})
 
 		const focus = () => {
 			codeEditor.value && codeEditor.value.focus()

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

@@ -84,9 +84,9 @@ export default {
 			return {}
 		}
 	},
-	preventsubmit: {
+	preventSubmit: {
 		type: Boolean,
-		default: null
+		default: false
 	},
 	validConfig: {
 		type: Object,

package/packages/components/sh-icon/css/index.scss

@@ -1,3 +1,6 @@
+@use "./default/icons" as default-icons;
+@use "./font/icons"  as font-icons;
+
 @font-face {
   font-family: 'Ionicons';
   src: url("./default/ionicons.woff2") format("woff2"),
@@ -24,8 +27,6 @@
   text-align: center;
 }
 
-@import "./default/icons";
-
 @font-face {
   font-family: "iconfont";
   src: url('./font/iconfont.woff2?t=1661513291946') format('woff2'),
@@ -39,6 +40,4 @@
   font-style: normal;
   -webkit-font-smoothing: antialiased;
   -moz-osx-font-smoothing: grayscale;
-}
-
-@import "./font/icons";
+}

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

@@ -159,6 +159,9 @@ export default defineComponent({
 			triggerEvent(evnt)
 		}
 		const compositionEnd = evnt => {
+			if (!reactData.isComposed) {
+				return
+			}
 			reactData.isComposed = false
 			const inputElem = evnt.target
 			const value = inputElem.value

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

@@ -28,12 +28,10 @@ export default {
 		type: [Number, String]
 	},
 	autoResize: {
-		type: Boolean,
-		default: false
+		type: Boolean
 	},
 	syncResize: {
-		type: [Boolean, String, Number],
-		default: true
+		type: [Boolean, String, Number]
 	},
 	stripe: {
 		type: Boolean,

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

@@ -461,11 +461,7 @@ export default function (props, context, proxy, isGrid) {
 	// -------- 搜索
 	// 表单展开全部/收起切换事件
 	const onFormCollapsed = value => {
-		if (isGrid) {
-			setTimeout(() => {
-				tableRef.value.recalculate(true)
-			})
-		}
+		tableRef.value.recalculate(true)
 	}
 	const onFormSubmit = () => {
 		emit('form-submit', props.queryData)
@@ -704,8 +700,8 @@ export default function (props, context, proxy, isGrid) {
 		updateSelection()
 		return newRow
 	}
-	// 复制行按钮
-	const handleToolCopy = async (rows, index) => {
+	// 复制行按钮  isNext复制到目标行的 上面还是下面，默认到下面
+	const handleToolCopy = async (rows, isNext = true) => {
 		let selectedRows = getSelectionData()
 		let copyRows = $vUtils.clone(rows || selectedRows, true)
 		if (copyRows.length < 1) {
@@ -715,7 +711,8 @@ export default function (props, context, proxy, isGrid) {
 		if (typeof props.onToolbarCopyBefore === 'function') {
 			copyRows = await props.onToolbarCopyBefore(copyRows)
 		}
-		let insertList = copyRows.map(row => tableRef.value.insertAt(Object.assign(row, { [keyField.value]: undefined }), index ? index : row))
+		let insertType = isNext ? 'insertNextAt' : 'insertAt'
+		let insertList = copyRows.map(row => tableRef.value[insertType](Object.assign({}, row, { [keyField.value]: undefined }), row))
 		let insertRes = await Promise.all(insertList)
 		let insertRows = insertRes.map(item => item.row)
 		updateSelection()

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

@@ -1,16 +1,14 @@
 <template>
 	<vxe-table
 		ref="tableRef"
-		v-resize="offetChangeDebounce"
 		:class="{ 'sh-vxe-tree-table': true, 'is--hidecheck': globalConfig.checkHide }"
 		v-bind="tableConfigIn"
-		:syncResize="syncResize"
 		@radio-change="onRadioChange"
 		@checkbox-change="onSelectionChange"
 		@checkbox-all="onSelectionChange">
 		<vxe-column :field="labelField" :title="labelTitle || multiple ? '全部' : ''" :width="checkWidth" :type="multiple ? 'checkbox' : 'radio'" treeNode>
 			<template #default="scoped">
-				<span>{{ getTreeNodeCellContent(scoped) }}</span>
+				<span>{{ treeNodeContent(scoped) }}</span>
 			</template>
 		</vxe-column>
 		<template v-if="globalConfig.columns && globalConfig.columns.length > 0">
@@ -59,7 +57,7 @@ export default defineComponent({
 				rowConfig: { keyField: treeNodeKey.value },
 				radioConfig: { labelField: props.labelField, checkMethod: tableCheckMethods },
 				checkboxConfig: { labelField: props.labelField, checkMethod: tableCheckMethods },
-				treeConfig: { rowField: treeNodeKey.value },
+				treeConfig: { rowField: treeNodeKey.value, expandAll: props.globalConfig?.expandAll },
 				editConfig: { enabled: false }
 			}
 			if (props.multiple && props.globalConfig.hasAll) resultConfig.showHeader = true
@@ -150,7 +148,7 @@ export default defineComponent({
 				searchData = $vUtils.searchTree(
 					tableTreeData,
 					row => {
-						let cellText = getTreeNodeCellContent({ row, column: tableTreeColumn })
+						let cellText = treeNodeContent({ row, column: tableTreeColumn })
 						return $vUtils.trim(cellText).indexOf(filterText) > -1
 					},
 					{ isEvery: true, children: treeChildKey.value }
@@ -165,32 +163,21 @@ export default defineComponent({
 			filterData.value = searchData
 			tableRef.value.setAllTreeExpand(true)
 		}
-		// 获取选中的数据
-		const getSelectionData = () => {
-			return tableRef.value.getCheckboxRecords()
-		}
 		const tableCheckMethods = ({ row, $table }) => {
 			if (props.isLeaf && !props.multiple) {
 				return (row[treeChildKey.value] || []).length < 1
 			}
 			return true
 		}
-		const getTreeNodeCellContent = ({ row, column }) => {
+		const treeNodeContent = ({ row, column }) => {
 			if (props.labelFormat) {
 				return $vUtils.format(props.labelFormat, row)
 			}
 			return $vUtils.get(row, column.property)
 		}
-		const handleOffsetChange = () => {
-			syncResize.value = true
-			setTimeout(() => {
-				syncResize.value = false
-			})
-		}
 
 		const initChangeDebounce = $vUtils.debounce(initSelection, 200)
 		const filterChangeDebounce = $vUtils.debounce(handleMyTableFilter, 500)
-		const offetChangeDebounce = $vUtils.debounce(handleOffsetChange, tableConfigIn.value.resizeConfig?.refreshDelay || 300)
 
 		onMounted(() => {
 			initChangeDebounce()
@@ -217,10 +204,8 @@ export default defineComponent({
 			tableConfigIn,
 			onRadioChange,
 			onSelectionChange,
-			getTreeNodeCellContent,
-			getSelectionData,
-			initSelection,
-			offetChangeDebounce
+			treeNodeContent,
+			initSelection
 		}
 	}
 })

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

@@ -108,11 +108,7 @@ export default defineComponent({
 			return Object.assign({ transfer: true }, propsConfig.value.globalConfig?.selectConfig, checkConfig.value)
 		})
 		const selectInputConfigIn = computed(() => {
-			return Object.assign(
-				{ clearable: true, controls: false, transfer: false, editable: false, suffixIcon: 'vxe-icon-caret-down', placeholder: props.placeholder },
-				propsConfig.value.globalConfig?.inputConfig,
-				checkConfig.value
-			)
+			return Object.assign({ clearable: true, readonly: true, suffixIcon: 'vxe-icon-caret-down', placeholder: props.placeholder }, propsConfig.value.globalConfig?.inputConfig, checkConfig.value)
 		})
 		const filterInputConfigIn = computed(() => {
 			return Object.assign({ prefixIcon: 'vxe-icon-search', placeholder: '搜索', clearable: true }, propsConfig.value.globalConfig?.filterInputConfig)
@@ -205,15 +201,14 @@ export default defineComponent({
 		// 树节点获取焦点事件
 		const onFocus = async obj => {
 			emitFocus()
-			treeSelectInputRef.value.blur()
 			await treeSelectRef.value.togglePanel()
 			pulldownDrop.value = true
-			if (filterInputRef.value) filterInputRef.value.focus()
+			if (filterInputRef.value) {
+				filterInputRef.value.focus()
+			}
 			// 初始化获取服务配置数据
 			await getServerConfigDataSourse()
-			if (tableTreeRef.value) {
-				tableTreeRef.value.initSelection(true)
-			}
+			tableTreeRef.value && tableTreeRef.value.initSelection(true)
 		}
 		// 树节点选择变换事件
 		const onChange = async (keys, rows, obj) => {

package/packages/vxeTable/index.js

@@ -18,7 +18,7 @@ import '@vxe-ui/plugin-menu/dist/style.css'
 import VxeUIPluginRenderWangEditor from '@vxe-ui/plugin-render-wangeditor'
 
 import { utils } from 'sh-tools'
-import { publicRenders, extraRenders, filterRenders } from './render/globalRenders.jsx'
+import { publicRenders, extraRenders, filterRenders } from './render/globalRenders.js'
 import renderUtils from './render/utils'
 
 utils.mixin(renderUtils)
@@ -99,7 +99,6 @@ let uiOptions = {
 			showHeader: false,
 			showFooter: false,
 			showOverflow: true,
-			resizeConfig: { refreshDelay: 300 },
 			cellConfig: { padding: false, height: 32, verticalAlign: 'center' },
 			columnConfig: { width: 120 },
 			virtualXConfig: { enabled: true, gt: 20 },
@@ -160,7 +159,8 @@ let tableOptions = {
 		stripe: false,
 		border: 'full',
 		round: false,
-		autoResize: false,
+		autoResize: true,
+		syncResize: true,
 		keepSource: false,
 		minHeight: 30,
 		rowConfig: {
@@ -267,7 +267,7 @@ let tableOptions = {
 			startIndex: 1
 		},
 		resizeConfig: {
-			refreshDelay: 200
+			refreshDelay: 100
 		},
 		exportConfig: {
 			mode: 'current',

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

@@ -7,7 +7,7 @@
 			:size="rsize"
 			:data-sourse="renderValue"
 			@edit-closed="vxeTableCallback"
-			@toolbar-btn-click="onToolbaroption"></sh-table>
+			@toolbar-btn-click="onToolbarBtnClick"></sh-table>
 	</span>
 </template>
 
@@ -27,7 +27,7 @@ export default defineComponent({
 		const vxeTableCallback = params => {}
 
 		// 新增、删除行回调
-		const onToolbaroption = (code, data, $table) => {
+		const onToolbarBtnClick = (code, data, $table) => {
 			driveBackData()
 		}
 
@@ -41,7 +41,7 @@ export default defineComponent({
 			...useCell,
 			shTableRef,
 			vxeTableCallback,
-			onToolbaroption
+			onToolbarBtnClick
 		}
 	}
 })

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

@@ -65,7 +65,8 @@ export default function (props, context, proxy) {
 	// 初始化数据
 	const initData = () => {
 		let keyValue = $vUtils.get(rdata.value, rkey.value)
-		formatValueFun(keyValue)
+		let formatFuncMethod = proxy.formatValueFun || formatValueFun
+		formatFuncMethod(keyValue)
 	}
 
 	// 输入框前缀点击事件