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

package/es/lowcode/view/Page.js

@@ -23,8 +23,7 @@ var LCPage = /*#__PURE__*/forwardRef(function (_ref2, ref) {
   var _ref = useRef(null);
   var _rootRef = ref || _ref;
   var _useRemoteSource = useRemoteSource(),
-    loading = _useRemoteSource.loading,
-    pageData = _useRemoteSource.pageData;
+    loading = _useRemoteSource.loading;
   var getTargetDom = useMemoizedFn(function () {
     return _rootRef.current;
   });
@@ -34,6 +33,6 @@ var LCPage = /*#__PURE__*/forwardRef(function (_ref2, ref) {
   }, /*#__PURE__*/React.createElement("div", _extends({
     ref: _rootRef,
     className: classNames(styles['lc-view-page'], _defineProperty(_defineProperty({}, styles.isloading, loading), className, !!className))
-  }, props), isNil(pageData) ? null : /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Canvas, null), loading ? /*#__PURE__*/React.createElement(Masker, null, /*#__PURE__*/React.createElement(Loading, null)) : null)));
+  }, props), /*#__PURE__*/React.createElement(Canvas, null), loading ? /*#__PURE__*/React.createElement(Masker, null, /*#__PURE__*/React.createElement(Loading, null)) : null));
 });
 export default LCPage;

package/es/lowcode/view/lc-components/Dialog/FunctionDesign.js

@@ -1,15 +1,13 @@
 import _extends from "@babel/runtime/helpers/esm/extends";
 import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
-import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
 var _excluded = ["id", "children", "className"];
 import React from 'react';
 import { useCreation } from 'ahooks';
 import Index from "./index";
 import { suid } from '@luck-design-biz/base/utils';
-import { useContext, usePageData } from "../../../engine/provider/ContextProvider";
-import { add } from "../../../engine/tools/dataProcess";
+import { useContext, addNode } from "../../../engine/provider/ContextProvider";
 import classNames from 'classnames';
 import styles from "./index.less";
 import boxDefaultMeta from "../../../engine/meta/box.props.default.json";
