fix: 修复用户名不显示问题

JackySoft · Aug 5, 2024 · 9e127a3 · 9e127a3
1 parent d27bfac
commit 9e127a3
Show file tree

Hide file tree

Showing 6 changed files with 131 additions and 90 deletions.
diff --git a/package.json b/package.json
@@ -1,5 +1,9 @@
 {
   "private": true,
+  "name": "mars",
+  "description": "低代码平台，包含可视化编辑器、可视化后台管理，支持自定义组件开发",
+  "version": "1.0.0",
+  "license": "MIT",
   "scripts": {
     "start:editor": "pnpm --filter editor start",
     "build:editor": "pnpm --filter editor build",

diff --git a/packages/editor/src/api/types/index.ts b/packages/editor/src/api/types/index.ts
@@ -10,8 +10,8 @@ export interface PageParams {
 export interface PageItem {
   id: number;
   name: string;
-  sso_name: string;
-  user_id: string;
+  user_name: string;
+  user_id: number;
   remark: string;
   updated_at: string;
   created_at: string;

diff --git a/packages/editor/src/pages/home/PageList.tsx b/packages/editor/src/pages/home/PageList.tsx
@@ -127,11 +127,11 @@ export default function Index() {
                         <StateTag item={item} />
                       </div>
                       <div className={styles.itemTitle}>{item.name}</div>
-                      <div className={styles.itemRemark}>{item.remark}</div>
+                      <div className={styles.itemRemark}>{item.remark || '暂无描述'}</div>
                       <div className={styles.updateUser}>
                         <span style={{ marginRight: 10 }}>
                           <UserOutlined style={{ fontSize: 15, marginRight: 5 }} />
-                          {item.sso_name}
+                          {item.user_name}
                         </span>
                         <span>更新时间：{dayjs(item.updated_at).fromNow()}</span>
                       </div>

diff --git a/packages/editor/src/pages/home/ProjectList.tsx b/packages/editor/src/pages/home/ProjectList.tsx
@@ -145,7 +145,7 @@ export default function Index() {
                         description={
                           <>
                             <div style={{ position: 'absolute', top: 15, right: 15 }}>{isAuth ? null : <LockOutlined />}</div>
-                            <p style={{ color: 'rgba(0, 0, 0, 0.88)' }}>{item.remark}</p>
+                            <p style={{ color: 'rgba(0, 0, 0, 0.88)' }}>{item.remark || '暂无描述'}</p>
                             <p style={{ marginTop: 10 }}>
                               <UserOutlined style={{ fontSize: 14, marginRight: 5 }} />
                               {item.user_name}

diff --git a/packages/editor/src/utils/request.ts b/packages/editor/src/utils/request.ts
@@ -61,7 +61,7 @@ instance.interceptors.response.use(
     if (res.ret === 10018) {
       message.error('登录已过期，请重新登录');
       setTimeout(() => {
-        window.location.replace(`/#/login?callback=${window.location.href}`);
+        window.location.replace(`/login?callback=${window.location.href}`);
         return null;
       }, 1500);
       return Promise.reject(res.message);