From f75b00faefc23bcdd90649044d795f6a9f3c622d Mon Sep 17 00:00:00 2001 From: autosubmit Date: Tue, 26 Sep 2023 15:30:55 +0800 Subject: [PATCH] Auto Submit --- 35574.async.js | 140 +++++++++++++++++++++++++++++++++++++------------ 1 file changed, 106 insertions(+), 34 deletions(-) diff --git a/35574.async.js b/35574.async.js index f7cdbf52ed..aa1b8645a3 100644 --- a/35574.async.js +++ b/35574.async.js @@ -874,6 +874,10 @@ var dealList = function dealList(item) { } } var items = data.map(function (e) { + e.forEach(function (info) { + var arr = info.name.split('.'); + info.name = "".concat(arr[0], ".").concat(arr[1].toLowerCase()); + }); if (e[0].name.includes('.in')) { if (e.length === 2) { return e; @@ -917,7 +921,10 @@ var UploadFile = function UploadFile(_ref) { _useState8 = slicedToArray_default()(_useState7, 2), radioValue = _useState8[0], setRadioValue = _useState8[1]; - // const [uploadIndex, setUploadIndex] = useState(0); + var _useState9 = (0,react.useState)(null), + _useState10 = slicedToArray_default()(_useState9, 2), + isLocal = _useState10[0], + setIsLocal = _useState10[1]; var savedFileList = (0,react.useRef)([]); var uploadIndex = (0,react.useRef)(0); var handleCancel = function handleCancel() { @@ -943,22 +950,29 @@ var UploadFile = function UploadFile(_ref) { _context.prev = 0; _context.next = 3; return (0,utils_fetch/* default */.ZP)('/api/buckets/get_upload_token_for_big_files', { - method: "get" + method: 'get' }); case 3: _OSSData = _context.sent; - data = JSON.parse((0,components_UploadFile/* decrypt */.pe)(_OSSData.data)); - setOSSData(data); - _context.next = 10; + if ((_OSSData === null || _OSSData === void 0 ? void 0 : _OSSData.status) === 0) { + if (_OSSData !== null && _OSSData !== void 0 && _OSSData.is_oss) { + data = JSON.parse((0,components_UploadFile/* decrypt */.pe)(_OSSData.data)); + setOSSData(data); + setIsLocal(false); + } else { + setIsLocal(true); + } + } + _context.next = 9; break; - case 8: - _context.prev = 8; + case 7: + _context.prev = 7; _context.t0 = _context["catch"](0); - case 10: + case 9: case "end": return _context.stop(); } - }, _callee, null, [[0, 8]]); + }, _callee, null, [[0, 7]]); })); return function init() { return _ref2.apply(this, arguments); @@ -1028,6 +1042,62 @@ var UploadFile = function UploadFile(_ref) { }); return; } + if (isLocal) { + var _formData = new FormData(); + _formData.append('file', file.file); + _formData.append('identifier', rootIdentifier); + var _Target = (0,utils_fetch/* default */.ZP)("/api/attachments.json", { + method: 'post', + body: _formData + }, true); + _Target.then(function (result) { + if (!!result.filename) { + uploadIndex.current = uploadIndex.current + 1; + var files = savedFileList.current.map(function (v) { + if (v.name === (result === null || result === void 0 ? void 0 : result.filename)) { + var _result$filename; + var _obj2 = objectSpread2_default()(objectSpread2_default()({}, v), {}, { + is_oss: !isLocal + }); + if (result !== null && result !== void 0 && (_result$filename = result.filename) !== null && _result$filename !== void 0 && _result$filename.includes('.in')) { + _obj2.in_object_key = result === null || result === void 0 ? void 0 : result.object; + _obj2.in_object_size = result === null || result === void 0 ? void 0 : result.size; + _obj2.input = result === null || result === void 0 ? void 0 : result.filename; + _obj2.in_file = file; + } else { + _obj2.out_object_key = result === null || result === void 0 ? void 0 : result.object; + _obj2.out_object_size = result === null || result === void 0 ? void 0 : result.size; + _obj2.output = result === null || result === void 0 ? void 0 : result.filename; + _obj2.out_file = file; + } + return _obj2; + } + return v; + }); + savedFileList.current = toConsumableArray_default()(files); + setFileList(toConsumableArray_default()(files)); + if (uploadIndex.current > 0 && uploadIndex.current === fileList.length) { + setBtnLoading(false); + var array = dealList(files); + array = array.filter(function (e) { + var _e$3, _e$4; + return !!((_e$3 = e[0]) !== null && _e$3 !== void 0 && _e$3.name && (_e$4 = e[1]) !== null && _e$4 !== void 0 && _e$4.name); + }); + array = array.map(function (e) { + return objectSpread2_default()(objectSpread2_default()(objectSpread2_default()({}, e[0]), e[1]), {}, { + is_file: true + }); + }); + onOK(array); + onClose(); + } + } else { + setBtnLoading(false); + onClose(); + } + }); + return; + } var client = new (aliyun_oss_sdk_default())({ endpoint: OSSData.end_point, region: OSSData.region, @@ -1042,9 +1112,9 @@ var UploadFile = function UploadFile(_ref) { file_name: name }; var filename = (0,v4/* default */.Z)(); - var url = "testsets/".concat(rootIdentifier, "/").concat(filename).concat(name.indexOf(".") > -1 ? '.' + name.split(".").pop() : ""); + var url = "testsets/".concat(rootIdentifier, "/").concat(filename).concat(name.indexOf('.') > -1 ? '.' + name.split('.').pop() : ''); if (rootIdentifier === null) { - url = "testsets/".concat(filename).concat(name.indexOf(".") > -1 ? '.' + name.split(".").pop() : ""); + url = "testsets/".concat(filename).concat(name.indexOf('.') > -1 ? '.' + name.split('.').pop() : ''); } client.multipartUpload(url, new Blob([file.file], { type: file.file.type @@ -1066,21 +1136,23 @@ var UploadFile = function UploadFile(_ref) { var _result$data, _result$data$data; if (v.name === ((_result$data = result.data) === null || _result$data === void 0 ? void 0 : (_result$data$data = _result$data.data) === null || _result$data$data === void 0 ? void 0 : _result$data$data.file_name)) { var _result$data2, _result$data2$data, _result$data2$data$fi; - var _obj2 = objectSpread2_default()({}, v); + var _obj3 = objectSpread2_default()(objectSpread2_default()({}, v), {}, { + is_oss: !isLocal + }); if ((_result$data2 = result.data) !== null && _result$data2 !== void 0 && (_result$data2$data = _result$data2.data) !== null && _result$data2$data !== void 0 && (_result$data2$data$fi = _result$data2$data.file_name) !== null && _result$data2$data$fi !== void 0 && _result$data2$data$fi.includes('.in')) { var _result$data3, _result$data3$data, _result$data4, _result$data4$data, _result$data5, _result$data5$data; - _obj2.in_object_key = (_result$data3 = result.data) === null || _result$data3 === void 0 ? void 0 : (_result$data3$data = _result$data3.data) === null || _result$data3$data === void 0 ? void 0 : _result$data3$data.object; - _obj2.in_object_size = (_result$data4 = result.data) === null || _result$data4 === void 0 ? void 0 : (_result$data4$data = _result$data4.data) === null || _result$data4$data === void 0 ? void 0 : _result$data4$data.size; - _obj2.input = (_result$data5 = result.data) === null || _result$data5 === void 0 ? void 0 : (_result$data5$data = _result$data5.data) === null || _result$data5$data === void 0 ? void 0 : _result$data5$data.file_name; - _obj2.in_file = file; + _obj3.in_object_key = (_result$data3 = result.data) === null || _result$data3 === void 0 ? void 0 : (_result$data3$data = _result$data3.data) === null || _result$data3$data === void 0 ? void 0 : _result$data3$data.object; + _obj3.in_object_size = (_result$data4 = result.data) === null || _result$data4 === void 0 ? void 0 : (_result$data4$data = _result$data4.data) === null || _result$data4$data === void 0 ? void 0 : _result$data4$data.size; + _obj3.input = (_result$data5 = result.data) === null || _result$data5 === void 0 ? void 0 : (_result$data5$data = _result$data5.data) === null || _result$data5$data === void 0 ? void 0 : _result$data5$data.file_name; + _obj3.in_file = file; } else { var _result$data6, _result$data6$data, _result$data7, _result$data7$data, _result$data8, _result$data8$data; - _obj2.out_object_key = (_result$data6 = result.data) === null || _result$data6 === void 0 ? void 0 : (_result$data6$data = _result$data6.data) === null || _result$data6$data === void 0 ? void 0 : _result$data6$data.object; - _obj2.out_object_size = (_result$data7 = result.data) === null || _result$data7 === void 0 ? void 0 : (_result$data7$data = _result$data7.data) === null || _result$data7$data === void 0 ? void 0 : _result$data7$data.size; - _obj2.output = (_result$data8 = result.data) === null || _result$data8 === void 0 ? void 0 : (_result$data8$data = _result$data8.data) === null || _result$data8$data === void 0 ? void 0 : _result$data8$data.file_name; - _obj2.out_file = file; + _obj3.out_object_key = (_result$data6 = result.data) === null || _result$data6 === void 0 ? void 0 : (_result$data6$data = _result$data6.data) === null || _result$data6$data === void 0 ? void 0 : _result$data6$data.object; + _obj3.out_object_size = (_result$data7 = result.data) === null || _result$data7 === void 0 ? void 0 : (_result$data7$data = _result$data7.data) === null || _result$data7$data === void 0 ? void 0 : _result$data7$data.size; + _obj3.output = (_result$data8 = result.data) === null || _result$data8 === void 0 ? void 0 : (_result$data8$data = _result$data8.data) === null || _result$data8$data === void 0 ? void 0 : _result$data8$data.file_name; + _obj3.out_file = file; } - return _obj2; + return _obj3; } return v; }); @@ -1090,8 +1162,8 @@ var UploadFile = function UploadFile(_ref) { setBtnLoading(false); var array = dealList(files); array = array.filter(function (e) { - var _e$3, _e$4; - return !!((_e$3 = e[0]) !== null && _e$3 !== void 0 && _e$3.name && (_e$4 = e[1]) !== null && _e$4 !== void 0 && _e$4.name); + var _e$5, _e$6; + return !!((_e$5 = e[0]) !== null && _e$5 !== void 0 && _e$5.name && (_e$6 = e[1]) !== null && _e$6 !== void 0 && _e$6.name); }); array = array.map(function (e) { return objectSpread2_default()(objectSpread2_default()(objectSpread2_default()({}, e[0]), e[1]), {}, { @@ -1159,8 +1231,8 @@ var UploadFile = function UploadFile(_ref) { setBtnLoading(true); s = dealList(fileList); if (!s.some(function (e) { - var _e$5, _e$6; - return !((_e$5 = e[0]) !== null && _e$5 !== void 0 && _e$5.name && (_e$6 = e[1]) !== null && _e$6 !== void 0 && _e$6.name); + var _e$7, _e$8; + return !((_e$7 = e[0]) !== null && _e$7 !== void 0 && _e$7.name && (_e$8 = e[1]) !== null && _e$8 !== void 0 && _e$8.name); })) { _context5.next = 10; break; @@ -1385,10 +1457,10 @@ var UploadTable = function UploadTable(_ref6) { filename: "", dataUrl: "" }; - var _useState9 = (0,react.useState)(objectSpread2_default()({}, defaultConfig)), - _useState10 = slicedToArray_default()(_useState9, 2), - monacoValue = _useState10[0], - setMonacoValue = _useState10[1]; + var _useState11 = (0,react.useState)(objectSpread2_default()({}, defaultConfig)), + _useState12 = slicedToArray_default()(_useState11, 2), + monacoValue = _useState12[0], + setMonacoValue = _useState12[1]; var downloadLocal = function downloadLocal(item) { var a = document.createElement("a"); document.body.appendChild(a); @@ -1536,7 +1608,7 @@ var UploadTable = function UploadTable(_ref6) { }), /*#__PURE__*/(0,jsx_runtime.jsx)("div", { className: UploadFilemodules.listWrapper, children: data.map(function (e, i) { - var _e$7, _e$8, _e$9, _e$10; + var _e$9, _e$10, _e$11, _e$12; return /*#__PURE__*/(0,jsx_runtime.jsxs)("div", { className: UploadFilemodules.list, children: [showEvaluatingSetting && /*#__PURE__*/(0,jsx_runtime.jsx)("div", { @@ -1560,7 +1632,7 @@ var UploadTable = function UploadTable(_ref6) { width: showScore ? '25%' : '35%' }, children: /*#__PURE__*/(0,jsx_runtime.jsx)("span", { - title: e.input || ((_e$7 = e[0]) === null || _e$7 === void 0 ? void 0 : _e$7.name), + title: e.input || ((_e$9 = e[0]) === null || _e$9 === void 0 ? void 0 : _e$9.name), onClick: /*#__PURE__*/asyncToGenerator_default()( /*#__PURE__*/regeneratorRuntime_default()().mark(function _callee6() { var input_file_url, res; return regeneratorRuntime_default()().wrap(function _callee6$(_context6) { @@ -1622,7 +1694,7 @@ var UploadTable = function UploadTable(_ref6) { } }, _callee6); })), - children: e.input || ((_e$8 = e[0]) === null || _e$8 === void 0 ? void 0 : _e$8.name) + children: e.input || ((_e$10 = e[0]) === null || _e$10 === void 0 ? void 0 : _e$10.name) }) }), /*#__PURE__*/(0,jsx_runtime.jsx)("div", { className: UploadFilemodules.info, @@ -1630,7 +1702,7 @@ var UploadTable = function UploadTable(_ref6) { width: showScore ? '25%' : '35%' }, children: /*#__PURE__*/(0,jsx_runtime.jsx)("span", { - title: e.output || ((_e$9 = e[1]) === null || _e$9 === void 0 ? void 0 : _e$9.name), + title: e.output || ((_e$11 = e[1]) === null || _e$11 === void 0 ? void 0 : _e$11.name), onClick: /*#__PURE__*/asyncToGenerator_default()( /*#__PURE__*/regeneratorRuntime_default()().mark(function _callee7() { var input_file_url, res; return regeneratorRuntime_default()().wrap(function _callee7$(_context7) { @@ -1692,7 +1764,7 @@ var UploadTable = function UploadTable(_ref6) { } }, _callee7); })), - children: e.output || ((_e$10 = e[1]) === null || _e$10 === void 0 ? void 0 : _e$10.name) + children: e.output || ((_e$12 = e[1]) === null || _e$12 === void 0 ? void 0 : _e$12.name) }) }), showScore && /*#__PURE__*/(0,jsx_runtime.jsxs)("div", { style: {