feat: 替换变量为驼峰

JackySoft · Dec 18, 2024 · 2d5285a · 2d5285a
1 parent 8c4dd8b
commit 2d5285a
Show file tree

Hide file tree

Showing 53 changed files with 461 additions and 486 deletions.
diff --git a/packages/admin/src/api/index.ts b/packages/admin/src/api/index.ts
@@ -35,5 +35,5 @@ export const getProjectMenu = (projectId: string | number) => {
 
 // 获取项目配置
 export const getProjectDetail = (projectId: string | number) => {
-  return request.get('/admin/getProjectConfig?project_id=' + projectId);
+  return request.get('/admin/getProjectConfig?projectId=' + projectId);
 };
diff --git a/packages/admin/src/components/BreadList/BreadList.tsx b/packages/admin/src/components/BreadList/BreadList.tsx
@@ -26,7 +26,7 @@ export default function BreadList() {
       breadList.unshift({
         title: cur.name,
       });
-      cur = menuMap[cur.parent_id];
+      cur = menuMap[cur.parentId];
     }
     setMenuPath(breadList);
   }, [pathname, menuMap]);

diff --git a/packages/admin/src/components/Header/Header.tsx b/packages/admin/src/components/Header/Header.tsx
@@ -30,10 +30,10 @@ const Header = memo(() => {
     updateCollapsed();
   };
 
-  const isLight = projectInfo.menu_theme_color === 'light' || projectInfo.layout === 1;
+  const isLight = projectInfo.menuThemeColor === 'light' || projectInfo.layout === 1;
   const style: React.CSSProperties = {
     backgroundColor: isLight ? '#fff' : '#001529',
-    color: projectInfo.menu_theme_color === 'light' ? '#000' : '#fff',
+    color: projectInfo.menuThemeColor === 'light' ? '#000' : '#fff',
   };
   return (
     <div className={styles.header} style={style}>

diff --git a/packages/admin/src/components/Logo/Logo.tsx b/packages/admin/src/components/Logo/Logo.tsx
@@ -10,7 +10,7 @@ function Logo() {
   const [nameStyle, setNameStyle] = useState({});
   useEffect(() => {
     // 左右布局模式下，Logo背景需要跟着主题色变化
-    if (projectInfo.menu_theme_color === 'dark') {
+    if (projectInfo.menuThemeColor === 'dark') {
       setStyle({ backgroundColor: '#001529', color: '#fff', height: 64, padding: '10px 20px' });
     } else {
       setStyle({ backgroundColor: '#fff', color: '#000', height: 64, padding: '10px 20px' });
@@ -25,7 +25,7 @@ function Logo() {
         fontSize: projectInfo.name.length > 9 ? 14 : 16,
       });
     }
-  }, [projectInfo.layout, projectInfo.menu_theme_color]);
+  }, [projectInfo.layout, projectInfo.menuThemeColor]);
   return (
     <div
       className={styles.logo}

diff --git a/packages/admin/src/components/Menu/Menu.tsx b/packages/admin/src/components/Menu/Menu.tsx
@@ -31,7 +31,7 @@ const MenuComponent: React.FC = () => {
       if (item.type === 1 && item.status === 1) {
         const iconsList: { [key: string]: any } = Icons;
         if (item.buttons?.length || !item.children) {
-          const path = `/project/${projectId}/${item.path.startsWith('/') ? item.path.slice(1) : item.path || item.page_id || -item.id}`;
+          const path = `/project/${projectId}/${item.path.startsWith('/') ? item.path.slice(1) : item.path || item.pageId || -item.id}`;
           return treeList.push(getMenuItem(item.name, path, iconsList[item.icon] && React.createElement(iconsList[item.icon])));
         }
         const path = `${projectId}-${item.id}`;
@@ -69,11 +69,11 @@ const MenuComponent: React.FC = () => {
   return (
     <div
       style={
-        projectInfo.menu_mode === 'horizontal'
+        projectInfo.menuMode === 'horizontal'
           ? { width: 'calc(100vw - 458px)' }
           : {
               width: collapsed ? 79 : 255,
-              background: projectInfo.menu_theme_color === 'light' ? '#fff' : '#001529',
+              background: projectInfo.menuThemeColor === 'light' ? '#fff' : '#001529',
               borderRight: projectInfo.layout === 2 ? '1px solid #e8e9eb' : 'none',
               overflowX: 'hidden',
             }
@@ -84,19 +84,19 @@ const MenuComponent: React.FC = () => {
           components: {
             Menu: {
               darkItemColor: '#fff',
-              darkItemHoverColor: projectInfo.system_theme_color,
+              darkItemHoverColor: projectInfo.systemThemeColor,
               iconSize: 16,
             },
           },
         }}
       >
         <Menu
           onClick={onClick}
-          theme={projectInfo.menu_theme_color as MenuTheme}
+          theme={projectInfo.menuThemeColor as MenuTheme}
           selectedKeys={selectedKeys}
-          style={projectInfo.menu_mode === 'horizontal' ? {} : { height: 'calc(100vh - 64px)', border: 'none', overflowY: 'auto' }}
-          mode={projectInfo.menu_mode}
-          inlineCollapsed={projectInfo.menu_mode === 'horizontal' ? undefined : collapsed}
+          style={projectInfo.menuMode === 'horizontal' ? {} : { height: 'calc(100vh - 64px)', border: 'none', overflowY: 'auto' }}
+          mode={projectInfo.menuMode}
+          inlineCollapsed={projectInfo.menuMode === 'horizontal' ? undefined : collapsed}
           items={menuList}
         />
       </ConfigProvider>

diff --git a/packages/admin/src/components/Tab.tsx b/packages/admin/src/components/Tab.tsx
@@ -32,8 +32,8 @@ function Tab() {
       setActiveKey('welcome');
       return;
     }
-    const page_id = getPageId(pageId, pageMap);
-    const menuItem = pageMap[Number(page_id)];
+    const id = getPageId(pageId, pageMap);
+    const menuItem = pageMap[Number(id)];
     if (!menuItem) return;
     if (!tabsList.find((item) => item.key == pathname)) {
       tabsList.push({

diff --git a/packages/admin/src/layout/layout.tsx b/packages/admin/src/layout/layout.tsx
@@ -108,7 +108,7 @@ const AdminLayout = () => {
       locale={locale}
       theme={{
         token: {
-          colorPrimary: projectInfo.system_theme_color || '#1677ff',
+          colorPrimary: projectInfo.systemThemeColor || '#1677ff',
         },
         hashed: false,
       }}

diff --git a/packages/admin/src/pages/console/index.tsx b/packages/admin/src/pages/console/index.tsx
@@ -88,7 +88,7 @@ function Console() {
                             <p style={{ color: 'rgba(0, 0, 0, 0.88)' }}>{item.remark}</p>
                             <p style={{ marginTop: 10 }}>
                               <UserOutlined style={{ fontSize: 14, marginRight: 5 }} />
-                              {item.updated_at}
+                              {item.updatedAt}
                             </p>
                           </>
                         }

diff --git a/packages/admin/src/pages/page/index.tsx b/packages/admin/src/pages/page/index.tsx
@@ -55,21 +55,21 @@ export default function () {
           }
           let pageData: any = {};
           try {
-            pageData = JSON.parse(res.page_data || '{}');
+            pageData = JSON.parse(res.pageData || '{}');
           } catch (error) {
             console.error(error);
-            console.info('【json数据】', res.page_data);
+            console.info('【json数据】', res.pageData);
             message.error('页面数据格式错误，请检查');
           }
           clearPageInfo();
           savePageInfo({
             pageId: res.id,
             pageName: res.name,
             remark: res.remark,
-            is_public: res.is_public,
-            stg_publish_id: res.stg_publish_id,
-            pre_publish_id: res.pre_publish_id,
-            prd_publish_id: res.prd_publish_id,
+            isPublic: res.isPublic,
+            stgPublishId: res.stgPublishId,
+            prePublishId: res.prePublishId,
+            prdPublishId: res.prdPublishId,
             ...pageData,
           });
           setPageData(pageData);

diff --git a/packages/admin/src/pages/project/index.tsx b/packages/admin/src/pages/project/index.tsx
@@ -28,22 +28,22 @@ export default function () {
   useEffect(() => {
     let env = storage.get(`${projectId}-env`) || 'prd';
     // 获取页面ID
-    const page_id = getPageId(pageId, pageMap);
-    if (!page_id) {
+    const id = getPageId(pageId, pageMap);
+    if (!id) {
       setNotFound(true);
       return;
     }
     if (!isEnv(env)) {
       env = 'prd';
     }
-    getPageDetail(env as string, Number(page_id))
+    getPageDetail(env as string, Number(id))
       .then((res: any) => {
         let pageData: any = {};
         try {
-          pageData = JSON.parse(res.page_data || '{}');
+          pageData = JSON.parse(res.pageData || '{}');
         } catch (error) {
           console.error(error);
-          console.info('【json数据】', res.page_data);
+          console.info('【json数据】', res.pageData);
           message.error('页面数据格式错误，请检查');
         }
         clearPageInfo();

diff --git a/packages/admin/src/stores/projectStore.ts b/packages/admin/src/stores/projectStore.ts
@@ -7,10 +7,10 @@ export interface ProjectInfo {
   footer?: number;
   layout?: number;
   logo?: string;
-  menu_mode: 'inline' | 'horizontal' | 'vertical';
-  menu_theme_color?: string;
+  menuMode: 'inline' | 'horizontal' | 'vertical';
+  menuThemeColor?: string;
   name: string;
-  system_theme_color?: string;
+  systemThemeColor?: string;
   breadcrumb?: number;
   tag?: number;
 }
@@ -32,7 +32,7 @@ export interface ProjectAction {
 export const useProjectStore = create<PageState & ProjectAction>((set, get) => ({
   projectInfo: {
     name: '',
-    menu_mode: 'inline',
+    menuMode: 'inline',
   },
   collapsed: false,
   menuTree: [],

diff --git a/packages/admin/src/types/index.ts b/packages/admin/src/types/index.ts
@@ -4,16 +4,16 @@
 
 export interface IMenuItem {
   id: number;
-  project_id: number;
+  projectId: number;
   name: string;
-  parent_id: number;
+  parentId: number;
   type: number;
   icon: string;
   path: string;
-  page_id: number;
-  sort_num: number;
+  pageId: number;
+  sortNum: number;
   status: number;
-  created_at: string;
+  createdAt: string;
   buttons?: IMenuItem[];
   children?: IMenuItem[];
 }
@@ -23,14 +23,8 @@ export interface ProjectItem {
   name: string;
   remark: string;
   logo: string;
-  user_name: string;
-  user_id: string;
-  updated_at: string;
-  created_at: string;
-  members: Array<{
-    id: number;
-    role: 1 | 2;
-    user_id: string;
-    user_name: string;
-  }>;
+  userName: string;
+  userId: string;
+  updatedAt: string;
+  createdAt: string;
 }
diff --git a/packages/admin/src/utils/util.ts b/packages/admin/src/utils/util.ts
@@ -14,10 +14,10 @@ export function isEnv(env?: string) {
  */
 export function getPageId(pageId: string | number | undefined, pageMap: Record<number, any>): number {
   if (!pageId || !pageMap) return 0;
-  const page_id = isNaN(Number(pageId))
-    ? Object.values(pageMap).filter((item) => (item.path.startsWith('/') ? item.path.slice(1) === pageId : item.path === pageId))?.[0]?.page_id
+  const id = isNaN(Number(pageId))
+    ? Object.values(pageMap).filter((item) => (item.path.startsWith('/') ? item.path.slice(1) === pageId : item.path === pageId))?.[0]?.pageId
     : pageId;
-  return page_id;
+  return id;
 }
 /**
  * 菜单数据转换
@@ -29,16 +29,16 @@ export function getPageId(pageId: string | number | undefined, pageMap: Record<n
  */
 export function arrayToTree(array: IMenuItem[] = []) {
   const buttons: IMenuItem[] = [];
-  const pageMap: { [key: number]: Pick<IMenuItem, 'id' | 'page_id' | 'parent_id' | 'name' | 'path'> } = {};
+  const pageMap: { [key: number]: Pick<IMenuItem, 'id' | 'pageId' | 'parentId' | 'name' | 'path'> } = {};
   const menuMap: { [key: number]: IMenuItem } = {};
   // 创建一个映射，将id映射到节点对象
   const map: { [key: number]: IMenuItem & { children?: IMenuItem[] } } = {};
   array.forEach((item) => {
     map[item.id] = { ...item };
     if (item.type === 2) buttons.push(item);
     if (item.type === 1 || item.type === 3) {
-      if (item.page_id) {
-        pageMap[item.page_id] = { id: item.id, page_id: item.page_id, parent_id: item.parent_id, name: item.name, path: item.path };
+      if (item.pageId) {
+        pageMap[item.pageId] = { id: item.id, pageId: item.pageId, parentId: item.parentId, name: item.name, path: item.path };
       } else {
         menuMap[item.id] = { ...item };
       }
@@ -47,22 +47,22 @@ export function arrayToTree(array: IMenuItem[] = []) {
 
   // 找到每个节点的父节点
   array.forEach((item) => {
-    if (item.parent_id && map[item.parent_id]) {
-      const parentItem = map[item.parent_id];
+    if (item.parentId && map[item.parentId]) {
+      const parentItem = map[item.parentId];
       if (item.type === 1 || item.type === 3) {
         if (!parentItem.children) parentItem.children = [];
         parentItem.children?.push(map[item.id]);
-        // 按照sort_num进行降序排序
-        parentItem.children = parentItem.children.sort((a, b) => a.sort_num - b.sort_num);
+        // 按照sortNum进行降序排序
+        parentItem.children = parentItem.children.sort((a, b) => a.sortNum - b.sortNum);
       } else {
         if (!parentItem.buttons) parentItem.buttons = [];
         parentItem.buttons?.push(map[item.id]);
       }
     }
   });
   const menuTree = Object.values(map)
-    .filter((item) => !item.parent_id)
-    .sort((a, b) => a.sort_num - b.sort_num);
+    .filter((item) => !item.parentId)
+    .sort((a, b) => a.sortNum - b.sortNum);
   return {
     menuTree,
     buttons,

diff --git a/packages/editor/src/api/index.ts b/packages/editor/src/api/index.ts
@@ -64,7 +64,7 @@ export const publishList = (params: PublishListParams) => {
 };
 
 // 页面回滚
-export const rollbackPage = (params: { page_id: number; env: string; last_publish_id: number }) => {
+export const rollbackPage = (params: { pageId: number; env: string; lastPublishId: number }) => {
   return request.post('/page/rollback', params);
 };
 
@@ -134,7 +134,7 @@ export const delUser = (params: { id: number }) => {
 };
 
 // 更新项目用户
-export const updateUser = (params: { id: number; system_role: number; role_id: number }) => {
+export const updateUser = (params: { id: number; systemRole: number; roleId: number }) => {
   return request.post('/project/user/update', params);
 };
 
@@ -144,8 +144,8 @@ export const getRoleList = (params: Role.Params) => {
 };
 
 // 获取所有角色
-export const getRoleListAll = (project_id: number) => {
-  return request.get('/role/listAll', { project_id });
+export const getRoleListAll = (projectId: number) => {
+  return request.get('/role/listAll', { projectId });
 };
 
 // 新增角色
@@ -154,16 +154,16 @@ export const createRole = (params: Role.CreateParams) => {
 };
 
 // 删除角色
-export const delRoleById = (params: { id: number; project_id: number }) => {
+export const delRoleById = (params: { id: number; projectId: number }) => {
   return request.post('/role/delete', params);
 };
 
 // 更新角色
-export const updateRoleLimits = (params: { id: number; checked: string; half_checked: string }) => {
+export const updateRoleLimits = (params: { id: number; checked: string; halfChecked: string }) => {
   return request.post('/role/updateLimits', params);
 };
 
 // 更新角色权限
-export const updateRole = (params: { id: number; project_id: string; name: string; remark: string }) => {
+export const updateRole = (params: { id: number; projectId: string; name: string; remark: string }) => {
   return request.post('/role/update', params);
 };