@luck-design-biz/luckda 1.0.2-9 → 1.0.3-13tl

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

@@ -503,34 +503,27 @@ var LCForm = /*#__PURE__*/forwardRef(function (_ref3, ref) {
   });
   var beforeSubmit = useMemoizedFn(function (values, data) {
     return new Promise( /*#__PURE__*/function () {
-      var _ref9 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(resolve) {
-        var _data;
+      var _ref9 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(resolve, reject) {
         return _regeneratorRuntime().wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
-              if (!isNil(advance.events.beforeSave)) {
-                _context.next = 4;
-                break;
+              if (isNil(advance.events.beforeSave)) resolve(values);else {
+                ctx.doAction(advance.events.beforeSave, {
+                  values: values,
+                  data: data
+                }).then(function (_data) {
+                  resolve(last(_data));
+                }).catch(function () {
+                  reject();
+                });
               }
-              resolve(values);
-              _context.next = 8;
-              break;
-            case 4:
-              _context.next = 6;
-              return ctx.doAction(advance.events.beforeSave, {
-                values: values,
-                data: data
-              });
-            case 6:
-              _data = _context.sent;
-              resolve(last(_data));
-            case 8:
+            case 1:
             case "end":
               return _context.stop();
           }
         }, _callee);
       }));
-      return function (_x) {
+      return function (_x, _x2) {
         return _ref9.apply(this, arguments);
       };
     }());

package/es/lowcode/view/lc-components/Form/meta.json

@@ -598,7 +598,7 @@
         "key": "beforeSave",
         "name": "保存前置事件",
         "desc": "保存前置事件，promise，返回false取消执行",
