venus-design 1.0.44 → 1.0.46

package/dist/SelectCompoments/SelectUserBySecLevelId/search/user.js

@@ -73,14 +73,14 @@ var UserList = /*#__PURE__*/function (_React$Component) {
               userStr = sessionStorage.getItem('user'); //@ts-ignore
               user = JSON.parse(userStr || "{seclevelId:1}");
               _context.next = 10;
-              return getUserListBySecLevelId(user && user.seclevelId ? user.seclevelId : "1", _this.props.secType, params);
+              return getUserListBySecLevelId(user && user.seclevelId ? user.seclevelId : "1", _this.props.secType || "high", params);
             case 10:
               response = _context.sent;
               _context.next = 16;
               break;
             case 13:
               _context.next = 15;
-              return getUserListBySecLevelId(_this.props.secId, _this.props.secType, params);
+              return getUserListBySecLevelId(_this.props.secId, _this.props.secType || "low", params);
             case 15:
               response = _context.sent;
             case 16:

package/dist/SelectCompoments/SelectUserOrDeptBySeclevel/selectPanel/user.js

@@ -119,7 +119,7 @@ var VenusUser = function VenusUser(props) {
             return getUserOrgTreeList({
               queryLikeWork: "",
               objectSecId: props.secId == -1 ? user && user.seclevelId : props.secId,
-              type: "high"
+              type: user && user.seclevelId ? "high" : "low"
             });
           case 8:
             res = _context.sent;
@@ -418,14 +418,14 @@ var VenusUser = function VenusUser(props) {
             }
             user = storage.getSessionItem("user");
             _context3.next = 9;
-            return getUserListBySecLevelId(user.seclevelId, props.secType, params);
+            return getUserListBySecLevelId(user.seclevelId, props.secType || "high", params);
           case 9:
             response = _context3.sent;
             _context3.next = 15;
             break;
           case 12:
             _context3.next = 14;
-            return getUserListBySecLevelId(props.secId, props.secType, params);
+            return getUserListBySecLevelId(props.secId, props.secType || "low", params);
           case 14:
             response = _context3.sent;
           case 15:

package/dist/VenusWorkDetail/index.d.ts

@@ -1,4 +1,8 @@
 import React from 'react';
+export interface VenusWorkDetailRef {
+    /** 外部唯一需要的方法：校验内部表单 */
+    validateBusinessForm: () => Promise<boolean>;
+}
 /**
  * 流程查看组件
  */
@@ -16,5 +20,5 @@ interface VenusWorkDetailType {
     height?: any;
     otherProps?: any;
 }
-declare const VenusWorkDetail: (props: VenusWorkDetailType) => React.JSX.Element;
+declare const VenusWorkDetail: React.ForwardRefExoticComponent<VenusWorkDetailType & React.RefAttributes<VenusWorkDetailRef>>;
 export default VenusWorkDetail;

package/dist/VenusWorkDetail/index.js

@@ -16,7 +16,7 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
 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 React, { useEffect, useRef, useState } from 'react';
+import React, { forwardRef, useEffect, useImperativeHandle, useRef, useState } from 'react';
 import VenusAdjustDetail from "../VenusAdjustDetail";
 import { LoadingAdjustData, LoadingWorkFlowData, LoadingWorkFlowTableData } from "./services";
 import VenusTable from "../VenusTable";
@@ -31,7 +31,7 @@ import { StyleProvider, legacyLogicalPropertiesTransformer } from "@ant-design/c
  * 流程查看组件
  */
 
-var VenusWorkDetail = function VenusWorkDetail(props) {
+var VenusWorkDetail = /*#__PURE__*/forwardRef(function (props, ref) {
   var _useState = useState({}),
     _useState2 = _slicedToArray(_useState, 2),
     data = _useState2[0],
@@ -49,6 +49,8 @@ var VenusWorkDetail = function VenusWorkDetail(props) {
           loader: () => import('@/pages/demo/test/index').then(({ orderRefund }) => orderRefund),
           loading: true
   })*/
+  /* --------------- 表单实例 --------------- */
+  var formRef = useRef(null); // VenusForm / VenusTable / 
   //懒加载组件
   var LoadableSub = Loadable({
     loader: props.loader,
@@ -182,6 +184,46 @@ var VenusWorkDetail = function VenusWorkDetail(props) {
       return _ref3.apply(this, arguments);
     };
   }();
+
+  /* --------------- 把校验能力抛给父级 --------------- */
+  // 暴露方法：添加送审
+  useImperativeHandle(ref, function () {
+    return {
+      validateBusinessForm: function () {
+        var _validateBusinessForm = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4() {
+          return _regeneratorRuntime().wrap(function _callee4$(_context4) {
+            while (1) switch (_context4.prev = _context4.next) {
+              case 0:
+                if (!(formRef && formRef.current)) {
+                  _context4.next = 6;
+                  break;
+                }
+                _context4.next = 3;
+                return formRef.current.validateBusinessForm();
+              case 3:
+                _context4.t0 = _context4.sent;
+                _context4.next = 7;
+                break;
+              case 6:
+                _context4.t0 = true;
+              case 7:
+                return _context4.abrupt("return", _context4.t0);
+              case 8:
+              case "end":
+                return _context4.stop();
+            }
+          }, _callee4);
+        }));
+        function validateBusinessForm() {
+          return _validateBusinessForm.apply(this, arguments);
+        }
+        return validateBusinessForm;
+      }(),
+      getPageRef: function getPageRef() {
+        return formRef;
+      }
+    };
+  });
   return /*#__PURE__*/React.createElement(StyleProvider, {
     hashPriority: "high",
     transformers: [legacyLogicalPropertiesTransformer]
@@ -193,7 +235,9 @@ var VenusWorkDetail = function VenusWorkDetail(props) {
   }, isNotNullVenus(props.componentUrl) && props.actionId != "adjust" ?
   /*#__PURE__*/
   //@ts-ignore
-  React.createElement(LoadableSub, _extends({}, props, props.otherProps, {
+  React.createElement(LoadableSub, _extends({}, props, {
+    formRef: formRef
+  }, props.otherProps, {
     innerId: getInnerIdByBusinessKey(props.businessKey)
   })) : props.actionId == "adjust" ? props.batchFlag == true ? /*#__PURE__*/React.createElement(VenusAdjustBatch, {
     actionRef: adjustActionRef,
@@ -256,5 +300,5 @@ var VenusWorkDetail = function VenusWorkDetail(props) {
     ,
     dataSceneIid: props.dataSceneIid //数据场景标识
   })));
-};
+});
 export default VenusWorkDetail;

package/package.json

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