@luck-design-biz/luckda 1.0.1-4 → 1.0.1-6

package/lib/lowcode/view/lc-components/Form/index.js

@@ -27,7 +27,6 @@ var _RuntimeComp = _interopRequireDefault(require("../JSX/RuntimeComp"));
 var _useCombinedRefs = _interopRequireDefault(require("../../../engine/tools/useCombinedRefs"));
 var _formPropsDefault = _interopRequireDefault(require("../../../engine/meta/form.props.default.json"));
 var _constants = require("../../../constants");
-var _index2 = _interopRequireDefault(require("./index.less"));
 var _excluded = ["advance", "state", "render"];
 var _I18N_PREFIX_ = 'lc.form.validator';
 var Header = function Header(_ref2) {
@@ -64,7 +63,7 @@ var getMthodParams = function getMthodParams(methodStr) {
   return [];
 };
 var LCForm = /*#__PURE__*/(0, _react.forwardRef)(function (_ref3, ref) {
-  var _ctx$state2, _promiseRef$current2;
+  var _ctx$state2;
   var id = _ref3.id,
     className = _ref3.className,
     blocks = _ref3.blocks,
@@ -73,6 +72,7 @@ var LCForm = /*#__PURE__*/(0, _react.forwardRef)(function (_ref3, ref) {
     readOnly = _ref3.readOnly,
     showSave = _ref3.showSave,
     saveTitle = _ref3.saveTitle,
+    affixBarZIndex = _ref3.affixBarZIndex,
     getContainer = _ref3.getContainer,
     settingLayout = _ref3.settingLayout,
     renderFormLeft = _ref3.renderFormLeft,
@@ -107,21 +107,24 @@ var LCForm = /*#__PURE__*/(0, _react.forwardRef)(function (_ref3, ref) {
   });
   (0, _react.useImperativeHandle)(apiRef, function () {
     return {
-      /**
-       * 获取表格实例
-       * @method
+      /**
+       * 获取表格实例
+       * @method
        */
       getInstance: function getInstance() {
         return formRef.current;
       },
-      /**
-       * 提交表格数据
-       * @method
+      /**
+       * 提交表格数据
+       * @method
        */
       submit: function submit(_formMode) {
-        return new Promise(function (resolve) {
+        return new Promise(function (resolve, reject) {
           var _ctx$state;
-          promiseRef.current = resolve;
+          promiseRef.current = {
+            resolve: resolve,
+            reject: reject
+          };
           var instance = formRef.current;
           var _ref5 = _formMode ? {
               formMode: _formMode
@@ -134,22 +137,22 @@ var LCForm = /*#__PURE__*/(0, _react.forwardRef)(function (_ref3, ref) {
           }
         });
       },
-      /**
-       * @typedef {Object} Field
-       * @property {Object} target - 字段引用
-       * @property {boolean} disabled - 字段不可维护
-       * @property {boolean} required - 字段必填
-       * @property {any} value - 字段值
+      /**
+       * @typedef {Object} Field
+       * @property {Object} target - 字段引用
+       * @property {boolean} disabled - 字段不可维护
+       * @property {boolean} required - 字段必填
+       * @property {any} value - 字段值
        */
-      /**
-       * @typedef {Object} Block
-       * @property {Object} target - 区块引用
-       * @property {function(fieldName): Field} getField - 获取区块下的表单域
+      /**
+       * @typedef {Object} Block
+       * @property {Object} target - 区块引用
+       * @property {function(fieldName): Field} getField - 获取区块下的表单域
        */
-      /**
-       * 获取区块
-       * @param {*} blockId - 区块ID
-       * @returns {Block}
+      /**
+       * 获取区块
+       * @param {*} blockId - 区块ID
+       * @returns {Block}
        */
       getBlock: function getBlock(blockId) {
         var instance = formRef.current;
@@ -573,7 +576,7 @@ var LCForm = /*#__PURE__*/(0, _react.forwardRef)(function (_ref3, ref) {
     wrapperRef: wrapperRef,
     id: id,
     ldId: id,
-    className: (0, _classnames.default)(_index2.default['lc-component-form'], (0, _defineProperty2.default)({}, className, !!className)),
+    className: (0, _classnames.default)('lc-component-form', (0, _defineProperty2.default)({}, className, !!className)),
     renderFormList: renderFormList,
     renderFormExtra: renderFormExtra,
     mainFormLdId: "block_main",
@@ -583,6 +586,7 @@ var LCForm = /*#__PURE__*/(0, _react.forwardRef)(function (_ref3, ref) {
     showSaveBtn: showSave,
     saveBtnTitle: saveTitle,
     affixLayout: settingLayout,
+    affixBarZIndex: affixBarZIndex,
     renderAffixLeft: function renderAffixLeft() {
       return renderAffix(renderFormLeft);
     },
@@ -595,15 +599,17 @@ var LCForm = /*#__PURE__*/(0, _react.forwardRef)(function (_ref3, ref) {
     onChildChange: onChildChange,
     setVerifyRules: setVerifyRules,
     getContainer: (0, _lodash.isNil)(getContainer) ? null : ctx.componentMap.get(getContainer).api.getSelfDom,
-    afterSubmitLoading: function afterSubmitLoading() {
+    afterSubmitLoading: function afterSubmitLoading(res) {
       var _promiseRef$current;
-      for (var _len5 = arguments.length, rest = new Array(_len5), _key5 = 0; _key5 < _len5; _key5++) {
-        rest[_key5] = arguments[_key5];
-      }
-      return (_promiseRef$current = promiseRef.current) === null || _promiseRef$current === void 0 ? void 0 : _promiseRef$current.call.apply(_promiseRef$current, [promiseRef].concat(rest));
+      (_promiseRef$current = promiseRef.current) === null || _promiseRef$current === void 0 || _promiseRef$current.resolve(res);
+      promiseRef.current = null;
     },
     afterInit: afterInit,
-    validateErrorCallback: (_promiseRef$current2 = promiseRef.current) === null || _promiseRef$current2 === void 0 ? void 0 : _promiseRef$current2.call(promiseRef),
+    validateErrorCallback: function validateErrorCallback() {
+      var _promiseRef$current2;
+      (_promiseRef$current2 = promiseRef.current) === null || _promiseRef$current2 === void 0 || _promiseRef$current2.reject();
+      promiseRef.current = null;
+    },
     showConfigBtn: false
   }));
 });