@luck-design-biz/luckda 0.0.25-1 → 0.0.25-2

package/lib/lowcode/painter/style/list-editor.less

@@ -7,6 +7,7 @@
     width: 100%;
     .list-item {
       height: 28px;
+      position: relative;
       background: #fff;
       border: 1px solid #e5e6e8;
       border-radius: 6px;
@@ -37,6 +38,41 @@
           cursor: pointer;
         }
       }
+
+      .list-item-bottom-line {
+        width: 100%;
+        height: 8px;
+        border-bottom: solid 1px var(--ant-primary-color);
+        position: absolute;
+        left: 0;
+        bottom: -6px;
+        padding-top: 4px;
+        display: none;
+        align-items: center;
+        justify-content: center;
+        cursor: pointer;
+        z-index: 10;
+      }
+      .list-item-bottom-line::after {
+        content: "+";
+        height: 12px;
+        margin-top: 4px;
+        color: var(--ant-primary-color);
+        border: solid 1px var(--ant-primary-color);
+        border-radius: 10px;
+        font-weight: bold;
+        font-size: 14px;
+        background-color: white;
+        padding: 0 8px;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+      }
+      &:hover {
+       .list-item-bottom-line {
+          display: flex;
+        }
+      }
     }
   }
 

package/lib/lowcode/preview/index.js

@@ -1,21 +1,35 @@
 "use strict";
 
+var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard").default;
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-var _react = _interopRequireDefault(require("react"));
+var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
+var _react = _interopRequireWildcard(require("react"));
+var _ahooks = require("ahooks");
 var _EventBusProvider = _interopRequireDefault(require("../engine/provider/EventBusProvider"));
 var _ContextProvider = _interopRequireDefault(require("../engine/provider/ContextProvider"));
 var _Page = _interopRequireDefault(require("../view/Page"));
 var _index = require("../constants/index");
 var Preview = function Preview(_ref) {
-  var code = _ref.code;
-  return /*#__PURE__*/_react.default.createElement(_EventBusProvider.default, {
+  var code = _ref.code,
+    userId = _ref.userId;
+  var _useState = (0, _react.useState)(userId),
+    _useState2 = (0, _slicedToArray2.default)(_useState, 2),
+    currentKey = _useState2[0],
+    setCurrentKey = _useState2[1];
+  (0, _ahooks.useUpdateEffect)(function () {
+    setCurrentKey(void 0);
+    setTimeout(function () {
+      setCurrentKey(userId);
+    });
+  }, [userId]);
+  return code && currentKey ? /*#__PURE__*/_react.default.createElement(_EventBusProvider.default, {
     runtime: _index.RUNTIME.PREVIEW
   }, /*#__PURE__*/_react.default.createElement(_ContextProvider.default, {
     code: code
-  }, /*#__PURE__*/_react.default.createElement(_Page.default, null)));
+  }, /*#__PURE__*/_react.default.createElement(_Page.default, null))) : null;
 };
 var _default = exports.default = Preview;

package/lib/lowcode/view/lc-components/Box/meta.json

