gaoxing/UNIVPLMDataIntegration
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

😎优化字典组件

Browse Source
This commit is contained in:
zuohuaijun 2025-09-24 14:27:49 +08:00
parent 801a31dfba
commit b39592fdcd
1 changed files with 46 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
Web/src/components/sysDict/sysDict.vue
View File

@ -290,16 +290,26 @@ const formattedDictData = computed(() => {
* @computed * @computed
* @returns {DictItem|DictItem[]|null} - 当前选中的字典项或字典项数组 * @returns {DictItem|DictItem[]|null} - 当前选中的字典项或字典项数组
*/ */
const currentDictItems = computed(() => { const currentDictItems = computed(() => {
if (!state.value) return null; // 更严谨的空值判断，0 不算空
const isEmpty = (val: any) =>
val === null ||
val === undefined ||
(Array.isArray(val) && val.length === 0) ||
(typeof val === 'string' && val.trim() === '');
if (isEmpty(state.value)) return null;
if (Array.isArray(state.value)) { if (Array.isArray(state.value)) {
// 去重 // 去重并类型兼容（数字/字符串混用时也能正确匹配）
const uniqueValues = [...new Set(state.value)]; const uniqueValues = [...new Set(state.value)];
return formattedDictData.value.filter((item) => uniqueValues.includes(item.value)); return formattedDictData.value.filter(item =>
uniqueValues.some(val => val == item.value)
);
} }
return formattedDictData.value.find((item) => item.value == state.value) || null; // 单选时类型兼容
return formattedDictData.value.find(item => item.value == state.value) || null;
}); });
/** /**
@ -467,17 +477,21 @@ const handleMutex = (newValue: any, mutexConfigs: MutexConfig[]): any => {
* @function * @function
* @param {any} newValue - 新值 * @param {any} newValue - 新值
*/ */
const updateValue = (newValue: any) => { const updateValue = (newValue: any) => {
// 如果有互斥配置，先处理互斥 // 先解析为数组（逗号模式下传入可能是字符串）
let processedValue = newValue; let processedValue = Array.isArray(newValue) ? newValue : (typeof newValue === 'string' && props.multipleModel === MultipleModel.Comma)
? newValue.split(',').filter(Boolean)
: newValue;
// 处理互斥逻辑
if (props.mutexConfigs && props.mutexConfigs.length > 0) { if (props.mutexConfigs && props.mutexConfigs.length > 0) {
processedValue = handleMutex(newValue, props.mutexConfigs); processedValue = handleMutex(processedValue, props.mutexConfigs);
} }
let emitValue = processedValue; let emitValue = processedValue;
if (props.multipleModel === MultipleModel.Comma) { if (props.multipleModel === MultipleModel.Comma) {
if (Array.isArray(processedValue)) { if (Array.isArray(processedValue)) {
emitValue = processedValue.length > 0 ? processedValue.sort().join(',') : []; emitValue = processedValue.length > 0 ? processedValue.sort().join(',') : '';
} else if (processedValue === null || processedValue === undefined) { } else if (processedValue === null || processedValue === undefined) {
emitValue = undefined; emitValue = undefined;
} }
@ -488,7 +502,7 @@ const updateValue = (newValue: any) => {
emitValue = undefined; emitValue = undefined;
} }
} }
console.log('更新值:', { newValue, processedValue, emitValue }); console.log('[g-sys-dict] 更新值:', { newValue, processedValue, emitValue });
state.value = processedValue; state.value = processedValue;
emit('update:modelValue', emitValue === '' || emitValue?.length === 0 ? undefined : emitValue); emit('update:modelValue', emitValue === '' || emitValue?.length === 0 ? undefined : emitValue);