venus-design 1.0.72 → 1.0.75

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -93,9 +93,9 @@ var VenusTable = /*#__PURE__*/forwardRef(function (props, ref) {
93
93
  /**
94
94
  * 分页信息
95
95
  */
96
- var pageInfoPagin = storage.getSessionItem("pagination_" + props.dataSceneIid); //分页信息
97
- var filtersVenus = storage.getSessionItem("filters_" + props.dataSceneIid); //列筛选
98
- var dataParamVenus = storage.getSessionItem("dataParam_" + props.dataSceneIid); //过滤条件
96
+ var pageInfoPagin = storage.getSessionItem("pagination_" + props.dataSceneIid + props.key || ""); //分页信息
97
+ var filtersVenus = storage.getSessionItem("filters_" + props.dataSceneIid + props.key || ""); //列筛选
98
+ var dataParamVenus = storage.getSessionItem("dataParam_" + props.dataSceneIid + props.key || ""); //过滤条件
99
99
  var _useState7 = useState(dataParamVenus || []),
100
100
  _useState8 = _slicedToArray(_useState7, 2),
101
101
  dataParam = _useState8[0],
@@ -265,8 +265,9 @@ var VenusTable = /*#__PURE__*/forwardRef(function (props, ref) {
265
265
  var onChangeTable = function onChangeTable(pagination, filters, sorter, data) {
266
266
  setPageInfo(pagination); //分页信息
267
267
  setFilters(filters); //过滤信息
268
- storage.setSessionItem("pagination_" + props.dataSceneIid, pagination); //分页信息
269
- storage.setSessionItem("filters_" + props.dataSceneIid, filters); //过滤信息
268
+ var key = props.key || "";
269
+ storage.setSessionItem("pagination_" + props.dataSceneIid + key, pagination); //分页信息
270
+ storage.setSessionItem("filters_" + props.dataSceneIid + key, filters); //过滤信息
270
271
  var dataParamBefore = handleFilterDataParams(filters); //组装过滤条件
271
272
  if (props.onChangeTable) {
272
273
  props.onChangeTable(pagination, filters, dataParamBefore, sorter, data);
@@ -42,6 +42,7 @@ export default interface VenusTableType {
42
42
  exportFileName?: String;
43
43
  scroll?: any;
44
44
  alwaysShowAlert?: boolean;
45
+ key?: string;
45
46
  onChangeTable?: Function;
46
47
  filters?: VenusEnumType[];
47
48
  tableAlertRender?: boolean;
@@ -1,3 +1,13 @@
1
+ import "antd/es/date-picker/style";
2
+ import _DatePicker from "antd/es/date-picker";
3
+ import "antd/es/tree-select/style";
4
+ import _TreeSelect from "antd/es/tree-select";
5
+ import "antd/es/select/style";
6
+ import _Select from "antd/es/select";
7
+ import "antd/es/input-number/style";
8
+ import _InputNumber from "antd/es/input-number";
9
+ import "antd/es/input/style";
10
+ import _Input from "antd/es/input";
1
11
  import "antd/es/tag/style";
2
12
  import _Tag from "antd/es/tag";
3
13
  import "antd/es/badge/style";
@@ -9,7 +19,6 @@ import _Image from "antd/es/image";
9
19
  import "antd/es/tooltip/style";
10
20
  import _Tooltip from "antd/es/tooltip";
11
21
  function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
12
- 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); }
13
22
  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; }
14
23
  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; }
15
24
  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; }
@@ -490,7 +499,7 @@ export var VENUS_TABLE_COLUMNRENDER_TYPE = {
490
499
  /**
491
500
  * 编辑单元格
492
501
  */
493
- "renderVenusEditText": function renderVenusEditText(column, actions) {
502
+ "renderVenusEditCell": function renderVenusEditCell(column, actions) {
494
503
  return function (text, record) {
495
504
  //判断权限
496
505
  if (column.parameterSource.editCellPath) {
@@ -504,7 +513,7 @@ export var VENUS_TABLE_COLUMNRENDER_TYPE = {
504
513
  /* 统一回写 */
505
514
  var finishEdit = function finishEdit(newVal) {
506
515
  actions.toggleEdit(key, false);
507
- actions.onUpdateFields(column.fieldId, newVal, record.innerId);
516
+ actions.onUpdateFields(column.fieldId, newVal, record.innerId, record);
508
517
  };
509
518
 
510
519
  /* 非编辑态 */
@@ -557,36 +566,19 @@ export var VENUS_TABLE_COLUMNRENDER_TYPE = {
557
566
  }
558
567
  };
559
568
 
560
- // 1. 编辑组件映射表 —— 想加新类型就在这里继续塞
569
+ // 2. 编辑组件映射表 —— 想加新类型就在这里继续塞
561
570
  var EDIT_COMPONENTS = {
562
- Input: function Input(p) {
563
- return /*#__PURE__*/React.createElement(_Input, p);
564
- },
565
- InputNumber: function InputNumber(p) {
566
- return /*#__PURE__*/React.createElement(_InputNumber, p);
567
- },
568
- Select: function Select(p) {
569
- return /*#__PURE__*/React.createElement(_Select, _extends({}, p, {
570
- onBlur: undefined
571
- }));
572
- },
573
- // Select 用 onChange
574
- SecurityLevel: function SecurityLevel(p) {
575
- return /*#__PURE__*/React.createElement(_Select, _extends({}, p, {
576
- onBlur: undefined
577
- }));
578
- },
579
- // SecurityLevel 用 onChange
580
- TreeSelect: function TreeSelect(p) {
581
- return /*#__PURE__*/React.createElement(_TreeSelect, _extends({}, p, {
582
- onBlur: undefined
583
- }));
584
- },
585
- DatePicker: function DatePicker(p) {
586
- return /*#__PURE__*/React.createElement(_DatePicker, _extends({}, p, {
587
- onBlur: undefined
588
- }));
589
- }
571
+ Input: _Input,
572
+ // 直接就是 Input 组件
573
+ InputNumber: _InputNumber,
574
+ // 直接就是 InputNumber 组件
575
+ Select: _Select,
576
+ // 直接就是 Select 组件
577
+ SecurityLevel: _Select,
578
+ // 底层一样,复用即可
579
+ TreeSelect: _TreeSelect,
580
+ // 直接就是 TreeSelect 组件
581
+ DatePicker: _DatePicker // 直接就是 DatePicker 组件
590
582
  };
591
583
  // 1. APP应用前缀
592
584
  export var APP_PREFIXS = {
@@ -0,0 +1,3 @@
1
+ import React from 'react';
2
+ declare const Demo: React.FC;
3
+ export default Demo;
@@ -0,0 +1,67 @@
1
+ import "antd/es/button/style";
2
+ import _Button from "antd/es/button";
3
+ import "antd/es/form/style";
4
+ import _Form from "antd/es/form";
5
+ function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
6
+ 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."); }
7
+ 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); }
8
+ 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; }
9
+ 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; } }
10
+ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
11
+ import { VenusUploadSecLevel } from "./..";
12
+ import React, { useState, useRef } from 'react';
13
+ var Demo = function Demo() {
14
+ var _useState = useState([{
15
+ fileId: "sdfs",
16
+ name: "5555.txt"
17
+ }, {
18
+ fileId: "asdfasd",
19
+ name: "5555.docx"
20
+ }]),
21
+ _useState2 = _slicedToArray(_useState, 2),
22
+ files = _useState2[0],
23
+ setFiles = _useState2[1];
24
+ var ref = useRef(null);
25
+ var _Form$useForm = _Form.useForm(),
26
+ _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
27
+ form = _Form$useForm2[0];
28
+ form.setFieldsValue({
29
+ file1: [{
30
+ fileId: "sdfs",
31
+ name: "5555.txt"
32
+ }, {
33
+ fileId: "asdfasd",
34
+ name: "5555.docx"
35
+ }],
36
+ sdfs: {
37
+ secId: {
38
+ label: "内部",
39
+ value: 6
40
+ }
41
+ }
42
+ });
43
+ return /*#__PURE__*/React.createElement(_Form, {
44
+ form: form,
45
+ onValuesChange: function onValuesChange(v, all) {
46
+ console.log(v);
47
+ console.log(all);
48
+ },
49
+ onFinish: function onFinish(v) {
50
+ console.log(v);
51
+ },
52
+ scrollToFirstError: true
53
+ }, /*#__PURE__*/React.createElement(_Form.Item, {
54
+ label: "\u9644\u4EF6",
55
+ name: "file1",
56
+ rules: [{
57
+ required: true,
58
+ message: '请上传至少一个文件'
59
+ }]
60
+ }, /*#__PURE__*/React.createElement(VenusUploadSecLevel, {
61
+ multiple: true
62
+ })), /*#__PURE__*/React.createElement(_Button, {
63
+ type: "primary",
64
+ htmlType: "submit"
65
+ }, "\u63D0\u4EA4"));
66
+ };
67
+ export default Demo;
@@ -38,7 +38,6 @@ var Item = _Form.Item;
38
38
  import { updateFileSecLevelNew } from "./service";
39
39
  var Dragger = _Upload.Dragger;
40
40
  var VenusUploadSecLevel = function VenusUploadSecLevel(props) {
41
- console.log("VenusUploadSecLevel", props);
42
41
  var _useState = useState([]),
43
42
  _useState2 = _slicedToArray(_useState, 2),
44
43
  fileList = _useState2[0],
@@ -113,7 +112,12 @@ var VenusUploadSecLevel = function VenusUploadSecLevel(props) {
113
112
  _iterator.f();
114
113
  }
115
114
  setFileList(files);
116
- propsOnChange(files);
115
+ // 保留:已有 fileId 或 新上传成功
116
+ var doneFiles = files.filter(function (f) {
117
+ var _f$response;
118
+ return f.fileId || ((_f$response = f.response) === null || _f$response === void 0 ? void 0 : _f$response.success);
119
+ });
120
+ propsOnChange(doneFiles);
117
121
  };
118
122
  var propsOnChange = function propsOnChange(files) {
119
123
  if (props.onChange) {
@@ -177,7 +181,10 @@ var VenusUploadSecLevel = function VenusUploadSecLevel(props) {
177
181
  _iterator2.f();
178
182
  }
179
183
  setFileList(files);
180
- propsOnChange(files);
184
+ propsOnChange(files.filter(function (f) {
185
+ var _f$response2;
186
+ return f.fileId || ((_f$response2 = f.response) === null || _f$response2 === void 0 ? void 0 : _f$response2.success);
187
+ }));
181
188
  };
182
189
  // 密级改变时,更新文件密级
183
190
  useEffect(function () {
@@ -6,6 +6,7 @@ interface VenusWfTaskDetailProps {
6
6
  height?: string;
7
7
  style?: any;
8
8
  workflowDetail?: any;
9
+ loader?: any;
9
10
  onMount?: any;
10
11
  componentUrl?: string;
11
12
  dataTrackFlag?: boolean;
@@ -113,9 +113,7 @@ var VenusWfTaskDetail = /*#__PURE__*/forwardRef(function (props, ref) {
113
113
  }
114
114
  return /*#__PURE__*/React.createElement(VenusWorkDetail, _extends({
115
115
  height: props.height,
116
- loader: function loader() {
117
- return props.componentUrl ? import("".concat(props.componentUrl)) : null;
118
- },
116
+ loader: props.loader,
119
117
  otherProps: props.params,
120
118
  rules: rules,
121
119
  style: props.style
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "venus-design",
3
- "version": "1.0.72",
3
+ "version": "1.0.75",
4
4
  "description": "venus all compoments",
5
5
  "module": "dist/index.js",
6
6
  "types": "dist/index.d.ts",