diff --git a/src/api/system/dict.api.ts b/src/api/system/dict.api.ts index e2024297..f558a987 100644 --- a/src/api/system/dict.api.ts +++ b/src/api/system/dict.api.ts @@ -21,6 +21,13 @@ const DictAPI = { }); }, + getList() { + return request({ + url: `${DICT_BASE_URL}`, + method: "get", + }); + }, + /** * 字典表单数据 * diff --git a/src/views/codegen/index.vue b/src/views/codegen/index.vue index 3a6ef2fc..60ea6d63 100644 --- a/src/views/codegen/index.vue +++ b/src/views/codegen/index.vue @@ -656,10 +656,7 @@ async function handleOpenDialog(tableName: string) { currentTableName.value = tableName; // 获取字典数据 DictAPI.getList().then((data) => { - dictOptions.value = data.map((item) => ({ - label: item.name, - value: item.dictCode, - })); + dictOptions.value = data; loading.value = true; GeneratorAPI.getGenConfig(tableName) .then((data) => { diff --git a/src/views/demo/table-select/index.vue b/src/views/demo/table-select/index.vue index 3456b451..6fd82c9d 100644 --- a/src/views/demo/table-select/index.vue +++ b/src/views/demo/table-select/index.vue @@ -22,7 +22,7 @@ function handleConfirm(data: IUser[]) { } const text = computed(() => { // 获取字典数据 - const dictData = dictStore.getDictionary("gender"); + const dictData = dictStore.getDictItems("gender"); const genderLabel = dictData.find((item: any) => item.value == selectedUser.value?.gender)?.label; return selectedUser.value ? `${selectedUser.value.username} - ${genderLabel} - ${selectedUser.value.deptName}` diff --git a/src/views/system/menu/index.vue b/src/views/system/menu/index.vue index bcff6cf1..23c497aa 100644 --- a/src/views/system/menu/index.vue +++ b/src/views/system/menu/index.vue @@ -465,7 +465,7 @@ function handleSubmit() { handleQuery(); }); } else { - MenuAPI.add(formData.value).then(() => { + MenuAPI.create(formData.value).then(() => { ElMessage.success("新增成功"); handleCloseDialog(); handleQuery();