From 402125b8142dc48a0dfa4b3a97125ca97f2de9fe Mon Sep 17 00:00:00 2001
From: zuohuaijun <zuohuaijun@163.com>
Date: Thu, 31 Oct 2024 19:01:59 +0800
Subject: [PATCH] =?UTF-8?q?=F0=9F=98=8E=E6=A0=BC=E5=BC=8F=E5=8C=96?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Admin.NET.Application.csproj              |   4 -
 .../Admin.NET.Core/Admin.NET.Core.csproj      |   2 +-
 Web/package.json                              |   2 +-
 Web/src/types/mitt.d.ts                       |   2 +-
 .../codeGen/component/genConfigDialog.vue     | 687 +++++++++--------
 .../system/database/component/addTable.vue    | 721 +++++++++---------
 6 files changed, 701 insertions(+), 717 deletions(-)

diff --git a/Admin.NET/Admin.NET.Application/Admin.NET.Application.csproj b/Admin.NET/Admin.NET.Application/Admin.NET.Application.csproj
index e732ac1e..a2246779 100644
--- a/Admin.NET/Admin.NET.Application/Admin.NET.Application.csproj
+++ b/Admin.NET/Admin.NET.Application/Admin.NET.Application.csproj
@@ -29,8 +29,4 @@
     <ProjectReference Include="..\Plugins\Admin.NET.Plugin.GoView\Admin.NET.Plugin.GoView.csproj" />
   </ItemGroup>
 
-  <ItemGroup>
-    <Folder Include="Entity\" />
-  </ItemGroup>
-
 </Project>
diff --git a/Admin.NET/Admin.NET.Core/Admin.NET.Core.csproj b/Admin.NET/Admin.NET.Core/Admin.NET.Core.csproj
index 119ac04b..6a9bab6e 100644
--- a/Admin.NET/Admin.NET.Core/Admin.NET.Core.csproj
+++ b/Admin.NET/Admin.NET.Core/Admin.NET.Core.csproj
@@ -45,7 +45,7 @@
     <PackageReference Include="SqlSugarCore" Version="5.1.4.170" />
     <PackageReference Include="SSH.NET" Version="2024.1.0" />
     <PackageReference Include="System.Linq.Dynamic.Core" Version="1.4.7" />
-    <PackageReference Include="TencentCloudSDK.Sms" Version="3.0.1113" />
+    <PackageReference Include="TencentCloudSDK.Sms" Version="3.0.1114" />
     <PackageReference Include="UAParser" Version="3.1.47" />
     <PackageReference Include="Yitter.IdGenerator" Version="1.0.14" />
   </ItemGroup>
diff --git a/Web/package.json b/Web/package.json
index e0c9ed7c..334bfa53 100644
--- a/Web/package.json
+++ b/Web/package.json
@@ -71,7 +71,7 @@
 		"vue-router": "^4.4.5",
 		"vue-signature-pad": "^3.0.2",
 		"vue3-tree-org": "^4.2.2",
-		"vxe-pc-ui": "^4.2.34",
+		"vxe-pc-ui": "^4.2.35",
 		"vxe-table": "^4.7.59",
 		"vxe-table-plugin-element": "^4.0.4",
 		"vxe-table-plugin-export-xlsx": "^4.0.7",
diff --git a/Web/src/types/mitt.d.ts b/Web/src/types/mitt.d.ts
index c384795d..db694f32 100644
--- a/Web/src/types/mitt.d.ts
+++ b/Web/src/types/mitt.d.ts
@@ -24,7 +24,7 @@ declare type MittType<T = any> = {
 	openShareTagsView?: string;
 	onTagsViewRefreshRouterView?: T;
 	onCurrentContextmenuClick?: T;
-	submitRefreshFk?:T
+	submitRefreshFk?: T;
 };
 
 // mitt 参数类型定义
diff --git a/Web/src/views/system/codeGen/component/genConfigDialog.vue b/Web/src/views/system/codeGen/component/genConfigDialog.vue
index 894e397c..32078965 100644
--- a/Web/src/views/system/codeGen/component/genConfigDialog.vue
+++ b/Web/src/views/system/codeGen/component/genConfigDialog.vue
@@ -1,92 +1,86 @@
 <template>
 	<div class="sys-codeGenConfig-container">
-	  <vxe-modal v-model="state.isShowDialog" title="生成配置" :width="800" :height="350" show-footer show-zoom resize fullscreen
-		@close="cancel">
-		<template #default>
-		  <vxe-grid ref="xGrid" class="xGrid-table-style" v-bind="options">
-			<template #drag_default="{}">
-			  <span class="drag-btn">
-				<i class="fa fa-arrows"></i>
-			  </span>
+		<vxe-modal v-model="state.isShowDialog" title="生成配置" :width="800" :height="350" show-footer show-zoom resize fullscreen @close="cancel">
+			<template #default>
+				<vxe-grid ref="xGrid" class="xGrid-table-style" v-bind="options">
+					<template #drag_default="{}">
+						<span class="drag-btn">
+							<i class="fa fa-arrows"></i>
+						</span>
+					</template>
+					<template #effectType="{ row, $index }">
+						<vxe-select v-model="row.effectType" class="m-2" style="width: 70%" placeholder="Select" transfer :disabled="judgeColumns(row)" @change="effectTypeChange(row, $index)" filterable>
+							<vxe-option v-for="item in state.effectTypeList" :key="item.code" :label="item.value" :value="item.code" />
+						</vxe-select>
+						<vxe-button v-if="row.effectType === 'ApiTreeSelect' || row.effectType === 'fk'" style="width: 30%" icon="vxe-icon-edit" @click="effectTypeChange(row, $index)">修改</vxe-button>
+					</template>
+					<template #columnComment="{ row }">
+						<vxe-input v-model="row.columnComment" autocomplete="off" />
+					</template>
+					<template #dictType="{ row }">
+						<vxe-select v-model="row.dictTypeCode" class="m-2" :disabled="effectTypeEnable(row)" filterable transfer>
+							<vxe-option v-for="item in state.dictTypeCodeList" :key="item.code" :label="item.name" :value="item.code" />
+						</vxe-select>
+					</template>
+					<template #whetherTable="{ row }">
+						<vxe-checkbox v-model="row.whetherTable"></vxe-checkbox>
+					</template>
+					<template #whetherAddUpdate="{ row }">
+						<vxe-checkbox v-model="row.whetherAddUpdate" :disabled="judgeColumns(row)"></vxe-checkbox>
+					</template>
+					<template #whetherSortable="{ row }">
+						<vxe-checkbox v-model="row.whetherSortable"></vxe-checkbox>
+					</template>
+					<template #whetherRequired="{ row }">
+						<vxe-tag v-if="row.whetherRequired" status="success">是</vxe-tag>
+						<vxe-tag v-else status="info">否</vxe-tag>
+					</template>
+					<template #queryWhether="{ row }">
+						<vxe-switch readonly v-model="row.queryWhether" open-label="是" close-label="否" :openValue="true" :closeValue="false"></vxe-switch>
+					</template>
+					<template #queryType="{ row }">
+						<vxe-select v-model="row.queryType" class="m-2" placeholder="Select" :disabled="!row.queryWhether" filterable transfer>
+							<vxe-option v-for="item in state.queryTypeList" :key="item.code" :label="item.value" :value="item.code" />
+						</vxe-select>
+					</template>
+					<template #verification="{ row }">
+						<vxe-button status="primary" plain v-if="row.columnKey === 'False' && !row.whetherCommon" @click="openVerifyDialog(row)">校验规则{{ row.ruleCount }}</vxe-button>
+						<span v-else></span>
+					</template>
+				</vxe-grid>
 			</template>
