venus-design 1.0.76 → 1.0.77

package/dist/Config/columnFilter.d.ts

@@ -55,7 +55,7 @@ export interface UltimateSearchProps<T> {
 export declare const createUltimateSearchNews: <T extends Record<string, any>>(config: UltimateSearchProps<T>) => ProColumns<T>;
 export declare const createUltimateSearch: <T extends Record<string, any>>(column: ProColumns<T>, dataIndex?: string, title?: string, socketSearch?: boolean, searchType?: 'flat' | 'tree', showHistory?: boolean, theme?: ThemeType) => ProColumns<T>;
 declare const _default: {
-    createUltimateSearch: <T extends Record<string, any>>(column: ProColumns<T>, dataIndex?: string, title?: string | undefined, socketSearch?: boolean, searchType?: "tree" | "flat", showHistory?: boolean, theme?: ThemeType) => ProColumns<T>;
+    createUltimateSearch: <T extends Record<string, any>>(column: ProColumns<T>, dataIndex?: string, title?: string | undefined, socketSearch?: boolean, searchType?: "flat" | "tree", showHistory?: boolean, theme?: ThemeType) => ProColumns<T>;
     createUltimateFilter: ({ dataIndex, title, dataSource, options, showSearch, showHistory, theme }: UltimateFilterProps) => Partial<ColumnType<any>>;
     createUltimateSearchNews: <T_1 extends Record<string, any>>(config: UltimateSearchProps<T_1>) => ProColumns<T_1>;
 };

package/dist/ProForm/index.d.ts

@@ -132,6 +132,12 @@ export declare const VenusFormSlider: (props: any) => React.JSX.Element;
  * @returns
  */
 export declare const VenusFormUploadPro: (props: any) => React.JSX.Element;
+/**
+ * 上传组件
+ * @param props
+ * @returns
+ */
+export declare const VenusFormEditor: (props: any) => React.JSX.Element;
 /**
  * 新上传组件
  */

package/dist/ProForm/index.js

@@ -66,13 +66,14 @@ var _excluded = ["children", "pageLoading", "pageFormClassName", "submitter", "s
   _excluded38 = ["comAttr", "placeholder", "disabled", "isDuo"],
   _excluded39 = ["comAttr", "placeholder", "disabled", "isDuo"],
   _excluded40 = ["comAttr", "placeholder", "disabled", "isDuo"],
-  _excluded41 = ["comAttr", "placeholder", "disabled", "isDuo"];
+  _excluded41 = ["comAttr", "placeholder", "disabled", "isDuo"],
+  _excluded42 = ["comAttr", "placeholder", "disabled", "isDuo"];
 function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
 function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
 import React from 'react';
 import classnames from 'classnames';
-import { CheckBoxInput, NumberPercent, NumberUnit, RadioAndInput, Search, TreeSelect, UploadImage, VenusUploadSecLevelForm, Upload, VenusUploadSecLevel } from "./..";
+import { CheckBoxInput, NumberPercent, NumberUnit, RadioAndInput, Search, TreeSelect, UploadImage, VenusUploadSecLevelForm, Upload, VenusUploadSecLevel, VenusEditor } from "./..";
 import "./styles.less";
 import { StyleProvider, legacyLogicalPropertiesTransformer } from "@ant-design/cssinjs";
 var ProForm = function ProForm(props) {
@@ -905,17 +906,32 @@ export var VenusFormUploadPro = function VenusFormUploadPro(props) {
     disabled: disabled
   }, comAttr)));
 };
-
 /**
- * 新上传组件
+ * 上传组件
+ * @param props 
+ * @returns 
  */
