venus-design 1.0.74 → 1.0.76

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?: "flat" | "tree", showHistory?: boolean, theme?: ThemeType) => ProColumns<T>;
+    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>;
     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/VenusTable/index.js

@@ -93,9 +93,9 @@ var VenusTable = /*#__PURE__*/forwardRef(function (props, ref) {
   /**
    * 分页信息
    */
-  var pageInfoPagin = storage.getSessionItem("pagination_" + props.dataSceneIid); //分页信息
-  var filtersVenus = storage.getSessionItem("filters_" + props.dataSceneIid); //列筛选
-  var dataParamVenus = storage.getSessionItem("dataParam_" + props.dataSceneIid); //过滤条件
+  var pageInfoPagin = storage.getSessionItem("pagination_" + props.dataSceneIid + props.key || ""); //分页信息
+  var filtersVenus = storage.getSessionItem("filters_" + props.dataSceneIid + props.key || ""); //列筛选
+  var dataParamVenus = storage.getSessionItem("dataParam_" + props.dataSceneIid + props.key || ""); //过滤条件
   var _useState7 = useState(dataParamVenus || []),
     _useState8 = _slicedToArray(_useState7, 2),
     dataParam = _useState8[0],
@@ -265,8 +265,9 @@ var VenusTable = /*#__PURE__*/forwardRef(function (props, ref) {
   var onChangeTable = function onChangeTable(pagination, filters, sorter, data) {
     setPageInfo(pagination); //分页信息
     setFilters(filters); //过滤信息
-    storage.setSessionItem("pagination_" + props.dataSceneIid, pagination); //分页信息
-    storage.setSessionItem("filters_" + props.dataSceneIid, filters); //过滤信息
+    var key = props.key || "";
+    storage.setSessionItem("pagination_" + props.dataSceneIid + key, pagination); //分页信息
+    storage.setSessionItem("filters_" + props.dataSceneIid + key, filters); //过滤信息
     var dataParamBefore = handleFilterDataParams(filters); //组装过滤条件
     if (props.onChangeTable) {
       props.onChangeTable(pagination, filters, dataParamBefore, sorter, data);

package/dist/VenusTable/interface.d.ts

@@ -42,6 +42,7 @@ export default interface VenusTableType {
     exportFileName?: String;
     scroll?: any;
     alwaysShowAlert?: boolean;
+    key?: string;
     onChangeTable?: Function;
     filters?: VenusEnumType[];
     tableAlertRender?: boolean;

package/dist/VenusTable/staticAttr.js

@@ -513,7 +513,7 @@ export var VENUS_TABLE_COLUMNRENDER_TYPE = {
       /* 统一回写 */
       var finishEdit = function finishEdit(newVal) {
         actions.toggleEdit(key, false);
-        actions.onUpdateFields(column.fieldId, newVal, record.innerId);
+        actions.onUpdateFields(column.fieldId, newVal, record.innerId, record);
       };
 
       /* 非编辑态 */

package/dist/VenusUploadSecLevel/demoDrag.d.ts

@@ -0,0 +1,3 @@
+import React from 'react';
+declare const Demo: React.FC;
+export default Demo;

package/dist/VenusUploadSecLevel/demoDrag.js

@@ -0,0 +1,67 @@
+import "antd/es/button/style";
+import _Button from "antd/es/button";
+import "antd/es/form/style";
+import _Form from "antd/es/form";
+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); }
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
+function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
+function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
+import { VenusUploadSecLevel } from "./..";
+import React, { useState, useRef } from 'react';
+var Demo = function Demo() {
+  var _useState = useState([{
+      fileId: "sdfs",
+      name: "5555.txt"
+    }, {
+      fileId: "asdfasd",
+      name: "5555.docx"
+    }]),
+    _useState2 = _slicedToArray(_useState, 2),
+    files = _useState2[0],
+    setFiles = _useState2[1];
+  var ref = useRef(null);
+  var _Form$useForm = _Form.useForm(),
+    _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
+    form = _Form$useForm2[0];
+  form.setFieldsValue({
+    file1: [{
+      fileId: "sdfs",
+      name: "5555.txt"
+    }, {
+      fileId: "asdfasd",
+      name: "5555.docx"
+    }],
+    sdfs: {
+      secId: {
+        label: "内部",
+        value: 6
+      }
+    }
+  });
+  return /*#__PURE__*/React.createElement(_Form, {
+    form: form,
+    onValuesChange: function onValuesChange(v, all) {
+      console.log(v);
+      console.log(all);
+    },
+    onFinish: function onFinish(v) {
+      console.log(v);
+    },
+    scrollToFirstError: true
+  }, /*#__PURE__*/React.createElement(_Form.Item, {
+    label: "\u9644\u4EF6",
+    name: "file1",
+    rules: [{
+      required: true,
+      message: '请上传至少一个文件'
+    }]
+  }, /*#__PURE__*/React.createElement(VenusUploadSecLevel, {
+    multiple: true
+  })), /*#__PURE__*/React.createElement(_Button, {
+    type: "primary",
+    htmlType: "submit"
+  }, "\u63D0\u4EA4"));
+};
+export default Demo;

package/dist/VenusUploadSecLevel/index.js

@@ -23,6 +23,10 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 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); }
@@ -38,7 +42,6 @@ var Item = _Form.Item;
 import { updateFileSecLevelNew } from "./service";
 var Dragger = _Upload.Dragger;
 var VenusUploadSecLevel = function VenusUploadSecLevel(props) {
-  console.log("VenusUploadSecLevel", props);
   var _useState = useState([]),
     _useState2 = _slicedToArray(_useState, 2),
     fileList = _useState2[0],
@@ -46,34 +49,32 @@ var VenusUploadSecLevel = function VenusUploadSecLevel(props) {
   var downNode = useRef(null);
   var _useState3 = useState(false),
     _useState4 = _slicedToArray(_useState3, 2),
-    isup = _useState4[0],
-    setisup = _useState4[1];
-  var _useState5 = useState(false),
+    load = _useState4[0],
+    setload = _useState4[1];
+  var _useState5 = useState(undefined),
     _useState6 = _slicedToArray(_useState5, 2),
-    load = _useState6[0],
-    setload = _useState6[1];
-  var _useState7 = useState(undefined),
-    _useState8 = _slicedToArray(_useState7, 2),
-    level = _useState8[0],
-    setLevel = _useState8[1];
+    level = _useState6[0],
+    setLevel = _useState6[1];
   useEffect(function () {
-    var value = (props.value || []).map(function (ls) {
-      return _objectSpread(_objectSpread({
-        fileId: ls.response != undefined && ls.response.data != undefined && ls.response.data.fileId != undefined ? ls.response.data.fileId : ls.fileId
-      }, ls), {}, {
-        status: 'done',
-        uid: ls.uid || ls.fileId
-      });
+    // 外部只给“已完成”数据，用 map 快速索引
+    //@ts-ignore
+    var outerMap = new Map((props.value || []).map(function (f) {
+      return [f.uid || f.fileId, f];
+    }));
+    setFileList(function (prev) {
+      var _prev$map;
+      return (_prev$map = prev.map(function (file) {
+        // 回显层只更新“已完成”部分的信息，不动正在上传的
+        var target = outerMap.get(file.uid || file.fileId);
+        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;
+        });
+      })));
     });
-    setFileList(value);
-    if (props.isDuo != undefined && props.isDuo == false) {
-      if (fileList.length > 0) {
-        setisup(true);
-      }
-      if (fileList.length < 1) {
-        setisup(false);
-      }
-    }
   }, [props.value]);
   /**
    * 上传文件
@@ -113,7 +114,12 @@ var VenusUploadSecLevel = function VenusUploadSecLevel(props) {
       _iterator.f();
     }
     setFileList(files);
-    propsOnChange(files);
+    // 保留：已有 fileId  或  新上传成功
+    var doneFiles = files.filter(function (f) {
+      var _f$response;
+      return f.fileId || ((_f$response = f.response) === null || _f$response === void 0 ? void 0 : _f$response.success);
+    });
+    propsOnChange(doneFiles);
   };
   var propsOnChange = function propsOnChange(files) {
     if (props.onChange) {
@@ -177,7 +183,10 @@ var VenusUploadSecLevel = function VenusUploadSecLevel(props) {
       _iterator2.f();
     }
     setFileList(files);
-    propsOnChange(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);
+    }));
   };
   // 密级改变时，更新文件密级
   useEffect(function () {

package/dist/VenusWfTaskDetail/index.d.ts

@@ -6,8 +6,8 @@ interface VenusWfTaskDetailProps {
     height?: string;
     style?: any;
     workflowDetail?: any;
-    onMount?: any;
     loader?: any;
+    onMount?: any;
     componentUrl?: string;
     dataTrackFlag?: boolean;
 }

package/package.json

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