-			<template #effectType="{ row, $index }">
-			  <vxe-select v-model="row.effectType" class="m-2" style="width: 70%" placeholder="Select" transfer
-				:disabled="judgeColumns(row)" @change="effectTypeChange(row, $index)" filterable>
-				<vxe-option v-for="item in state.effectTypeList" :key="item.code" :label="item.value"
-				  :value="item.code" />
-			  </vxe-select>
-			  <vxe-button v-if="row.effectType === 'ApiTreeSelect' || row.effectType === 'fk'" style="width: 30%"
-				icon="vxe-icon-edit" @click="effectTypeChange(row, $index)">修改</vxe-button>
+			<template #footer>
+				<vxe-button @click="cancel">取 消</vxe-button>
+				<vxe-button status="primary" @click="submit">确 定</vxe-button>
 			</template>
-			<template #columnComment="{ row }">
-			  <vxe-input v-model="row.columnComment" autocomplete="off" />
-			</template>
-			<template #dictType="{ row }">
-			  <vxe-select v-model="row.dictTypeCode" class="m-2" :disabled="effectTypeEnable(row)" filterable transfer>
-				<vxe-option v-for="item in state.dictTypeCodeList" :key="item.code" :label="item.name"
-				  :value="item.code" />
-			  </vxe-select>
-			</template>
-			<template #whetherTable="{ row }">
-			  <vxe-checkbox v-model="row.whetherTable"></vxe-checkbox>
-			</template>
-			<template #whetherAddUpdate="{ row }">
-			  <vxe-checkbox v-model="row.whetherAddUpdate" :disabled="judgeColumns(row)"></vxe-checkbox>
-			</template>
-			<template #whetherSortable="{ row }">
-			  <vxe-checkbox v-model="row.whetherSortable"></vxe-checkbox>
-			</template>
-			<template #whetherRequired="{ row }">
-			  <vxe-tag v-if="row.whetherRequired" status="success">是</vxe-tag>
-			  <vxe-tag v-else status="info">否</vxe-tag>
-			</template>
-			<template #queryWhether="{ row }">
-			  <vxe-switch readonly v-model="row.queryWhether" open-label="是" close-label="否" :openValue="true"
-				:closeValue="false"></vxe-switch>
-			</template>
-			<template #queryType="{ row }">
-			  <vxe-select v-model="row.queryType" class="m-2" placeholder="Select" :disabled="!row.queryWhether"
-				filterable transfer>
-				<vxe-option v-for="item in state.queryTypeList" :key="item.code" :label="item.value" :value="item.code" />
-			  </vxe-select>
-			</template>
-			<template #verification="{ row }">
-			  <vxe-button status="primary" plain v-if="row.columnKey === 'False' && !row.whetherCommon"
-				@click="openVerifyDialog(row)">校验规则{{ row.ruleCount }}</vxe-button>
-			  <span v-else></span>
-			</template>
-		  </vxe-grid>
-		</template>
-		<template #footer>
-		  <vxe-button @click="cancel">取 消</vxe-button>
-		  <vxe-button status="primary" @click="submit">确 定</vxe-button>
-		</template>
-	  </vxe-modal>
-  
-	  <fkDialog ref="fkDialogRef" @submitRefreshFk="submitRefreshFk" />
-	  <treeDialog ref="treeDialogRef" @submitRefreshFk="submitRefreshFk" />
-	  <verifyDialog ref="verifyDialogRef" @submitVerify="submitVerifyOk" />
+		</vxe-modal>
+
+		<fkDialog ref="fkDialogRef" @submitRefreshFk="submitRefreshFk" />
+		<treeDialog ref="treeDialogRef" @submitRefreshFk="submitRefreshFk" />
+		<verifyDialog ref="verifyDialogRef" @submitVerify="submitVerifyOk" />
 	</div>
