!1493 修复部分已知bug并清理代码

Merge pull request !1493 from 喵你个汪/next

Admin.NET/Admin.NET.Web.Entry/wwwroot/template/editDialog.vue.vm

@@ -9,7 +9,7 @@
 }
 <template>
 	<div class="@(Model.LowerClassName)-container">
-		<el-dialog v-model="isShowDialog" :width="800" draggable="" :close-on-click-modal="false">
+		<el-dialog v-model="isShowDialog" :width="800" draggable :close-on-click-modal="false">
 			<template #header>
 				<div style="color: #fff">
 					<!--<el-icon size="16" style="margin-right: 3px; display: inline; vertical-align: middle"> <ele-Edit /> </el-icon>-->

Admin.NET/Admin.NET.Web.Entry/wwwroot/template/index.vue.vm

@@ -1,6 +1,8 @@
 @{
   string LowerFirstLetter(string text) => text.ToString()[..1].ToLower() + text[1..];
 
+  string getDropdownName(dynamic column) => $"{column.FkEntityName}{Regex.Replace(column.PropertyName, "[iI]d$", "")}Dropdown";
+
   var pkField = Model.TableField.Where(c => c.ColumnKey == "True").FirstOrDefault();
 
   string pkFieldName = pkField != null && !string.IsNullOrEmpty(pkField.PropertyName) ? LowerFirstLetter(pkField.PropertyName) : null;
@@ -46,13 +48,13 @@
             }else if(column.EffectType == "ForeignKey"){
             @:<el-form-item label="@column.ColumnComment">
               @:<el-select clearable filterable v-model="queryParams.@(column.LowerPropertyName)" placeholder="请选择@(column.ColumnComment)">
-                @:<el-option v-for="(item,index) in @LowerFirstLetter(@column.FkEntityName)@(column.PropertyName)DropdownList" :key="index" :value="item.value" :label="item.label" />
+                @:<el-option v-for="(item,index) in get@(getDropdownName(column))List" :key="index" :value="item.value" :label="item.label" />
               @:</el-select>
             @:</el-form-item>
             }else if(column.EffectType == "DictSelector" || column.EffectType == "EnumSelector"){
             @:<el-form-item label="@column.ColumnComment">
               @:<el-select clearable filterable v-model="queryParams.@(column.LowerPropertyName)" placeholder="请选择@(column.ColumnComment)">
-                @:<el-option v-for="(item,index) in getDictDataByCode('code_gen_create_type')('@(column.DictTypeCode)')" :key="index" :value="item.code" :label="`[${item.code}]${item.value}`" />
+                @:<el-option v-for="(item,index) in getDictDataByCode('@(column.DictTypeCode)')" :key="index" :value="item.code" :label="`[${item.code}]${item.value}`" />
               @:</el-select>
             @:</el-form-item>
             }else if(column.EffectType == "ApiTreeSelector"){
@@ -116,7 +118,7 @@
       </el-form>
     </el-card>
     <el-card class="full-table" shadow="hover" style="margin-top: 5px">
-      <el-table :data="tableData" @@selection-change="(val: any[]) => { selectData = val; }" style="width: 100%" v-loading="loading" tooltip-effect="light" @(pkFieldName != null ? $"row-key=\"{@pkFieldName}\"" : "") @@sort-change="sortChange" border="">
+      <el-table :data="tableData" @@selection-change="(val: any[]) => { selectData = val; }" style="width: 100%" v-loading="loading" tooltip-effect="light" @(pkFieldName != null ? $"row-key=\"{@pkFieldName}\"" : "") @@sort-change="sortChange" border>
         <el-table-column type="selection" width="40" align="center" v-auth="'@(Model.LowerClassName):batchDelete'" />
         <el-table-column type="index" label="序号" width="55" align="center"/>
         @foreach (var column in Model.TableField.Where(u => u.WhetherTable == "Y")){
@@ -133,7 +135,7 @@
             @::preview-src-list="[scope.row.@column.LowerPropertyName]"
             @::initial-index="0"
             @:fit="scale-down"
-            @:preview-teleported=""/>
+            @:preview-teleported />
             }else if(column.EffectType == "ForeignKey"){
             @:<span>{{scope.row.@LowerFirstLetter(@column.PropertyName)FkColumn}}</span>
             }else if(column.EffectType == "ApiTreeSelector"){
@@ -148,7 +150,7 @@
         @:</el-table-column>
         } else if (column.EffectType == "DictSelector" || column.EffectType == "EnumSelector") {
         isStatus = column.NetType == "StatusEnum" && column.PropertyName == "Status";
-        @:<el-table-column prop="@column.LowerPropertyName" label="@column.ColumnComment" @(column.WhetherSortable == "Y" ? "sortable='custom'" : "") show-overflow-tooltip="" @(isStatus ? $"v-auth=\"'{@Model.LowerClassName}:setStatus'\"": "")>
+        @:<el-table-column prop="@column.LowerPropertyName" label="@column.ColumnComment" @(column.WhetherSortable == "Y" ? "sortable='custom'" : "") show-overflow-tooltip @(isStatus ? $"v-auth=\"'{@Model.LowerClassName}:setStatus'\"": "")>
           @:<template #default="scope">
             if (isStatus) {
               @:<el-switch v-model="scope.row.@column.LowerPropertyName" :active-value="1" :inactive-value="2" size="small" @@change="change@(Model.ClassName)Status(scope.row)" />
@@ -158,7 +160,7 @@
           @:</template>
         @:</el-table-column>
         } else {
-        @:<el-table-column prop="@column.LowerPropertyName" label="@column.ColumnComment" @(column.WhetherSortable == "Y" ? "sortable='custom'" : "") show-overflow-tooltip="" />
+        @:<el-table-column prop="@column.LowerPropertyName" label="@column.ColumnComment" @(column.WhetherSortable == "Y" ? "sortable='custom'" : "") show-overflow-tooltip />
         }
         }
         <el-table-column label="修改记录" width="100" align="center" show-overflow-tooltip>
@@ -166,27 +168,27 @@
             <ModifyRecord :data="scope.row" />
           </template>
         </el-table-column>
-        <el-table-column label="操作" width="@(Model.PrintType == "custom" ? "200" : "140")" align="center" fixed="right" show-overflow-tooltip="" v-if="auth('@(Model.LowerClassName):update') || auth('@(Model.LowerClassName):delete')">
+        <el-table-column label="操作" width="@(Model.PrintType == "custom" ? "200" : "140")" align="center" fixed="right" show-overflow-tooltip v-if="auth('@(Model.LowerClassName):update') || auth('@(Model.LowerClassName):delete')">
           <template #default="scope">
             @if (Model.PrintType == "custom"){
-            @:<el-button icon="ele-Printer" size="small" text="" type="primary" @@click="openPrint@(Model.ClassName)(scope.row)" v-auth="'@(Model.LowerClassName):print'"> 打印 </el-button>
+            @:<el-button icon="ele-Printer" size="small" text type="primary" @@click="openPrint@(Model.ClassName)(scope.row)" v-auth="'@(Model.LowerClassName):print'"> 打印 </el-button>
             }
-            <el-button icon="ele-Edit" size="small" text="" type="primary" @@click="openEdit@(Model.ClassName)(scope.row)" v-auth="'@(Model.LowerClassName):update'"> 编辑 </el-button>
-            <el-button icon="ele-Delete" size="small" text="" type="primary" @@click="del@(Model.ClassName)(scope.row)" v-auth="'@(Model.LowerClassName):delete'"> 删除 </el-button>
+            <el-button icon="ele-Edit" size="small" text type="primary" @@click="openEdit@(Model.ClassName)(scope.row)" v-auth="'@(Model.LowerClassName):update'"> 编辑 </el-button>
+            <el-button icon="ele-Delete" size="small" text type="primary" @@click="del@(Model.ClassName)(scope.row)" v-auth="'@(Model.LowerClassName):delete'"> 删除 </el-button>
           </template>
         </el-table-column>
       </el-table>
       <el-pagination
 				v-model:currentPage="tableParams.page"
 				v-model:page-size="tableParams.pageSize"
-				:total="tableParams.total"
 				:page-sizes="[10, 20, 50, 100, 200, 500]"
+                :total="tableParams.total"
+                @@size-change="handleSizeChange"
+                @@current-change="handleCurrentChange"
+                layout="total, sizes, prev, pager, next, jumper"
 				size="small"
-				background=""
-				@@size-change="handleSizeChange"
-				@@current-change="handleCurrentChange"
-				layout="total, sizes, prev, pager, next, jumper"
-	/>
+				background
+      />
       <printDialog
         ref="printDialogRef"
         :title="print@(Model.ClassName)Title"
@@ -369,7 +371,7 @@
 
 @foreach (var column in Model.TableField) {
   if (column.EffectType == "ForeignKey") {
-    var dropdownName = $"{column.FkEntityName}{Regex.Replace(column.PropertyName, "[iI]d$", "")}Dropdown";
+  var dropdownName = getDropdownName(column);
   @:const @LowerFirstLetter(dropdownName)List = ref<any>([]);
   @:const get@(dropdownName)List = async () => {
     @:let list = await @(Model.LowerClassName)Api.get@(dropdownName)();

Web/src/components/dragVerify/dragVerifyImg.vue

@@ -1,7 +1,7 @@
 <template>
 	<div class="drag-verify-container">
 		<div :style="dragVerifyImgStyle">
-			<img ref="checkImg" :src="imgsrc" @load="checkimgLoaded" style="width:100%" alt="">
+			<img ref="checkImg" :src="imgsrc" @load="checkimgLoaded" style="width:100%" >
 			<div class="move-bar" :class="{goFirst:isOk, goKeep:isKeep}" :style="movebarStyle" ref="moveBar"
 				v-show="showBar"></div>
 			<div class="clip-bar" :style="clipbarStyle" ref="clipBar"></div>

Web/src/components/dragVerify/dragVerifyImgChip.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="drag-verify-container">
     <div :style="dragVerifyImgStyle">
-      <img ref="checkImg" crossOrigin="anonymous" :src="imgsrc" @load="checkimgLoaded" style="width:100%" alt="">
+      <img ref="checkImg" crossOrigin="anonymous" :src="imgsrc" @load="checkimgLoaded" style="width:100%">
       <canvas ref="maincanvas" class="main-canvas"></canvas>
       <canvas ref="movecanvas" :class="{goFirst:isOk, goKeep:isKeep}" class="move-canvas"></canvas>
       <div class="refresh" v-if="showRefresh && !isPassing">

Web/src/components/dragVerify/dragVerifyImgRotate.vue

@@ -1,8 +1,7 @@
 <template>
 	<div class="drag-verify-container">
 		<div :style="dragVerifyImgStyle" style="background-color: var(--el-color-primary)">
-			<img ref="checkImg" :src="imgsrc" class="check-img" :class="{goOrigin:isOk}" @load="checkimgLoaded"
-				:style="imgStyle" alt="">
+			<img ref="checkImg" :src="imgsrc" class="check-img" :class="{goOrigin:isOk}" @load="checkimgLoaded" :style="imgStyle">
 			<div class="tips success" v-if="showTips && isPassing">{{successTip}}</div>
 			<div class="tips danger" v-if="showTips && !isPassing && showErrorTip">{{failTip}}</div>
 		</div>

Web/src/views/approvalFlow/component/detailDialog.vue

@@ -1,4 +1,4 @@
-<template lang="">
+<template>
 	<div class="flow-container">
 		<el-dialog v-model="state.isShowDialog" :width="800" draggable :close-on-click-modal="false">
 			<template #header>

Web/src/views/approvalFlow/component/editFormDialog.vue

@@ -1,4 +1,4 @@
-<template lang="">
+<template>
 	<div class="flow-container">
 		<el-dialog v-model="state.isShowDialog" :width="800" draggable :close-on-click-modal="false">
 			<template #header>

Web/src/views/approvalFlow/index.vue

@@ -38,18 +38,18 @@
 			</el-form>
 		</el-card>
 		<el-card class="full-table" shadow="hover" style="margin-top: 5px">
-			<el-table :data="state.tableData" style="width: 100%" v-loading="state.loading" row-key="id" border="">
+			<el-table :data="state.tableData" style="width: 100%" v-loading="state.loading" row-key="id" border>
 				<el-table-column type="index" label="序号" width="55" align="center" />
-				<el-table-column prop="code" label="编号" width="140" show-overflow-tooltip="" />
-				<el-table-column prop="name" label="名称" show-overflow-tooltip="" />
-				<el-table-column prop="formJson" label="表单" align="center" show-overflow-tooltip="">
+				<el-table-column prop="code" label="编号" width="140" show-overflow-tooltip />
+				<el-table-column prop="name" label="名称" show-overflow-tooltip />
+				<el-table-column prop="formJson" label="表单" align="center" show-overflow-tooltip>
 					<template #default="scope">
-						<el-button icon="ele-Edit" size="small" text="" type="primary" @click="openEditFormDialog(scope.row)"> 表单 </el-button>
+						<el-button icon="ele-Edit" size="small" text type="primary" @click="openEditFormDialog(scope.row)"> 表单 </el-button>
 					</template>
 				</el-table-column>
-				<el-table-column prop="flowJson" label="流程" align="center" show-overflow-tooltip="">
+				<el-table-column prop="flowJson" label="流程" align="center" show-overflow-tooltip>
 					<template #default="scope">
-						<el-button icon="ele-Edit" size="small" text="" type="primary" @click="openEditFlowDialog(scope.row)"> 流程 </el-button>
+						<el-button icon="ele-Edit" size="small" text type="primary" @click="openEditFlowDialog(scope.row)"> 流程 </el-button>
 					</template>
 				</el-table-column>
 				<el-table-column label="修改记录" width="100" align="center" show-overflow-tooltip>
@@ -57,24 +57,24 @@
 						<ModifyRecord :data="scope.row" />
 					</template>
 				</el-table-column>
-				<el-table-column label="操作" width="200" align="center" fixed="right" show-overflow-tooltip="">
+				<el-table-column label="操作" width="200" align="center" fixed="right" show-overflow-tooltip>
 					<template #default="scope">
-						<el-button icon="ele-View" size="small" text="" type="primary" @click="openDetailDialog(scope.row)"> 查看 </el-button>
-						<el-button icon="ele-Edit" size="small" text="" type="primary" @click="openEditApprovalFlow(scope.row)"> 编辑 </el-button>
-						<el-button icon="ele-Delete" size="small" text="" type="primary" @click="delApprovalFlow(scope.row)"> 删除 </el-button>
+						<el-button icon="ele-View" size="small" text type="primary" @click="openDetailDialog(scope.row)"> 查看 </el-button>
+						<el-button icon="ele-Edit" size="small" text type="primary" @click="openEditApprovalFlow(scope.row)"> 编辑 </el-button>
+						<el-button icon="ele-Delete" size="small" text type="primary" @click="delApprovalFlow(scope.row)"> 删除 </el-button>
 					</template>
 				</el-table-column>
 			</el-table>
 			<el-pagination
-				v-model:currentPage="state.tableParams.page"
 				v-model:page-size="state.tableParams.pageSize"
-				:total="state.tableParams.total"
+        v-model:currentPage="state.tableParams.page"
 				:page-sizes="[10, 20, 50, 100, 200, 500]"
-				small=""
-				background=""
-				@size-change="handleSizeChange"
-				@current-change="handleCurrentChange"
-				layout="total, sizes, prev, pager, next, jumper"
+        :total="state.tableParams.total"
+        @current-change="handleCurrentChange"
+        @size-change="handleSizeChange"
+        layout="total, sizes, prev, pager, next, jumper"
+				background
+        small
 			/>
 		</el-card>
 
@@ -86,7 +86,7 @@
 	</div>
 </template>
 
-<script lang="ts" setup="" name="approvalFlow">
+<script lang="ts" setup name="approvalFlow">
 import { onMounted, reactive, ref } from 'vue';
 import { ElMessageBox, ElMessage } from 'element-plus';
 // import { auth } from '/@/utils/authFunction';

Web/src/views/home/widgets/components/about.vue

@@ -2,7 +2,7 @@
 	<el-card shadow="hover" header="关于项目" class="item-background">
 		<template #header>
 			<el-icon style="display: inline; vertical-align: middle"> <ele-QuestionFilled /> </el-icon>
-			<span style=""> 关于项目 </span>
+			<span> 关于项目 </span>
 		</template>
 		<p>
 			基于 .NET6 (Furion/SqlSugar) 实现的通用权限开发框架，前端采用

Web/src/views/home/widgets/components/commit.vue

@@ -2,7 +2,7 @@
 	<el-card shadow="hover" header="更新记录">
 		<template #header>
 			<el-icon style="display: inline; vertical-align: middle"> <ele-DocumentCopy /> </el-icon>
-			<span style=""> 更新记录 </span>
+			<span> 更新记录 </span>
 			<el-button type="primary" icon="ele-Refresh" round plain @click="refresh" style="float: right">更新记录</el-button>
 		</template>
 		<div class="commit" v-loading="state.loading">

Web/src/views/home/widgets/components/myapp.vue

@@ -2,7 +2,7 @@
 	<el-card shadow="hover" header="快捷入口">
 		<template #header>
 			<el-icon style="display: inline; vertical-align: middle"> <ele-Guide /> </el-icon>
-			<span style=""> 快捷入口 </span>
+			<span> 快捷入口 </span>
 		</template>
 		<ul class="myMods">
 			<li v-for="mod in myMods" :key="mod.path!">

Web/src/views/home/widgets/components/progressing.vue

@@ -2,7 +2,7 @@
 	<el-card shadow="hover" header="项目进度">
 		<template #header>
 			<el-icon style="display: inline; vertical-align: middle"> <ele-Odometer /> </el-icon>
-			<span style=""> 项目进度 </span>
+			<span> 项目进度 </span>
 		</template>
 		<div class="progress">
 			<el-progress type="dashboard" :percentage="99.9" :width="160" color="var(--el-color-primary)">

Web/src/views/home/widgets/components/schedule.vue

@@ -2,7 +2,7 @@
 	<el-card shadow="hover" header="我的日程" class="item-background">
 		<template #header>
 			<el-icon style="display: inline; vertical-align: middle"> <ele-Calendar /> </el-icon>
-			<span style=""> 我的日程 </span>
+			<span> 我的日程 </span>
 			<el-button type="primary" icon="ele-CirclePlus" round plain @click="openAddSchedule" style="float: right">添加日程</el-button>
 		</template>
 

Web/src/views/home/widgets/components/timer.vue

@@ -2,7 +2,7 @@
 	<el-card shadow="hover" header="当前时钟" class="item-background">
 		<template #header>
 			<el-icon style="display: inline; vertical-align: middle"> <ele-Clock /> </el-icon>
-			<span style=""> 当前时钟 </span>
+			<span> 当前时钟 </span>
 		</template>
 		<div class="time">
 			<h2>{{ time }}</h2>

Web/src/views/home/widgets/components/version.vue

@@ -2,7 +2,7 @@
 	<el-card shadow="hover" header="版本信息">
 		<template #header>
 			<el-icon style="display: inline; vertical-align: middle"> <ele-InfoFilled /> </el-icon>
-			<span style=""> 版本信息 </span>
+			<span> 版本信息 </span>
 		</template>
 		<div style="height: 210px; text-align: center">
 			<img :src="verSvg" style="height: 140px" />

Web/src/views/home/widgets/components/welcome.vue

@@ -2,7 +2,7 @@
 	<el-card shadow="hover" header="欢迎">
 		<template #header>
 			<el-icon style="display: inline; vertical-align: middle"> <ele-Promotion /> </el-icon>
-			<span style=""> 欢迎 </span>
+			<span> 欢迎 </span>
 		</template>
 		<div class="welcome">
 			<div class="logo">

Web/src/views/system/codeGen/component/fkDialog.vue

@@ -55,7 +55,7 @@ import { onMounted, reactive, ref } from 'vue';
 import { getAPI } from '/@/utils/axios-utils';
 import { SysCodeGenApi } from '/@/api-services/api';
 
-var rowdata = {} as any;
+let rowData = {} as any;
 const emits = defineEmits(['submitRefreshFk']);
 const ruleFormRef = ref();
 const state = reactive({
@@ -88,49 +88,48 @@ const TableChanged = async () => {
 };
 
 const getDbList = async () => {
-	var res = await getAPI(SysCodeGenApi).apiSysCodeGenDatabaseListGet();
+  const res = await getAPI(SysCodeGenApi).apiSysCodeGenDatabaseListGet();
 	state.dbData = res.data.result;
 };
 
 const getTableInfoList = async () => {
 	if (state.ruleForm.configId == '') return;
-	var res = await getAPI(SysCodeGenApi).apiSysCodeGenTableListConfigIdGet(state.ruleForm.configId);
+	const res = await getAPI(SysCodeGenApi).apiSysCodeGenTableListConfigIdGet(state.ruleForm.configId);
 	state.tableData = res.data.result;
 };
 
 const getColumnInfoList = async () => {
 	if (state.ruleForm.configId == '' || state.ruleForm.tableName == '') return;
 	console.log(state.ruleForm.configId, state.ruleForm.tableName);
-	var res = await getAPI(SysCodeGenApi).apiSysCodeGenColumnListByTableNameTableNameConfigIdGet(state.ruleForm.tableName, state.ruleForm.configId);
+	const res = await getAPI(SysCodeGenApi).apiSysCodeGenColumnListByTableNameTableNameConfigIdGet(state.ruleForm.tableName, state.ruleForm.configId);
 	state.columnData = res.data.result;
 };
 
 // 打开弹窗
 const openDialog = async (row: any) => {
-	rowdata = row;
-	if (rowdata.fkConfigId) {
+	rowData = row;
+	if (rowData.fkConfigId) {
 		await getDbList();
-    state.ruleForm.configId = rowdata.fkConfigId;
-		state.ruleForm.tableName = rowdata.fkTableName;
+    state.ruleForm.configId = rowData.fkConfigId;
+		state.ruleForm.tableName = rowData.fkTableName;
 		await DbChanged();
 		await TableChanged();
-    state.ruleForm.fkColumnList = rowdata.fkColumnList;
-    state.ruleForm.linkColumnName = rowdata.fkLinkColumnName;
+    state.ruleForm.fkColumnList = rowData.fkColumnList;
+    state.ruleForm.linkColumnName = rowData.fkLinkColumnName;
 	}
 	state.isShowDialog = true;
 };
 
 // 关闭弹窗
 const closeDialog = () => {
-	rowdata.fkTableName = state.ruleForm.tableName;
-	let tableData = state.tableData.filter((x: any) => x.tableName == state.ruleForm.tableName);
-	rowdata.fkEntityName = tableData.length == 0 ? '' : tableData[0].entityName;
-	rowdata.fkColumnList = state.ruleForm.fkColumnList;
-	rowdata.fkLinkColumnName = state.ruleForm.linkColumnName;
-	rowdata.fkConfigId = state.ruleForm.configId;
-	let columnData = state.columnData.filter((x: any) => x.columnName == state.ruleForm.columnName);
-	rowdata.fkColumnNetType = columnData.length == 0 ? '' : columnData[0].netType;
-	emits('submitRefreshFk', rowdata);
+  rowData.fkColumnNetType = state.columnData.find(x => x.columnName == state.ruleForm.linkColumnName)?.netType;
+  const table = state.tableData.find(x => x.tableName == state.ruleForm.tableName);
+  rowData.fkLinkColumnName = state.ruleForm.linkColumnName;
+  rowData.fkColumnList = state.ruleForm.fkColumnList;
+  rowData.fkTableName = state.ruleForm.tableName;
+  rowData.fkConfigId = state.ruleForm.configId;
+  rowData.fkEntityName = table?.entityName;
+	emits('submitRefreshFk', rowData);
 	cancel();
 };
 

Web/src/views/system/codeGen/component/genConfigDialog.vue

@@ -34,7 +34,7 @@
 				</el-table-column>
 				<el-table-column prop="dictTypeCode" label="字典" width="150" 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" :disabled="effectTypeEnable(scope.row)" class="m-2">
 							<el-option
 							v-for="item in state.selectDataMap[scope.row.effectType] ?? []"
 							:key="item.code"
@@ -45,32 +45,32 @@
 				</el-table-column>
 				<el-table-column prop="whetherTable" label="列表显示" width="70" align="center" show-overflow-tooltip>
 					<template #default="scope">
-						<el-checkbox v-model="scope.row.whetherTable" />
+						<el-checkbox v-model="scope.row.whetherTable" true-value="Y" false-value="N" />
 					</template>
 				</el-table-column>
 				<el-table-column prop="whetherAddUpdate" label="增改" width="70" align="center" show-overflow-tooltip>
 					<template #default="scope">
-						<el-checkbox v-model="scope.row.whetherAddUpdate" :disabled="judgeColumns(scope.row)" />
+						<el-checkbox v-model="scope.row.whetherAddUpdate" true-value="Y" false-value="N" :disabled="judgeColumns(scope.row)" />
 					</template>
 				</el-table-column>
 				<el-table-column prop="whetherImport" label="导入" width="70" align="center" show-overflow-tooltip>
 					<template #default="scope">
-						<el-checkbox v-model="scope.row.whetherImport" :disabled="judgeColumns(scope.row)" />
+						<el-checkbox v-model="scope.row.whetherImport" true-value="Y" false-value="N" :disabled="judgeColumns(scope.row)" />
 					</template>
 				</el-table-column>
 				<el-table-column prop="whetherRequired" label="必填" width="70" align="center" show-overflow-tooltip>
 					<template #default="scope">
-						<el-checkbox v-model="scope.row.whetherRequired" :disabled="judgeColumns(scope.row)" />
+						<el-checkbox v-model="scope.row.whetherRequired" true-value="Y" false-value="N" :disabled="judgeColumns(scope.row)" />
 					</template>
 				</el-table-column>
 				<el-table-column prop="whetherSortable" label="可排序" width="70" align="center" show-overflow-tooltip>
 					<template #default="scope">
-						<el-checkbox v-model="scope.row.whetherSortable" />
+						<el-checkbox v-model="scope.row.whetherSortable" true-value="Y" false-value="N" />
 					</template>
 				</el-table-column>
 				<el-table-column prop="queryWhether" label="查询" width="70" align="center" show-overflow-tooltip>
 					<template #default="scope">
-						<el-switch v-model="scope.row.queryWhether" :active-value="true" :inactive-value="false" />
+						<el-switch v-model="scope.row.queryWhether" active-value="Y" inactive-value="N" />
 					</template>
 				</el-table-column>
 				<el-table-column prop="queryType" label="查询方式" width="110" align="center" show-overflow-tooltip>
@@ -150,24 +150,13 @@ const effectTypeChange = (data: any, index: number) => {
 // 查询操作
 const handleQuery = async (row: any) => {
 	state.loading = true;
-	const data = await getAPI(SysCodeGenConfigApi).apiSysCodeGenConfigListGet(undefined, row.id).then(res => res.data.result ?? []);
-  const lstWhetherColumn = ['whetherTable', 'whetherAddUpdate', 'whetherImport', 'whetherRequired', 'whetherSortable']; //列表显示的checkbox
-  data.forEach((item: any) => {
-		for (const key in item) {
-			if (item[key] === 'Y') {
-				item[key] = true;
-			} else if (item[key] === 'N' || (lstWhetherColumn.includes(key) && item[key] === null)) {
-				item[key] = false;
-			}
-		}
-	});
-	state.tableData = data;
+	state.tableData = await getAPI(SysCodeGenConfigApi).apiSysCodeGenConfigListGet(undefined, row.id).then(res => res.data.result ?? []);
 	state.loading = false;
 };
 
 // 判断是否（用于是否能选择或输入等）
 function judgeColumns(data: any) {
-	return data.whetherCommon == true || data.columnKey === 'True';
+	return data.whetherCommon == "Y" || data.columnKey === 'True';
 }
 
 function effectTypeEnable(data: any) {
@@ -205,14 +194,7 @@ const cancel = () => {
 // 提交
 const submit = async () => {
 	state.loading = true;
-	var lst = state.tableData;
-  const whetherMap = { true: 'Y', false: 'N' } as any;
-	lst.forEach((item: any) => { // 转换是否字段值
-		for (var key in item) {
-      item[key] = whetherMap[item[key]] || item[key];
-		}
-	});
-	await getAPI(SysCodeGenConfigApi).apiSysCodeGenConfigUpdatePost(lst);
+	await getAPI(SysCodeGenConfigApi).apiSysCodeGenConfigUpdatePost(state.tableData);
 	state.loading = false;
 	closeDialog();
 };

Web/src/views/system/codeGen/component/treeDialog.vue

@@ -62,7 +62,7 @@ import { onMounted, reactive, ref } from 'vue';
 import { getAPI } from '/@/utils/axios-utils';
 import { SysCodeGenApi } from '/@/api-services/api';
 
-var rowdata = {} as any;
+let rowData = {} as any;
 const emits = defineEmits(['submitRefreshFk']);
 const ruleFormRef = ref();
 const state = reactive({
@@ -96,55 +96,52 @@ const TableChanged = async () => {
 };
 
 const getDbList = async () => {
-	var res = await getAPI(SysCodeGenApi).apiSysCodeGenDatabaseListGet();
+	const res = await getAPI(SysCodeGenApi).apiSysCodeGenDatabaseListGet();
 	state.dbData = res.data.result;
 };
 
 const getTableInfoList = async () => {
 	if (state.ruleForm.configId == '') return;
-	var res = await getAPI(SysCodeGenApi).apiSysCodeGenTableListConfigIdGet(state.ruleForm.configId);
+  const res = await getAPI(SysCodeGenApi).apiSysCodeGenTableListConfigIdGet(state.ruleForm.configId);
 	state.tableData = res.data.result;
 };
 
 const getColumnInfoList = async () => {
 	if (state.ruleForm.configId == '' || state.ruleForm.tableName == '') return;
-	var res = await getAPI(SysCodeGenApi).apiSysCodeGenColumnListByTableNameTableNameConfigIdGet(state.ruleForm.tableName, state.ruleForm.configId);
+  const res = await getAPI(SysCodeGenApi).apiSysCodeGenColumnListByTableNameTableNameConfigIdGet(state.ruleForm.tableName, state.ruleForm.configId);
 	state.columnData = res.data.result;
 };
 
 // 打开弹窗
 const openDialog = async (row: any) => {
-	rowdata = row;
+	rowData = row;
 	state.isShowDialog = true;
 	ruleFormRef.value?.resetFields();
-	if (rowdata.fkConfigId) {
+	if (rowData.fkConfigId) {
 		await getDbList();
-    state.ruleForm.configId = rowdata.fkConfigId;
-		state.ruleForm.tableName = rowdata.fkTableName;
+    state.ruleForm.configId = rowData.fkConfigId;
+		state.ruleForm.tableName = rowData.fkTableName;
 
 		await DbChanged();
 		await TableChanged();
 
-    state.ruleForm.pidColumn = rowdata.pidColumn;
-    state.ruleForm.valueColumn = rowdata.valueColumn;
-    state.ruleForm.displayColumnList = rowdata.displayColumnList;
+    state.ruleForm.pidColumn = rowData.pidColumn;
+    state.ruleForm.valueColumn = rowData.valueColumn;
+    state.ruleForm.displayColumnList = rowData.displayColumnList;
 	}
 };
 
 // 关闭弹窗
 const closeDialog = () => {
-	rowdata.fkTableName = state.ruleForm.tableName;
-	// rowdata.fkEntityName = state.ruleForm.entityName;
-	// 这里一定要设置 fkEntityName,因为模板文件用到了
-	let tableData = state.tableData.filter((x: any) => x.tableName == state.ruleForm.tableName);
-	rowdata.fkEntityName = tableData.length == 0 ? '' : tableData[0].entityName;
-	// rowdata.fkColumnName = state.ruleForm.columnName;
-	// rowdata.fkColumnNetType = state.ruleForm.columnNetType;
-	rowdata.displayColumn = state.ruleForm.displayColumn;
-	rowdata.valueColumn = state.ruleForm.valueColumn;
-	rowdata.pidColumn = state.ruleForm.pidColumn;
-	rowdata.fkConfigId = state.ruleForm.configId;
-	emits('submitRefreshFk', rowdata);
+  rowData.fkColumnNetType = state.columnData.find(x => x.columnName == state.ruleForm.valueColumn)?.netType;
+	let table = state.tableData.find(x => x.tableName == state.ruleForm.tableName);
+	rowData.displayColumn = state.ruleForm.displayColumn;
+	rowData.valueColumn = state.ruleForm.valueColumn;
+  rowData.fkTableName = state.ruleForm.tableName;
+	rowData.pidColumn = state.ruleForm.pidColumn;
+	rowData.fkConfigId = state.ruleForm.configId;
+  rowData.fkEntityName = table?.entityName;
+	emits('submitRefreshFk', rowData);
 	cancel();
 };
 

Web/src/views/system/file/index.vue

@@ -108,7 +108,7 @@
 					<el-radio :value="false">否</el-radio>
 					<el-radio :value="true">是</el-radio>
 				</el-radio-group>
-				<el-upload ref="uploadRef" drag :auto-upload="false" :limit="1" :file-list="state.fileList" action="" :on-change="handleChange" accept=".jpg,.png,.bmp,.gif,.txt,.pdf,.xlsx,.docx">
+				<el-upload ref="uploadRef" drag :auto-upload="false" :limit="1" :file-list="state.fileList" action :on-change="handleChange" accept=".jpg,.png,.bmp,.gif,.txt,.pdf,.xlsx,.docx">
 					<el-icon class="el-icon--upload">
 						<ele-UploadFilled />
 					</el-icon>

Web/src/views/system/infoSetting/index.vue

@@ -11,7 +11,7 @@
 							<el-icon><ele-PictureRounded /></el-icon> 系统图标
 						</div>
 					</template> -->
-					<el-upload ref="uploadRef" class="avatar-uploader" :showFileList="false" :autoUpload="false" accept=".jpg,.png,.svg" action="" :limit="1" :onChange="handleUploadChange">
+					<el-upload ref="uploadRef" class="avatar-uploader" :showFileList="false" :autoUpload="false" accept=".jpg,.png,.svg" action :limit="1" :onChange="handleUploadChange">
 						<img v-if="state.formData.sysLogo" :src="state.formData.sysLogo" class="avatar" />
 						<SvgIcon v-else class="avatar-uploader-icon" name="ele-Plus" :size="28" />
 					</el-upload>

Web/src/views/system/job/index.vue

@@ -59,11 +59,11 @@
 							<el-table-column prop="status" label="状态" width="120" align="center" show-overflow-tooltip>
 								<template #default="scope">
 									<el-tag type="warning" effect="plain" v-if="(scope.row as SysJobTrigger).status == 0"> 积压 </el-tag>
-									<el-tag type="" effect="plain" v-if="(scope.row as SysJobTrigger).status == 1"> 就绪 </el-tag>
+									<el-tag effect="plain" v-if="(scope.row as SysJobTrigger).status == 1"> 就绪 </el-tag>
 									<el-tag type="success" effect="plain" v-if="(scope.row as SysJobTrigger).status == 2"> 正在运行 </el-tag>
 									<el-tag type="danger" effect="plain" v-if="(scope.row as SysJobTrigger).status == 3"> 暂停 </el-tag>
 									<el-tag type="danger" effect="plain" v-if="(scope.row as SysJobTrigger).status == 4"> 阻塞 </el-tag>
-									<el-tag type="" effect="plain" v-if="(scope.row as SysJobTrigger).status == 5"> 由失败进入就绪 </el-tag>
+									<el-tag effect="plain" v-if="(scope.row as SysJobTrigger).status == 5"> 由失败进入就绪 </el-tag>
 									<el-tag type="danger" effect="plain" v-if="(scope.row as SysJobTrigger).status == 6"> 归档 </el-tag>
 									<el-tag type="danger" effect="plain" v-if="(scope.row as SysJobTrigger).status == 7"> 崩溃 </el-tag>
 									<el-tag type="danger" effect="plain" v-if="(scope.row as SysJobTrigger).status == 8"> 超限 </el-tag>
@@ -229,11 +229,11 @@
 					<el-table-column prop="status" label="触发器状态" align="center" show-overflow-tooltip>
 						<template #default="scope">
 							<el-tag type="warning" effect="plain" v-if="(scope.row as SysJobTrigger).status == 0"> 积压 </el-tag>
-							<el-tag type="" effect="plain" v-if="(scope.row as SysJobTrigger).status == 1"> 就绪 </el-tag>
+							<el-tag effect="plain" v-if="(scope.row as SysJobTrigger).status == 1"> 就绪 </el-tag>
 							<el-tag type="success" effect="plain" v-if="(scope.row as SysJobTrigger).status == 2"> 正在运行 </el-tag>
 							<el-tag type="danger" effect="plain" v-if="(scope.row as SysJobTrigger).status == 3"> 暂停 </el-tag>
 							<el-tag type="danger" effect="plain" v-if="(scope.row as SysJobTrigger).status == 4"> 阻塞 </el-tag>
-							<el-tag type="" effect="plain" v-if="(scope.row as SysJobTrigger).status == 5"> 由失败进入就绪 </el-tag>
+							<el-tag effect="plain" v-if="(scope.row as SysJobTrigger).status == 5"> 由失败进入就绪 </el-tag>
 							<el-tag type="danger" effect="plain" v-if="(scope.row as SysJobTrigger).status == 6"> 归档 </el-tag>
 							<el-tag type="danger" effect="plain" v-if="(scope.row as SysJobTrigger).status == 7"> 崩溃 </el-tag>
 							<el-tag type="danger" effect="plain" v-if="(scope.row as SysJobTrigger).status == 8"> 超限 </el-tag>

Web/src/views/system/ldap/index.vue

@@ -3,10 +3,10 @@
 		<el-card shadow="hover" :body-style="{ paddingBottom: '0' }">
 			<el-form :model="state.queryParams" ref="queryForm" :inline="true">
 				<el-form-item label="关键字">
-					<el-input v-model="state.queryParams.keyword" clearable="" placeholder="请输入模糊查询关键字" />
+					<el-input v-model="state.queryParams.keyword" clearable placeholder="请输入模糊查询关键字" />
 				</el-form-item>
 				<el-form-item label="主机">
-					<el-input v-model="state.queryParams.host" clearable="" placeholder="请输入主机" />
+					<el-input v-model="state.queryParams.host" clearable placeholder="请输入主机" />
 				</el-form-item>
 				<el-form-item>
 					<el-button-group>
@@ -21,16 +21,16 @@
 		</el-card>
 
 		<el-card class="full-table" shadow="hover" style="margin-top: 5px">
-			<el-table :data="state.tableData" style="width: 100%" v-loading="state.loading" border="">
+			<el-table :data="state.tableData" style="width: 100%" v-loading="state.loading" border>
 				<el-table-column type="index" label="序号" width="55" align="center" />
-				<el-table-column prop="host" label="主机" min-width="150" show-overflow-tooltip="" />
-				<el-table-column prop="port" label="端口" show-overflow-tooltip="" />
-				<el-table-column prop="baseDn" label="用户搜索基准" show-overflow-tooltip="" />
-				<el-table-column prop="bindDn" label="绑定DN" show-overflow-tooltip="" />
-				<el-table-column prop="bindPass" label="绑定密码" min-width="200" show-overflow-tooltip="" />
-				<el-table-column prop="authFilter" label="用户过滤规则" show-overflow-tooltip="" />
-				<el-table-column prop="version" label="Ldap版本" show-overflow-tooltip="" />
-				<el-table-column prop="status" label="状态" width="80" align="center" show-overflow-tooltip="">
+				<el-table-column prop="host" label="主机" min-width="150" show-overflow-tooltip />
+				<el-table-column prop="port" label="端口" show-overflow-tooltip />
+				<el-table-column prop="baseDn" label="用户搜索基准" show-overflow-tooltip />
+				<el-table-column prop="bindDn" label="绑定DN" show-overflow-tooltip />
+				<el-table-column prop="bindPass" label="绑定密码" min-width="200" show-overflow-tooltip />
+				<el-table-column prop="authFilter" label="用户过滤规则" show-overflow-tooltip />
+				<el-table-column prop="version" label="Ldap版本" show-overflow-tooltip />
+				<el-table-column prop="status" label="状态" width="80" align="center" show-overflow-tooltip>
 					<template #default="scope">
             <DictLabel :value="scope.row.status" code="StatusEnum" />
 					</template>
@@ -40,9 +40,9 @@
 						<ModifyRecord :data="scope.row" />
 					</template>
 				</el-table-column>
-				<el-table-column label="操作" width="300" align="center" fixed="right" show-overflow-tooltip="" v-if="auth('sysLdap:update') || auth('sysLdap:delete') || auth('sysLdap:syncUser') || auth('sysLdap:syncOrg')">
+				<el-table-column label="操作" width="300" align="center" fixed="right" show-overflow-tooltip v-if="auth('sysLdap:update') || auth('sysLdap:delete') || auth('sysLdap:syncUser') || auth('sysLdap:syncOrg')">
 					<template #default="scope">
-						<el-button icon="ele-Edit" size="small" text="" type="primary" @click="openEditSysLdap(scope.row)" v-auth="'sysLdap:update'"> 编辑 </el-button>
+						<el-button icon="ele-Edit" size="small" text type="primary" @click="openEditSysLdap(scope.row)" v-auth="'sysLdap:update'"> 编辑 </el-button>
 						<el-button icon="ele-Delete" size="small" text type="danger" @click="delSysLdap(scope.row)" v-auth="'sysLdap:delete'"> 删除 </el-button>
 						<el-button icon="ele-Refresh" size="small" text type="primary" @click="syncDomainUser(scope.row)" v-auth="'sysLdap:syncUser'"> 同步域账户 </el-button>
 						<el-button icon="ele-Refresh" size="small" text type="primary" @click="syncDomainOrg(scope.row)" v-auth="'sysLdap:syncOrg'"> 同步域组织 </el-button>
@@ -55,7 +55,7 @@
 				:total="state.tableParams.total"
 				:page-sizes="[10, 20, 50, 100, 200, 500]"
 				size="small"
-				background=""
+				background
 				@size-change="handleSizeChange"
 				@current-change="handleCurrentChange"
 				layout="total, sizes, prev, pager, next, jumper"
@@ -66,7 +66,7 @@
 	</div>
 </template>
 
-<script lang="ts" setup="" name="sysLdap">
+<script lang="ts" setup name="sysLdap">
 import { onMounted, reactive, ref } from 'vue';
 import { ElMessageBox, ElMessage } from 'element-plus';
 import { auth } from '/@/utils/authFunction';

Web/src/views/system/server/index.vue

@@ -110,7 +110,7 @@
 					<div v-for="d in state.assemblyInfo" :key="d.name" style="display: inline-block; margin: 4px; text-align: left">
 						<el-tag round>
 							<div style="display: inline-flex">
-								<div style="">{{ d.name }}</div>
+								<div>{{ d.name }}</div>
 								<div style="color: black; font-size: 9px; margin-left: 3px">v{{ d.version }}</div>
 							</div>
 						</el-tag>

Web/src/views/system/tenant/component/grantMenu.vue

@@ -10,7 +10,7 @@
 			<el-form :model="state.ruleForm" v-loading="state.loading">
 				<el-row :gutter="35">
 					<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl1="24">
-						<el-form-item prop="orgIdList" label="">
+						<el-form-item prop="orgIdList">
 							<el-tree
 								ref="treeRef"
 								:data="state.menuData"

Web/src/views/system/user/component/userCenter.vue

@@ -4,7 +4,7 @@
 			<el-col :span="8" :xs="24">
 				<el-card shadow="hover">
 					<div class="account-center-avatarHolder">
-						<!-- <el-upload class="h100" ref="uploadAvatarRef" action="" :limit="1" :show-file-list="false" :auto-upload="false" :on-change="uploadAvatarFile" accept=".jpg,.png,.bmp,.gif">
+						<!-- <el-upload class="h100" ref="uploadAvatarRef" action :limit="1" :show-file-list="false" :auto-upload="false" :on-change="uploadAvatarFile" accept=".jpg,.png,.bmp,.gif">
 							<el-avatar :size="100" :src="userInfos.avatar" />
 						</el-upload> -->
 						<el-avatar
@@ -36,7 +36,7 @@
 					<el-button icon="ele-Edit" type="primary" @click="openSignDialog" v-auth="'sysFile:uploadSignature'"> 电子签名 </el-button>
 					<el-upload
 						ref="uploadSignRef"
-						action=""
+						action
 						accept=".png"
 						:limit="1"
 						:show-file-list="false"

Web/src/views/system/weChatPay/index.vue

@@ -3,7 +3,7 @@
 		<el-card shadow="hover" :body-style="{ paddingBottom: '0' }">
 			<el-form :model="state.queryParams" ref="queryForm" :inline="true">
 				<el-form-item label="订单号">
-					<el-input v-model="state.queryParams.keyword" clearable="" placeholder="请输入订单号" />
+					<el-input v-model="state.queryParams.keyword" clearable placeholder="请输入订单号" />
 				</el-form-item>
 				<el-form-item label="创建时间">
 					<el-date-picker placeholder="请选择创建时间" value-format="YYYY/MM/DD" type="daterange" v-model="state.queryParams.createTimeRange" />
@@ -21,7 +21,7 @@
 		</el-card>
 
 		<el-card class="full-table" shadow="hover" style="margin-top: 5px">
-			<el-table :data="state.tableData" style="width: 100%" v-loading="state.loading" border="">
+			<el-table :data="state.tableData" style="width: 100%" v-loading="state.loading" border>
 				<el-table-column type="index" label="序号" width="55" align="center" />
 				<el-table-column prop="outTradeNumber" label="商户订单号" width="180"></el-table-column>
 				<el-table-column prop="transactionId" label="支付订单号" width="220"></el-table-column>
@@ -42,15 +42,15 @@
 				<el-table-column label="操作" align="center" fixed="right">
 					<template #default="scope">
 						<el-button
+              text
 							size="small"
-							text=""
 							type="primary"
 							v-if="scope.row.qrcodeContent != null && scope.row.qrcodeContent != '' && (scope.row.tradeState === '' || !scope.row.tradeState)"
 							@click="openQrDialog(scope.row.qrcodeContent)"
 							>付款二维码</el-button
 						>
-						<el-button size="small" text="" type="primary" v-if="scope.row.tradeState === 'REFUND'" @click="openRefundDialog(scope.row.transactionId)">查看退款</el-button>
-						<el-button size="small" text="" type="primary" v-if="scope.row.tradeState === 'SUCCESS'" @click="doRefund(scope.row)">全额退款</el-button>
+						<el-button size="small" text type="primary" v-if="scope.row.tradeState === 'REFUND'" @click="openRefundDialog(scope.row.transactionId)">查看退款</el-button>
+						<el-button size="small" text type="primary" v-if="scope.row.tradeState === 'SUCCESS'" @click="doRefund(scope.row)">全额退款</el-button>
 					</template>
 				</el-table-column>
 			</el-table>
@@ -109,7 +109,7 @@
 					<span>退款信息</span>
 				</div>
 			</template>
-			<el-table :data="subTableData" style="width: 100%" tooltip-effect="light" row-key="id" border="">
+			<el-table :data="subTableData" style="width: 100%" tooltip-effect="light" row-key="id" border>
 				<el-table-column type="index" label="序号" width="55" align="center" />
 				<el-table-column prop="outRefundNumber" label="商户退款号" width="180"></el-table-column>
 				<el-table-column prop="transactionId" label="支付订单号" width="220"></el-table-column>