venus-design 1.0.47 → 1.0.49

package/dist/LoadableStep/index.d.ts

@@ -0,0 +1,15 @@
+import React from 'react';
+export interface LoadableStepRef {
+    validateBusinessForm: () => Promise<boolean>;
+    getPageRef: () => any;
+}
+interface LoadableStepProps {
+    loader: () => Promise<any>;
+    [key: string]: any;
+}
+/**
+ * 让 react-loadable 支持 ref 转发
+ * 把 ref 转成普通 prop forwardedRef 再往下塞
+ */
+declare const LoadableStep: React.ForwardRefExoticComponent<Omit<LoadableStepProps, "ref"> & React.RefAttributes<LoadableStepRef>>;
+export default LoadableStep;

package/dist/LoadableStep/index.js

@@ -0,0 +1,35 @@
+var _excluded = ["loader"];
+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); }
+function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
+function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
+import React, { forwardRef, useImperativeHandle, useRef } from 'react';
+import Loadable from 'react-loadable';
+import { BISpin } from "./..";
+/**
+ * 让 react-loadable 支持 ref 转发
+ * 把 ref 转成普通 prop forwardedRef 再往下塞
+ */
+var LoadableStep = /*#__PURE__*/forwardRef(function (_ref, ref) {
+  var loader = _ref.loader,
+    rest = _objectWithoutProperties(_ref, _excluded);
+  // ① 用 Loadable 动态加载真实组件
+  var LazyComp = Loadable({
+    loader: loader,
+    loading: function loading() {
+      return /*#__PURE__*/React.createElement(BISpin, null);
+    }
+  });
+
+  // ② 等 LazyComp 加载完成后，里层组件实例会挂到 innerRef
+  var innerRef = useRef();
+  useImperativeHandle(ref, function () {
+    return innerRef.current;
+  }, []);
+
+  // ③ 把 ref 变成普通 prop 向下转发
+  //@ts-ignore
+  return /*#__PURE__*/React.createElement(LazyComp, _extends({}, rest, {
+    forwardedRef: innerRef
+  }));
+});
+export default LoadableStep;

package/dist/VenusWorkDetail/index.js

@@ -21,10 +21,10 @@ import VenusAdjustDetail from "../VenusAdjustDetail";
 import { LoadingAdjustData, LoadingWorkFlowData, LoadingWorkFlowTableData } from "./services";
 import VenusTable from "../VenusTable";
 import VenusForm from "../VenusForm";
-import { BISpin, isNotNullVenus } from "./..";
+import { isNotNullVenus, LoadableStep } from "./..";
 import VenusAdjustBatch from "../VenusAdjustBatch";
 import { getInnerIdByBusinessKey } from "./utils";
