Compare commits

..

2 Commits

Author SHA1 Message Date
ChenYi
68ff5db53f 修复 2025-10-23 14:31:42 +08:00
ChenYi
2874160e45 完善数据字典 2025-10-23 14:31:32 +08:00
5 changed files with 55 additions and 18 deletions

View File

@ -8890,6 +8890,11 @@ export const UpdateDetailInputSchema = {
order: {
type: 'integer',
format: 'int32'
},
extendedAttribute: {
type: 'string',
description: '扩展属性',
nullable: true
}
},
additionalProperties: false

View File

@ -4574,6 +4574,10 @@ export type UpdateDetailInput = {
displayText?: (string) | null;
description?: (string) | null;
order?: number;
/**
*
*/
extendedAttribute?: (string) | null;
};
export type UpdateFeatureDto = {

View File

@ -100,7 +100,6 @@ const editRow: Record<string, any> = ref({});
//
const hasData = ref(true);
const [ThingModelModal, thingModelModalApi] = useVbenModal({
draggable: true,
footer: true,
@ -278,7 +277,7 @@ const openCopyAnotherThingModelModal = async () => {
console.log('打开复制模态框当前props:', {
productId: props.productId,
productName: props.productName,
ioTPlatform: props.ioTPlatform
ioTPlatform: props.ioTPlatform,
});
copyModalApi.open();
};
@ -295,8 +294,8 @@ async function submitCopy() {
props: {
productId: props.productId,
productName: props.productName,
ioTPlatform: props.ioTPlatform
}
ioTPlatform: props.ioTPlatform,
},
});
try {
@ -365,7 +364,6 @@ function closeModal() {
emit('update:visible', false);
emit('close');
}
</script>
<template>

View File

@ -354,7 +354,7 @@ export const editThingModelFormSchema = computed(() => [
return items.map((item: any) => ({
...item,
// 使用secondValue的小写版本作为value保持label为原始value
value: item.secondValue?.toLowerCase() || item.value?.toLowerCase(),
value: item.secondValue || item.value,
label: item.value, // 显示文本
}));
},

View File

@ -5,6 +5,7 @@ import { useVbenModal } from '@vben/common-ui';
import { useVbenForm } from '#/adapter/form';
import {
getCommonGetSelectList,
postDataDictionaryCreateDetail,
postDataDictionaryUpdateDetail,
} from '#/api-client/index';
@ -69,9 +70,38 @@ const [Form, formApi] = useVbenForm({
rules: 'required',
},
{
component: 'Input',
component: 'ApiSelect',
componentProps: {
placeholder: $t('common.pleaseInput'),
api: getCommonGetSelectList,
params: {
query: {
typeName: 'StandardThingModelDataTypeEnum',
},
},
labelField: 'value',
valueField: 'secondValue',
optionsPropName: 'options',
immediate: true,
allowClear: true,
placeholder:
$t('common.pleaseSelect') +
$t('abp.dataDictionary.extendedAttribute'),
afterFetch: (res: any) => {
//
if (Array.isArray(res)) {
return res;
}
// items
if (res && Array.isArray(res.items)) {
return res.items;
}
// data
if (res && Array.isArray(res.data)) {
return res.data;
}
//
return [];
},
},
fieldName: 'extendedAttribute',
label: $t('abp.dataDictionary.extendedAttribute'),