-        "func": "function beforeSave(values, data) {\n return values; \n}"
+        "func": "function beforeSave(values, data) {\n return new Promise(resolve=>resolve(values)); \n}"
       },
       {
         "key": "onSaveCallback",

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

@@ -31,7 +31,7 @@ var LCPageLayout = function LCPageLayout(_ref) {
     $css: css,
     height: height,
     width: width
-  }, display === 'tb' ? /*#__PURE__*/React.createElement(Layout.Main, null, (children === null || children === void 0 ? void 0 : children.length) === display.split('').length ? /*#__PURE__*/React.createElement(MemorySplit, {
+  }, display === 'tb' || display === 's' ? /*#__PURE__*/React.createElement(Layout.Main, null, (children === null || children === void 0 ? void 0 : children.length) === display.split('').length ? /*#__PURE__*/React.createElement(MemorySplit, {
     split: "horizontal"
   }, children) : null) : [/*#__PURE__*/React.createElement(Layout.Sider, null, children === null || children === void 0 ? void 0 : children[0]), /*#__PURE__*/React.createElement(Layout.Main, null, (children === null || children === void 0 ? void 0 : children.length) === display.split('').length ? /*#__PURE__*/React.createElement(React.Fragment, null, display === 'lr' ? children === null || children === void 0 ? void 0 : children[1] : /*#__PURE__*/React.createElement(MemorySplit, {
     split: display === 'ltb' ? 'horizontal' : 'vertical'

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

@@ -6,7 +6,8 @@ import React, { useState, useEffect } from 'react';
 import { Button, notification, Icon, Progress, message } from 'luck-design/antd';
 import api from "@/services/ApiConfig";
 import { BasicForm, BasicFormItem, PopWindow } from 'luck-design';
-import { exportExcel, uploadTemplate, getFindexcelstate, noAuthGetTemplateUrl } from "../../../../constants/api-url";
+import { exportExcel, uploadTemplate, getFindexcelstate, noAuthGetTemplateUrl, clearProcess } from "../../../../constants/api-url";
+import { getLDMetaAttr } from "../../../../engine/tools/helper";
 import styled from 'styled-components';
 import { isString, split, last, lowerCase, includes } from 'lodash';
 import { useRequest } from 'ahooks';
@@ -19,6 +20,7 @@ var UploadDoneWrap = styled.div.withConfig({
   displayName: "UploadDoneWrap",
   componentId: "luckda-6530__sc-1eag873-1"
 })(["display:flex;align-items:center;justify-content:center;flex-direction:column;padding:16px;"]);
+var mdCode = getLDMetaAttr('dataModelKey');
 
 // options: {import: 'templateId' | 'behaviorKey',  importType: false | true, moduleCode}
 export var ImportUploadPop = function ImportUploadPop(_ref) {
@@ -43,6 +45,11 @@ export var ImportUploadPop = function ImportUploadPop(_ref) {
       manual: true
     }),
     runAsyncImport = _useRequest.runAsync;
+
+  // 清除进度
+  var clearProgress = function clearProgress(batchNo) {
+    clearProcess(batchNo).then();
+  };
   var fecthFindExcelState = function fecthFindExcelState(_ref2, callback) {
     var strategy = _ref2.strategy,
       batchNo = _ref2.batchNo,
@@ -54,7 +61,7 @@ export var ImportUploadPop = function ImportUploadPop(_ref) {
       moduleCode: moduleCode,
       behaviorKey: behaviorKey,
       templateId: templateId,
-      reportType: "import"
+      reportType: 'import'
     };
     getFindexcelstate(_fetchExcelStatePrefix, _fetchExcelStateParams).then(function (response) {
       if (response.code === 1) {
@@ -72,13 +79,16 @@ export var ImportUploadPop = function ImportUploadPop(_ref) {
           }, 500);
         } else {
           setActionStep('finish');
+          clearProgress(batchNo);
         }
       } else {
         callback();
         setActionStep('finish');
+        clearProgress(batchNo);
       }
     }).catch(function () {
       setActionStep('finish');
+      clearProgress(batchNo);
       callback();
     });
   };
@@ -147,7 +157,7 @@ export var ImportUploadPop = function ImportUploadPop(_ref) {
     };
   }();
   return /*#__PURE__*/React.createElement(PopWindow, {
-    title: "上传excel文件",
+    title: '上传excel文件',
     mode: "modal",
     size: "mini",
     visible: visible,
@@ -184,11 +194,14 @@ export var ImportUploadPop = function ImportUploadPop(_ref) {
       accept: '.xls,.xlsx,.xlt,.xlsm',
       name: 'fileObj',
       beforeUpload: function beforeUpload(file) {
-        var suffix = lowerCase(last(split(file.name, '.')));
-        if (!includes(['xls', 'xlsx', 'xlt', 'xlsm'], suffix)) {
-          message.info('禁止上传的文件类型');
-          return false;
-        }
+        return new Promise(function (resolve, reject) {
+          var suffix = lowerCase(last(split(file.name, '.')));
+          if (!includes(['xls', 'xlsx', 'xlt', 'xlsm'], suffix)) {
+            reject(new Error('禁止上传的文件类型'));
+          } else {
+            resolve(true);
+          }
+        });
       }
     }
   })), templateUrl && /*#__PURE__*/React.createElement(DownloadLink, null, /*#__PURE__*/React.createElement("a", {
@@ -198,8 +211,12 @@ export var ImportUploadPop = function ImportUploadPop(_ref) {
     type: "link"
   }, /*#__PURE__*/React.createElement(Icon, {
     type: "download"
-  }), " \u4E0B\u8F7D\u6A21\u7248")))) : /*#__PURE__*/React.createElement(UploadDoneWrap, null, /*#__PURE__*/React.createElement("p", null, "\u5DF2\u5BFC\u5165\uFF1A", uploadResult.totalCount || 0, "\u6761\uFF0C\u6210\u529F\uFF1A", uploadResult.successCount || 0, "\u6761\uFF0C\u5931\u8D25\uFF1A", uploadResult.failureCount, "\u6761"), uploadResult.failureCount > 0 ? /*#__PURE__*/React.createElement("a", {
-    href: uploadResult.errorFileUrl,
+  }), " \u4E0B\u8F7D\u6A21\u7248")))) : /*#__PURE__*/React.createElement(UploadDoneWrap, null, /*#__PURE__*/React.createElement("p", null, "\u5DF2\u5BFC\u5165\uFF1A", uploadResult.totalCount || 0, "\u6761\uFF0C\u6210\u529F\uFF1A", uploadResult.successCount || 0, "\u6761\uFF0C\u5931\u8D25\uFF1A", uploadResult.failureCount, "\u6761"), uploadResult.failureCount > 0 ?
+  /*#__PURE__*/
+  //1. http://ip/api/fes
+  //2. 循环结束调用clearProgress （batchNo）
+  React.createElement("a", {
+    href: "".concat(window.location.origin).concat(api.API_HOST, "/").concat(mdCode).concat(uploadResult.errorFileUrl),
     download: true
   }, "\u4E0B\u8F7D\u51FA\u9519\u8868\u683C\u4FE1\u606F") : ''));
 };
