Update 优化表格搜索栏formItem的span

UI/VAP_V3.VUE/src/components/form/VbFormItem.vue

@@ -49,7 +49,7 @@ const itemData = computed(() => resolveDynamicValue(item.value.data, undefined))
 const colSpan = computed(() => resolveDynamicValue(item.value.span, data.value) || props.span)
 const isShow = computed(() => {
 	if (item.value.show === undefined) return true
-	return resolveDynamicValue(item.value.show, data.value) || true
+	return resolveDynamicValue(item.value.show, data.value)
 })
 const isRequired = computed(() => resolveDynamicValue(item.value.required, data.value) || false)
 const isReadonly = computed(() => resolveDynamicValue(item.value.readonly, data.value) || false)

UI/VAP_V3.VUE/src/components/table/VbTable.vue

@@ -14,9 +14,9 @@ import { useTableToolbar } from "./composables/useTableToolbar" // 工具栏
 import { useTableEvents } from "./composables/useTableEvents" // 事件处理
 import { useTableSelection } from "./composables/useTableSelection" // 选择管理
 import { useTableFixed } from "./composables/useTableFixed" // 固定列
-import { useTableTree } from "./composables/useTableTree" // 树形表格
+// import { useTableTree } from "./composables/useTableTree" // 树形表格
 import { useTableContext } from "./composables/useTableContext" // 上下文管理
-import { useAutoRowMerge } from "./composables/useAutoRowMerge" // 自动行合并
+// import { useAutoRowMerge } from "./composables/useAutoRowMerge" // 自动行合并
 
 // 子组件
 import Toolbar from "./partials/toolbar/TableToolbar.vue"

UI/VAP_V3.VUE/src/components/table/composables/useTableToolbar.ts

@@ -55,7 +55,7 @@ export function useTableToolbar(options: UseTableOptions) {
 			if (props.getEntityFun) {
 				props.getEntityFun(row[state.keyField.value]).then((res: any) => {
 					emits("update:formData", res.data)
-					emits("form-edit", state.formData.value || {})
+					emits("form-edit", state.formData?.value || {})
 					if (props.modal) {
 						props.modal.show()
 						props.modal.changePrefixTitle("修改")

UI/VAP_V3.VUE/src/components/table/partials/toolbar/TableSearchFrom.vue

@@ -21,13 +21,9 @@ const searchFormRef = ref<any>()
 const _searchFormItems = computed(() => {
 	if (searchFormItems.value || searchFormRowItems.value) {
 		const items = searchFormItems.value || []
-		if (!items.find((v) => v.field == "searchbtn")) {
-			items.push({
-				field: "searchbtn",
-				component: "slot",
-				span: 1.5
-			})
-		}
+		items.forEach((v) => {
+			v.span = v.span || (v.field == "searchbtn" ? 1.5 : 5)
+		})
 		return items as any
 	}
 	return searchFormItems.value as any