-import Loadable from 'react-loadable';
+//import Loadable from 'react-loadable';
 import { StyleProvider, legacyLogicalPropertiesTransformer } from "@ant-design/cssinjs";
 
 /**
@@ -52,12 +52,10 @@ var VenusWorkDetail = /*#__PURE__*/forwardRef(function (props, ref) {
   /* --------------- 表单实例 --------------- */
   var formRef = useRef(null); // VenusForm / VenusTable / 
   //懒加载组件
-  var LoadableSub = Loadable({
-    loader: props.loader,
-    loading: function loading() {
-      return /*#__PURE__*/React.createElement(BISpin, null);
-    }
-  });
+  /*const LoadableSub =  Loadable({
+          loader:props.loader,
+          loading: () => <BISpin />,
+  });*/
   var _Form$useForm = _Form.useForm(),
     _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
     form = _Form$useForm2[0];
@@ -220,8 +218,38 @@ var VenusWorkDetail = /*#__PURE__*/forwardRef(function (props, ref) {
         return validateBusinessForm;
       }(),
       getPageRef: function getPageRef() {
-        return formRef;
-      }
+        return formRef.current.getPageRef();
+      },
+      validateSubmitSuccess: function () {
+        var _validateSubmitSuccess = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5() {
+          return _regeneratorRuntime().wrap(function _callee5$(_context5) {
+            while (1) switch (_context5.prev = _context5.next) {
+              case 0:
+                if (!(formRef && formRef.current)) {
+                  _context5.next = 6;
+                  break;
+                }
+                _context5.next = 3;
+                return formRef.current.validateSubmitSuccess();
+              case 3:
+                _context5.t0 = _context5.sent;
+                _context5.next = 7;
+                break;
+              case 6:
+                _context5.t0 = true;
+              case 7:
+                return _context5.abrupt("return", _context5.t0);
+              case 8:
+              case "end":
+                return _context5.stop();
+            }
+          }, _callee5);
+        }));
+        function validateSubmitSuccess() {
+          return _validateSubmitSuccess.apply(this, arguments);
+        }
+        return validateSubmitSuccess;
+      }()
     };
   });
   return /*#__PURE__*/React.createElement(StyleProvider, {
@@ -235,8 +263,10 @@ var VenusWorkDetail = /*#__PURE__*/forwardRef(function (props, ref) {
   }, isNotNullVenus(props.componentUrl) && props.actionId != "adjust" ?
   /*#__PURE__*/
   //@ts-ignore
-  React.createElement(LoadableSub, _extends({}, props, {
-    ref: formRef
+  React.createElement(LoadableStep, _extends({
+    loader: props.loader // 保持动态！
+    ,
+    ref: formRef // 现在能真正落到底层组件
   }, props.otherProps, {
     innerId: getInnerIdByBusinessKey(props.businessKey)
   })) : props.actionId == "adjust" ? props.batchFlag == true ? /*#__PURE__*/React.createElement(VenusAdjustBatch, {

package/dist/index.d.ts

@@ -34,6 +34,7 @@ export { default as RenderRouter } from './RenderRouter';
 export { default as VenusFormInterface, VenusFormGroupInterface, VenusFormItemInterface, VenusFormDataVo, VenusFormRadioType, VenusFormType } from './VenusForm/interface';
 export { handleFormItems, radioEnumData, zeroAndOneToTrueOrFalse, haveQt, validatorListToValidator, setVenusFormFormate, getVenusFormFormate } from './VenusForm/handleVenusFormFunctions';
 export { VENUS_FORM_ITEM_VALUE, VENUS_FORM_EDIT_ITEM_VALUE, handleDatePickerData, handleNameAndIdSplit, VENUS_FORM_ITEM_TYPE, isNotEditScene, getUserFormate, setUserFormate, addFormCustomCom, VENUS_FORM_CUSTOMCOM_TYPE, getColumnByFieldName } from './VenusForm/staticAttr';
+export { default as LoadableStep } from './LoadableStep';
 export { dataToEnum, requestEnumDataCallback, requestRadioDataCallback, requestCheckboxDataCallback, requestDataOptionsCallback, requestSeclevelEnumCallback, requestSeclevelDataCallback, requestFormCallback, requestDefineCallback, requestCostumColumnsDataCallback } from './Config/useCallback';
 export { default as SelectKYSeclevel } from './SelectCompoments/SelectKYSeclevel';
 export { default as SelectUserBySecLevelId } from './SelectCompoments/SelectUserBySecLevelId';

package/dist/index.js

@@ -34,6 +34,7 @@ export { default as RenderRouter } from "./RenderRouter";
 export { default as VenusFormInterface, VenusFormGroupInterface, VenusFormItemInterface, VenusFormDataVo, VenusFormRadioType, VenusFormType } from "./VenusForm/interface";
 export { handleFormItems, radioEnumData, zeroAndOneToTrueOrFalse, haveQt, validatorListToValidator, setVenusFormFormate, getVenusFormFormate } from "./VenusForm/handleVenusFormFunctions";
 export { VENUS_FORM_ITEM_VALUE, VENUS_FORM_EDIT_ITEM_VALUE, handleDatePickerData, handleNameAndIdSplit, VENUS_FORM_ITEM_TYPE, isNotEditScene, getUserFormate, setUserFormate, addFormCustomCom, VENUS_FORM_CUSTOMCOM_TYPE, getColumnByFieldName } from "./VenusForm/staticAttr";
+export { default as LoadableStep } from "./LoadableStep";
 export { dataToEnum, requestEnumDataCallback, requestRadioDataCallback, requestCheckboxDataCallback, requestDataOptionsCallback, requestSeclevelEnumCallback, requestSeclevelDataCallback, requestFormCallback, requestDefineCallback, requestCostumColumnsDataCallback } from "./Config/useCallback";
 export { default as SelectKYSeclevel } from "./SelectCompoments/SelectKYSeclevel";
 export { default as SelectUserBySecLevelId } from "./SelectCompoments/SelectUserBySecLevelId";

package/package.json

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