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

package/es/utils/form.js

@@ -15,14 +15,14 @@ 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";
 
-/**
- * 根据动态表单配置项生成formItem
- * @param {动态表单配置项} props
- * @param {自定义动态表单配置项} customProps
- * @returns <BasicForm name='' ... />
+/**
+ * 根据动态表单配置项生成formItem
+ * @param {动态表单配置项} props
+ * @param {自定义动态表单配置项} customProps
+ * @returns <BasicForm name='' ... />
  */
 export function getFormItem() {
   var _ref = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {},
@@ -56,11 +56,11 @@ export function getFormItem() {
   }));
 }
 
-/**
- * 根据后端返回数据组装表单数据
- * @param {数组---动态表单配置参数列表} propsList
- * @param {对象---后端返回的未处理数据} values
- * @returns
+/**
+ * 根据后端返回数据组装表单数据
+ * @param {数组---动态表单配置参数列表} propsList
+ * @param {对象---后端返回的未处理数据} values
+ * @returns
  */
 export var formItemDataFormat = function formItemDataFormat() {
   var propsList = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
@@ -130,11 +130,11 @@ export var formItemDataFormat = function formItemDataFormat() {
   return _objectSpread(_objectSpread({}, omitValues), data);
 };
 
-/**
- * 数据格式化
- * @param {数组---动态表单配置参数列表} propsList
- * @param {对象---表单获取到的未处理数据} values
- * @returns
+/**
+ * 数据格式化
+ * @param {数组---动态表单配置参数列表} propsList
+ * @param {对象---表单获取到的未处理数据} values
+ * @returns
  */
 export var dataFormat = function dataFormat() {
   var propsList = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
@@ -194,17 +194,17 @@ 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);
 };
 
-/**
- *
- * @param formType
- * @param props
- * @param customProps
- * @returns {*&{field: *, editable: (false|{required: *}), renderBasicFormItem: ((function(): (*))|*), title, render: *}}
+/**
+ *
+ * @param formType
+ * @param props
+ * @param customProps
+ * @returns {*&{field: *, editable: (false|{required: *}), renderBasicFormItem: ((function(): (*))|*), title, render: *}}
  */
 export var getFormColumn = function getFormColumn() {
   var _props$config;
@@ -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/LDActions/index.less

@@ -1,70 +1,70 @@
-@import '~@luck-helper/ui-design/es/style/themes/default.less';
-
-@spanDefault: #262626;
-@spanPrimary: var(--ant-primary-color);
-@spanDanger: #ff4d4f;
-@spanDestroy: #820014;
-
-.ldActions {
-
-  button:not(:last-child) {
-    margin-right: 4px;
-  }
-  button:not(:first-child) {
-    margin-left: 4px;
-  }
-  span {
-    cursor: pointer;
-  }
-
-  button.default {
-    background-color: @component-background;
-  }
-  span.default {
-    color: @spanDefault;
-  }
-
-  button.primary {
-    background-color: var(--ant-primary-color);
-    border-color: var(--ant-primary-color);
-    color: white;
-  }
-  span.primary {
-    color: @spanPrimary;
-  }
-
-  button.danger {
-    background-color: #ff4d4f;
-    border-color: #ff4d4f;
-    color: white;
-  }
-  span.danger {
-    color: @spanDanger;
-  }
-
-  button.destroy {
-    background-color: #820014;
-    border-color: #820014;
-    color: white;
-  }
-  span.destroy {
-    color: @spanDestroy;
-  }
-
-  span.disabled {
-    color: #bfbfbf;
-    cursor: not-allowed;
-  }
-}
-span.default.menuItem {
-  color: @spanDefault;
-}
-span.primary.menuItem {
-  color: @spanPrimary;
-}
-span.danger.menuItem {
-  color: @spanDanger;
-}
-span.destroy.menuItem {
-  color: @spanDestroy;
-}
+@import '~@luck-helper/ui-design/es/style/themes/default.less';
+
+@spanDefault: #262626;
+@spanPrimary: var(--ant-primary-color);
+@spanDanger: #ff4d4f;
+@spanDestroy: #820014;
+
+.ldActions {
+
+  button:not(:last-child) {
+    margin-right: 4px;
+  }
+  button:not(:first-child) {
+    margin-left: 4px;
+  }
+  span {
+    cursor: pointer;
+  }
+
+  button.default {
+    background-color: @component-background;
+  }
+  span.default {
+    color: @spanDefault;
+  }
+
+  button.primary {
+    background-color: var(--ant-primary-color);
+    border-color: var(--ant-primary-color);
+    color: white;
+  }
+  span.primary {
+    color: @spanPrimary;
+  }
+
+  button.danger {
+    background-color: #ff4d4f;
+    border-color: #ff4d4f;
+    color: white;
+  }
+  span.danger {
+    color: @spanDanger;
+  }
+
+  button.destroy {
+    background-color: #820014;
+    border-color: #820014;
+    color: white;
+  }
+  span.destroy {
+    color: @spanDestroy;
+  }
+
+  span.disabled {
+    color: #bfbfbf;
+    cursor: not-allowed;
+  }
+}
+span.default.menuItem {
+  color: @spanDefault;
+}
+span.primary.menuItem {
+  color: @spanPrimary;
+}
+span.danger.menuItem {
+  color: @spanDanger;
+}
+span.destroy.menuItem {
+  color: @spanDestroy;
+}

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

@@ -101,14 +101,14 @@ var LdGrid = function LdGrid(_ref) {
     });
   }, [batchOperations]);
 