@@ -1,6 +1,6 @@
 {
   "component": "Box",
-  "name": "容器",
+  "name": "盒子",
   "desc": "盒子是一个用于包裹其他组件的包装器，是一个单纯的容器组件，可以对其设置样式达到想要的效果。",
   "icon": "icon-box",
   "group": "container",

package/lib/lowcode/view/lc-components/Button/meta.json

@@ -16,7 +16,7 @@
     {
       "key": "title",
       "name": "标题",
-      "type": "string",
+      "type": "_I18nInput",
       "repositioning": true,
       "default": "按钮"
     },

package/lib/lowcode/view/lc-components/CardList/meta.json

@@ -57,7 +57,7 @@
       "key": "actionTitle",
       "name": "操作列标题",
       "desc": "操作列的标题",
-      "type": "string",
+      "type": "_I18nInput",
       "default": "操作列"
     },
     {

package/lib/lowcode/view/lc-components/Dialog/FunctionDesign.js

@@ -12,7 +12,6 @@ var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/sli
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 var _react = _interopRequireDefault(require("react"));
 var _ahooks = require("ahooks");
-var _lodash = require("lodash");
 var _index = _interopRequireDefault(require("./index"));
 var _utils = require("@luck-design-biz/base/utils");
 var _ContextProvider = require("../../../engine/provider/ContextProvider");
@@ -36,11 +35,10 @@ var FunctionDesign = function FunctionDesign(_ref) {
       var compId = _ref2.id,
         pageData = _ref2.pageData;
       if (compId !== id) return;
-      var cloneData = (0, _lodash.cloneDeep)(pageData);
-      (0, _dataProcess.add)(cloneData, id, "box_".concat((0, _utils.suid)()), (0, _objectSpread2.default)((0, _objectSpread2.default)({}, _boxPropsDefault.default), {}, {
+      (0, _dataProcess.add)(pageData, id, "box_".concat((0, _utils.suid)()), (0, _objectSpread2.default)((0, _objectSpread2.default)({}, _boxPropsDefault.default), {}, {
         buildIn: true
       }));
-      setPageData(cloneData);
+      setPageData(pageData);
     }).watch();
   }, []);
   return /*#__PURE__*/_react.default.createElement(_index.default, (0, _extends2.default)({

package/lib/lowcode/view/lc-components/Dialog/meta.json

@@ -17,7 +17,7 @@
       "key": "title",
       "name": "标题",
       "desc": "对话框左上角的标题",
-      "type": "string",
+      "type": "_I18nInput",
       "default": "对话框"
     },
     {

package/lib/lowcode/view/lc-components/Drawer/meta.json

@@ -17,7 +17,7 @@
       "key": "title",
       "name": "标题",
       "desc": "抽屉左上角的标题",
-      "type": "string",
+      "type": "_I18nInput",
       "default": "抽屉"
     },
     {

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

@@ -8,10 +8,16 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
+var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 var _react = _interopRequireWildcard(require("react"));
 var _ahooks = require("ahooks");
 var _lodash = require("lodash");
+var _utils = require("@luck-design-biz/base/utils");
+var _ContextProvider = require("../../../engine/provider/ContextProvider");
+var _dataProcess = require("../../../engine/tools/dataProcess");
+var _boxPropsDefault = _interopRequireDefault(require("../../../engine/meta/box.props.default.json"));
 var _index = _interopRequireDefault(require("./index"));
 var _excluded = ["children", "blocks", "id"];
 var FunctionDesign = function FunctionDesign(_ref) {
@@ -20,19 +26,75 @@ var FunctionDesign = function FunctionDesign(_ref) {
     id = _ref.id,
     props = (0, _objectWithoutProperties2.default)(_ref, _excluded);
   var ref = (0, _react.useRef)(null);
+  var ctx = (0, _ContextProvider.useContext)();
+  var _usePageData = (0, _ContextProvider.usePageData)(),
+    _usePageData2 = (0, _slicedToArray2.default)(_usePageData, 2),
+    setPageData = _usePageData2[1].setPageData;
   var previousBlocks = (0, _ahooks.usePrevious)((0, _lodash.cloneDeep)(blocks), function (prev, next) {
     return !(0, _lodash.isEqual)(prev, next);
   });
   (0, _ahooks.useUpdateLayoutEffect)(function () {
-    var difference = (0, _lodash.differenceWith)(blocks, previousBlocks, function (arrVal, othVal) {
+    var diffDataset = (0, _lodash.differenceWith)(blocks, previousBlocks, function (arrVal, othVal) {
       var _arrVal$dataset, _othVal$dataset;
       return arrVal.id === othVal.id && ((_arrVal$dataset = arrVal.dataset) === null || _arrVal$dataset === void 0 ? void 0 : _arrVal$dataset.code) === ((_othVal$dataset = othVal.dataset) === null || _othVal$dataset === void 0 ? void 0 : _othVal$dataset.code);
     });
-    difference.forEach(function (df) {
+    diffDataset.forEach(function (df) {
       var _df$dataset;
       ((_df$dataset = df.dataset) === null || _df$dataset === void 0 ? void 0 : _df$dataset.code) && ref.current.doQueryOne(df.id);
     });
+    var diffColReset = (0, _lodash.differenceWith)(blocks, previousBlocks, function (arrVal, othVal) {
+      return arrVal.id === othVal.id && arrVal.actionsColumnReset === othVal.actionsColumnReset;
+    });
+    diffColReset.forEach(function (df) {
+      var _ctx$componentMap$get2;
+      var _ctx$componentMap$get = (_ctx$componentMap$get2 = ctx.componentMap.get(id)) === null || _ctx$componentMap$get2 === void 0 ? void 0 : _ctx$componentMap$get2.api.getForm().getFormRef(df.id).formRef.current,
+        gridApi = _ctx$componentMap$get.gridApi;
+      gridApi.api.refreshCells({
+        columns: ['luck-actions'],
+        force: true
+      });
+    });
   }, [JSON.stringify(blocks)]);
+  (0, _react.useEffect)(function () {
+    var cmid = ctx.$subscriber(ctx.topics.COMPONENT_MODIFY).on(function (_ref2) {
+      var compId = _ref2.id,
+        pageData = _ref2.pageData,
+        newValue = _ref2.newValue,
+        oldValue = _ref2.oldValue;
+      if (compId !== id || !newValue.hasOwnProperty('blocks')) return;
+      if (newValue.blocks.length > oldValue.blocks.length) {
+        var _differenceBy = (0, _lodash.differenceBy)(newValue.blocks, oldValue.blocks, 'id'),
+          _differenceBy2 = (0, _slicedToArray2.default)(_differenceBy, 1),
+          newItem = _differenceBy2[0];
+        if (newItem.type === 'blank') {
+          var boxId = "box_".concat((0, _utils.suid)());
+          (0, _dataProcess.add)(pageData, id, boxId, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, _boxPropsDefault.default), {}, {
+            buildIn: true,
+            formBoxId: newItem.id
+          }));
+          setPageData(pageData);
+        }
+      } else if (newValue.blocks.length < oldValue.blocks.length) {
+        var _differenceBy3 = (0, _lodash.differenceBy)(oldValue.blocks, newValue.blocks, 'id'),
+          _differenceBy4 = (0, _slicedToArray2.default)(_differenceBy3, 1),
+          removeItem = _differenceBy4[0];
+        if (removeItem.type === 'blank') {
+          var _findNodeAndParent = (0, _dataProcess.findNodeAndParent)(id, pageData),
+            current = _findNodeAndParent.node;
+          var _boxId = current.children.find(function (childId) {
+            return current[childId].props.tabId === removeItem.id;
+          });
+          ctx.$publisher(ctx.topics.COMPONENT_DELETE, {
+            id: _boxId,
+            pageData: pageData
+          });
+        }
+      }
+    }).watch();
+    return function () {
+      return ctx.$unsubscriber(ctx.topics.COMPONENT_MODIFY, cmid);
+    };
+  }, []);
   return /*#__PURE__*/_react.default.createElement(_index.default, (0, _extends2.default)({}, props, {
     id: id,
     blocks: blocks,

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

@@ -1,38 +1,90 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
 var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard").default;
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
-var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 var _react = _interopRequireWildcard(require("react"));
 var _ahooks = require("ahooks");
 var _classnames = _interopRequireDefault(require("classnames"));
 var _lodash = require("lodash");
+var _luckDesign = require("luck-design");
+var _base = require("@luck-design-biz/base");
 var _Wrapper = _interopRequireDefault(require("../Wrapper"));
 var _index = require("../../../../index");
 var _helper = require("../../../engine/tools/helper");
 var _ContextProvider = require("../../../engine/provider/ContextProvider");
+var _Form = _interopRequireDefault(require("../../../../upload/Form"));
+var _LdRuntimeCom = _interopRequireDefault(require("../../../../components/LdRuntimeCom"));
 var _formPropsDefault = _interopRequireDefault(require("../../../engine/meta/form.props.default.json"));
 var _index2 = _interopRequireDefault(require("./index.less"));
-var _excluded = ["id", "parentId", "width", "height", "className", "blocks", "advance", "initData", "readOnly"];
-var LCForm = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref) {
-  var id = _ref.id,
-    parentId = _ref.parentId,
-    width = _ref.width,
-    height = _ref.height,
-    className = _ref.className,
-    blocks = _ref.blocks,
-    advance = _ref.advance,
-    initData = _ref.initData,
-    readOnly = _ref.readOnly,
-    props = (0, _objectWithoutProperties2.default)(_ref, _excluded);
+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;
+  if (header === 'collapse' || header === 'collapseFollow') return /*#__PURE__*/_react.default.createElement(_base.Collapse, {
+    title: title || ldId,
+    id: ldId,
+    key: ldId,
+    mode: header === 'collapse' && 'tab'
+  }, children);
+  return /*#__PURE__*/_react.default.createElement(_react.Fragment, {
+    key: ldId
+  }, header === 'divider' && /*#__PURE__*/_react.default.createElement(_luckDesign.BasicDivider, {
+    title: title || ldId,
+    id: ldId
+  }), children);
+};
+var LCForm = /*#__PURE__*/(0, _react.forwardRef)(function (_ref2, ref) {
+  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,
+    settingLayout = _ref2.settingLayout,
+    renderFormLeft = _ref2.renderFormLeft,
+    renderFormRight = _ref2.renderFormRight,
+    children = _ref2.children;
+  var apiRef = (0, _react.useRef)();
   var boxRef = (0, _react.useRef)();
+  var formRef = (0, _react.useRef)();
   var ctx = (0, _ContextProvider.useContext)();
+  var remoteSource = (0, _ContextProvider.useRemoteSource)();
+  var serials = (0, _ahooks.useCreation)(function () {
+    var _remoteSource$serials;
+    return ((_remoteSource$serials = remoteSource.serials) === null || _remoteSource$serials === void 0 ? void 0 : _remoteSource$serials.map(function (i) {
+      return i.serial;
+    })) || [];
+  }, [remoteSource.serials]);
+  (0, _ahooks.useMount)(function () {
+    ctx.doAction(advance.events.onMount, {
+      instance: (ref || formRef).current
+    });
+  });
+  (0, _ahooks.useUnmount)(function () {
+    ctx.doAction(advance.events.onUnmount, {
+      instance: (ref || formRef).current
+    });
+  });
+  (0, _react.useImperativeHandle)(apiRef, function () {
+    return {
+      getForm: function getForm() {
+        return (ref || formRef).current;
+      }
+    };
+  });
   var getTargetDom = (0, _ahooks.useMemoizedFn)(function () {
     return boxRef.current;
   });
@@ -42,9 +94,9 @@ var LCForm = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref) {
     };
     return (0, _helper.executeCode)(ctx, defaultDataSourceFormat, ['defaultValues'], defaultValues);
   });
-  var handleDataSourceFormat = (0, _ahooks.useMemoizedFn)(function (dataSourceFormat, _ref2) {
-    var values = _ref2.values,
-      submitData = _ref2.submitData;
+  var handleDataSourceFormat = (0, _ahooks.useMemoizedFn)(function (dataSourceFormat, _ref3) {
+    var values = _ref3.values,
+      submitData = _ref3.submitData;
     if ((0, _lodash.isNil)(dataSourceFormat)) return submitData;
     return (0, _helper.executeCode)(ctx, dataSourceFormat, ['values', 'submitData'], values, submitData);
   });
@@ -58,61 +110,166 @@ var LCForm = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref) {
   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;
+    return (0, _helper.executeCode)(ctx, resetActions, ['data', 'index', 'actionList', 'params'], data, index, actionList, params);
+  });
+  var handleForbiddenTypes = (0, _ahooks.useMemoizedFn)(function (forbiddenTypes) {
+    if ((0, _lodash.isNil)(forbiddenTypes)) return [];
+    return (0, _helper.executeCode)(ctx, forbiddenTypes, []);
+  });
+  var handleBeforeUpload = (0, _ahooks.useMemoizedFn)(function (beforeUpload, file, fileList) {
+    if ((0, _lodash.isNil)(beforeUpload)) return true;
+    return (0, _helper.executeCode)(ctx, beforeUpload, ['file', 'fileList'], file, fileList);
+  });
+  var handleUploadChange = (0, _ahooks.useMemoizedFn)(function (onUploadChange, e) {
+    if (!(0, _lodash.isNil)(onUploadChange)) return (0, _helper.executeCode)(ctx, onUploadChange, ['event'], e);
+  });
+  var renderAffix = (0, _ahooks.useMemoizedFn)(function (_render) {
+    return _render ? /*#__PURE__*/_react.default.createElement(_LdRuntimeCom.default, null, _render) : null;
+  });
   var renderFormList = (0, _ahooks.useMemoizedFn)(function (formConfig) {
-    var formList = (0, _lodash.reduce)(blocks, function (result, item) {
-      if ((0, _lodash.includes)(['auto', 'grid', 'writer'], item.type)) {
-        if (item.dataset && (0, _lodash.includes)(item.mode, formConfig.formMode)) {
-          var data = {
-            id: item.id,
-            type: item.type,
-            readOnly: item.readOnly,
-            title: item.name,
-            header: item.header,
-            dataSetKey: item.dataset.code,
-            serial: item.serial,
-            serialEffect: item.serialEffect,
-            defaultDataSourceFormat: function defaultDataSourceFormat(defaultValues) {
-              return handleDefaultDataSourceFormat(item.defaultDataSourceFormat, defaultValues);
-            },
-            onUpdate: {
-              post: function post(data) {
-                return handleDataSourceFormat(item.dataSourceFormat, data);
-              }
+    return (0, _lodash.reduce)(blocks, function (result, item) {
+      if ((0, _lodash.includes)(['auto', 'grid', 'writer'], item.type) && item.dataset && (0, _lodash.includes)(item.mode, formConfig.formMode)) {
+        var data = {
+          id: item.id,
+          order: item.order,
+          type: item.type,
+          readOnly: item.readOnly,
+          title: item.name,
+          header: item.header,
+          dataSetKey: item.dataset.code,
+          serial: item.serial,
+          serialEffect: item.serialEffect,
+          defaultDataSourceFormat: function defaultDataSourceFormat(defaultValues) {
+            return handleDefaultDataSourceFormat(item.defaultDataSourceFormat, defaultValues);
+          },
+          onUpdate: {
+            post: function post(data) {
+              return handleDataSourceFormat(item.dataSourceFormat, data);
             }
-          };
-          if (item.type === 'auto') data = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, data), {}, {
-            col: item.cols
-          });else data = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, data), {}, {
+          }
+        };
+        if (item.type === 'auto') data = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, data), {}, {
+          col: item.cols
+        });else data = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, data), {}, {
+          suppressPreset: item.suppressPreset,
+          height: item.height,
+          bordered: item.bordered,
+          draggable: item.draggable,
+          orderByAdd: item.orderByAdd,
+          hideActionsColumn: item.suppressActions,
+          actionsWidth: item.actionsColumnWidth,
+          columnsReset: function columnsReset(columns) {
+            return handleColumnsReset(item.columnsReset, columns);
+          },
+          onGridFormReady: function onGridFormReady(ref, params, gridForm) {
+            return handleGridFormReady(item.onGridFormReady, ref, params, gridForm);
+          }
+        });
+        if (item.actionsColumnReset) data = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, data), {}, {
+          resetActionsColumn: function resetActionsColumn(data, index, actions, params) {
+            return handleResetActionsColumn(item.actionsColumnReset, data, index, actions, params);
+          }
+        });
+        result.push(data);
+      }
+      return result;
+    }, []);
+  });
+  var renderFormExtra = (0, _ahooks.useMemoizedFn)(function (formConfig) {
+    return (0, _lodash.reduce)(blocks, function (result, item) {
+      if ((0, _lodash.includes)(item.mode, formConfig.formMode) && !item.serial || item.serialEffect === 'disable' || (0, _lodash.includes)(serials, item.serial)) {
+        if (item.type === 'uploadForm') {
+          var _remoteSource$pageinf;
+          var dom = /*#__PURE__*/_react.default.createElement(Header, {
+            ldId: item.id,
+            key: item.id,
+            header: item.header,
+            title: item.name,
+            order: item.order
+          }, (0, _Form.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, formConfig), {}, {
+            formId: item.id,
+            moduleCode: remoteSource === null || remoteSource === void 0 || (_remoteSource$pageinf = remoteSource.pageinfo) === null || _remoteSource$pageinf === void 0 || (_remoteSource$pageinf = _remoteSource$pageinf.relationship) === null || _remoteSource$pageinf === void 0 ? void 0 : _remoteSource$pageinf.moduleCode,
+            readOnly: item.readOnly || formConfig.readOnly || item.serial && !(0, _lodash.includes)(serials, item.serial),
             suppressPreset: item.suppressPreset,
             height: item.height,
             bordered: item.bordered,
-            draggable: item.draggable,
-            orderByAdd: item.orderByAdd,
-            hideActionsColumn: item.suppressActions,
-            actionsWidth: item.actionsColumnWidth,
-            columnsReset: function columnsReset(columns) {
-              return handleColumnsReset(item.columnsReset, columns);
+            showNote: item.showNote,
+            zipName: "".concat(item.zipName || 'download', ".zip"),
+            uploadUrl: item.uploadUrl,
+            resetActions: item.useResetActions ? null : function () {
+              for (var _len = arguments.length, params = new Array(_len), _key = 0; _key < _len; _key++) {
+                params[_key] = arguments[_key];
+              }
+              return handleResetActions.apply(void 0, [item.resetActions].concat(params));
             },
-            onGridFormReady: function onGridFormReady(ref, params, gridForm) {
-              return handleGridFormReady(item.onGridFormReady, ref, params, gridForm);
-            }
-          });
-          if (item.actionsColumnReset) data = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, data), {}, {
-            resetActionsColumn: function resetActionsColumn(data, index, actions, params) {
-              return handleResetActionsColumn(item.actionsColumnReset, data, index, actions, params);
+            forbiddenTypes: function forbiddenTypes() {
+              return handleForbiddenTypes(item.forbiddenTypes);
+            },
+            beforeUpload: function beforeUpload() {
+              for (var _len2 = arguments.length, params = new Array(_len2), _key2 = 0; _key2 < _len2; _key2++) {
+                params[_key2] = arguments[_key2];
+              }
+              return handleBeforeUpload.apply(void 0, [item.beforeUpload].concat(params));
+            },
+            onUploadChange: function onUploadChange(e) {
+              return handleUploadChange(item.onUploadChange, e);
             }
-          });
-          result.push(data);
+          })));
+          result.push(dom);
+        }
+        if (item.type === 'blank') {
+          var _dom = /*#__PURE__*/_react.default.createElement(Header, {
+            ldId: item.id,
+            key: item.id,
+            header: item.header,
+            title: item.name,
+            order: item.order
+          }, children === null || children === void 0 ? void 0 : children.find(function (child) {
+            return child.props.formBoxId === item.id;
+          }));
+          result.push(_dom);
         }
       }
       return result;
     }, []);
-    return formList;
+  });
+  var beforeSubmit = (0, _ahooks.useMemoizedFn)(function (values, data) {
+    return new Promise(function (resolve) {
+      if ((0, _lodash.isNil)(advance.events.beforeSave)) resolve(values);else {
+        var _data = ctx.doAction(advance.events.beforeSave, {
+          values: values,
+          data: data
+        });
+        resolve(_data);
+      }
+      ;
+    });
+  });
+  var afterSubmit = (0, _ahooks.useMemoizedFn)(function (success, mainKey, res) {
+    ctx.doAction(advance.events.onSaveCallback, {
+      success: success,
+      mainKey: mainKey,
+      res: res
+    });
+  });
+  var onValueChange = (0, _ahooks.useMemoizedFn)(function (change, data) {
+    ctx.doAction(advance.events.onValueChange, {
+      change: change,
+      data: data
+    });
+  });
+  var onChildChange = (0, _ahooks.useMemoizedFn)(function (instance) {
+    ctx.doAction(advance.events.onChildChange, {
+      instance: instance
+    });
   });
   return /*#__PURE__*/_react.default.createElement(_Wrapper.default, {
     id: id,
     displayName: "Form",
-    getTargetDom: getTargetDom
+    getTargetDom: getTargetDom,
+    api: apiRef
   }, /*#__PURE__*/_react.default.createElement("div", {
     ref: boxRef,
     style: {
@@ -124,10 +281,24 @@ var LCForm = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref) {
     ldId: id,
     className: (0, _classnames.default)(_index2.default['lc-component-form'], (0, _defineProperty2.default)({}, className, !!className)),
     renderFormList: renderFormList,
+    renderFormExtra: renderFormExtra,
     mainFormLdId: "block_main",
     initData: initData,
-    ref: ref,
-    readOnly: readOnly
+    ref: ref || formRef,
+    readOnly: readOnly,
+    showSaveBtn: showSave,
+    saveBtnTitle: saveTitle,
+    affixLayout: settingLayout,
+    renderAffixLeft: function renderAffixLeft() {
+      return renderAffix(renderFormLeft);
+    },
+    renderAffixRight: function renderAffixRight() {
+      return renderAffix(renderFormRight);
+    },
+    beforeSubmit: beforeSubmit,
+    afterSubmit: advance.events.onSaveCallback ? afterSubmit : null,
+    onValueChange: onValueChange,
+    onChildChange: onChildChange
   })));
 });
 LCForm.defaultProps = (0, _helper.omitBadProps)(_formPropsDefault.default);