wip: 11

yaklang · Nov 13, 2024 · 256e020 · 256e020
1 parent 9cec545
commit 256e020
Show file tree

Hide file tree

Showing 10 changed files with 97 additions and 46 deletions.
diff --git a/.github/workflows/workflows.yml b/.github/workflows/workflows.yml
@@ -43,11 +43,11 @@ jobs:
 
             # 静态文件压缩
             - name: Pack output files
-              # if: ${{ startsWith(github.ref, 'refs/tags/v') }}
+              if: ${{ startsWith(github.ref, 'refs/tags/v') }}
               run: tar -zcvf out.tgz dist
 
             - name: Upload Build Artifact
-              # if: ${{ startsWith(github.ref, 'refs/tags/v') }}
+              if: ${{ startsWith(github.ref, 'refs/tags/v') }}
               uses: actions/upload-artifact@v3
               with:
                   name: build-output

diff --git a/src/App/routers/AuthRoute.tsx b/src/App/routers/AuthRoute.tsx
@@ -1,7 +1,6 @@
 import type { FC, ReactNode } from 'react';
-// import { useEffect } from 'react';
-import { Navigate } from 'react-router-dom';
 import useLoginStore from '../store/loginStore';
+import { NoLoginPermission } from '@/compoments';
 
 interface AuthRouteType {
     children: ReactNode;
@@ -15,6 +14,7 @@ const AuthRoute: FC<AuthRouteType> = ({ children }) => {
     //     // dispatch(logOut(_pathname.slice(1)))
     //   }
     // }, [token]);
-    return token ? children : <Navigate to="/login" replace />;
+
+    return token ? children : <NoLoginPermission />;
 };
 export default AuthRoute;
diff --git a/src/assets/compoments/Empty.png b/src/assets/compoments/Empty.png
diff --git a/src/assets/compoments/NoLoginPermission.png b/src/assets/compoments/NoLoginPermission.png
diff --git a/src/compoments/EmptyBox/index.tsx b/src/compoments/EmptyBox/index.tsx
@@ -0,0 +1,14 @@
+import { FC } from 'react';
+
+import EmptyImages from '@/assets/compoments/Empty.png';
+
+const EmptyBox: FC = () => {
+    return (
+        <div className="w-full h-full flex items-center justify-center flex-col gap-4">
+            <img src={EmptyImages} className="w-54" />
+            <div className="font-semibold text-sm">暂无数据</div>
+        </div>
+    );
+};
+
+export default EmptyBox;
diff --git a/src/compoments/NoLoginPermission/index.tsx b/src/compoments/NoLoginPermission/index.tsx
@@ -0,0 +1,26 @@
+import { FC } from 'react';
+import NoLoginPermissionImage from '@/assets/compoments/NoLoginPermission.png';
+import { Button } from 'antd';
+import { useNavigate } from 'react-router-dom';
+
+const NoLoginPermission: FC = () => {
+    const navigate = useNavigate();
+
+    const headLogin = () => {
+        navigate('/login', { replace: true });
+    };
+    return (
+        <div className="w-full h-full flex items-center justify-center flex-col gap-4">
+            <img src={NoLoginPermissionImage} className="w-80" />
+            <div className="color-[#31343F] text-sm font-semibold">
+                暂无访问权限
+            </div>
+            <div>登陆后即可访问该页面</div>
+            <Button color="primary" variant="outlined" onClick={headLogin}>
+                立即登陆
+            </Button>
+        </div>
+    );
+};
+
+export default NoLoginPermission;
diff --git a/src/compoments/WizardTable/index.tsx b/src/compoments/WizardTable/index.tsx
@@ -20,6 +20,7 @@ import extendTableProps from './extendTableProps';
 
 import './index.scss';
 import { match } from 'ts-pattern';
+import EmptyBox from '../EmptyBox';
 
 const reducer = <T extends TRecudeInitiakValue>(state: T, payload: T): T => ({
     ...state,
@@ -370,6 +371,7 @@ const WizardTable = <T extends AnyObject = AnyObject>(
         );
     }, [state.loading]);
 
+    // Array.isArray(dataSource) && dataSource?.length > 0 ? (
     return (
         <div className="flex w-full h-full overflow-hidden justify-end">
             {/* 表格部分 */}
@@ -433,6 +435,9 @@ const WizardTable = <T extends AnyObject = AnyObject>(
             </div>
         </div>
     );
+    // ) : (
+    //     <EmptyBox />
+    // );
 };
 
 WizardTable.usePage = usePage;

diff --git a/src/compoments/index.ts b/src/compoments/index.ts
@@ -6,3 +6,5 @@ export { default as WizardProFilterDrawer } from './WizardProFilterDrawer';
 export { default as WizardTooltip } from './WizardTooltip';
 export { default as WizardModal } from './WizardModal';
 export { default as ChunkUpload } from './ChunkUpload';
+export { default as EmptyBox } from './EmptyBox';
+export { default as NoLoginPermission } from './NoLoginPermission';
diff --git a/src/pages/NetworkError.tsx b/src/pages/NetworkError.tsx
@@ -23,7 +23,7 @@ const NetworkError = () => {
                 请检查网络连接
             </div>
             <div>连网后才可访问 Yakit 插件商店</div>
-            <Button type="link" onClick={headClean}>
+            <Button color="primary" variant="outlined" onClick={headClean}>
                 <SyncOutlined />
                 刷新页面
             </Button>

diff --git a/src/pages/TaskScript/TaskScript.tsx b/src/pages/TaskScript/TaskScript.tsx
@@ -6,7 +6,7 @@ import { StartUpScriptModal } from './compoment/StartUpScriptModal';
 import { TaskScriptTags } from './compoment/TaskScriptTags';
 import { useRequest } from 'ahooks';
 import { getAnalysisScript, getScriptTaskGroup } from '@/apis/task';
-import { WizardModal } from '@/compoments';
+import { EmptyBox, WizardModal } from '@/compoments';
 import { Spin } from 'antd';
 
 const TaskScript: FC = () => {
@@ -61,51 +61,55 @@ const TaskScript: FC = () => {
     // }));
 
     return (
-        <div className="p-4 ">
-            <Spin spinning={scriptLoading}>
-                <div className="grid grid-cols-3 gap-4">
-                    {scriptData?.map((items) => {
-                        return (
-                            <div
-                                key={items.script_name}
-                                className={styles['wizard-card']}
-                            >
-                                <div className={styles['card-header']}>
-                                    <div
-                                        className={`text-clip ${styles['card-header-text']}`}
-                                    >
-                                        {items?.script_name}
+        <div className="p-4 h-full">
+            {Array.isArray(scriptData) && scriptData.length > 0 ? (
+                <Spin spinning={scriptLoading}>
+                    <div className="grid grid-cols-3 gap-4">
+                        {scriptData?.map((items) => {
+                            return (
+                                <div
+                                    key={items.script_name}
+                                    className={styles['wizard-card']}
+                                >
+                                    <div className={styles['card-header']}>
+                                        <div
+                                            className={`text-clip ${styles['card-header-text']}`}
+                                        >
+                                            {items?.script_name}
+                                        </div>
+                                    </div>
+
+                                    <div className={styles['card-content']}>
+                                        <TaskScriptTags
+                                            tags={items?.tags}
+                                            script_name={items.script_name}
+                                        />
+                                        <div
+                                            className={`text-clip2 ${styles['content-describe']}`}
+                                        >
+                                            {items?.description &&
+                                            items.description?.length > 0
+                                                ? items.description
+                                                : '-'}
+                                        </div>
                                     </div>
-                                </div>
 
-                                <div className={styles['card-content']}>
-                                    <TaskScriptTags
-                                        tags={items?.tags}
-                                        script_name={items.script_name}
-                                    />
                                     <div
-                                        className={`text-clip2 ${styles['content-describe']}`}
+                                        className={styles['card-footer']}
+                                        onClick={async () => {
+                                            await runAsync(items);
+                                        }}
                                     >
-                                        {items?.description &&
-                                        items.description?.length > 0
-                                            ? items.description
-                                            : '-'}
+                                        使用模版
                                     </div>
                                 </div>
-
-                                <div
-                                    className={styles['card-footer']}
-                                    onClick={async () => {
-                                        await runAsync(items);
-                                    }}
-                                >
-                                    使用模版
-                                </div>
-                            </div>
-                        );
-                    })}
-                </div>
-            </Spin>
+                            );
+                        })}
+                    </div>
+                </Spin>
+            ) : (
+                <EmptyBox />
+            )}
             <StartUpScriptModal ref={StartUpScriptModalRef} title="创建任务" />
         </div>
     );