From f0bf2f339e3440af49016304d7484755ed99664d Mon Sep 17 00:00:00 2001
From: zuohuaijun <zuohuaijun@163.com>
Date: Wed, 21 Aug 2024 15:27:09 +0800
Subject: [PATCH] =?UTF-8?q?=F0=9F=98=8E=E8=B0=83=E6=95=B4=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81=E7=94=9F=E6=88=90=E7=9B=B8=E5=85=B3=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E4=B8=8B=E6=8B=89=E6=A1=86=E5=8F=AF=E6=90=9C=E7=B4=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Admin.NET/Admin.NET.Core/Admin.NET.Core.csproj            | 4 ++--
 .../views/system/codeGen/component/editCodeGenDialog.vue  | 2 +-
 Web/src/views/system/codeGen/component/fkDialog.vue       | 4 ++--
 .../views/system/codeGen/component/genConfigDialog.vue    | 6 +++---
 Web/src/views/system/codeGen/component/previewDialog.vue  | 4 ++--
 Web/src/views/system/codeGen/component/treeDialog.vue     | 8 ++++----
 6 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/Admin.NET/Admin.NET.Core/Admin.NET.Core.csproj b/Admin.NET/Admin.NET.Core/Admin.NET.Core.csproj
index 3f0635be..6e63a02d 100644
--- a/Admin.NET/Admin.NET.Core/Admin.NET.Core.csproj
+++ b/Admin.NET/Admin.NET.Core/Admin.NET.Core.csproj
@@ -38,8 +38,8 @@
     <PackageReference Include="SKIT.FlurlHttpClient.Wechat.TenpayV3" Version="3.7.0" />
     <PackageReference Include="SqlSugarCore" Version="5.1.4.167" />
     <PackageReference Include="SSH.NET" Version="2024.1.0" />
-    <PackageReference Include="System.Linq.Dynamic.Core" Version="1.4.4" />
-    <PackageReference Include="TencentCloudSDK.Sms" Version="3.0.1072" />
+    <PackageReference Include="System.Linq.Dynamic.Core" Version="1.4.5" />
+    <PackageReference Include="TencentCloudSDK.Sms" Version="3.0.1073" />
     <PackageReference Include="UAParser" Version="3.1.47" />
     <PackageReference Include="Yitter.IdGenerator" Version="1.0.14" />
   </ItemGroup>
diff --git a/Web/src/views/system/codeGen/component/editCodeGenDialog.vue b/Web/src/views/system/codeGen/component/editCodeGenDialog.vue
index 44447f04..62b0fe97 100644
--- a/Web/src/views/system/codeGen/component/editCodeGenDialog.vue
+++ b/Web/src/views/system/codeGen/component/editCodeGenDialog.vue
@@ -22,7 +22,7 @@
 					</el-col>
 					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
 						<el-form-item label="库类型" prop="dbType" :rules="[{ required: true, message: '描述不能为空', trigger: 'blur' }]">
-							<el-select v-model="state.ruleForm.dbType" placeholder="数据库类型" clearable disabled class="w100">
+							<el-select v-model="state.ruleForm.dbType" placeholder="数据库类型" filterable clearable disabled class="w100">
 								<el-option label="MySql" :value="'0'" />
 								<el-option label="SqlServer" :value="'1'" />
 								<el-option label="Sqlite" :value="'2'" />
diff --git a/Web/src/views/system/codeGen/component/fkDialog.vue b/Web/src/views/system/codeGen/component/fkDialog.vue
index 3fb0378d..e40bb6a3 100644
--- a/Web/src/views/system/codeGen/component/fkDialog.vue
+++ b/Web/src/views/system/codeGen/component/fkDialog.vue
@@ -25,14 +25,14 @@
 					</el-col>
 					<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="mb20">
 						<el-form-item label="显示字段" prop="columnName">
-							<el-select v-model="state.ruleForm.columnName" class="w100">
+							<el-select v-model="state.ruleForm.columnName" filterable class="w100">
 								<el-option v-for="item in state.columnData" :key="item.columnName" :label="item.columnName + ' [' + item.columnComment + ']'" :value="item.columnName" />
 							</el-select>
 						</el-form-item>
 					</el-col>
 					<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="mb20">
 						<el-form-item label="链接字段" prop="linkColumnName">
-							<el-select v-model="state.ruleForm.linkColumnName" class="w100">
+							<el-select v-model="state.ruleForm.linkColumnName" filterable class="w100">
 								<el-option v-for="item in state.columnData" :key="item.columnName" :label="item.columnName + ' [' + item.columnComment + ']'" :value="item.columnName" />
 							</el-select>
 						</el-form-item>
diff --git a/Web/src/views/system/codeGen/component/genConfigDialog.vue b/Web/src/views/system/codeGen/component/genConfigDialog.vue
index 179aa554..b5a5b4a3 100644
--- a/Web/src/views/system/codeGen/component/genConfigDialog.vue
+++ b/Web/src/views/system/codeGen/component/genConfigDialog.vue
@@ -19,7 +19,7 @@
 				<el-table-column prop="effectType" label="作用类型" width="140" show-overflow-tooltip>
 					<template #default="scope">
 						<div class="effect-type-container">
