Update VbDataTable组件更名为VbTable

UI/VAP_V3.VUE/src/assets/sass/core/layout/base/_container.scss

@@ -5,6 +5,8 @@
 // Desktop mode
 @include media-breakpoint-up(lg) {
 	.app-container {
+		padding-top:  $app-container-padding-x !important;
+		padding-bottom: $app-container-padding-x !important;
 		padding-left: $app-container-padding-x !important;
 		padding-right: $app-container-padding-x !important;
 	}

UI/VAP_V3.VUE/src/components/modal-select/RoleSelect.vue

@@ -243,7 +243,7 @@ defineExpose({
 						</el-tag>
 					</el-card>
 				</transition-group>
-				<VbDataTable
+				<VbTable
 					ref="tableRef"
 					v-model:selected-rows="selectList"
 					v-model:query-params="queryParams"
@@ -262,7 +262,7 @@ defineExpose({
 					@checkbox-all="onCheckboxAll"
 					table-box-height="70vh">
 					<template #status="{ row }"></template>
-				</VbDataTable>
+				</VbTable>
 			</template>
 		</VbModal>
 	</div>

UI/VAP_V3.VUE/src/components/modal-select/UserSelect.vue

@@ -303,7 +303,7 @@ defineExpose({
 						</el-card>
 					</transition>
 
-					<VbDataTable
+					<VbTable
 						ref="tableRef"
 						v-model:query-params="queryParams"
 						:search-form-items="tableOpts.searchFormItems"
@@ -324,7 +324,7 @@ defineExpose({
 							{{ row.org.orgName }}
 						</template>
 						<template #status="{ row }"></template>
-					</VbDataTable>
+					</VbTable>
 				</el-col>
 			</el-row>
 		</template>

UI/VAP_V3.VUE/src/components/process/ProcessMeddle.vue

@@ -275,13 +275,13 @@ onMounted(init)
 		@confirm="handleAddMultiInstanceUser"></UserSelect>
 	<VbModal ref="deleteUserModalRef" title="减签人员" append-to-body>
 		<template #body>
-			<VbDataTable :columns="deleteUserColumns" :data="deleteUserList">
+			<VbTable :columns="deleteUserColumns" :data="deleteUserList">
 				<template #action="{ row }">
 					<el-button type="danger" size="small" icon="Delete" @click="deleteMultiInstanceUser(row)">
 						删除
 					</el-button>
 				</template>
-			</VbDataTable>
+			</VbTable>
 		</template>
 	</VbModal>
 </template>

UI/VAP_V3.VUE/src/components/table/index.ts

@@ -1,13 +1,13 @@
 /**
  * Table2组件导出
  *
- * VbDataTable - 基于 Composables 架构重构的表格组件
+ * VbTable - 基于 Composables 架构重构的表格组件
  */
 
-import VbDataTable from "./VbDataTable.vue"
+import VbTable from "./VbTable.vue"
 
-export { VbDataTable }
-export default VbDataTable
+export { VbTable }
+export default VbTable
 
 // 导出类型
 export type { Sort, Scroll, Header, HeaderEx, ToolBtn, DefaultToolBtns } from "./models"

UI/VAP_V3.VUE/src/router/index.ts

@@ -40,6 +40,33 @@ export const constantRoutes: RouteRecordRaw[] = [
 					title: "个人中心",
 					noCache: false
 				}
+			},
+			{
+				path: "/t",
+				name: "test",
+				component: () => import("@/views/test/index.vue"),
+				meta: {
+					title: "测试",
+					noCache: false
+				}
+			},
+			{
+				path: "/t2",
+				name: "test2",
+				component: () => import("@/views/test/index2.vue"),
+				meta: {
+					title: "测试2",
+					noCache: false
+				}
+			},
+			{
+				path: "/t3",
+				name: "test3",
+				component: () => import("@/views/test/auto-row-merge-test.vue"),
+				meta: {
+					title: "测试2",
+					noCache: false
+				}
 			}
 		]
 	},

UI/VAP_V3.VUE/src/views/demo/leave/index.vue

@@ -240,7 +240,7 @@ function submitForm() {
 </script>
 <template>
 	<div class="app-container">
-		<VbDataTable
+		<VbTable
 			ref="tableRef"
 			keyField="id"
 			:columns="opts.columns"
@@ -326,7 +326,7 @@ function submitForm() {
 					</el-button>
 				</vb-tooltip>
 			</template>
-		</VbDataTable>
+		</VbTable>
 		<VbModal
 			v-model:modal="modalRef"
 			:title="opts.modalTitle"

UI/VAP_V3.VUE/src/views/monitor/admin/index.vue

@@ -2,7 +2,7 @@
 const url = ref(import.meta.env.VITE_APP_MONITRO_ADMIN)
 </script>
 <template>
-	<div>
+	<div class="app-container">
 		<i-frame v-model:src="url"></i-frame>
 	</div>
 </template>

UI/VAP_V3.VUE/src/views/monitor/cache/list.vue

@@ -121,7 +121,7 @@ const cardBodyHeightDiff = ref(255)
 </script>
 
 <template>
-	<div class="p-5">
+	<div class="app-container">
 		<el-row :gutter="20">
 			<el-col :span="8">
 				<card
@@ -142,7 +142,7 @@ const cardBodyHeightDiff = ref(255)
 						<div
 							class="overflow-auto w-100"
 							:style="`height: calc(100vh - ${cardBodyHeightDiff}px)`">
-							<VbDataTable
+							<VbTable
 								ref="tableRef_1"
 								:columns="columns_1"
 								:query-params="{}"
@@ -167,7 +167,7 @@ const cardBodyHeightDiff = ref(255)
 										</el-button>
 									</vb-tooltip>
 								</template>
-							</VbDataTable>
+							</VbTable>
 						</div>
 					</template>
 				</card>
@@ -189,7 +189,7 @@ const cardBodyHeightDiff = ref(255)
 					</template>
 					<template #body>
 						<div class="overflow-auto" :style="`height: calc(100vh - ${cardBodyHeightDiff}px)`">
-							<VbDataTable
+							<VbTable
 								ref="tableRef_2"
 								:columns="columns_2"
 								:query-params="{}"
@@ -215,7 +215,7 @@ const cardBodyHeightDiff = ref(255)
 										</el-button>
 									</vb-tooltip>
 								</template>
-							</VbDataTable>
+							</VbTable>
 						</div>
 					</template>
 				</card>

UI/VAP_V3.VUE/src/views/monitor/job/index.vue

@@ -2,7 +2,7 @@
 const url = ref(import.meta.env.VITE_APP_JOB_ADMIN)
 </script>
 <template>
-	<div>
+	<div class="app-container">
 		<i-frame v-model:src="url"></i-frame>
 	</div>
 </template>

UI/VAP_V3.VUE/src/views/monitor/online/index.vue

@@ -80,7 +80,7 @@ function handleForceLogout(row: any) {
 
 <template>
 	<div class="app-container">
-		<VbDataTable
+		<VbTable
 			ref="tableRef"
 			:search-form-items="searchFormItems"
 			:columns="columns"
@@ -105,6 +105,6 @@ function handleForceLogout(row: any) {
 					强退
 				</el-button>
 			</template>
-		</VbDataTable>
+		</VbTable>
 	</div>
 </template>

UI/VAP_V3.VUE/src/views/my/notice.vue

@@ -116,8 +116,8 @@ function init() {}
 onMounted(init)
 </script>
 <template>
-	<div>
-		<VbDataTable
+	<div class="app-container">
+		<VbTable
 			ref="tableRef"
 			:handle-perm="opts.permission"
 			:handle-funs="opts.handleFuns"
@@ -163,7 +163,7 @@ onMounted(init)
 					</el-button>
 				</vb-tooltip>
 			</template>
-		</VbDataTable>
+		</VbTable>
 		<VbModal
 			v-model:modal="modalRef"
 			title="公告详情"

UI/VAP_V3.VUE/src/views/system/client/index.vue

@@ -222,7 +222,7 @@ function submitForm() {
 </script>
 <template>
 	<div class="app-container">
-		<VbDataTable
+		<VbTable
 			ref="tableRef"
 			keyField="id"
 			:columns="opts.columns"
@@ -279,7 +279,7 @@ function submitForm() {
 					</el-button>
 				</vb-tooltip>
 			</template>
-		</VbDataTable>
+		</VbTable>
 		<VbModal
 			v-model:modal="modalRef"
 			:title="opts.modalTitle"

UI/VAP_V3.VUE/src/views/system/config/index.vue

@@ -130,8 +130,8 @@ function handleRefreshCache() {
 }
 </script>
 <template>
-	<div>
-		<VbDataTable
+	<div class="app-container">
+		<VbTable
 			ref="tableRef"
 			:handle-perm="opts.permission"
 			:handle-funs="opts.handleFuns"
@@ -177,7 +177,7 @@ function handleRefreshCache() {
 					</el-button>
 				</vb-tooltip>
 			</template>
-		</VbDataTable>
+		</VbTable>
 		<VbModal
 			v-model:modal="modalRef"
 			:title="opts.modalTitle"

UI/VAP_V3.VUE/src/views/system/dict/_data.vue

@@ -146,7 +146,7 @@ defineExpose({ queryDictData, dictTypeData })
 		<h2 class="mt-5 text-primary text-center">
 			{{ dictTypeData?.dictName || "" }} {{ dictTypeData?.dictType || "" }}
 		</h2>
-		<VbDataTable
+		<VbTable
 			ref="tableRef"
 			:handle-perm="opts.permission"
 			:handle-btns="opts.handleBtns"
@@ -211,7 +211,7 @@ defineExpose({ queryDictData, dictTypeData })
 					</el-button>
 				</vb-tooltip>
 			</template>
-		</VbDataTable>
+		</VbTable>
 		<VbModal
 			v-model:modal="modalRef"
 			modal-dialog-class="max-width:850px;width:850px;"

UI/VAP_V3.VUE/src/views/system/dict/_type.vue

@@ -147,7 +147,7 @@ function onQuerySuccess() {
 </script>
 <template>
 	<div>
-		<VbDataTable
+		<VbTable
 			ref="tableRef"
 			:handle-perm="opts.permission"
 			:handle-funs="opts.handleFuns"
@@ -197,7 +197,7 @@ function onQuerySuccess() {
 					</el-button>
 				</vb-tooltip>
 			</template>
-		</VbDataTable>
+		</VbTable>
 		<VbModal
 			v-model:modal="modalRef"
 			:title="opts.modalTitle"

UI/VAP_V3.VUE/src/views/system/log/loginLog.vue

@@ -173,8 +173,8 @@ function handleExport() {
 </script>
 
 <template>
-	<div>
-		<VbDataTable
+	<div class="app-container">
+		<VbTable
 			ref="tableRef"
 			key-field="infoId"
 			:handle-perm="opts.permission"
@@ -193,6 +193,6 @@ function handleExport() {
 			<template #status="{ row }">
 				<DictTag :value="row.status" type="sys_common_status"></DictTag>
 			</template>
-		</VbDataTable>
+		</VbTable>
 	</div>
 </template>

UI/VAP_V3.VUE/src/views/system/log/operLog.vue

@@ -172,8 +172,8 @@ function typeFormat(row: any) {
 </script>
 
 <template>
-	<div>
-		<VbDataTable
+	<div class="app-container">
+		<VbTable
 			ref="tableRef"
 			key-field="operId"
 			:handle-perm="opts.permission"
@@ -211,7 +211,7 @@ function typeFormat(row: any) {
 					详情
 				</el-button>
 			</template>
-		</VbDataTable>
+		</VbTable>
 		<VbModal v-model:modal="viewsModalRef" id="q23" title="操作日志详情" append-to-body>
 			<template #body>
 				<el-row>

UI/VAP_V3.VUE/src/views/system/menu/index.vue

@@ -244,8 +244,8 @@ function selected(name: string) {
 }
 </script>
 <template>
-	<div>
-		<VbDataTable
+	<div class="app-container">
+		<VbTable
 			ref="tableRef"
 			:is-tree="true"
 			keyField="menuId"
@@ -266,7 +266,7 @@ function selected(name: string) {
 			:search-form-items="opts.searchFormItems"
 			:columns="opts.columns"
 			:custom-btns="opts.customBtns"
-			:remote-fun="opts.tableListFun"
+			:remote-fun="apis.system.menuApi.listMenu"
 			v-model:query-params="queryParams"
 			:reset-search-form-fun="resetQuery"
 			:custom-search-fun="handleQuery">
@@ -374,7 +374,7 @@ function selected(name: string) {
 					</el-button>
 				</vb-tooltip>
 			</template>
-		</VbDataTable>
+		</VbTable>
 		<VbModal
 			v-model:modal="modalRef"
 			:title="opts.modalTitle"

UI/VAP_V3.VUE/src/views/system/notice/index.vue

@@ -137,8 +137,8 @@ function init() {
 onMounted(init)
 </script>
 <template>
-	<div>
-		<VbDataTable
+	<div class="app-container">
+		<VbTable
 			ref="tableRef"
 			:handle-perm="opts.permission"
 			:handle-funs="opts.handleFuns"
@@ -187,7 +187,7 @@ onMounted(init)
 					</el-button>
 				</vb-tooltip>
 			</template>
-		</VbDataTable>
+		</VbTable>
 		<VbModal
 			v-model:modal="modalRef"
 			:title="opts.modalTitle"

UI/VAP_V3.VUE/src/views/system/org/index.vue

@@ -220,8 +220,8 @@ function getUserListByOrgId(orgId: number) {
 }
 </script>
 <template>
-	<div>
-		<VbDataTable
+	<div class="app-container">
+		<VbTable
 			ref="tableRef"
 			:is-tree="true"
 			keyField="orgId"
@@ -240,7 +240,7 @@ function getUserListByOrgId(orgId: number) {
 			:search-form-items="opts.searchFormItems"
 			:columns="opts.columns"
 			:custom-btns="opts.customBtns"
-			:remote-fun="opts.tableListFun"
+			:remote-fun="apis.system.orgApi.listOrg"
 			v-model:query-params="queryParams"
 			:reset-search-form-fun="resetQuery"
 			:custom-search-fun="handleQuery">
@@ -282,7 +282,7 @@ function getUserListByOrgId(orgId: number) {
 					</el-button>
 				</vb-tooltip>
 			</template>
-		</VbDataTable>
+		</VbTable>
 		<VbModal
 			v-model:modal="modalRef"
 			:title="opts.modalTitle"

UI/VAP_V3.VUE/src/views/system/oss/_config.vue

@@ -305,7 +305,7 @@ defineExpose({ query })
 </script>
 <template>
 	<div class="app-container">
-		<VbDataTable
+		<VbTable
 			ref="tableRef"
 			keyField="ossConfigId"
 			:columns="opts.columns"
@@ -364,7 +364,7 @@ defineExpose({ query })
 					</el-button>
 				</vb-tooltip>
 			</template>
-		</VbDataTable>
+		</VbTable>
 		<VbModal
 			v-model:modal="modalRef"
 			:title="opts.modalTitle"

UI/VAP_V3.VUE/src/views/system/oss/index.vue

@@ -217,7 +217,7 @@ getServiceOptions()
 </script>
 <template>
 	<div class="app-container">
-		<VbDataTable
+		<VbTable
 			ref="tableRef"
 			keyField="ossId"
 			:columns="opts.columns"
@@ -281,7 +281,7 @@ getServiceOptions()
 					</el-button>
 				</vb-tooltip>
 			</template>
-		</VbDataTable>
+		</VbTable>
 		<VbModal
 			v-model:modal="modalRef"
 			:title="opts.modalTitle"

UI/VAP_V3.VUE/src/views/system/post/index.vue

@@ -247,7 +247,7 @@ function getOrgTreeSelect() {
 			</el-col>
 			<!--用户数据-->
 			<el-col :span="20" :xs="24">
-				<VbDataTable
+				<VbTable
 					ref="tableRef"
 					:handle-perm="opts.permission"
 					:handle-funs="opts.handleFuns"
@@ -296,7 +296,7 @@ function getOrgTreeSelect() {
 							</el-button>
 						</vb-tooltip>
 					</template>
-				</VbDataTable>
+				</VbTable>
 			</el-col>
 		</el-row>
 

UI/VAP_V3.VUE/src/views/system/role/index.vue

@@ -448,8 +448,8 @@ function getOrgAllCheckedKeys() {
 </script>
 
 <template>
-	<div>
-		<VbDataTable
+	<div class="app-container">
+		<VbTable
 			ref="tableRef"
 			:handle-perm="opts.permission"
 			:handle-btns="opts.handleBtns"
@@ -517,7 +517,7 @@ function getOrgAllCheckedKeys() {
 					</vb-tooltip>
 				</template>
 			</template>
-		</VbDataTable>
+		</VbTable>
 		<VbModal
 			v-model:modal="modalRef"
 			:title="opts.modalTitle"

UI/VAP_V3.VUE/src/views/system/tenant/index.vue

@@ -382,7 +382,7 @@ function getPackages() {
 </script>
 <template>
 	<div class="app-container">
-		<VbDataTable
+		<VbTable
 			ref="tableRef"
 			keyField="id"
 			:columns="opts.columns"
@@ -455,7 +455,7 @@ function getPackages() {
 					</el-button>
 				</vb-tooltip>
 			</template>
-		</VbDataTable>
+		</VbTable>
 		<VbModal
 			v-model:modal="modalRef"
 			:title="opts.modalTitle"

UI/VAP_V3.VUE/src/views/system/tenantPackage/index.vue

@@ -237,7 +237,7 @@ function getMenuAllCheckedKeys() {
 </script>
 <template>
 	<div class="app-container">
-		<VbDataTable
+		<VbTable
 			ref="tableRef"
 			keyField="packageId"
 			:columns="opts.columns"
@@ -295,7 +295,7 @@ function getMenuAllCheckedKeys() {
 					</el-button>
 				</vb-tooltip>
 			</template>
-		</VbDataTable>
+		</VbTable>
 		<VbModal
 			v-model:modal="modalRef"
 			:title="opts.modalTitle"

UI/VAP_V3.VUE/src/views/system/user/index.vue

@@ -508,7 +508,7 @@ function clearPost() {
 			</el-col>
 			<!--用户数据-->
 			<el-col :span="20" :xs="24">
-				<VbDataTable
+				<VbTable
 					ref="tableRef"
 					:handle-perm="permission"
 					:handle-funs="handleFuns"
@@ -577,7 +577,7 @@ function clearPost() {
 							</vb-tooltip>
 						</template>
 					</template>
-				</VbDataTable>
+				</VbTable>
 			</el-col>
 		</el-row>
 		<VbModal

UI/VAP_V3.VUE/src/views/tool/gen/_ImportTable.vue

@@ -114,7 +114,7 @@ defineExpose({
 
 <template>
 	<div class="app-container">
-		<VbDataTable
+		<VbTable
 			ref="tableRef"
 			:handle-perm="opts.permission"
 			:handle-funs="opts.handleFuns"
@@ -141,6 +141,6 @@ defineExpose({
 			<template #updatedAt="{ row }">
 				{{ dayjs(row.updatedAt).format("YYYY-MM-DD HH:mm:ss") }}
 			</template>
-		</VbDataTable>
+		</VbTable>
 	</div>
 </template>

UI/VAP_V3.VUE/src/views/tool/gen/index.vue

@@ -299,8 +299,8 @@ function submitProjectForm() {
 </script>
 
 <template>
-	<div>
-		<VbDataTable
+	<div class="app-container">
+		<VbTable
 			ref="tableRef"
 			:handle-perm="opts.permission"
 			:handle-funs="opts.handleFuns"
@@ -365,7 +365,7 @@ function submitProjectForm() {
 					</el-button>
 				</vb-tooltip>
 			</template>
-		</VbDataTable>
+		</VbTable>
 		<VbModal
 			v-model:modal="modalRef"
 			title="修改表信息"

UI/VAP_V3.VUE/src/views/workflow/category/index.vue

@@ -197,7 +197,7 @@ function getTableData(query: any) {
 </script>
 <template>
 	<div class="app-container">
-		<VbDataTable
+		<VbTable
 			ref="tableTreeRef"
 			:is-tree="true"
 			keyField="categoryId"
@@ -263,7 +263,7 @@ function getTableData(query: any) {
 					</el-button>
 				</vb-tooltip>
 			</template>
-		</VbDataTable>
+		</VbTable>
 		<VbModal
 			v-model:modal="modalRef"
 			:title="opts.modalTitle"

UI/VAP_V3.VUE/src/views/workflow/formManage/index.vue

@@ -193,7 +193,7 @@ function submitForm() {
 </script>
 <template>
 	<div class="app-container">
-		<VbDataTable
+		<VbTable
 			ref="tableRef"
 			keyField="id"
 			:columns="opts.columns"
@@ -241,7 +241,7 @@ function submitForm() {
 					</el-button>
 				</vb-tooltip>
 			</template>
-		</VbDataTable>
+		</VbTable>
 		<VbModal
 			v-model:modal="modalRef"
 			:title="opts.modalTitle"

UI/VAP_V3.VUE/src/views/workflow/model/index.vue

@@ -260,7 +260,7 @@ onMounted(init)
 					@node-click="onCategoryChange"></VbTree>
 			</el-col>
 			<el-col :span="20" :xs="24">
-				<VbDataTable
+				<VbTable
 					ref="tableRef"
 					:handle-perm="opts.permission"
 					:handle-funs="opts.handleFuns"
@@ -343,7 +343,7 @@ onMounted(init)
 							</el-button>
 						</vb-tooltip>
 					</template>
-				</VbDataTable>
+				</VbTable>
 			</el-col>
 		</el-row>
 		<Design ref="modelDesignRef"></Design>

UI/VAP_V3.VUE/src/views/workflow/processDefinition/index.vue

@@ -444,7 +444,7 @@ onMounted(init)
 					@node-click="onCategoryChange"></VbTree>
 			</el-col>
 			<el-col :span="21" :xs="24">
-				<VbDataTable
+				<VbTable
 					ref="tableRef"
 					keyField="id"
 					:columns="opts.columns"
@@ -542,7 +542,7 @@ onMounted(init)
 							</el-button>
 						</vb-tooltip>
 					</template>
-				</VbDataTable>
+				</VbTable>
 			</el-col>
 		</el-row>
 		<VbModal

UI/VAP_V3.VUE/src/views/workflow/processInstance/index.vue

@@ -354,7 +354,7 @@ onMounted(init)
 					@node-click="onCategoryChange"></VbTree>
 			</el-col>
 			<el-col :span="20" :xs="24">
-				<VbDataTable
+				<VbTable
 					ref="tableRef"
 					keyField="id"
 					:columns="opts.columns"
@@ -440,7 +440,7 @@ onMounted(init)
 							</el-button>
 						</vb-tooltip>
 					</template>
-				</VbDataTable>
+				</VbTable>
 			</el-col>
 		</el-row>
 		<VbModal
@@ -500,7 +500,7 @@ onMounted(init)
 			modal-body-class="pt-0"
 			append-to-body>
 			<template #body>
-				<VbDataTable
+				<VbTable
 					ref="pdTableRef"
 					:columns="pdColumns"
 					:data="pdHistoryList"
@@ -514,7 +514,7 @@ onMounted(init)
 						<el-tag v-if="row.suspensionState == 1" type="success">激活</el-tag>
 						<el-tag v-else type="danger">挂起</el-tag>
 					</template>
-				</VbDataTable>
+				</VbTable>
 			</template>
 		</VbModal>
 	</div>

UI/VAP_V3.VUE/src/views/workflow/spel/index.vue

@@ -220,7 +220,7 @@ watch(
 
 <template>
 	<div class="app-container">
-		<VbDataTable
+		<VbTable
 			ref="tableRef"
 			:handle-perm="opts.permission"
 			:handle-funs="opts.handleFuns"
@@ -269,7 +269,7 @@ watch(
 					</el-button>
 				</vb-tooltip>
 			</template>
-		</VbDataTable>
+		</VbTable>
 
 		<VbModal
 			v-model:modal="modalRef"

UI/VAP_V3.VUE/src/views/workflow/task/allTaskWaiting.vue

@@ -183,7 +183,7 @@ function onUrgeTaskSubmit(data: any) {
 
 <template>
 	<div class="app-container">
-		<VbDataTable
+		<VbTable
 			ref="tableRef"
 			keyField="id"
 			:columns="opts.columns"
@@ -269,7 +269,7 @@ function onUrgeTaskSubmit(data: any) {
 					</el-button>
 				</vb-tooltip>
 			</template>
-		</VbDataTable>
+		</VbTable>
 		<!-- 选人组件 -->
 		<UserSelect
 			ref="userSelectRef"

UI/VAP_V3.VUE/src/views/workflow/task/myDocument.vue

@@ -196,7 +196,7 @@ function getCategoryTreeSelect() {
 					@node-click="onCategoryChange"></VbTree>
 			</el-col>
 			<el-col :span="20" :xs="24">
-				<VbDataTable
+				<VbTable
 					ref="tableRef"
 					keyField="id"
 					:columns="opts.columns"
@@ -292,7 +292,7 @@ function getCategoryTreeSelect() {
 							</el-button>
 						</vb-tooltip>
 					</template>
-				</VbDataTable>
+				</VbTable>
 			</el-col>
 		</el-row>
 

UI/VAP_V3.VUE/src/views/workflow/task/taskCopyList.vue

@@ -101,7 +101,7 @@ function handleView(row: any) {
 </script>
 <template>
 	<div class="app-container">
-		<VbDataTable
+		<VbTable
 			ref="tableRef"
 			keyField="id"
 			:columns="opts.columns"
@@ -127,6 +127,6 @@ function handleView(row: any) {
 					</el-button>
 				</vb-tooltip>
 			</template>
-		</VbDataTable>
+		</VbTable>
 	</div>
 </template>

UI/VAP_V3.VUE/src/views/workflow/task/taskFinish.vue

@@ -123,7 +123,7 @@ function onUserSelect(data: any) {
 </script>
 <template>
 	<div class="app-container">
-		<VbDataTable
+		<VbTable
 			ref="tableRef"
 			keyField="id"
 			:columns="opts.columns"
@@ -157,7 +157,7 @@ function onUserSelect(data: any) {
 					</el-button>
 				</vb-tooltip>
 			</template>
-		</VbDataTable>
+		</VbTable>
 		<UserSelect
 			ref="userSelectRef"
 			:multiple="true"

UI/VAP_V3.VUE/src/views/workflow/task/taskWaiting.vue

@@ -103,7 +103,7 @@ function handleApproval(row: any) {
 </script>
 <template>
 	<div class="app-container">
-		<VbDataTable
+		<VbTable
 			ref="tableRef"
 			keyField="id"
 			:columns="opts.columns"
@@ -146,6 +146,6 @@ function handleApproval(row: any) {
 					</el-button>
 				</vb-tooltip>
 			</template>
-		</VbDataTable>
+		</VbTable>
 	</div>
 </template>