Merge branch 'dev-4.2.2'

oceanbase · Nov 22, 2023 · 180df0e · 180df0e
2 parents a7501ce + 44e5809
commit 180df0e
Show file tree

Hide file tree

Showing 23 changed files with 588 additions and 481 deletions.
diff --git a/.secignore b/.secignore
@@ -29,6 +29,7 @@
     https://ur.alipay.com*
     http://editorconfig.org*
     http://www.apache.org*
+    https://dev.mysql.com*
 
 --------------------------------------------------------
 # Should use GLOB wildcard to config and analysis the ignored folder

diff --git a/config/config.js b/config/config.js
@@ -61,17 +61,17 @@ const config = {
   proxy: {
     // 本地开发或者对内 Site 应用的开发环境的代理配置
     '/api/v1/webSocket/obclient': {
-      target: 'http://11.162.218.70:7001/proxy/96',
+      target: 'http://dev.odc-local.net:7001/proxy/96',
       ws: true,
     },
     '/api/': {
-      target: 'http://11.162.218.70:7001/proxy/96',
+      target: 'http://dev.odc-local.net:7001/proxy/96',
     },
     '/oauth2/': {
-      target: 'http://11.162.218.70:7001/proxy/96',
+      target: 'http://dev.odc-local.net:7001/proxy/96',
     },
     '/login/': {
-      target: 'http://11.162.218.70:7001/proxy/96',
+      target: 'http://dev.odc-local.net:7001/proxy/96',
     }
   },
 

diff --git a/src/component/CommonTable/index.tsx b/src/component/CommonTable/index.tsx
@@ -189,7 +189,7 @@ const CommonTable: <RecordType extends object = any>(
       (tableProps?.pagination as TablePaginationConfig)?.pageSize ??
       Math.max(
         Math.floor(
-          (tableRef.current.offsetHeight -
+          (tableRef.current?.offsetHeight -
             TOOLBAR_HEIGHT -
             TABLE_HEAD_HEIGHT -
             INFO_BAR_HEIGHT -
@@ -200,7 +200,7 @@ const CommonTable: <RecordType extends object = any>(
         1,
       );
     setPageSize(computedPageSize);
-    setWrapperHeight(tableRef.current.offsetHeight);
+    setWrapperHeight(tableRef.current?.offsetHeight);
   }
 
   function computeTableScrollHeight() {

diff --git a/src/component/Task/DataArchiveTask/CreateModal/VariableConfig.tsx b/src/component/Task/DataArchiveTask/CreateModal/VariableConfig.tsx
@@ -25,9 +25,13 @@ import styles from './index.less';
 
 export const timeUnitOptions = [
   {
-    label: formatMessage({ id: 'odc.DataArchiveTask.CreateModal.VariableConfig.Points' }), //分
+    label: '秒',
     value: 's',
   },
+  {
+    label: formatMessage({ id: 'odc.DataArchiveTask.CreateModal.VariableConfig.Points' }), //分
+    value: 'm',
+  },
   {
     label: formatMessage({ id: 'odc.DataArchiveTask.CreateModal.VariableConfig.Hours' }), //小时
     value: 'h',
@@ -42,7 +46,7 @@ export const timeUnitOptions = [
   },
   {
     label: formatMessage({ id: 'odc.DataArchiveTask.CreateModal.VariableConfig.Month' }), //月
-    value: 'm',
+    value: 'M',
   },
   {
     label: formatMessage({ id: 'odc.DataArchiveTask.CreateModal.VariableConfig.Year' }), //年
@@ -51,7 +55,7 @@ export const timeUnitOptions = [
 ];
 
 const ENABLE_PATTERN_OPERATOR = false;
-const timeFormatOptions = ['yyyy-MM-dd', 'yyyyMMdd'].map((item) => ({
+const timeFormatOptions = ['yyyy-MM-dd HH:mm:ss', 'yyyy-MM-dd', 'yyyyMMdd'].map((item) => ({
   label: item,
   value: item,
 }));

diff --git a/src/component/Task/DataClearTask/CreateModal/VariableConfig.tsx b/src/component/Task/DataClearTask/CreateModal/VariableConfig.tsx
@@ -22,60 +22,18 @@ import { Button, Form, Input, InputNumber, Select, Space } from 'antd';
 import classNames from 'classnames';
 import { variable } from './index';
 import styles from './index.less';
+import { timeUnitOptions } from '../../DataArchiveTask/CreateModal/VariableConfig';
 const ENABLE_PATTERN_OPERATOR = false;
 
-const timeFormatOptions = ['yyyy-MM-dd', 'yyyyMMdd'].map((item) => ({
+const timeFormatOptions = ['yyyy-MM-dd HH:mm:ss', 'yyyy-MM-dd', 'yyyyMMdd'].map((item) => ({
   label: item,
   value: item,
 }));
 const operatorOptions = ['+', '-'].map((item) => ({
   label: item,
   value: item,
 }));
-const timeUnitOptions = [
-  {
-    label: formatMessage({
-      id: 'odc.DataClearTask.CreateModal.VariableConfig.Points',
-    }),
-    //分
-    value: 's',
-  },
-  {
-    label: formatMessage({
-      id: 'odc.DataClearTask.CreateModal.VariableConfig.Hours',
-    }),
-    //小时
-    value: 'h',
-  },
-  {
-    label: formatMessage({
-      id: 'odc.DataClearTask.CreateModal.VariableConfig.Day',
-    }),
-    //日
-    value: 'd',
-  },
-  {
-    label: formatMessage({
-      id: 'odc.DataClearTask.CreateModal.VariableConfig.Zhou',
-    }),
-    //周
-    value: 'w',
-  },
-  {
-    label: formatMessage({
-      id: 'odc.DataClearTask.CreateModal.VariableConfig.Month',
-    }),
-    //月
-    value: 'm',
-  },
-  {
-    label: formatMessage({
-      id: 'odc.DataClearTask.CreateModal.VariableConfig.Year',
-    }),
-    //年
-    value: 'y',
-  },
-];
+
 interface IProps {}
 const VariableConfig: React.FC<IProps> = (props) => {
   //

diff --git a/src/component/Task/component/VariableConfigTable/index.tsx b/src/component/Task/component/VariableConfigTable/index.tsx
@@ -19,7 +19,7 @@ import { timeUnitOptions } from '@/component/Task/DataArchiveTask/CreateModal/Va
 import { formatMessage } from '@/util/intl';
 import React from 'react';
 
-const oprationReg = /^[-+]\d+[shdwmy]$/;
+const oprationReg = /^[-+]\d+[shdwmMy]$/;
 
 const columns = [
   {

diff --git a/src/d.ts/database.ts b/src/d.ts/database.ts
@@ -26,6 +26,7 @@ export enum DatabaseSyncStatus {
 
 export interface IDatabase {
   id: number;
+  databaseId?: string;
   name: string;
   project: IProject;
   dataSource: IDatasource;

diff --git a/src/page/Auth/Role/component/FormModal/index.tsx b/src/page/Auth/Role/component/FormModal/index.tsx
@@ -24,6 +24,7 @@ import { Button, Drawer, message, Modal, Radio, Space } from 'antd';
 import type { FormInstance } from 'antd/lib/form';
 import { isNull, set } from 'lodash';
 import React, { useContext, useEffect, useRef, useState } from 'react';
+import odc from '@/plugins/odc';
 import { ResourceContext } from '../../../context';
 import { resourceManagementActionMap } from '../../../utils';
 import { SystemAction, systemActionMap } from '../ResourceSelector/const';
@@ -330,13 +331,17 @@ const FormModal: React.FC<IProps> = (props) => {
           systemActionMap,
         );
         if (createAbleResource?.length) {
-          createAbleResource?.forEach((type) => {
-            formData.resourceManagementPermissions?.push({
-              resourceType: type,
-              resourceId: null,
-              actions: ['create'],
+          createAbleResource
+            ?.filter((resourceType) =>
+              odc.appConfig.manage.user.create ? true : resourceType !== IManagerResourceType.user,
+            )
+            ?.forEach((type) => {
+              formData.resourceManagementPermissions?.push({
+                resourceType: type,
+                resourceId: null,
+                actions: ['create'],
+              });
             });
-          });
         }
 
         if (

diff --git a/src/page/Datasource/Datasource/NewDatasourceDrawer/Form/ExtraConfig/index.tsx b/src/page/Datasource/Datasource/NewDatasourceDrawer/Form/ExtraConfig/index.tsx
@@ -24,6 +24,7 @@ import SSLItem from '../SSLItem';
 import styles from './index.less';
 import InitScriptItem from '../InitScriptItem';
 import JDBCParamsItem from '../JDBCParamsItem';
+import { haveOCP } from '@/util/env';
 interface IProps {}
 const ExtraConfig: React.FC<IProps> = function () {
   const context = useContext(DatasourceFormContext);
@@ -84,12 +85,12 @@ const ExtraConfig: React.FC<IProps> = function () {
               <Tabs
                 size="small"
                 type="card"
-                items={[
+                items={!haveOCP() ? [
                   config?.sys && sysItem,
                   config?.ssl && sslItem,
                   initScriptItem,
                   jdbcItem,
-                ].filter(Boolean)}
+                ].filter(Boolean) : [initScriptItem]}
               />
             );
           }}

diff --git a/src/page/Datasource/Datasource/NewDatasourceDrawer/Form/index.tsx b/src/page/Datasource/Datasource/NewDatasourceDrawer/Form/index.tsx
@@ -286,7 +286,7 @@ export default forwardRef<IFormRef, IProps>(function DatasourceForm(
                     })}
                   </Select>
                 </Form.Item>
-                {!haveOCP() && <ExtraConfig />}
+                <ExtraConfig />
               </>
             );
           }}

diff --git a/src/page/Project/Sensitive/SensitiveContext.ts b/src/page/Project/Sensitive/SensitiveContext.ts
@@ -43,6 +43,11 @@ interface ISensitiveContext {
   sensitiveRuleIdMap: {
     [key in any]: string;
   };
+  setSensitiveRuleIdMap: (
+    sensitiveRuleIdMap: {
+      [key in any]: string;
+    },
+  ) => void;
 }
 
 const SensitiveContext = React.createContext<Partial<ISensitiveContext>>({
@@ -58,6 +63,7 @@ const SensitiveContext = React.createContext<Partial<ISensitiveContext>>({
   tables: [],
   sensitiveRules: [],
   sensitiveRuleIdMap: {},
+  setSensitiveRuleIdMap: (sensitiveRuleIdMap = {}) => {},
 });
 
 export default SensitiveContext;