venus-design 1.0.83 → 1.0.85

package/dist/VenusForm/staticAttr.js

@@ -842,7 +842,6 @@ export var VENUS_FORM_ITEM_TYPE = {
   //带后缀的文本输入框（暂不实现）
   "textUnit": function textUnit() {},
   "uploadSecLevel": function uploadSecLevel(column, type, disabled, formData) {
-    var _formData$column$para, _formData$column$para2, _column$parameterSour;
     return /*#__PURE__*/React.createElement(VenusFormUploadSecLevel, {
       width: "md",
       className: column.formItemClassName,
@@ -862,7 +861,7 @@ export var VENUS_FORM_ITEM_TYPE = {
       //@ts-ignore
       ,
       comAttr: column.parameterSource.uploadSecField && {
-        secId: (_formData$column$para = (_formData$column$para2 = formData[column === null || column === void 0 || (_column$parameterSour = column.parameterSource) === null || _column$parameterSour === void 0 ? void 0 : _column$parameterSour.uploadSecField]) === null || _formData$column$para2 === void 0 ? void 0 : _formData$column$para2.value) !== null && _formData$column$para !== void 0 ? _formData$column$para : ''
+        secId: formData[column.parameterSource.uploadSecField] && formData[column.parameterSource.uploadSecField].value
       },
       rules: [{
         //是否必填通过其他字段判断时可使用required：{label:string,fieldName:string,value:any}

package/dist/VenusUploadSecLevel/index.js

@@ -52,26 +52,31 @@ var VenusUploadSecLevel = function VenusUploadSecLevel(props) {
     _useState6 = _slicedToArray(_useState5, 2),
     level = _useState6[0],
     setLevel = _useState6[1];
-
-  // 外部只给“已完成”数据，用 map 快速索引
   useEffect(function () {
-    var outerMap = new Map(
     //@ts-ignore
-    (props.value || []).map(function (f) {
-      return [f.fileId || f.uid, f];
-    }));
-
-    // 回显层只更新“已完成”部分的信息，不动正在上传的
-    setFileList(function (prev) {
-      return prev.map(function (file) {
-        var key = file.fileId || file.uid;
-        var target = outerMap.get(key);
-        return target ? _objectSpread(_objectSpread(_objectSpread({}, file), target), {}, {
-          status: 'done'
-        }) : file;
+    var next = (props.value || []).map(function (f) {
+      return _objectSpread(_objectSpread({}, f), {}, {
+        status: 'done'
       });
     });
-  }, [props.value, level]);
+
+    /* 1. 先把正在上传的项保留下来（status === 'uploading'）*/
+    var uploading = fileList.filter(function (f) {
+      return f.status === 'uploading';
+    });
+
+    /* 2. 用 Map 去重：以 fileId 为 key */
+    var map = new Map();
+    //@ts-ignore
+    next.forEach(function (f) {
+      return map.set(f.fileId, f);
+    }); // 外部数据优先
+    uploading.forEach(function (f) {
+      return map.set(f.uid, f);
+    }); // 正在上传的也保留
+
+    setFileList(Array.from(map.values()));
+  }, [props.value]);
   var onChange = function onChange(info) {
     var file = info.file,
       newFileList = info.fileList;
@@ -329,10 +334,19 @@ var VenusUploadSecLevel = function VenusUploadSecLevel(props) {
         }
       })), !uploading && /*#__PURE__*/React.createElement(_Tooltip, {
         title: "\u4E0B\u8F7D"
-      }, /*#__PURE__*/React.createElement("a", {
-        href: downloadFile(file.fileId),
-        download: file.name
-      }, /*#__PURE__*/React.createElement(DownloadOutlined, null))), /*#__PURE__*/React.createElement(_Tooltip, {
+      }, /*#__PURE__*/React.createElement(DownLoad, {
+        hideProgress: true,
+        params: {
+          method: 'get'
+        },
+        fileName: function fileName() {
+          return file.name;
+        },
+        text: /*#__PURE__*/React.createElement("a", {
+          rel: "noopener noreferrer"
+        }, /*#__PURE__*/React.createElement(DownloadOutlined, null)),
+        loadUrl: downloadFile(file.fileId)
+      })), /*#__PURE__*/React.createElement(_Tooltip, {
         title: "\u5220\u9664"
       }, /*#__PURE__*/React.createElement(DeleteOutlined, {
         style: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "venus-design",
-  "version": "1.0.83",
+  "version": "1.0.85",
   "description": "venus all compoments",
   "module": "dist/index.js",
   "types": "dist/index.d.ts",