{
+ setOpen(false);
+ }}
+ >
+ )}
+
+ );
+ }, [open]);
+
+ const renderInputSearch = useMemo(() => {
+ return (
+
+ setSearchValue(e.target.value)}
+ />
+
+ );
+ }, [searchValue]);
+
+ const renderContentBottom = useMemo(() => {
+ return (
+ <>
+
+
+ {
+ setCheckedList(e.target.checked ? filterOptions?.map((item) => item?.value) : []);
+ }}
+ >
+ 全选
+
+
+
+
+ );
+ }, [checkedList, filterOptions]);
+
+ const renderContent = () => {
+ const renderContentWhenHasData = () => {
+ return (
+
+ {filterOptions?.map((item) => (
+
+ );
+ };
+ let content;
+ if (!filterOptions) {
+ content =
+ {
+ if (e.target.checked) {
+ setCheckedList([...checkedList, e.target.value]);
+ } else {
+ setCheckedList(checkedList?.filter((item) => item !== e.target.value));
+ }
+ }}
+ >
+
+
+ ))}
+
+
+
+ {renderInputSearch}
+
+ );
+ };
+
+ return (
+ <>
+ {renderMask}
+ {content}
+ {renderContentBottom}
+
diff --git a/src/component/Button/SyncMetadata/index.tsx b/src/component/Button/SyncMetadata/index.tsx
index c1b8b6acc..97a878702 100644
--- a/src/component/Button/SyncMetadata/index.tsx
+++ b/src/component/Button/SyncMetadata/index.tsx
@@ -1,14 +1,29 @@
-import { formatMessage } from '@/util/intl';
-import { LoadingOutlined } from '@ant-design/icons';
+/*
+ * Copyright 2023 OceanBase
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
import { syncObject } from '@/common/network/database';
-import { ReactComponent as SyncMetadataSvg } from '@/svgr/sync_metadata.svg';
-import { useRequest } from 'ahooks';
-import { DBObjectSyncStatus } from '@/d.ts/database';
import { IManagerResourceType } from '@/d.ts';
-import { Tooltip } from 'antd';
+import { DBObjectSyncStatus, IDatabase } from '@/d.ts/database';
+import { ReactComponent as SyncMetadataSvg } from '@/svgr/sync_metadata.svg';
+import { formatMessage } from '@/util/intl';
import { getLocalFormatDateTime } from '@/util/utils';
-import { useState } from 'react';
-import { IDatabase } from '@/d.ts/database';
+import { LoadingOutlined } from '@ant-design/icons';
+import { useInterval, useRequest } from 'ahooks';
+import { Tooltip } from 'antd';
+import { useEffect, useRef, useState } from 'react';
export default function Reload({
size = '13px',
@@ -49,9 +64,9 @@ export default function Reload({
formatMessage(
{
id: 'src.component.Button.SyncMetadata.FD352980',
- defaultMessage: '元数据同步（上一次同步时间：${time}）',
+ defaultMessage: '元数据同步（上一次同步时间：{time}）',
},
- { time: time },
+ { time },
),
icon: ();
- const { run, cancel } = useRequest(
- async () => {
- if (
- databaseList?.every((item) =>
- [DBObjectSyncStatus.SYNCED, DBObjectSyncStatus.FAILED].includes(item.objectSyncStatus),
- )
- ) {
- // 全部都是SYNCED或者FAILED, 就展示上次同步时间(取最小时间)
- setLastSyncTime(getlastSyncTime(databaseList)?.objectLastSyncTime);
- setState(statusMap.SYNCED);
- cancel();
- isManual && reloadDatabase();
- } else if (
- databaseList?.find((item) =>
- [DBObjectSyncStatus.SYNCING, DBObjectSyncStatus.PENDING].includes(item.objectSyncStatus),
- )
- ) {
- // 有状态为初始化同步中的, 就是 元数据同步中,请稍等
- setState(statusMap.SYNCING);
- setIsManual(true);
+ function updateState() {
+ if (
+ databaseList?.every((item) =>
+ [DBObjectSyncStatus.SYNCED, DBObjectSyncStatus.FAILED].includes(item.objectSyncStatus),
+ )
+ ) {
+ // 全部都是SYNCED或者FAILED, 就展示上次同步时间(取最小时间)
+ setLastSyncTime(getlastSyncTime(databaseList)?.objectLastSyncTime);
+ setState(statusMap.SYNCED);
+ } else if (
+ databaseList?.find((item) =>
+ [DBObjectSyncStatus.SYNCING, DBObjectSyncStatus.PENDING].includes(item.objectSyncStatus),
+ )
+ ) {
+ // 有状态为初始化同步中的, 就是 元数据同步中,请稍等
+ setState(statusMap.SYNCING);
+ fetchDBTimer.current = window.setTimeout(() => {
reloadDatabase();
- } else if (
- databaseList?.find((item) =>
- [DBObjectSyncStatus.INITIALIZED, null].includes(item.objectSyncStatus),
- )
- ) {
- // 只要有一个是INITIALIZED, null, 就还没整体初始化过, 展示初始态
- setState(statusMap.NOTSYNCED);
- cancel();
+ }, 3000);
+ } else if (
+ databaseList?.find((item) =>
+ [DBObjectSyncStatus.INITIALIZED, null].includes(item.objectSyncStatus),
+ )
+ ) {
+ // 只要有一个是INITIALIZED, null, 就还没整体初始化过, 展示初始态
+ setState(statusMap.NOTSYNCED);
+ }
+ }
+ useEffect(() => {
+ if (databaseList) {
+ updateState();
+ }
+ return () => {
+ if (fetchDBTimer.current) {
+ clearTimeout(fetchDBTimer.current);
+ fetchDBTimer.current = null;
}
- },
- {
- pollingInterval: 3000,
- pollingWhenHidden: false,
- },
- );
+ };
+ }, [databaseList]);
async function _onClick() {
- setIsManual(true);
- setState(statusMap.SYNCING);
if (resourceType && resourceId) {
+ setState(statusMap.SYNCING);
await syncObject(resourceType, resourceId);
await reloadDatabase();
- await run();
}
}
diff --git a/src/component/ChangePasswordModal/index.tsx b/src/component/ChangePasswordModal/index.tsx
index c9d68b144..36ad5b91a 100644
--- a/src/component/ChangePasswordModal/index.tsx
+++ b/src/component/ChangePasswordModal/index.tsx
@@ -18,7 +18,7 @@ import { formatMessage } from '@/util/intl';
import { inject, observer } from 'mobx-react';
import React, { Component } from 'react';
// compatible
-import { PASSWORD_REGEX, SPACE_REGEX } from '@/constant';
+import { PASSWORD_REGEX, SPACE_REGEX, PASSWORD_VALIDATE_MESSAGE } from '@/constant';
import { UserStore } from '@/store/login';
import { Form, Input, Modal } from 'antd';
import { FormInstance } from 'antd/lib/form';
@@ -92,7 +92,9 @@ class ChangePasswordModal extends Component {
centered
width={560}
destroyOnClose
- title={title || formatMessage({ id: 'login.button.changePassword' })}
+ title={
+ title || formatMessage({ id: 'login.button.changePassword', defaultMessage: '修改密码' })
+ }
open={visible}
onOk={this.handleSubmit}
onCancel={onCancel}
@@ -102,19 +104,23 @@ class ChangePasswordModal extends Component {
{!isExternal && (
@@ -124,7 +130,7 @@ class ChangePasswordModal extends Component {
{() => {
return (
{
required: true,
message: formatMessage({
id: 'login.password.validation.required',
+ defaultMessage: '请输入密码',
}),
},
{
pattern: PASSWORD_REGEX,
- message: formatMessage({ id: 'login.password.valid' }),
+ message: PASSWORD_VALIDATE_MESSAGE,
},
{
pattern: SPACE_REGEX,
message: formatMessage({
id: 'odc.component.ChangePasswordModal.ThePasswordCannotContainSpaces',
+ defaultMessage: '密码不能包含空格',
}), //密码不能包含空格
},
]}
@@ -151,6 +159,7 @@ class ChangePasswordModal extends Component {
{
this.clearValidateMessage('newPassword');
@@ -161,7 +170,7 @@ class ChangePasswordModal extends Component {
}}
{
required: true,
message: formatMessage({
id: 'login.password.validation.required',
+ defaultMessage: '请输入密码',
}),
},
@@ -176,6 +186,7 @@ class ChangePasswordModal extends Component {
pattern: PASSWORD_REGEX,
message: formatMessage({
id: 'login.password.validation.strength',
+ defaultMessage: '密码强度不符合要求',
}),
},
@@ -183,12 +194,16 @@ class ChangePasswordModal extends Component {
validator: this.handleValidateConfirmPassword,
message: formatMessage({
id: 'password.label.confirm.validation',
+ defaultMessage: '确认密码不一致',
}),
},
]}
>
{
this.clearValidateMessage('confirmPassword');
}}
diff --git a/src/component/CommonCopyIcon/index.tsx b/src/component/CommonCopyIcon/index.tsx
new file mode 100644
index 000000000..5cb286f16
--- /dev/null
+++ b/src/component/CommonCopyIcon/index.tsx
@@ -0,0 +1,57 @@
+/*
+ * Copyright 2023 OceanBase
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import CopyToClipboard from 'react-copy-to-clipboard';
+import { CopyOutlined } from '@ant-design/icons';
+import { Tooltip } from 'antd';
+import React, { useEffect, useState } from 'react';
+
+import { CheckOutlined } from '@ant-design/icons';
+
+interface IProps {
+ tooltipText?: string;
+ text: string;
+ onCopy: (_, result: boolean) => void;
+}
+
+const CommonCopyIcon = ({ tooltipText = null, text, onCopy }: IProps) => {
+ const [copied, setCopied] = useState(false);
+
+ useEffect(() => {
+ if (copied) {
+ setTimeout(() => {
+ setCopied(false);
+ }, 3000);
+ }
+ }, [copied]);
+
+ return (
+
+
+ {copied ? (
+ setCopied(true)}
+ style={{ color: 'var(--icon-blue-color)' }}
+ />
+ )}
+
+
+ );
+};
+
+export default CommonCopyIcon;
diff --git a/src/component/CommonFilter/index.tsx b/src/component/CommonFilter/index.tsx
index ebae1cc37..009ef7659 100644
--- a/src/component/CommonFilter/index.tsx
+++ b/src/component/CommonFilter/index.tsx
@@ -25,7 +25,7 @@ import React, { useEffect, useMemo, useState } from 'react';
import styles from './index.less';
export const EmptyLabel: React.FC<{ label?: string }> = ({
- label = formatMessage({ id: 'odc.component.CommonFilter.Null' }), // (空)
+ label = formatMessage({ id: 'odc.component.CommonFilter.Null', defaultMessage: '(空)' }), // (空)
}) => {
return {label};
};
@@ -104,6 +104,7 @@ const CommonFilter: React.FC = (props) => {
{
formatMessage({
id: 'odc.component.CommonFilter.SelectAll',
+ defaultMessage: '全选',
}) /* 全选 */
}
@@ -111,6 +112,7 @@ const CommonFilter: React.FC = (props) => {
{
formatMessage({
id: 'odc.component.CommonFilter.CancelAll',
+ defaultMessage: '取消全选',
}) /* 取消全选 */
}
@@ -120,6 +122,7 @@ const CommonFilter: React.FC = (props) => {
{
formatMessage({
id: 'odc.component.CommonFilter.Cancel',
+ defaultMessage: '取消',
}) /* 取消 */
}
@@ -127,6 +130,7 @@ const CommonFilter: React.FC = (props) => {
{
formatMessage({
id: 'odc.component.CommonFilter.Determine',
+ defaultMessage: '确定',
}) /* 确定 */
}
diff --git a/src/component/CommonIDE/index.tsx b/src/component/CommonIDE/index.tsx
index 7b0668cbb..dd1eadaf9 100644
--- a/src/component/CommonIDE/index.tsx
+++ b/src/component/CommonIDE/index.tsx
@@ -87,6 +87,8 @@ interface ICommonIDEProps {
* 创建后监听事件
*/
onEditorAfterCreatedCallback?: (editor: IEditor) => void;
+
+ placeholder?: string;
}
interface ICommonIDEState {
resultHeight: number;
@@ -149,6 +151,7 @@ class CommonIDE extends React.PureComponent {
resultSets,
toolbarActions,
session,
+ placeholder,
} = this.props;
const { resultHeight } = this.state;
@@ -182,6 +185,7 @@ class CommonIDE extends React.PureComponent {
defaultValue={initialSQL}
onValueChange={this.onSQLChange}
onEditorCreated={this.onEditorCreated}
+ placeholder={placeholder}
{...editorProps}
/>
@@ -194,6 +198,7 @@ class CommonIDE extends React.PureComponent| ; - } - - return ( - | - |
|---|