venus-design 1.0.26 → 1.0.28

package/dist/Approval/components/SelectRoleAndUser/index.js

@@ -11,13 +11,6 @@ var SelectApprovalUser = function SelectApprovalUser(props) {
   var children = [];
   var tagdata = [];
   if (props.users != undefined) {
-    /*if(props.users.rolename!="未选择角色"&&props.users.rolename[0].rolecode!=undefined){
-      for (let i = 0; i <props.users.rolename[0].rolecode.length ; i++) {
-          tagdata.push(props.users.rolename[0].rolecode[i]);
-          selectType=="moren"? options.push(props.users.rolename[0].rolecode[i]):"";
-          children.push(<Option selected key={props.users.rolename[0].rolecode[i]}>{props.users.rolename[0].rolename[i]}</Option>);
-      }
-    }*/
     if (props.users.username != "未选择人员" && props.users.username[0].userid != undefined) {
       for (var i = 0; i < props.users.username[0].userid.length; i++) {
         if (props.users.username[0].userid[i] != "") {

package/dist/Approval/index.js

@@ -19,6 +19,10 @@ function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key i
 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 _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 _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 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 _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
@@ -99,109 +103,106 @@ export default /*#__PURE__*/React.forwardRef(function (props, ref) {
     _useState30 = _slicedToArray(_useState29, 2),
     idS = _useState30[0],
     setIds = _useState30[1];
-  //查询流程配置
   var findByOption = /*#__PURE__*/function () {
     var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(record, code, name) {
-      var idService, res, res1, options, i, userLi, _i, projectname, name1;
+      var _record$id, _userRes$data, rawId, hasAmpersand, serviceId, flowRes, _flowRes$data, workflowcode, formid, columnlist, userRes, _ref2, rolename, username, _selectType, options, _rolename$0$rolecode, _rolename$, _username$0$userid, _username$, users, defaultName;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
-            idService = record.id;
-            if (idService.indexOf("&") > -1) {
-              setserviceid(idService.substring(0, idService.indexOf("&")));
-              setIds(true);
-            } else {
-              setserviceid(idService);
-            }
-            //查询流程配置
-            _context.next = 4;
+            _context.prev = 0;
+            // 1. 解析 serviceId
+            rawId = (_record$id = record === null || record === void 0 ? void 0 : record.id) !== null && _record$id !== void 0 ? _record$id : '';
+            hasAmpersand = rawId.includes('&');
+            serviceId = hasAmpersand ? rawId.split('&')[0] : rawId;
+            setserviceid(serviceId);
+            setIds(hasAmpersand);
+
+            // 2. 查询流程配置
+            _context.next = 8;
             return findByOptionCode(code);
-          case 4:
-            res = _context.sent;
-            if (!(res && res.success)) {
-              _context.next = 18;
+          case 8:
+            flowRes = _context.sent;
+            if (!(!(flowRes !== null && flowRes !== void 0 && flowRes.success) || !flowRes.data)) {
+              _context.next = 13;
               break;
             }
-            if (!res.data) {
-              _context.next = 14;
+            _message.warning("\u672A\u627E\u5230\u6D41\u7A0B\u914D\u7F6E\u7F16\u7801\u4E3A ".concat(code, " \u7684\u4FE1\u606F"));
+            setDefaultName(record, name);
+            return _context.abrupt("return");
+          case 13:
+            _flowRes$data = flowRes.data, workflowcode = _flowRes$data.workflowcode, formid = _flowRes$data.formid, columnlist = _flowRes$data.columnlist;
+            setdefineid(formid !== null && formid !== void 0 ? formid : -1);
+            if (formid == null && columnlist) settablename(columnlist);
+
+            // 3. 查询审批人
+            _context.next = 18;
+            return findByUserid(workflowcode, record);
+          case 18:
+            userRes = _context.sent;
+            if (userRes !== null && userRes !== void 0 && userRes.success) {
+              _context.next = 23;
               break;
             }
-            _context.next = 9;
-            return findByUserid(res.data.workflowcode, record);
-          case 9:
-            res1 = _context.sent;
+            _message.error('查询候选人失败！');
+            setDefaultName(record, name);
+            return _context.abrupt("return");
+          case 23:
+            _ref2 = (_userRes$data = userRes.data) !== null && _userRes$data !== void 0 ? _userRes$data : {}, rolename = _ref2.rolename, username = _ref2.username, _selectType = _ref2.selectType;
+            setuserdata(userRes.data);
+            setSelectType(_selectType);
+
+            // 4. 构建 options
             options = [];
-            if (res1 && res1.success) {
-              setuserdata(res1.data);
-              setSelectType(res1.data.selectType);
-              if (res1.data != undefined) {
-                if (res1.data.rolename != "未选择角色") {
-                  for (i = 0; i < res1.data.rolename[0].rolecode.length; i++) {
-                    options.push(res1.data.rolename[0].rolecode[i]);
-                  }
-                }
-                if (res1.data.username != "未选择人员") {
-                  if (res1.data.username[0].userid != null && res1.data.selectType == "moren") {
-                    userLi = res1.data.username[0].userid;
-                    form.setFieldsValue({
-                      person: userLi
-                    });
-                  }
-                  for (_i = 0; _i < res1.data.username[0].userid.length; _i++) {
-                    options.push(res1.data.username[0].userid[_i]);
-                  }
-                }
-              }
-              setdata(res.data);
-              if (record != undefined) {
-                projectname = "";
-                if (props.project != undefined && props.project != null) {
-                  projectname += props.project.projectName;
-                } else {
-                  projectname = name;
-                }
-                name1 = name ? name : "送审" + "【" + record.data.commissionNo + "】" + moment().format("YYYY-MM-DD hh:mm:ss");
+            if (rolename && rolename !== '未选择角色') {
+              options.push.apply(options, _toConsumableArray((_rolename$0$rolecode = (_rolename$ = rolename[0]) === null || _rolename$ === void 0 ? void 0 : _rolename$.rolecode) !== null && _rolename$0$rolecode !== void 0 ? _rolename$0$rolecode : []));
+            }
+            if (username && username !== '未选择人员') {
+              users = (_username$0$userid = (_username$ = username[0]) === null || _username$ === void 0 ? void 0 : _username$.userid) !== null && _username$0$userid !== void 0 ? _username$0$userid : [];
+              if (_selectType === 'moren' && users.length) {
                 form.setFieldsValue({
-                  name: name1
+                  person: users
                 });
-                setload(false);
               }
-            } else {
-              _message.error("查询候选人失败！");
+              options.push.apply(options, _toConsumableArray(users));
             }
-            _context.next = 15;
-            break;
-          case 14:
-            _message.warning("没有找到流程配置编码为" + code + "的相关信息");
-          case 15:
-            if (res.data != null && res.data.formid != null) {
-              setdefineid(res.data.formid);
-            } else {
-              setdefineid(-1);
-              if (res.data != null) {
-                settablename(res.data.columnlist);
-              } else {
-                _message.warning("没有配置审批页面显示列！");
-              }
-            }
-            _context.next = 21;
-            break;
-          case 18:
-            name1 = name ? name : "送审" + "【" + record.data.commissionNo + "】" + moment().format("YYYY-MM-DD hh:mm:ss");
+            // 5. 设置表单名称
+            defaultName = name || buildDefaultName(record);
             form.setFieldsValue({
-              name: name1
+              name: defaultName
             });
+            setdata(flowRes.data);
+          case 32:
+            _context.prev = 32;
             setload(false);
-          case 21:
+            return _context.finish(32);
+          case 35:
           case "end":
             return _context.stop();
         }
-      }, _callee);
+      }, _callee, null, [[0,, 32, 35]]);
     }));
     return function findByOption(_x, _x2, _x3) {
       return _ref.apply(this, arguments);
     };
   }();
+
+  // 抽离：设置默认名称
+  function setDefaultName(record, name) {
+    var defaultName = name || buildDefaultName(record);
+    form.setFieldsValue({
+      name: defaultName
+    });
+    setload(false);
+  }
+
+  // 抽离：构造默认名称
+  function buildDefaultName(record) {
+    var _props$project, _record$data;
+    var projectName = (_props$project = props.project) === null || _props$project === void 0 ? void 0 : _props$project.projectName;
+    var commissionNo = record === null || record === void 0 || (_record$data = record.data) === null || _record$data === void 0 ? void 0 : _record$data.commissionNo;
+    var timestamp = moment().format('YYYY-MM-DD HH:mm:ss');
+    return projectName ? "\u9001\u5BA1\u3010".concat(commissionNo, "\u3011").concat(timestamp) : "\u9001\u5BA1\u3010".concat(commissionNo, "\u3011").concat(timestamp);
+  }
   //取消
   var onCancel = function onCancel() {
     setVisible(false);
@@ -212,9 +213,13 @@ export default /*#__PURE__*/React.forwardRef(function (props, ref) {
       props.onCancel();
     }
   };
+  /**
+   * 发起送审
+   * @param val 
+   */
   var _onOk = function onOk(val) {
     setokload(true);
-    onStartInstance(data.workflowcode, val.name, serviceid, defineid, tablename, val.memo, val.person, data.operationname);
+    onStartInstance(data.workflowcode, val.name, serviceid, defineid, tablename, val.memo);
   };
   /**
    * 发起送审
@@ -228,8 +233,8 @@ export default /*#__PURE__*/React.forwardRef(function (props, ref) {
    * @param operationname 
    */
   var onStartInstance = /*#__PURE__*/function () {
-    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(key, instanceName, id, defineid, tablename, memo, persong, operationname) {
-      var firstPerson, flagWf, res, _res;
+    var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(key, instanceName, id, defineid, tablename, memo) {
+      var firstPerson, flagWf, res, wfData, _res;
       return _regeneratorRuntime().wrap(function _callee2$(_context2) {
         while (1) switch (_context2.prev = _context2.next) {
           case 0:
@@ -250,7 +255,6 @@ export default /*#__PURE__*/React.forwardRef(function (props, ref) {
             _message.success("送审成功！");
             flagWf = true;
             setokload(false);
-            //const editUser = await editCandateGroupsOrUsers(firstPerson,res.message);
             setVisible(false);
             //刷新状态
             if (!(urlUpdateStatus != undefined && urlUpdateStatus != null)) {
@@ -265,22 +269,42 @@ export default /*#__PURE__*/React.forwardRef(function (props, ref) {
           case 16:
             _message.error("请检查流程是否部署！");
           case 17:
-            _context2.next = 33;
+            _context2.next = 34;
             break;
           case 19:
-            _context2.next = 21;
-            return startData(key, instanceName, id, defineid, tablename, memo, url, prefix, operationname, urlUpdateStatus, _objectSpread(_objectSpread({}, record.data), {}, {
-              currentState: props.currentState != undefined ? props.currentState : "",
-              modifyState: props.modifyState != undefined ? props.modifyState : "",
-              isProjectBG: props.isProjectBG != undefined ? props.isProjectBG : false
-            }), firstPerson, props.statusList, actionId, record.data.businessKey, props.dataViewIid != undefined ? props.dataViewIid : "-1", props.dataSceneIid != undefined ? props.dataSceneIid : "-1",
-            //场景标识
-            props.serviceUrl != undefined ? props.serviceUrl : "", props.componentUrl != undefined ? props.componentUrl : null //组件地址
-            );
-          case 21:
+            //启动流程数据
+            wfData = {
+              processDefinitionKey: key,
+              instanceName: instanceName,
+              formId: defineid,
+              tableName: tablename,
+              dataId: id,
+              businessKey: record.data.businessKey,
+              memo: memo,
+              url: url,
+              prefix: prefix,
+              firstPerson: firstPerson,
+              urlUpdateStatus: urlUpdateStatus,
+              stateList: props.statusList,
+              actionId: actionId,
+              dataViewIid: props.dataViewIid != undefined ? props.dataViewIid : "-1",
+              dataSceneIid: props.dataSceneIid != undefined ? props.dataSceneIid : "-1",
+              serviceUrl: props.serviceUrl != undefined ? props.serviceUrl : "",
+              componentUrl: props.componentUrl != undefined ? props.componentUrl : null,
+              //组件地址
+              ownerAppCode: data.ownerAppCode != undefined ? data.ownerAppCode : "",
+              vis: _objectSpread(_objectSpread({}, record.data), {}, {
+                currentState: props.currentState != undefined ? props.currentState : "",
+                modifyState: props.modifyState != undefined ? props.modifyState : "",
+                isProjectBG: props.isProjectBG != undefined ? props.isProjectBG : false
+              })
+            }; //启动流程
+            _context2.next = 22;
+            return startData(wfData);
+          case 22:
             _res = _context2.sent;
             if (!(_res && _res.success)) {
-              _context2.next = 32;
+              _context2.next = 33;
               break;
             }
             _message.success("送审成功！");
@@ -289,40 +313,52 @@ export default /*#__PURE__*/React.forwardRef(function (props, ref) {
             setVisible(false);
             //刷新状态
             if (!(urlUpdateStatus != undefined && urlUpdateStatus != null)) {
-              _context2.next = 30;
+              _context2.next = 31;
               break;
             }
-            _context2.next = 30;
+            _context2.next = 31;
             return SubmitDataStatus(record.id, props.statusList[0], urlUpdateStatus, prefix);
-          case 30:
-            _context2.next = 33;
+          case 31:
+            _context2.next = 34;
             break;
-          case 32:
-            _message.error("请检查流程是否部署！");
           case 33:
-            props.callback(flagWf);
+            _message.error("请检查流程是否部署！");
           case 34:
+            //刷新列表
+            props.callback(flagWf);
+          case 35:
           case "end":
             return _context2.stop();
         }
       }, _callee2);
     }));
-    return function onStartInstance(_x4, _x5, _x6, _x7, _x8, _x9, _x10, _x11) {
-      return _ref2.apply(this, arguments);
+    return function onStartInstance(_x4, _x5, _x6, _x7, _x8, _x9) {
+      return _ref3.apply(this, arguments);
     };
   }();
+
+  // 暴露方法：添加送审
   useImperativeHandle(ref, function () {
     return {
       addFn: addFn
     };
   });
+  /**
+   * 弹出送审弹窗
+   */
   useEffect(function () {
     if (userdata) {
       setVisible(true);
     }
   }, [userdata]);
+  /**
+   * 添加送审
+   * @param record 
+   * @param code 
+   * @param name 
+   */
   var addFn = /*#__PURE__*/function () {
-    var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(record, code, name) {
+    var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(record, code, name) {
       return _regeneratorRuntime().wrap(function _callee3$(_context3) {
         while (1) switch (_context3.prev = _context3.next) {
           case 0:
@@ -345,8 +381,8 @@ export default /*#__PURE__*/React.forwardRef(function (props, ref) {
         }
       }, _callee3);
     }));
-    return function addFn(_x12, _x13, _x14) {
-      return _ref3.apply(this, arguments);
+    return function addFn(_x10, _x11, _x12) {
+      return _ref4.apply(this, arguments);
     };
   }();
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(StyleProvider, {

package/dist/Approval/service.d.ts

@@ -1,4 +1,5 @@
-export declare function startData(key: string, instanceName: string, id: string, defineid: number, tablename: string, memo: string, url: string, prefix: string, operationname: string, urlUpdateStatus: string, vis: any, firstPerson: any, stateList: any, actionId: string, businessKey: string, dataViewIid: string, dataSceneIid: string, serviceUrl: string, componentUrl: string): Promise<any>;
+import { StartPayload } from './types';
+export declare function startData(data: StartPayload): Promise<any>;
 export declare function updateProcessInstance(instanceName: string, memo: string, firstPerson: any, proId: string): Promise<any>;
 export declare function editCandateGroupsOrUsers(person: any, instanceid: string): Promise<any>;
 export declare function findByOptionCode(code: string): Promise<any>;

package/dist/Approval/service.js

@@ -6,25 +6,20 @@ import { request } from "./..";
 /*
  *  启动流程部署记录
  */
-export function startData(_x, _x2, _x3, _x4, _x5, _x6, _x7, _x8, _x9, _x10, _x11, _x12, _x13, _x14, _x15, _x16, _x17, _x18, _x19) {
+export function startData(_x) {
   return _startData.apply(this, arguments);
 }
 /*
  *  退回的流程重新发起
  */
 function _startData() {
-  _startData = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(key, instanceName, id, defineid, tablename, memo, url, prefix, operationname, urlUpdateStatus, vis, firstPerson, stateList, actionId, businessKey, dataViewIid, dataSceneIid, serviceUrl, componentUrl) {
+  _startData = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(data) {
     return _regeneratorRuntime().wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
-          return _context.abrupt("return", request("/wfprocessinstance/startProcessByKey?instanceName=".concat(instanceName, "&defineid=").concat(defineid, "&tablename=").concat(tablename, "&businessKey=").concat(businessKey, "&processDefinitionKey=").concat(key, "&memo=").concat(memo, "&url=").concat(url, "&prefix=").concat(prefix, "&operation=").concat(operationname, "&urlUpdateStatus=").concat(urlUpdateStatus, "&actionId=").concat(actionId, "&dataViewIid=").concat(dataViewIid, "&dataSceneIid=").concat(dataSceneIid, "&serviceUrl=").concat(serviceUrl, "&componentUrl=").concat(componentUrl), {
+          return _context.abrupt("return", request("/wfprocessinstance/startProcessByKey", {
             method: 'post',
-            data: {
-              vis: vis,
-              firstPerson: firstPerson,
-              stateList: stateList,
-              id: id
-            },
+            data: data,
             prefix: '/workflow'
           }));
         case 1:
@@ -35,7 +30,7 @@ function _startData() {
   }));
   return _startData.apply(this, arguments);
 }
-export function updateProcessInstance(_x20, _x21, _x22, _x23) {
+export function updateProcessInstance(_x2, _x3, _x4, _x5) {
   return _updateProcessInstance.apply(this, arguments);
 }
 
@@ -62,7 +57,7 @@ function _updateProcessInstance() {
   }));
   return _updateProcessInstance.apply(this, arguments);
 }
-export function editCandateGroupsOrUsers(_x24, _x25) {
+export function editCandateGroupsOrUsers(_x6, _x7) {
   return _editCandateGroupsOrUsers.apply(this, arguments);
 }
 /*
@@ -85,7 +80,7 @@ function _editCandateGroupsOrUsers() {
   }));
   return _editCandateGroupsOrUsers.apply(this, arguments);
 }
-export function findByOptionCode(_x26) {
+export function findByOptionCode(_x8) {
   return _findByOptionCode.apply(this, arguments);
 }
 //查询节点人员
@@ -106,7 +101,7 @@ function _findByOptionCode() {
   }));
   return _findByOptionCode.apply(this, arguments);
 }
-export function findByUserid(_x27, _x28) {
+export function findByUserid(_x9, _x10) {
   return _findByUserid.apply(this, arguments);
 }
 //查询流程定义
@@ -128,7 +123,7 @@ function _findByUserid() {
   }));
   return _findByUserid.apply(this, arguments);
 }
-export function findBydefineId(_x29) {
+export function findBydefineId(_x11) {
   return _findBydefineId.apply(this, arguments);
 }
 //查询表名
@@ -149,7 +144,7 @@ function _findBydefineId() {
   }));
   return _findBydefineId.apply(this, arguments);
 }
-export function findTableByFormid(_x30) {
+export function findTableByFormid(_x12) {
   return _findTableByFormid.apply(this, arguments);
 }
 
@@ -173,7 +168,7 @@ function _findTableByFormid() {
   }));
   return _findTableByFormid.apply(this, arguments);
 }
-export function SubmitDataStatus(_x31, _x32, _x33, _x34) {
+export function SubmitDataStatus(_x13, _x14, _x15, _x16) {
   return _SubmitDataStatus.apply(this, arguments);
 }
 function _SubmitDataStatus() {

package/dist/Approval/types.d.ts

@@ -0,0 +1,40 @@
+export interface RoleItem {
+    roleCode: string;
+    roleName: string;
+}
+export interface UserItem {
+    userId: string;
+    userName: string;
+}
+export interface CandidateData {
+    selectType: 'free' | 'moren';
+    roles?: RoleItem[];
+    users?: UserItem[];
+}
+export interface WfConfig {
+    workflowCode: string;
+    formId?: number;
+    columnList?: string;
+    ownerAppCode?: string;
+}
+export interface StartPayload {
+    processDefinitionKey: string;
+    instanceName: string;
+    formId: number;
+    tableName: string;
+    dataId: string;
+    businessKey: string;
+    memo: string;
+    url: string;
+    prefix: string;
+    firstPerson: string[];
+    urlUpdateStatus: string;
+    stateList: string[];
+    actionId: string;
+    dataViewIid: string;
+    dataSceneIid: string;
+    serviceUrl: string;
+    componentUrl: string;
+    ownerAppCode: string;
+    vis: Record<string, unknown>;
+}

package/dist/Approval/types.js

@@ -0,0 +1 @@
+export {};

package/dist/VirtTable/src/FilterPanal.d.ts

@@ -5,7 +5,6 @@ export default class FilterPanel {
     private wrap;
     private curHeader?;
     private filterMap;
-    private root;
     constructor(ctx: Context);
     show(h: CellHeader): Promise<void>;
     private applyFilter;

package/dist/VirtTable/src/FilterPanal.js

@@ -27,9 +27,7 @@ function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key i
 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); }
 import React, { useState } from 'react';
-import ReactDOM from 'react-dom/client';
-// 你的类型
-
+import ReactDOM from 'react-dom';
 import { computePosition, offset, flip, shift } from '@floating-ui/dom';
 import moment from 'moment';
 var FilterPanel = /*#__PURE__*/function () {
@@ -37,12 +35,10 @@ var FilterPanel = /*#__PURE__*/function () {
     var _this = this;
     _classCallCheck(this, FilterPanel);
     _defineProperty(this, "ctx", void 0);
-    _defineProperty(this, "wrap", void 0);
+    _defineProperty(this, "wrap", document.createElement('div'));
     _defineProperty(this, "curHeader", void 0);
     _defineProperty(this, "filterMap", new Map());
-    _defineProperty(this, "root", null);
     this.ctx = ctx;
-    this.wrap = document.createElement('div'); // 仍用原生节点当浮层容器
     document.body.appendChild(this.wrap);
     this.ctx.on('filterClick', function (h) {
       return _this.show(h);
@@ -86,9 +82,9 @@ var FilterPanel = /*#__PURE__*/function () {
                   start: '',
                   end: ''
                 } : ''
-              }; // 用 React 渲染
-              this.root = ReactDOM.createRoot(this.wrap);
-              this.root.render( /*#__PURE__*/React.createElement(_ConfigProvider, null, /*#__PURE__*/React.createElement(AntFilterContent, {
+              };
+              /* ② React 16 用 ReactDOM.render */
+              ReactDOM.render( /*#__PURE__*/React.createElement(_ConfigProvider, null, /*#__PURE__*/React.createElement(AntFilterContent, {
                 type: type,
                 column: col,
                 lastValue: last.val,
@@ -98,9 +94,9 @@ var FilterPanel = /*#__PURE__*/function () {
                 onReset: function onReset() {
                   return _this2.applyFilter(undefined);
                 }
-              })));
+              })), this.wrap);
 
-              // 浮层定位仍用 floating-ui
+              /* 定位照旧 */
               this.wrap.style.position = 'absolute';
               this.wrap.style.zIndex = '2000';
               btn = h.filterBtnRect;
@@ -119,14 +115,14 @@ var FilterPanel = /*#__PURE__*/function () {
                   };
                 }
               };
-              _context.next = 13;
+              _context.next = 12;
               return computePosition(virtualEl, this.wrap, {
                 placement: 'bottom-end',
                 middleware: [offset(4), flip(), shift({
                   padding: 4
                 })]
               });
-            case 13:
+            case 12:
               _yield$computePositio = _context.sent;
               x = _yield$computePositio.x;
               y = _yield$computePositio.y;
@@ -134,7 +130,7 @@ var FilterPanel = /*#__PURE__*/function () {
                 left: "".concat(x, "px"),
                 top: "".concat(y, "px")
               });
-            case 17:
+            case 16:
             case "end":
               return _context.stop();
           }
@@ -167,10 +163,8 @@ var FilterPanel = /*#__PURE__*/function () {
   }, {
     key: "hide",
     value: function hide() {
-      if (this.root) {
-        this.root.unmount();
-        this.root = null;
-      }
+      /* ③ React 16 卸载方式 */
+      ReactDOM.unmountComponentAtNode(this.wrap);
     }
   }, {
     key: "destroy",
@@ -181,7 +175,7 @@ var FilterPanel = /*#__PURE__*/function () {
   }]);
   return FilterPanel;
 }();
-/* ***************  以下为 AntD 写的 UI 部分  *************** */
+/* **************** UI 部分（无需改动） **************** */
 export { FilterPanel as default };
 function AntFilterContent(_ref) {
   var type = _ref.type,
@@ -201,8 +195,6 @@ function AntFilterContent(_ref) {
     _useState6 = _slicedToArray(_useState5, 2),
     checked = _useState6[0],
     setChecked = _useState6[1];
-
-  // select 场景：把 options 提出来
   var options = React.useMemo(function () {
     var _column$editorProps;
     if (type !== 'select') return [];
@@ -217,10 +209,10 @@ function AntFilterContent(_ref) {
     style: {
       padding: 12,
       width: type === 'date' ? 280 : 200,
-      backgroundColor: '#fff',
+      background: '#fff',
       borderRadius: 8,
       marginTop: 6,
-      boxShadow: '0 2px 8px rgba(0, 0, 0, 0.15)'
+      boxShadow: '0 2px 8px rgba(0,0,0,0.15)'
     }
   }, type === 'text' && /*#__PURE__*/React.createElement(_Input, {
     placeholder: "\u5173\u952E\u5B57",

package/package.json

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