PullRequest: 445 fix/dev-4.3.0-2544,2414,2544

Merge branch 'fix/dev-4.3.0-2544 of [email protected]:oceanbase/oceanbase-developer-center.git into dev-4.3.0

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


Signed-off-by: 晓康 <[email protected]>


* Fixes oceanbase/odc#2414
* Fixes oceanbase/odc#2543
* Fixes oceanbase/odc#2544

Author: yezaoshu

src/component/Task/component/ApprovalModal/index.tsx

@@ -143,6 +143,8 @@ const ApprovalModal: React.FC<IProps> = inject('taskStore')(
               ]}
             >
               <TextArea
+                maxLength={200}
+                showCount
                 rows={5}
                 placeholder={formatMessage({
                   id: 'odc.TaskManagePage.component.ApprovalModal.PleaseEnterHandlingCommentsWithin',

src/page/Datasource/Info/NewDataBaseButton/index.tsx

@@ -44,7 +44,7 @@ export default function NewDataBaseButton({
   mode,
 }: IProps) {
   const [open, setOpen] = useState<boolean>(false);
-  const [projectInfo, setProjectInfo] = useState<IProject>();
+  const [projectInfo, setProjectInfo] = useState<IProject>(null);
   const [ownerSelectStatus, setOwnerSelectStatus] = useState<boolean>(false);
   const [form] = Form.useForm<
     Pick<IDatabase, 'name' | 'collationName' | 'charsetName'> & {
@@ -63,6 +63,7 @@ export default function NewDataBaseButton({
   function close() {
     setOpen(false);
     form.resetFields();
+    setProjectInfo(null);
   }
   useEffect(() => {
     if (open) {
@@ -123,6 +124,7 @@ export default function NewDataBaseButton({
       onSuccess();
       setOwnerSelectStatus(false);
       form.resetFields();
+      setProjectInfo(null);
     }
   }
   return (
@@ -153,7 +155,7 @@ export default function NewDataBaseButton({
                 const res = await getProject(changedValues.projectId);
                 res && setProjectInfo(res);
               } else {
-                setProjectInfo(undefined);
+                setProjectInfo(null);
               }
               form.setFieldValue('ownerIds', []);
             }

src/page/Project/Database/components/DatabaseOwnerSelect.tsx/index.tsx

@@ -67,13 +67,23 @@ export const DatabaseOwnerSelect = ({
             <span>
               <span style={{ paddingRight: 4 }}>库管理员</span>
               <Tooltip
-                title="在原有项目角色的基础上，拥有该库的审批权限"
+                title="库管理员是数据库和表的负责人，可以在审批流程中引用"
                 overlayInnerStyle={{ width: 268 }}
               >
                 <QuestionCircleOutlined />
               </Tooltip>
             </span>
           }
+          rules={
+            hasDefaultSet && !notSetAdmin
+              ? [
+                  {
+                    required: true,
+                    message: '请输入',
+                  },
+                ]
+              : null
+          }
         >
           <Select
             allowClear

src/page/Workspace/SideBar/ResourceTree/DatabaseSearchModal/components/ObjectList.tsx

@@ -33,9 +33,9 @@ const ObjectList = ({
 }: Iprops) => {
   const [activeDatabase, setActiveDatabase] = useState<IDatabase>();
   const ALL_TAB_MAX_LENGTH = 3;
+  const dbType = database?.dataSource?.dialectType || SEARCH_OBJECT_FROM_ALL_DATABASE;
   const getTyepBlock = () => {
-    const typeList =
-      objectTypeConfig[database?.dataSource?.dialectType || SEARCH_OBJECT_FROM_ALL_DATABASE];
+    const typeList = objectTypeConfig[dbType];
     const typeObjectTree = typeList?.map((i) => {
       if (i === DbObjectType.column) {
         return { key: i, data: objectlist?.dbColumns };
@@ -303,15 +303,13 @@ const ObjectList = ({
       children: renderAllTab(),
     },
   ].concat(
-    objectTypeConfig[database?.dataSource?.dialectType || SEARCH_OBJECT_FROM_ALL_DATABASE]?.map(
-      (i) => {
-        return {
-          key: i,
-          label: <span style={{ padding: '0 6px', margin: 0 }}>{DbObjectTypeMap?.[i]?.label}</span>,
-          children: renderObjectTypeTabs(i),
-        };
-      },
-    ),
+    objectTypeConfig[dbType]?.map((i) => {
+      return {
+        key: i,
+        label: <span style={{ padding: '0 6px', margin: 0 }}>{DbObjectTypeMap?.[i]?.label}</span>,
+        children: renderObjectTypeTabs(i),
+      };
+    }),
   );
 
   const handleChange = (key) => {

src/page/Workspace/SideBar/ResourceTree/DatabaseSearchModal/index.less

@@ -110,7 +110,7 @@
   .modalTabs {
     :global {
       .ant-tabs-tab {
-        margin: 0 12px;
+        margin: 0 6px;
       }
     }
     .objectlistBox {