venus-design 1.0.32 → 1.0.34

package/dist/VenusAdjustDetail/index.js

@@ -1,6 +1,8 @@
 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); }
 import "antd/es/card/style";
 import _Card from "antd/es/card";
+import "antd/es/form/style";
+import _Form from "antd/es/form";
 import "antd/es/collapse/style";
 import _Collapse from "antd/es/collapse";
 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; }
@@ -25,35 +27,56 @@ var VenusAdjustDetail = function VenusAdjustDetail(props) {
     _useState2 = _slicedToArray(_useState, 2),
     formData = _useState2[0],
     setFormData = _useState2[1];
+  var _useState3 = useState([]),
+    _useState4 = _slicedToArray(_useState3, 2),
+    formDataAfter = _useState4[0],
+    setFormDataAfter = _useState4[1];
+  var _Form$useForm = _Form.useForm(),
+    _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
+    form = _Form$useForm2[0];
   /**
    * 根据场景标识查询表单对象
   */
   var getVenusAdjustData = /*#__PURE__*/function () {
     var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
-      var res;
+      var res, resAfter;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
+            if (props.detailAfterColumn && props.detailAfterColumn) {
+              setFormDataAfter(props.detailAfterColumn);
+            }
             if (!(props.detailColumn && props.detailColumn.length > 0)) {
-              _context.next = 4;
+              _context.next = 5;
               break;
             }
             setFormData(props.detailColumn);
-            _context.next = 8;
+            _context.next = 13;
             break;
-          case 4:
-            _context.next = 6;
+          case 5:
+            _context.next = 7;
             return getVenusAdjust({
               dataViewId: props.dataViewIid || "-1",
               dataSceneId: props.dataSceneIid || "-1"
             });
-          case 6:
+          case 7:
             res = _context.sent;
             if (res && res.success) {
               //添加调整原因，调整类型
               setFormData(res.data || []);
             }
-          case 8:
+            _context.next = 11;
+            return getVenusAdjust({
+              dataViewId: props.dataAfterViewIid || "-1",
+              dataSceneId: props.dataAfterViewIid || "-1"
+            });
+          case 11:
+            resAfter = _context.sent;
+            if (resAfter && resAfter.success) {
+              //添加调整原因，调整类型
+              setFormDataAfter(res.data || []);
+            }
+          case 13:
           case "end":
             return _context.stop();
         }
@@ -90,18 +113,17 @@ var VenusAdjustDetail = function VenusAdjustDetail(props) {
   }) : null)), /*#__PURE__*/React.createElement(Panel, {
     header: "\u8C03\u6574\u540E",
     key: "after"
-  }, /*#__PURE__*/React.createElement(_Card, null, formData.length > 0 ? /*#__PURE__*/React.createElement(VenusDetail, {
+  }, /*#__PURE__*/React.createElement(_Card, null, formDataAfter.length > 0 ? /*#__PURE__*/React.createElement(VenusDetail, {
     key: props.dataSceneIid + "2",
     loading: false //加载中
     ,
-    dataViewIid: props.dataViewIid //数据视图标识
-    ,
-    dataSceneIid: props.dataSceneIid //数据场景标识
-    ,
     data: props.adjustAfter || {} //详情数据
     ,
     dataAfter: props.adjustBefore,
-    detailColumn: formData
+    detailColumn: formDataAfter,
+    dataViewIid: props.dataAfterViewIid //数据视图标识
+    ,
+    dataSceneIid: props.dataAfterSceneIid //数据场景标识
   }) : null)))));
 };
 export default VenusAdjustDetail;

package/dist/VenusAdjustDetail/interface.d.ts

@@ -6,8 +6,11 @@ export interface VenusAdjustDetailInterface {
     onCancel?: Function;
     dataViewIid: string;
     dataSceneIid: string;
+    dataAfterViewIid: string;
+    dataAfterSceneIid: string;
     adjustBefore?: object;
     adjustAfter?: object;
     detailColumn?: any;
+    detailAfterColumn?: any;
     defaultActiveKey?: string[];
 }

package/dist/VenusDetail/staticAttr.js

@@ -1,5 +1,7 @@
 import "antd/es/image/style";
 import _Image from "antd/es/image";
+import "antd/es/tag/style";
+import _Tag from "antd/es/tag";
 import React from 'react';
 import { Descriptions, dataToEnum, downloadFile, DownLoad } from "./..";
 import moment from 'moment';
