venus-design 1.0.77 → 1.0.79

package/dist/VenusForm/index.js

@@ -229,6 +229,9 @@ var VenusForm = /*#__PURE__*/forwardRef(function (props, ref) {
             if (fieldIds.includes(node.fieldId)) {
               //@ts-ignore
               node.nonEditableScene = disabled ? 'EDIT' : null;
+            } else {
+              //@ts-ignore
+              node.nonEditableScene = null;
             }
           });
           return clone;
@@ -242,6 +245,9 @@ var VenusForm = /*#__PURE__*/forwardRef(function (props, ref) {
             if (!fieldIds.includes(node.fieldId)) {
               //@ts-ignore
               node.nonEditableScene = disabled ? 'EDIT' : null;
+            } else {
+              //@ts-ignore
+              node.nonEditableScene = null;
             }
           });
           return clone;

package/dist/VenusUploadSecLevel/index.js

@@ -5,6 +5,8 @@ import "antd/es/button/style";
 import _Button from "antd/es/button";
 import "antd/es/tooltip/style";
 import _Tooltip from "antd/es/tooltip";
+import "antd/es/progress/style";
+import _Progress from "antd/es/progress";
 import "antd/es/message/style";
 import _message from "antd/es/message";
 import "antd/es/upload/style";
@@ -50,6 +52,7 @@ var VenusUploadSecLevel = function VenusUploadSecLevel(props) {
     _useState6 = _slicedToArray(_useState5, 2),
     level = _useState6[0],
     setLevel = _useState6[1];
+
   // 外部只给“已完成”数据，用 map 快速索引
   useEffect(function () {
     var outerMap = new Map(
@@ -69,53 +72,91 @@ var VenusUploadSecLevel = function VenusUploadSecLevel(props) {
       });
     });
   }, [props.value, level]);