-  /**
-   * 优先级
-   * columnsReset 重置columns，不受模块管理限制，写什么展示什么
-   * columnsRewrite 覆盖模块管理配置，是否展示以模块管理配置为主，自己可以用hide来隐藏某字段
+  /**
+   * 优先级
+   * columnsReset 重置columns，不受模块管理限制，写什么展示什么
+   * columnsRewrite 覆盖模块管理配置，是否展示以模块管理配置为主，自己可以用hide来隐藏某字段
    */
   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/components/LdGridForm/index.less

@@ -1,7 +1,7 @@
-.ldGridForm {
-  :global {
-    .ag-layout-auto-height {
-      height: 100% !important;
-    }
-  }
-}
+.ldGridForm {
+  :global {
+    .ag-layout-auto-height {
+      height: 100% !important;
+    }
+  }
+}

package/lib/components/LdTree/index.less

@@ -1,43 +1,43 @@
-@import '~@luck-helper/ui-design/es/style/themes/default.less';
-
-.tree {
-  .nodeTitle {
-    display: flex;
-    align-items: center;
-    width: 100%;
-    user-select: none;
-
-    div {
-      flex: 1;
-      overflow-x: hidden;
-      white-space: nowrap;
-      text-overflow: ellipsis;
-    }
-
-    div.nodeTitleDisabled {
-      color: @text-color-secondary_luck;
-    }
-
-    div.nodeTitleDisabled:hover {
-      cursor: not-allowed;
-    }
-  }
-
-  :global {
-    .ant-tree-title {
-      width: 100%;
-    }
-  }
-}
-
-.classTreeOperates {
-  :global(.ant-popover-inner-content) {
-    padding: 0;
-  }
-
-  .rightMenu {
-    display: block;
-    padding: 4px 8px;
-    color: @text-color;
-  }
+@import '~@luck-helper/ui-design/es/style/themes/default.less';
+
+.tree {
+  .nodeTitle {
+    display: flex;
+    align-items: center;
+    width: 100%;
+    user-select: none;
+
+    div {
+      flex: 1;
+      overflow-x: hidden;
+      white-space: nowrap;
+      text-overflow: ellipsis;
+    }
+
+    div.nodeTitleDisabled {
+      color: @text-color-secondary_luck;
+    }
+
+    div.nodeTitleDisabled:hover {
+      cursor: not-allowed;
+    }
+  }
+
+  :global {
+    .ant-tree-title {
+      width: 100%;
+    }
+  }
+}
+
+.classTreeOperates {
+  :global(.ant-popover-inner-content) {
+    padding: 0;
+  }
+
+  .rightMenu {
+    display: block;
+    padding: 4px 8px;
+    color: @text-color;
+  }
 }

package/lib/helper/action.js

@@ -14,12 +14,12 @@ var _utils2 = require("../utils");
 var _form = require("./form");
 // 通用方法
 
-/**
- * 提交行为
- * @param action 行为
- * @param data 数据
- * @param parmas 附件设置
- * @param moduleData 当前模块信息
+/**
+ * 提交行为
+ * @param action 行为
+ * @param data 数据
+ * @param parmas 附件设置
+ * @param moduleData 当前模块信息
  */
 var doAction = exports.doAction = function doAction(action) {
   var data = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
@@ -188,5 +188,7 @@ var onBatchSubmitAction = exports.onBatchSubmitAction = function onBatchSubmitAc
         callback: callback
       });
     }
