mirrors/nocobase
1
0
Fork 0
mirror of https://github.com/nocobase/nocobase synced 2024-11-15 12:26:22 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

refactor: only numerical formula fields support format (#3962)

Browse Source
This commit is contained in:
katherinehhh 2024-04-08 14:30:50 +08:00 committed by GitHub
parent 9f72b4e1ef
commit c735664ea9
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
packages/plugins/@nocobase/plugin-formula-field/src/client/FormulaComponentFieldSettings.tsx
View File

@ -1,6 +1,6 @@
import { useFieldSchema } from '@formily/react'; import { useFieldSchema } from '@formily/react';
import { SchemaSettings, SchemaSettingsNumberFormat, useColumnSchema, useIsFieldReadPretty } from '@nocobase/client'; import { SchemaSettings, SchemaSettingsNumberFormat, useColumnSchema, useIsFieldReadPretty } from '@nocobase/client';
import { useTargetCollectionField } from './components/Formula/Result';
export const FormulaComponentFieldSettings = new SchemaSettings({ export const FormulaComponentFieldSettings = new SchemaSettings({
name: 'fieldSettings:component:Formula.Result', name: 'fieldSettings:component:Formula.Result',
items: [ items: [
@ -16,8 +16,13 @@ export const FormulaComponentFieldSettings = new SchemaSettings({
}; };
}, },
useVisible() { useVisible() {
const schema = useFieldSchema();
const { fieldSchema: tableColumnSchema } = useColumnSchema();
const fieldSchema = tableColumnSchema || schema;
const { dataType } = useTargetCollectionField(fieldSchema) || {};
const isNumberFormat = ['integer', 'bigInt', 'double', 'decimal'].includes(dataType);
const isFieldReadPretty = useIsFieldReadPretty(); const isFieldReadPretty = useIsFieldReadPretty();
return isFieldReadPretty; return isFieldReadPretty && isNumberFormat;
}, },
}, },
], ],

5
packages/plugins/@nocobase/plugin-formula-field/src/client/components/Formula/Result.tsx
View File

@ -28,8 +28,9 @@ const TypedComponents = {
string: InputString.ReadPretty, string: InputString.ReadPretty,
}; };
function useTargetCollectionField() { export function useTargetCollectionField(schema?) {
const fieldSchema = useFieldSchema(); const targetSchema = useFieldSchema();
const fieldSchema = schema || targetSchema;
const providedCollection = useCollection_deprecated(); const providedCollection = useCollection_deprecated();
const { getCollection, getCollectionField } = useCollectionManager_deprecated(); const { getCollection, getCollectionField } = useCollectionManager_deprecated();
const paths = (fieldSchema.name as string).split('.'); const paths = (fieldSchema.name as string).split('.');