@nger/fk-upload 1.0.134 → 1.0.138

package/dist/templates/component.js

@@ -22,14 +22,21 @@ function Nav(props) {
         }];
     return react_1.default.createElement("div", null,
         react_1.default.createElement("link", { href: "https://cdn.jsdelivr.net/npm/bootstrap@4.6.1/dist/css/bootstrap.min.css", rel: "stylesheet" }),
-        react_1.default.createElement("ul", { className: "nav nav-pills" }, navs.map((nav, key) => {
-            let cls = `nav-link`;
-            if (props.active === key) {
-                cls += ` active`;
-            }
-            return react_1.default.createElement("li", { key: key, className: "nav-item" },
-                react_1.default.createElement("a", { className: cls, href: nav.link }, nav.title));
-        })),
+        react_1.default.createElement("nav", { className: "navbar navbar-expand-lg navbar-light bg-light" },
+            react_1.default.createElement("div", { className: "collapse navbar-collapse" },
+                react_1.default.createElement("ul", { className: "navbar-nav mr-auto" },
+                    react_1.default.createElement("li", { className: "nav-item active" },
+                        react_1.default.createElement("a", { className: "nav-link", href: "/@nger/fk-upload/help" },
+                            "Home ",
+                            react_1.default.createElement("span", { className: "sr-only" }, "(current)"))),
+                    navs.map((nav, key) => {
+                        let cls = `nav-link`;
+                        if (props.active === key) {
+                            cls += ` active`;
+                        }
+                        return react_1.default.createElement("li", { key: key, className: "nav-item" },
+                            react_1.default.createElement("a", { className: cls, href: nav.link }, nav.title));
+                    })))),
         props.children);
 }
 exports.Nav = Nav;

package/dist/templates/task-manage.d.ts

@@ -6,6 +6,11 @@ export declare class TaskManageController {
     private db;
     private config;
     constructor(db: Db, config: Config);
-    taskManage(): Promise<JSX.Element>;
+    toUrl(query: any): string;
+    createPages(total: number, query: any): {
+        index: number;
+        link: string;
+    }[];
+    taskManage(query: any): Promise<JSX.Element>;
     staticTaskManage(ctx: Context): any;
 }

package/dist/templates/task-manage.js

