Merge pull request #9 from actiontech/fix_date_picker_style

Fix date picker style
actiontech · Oct 20, 2023 · c9be7d0 · c9be7d0
2 parents d2b1c71 + e58116a
commit c9be7d0
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 5 deletions.
diff --git a/packages/shared/lib/components/BasicRangePicker/index.tsx b/packages/shared/lib/components/BasicRangePicker/index.tsx
@@ -11,7 +11,7 @@ export type BasicRangePickerProps = RangePickerProps & {
 };
 
 const BasicRangePicker = (props: BasicRangePickerProps) => {
-  const { className, suffixIcon, prefix, ...otherParams } = props;
+  const { className, suffixIcon, prefix, size, ...otherParams } = props;
 
   return (
     <ConfigProvider
@@ -29,7 +29,7 @@ const BasicRangePicker = (props: BasicRangePickerProps) => {
         className={classnames('basic-range-picker-wrapper', className, {
           'custom-picker-prefix': !suffixIcon && !!prefix
         })}
-        size="large"
+        size="middle"
         {...otherParams}
         /**
          * when both suffixIcon and prefix exist, the former will force the latter to be overwritten

diff --git a/packages/shared/lib/theme/dark/components/tag.ts b/packages/shared/lib/theme/dark/components/tag.ts
@@ -2,6 +2,10 @@ import { BasicTagTheme } from '../../theme.type';
 
 const tagTheme: BasicTagTheme = {
   default: {
+    color: '#575C66',
+    backgroundColor: '#fffff'
+  },
+  gray: {
     color: '#7d8ca8',
     backgroundColor: 'rgba(125, 140, 168, 0.1)'
   },

diff --git a/packages/shared/lib/theme/light/components/tag.ts b/packages/shared/lib/theme/light/components/tag.ts
@@ -2,6 +2,10 @@ import { BasicTagTheme } from '../../theme.type';
 
 const tagTheme: BasicTagTheme = {
   default: {
+    color: '#575C66',
+    backgroundColor: '#fffff'
+  },
+  gray: {
     color: '#7d8ca8',
     backgroundColor: 'rgba(125, 140, 168, 0.1)'
   },

diff --git a/packages/shared/lib/theme/theme.type.ts b/packages/shared/lib/theme/theme.type.ts
@@ -406,7 +406,8 @@ export type BasicTagColor =
   | 'geekblue'
   | 'purple'
   | 'Grape'
-  | 'lilac';
+  | 'lilac'
+  | 'gray';
 
 export type BasicTagTheme = Record<
   BasicTagColor,

diff --git a/packages/sqle/src/page/Order/Create/SQLInfoForm/DatabaseInfo.tsx b/packages/sqle/src/page/Order/Create/SQLInfoForm/DatabaseInfo.tsx
@@ -285,7 +285,7 @@ const DatabaseInfo: React.FC<DatabaseInfoProps> = ({
                         allowClear={false}
                         prefix={<IconDatabase />}
                         valuePrefix={<IconDatabaseActive />}
-                        size="large"
+                        size="middle"
                         loading={instanceTipsLoading}
                         options={instanceOptions}
                         onChange={(value) =>
@@ -306,7 +306,7 @@ const DatabaseInfo: React.FC<DatabaseInfoProps> = ({
                         }
                         prefix={<IconDatabaseSchema />}
                         valuePrefix={<IconDatabaseSchemaActive />}
-                        size="large"
+                        size="middle"
                         options={instanceSchemaOptions(field.name)}
                         placeholder={t('order.order.schemaPlaceholder')}
                         loading={!!getSchemaListLoading.get(field.key)}