-export var VenusFormUploadSecLevel = function VenusFormUploadSecLevel(props) {
+export var VenusFormEditor = function VenusFormEditor(props) {
   var _props$comAttr36 = props.comAttr,
     comAttr = _props$comAttr36 === void 0 ? {} : _props$comAttr36,
     placeholder = props.placeholder,
     disabled = props.disabled,
     isDuo = props.isDuo,
     others = _objectWithoutProperties(props, _excluded41);
+  return /*#__PURE__*/React.createElement(FormItem2, others, /*#__PURE__*/React.createElement(VenusEditor, _extends({
+    disabled: disabled
+  }, comAttr)));
+};
+/**
+ * 新上传组件
+ */
+export var VenusFormUploadSecLevel = function VenusFormUploadSecLevel(props) {
+  var _props$comAttr37 = props.comAttr,
+    comAttr = _props$comAttr37 === void 0 ? {} : _props$comAttr37,
+    placeholder = props.placeholder,
+    disabled = props.disabled,
+    isDuo = props.isDuo,
+    others = _objectWithoutProperties(props, _excluded42);
   return /*#__PURE__*/React.createElement(FormItem2, others, /*#__PURE__*/React.createElement(VenusUploadSecLevel, _extends({
     placeholder: placeholder,
     isDuo: isDuo,

package/dist/VenusUploadSecLevel/index.js

@@ -17,16 +17,11 @@ function _extends() { _extends = Object.assign ? Object.assign.bind() : function
 function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return e; }; var t, e = {}, r = Object.prototype, n = r.hasOwnProperty, o = Object.defineProperty || function (t, e, r) { t[e] = r.value; }, i = "function" == typeof Symbol ? Symbol : {}, a = i.iterator || "@@iterator", c = i.asyncIterator || "@@asyncIterator", u = i.toStringTag || "@@toStringTag"; function define(t, e, r) { return Object.defineProperty(t, e, { value: r, enumerable: !0, configurable: !0, writable: !0 }), t[e]; } try { define({}, ""); } catch (t) { define = function define(t, e, r) { return t[e] = r; }; } function wrap(t, e, r, n) { var i = e && e.prototype instanceof Generator ? e : Generator, a = Object.create(i.prototype), c = new Context(n || []); return o(a, "_invoke", { value: makeInvokeMethod(t, r, c) }), a; } function tryCatch(t, e, r) { try { return { type: "normal", arg: t.call(e, r) }; } catch (t) { return { type: "throw", arg: t }; } } e.wrap = wrap; var h = "suspendedStart", l = "suspendedYield", f = "executing", s = "completed", y = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var p = {}; define(p, a, function () { return this; }); var d = Object.getPrototypeOf, v = d && d(d(values([]))); v && v !== r && n.call(v, a) && (p = v); var g = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(p); function defineIteratorMethods(t) { ["next", "throw", "return"].forEach(function (e) { define(t, e, function (t) { return this._invoke(e, t); }); }); } function AsyncIterator(t, e) { function invoke(r, o, i, a) { var c = tryCatch(t[r], t, o); if ("throw" !== c.type) { var u = c.arg, h = u.value; return h && "object" == _typeof(h) && n.call(h, "__await") ? e.resolve(h.__await).then(function (t) { invoke("next", t, i, a); }, function (t) { invoke("throw", t, i, a); }) : e.resolve(h).then(function (t) { u.value = t, i(u); }, function (t) { return invoke("throw", t, i, a); }); } a(c.arg); } var r; o(this, "_invoke", { value: function value(t, n) { function callInvokeWithMethodAndArg() { return new e(function (e, r) { invoke(t, n, e, r); }); } return r = r ? r.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(e, r, n) { var o = h; return function (i, a) { if (o === f) throw new Error("Generator is already running"); if (o === s) { if ("throw" === i) throw a; return { value: t, done: !0 }; } for (n.method = i, n.arg = a;;) { var c = n.delegate; if (c) { var u = maybeInvokeDelegate(c, n); if (u) { if (u === y) continue; return u; } } if ("next" === n.method) n.sent = n._sent = n.arg;else if ("throw" === n.method) { if (o === h) throw o = s, n.arg; n.dispatchException(n.arg); } else "return" === n.method && n.abrupt("return", n.arg); o = f; var p = tryCatch(e, r, n); if ("normal" === p.type) { if (o = n.done ? s : l, p.arg === y) continue; return { value: p.arg, done: n.done }; } "throw" === p.type && (o = s, n.method = "throw", n.arg = p.arg); } }; } function maybeInvokeDelegate(e, r) { var n = r.method, o = e.iterator[n]; if (o === t) return r.delegate = null, "throw" === n && e.iterator.return && (r.method = "return", r.arg = t, maybeInvokeDelegate(e, r), "throw" === r.method) || "return" !== n && (r.method = "throw", r.arg = new TypeError("The iterator does not provide a '" + n + "' method")), y; var i = tryCatch(o, e.iterator, r.arg); if ("throw" === i.type) return r.method = "throw", r.arg = i.arg, r.delegate = null, y; var a = i.arg; return a ? a.done ? (r[e.resultName] = a.value, r.next = e.nextLoc, "return" !== r.method && (r.method = "next", r.arg = t), r.delegate = null, y) : a : (r.method = "throw", r.arg = new TypeError("iterator result is not an object"), r.delegate = null, y); } function pushTryEntry(t) { var e = { tryLoc: t[0] }; 1 in t && (e.catchLoc = t[1]), 2 in t && (e.finallyLoc = t[2], e.afterLoc = t[3]), this.tryEntries.push(e); } function resetTryEntry(t) { var e = t.completion || {}; e.type = "normal", delete e.arg, t.completion = e; } function Context(t) { this.tryEntries = [{ tryLoc: "root" }], t.forEach(pushTryEntry, this), this.reset(!0); } function values(e) { if (e || "" === e) { var r = e[a]; if (r) return r.call(e); if ("function" == typeof e.next) return e; if (!isNaN(e.length)) { var o = -1, i = function next() { for (; ++o < e.length;) if (n.call(e, o)) return next.value = e[o], next.done = !1, next; return next.value = t, next.done = !0, next; }; return i.next = i; } } throw new TypeError(_typeof(e) + " is not iterable"); } return GeneratorFunction.prototype = GeneratorFunctionPrototype, o(g, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), o(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, u, "GeneratorFunction"), e.isGeneratorFunction = function (t) { var e = "function" == typeof t && t.constructor; return !!e && (e === GeneratorFunction || "GeneratorFunction" === (e.displayName || e.name)); }, e.mark = function (t) { return Object.setPrototypeOf ? Object.setPrototypeOf(t, GeneratorFunctionPrototype) : (t.__proto__ = GeneratorFunctionPrototype, define(t, u, "GeneratorFunction")), t.prototype = Object.create(g), t; }, e.awrap = function (t) { return { __await: t }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, c, function () { return this; }), e.AsyncIterator = AsyncIterator, e.async = function (t, r, n, o, i) { void 0 === i && (i = Promise); var a = new AsyncIterator(wrap(t, r, n, o), i); return e.isGeneratorFunction(r) ? a : a.next().then(function (t) { return t.done ? t.value : a.next(); }); }, defineIteratorMethods(g), define(g, u, "Generator"), define(g, a, function () { return this; }), define(g, "toString", function () { return "[object Generator]"; }), e.keys = function (t) { var e = Object(t), r = []; for (var n in e) r.push(n); return r.reverse(), function next() { for (; r.length;) { var t = r.pop(); if (t in e) return next.value = t, next.done = !1, next; } return next.done = !0, next; }; }, e.values = values, Context.prototype = { constructor: Context, reset: function reset(e) { if (this.prev = 0, this.next = 0, this.sent = this._sent = t, this.done = !1, this.delegate = null, this.method = "next", this.arg = t, this.tryEntries.forEach(resetTryEntry), !e) for (var r in this) "t" === r.charAt(0) && n.call(this, r) && !isNaN(+r.slice(1)) && (this[r] = t); }, stop: function stop() { this.done = !0; var t = this.tryEntries[0].completion; if ("throw" === t.type) throw t.arg; return this.rval; }, dispatchException: function dispatchException(e) { if (this.done) throw e; var r = this; function handle(n, o) { return a.type = "throw", a.arg = e, r.next = n, o && (r.method = "next", r.arg = t), !!o; } for (var o = this.tryEntries.length - 1; o >= 0; --o) { var i = this.tryEntries[o], a = i.completion; if ("root" === i.tryLoc) return handle("end"); if (i.tryLoc <= this.prev) { var c = n.call(i, "catchLoc"), u = n.call(i, "finallyLoc"); if (c && u) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } else if (c) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); } else { if (!u) throw new Error("try statement without catch or finally"); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } } } }, abrupt: function abrupt(t, e) { for (var r = this.tryEntries.length - 1; r >= 0; --r) { var o = this.tryEntries[r]; if (o.tryLoc <= this.prev && n.call(o, "finallyLoc") && this.prev < o.finallyLoc) { var i = o; break; } } i && ("break" === t || "continue" === t) && i.tryLoc <= e && e <= i.finallyLoc && (i = null); var a = i ? i.completion : {}; return a.type = t, a.arg = e, i ? (this.method = "next", this.next = i.finallyLoc, y) : this.complete(a); }, complete: function complete(t, e) { if ("throw" === t.type) throw t.arg; return "break" === t.type || "continue" === t.type ? this.next = t.arg : "return" === t.type ? (this.rval = this.arg = t.arg, this.method = "return", this.next = "end") : "normal" === t.type && e && (this.next = e), y; }, finish: function finish(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.finallyLoc === t) return this.complete(r.completion, r.afterLoc), resetTryEntry(r), y; } }, catch: function _catch(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.tryLoc === t) { var n = r.completion; if ("throw" === n.type) { var o = n.arg; resetTryEntry(r); } return o; } } throw new Error("illegal catch attempt"); }, delegateYield: function delegateYield(e, r, n) { return this.delegate = { iterator: values(e), resultName: r, nextLoc: n }, "next" === this.method && (this.arg = t), y; } }, e; }
 function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
 function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
-function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
-function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
-function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
-function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
-function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
@@ -55,72 +50,78 @@ var VenusUploadSecLevel = function VenusUploadSecLevel(props) {
     _useState6 = _slicedToArray(_useState5, 2),
     level = _useState6[0],
     setLevel = _useState6[1];
+  // 外部只给“已完成”数据，用 map 快速索引
   useEffect(function () {
-    // 外部只给“已完成”数据，用 map 快速索引
+    var outerMap = new Map(
     //@ts-ignore
-    var outerMap = new Map((props.value || []).map(function (f) {
-      return [f.uid || f.fileId, f];
+    (props.value || []).map(function (f) {
+      return [f.fileId || f.uid, f];
     }));
+
+    // 回显层只更新“已完成”部分的信息，不动正在上传的
     setFileList(function (prev) {
-      var _prev$map;
-      return (_prev$map = prev.map(function (file) {
-        // 回显层只更新“已完成”部分的信息，不动正在上传的
-        var target = outerMap.get(file.uid || file.fileId);
+      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;
-      })).concat.apply(_prev$map, _toConsumableArray((props.value || []).filter(function (f) {
-        return !prev.some(function (p) {
-          return p.uid === f.uid || p.fileId === f.fileId;
-        });
-      })));
+      });
     });
-  }, [props.value]);
-  /**
-   * 上传文件
-   */
+  }, [props.value, level]);
+  // 上传完成后，更新 fileList 里的信息
   var onChange = function onChange(info) {
-    var files = [];
     var dataLevel = [];
-    (props.value || []).map(function (v, n) {
+    (props.value || []).forEach(function (v) {
       dataLevel[v.id] = v.secId;
     });
-    var _iterator = _createForOfIteratorHelper(info.fileList),
-      _step;
-    try {
-      for (_iterator.s(); !(_step = _iterator.n()).done;) {
-        var file = _step.value;
-        if (file.response && file.response.success) {
-          file.id = file.response.data.id;
-          file.secId = dataLevel[file.fileId] != undefined ? {
-            label: dataLevel[file.fileId].label,
-            value: dataLevel[file.fileId].value
-          } : level && level[file.fileId] != undefined ? {
-            label: level[file.fileId].label,
-            value: level[file.fileId].value
-          } : undefined;
-          files.push(file);
-        }
-        if (file.response == undefined) {
-          files.push(file);
-        }
-        if (file.response && !file.response.success) {
-          _message.warning("文件上传失败！请重新上传！");
-        }
+
+    /* ---------- 1. 收集本次失败的 uid ---------- */
+    var failedUids = [];
+    info.fileList.forEach(function (f) {
+      if (f.response && !f.response.success) {
+        failedUids.push(f.uid);
       }
-    } catch (err) {
-      _iterator.e(err);
-    } finally {
-      _iterator.f();
+    });
+    if (failedUids.length) {
+      _message.warning('文件上传失败！请重新上传');
     }
-    setFileList(files);
-    // 保留：已有 fileId  或  新上传成功
-    var doneFiles = files.filter(function (f) {
+
+    /* ---------- 2. 双键 Map：优先 fileId，其次 uid ---------- */
+    var fileMap = new Map();
+    fileList.forEach(function (f) {
+      var key = f.fileId || f.uid;
+      fileMap.set(key, f);
+    });
+    // 上传完成后，更新 fileList 里的信息
+    info.fileList.forEach(function (f) {
       var _f$response;
-      return f.fileId || ((_f$response = f.response) === null || _f$response === void 0 ? void 0 : _f$response.success);
+      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;
+        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;
+      }
+      fileMap.set(key, target);
+    });
+
+    /* ---------- 3. 把失败项从 Map 里删掉 ---------- */
+    failedUids.forEach(function (uid) {
+      var key = uid; // 失败文件一定没有 fileId，直接用 uid
+      fileMap.delete(key);
     });
-    propsOnChange(doneFiles);
+    // 4. 合并 Map 里的项
+    var merged = Array.from(fileMap.values());
+    setFileList(merged);
+
+    /* ---------- 4. 写给表单的依旧是“已完成” ---------- */
+    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);
+    }));
   };
+  // 上传完成后，调用表单的 onChange 回调
   var propsOnChange = function propsOnChange(files) {
     if (props.onChange) {
       props.onChange(files);
@@ -128,7 +129,7 @@ var VenusUploadSecLevel = function VenusUploadSecLevel(props) {
   };
   //删除文件
   var onRemove = /*#__PURE__*/function () {
-    var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(file) {
+    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(file) {
       var res;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
@@ -139,9 +140,11 @@ var VenusUploadSecLevel = function VenusUploadSecLevel(props) {
             res = _context.sent;
             if (res && res.success) {
               _message.success(res.message);
-              setFileList(fileList.filter(function (f) {
-                return f.fileId !== file.fileId;
-              }));
+              setFileList(function (prev) {
+                return prev.filter(function (f) {
+                  return (f.fileId || f.uid) !== (file.fileId || file.uid);
+                });
+              });
             }
           case 4:
           case "end":
@@ -150,7 +153,7 @@ var VenusUploadSecLevel = function VenusUploadSecLevel(props) {
       }, _callee);
     }));
     return function onRemove(_x) {
-      return _ref.apply(this, arguments);
+      return _ref2.apply(this, arguments);
     };
   }();
   /*  
@@ -158,34 +161,25 @@ var VenusUploadSecLevel = function VenusUploadSecLevel(props) {
    * @param info 
    */
   var onSelectLevelChange = function onSelectLevelChange() {
-    var files = [];
     var dataLevel = [];
-    (props.value || []).map(function (v, n) {
+    (props.value || []).forEach(function (v) {
       dataLevel[v.id] = v.secId;
     });
-    var _iterator2 = _createForOfIteratorHelper(fileList),
-      _step2;
-    try {
-      for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
-        var file = _step2.value;
-        file.secId = dataLevel[file.fileId] != undefined ? {
-          label: dataLevel[file.fileId].label,
-          value: dataLevel[file.fileId].value
-        } : level && level[file.fileId] != undefined ? {
-          label: level[file.fileId].label,
-          value: level[file.fileId].value
-        } : undefined;
-        files.push(file);
-      }
-    } catch (err) {
-      _iterator2.e(err);
-    } finally {
-      _iterator2.f();
-    }
-    setFileList(files);
-    propsOnChange(files.filter(function (f) {
-      var _f$response2;
-      return f.fileId || ((_f$response2 = f.response) === null || _f$response2 === void 0 ? void 0 : _f$response2.success);
+
+    /* 1. 双键 Map 去重：优先 fileId，其次 uid */
+    var fileMap = new Map();
+    fileList.forEach(function (f) {
+      var _ref3, _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;
+      fileMap.set(key, f);
+    });
+    var merged = Array.from(fileMap.values());
+    setFileList(merged);
+    propsOnChange(merged.filter(function (f) {
+      var _f$response3;
+      return f.fileId || ((_f$response3 = f.response) === null || _f$response3 === void 0 ? void 0 : _f$response3.success);
     }));
   };
   // 密级改变时，更新文件密级
@@ -199,28 +193,34 @@ var VenusUploadSecLevel = function VenusUploadSecLevel(props) {
    * 选择密级
    */
   var onSelectLevel = /*#__PURE__*/function () {
-    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(v, file) {
-      var fileId;
+    var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(v, file) {
+      var _file$response;
+      var key, fileId;
       return _regeneratorRuntime().wrap(function _callee2$(_context2) {
         while (1) switch (_context2.prev = _context2.next) {
           case 0:
-            //设置表单属性
-            setLevel(_objectSpread(_objectSpread({}, level), {}, _defineProperty({}, file.uid, v)));
-            if (!(file.fileId || file.response != undefined && file.response.code == 200)) {
-              _context2.next = 5;
+            // 1. 函数式更新，用参数 prev 而不是外部 level
+            key = file.fileId || file.uid; //@ts-ignore
+            setLevel(function (prev) {
+              return _objectSpread(_objectSpread({}, prev), {}, _defineProperty({}, key, v));
+            });
+
+            // 2. 调接口依旧用 fileId
+            if (!(file.fileId || (_file$response = file.response) !== null && _file$response !== void 0 && _file$response.success)) {
+              _context2.next = 6;
               break;
             }
             fileId = file.fileId || file.response.data.fileId;
-            _context2.next = 5;
+            _context2.next = 6;
             return updateFileSecLevelNew(fileId, v.value);
-          case 5:
+          case 6:
           case "end":
             return _context2.stop();
         }
       }, _callee2);
     }));
     return function onSelectLevel(_x2, _x3) {
-      return _ref2.apply(this, arguments);
+      return _ref4.apply(this, arguments);
     };
   }();
   //上传前的控制
@@ -258,7 +258,7 @@ var VenusUploadSecLevel = function VenusUploadSecLevel(props) {
     },
     itemRender: function itemRender(originNode, file, fileList, actions) {
       return /*#__PURE__*/React.createElement(FileCard, {
-        key: file.fileId,
+        key: "".concat(file.fileId || file.uid),
         style: {
           backgroundColor: props.disabled ? "#f5f5f5" : ""
         },

package/package.json

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