@nger/fk-upload 1.0.175 → 1.0.178

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (5) hide show
  1. package/dist/main.js +2 -0
  2. package/dist/templates/component.js +1 -1
  3. package/dist/templates/setting.js +3 -3
  4. package/dist/templates/task-manage.js +16 -2
  5. package/package.json +1 -1
package/dist/main.js CHANGED
@@ -15,6 +15,7 @@ const redis_1 = require("@nger/redis");
15
15
  const rabbitmq_1 = require("@nger/rabbitmq");
16
16
  const schedule_1 = require("@nger/schedule");
17
17
  const w7_1 = require("@nger/w7");
18
+ const sirv_1 = require("@nger/sirv");
18
19
  let AppModule = class AppModule {
19
20
  };
20
21
  AppModule = tslib_1.__decorate([
@@ -25,6 +26,7 @@ AppModule = tslib_1.__decorate([
25
26
  }],
26
27
  imports: [
27
28
  w7_1.W7Module,
29
+ sirv_1.SirvModule.forRoot(),
28
30
  fk_upload_module_1.FkUploadModule,
29
31
  http_1.HttpModule.forEnv(),
30
32
  typeorm_1.TypeormModule.forEnv(),
package/dist/templates/component.js CHANGED
@@ -22,7 +22,7 @@ function Nav(props) {
22
22
  }];
23
23
  return react_1.default.createElement("div", null,
24
24
  react_1.default.createElement("link", { href: "/bootstrap/css/bootstrap.min.css", rel: "stylesheet" }),
25
- react_1.default.createElement("nav", { className: "navbar navbar-expand-lg navbar-dark bg-primary" },
25
+ react_1.default.createElement("nav", { style: { padding: "0 10px" }, className: "navbar navbar-expand-lg navbar-dark bg-primary" },
26
26
  react_1.default.createElement("div", { className: "collapse navbar-collapse show" },
27
27
  react_1.default.createElement("ul", { className: "navbar-nav mr-auto", style: { display: "flex", flexDirection: 'row' } },
28
28
  react_1.default.createElement("a", { className: "navbar-brand", href: "/@nger/fk-upload/help" }, "FkUpload"),
package/dist/templates/setting.js CHANGED
@@ -32,13 +32,13 @@ let SettingController = class SettingController {
32
32
  const url = `/@nger/fk-upload/setting?id=${taskId}`;
33
33
  return react_1.default.createElement(component_1.Nav, { active: 4 },
34
34
  react_1.default.createElement("form", { action: url, method: 'post', encType: 'application/x-www-form-urlencoded' },
35
- react_1.default.createElement("div", { className: "form-group" },
35
+ react_1.default.createElement("div", { className: "mb-3" },
36
36
  react_1.default.createElement("label", { htmlFor: "name" }, "\u540D\u79F0"),
37
37
  react_1.default.createElement("input", { type: "text", className: 'form-control', onChange: e => { }, value: setting.name, id: "name", name: "name" })),
38
- react_1.default.createElement("div", { className: "form-group" },
38
+ react_1.default.createElement("div", { className: "mb-3" },
39
39
  react_1.default.createElement("label", { htmlFor: "rule" }, "\u89C4\u5219"),
40
40
  react_1.default.createElement("input", { type: "text", className: 'form-control', onChange: e => { }, value: setting.rule, id: "rule", name: "rule" })),
41
- react_1.default.createElement("div", { className: "form-group" },
41
+ react_1.default.createElement("div", { className: "mb-3" },
42
42
  react_1.default.createElement("button", { type: "submit", className: 'btn btn-primary' }, "\u4FDD\u5B58"),
43
43
  react_1.default.createElement("button", { type: "reset", className: 'btn' }, "\u91CD\u7F6E"))));
44
44
  }
package/dist/templates/task-manage.js CHANGED
@@ -147,6 +147,10 @@ let TaskManageController = class TaskManageController {
147
147
  link: `/@nger/fk-upload/task-manage?${this.toUrl({ ...query, status: 3, page: 1 })}`,
148
148
  key: 3
149
149
  }];
150
+ const logins = await this.db.manager.find(entities_1.FkLoginEntity, { where: {} });
151
+ const getLogin = (id) => {
152
+ return logins.find(it => it.fkLoginId = id);
153
+ };
150
154
  return react_1.default.createElement(component_1.Nav, { active: 2 },
151
155
  react_1.default.createElement("ul", { className: "nav nav-pills", style: { marginBottom: "10px" } }, navs.map((nav, key) => {
152
156
  let cls = `nav-link`;
@@ -176,9 +180,14 @@ let TaskManageController = class TaskManageController {
176
180
  react_1.default.createElement("td", null, "\u72B6\u6001"),
177
181
  react_1.default.createElement("td", null, "\u5927\u5C0F"),
178
182
  react_1.default.createElement("td", null, "\u5927\u4E8E1G"),
183
+ react_1.default.createElement("td", null),
184
+ react_1.default.createElement("td", null),
185
+ react_1.default.createElement("td", null),
186
+ react_1.default.createElement("td", null),
179
187
  react_1.default.createElement("td", null, "\u64CD\u4F5C"))),
180
188
  react_1.default.createElement("tbody", null, tasks.map((task, key) => {
181
- const uploadUrl = task.uploadUrl;
189
+ const login = getLogin(task.loginId);
190
+ // const uploadUrl = task.uploadUrl;
182
191
  // https://29294142.s21v.faiusr.com/58/ABUIABA6GAAg3tiOlAYogPvErAY.mp4
183
192
  // https://29294142.s21d.faiusrd.com/58/ABUIABA6GAAgzrCRlAYo_J_Aag.mp4
184
193
  // https://29294142.s21d.faiusrd.com/0/ABUIABA6GAAg3tiOlAYogPvErAY.mp4?f=mAVUREPTVCTkBF%2BzQR2oy8h6lZw4.mp4&
@@ -192,9 +201,14 @@ let TaskManageController = class TaskManageController {
192
201
  Math.ceil(100 * task.totalSize / (1024 * 1024 * 1024)) / 100,
193
202
  "G"),
194
203
  react_1.default.createElement("td", null, task.isBigFile ? '是' : '否'),
204
+ react_1.default.createElement("td", null, task.topicId),
205
+ react_1.default.createElement("td", null, login.username),
206
+ react_1.default.createElement("td", null, login.password),
207
+ react_1.default.createElement("td", null, login.w7Username),
195
208
  react_1.default.createElement("td", null,
196
209
  react_1.default.createElement("input", { type: "hidden", id: task.filename + '-copy', onChange: () => { }, value: task.uploadUrl }),
197
- react_1.default.createElement("a", { href: url }, "\u4E0B\u8F7D")));
210
+ react_1.default.createElement("a", { href: url }, "\u4E0B\u8F7D"),
211
+ react_1.default.createElement("a", { href: `https://wx.jidujiaowang.com/web/index.php?c=site&a=entry&topic_id=${task.topicId}&do=topic_add&m=dg_chat` }, "\u7F16\u8F91")));
198
212
  }))),
199
213
  react_1.default.createElement("nav", null,
200
214
  react_1.default.createElement("ul", { className: "pagination" },
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@nger/fk-upload",
3
- "version": "1.0.175",
3
+ "version": "1.0.178",
4
4
  "description": "nger fk upload",
5
5
  "main": "dist/electon.js",
6
6
  "types": "dist/core.d.ts",