+  }).catch(function () {
+    callback(false);
   });
 };

package/lib/helper/form.js

@@ -38,11 +38,11 @@ var defaultComName = exports.defaultComName = {
   complex: 'complex'
 };
 
-/**
- * 动态表单配置项转译
- * @param {key string} keyStr
- * @param {label string} labelStr
- * @returns [{key,label}]
+/**
+ * 动态表单配置项转译
+ * @param {key string} keyStr
+ * @param {label string} labelStr
+ * @returns [{key,label}]
  */
 var splitStrToObj = exports.splitStrToObj = function splitStrToObj(keyStr, labelStr) {
   var keys = keyStr && keyStr.length > 0 ? keyStr.split(',') : undefined;
@@ -59,11 +59,11 @@ var splitStrToObj = exports.splitStrToObj = function splitStrToObj(keyStr, label
   return undefined;
 };
 
-/**
- * 动态表单配置项转译
- * @param {动态表单配置项} props
- * @param {自定义动态表单配置项} customProps
- * @returns {name: '',...}
+/**
+ * 动态表单配置项转译
+ * @param {动态表单配置项} props
+ * @param {自定义动态表单配置项} customProps
+ * @returns {name: '',...}
  */
 function translator() {
   var _ref = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {},
@@ -130,10 +130,10 @@ function translator() {
   return _props;
 }
 
-/**
- * 删除自动移操作中的不可覆盖字段
- * @param props
- * @returns {{multiple}|*}
+/**
+ * 删除自动移操作中的不可覆盖字段
+ * @param props
+ * @returns {{multiple}|*}
  */
 function formatCustomProps(comType, props) {
   var _props2, _props3;

package/lib/helper/index.less

@@ -1,7 +1,7 @@
-.ldLabs{
-  :global{
-    .ant-tabs-bar{
-      margin: 0 0 4px 0;
-    }
-  }
-}
+.ldLabs{
+  :global{
+    .ant-tabs-bar{
+      margin: 0 0 4px 0;
+    }
+  }
+}

package/lib/locales/zh-CN.js

@@ -13,6 +13,7 @@ var _default = exports.default = {
   "lc.form.validator.textNum": "个字符",
   "lc.form.validator.numberBelowMin": "低于最小值",
   "lc.form.validator.numberExceedMax": "超过最大值",
+  "luckda.lowcode.painter.I18n.empty": "敬请期待",
   "luckda.lowcode.painter.panel.attrs": "属性",
   "luckda.lowcode.painter.panel.css": "样式",
   "luckda.lowcode.painter.panel.advance": "高级",
@@ -21,13 +22,22 @@ var _default = exports.default = {
   "luckda.lowcode.modal": "模态视图层",
   "luckda.lowcode.painter.I18n.search": "搜索文案",
   "luckda.lowcode.painter.I18n.add": "新增文案",
-  "luckda.lowcode.painter.I18n.empty": "敬请期待",
+  "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": "调试",
@@ -82,7 +92,6 @@ var _default = exports.default = {
   "luckda.lowcode.painter.pageVars.add": "添加",
   "luckda.lowcode.painter.panel-section.Layoutratio.err": "必须是数字或者数字加:号的组合",
   "luckda.lowcode.painter.panel-section.Layoutratio.label": "列比例",
-  "luckda.lowcode.painter.panel-section.style-panel.sourceedit": "源码编辑",
   "luckda.lowcode.painter.panel-section.impexp.expType.placeholder": "请选择自定义行为",
   "luckda.lowcode.painter.panel-section.impexp.impType.placeholder": "请选择自定义行为",
   "luckda.lowcode.painter.bindCondition": "绑定条件",
@@ -90,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": "辅助选择",
@@ -115,6 +129,7 @@ var _default = exports.default = {
   "luckda.lowcode.painter.panel-section.style-panel.margin.down": "下间距",
   "luckda.lowcode.painter.panel-section.style-panel.margin.left": "左间距",
   "luckda.lowcode.painter.panel-section.style-panel.group-name": "样式设置",
+  "luckda.lowcode.painter.panel-section.style-panel.sourceedit": "源码编辑",
   "luckda.lowcode.painter.panel-section.style-panel.width": "请输入宽度",
   "luckda.lowcode.painter.panel-section.style-panel.height": "请输入高度",
   "luckda.lowcode.painter.panel-section.style-panel.display": "显示",
@@ -174,6 +189,10 @@ 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": "表格",
   "luckda.lowcode.painter.panel-section.blocksEditor.writer": "行内编辑表格",