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

package/es/components/LDActions/index.js

@@ -28,6 +28,7 @@ var DisplayComp = function DisplayComp(_ref) {
   return /*#__PURE__*/React.createElement(Button, _extends({}, props, {
     disabled: action.serialEffect === 'disable',
     className: classNames(styles[action.riskLevel], _defineProperty({}, className, !!className)),
+    type: action.riskLevel,
     onClick: onClick
   }), children);
 };

package/es/components/LdFormList/index.js

@@ -6,7 +6,7 @@ import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-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"];
@@ -59,6 +59,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,
@@ -221,9 +222,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);
@@ -231,10 +232,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, _defineProperty({}, 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 = _objectSpread(_objectSpread({

package/es/components/LdGrid/index.js

@@ -100,7 +100,7 @@ var LdGrid = function LdGrid(_ref) {
    */
   var _columns = useCreation(function () {
     if (columnsReset) {
-      if (isFunction) {
+      if (isFunction(columnsReset)) {
         return columnsReset(columns);
       }
       return columnsReset;
@@ -144,9 +144,6 @@ var LdGrid = function LdGrid(_ref) {
     unclosableSet: unclosableSet,
     onQuery: onQuery
   });
-
-  // console.log('_columns',columns,_columns)
-
   return /*#__PURE__*/React.createElement(GridList, _extends({
     columns: _columns
     // 资源串、行为配置

package/es/helper/action.js

@@ -181,5 +181,7 @@ export var onBatchSubmitAction = function onBatchSubmitAction(_ref3, callback) {
         callback: callback
       });
     }
+  }).catch(function () {
+    callback(false);
   });
 };

package/es/locales/zh-CN.js

@@ -16,12 +16,22 @@ export 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": "调试",
@@ -83,6 +93,11 @@ export 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": "辅助选择",
@@ -168,7 +183,9 @@ export 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": "表格",