Merge branch 'ts'

src/api/system/dict/data/types.ts

@@ -1,7 +1,6 @@
 export interface DictDataQuery extends PageQuery {
   dictName: string;
   dictType: string;
-  status: string;
   dictLabel: string;
 }
 
@@ -12,7 +11,6 @@ export interface DictDataVO extends BaseEntity {
   cssClass: string;
   listClass: ElTagType;
   dictSort: number;
-  status: string;
   remark: string;
 }
 
@@ -24,6 +22,5 @@ export interface DictDataForm {
   cssClass: string;
   listClass: ElTagType;
   dictSort: number;
-  status: string;
   remark: string;
 }

src/api/system/dict/type/types.ts

@@ -2,7 +2,6 @@ export interface DictTypeVO extends BaseEntity {
   dictId: number | string;
   dictName: string;
   dictType: string;
-  status: string;
   remark: string;
 }
 
@@ -10,12 +9,10 @@ export interface DictTypeForm {
   dictId: number | string | undefined;
   dictName: string;
   dictType: string;
-  status: string;
   remark: string;
 }
 
 export interface DictTypeQuery extends PageQuery {
   dictName: string;
   dictType: string;
-  status: string;
 }

src/views/register.vue

@@ -132,13 +132,14 @@ const handleRegister = () => {
 }
 
 const getCode = async () => {
-  const { data } = await getCodeImg();
+  const res = await getCodeImg();
+  const { data } = res;
   captchaEnabled.value = data.captchaEnabled === undefined ? true : data.captchaEnabled;
   if (captchaEnabled.value) {
-    codeUrl.value = "data:image/gif;base64," + data.img;
+    codeUrl.value = 'data:image/gif;base64,' + data.img;
     registerForm.value.uuid = data.uuid;
   }
-}
+};
 
 const initTenantList = async () => {
   const { data } = await getTenantList();

src/views/system/dict/data.vue

@@ -12,11 +12,6 @@
             <el-form-item label="字典标签" prop="dictLabel">
               <el-input v-model="queryParams.dictLabel" placeholder="请输入字典标签" clearable style="width: 200px" @keyup.enter="handleQuery" />
             </el-form-item>
-            <el-form-item label="状态" prop="status">
-              <el-select v-model="queryParams.status" placeholder="数据状态" clearable style="width: 200px">
-                <el-option v-for="dict in sys_normal_disable" :key="dict.value" :label="dict.label" :value="dict.value" />
-              </el-select>
-            </el-form-item>
             <el-form-item>
               <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
               <el-button icon="Refresh" @click="resetQuery">重置</el-button>
@@ -61,11 +56,6 @@
         </el-table-column>
         <el-table-column label="字典键值" align="center" prop="dictValue" />
         <el-table-column label="字典排序" align="center" prop="dictSort" />
-        <el-table-column label="状态" align="center" prop="status">
-          <template #default="scope">
-            <dict-tag :options="sys_normal_disable" :value="scope.row.status" />
-          </template>
-        </el-table-column>
         <el-table-column label="备注" align="center" prop="remark" :show-overflow-tooltip="true" />
         <el-table-column label="创建时间" align="center" prop="createTime" width="180">
           <template #default="scope">
@@ -114,11 +104,6 @@
             ></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="状态" prop="status">
-          <el-radio-group v-model="form.status">
-            <el-radio v-for="dict in sys_normal_disable" :key="dict.value" :label="dict.value">{{ dict.label }}</el-radio>
-          </el-radio-group>
-        </el-form-item>
         <el-form-item label="备注" prop="remark">
           <el-input v-model="form.remark" type="textarea" placeholder="请输入内容"></el-input>
         </el-form-item>
@@ -141,7 +126,6 @@ import { DictTypeVO } from '@/api/system/dict/type/types';
 import { DictDataForm, DictDataQuery, DictDataVO } from "@/api/system/dict/data/types";
 
 const { proxy } = getCurrentInstance() as ComponentInternalInstance
-const { sys_normal_disable } = toRefs<any>(proxy?.useDict("sys_normal_disable"));
 const route = useRoute();
 
 const dataList = ref<DictDataVO[]>([]);
@@ -180,7 +164,6 @@ const initFormData: DictDataForm = {
   cssClass: '',
   listClass: "default",
   dictSort: 0,
-  status: "0",
   remark: ''
 }
 const data = reactive<PageData<DictDataForm, DictDataQuery>>({
@@ -190,7 +173,6 @@ const data = reactive<PageData<DictDataForm, DictDataQuery>>({
     pageSize: 10,
     dictName: '',
     dictType: '',
-    status: '',
     dictLabel: ''
   },
   rules: {

src/views/system/dict/index.vue

@@ -10,11 +10,6 @@
             <el-form-item label="字典类型" prop="dictType">
               <el-input v-model="queryParams.dictType" placeholder="请输入字典类型" clearable style="width: 240px" @keyup.enter="handleQuery" />
             </el-form-item>
-            <el-form-item label="状态" prop="status">
-              <el-select v-model="queryParams.status" placeholder="字典状态" clearable style="width: 240px">
-                <el-option v-for="dict in sys_normal_disable" :key="dict.value" :label="dict.label" :value="dict.value" />
-              </el-select>
-            </el-form-item>
             <el-form-item label="创建时间" style="width: 308px">
               <el-date-picker
                 v-model="dateRange"
@@ -69,11 +64,6 @@
             </router-link>
           </template>
         </el-table-column>
-        <el-table-column label="状态" align="center" prop="status">
-          <template #default="scope">
-            <dict-tag :options="sys_normal_disable" :value="scope.row.status" />
-          </template>
-        </el-table-column>
         <el-table-column label="备注" align="center" prop="remark" :show-overflow-tooltip="true" />
         <el-table-column label="创建时间" align="center" prop="createTime" width="180">
           <template #default="scope">
@@ -103,11 +93,6 @@
         <el-form-item label="字典类型" prop="dictType">
           <el-input v-model="form.dictType" placeholder="请输入字典类型" />
         </el-form-item>
-        <el-form-item label="状态" prop="status">
-          <el-radio-group v-model="form.status">
-            <el-radio v-for="dict in sys_normal_disable" :key="dict.value" :label="dict.value">{{ dict.label }}</el-radio>
-          </el-radio-group>
-        </el-form-item>
         <el-form-item label="备注" prop="remark">
           <el-input v-model="form.remark" type="textarea" placeholder="请输入内容"></el-input>
         </el-form-item>
@@ -128,7 +113,6 @@ import { listType, getType, delType, addType, updateType, refreshCache } from "@
 import { DictTypeForm, DictTypeQuery, DictTypeVO } from "@/api/system/dict/type/types";
 
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
-const { sys_normal_disable } = toRefs<any>(proxy?.useDict("sys_normal_disable"))
 
 const typeList = ref<DictTypeVO[]>([]);
 const loading = ref(true);
@@ -152,7 +136,6 @@ const initFormData: DictTypeForm = {
   dictId: undefined,
   dictName: '',
   dictType: '',
-  status: "0",
   remark: ''
 }
 const data = reactive<PageData<DictTypeForm, DictTypeQuery>>({
@@ -161,8 +144,7 @@ const data = reactive<PageData<DictTypeForm, DictTypeQuery>>({
     pageNum: 1,
     pageSize: 10,
     dictName: '',
-    dictType: '',
-    status: ''
+    dictType: ''
   },
   rules: {
     dictName: [{ required: true, message: "字典名称不能为空", trigger: "blur" }],