@nger/fk-upload 1.0.184 → 1.0.187

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

@@ -3,11 +3,13 @@ import { Config } from '@nger/core';
 import { Db } from '@nger/typeorm';
 import { Context } from 'koa';
 import { BrowserWindow } from 'electron';
+import { W7DataSource } from '@nger/w7';
 export declare class TaskManageController {
     private db;
     private config;
     private win;
-    constructor(db: Db, config: Config, win: BrowserWindow);
+    private w7;
+    constructor(db: Db, config: Config, win: BrowserWindow, w7: W7DataSource);
     toUrl(query: any): string;
     createPages(total: number, query: any, page: number): {
         index: number;

package/dist/templates/task-manage.js

@@ -25,14 +25,17 @@ function getStatusTitle(status) {
     }
 }
 const electron_1 = require("electron");
+const w7_1 = require("@nger/w7");
 let TaskManageController = class TaskManageController {
     db;
     config;
     win;
-    constructor(db, config, win) {
+    w7;
+    constructor(db, config, win, w7) {
         this.db = db;
         this.config = config;
         this.win = win;
+        this.w7 = w7;
     }
     toUrl(query) {
         return Object.keys(query).map(key => `${key}=${decodeURIComponent(query[key])}`).join('&');
@@ -99,6 +102,12 @@ let TaskManageController = class TaskManageController {
         const take = psize;
         const skip = (page - 1) * psize;
         const tasks = await this.db.manager.find(entities_1.FkDownloadTaskEntity, { where, order: { createDate: "DESC" }, take, skip });
+        await Promise.all(tasks.map(async (task) => {
+            const topic = await this.w7.manager.findOne(w7_1.W7ChatTopicEntity, { where: { id: task.topicId } });
+            if (topic) {
+                Reflect.set(topic, 'topicName', topic.topicName);
+            }
+        }));
         const count = await this.db.manager.count(entities_1.FkDownloadTaskEntity, { where });
         // const downloadSize = await this.db.manager.find();
         const totalPage = Math.ceil(count / psize);
@@ -188,6 +197,7 @@ let TaskManageController = class TaskManageController {
                         react_1.default.createElement("td", null),
                         react_1.default.createElement("td", null),
                         react_1.default.createElement("td", null, "\u65F6\u95F4"),
+                        react_1.default.createElement("td", null, "\u8BFE\u7A0B\u6807\u9898"),
                         react_1.default.createElement("td", null, "\u64CD\u4F5C"))),
                 react_1.default.createElement("tbody", null, tasks.map((task, key) => {
                     const login = getLogin(task.loginId);
@@ -209,7 +219,8 @@ let TaskManageController = class TaskManageController {
                         react_1.default.createElement("td", null, login.username),
                         react_1.default.createElement("td", null, login.pass),
                         react_1.default.createElement("td", null, login.w7Username),
-                        react_1.default.createElement("td", null, `${task.createDate.getMonth() + 1}月${task.createDate.getDay()}日:${task.createDate.getMinutes()}分`),
+                        react_1.default.createElement("td", null, `${task.createDate.getMonth() + 1}月${task.createDate.getDate()}日:${task.createDate.getMinutes()}分`),
+                        react_1.default.createElement("td", null, Reflect.get(task, 'topicName')),
                         react_1.default.createElement("td", null,
                             react_1.default.createElement("input", { type: "hidden", id: task.filename + '-copy', onChange: () => { }, value: task.uploadUrl }),
                             react_1.default.createElement("a", { className: "btn", target: "_blank", href: url }, "\u4E0B\u8F7D"),
@@ -286,6 +297,6 @@ tslib_1.__decorate([
 ], TaskManageController.prototype, "finishTask", null);
 TaskManageController = tslib_1.__decorate([
     (0, core_1.Controller)(`@nger/fk-upload`),
-    tslib_1.__metadata("design:paramtypes", [typeorm_1.Db, core_1.Config, electron_1.BrowserWindow])
+    tslib_1.__metadata("design:paramtypes", [typeorm_1.Db, core_1.Config, electron_1.BrowserWindow, w7_1.W7DataSource])
 ], TaskManageController);
 exports.TaskManageController = TaskManageController;

package/package.json

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