@@ -19,19 +17,14 @@ var FunctionDesign = function FunctionDesign(_ref) {
     className = _ref.className,
     props = _objectWithoutProperties(_ref, _excluded);
   var ctx = useContext();
-  var _usePageData = usePageData(),
-    _usePageData2 = _slicedToArray(_usePageData, 2),
-    setPageData = _usePageData2[1].setPageData;
   useCreation(function () {
     if (children !== null && children !== void 0 && children.length) return;
     ctx.$subscriber(ctx.topics.COMPONENT_APPEND).once(function (_ref2) {
-      var compId = _ref2.id,
-        pageData = _ref2.pageData;
+      var compId = _ref2.id;
       if (compId !== id) return;
-      add(pageData, id, "box_".concat(suid()), _objectSpread(_objectSpread({}, boxDefaultMeta), {}, {
+      addNode(id, "box_".concat(suid()), _objectSpread(_objectSpread({}, boxDefaultMeta), {}, {
         buildIn: true
       }));
-      setPageData(pageData);
     }).watch();
   }, []);
   return /*#__PURE__*/React.createElement(Index, _extends({

package/es/lowcode/view/lc-components/Dialog/index.js

@@ -1,29 +1,83 @@
 import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
+import _extends from "@babel/runtime/helpers/esm/extends";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
-import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-var _excluded = ["id", "children", "getContainer", "wrapClassName", "maskStyle"];
-import React, { useRef, useImperativeHandle } from 'react';
-import { useMemoizedFn, useBoolean } from 'ahooks';
-import { Modal } from 'luck-design/antd';
+import React, { useRef, useEffect, useImperativeHandle } from 'react';
+import { useMemoizedFn, useUpdateEffect, useCreation } from 'ahooks';
+import { Modal, Button } from 'luck-design/antd';
 import classNames from 'classnames';
+import styled from 'styled-components';
+import { LDActions } from "../../../../index";
+import { useContext } from "../../../engine/provider/ContextProvider";
+import usePromiseState from "../../../engine/tools/usePromiseState";
 import Wrapper from "../Wrapper";
 import styles from "./index.less";
+var Footer = styled.div.withConfig({
+  displayName: "Footer",
+  componentId: "luckda-6530__sc-1aeozvd-0"
+})(["width:100%;display:flex;justify-content:flex-end;"]);
 var LCDialog = function LCDialog(_ref) {
   var id = _ref.id,
     children = _ref.children,
+    title = _ref.title,
+    width = _ref.width,
+    height = _ref.height,
     getContainer = _ref.getContainer,
     wrapClassName = _ref.wrapClassName,
     maskStyle = _ref.maskStyle,
-    props = _objectWithoutProperties(_ref, _excluded);
+    defaultOpen = _ref.defaultOpen,
+    mask = _ref.mask,
+    okText = _ref.okText,
+    cancelText = _ref.cancelText,
+    footer = _ref.footer,
+    btnGroup = _ref.btnGroup,
+    advance = _ref.advance;
+  var ctx = useContext();
   var apiRef = useRef();
   var domRef = useRef();
-  var _useBoolean = useBoolean(false),
-    _useBoolean2 = _slicedToArray(_useBoolean, 2),
-    open = _useBoolean2[0],
-    _useBoolean2$ = _useBoolean2[1],
-    setTrue = _useBoolean2$.setTrue,
-    setFalse = _useBoolean2$.setFalse,
-    toggle = _useBoolean2$.toggle;
+  var _usePromiseState = usePromiseState(defaultOpen),
+    _usePromiseState2 = _slicedToArray(_usePromiseState, 2),
+    open = _usePromiseState2[0],
+    setOpen = _usePromiseState2[1];
+  useEffect(function () {
+    ctx.doAction(advance.events.onMount);
+    return function () {
+      return ctx.doAction(advance.events.onUnmount);
+    };
+  }, []);
+  useUpdateEffect(function () {
+    if (open) {
+      ctx.doAction(advance.events.onOpen);
+    } else {
+      ctx.doAction(advance.events.onClose);
+    }
+  }, [open]);
+  var handleOk = useMemoizedFn(function () {
+    ctx.doAction(advance.events.onOk);
+  });
+  var _footer = useCreation(function () {
+    var _btnGroup$todoList;
+    if (!footer) return {
+      footer: null
+    };
+    if (!(btnGroup !== null && btnGroup !== void 0 && (_btnGroup$todoList = btnGroup.todoList) !== null && _btnGroup$todoList !== void 0 && _btnGroup$todoList.length)) return {};
+    return {
+      footer: /*#__PURE__*/React.createElement(Footer, null, /*#__PURE__*/React.createElement(LDActions, _extends({}, btnGroup, {
+        doAction: function doAction(action) {
+          return ctx.doAction(action);
+        }
+      })), /*#__PURE__*/React.createElement(Button, {
+        onClick: function onClick() {
+          return setOpen(false);
+        },
+        style: {
+          marginLeft: 8
+        }
+      }, cancelText), /*#__PURE__*/React.createElement(Button, {
+        type: "primary",
+        onClick: handleOk
+      }, okText))
+    };
+  }, [footer, btnGroup]);
   var getTargetDom = useMemoizedFn(function () {
     var _domRef$current;
     return (_domRef$current = domRef.current) === null || _domRef$current === void 0 ? void 0 : _domRef$current.closest('.ant-modal-content');
@@ -31,22 +85,38 @@ var LCDialog = function LCDialog(_ref) {
   useImperativeHandle(apiRef, function () {
     return {
       open: open,
-      doOpen: setTrue,
-      doClose: setFalse,
-      toggle: toggle
+      doOpen: function doOpen() {
+        return setOpen(true);
+      },
+      doClose: function doClose() {
+        return setOpen(false);
+      }
     };
-  });
+  }, []);
   return /*#__PURE__*/React.createElement(Wrapper, {
     id: id,
     displayName: "Dialog",
     getTargetDom: getTargetDom,
     api: apiRef
-  }, /*#__PURE__*/React.createElement(Modal, {
+  }, /*#__PURE__*/React.createElement(Modal, _extends({
+    title: title,
     visible: open,
     getContainer: getContainer,
+    width: width,
+    mask: mask,
     maskStyle: maskStyle,
+    bodyStyle: {
+      height: height,
+      overflowY: 'auto',
+      marginTop: 0
+    },
     wrapClassName: classNames(styles['lc-component-dialog-wrapper'], _defineProperty({}, wrapClassName, !!wrapClassName))
-  }, /*#__PURE__*/React.createElement("div", {
+  }, _footer, {
+    onOk: handleOk,
+    onCancel: function onCancel() {
+      return setOpen(false);
+    }
+  }), /*#__PURE__*/React.createElement("div", {
     style: {
       height: 0,
       width: 0,

package/es/lowcode/view/lc-components/Dialog/meta.json

@@ -9,7 +9,7 @@
   "props": [
     {
       "key": "id",
-      "desc": "唯一标识",
+      "name": "唯一标识",
       "type": "string",
       "disabled": true
     },
@@ -22,65 +22,88 @@
     },
     {
       "key": "width",
-      "name": "宽度",
-      "desc": "对话框的宽度",
-      "type": "string",
+      "name": "对话框宽度",
+      "type": "_WidthHeight",
+      "options": [
+        {
+          "label": "px",
+          "value": "px"
+        },
+        {
+          "label": "%",
+          "value": "%"
+        },
+        {
+          "label": "vw",
+          "value": "vw"
+        },
+        {
+          "label": "A",
+          "value": "auto"
+        }
+      ],
       "default": "700px"
     },
     {
       "key": "height",
-      "name": "高度",
-      "desc": "对话框的高度",
-      "type": "string",
-      "default": "60vh"
-    },
-    {
-      "key": "fullScreen",
-      "name": "默认全屏",
-      "desc": "对话框打开默认全屏",
-      "type": "boolean",
-      "default": false
-    },
-    {
-      "key": "fullable",
-      "name": "支持全屏切换",
-      "desc": "可以通过右上角按钮切换全屏状态",
-      "type": "boolean",
-      "default": true
+      "name": "内容区高度",
+      "type": "_WidthHeight",
+      "options": [
+        {
+          "label": "px",
+          "value": "px"
+        },
+        {
+          "label": "vh",
+          "value": "vh"
+        },
+        {
+          "label": "A",
+          "value": "auto"
+        }
+      ],
+      "default": "50vh"
     },
     {
       "key": "defaultOpen",
       "name": "默认显示",
       "desc": "默认是否显示",
-      "type": "boolean",
+      "type": "switch",
       "default": false
     },
     {
       "key": "mask",
       "name": "显示遮罩",
-      "desc": "是否展示遮罩",
-      "type": "boolean",
-      "default": false
+      "type": "switch",
+      "default": true
     },
     {
-      "key": "keyboard",
-      "name": "ESC关闭",
-      "desc": "是否支持键盘 esc 关闭",
-      "type": "boolean",
-      "default": true
+      "key": "okText",
+      "name": "确认文字",
+      "type": "_I18nInput",
+      "default": "确定"
+    },
+    {
+      "key": "cancelText",
+      "name": "取消文字",
+      "type": "_I18nInput",
+      "default": "取消"
     },
     {
       "key": "footer",
-      "name": "底部按钮是否显示",
+      "name": "显示footer",
       "desc": "是否显示底部按钮区域",
-      "type": "boolean",
+      "type": "switch",
       "default": true
     },
     {
       "key": "btnGroup",
       "name": "按钮组",
       "desc": "底部按钮区域的按钮组（参考按钮配置）",
-      "type": "_ActionSelector"
+      "type": "_ActionsEditor",
+      "default": { "display": "button", "max": 2, "moreText": "操作", "todoList": [] },
+      "wrapper": "collapse",
+      "wrapperProps": { "suppressIcon": true }
     }
   ],
   "advance": {
@@ -89,31 +112,31 @@
         "key": "onMount",
         "name": "组件首次渲染时",
         "desc": "在组件首次渲染时，执行方法",
-        "func": "(params)=>{\n\t\n}"
+        "func": "()=>{\n\t\n}"
       },
       {
         "key": "onUnmount",
         "name": "组件卸载时",
         "desc": "在组件卸载时，执行方法。",
-        "func": "(params)=>{\n\t\n}"
+        "func": "()=>{\n\t\n}"
       },
       {
         "key": "onOpen",
         "name": "对话框打开时",
         "desc": "在对话框打开时，执行方法",
-        "func": "(params)=>{\n\t\n}"
+        "func": "()=>{\n\t\n}"
       },
       {
         "key": "onClose",
         "name": "对话框关闭时",
         "desc": "在对话框打开时，执行方法，promise反馈false无法截断关闭",
-        "func": "(params)=>{\n\t\n}"
+        "func": "()=>{\n\t\n}"
       },
       {
-        "key": "onButtonClick",
-        "name": "按钮组点击",
-        "desc": "点击按钮组某个按钮时，执行方法",
-        "func": "(buttonKey,params)=>{\n\t\n}"
+        "key": "onOk",
+        "name": "确定按钮点击",
+        "desc": "点击确定按钮时，执行方法",
+        "func": "()=>{\n\t\n}"
       }
     ]
   }

package/es/lowcode/view/lc-components/Form/FunctionDesign.js

@@ -6,12 +6,12 @@ import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutPr
 var _excluded = ["children", "blocks", "id"];
 import React, { useRef, useEffect } from 'react';
 import { usePrevious, useUpdateLayoutEffect } from 'ahooks';
-import { isEqual, differenceWith, cloneDeep, differenceBy } from 'lodash';
+import { isEqual, cloneDeep, differenceBy } from 'lodash';
 import { suid } from '@luck-design-biz/base/utils';
-import { useContext, usePageData } from "../../../engine/provider/ContextProvider";
-import { add, findNodeAndParent } from "../../../engine/tools/dataProcess";
+import { useContext, useGet, addNode } from "../../../engine/provider/ContextProvider";
 import boxDefaultMeta from "../../../engine/meta/box.props.default.json";
 import Index from "./index";
+import { keyBy, forEach } from 'lodash';
 var FunctionDesign = function FunctionDesign(_ref) {
   var children = _ref.children,
     blocks = _ref.blocks,
@@ -19,38 +19,32 @@ var FunctionDesign = function FunctionDesign(_ref) {
     props = _objectWithoutProperties(_ref, _excluded);
   var ref = useRef(null);
   var ctx = useContext();
-  var _usePageData = usePageData(),
-    _usePageData2 = _slicedToArray(_usePageData, 2),
-    setPageData = _usePageData2[1].setPageData;
+  var current = useGet({
+    id: id
+  });
   var previousBlocks = usePrevious(cloneDeep(blocks), function (prev, next) {
     return !isEqual(prev, next);
   });
   useUpdateLayoutEffect(function () {
-    var diffDataset = differenceWith(blocks, previousBlocks, function (arrVal, othVal) {
-      var _arrVal$dataset, _othVal$dataset;
-      return arrVal.id === othVal.id && ((_arrVal$dataset = arrVal.dataset) === null || _arrVal$dataset === void 0 ? void 0 : _arrVal$dataset.code) === ((_othVal$dataset = othVal.dataset) === null || _othVal$dataset === void 0 ? void 0 : _othVal$dataset.code);
-    });
-    diffDataset.forEach(function (df) {
-      var _df$dataset;
-      ((_df$dataset = df.dataset) === null || _df$dataset === void 0 ? void 0 : _df$dataset.code) && ref.current.doQueryOne(df.id);
-    });
-    var diffColReset = differenceWith(blocks, previousBlocks, function (arrVal, othVal) {
-      return arrVal.id === othVal.id && arrVal.actionsColumnReset === othVal.actionsColumnReset;
-    });
-    diffColReset.forEach(function (df) {
-      var _ctx$componentMap$get2;
-      var _ctx$componentMap$get = (_ctx$componentMap$get2 = ctx.componentMap.get(id)) === null || _ctx$componentMap$get2 === void 0 ? void 0 : _ctx$componentMap$get2.api.getForm().getFormRef(df.id).formRef.current,
-        gridApi = _ctx$componentMap$get.gridApi;
-      gridApi.api.refreshCells({
-        columns: ['luck-actions'],
-        force: true
-      });
+    var blocksObj = keyBy(blocks, 'id');
+    var previousBlocksObj = keyBy(previousBlocks, 'id');
+    forEach(blocksObj, function (value, key) {
+      var _value$dataset, _previousBlocksObj$ke, _value$dataset2, _previousBlocksObj$ke2;
+      if (((_value$dataset = value.dataset) === null || _value$dataset === void 0 ? void 0 : _value$dataset.code) !== ((_previousBlocksObj$ke = previousBlocksObj[key]) === null || _previousBlocksObj$ke === void 0 || (_previousBlocksObj$ke = _previousBlocksObj$ke.dataset) === null || _previousBlocksObj$ke === void 0 ? void 0 : _previousBlocksObj$ke.code)) ((_value$dataset2 = value.dataset) === null || _value$dataset2 === void 0 ? void 0 : _value$dataset2.code) && ref.current.doQueryOne(key);
+      if (value.actionsColumnReset !== ((_previousBlocksObj$ke2 = previousBlocksObj[key]) === null || _previousBlocksObj$ke2 === void 0 ? void 0 : _previousBlocksObj$ke2.actionsColumnReset)) {
+        var _ctx$componentMap$get2;
+        var _ctx$componentMap$get = (_ctx$componentMap$get2 = ctx.componentMap.get(id)) === null || _ctx$componentMap$get2 === void 0 ? void 0 : _ctx$componentMap$get2.api.getForm().getFormRef(key).formRef.current,
+          gridApi = _ctx$componentMap$get.gridApi;
+        gridApi.api.refreshCells({
+          columns: ['luck-actions'],
+          force: true
+        });
+      }
     });
   }, [JSON.stringify(blocks)]);
   useEffect(function () {
     var cmid = ctx.$subscriber(ctx.topics.COMPONENT_MODIFY).on(function (_ref2) {
       var compId = _ref2.id,
-        pageData = _ref2.pageData,
         newValue = _ref2.newValue,
         oldValue = _ref2.oldValue;
       if (compId !== id || !newValue.hasOwnProperty('blocks')) return;
@@ -60,25 +54,21 @@ var FunctionDesign = function FunctionDesign(_ref) {
           newItem = _differenceBy2[0];
         if (newItem.type === 'blank') {
           var boxId = "box_".concat(suid());
-          add(pageData, id, boxId, _objectSpread(_objectSpread({}, boxDefaultMeta), {}, {
+          addNode(id, boxId, _objectSpread(_objectSpread({}, boxDefaultMeta), {}, {
             buildIn: true,
             formBoxId: newItem.id
           }));
-          setPageData(pageData);
         }
       } else if (newValue.blocks.length < oldValue.blocks.length) {
         var _differenceBy3 = differenceBy(oldValue.blocks, newValue.blocks, 'id'),
           _differenceBy4 = _slicedToArray(_differenceBy3, 1),
           removeItem = _differenceBy4[0];
         if (removeItem.type === 'blank') {
-          var _findNodeAndParent = findNodeAndParent(id, pageData),
-            current = _findNodeAndParent.node;
           var _boxId = current.children.find(function (childId) {
-            return current[childId].props.tabId === removeItem.id;
+            return current[childId].props.formBoxId === removeItem.id;
           });
           ctx.$publisher(ctx.topics.COMPONENT_DELETE, {
-            id: _boxId,
-            pageData: pageData
+            id: _boxId
           });
         }
       }

package/es/lowcode/view/lc-components/Form/index.js

@@ -34,6 +34,7 @@ var Header = function Header(_ref) {
   }), children);
 };
 var LCForm = /*#__PURE__*/forwardRef(function (_ref2, ref) {
+  var _ctx$pagePublicResour2;
   var id = _ref2.id,
     parentId = _ref2.parentId,
     width = _ref2.width,
@@ -74,6 +75,17 @@ var LCForm = /*#__PURE__*/forwardRef(function (_ref2, ref) {
     return {
       getForm: function getForm() {
         return (ref || formRef).current;
+      },
+      submit: function submit() {
+        var _ctx$pagePublicResour;
+        var instance = (ref || formRef).current;
+        var _ref3 = ((_ctx$pagePublicResour = ctx.pagePublicResource) === null || _ctx$pagePublicResour === void 0 ? void 0 : _ctx$pagePublicResour[id]) || initData || {},
+          formMode = _ref3.formMode;
+        if (formMode === 'add') {
+          instance.onAdd();
+        } else if (formMode === 'update') {
+          instance.onBatchUpdate();
+        }
       }
     };
   });
@@ -86,9 +98,9 @@ var LCForm = /*#__PURE__*/forwardRef(function (_ref2, ref) {
     };
     return executeCode(ctx, defaultDataSourceFormat, ['defaultValues'], defaultValues);
   });
-  var handleDataSourceFormat = useMemoizedFn(function (dataSourceFormat, _ref3) {
-    var values = _ref3.values,
-      submitData = _ref3.submitData;
+  var handleDataSourceFormat = useMemoizedFn(function (dataSourceFormat, _ref4) {
+    var values = _ref4.values,
+      submitData = _ref4.submitData;
     if (isNil(dataSourceFormat)) return submitData;
     return executeCode(ctx, dataSourceFormat, ['values', 'submitData'], values, submitData);
   });
@@ -122,7 +134,8 @@ var LCForm = /*#__PURE__*/forwardRef(function (_ref2, ref) {
   });
   var renderFormList = useMemoizedFn(function (formConfig) {
     return reduce(blocks, function (result, item) {
-      if (includes(['auto', 'grid', 'writer'], item.type) && item.dataset && includes(item.mode, formConfig.formMode)) {
+      if (includes(['auto', 'grid', 'writer'], item.type) && includes(item.mode, formConfig.formMode)) {
+        var _item$dataset;
         var data = {
           id: item.id,
           order: item.order,
@@ -130,9 +143,10 @@ var LCForm = /*#__PURE__*/forwardRef(function (_ref2, ref) {
           readOnly: item.readOnly,
           title: item.name,
           header: item.header,
-          dataSetKey: item.dataset.code,
+          dataSetKey: (_item$dataset = item.dataset) === null || _item$dataset === void 0 ? void 0 : _item$dataset.code,
           serial: item.serial,
           serialEffect: item.serialEffect,
+          fields: item.fields,
           defaultDataSourceFormat: function defaultDataSourceFormat(defaultValues) {
             return handleDefaultDataSourceFormat(item.defaultDataSourceFormat, defaultValues);
           },
@@ -275,7 +289,7 @@ var LCForm = /*#__PURE__*/forwardRef(function (_ref2, ref) {
     renderFormList: renderFormList,
     renderFormExtra: renderFormExtra,
     mainFormLdId: "block_main",
-    initData: initData,
+    initData: ((_ctx$pagePublicResour2 = ctx.pagePublicResource) === null || _ctx$pagePublicResour2 === void 0 ? void 0 : _ctx$pagePublicResour2[id]) || initData,
     ref: ref || formRef,
     readOnly: readOnly,
     showSaveBtn: showSave,

package/es/lowcode/view/lc-components/Form/meta.json

@@ -38,7 +38,7 @@
           {
             "key": "saveTitle",
             "name": "保存按钮标题",
-            "type": "string",
+            "type": "_I18nInput",
             "default": "保存"
           },
           {
@@ -120,7 +120,7 @@
         {
           "key": "name",
           "name": "区块名称",
-          "type": "string"
+          "type": "_I18nInput"
         },
         {
           "key": "serial",
@@ -501,7 +501,7 @@
               {
                 "key": "zipName",
                 "name": "压缩包命名",
-                "type": "string"
+                "type": "_I18nInput"
               },
               {
                 "key": "uploadUrl",

package/es/lowcode/view/lc-components/Layout/FunctionDesign.js

@@ -1,15 +1,13 @@
 import _extends from "@babel/runtime/helpers/esm/extends";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
-import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
 var _excluded = ["children", "id", "columnRatio"];
 import React, { useEffect } from 'react';
 import { useCreation, useMemoizedFn } from 'ahooks';
 import { drop } from 'lodash';
 import { suid } from '@luck-design-biz/base/utils';
-import { useContext, usePageData } from "../../../engine/provider/ContextProvider";
+import { useContext, useGet, addNode, deleteNode, modifyNode } from "../../../engine/provider/ContextProvider";
 import Index from "./index";
-import { add, modifyById, deleteById, findNodeAndParent } from "../../../engine/tools/dataProcess";
 import boxDefaultMeta from "../../../engine/meta/box.props.default.json";
 var LayoutFunctionDesign = function LayoutFunctionDesign(_ref) {
   var children = _ref.children,
@@ -17,29 +15,27 @@ var LayoutFunctionDesign = function LayoutFunctionDesign(_ref) {
     columnRatio = _ref.columnRatio,
     props = _objectWithoutProperties(_ref, _excluded);
   var ctx = useContext();
-  var _usePageData = usePageData(),
-    _usePageData2 = _slicedToArray(_usePageData, 2),
-    setPageData = _usePageData2[1].setPageData;
-  var refreshChild = useMemoizedFn(function (_pageData) {
-    var _findNodeAndParent = findNodeAndParent(id, _pageData),
-      current = _findNodeAndParent.node;
+  var current = useGet({
+    id: id
+  });
+  var refreshChild = useMemoizedFn(function () {
     var ratioArr = columnRatio.split(':');
     drop(current.children, ratioArr.length).forEach(function (boxId) {
-      deleteById(_pageData, boxId);
+      deleteNode(boxId);
     });
     ratioArr.forEach(function (item, index) {
       var _current$children;
       var ratio = parseInt(item, 10);
       var boxId = (_current$children = current.children) === null || _current$children === void 0 ? void 0 : _current$children[index];
       if (boxId) {
-        modifyById(_pageData, current.children[index], _objectSpread(_objectSpread({}, current[boxId].props), {}, {
+        modifyNode(current.children[index], _objectSpread(_objectSpread({}, current[boxId].props), {}, {
           style: {
             gridColumn: 'span ' + ratio
           }
         }));
       } else {
         boxId = "box_".concat(suid());
-        add(_pageData, id, boxId, _objectSpread(_objectSpread({}, boxDefaultMeta), {}, {
+        addNode(id, boxId, _objectSpread(_objectSpread({}, boxDefaultMeta), {}, {
           buildIn: true,
           style: {
             gridColumn: 'span ' + ratio
@@ -47,23 +43,20 @@ var LayoutFunctionDesign = function LayoutFunctionDesign(_ref) {
         }));
       }
     });
-    setPageData(_pageData);
   });
   useCreation(function () {
     if (children !== null && children !== void 0 && children.length) return;
     ctx.$subscriber(ctx.topics.COMPONENT_APPEND).once(function (_ref2) {
-      var compId = _ref2.id,
-        pageData = _ref2.pageData;
+      var compId = _ref2.id;
       if (compId !== id) return;
-      refreshChild(pageData);
+      refreshChild();
     }).watch();
   }, []);
   useEffect(function () {
     var cmid = ctx.$subscriber(ctx.topics.COMPONENT_MODIFY).on(function (_ref3) {
-      var compId = _ref3.id,
-        pageData = _ref3.pageData;
+      var compId = _ref3.id;
       if (compId !== id) return;
-      refreshChild(pageData);
+      refreshChild();
     }).watch();
     return function () {
       return ctx.$unsubscriber(ctx.topics.COMPONENT_MODIFY, cmid);