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

package/es/components/LdAutoForm/index.js

@@ -71,7 +71,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.createElement(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) {
@@ -81,7 +81,7 @@ var buildLdAutoForm = function buildLdAutoForm(_ref) {
         var defaultSet = ['col', 'row', 'note', 'tip', 'placeholder'];
         var newCol = _objectSpread(_objectSpread({}, 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
         }, pick(setting, defaultSet));
         result.push(getFormItem(newCol, _objectSpread(_objectSpread({
           formId: ldId,

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", "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"];
@@ -36,6 +36,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,
@@ -57,6 +58,7 @@ var LdFormList = function LdFormList(_ref) {
     _ref$bpmButtonProps = _ref.bpmButtonProps,
     bpmButtonProps = _ref$bpmButtonProps === void 0 ? {} : _ref$bpmButtonProps,
     setVerifyRules = _ref.setVerifyRules,
+    afterSubmitLoading = _ref.afterSubmitLoading,
     props = _objectWithoutProperties(_ref, _excluded);
   var PRIMARY = window.appConfig.constraintKeys.PRIMARY;
   var currentValueRef = useRef(null);
@@ -87,7 +89,7 @@ var LdFormList = function LdFormList(_ref) {
     resources = _ref3.resources,
     rest = _objectWithoutProperties(_ref3, _excluded2);
   var formListRef = useRef(null);
-  useImperativeHandle(wrapperRef, function () {
+  useImperativeHandle(apiRef, function () {
     return _objectSpread(_objectSpread({}, formListRef.current), {}, {
       getCValue: function getCValue() {
         return currentValueRef.current || props.formData;
@@ -209,6 +211,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]];
@@ -249,7 +252,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.createElement(FormList, _extends({
+  return /*#__PURE__*/React.createElement(FormList, _extends({
     editFlow: true,
     formState: formState,
     formMode: formMode,
@@ -259,6 +262,7 @@ var LdFormList = function LdFormList(_ref) {
     })
   }, props, {
     modelName: namespace,
+    wrapperRef: wrapperRef,
     ref: formListRef,
     onAdd: function onAdd(values, other) {
       return handleBatchSubmit(values, 'add', other);
@@ -342,7 +346,7 @@ var LdFormList = function LdFormList(_ref) {
         mode: child.props.mode || 'tab'
       }) : child.props);
     })[0];
-  })) : null;
+  }));
 };
 
 // 构建带有model的组件
@@ -427,6 +431,6 @@ Index.defaultProps = {
 };
 export default /*#__PURE__*/forwardRef(function (props, ref) {
   return /*#__PURE__*/React.createElement(Index, _extends({
-    wrapperRef: ref
+    apiRef: ref
   }, props));
 });

package/es/components/LdGridForm/index.js

@@ -84,7 +84,7 @@ var buildLdGridForm = function buildLdGridForm(_ref) {
         _defaultValues = _objectSpread(_objectSpread({}, _defaultValues), {}, _defineProperty(_defineProperty({}, col.aliaName, col['optDefaultValue']), "".concat(col.aliaName, "_virtual"), col['optDefaultValueCvt']));
         var newCol = _objectSpread(_objectSpread({}, 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(getFormColumn(type, newCol, _objectSpread(_objectSpread(_objectSpread({}, pick(setting, defaultSet)), customColumn), {}, {

package/es/locales/zh-CN.js

@@ -197,10 +197,6 @@ export 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/es/lowcode/engine/factory/panel-item-factory/RadioStrategy.js

@@ -0,0 +1,53 @@
+import _classCallCheck from "@babel/runtime/helpers/esm/classCallCheck";
+import _createClass from "@babel/runtime/helpers/esm/createClass";
+import _assertThisInitialized from "@babel/runtime/helpers/esm/assertThisInitialized";
+import _inherits from "@babel/runtime/helpers/esm/inherits";
+import _createSuper from "@babel/runtime/helpers/esm/createSuper";
+import React from 'react';
+import { Radio } from 'luck-design/antd';
+import Strategy from "./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.createElement(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.createElement(Radio, {
+      key: value,
+      value: value
+    }, label);
+  }));
+};
+var RadioStrategy = /*#__PURE__*/function (_Strategy) {
+  _inherits(RadioStrategy, _Strategy);
+  var _super = _createSuper(RadioStrategy);
+  function RadioStrategy(factory) {
+    var _this;
+    _classCallCheck(this, RadioStrategy);
+    _this = _super.call(this, _TYPE_);
+    factory.register(_TYPE_, _assertThisInitialized(_this));
+    return _this;
+  }
+  _createClass(RadioStrategy, [{
+    key: "match",
+    value: function match(type) {
+      return type === _TYPE_;
+    }
+  }, {
+    key: "builder",
+    value: function builder() {
+      return RadioComp;
+    }
+  }]);
+  return RadioStrategy;
+}(Strategy);
+export { RadioStrategy as default };

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

@@ -6,6 +6,7 @@ import SelectStrategy from "./SelectStrategy";
 import SwitchStrategy from "./SwitchStrategy";
 import CheckboxStrategy from "./CheckboxStrategy";
 import SegmentedStrategy from "./SegmentedStrategy";
+import RadioStrategy from "./RadioStrategy";
 import DynamicStrategy from "./DynamicStrategy";
 import GroupStrategy from "./GroupStrategy";
 var Factory = /*#__PURE__*/function () {
@@ -23,6 +24,7 @@ var Factory = /*#__PURE__*/function () {
       new SelectStrategy(this);
       new CheckboxStrategy(this);
       new SegmentedStrategy(this);
+      new RadioStrategy(this);
       new SwitchStrategy(this);
       new GroupStrategy(this);
     }

package/es/lowcode/engine/meta/components-list.json

@@ -1,106 +1,4 @@
 [
-  {
-    "group": "field",
-    "groupName": "表单项",
-    "components": [
-      {
-        "component": "FieldColor",
-        "name": "颜色",
-        "desc": "颜色类型表单项",
-        "icon": "icon-fieldstring"
-      },
-      {
-        "component": "FieldComplex",
-        "name": "复合",
-        "desc": "复合类型表单项",
-        "icon": "icon-fieldstring"
-      },
-      {
-        "component": "FieldDate",
-        "name": "日期",
-        "desc": "日期类型表单项",
-        "icon": "icon-fieldstring"
-      },
-      {
-        "component": "FieldDict",
-        "name": "数据字典",
-        "desc": "数据字典类型表单项",
-        "icon": "icon-fieldstring"
-      },
-      {
-        "component": "FieldEditor",
-        "name": "富文本",
-        "desc": "富文本类型表单项",
-        "icon": "icon-fieldstring"
-      },
-      {
-        "component": "FieldGroup",
-        "name": "组维度",
-        "desc": "组维度类型表单项",
-        "icon": "icon-fieldstring"
-      },
-      {
-        "component": "FieldNumber",
-        "name": "数字",
-        "desc": "数字类型表单项",
-        "icon": "icon-fieldstring"
-      },
-      {
-        "component": "FieldRadio",
-        "name": "单选组件",
-        "desc": "圆形单选表单项",
-        "icon": "icon-fieldstring"
-      },
-      {
-        "component": "FieldRegion",
-        "name": "省市区选择",
-        "desc": "省市区级联选择表单项",
-        "icon": "icon-fieldstring"
-      },
-      {
-        "component": "FieldSelect",
-        "name": "下拉选择器",
-        "desc": "下拉选择器，支持单选、多选、tag标签选择",
-        "icon": "icon-fieldstring"
-      },
-      {
-        "component": "FieldString",
-        "name": "字符串",
-        "desc": "字符串类型表单项",
-        "icon": "icon-fieldstring"
-      },
-      {
-        "component": "FieldSwitch",
-        "name": "开关",
-        "desc": "开关类型表单项",
-        "icon": "icon-fieldstring"
-      },
-      {
-        "component": "FieldTextarea",
-        "name": "文本框",
-        "desc": "文本框类型表单项",
-        "icon": "icon-fieldstring"
-      },
-      {
-        "component": "FieldUpload",
-        "name": "附件上传",
-        "desc": "附件上传表单项",
-        "icon": "icon-fieldstring"
-      },
-      {
-        "component": "FieldUser",
-        "name": "用户",
-        "desc": "用户类型表单项",
-        "icon": "icon-fieldstring"
-      },
-      {
-        "component": "FieldYear",
-        "name": "年份选择",
-        "desc": "年份选择表单项",
-        "icon": "icon-fieldstring"
-      }
-    ]
-  },
   {
     "group": "container",
     "groupName": "布局",
@@ -203,6 +101,108 @@
       }
     ]
   },
+  {
+    "group": "field",
+    "groupName": "表单项",
+    "components": [
+      {
+        "component": "FieldColor",
+        "name": "颜色",
+        "desc": "颜色类型表单项",
+        "icon": "icon-fieldstring"
+      },
+      {
+        "component": "FieldComplex",
+        "name": "复合",
+        "desc": "复合类型表单项",
+        "icon": "icon-fieldstring"
+      },
+      {
+        "component": "FieldDate",
+        "name": "日期",
+        "desc": "日期类型表单项",
+        "icon": "icon-fieldstring"
+      },
+      {
+        "component": "FieldDict",
+        "name": "数据字典",
+        "desc": "数据字典类型表单项",
+        "icon": "icon-fieldstring"
+      },
+      {
+        "component": "FieldEditor",
+        "name": "富文本",
+        "desc": "富文本类型表单项",
+        "icon": "icon-fieldstring"
+      },
+      {
+        "component": "FieldGroup",
+        "name": "组维度",
+        "desc": "组维度类型表单项",
+        "icon": "icon-fieldstring"
+      },
+      {
+        "component": "FieldNumber",
+        "name": "数字",
+        "desc": "数字类型表单项",
+        "icon": "icon-fieldstring"
+      },
+      {
+        "component": "FieldRadio",
+        "name": "单选组件",
+        "desc": "圆形单选表单项",
+        "icon": "icon-fieldstring"
+      },
+      {
+        "component": "FieldRegion",
+        "name": "省市区选择",
+        "desc": "省市区级联选择表单项",
+        "icon": "icon-fieldstring"
+      },
+      {
+        "component": "FieldSelect",
+        "name": "下拉选择器",
+        "desc": "下拉选择器，支持单选、多选、tag标签选择",
+        "icon": "icon-fieldstring"
+      },
+      {
+        "component": "FieldString",
+        "name": "字符串",
+        "desc": "字符串类型表单项",
+        "icon": "icon-fieldstring"
+      },
+      {
+        "component": "FieldSwitch",
+        "name": "开关",
+        "desc": "开关类型表单项",
+        "icon": "icon-fieldstring"
+      },
+      {
+        "component": "FieldTextarea",
+        "name": "文本框",
+        "desc": "文本框类型表单项",
+        "icon": "icon-fieldstring"
+      },
+      {
+        "component": "FieldUpload",
+        "name": "附件上传",
+        "desc": "附件上传表单项",
+        "icon": "icon-fieldstring"
+      },
+      {
+        "component": "FieldUser",
+        "name": "用户",
+        "desc": "用户类型表单项",
+        "icon": "icon-fieldstring"
+      },
+      {
+        "component": "FieldYear",
+        "name": "年份选择",
+        "desc": "年份选择表单项",
+        "icon": "icon-fieldstring"
+      }
+    ]
+  },
   {
     "group": "advance",
     "groupName": "高级",

package/es/lowcode/engine/meta/dialog.props.json

@@ -149,7 +149,7 @@
       {
         "key": "onOk",
         "name": "确定按钮点击",
-        "desc": "点击确定按钮时，执行方法",
+        "desc": "点击确定按钮时，执行方法,return为Promose对象时会自动追加loading状态",
         "func": "function onOk() {\n\t\n}"
       }
     ]

package/es/lowcode/engine/meta/fieldcolor.props.default.json

@@ -8,6 +8,8 @@
   "order": 1,
   "enableAlpha": false,
   "placement": "topLeft",
+  "col": 1,
+  "row": 1,
   "advance": {
     "events": {}
   }

package/es/lowcode/engine/meta/fieldcolor.props.json

@@ -7,6 +7,11 @@
   "groupName": "表单项",
   "order": 1,
   "props": [
+    {
+      "key": "fieldAliasName",
+      "name": "字段标题",
+      "type": "_I18nInput"
+    },
     {
       "key": "enableAlpha",
       "name": "启用透明度",
@@ -36,6 +41,78 @@
         }
       ],
       "default": "topLeft"
+    },
+    {
+      "key": "generalSetting",
+      "name": "通用配置",
+      "type": "group",
+      "props": [
+        {
+          "key": "col",
+          "name": "占列数",
+          "type": "radio",
+          "repositioning": true,
+          "options": [
+            {
+              "label": "1",
+              "value": 1
+            },
+            {
+              "label": "2",
+              "value": 2
+            },
+            {
+              "label": "3",
+              "value": 3
+            },
+            {
+              "label": "4",
+              "value": 4
+            }
+          ],
+          "default": 1
+        },
+        {
+          "key": "row",
+          "name": "占行数",
+          "type": "radio",
+          "repositioning": true,
+          "options": [
+            {
+              "label": "1",
+              "value": 1
+            },
+            {
+              "label": "2",
+              "value": 2
+            },
+            {
+              "label": "3",
+              "value": 3
+            },
+            {
+              "label": "4",
+              "value": 4
+            }
+          ],
+          "default": 1
+        },
+        {
+          "key": "note",
+          "name": "字段注释",
+          "type": "_I18nInput"
+        },
+        {
+          "key": "tip",
+          "name": "长说明",
+          "type": "_I18nInput"
+        },
+        {
+          "key": "placeholder",
+          "name": "默认提示",
+          "type": "_I18nInput"
+        }
+      ]
     }
   ],
   "advance": {

package/es/lowcode/engine/meta/fieldcomplex.props.default.json

@@ -7,6 +7,8 @@
   "groupName": "表单项",
   "order": 1,
   "allowClear": true,
+  "col": 1,
+  "row": 1,
   "advance": {
     "events": {}
   }

package/es/lowcode/engine/meta/fieldcomplex.props.json

@@ -7,11 +7,88 @@
   "groupName": "表单项",
   "order": 1,
   "props": [
+    {
+      "key": "fieldAliasName",
+      "name": "字段标题",
+      "type": "_I18nInput"
+    },
     {
       "key": "allowClear",
       "name": "允许清除",
       "type": "switch",
       "default": true
+    },
+    {
+      "key": "generalSetting",
+      "name": "通用配置",
+      "type": "group",
+      "props": [
+        {
+          "key": "col",
+          "name": "占列数",
+          "type": "radio",
+          "repositioning": true,
+          "options": [
+            {
+              "label": "1",
+              "value": 1
+            },
+            {
+              "label": "2",
+              "value": 2
+            },
+            {
+              "label": "3",
+              "value": 3
+            },
+            {
+              "label": "4",
+              "value": 4
+            }
+          ],
+          "default": 1
+        },
+        {
+          "key": "row",
+          "name": "占行数",
+          "type": "radio",
+          "repositioning": true,
+          "options": [
+            {
+              "label": "1",
+              "value": 1
+            },
+            {
+              "label": "2",
+              "value": 2
+            },
+            {
+              "label": "3",
+              "value": 3
+            },
+            {
+              "label": "4",
+              "value": 4
+            }
+          ],
+          "default": 1
+        },
+        {
+          "key": "note",
+          "name": "字段注释",
+          "type": "_I18nInput"
+        },
+        {
+          "key": "tip",
+          "name": "长说明",
+          "type": "_I18nInput"
+        },
+        {
+          "key": "placeholder",
+          "name": "默认提示",
+          "type": "_I18nInput"
+        }
+      ]
     }
   ],
   "advance": {

package/es/lowcode/engine/meta/fielddate.props.default.json

@@ -6,6 +6,8 @@
   "icon": "icon-fieldstring",
   "groupName": "表单项",
   "order": 1,
+  "col": 1,
+  "row": 1,
   "advance": {
     "events": {}
   }