@cmstops/pro-compo 0.3.57 → 0.3.59

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 (8) hide show
  1. package/es/editMetaInfo/components/metaInfoForm.js +4 -4
  2. package/es/hooks/useUpload.d.ts +2 -1
  3. package/es/hooks/useUpload.js +15 -4
  4. package/es/selectResourceModal/components/ListContentLocal/index.js +2 -2
  5. package/lib/editMetaInfo/components/metaInfoForm.js +4 -4
  6. package/lib/hooks/useUpload.js +15 -3
  7. package/lib/selectResourceModal/components/ListContentLocal/index.js +2 -2
  8. package/package.json +1 -1
package/es/editMetaInfo/components/metaInfoForm.js CHANGED
@@ -49,7 +49,7 @@ const _sfc_main = defineComponent({
49
49
  guide: "",
50
50
  keywords: [],
51
51
  author: "",
52
- duty_editor: "",
52
+ duty_editor: [],
53
53
  extra_attrs: [],
54
54
  self_publish_time: "",
55
55
  line_time: false,
@@ -213,9 +213,9 @@ const _sfc_main = defineComponent({
213
213
  data.self_publish_time = data.self_publish_time && parseInt(data.self_publish_time, 10) * 1e3 || "";
214
214
  data.online_time = data.online_time && parseInt(data.online_time, 10) * 1e3 || "";
215
215
  data.offline_time = data.offline_time && parseInt(data.offline_time, 10) * 1e3 || "";
216
- data.keywords = data.keywords && data.keywords.split(",");
217
- data.duty_editor = data.duty_editor && data.duty_editor.split(",") || "";
218
- data.extra_attrs = data.extra_attrs && data.extra_attrs.split(",") || "";
216
+ data.keywords = data.keywords && data.keywords.split(",") || [];
217
+ data.duty_editor = data.duty_editor && data.duty_editor.split(",") || [];
218
+ data.extra_attrs = data.extra_attrs && data.extra_attrs.split(",") || [];
219
219
  data.relation_news = data.relation_news && JSON.parse(data.relation_news) || [];
220
220
  data.line_time = !!(data.online_time || data.offline_time);
221
221
  data.ori_read_count = Number(data.ori_read_count);
package/es/hooks/useUpload.d.ts CHANGED
@@ -9,6 +9,7 @@ export declare type TypeAddMediaParam = {
9
9
  };
10
10
  export declare function getSize(value: number): string;
11
11
  export declare function addMedia(BASE_API: string, params: TypeAddMediaParam): import("axios").AxiosPromise<any>;
12
+ export declare function getMediaDetails(BASE_API: string, repoId: number, id: number): import("axios").AxiosPromise<any>;
12
13
  export declare function reTranscodeMedia(BASE_API: string, media_id: number): import("axios").AxiosPromise<any>;
13
14
  declare type UploadOptions = {
14
15
  noAddMedia: boolean;
@@ -17,7 +18,7 @@ export default function useUpload(options?: UploadOptions): {
17
18
  list: import("vue").Ref<any[]>;
18
19
  uploadFile: (BASE_API: string, file: any, dir: number | undefined, repoId: number, callback?: CallbackFunc | undefined) => void;
19
20
  reTranscode: (BASE_API: string, file: any) => Promise<boolean>;
20
- transcodingFile: (BASE_API: string, file: any) => void;
21
+ transcodingFile: (BASE_API: string, file: any, repoId: number) => void;
21
22
  recordTaskStatusChange: (file: any, progress: number, isTrans?: boolean | undefined) => void;
22
23
  removeRecord: (file: any) => void;
23
24
  };
package/es/hooks/useUpload.js CHANGED
@@ -12,7 +12,7 @@ function getSize(value) {
12
12
  do {
13
13
  value /= 1024;
14
14
  i++;
15
- } while (value > 1024);
15
+ } while (value >= 1024);
16
16
  return value.toFixed(2) + byteUnits[i];
17
17
  }
18
18
  function addMedia(BASE_API, params) {
@@ -22,6 +22,12 @@ function addMedia(BASE_API, params) {
22
22
  data: params
23
23
  });
24
24
  }
25
+ function getMediaDetails(BASE_API, repoId, id) {
26
+ return request(BASE_API, {
27
+ url: `/poplar/v2/repo/${repoId}/media?where=id__eq:${id}`,
28
+ method: "get"
29
+ });
30
+ }
25
31
  function reTranscodeMedia(BASE_API, media_id) {
26
32
  return request(BASE_API, {
27
33
  url: "/poplar/v3/attachment/re_transcoding",
@@ -121,7 +127,7 @@ function useUpload(options) {
121
127
  callback && callback(newFile, "fail");
122
128
  });
123
129
  };
124
- const transcodingFile = (BASE_API, file) => {
130
+ const transcodingFile = (BASE_API, file, repoId) => {
125
131
  if (!["video", "audio"].includes(file.catalog))
126
132
  return;
127
133
  const task = new TranscodingTask(file);
@@ -138,7 +144,12 @@ function useUpload(options) {
138
144
  if (res) {
139
145
  console.log("\u{1F680}\u{1F680}\u{1F680}\u{1F680}\u{1F680}\u{1F680} \u8F6C\u7801\u6210\u529F", res);
140
146
  recordTaskStatusChange({ ...item, status: 0 }, 1);
141
- setTimeout(() => uploadSuccess(file), 200);
147
+ const { code, message } = await getMediaDetails(BASE_API, repoId, file.id);
148
+ if (code !== 0)
149
+ throw new Error(message);
150
+ const { file: fileList } = message;
151
+ const [resFile] = fileList.data;
152
+ setTimeout(() => uploadSuccess({ ...file, url: resFile.url }), 200);
142
153
  } else {
143
154
  console.log("\u{1F525}\u{1F525}\u{1F525}\u{1F525}\u{1F525} \u8F6C\u7801\u5931\u8D25\uFF1A", item);
144
155
  recordTaskStatusChange(
@@ -241,4 +252,4 @@ function useUploadConfig() {
241
252
  initUploadConfig
242
253
  };
243
254
  }
244
- export { addMedia, useUpload as default, getSize, reTranscodeMedia, useUploadConfig };
255
+ export { addMedia, useUpload as default, getMediaDetails, getSize, reTranscodeMedia, useUploadConfig };
package/es/selectResourceModal/components/ListContentLocal/index.js CHANGED
@@ -34,7 +34,7 @@ const _sfc_main = defineComponent({
34
34
  file.file,
35
35
  0,
36
36
  repoId.value,
37
- (media) => transcodingFile(baseAPI, media)
37
+ (media) => transcodingFile(baseAPI, media, repoId.value)
38
38
  );
39
39
  }
40
40
  async function handleOptions(e) {
@@ -52,7 +52,7 @@ const _sfc_main = defineComponent({
52
52
  return;
53
53
  if (!await reTranscode(baseAPI, e.item.mediaFile))
54
54
  return;
55
- transcodingFile(baseAPI, e.item.mediaFile);
55
+ transcodingFile(baseAPI, e.item.mediaFile, repoId.value);
56
56
  return;
57
57
  }
58
58
  if (e.key === "remove") {
package/lib/editMetaInfo/components/metaInfoForm.js CHANGED
@@ -50,7 +50,7 @@ const _sfc_main = vue.defineComponent({
50
50
  guide: "",
51
51
  keywords: [],
52
52
  author: "",
53
- duty_editor: "",
53
+ duty_editor: [],
54
54
  extra_attrs: [],
55
55
  self_publish_time: "",
56
56
  line_time: false,
@@ -214,9 +214,9 @@ const _sfc_main = vue.defineComponent({
214
214
  data.self_publish_time = data.self_publish_time && parseInt(data.self_publish_time, 10) * 1e3 || "";
215
215
  data.online_time = data.online_time && parseInt(data.online_time, 10) * 1e3 || "";
216
216
  data.offline_time = data.offline_time && parseInt(data.offline_time, 10) * 1e3 || "";
217
- data.keywords = data.keywords && data.keywords.split(",");
218
- data.duty_editor = data.duty_editor && data.duty_editor.split(",") || "";
219
- data.extra_attrs = data.extra_attrs && data.extra_attrs.split(",") || "";
217
+ data.keywords = data.keywords && data.keywords.split(",") || [];
218
+ data.duty_editor = data.duty_editor && data.duty_editor.split(",") || [];
219
+ data.extra_attrs = data.extra_attrs && data.extra_attrs.split(",") || [];
220
220
  data.relation_news = data.relation_news && JSON.parse(data.relation_news) || [];
221
221
  data.line_time = !!(data.online_time || data.offline_time);
222
222
  data.ori_read_count = Number(data.ori_read_count);
package/lib/hooks/useUpload.js CHANGED
@@ -14,7 +14,7 @@ function getSize(value) {
14
14
  do {
15
15
  value /= 1024;
16
16
  i++;
17
- } while (value > 1024);
17
+ } while (value >= 1024);
18
18
  return value.toFixed(2) + byteUnits[i];
19
19
  }
20
20
  function addMedia(BASE_API, params) {
@@ -24,6 +24,12 @@ function addMedia(BASE_API, params) {
24
24
  data: params
25
25
  });
26
26
  }
27
+ function getMediaDetails(BASE_API, repoId, id) {
28
+ return request(BASE_API, {
29
+ url: `/poplar/v2/repo/${repoId}/media?where=id__eq:${id}`,
30
+ method: "get"
31
+ });
32
+ }
27
33
  function reTranscodeMedia(BASE_API, media_id) {
28
34
  return request(BASE_API, {
29
35
  url: "/poplar/v3/attachment/re_transcoding",
@@ -123,7 +129,7 @@ function useUpload(options) {
123
129
  callback && callback(newFile, "fail");
124
130
  });
125
131
  };
126
- const transcodingFile = (BASE_API, file) => {
132
+ const transcodingFile = (BASE_API, file, repoId) => {
127
133
  if (!["video", "audio"].includes(file.catalog))
128
134
  return;
129
135
  const task = new transcodeMedia.TranscodingTask(file);
@@ -140,7 +146,12 @@ function useUpload(options) {
140
146
  if (res) {
141
147
  console.log("\u{1F680}\u{1F680}\u{1F680}\u{1F680}\u{1F680}\u{1F680} \u8F6C\u7801\u6210\u529F", res);
142
148
  recordTaskStatusChange({ ...item, status: 0 }, 1);
143
- setTimeout(() => uploadSuccess(file), 200);
149
+ const { code, message } = await getMediaDetails(BASE_API, repoId, file.id);
150
+ if (code !== 0)
151
+ throw new Error(message);
152
+ const { file: fileList } = message;
153
+ const [resFile] = fileList.data;
154
+ setTimeout(() => uploadSuccess({ ...file, url: resFile.url }), 200);
144
155
  } else {
145
156
  console.log("\u{1F525}\u{1F525}\u{1F525}\u{1F525}\u{1F525} \u8F6C\u7801\u5931\u8D25\uFF1A", item);
146
157
  recordTaskStatusChange(
@@ -245,6 +256,7 @@ function useUploadConfig() {
245
256
  }
246
257
  exports.addMedia = addMedia;
247
258
  exports["default"] = useUpload;
259
+ exports.getMediaDetails = getMediaDetails;
248
260
  exports.getSize = getSize;
249
261
  exports.reTranscodeMedia = reTranscodeMedia;
250
262
  exports.useUploadConfig = useUploadConfig;
package/lib/selectResourceModal/components/ListContentLocal/index.js CHANGED
@@ -35,7 +35,7 @@ const _sfc_main = vue.defineComponent({
35
35
  file.file,
36
36
  0,
37
37
  repoId.value,
38
- (media) => transcodingFile(baseAPI, media)
38
+ (media) => transcodingFile(baseAPI, media, repoId.value)
39
39
  );
40
40
  }
41
41
  async function handleOptions(e) {
@@ -53,7 +53,7 @@ const _sfc_main = vue.defineComponent({
53
53
  return;
54
54
  if (!await reTranscode(baseAPI, e.item.mediaFile))
55
55
  return;
56
- transcodingFile(baseAPI, e.item.mediaFile);
56
+ transcodingFile(baseAPI, e.item.mediaFile, repoId.value);
57
57
  return;
58
58
  }
59
59
  if (e.key === "remove") {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@cmstops/pro-compo",
3
- "version": "0.3.57",
3
+ "version": "0.3.59",
4
4
  "description": "",
5
5
  "keywords": [
6
6
  "vue",