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

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

@@ -20,12 +20,12 @@ import RuntimeComp from "../JSX/RuntimeComp";
 import defaultMeta from "../../../engine/meta/form.props.default.json";
 import styles from "./index.less";
 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.createElement(Collapse, {
     title: title || ldId,
     id: ldId,
@@ -53,27 +53,37 @@ var getMthodParams = function getMthodParams(methodStr) {
   }
   return [];
 };
-var LCForm = /*#__PURE__*/forwardRef(function (_ref2, ref) {
+var useCombinedRefs = function useCombinedRefs(forwardedRef) {
+  var innerRef = useRef(null);
+  useEffect(function () {
+    if (!forwardedRef) return;
+    if (typeof forwardedRef === 'function') {
+      forwardedRef(innerRef.current);
+    } else {
+      forwardedRef.current = innerRef.current;
+    }
+  }, [forwardedRef]);
+  return forwardedRef || innerRef;
+};
+var LCForm = /*#__PURE__*/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 = useRef();
-  var boxRef = useRef();
-  var formRef = useRef();
+  var wrapperRef = useRef();
+  var formRef = useCombinedRefs(ref);
+  var promiseRef = useRef(null);
   var ctx = useContext();
   var remoteSource = useRemoteSource();
   var _initData = useCreation(function () {
@@ -87,30 +97,30 @@ var LCForm = /*#__PURE__*/forwardRef(function (_ref2, ref) {
     })) || [];
   }, [remoteSource.serials]);
   var _blocks = useCreation(function () {
-    return blocks.filter(function (_ref3) {
-      var hidden = _ref3.hidden;
+    return blocks.filter(function (_ref4) {
+      var hidden = _ref4.hidden;
       return !hidden;
     });
   }, [blocks]);
   useMount(function () {
     ctx.doAction(advance.events.onMount, {
-      instance: (ref || formRef).current
+      instance: formRef.current
     });
   });
   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
       });
     };
   }, []);
