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

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,9 +5,9 @@ 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"));
 var _react = _interopRequireDefault(require("react"));
 var _ahooks = require("ahooks");
 var _antd = require("luck-design/antd");
@@ -55,24 +55,21 @@ var BlockEditor = function BlockEditor(_ref) {
     nodeId = _ref.nodeId,
     renderPanelItems = _ref.renderPanelItems,
     innerProps = _ref.innerProps;
-  var _usePageData = (0, _ContextProvider.usePageData)({
-      id: nodeId
-    }),
-    _usePageData2 = (0, _slicedToArray2.default)(_usePageData, 1),
-    node = _usePageData2[0];
-  var _ref2 = node || {
-      props: {}
-    },
-    blocks = _ref2.props.blocks;
+  var blocks = (0, _ContextProvider.useGet)({
+    id: nodeId,
+    path: '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,17 +91,33 @@ 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
+      });
+    });
+    onChange(newData);
   });
   var menu = (0, _ahooks.useCreation)(function () {
     return /*#__PURE__*/_react.default.createElement(_antd.Menu, {
-      onClick: function onClick(_ref3) {
-        var key = _ref3.key;
+      onClick: function onClick(_ref2) {
+        var key = _ref2.key;
         return handleAddBlock(key);
       }
     }, addOptions.map(function (opt) {
@@ -136,7 +149,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 +161,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.fieldsKey = '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 +175,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 +204,16 @@ 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.component = 'tableForm';
+          cloneP.fieldsKey = "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/ButtonType.js

@@ -12,10 +12,12 @@ var _antd = require("luck-design/antd");
 var _buttonType = _interopRequireDefault(require("../style/button-type.less"));
 var _excluded = ["onChange"];
 var ButtonType = function ButtonType(_ref) {
-  var onChange = _ref.onChange,
+  var _onChange = _ref.onChange,
     props = (0, _objectWithoutProperties2.default)(_ref, _excluded);
   return /*#__PURE__*/_react.default.createElement(_antd.Select, (0, _extends2.default)({}, props, {
-    onChange: onChange,
+    onChange: function onChange(val) {
+      return _onChange(val);
+    },
     className: _buttonType.default['lc-painter-panel-section-components-buttontype']
   }), /*#__PURE__*/_react.default.createElement(_antd.Select.Option, {
     value: "primary"

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

@@ -15,6 +15,7 @@ var _styledComponents = _interopRequireDefault(require("styled-components"));
 var _antd = require("luck-design/antd");
 var _ContextProvider = require("../../engine/provider/ContextProvider");
 var _apiUrl = require("../../constants/api-url");
+var _helper = require("../../engine/tools/helper");
 var Div = _styledComponents.default.div.withConfig({
   displayName: "Div",
   componentId: "luckda-6530__sc-onj9tc-0"
@@ -22,6 +23,9 @@ var Div = _styledComponents.default.div.withConfig({
 var DataSetSelector = function DataSetSelector(_ref) {
   var defaultValue = _ref.defaultValue,
     onChange = _ref.onChange,
+    _ref$fieldsKey = _ref.fieldsKey,
+    fieldsKey = _ref$fieldsKey === void 0 ? 'fields' : _ref$fieldsKey,
+    component = _ref.component,
     size = _ref.size,
     isTree = _ref.isTree,
     next = _ref.next;
@@ -37,8 +41,7 @@ var DataSetSelector = function DataSetSelector(_ref) {
     dataset = _useRemoteSource.dataset,
     fetchAllDatasetLoading = _useRemoteSource.fetchAllDatasetLoading,
     refreshModlueData = _useRemoteSource.refreshModlueData,
-    refreshDataset = _useRemoteSource.refreshDataset,
-    pageinfo = _useRemoteSource.pageinfo;
+    refreshDataset = _useRemoteSource.refreshDataset;
   var _useRequest = (0, _ahooks.useRequest)(_apiUrl.fetchAddDataset, {
       manual: true
     }),
@@ -52,12 +55,12 @@ var DataSetSelector = function DataSetSelector(_ref) {
   }, [dataset, isTree]);
   var handleChange = (0, _ahooks.useMemoizedFn)( /*#__PURE__*/function () {
     var _ref4 = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee(value, _ref3) {
-      var key, _pageinfo$relationshi, moduleId, dataModelKey, _yield$runAsync, code, res, _ds;
+      var key, _getLDMetaAttr, _getLDMetaAttr2, moduleId, dataModelKey, _yield$runAsync, code, res, _ds;
       return (0, _regeneratorRuntime2.default)().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
             key = _ref3.key;
-            _pageinfo$relationshi = pageinfo.relationship, moduleId = _pageinfo$relationshi.moduleId, dataModelKey = _pageinfo$relationshi.dataModelKey;
+            _getLDMetaAttr = (0, _helper.getLDMetaAttr)(['moduleId', 'dataModelKey']), _getLDMetaAttr2 = (0, _slicedToArray2.default)(_getLDMetaAttr, 2), moduleId = _getLDMetaAttr2[0], dataModelKey = _getLDMetaAttr2[1];
             _context.next = 4;
             return runAsync({
               uid: moduleId,
@@ -83,7 +86,26 @@ var DataSetSelector = function DataSetSelector(_ref) {
                 code: value,
                 uid: key
               };
-              onChange(_ds);
+              onChange(_ds, function (exe) {
+                var dsFields = res.data.dataSets[value];
+                exe(fieldsKey, dsFields.map(function (f) {
+                  var _extra = JSON.parse(f.extra || '{}');
+                  var restProps = {};
+                  if (['table', 'tableForm'].includes(component)) {
+                    var alignMapping = {
+                      0: 'left',
+                      1: 'center',
+                      2: 'right'
+                    };
+                    restProps.align = alignMapping[_extra.scell_alignment];
+                    restProps.headerAlign = alignMapping[_extra.sheading_alignment];
+                  }
+                  return {
+                    uid: f.uid,
+                    field: f.field
+                  };
+                }));
+              });
               setCurrentDataset(_ds);
             }
           case 11:
@@ -123,9 +145,10 @@ var DataSetSelector = function DataSetSelector(_ref) {
     disabled: !currentDataset,
     onClick: function onClick() {
       return next({
-        pageinfo: pageinfo,
         datasetUid: currentDataset.uid,
-        datasetCode: currentDataset.code
+        datasetCode: currentDataset.code,
+        valueKey: fieldsKey,
+        component: component
       });
     }
   }), /*#__PURE__*/_react.default.createElement(_antd.Button, {

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

@@ -1,11 +1,12 @@
 "use strict";
 
-var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard").default;
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
+var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard").default;
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
+var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _react = _interopRequireWildcard(require("react"));
@@ -23,8 +24,9 @@ var _BatchSetting = _interopRequireDefault(require("../components/field-setting/
 var _apiUrl = require("../../constants/api-url");
 var _helper = require("../../engine/tools/helper");
 var _fieldsSetting = _interopRequireDefault(require("../style/fields-setting.less"));
+var _excluded = ["fieldAliasName"];
 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', 'aliasName'];
 var Header = _styledComponents.default.div.withConfig({
   displayName: "Header",
   componentId: "luckda-6530__sc-gcwvp1-0"
@@ -35,11 +37,10 @@ var FieldKey = (0, _styledComponents.default)(_luckDesign.Ellipsis).withConfig({
 })(["width:80px;margin-left:4px;"]);
 var FieldsSetting = function FieldsSetting(_ref) {
   var component = _ref.component,
-    pageinfo = _ref.pageinfo,
     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),
@@ -54,46 +55,66 @@ var FieldsSetting = function FieldsSetting(_ref) {
     checkedFields = _useMap2[0],
     _useMap2$ = _useMap2[1],
     set = _useMap2$.set,
-    remove = _useMap2$.remove;
+    get = _useMap2$.get,
+    setAll = _useMap2$.setAll,
+    remove = _useMap2$.remove,
+    reset = _useMap2$.reset;
   var _useState3 = (0, _react.useState)(void 0),
     _useState4 = (0, _slicedToArray2.default)(_useState3, 2),
     drawerType = _useState4[0],
     setDrawerType = _useState4[1];
+  var _useState5 = (0, _react.useState)(false),
+    _useState6 = (0, _slicedToArray2.default)(_useState5, 2),
+    checkAll = _useState6[0],
+    setCheckAll = _useState6[1];
   var fieldData = (0, _ahooks.useCreation)(function () {
     return fields.find(function (_ref2) {
       var uid = _ref2.uid;
       return uid === fieldId;
     });
   }, [fieldId, fields]);
+  (0, _ahooks.useUpdateEffect)(function () {
+    if (checkedFields.size === fields.length) {
+      setCheckAll(true);
+    } else if (checkedFields.size === 0) {
+      setCheckAll(false);
+    }
+  }, [checkedFields, fields]);
   var _useRequest = (0, _ahooks.useRequest)(_apiUrl.fetchFieldsByDataset, {
       defaultParams: [{
         datasetUid: datasetUid,
-        moduleUid: pageinfo.relationship.moduleId
+        moduleUid: (0, _helper.getLDMetaAttr)('moduleId')
       }],
       onSuccess: function onSuccess(_ref3) {
         var code = _ref3.code,
           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 = {
-              0: 'left',
-              1: 'center',
-              2: 'right'
-            };
-            return {
+            var extra = JSON.parse(_fieldData.extra || '{}');
+            var restProps = {};
+            if (['table', 'tableForm'].includes(component)) {
+              var alignMapping = {
+                0: 'left',
+                1: 'center',
+                2: 'right'
+              };
+              restProps.align = alignMapping[extra.scell_alignment];
+              restProps.headerAlign = alignMapping[extra.sheading_alignment];
+            }
+            return (0, _objectSpread2.default)({
               uid: id,
-              field: detail[id].field,
-              align: alignMapping[extraAttr.scell_alignment],
-              headerAlign: alignMapping[extraAttr.sheading_alignment]
-            };
+              field: detail[id].field
+            }, restProps);
           }), 'uid');
           if (!(0, _lodash.isEqual)(_fields, defaultValue)) {
-            _onChange(_fields);
+            onChange(_fields);
           }
           dispatch({
             type: 'init',
@@ -105,14 +126,20 @@ 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
     }),
     runUpdateFieldAttrs = _useRequest2.runAsync;
   var _useDebounceFn = (0, _ahooks.useDebounceFn)(function (field, value) {
-      var _pageinfo$relationshi = pageinfo.relationship,
-        moduleId = _pageinfo$relationshi.moduleId,
-        dataModelKey = _pageinfo$relationshi.dataModelKey;
+      var _getLDMetaAttr = (0, _helper.getLDMetaAttr)(['moduleId', 'dataModelKey']),
+        _getLDMetaAttr2 = (0, _slicedToArray2.default)(_getLDMetaAttr, 2),
+        moduleId = _getLDMetaAttr2[0],
+        dataModelKey = _getLDMetaAttr2[1];
       runUpdateFieldAttrs({
         dataModelKey: dataModelKey,
         datasetBusinessUids: [field.uid],
@@ -127,6 +154,17 @@ var FieldsSetting = function FieldsSetting(_ref) {
           var col = gridApi.columnApi.getColumn(field.field);
           col.colDef.headerName = value;
           gridApi.api.refreshHeader();
+        } else if (['form', 'tableForm'].includes(component)) {
+          handleChange((0, _lodash.reduce)(fields, function (ret, _ref4) {
+            var fieldAliasName = _ref4.fieldAliasName,
+              _field = (0, _objectWithoutProperties2.default)(_ref4, _excluded);
+            if (fieldAliasName) {
+              ret.push((0, _objectSpread2.default)({
+                aliasName: fieldAliasName
+              }, _field));
+            }
+            return ret;
+          }, []));
         }
       });
     }, {
@@ -142,9 +180,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);
       }
     });
   });
@@ -170,9 +206,35 @@ var FieldsSetting = function FieldsSetting(_ref) {
       remove(data.uid, data);
     }
   });
+  var handleFieldCheckAll = (0, _ahooks.useMemoizedFn)(function (e) {
+    if (e.target.checked) {
+      setAll(fields.map(function (_field) {
+        return [_field.uid, _field];
+      }));
+    } else {
+      reset();
+    }
+  });
   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 +251,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: '编辑'
@@ -208,10 +270,18 @@ var FieldsSetting = function FieldsSetting(_ref) {
   });
   return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_antd.Spin, {
     spinning: loading
-  }, /*#__PURE__*/_react.default.createElement(Header, null, /*#__PURE__*/_react.default.createElement("div", {
+  }, /*#__PURE__*/_react.default.createElement(Header, null, /*#__PURE__*/_react.default.createElement(_antd.Checkbox, {
     style: {
-      width: 116,
-      paddingLeft: 40
+      marginLeft: 20
+    },
+    disabled: drawerType === 'batch',
+    checked: checkAll,
+    indeterminate: checkedFields.size > 0 && checkedFields.size !== fields.length,
+    onChange: handleFieldCheckAll
+  }), /*#__PURE__*/_react.default.createElement("div", {
+    style: {
+      width: 80,
+      paddingLeft: 4
     }
   }, (0, _utils.formatMessage)({
     id: "".concat(_I18N_PREFIX_, ".field"),
@@ -225,8 +295,8 @@ var FieldsSetting = function FieldsSetting(_ref) {
     id: "".concat(_I18N_PREFIX_, ".title"),
     label: '标题'
   }))), /*#__PURE__*/_react.default.createElement(_SortBox.SortBox, {
-    datas: fields.map(function (_ref4) {
-      var uid = _ref4.uid;
+    datas: fields.map(function (_ref5) {
+      var uid = _ref5.uid;
       return uid;
     }),
     onChange: handleSortChange
@@ -244,22 +314,29 @@ 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,
+        checked: !!get(field.uid),
         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,
@@ -288,29 +365,21 @@ var FieldsSetting = function FieldsSetting(_ref) {
     dispatch: dispatch,
     nodeId: nodeId,
     fieldData: fieldData,
-    dataModelKey: pageinfo.relationship.dataModelKey,
-    moduleId: pageinfo.relationship.moduleId,
+    dataModelKey: (0, _helper.getLDMetaAttr)('dataModelKey'),
+    moduleId: (0, _helper.getLDMetaAttr)('moduleId'),
     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,
     fieldsData: checkedFields,
-    dataModelKey: pageinfo.relationship.dataModelKey,
-    moduleId: pageinfo.relationship.moduleId,
+    dataModelKey: (0, _helper.getLDMetaAttr)('dataModelKey'),
+    moduleId: (0, _helper.getLDMetaAttr)('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;