@luck-design-biz/luckda 0.0.25-13 → 0.0.25-14

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

@@ -28,12 +28,12 @@ var _formPropsDefault = _interopRequireDefault(require("../../../engine/meta/for
 var _index2 = _interopRequireDefault(require("./index.less"));
 var _excluded = ["advance"];
 var _I18N_PREFIX_ = 'lc.form.validator';
-var Header = function Header(_ref) {
-  var _ref$header = _ref.header,
-    header = _ref$header === void 0 ? 'collapse' : _ref$header,
-    title = _ref.title,
-    ldId = _ref.ldId,
-    children = _ref.children;
+var Header = function Header(_ref2) {
+  var _ref2$header = _ref2.header,
+    header = _ref2$header === void 0 ? 'collapse' : _ref2$header,
+    title = _ref2.title,
+    ldId = _ref2.ldId,
+    children = _ref2.children;
   if (header === 'collapse' || header === 'collapseFollow') return /*#__PURE__*/_react.default.createElement(_base.Collapse, {
     title: title || ldId,
     id: ldId,
@@ -61,28 +61,37 @@ var getMthodParams = function getMthodParams(methodStr) {
   }
   return [];
 };
-var LCForm = /*#__PURE__*/(0, _react.forwardRef)(function (_ref2, ref) {
+var useCombinedRefs = function useCombinedRefs(forwardedRef) {
+  var innerRef = (0, _react.useRef)(null);
+  (0, _react.useEffect)(function () {
+    if (!forwardedRef) return;
+    if (typeof forwardedRef === 'function') {
+      forwardedRef(innerRef.current);
+    } else {
+      forwardedRef.current = innerRef.current;
+    }
+  }, [forwardedRef]);
+  return forwardedRef || innerRef;
+};
+var LCForm = /*#__PURE__*/(0, _react.forwardRef)(function (_ref3, ref) {
   var _ctx$pagePublicResour2;
-  var id = _ref2.id,
-    parentId = _ref2.parentId,
-    width = _ref2.width,
-    height = _ref2.height,
-    className = _ref2.className,
-    blocks = _ref2.blocks,
-    advance = _ref2.advance,
-    initData = _ref2.initData,
-    readOnly = _ref2.readOnly,
-    showSave = _ref2.showSave,
-    saveTitle = _ref2.saveTitle,
-    getContainer = _ref2.getContainer,
-    settingLayout = _ref2.settingLayout,
-    renderFormLeft = _ref2.renderFormLeft,
-    renderFormRight = _ref2.renderFormRight,
-    children = _ref2.children;
+  var id = _ref3.id,
+    className = _ref3.className,
+    blocks = _ref3.blocks,
+    advance = _ref3.advance,
+    initData = _ref3.initData,
+    readOnly = _ref3.readOnly,
+    showSave = _ref3.showSave,
+    saveTitle = _ref3.saveTitle,
+    getContainer = _ref3.getContainer,
+    settingLayout = _ref3.settingLayout,
+    renderFormLeft = _ref3.renderFormLeft,
+    renderFormRight = _ref3.renderFormRight,
+    children = _ref3.children;
   var apiRef = (0, _react.useRef)();
-  var boxRef = (0, _react.useRef)();
+  var wrapperRef = (0, _react.useRef)();
+  var formRef = useCombinedRefs(ref);
   var promiseRef = (0, _react.useRef)(null);
-  var formRef = (0, _react.useRef)();
   var ctx = (0, _ContextProvider.useContext)();
   var remoteSource = (0, _ContextProvider.useRemoteSource)();
   var _initData = (0, _ahooks.useCreation)(function () {
@@ -96,53 +105,53 @@ var LCForm = /*#__PURE__*/(0, _react.forwardRef)(function (_ref2, ref) {
     })) || [];
   }, [remoteSource.serials]);
   var _blocks = (0, _ahooks.useCreation)(function () {
-    return blocks.filter(function (_ref3) {
-      var hidden = _ref3.hidden;
+    return blocks.filter(function (_ref4) {
+      var hidden = _ref4.hidden;
       return !hidden;
     });
   }, [blocks]);
   (0, _ahooks.useMount)(function () {
     ctx.doAction(advance.events.onMount, {
-      instance: (ref || formRef).current
+      instance: formRef.current
     });
   });
   (0, _react.useEffect)(function () {
-    var tid = ctx.$subscriber(ctx.topics.PAGE_PUBLIC_RESOURCE_CHANGED).on(function (_ref4) {
-      var resource = _ref4.resource,
-        prevResource = _ref4.prevResource;
+    var tid = ctx.$subscriber(ctx.topics.PAGE_PUBLIC_RESOURCE_CHANGED).on(function (_ref5) {
+      var resource = _ref5.resource,
+        prevResource = _ref5.prevResource;
       ctx.doAction(advance.events.onPagePublicResourceChanged, {
         resource: resource,
         prevResource: prevResource,
-        instance: (ref || formRef).current
+        instance: formRef.current
       });
     }).watch();
     return function () {
       ctx.$unsubscriber(ctx.topics.PAGE_PUBLIC_RESOURCE_CHANGED, tid);
       ctx.doAction(advance.events.onUnmount, {
-        instance: (ref || formRef).current
+        instance: formRef.current
       });
     };
   }, []);
   (0, _react.useImperativeHandle)(apiRef, function () {
     return {
-      /**
-       * 获取表格实例
-       * @method
+      /**
+       * 获取表格实例
+       * @method
        */
       getInstance: function getInstance() {
-        return (ref || formRef).current;
+        return formRef.current;
       },
-      /**
-       * 提交表格数据
-       * @method
+      /**
+       * 提交表格数据
+       * @method
        */
       submit: function submit() {
         return new Promise(function (resolve) {
           var _ctx$pagePublicResour;
           promiseRef.current = resolve;
-          var instance = (ref || formRef).current;
-          var _ref5 = ((_ctx$pagePublicResour = ctx.pagePublicResource) === null || _ctx$pagePublicResour === void 0 ? void 0 : _ctx$pagePublicResour[id]) || initData || _initData || {},
-            formMode = _ref5.formMode;
+          var instance = formRef.current;
+          var _ref6 = ((_ctx$pagePublicResour = ctx.pagePublicResource) === null || _ctx$pagePublicResour === void 0 ? void 0 : _ctx$pagePublicResour[id]) || initData || _initData || {},
+            formMode = _ref6.formMode;
           if (formMode === 'add') {
             instance.onAdd();
           } else if (formMode === 'update') {
@@ -150,25 +159,25 @@ var LCForm = /*#__PURE__*/(0, _react.forwardRef)(function (_ref2, 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 = (ref || formRef).current;
+        var instance = formRef.current;
         var block = instance.formRefs[blockId];
         if (!block) {
           console.e('未发现区块');
@@ -237,7 +246,7 @@ var LCForm = /*#__PURE__*/(0, _react.forwardRef)(function (_ref2, ref) {
     };
   });
   var getTargetDom = (0, _ahooks.useMemoizedFn)(function () {
-    return boxRef.current;
+    return wrapperRef.current;
   });
   var handleDefaultDataSourceFormat = (0, _ahooks.useMemoizedFn)(function (defaultDataSourceFormat, defaultValues) {
     if ((0, _lodash.isNil)(defaultDataSourceFormat)) return function () {
@@ -245,10 +254,10 @@ var LCForm = /*#__PURE__*/(0, _react.forwardRef)(function (_ref2, ref) {
     };
     return (0, _helper.executeCode)(ctx, defaultDataSourceFormat, ['defaultValues'], defaultValues);
   });
-  var handleDataSourceFormat = (0, _ahooks.useMemoizedFn)(function (dataSourceFormat, dataSetKey, _ref6) {
-    var values = _ref6.values,
-      submitData = _ref6.submitData,
-      behaviorKey = _ref6.behaviorKey;
+  var handleDataSourceFormat = (0, _ahooks.useMemoizedFn)(function (dataSourceFormat, dataSetKey, _ref7) {
+    var values = _ref7.values,
+      submitData = _ref7.submitData,
+      behaviorKey = _ref7.behaviorKey;
     if ((0, _lodash.isNil)(dataSourceFormat)) return (0, _defineProperty2.default)({}, dataSetKey, submitData);
     return (0, _helper.executeCode)(ctx, dataSourceFormat, ['dataSetKey', 'values', 'submitData', 'behaviorKey'], dataSetKey, values, submitData, behaviorKey);
   });
@@ -259,8 +268,8 @@ var LCForm = /*#__PURE__*/(0, _react.forwardRef)(function (_ref2, ref) {
     if ((0, _lodash.isNil)(actionsColumnReset)) return columns;
     return (0, _helper.executeCode)(ctx, actionsColumnReset, ['columns'], columns);
   });
-  var handleGridFormReady = (0, _ahooks.useMemoizedFn)(function (onGridFormReady, ref, params, gridForm) {
-    if (!(0, _lodash.isNil)(onGridFormReady)) return (0, _helper.executeCode)(ctx, onGridFormReady, ['ref', 'params', 'gridForm'], ref, params, gridForm);
+  var handleGridFormReady = (0, _ahooks.useMemoizedFn)(function (onGridFormReady, _ref, params, gridForm) {
+    if (!(0, _lodash.isNil)(onGridFormReady)) return (0, _helper.executeCode)(ctx, onGridFormReady, ['ref', 'params', 'gridForm'], _ref, params, gridForm);
   });
   var handleResetActions = (0, _ahooks.useMemoizedFn)(function (resetActions, data, index, actionList, params) {
     if ((0, _lodash.isNil)(resetActions)) return actionList;
@@ -286,8 +295,8 @@ var LCForm = /*#__PURE__*/(0, _react.forwardRef)(function (_ref2, ref) {
     props.config.rules = props.config.rules || [];
     if ((_verifyListObj$length = verifyListObj.length) !== null && _verifyListObj$length !== void 0 && _verifyListObj$length.expression) props.config.rules.push({
       validator: function validator(rule, value, callback) {
-        var _current;
-        var length = (0, _helper.executeCode)(ctx, verifyListObj.length.expression, ['cValue'], (_current = (ref || formRef).current) === null || _current === void 0 ? void 0 : _current.getCValue());
+        var _formRef$current;
+        var length = (0, _helper.executeCode)(ctx, verifyListObj.length.expression, ['cValue'], (_formRef$current = formRef.current) === null || _formRef$current === void 0 ? void 0 : _formRef$current.getCValue());
         if (value.length > length) callback("".concat((0, _utils.formatMessage)({
           id: "".concat(_I18N_PREFIX_, ".maxLength"),
           label: '字数不得超过'
@@ -300,8 +309,8 @@ var LCForm = /*#__PURE__*/(0, _react.forwardRef)(function (_ref2, ref) {
     });
     if ((_verifyListObj$min = verifyListObj.min) !== null && _verifyListObj$min !== void 0 && _verifyListObj$min.expression) props.config.rules.push({
       validator: function validator(rule, value, callback) {
-        var _current2;
-        var min = (0, _helper.executeCode)(ctx, verifyListObj.min.expression, ['cValue'], (_current2 = (ref || formRef).current) === null || _current2 === void 0 ? void 0 : _current2.getCValue());
+        var _formRef$current2;
+        var min = (0, _helper.executeCode)(ctx, verifyListObj.min.expression, ['cValue'], (_formRef$current2 = formRef.current) === null || _formRef$current2 === void 0 ? void 0 : _formRef$current2.getCValue());
         if (value < min) callback((0, _utils.formatMessage)({
           id: "".concat(_I18N_PREFIX_, ".numberBelowMin"),
           label: '低于最小值'
@@ -311,8 +320,8 @@ var LCForm = /*#__PURE__*/(0, _react.forwardRef)(function (_ref2, ref) {
     });
     if ((_verifyListObj$max = verifyListObj.max) !== null && _verifyListObj$max !== void 0 && _verifyListObj$max.expression) props.config.rules.push({
       validator: function validator(rule, value, callback) {
-        var _current3;
-        var max = (0, _helper.executeCode)(ctx, verifyListObj.max.expression, ['cValue'], (_current3 = (ref || formRef).current) === null || _current3 === void 0 ? void 0 : _current3.getCValue());
+        var _formRef$current3;
+        var max = (0, _helper.executeCode)(ctx, verifyListObj.max.expression, ['cValue'], (_formRef$current3 = formRef.current) === null || _formRef$current3 === void 0 ? void 0 : _formRef$current3.getCValue());
         if (value > max) callback((0, _utils.formatMessage)({
           id: "".concat(_I18N_PREFIX_, ".numberExceedMax"),
           label: '超过最大值'
@@ -325,8 +334,8 @@ var LCForm = /*#__PURE__*/(0, _react.forwardRef)(function (_ref2, ref) {
     if (verifyListObj.mobile) props.config.type = 'mobile';
     if ((_verifyListObj$rules = verifyListObj.rules) !== null && _verifyListObj$rules !== void 0 && _verifyListObj$rules.expression) props.config.rules.push({
       validator: function validator(rule, value, callback) {
-        var _current4;
-        (0, _helper.executeCode)(ctx, verifyListObj.rules.expression, ['cValue', 'rule', 'value', 'callback'], (_current4 = (ref || formRef).current) === null || _current4 === void 0 ? void 0 : _current4.getCValue(), rule, value, callback);
+        var _formRef$current4;
+        (0, _helper.executeCode)(ctx, verifyListObj.rules.expression, ['cValue', 'rule', 'value', 'callback'], (_formRef$current4 = formRef.current) === null || _formRef$current4 === void 0 ? void 0 : _formRef$current4.getCValue(), rule, value, callback);
       }
     });
     return props;
@@ -401,8 +410,8 @@ var LCForm = /*#__PURE__*/(0, _react.forwardRef)(function (_ref2, ref) {
           columnsReset: function columnsReset(columns) {
             return handleColumnsReset(item.columnsReset, columns);
           },
-          onGridFormReady: function onGridFormReady(ref, params, gridForm) {
-            return handleGridFormReady(item.onGridFormReady, ref, params, gridForm);
+          onGridFormReady: function onGridFormReady(_ref, params, gridForm) {
+            return handleGridFormReady(item.onGridFormReady, _ref, params, gridForm);
           }
         });
         if (item.actionsColumnReset) data = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, data), {}, {
@@ -474,7 +483,7 @@ var LCForm = /*#__PURE__*/(0, _react.forwardRef)(function (_ref2, ref) {
   });
   var beforeSubmit = (0, _ahooks.useMemoizedFn)(function (values, data) {
     return new Promise( /*#__PURE__*/function () {
-      var _ref8 = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee(resolve) {
+      var _ref9 = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee(resolve) {
         var _data;
         return (0, _regeneratorRuntime2.default)().wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
@@ -502,7 +511,7 @@ var LCForm = /*#__PURE__*/(0, _react.forwardRef)(function (_ref2, ref) {
         }, _callee);
       }));
       return function (_x) {
-        return _ref8.apply(this, arguments);
+        return _ref9.apply(this, arguments);
       };
     }());
   });
@@ -529,13 +538,8 @@ var LCForm = /*#__PURE__*/(0, _react.forwardRef)(function (_ref2, ref) {
     displayName: "Form",
     getTargetDom: getTargetDom,
     api: apiRef
-  }, /*#__PURE__*/_react.default.createElement("div", {
-    ref: boxRef,
-    style: {
-      width: width,
-      height: height
-    }
   }, /*#__PURE__*/_react.default.createElement(_index.LdFormList, {
+    wrapperRef: wrapperRef,
     id: id,
     ldId: id,
     className: (0, _classnames.default)(_index2.default['lc-component-form'], (0, _defineProperty2.default)({}, className, !!className)),
@@ -543,7 +547,7 @@ var LCForm = /*#__PURE__*/(0, _react.forwardRef)(function (_ref2, ref) {
     renderFormExtra: renderFormExtra,
     mainFormLdId: "block_main",
     initData: ((_ctx$pagePublicResour2 = ctx.pagePublicResource) === null || _ctx$pagePublicResour2 === void 0 ? void 0 : _ctx$pagePublicResour2[id]) || initData || _initData,
-    ref: ref || formRef,
+    ref: formRef,
     readOnly: readOnly,
     showSaveBtn: showSave,
     saveBtnTitle: saveTitle,
@@ -567,7 +571,7 @@ var LCForm = /*#__PURE__*/(0, _react.forwardRef)(function (_ref2, ref) {
       }
       return (_promiseRef$current = promiseRef.current) === null || _promiseRef$current === void 0 ? void 0 : _promiseRef$current.call.apply(_promiseRef$current, [promiseRef].concat(rest));
     }
-  })));
+  }));
 });
 LCForm.defaultProps = (0, _helper.omitBadProps)(_formPropsDefault.default);
 var _default = exports.default = LCForm;

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

@@ -1,5 +1,5 @@
-.lc-component-form{
-}
-.lc-component-form.runtime-form {
-  
+.lc-component-form{
+}
+.lc-component-form.runtime-form {
+  
 }