@luck-design-biz/luckda 0.0.25-1 → 0.0.25-2

package/lib/lowcode/painter/components/field-setting/BatchSetting.js

@@ -97,6 +97,8 @@ var BatchSetting = function BatchSetting(_ref) {
   var _useDebounceFn = (0, _ahooks.useDebounceFn)(function (key, val) {
       if (key === 'width') {
         handleUIChange(key, val);
+      } else if (key === 'note' || key === 'tip' || key === 'placeholder') {
+        handleUIChange(key, val);
       }
     }, {
       wait: 400
@@ -112,10 +114,18 @@ var BatchSetting = function BatchSetting(_ref) {
               break;
             }
             handleUIChange(key, val);
-            _context.next = 6;
+            _context.next = 10;
             break;
           case 4:
-            _context.next = 6;
+            if (!(key === 'col' || key === 'row')) {
+              _context.next = 8;
+              break;
+            }
+            handleUIChange(key, val);
+            _context.next = 10;
+            break;
+          case 8:
+            _context.next = 10;
             return (0, _apiUrl.fetchAddFieldAttrs)({
               dataModelKey: dataModelKey,
               moduleDatasetUid: datasetId,
@@ -128,7 +138,7 @@ var BatchSetting = function BatchSetting(_ref) {
               }],
               datasetBusinessUids: (0, _toConsumableArray2.default)(fieldsData.keys())
             });
-          case 6:
+          case 10:
           case "end":
             return _context.stop();
         }

package/lib/lowcode/painter/components/field-setting/SettingUI.js

@@ -70,6 +70,10 @@ var DefaultValueWrapper = _styledComponents.default.span.withConfig({
   displayName: "DefaultValueWrapper",
   componentId: "luckda-6530__sc-1n41f3z-1"
 })(["color:var(--ant-primary-color);font-size:12px;padding:0 16px;display:inline-block;cursor:pointer;"]);
+var StyledRadio = (0, _styledComponents.default)(_antd.Radio.Group).withConfig({
+  displayName: "StyledRadio",
+  componentId: "luckda-6530__sc-1n41f3z-2"
+})(["span.ant-radio + *{padding-left:4px;padding-right:4px;}"]);
 var SettingUI = function SettingUI(_ref) {
   var loading = _ref.loading,
     data = _ref.data,
@@ -251,8 +255,11 @@ var SettingUI = function SettingUI(_ref) {
       id: "".concat(_I18N_PREFIX_, ".fieldColumn"),
       label: '占列数'
     })
-  }, /*#__PURE__*/_react.default.createElement(_antd.Radio.Group, {
-    value: 1
+  }, /*#__PURE__*/_react.default.createElement(StyledRadio, {
+    defaultValue: fieldData.col,
+    onChange: function onChange(e) {
+      return run('col', e.target.value);
+    }
   }, /*#__PURE__*/_react.default.createElement(_antd.Radio, {
     value: 1
   }, "1"), /*#__PURE__*/_react.default.createElement(_antd.Radio, {
@@ -266,8 +273,11 @@ var SettingUI = function SettingUI(_ref) {
       id: "".concat(_I18N_PREFIX_, ".fieldRow"),
       label: '占行数'
     })
-  }, /*#__PURE__*/_react.default.createElement(_antd.Radio.Group, {
-    value: 1
+  }, /*#__PURE__*/_react.default.createElement(StyledRadio, {
+    defaultValue: fieldData.row,
+    onChange: function onChange(e) {
+      return run('row', e.target.value);
+    }
   }, /*#__PURE__*/_react.default.createElement(_antd.Radio, {
     value: 1
   }, "1"), /*#__PURE__*/_react.default.createElement(_antd.Radio, {
@@ -282,7 +292,10 @@ var SettingUI = function SettingUI(_ref) {
       label: '字段注释'
     })
   }, /*#__PURE__*/_react.default.createElement(_antd.Input, {
-    defaultValue: "fieldNote",
+    defaultValue: fieldData.note,
+    onChange: function onChange(val) {
+      return runDebounce('note', val);
+    },
     size: "small"
   })), /*#__PURE__*/_react.default.createElement(_PanelItem.default, {
     label: (0, _utils.formatMessage)({
@@ -290,7 +303,10 @@ var SettingUI = function SettingUI(_ref) {
       label: '长说明'
     })
   }, /*#__PURE__*/_react.default.createElement(_antd.Input, {
-    defaultValue: "fieldTip",
+    defaultValue: fieldData.tip,
+    onChange: function onChange(val) {
+      return runDebounce('tip', val);
+    },
     size: "small"
   })), /*#__PURE__*/_react.default.createElement(_PanelItem.default, {
     label: (0, _utils.formatMessage)({
@@ -298,7 +314,10 @@ var SettingUI = function SettingUI(_ref) {
       label: '默认提示'
     })
   }, /*#__PURE__*/_react.default.createElement(_antd.Input, {
-    defaultValue: "placeholder",
+    defaultValue: fieldData.placeholder,
+    onChange: function onChange(val) {
+      return runDebounce('placeholder', val);
+    },
     size: "small"
   }))), !isBatch ? /*#__PURE__*/_react.default.createElement(_PanelItem.default, {
     label: (0, _utils.formatMessage)({

package/lib/lowcode/painter/components/field-setting/index.js

@@ -210,6 +210,8 @@ var FieldSetting = function FieldSetting(_ref) {
   var _useDebounceFn = (0, _ahooks.useDebounceFn)(function (key, val) {
       if (key === 'width') {
         handleUIChange(key, val);
+      } else if (key === 'note' || key === 'tip' || key === 'placeholder') {
+        handleUIChange(key, val);
       }
     }, {
       wait: 400
@@ -231,7 +233,7 @@ var FieldSetting = function FieldSetting(_ref) {
               moduleUid: moduleId
             }, val ? 'uniqueFieldUid' : 'noUniqueFieldUid', fieldData.uid));
           case 3:
-            _context2.next = 26;
+            _context2.next = 30;
             break;
           case 5:
             if (!(key === 'align' || key === 'headerAlign' || key === 'pinned' || key === 'tip')) {
@@ -239,13 +241,21 @@ var FieldSetting = function FieldSetting(_ref) {
               break;
             }
             handleUIChange(key, val);
-            _context2.next = 26;
+            _context2.next = 30;
             break;
           case 9:
-            if (!(key === 'delRule')) {
+            if (!(key === 'col' || key === 'row')) {
               _context2.next = 13;
               break;
             }
+            handleUIChange(key, val);
+            _context2.next = 30;
+            break;
+          case 13:
+            if (!(key === 'delRule')) {
+              _context2.next = 17;
+              break;
+            }
             _antd.Modal.confirm({
               title: (0, _utils.formatMessage)({
                 id: 'luckda.lowcode.painter.delete.tip',
@@ -287,9 +297,9 @@ var FieldSetting = function FieldSetting(_ref) {
                 return onOk;
               }()
             });
-            _context2.next = 26;
+            _context2.next = 30;
             break;
-          case 13:
+          case 17:
             mapping = (0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)({}, _constants.FIELD_SCOPES.FIELD_REQUIRED, {
               key: 'fieldRequired',
               refresh: requiredRefresh
@@ -325,15 +335,15 @@ var FieldSetting = function FieldSetting(_ref) {
             if (!_stateItem) {
               d.datasetBusinessUids = [fieldData.uid];
             }
-            _context2.next = 23;
+            _context2.next = 27;
             return request(d);
-          case 23:
+          case 27:
             _yield$request = _context2.sent;
             code = _yield$request.code;
             if (code === 1) {
               mapping[key].refresh();
             }
-          case 26:
+          case 30:
           case "end":
             return _context2.stop();
         }

package/lib/lowcode/painter/index.js

@@ -1,13 +1,12 @@
 "use strict";
 
-var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard").default;
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-var _react = _interopRequireWildcard(require("react"));
+var _react = _interopRequireDefault(require("react"));
 var _classnames = _interopRequireDefault(require("classnames"));
 var _EventBusProvider = _interopRequireDefault(require("../engine/provider/EventBusProvider"));
 var _ContextProvider = _interopRequireDefault(require("../engine/provider/ContextProvider"));
@@ -16,38 +15,10 @@ var _Design = _interopRequireDefault(require("./Design"));
 var _Panel = _interopRequireDefault(require("./Panel"));
 var _index = require("../constants/index");
 var _index2 = _interopRequireDefault(require("./style/index.less"));
-var _core = require("@dnd-kit/core");
 var _DragDropContext = _interopRequireDefault(require("./components/DragDrop/DragDropContext"));
-// import { history } from 'umi';
-// import { formatMessage } from '@luck-design-biz/base/utils';
-
 var Painter = function Painter(_ref) {
   var className = _ref.className,
     code = _ref.code;
-  // 修改后刷新提示功能，暂时关掉，等待提供数据对比进行判断
-  // useEffect(() => {
-  //   const handleBeforeUnload = (event) => {
-  //     event.preventDefault();
-  //     event.returnValue = null;
-  //     return null;
-  //   };
-
-  //   window.addEventListener('beforeunload', handleBeforeUnload);
-
-  //   const unblock = history.block(() =>
-  //     confirm(`${formatMessage({
-  //       id: 'app.base.operate.comfire.reload', label: '重新加载此网站？'
-  //     })}\n${formatMessage({
-  //       id: 'app.base.operate.comfire.message.reload', label: '系统可能不会保存您所做的更改。'
-  //     })}`)
-  //   );
-
-  //   return () => {
-  //     unblock();
-  //     window.removeEventListener('beforeunload', handleBeforeUnload);
-  //   };
-  // }, []);
-
   return /*#__PURE__*/_react.default.createElement(_EventBusProvider.default, {
     runtime: _index.RUNTIME.DESIGN
   }, /*#__PURE__*/_react.default.createElement(_ContextProvider.default, {

package/lib/lowcode/painter/panel-section/ActionsColumnWidth.js

@@ -0,0 +1,32 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
+var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
+var _react = _interopRequireDefault(require("react"));
+var _ahooks = require("ahooks");
+var _WidthHeight = _interopRequireDefault(require("./WidthHeight"));
+var _ContextProvider = require("../../engine/provider/ContextProvider");
+var _excluded = ["blockId", "onChange"];
+var ActionsColumnWidth = function ActionsColumnWidth(_ref) {
+  var blockId = _ref.blockId,
+    onChange = _ref.onChange,
+    props = (0, _objectWithoutProperties2.default)(_ref, _excluded);
+  var ctx = (0, _ContextProvider.useContext)();
+  var handleChange = (0, _ahooks.useMemoizedFn)(function (value) {
+    var _ctx$componentMap$get2;
+    var _ctx$componentMap$get = (_ctx$componentMap$get2 = ctx.componentMap.get(props.nodeId)) === null || _ctx$componentMap$get2 === void 0 ? void 0 : _ctx$componentMap$get2.api.getForm().getFormRef(blockId).formRef.current,
+      gridApi = _ctx$componentMap$get.gridApi;
+    var col = gridApi.columnApi.getColumn('luck-actions');
+    gridApi.columnApi.setColumnWidth(col, value || 160);
+    onChange && onChange(value);
+  });
+  return /*#__PURE__*/_react.default.createElement(_WidthHeight.default, (0, _extends2.default)({
+    onChange: handleChange
+  }, props));
+};
+var _default = exports.default = ActionsColumnWidth;

package/lib/lowcode/painter/panel-section/BlockEditor/index.js

@@ -10,18 +10,21 @@ var _ahooks = require("ahooks");
 var _antd = require("luck-design/antd");
 var BlockEditor = function BlockEditor(_ref) {
   var blockName = _ref.blockName,
+    blockId = _ref.blockId,
     next = _ref.next;
   var handleClick = (0, _ahooks.useMemoizedFn)(function (e) {
     e.stopPropagation();
-    next();
+    next && next({
+      blockId: blockId
+    });
   });
   return /*#__PURE__*/_react.default.createElement("span", {
     onClick: handleClick,
-    style: {
+    style: next ? {
       color: 'var(--ant-primary-color)',
       cursor: 'pointer'
-    }
-  }, blockName, /*#__PURE__*/_react.default.createElement(_antd.Icon, {
+    } : {}
+  }, blockName || blockId, next && /*#__PURE__*/_react.default.createElement(_antd.Icon, {
     type: "setting",
     style: {
       marginLeft: 4

package/lib/lowcode/painter/panel-section/BlocksEditor/BlockEditorItem.js

@@ -18,12 +18,13 @@ var BlockEditorItem = function BlockEditorItem(_ref) {
     style = _ref.style,
     setActivatorNodeRef = _ref.setActivatorNodeRef,
     attributes = _ref.attributes,
-    listeners = _ref.listeners;
+    listeners = _ref.listeners,
+    draggable = _ref.draggable;
   return /*#__PURE__*/_react.default.createElement("div", {
     ref: setNodeRef,
     style: style
   }, /*#__PURE__*/_react.default.createElement(_Collapse.default, {
-    label: /*#__PURE__*/_react.default.createElement("div", null, /*#__PURE__*/_react.default.createElement("span", (0, _extends2.default)({
+    label: /*#__PURE__*/_react.default.createElement("div", null, draggable ? /*#__PURE__*/_react.default.createElement("span", (0, _extends2.default)({
       ref: setActivatorNodeRef
     }, attributes, listeners), /*#__PURE__*/_react.default.createElement("svg", {
       fill: "currentColor",
@@ -36,7 +37,7 @@ var BlockEditorItem = function BlockEditorItem(_ref) {
       }
     }, /*#__PURE__*/_react.default.createElement("path", {
       d: "M0.499972716,6 L1.50002728,6 C1.77615459,6 2,6.22384541 2,6.49997272 C2,6.77610002 1.77615459,6.99994543 1.50002728,6.99994543 L0.499972716,6.99994543 C0.22384541,6.99994543 3.38158422e-17,6.77610002 0,6.49997272 C-3.38158422e-17,6.22384541 0.22384541,6 0.499972716,6 Z M0.499972716,3 L1.50002728,3 C1.77615459,3 2,3.22384541 2,3.49997272 C2,3.77610002 1.77615459,3.99994543 1.50002728,3.99994543 L0.499972716,3.99994543 C0.22384541,3.99994543 3.38158422e-17,3.77610002 0,3.49997272 C-3.38158422e-17,3.22384541 0.22384541,3 0.499972716,3 Z M0.499972716,7.28787148e-18 L1.50002728,5.55666624e-14 C1.77615459,7.07214574e-14 2,0.22384541 2,0.499972716 C2,0.776100022 1.77615459,0.999945432 1.50002728,0.999945432 L0.499972716,0.999945432 C0.22384541,0.999945432 3.38158422e-17,0.776100022 0,0.499972716 C-3.38158422e-17,0.22384541 0.22384541,5.0723721e-17 0.499972716,0 Z M0.5,9.00002729 L1.5,9.00002729 C1.77614237,9.00002729 2,9.22388491 2,9.50002729 C2,9.77616966 1.77614237,10.0000273 1.5,10.0000273 L0.5,10.0000273 C0.223857625,10.0000273 3.38176876e-17,9.77616966 0,9.50002729 C-3.38176876e-17,9.22388491 0.223857625,9.00002729 0.5,9.00002729 Z M0.5,12.0000273 L1.5,12.0000273 C1.77614237,12.0000273 2,12.2238849 2,12.5000273 C2,12.7761697 1.77614237,13.0000273 1.5,13.0000273 L0.5,13.0000273 C0.223857625,13.0000273 3.38176876e-17,12.7761697 0,12.5000273 C-3.38176876e-17,12.2238849 0.223857625,12.0000273 0.5,12.0000273 Z M0.5,15.0000273 L1.5,15.0000273 C1.77614237,15.0000273 2,15.2238849 2,15.5000273 C2,15.7761697 1.77614237,16.0000273 1.5,16.0000273 L0.5,16.0000273 C0.223857625,16.0000273 3.38176876e-17,15.7761697 0,15.5000273 C-3.38176876e-17,15.2238849 0.223857625,15.0000273 0.5,15.0000273 Z M3.49997272,6 L4.50002728,6 C4.77615459,6 5,6.22384541 5,6.49997272 C5,6.77610002 4.77615459,6.99994543 4.50002728,6.99994543 L3.49997272,6.99994543 C3.22384541,6.99994543 3,6.77610002 3,6.49997272 C3,6.22384541 3.22384541,6 3.49997272,6 Z M3.49997272,3 L4.50002728,3 C4.77615459,3 5,3.22384541 5,3.49997272 C5,3.77610002 4.77615459,3.99994543 4.50002728,3.99994543 L3.49997272,3.99994543 C3.22384541,3.99994543 3,3.77610002 3,3.49997272 C3,3.22384541 3.22384541,3 3.49997272,3 Z M3.49997272,7.28787148e-18 L4.50002728,5.55666624e-14 C4.77615459,7.07214574e-14 5,0.22384541 5,0.499972716 C5,0.776100022 4.77615459,0.999945432 4.50002728,0.999945432 L3.49997272,0.999945432 C3.22384541,0.999945432 3,0.776100022 3,0.499972716 C3,0.22384541 3.22384541,5.0723721e-17 3.49997272,0 Z M3.5,9.00002729 L4.5,9.00002729 C4.77614237,9.00002729 5,9.22388491 5,9.50002729 C5,9.77616966 4.77614237,10.0000273 4.5,10.0000273 L3.5,10.0000273 C3.22385763,10.0000273 3,9.77616966 3,9.50002729 C3,9.22388491 3.22385763,9.00002729 3.5,9.00002729 Z M3.5,12.0000273 L4.5,12.0000273 C4.77614237,12.0000273 5,12.2238849 5,12.5000273 C5,12.7761697 4.77614237,13.0000273 4.5,13.0000273 L3.5,13.0000273 C3.22385763,13.0000273 3,12.7761697 3,12.5000273 C3,12.2238849 3.22385763,12.0000273 3.5,12.0000273 Z M3.5,15.0000273 L4.5,15.0000273 C4.77614237,15.0000273 5,15.2238849 5,15.5000273 C5,15.7761697 4.77614237,16.0000273 4.5,16.0000273 L3.5,16.0000273 C3.22385763,16.0000273 3,15.7761697 3,15.5000273 C3,15.2238849 3.22385763,15.0000273 3.5,15.0000273 Z"
-    }))), name),
+    }))) : null, name),
     extraRender: (0, _lodash.isNil)(onDelete) ? false : function () {
       return /*#__PURE__*/_react.default.createElement(_antd.Icon, {
         type: "delete",

package/lib/lowcode/painter/panel-section/BlocksEditor/index.js

@@ -5,6 +5,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
+var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _toArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toArray"));
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
@@ -66,13 +67,15 @@ var BlockEditor = function BlockEditor(_ref) {
     blocks = _ref2.props.blocks;
   var handleAddBlock = (0, _ahooks.useMemoizedFn)(function (type) {
     var _id = "block_".concat((0, _utils.suid)());
-    var newData = (0, _lodash.concat)(blocks, (0, _objectSpread2.default)({
+    var newData = (0, _lodash.concat)(blocks, (0, _objectSpread2.default)((0, _objectSpread2.default)({
       id: _id,
       name: _id,
       type: type,
       serialEffect: 'hidden',
       mode: ['add', 'update', 'edit', 'info']
-    }, _formPropsDefault.default.blockSettings[type]));
+    }, _formPropsDefault.default.blockSettings[type]), {}, {
+      order: blocks.length + 1
+    }));
     onChange(newData);
   });
   var handleDeleteBlock = (0, _ahooks.useMemoizedFn)(function (_id) {
@@ -94,12 +97,29 @@ var BlockEditor = function BlockEditor(_ref) {
         var newData = blocks.filter(function (val) {
           return val.id !== _id;
         });
-        onChange(newData);
+        onChange(newData.map(function (i, index) {
+          return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, i), {}, {
+            order: index + 1
+          });
+        }));
       }
     });
   });
   var handleSortBlock = (0, _ahooks.useMemoizedFn)(function (sortItems) {
-    console.log('sortItems', sortItems);
+    var _blocks = (0, _toArray2.default)(blocks),
+      mainForm = _blocks[0],
+      restForm = _blocks.slice(1);
+    var newRestForm = (0, _lodash.sortBy)(restForm, function (item) {
+      var index = sortItems.indexOf(item.id);
+      return index !== -1 ? index : Infinity;
+    });
+    var newData = [mainForm].concat((0, _toConsumableArray2.default)(newRestForm)).map(function (i, index) {
+      return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, i), {}, {
+        order: index + 1
+      });
+    });
+    console.log('newData', newData, sortItems);
+    onChange(newData);
   });
   var menu = (0, _ahooks.useCreation)(function () {
     return /*#__PURE__*/_react.default.createElement(_antd.Menu, {
@@ -136,7 +156,8 @@ var BlockEditor = function BlockEditor(_ref) {
   return mainForm ? /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_BlockEditorItem.default, {
     name: renderPanelItems([(0, _objectSpread2.default)((0, _objectSpread2.default)({}, specialProp), {}, {
       valueKey: "blocks[0].".concat(specialProp.key),
-      blockName: mainForm.name || mainForm.id,
+      blockName: mainForm.name,
+      blockId: mainForm.id,
       next: {
         name: specialProp.name,
         props: specialProp.next["_".concat(mainForm.type, "_props")].map(function (nextP) {
@@ -147,9 +168,13 @@ var BlockEditor = function BlockEditor(_ref) {
       }
     })])
   }, renderPanelItems(commonProps.map(function (p) {
-    return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, p), {}, {
-      disabled: (0, _lodash.includes)(['mode', 'serialEffect'], p.key) || p.disabled,
-      valueKey: "blocks[0].".concat(p.key)
+    var cloneP = (0, _lodash.cloneDeep)(p);
+    if (cloneP.key === 'dataset') {
+      cloneP.next.props[0].valueKey = "blocks[0].fields";
+    }
+    return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, cloneP), {}, {
+      disabled: (0, _lodash.includes)(['mode', 'serialEffect'], cloneP.key) || cloneP.disabled,
+      valueKey: "blocks[0].".concat(cloneP.key)
     });
   }))), /*#__PURE__*/_react.default.createElement(_SortBox.SortBox, {
     datas: restForm.map(function (_bk) {
@@ -157,16 +182,19 @@ var BlockEditor = function BlockEditor(_ref) {
     }),
     onChange: handleSortBlock
   }, restForm.map(function (blockItem, i) {
+    var _specialProp$next;
     return /*#__PURE__*/_react.default.createElement(_SortBox.SortItem, {
       key: blockItem.id,
       id: blockItem.id
     }, /*#__PURE__*/_react.default.createElement(_BlockEditorItem.default, {
+      draggable: true,
       name: renderPanelItems([(0, _objectSpread2.default)((0, _objectSpread2.default)({}, specialProp), {}, {
         valueKey: "blocks[".concat(i + 1, "].").concat(specialProp.key),
-        blockName: blockItem.name || blockItem.id,
+        blockName: blockItem.name,
+        blockId: blockItem.id,
         next: {
           name: specialProp.name,
-          props: specialProp.next["_".concat(blockItem.type, "_props")].map(function (nextP) {
+          props: (_specialProp$next = specialProp.next["_".concat(blockItem.type, "_props")]) === null || _specialProp$next === void 0 ? void 0 : _specialProp$next.map(function (nextP) {
             var _nextP$props;
             return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, nextP), {}, {
               valueKey: "blocks[".concat(i + 1, "].").concat(nextP.key),
@@ -183,9 +211,15 @@ var BlockEditor = function BlockEditor(_ref) {
         return handleDeleteBlock(blockItem.id);
       }
     }, renderPanelItems((0, _lodash.reduce)(commonProps, function (result, p) {
-      if (!(blockItem.type === 'uploadForm' && p.key === 'dataset')) result.push((0, _objectSpread2.default)((0, _objectSpread2.default)({}, p), {}, {
-        valueKey: "blocks[".concat(i + 1, "].").concat(p.key)
-      }));
+      var cloneP = (0, _lodash.cloneDeep)(p);
+      cloneP.valueKey = "blocks[".concat(i + 1, "].").concat(p.key);
+      if (p.key === 'dataset') {
+        if ((0, _lodash.includes)(['auto', 'grid', 'writer'], blockItem.type)) {
+          if (blockItem.type !== 'auto') cloneP.next.props[0].component = "table";
+          cloneP.next.props[0].valueKey = "blocks[".concat(i + 1, "].fields");
+          result.push(cloneP);
+        }
+      } else result.push(cloneP);
       return result;
     }, []))));
   })), /*#__PURE__*/_react.default.createElement("div", {

package/lib/lowcode/painter/panel-section/FieldsSetting.js

@@ -24,7 +24,7 @@ var _apiUrl = require("../../constants/api-url");
 var _helper = require("../../engine/tools/helper");
 var _fieldsSetting = _interopRequireDefault(require("../style/fields-setting.less"));
 var _I18N_PREFIX_ = 'luckda.lowcode.painter.panel-section.fieldsSetting';
-var _PICK_KEYS_ = ['uid', 'field', 'width', 'align', 'headerAlign', 'pinned', 'tip'];
+var _PICK_KEYS_ = ['id', 'uid', 'field', 'width', 'align', 'headerAlign', 'pinned', 'tip', 'col', 'row', 'note', 'placeholder'];
 var Header = _styledComponents.default.div.withConfig({
   displayName: "Header",
   componentId: "luckda-6530__sc-gcwvp1-0"
@@ -39,7 +39,7 @@ var FieldsSetting = function FieldsSetting(_ref) {
     datasetUid = _ref.datasetUid,
     nodeId = _ref.nodeId,
     defaultValue = _ref.defaultValue,
-    _onChange = _ref.onChange;
+    onChange = _ref.onChange;
   var ctx = (0, _ContextProvider.useContext)();
   var _useReducer = (0, _react.useReducer)(_helper.listReducer, []),
     _useReducer2 = (0, _slicedToArray2.default)(_useReducer, 2),
@@ -75,9 +75,12 @@ var FieldsSetting = function FieldsSetting(_ref) {
           list = _ref3.list,
           detail = _ref3.detail;
         if (code === 1) {
-          var _fields = (0, _lodash.unionBy)((0, _lodash.intersectionWith)(defaultValue, list, function (a, b) {
-            return a.uid === b;
-          }), list.map(function (id) {
+          var _fields = (0, _lodash.unionBy)((0, _lodash.reduce)(defaultValue, function (ret, _val) {
+            if (list.includes(_val.uid) || _val._type === 'divider') {
+              ret.push(_val);
+            }
+            return ret;
+          }, []), list.map(function (id) {
             var _fieldData = detail[id];
             var extraAttr = JSON.parse(_fieldData.extraAttr || '{}');
             var alignMapping = {
@@ -93,7 +96,7 @@ var FieldsSetting = function FieldsSetting(_ref) {
             };
           }), 'uid');
           if (!(0, _lodash.isEqual)(_fields, defaultValue)) {
-            _onChange(_fields);
+            onChange(_fields);
           }
           dispatch({
             type: 'init',
@@ -105,6 +108,11 @@ var FieldsSetting = function FieldsSetting(_ref) {
       }
     }),
     loading = _useRequest.loading;
+  var handleChange = (0, _ahooks.useMemoizedFn)(function (newFields) {
+    onChange(newFields.map(function (_fieldData) {
+      return _fieldData._type === 'divider' ? _fieldData : (0, _lodash.pick)(_fieldData, _PICK_KEYS_);
+    }));
+  });
   var _useRequest2 = (0, _ahooks.useRequest)(_apiUrl.fetchUpdateFieldAttrs, {
       manual: true
     }),
@@ -142,9 +150,7 @@ var FieldsSetting = function FieldsSetting(_ref) {
           var gridApi = ctx.componentMap.get(nodeId).api.self.ref.current.gridApi;
           gridApi.columnApi.moveColumnByIndex(fromIndex, toIndex);
         }
-        _onChange(newFields.map(function (_fieldData) {
-          return (0, _lodash.pick)(_fieldData, _PICK_KEYS_);
-        }));
+        handleChange(newFields);
       }
     });
   });
@@ -173,6 +179,23 @@ var FieldsSetting = function FieldsSetting(_ref) {
   var handleBatchSetting = (0, _ahooks.useMemoizedFn)(function () {
     setDrawerType('batch');
   });
+  var handleAddFormDivider = (0, _ahooks.useMemoizedFn)(function (index) {
+    var groupId = "group_".concat((0, _utils.suid)());
+    dispatch({
+      type: 'insert',
+      payload: {
+        index: index,
+        data: {
+          uid: groupId,
+          id: groupId,
+          field: 'divider',
+          fieldAliasName: 'Group',
+          _type: 'divider'
+        }
+      },
+      callback: handleChange
+    });
+  });
   var renderItemRight = (0, _ahooks.useMemoizedFn)(function (field) {
     return /*#__PURE__*/_react.default.createElement("div", {
       key: field.uid,
@@ -189,7 +212,7 @@ var FieldsSetting = function FieldsSetting(_ref) {
       onChange: function onChange(e) {
         return handleAliasChange(field, e.target.value);
       }
-    }), /*#__PURE__*/_react.default.createElement(_antd.Tooltip, {
+    }), field._type !== 'divider' && /*#__PURE__*/_react.default.createElement(_antd.Tooltip, {
       title: (0, _utils.formatMessage)({
         id: 'luckda.lowcode.painter.edit',
         label: '编辑'
@@ -244,22 +267,28 @@ var FieldsSetting = function FieldsSetting(_ref) {
     addBtnProps: {
       disabled: drawerType === 'batch'
     }
-  }, fields.map(function (field) {
+  }, fields.map(function (field, index) {
     return /*#__PURE__*/_react.default.createElement(_SortBox.SortItem, {
       key: field.uid,
       id: field.uid
     }, /*#__PURE__*/_react.default.createElement(_ListEditor.ListEditorItem, {
-      left: /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_antd.Checkbox, {
+      left: /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, field._type !== 'divider' ? /*#__PURE__*/_react.default.createElement(_antd.Checkbox, {
         disabled: drawerType === 'batch',
         data: field,
         onChange: handleFieldCheckChange
-      }), /*#__PURE__*/_react.default.createElement(FieldKey, {
+      }) : null, /*#__PURE__*/_react.default.createElement(FieldKey, {
         tooltip: true,
-        lines: 1
+        lines: 1,
+        style: field._type === 'divider' ? {
+          paddingLeft: 16
+        } : null
       }, field.field)),
       right: renderItemRight(field),
       item: field,
-      dispatch: dispatch
+      dispatch: dispatch,
+      onAddLine: component === 'form' ? function () {
+        return handleAddFormDivider(index);
+      } : false
     }));
   })))), !!drawerType ? /*#__PURE__*/_react.default.createElement(_antd.Drawer, {
     visible: true,
@@ -293,11 +322,7 @@ var FieldsSetting = function FieldsSetting(_ref) {
     datasetId: datasetUid,
     component: component,
     onAliasChange: handleAliasChange,
-    onChange: function onChange(newFields) {
-      return _onChange(newFields.map(function (_fieldData) {
-        return (0, _lodash.pick)(_fieldData, _PICK_KEYS_);
-      }));
-    }
+    onChange: handleChange
   }) : null, drawerType === 'batch' ? /*#__PURE__*/_react.default.createElement(_BatchSetting.default, {
     dispatch: dispatch,
     nodeId: nodeId,
@@ -306,11 +331,7 @@ var FieldsSetting = function FieldsSetting(_ref) {
     moduleId: pageinfo.relationship.moduleId,
     datasetId: datasetUid,
     component: component,
-    onChange: function onChange(newFields) {
-      return _onChange(newFields.map(function (_fieldData) {
-        return (0, _lodash.pick)(_fieldData, _PICK_KEYS_);
-      }));
-    }
+    onChange: handleChange
   }) : null) : null);
 };
 var _default = exports.default = FieldsSetting;

package/lib/lowcode/painter/panel-section/I18nInput.js

@@ -0,0 +1,27 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+var _react = _interopRequireDefault(require("react"));
+var _ahooks = require("ahooks");
+var _antd = require("luck-design/antd");
+var I18nInput = function I18nInput(_ref) {
+  var defaultValue = _ref.defaultValue,
+    onChange = _ref.onChange,
+    size = _ref.size;
+  var _useDebounceFn = (0, _ahooks.useDebounceFn)(onChange, {
+      wait: 400
+    }),
+    run = _useDebounceFn.run;
+  return /*#__PURE__*/_react.default.createElement(_antd.Input, {
+    defaultValue: defaultValue,
+    onChange: function onChange(e) {
+      return run(e.target.value);
+    },
+    size: size
+  });
+};
+var _default = exports.default = I18nInput;

package/lib/lowcode/painter/style/design.less

@@ -63,6 +63,11 @@
       color: #8c8c8c;
       background: #f1f2f3;
     }
+
+    .toolbar-item.disabled {
+      color: #d9d9d9;
+      cursor: not-allowed;
+    }
   }
 
   &-workspace {
@@ -77,9 +82,8 @@
 
   &-simulator {
     min-height: 100%;
-    height: auto;
     :global {
-      .ant-form-item, .resizer {
+      .ant-form-item, .ant-collapse-header, .resizer {
         pointer-events: none;
       }
       .luck-grid-table {