ruiling/tachybase_todo
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(client): size undefined in nanoid (#3708)

Browse Source 
* fix(data-source): foreignkey

* fix: size undefined in nanoid
This commit is contained in:
katherinehhh 2024-03-13 19:00:28 +08:00 committed by GitHub
parent 0779a4eab3
commit e5c1bef8de
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
packages/core/client/src/schema-component/antd/nanoIDInput/NanoIDInput.tsx
View File

@ -11,22 +11,22 @@ export const NanoIDInput = Object.assign(
connect(
AntdInput,
mapProps((props: any, field: any) => {
const { size, customAlphabet } = useCollectionField();
const { size, customAlphabet } = useCollectionField() || {};
const { t } = useTranslation();
const form = useForm();
function isValidNanoid(value) {
if (value.length !== size) {
return t('Field value size is') + ` ${size}`;
if (value?.length !== size) {
return t('Field value size is') + ` ${size || 21}`;
}
for (let i = 0; i < value.length; i++) {
if (customAlphabet.indexOf(value[i]) === -1) {
if (customAlphabet?.indexOf(value[i]) === -1) {
return t(`Field value do not meet the requirements`);
}
}
}
useEffect(() => {
if (!field.initialValue) {
if (!field.initialValue && customAlphabet) {
field.setInitialValue(Alphabet(customAlphabet, size)());
}
form.setFieldState(field.props.name, (state) => {

4
packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/CollectionsManager/components/index.tsx
View File

@ -63,7 +63,7 @@ export const ForeignKey = observer(
: ['belongsToMany'].includes(type)
? through
: target;
const fields = getCollection(effectField || name, dataSourceKey)?.fields;
const fields = getCollection(effectField, dataSourceKey)?.fields;
if (fields) {
const sourceOptions = fields
?.filter((v) => {
@ -95,7 +95,7 @@ export const ForeignKey = observer(
onDropdownVisibleChange={async (open) => {
const { target, type, through } = form.values;
const effectField = ['belongsTo'].includes(type)
? collectionName
? collectionName || name
: ['belongsToMany'].includes(type)
? through
: target;