-  </template>
-  
-  <script lang="ts" setup name="sysCodeGenConfig">
-  import { nextTick, onMounted, onUnmounted, reactive, ref } from 'vue';
-  import mittBus from '/@/utils/mitt';
-  import fkDialog from '/@/views/system/codeGen/component/fkDialog.vue';
-  import treeDialog from '/@/views/system/codeGen/component/treeDialog.vue';
-  import verifyDialog from '/@/views/system/codeGen/component/verifyDialog.vue';
-  
-  import { getAPI } from '/@/utils/axios-utils';
-  import { SysCodeGenConfigApi, SysConstApi, SysDictDataApi, SysDictTypeApi, SysEnumApi } from '/@/api-services/api';
-  import { VxeGridInstance, VxeGridProps } from 'vxe-pc-ui';
-  import Sortable from 'sortablejs';
-  // import { CodeGenConfig } from '/@/api-services/models/code-gen-config';
-  const xGrid = ref<VxeGridInstance<any>>();
-  const emits = defineEmits(['handleQuery']);
-  const fkDialogRef = ref();
-  const treeDialogRef = ref();
-  const verifyDialogRef = ref();
-  const state = reactive({
+</template>
+
+<script lang="ts" setup name="sysCodeGenConfig">
+import { nextTick, onMounted, onUnmounted, reactive, ref } from 'vue';
+import mittBus from '/@/utils/mitt';
+import Sortable from 'sortablejs';
+import { VxeGridInstance, VxeGridProps } from 'vxe-pc-ui';
+
+import fkDialog from '/@/views/system/codeGen/component/fkDialog.vue';
+import treeDialog from '/@/views/system/codeGen/component/treeDialog.vue';
+import verifyDialog from '/@/views/system/codeGen/component/verifyDialog.vue';
+
+import { getAPI } from '/@/utils/axios-utils';
+import { SysCodeGenConfigApi, SysConstApi, SysDictDataApi, SysDictTypeApi, SysEnumApi } from '/@/api-services/api';
+// import { CodeGenConfig } from '/@/api-services/models/code-gen-config';
+
+const xGrid = ref<VxeGridInstance<any>>();
+const emits = defineEmits(['handleQuery']);
+const fkDialogRef = ref();
+const treeDialogRef = ref();
+const verifyDialogRef = ref();
+const state = reactive({
 	isShowDialog: false,
 	loading: false,
 	dbData: [] as any,
@@ -97,9 +91,10 @@
 	allConstSelector: [] as any,
 	allEnumSelector: [] as any,
 	sortable: undefined as any,
-  });
-  // 表格参数配置
-  const options = reactive<VxeGridProps>({
+});
+
+// 表格参数配置
+const options = reactive<VxeGridProps>({
 	id: 'genConfigDialog',
 	height: 'auto',
 	keepSource: true,
@@ -109,353 +104,353 @@
 	rowConfig: { useKey: true },
 	seqConfig: { seqMethod: ({ row }) => row.orderNo },
 	columns: [
-	  {
-		width: 50,
-		slots: {
-		  default: 'drag_default',
+		{
+			width: 50,
+			slots: {
+				default: 'drag_default',
+			},
 		},
-	  },
-	  {
-		field: 'orderNo',
-		title: '排序',
-		minWidth: 80,
-		showOverflow: 'tooltip',
-	  },
-	  {
-		field: 'columnName',
-		title: '字段',
-		minWidth: 160,
-		showOverflow: 'tooltip',
-	  },
-	  {
-		field: 'columnComment',
-		title: '描述',
-		minWidth: 120,
-		showOverflow: 'tooltip',
-		slots: {
-		  edit: 'columnComment',
-		  default: 'columnComment',
+		{
+			field: 'orderNo',
+			title: '排序',
+			minWidth: 80,
+			showOverflow: 'tooltip',
 		},
-	  },
-	  {
-		field: 'netType',
-		title: '数据类型',
-		minWidth: 90,
-	  },
-	  {
-		field: 'effectType',
-		title: '作用类型',
-		minWidth: 160,
-		slots: {
-		  edit: 'effectType',
-		  default: 'effectType',
+		{
+			field: 'columnName',
+			title: '字段',
+			minWidth: 160,
+			showOverflow: 'tooltip',
 		},
-	  },
-	  {
-		field: 'dictTypeCode',
-		title: '字典',
-		minWidth: 180,
-		slots: {
-		  edit: 'dictType',
-		  default: 'dictType',
+		{
+			field: 'columnComment',
+			title: '描述',
+			minWidth: 120,
+			showOverflow: 'tooltip',
+			slots: {
+				edit: 'columnComment',
+				default: 'columnComment',
+			},
 		},
-	  },
-	  {
-		field: 'whetherTable',
-		title: '列表显示',
-		minWidth: 70,
-		slots: {
-		  edit: 'whetherTable',
-		  default: 'whetherTable',
+		{
+			field: 'netType',
+			title: '数据类型',
+			minWidth: 90,
 		},
-	  },
-	  {
-		field: 'whetherAddUpdate',
-		title: '增改',
-		minWidth: 70,
-		slots: {
-		  edit: 'whetherAddUpdate',
-		  default: 'whetherAddUpdate',
+		{
+			field: 'effectType',
+			title: '作用类型',
+			minWidth: 160,
+			slots: {
+				edit: 'effectType',
+				default: 'effectType',
+			},
 		},
-	  },
-	  {
-		field: 'whetherRequired',
-		title: '必填',
-		minWidth: 70,
-		slots: {
-		  edit: 'whetherRequired',
-		  default: 'whetherRequired',
+		{
+			field: 'dictTypeCode',
+			title: '字典',
+			minWidth: 180,
+			slots: {
+				edit: 'dictType',
+				default: 'dictType',
+			},
 		},
-	  },
-	  {
-		field: 'whetherSortable',
-		title: '可排序',
-		minWidth: 70,
-		slots: {
-		  edit: 'whetherSortable',
-		  default: 'whetherSortable',
+		{
+			field: 'whetherTable',
+			title: '列表显示',
+			minWidth: 70,
+			slots: {
+				edit: 'whetherTable',
+				default: 'whetherTable',
+			},
 		},
-	  },
-	  {
-		field: 'queryWhether',
-		title: '是否是查询',
-		minWidth: 70,
-		slots: {
-		  edit: 'queryWhether',
-		  default: 'queryWhether',
+		{
+			field: 'whetherAddUpdate',
+			title: '增改',
+			minWidth: 70,
+			slots: {
+				edit: 'whetherAddUpdate',
+				default: 'whetherAddUpdate',
+			},
 		},
-	  },
-	  {
-		field: 'queryType',
-		title: '查询方式',
-		minWidth: 120,
-		slots: {
-		  edit: 'queryType',
-		  default: 'queryType',
+		{
+			field: 'whetherRequired',
+			title: '必填',
+			minWidth: 70,
+			slots: {
+				edit: 'whetherRequired',
+				default: 'whetherRequired',
+			},
 		},
-	  },
-	  {
-		title: '校验规则',
-		width: 130,
-		showOverflow: true,
-		slots: {
-		  edit: 'verification',
-		  default: 'verification',
+		{
+			field: 'whetherSortable',
+			title: '可排序',
+			minWidth: 70,
+			slots: {
+				edit: 'whetherSortable',
+				default: 'whetherSortable',
+			},
+		},
+		{
+			field: 'queryWhether',
+			title: '是否是查询',
+			minWidth: 70,
+			slots: {
+				edit: 'queryWhether',
+				default: 'queryWhether',
+			},
+		},
+		{
+			field: 'queryType',
+			title: '查询方式',
+			minWidth: 120,
+			slots: {
+				edit: 'queryType',
+				default: 'queryType',
+			},
+		},
+		{
+			title: '校验规则',
+			width: 130,
+			showOverflow: true,
+			slots: {
+				edit: 'verification',
+				default: 'verification',
+			},
 		},
-	  },
 	],
 	editConfig: { trigger: 'click', mode: 'row', showStatus: true },
-  });
-  
-  const rowDrop = () => {
+});
+
+const rowDrop = () => {
 	const el = document.querySelector('.xGrid-table-style .vxe-table--body tbody') as HTMLElement;
 	state.sortable = Sortable.create(el, {
-	  animation: 300,
-	  handle: '.drag-btn',
-	  onEnd: (sortableEvent: any) => {
-		const fullData = xGrid.value?.getTableData().fullData || [];
-		const newIndex = sortableEvent.newIndex as number;
-		const oldIndex = sortableEvent.oldIndex as number;
-		// 往前移动
-		if (oldIndex > newIndex) {
-		  const moveRow = fullData?.find((e) => e.orderNo == oldIndex + 1);
-		  for (let i = oldIndex; i > newIndex; i--) {
-			const row = fullData?.find((e) => e.orderNo == i);
-			if (row) {
-				row.orderNo += 1;
+		animation: 300,
+		handle: '.drag-btn',
+		onEnd: (sortableEvent: any) => {
+			const fullData = xGrid.value?.getTableData().fullData || [];
+			const newIndex = sortableEvent.newIndex as number;
+			const oldIndex = sortableEvent.oldIndex as number;
+			// 往前移动
+			if (oldIndex > newIndex) {
+				const moveRow = fullData?.find((e) => e.orderNo == oldIndex + 1);
+				for (let i = oldIndex; i > newIndex; i--) {
+					const row = fullData?.find((e) => e.orderNo == i);
+					if (row) {
+						row.orderNo += 1;
+					}
+				}
+				moveRow.orderNo = newIndex + 1;
+			} else {
+				// 往后移动
+				const moveRow = fullData?.find((e) => e.orderNo == oldIndex + 1);
+				for (let i = oldIndex; i < newIndex; i++) {
+					const row = fullData?.find((e) => e.orderNo == i + 2);
+					if (row) {
+						row.orderNo -= 1;
+					}
+				}
+				moveRow.orderNo = newIndex + 1;
 			}
-		  }
-		  moveRow.orderNo = newIndex + 1;
-		} else {
-		  // 往后移动
-		  const moveRow = fullData?.find((e) => e.orderNo == oldIndex + 1);
-		  for (let i = oldIndex; i < newIndex; i++) {
-			const row = fullData?.find((e) => e.orderNo == i + 2);
-			if (row) {
-				row.orderNo -= 1;
-			}
-		  }
-		  moveRow.orderNo = newIndex + 1;
-		}
-		// 更新表格数据
-		xGrid.value?.updateData();
-	  },
+			// 更新表格数据
+			xGrid.value?.updateData();
+		},
 	});
-  };
-  
-  // 页面初始化
-  onMounted(async () => {
+};
+
+// 页面初始化
+onMounted(async () => {
 	// 从后端获取字典列表数据，并保存到本地状态管理中
 	var res = await getAPI(SysDictDataApi).apiSysDictDataDataListCodeGet('code_gen_effect_type');
 	state.effectTypeList = res.data.result;
-  
+
 	// 获取字典类型代码列表，并将其保存到本地状态管理中，同时更新字典数据全集
 	var res1 = await getAPI(SysDictTypeApi).apiSysDictTypeListGet();
 	state.dictTypeCodeList = res1.data.result;
 	state.dictDataAll = res1.data.result;
-  
+
 	// 获取查询类型列表数据，并保存到本地状态管理中
 	var res2 = await getAPI(SysDictDataApi).apiSysDictDataDataListCodeGet('code_gen_query_type');
 	state.queryTypeList = res2.data.result;
-  
+
 	// 从后端获取常量列表数据，并保存到本地状态管理中
 	var res3 = await getAPI(SysConstApi).apiSysConstListGet();
 	state.allConstSelector = res3.data.result;
-  
+
 	// 获取枚举类型列表数据，对其进行处理后保存到本地状态管理中
 	let resEnum = await getAPI(SysEnumApi).apiSysEnumEnumTypeListGet();
 	state.allEnumSelector = resEnum.data.result?.map((item) => ({ ...item, name: `${item.typeDescribe} [${item.typeName?.replace('Enum', '')}]`, code: item.typeName }));
-  
+
 	mittBus.on('submitRefreshFk', (data: any) => {
-	  let tableData = xGrid.value?.getData() || [];
-	  tableData[data.index] = data;
-	  xGrid.value?.loadData(tableData);
+		let tableData = xGrid.value?.getData() || [];
+		tableData[data.index] = data;
+		xGrid.value?.loadData(tableData);
 	});
-  });
-  
-  // 更新主键
-  const submitRefreshFk = (data: any) => {
+});
+
+// 更新主键
+const submitRefreshFk = (data: any) => {
 	let tableData = xGrid.value?.getData() || [];
 	tableData[data.index] = data;
 	xGrid.value?.reloadData(tableData);
-  };
-  
-  onUnmounted(() => {
+};
+
+// 页面初始化
+onUnmounted(() => {
 	// mittBus.off('submitRefresh', () => {});
-	mittBus.off('submitRefreshFk', () => { });
-  });
-  
-  // 控件类型改变
-  const effectTypeChange = (data: any, index: number) => {
+	mittBus.off('submitRefreshFk', () => {});
+});
+
+// 控件类型改变
+const effectTypeChange = (data: any, index: number) => {
 	let value = data.effectType;
 	if (value === 'fk') {
-	  openFkDialog(data, index);
+		openFkDialog(data, index);
 	} else if (value === 'ApiTreeSelect') {
-	  openTreeDialog(data, index);
+		openTreeDialog(data, index);
 	} else if (value === 'Select') {
-	  data.dictTypeCode = '';
-	  state.dictTypeCodeList = state.dictDataAll;
+		data.dictTypeCode = '';
+		state.dictTypeCodeList = state.dictDataAll;
 	} else if (value === 'ConstSelector') {
-	  data.dictTypeCode = '';
-	  state.dictTypeCodeList = state.allConstSelector;
+		data.dictTypeCode = '';
+		state.dictTypeCodeList = state.allConstSelector;
 	} else if (value == 'EnumSelector') {
-	  data.dictTypeCode = '';
-	  state.dictTypeCodeList = state.allEnumSelector;
+		data.dictTypeCode = '';
+		state.dictTypeCodeList = state.allEnumSelector;
 	}
-  };
-  
-  // 查询操作
-  const handleQuery = async (row: any) => {
+};
+
+// 查询操作
+const handleQuery = async (row: any) => {
 	state.loading = true;
 	var res = await getAPI(SysCodeGenConfigApi).apiSysCodeGenConfigListGet(undefined, row.id);
 	var data = res.data.result ?? [];
 	let lstWhetherColumn = ['whetherTable', 'whetherAddUpdate', 'whetherRequired', 'whetherSortable']; //列表显示的checkbox
 	data.forEach((item: any) => {
-	  for (const key in item) {
-		if (item[key] === 'Y') {
-		  item[key] = true;
+		for (const key in item) {
+			if (item[key] === 'Y') {
+				item[key] = true;
+			}
+			if (item[key] === 'N' || (lstWhetherColumn.includes(key) && item[key] === null)) {
+				item[key] = false;
+			}
 		}
-		if (item[key] === 'N' || (lstWhetherColumn.includes(key) && item[key] === null)) {
-		  item[key] = false;
+		// 验证规则相关
+		let rules = new Array();
+		if (item.rules != '' && item.rules !== null) {
+			rules = JSON.parse(item.rules);
 		}
-	  }
-	  // 验证规则相关
-	  let rules = new Array();
-	  if (item.rules != '' && item.rules !== null) {
-		rules = JSON.parse(item.rules);
-	  }
-	  item.ruleCount = rules.length > 0 ? `（${rules.length}）` : '';
+		item.ruleCount = rules.length > 0 ? `（${rules.length}）` : '';
 	});
 	xGrid.value?.loadData(data);
 	state.loading = false;
-  };
-  
-  // 判断是否（用于是否能选择或输入等）
-  function judgeColumns(data: any) {
+};
+
+// 判断是否（用于是否能选择或输入等）
+function judgeColumns(data: any) {
 	return data.whetherCommon == true || data.columnKey === 'True';
-  }
-  
-  function effectTypeEnable(data: any) {
+}
+
+function effectTypeEnable(data: any) {
 	var lst = ['Radio', 'Select', 'Checkbox', 'ConstSelector', 'EnumSelector'];
 	return lst.indexOf(data.effectType) === -1;
-  }
-  
-  // 打开弹窗
-  const openDialog = async (addRow: any) => {
+}
+
+// 打开弹窗
+const openDialog = async (addRow: any) => {
 	state.isShowDialog = true;
-  
+
 	nextTick(async () => {
-	  await handleQuery(addRow);
-	  rowDrop();
+		await handleQuery(addRow);
+		rowDrop();
 	});
-  };
-  
-  // 打开外键弹窗
-  const openFkDialog = (addRow: any, index: number) => {
+};
+
+// 打开外键弹窗
+const openFkDialog = (addRow: any, index: number) => {
 	addRow.index = index;
 	fkDialogRef.value.openDialog(addRow);
-  };
-  
-  const openTreeDialog = (addRow: any, index: number) => {
+};
+
+const openTreeDialog = (addRow: any, index: number) => {
 	addRow.index = index;
 	treeDialogRef.value.openDialog(addRow);
-  };
-  
-  // 打开校验弹窗
-  const openVerifyDialog = (row: any) => {
+};
+
+// 打开校验弹窗
+const openVerifyDialog = (row: any) => {
 	// handleQuery(addRow);
 	// state.isShowDialog = true;
 	verifyDialogRef.value.openDialog(row);
-  };
-  
-  // 验证提交回调
-  const submitVerifyOk = (data: any) => {
+};
+
+// 验证提交回调
+const submitVerifyOk = (data: any) => {
 	let tableData = xGrid.value?.getData() || [];
 	for (let i = 0; i < tableData.length; i++) {
-	  if (tableData[i].id == data.id) {
-		tableData[i].rules = data.rules;
-		tableData[i].ruleCount = data.ruleCount;
-		//更新必填项
-		let rules = new Array();
-		if (data.rules != '' && data.rules !== null) {
-		  rules = JSON.parse(data.rules);
-		  let requiredRule = rules.find((t) => t.type === 'required');
-		  if (requiredRule) {
-			tableData[i].whetherRequired = true;
-		  } else {
-			tableData[i].whetherRequired = false;
-		  }
+		if (tableData[i].id == data.id) {
+			tableData[i].rules = data.rules;
+			tableData[i].ruleCount = data.ruleCount;
+			// 更新必填项
+			let rules = new Array();
+			if (data.rules != '' && data.rules !== null) {
+				rules = JSON.parse(data.rules);
+				let requiredRule = rules.find((t) => t.type === 'required');
+				if (requiredRule) {
+					tableData[i].whetherRequired = true;
+				} else {
+					tableData[i].whetherRequired = false;
+				}
+			}
+			break;
 		}
-		break;
-	  }
 	}
 	xGrid.value?.reloadData(tableData);
-  };
-  
-  // 关闭弹窗
-  const closeDialog = () => {
+};
+
+// 关闭弹窗
+const closeDialog = () => {
 	emits('handleQuery');
 	cancel();
-  };
-  
-  // 取消
-  const cancel = () => {
+};
+
+// 取消
+const cancel = () => {
 	xGrid.value?.loadData([]);
 	state.isShowDialog = false;
 	if (state.sortable) {
-	  state.sortable.destroy();
+		state.sortable.destroy();
 	}
-  };
-  
-  // 提交
-  const submit = async () => {
+};
+
+// 提交
+const submit = async () => {
 	state.loading = true;
 	let lst = xGrid.value?.getData() || [];
-	// console.log(lst);
 	let ignoreFields = ['remoteVerify', 'anyRule', 'columnKey'];
 	lst.forEach((item: any) => {
-	  // 必填那一项转换
-	  for (var key in item) {
-		if (item[key] === true && !ignoreFields.includes(key)) {
-		  item[key] = 'Y';
+		// 必填那一项转换
+		for (var key in item) {
+			if (item[key] === true && !ignoreFields.includes(key)) {
+				item[key] = 'Y';
+			}
+			if (item[key] === false && !ignoreFields.includes(key)) {
+				item[key] = 'N';
+			}
 		}
-		if (item[key] === false && !ignoreFields.includes(key)) {
-		  item[key] = 'N';
-		}
-	  }
 	});
 	await getAPI(SysCodeGenConfigApi).apiSysCodeGenConfigUpdatePost(lst);
 	state.loading = false;
 	closeDialog();
-  };
-  
-  // 导出对象
-  defineExpose({ openDialog });
-  </script>
-  <style lang="scss" scoped>
-  .xGrid-table-style .drag-btn {
+};
+
+// 导出对象
+defineExpose({ openDialog });
+</script>
+
+<style lang="scss" scoped>
+.xGrid-table-style .drag-btn {
 	cursor: move;
 	font-size: 20px;
-  }
-  </style>
-  
\ No newline at end of file
+}
+</style>
diff --git a/Web/src/views/system/database/component/addTable.vue b/Web/src/views/system/database/component/addTable.vue
index b6a4bb60..376a01c2 100644
--- a/Web/src/views/system/database/component/addTable.vue
+++ b/Web/src/views/system/database/component/addTable.vue
@@ -1,94 +1,87 @@
 <template>
 	<div class="sys-dbTable-container">
-	  <vxe-modal v-model="state.visible" title="增加表" :width="800" :height="350" resize show-footer show-confirm-button
-		show-cancel-button show-zoom fullscreen @close="cancel">
-		<template #default>
-		  <el-divider content-position="left" style="margin: 10px 0 18px 0">数据表信息</el-divider>
-		  <el-form :model="state.ruleForm" ref="ruleFormRef" label-width="auto">
-			<el-row>
-			  <el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="mb20">
-				<el-form-item label="表名称" prop="tableName"
-				  :rules="[{ required: true, message: '名称不能为空', trigger: 'blur' }]">
-				  <el-input v-model.lazy.trim="state.ruleForm.tableName" placeholder="表名称" clearable />
-				</el-form-item>
-			  </el-col>
-			  <el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="mb20">
-				<el-form-item label="描述" prop="description"
-				  :rules="[{ required: true, message: '描述不能为空', trigger: 'blur' }]">
-				  <el-input v-model.lazy.trim="state.ruleForm.description" placeholder="描述" clearable type="textarea" />
-				</el-form-item>
-			  </el-col>
-			</el-row>
-		  </el-form>
-		  <el-divider content-position="left" style="margin: 10px 0 18px 0">数据列信息</el-divider>
-		  <div style="height: calc(100vh - 300px)">
-			<vxe-grid ref="xGrid" class="xGrid-table-style" v-bind="options">
-			  <template #toolbar_buttons>
-				<el-button icon="ele-Plus" @click="addPrimaryColumn">新增主键字段</el-button>
-				<el-button icon="ele-Plus" @click="addColumn">新增普通字段</el-button>
-				<el-button icon="ele-Plus" @click="addTenantColumn">新增租户字段</el-button>
-				<el-button icon="ele-Plus" @click="addBaseColumn">新增基础字段</el-button>
-				<el-button icon="ele-Delete" type="danger" @click="deleteSelected">删除选中</el-button>
-			  </template>
-			  <template #toolbar_tools> </template>
-			  <template #empty>
-				<el-empty :image-size="200" />
-			  </template>
-			  <template #drag_default="{}">
-				<span class="drag-btn">
-				  <i class="fa fa-arrows"></i>
-				</span>
-			  </template>
-			  <template #isPrimarykey="{ row }">
-				<vxe-switch readonly v-model="row.isPrimarykey" open-label="是" close-label="否" :openValue="1"
-				  :closeValue="0"></vxe-switch>
-			  </template>
-			  <template #isIdentity="{ row }">
-				<vxe-switch readonly v-model="row.isIdentity" open-label="是" close-label="否" :openValue="1"
-				  :closeValue="0"></vxe-switch>
-			  </template>
-			  <template #isNullable="{ row }">
-				<vxe-switch readonly v-model="row.isNullable" open-label="是" close-label="否" :openValue="1"
-				  :closeValue="0"></vxe-switch>
-			  </template>
-			  <template #operate="{ row }">
-				<vxe-button mode="text" status="error" icon="vxe-icon-delete" @click="deleteRow(row)" />
-			  </template>
-			</vxe-grid>
-		  </div>
-		</template>
-		<template #footer>
-		  <vxe-button @click="cancel">取 消</vxe-button>
-		  <vxe-button status="primary" @click="submit">确 定</vxe-button>
-		</template>
-	  </vxe-modal>
+		<vxe-modal v-model="state.visible" title="增加表" :width="800" :height="350" resize show-footer show-confirm-button show-cancel-button show-zoom fullscreen @close="cancel">
+			<template #default>
+				<el-divider content-position="left" style="margin: 10px 0 18px 0">数据表信息</el-divider>
+				<el-form :model="state.ruleForm" ref="ruleFormRef" label-width="auto">
+					<el-row>
+						<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="mb20">
+							<el-form-item label="表名称" prop="tableName" :rules="[{ required: true, message: '名称不能为空', trigger: 'blur' }]">
+								<el-input v-model.lazy.trim="state.ruleForm.tableName" placeholder="表名称" clearable />
+							</el-form-item>
+						</el-col>
+						<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="mb20">
+							<el-form-item label="描述" prop="description" :rules="[{ required: true, message: '描述不能为空', trigger: 'blur' }]">
+								<el-input v-model.lazy.trim="state.ruleForm.description" placeholder="描述" clearable type="textarea" />
+							</el-form-item>
+						</el-col>
+					</el-row>
+				</el-form>
+				<el-divider content-position="left" style="margin: 10px 0 18px 0">数据列信息</el-divider>
+				<div style="height: calc(100vh - 300px)">
+					<vxe-grid ref="xGrid" class="xGrid-table-style" v-bind="options">
+						<template #toolbar_buttons>
+							<el-button icon="ele-Plus" @click="addPrimaryColumn">新增主键字段</el-button>
+							<el-button icon="ele-Plus" @click="addColumn">新增普通字段</el-button>
+							<el-button icon="ele-Plus" @click="addTenantColumn">新增租户字段</el-button>
+							<el-button icon="ele-Plus" @click="addBaseColumn">新增基础字段</el-button>
+							<el-button icon="ele-Delete" type="danger" @click="deleteSelected">删除选中</el-button>
+						</template>
+						<template #toolbar_tools> </template>
+						<template #empty>
+							<el-empty :image-size="200" />
+						</template>
+						<template #drag_default="{}">
+							<span class="drag-btn">
+								<i class="fa fa-arrows"></i>
+							</span>
+						</template>
+						<template #isPrimarykey="{ row }">
+							<vxe-switch readonly v-model="row.isPrimarykey" open-label="是" close-label="否" :openValue="1" :closeValue="0"></vxe-switch>
+						</template>
+						<template #isIdentity="{ row }">
+							<vxe-switch readonly v-model="row.isIdentity" open-label="是" close-label="否" :openValue="1" :closeValue="0"></vxe-switch>
+						</template>
+						<template #isNullable="{ row }">
+							<vxe-switch readonly v-model="row.isNullable" open-label="是" close-label="否" :openValue="1" :closeValue="0"></vxe-switch>
+						</template>
+						<template #operate="{ row }">
+							<vxe-button mode="text" status="error" icon="vxe-icon-delete" @click="deleteRow(row)" />
+						</template>
+					</vxe-grid>
+				</div>
+			</template>
+			<template #footer>
+				<vxe-button @click="cancel">取 消</vxe-button>
+				<vxe-button status="primary" @click="submit">确 定</vxe-button>
+			</template>
+		</vxe-modal>
 	</div>
-  </template>
-  
-  <script lang="tsx" setup name="sysAddTable">
-  import { nextTick, reactive, ref } from 'vue';
-  import { ElMessage, dayjs } from 'element-plus';
-  import { VxeGridInstance, VxeGridProps } from 'vxe-table';
-  import { Rank } from '@element-plus/icons-vue';
-  import Sortable from 'sortablejs';
-  import { dataTypeList } from '../database';
-  
-  import { getAPI } from '/@/utils/axios-utils';
-  import { SysDatabaseApi } from '/@/api-services/api';
-  import { UpdateDbTableInput } from '/@/api-services/models';
-  
-  const xGrid = ref<VxeGridInstance>();
-  let initTime: any;
-  const emits = defineEmits(['addTableSubmitted']);
-  const ruleFormRef = ref();
-  const state = reactive({
+</template>
+
+<script lang="tsx" setup name="sysAddTable">
+import { nextTick, reactive, ref } from 'vue';
+import { ElMessage, dayjs } from 'element-plus';
+import { VxeGridInstance, VxeGridProps } from 'vxe-table';
+import Sortable from 'sortablejs';
+import { dataTypeList } from '../database';
+
+import { getAPI } from '/@/utils/axios-utils';
+import { SysDatabaseApi } from '/@/api-services/api';
+import { UpdateDbTableInput } from '/@/api-services/models';
+
+const xGrid = ref<VxeGridInstance>();
+let initTime: any;
+const emits = defineEmits(['addTableSubmitted']);
+const ruleFormRef = ref();
+const state = reactive({
 	visible: false,
 	ruleForm: {} as UpdateDbTableInput,
 	sortable: undefined as any,
-  });
-  
-  // 表格参数配置
-  const options = reactive<VxeGridProps>({
+});
+
+// 表格参数配置
+const options = reactive<VxeGridProps>({
 	id: 'sysAddTable',
 	height: 'auto',
 	autoResize: true,
@@ -98,373 +91,373 @@
 	data: [] as Array<any>,
 	rowConfig: { useKey: true },
 	mouseConfig: {
-	  selected: true,
+		selected: true,
 	},
 	keyboardConfig: {
-	  isArrow: true,
-	  isDel: true,
-	  isEnter: true,
-	  isTab: true,
-	  isEdit: true,
+		isArrow: true,
+		isDel: true,
+		isEnter: true,
+		isTab: true,
+		isEdit: true,
 	},
 	seqConfig: { seqMethod: ({ row }) => row.orderNo },
 	columns: [
-	  {
-		width: 80,
-		slots: {
-		  default: 'drag_default',
+		{
+			width: 80,
+			slots: {
+				default: 'drag_default',
+			},
 		},
-	  },
-	  { type: 'seq', title: '序号', width: 60 },
-	  { type: 'checkbox', width: 40 },
-	  {
-		field: 'dbColumnName',
-		title: '字段名',
-		minWidth: 160,
-		showOverflow: 'tooltip',
-		editRender: { name: '$input', props: { clearable: true, placeholder: '请输入字段名' } },
-	  },
-	  {
-		field: 'columnDescription',
-		title: '描述',
-		minWidth: 220,
-		showOverflow: 'tooltip',
-		editRender: { name: '$input', props: { clearable: true, placeholder: '请输入描述' } },
-	  },
-	  {
-		field: 'isPrimarykey',
-		title: '主键',
-		minWidth: 100,
-		editRender: { name: '$switch', props: { openValue: 1, closeValue: 0, openLabel: '是', closeLabel: '否', immediate: true } },
-		slots: {
-		  default: "isPrimarykey"
+		{ type: 'seq', title: '序号', width: 60 },
+		{ type: 'checkbox', width: 40 },
+		{
+			field: 'dbColumnName',
+			title: '字段名',
+			minWidth: 160,
+			showOverflow: 'tooltip',
+			editRender: { name: '$input', props: { clearable: true, placeholder: '请输入字段名' } },
 		},
-	  },
-	  {
-		field: 'isIdentity',
-		title: '自增',
-		minWidth: 100,
-		editRender: { name: '$switch', props: { openValue: 1, closeValue: 0, openLabel: '是', closeLabel: '否' } },
-		slots: {
-		  default: "isIdentity"
+		{
+			field: 'columnDescription',
+			title: '描述',
+			minWidth: 220,
+			showOverflow: 'tooltip',
+			editRender: { name: '$input', props: { clearable: true, placeholder: '请输入描述' } },
 		},
-	  },
-	  {
-		field: 'dataType',
-		title: '类型',
-		minWidth: 100,
-		editRender: {
-		  name: '$select',
-		  options: dataTypeList,
-		  optionProps: { value: 'value', label: 'value' },
-		  props: { optionProps: { value: 'value', label: 'value' }, placeholder: '请选择类型', popupClassName: 'zIndex2023' },
+		{
+			field: 'isPrimarykey',
+			title: '主键',
+			minWidth: 100,
+			editRender: { name: '$switch', props: { openValue: 1, closeValue: 0, openLabel: '是', closeLabel: '否', immediate: true } },
+			slots: {
+				default: 'isPrimarykey',
+			},
 		},
-	  },
-	  {
-		field: 'isNullable',
-		title: '可空',
-		minWidth: 100,
-		editRender: { name: '$switch', props: { openValue: 1, closeValue: 0, openLabel: '是', closeLabel: '否' } },
-		slots: {
-		  default: "isNullable"
+		{
+			field: 'isIdentity',
+			title: '自增',
+			minWidth: 100,
+			editRender: { name: '$switch', props: { openValue: 1, closeValue: 0, openLabel: '是', closeLabel: '否' } },
+			slots: {
+				default: 'isIdentity',
+			},
 		},
-	  },
-	  {
-		field: 'length',
-		title: '长度',
-		minWidth: 100,
-		showOverflow: 'tooltip',
-		editRender: { name: '$input', props: { type: 'integer', clearable: true, placeholder: '请输入长度' } },
-	  },
-	  {
-		field: 'decimalDigits',
-		title: '小数位',
-		minWidth: 100,
-		showOverflow: 'tooltip',
-		editRender: { name: '$input', props: { type: 'integer', clearable: true, placeholder: '请输入小数位' } },
-	  },
-	  {
-		title: '操作',
-		width: 80,
-		showOverflow: true,
-		fixed: 'right',
-		slots: {
-		  default: "operate",
+		{
+			field: 'dataType',
+			title: '类型',
+			minWidth: 100,
+			editRender: {
+				name: '$select',
+				options: dataTypeList,
+				optionProps: { value: 'value', label: 'value' },
+				props: { optionProps: { value: 'value', label: 'value' }, placeholder: '请选择类型', popupClassName: 'zIndex2023' },
+			},
+		},
+		{
+			field: 'isNullable',
+			title: '可空',
+			minWidth: 100,
+			editRender: { name: '$switch', props: { openValue: 1, closeValue: 0, openLabel: '是', closeLabel: '否' } },
+			slots: {
+				default: 'isNullable',
+			},
+		},
+		{
+			field: 'length',
+			title: '长度',
+			minWidth: 100,
+			showOverflow: 'tooltip',
+			editRender: { name: '$input', props: { type: 'integer', clearable: true, placeholder: '请输入长度' } },
+		},
+		{
+			field: 'decimalDigits',
+			title: '小数位',
+			minWidth: 100,
+			showOverflow: 'tooltip',
+			editRender: { name: '$input', props: { type: 'integer', clearable: true, placeholder: '请输入小数位' } },
+		},
+		{
+			title: '操作',
+			width: 80,
+			showOverflow: true,
+			fixed: 'right',
+			slots: {
+				default: 'operate',
+			},
 		},
-	  },
 	],
 	editRules: {
-	  dbColumnName: [{ required: true, message: '字段名必填' }],
-	  dataType: [{ required: true, message: '类型必填' }],
+		dbColumnName: [{ required: true, message: '字段名必填' }],
+		dataType: [{ required: true, message: '类型必填' }],
 	},
 	toolbarConfig: {
-	  size: 'small',
-	  slots: { buttons: 'toolbar_buttons', tools: 'toolbar_tools' },
-	  refresh: false,
-	  export: true,
-	  print: true,
-	  zoom: true,
-	  custom: false,
+		size: 'small',
+		slots: { buttons: 'toolbar_buttons', tools: 'toolbar_tools' },
+		refresh: false,
+		export: true,
+		print: true,
+		zoom: true,
+		custom: false,
 	},
 	checkboxConfig: { range: true },
 	sortConfig: {
-	  trigger: 'cell',
-	  remote: false,
+		trigger: 'cell',
+		remote: false,
 	},
 	editConfig: { trigger: 'click', mode: 'row', showStatus: true },
 	exportConfig: {
-		remote: false, //设置使用服务端导出
+		remote: false, // 设置使用服务端导出
 		filename: `数据列信息导出_${dayjs().format('YYMMDDHHmmss')}`,
-		exportMethod: ({ options }) => handleExport(options), //服务器导出方法
+		exportMethod: ({ options }) => handleExport(options), // 服务器导出方法
 	},
 	printConfig: { sheetName: '' },
 	proxyConfig: {
 		props: {
-			list: 'data.result.items', //不分页时
-			// result: 'data.result.items', //分页时
+			list: 'data.result.items', // 不分页时
+			// result: 'data.result.items', // 分页时
 			total: 'data.result.total',
 			message: 'data.message',
 		},
 		ajax: {
-			query: () => Promise.resolve(), //不加会报错
+			query: () => Promise.resolve(), // 不加会报错
 		},
 	},
-  });
-  
-  // 打开弹窗
-  const openDialog = (row: any) => {
+});
+
+// 打开弹窗
+const openDialog = (row: any) => {
 	state.ruleForm = row;
 	state.visible = true;
 	ruleFormRef.value?.resetFields();
 	nextTick(() => {
-	  rowDrop();
+		rowDrop();
 	});
-  };
-  
-  const rowDrop = () => {
+};
+
+const rowDrop = () => {
 	const el = document.querySelector('.xGrid-table-style .vxe-table--body tbody') as HTMLElement;
 	state.sortable = Sortable.create(el, {
-	  animation: 300,
-	  handle: '.drag-btn',
-	  onEnd: (sortableEvent: any) => {
-		const fullData = xGrid.value?.getTableData().fullData;
-		const newIndex = sortableEvent.newIndex as number;
-		const oldIndex = sortableEvent.oldIndex as number;
-		// 往前移动
-		if (oldIndex > newIndex) {
-		  const moveRow = fullData?.find((e) => e.orderNo == oldIndex + 1);
-		  for (let i = oldIndex; i > newIndex; i--) {
-			const row = fullData?.find((e) => e.orderNo == i);
-			row.orderNo += 1;
-		  }
-		  moveRow.orderNo = newIndex + 1;
-		} else {
-		  // 往后移动
-		  const moveRow = fullData?.find((e) => e.orderNo == oldIndex + 1);
-		  for (let i = oldIndex; i < newIndex; i++) {
-			const row = fullData?.find((e) => e.orderNo == i + 2);
-			row.orderNo -= 1;
-		  }
-		  moveRow.orderNo = newIndex + 1;
-		}
-		xGrid.value?.updateData();
-	  },
+		animation: 300,
+		handle: '.drag-btn',
+		onEnd: (sortableEvent: any) => {
+			const fullData = xGrid.value?.getTableData().fullData;
+			const newIndex = sortableEvent.newIndex as number;
+			const oldIndex = sortableEvent.oldIndex as number;
+			// 往前移动
+			if (oldIndex > newIndex) {
+				const moveRow = fullData?.find((e) => e.orderNo == oldIndex + 1);
+				for (let i = oldIndex; i > newIndex; i--) {
+					const row = fullData?.find((e) => e.orderNo == i);
+					row.orderNo += 1;
+				}
+				moveRow.orderNo = newIndex + 1;
+			} else {
+				// 往后移动
+				const moveRow = fullData?.find((e) => e.orderNo == oldIndex + 1);
+				for (let i = oldIndex; i < newIndex; i++) {
+					const row = fullData?.find((e) => e.orderNo == i + 2);
+					row.orderNo -= 1;
+				}
+				moveRow.orderNo = newIndex + 1;
+			}
+			xGrid.value?.updateData();
+		},
 	});
-  };
-  
-  // 关闭弹窗
-  const closeDialog = () => {
+};
+
+// 关闭弹窗
+const closeDialog = () => {
 	emits('addTableSubmitted', state.ruleForm.tableName ?? '');
 	cancel();
-  };
-  
-  // 取消
-  const cancel = () => {
+};
+
+// 取消
+const cancel = () => {
 	xGrid.value?.loadData([]);
 	state.visible = false;
 	clearTimeout(initTime);
 	if (state.sortable) {
-	  state.sortable.destroy();
+		state.sortable.destroy();
 	}
-  };
-  
-  // 导出日志(服务端导出)
-  const handleExport = async (opts: any) => {
+};
+
+// 导出日志(服务端导出)
+const handleExport = async (opts: any) => {
 	console.log(opts);
 	options.loading = true;
 	// var res = await getAPI(SysLogExApi).apiSysLogExExportPost(state.queryParams as any, { responseType: 'blob' });
 	options.loading = false;
 	// VXETable.saveFile({ filename: getFileName(res.headers), type: 'xlsx', content: res.data as any });
 	return Promise.resolve();
-  };
-  
-  // 提交
-  const submit = () => {
+};
+
+// 提交
+const submit = () => {
 	ruleFormRef.value.validate(async (valid: boolean) => {
-	  if (!valid) return;
-	  const tableData = xGrid.value?.getTableData().fullData ?? [];
-	  if (tableData.length === 0) {
-		ElMessage({ type: 'error', message: `请添加列!` });
-		return;
-	  }
-	  const rowValid = await xGrid.value?.validate(true);
-	  if (rowValid) {
-		ElMessage.error('校验不通过');
-		return;
-	  }
-	  const params: any = {
-		dbColumnInfoList: tableData,
-		...state.ruleForm,
-	  };
-	  await getAPI(SysDatabaseApi).apiSysDatabaseAddTablePost(params);
-	  closeDialog();
+		if (!valid) return;
+		const tableData = xGrid.value?.getTableData().fullData ?? [];
+		if (tableData.length === 0) {
+			ElMessage({ type: 'error', message: `请添加列!` });
+			return;
+		}
+		const rowValid = await xGrid.value?.validate(true);
+		if (rowValid) {
+			ElMessage.error('校验不通过');
+			return;
+		}
+		const params: any = {
+			dbColumnInfoList: tableData,
+			...state.ruleForm,
+		};
+		await getAPI(SysDatabaseApi).apiSysDatabaseAddTablePost(params);
+		closeDialog();
 	});
-  };
-  
-  // 增加主键列
-  const addPrimaryColumn = async () => {
+};
+
+// 增加主键列
+const addPrimaryColumn = async () => {
 	const fullData = xGrid.value?.getTableData().fullData;
 	const colIndex = (fullData?.length ?? 0) + 1;
 	const temp = await xGrid.value?.insertAt(
-	  {
-		columnDescription: '主键ID',
-		dataType: 'bigint',
-		dbColumnName: 'Id',
-		decimalDigits: 0,
-		isIdentity: 0,
-		isNullable: 0,
-		isPrimarykey: 1,
-		length: 0,
-		orderNo: colIndex,
-		editable: true,
-		isNew: true,
-	  },
-	  -1
+		{
+			columnDescription: '主键ID',
+			dataType: 'bigint',
+			dbColumnName: 'Id',
+			decimalDigits: 0,
+			isIdentity: 0,
+			isNullable: 0,
+			isPrimarykey: 1,
+			length: 0,
+			orderNo: colIndex,
+			editable: true,
+			isNew: true,
+		},
+		-1
 	);
 	if (temp && temp.row) await xGrid.value?.setEditCell(temp?.row, 'dbColumnName');
-  };
-  
-  // 增加普通列
-  const addColumn = async () => {
+};
+
+// 增加普通列
+const addColumn = async () => {
 	const fullData = xGrid.value?.getTableData().fullData;
 	const colIndex = (fullData?.length ?? 0) + 1;
 	const temp = await xGrid.value?.insertAt(
-	  {
-		columnDescription: '',
-		dataType: 'varchar',
-		dbColumnName: '',
-		decimalDigits: 0,
-		isIdentity: 0,
-		isNullable: 1,
-		isPrimarykey: 0,
-		length: 64,
-		orderNo: colIndex,
-		editable: true,
-		isNew: true,
-	  },
-	  -1
+		{
+			columnDescription: '',
+			dataType: 'varchar',
+			dbColumnName: '',
+			decimalDigits: 0,
+			isIdentity: 0,
+			isNullable: 1,
+			isPrimarykey: 0,
+			length: 64,
+			orderNo: colIndex,
+			editable: true,
+			isNew: true,
+		},
+		-1
 	);
 	if (temp && temp.row) await xGrid.value?.setEditCell(temp?.row, 'dbColumnName');
-  };
-  
-  // 增加租户列
-  const addTenantColumn = async () => {
+};
+
+// 增加租户列
+const addTenantColumn = async () => {
 	const fullData = xGrid.value?.getTableData().fullData;
 	const colIndex = (fullData?.length ?? 0) + 1;
 	const temp = await xGrid.value?.insertAt(
-	  {
-		columnDescription: '租户Id',
-		dataType: 'bigint',
-		dbColumnName: 'TenantId',
-		decimalDigits: 0,
-		isIdentity: 0,
-		isNullable: 1,
-		isPrimarykey: 0,
-		length: 0,
-		orderNo: colIndex,
-		editable: true,
-		isNew: true,
-	  },
-	  -1
+		{
+			columnDescription: '租户Id',
+			dataType: 'bigint',
+			dbColumnName: 'TenantId',
+			decimalDigits: 0,
+			isIdentity: 0,
+			isNullable: 1,
+			isPrimarykey: 0,
+			length: 0,
+			orderNo: colIndex,
+			editable: true,
+			isNew: true,
+		},
+		-1
 	);
 	if (temp && temp.row) await xGrid.value?.setEditCell(temp?.row, 'dbColumnName');
-  };
-  
-  // 增加通用基础列
-  const addBaseColumn = async () => {
+};
+
+// 增加通用基础列
+const addBaseColumn = async () => {
 	const fileds = [
-	  { dataType: 'varchar', name: 'Code', desc: '编码', length: 64 },
-	  { dataType: 'varchar', name: 'Name', desc: '名称', length: 64 },
-	  { dataType: 'varchar', name: 'Description', desc: '描述', length: 500 },
-	  { dataType: 'datetime', name: 'CreateTime', desc: '创建时间' },
-	  { dataType: 'bigint', name: 'CreateUserId', desc: '创建人Id' },
-	  { dataType: 'varchar', name: 'CreateUserName', desc: '创建人', length: 64 },
-	  { dataType: 'datetime', name: 'UpdateTime', desc: '修改时间' },
-	  { dataType: 'bigint', name: 'UpdateUserId', desc: '修改人Id' },
-	  { dataType: 'varchar', name: 'UpdateUserName', desc: '修改人', length: 64 },
-	  { dataType: 'bigint', name: 'CreateOrgId', desc: '创建者机构Id' },
-	  { dataType: 'varchar', name: 'CreateOrgName', desc: '创建者机构名称', length: 64 },
-	  { dataType: 'bit', name: 'IsDelete', desc: '软删除', isNullable: 0 },
+		{ dataType: 'varchar', name: 'Code', desc: '编码', length: 64 },
+		{ dataType: 'varchar', name: 'Name', desc: '名称', length: 64 },
+		{ dataType: 'varchar', name: 'Description', desc: '描述', length: 500 },
+		{ dataType: 'datetime', name: 'CreateTime', desc: '创建时间' },
+		{ dataType: 'bigint', name: 'CreateUserId', desc: '创建人Id' },
+		{ dataType: 'varchar', name: 'CreateUserName', desc: '创建人', length: 64 },
+		{ dataType: 'datetime', name: 'UpdateTime', desc: '修改时间' },
+		{ dataType: 'bigint', name: 'UpdateUserId', desc: '修改人Id' },
+		{ dataType: 'varchar', name: 'UpdateUserName', desc: '修改人', length: 64 },
+		{ dataType: 'bigint', name: 'CreateOrgId', desc: '创建者机构Id' },
+		{ dataType: 'varchar', name: 'CreateOrgName', desc: '创建者机构名称', length: 64 },
+		{ dataType: 'bit', name: 'IsDelete', desc: '软删除', isNullable: 0 },
 	];
 	let temp = {} as any;
 	const fullData = xGrid.value?.getTableData().fullData;
 	let colIndex = (fullData?.length ?? 0) + 1;
 	for (let i = 0; i < fileds.length; i++) {
-	  temp = await xGrid.value?.insertAt(
-		{
-		  columnDescription: fileds[i].desc,
-		  dataType: fileds[i].dataType,
-		  dbColumnName: fileds[i].name,
-		  decimalDigits: 0,
-		  isIdentity: 0,
-		  isNullable: fileds[i].isNullable === 0 ? 0 : 1,
-		  isPrimarykey: 0,
-		  length: (fileds[i] as any).length || 0,
-		  orderNo: colIndex,
-		  editable: true,
-		  isNew: true,
-		},
-		-1
-	  );
-	  colIndex++;
+		temp = await xGrid.value?.insertAt(
+			{
+				columnDescription: fileds[i].desc,
+				dataType: fileds[i].dataType,
+				dbColumnName: fileds[i].name,
+				decimalDigits: 0,
+				isIdentity: 0,
+				isNullable: fileds[i].isNullable === 0 ? 0 : 1,
+				isPrimarykey: 0,
+				length: (fileds[i] as any).length || 0,
+				orderNo: colIndex,
+				editable: true,
+				isNew: true,
+			},
+			-1
+		);
+		colIndex++;
 	}
 	if (temp && temp.row) await xGrid.value?.setEditCell(temp?.row, 'dbColumnName');
-  };
-  
-  // 删除行
-  const deleteRow = (row: any) => {
+};
+
+// 删除行
+const deleteRow = (row: any) => {
 	const fullData = xGrid.value?.getTableData().fullData;
 	fullData?.filter((e: any) => e.orderNo > row.orderNo)?.forEach((e: any) => (e.orderNo = e.orderNo - 1));
 	xGrid.value?.remove(row);
-  };
-  
-  // 删除选中行
-  const deleteSelected = () => {
+};
+
+// 删除选中行
+const deleteSelected = () => {
 	const selected = xGrid.value?.getCheckboxRecords();
 	const fullData = xGrid.value?.getTableData().fullData;
 	// 更新序号
 	for (let i = 0; i < selected!.length; i++) {
-	  fullData?.filter((e: any) => e.orderNo > selected![i].orderNo)?.forEach((e: any) => (e.orderNo = e.orderNo - 1));
+		fullData?.filter((e: any) => e.orderNo > selected![i].orderNo)?.forEach((e: any) => (e.orderNo = e.orderNo - 1));
 	}
 	// 移除选中
 	xGrid.value?.removeCheckboxRow();
-  };
-  
-  // 导出对象
-  defineExpose({ openDialog });
-  </script>
-  
-  <style lang="scss" scoped>
-  .sys-dbTable-container :deep(.el-dialog__body) {}
-  
-  .xGrid-table-style .drag-btn {
+};
+
+// 导出对象
+defineExpose({ openDialog });
+</script>
+
+<style lang="scss" scoped>
+.sys-dbTable-container :deep(.el-dialog__body) {
+}
+
+.xGrid-table-style .drag-btn {
 	cursor: move;
 	font-size: 20px;
-  }
-  
-  .xGrid-table-style .vxe-body--row.sortable-ghost,
-  .xGrid-table-style .vxe-body--row.sortable-chosen {
+}
+
+.xGrid-table-style .vxe-body--row.sortable-ghost,
+.xGrid-table-style .vxe-body--row.sortable-chosen {
 	background-color: #e40000 !important;
-  }
-  </style>
-  
\ No newline at end of file
+}
+</style>