update 重构 修改框架内不正常命名与规范是和否的状态

src/api/system/ossConfig/types.ts

@@ -6,7 +6,7 @@ export interface OssConfigVO extends BaseEntity {
   bucketName: string;
   prefix: string;
   endpoint: string;
-  domain: string;
+  domainUrl: string;
   isHttps: string;
   region: string;
   status: string;
@@ -29,7 +29,7 @@ export interface OssConfigForm {
   bucketName: string;
   prefix: string;
   endpoint: string;
-  domain: string;
+  domainUrl: string;
   isHttps: string;
   accessPolicy: string;
   region: string;

src/api/system/user/types.ts

@@ -16,7 +16,7 @@ export interface UserInfo {
 export interface UserQuery extends PageQuery {
   userName?: string;
   nickName?: string;
-  phonenumber?: string;
+  phoneNumber?: string;
   status?: string;
   deptId?: string | number;
   roleId?: string | number;
@@ -34,8 +34,8 @@ export interface UserVO extends BaseEntity {
   nickName: string;
   userType: string;
   email: string;
-  phonenumber: string;
+  phoneNumber: string;
-  sex: string;
+  gender: string;
   avatar: string;
   status: string;
   delFlag: string;
@@ -60,9 +60,9 @@ export interface UserForm {
   userName: string;
   nickName?: string;
   password: string;
-  phonenumber?: string;
+  phoneNumber?: string;
   email?: string;
-  sex?: string;
+  gender?: string;
   status: string;
   remark?: string;
   postIds: string[];

src/components/UserSelect/index.vue

@@ -35,8 +35,8 @@
                       <el-form-item label="用户名称" prop="userName">
                         <el-input v-model="queryParams.userName" placeholder="请输入用户名称" clearable @keyup.enter="handleQuery" />
                       </el-form-item>
-                  <el-form-item label="手机号码" prop="phonenumber">
+                      <el-form-item label="手机号码" prop="phoneNumber">
-                    <el-input v-model="queryParams.phonenumber" placeholder="请输入手机号码" clearable @keyup.enter="handleQuery" />
+                        <el-input v-model="queryParams.phoneNumber" placeholder="请输入手机号码" clearable @keyup.enter="handleQuery" />
                       </el-form-item>
                       <el-form-item>
                         <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
@@ -79,7 +79,7 @@
                   <vxe-column key="userName" title="用户名称" align="center" field="userName" />
                   <vxe-column key="nickName" title="用户昵称" align="center" field="nickName" />
                   <vxe-column key="deptName" title="部门" align="center" field="deptName" />
-              <vxe-column key="phonenumber" title="手机号码" align="center" field="phonenumber" width="120" />
+                  <vxe-column key="phoneNumber" title="手机号码" align="center" field="phoneNumber" width="120" />
                   <vxe-column key="status" title="状态" align="center">
                     <template #default="scope">
                       <dict-tag :options="sys_normal_disable" :value="scope.row.status"></dict-tag>
@@ -159,7 +159,7 @@ const queryParams = ref<UserQuery>({
   pageNum: 1,
   pageSize: 10,
   userName: '',
-  phonenumber: '',
+  phoneNumber: '',
   status: '',
   deptId: '',
   roleId: '',

src/views/system/dict/index.vue

@@ -65,7 +65,7 @@
                   <span class="link-type" @click.stop="handleTypeRowClick(scope.row)">{{ scope.row.dictType }}</span>
                 </template>
               </el-table-column>
-              <el-table-column label="备注" align="center" prop="remark" width="160"/>
+              <el-table-column label="备注" align="center" prop="remark" width="160" />
               <el-table-column label="创建时间" align="center" prop="createTime" width="180">
                 <template #default="scope">
                   <span>{{ proxy.parseTime(scope.row.createTime) }}</span>
@@ -219,7 +219,7 @@
         <el-form-item prop="dictType">
           <template #label>
             <span>
-              <el-tooltip content="数据存储中的Key值，如：sys_user_sex" placement="top">
+              <el-tooltip content="数据存储中的Key值，如：sys_user_gender" placement="top">
                 <i class="el-icon-question"></i>
               </el-tooltip>
               字典类型

src/views/system/menu/index.vue

@@ -143,8 +143,8 @@
                 </span>
               </template>
               <el-radio-group v-model="form.isFrame">
-                <el-radio value="0">是</el-radio>
+                <el-radio value="Y">是</el-radio>
-                <el-radio value="1">否</el-radio>
+                <el-radio value="N">否</el-radio>
               </el-radio-group>
             </el-form-item>
           </el-col>
@@ -221,8 +221,8 @@
                 </span>
               </template>
               <el-radio-group v-model="form.isCache">
-                <el-radio value="0">缓存</el-radio>
+                <el-radio value="Y">缓存</el-radio>
-                <el-radio value="1">不缓存</el-radio>
+                <el-radio value="N">不缓存</el-radio>
               </el-radio-group>
             </el-form-item>
           </el-col>
@@ -345,8 +345,8 @@ const initFormData = {
   icon: '',
   menuType: MenuTypeEnum.M,
   orderNum: 1,
-  isFrame: '1',
+  isFrame: 'N',
-  isCache: '0',
+  isCache: 'Y',
   visible: '0',
   status: '0'
 };

src/views/system/oss/config.vue

@@ -19,8 +19,8 @@
           </el-form-item>
           <el-form-item label="是否默认" prop="status">
             <el-select v-model="queryParams.status" placeholder="请选择状态" clearable>
-                <el-option key="0" label="是" value="0" />
+              <el-option key="Y" label="是" value="Y" />
-                <el-option key="1" label="否" value="1" />
+              <el-option key="N" label="否" value="N" />
             </el-select>
           </el-form-item>
           <el-form-item>
@@ -57,7 +57,7 @@
         <el-table-column v-if="columns[0].visible" label="主建" align="center" prop="ossConfigId" />
         <el-table-column v-if="columns[1].visible" label="配置key" align="center" prop="configKey" />
         <el-table-column v-if="columns[2].visible" label="访问站点" align="center" prop="endpoint" width="200" />
-        <el-table-column v-if="columns[3].visible" label="自定义域名" align="center" prop="domain" width="200" />
+        <el-table-column v-if="columns[3].visible" label="自定义域名" align="center" prop="domainUrl" width="200" />
         <el-table-column v-if="columns[4].visible" label="桶名称" align="center" prop="bucketName" />
         <el-table-column v-if="columns[5].visible" label="前缀" align="center" prop="prefix" />
         <el-table-column v-if="columns[6].visible" label="域" align="center" prop="region" />
@@ -100,8 +100,8 @@
             </template>
           </el-input>
         </el-form-item>
-        <el-form-item label="自定义域名" prop="domain">
+        <el-form-item label="自定义域名" prop="domainUrl">
-          <el-input v-model="form.domain" placeholder="请输入自定义域名">
+          <el-input v-model="form.domainUrl" placeholder="请输入自定义域名">
             <template #prefix>
               <span style="color: #999">{{ protocol }}</span>
             </template>
@@ -193,11 +193,11 @@ const initFormData: OssConfigForm = {
   bucketName: '',
   prefix: '',
   endpoint: '',
-  domain: '',
+  domainUrl: '',
   isHttps: 'N',
   accessPolicy: '1',
   region: '',
-  status: '1',
+  status: 'N',
   remark: ''
 };
 const data = reactive<PageData<OssConfigForm, OssConfigQuery>>({

src/views/system/role/authUser.vue

@@ -11,8 +11,8 @@
           <el-form-item label="用户名称" prop="userName">
             <el-input v-model="queryParams.userName" placeholder="请输入用户名称" clearable @keyup.enter="handleQuery" />
           </el-form-item>
-          <el-form-item label="手机号码" prop="phonenumber">
+          <el-form-item label="手机号码" prop="phoneNumber">
-            <el-input v-model="queryParams.phonenumber" placeholder="请输入手机号码" clearable @keyup.enter="handleQuery" />
+            <el-input v-model="queryParams.phoneNumber" placeholder="请输入手机号码" clearable @keyup.enter="handleQuery" />
           </el-form-item>
           <el-form-item>
             <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
@@ -42,7 +42,7 @@
         <el-table-column label="用户名称" prop="userName" :show-overflow-tooltip="true" />
         <el-table-column label="用户昵称" prop="nickName" :show-overflow-tooltip="true" />
         <el-table-column label="邮箱" prop="email" :show-overflow-tooltip="true" />
-        <el-table-column label="手机" prop="phonenumber" :show-overflow-tooltip="true" />
+        <el-table-column label="手机" prop="phoneNumber" :show-overflow-tooltip="true" />
         <el-table-column label="状态" align="center" prop="status">
           <template #default="scope">
             <dict-tag :options="sys_normal_disable" :value="scope.row.status" />
@@ -94,7 +94,7 @@ const queryParams = reactive<UserQuery>({
   pageSize: 10,
   roleId: route.params.roleId as string,
   userName: undefined,
-  phonenumber: undefined
+  phoneNumber: undefined
 });
 
 /** 查询授权用户列表 */

src/views/system/role/selectUser.vue

@@ -7,8 +7,8 @@
             <el-form-item label="用户名称" prop="userName">
               <el-input v-model="queryParams.userName" placeholder="请输入用户名称" clearable @keyup.enter="handleQuery" />
             </el-form-item>
-            <el-form-item label="手机号码" prop="phonenumber">
+            <el-form-item label="手机号码" prop="phoneNumber">
-              <el-input v-model="queryParams.phonenumber" placeholder="请输入手机号码" clearable @keyup.enter="handleQuery" />
+              <el-input v-model="queryParams.phoneNumber" placeholder="请输入手机号码" clearable @keyup.enter="handleQuery" />
             </el-form-item>
             <el-form-item>
               <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
@@ -18,12 +18,20 @@
         </el-card>
 
         <el-card shadow="hover" class="table-panel select-user-card">
-          <el-table ref="tableRef" border class="data-table" :data="userList" height="260px" @row-click="clickRow" @selection-change="handleSelectionChange">
+          <el-table
+            ref="tableRef"
+            border
+            class="data-table"
+            :data="userList"
+            height="260px"
+            @row-click="clickRow"
+            @selection-change="handleSelectionChange"
+          >
             <el-table-column type="selection" width="55"></el-table-column>
             <el-table-column label="用户名称" prop="userName" :show-overflow-tooltip="true" />
             <el-table-column label="用户昵称" prop="nickName" :show-overflow-tooltip="true" />
             <el-table-column label="邮箱" prop="email" :show-overflow-tooltip="true" />
-            <el-table-column label="手机" prop="phonenumber" :show-overflow-tooltip="true" />
+            <el-table-column label="手机" prop="phoneNumber" :show-overflow-tooltip="true" />
             <el-table-column label="状态" align="center" prop="status">
               <template #default="scope">
                 <dict-tag :options="sys_normal_disable" :value="scope.row.status" />
@@ -73,7 +81,7 @@ const queryParams = reactive<UserQuery>({
   pageSize: 10,
   roleId: undefined,
   userName: undefined,
-  phonenumber: undefined
+  phoneNumber: undefined
 });
 
 const tableRef = ref<ElTableInstance>();

src/views/system/user/index.vue

@@ -45,8 +45,8 @@
               <el-form-item label="用户昵称" prop="nickName">
                 <el-input v-model="queryParams.nickName" placeholder="请输入用户昵称" clearable @keyup.enter="handleQuery" />
               </el-form-item>
-                <el-form-item label="手机号码" prop="phonenumber">
+              <el-form-item label="手机号码" prop="phoneNumber">
-                  <el-input v-model="queryParams.phonenumber" placeholder="请输入手机号码" clearable @keyup.enter="handleQuery" />
+                <el-input v-model="queryParams.phoneNumber" placeholder="请输入手机号码" clearable @keyup.enter="handleQuery" />
               </el-form-item>
 
               <el-form-item label="状态" prop="status">
@@ -114,7 +114,7 @@
             <el-table-column v-if="columns[1].visible" key="userName" label="用户名称" align="center" prop="userName" :show-overflow-tooltip="true" />
             <el-table-column v-if="columns[2].visible" key="nickName" label="用户昵称" align="center" prop="nickName" :show-overflow-tooltip="true" />
             <el-table-column v-if="columns[3].visible" key="deptName" label="部门" align="center" prop="deptName" :show-overflow-tooltip="true" />
-            <el-table-column v-if="columns[4].visible" key="phonenumber" label="手机号码" align="center" prop="phonenumber" width="120" />
+            <el-table-column v-if="columns[4].visible" key="phoneNumber" label="手机号码" align="center" prop="phoneNumber" width="120" />
             <el-table-column v-if="columns[5].visible" key="status" label="状态" align="center">
               <template #default="scope">
                 <el-switch v-model="scope.row.status" active-value="0" inactive-value="1" @change="handleStatusChange(scope.row)"></el-switch>
@@ -183,8 +183,8 @@
         </el-row>
         <el-row>
           <el-col :span="12">
-            <el-form-item label="手机号码" prop="phonenumber">
+            <el-form-item label="手机号码" prop="phoneNumber">
-              <el-input v-model="form.phonenumber" placeholder="请输入手机号码" maxlength="11" />
+              <el-input v-model="form.phoneNumber" placeholder="请输入手机号码" maxlength="11" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -208,8 +208,8 @@
         <el-row>
           <el-col :span="12">
             <el-form-item label="用户性别">
-              <el-select v-model="form.sex" placeholder="请选择">
+              <el-select v-model="form.gender" placeholder="请选择">
-                <el-option v-for="dict in sys_user_sex" :key="dict.value" :label="dict.label" :value="dict.value"></el-option>
+                <el-option v-for="dict in sys_user_gender" :key="dict.value" :label="dict.label" :value="dict.value"></el-option>
               </el-select>
             </el-form-item>
           </el-col>
@@ -315,7 +315,7 @@ import { useUserStore } from '@/store/modules/user';
 
 const router = useRouter();
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
-const { sys_normal_disable, sys_user_sex } = toRefs<any>(proxy?.useDict('sys_normal_disable', 'sys_user_sex'));
+const { sys_normal_disable, sys_user_gender } = toRefs<any>(proxy?.useDict('sys_normal_disable', 'sys_user_gender'));
 const userList = ref<UserVO[]>();
 const loading = ref(true);
 const showSearch = ref(true);
@@ -373,9 +373,9 @@ const initFormData: UserForm = {
   userName: '',
   nickName: undefined,
   password: '',
-  phonenumber: undefined,
+  phoneNumber: undefined,
   email: undefined,
-  sex: undefined,
+  gender: undefined,
   status: '0',
   remark: '',
   postIds: [],
@@ -388,7 +388,7 @@ const initData: PageData<UserForm, UserQuery> = {
     pageNum: 1,
     pageSize: 10,
     userName: '',
-    phonenumber: '',
+    phoneNumber: '',
     status: '',
     deptId: '',
     roleId: ''
@@ -421,7 +421,7 @@ const initData: PageData<UserForm, UserQuery> = {
         trigger: ['blur', 'change']
       }
     ],
-    phonenumber: [
+    phoneNumber: [
       {
         pattern: /^1[3456789][0-9]\d{8}$/,
         message: '请输入正确的手机号码',
@@ -628,9 +628,7 @@ const handleUpdate = async (row?: UserForm) => {
   dialog.title = '修改用户';
   Object.assign(form.value, data.user);
   postOptions.value = data.posts;
-  roleOptions.value = Array.from(
+  roleOptions.value = Array.from(new Map([...data.roles, ...data.user.roles].map((role) => [role.roleId, role])).values());
-    new Map([...data.roles, ...data.user.roles].map(role => [role.roleId, role])).values()
-  );
   form.value.postIds = data.postIds;
   form.value.roleIds = data.roleIds;
   form.value.password = '';

src/views/system/user/profile/index.vue

@@ -25,7 +25,7 @@
                   <svg-icon icon-class="phone" />
                   <span>手机号码</span>
                 </div>
-                <span class="profile-item-value">{{ state.user.phonenumber || '-' }}</span>
+                <span class="profile-item-value">{{ state.user.phoneNumber || '-' }}</span>
               </li>
               <li class="list-group-item">
                 <div class="profile-item-label">

src/views/system/user/profile/userInfo.vue

@@ -3,14 +3,14 @@
     <el-form-item label="用户昵称" prop="nickName">
       <el-input v-model="userForm.nickName" maxlength="30" />
     </el-form-item>
-    <el-form-item label="手机号码" prop="phonenumber">
+    <el-form-item label="手机号码" prop="phoneNumber">
-      <el-input v-model="userForm.phonenumber" maxlength="11" />
+      <el-input v-model="userForm.phoneNumber" maxlength="11" />
     </el-form-item>
     <el-form-item label="邮箱" prop="email">
       <el-input v-model="userForm.email" maxlength="50" />
     </el-form-item>
     <el-form-item label="性别">
-      <el-radio-group v-model="userForm.sex">
+      <el-radio-group v-model="userForm.gender">
         <el-radio value="0">男</el-radio>
         <el-radio value="1">女</el-radio>
       </el-radio-group>
@@ -42,7 +42,7 @@ const rule: ElFormRules = {
       trigger: ['blur', 'change']
     }
   ],
-  phonenumber: [
+  phoneNumber: [
     {
       required: true,
       message: '手机号码不能为空',