@nger/fk-upload 1.0.190 → 1.0.193

package/dist/entities/fk-download-task.entity.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.FkDownloadTaskEntity = void 0;
 const tslib_1 = require("tslib");
 const typeorm_1 = require("typeorm");
+const rest_1 = require("@nger/rest");
 let FkDownloadTaskEntity = class FkDownloadTaskEntity {
     filename;
     status;
@@ -22,16 +23,30 @@ let FkDownloadTaskEntity = class FkDownloadTaskEntity {
     isBigFile;
 };
 tslib_1.__decorate([
+    (0, rest_1.Widget)({
+        title: '文件名'
+    }),
     (0, typeorm_1.PrimaryColumn)(),
     tslib_1.__metadata("design:type", String)
 ], FkDownloadTaskEntity.prototype, "filename", void 0);
 tslib_1.__decorate([
+    (0, rest_1.Widget)({
+        title: '状态',
+        widget: {
+            type: 'status',
+            color: {},
+            label: {}
+        }
+    }),
     (0, typeorm_1.Column)({
         default: 0
     }),
     tslib_1.__metadata("design:type", Number)
 ], FkDownloadTaskEntity.prototype, "status", void 0);
 tslib_1.__decorate([
+    (0, rest_1.Widget)({
+        title: '大小'
+    }),
     (0, typeorm_1.Column)({
         default: 0
     }),
@@ -112,6 +127,9 @@ tslib_1.__decorate([
     tslib_1.__metadata("design:type", Date)
 ], FkDownloadTaskEntity.prototype, "updateDate", void 0);
 tslib_1.__decorate([
+    (0, rest_1.Widget)({
+        title: '大文件'
+    }),
     (0, typeorm_1.Column)({
         default: false
     }),

package/dist/templates/task-manage.js

@@ -81,6 +81,8 @@ let TaskManageController = class TaskManageController {
         let psize = 10;
         let status = -1;
         let big = -1;
+        where.status = 0;
+        where.isBigFile = true;
         if (query && typeof query.status !== 'undefined') {
             status = Number(query.status);
             if (status !== -1) {
@@ -158,9 +160,14 @@ let TaskManageController = class TaskManageController {
                 link: `/@nger/fk-upload/task-manage?${this.toUrl({ ...query, status: 3, page: 1 })}`,
                 key: 3
             }];
-        const finishUrl = (filename) => `/@nger/fk-upload/finish-task?filename=${filename}&callback=/@nger/fk-uplaod/task-manage?${this.toUrl({
+        const finishCallback = `/@nger/fk-upload/task-manage?${this.toUrl({
+            page: page,
+            psize: psize,
+            isBigFile: where.isBigFile ? 1 : 0,
+            status: where.status,
             ...query
         })}`;
+        const finishUrl = (filename) => `/@nger/fk-upload/finish-task?filename=${filename}&callback=${encodeURIComponent(finishCallback)}`;
         const logins = await this.db.manager.find(entities_1.FkLoginEntity, { where: {} });
         const getLogin = (id) => {
             return logins.find(it => it.fkLoginId = id);
@@ -261,7 +268,15 @@ let TaskManageController = class TaskManageController {
         }
     }
     async finishTask(filename, callback, ctx) {
-        await this.db.manager.update(entities_1.FkDownloadTaskEntity, filename, { status: 3 });
+        if (filename) {
+            const item = this.db.manager.findOne(entities_1.FkDownloadTaskEntity, { where: { filename } });
+            if (item) {
+                await this.db.manager.update(entities_1.FkDownloadTaskEntity, filename, { status: 3 });
+            }
+            else {
+                console.log({ filename, callback });
+            }
+        }
         ctx.redirect(callback);
     }
 };

package/dist/templates/tasks/actions.d.ts

@@ -30,6 +30,7 @@ export interface IUploadTask {
     index: number;
 }
 export declare const UPLOAD_ACTION: StringToken<IUploadTask>;
+export declare const YASUO_ACTION: StringToken<IUploadTask>;
 export interface IEffectTask {
     filename: string;
     uploadUrl: string;

package/dist/templates/tasks/actions.js

@@ -1,8 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.CHECK_ACTION = exports.EFFECT_ACTION = exports.UPLOAD_ACTION = exports.SCHEDULE_ACTION = exports.DOWNLOAD_ACTION = void 0;
+exports.CHECK_ACTION = exports.EFFECT_ACTION = exports.YASUO_ACTION = exports.UPLOAD_ACTION = exports.SCHEDULE_ACTION = exports.DOWNLOAD_ACTION = void 0;
 exports.DOWNLOAD_ACTION = `@nger/fk-upload/download-task`;
 exports.SCHEDULE_ACTION = `@nger/fk-upload/schedule-task`;
 exports.UPLOAD_ACTION = `@nger/fk-upload/upload-task`;
+exports.YASUO_ACTION = `@nger/fk-upload/yasuo-task`;
 exports.EFFECT_ACTION = `@nger/fk-upload/effect-task`;
 exports.CHECK_ACTION = `@nger/fk-upload/check-task`;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nger/fk-upload",
-  "version": "1.0.190",
+  "version": "1.0.193",
   "description": "nger fk upload",
   "main": "dist/electon.js",
   "types": "dist/core.d.ts",
@@ -16,6 +16,7 @@
   "dependencies": {
     "@nger/api": "^1.0.0",
     "@nger/core": "^1.0.0",
+    "@nger/rest": "^1.0.0",
     "@nger/http": "^4.0.0",
     "@nger/rabbitmq": "^1.0.0",
     "@nger/redis": "^1.0.0",

package/pnpm-lock.yaml

@@ -6,6 +6,7 @@ specifiers:
   '@nger/http': workspace:^4.0.0
   '@nger/rabbitmq': workspace:^1.0.0
   '@nger/redis': workspace:^1.0.0
+  '@nger/rest': workspace:^1.0.0
   '@nger/schedule': workspace:^1.0.0
   '@nger/typeorm': workspace:^1.0.0
   '@nger/w7': workspace:^1.0.0
@@ -32,6 +33,7 @@ dependencies:
   '@nger/http': link:../http
   '@nger/rabbitmq': link:../rabbitmq
   '@nger/redis': link:../redis
+  '@nger/rest': link:../rest
   '@nger/schedule': link:../schedule
   '@nger/typeorm': link:../typeorm
   '@nger/w7': link:../w7