@@ -18,8 +18,10 @@ function getStatusTitle(status) {
             return 'uploading';
         case 2:
             return 'effecting';
-        default:
+        case 3:
             return 'finish';
+        default:
+            return 'unknow';
     }
 }
 let TaskManageController = class TaskManageController {
@@ -29,9 +31,76 @@ let TaskManageController = class TaskManageController {
         this.db = db;
         this.config = config;
     }
-    async taskManage() {
-        const tasks = await this.db.manager.find(entities_1.FkDownloadTaskEntity, { where: {}, order: { createDate: "DESC" }, take: 50 });
+    toUrl(query) {
+        return Object.keys(query).map(key => `${key}=${decodeURIComponent(query[key])}`).join('&');
+    }
+    createPages(total, query) {
+        const list = [];
+        for (let i = 0; i < total; i++) {
+            list.push({
+                index: i + 1,
+                link: `/@nger/fk-upload/task-manage?${this.toUrl({
+                    ...query,
+                    page: i + 1
+                })}`
+            });
+        }
+        return list;
+    }
+    async taskManage(query) {
+        const where = {};
+        let page = 1;
+        let psize = 10;
+        if (query && typeof query.status !== 'undefined') {
+            where.status = Number(query.status);
+        }
+        if (query && typeof query.isBigFile !== 'undefined') {
+            where.isBigFile = Boolean(Number(query.isBigFile));
+        }
+        if (query && typeof query.page !== 'undefined') {
+            page = Number(query.page);
+        }
+        if (query && typeof query.psize !== 'undefined') {
+            psize = Number(query.psize);
+        }
+        const take = psize;
+        const skip = (page - 1) * psize;
+        const tasks = await this.db.manager.find(entities_1.FkDownloadTaskEntity, { where, order: { createDate: "DESC" }, take, skip });
+        const count = await this.db.manager.count(entities_1.FkDownloadTaskEntity, { where });
+        const totalPage = Math.ceil(count / psize);
+        const pre = {
+            ...query,
+            page: page - 1 > 0 ? page - 1 : 1
+        };
+        const preUrl = `/@nger/fk-upload/task-manage?${this.toUrl(pre)}`;
+        const next = {
+            ...query,
+            page: page + 1 < totalPage ? page + 1 : totalPage
+        };
+        const nextUrl = `/@nger/fk-upload/task-manage?${this.toUrl(next)}`;
+        const pages = this.createPages(totalPage, query);
+        const navs = [{
+                title: 'downloading',
+                link: `/@nger/fk-upload/task-manage?${this.toUrl({ ...query, status: 0 })}`
+            }, {
+                title: 'uploading',
+                link: `/@nger/fk-upload/task-manage?${this.toUrl({ ...query, status: 1 })}`
+            }, {
+                title: 'effecting',
+                link: `/@nger/fk-upload/task-manage?${this.toUrl({ ...query, status: 2 })}`
+            }, {
+                title: 'finish',
+                link: `/@nger/fk-upload/task-manage?${this.toUrl({ ...query, status: 3 })}`
+            }];
         return react_1.default.createElement(component_1.Nav, { active: 2 },
+            react_1.default.createElement("ul", { className: "nav nav-pills" }, navs.map((nav, key) => {
+                let cls = `nav-link`;
+                if (where.status === key) {
+                    cls += ` active`;
+                }
+                return react_1.default.createElement("li", { key: key, className: "nav-item" },
+                    react_1.default.createElement("a", { className: cls, href: nav.link }, nav.title));
+            })),
             react_1.default.createElement("script", { dangerouslySetInnerHTML: {
                     __html: `
                 window.WS_PORT = ${this.config.get(`WS_PORT`)};
@@ -47,7 +116,8 @@ let TaskManageController = class TaskManageController {
                                 react_1.default.createElement("td", null, "\u5927\u5C0F"),
                                 react_1.default.createElement("td", null, "\u4E0B\u8F7D"),
                                 react_1.default.createElement("td", null, "\u4E0A\u4F20"),
-                                react_1.default.createElement("td", { width: '240px' }, "\u8FDE\u63A5"))),
+                                react_1.default.createElement("td", { width: '240px' }, "\u8FDE\u63A5"),
+                                react_1.default.createElement("td", null, "operation"))),
                         react_1.default.createElement("tbody", null, tasks.map((task, key) => {
                             return react_1.default.createElement("tr", { key: key },
                                 react_1.default.createElement("td", null, task.filename),
@@ -55,8 +125,18 @@ let TaskManageController = class TaskManageController {
                                 react_1.default.createElement("td", { id: task.filename + '-total' }, task.totalSize),
                                 react_1.default.createElement("td", { id: task.filename + '-size' }, task.size),
                                 react_1.default.createElement("td", { id: task.filename + '-upload-size' }, task.uploadSize),
-                                react_1.default.createElement("td", { id: task.filename + '-upload-url' }, task.uploadUrl));
-                        }))))),
+                                react_1.default.createElement("td", { id: task.filename + '-upload-url' },
+                                    react_1.default.createElement("a", { href: task.uploadUrl }, "download")),
+                                react_1.default.createElement("td", { id: task.filename + '-operation-td' }));
+                        }))),
+                    react_1.default.createElement("nav", null,
+                        react_1.default.createElement("ul", { className: "pagination" },
+                            react_1.default.createElement("li", { className: "page-item" },
+                                react_1.default.createElement("a", { className: "page-link", href: preUrl }, "Previous")),
+                            pages.map(page => react_1.default.createElement("li", { className: "page-item" },
+                                react_1.default.createElement("a", { className: "page-link", href: page.link }, page.index))),
+                            react_1.default.createElement("li", { className: "page-item" },
+                                react_1.default.createElement("a", { className: "page-link", href: nextUrl }, "Next")))))),
             react_1.default.createElement("script", { src: "/@nger/fk-upload/static/task-manage.js?t=" + new Date().getTime() }));
     }
     staticTaskManage(ctx) {
@@ -72,8 +152,9 @@ let TaskManageController = class TaskManageController {
 };
 tslib_1.__decorate([
     (0, http_1.Get)('task-manage'),
+    tslib_1.__param(0, (0, http_1.Query)()),
     tslib_1.__metadata("design:type", Function),
-    tslib_1.__metadata("design:paramtypes", []),
+    tslib_1.__metadata("design:paramtypes", [Object]),
     tslib_1.__metadata("design:returntype", Promise)
 ], TaskManageController.prototype, "taskManage", null);
 tslib_1.__decorate([

package/dist/templates/tasks/effect-task.js

@@ -37,9 +37,12 @@ class EffectTask extends rabbitmq_1.Task {
                 await complete();
                 return next && next();
             }
-            const fail = injector.get(rabbitmq_1.FAIL);
             const w7 = injector.get(w7_1.W7DataSource);
-            await db.manager.update(entities_1.FkDownloadTaskEntity, task.filename, { status: 3 });
+            let uploadUrl = task.uploadUrl;
+            if (uploadUrl.startsWith('https://29294142.s21i.faiusr.com')) {
+                uploadUrl = uploadUrl.replace('https://29294142.s21i.faiusr.com', 'https://29294142.s21v.faiusr.com');
+            }
+            await db.manager.update(entities_1.FkDownloadTaskEntity, task.filename, { status: 3, uploadUrl });
             if (task.topicId) {
                 try {
                     await (0, fs_extra_1.unlink)(task.path);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nger/fk-upload",
-  "version": "1.0.134",
+  "version": "1.0.138",
   "description": "",
   "main": "dist/core.js",
   "types": "dist/core.d.ts",