Skip to content

fix: fix field select #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 2 commits into
base: main
Choose a base branch
from
Draft

fix: fix field select #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4a1a0c8
fix: fix field select
Nov 10, 2023
88a5637
Merge branch 'main' into fix/fix-error
Nov 10, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,9 @@
"@types/react": "^16.9.43",
"@types/react-dom": "^16.9.8",
"@apitable/components": "latest",
"@apitable/core": "latest",
"@apitable/icons": "latest",
"@apitable/widget-sdk": "latest",
"@apitable/core": "*",
"@apitable/icons": "^1.4.0",
"@apitable/widget-sdk": "^1.4.0",
"ahooks": "^2.10.0",
"lodash": "^4.17.20",
"styled-components": ">=5.2.1",
Expand Down
61 changes: 3 additions & 58 deletions src/form_components/field_select.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,67 +1,12 @@
import { WidgetProps } from '@rjsf/core';
import { applyDefaultTheme, ITheme, Select, useTheme } from '@apitable/components';
import { FieldType, t, useField } from '@apitable/widget-sdk';
import {FieldIconMap, t, useField} from '@apitable/widget-sdk';
import React from 'react';
import {
ColumnAttachmentFilled,
ColumnAutonumberFilled,
AccountFilled,
ColumnCheckboxFilled,
ColumnLastmodifiedtimeFilled,
ColumnTextFilled,
ColumnCreatedbyFilled,
ColumnCreatedtimeFilled,
ColumnSingleFilled,
ColumnCurrencyFilled,
ColumnEmailFilled,
ColumnFormulaFilled,
ColumnPercentFilled,
ColumnFigureFilled,
ColumnMultipleFilled,
ColumnCalendarFilled,
ColumnLinktableFilled,
ColumnUrlOutlined,
ColumnLastmodifiedbyFilled,
ColumnLongtextFilled,
ColumnPhoneFilled,
ColumnLookupFilled,
ColumnRatingFilled,
CascadeOutlined,
OneWayLinkOutlined,
TwoWayLinkOutlined
} from '@apitable/icons';

import styled from 'styled-components';
import { Strings } from '../i18n';

const SELECT_OPEN_SEARCH_COUNT = 7;
const FieldIconMap = {
[FieldType.Text]: ColumnLongtextFilled, // FIXME: icon
[FieldType.Number]: ColumnFigureFilled, // FIXME: icon there is a problem with the naming.
[FieldType.SingleSelect]: ColumnSingleFilled,
[FieldType.MultiSelect]: ColumnMultipleFilled,
[FieldType.DateTime]: ColumnCalendarFilled, // FIXME: icon there is a problem with the naming.
[FieldType.Attachment]: ColumnAttachmentFilled,
[FieldType.OneWayLink]: OneWayLinkOutlined,
[FieldType.TwoWayLink]: TwoWayLinkOutlined,
[FieldType.MagicLink]: ColumnLinktableFilled, // ?
[FieldType.URL]: ColumnUrlOutlined,
[FieldType.Email]: ColumnEmailFilled,
[FieldType.Phone]: ColumnPhoneFilled,
[FieldType.Checkbox]: ColumnCheckboxFilled,
[FieldType.Rating]: ColumnRatingFilled,
[FieldType.Member]: AccountFilled,
[FieldType.MagicLookUp]: ColumnLookupFilled,
[FieldType.Formula]: ColumnFormulaFilled,
[FieldType.Currency]: ColumnCurrencyFilled,
[FieldType.Percent]: ColumnPercentFilled,
[FieldType.SingleText]: ColumnTextFilled,
[FieldType.AutoNumber]: ColumnAutonumberFilled,
[FieldType.CreatedTime]: ColumnCreatedtimeFilled,
[FieldType.LastModifiedTime]: ColumnLastmodifiedtimeFilled,
[FieldType.CreatedBy]: ColumnCreatedbyFilled,
[FieldType.LastModifiedBy]: ColumnLastmodifiedbyFilled,
[FieldType.Cascader]: CascadeOutlined
};

const transformOptions = (enumOptions: { label: string, value: any }[], theme: ITheme) => {

Expand All @@ -72,7 +17,7 @@ const transformOptions = (enumOptions: { label: string, value: any }[], theme: I
};
const field = useField(option.value);
if (!field) return res;
const FieldIcon = FieldIconMap[field.type];
const FieldIcon = FieldIconMap[field.type] ?? null;
return {
...res,
prefixIcon: FieldIcon ? <FieldIcon color={theme.palette.text.third} /> : null,
Expand Down
Loading