-  // 上传完成后，更新 fileList 里的信息
   var onChange = function onChange(info) {
+    var file = info.file,
+      newFileList = info.fileList;
+
+    /* 0. 预计算：外部已完成的密级映射 */
     var dataLevel = [];
     (props.value || []).forEach(function (v) {
       dataLevel[v.id] = v.secId;
     });
 
-    /* ---------- 1. 收集本次失败的 uid ---------- */
-    var failedUids = [];
-    info.fileList.forEach(function (f) {
-      if (f.response && !f.response.success) {
-        failedUids.push(f.uid);
-      }
+    /* 0.5 如果 antd 已经标记为 error，直接删掉（保持原来“失败物理删除”逻辑）*/
+    var cleanedList = newFileList.filter(function (f) {
+      return f.status !== 'error';
     });
-    if (failedUids.length) {
-      _message.warning('文件上传失败！请重新上传');
+
+    /* 1. 用清理后的列表继续走你原有逻辑 */
+    setFileList(cleanedList);
+
+    /* 2. 仅当“当前文件” done 时，再决定 success / error */
+    if (file.status === 'done' && file.response) {
+      if (file.response.success) {
+        /* 2.1 真正成功 -> 补充 fileId 与密级 */
+        setFileList(function (prev) {
+          var map = new Map(prev.map(function (f) {
+            return [f.uid, f];
+          }));
+          var target = map.get(file.uid);
+          if (target) {
+            var _ref, _dataLevel$target$fil;
+            target.status = 'done';
+            target.percent = 100;
+            target.fileId = file.response.data.fileId;
+            target.secId = (_ref = (_dataLevel$target$fil = dataLevel[target.fileId]) !== null && _dataLevel$target$fil !== void 0 ? _dataLevel$target$fil :
+            // 外部表单里已有
+            level && level[target.fileId]) !== null && _ref !== void 0 ? _ref :
+            // 组件内刚选的
+            undefined;
+          }
+          return Array.from(map.values());
+        });
+      } else {
+        /* 2.2 后端明确失败 -> 标红但不删除（也可删除，按你原逻辑）*/
+        setFileList(function (prev) {
+          var map = new Map(prev.map(function (f) {
+            return [f.uid, f];
+          }));
+          var target = map.get(file.uid);
+          if (target) target.status = 'error';
+          return Array.from(map.values());
+        });
+        _message.error(file.response.message || '文件上传失败！请重新上传');
+      }
     }
 
-    /* ---------- 2. 双键 Map：优先 fileId，其次 uid ---------- */
+    /* 3. 用你原来的“双键 Map”再合并一次，保证 fileId / secId 不丢 */
     var fileMap = new Map();
     fileList.forEach(function (f) {
       var key = f.fileId || f.uid;
       fileMap.set(key, f);
     });
-    // 上传完成后，更新 fileList 里的信息
-    info.fileList.forEach(function (f) {
+    //@ts-ignore
+    newFileList.forEach(function (f) {
       var _f$response;
       var key = f.fileId || f.uid;
       var target = _objectSpread({}, f);
       if ((_f$response = f.response) !== null && _f$response !== void 0 && _f$response.success) {
-        var _ref, _dataLevel$target$fil;
+        var _ref2, _dataLevel$target$fil2;
         target.fileId = f.response.data.fileId;
-        target.secId = (_ref = (_dataLevel$target$fil = dataLevel[target.fileId]) !== null && _dataLevel$target$fil !== void 0 ? _dataLevel$target$fil : level && level[target.fileId]) !== null && _ref !== void 0 ? _ref : undefined;
+        target.secId = (_ref2 = (_dataLevel$target$fil2 = dataLevel[target.fileId]) !== null && _dataLevel$target$fil2 !== void 0 ? _dataLevel$target$fil2 : level && level[target.fileId]) !== null && _ref2 !== void 0 ? _ref2 : undefined;
       }
       fileMap.set(key, target);
     });
 
-    /* ---------- 3. 把失败项从 Map 里删掉 ---------- */
+    /* 4. 把失败的项物理删除（同原逻辑）*/
+    var failedUids = [];
+    newFileList.forEach(function (f) {
+      if (f.response && !f.response.success) failedUids.push(f.uid);
+    });
     failedUids.forEach(function (uid) {
-      var key = uid; // 失败文件一定没有 fileId，直接用 uid
-      fileMap.delete(key);
+      return fileMap.delete(uid);
     });
-    // 4. 合并 Map 里的项
     var merged = Array.from(fileMap.values());
     setFileList(merged);
 
-    /* ---------- 4. 写给表单的依旧是“已完成” ---------- */
+    /* 5. 只回写“已完成”给表单 */
     propsOnChange(merged.filter(function (f) {
       var _f$response2;
       return f.fileId || ((_f$response2 = f.response) === null || _f$response2 === void 0 ? void 0 : _f$response2.success);
@@ -129,7 +170,7 @@ var VenusUploadSecLevel = function VenusUploadSecLevel(props) {
   };
   //删除文件
   var onRemove = /*#__PURE__*/function () {
-    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(file) {
+    var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(file) {
       var res;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
@@ -153,7 +194,7 @@ var VenusUploadSecLevel = function VenusUploadSecLevel(props) {
       }, _callee);
     }));
     return function onRemove(_x) {
-      return _ref2.apply(this, arguments);
+      return _ref3.apply(this, arguments);
     };
   }();
   /*  
@@ -169,10 +210,10 @@ var VenusUploadSecLevel = function VenusUploadSecLevel(props) {
     /* 1. 双键 Map 去重：优先 fileId，其次 uid */
     var fileMap = new Map();
     fileList.forEach(function (f) {
-      var _ref3, _dataLevel$f$fileId;
+      var _ref4, _dataLevel$f$fileId;
       var key = f.fileId || f.uid;
       // 更新 secId
-      f.secId = (_ref3 = (_dataLevel$f$fileId = dataLevel[f.fileId]) !== null && _dataLevel$f$fileId !== void 0 ? _dataLevel$f$fileId : level && level[f.fileId]) !== null && _ref3 !== void 0 ? _ref3 : undefined;
+      f.secId = (_ref4 = (_dataLevel$f$fileId = dataLevel[f.fileId]) !== null && _dataLevel$f$fileId !== void 0 ? _dataLevel$f$fileId : level && level[f.fileId]) !== null && _ref4 !== void 0 ? _ref4 : undefined;
       fileMap.set(key, f);
     });
     var merged = Array.from(fileMap.values());
@@ -193,7 +234,7 @@ var VenusUploadSecLevel = function VenusUploadSecLevel(props) {
    * 选择密级
    */
   var onSelectLevel = /*#__PURE__*/function () {
-    var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(v, file) {
+    var _ref5 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(v, file) {
       var _file$response;
       var key, fileId;
       return _regeneratorRuntime().wrap(function _callee2$(_context2) {
@@ -220,17 +261,16 @@ var VenusUploadSecLevel = function VenusUploadSecLevel(props) {
       }, _callee2);
     }));
     return function onSelectLevel(_x2, _x3) {
-      return _ref4.apply(this, arguments);
+      return _ref5.apply(this, arguments);
     };
   }();
-  //上传前的控制
+  /* ---------- 2. beforeUpload：强制 status=uploading ---------- */
   var handleBeforeUpload = function handleBeforeUpload(file) {
     if (file.size > MAX_SIZE) {
       _message.error('文件大小不能超过 100MB');
-      return _Upload.LIST_IGNORE; // Ant Design 中阻止上传
-      // 或者 return false; // 原生 input 阻止上传
+      return _Upload.LIST_IGNORE;
     }
-    return true;
+    return true; // 继续上传
   };
   var Component = props.component && props.component == "Dragger" ? Dragger : _Upload;
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(_Spin, {
@@ -238,25 +278,10 @@ var VenusUploadSecLevel = function VenusUploadSecLevel(props) {
   }, /*#__PURE__*/React.createElement(Component, _extends({
     beforeUpload: handleBeforeUpload,
     disabled: props.disabled,
-    showUploadList: {
-      showDownloadIcon: true,
-      downloadIcon: function downloadIcon(file) {
-        return /*#__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)
-        });
-      }
-    },
     itemRender: function itemRender(originNode, file, fileList, actions) {
+      /* 上传中 / 成功 / 失败 不同 UI */
+      var uploading = file.status === 'uploading';
+      var error = file.status === 'error';
       return /*#__PURE__*/React.createElement(FileCard, {
         key: "".concat(file.fileId || file.uid),
         style: {
@@ -266,7 +291,21 @@ var VenusUploadSecLevel = function VenusUploadSecLevel(props) {
       }, /*#__PURE__*/React.createElement(FileInfo, null, /*#__PURE__*/React.createElement("span", {
         className: "name",
         title: file.name
-      }, file.name)), /*#__PURE__*/React.createElement(Actions, null, /*#__PURE__*/React.createElement(Item, {
+      }, file.name), uploading && /*#__PURE__*/React.createElement("div", {
+        style: {
+          width: 180,
+          marginTop: 4
+        }
+      }, /*#__PURE__*/React.createElement(_Progress, {
+        percent: Math.round(file.percent || 0),
+        size: "small",
+        strokeColor: "#1890ff"
+      })), error && /*#__PURE__*/React.createElement("span", {
+        style: {
+          color: '#ff4d4f',
+          fontSize: 12
+        }
+      }, "\u4E0A\u4F20\u5931\u8D25")), /*#__PURE__*/React.createElement(Actions, null, /*#__PURE__*/React.createElement(Item, {
         layout: "horizontal"
         // 关键：让表单知道这是 fileList[index].secId
         ,
@@ -288,7 +327,7 @@ var VenusUploadSecLevel = function VenusUploadSecLevel(props) {
         style: {
           width: 120
         }
-      })), /*#__PURE__*/React.createElement(_Tooltip, {
+      })), !uploading && /*#__PURE__*/React.createElement(_Tooltip, {
         title: "\u4E0B\u8F7D"
       }, /*#__PURE__*/React.createElement("a", {
         href: downloadFile(file.fileId),
@@ -299,7 +338,7 @@ var VenusUploadSecLevel = function VenusUploadSecLevel(props) {
         style: {
           color: 'red'
         },
-        disabled: props.disabled,
+        disabled: props.disabled || uploading,
         onClick: function onClick() {
           return onRemove(file);
         }

package/package.json

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