ZeroNodeTeam/accompany_admin_pc
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' of http://120.46.3.39:3000/AGSSTeam/accompany_admin_pc into develop

Browse Source
This commit is contained in:
fangyunong 2025-07-18 22:21:42 +08:00
commit 991736f760
4 changed files with 68 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/api/dictApi.ts
View File

@ -79,7 +79,7 @@ export function addChildDict(data: DictRowQuery) {
* @param tag 用逗号连接选择的tags数组
* @returns
*/
export function getDict(value: string, tag: string): Promise<DictRowReturn[]> {
export function getDict(value: string, tag: string | null = null): Promise<DictRowReturn[]> {
return http({
url: DictChildURL,
method: 'GET',

59
src/views/system/dict/components/DictMain.vue
View File

@ -10,8 +10,8 @@
<h1>{{ tableTitle }}</h1>
</div>
<div class="dict-main__search">
<n-input autosize v-model:value="mainSearch" placeholder="查询字典名称（中/英）" clearable
@keyup.enter="handleFindDatas" class="dict-main__search-input">
<n-input autosize v-model:value="mainSearch" placeholder="查询字典名称（中/英）或字典值" clearable
@keyup.enter="handleFindDatas" @input="handleInputSearch" class="dict-main__search-input" >
</n-input>
<n-button type="primary" @click="handleFindDatas" :focusable="false" class="dict-main__search-btn">
<template #icon>
@ -33,7 +33,7 @@
</div>
</main>
<n-modal v-model:show="showDataModal" title="新增字典数据" preset="dialog" :mask-closable="false">
<n-modal v-model:show="showDataModal" title="新增字典数据" preset="dialog" :mask-closable="false" :draggable="true">
<n-form ref="formRef" :model="formData" :rules="formRules">
<n-form-item label="字典中文名称" path="label">
<n-input v-model:value="formData.label" placeholder="输入字典中文名称" clearable />
@ -63,12 +63,6 @@
</n-space>
</template>
</n-modal>
<n-modal v-model:show="showDeleteModal" title="删除字典数据" preset="dialog" :mask-closable="false" content="确认删除该项字典数据？"
negative-text="取消" positive-text="确认" @negative-click="showDeleteModal = false"
@positive-click="hanldeDeleteSubmit">
</n-modal>
</template>
<script setup lang="ts">
@ -76,7 +70,7 @@ import { getDict } from '@/api/dictApi';
import LsEmpty from '@/components/Ls-UI/LsEmpty.vue';
import { deepClone } from '@/utils';
import { AddOutline, PencilOutline, SearchOutline, TrashOutline } from '@vicons/ionicons5';
import { DataTableColumns, FormInst, NButton, NIcon, NSpace, NTag, NTime, useMessage } from 'naive-ui';
import { DataTableColumns, FormInst, NButton, NIcon, NSpace, NTag, NTime, useDialog, useMessage } from 'naive-ui';
const parentProps = defineProps<{
uuid: string
@ -107,6 +101,9 @@ watch(parentProps, async (newValue) => {
}
});
const message = useMessage();
const dialog = useDialog();
interface DictRow {
uuid?: string
parentId?: string
@ -160,10 +157,6 @@ const getColumns = ({
return h(
NTag,
{
style: {
marginRight: '6px',
color: '#3D8EFF',
},
type: 'info',
bordered: false
},
@ -253,7 +246,7 @@ const getColumns = ({
const getDatas = async () => {
try {
console.log("父级字典：", parentProps);
const result = await getDict(parentProps.value, null);
const result = await getDict(parentProps.value);
tableData.value = result.map(item => {
const { tag, ...rest } = item;
return {
@ -268,11 +261,13 @@ const getDatas = async () => {
}
};
const handleFindDatas = () => {
currentData.value = tableData.value.filter(item => (item.label.includes(mainSearch.value) || item.labelEn.includes(mainSearch.value)) && item.value === parentProps.value)
};
const handleInputSearch = () => {
handleFindDatas(); // 可以尝试加入防抖
}
const message = useMessage();
const handleFindDatas = () => {
currentData.value = tableData.value.filter(item => (item.label.includes(mainSearch.value) || item.labelEn.includes(mainSearch.value) || item.value.includes(mainSearch.value)))
};
const formRef = ref<FormInst | null>(null);
const currentMode = ref<'Add' | 'Modify'>('Add');
@ -389,19 +384,27 @@ const handleFormSubmit = async (e: MouseEvent) => {
}
// 删除相关逻辑
const showDeleteModal = ref(false);
const deleteData = ref<DictRow | null>(null);
const handleDeleteDatas = (row: DictRow) => {
console.log("删除:", row);
deleteData.value = row;
showDeleteModal.value = true;
const handleDeleteDatas = async (row: DictRow) => {
dialog.warning({
title: '删除字典数据',
content: '确认删除？',
positiveText: '确认',
negativeText: '取消',
draggable: true,
onPositiveClick: async () => {
try {
await handleDeleteSubmit(row);
} catch (error) {
console.log('删除失败', error);
}
}
})
}
const hanldeDeleteSubmit = async () => {
const handleDeleteSubmit = async (deleteData: DictRow) => {
console.log('submit delete ', deleteData);
try {
await deleteChildDict(deleteData.value.uuid);
await deleteChildDict(deleteData.uuid);
message.success('删除成功');
try {
await getDatas();

39
src/views/system/dict/components/DictNav.vue
View File

@ -39,7 +39,7 @@
</n-space>
</nav>
<n-modal v-model:show="showDataModal" title="新增父级字典" preset="dialog" :mask-closable="false">
<n-modal v-model:show="showDataModal" title="新增父级字典" preset="dialog" :mask-closable="false" :draggable="true">
<n-form ref="formRef" :model="formData" :rules="formRules">
<n-form-item label="父级字典名称" path="label">
<n-input v-model:value="formData.label" placeholder="输入父级字典名称" />
@ -55,18 +55,12 @@
</n-space>
</template>
</n-modal>
<n-modal v-model:show="showDeleteModal" title="删除父级字典数据" preset="dialog" :mask-closable="false"
content="确认删除该项字典数据？" negative-text="取消" positive-text="确认" @negative-click="showDeleteModal = false"
@positive-click="handleDeleteSubmit">
</n-modal>
</template>
<script setup lang="ts">
import { getParentDict } from '@/api/dictApi';
import { AddOutline, BookOutline, PencilOutline, SearchOutline, TrashOutline } from '@vicons/ionicons5';
import { FormInst, NButton, NIcon, useMessage } from 'naive-ui';
import { FormInst, NButton, NIcon, useDialog, useMessage } from 'naive-ui';
const parentProps = defineProps<{
parentUuid: string
@ -93,6 +87,8 @@ interface DictRow {
createUserId?: string
}
const message = useMessage();
const dialog = useDialog();
const parentDictDatas = ref<DictRow[]>([]);
// 查找父级字典相关逻辑
@ -126,8 +122,6 @@ const handleUpdateParent = (dict: DictRow) => {
return;
}
const message = useMessage();
// 新增与编辑相关数据与逻辑
interface FormData {
label: string;
@ -206,21 +200,30 @@ const handleFormSubmit = async (e: MouseEvent) => {
}
// 删除相关逻辑
const showDeleteModal = ref(false);
const deleteData = ref<DictRow | null>(null);
const handleDeleteParent = (e: MouseEvent, data: DictRow) => {
e.stopPropagation();
console.log('删除', data);
deleteData.value = data;
showDeleteModal.value = true;
dialog.warning({
title: '删除父级字典数据',
content: '确认删除？',
positiveText: '确认',
negativeText: '取消',
draggable: true,
onPositiveClick: async () => {
try {
await handleDeleteSubmit(data);
} catch (error) {
console.log('删除失败', error);
}
}
})
}
const handleDeleteSubmit = async () => {
const handleDeleteSubmit = async (deleteData: DictRow) => {
console.log('submit delete ', deleteData);
try {
await deleteParentDict(deleteData.value.uuid);
if (deleteData.value.uuid === parentProps.parentUuid) {
await deleteParentDict(deleteData.uuid);
if (deleteData.uuid === parentProps.parentUuid) {
emit('update:parentUuid', '');
emit('update:parentValue', '');
emit('update:parentTitle', '');

20
src/views/system/menu/index.vue
View File

@ -295,11 +295,21 @@ const isEditChild = ref(false)
const currentChildId = ref('')
// 适配方式选项
const adaptabilityOptions = [
{ label: 'PC端', value: 'pc' },
{ label: '移动端', value: 'mobile' },
{ label: '响应式', value: 'responsive' }
]
const adaptabilityOptions = ref([]);
getDict("page_adaptability").then((res) => {
console.log('获取适配方式选项', res);
adaptabilityOptions.value = res.map(item => {
const {label, value, ...rest} = item;
return {
label: label,
value: value,
}
})
}).catch((errors) => {
console.log('获取适配方式选项失败', errors);
message.error('获取适配方式选项失败');
})
// 计算属性
const parentModalTitle = computed(() => (isEditParent.value ? '编辑父级菜单' : '添加父级菜单'))