@luck-design-biz/luckda 0.0.25-6 → 0.0.25-7

package/lib/lowcode/painter/DesignToolbar.js

@@ -33,15 +33,7 @@ var DesignToolbar = function DesignToolbar(_ref) {
   var location = (0, _umi.useLocation)();
   var editorRef = (0, _react.useRef)();
   var context = (0, _ContextProvider.useContext)();
-  var _usePageData = (0, _ContextProvider.usePageData)(),
-    _usePageData2 = (0, _slicedToArray2.default)(_usePageData, 2),
-    pageData = _usePageData2[0],
-    _usePageData2$ = _usePageData2[1],
-    setPageData = _usePageData2$.setPageData,
-    back = _usePageData2$.back,
-    forward = _usePageData2$.forward,
-    backLength = _usePageData2$.backLength,
-    forwardLength = _usePageData2$.forwardLength;
+  var pageData = (0, _ContextProvider.useGet)();
   var _ref2 = (0, _ContextProvider.useRemoteSource)() || {},
     pageinfo = _ref2.pageinfo;
   var _useState = (0, _react.useState)(null),
@@ -143,9 +135,10 @@ var DesignToolbar = function DesignToolbar(_ref) {
     var code = editorRef.current.editor.getValue();
     try {
       var data = JSON.parse(code);
-      setPageData(data);
+      (0, _ContextProvider.resetPageData)(data);
       setShow(false);
     } catch (e) {
+      console.error(e);
       _antd.message.warning((0, _utils.formatMessage)({
         id: 'luckda.lowcode.error.pagedata',
         label: '页面数据错误'
@@ -220,35 +213,6 @@ var DesignToolbar = function DesignToolbar(_ref) {
     type: "mobile"
   })), /*#__PURE__*/_react.default.createElement(_antd.Divider, {
     type: "vertical"
-  }), /*#__PURE__*/_react.default.createElement("span", {
-    className: (0, _classnames.default)(_design.default['toolbar-item'], (0, _defineProperty2.default)({}, _design.default.disabled, backLength < 1)),
-    onClick: function onClick() {
-      return backLength > 0 && back();
-    }
-  }, /*#__PURE__*/_react.default.createElement("svg", {
-    viewBox: "0 0 1024 1024",
-    width: "20",
-    height: "20",
-    fill: "currentColor",
-    style: {
-      transform: 'rotateY(180deg)'
-    }
-  }, /*#__PURE__*/_react.default.createElement("path", {
-    d: "M946.8 420L651.9 125.1c-19.5-19.5-52.7-5.7-52.7 21.8v174c-79.3-1.8-501.8 14.9-532.3 569.6-0.9 17.2 22.1 24.3 30.6 9.3C255 621 396.6 553.3 599.1 561.5v175.2c0 27.5 33.3 41.3 52.8 21.9l294.8-294.9c12.1-12.1 12.1-31.6 0.1-43.7z"
-  }))), /*#__PURE__*/_react.default.createElement("span", {
-    className: (0, _classnames.default)(_design.default['toolbar-item'], (0, _defineProperty2.default)({}, _design.default.disabled, forwardLength < 1)),
-    onClick: function onClick() {
-      return forwardLength > 0 && forward();
-    }
-  }, /*#__PURE__*/_react.default.createElement("svg", {
-    viewBox: "0 0 1024 1024",
-    width: "20",
-    height: "20",
-    fill: "currentColor"
-  }, /*#__PURE__*/_react.default.createElement("path", {
-    d: "M946.8 420L651.9 125.1c-19.5-19.5-52.7-5.7-52.7 21.8v174c-79.3-1.8-501.8 14.9-532.3 569.6-0.9 17.2 22.1 24.3 30.6 9.3C255 621 396.6 553.3 599.1 561.5v175.2c0 27.5 33.3 41.3 52.8 21.9l294.8-294.9c12.1-12.1 12.1-31.6 0.1-43.7z"
-  }))), /*#__PURE__*/_react.default.createElement(_antd.Divider, {
-    type: "vertical"
   }), /*#__PURE__*/_react.default.createElement("span", {
     style: {
       width: 'auto',
@@ -320,15 +284,15 @@ var DesignToolbar = function DesignToolbar(_ref) {
       return document.getElementById('lc-design-workspace');
     },
     zIndex: 3000,
-    bodyStyle: {
-      height: '70vh'
-    },
     onOk: handleOk,
     onCancel: function onCancel() {
       return setShow(false);
     }
   }, /*#__PURE__*/_react.default.createElement(_JsonEditor.default, {
-    ref: editorRef
+    ref: editorRef,
+    style: {
+      height: '70vh'
+    }
   }, JSON.stringify(pageData, null, '\t'))), /*#__PURE__*/_react.default.createElement(_antd.Drawer, {
     title: /*#__PURE__*/_react.default.createElement("div", {
       id: "preview-drawer-header",

package/lib/lowcode/painter/Outline.js

@@ -27,9 +27,7 @@ var Outline = function Outline(_ref) {
   var open = _ref.open;
   var clickBySelf = (0, _react.useRef)(false);
   var ctx = (0, _ContextProvider.useContext)();
-  var _usePageData = (0, _ContextProvider.usePageData)(),
-    _usePageData2 = (0, _slicedToArray2.default)(_usePageData, 1),
-    pageData = _usePageData2[0];
+  var pageData = (0, _ContextProvider.useGet)();
   var _useState = (0, _react.useState)(null),
     _useState2 = (0, _slicedToArray2.default)(_useState, 2),
     pageAndModal = _useState2[0],

package/lib/lowcode/painter/Panel.js

@@ -19,7 +19,6 @@ var _ContextProvider = require("../engine/provider/ContextProvider");
 var _AttrsPanel = _interopRequireDefault(require("./components/AttrsPanel"));
 var _StylePanel = _interopRequireDefault(require("./panel-section/StylePanel"));
 var _AdvancePanel = _interopRequireDefault(require("./components/AdvancePanel"));
-var _dataProcess = require("../engine/tools/dataProcess");
 var _panel = _interopRequireDefault(require("./style/panel.less"));
 var _constants = require("../constants");
 var _I18N_PREFIX_ = 'luckda.lowcode.painter.panel';
@@ -54,10 +53,7 @@ var Panel = function Panel() {
     activeTabKey = _useState4[0],
     setActiveTabKey = _useState4[1];
   var context = (0, _ContextProvider.useContext)();
-  var _usePageData = (0, _ContextProvider.usePageData)(),
-    _usePageData2 = (0, _slicedToArray2.default)(_usePageData, 2),
-    pageData = _usePageData2[0],
-    setPageData = _usePageData2[1].setPageData;
+  var task = (0, _ContextProvider.useTask)('modify');
   var meta = (0, _ahooks.useCreation)(function () {
     try {
       return (0, _lodash.isNil)(activeNode) ? null : require("../engine/meta/".concat(activeNode.node.component.toLowerCase(), ".props.json"));
@@ -65,38 +61,41 @@ var Panel = function Panel() {
       return null;
     }
   }, [activeNode]);
-  var handleChange = (0, _ahooks.useMemoizedFn)(function (field, value, repositioning) {
+  var handleChange = (0, _ahooks.useMemoizedFn)(function (field, value) {
+    var _ref = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {},
+      repositioning = _ref.repositioning,
+      before = _ref.before;
     if (field === 'enableHeader') {
       if (value) {
         var headerMeta = require("../engine/meta/pageheader.props.default.json");
-        (0, _dataProcess.add)(pageData, _constants.LC_BUILDIN_UNIT_KEY.PAGE_ROOT, _constants.LC_BUILDIN_UNIT_KEY.PAGE_HEADER, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, headerMeta), {}, {
+        (0, _ContextProvider.addNode)(_constants.LC_BUILDIN_UNIT_KEY.PAGE_ROOT, _constants.LC_BUILDIN_UNIT_KEY.PAGE_HEADER, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, headerMeta), {}, {
           buildIn: true
         }));
       } else {
-        (0, _dataProcess.deleteById)(pageData, _constants.LC_BUILDIN_UNIT_KEY.PAGE_HEADER);
+        (0, _ContextProvider.deleteNode)(_constants.LC_BUILDIN_UNIT_KEY.PAGE_HEADER);
       }
     } else if (field === 'enableFooter') {
       if (value) {
         var footerMeta = require("../engine/meta/pagefooter.props.default.json");
-        (0, _dataProcess.add)(pageData, _constants.LC_BUILDIN_UNIT_KEY.PAGE_ROOT, _constants.LC_BUILDIN_UNIT_KEY.PAGE_FOOTER, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, footerMeta), {}, {
+        (0, _ContextProvider.addNode)(_constants.LC_BUILDIN_UNIT_KEY.PAGE_ROOT, _constants.LC_BUILDIN_UNIT_KEY.PAGE_FOOTER, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, footerMeta), {}, {
           buildIn: true
         }));
       } else {
-        (0, _dataProcess.deleteById)(pageData, _constants.LC_BUILDIN_UNIT_KEY.PAGE_FOOTER);
+        (0, _ContextProvider.deleteNode)(_constants.LC_BUILDIN_UNIT_KEY.PAGE_FOOTER);
       }
     }
     var component = context.componentMap.get(activeNode.node.id);
-    var _component$api$getSel = component.api.getSelfAndParentLCData(),
-      node = _component$api$getSel.node;
+    var node = component.api.getSelfData();
     var oldValue = (0, _defineProperty2.default)({}, field, (0, _lodash.get)(node.props, field));
-    var newNodeData = (0, _lodash.set)(node.props, field, value);
-    (0, _dataProcess.modifyById)(pageData, activeNode.node.id, newNodeData);
-    setPageData(pageData).then(function (newData) {
+    var newValue = (0, _defineProperty2.default)({}, field, value);
+    if (before) {
+      before(handleChange);
+    }
+    task(activeNode.node.id, newValue).then(function (a, b) {
       context.$publisher(context.topics.COMPONENT_MODIFY, {
         id: activeNode.node.id,
-        pageData: newData,
         oldValue: oldValue,
-        newValue: (0, _defineProperty2.default)({}, field, value)
+        newValue: newValue
       });
       if (repositioning) context.$publisher(context.topics.COMPONENT_REPOSITIONING, {
         id: activeNode.node.id
@@ -111,8 +110,7 @@ var Panel = function Panel() {
         return;
       }
       var component = context.componentMap.get(payload.id);
-      var _component$api$getSel2 = component.api.getSelfAndParentLCData(),
-        node = _component$api$getSel2.node;
+      var node = component.api.getSelfData();
       var levelNodes = (0, _lodash.takeRight)(component.api.getLevelNodes(), 4);
       setActiveNode({
         node: node.props,
@@ -135,9 +133,9 @@ var Panel = function Panel() {
     style: {
       fontSize: 12
     }
-  }, activeNode === null || activeNode === void 0 ? void 0 : activeNode.level.map(function (_ref) {
-    var id = _ref.id,
-      name = _ref.name;
+  }, activeNode === null || activeNode === void 0 ? void 0 : activeNode.level.map(function (_ref2) {
+    var id = _ref2.id,
+      name = _ref2.name;
     return /*#__PURE__*/_react.default.createElement(_antd.Breadcrumb.Item, {
       key: id,
       className: (0, _classnames.default)((0, _defineProperty2.default)({}, _panel.default['active-node-level'], id !== activeNode.node.id)),
@@ -184,17 +182,20 @@ var Panel = function Panel() {
     ref: underLineRef,
     className: _panel.default.underline
   })), activeTabKey === _TAB_LIST_[0].key && /*#__PURE__*/_react.default.createElement(_AttrsPanel.default, {
+    key: activeNode === null || activeNode === void 0 ? void 0 : activeNode.node.id,
     meta: meta,
     value: activeNode === null || activeNode === void 0 ? void 0 : activeNode.node,
-    onChange: function onChange(field, value, repositioning) {
-      return handleChange(field, value, repositioning);
+    onChange: function onChange(field, value, params) {
+      return handleChange(field, value, params);
     }
   }), activeTabKey === _TAB_LIST_[1].key && /*#__PURE__*/_react.default.createElement(_StylePanel.default, {
+    key: activeNode === null || activeNode === void 0 ? void 0 : activeNode.node.id,
     value: activeNode === null || activeNode === void 0 ? void 0 : activeNode.node.css,
     onChange: function onChange(_, newCss) {
       return handleChange('css', newCss);
     }
   }), activeTabKey === _TAB_LIST_[2].key && /*#__PURE__*/_react.default.createElement(_AdvancePanel.default, {
+    key: activeNode === null || activeNode === void 0 ? void 0 : activeNode.node.id,
     meta: meta,
     value: activeNode === null || activeNode === void 0 ? void 0 : activeNode.node.advance,
     onChange: function onChange(val) {

package/lib/lowcode/painter/components/ActionBindModal.js

@@ -7,7 +7,6 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _react = _interopRequireWildcard(require("react"));
 var _ahooks = require("ahooks");
@@ -17,7 +16,6 @@ var _lodash = require("lodash");
 var _utils = require("@luck-design-biz/base/utils");
 var _ContextProvider = require("../../engine/provider/ContextProvider");
 var _JSEditor = _interopRequireDefault(require("./code-editor/JSEditor"));
-var _JsonEditor = _interopRequireDefault(require("./code-editor/JsonEditor"));
 var _actionBindModal = _interopRequireDefault(require("../style/action-bind-modal.less"));
 var _I18N_PREFIX_ = 'luckda.lowcode.painter.actionBindModal';
 var _ACTION_CATEGORY_ = [{
@@ -39,7 +37,7 @@ var _ACTION_CATEGORY_ = [{
     label: '自定义动作'
   })
 }];
-var _DEFAULT_JSON_CODE_ = '{"datasetCode": "","params":{},"body":{}}';
+var _DEFAULT_JSON_CODE_ = '{"params":{},"data":{}}';
 var _DEFAULT_JS_CODE_ = 'function todo() {\n\n}';
 var ActionBindModal = function ActionBindModal(_ref) {
   var event = _ref.event,
@@ -89,7 +87,7 @@ var ActionBindModal = function ActionBindModal(_ref) {
           target = _ref3[1];
         ret.push({
           key: key,
-          label: "".concat(target.api.getSelfAndParentLCData().node.props.name, "(").concat(key, ")")
+          label: "".concat(target.api.getSelfData().props.name, "(").concat(key, ")")
         });
         return ret;
       }, []);
@@ -125,9 +123,7 @@ var ActionBindModal = function ActionBindModal(_ref) {
     if (actionPool.has(key)) {
       action = get(key);
     } else {
-      var code = category === 'custom' ? event.func || defaultCode : JSON.stringify((0, _objectSpread2.default)({
-        moduleCode: module.moduleCode
-      }, JSON.parse(_DEFAULT_JSON_CODE_)), null, '\t');
+      var code = event.func || (category === 'custom' ? defaultCode : "".concat(defaultCode.slice(0, -1), "\n\treturn ").concat(_DEFAULT_JSON_CODE_, " \n}"));
       action = {
         category: category,
         key: key,
@@ -141,9 +137,7 @@ var ActionBindModal = function ActionBindModal(_ref) {
       if (activeKey !== key) {
         setActiveKey(key);
       }
-      var code = category === 'custom' ? event.func || defaultCode : JSON.stringify((0, _objectSpread2.default)({
-        moduleCode: module.moduleCode
-      }, JSON.parse(_DEFAULT_JSON_CODE_)), null, '\t');
+      var code = event.func || (category === 'custom' ? defaultCode : "".concat(defaultCode.slice(0, -1), "\n\treturn ").concat(_DEFAULT_JSON_CODE_, " \n}"));
       set(key, {
         category: category,
         key: key,
@@ -278,7 +272,7 @@ var ActionBindModal = function ActionBindModal(_ref) {
     type: "exclamation-circle"
   }))), /*#__PURE__*/_react.default.createElement("div", {
     className: _actionBindModal.default['code-box']
-  }, activeKey ? /*#__PURE__*/_react.default.createElement(_JsonEditor.default, {
+  }, activeKey ? /*#__PURE__*/_react.default.createElement(_JSEditor.default, {
     ref: editorRef,
     onChange: handleEditorValueChange.current
   }) : (0, _utils.formatMessage)({

package/lib/lowcode/painter/components/AttrsPanel.js

@@ -35,9 +35,14 @@ var AttrsPanel = function AttrsPanel(_ref) {
     setTrue = _useBoolean2$.setTrue,
     setFalse = _useBoolean2$.setFalse;
   var context = (0, _ContextProvider.useContext)();
-  var handleChange = (0, _ahooks.useMemoizedFn)(function (field, val, repositioning) {
+  var handleChange = (0, _ahooks.useMemoizedFn)(function (field, val, _ref2) {
     var _nextRef$current;
-    onChange(field, val, repositioning);
+    var repositioning = _ref2.repositioning,
+      before = _ref2.before;
+    onChange(field, val, {
+      repositioning: repositioning,
+      before: before
+    });
     if ((_nextRef$current = nextRef.current) !== null && _nextRef$current !== void 0 && _nextRef$current.autoClose) {
       setFalse();
     }
@@ -52,21 +57,20 @@ var AttrsPanel = function AttrsPanel(_ref) {
     setTrue();
   });
   var renderPanelItems = (0, _ahooks.useMemoizedFn)(function (items, dynamicProps) {
-    var _context$componentMap = context.componentMap.get(value.id).api.getSelfAndParentLCData(),
-      node = _context$componentMap.node;
-    return items.map(function (_ref2) {
-      var type = _ref2.type,
-        key = _ref2.key,
-        valueKey = _ref2.valueKey,
-        name = _ref2.name,
-        desc = _ref2.desc,
-        defaultValue = _ref2.default,
-        props = _ref2.props,
-        wrapper = _ref2.wrapper,
-        wrapperProps = _ref2.wrapperProps,
-        next = _ref2.next,
-        repositioning = _ref2.repositioning,
-        rest = (0, _objectWithoutProperties2.default)(_ref2, _excluded);
+    var node = context.componentMap.get(value.id).api.getSelfData();
+    return items.map(function (_ref3) {
+      var type = _ref3.type,
+        key = _ref3.key,
+        valueKey = _ref3.valueKey,
+        name = _ref3.name,
+        desc = _ref3.desc,
+        defaultValue = _ref3.default,
+        props = _ref3.props,
+        wrapper = _ref3.wrapper,
+        wrapperProps = _ref3.wrapperProps,
+        next = _ref3.next,
+        repositioning = _ref3.repositioning,
+        rest = (0, _objectWithoutProperties2.default)(_ref3, _excluded);
       var Comp = factory.current.getPanelItemFor((0, _lodash.startsWith)(type, '_') ? 'dynamic' : type, type);
       if (type === 'group') {
         return /*#__PURE__*/_react.default.createElement(Comp, {
@@ -89,8 +93,11 @@ var AttrsPanel = function AttrsPanel(_ref) {
         next: next !== null && next !== void 0 && next.props ? function (_dp) {
           return goNext(next, _dp);
         } : null,
-        onChange: function onChange(val) {
-          return handleChange(valueKey || key, val, repositioning);
+        onChange: function onChange(val, before) {
+          return handleChange(valueKey || key, val, {
+            repositioning: repositioning,
+            before: before
+          });
         },
         size: "small",
         settings: node.props,

package/lib/lowcode/painter/components/DragDrop/DragDropContext.js

@@ -70,7 +70,7 @@ function _default(_ref) {
 }
 function pubEvent(event, eventName, ctx) {
   if (event.active && event.over && event.active.data.current.id !== event.over.data.current.id) {
-    var parentNode = ctx.componentMap.get(event.over.data.current.id).api.getSelfAndParentLCData().parent;
+    var parentNode = ctx.componentMap.get(event.over.data.current.id).api.getSelfAndParentData().parent;
 
     // console.log('event.over.data.current.type', event.over.data.current.type)
     var actionSide = getAction(event.over.data.current.type, event.over.data.current.component.component, event.active.rect.current.translated, event.over.rect, parentNode);

package/lib/lowcode/painter/components/code-editor/BaseEditor.js

@@ -11,7 +11,7 @@ var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/obje
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 var _react = _interopRequireWildcard(require("react"));
 var monaco = _interopRequireWildcard(require("monaco-editor"));
-var _excluded = ["onChange", "isFullscreen"],
+var _excluded = ["onChange", "isFullscreen", "style"],
   _excluded2 = ["children", "language", "options"];
 /**
  * BaseEditor 组件是一个封装了 monaco 编辑器的 React 组件，支持前向 ref 引用。
@@ -49,6 +49,7 @@ var _excluded = ["onChange", "isFullscreen"],
 var BaseEditor = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref) {
   var onChange = _ref.onChange,
     isFullscreen = _ref.isFullscreen,
+    style = _ref.style,
     props = (0, _objectWithoutProperties2.default)(_ref, _excluded);
   var children = props.children,
     _props$language = props.language,
@@ -109,7 +110,7 @@ var BaseEditor = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref) {
   };
   return /*#__PURE__*/_react.default.createElement("div", (0, _extends2.default)({
     ref: editorRef,
-    style: editorStyle
+    style: (0, _objectSpread2.default)((0, _objectSpread2.default)({}, editorStyle), style)
   }, rest));
 });
 var _default = exports.default = /*#__PURE__*/_react.default.memo(BaseEditor);

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

@@ -191,7 +191,7 @@ var SettingUI = function SettingUI(_ref) {
     onChange: function onChange(e) {
       return onAliasChange(fieldData, e.target.value);
     }
-  })) : null, component === 'table' && /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_PanelItem.default, {
+  })) : null, (component === 'table' || component === 'tableForm') && /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_PanelItem.default, {
     label: (0, _utils.formatMessage)({
       id: "".concat(_I18N_PREFIX_, ".width"),
       label: '列宽'
@@ -293,8 +293,8 @@ var SettingUI = function SettingUI(_ref) {
     })
   }, /*#__PURE__*/_react.default.createElement(_antd.Input, {
     defaultValue: fieldData.note,
-    onChange: function onChange(val) {
-      return runDebounce('note', val);
+    onChange: function onChange(e) {
+      return runDebounce('note', e.target.value);
     },
     size: "small"
   })), /*#__PURE__*/_react.default.createElement(_PanelItem.default, {
@@ -304,8 +304,8 @@ var SettingUI = function SettingUI(_ref) {
     })
   }, /*#__PURE__*/_react.default.createElement(_antd.Input, {
     defaultValue: fieldData.tip,
-    onChange: function onChange(val) {
-      return runDebounce('tip', val);
+    onChange: function onChange(e) {
+      return runDebounce('tip', e.target.value);
     },
     size: "small"
   })), /*#__PURE__*/_react.default.createElement(_PanelItem.default, {
@@ -315,8 +315,8 @@ var SettingUI = function SettingUI(_ref) {
     })
   }, /*#__PURE__*/_react.default.createElement(_antd.Input, {
     defaultValue: fieldData.placeholder,
-    onChange: function onChange(val) {
-      return runDebounce('placeholder', val);
+    onChange: function onChange(e) {
+      return runDebounce('placeholder', e.target.value);
     },
     size: "small"
   }))), !isBatch ? /*#__PURE__*/_react.default.createElement(_PanelItem.default, {

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

@@ -8,7 +8,6 @@ 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");
@@ -56,11 +55,9 @@ 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 node = (0, _ContextProvider.useGet)({
+    id: nodeId
+  });
   var _ref2 = node || {
       props: {}
     },
@@ -118,7 +115,6 @@ var BlockEditor = function BlockEditor(_ref) {
         order: index + 1
       });
     });
-    console.log('newData', newData, sortItems);
     onChange(newData);
   });
   var menu = (0, _ahooks.useCreation)(function () {
@@ -170,7 +166,9 @@ var BlockEditor = function BlockEditor(_ref) {
   }, renderPanelItems(commonProps.map(function (p) {
     var cloneP = (0, _lodash.cloneDeep)(p);
     if (cloneP.key === 'dataset') {
-      cloneP.next.props[0].valueKey = "blocks[0].fields";
+      var _valueKey = 'blocks[0].fields';
+      cloneP.next.props[0].valueKey = _valueKey;
+      cloneP.beforeChangeKey = _valueKey;
     }
     return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, cloneP), {}, {
       disabled: (0, _lodash.includes)(['mode', 'serialEffect'], cloneP.key) || cloneP.disabled,
@@ -215,8 +213,10 @@ var BlockEditor = function BlockEditor(_ref) {
       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");
+          if (blockItem.type !== 'auto') cloneP.next.props[0].component = "tableForm";
+          var _valueKey = "blocks[".concat(i + 1, "].fields");
+          cloneP.next.props[0].valueKey = _valueKey;
+          cloneP.beforeChangeKey = _valueKey;
           result.push(cloneP);
         }
       } else result.push(cloneP);

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

@@ -22,6 +22,7 @@ var Div = _styledComponents.default.div.withConfig({
 var DataSetSelector = function DataSetSelector(_ref) {
   var defaultValue = _ref.defaultValue,
     onChange = _ref.onChange,
+    beforeChangeKey = _ref.beforeChangeKey,
     size = _ref.size,
     isTree = _ref.isTree,
     next = _ref.next;
@@ -83,7 +84,9 @@ var DataSetSelector = function DataSetSelector(_ref) {
                 code: value,
                 uid: key
               };
-              onChange(_ds);
+              onChange(_ds, function (_beforeChange) {
+                return _beforeChange(beforeChangeKey, []);
+              });
               setCurrentDataset(_ds);
             }
           case 11:

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_ = ['id', 'uid', 'field', 'width', 'align', 'headerAlign', 'pinned', 'tip', 'col', 'row', 'note', 'placeholder'];
+var _PICK_KEYS_ = ['id', 'uid', 'field', 'width', 'align', 'headerAlign', 'pinned', 'tip', 'col', 'row', 'note', 'placeholder', 'fieldAliasName'];
 var Header = _styledComponents.default.div.withConfig({
   displayName: "Header",
   componentId: "luckda-6530__sc-gcwvp1-0"
@@ -135,6 +135,10 @@ var FieldsSetting = function FieldsSetting(_ref) {
           var col = gridApi.columnApi.getColumn(field.field);
           col.colDef.headerName = value;
           gridApi.api.refreshHeader();
+        } else if (component === 'form') {
+          handleChange(fields);
+        } else if (component === 'tableForm') {
+          handleChange(fields);
         }
       });
     }, {

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

@@ -15,7 +15,7 @@ var Div = _styledComponents.default.div.withConfig({
 })(["display:flex;align-items:center;"]);
 var SerialsSelector = function SerialsSelector(_ref) {
   var defaultValue = _ref.defaultValue,
-    onChange = _ref.onChange,
+    _onChange = _ref.onChange,
     size = _ref.size;
   var _useRemoteSource = (0, _ContextProvider.useRemoteSource)(),
     serials = _useRemoteSource.serials,
@@ -25,7 +25,9 @@ var SerialsSelector = function SerialsSelector(_ref) {
     defaultValue: defaultValue,
     size: size,
     allowClear: true,
-    onChange: onChange,
+    onChange: function onChange(val) {
+      return _onChange(val);
+    },
     getPopupContainer: function getPopupContainer() {
       return document.getElementById('lc-design-workspace');
     },

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

@@ -63,8 +63,8 @@ var TreeRootEditor = function TreeRootEditor(_ref) {
     }
   }))), /*#__PURE__*/_react.default.createElement(_antd.Tooltip, {
     title: (0, _utils.formatMessage)({
-      id: 'luckda.lowcode.painter.edit',
-      label: '编辑'
+      id: 'luckda.lowcode.painter.bind',
+      label: '绑定动作'
     })
   }, /*#__PURE__*/_react.default.createElement(_antd.Icon, {
     type: "paper-clip",

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

@@ -123,7 +123,7 @@
         .selector-item();
       }
 
-      :local {
+      :global {
         .instance-node-selector {
           padding: 0 6px;
           margin-right: 3px;

package/lib/lowcode/painter/style/panel-item.less

@@ -32,7 +32,7 @@
     }
 
     /* 使.item-component-box的直接子元素铺满 */
-    .item-component > *:not(.ant-switch) {
+    .item-component > *:not(:global(.ant-switch)) {
       flex-grow: 1;
     }
     .panel-pointer {

package/lib/lowcode/view/Canvas.js

@@ -25,12 +25,11 @@ var PageRoot = _styledComponents.default.div.withConfig({
 });
 var Canvas = function Canvas(_ref) {
   var className = _ref.className;
-  var _usePageData = (0, _ContextProvider.usePageData)(['props.css', 'props.enableHeader', 'props.enableFooter']),
-    _usePageData2 = (0, _slicedToArray2.default)(_usePageData, 1),
-    _usePageData2$ = (0, _slicedToArray2.default)(_usePageData2[0], 3),
-    pagerootCss = _usePageData2$[0],
-    enableHeader = _usePageData2$[1],
-    enableFooter = _usePageData2$[2];
+  var _useGet = (0, _ContextProvider.useGet)(['props.css', 'props.enableHeader', 'props.enableFooter']),
+    _useGet2 = (0, _slicedToArray2.default)(_useGet, 3),
+    pagerootCss = _useGet2[0],
+    enableHeader = _useGet2[1],
+    enableFooter = _useGet2[2];
   return /*#__PURE__*/_react.default.createElement(PageRoot, {
     id: "page-canvas",
     className: (0, _classnames.default)(_canvas.default['lc-view-canvas'], (0, _defineProperty2.default)({}, className, !!className)),

package/lib/lowcode/view/Page.js

@@ -31,8 +31,7 @@ var LCPage = /*#__PURE__*/(0, _react.forwardRef)(function (_ref2, ref) {
   var _ref = (0, _react.useRef)(null);
   var _rootRef = ref || _ref;
   var _useRemoteSource = (0, _ContextProvider.useRemoteSource)(),
-    loading = _useRemoteSource.loading,
-    pageData = _useRemoteSource.pageData;
+    loading = _useRemoteSource.loading;
   var getTargetDom = (0, _ahooks.useMemoizedFn)(function () {
     return _rootRef.current;
   });
@@ -42,6 +41,6 @@ var LCPage = /*#__PURE__*/(0, _react.forwardRef)(function (_ref2, ref) {
   }, /*#__PURE__*/_react.default.createElement("div", (0, _extends2.default)({
     ref: _rootRef,
     className: (0, _classnames.default)(_page.default['lc-view-page'], (0, _defineProperty2.default)((0, _defineProperty2.default)({}, _page.default.isloading, loading), className, !!className))
-  }, props), (0, _lodash.isNil)(pageData) ? null : /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_Canvas.default, null), loading ? /*#__PURE__*/_react.default.createElement(Masker, null, /*#__PURE__*/_react.default.createElement(_Loading.default, null)) : null)));
+  }, props), /*#__PURE__*/_react.default.createElement(_Canvas.default, null), loading ? /*#__PURE__*/_react.default.createElement(Masker, null, /*#__PURE__*/_react.default.createElement(_Loading.default, null)) : null));
 });
 var _default = exports.default = LCPage;