Skip to content

Commit

Permalink
PullRequest: 530 fix/dev-4.3.2
Browse files Browse the repository at this point in the history
Merge branch 'fix/dev-4.3.2 of git@code.alipay.com:oceanbase/oceanbase-developer-center.git into dev-4.3.2

https://code.alipay.com/oceanbase/oceanbase-developer-center/pull_requests/530


Signed-off-by: 晓康 <xxk268858@oceanbase.com>


* fix: add ClickToComponent Config
* feat: side bar nav to front page
* feat: jump to synergy space by space ID.
* feat: add datasource icon to scan rule datasource options list.
* feat: add datasource empty page
* feat: add scan rule empty
* feat: add sqlconsole empty page
* feat: add script page empty status
* feat: add empty status page to Snippet page
* feat: change icon of nav to team page
* fix: change sql console datasource empty page text
* refactor: 调整代码
* fix: 删除跳转团队空间首页功能
* feat: 调整展示数据归档空页面的条件
* feat: add scanRuleEmpty action button
* feat: normal empty page style change
* fix: 项目空白页添加
* feat: 归档不展示action button
* feat: datasource empty page style
* feat: use the Access component to differentiate between administrators and normal users.
* feat: 运维-数据源选择-icon 展示
* feat: use color token
* feat: use color token
* feat: 使用 px 替代 vh
* fix: sql 控制台空页面文案修正
* feat: 敏感列扫描增加模糊搜索
* feat: 敏感列 popover 添加
* feat: 总耗时改为 DB 耗时
* feat: 敏感列模糊搜索
* refactor: 添加注释
* feat: 增加分区上下界选择
* feat: 修改后缀提示语
* feat: 添加取值策略展示
* feat: 展示取值策略
* fix: Remove unnecessary console.log
* feat: 新窗口打开 github issue
  • Loading branch information
之瑛 committed Sep 18, 2024
1 parent 6c75e27 commit 16f4633
Show file tree
Hide file tree
Showing 8 changed files with 22 additions and 21 deletions.
2 changes: 1 addition & 1 deletion src/common/datasource/mysql/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@
*/

import { ConnectType, TaskType } from '@/d.ts';
import { haveOCP } from '@/util/env';
import { IDataSourceModeConfig } from '../interface';
import MySQLColumnExtra from '../oceanbase/MySQLColumnExtra';
import { haveOCP } from '@/util/env';

const tableConfig = {
enableTableCharsetsAndCollations: true,
Expand Down
4 changes: 2 additions & 2 deletions src/common/datasource/oceanbase/oboracle.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@
*/

import { ConnectType, TaskType } from '@/d.ts';
import { IDataSourceModeConfig } from '../interface';
import OracleColumnExtra from './OracleColumnExtra';
import { TableForeignConstraintOnDeleteType } from '@/d.ts/table';
import { haveOCP } from '@/util/env';
import { IDataSourceModeConfig } from '../interface';
import OracleColumnExtra from './OracleColumnExtra';

const oracleTableConfig = {
constraintEnableConfigurable: true,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -68,8 +68,12 @@ export default class ModalHelp extends PureComponent<{
<Icon style={{ fontSize: 14, marginRight: 8 }} component={GithubSvg} />
{'Github issues'}
</h4>
<a href="https://github.com/oceanbase/odc/issues">
{'https://github.com/oceanbase/odc/issues'}
<a
href="https://github.com/oceanbase/odc/issues"
target="_blank"
rel="noopener noreferrer"
>
https://github.com/oceanbase/odc/issues
</a>
{serverSystemInfo?.supportUrl ? <p>Help: {serverSystemInfo?.supportUrl}</p> : null}
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,11 +34,11 @@ import {
Drawer,
Form,
InputNumber,
message,
Modal,
Radio,
Space,
Tooltip,
message,
} from 'antd';
import { inject, observer } from 'mobx-react';
import moment from 'moment';
Expand Down
9 changes: 4 additions & 5 deletions src/component/Task/component/DatabaseSelecter/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -18,16 +18,15 @@ import { formatMessage } from '@/util/intl';
import { listDatabases } from '@/common/network/database';
import ExportCard from '@/component/ExportCard';
import DataBaseStatusIcon from '@/component/StatusIcon/DatabaseIcon';
import { EnvColorMap } from '@/constant';
import { DBType } from '@/d.ts/database';
import datasourceStatus from '@/store/datasourceStatus';
import { DeleteOutlined } from '@ant-design/icons';
import { Badge, Checkbox, Empty, Popconfirm, Space, Spin, Tooltip, Tree, Typography } from 'antd';
import { DataNode, TreeProps } from 'antd/lib/tree';
import { ReactComponent as DatabaseSvg } from '@/svgr/database.svg';
import { Empty, Popconfirm, Space, Spin, Tree, Typography, Checkbox, Tooltip, Badge } from 'antd';
import classnames from 'classnames';
import React, { useCallback, useEffect, useState } from 'react';
import styles from './index.less';
import { EnvColorMap } from '@/constant';
import { DBType } from '@/d.ts/database';
import datasourceStatus from '@/store/datasourceStatus';

const { Text } = Typography;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
import { getDataSourceStyleByConnectType } from '@/common/datasource';
import { getDataSourceModeConfig, getDataSourceStyleByConnectType } from '@/common/datasource';
import { listDatabases } from '@/common/network/database';
import { createLogicalDatabase } from '@/common/network/logicalDatabase';
import HelpDoc from '@/component/helpDoc';
import RiskLevelLabel from '@/component/RiskLevelLabel';
import DataBaseStatusIcon from '@/component/StatusIcon/DatabaseIcon';
import DatabaseSelecter from '@/component/Task/component/DatabaseSelecter';
import { EnvColorMap, SPACE_REGEX } from '@/constant';
import { TaskType } from '@/d.ts';
import { IDatabase } from '@/d.ts/database';
import login from '@/store/login';
import Icon from '@ant-design/icons';
Expand All @@ -27,8 +28,6 @@ import {
import { useForm, useWatch } from 'antd/lib/form/Form';
import { DefaultOptionType } from 'antd/lib/select';
import React, { useEffect, useState } from 'react';
import { getDataSourceModeConfig } from '@/common/datasource';
import { TaskType } from '@/d.ts';

const ProjectDatabaseSelector: React.FC<{
width?: number | string;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@ import {
Drawer,
Empty,
message,
Modal,
Space,
Tooltip,
Modal,
} from 'antd';
import React, { useEffect, useRef, useState } from 'react';

Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
import { previewLogicalTableTopologies } from '@/common/network/logicalDatabase';
import CommonTable from '@/component/CommonTable';
import DataBaseStatusIcon from '@/component/StatusIcon/DatabaseIcon';
import { formatMessage } from '@/util/intl';
import { Col, Form, Input, Row, Select, Typography, Empty, Popover, Space } from 'antd';
import { FormInstance } from 'antd/es/form/Form';
import React, { useContext, useEffect, useImperativeHandle, useState } from 'react';
import { Col, Empty, Form, Input, Popover, Row, Select, Space, Typography } from 'antd';
import { useState } from 'react';
import { getDefaultCollation } from '../helper';
import styles from './index.less';
import CommonTable from '@/component/CommonTable';
import { previewLogicalTableTopologies } from '@/common/network/logicalDatabase';
const { Text, Link } = Typography;
import DataBaseStatusIcon from '@/component/StatusIcon/DatabaseIcon';

const { Option } = Select;

Expand Down

0 comments on commit 16f4633

Please sign in to comment.