@@ -248,7 +265,7 @@ export var TopExport = function TopExport(_ref5) {
     var _fetchExcelStateParams = {
       moduleCode: moduleCode,
       behaviorKey: behaviorKey,
-      reportType: "export"
+      reportType: 'export'
     };
     getFindexcelstate(_fetchExcelStatePrefix, _fetchExcelStateParams).then(function (response) {
       if (response.code === 1) {
@@ -299,7 +316,7 @@ export var TopExport = function TopExport(_ref5) {
               _exportExcelParams = {
                 moduleCode: moduleCode,
                 behaviorKey: behaviorKey,
-                reportType: "export"
+                reportType: 'export'
               };
               _exportExcelPrefix = "/".concat(strategy);
               _context2.next = 10;
@@ -330,14 +347,14 @@ export var TopExport = function TopExport(_ref5) {
                   labels.push(column.colDef.headerName);
                   fieldInfo.push({
                     width: column.actualWidth,
-                    fieldNm: column.colId
+                    fieldNm: column.colDef.exportField || column.colId
                   });
                 }
               });
               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(),
@@ -345,7 +362,7 @@ export var TopExport = function TopExport(_ref5) {
               };
               _exportExcelParams2 = _objectSpread({
                 moduleCode: moduleCode,
-                reportType: "export"
+                reportType: 'export'
               }, defaultExcelParams);
               _exportExcelPrefix2 = "/".concat(strategy);
               _context2.next = 23;

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

@@ -275,7 +275,7 @@ var LCTable = /*#__PURE__*/forwardRef(function (_ref, ref) {
                   labels.push(column.colDef.headerName);
                   fieldInfo.push({
                     width: column.actualWidth,
-                    fieldNm: column.colId
+                    fieldNm: column.colDef.exportField || column.colId
                   });
                 }
               });
@@ -447,7 +447,7 @@ var LCTable = /*#__PURE__*/forwardRef(function (_ref, ref) {
       }));
     }
     return resultComp;
