From 258f0142619bb02db69c0f7006ca5bcc75d7a2e4 Mon Sep 17 00:00:00 2001
From: 1 <1@123>
Date: 星期三, 04 三月 2026 15:35:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/devlop-phyz' into devlop-phyz
---
rsf-admin/src/page/components/DictionarySelect.jsx | 60 +++++++++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 51 insertions(+), 9 deletions(-)
diff --git a/rsf-admin/src/page/components/DictionarySelect.jsx b/rsf-admin/src/page/components/DictionarySelect.jsx
index aa489d2..e6934f9 100644
--- a/rsf-admin/src/page/components/DictionarySelect.jsx
+++ b/rsf-admin/src/page/components/DictionarySelect.jsx
@@ -1,26 +1,31 @@
import EditIcon from '@mui/icons-material/Edit';
-import { useState, useEffect } from 'react';
+import { useState, useEffect, useMemo } from 'react';
import {
Button, useListContext, SelectInput,
required, SelectArrayInput,
useTranslate, useNotify
} from 'react-admin';
+import { useFormContext } from 'react-hook-form';
import request from '@/utils/request';
const DictionarySelect = (props) => {
- const {
- dictTypeCode,
- name,
+ const {
+ dictTypeCode,
+ name,
group,
- multiple = false,
+ multiple = false,
perPage = 100, // 榛樿姣忛〉鏄剧ず100鏉℃暟鎹�
page = 1, // 榛樿绗竴椤�
- ...parmas
+ ...parmas
} = props;
const translate = useTranslate();
const notify = useNotify();
+ const { watch } = useFormContext();
const [list, setList] = useState([]);
const [loading, setLoading] = useState(false);
+
+ // 鑾峰彇褰撳墠琛ㄥ崟鍊�
+ const currentValue = watch(name);
useEffect(() => {
http();
@@ -29,13 +34,13 @@
const http = async () => {
setLoading(true);
try {
- const res = await request.post('/dictData/page', {
+ const res = await request.post('/dictData/page', {
dictTypeCode,
group,
current: page,
pageSize: perPage
});
-
+
if (res?.data?.code === 200) {
setList(res.data.data.records.map((item) => {
return {
@@ -54,12 +59,49 @@
}
};
+ // 纭繚褰撳墠鍊煎湪閫夐」涓紝濡傛灉涓嶅湪涓旀鍦ㄥ姞杞斤紝娣诲姞鍗犱綅閫夐」
+ const choices = useMemo(() => {
+ if (!list || list.length === 0) {
+ // 濡傛灉鍒楄〃涓虹┖浣嗗綋鍓嶆湁鍊硷紝娣诲姞鍗犱綅閫夐」浠ラ伩鍏嶈鍛�
+ if (currentValue !== undefined && currentValue !== null && currentValue !== '') {
+ if (multiple && Array.isArray(currentValue)) {
+ return currentValue.map(v => ({ id: v, name: String(v) }));
+ }
+ return [{ id: currentValue, name: String(currentValue) }];
+ }
+ return [];
+ }
+
+ if (currentValue !== undefined && currentValue !== null && currentValue !== '') {
+ if (multiple && Array.isArray(currentValue)) {
+ let newChoices = [...list];
+ currentValue.forEach(val => {
+ const exists = newChoices.some(item => String(item.id) === String(val));
+ if (!exists) {
+ newChoices.push({ id: val, name: String(val) });
+ }
+ });
+ return newChoices;
+ } else {
+ // 妫�鏌ュ綋鍓嶅�兼槸鍚﹀湪閫夐」涓�
+ const valueExists = list.some(item => String(item.id) === String(currentValue));
+
+ // 濡傛灉褰撳墠鍊间笉鍦ㄩ�夐」涓紝娣诲姞瀹冿紙鍙兘鏄姞杞藉欢杩熷鑷寸殑锛�
+ if (!valueExists) {
+ return [...list, { id: currentValue, name: String(currentValue) }];
+ }
+ }
+ }
+
+ return list;
+ }, [list, currentValue, multiple]);
+
const InputComponent = multiple ? SelectArrayInput : SelectInput;
return (
<InputComponent
source={name}
- choices={list}
+ choices={choices}
isLoading={loading}
{...parmas}
/>
--
Gitblit v1.9.1