smart-flow/yudao-ui-admin-vben
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'yudao/dev' into dev-new

Browse Source 
# Conflicts:
#	apps/web-antd/src/views/infra/demo/demo01/index.vue
#	apps/web-antd/src/views/infra/demo/general/demo01/index.vue
#	apps/web-antd/src/views/infra/demo/general/demo03/erp/index.vue
#	apps/web-antd/src/views/infra/demo/general/demo03/erp/modules/demo03-course-list.vue
#	apps/web-antd/src/views/infra/demo/general/demo03/erp/modules/demo03-grade-list.vue
#	apps/web-antd/src/views/infra/demo/general/demo03/inner/index.vue
#	apps/web-antd/src/views/infra/demo/general/demo03/normal/index.vue
This commit is contained in:
puhui999
2025-05-20 17:56:53 +08:00
parent b2411ea8f5 7a54f7767a
commit 495aa10695
41 changed files with 866 additions and 1069 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apps/web-antd/src/views/infra/demo/general/demo01/modules/form.vue
View File

@@ -119,7 +119,7 @@ const [Modal, modalApi] = useVbenModal({
<RadioGroup v-model:value="formData.sex">
<Radio
v-for="dict in getDictOptions(DICT_TYPE.SYSTEM_USER_SEX, 'number')"
:key="dict.value"
:key="dict.value.toString()"
:value="dict.value"
>
{{ dict.label }}

10
apps/web-antd/src/views/infra/demo/general/demo02/index.vue
View File

@@ -88,14 +88,16 @@ function onAppend(row: Demo02CategoryApi.Demo02Category) {
async function onDelete(row: Demo02CategoryApi.Demo02Category) {
const hideLoading = message.loading({
content: $t('ui.actionMessage.deleting', [row.id]),
duration: 0,
key: 'action_process_msg',
key: 'action_key_msg',
});
try {
await deleteDemo02Category(row.id as number);
message.success($t('ui.actionMessage.deleteSuccess', [row.id]));
message.success({
content: $t('ui.actionMessage.deleteSuccess', [row.id]),
key: 'action_key_msg',
});
await getList();
} catch {
} finally {
hideLoading();
}
}

2
apps/web-antd/src/views/infra/demo/general/demo03/erp/modules/form.vue
View File

@@ -116,7 +116,7 @@ const [Modal, modalApi] = useVbenModal({
<RadioGroup v-model:value="formData.sex">
<Radio
v-for="dict in getDictOptions(DICT_TYPE.SYSTEM_USER_SEX, 'number')"
:key="dict.value"
:key="dict.value.toString()"
:value="dict.value"
>
{{ dict.label }}

2
apps/web-antd/src/views/infra/demo/general/demo03/inner/modules/form.vue
View File

@@ -136,7 +136,7 @@ const [Modal, modalApi] = useVbenModal({
<RadioGroup v-model:value="formData.sex">
<Radio
v-for="dict in getDictOptions(DICT_TYPE.SYSTEM_USER_SEX, 'number')"
:key="dict.value"
:key="dict.value.toString()"
:value="dict.value"
>
{{ dict.label }}

4
apps/web-antd/src/views/infra/demo/general/demo03/normal/modules/form.vue
View File

@@ -83,7 +83,7 @@ const [Modal, modalApi] = useVbenModal({
const data = formData.value as Demo03StudentApi.Demo03Student;
// 拼接子表的数据
data.demo03courses = demo03CourseFormRef.value?.getData();
data.demo03grade = demo03GradeFormRef.value?.getValues();
data.demo03grade = demo03GradeFormRef.value?.getValues() as any;
try {
await (formData.value?.id
? updateDemo03Student(data)
@@ -135,7 +135,7 @@ const [Modal, modalApi] = useVbenModal({
<RadioGroup v-model:value="formData.sex">
<Radio
v-for="dict in getDictOptions(DICT_TYPE.SYSTEM_USER_SEX, 'number')"
:key="dict.value"
:key="dict.value.toString()"
:value="dict.value"
>
{{ dict.label }}