@@ -121,22 +131,25 @@ var LCForm = /*#__PURE__*/forwardRef(function (_ref2, ref) {
        * @method
        */
       getInstance: function getInstance() {
-        return (ref || formRef).current;
+        return formRef.current;
       },
       /**
        * 提交表格数据
        * @method
        */
       submit: function submit() {
-        var _ctx$pagePublicResour;
-        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;
-        if (formMode === 'add') {
-          instance.onAdd();
-        } else if (formMode === 'update') {
-          instance.onBatchUpdate();
-        }
+        return new Promise(function (resolve) {
+          var _ctx$pagePublicResour;
+          promiseRef.current = resolve;
+          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') {
+            instance.onBatchUpdate();
+          }
+        });
       },
       /**
        * @typedef {Object} Field
@@ -156,7 +169,7 @@ var LCForm = /*#__PURE__*/forwardRef(function (_ref2, ref) {
        * @returns {Block}
        */
       getBlock: function getBlock(blockId) {
-        var instance = (ref || formRef).current;
+        var instance = formRef.current;
         var block = instance.formRefs[blockId];
         if (!block) {
           console.e('未发现区块');
@@ -225,7 +238,7 @@ var LCForm = /*#__PURE__*/forwardRef(function (_ref2, ref) {
     };
   });
   var getTargetDom = useMemoizedFn(function () {
-    return boxRef.current;
+    return wrapperRef.current;
   });
   var handleDefaultDataSourceFormat = useMemoizedFn(function (defaultDataSourceFormat, defaultValues) {
     if (isNil(defaultDataSourceFormat)) return function () {
@@ -233,10 +246,10 @@ var LCForm = /*#__PURE__*/forwardRef(function (_ref2, ref) {
     };
     return executeCode(ctx, defaultDataSourceFormat, ['defaultValues'], defaultValues);
   });
-  var handleDataSourceFormat = useMemoizedFn(function (dataSourceFormat, dataSetKey, _ref6) {
-    var values = _ref6.values,
-      submitData = _ref6.submitData,
-      behaviorKey = _ref6.behaviorKey;
+  var handleDataSourceFormat = useMemoizedFn(function (dataSourceFormat, dataSetKey, _ref7) {
+    var values = _ref7.values,
+      submitData = _ref7.submitData,
+      behaviorKey = _ref7.behaviorKey;
     if (isNil(dataSourceFormat)) return _defineProperty({}, dataSetKey, submitData);
     return executeCode(ctx, dataSourceFormat, ['dataSetKey', 'values', 'submitData', 'behaviorKey'], dataSetKey, values, submitData, behaviorKey);
   });
@@ -247,8 +260,8 @@ var LCForm = /*#__PURE__*/forwardRef(function (_ref2, ref) {
     if (isNil(actionsColumnReset)) return columns;
     return executeCode(ctx, actionsColumnReset, ['columns'], columns);
   });
-  var handleGridFormReady = useMemoizedFn(function (onGridFormReady, ref, params, gridForm) {
-    if (!isNil(onGridFormReady)) return executeCode(ctx, onGridFormReady, ['ref', 'params', 'gridForm'], ref, params, gridForm);
+  var handleGridFormReady = useMemoizedFn(function (onGridFormReady, _ref, params, gridForm) {
+    if (!isNil(onGridFormReady)) return executeCode(ctx, onGridFormReady, ['ref', 'params', 'gridForm'], _ref, params, gridForm);
   });
   var handleResetActions = useMemoizedFn(function (resetActions, data, index, actionList, params) {
     if (isNil(resetActions)) return actionList;
@@ -274,8 +287,8 @@ var LCForm = /*#__PURE__*/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 = executeCode(ctx, verifyListObj.length.expression, ['cValue'], (_current = (ref || formRef).current) === null || _current === void 0 ? void 0 : _current.getCValue());
+        var _formRef$current;
+        var length = 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(formatMessage({
           id: "".concat(_I18N_PREFIX_, ".maxLength"),
           label: '字数不得超过'
@@ -288,8 +301,8 @@ var LCForm = /*#__PURE__*/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 = executeCode(ctx, verifyListObj.min.expression, ['cValue'], (_current2 = (ref || formRef).current) === null || _current2 === void 0 ? void 0 : _current2.getCValue());
+        var _formRef$current2;
+        var min = executeCode(ctx, verifyListObj.min.expression, ['cValue'], (_formRef$current2 = formRef.current) === null || _formRef$current2 === void 0 ? void 0 : _formRef$current2.getCValue());
         if (value < min) callback(formatMessage({
           id: "".concat(_I18N_PREFIX_, ".numberBelowMin"),
           label: '低于最小值'
@@ -299,8 +312,8 @@ var LCForm = /*#__PURE__*/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 = executeCode(ctx, verifyListObj.max.expression, ['cValue'], (_current3 = (ref || formRef).current) === null || _current3 === void 0 ? void 0 : _current3.getCValue());
+        var _formRef$current3;
+        var max = executeCode(ctx, verifyListObj.max.expression, ['cValue'], (_formRef$current3 = formRef.current) === null || _formRef$current3 === void 0 ? void 0 : _formRef$current3.getCValue());
         if (value > max) callback(formatMessage({
           id: "".concat(_I18N_PREFIX_, ".numberExceedMax"),
           label: '超过最大值'
@@ -313,8 +326,8 @@ var LCForm = /*#__PURE__*/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;
-        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;
+        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;
@@ -389,8 +402,8 @@ var LCForm = /*#__PURE__*/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 = _objectSpread(_objectSpread({}, data), {}, {
@@ -462,7 +475,7 @@ var LCForm = /*#__PURE__*/forwardRef(function (_ref2, ref) {
   });
   var beforeSubmit = useMemoizedFn(function (values, data) {
     return new Promise( /*#__PURE__*/function () {
-      var _ref8 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(resolve) {
+      var _ref9 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(resolve) {
         var _data;
         return _regeneratorRuntime().wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
@@ -490,7 +503,7 @@ var LCForm = /*#__PURE__*/forwardRef(function (_ref2, ref) {
         }, _callee);
       }));
       return function (_x) {
-        return _ref8.apply(this, arguments);
+        return _ref9.apply(this, arguments);
       };
     }());
   });
@@ -517,13 +530,8 @@ var LCForm = /*#__PURE__*/forwardRef(function (_ref2, ref) {
     displayName: "Form",
     getTargetDom: getTargetDom,
     api: apiRef
-  }, /*#__PURE__*/React.createElement("div", {
-    ref: boxRef,
-    style: {
-      width: width,
-      height: height
-    }
   }, /*#__PURE__*/React.createElement(LdFormList, {
+    wrapperRef: wrapperRef,
     id: id,
     ldId: id,
     className: classNames(styles['lc-component-form'], _defineProperty({}, className, !!className)),
@@ -531,7 +539,7 @@ var LCForm = /*#__PURE__*/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,
@@ -547,8 +555,15 @@ var LCForm = /*#__PURE__*/forwardRef(function (_ref2, ref) {
     onValueChange: onValueChange,
     onChildChange: onChildChange,
     setVerifyRules: setVerifyRules,
-    getContainer: isNil(getContainer) ? null : ctx.componentMap.get(getContainer).api.getSelfDom
-  })));
+    getContainer: isNil(getContainer) ? null : ctx.componentMap.get(getContainer).api.getSelfDom,
+    afterSubmitLoading: function afterSubmitLoading() {
+      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));
+    }
+  }));
 });
 LCForm.defaultProps = omitBadProps(defaultMeta);
 export default LCForm;

package/es/lowcode/view/lc-components/Table/components/TopImex.js

@@ -324,7 +324,9 @@ export var TopExport = function TopExport(_ref5) {
               labels = [];
               fieldInfo = [];
               tableRef === null || tableRef === void 0 || (_tableRef$gridApi = tableRef.gridApi) === null || _tableRef$gridApi === void 0 || _tableRef$gridApi.columnApi.getAllDisplayedColumns().forEach(function (column) {
-                if (column.colId !== 'luck-expand' && column.colId !== 'luck-select' && column.colId !== 'luck-index' && column.colId !== 'luck-actions' && !column.colDef.draggable) {
+                if (column.colId !== 'luck-expand' && column.colId !== 'luck-select' && column.colId !== 'luck-index' && column.colId !== 'luck-actions' && column.colId !== 'fraction_drag'
+                // !column.colDef.draggable
+                ) {
                   labels.push(column.colDef.headerName);
                   fieldInfo.push({
                     width: column.actualWidth,

package/es/lowcode/view/lc-components/Table/index.js

@@ -183,7 +183,7 @@ var LCTable = /*#__PURE__*/forwardRef(function (_ref, ref) {
     runAsync = _useRequest.runAsync;
 
   // 查询进度
-  var fecthExcelState = function fecthExcelState(_ref2, procress, resolve, reject) {
+  var fecthExcelState = useMemoizedFn(function (_ref2, procress, resolve, reject) {
     var strategy = _ref2.strategy,
       batchNo = _ref2.batchNo,
       moduleCode = _ref2.moduleCode,
@@ -192,7 +192,7 @@ var LCTable = /*#__PURE__*/forwardRef(function (_ref, ref) {
     var _fetchExcelStateParams = {
       moduleCode: moduleCode,
       behaviorKey: behaviorKey,
-      reportType: "export"
+      reportType: 'export'
     };
     getFindexcelstate(_fetchExcelStatePrefix, _fetchExcelStateParams).then(function (response) {
       if (response.code === 1) {
@@ -219,8 +219,8 @@ var LCTable = /*#__PURE__*/forwardRef(function (_ref, ref) {
     }).catch(function () {
       reject();
     });
-  };
-  var _onExportAll = function _onExportAll(procress) {
+  });
+  var _onExportAll = useMemoizedFn(function (procress) {
     return new Promise( /*#__PURE__*/function () {
       var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(resolve, reject) {
         var isBehavior, behaviorKey, strategy, _exportExcelParams, _exportExcelPrefix, exportExcelResponse, _ref4, _ref5, _getProps, apiUrl, _strategy, joiner, labels, fieldInfo, defaultExcelParams, _exportExcelParams2, _exportExcelPrefix2, _exportExcelResponse;
@@ -238,7 +238,7 @@ var LCTable = /*#__PURE__*/forwardRef(function (_ref, ref) {
               _exportExcelParams = {
                 moduleCode: module.moduleCode,
                 behaviorKey: behaviorKey,
-                reportType: "export"
+                reportType: 'export'
               };
               _exportExcelPrefix = "/".concat(strategy);
               _context.next = 8;
@@ -275,9 +275,9 @@ var LCTable = /*#__PURE__*/forwardRef(function (_ref, ref) {
                 }
               });
               defaultExcelParams = {
-                bgColor: "#69b1ff",
+                bgColor: '#69b1ff',
                 dataUrl: "".concat(window.location.origin, "/api").concat(apiUrl).concat(joiner, "token=").concat(window.cookie.get(window.appConfig.authSaveKey)),
-                excelName: "download.xls",
+                excelName: 'download.xls',
                 fieldInfo: fieldInfo,
                 islock: false,
                 labels: labels === null || labels === void 0 ? void 0 : labels.join(),
@@ -285,7 +285,7 @@ var LCTable = /*#__PURE__*/forwardRef(function (_ref, ref) {
               };
               _exportExcelParams2 = _objectSpread({
                 moduleCode: module.moduleCode,
-                reportType: "export"
+                reportType: 'export'
               }, defaultExcelParams);
               _exportExcelPrefix2 = "/".concat(_strategy);
               _context.next = 23;
@@ -311,7 +311,7 @@ var LCTable = /*#__PURE__*/forwardRef(function (_ref, ref) {
         return _ref3.apply(this, arguments);
       };
     }());
-  };
+  });
   var _export = useCreation(function () {
     var _temp = {
       enableExportAll: !!impexp.export

package/es/utils/grid.js

@@ -131,7 +131,7 @@ export var getGridColumn = function getGridColumn() {
   var _extra = JSON.parse(extra) || {};
   var data = _objectSpread(_objectSpread({}, _props), {}, {
     field: name,
-    title: _props.label,
+    title: _props.fieldAliasName || _props.label,
     headerAlign: _props.headerAlign || getAlign(_extra, 'sheading_alignment_virtual'),
     align: _props.align || getAlign(_extra, 'scell_alignment_virtual'),
     render: _props.render || getColumnRender(name, comType, _props)

package/lib/components/LdAutoForm/index.js

@@ -79,7 +79,7 @@ var buildLdAutoForm = function buildLdAutoForm(_ref) {
       var col = columnsObj[key];
       if ((setting === null || setting === void 0 ? void 0 : setting._type) === 'divider') {
         result.push( /*#__PURE__*/_react.default.createElement(_luckDesign.BasicDivider, {
-          title: setting === null || setting === void 0 ? void 0 : setting.aliasName
+          title: setting === null || setting === void 0 ? void 0 : setting.fieldAliasName
         }));
       } else if (col !== null && col !== void 0 && col.isShowInForm) {
         var customFiled = filedsRewrite.find(function (_field) {
@@ -89,7 +89,7 @@ var buildLdAutoForm = function buildLdAutoForm(_ref) {
         var defaultSet = ['col', 'row', 'note', 'tip', 'placeholder'];
         var newCol = (0, _objectSpread3.default)((0, _objectSpread3.default)({}, col), {}, {
           setVerifyRules: setVerifyRules,
-          fieldName: (setting === null || setting === void 0 ? void 0 : setting.aliasName) || col.fieldName
+          fieldName: (setting === null || setting === void 0 ? void 0 : setting.fieldAliasName) || col.fieldName
         }, (0, _lodash.pick)(setting, defaultSet));
         result.push((0, _utils.getFormItem)(newCol, (0, _objectSpread3.default)((0, _objectSpread3.default)({
           formId: ldId,

package/lib/components/LdFormList/index.js

@@ -31,7 +31,7 @@ var _LdPop = require("../LdPop");
 var _model = _interopRequireDefault(require("./model"));
 var _action = require("../../helper/action");
 var _useTodo3 = _interopRequireDefault(require("../../lowcode/engine/tools/useTodo"));
-var _excluded = ["namespace", "formState", "formMode", "formOperates", "loading", "wrapperRef", "readOnly", "mainFormLdId", "renderFormList", "renderAffixLeft", "renderAffixRight", "beforeSubmit", "showSaveBtn", "saveBtnTitle", "affixLayout", "getContainer", "onValueChange", "afterSubmit", "renderFormExtra", "bpmButtonProps", "setVerifyRules"],
+var _excluded = ["namespace", "formState", "formMode", "formOperates", "loading", "apiRef", "wrapperRef", "readOnly", "mainFormLdId", "renderFormList", "renderAffixLeft", "renderAffixRight", "beforeSubmit", "showSaveBtn", "saveBtnTitle", "affixLayout", "getContainer", "onValueChange", "afterSubmit", "renderFormExtra", "bpmButtonProps", "setVerifyRules", "afterSubmitLoading"],
   _excluded2 = ["dataSets", "doAction", "resources"],
   _excluded3 = ["id", "header", "title", "readOnly", "extraConfig", "renderTopLeft", "serial"],
   _excluded4 = ["ldId", "initData", "overModel"];
@@ -43,6 +43,7 @@ var LdFormList = function LdFormList(_ref) {
     formMode = _ref.formMode,
     formOperates = _ref.formOperates,
     loading = _ref.loading,
+    apiRef = _ref.apiRef,
     wrapperRef = _ref.wrapperRef,
     readOnly = _ref.readOnly,
     mainFormLdId = _ref.mainFormLdId,
@@ -64,6 +65,7 @@ var LdFormList = function LdFormList(_ref) {
     _ref$bpmButtonProps = _ref.bpmButtonProps,
     bpmButtonProps = _ref$bpmButtonProps === void 0 ? {} : _ref$bpmButtonProps,
     setVerifyRules = _ref.setVerifyRules,
+    afterSubmitLoading = _ref.afterSubmitLoading,
     props = (0, _objectWithoutProperties2.default)(_ref, _excluded);
   var PRIMARY = window.appConfig.constraintKeys.PRIMARY;
   var currentValueRef = (0, _react.useRef)(null);
@@ -94,7 +96,7 @@ var LdFormList = function LdFormList(_ref) {
     resources = _ref3.resources,
     rest = (0, _objectWithoutProperties2.default)(_ref3, _excluded2);
   var formListRef = (0, _react.useRef)(null);
-  (0, _react.useImperativeHandle)(wrapperRef, function () {
+  (0, _react.useImperativeHandle)(apiRef, function () {
     return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, formListRef.current), {}, {
       getCValue: function getCValue() {
         return currentValueRef.current || props.formData;
@@ -216,6 +218,7 @@ var LdFormList = function LdFormList(_ref) {
       formUid: formUid,
       mainDataSetKey: mainDataSetKey
     }, function (success, mainKey, res) {
+      afterSubmitLoading && afterSubmitLoading(res);
       setSubmitLoading(false);
       if (success) {
         var mainFormData = res.detail[res.list[0]];
@@ -256,7 +259,7 @@ var LdFormList = function LdFormList(_ref) {
   var mainDataSetKey = (_formList$find = formList.find(function (i) {
     return i.id === mainFormLdId;
   })) === null || _formList$find === void 0 ? void 0 : _formList$find.dataSetKey;
-  return formList.length > 0 ? /*#__PURE__*/_react.default.createElement(_FormList.FormList, (0, _extends2.default)({
+  return /*#__PURE__*/_react.default.createElement(_FormList.FormList, (0, _extends2.default)({
     editFlow: true,
     formState: formState,
     formMode: formMode,
@@ -266,6 +269,7 @@ var LdFormList = function LdFormList(_ref) {
     })
   }, props, {
     modelName: namespace,
+    wrapperRef: wrapperRef,
     ref: formListRef,
     onAdd: function onAdd(values, other) {
       return handleBatchSubmit(values, 'add', other);
@@ -349,7 +353,7 @@ var LdFormList = function LdFormList(_ref) {
         mode: child.props.mode || 'tab'
       }) : child.props);
     })[0];
-  })) : null;
+  }));
 };
 
 // 构建带有model的组件
@@ -434,6 +438,6 @@ Index.defaultProps = {
 };
 var _default = exports.default = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
   return /*#__PURE__*/_react.default.createElement(Index, (0, _extends2.default)({
-    wrapperRef: ref
+    apiRef: ref
   }, props));
 });

package/lib/components/LdGridForm/index.js

@@ -92,7 +92,7 @@ var buildLdGridForm = function buildLdGridForm(_ref) {
         _defaultValues = (0, _objectSpread4.default)((0, _objectSpread4.default)({}, _defaultValues), {}, (0, _defineProperty2.default)((0, _defineProperty2.default)({}, col.aliaName, col['optDefaultValue']), "".concat(col.aliaName, "_virtual"), col['optDefaultValueCvt']));
         var newCol = (0, _objectSpread4.default)((0, _objectSpread4.default)({}, col), {}, {
           setVerifyRules: setVerifyRules,
-          fieldName: (setting === null || setting === void 0 ? void 0 : setting.aliasName) || col.fieldName
+          fieldName: (setting === null || setting === void 0 ? void 0 : setting.fieldAliasName) || col.fieldName
         });
         var defaultSet = ['width', 'align', 'headerAlign', 'pinned', 'tip'];
         result.push((0, _utils.getFormColumn)(type, newCol, (0, _objectSpread4.default)((0, _objectSpread4.default)((0, _objectSpread4.default)({}, (0, _lodash.pick)(setting, defaultSet)), customColumn), {}, {

package/lib/locales/zh-CN.js

@@ -203,10 +203,6 @@ var _default = exports.default = {
   "luckda.lowcode.painter.panel-section.fieldsSetting.pinned": "固定列",
   "luckda.lowcode.painter.panel-section.fieldsSetting.tip": "过长提示",
   "luckda.lowcode.painter.panel-section.fieldsSetting.fieldColumn": "占列数",
-  "luckda.lowcode.painter.panel-section.fieldsSetting.fieldRow": "占行数",
-  "luckda.lowcode.painter.panel-section.fieldsSetting.fieldNote": "字段注释",
-  "luckda.lowcode.painter.panel-section.fieldsSetting.fieldTip": "长说明",
-  "luckda.lowcode.painter.panel-section.fieldsSetting.placeholder": "默认提示",
   "luckda.lowcode.painter.panel-section.fieldsSetting.isEqual": "唯一校验",
   "luckda.lowcode.painter.panel-section.fieldsSetting.required": "是否必填",
   "luckda.lowcode.painter.panel-section.fieldsSetting.table.display": "表格中显示",

package/lib/lowcode/engine/factory/panel-item-factory/RadioStrategy.js

@@ -0,0 +1,59 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
+var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
+var _assertThisInitialized2 = _interopRequireDefault(require("@babel/runtime/helpers/assertThisInitialized"));
+var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
+var _createSuper2 = _interopRequireDefault(require("@babel/runtime/helpers/createSuper"));
+var _react = _interopRequireDefault(require("react"));
+var _antd = require("luck-design/antd");
+var _Strategy2 = _interopRequireDefault(require("./Strategy"));
+var _TYPE_ = 'radio';
+var RadioComp = function RadioComp(_ref) {
+  var _onChange = _ref.onChange,
+    defaultValue = _ref.defaultValue,
+    size = _ref.size,
+    options = _ref.options;
+  return /*#__PURE__*/_react.default.createElement(_antd.Radio.Group, {
+    onChange: function onChange(e) {
+      return _onChange(e.target.value);
+    },
+    defaultValue: defaultValue,
+    size: size
+  }, options.map(function (_ref2) {
+    var value = _ref2.value,
+      label = _ref2.label;
+    return /*#__PURE__*/_react.default.createElement(_antd.Radio, {
+      key: value,
+      value: value
+    }, label);
+  }));
+};
+var RadioStrategy = exports.default = /*#__PURE__*/function (_Strategy) {
+  (0, _inherits2.default)(RadioStrategy, _Strategy);
+  var _super = (0, _createSuper2.default)(RadioStrategy);
+  function RadioStrategy(factory) {
+    var _this;
+    (0, _classCallCheck2.default)(this, RadioStrategy);
+    _this = _super.call(this, _TYPE_);
+    factory.register(_TYPE_, (0, _assertThisInitialized2.default)(_this));
+    return _this;
+  }
+  (0, _createClass2.default)(RadioStrategy, [{
+    key: "match",
+    value: function match(type) {
+      return type === _TYPE_;
+    }
+  }, {
+    key: "builder",
+    value: function builder() {
+      return RadioComp;
+    }
+  }]);
+  return RadioStrategy;
+}(_Strategy2.default);

package/lib/lowcode/engine/factory/panel-item-factory/index.js

@@ -13,6 +13,7 @@ var _SelectStrategy = _interopRequireDefault(require("./SelectStrategy"));
 var _SwitchStrategy = _interopRequireDefault(require("./SwitchStrategy"));
 var _CheckboxStrategy = _interopRequireDefault(require("./CheckboxStrategy"));
 var _SegmentedStrategy = _interopRequireDefault(require("./SegmentedStrategy"));
+var _RadioStrategy = _interopRequireDefault(require("./RadioStrategy"));
 var _DynamicStrategy = _interopRequireDefault(require("./DynamicStrategy"));
 var _GroupStrategy = _interopRequireDefault(require("./GroupStrategy"));
 var Factory = exports.default = /*#__PURE__*/function () {
@@ -30,6 +31,7 @@ var Factory = exports.default = /*#__PURE__*/function () {
       new _SelectStrategy.default(this);
       new _CheckboxStrategy.default(this);
       new _SegmentedStrategy.default(this);
+      new _RadioStrategy.default(this);
       new _SwitchStrategy.default(this);
       new _GroupStrategy.default(this);
     }