diff --git a/client/src/components/customDialog/CustomDialog.tsx b/client/src/components/customDialog/CustomDialog.tsx index 61d0c1c1..9079adbd 100644 --- a/client/src/components/customDialog/CustomDialog.tsx +++ b/client/src/components/customDialog/CustomDialog.tsx @@ -100,7 +100,7 @@ const CustomDialog: FC = props => { onClose={handleCancel} > {type === 'notice' ? ( - <> +
= props => { {cancelLabel} handleConfirm()} + type="submit" color="primary" variant="contained" className={confirmClass} @@ -129,7 +129,7 @@ const CustomDialog: FC = props => { {confirmLabel} - + ) : ( CustomComponent )} diff --git a/client/src/components/customDialog/DeleteDialogTemplate.tsx b/client/src/components/customDialog/DeleteDialogTemplate.tsx index 744fe4ef..84628f5d 100644 --- a/client/src/components/customDialog/DeleteDialogTemplate.tsx +++ b/client/src/components/customDialog/DeleteDialogTemplate.tsx @@ -66,55 +66,60 @@ const DeleteTemplate: FC = props => { return (
- - {title} - +
+ + {title} + - - {text} - - {dialogTrans('deleteTipAction')} - {` ${label.toLowerCase()} `} - {dialogTrans('deleteTipPurpose')} - - - + + {text} + + {dialogTrans('deleteTipAction')} + {` ${label.toLowerCase()} `} + {dialogTrans('deleteTipPurpose')} + + + - - - {btnTrans('cancel')} - - - {label} - - + + + {btnTrans('cancel')} + + + {label} + + +
); }; diff --git a/client/src/components/customDialog/DialogTemplate.tsx b/client/src/components/customDialog/DialogTemplate.tsx index d9419e20..7a487108 100644 --- a/client/src/components/customDialog/DialogTemplate.tsx +++ b/client/src/components/customDialog/DialogTemplate.tsx @@ -78,46 +78,55 @@ const DialogTemplate: FC = ({ return (
-
- - {title} - - {children} - {showActions && ( - -
{leftActions}
-
- {showCancel && ( - - {cancel} +
+
+ + {title} + + {children} + {showActions && ( + +
{leftActions}
+
+ {showCancel && ( + + {cancel} + + )} + + {confirm} - )} - - {confirm} - -
-
- )} -
+
+
+ )} +
-
- {showCode && ( - - )} -
+
+ {showCode && ( + + )} +
+
); }; diff --git a/client/src/i18n/cn/common.ts b/client/src/i18n/cn/common.ts index ddedbed7..cb591de3 100644 --- a/client/src/i18n/cn/common.ts +++ b/client/src/i18n/cn/common.ts @@ -6,7 +6,6 @@ const commonTrans = { username: 'Username', password: 'Password', optional: '(optional)', - ssl: 'SSL', }, status: { diff --git a/client/src/i18n/cn/dialog.ts b/client/src/i18n/cn/dialog.ts index 568c9ae6..b4a812bc 100644 --- a/client/src/i18n/cn/dialog.ts +++ b/client/src/i18n/cn/dialog.ts @@ -9,7 +9,7 @@ const dialogTrans = { loadContent: `You are trying to load a {{type}} with data. Only loaded {{type}} can be searched.`, releaseContent: `You are trying to release a {{type}} with data. Please be aware that the data will no longer be available for search.`, - createTitle: `Create {{type}} in "{{name}}"`, + createTitle: `Create {{type}} on "{{name}}"`, }; export default dialogTrans; diff --git a/client/src/i18n/cn/search.ts b/client/src/i18n/cn/search.ts index b05ea786..55826bec 100644 --- a/client/src/i18n/cn/search.ts +++ b/client/src/i18n/cn/search.ts @@ -1,11 +1,11 @@ const searchTrans = { - firstTip: '1. Enter search vector {{dimensionTip}}', - secondTip: '2. Choose collection and field', + firstTip: '2. Enter search vector {{dimensionTip}}', + secondTip: '1. Choose collection and field', thirdTip: '3. Set search parameters', vectorPlaceholder: 'Please input your vector value here, e.g. [1, 2, 3, 4]', - collection: 'Choose Loaded Collection', - noCollection: 'No collection', - field: 'Choose Field', + collection: 'Choose loaded collection', + noCollection: 'No loaded collection', + field: 'Choose vector field', startTip: 'Start your vector search', empty: 'No result', result: 'Search Results', diff --git a/client/src/i18n/cn/success.ts b/client/src/i18n/cn/success.ts index 8d21cd12..a4a48d8d 100644 --- a/client/src/i18n/cn/success.ts +++ b/client/src/i18n/cn/success.ts @@ -2,9 +2,9 @@ const successTrans = { connect: 'Connection to milvus successful', create: `{{name}} has been created.`, load: `{{name}} is loading.`, - delete: `{{name}} successfully dropped,`, - release: `{{name}} has been released,`, - update: `{{name}} has been updated,`, + delete: `{{name}} successfully dropped.`, + release: `{{name}} has been released.`, + update: `{{name}} has been updated.`, }; export default successTrans; diff --git a/client/src/i18n/cn/user.ts b/client/src/i18n/cn/user.ts index ef225487..4a2de0a4 100644 --- a/client/src/i18n/cn/user.ts +++ b/client/src/i18n/cn/user.ts @@ -2,14 +2,14 @@ const userTrans = { createTitle: 'Create User', updateTitle: 'Update User', user: 'User', - deleteWarning: 'You are trying to delete user. This action cannot be undone.', + deleteWarning: 'You are trying to drop user. This action cannot be undone.', oldPassword: 'Current Password', newPassword: 'New Password', confirmPassword: 'Confirm Password', update: 'Update password', isNotSame: 'Not same as new password', deleteTip: - 'Please select at least one item to delete and root can not be deleted.', + 'Please select at least one item to drop and root can not be dropped.', }; export default userTrans; diff --git a/client/src/i18n/en/dialog.ts b/client/src/i18n/en/dialog.ts index 568c9ae6..b4a812bc 100644 --- a/client/src/i18n/en/dialog.ts +++ b/client/src/i18n/en/dialog.ts @@ -9,7 +9,7 @@ const dialogTrans = { loadContent: `You are trying to load a {{type}} with data. Only loaded {{type}} can be searched.`, releaseContent: `You are trying to release a {{type}} with data. Please be aware that the data will no longer be available for search.`, - createTitle: `Create {{type}} in "{{name}}"`, + createTitle: `Create {{type}} on "{{name}}"`, }; export default dialogTrans; diff --git a/client/src/i18n/en/success.ts b/client/src/i18n/en/success.ts index 8d21cd12..a4a48d8d 100644 --- a/client/src/i18n/en/success.ts +++ b/client/src/i18n/en/success.ts @@ -2,9 +2,9 @@ const successTrans = { connect: 'Connection to milvus successful', create: `{{name}} has been created.`, load: `{{name}} is loading.`, - delete: `{{name}} successfully dropped,`, - release: `{{name}} has been released,`, - update: `{{name}} has been updated,`, + delete: `{{name}} successfully dropped.`, + release: `{{name}} has been released.`, + update: `{{name}} has been updated.`, }; export default successTrans; diff --git a/client/src/i18n/en/user.ts b/client/src/i18n/en/user.ts index ef225487..4a2de0a4 100644 --- a/client/src/i18n/en/user.ts +++ b/client/src/i18n/en/user.ts @@ -2,14 +2,14 @@ const userTrans = { createTitle: 'Create User', updateTitle: 'Update User', user: 'User', - deleteWarning: 'You are trying to delete user. This action cannot be undone.', + deleteWarning: 'You are trying to drop user. This action cannot be undone.', oldPassword: 'Current Password', newPassword: 'New Password', confirmPassword: 'Confirm Password', update: 'Update password', isNotSame: 'Not same as new password', deleteTip: - 'Please select at least one item to delete and root can not be deleted.', + 'Please select at least one item to drop and root can not be dropped.', }; export default userTrans; diff --git a/client/src/pages/collections/Create.tsx b/client/src/pages/collections/Create.tsx index ef0fbe9f..0a5d7707 100644 --- a/client/src/pages/collections/Create.tsx +++ b/client/src/pages/collections/Create.tsx @@ -212,7 +212,7 @@ const CreateCollection: FC = ({ handleCreate }) => { confirmDisabled={disabled || !allFieldsValid} dialogClass={classes.dialog} > -
+ <>
{collectionTrans('general')} {generalInfoConfigs.map(config => ( @@ -251,7 +251,7 @@ const CreateCollection: FC = ({ handleCreate }) => { variant="filled" />
-
+ ); }; diff --git a/client/src/pages/partitions/Create.tsx b/client/src/pages/partitions/Create.tsx index 64d63b6c..ab17c023 100644 --- a/client/src/pages/partitions/Create.tsx +++ b/client/src/pages/partitions/Create.tsx @@ -68,14 +68,12 @@ const CreatePartition: FC = ({ handleConfirm={handleCreatePartition} confirmDisabled={disabled} > -
- - + ); }; diff --git a/client/src/pages/user/Create.tsx b/client/src/pages/user/Create.tsx index b839f7c8..d17944a2 100644 --- a/client/src/pages/user/Create.tsx +++ b/client/src/pages/user/Create.tsx @@ -88,7 +88,7 @@ const CreateUser: FC = ({ handleCreate, handleClose }) => { handleConfirm={handleCreateUser} confirmDisabled={disabled} > -
+ <> {createConfigs.map(v => ( = ({ handleCreate, handleClose }) => { key={v.label} /> ))} - + ); }; diff --git a/client/src/pages/user/Update.tsx b/client/src/pages/user/Update.tsx index 91ecc9b2..ca27afe9 100644 --- a/client/src/pages/user/Update.tsx +++ b/client/src/pages/user/Update.tsx @@ -122,7 +122,7 @@ const UpdateUser: FC = ({ handleConfirm={handleUpdateUser} confirmDisabled={disabled} > -
+ <> {createConfigs.map(v => ( = ({ key={v.label} /> ))} - + ); }; diff --git a/client/src/pages/user/User.tsx b/client/src/pages/user/User.tsx index c562df79..be018938 100644 --- a/client/src/pages/user/User.tsx +++ b/client/src/pages/user/User.tsx @@ -105,7 +105,7 @@ const Users = () => { params: { component: (