@@ -163,6 +165,7 @@ export var VENUS_DETAIL_ITEM_TYPE = {
       }, dataFile.map(function (v, n) {
         return /*#__PURE__*/React.createElement(DownLoad, {
           hideProgress: true,
+          key: v.fileId,
           params: {
             method: 'get'
           },
@@ -180,12 +183,54 @@ export var VENUS_DETAIL_ITEM_TYPE = {
       console.log("单选属性错误");
     }
   },
+  "uploadSecLevel": function uploadSecLevel(column, data, dataAfter) {
+    try {
+      var _column$parameterSour7;
+      var dataFile = data[column.fieldId] != null && data[column.fieldId] != undefined ? JSON.parse(data[column.fieldId]) : undefined;
+      console.log(dataFile);
+      return /*#__PURE__*/React.createElement(Descriptions.Item, {
+        key: column.fieldId,
+        span: ((_column$parameterSour7 = column.parameterSource) === null || _column$parameterSour7 === void 0 ? void 0 : _column$parameterSour7.detailSpan) || 1,
+        label: column.fieldName
+      }, dataFile.map(function (v) {
+        return /*#__PURE__*/React.createElement("div", {
+          key: v.fileId,
+          style: {
+            border: "1px solid #f0f0f0",
+            borderRadius: 5,
+            padding: 2
+          }
+        }, /*#__PURE__*/React.createElement(DownLoad, {
+          key: v.fileId,
+          hideProgress: true,
+          params: {
+            method: 'get'
+          },
+          fileName: function fileName() {
+            return v.name;
+          },
+          text: /*#__PURE__*/React.createElement("a", {
+            rel: "noopener noreferrer"
+          }, v.name),
+          loadUrl: downloadFile(v.fileId)
+        }), /*#__PURE__*/React.createElement(_Tag, {
+          style: {
+            color: "#848f9b",
+            marginLeft: 5
+          }
+        }, v.secId.label));
+      }));
+    } catch (err) {
+      console.log(err);
+      console.log("单选属性错误");
+    }
+  },
   "uploadImage": function uploadImage(column, data, dataAfter) {
-    var _column$parameterSour7;
+    var _column$parameterSour8;
     var textImageBase64 = data[column.fieldId] != null && data[column.fieldId] != undefined ? data[column.fieldId] : undefined;
     return /*#__PURE__*/React.createElement(Descriptions.Item, {
       key: data[column.fieldId],
-      span: ((_column$parameterSour7 = column.parameterSource) === null || _column$parameterSour7 === void 0 ? void 0 : _column$parameterSour7.detailSpan) || 1,
+      span: ((_column$parameterSour8 = column.parameterSource) === null || _column$parameterSour8 === void 0 ? void 0 : _column$parameterSour8.detailSpan) || 1,
       label: column.fieldName
     }, /*#__PURE__*/React.createElement(StyleProvider, {
       hashPriority: "high",

package/dist/VenusForm/index.js

@@ -290,6 +290,7 @@ var VenusForm = /*#__PURE__*/forwardRef(function (props, ref) {
      */,
     onFinish: function onFinish(formDataValue) {
       var dataForm = addOrEditValue(formDataValue);
+      //@ts-ignore
       props.onFinish(_objectSpread({}, dataForm));
     },
     submitter: false //关闭原本的提交和取消按钮（重新添加）

package/dist/VenusForm/interface.d.ts

@@ -96,9 +96,9 @@ export interface VenusFormType {
     isEdit?: boolean;
     loading?: boolean;
     dataSource?: any;
-    submitIng: boolean;
-    onCancel: Function;
-    onFinish: Function;
+    submitIng?: boolean;
+    onCancel?: Function;
+    onFinish?: Function;
     children?: ReactNode;
     size?: string;
     scrollToFirstError?: boolean;

package/dist/VenusForm/staticAttr.js

@@ -102,7 +102,8 @@ export var VENUS_FORM_ITEM_VALUE = {
         try {
           for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
             var con = _step2.value;
-            nameStr += con.title + ",";
+            var title = con.title || con.name;
+            nameStr += title + ",";
             idStr += con.id + ",";
           }
         } catch (err) {
@@ -112,7 +113,8 @@ export var VENUS_FORM_ITEM_VALUE = {
         }
         return _defineProperty(_defineProperty({}, nameAndId[0], idStr.substring(0, idStr.length - 1)), nameAndId[1], nameStr.substring(0, nameStr.length - 1));
       } else {
-        return _defineProperty(_defineProperty({}, nameAndId[0], orgVal.id), nameAndId[1], orgVal.title);
+        var _title = orgVal.title || orgVal.name;
+        return _defineProperty(_defineProperty({}, nameAndId[0], orgVal.id), nameAndId[1], _title);
       }
     } else {
       return _defineProperty(_defineProperty({}, nameAndId[0], undefined), nameAndId[1], undefined);

package/package.json

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