[improvement][semantic-fe] Optimized the frontend display and code logic of visual modeling, and updated the relevant interface of the permission management module.

webapp/packages/supersonic-fe/src/components/SelectPartner/index.tsx

@@ -1,6 +1,6 @@
-import { Avatar, TreeSelect, Tag } from 'antd';
+import { TreeSelect, Tag } from 'antd';
 import React, { useEffect, useState } from 'react';
-import { getDepartmentTree, getUserByDeptid } from './service';
+import { getUserByDeptid, getOrganizationTree } from './service';
 import TMEAvatar from '@/components/TMEAvatar';
 
 type Props = {
@@ -11,6 +11,9 @@ type Props = {
 };
 
 const isDisableCheckbox = (name: string, type: string) => {
+  if (!name) {
+    return false;
+  }
   const isPersonNode = name.includes('(');
   if (type === 'selectedPerson') {
     return !isPersonNode;
@@ -25,18 +28,18 @@ const isDisableCheckbox = (name: string, type: string) => {
 };
 
 // 转化树结构
-export function changeTreeData(treeData: any = [], type: string) {
+export function changeTreeData(treeData: any = [], type: string, keyName = 'id') {
   return treeData.map((item: any) => {
     return {
       title: item.name,
-      value: item.key,
-      key: item.key,
-      isLeaf: !!item.emplid,
-      children: item?.subDepartments ? changeTreeData(item.subDepartments, type) : [],
-      disableCheckbox: isDisableCheckbox(item.name, type),
-      checkable: !isDisableCheckbox(item.name, type),
-      icon: item.name.includes('(') && (
-        <Avatar size={18} shape="square" src={`${item.avatarImg}`} alt="avatar" />
+      value: item[keyName],
+      key: item[keyName],
+      isLeaf: !item.subOrganizations,
+      children: item.subOrganizations ? changeTreeData(item.subOrganizations, type, keyName) : [],
+      disableCheckbox: isDisableCheckbox(item.displayName, type),
+      checkable: !isDisableCheckbox(item.displayName, type),
+      icon: (item.displayName || '').includes('(') && (
+        <TMEAvatar size="small" staffName={item.name} />
       ),
     };
   });
@@ -51,9 +54,12 @@ const SelectPartner: React.FC<Props> = ({
   const [treeData, setTreeData] = useState([]);
 
   const getDetpartment = async () => {
-    const res = await getDepartmentTree();
-    const data = changeTreeData(res.data, type);
-    setTreeData(data);
+    const { code, data } = await getOrganizationTree();
+    if (code === 200) {
+      const changeData = changeTreeData(data, type);
+      setTreeData(changeData);
+      return;
+    }
   };
 
   useEffect(() => {
@@ -78,13 +84,21 @@ const SelectPartner: React.FC<Props> = ({
   const onLoadData = (target: any) => {
     const { key } = target;
     const loadData = async () => {
-      const childData = await getUserByDeptid(key);
-      if (childData.data.length === 0) {
-        return;
+      const { code, data } = await getUserByDeptid(key);
+      if (code === 200) {
+        const list = data.reduce((userList: any[], item: any) => {
+          const { name, displayName } = item;
+          if (name && displayName) {
+            userList.push({ key: `${key}-${item.id}`, ...item });
+          }
+          return userList;
+        }, []);
+        setTimeout(() => {
+          setTreeData((origin) => {
+            return updateTreeData(origin, key, changeTreeData(list, type, 'key'));
+          });
+        }, 300);
       }
-      setTimeout(() => {
-        setTreeData((origin) => updateTreeData(origin, key, changeTreeData(childData.data, type)));
-      }, 300);
     };
     return new Promise<void>((resolve) => {
       loadData().then(() => {

webapp/packages/supersonic-fe/src/components/SelectPartner/service.ts

@@ -1,13 +1,12 @@
 import { request } from 'umi';
 
-export async function getDepartmentTree() {
-  return request<any>('/api/tpp/getDetpartmentTree', {
-    method: 'GET',
-  });
-}
-
 export async function getUserByDeptid(id: any) {
-  return request<any>(`/api/tpp/getUserByDeptid/${id}`, {
+  return request<any>(`${process.env.AUTH_API_BASE_URL}user/getUserByOrg/${id}`, {
+    method: 'GET',
+  });
+}
+export async function getOrganizationTree() {
+  return request<any>(`${process.env.AUTH_API_BASE_URL}user/getOrganizationTree`, {
     method: 'GET',
   });
 }

webapp/packages/supersonic-fe/src/components/SelectTMEPerson/index.tsx

@@ -30,15 +30,7 @@ const SelectTMEPerson: FC<Props> = ({ placeholder, value, isMultiple = true, onC
         }
       },
       updater: (list) => {
-        const users = list.map((item: UserItem) => {
-          const { enName, chName, name } = item;
-          return {
-            ...item,
-            enName: enName || name,
-            chName: chName || name,
-          };
-        });
-        setUserList(users);
+        setUserList(list);
       },
       cleanup: () => {
         setUserList([]);
@@ -58,8 +50,8 @@ const SelectTMEPerson: FC<Props> = ({ placeholder, value, isMultiple = true, onC
     >
       {userList.map((item) => {
         return (
-          <Select.Option key={item.enName} value={item.enName}>
-            <TMEAvatar size="small" staffName={item.enName} />
+          <Select.Option key={item.name} value={item.name}>
+            <TMEAvatar size="small" staffName={item.name} />
             <span className={styles.userText}>{item.displayName}</span>
           </Select.Option>
         );

webapp/packages/supersonic-fe/src/components/SelectTMEPerson/service.ts

@@ -1,19 +1,15 @@
 import request from 'umi-request';
 
-export type UserItem = {
-  enName?: string;
+export interface UserItem {
+  id: number;
+  name: string;
   displayName: string;
-  chName?: string;
-  name?: string;
   email: string;
-};
+}
+
 export type GetAllUserRes = Result<UserItem[]>;
 
 // 获取所有用户
 export async function getAllUser(): Promise<GetAllUserRes> {
-  const { APP_TARGET } = process.env;
-  if (APP_TARGET === 'inner') {
-    return request.get('/api/oa/user/all');
-  }
   return request.get(`${process.env.AUTH_API_BASE_URL}user/getUserList`);
 }

webapp/packages/supersonic-fe/src/components/SqlEditor/index.tsx

@@ -49,11 +49,13 @@ export interface ISqlEditorProps {
   isRightTheme?: boolean;
   editorConfig?: IAceEditorProps;
   sizeChanged?: number;
+  isFullScreen?: boolean;
   fullScreenBtnVisible?: boolean;
   onSqlChange?: (sql: string) => void;
   onChange?: (sql: string) => void;
   onSelect?: (sql: string) => void;
   onCmdEnter?: () => void;
+  triggerBackToNormal?: () => void;
 }
 
 /**
@@ -71,10 +73,12 @@ function SqlEditor(props: ISqlEditorProps) {
     sizeChanged,
     editorConfig,
     fullScreenBtnVisible = true,
+    isFullScreen = false,
     onSqlChange,
     onChange,
     onSelect,
     onCmdEnter,
+    triggerBackToNormal,
   } = props;
   const resize = useCallback(
     debounce(() => {
@@ -118,11 +122,15 @@ function SqlEditor(props: ISqlEditorProps) {
     setHintsPopover(hints);
   }, [hints]);
 
-  const [isSqlIdeFullScreen, setIsSqlIdeFullScreen] = useState<boolean>(false);
+  const [isSqlIdeFullScreen, setIsSqlIdeFullScreen] = useState<boolean>(isFullScreen);
+
+  useEffect(() => {
+    setIsSqlIdeFullScreen(isFullScreen);
+  }, [isFullScreen]);
 
   const handleNormalScreenSqlIde = () => {
     setIsSqlIdeFullScreen(false);
-    // setSqlEditorHeight(getDefaultSqlEditorHeight(screenSize));
+    triggerBackToNormal?.();
   };
   return (
     <div className={styles.sqlEditor} style={{ height }}>