-							<el-select v-model="scope.row.effectType" class="m-2" placeholder="Select" :disabled="judgeColumns(scope.row)" @change="effectTypeChange(scope.row, scope.$index)">
+							<el-select v-model="scope.row.effectType" class="m-2" placeholder="Select" :disabled="judgeColumns(scope.row)" @change="effectTypeChange(scope.row, scope.$index)" filterable>
 								<el-option v-for="item in state.effectTypeList" :key="item.code" :label="item.value" :value="item.code" />
 							</el-select>
 							<el-button
@@ -35,7 +35,7 @@
 				</el-table-column>
 				<el-table-column prop="dictTypeCode" label="字典" width="180" show-overflow-tooltip>
 					<template #default="scope">
-						<el-select v-model="scope.row.dictTypeCode" class="m-2" :disabled="effectTypeEnable(scope.row)">
+						<el-select v-model="scope.row.dictTypeCode" class="m-2" :disabled="effectTypeEnable(scope.row)" filterable>
 							<el-option v-for="item in state.dictTypeCodeList" :key="item.code" :label="item.name" :value="item.code" />
 						</el-select>
 					</template>
@@ -68,7 +68,7 @@
 				</el-table-column>
 				<el-table-column prop="queryType" label="查询方式" min-width="120" align="center" show-overflow-tooltip>
 					<template #default="scope">
-						<el-select v-model="scope.row.queryType" class="m-2" placeholder="Select" :disabled="!scope.row.queryWhether">
+						<el-select v-model="scope.row.queryType" class="m-2" placeholder="Select" :disabled="!scope.row.queryWhether" filterable>
 							<el-option v-for="item in state.queryTypeList" :key="item.code" :label="item.value" :value="item.code" />
 						</el-select>
 					</template>
diff --git a/Web/src/views/system/codeGen/component/previewDialog.vue b/Web/src/views/system/codeGen/component/previewDialog.vue
index b3cd2f72..5b21a6e0 100644
--- a/Web/src/views/system/codeGen/component/previewDialog.vue
+++ b/Web/src/views/system/codeGen/component/previewDialog.vue
@@ -29,7 +29,7 @@
 </template>
 
 <script lang="ts" setup name="sysPreviewCode">
-import { reactive, ref, nextTick, toRaw } from 'vue';
+import { reactive, ref, nextTick } from 'vue';
 import * as monaco from 'monaco-editor';
 import EditorWorker from 'monaco-editor/esm/vs/editor/editor.worker?worker';
 import commonFunction from '/@/utils/commonFunction';
@@ -111,7 +111,7 @@ const cancel = () => {
 	state.isShowDialog = false;
 };
 
-//复制代码
+// 复制代码
 const handleCopy = () => {
 	copyText(state.codes[state.current]);
 };
diff --git a/Web/src/views/system/codeGen/component/treeDialog.vue b/Web/src/views/system/codeGen/component/treeDialog.vue
index cb5b114b..51b8ed66 100644
--- a/Web/src/views/system/codeGen/component/treeDialog.vue
+++ b/Web/src/views/system/codeGen/component/treeDialog.vue
@@ -18,28 +18,28 @@
 					</el-col>
 					<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="mb20">
 						<el-form-item label="数据库表" prop="tableName">
-							<el-select v-model="state.ruleForm.tableName" class="w100" filterable clearable @change="TableChanged()">
+							<el-select v-model="state.ruleForm.tableName" filterable clearable @change="TableChanged()" class="w100">
 								<el-option v-for="item in state.tableData" :key="item.entityName" :label="item.tableName + ' [' + item.tableComment + ']'" :value="item.tableName" />
 							</el-select>
 						</el-form-item>
 					</el-col>
 					<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="mb20">
 						<el-form-item label="显示字段" prop="displayColumn">
-							<el-select v-model="state.ruleForm.displayColumn" class="w100">
+							<el-select v-model="state.ruleForm.displayColumn" filterable class="w100">
 								<el-option v-for="item in state.columnData" :key="item.columnName" :label="item.columnName + ' [' + item.columnComment + ']'" :value="item.columnName" />
 							</el-select>
 						</el-form-item>
 					</el-col>
 					<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="mb20">
 						<el-form-item label="选择值字段" prop="valueColumn">
-							<el-select v-model="state.ruleForm.valueColumn" class="w100">
+							<el-select v-model="state.ruleForm.valueColumn" filterable class="w100">
 								<el-option v-for="item in state.columnData" :key="item.columnName" :label="item.columnName + ' [' + item.columnComment + ']'" :value="item.columnName" />
 							</el-select>
 						</el-form-item>
 					</el-col>
 					<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="mb20">
 						<el-form-item label="父级字段" prop="pidColumn">
-							<el-select v-model="state.ruleForm.pidColumn" class="w100">
+							<el-select v-model="state.ruleForm.pidColumn" filterable class="w100">
 								<el-option v-for="item in state.columnData" :key="item.columnName" :label="item.columnName + ' [' + item.columnComment + ']'" :value="item.columnName" />
 							</el-select>
 						</el-form-item>