-  }, [topActionGroup, impexp]);
+  }, [topActionGroup, impexp, moduleCode]);
   var renderFilterArea = useCallback(function () {
     return topFilter ? /*#__PURE__*/React.createElement(TopFilter, {
       filter: topFilter,
@@ -566,8 +566,9 @@ var LCTable = /*#__PURE__*/forwardRef(function (_ref, ref) {
     wrapper: wrapperRef,
     wrapperProps: _wrapperProps,
     width: width,
-    height: height,
-    _loading: ctx.loading,
+    height: height
+    // _loading={ctx.loading}
+    ,
     bordered: bordered,
     className: classNames(_defineProperty({}, className, !!className)),
     ldId: id,

package/es/upload/FilesWall/index.js

@@ -8,9 +8,9 @@ import React, { forwardRef, useEffect, useImperativeHandle } from 'react';
 import { Button, Checkbox, Dropdown, Icon, Modal, Upload } from 'luck-design/antd';
 import { useSetState } from 'ahooks';
 import PropTypes from 'prop-types';
-import { canPreview, formatMessage, patchDownload, request, showPop } from '@luck-design-biz/base/utils';
-import { getDvaApp } from 'umi';
-import { last, lowerCase, split } from 'lodash';
+import { canPreview, formatMessage, patchDownload, request, showPop, string2ASCII } from '@luck-design-biz/base/utils';
+import { getDvaApp, history, getCreateHistoryOptions } from 'umi';
+import { last, lowerCase, split, replace } from 'lodash';
 import { Box, Permission, PermissionGroup } from 'luck-design';
 import styles from "./index.less";
 
@@ -150,12 +150,22 @@ var FilesWall = /*#__PURE__*/forwardRef(function (props, ref) {
     });
     onUploadChange && onUploadChange(e);
   };
+  var headers = {};
+  var token = window.cookie.get(window.appConfig.authSaveKey);
+  if (token) headers.Authorization = "Bearer ".concat(token);
+  var ticket = history.location.query.ticket;
+  if (ticket) headers.ticket = string2ASCII(ticket);
+  if (window.__POWERED_BY_QIANKUN__) {
+    var pathname = replace(window.location.pathname, getCreateHistoryOptions().basename, '');
+    headers['Mf-Path'] = pathname.length > 0 ? pathname : '/';
+    headers['Sys-Code'] = getCreateHistoryOptions().basename.split('/')[1];
+    if (window.routeCode) headers['Menu-Code'] = window.routeCode;
+  }
+  ;
   var formItemProps = _objectSpread(_objectSpread({}, rest), {}, {
     action: getUrl('upload'),
     // 上传地址
-    headers: {
-      Authorization: "Bearer ".concat(window.cookie.get(window.appConfig.authSaveKey))
-    },
+    headers: headers,
     // 请求头
     name: 'files',
     multiple: true,

package/es/upload/Form/gridForm.js

@@ -4,15 +4,15 @@ import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
 var _excluded = ["formId", "formRef", "showNote", "operates", "loading", "uploadUrl", "supportTypes", "forbiddenTypes", "beforeUpload", "formMode", "onUploadChange", "zipName", "resetActions", "getUrl", "wrapperRef"];
 import React, { useState, useRef, forwardRef } from 'react';
-import { getDvaApp } from 'umi';
+import { getDvaApp, history, getCreateHistoryOptions } from 'umi';
 import { useMemoizedFn, useCreation } from 'ahooks';
 import { Button, Upload, Tooltip, Icon } from 'luck-design/antd';
 import moment from 'moment';
-import { last } from 'lodash';
+import { last, replace } from 'lodash';
 import { BasicForm, BasicFormItem, PopWindow } from 'luck-design';
 import api from "@/services/ApiConfig";
 import { FormBtn, GridForm } from '@luck-design-biz/base/FormList';
-import { byteConvert, formatMessage, beforeUpload as _beforeUpload2, getSupportUploadTypes, patchDownloadZip, showPop, request, canPreview } from '@luck-design-biz/base/utils';
+import { byteConvert, formatMessage, beforeUpload as _beforeUpload2, getSupportUploadTypes, patchDownloadZip, showPop, request, canPreview, string2ASCII } from '@luck-design-biz/base/utils';
 var columns = [{
   field: 'name',
   title: '附件名称'
@@ -198,12 +198,22 @@ var UploadGridForm = function UploadGridForm(_ref) {
     }
   });
   var renderUploadTopLeft = useMemoizedFn(function () {
+    var headers = {};
+    var token = window.cookie.get(window.appConfig.authSaveKey);
+    if (token) headers.Authorization = "Bearer ".concat(token);
+    var ticket = history.location.query.ticket;
+    if (ticket) headers.ticket = string2ASCII(ticket);
+    if (window.__POWERED_BY_QIANKUN__) {
+      var pathname = replace(window.location.pathname, getCreateHistoryOptions().basename, '');
+      headers['Mf-Path'] = pathname.length > 0 ? pathname : '/';
+      headers['Sys-Code'] = getCreateHistoryOptions().basename.split('/')[1];
+      if (window.routeCode) headers['Menu-Code'] = window.routeCode;
+    }
+    ;
     var formItemProps = {
       action: uploadUrl || getUrl('upload'),
       // 上传地址
-      headers: {
-        Authorization: "Bearer ".concat(window.cookie.get(window.appConfig.authSaveKey))
-      },
+      headers: headers,
       // 请求头
       name: 'files',
       multiple: true,

package/es/upload/FormItem/index.js

@@ -3,8 +3,10 @@ import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
 var _excluded = ["uploadUrl", "moduleCode", "bucket", "tag", "note", "config", "supportTypes", "forbiddenTypes", "children", "dataFormat", "listType"];
 import React from 'react';
+import { replace } from 'lodash';
 import { BasicFormItem } from 'luck-design';
-import { formatMessage, beforeUpload as _beforeUpload, getSupportUploadTypes } from '@luck-design-biz/base/utils';
+import { history, getCreateHistoryOptions } from 'umi';
+import { formatMessage, beforeUpload as _beforeUpload, getSupportUploadTypes, string2ASCII } from '@luck-design-biz/base/utils';
 
 /**
  * 表单类型富文本上传
@@ -45,6 +47,18 @@ function buildComponent(props) {
     return "".concat(window.appConfig.OSS_HOST_V3, "?moduleCode=").concat(moduleCode, "&behaviorKey=").concat(behaviorKey, "&bucket=").concat(bucket, "&tag=").concat(tag, "&note=").concat(note);
   };
   var supportUploadTypes = getSupportUploadTypes(forbiddenTypes, supportTypes);
+  var headers = {};
+  var token = window.cookie.get(window.appConfig.authSaveKey);
+  if (token) headers.Authorization = "Bearer ".concat(token);
+  var ticket = history.location.query.ticket;
+  if (ticket) headers.ticket = string2ASCII(ticket);
+  if (window.__POWERED_BY_QIANKUN__) {
+    var pathname = replace(window.location.pathname, getCreateHistoryOptions().basename, '');
+    headers['Mf-Path'] = pathname.length > 0 ? pathname : '/';
+    headers['Sys-Code'] = getCreateHistoryOptions().basename.split('/')[1];
+    if (window.routeCode) headers['Menu-Code'] = window.routeCode;
+  }
+  ;
   return /*#__PURE__*/React.createElement(BasicFormItem, _extends({
     extra: "".concat(formatMessage({
       id: 'app.upload.supportUpload',
@@ -62,9 +76,7 @@ function buildComponent(props) {
       }),
       action: uploadUrl || getUrl('upload'),
       // 上传地址
-      headers: {
-        Authorization: "Bearer ".concat(window.cookie.get(window.appConfig.authSaveKey))
-      },
+      headers: headers,
       // 请求头
       name: 'files',
       // 发送到后台的文件名

package/es/utils/form.js

@@ -15,7 +15,7 @@ import moment from 'moment';
 import { capitalize, merge, transform, isArray, omit, isNil, clone, cloneDeep } from 'lodash';
 import api from "@/services/ApiConfig";
 import { defaultComName, translator, splitStrToObj, formatCustomProps } from "../helper/form";
-import { getColumnRender } from "./grid";
+import { getColumnRender, getExportField } from "./grid";
 import * as formItemUtils from "../helper/FromItems";
 
 /**
@@ -194,7 +194,7 @@ export var dataFormat = function dataFormat() {
       default:
         result[name] = values[name];
     }
-    values = omit(values, [name, "".concat(name, "_cvt")]);
+    values = omit(values, [name, "".concat(name, "_virtual")]);
   }, {});
   return _objectSpread(_objectSpread({}, values), data);
 };
@@ -256,6 +256,7 @@ export var getFormColumn = function getFormColumn() {
         key: name
       }, _props));
     },
-    field: name
+    field: name,
+    exportField: getExportField(name, formItemType, _props)
   });
 };

package/es/utils/grid.js

@@ -109,6 +109,11 @@ var getAlign = function getAlign(extraData, alignClass) {
       return 'left';
   }
 };
+export var getExportField = function getExportField(name, type, props) {
+  var _props$config2;
+  if (type === 'number' && (_props$config2 = props.config) !== null && _props$config2 !== void 0 && _props$config2.precision || ['date', 'user', 'select', 'group', 'region', 'upload'].includes(type)) return "".concat(name, "_virtual");
+  return;
+};
 export var getGridColumn = function getGridColumn() {
   var _ref = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {},
     comName = _ref.comName,
@@ -132,6 +137,7 @@ export var getGridColumn = function getGridColumn() {
   var _extra = JSON.parse(extra) || {};
   var data = _objectSpread(_objectSpread({}, _props), {}, {
     field: name,
+    exportField: getExportField(name, comName || defaultComName[property], _props),
     title: _props.fieldAliasName || _props.label,
     headerAlign: _props.headerAlign || getAlign(_extra, 'sheading_alignment_virtual'),
     align: _props.align || getAlign(_extra, 'scell_alignment_virtual'),
@@ -144,8 +150,8 @@ export var getGridColumn = function getGridColumn() {
     data.filter = filter;
     data.filterParams = filterParams;
   } else if (!isTreeGrid && !isVirtual) {
-    var _props$config2;
-    if ((_props.mode || ((_props$config2 = _props.config) === null || _props$config2 === void 0 ? void 0 : _props$config2.mode)) === 'multiple') {
+    var _props$config3;
+    if ((_props.mode || ((_props$config3 = _props.config) === null || _props$config3 === void 0 ? void 0 : _props$config3.mode)) === 'multiple') {
       data.field = "".concat(name, "_virtual");
       data.filter = 'text';
       return data;
@@ -196,6 +202,7 @@ export var getGridColumn = function getGridColumn() {
         break;
       case 'select':
       case 'radio':
+      case 'dict':
         data.filter = 'select';
         if (_props.alias) {
           data.filterParams = {
@@ -269,6 +276,7 @@ export var getGridColumn = function getGridColumn() {
         case 'select':
         case 'group':
         case 'complex':
+        case 'dict':
           if (translateProps.multiple) {
             formItemProps = {
               dataFormat: function dataFormat(value) {

package/lib/components/LDActions/index.js

@@ -36,6 +36,7 @@ var DisplayComp = function DisplayComp(_ref) {
   return /*#__PURE__*/_react.default.createElement(_antd.Button, (0, _extends2.default)({}, props, {
     disabled: action.serialEffect === 'disable',
     className: (0, _classnames.default)(_index.default[action.riskLevel], (0, _defineProperty2.default)({}, className, !!className)),
+    type: action.riskLevel,
     onClick: onClick
   }), children);
 };

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 _utils2 = require("../../lowcode/engine/provider/ContextProvider/utils");
-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", "showConfigBtn", "affixBarZIndex"],
+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", "validateErrorCallback", "showConfigBtn", "affixBarZIndex"],
   _excluded2 = ["dataSets", "doAction", "resources"],
   _excluded3 = ["id", "header", "title", "readOnly", "extraConfig", "renderTopLeft", "serial"],
   _excluded4 = ["ldId", "initData", "overModel"];
@@ -66,6 +66,7 @@ var LdFormList = function LdFormList(_ref) {
     bpmButtonProps = _ref$bpmButtonProps === void 0 ? {} : _ref$bpmButtonProps,
     setVerifyRules = _ref.setVerifyRules,
     afterSubmitLoading = _ref.afterSubmitLoading,
+    validateErrorCallback = _ref.validateErrorCallback,
     _ref$showConfigBtn = _ref.showConfigBtn,
     showConfigBtn = _ref$showConfigBtn === void 0 ? true : _ref$showConfigBtn,
     affixBarZIndex = _ref.affixBarZIndex,
@@ -228,9 +229,9 @@ var LdFormList = function LdFormList(_ref) {
       formUid: formUid,
       mainDataSetKey: mainDataSetKey
     }, function (success, mainKey, res) {
-      afterSubmitLoading && afterSubmitLoading(res);
       setSubmitLoading(false);
       if (success) {
+        afterSubmitLoading === null || afterSubmitLoading === void 0 || afterSubmitLoading(res);
         var mainFormData = res.detail[res.list[0]];
         if (afterSubmit) {
           afterSubmit(success, mainKey, res);
@@ -238,10 +239,11 @@ var LdFormList = function LdFormList(_ref) {
           var _formListRef$current, _formListRef$current2;
           props.parentModelName && ((_formListRef$current = formListRef.current) === null || _formListRef$current === void 0 ? void 0 : _formListRef$current.doParentsQuery());
           (_formListRef$current2 = formListRef.current) === null || _formListRef$current2 === void 0 || _formListRef$current2.onQuery(null, (0, _defineProperty2.default)({}, mainFormLdId, mainFormData), function () {
-            formListRef.current.setFormMode('info');
+            var _formListRef$current4;
+            (_formListRef$current4 = formListRef.current) === null || _formListRef$current4 === void 0 || _formListRef$current4.setFormMode('info');
           });
         }
-      }
+      } else validateErrorCallback === null || validateErrorCallback === void 0 || validateErrorCallback();
     });
   };
   var formConfig = (0, _objectSpread2.default)((0, _objectSpread2.default)({

package/lib/components/LdGrid/index.js

@@ -108,7 +108,7 @@ var LdGrid = function LdGrid(_ref) {
    */
   var _columns = (0, _ahooks.useCreation)(function () {
     if (columnsReset) {
-      if (_lodash.isFunction) {
+      if ((0, _lodash.isFunction)(columnsReset)) {
         return columnsReset(columns);
       }
       return columnsReset;
@@ -152,9 +152,6 @@ var LdGrid = function LdGrid(_ref) {
     unclosableSet: unclosableSet,
     onQuery: onQuery
   });
-
-  // console.log('_columns',columns,_columns)
-
   return /*#__PURE__*/_react.default.createElement(_List.GridList, (0, _extends2.default)({
     columns: _columns
     // 资源串、行为配置

package/lib/helper/action.js

@@ -188,5 +188,7 @@ var onBatchSubmitAction = exports.onBatchSubmitAction = function onBatchSubmitAc
         callback: callback
       });
     }
+  }).catch(function () {
+    callback(false);
   });
 };

package/lib/locales/zh-CN.js

@@ -22,12 +22,22 @@ var _default = exports.default = {
   "luckda.lowcode.modal": "模态视图层",
   "luckda.lowcode.painter.I18n.search": "搜索文案",
   "luckda.lowcode.painter.I18n.add": "新增文案",
+  "luckda.lowcode.version.delete": "你确定要删除该历史版本吗？",
+  "luckda.lowcode.version.confirm.recover": "你确定要还原到该历史版本吗？",
+  "luckda.lowcode.version.recover": "还原版本",
+  "luckda.lowcode.error.pagedata": "页面数据错误",
+  "luckda.lowcode.version.placeholder.search": "请输入查询内容",
+  "app.base.operate.delete": "删除",
+  "luckda.lowcode.version.diff": "差异比对",
+  "luckda.lowcode.version.use": "使用",
+  "luckda.lowcode.version.add": "添加到历史版本",
+  "luckda.lowcode.version.placeholder.title": "请输入版本标题",
+  "luckda.lowcode.version.placeholder.note": "请输入版本描述",
   "luckda.lowcode.design.toolbar.save.on": "保存中...",
   "luckda.lowcode.design.toolbar.save.success": "保存成功",
   "luckda.lowcode.design.toolbar.save.error": "保存失败",
   "luckda.lowcode.design.toolbar.clear.tip": "清除提示",
   "luckda.lowcode.design.toolbar.clear": "清除缓存",
-  "luckda.lowcode.error.pagedata": "页面数据错误",
   "luckda.lowcode.not.mobile": "此功能暂未开放",
   "luckda.lowcode.design.toolbar.pageAttrs": "页面属性",
   "luckda.lowcode.design.toolbar.debug": "调试",
@@ -89,6 +99,11 @@ var _default = exports.default = {
   "luckda.lowcode.painter.panel-section.fieldsSetting.field": "数据字段",
   "luckda.lowcode.painter.panel-section.fieldsSetting.title": "标题",
   "luckda.lowcode.painter.panel-section.fieldsSetting.batch": "批量设置",
+  "luckda.lowcode.painter.panel-section.dialogSize.size.small": "小",
+  "luckda.lowcode.painter.panel-section.dialogSize.size.default": "中",
+  "luckda.lowcode.painter.panel-section.dialogSize.size.large": "大",
+  "luckda.lowcode.painter.panel-section.dialogSize.size.full": "全屏",
+  "luckda.lowcode.painter.panel-section.dialogSize.size.custom": "定制",
   "luckda.lowcode.painter.dateSetSelector.setting": "配置字段",
   "luckda.lowcode.painter.dateSetSelector.sync": "同步数据",
   "luckda.lowcode.painter.panel-section.complexPop.assisted": "辅助选择",
@@ -174,7 +189,9 @@ var _default = exports.default = {
   "luckda.lowcode.painter.panel-section.style-panel.border.width.ph": "线宽",
   "luckda.lowcode.painter.panel-section.style-panel.border.color": "颜色",
   "luckda.lowcode.painter.panel-section.style-panel.background": "背景",
+  "luckda.lowcode.painter.panel-section.jseditor.clear": "确定执行操作吗？",
   "luckda.lowcode.painter.panel-section.jseditor.saveto": "保存为",
+  "app.base.operate.clear": "清空",
   "app.base.operate.ok": "确定",
   "luckda.lowcode.painter.panel-section.blocksEditor.auto": "表单",
   "luckda.lowcode.painter.panel-section.blocksEditor.grid": "表格",