PullRequest: 233 bug fix

Merge branch 'fix/dev-4.2.2-bugs-xyh-1120 of [email protected]:oceanbase/oceanbase-developer-center.git into dev-4.2.2 https://code.alipay.com/oceanbase/oceanbase-developer-center/pull_requests/233 Signed-off-by: 晓康 <[email protected]> * feat: dataArchiveTask and dataClearTask (add date type) * fix(101305742)
oceanbase · Nov 20, 2023 · b873562 · b873562
1 parent 59f599b
commit b873562
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 8 deletions.
diff --git a/src/component/Task/DataArchiveTask/CreateModal/VariableConfig.tsx b/src/component/Task/DataArchiveTask/CreateModal/VariableConfig.tsx
@@ -55,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
@@ -25,7 +25,7 @@ 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,
 }));

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 (