@luck-design-biz/luckda 0.0.25-15 → 0.0.25-16

package/es/lowcode/engine/tools/usePageDataStore.js

@@ -5,7 +5,7 @@ import { create, createStore, useStore } from 'zustand';
 import { immer } from 'zustand/middleware/immer';
 import { subscribeWithSelector } from 'zustand/middleware';
 import { useShallow } from 'zustand/react/shallow';
-import { isObject, isArray, isNil, isFunction, isString, get, set as _set, unset, assign, forOwn, omit, debounce } from 'lodash';
+import { isObject, isArray, isNil, isFunction, isString, get, set as _set, unset, assign, forOwn, forEach, omit, debounce } from 'lodash';
 import isDeepEqual from 'fast-deep-equal';
 import { getPathNodesById, findNodeAndParent } from "./dataProcess";
 import { LC_BUILDIN_UNIT_KEY } from "../../constants";
@@ -245,6 +245,20 @@ export var modifyNode = function modifyNode(id, data) {
     });
   });
 };
+export var clearChildren = function clearChildren(id) {
+  usePageDataStore.setState(function (state) {
+    if (id === LC_BUILDIN_UNIT_KEY.PAGE_ROOT) {
+      return;
+    }
+    var _ref4 = findNode(state.pageData, id) || {},
+      target = _ref4.target;
+    if (!target) return;
+    forEach(target.children, function (c) {
+      delete target[c];
+    });
+    delete target['children'];
+  });
+};
 export var useTask = function useTask(type) {
   var promiseRef = useRef(null);
   var task = useCallback(function () {

package/es/lowcode/painter/components/PreviewIframe.js

@@ -1,9 +1,7 @@
-import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
-import React, { useRef, useEffect } from 'react';
-import { createPortal } from 'react-dom';
-import { useBoolean } from 'ahooks';
+import React from 'react';
+import { getCreateHistoryOptions } from 'umi';
 import styled from 'styled-components';
-import Preview from "../../preview";
+import { useCreation } from 'ahooks';
 var Iframe = styled.iframe.withConfig({
   displayName: "Iframe",
   componentId: "luckda-6530__sc-cyloc5-0"
@@ -11,45 +9,11 @@ var Iframe = styled.iframe.withConfig({
 var PreviewIframe = function PreviewIframe(_ref) {
   var code = _ref.code,
     userId = _ref.userId;
-  var ref = useRef();
-  var _useBoolean = useBoolean(false),
-    _useBoolean2 = _slicedToArray(_useBoolean, 2),
-    isMount = _useBoolean2[0],
-    setTrue = _useBoolean2[1].setTrue;
-  useEffect(function () {
-    var styles = Array.from(document.styleSheets).map(function (styleSheet) {
-      if (styleSheet.href) {
-        var link = document.createElement('link');
-        link.rel = 'stylesheet';
-        link.href = styleSheet.href;
-        return link;
-      } else {
-        try {
-          var style = document.createElement('style');
-          style.textContent = Array.from(styleSheet.cssRules).map(function (rule) {
-            return rule.cssText;
-          }).join('\n');
-          return style;
-        } catch (e) {
-          console.error(e);
-          return null;
-        }
-      }
-    }).filter(Boolean);
-    styles.forEach(function (style) {
-      return ref.current.contentDocument.head.appendChild(style);
-    });
-    ref.current.contentDocument.body.setAttribute('luck-theme', 'base');
-    setTrue();
-  }, []);
+  var basename = useCreation(function () {
+    return getCreateHistoryOptions().basename;
+  });
   return /*#__PURE__*/React.createElement(Iframe, {
-    ref: ref
-  }, isMount && /*#__PURE__*/createPortal( /*#__PURE__*/React.createElement("div", {
-    id: "root"
-  }, /*#__PURE__*/React.createElement(Preview, {
-    code: code,
-    userId: userId,
-    debug: true
-  })), ref.current.contentDocument.body));
+    src: "".concat(basename === '/' ? '' : basename, "/byteman/preview?code=").concat(code, "&user=").concat(userId)
+  });
 };
 export default PreviewIframe;

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

@@ -5,8 +5,7 @@ var _excluded = ["children", "id", "display"];
 import React, { useEffect } from 'react';
 import { useCreation, useMemoizedFn } from 'ahooks';
 import { suid } from '@luck-design-biz/base/utils';
-import { drop } from 'lodash';
-import { useContext, useGet, addNode, deleteNode } from "../../../engine/provider/ContextProvider";
+import { useContext, useGet, addNode, clearChildren } from "../../../engine/provider/ContextProvider";
 import Index from "./index";
 import boxDefaultMeta from "../../../engine/meta/box.props.default.json";
 var FunctionDesign = function FunctionDesign(_ref) {
@@ -19,18 +18,24 @@ var FunctionDesign = function FunctionDesign(_ref) {
     id: id
   });
   var refreshChild = useMemoizedFn(function () {
-    var _current$children;
     var ratioArr = display.split('');
-    if (ratioArr.length === ((_current$children = current.children) === null || _current$children === void 0 ? void 0 : _current$children.length)) return;
-    drop(current.children, ratioArr.length).forEach(function (boxId) {
-      deleteNode(boxId);
-    });
-    ratioArr.forEach(function (_, index) {
-      var _current$children2;
-      if (!((_current$children2 = current.children) !== null && _current$children2 !== void 0 && _current$children2[index])) {
-        addNode(id, "box_".concat(suid()), _objectSpread(_objectSpread({}, boxDefaultMeta), {}, {
-          buildIn: true
-        }));
+    var prevChildren = [];
+    for (var i in current.children) {
+      var _box$children;
+      var _box = current[current.children[i]];
+      if (_box !== null && _box !== void 0 && (_box$children = _box.children) !== null && _box$children !== void 0 && _box$children[0]) {
+        prevChildren.push([_box.children[0], _box[_box.children[0]].props]);
+      }
+      if (i === ratioArr.length - 1) break;
+    }
+    clearChildren(id);
+    ratioArr.forEach(function (_, i) {
+      var _boxId = "box_".concat(suid());
+      addNode(id, _boxId, _objectSpread(_objectSpread({}, boxDefaultMeta), {}, {
+        buildIn: true
+      }));
+      if (prevChildren[i]) {
+        addNode(_boxId, prevChildren[i][0], prevChildren[i][1]);
       }
     });
   });

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

@@ -29,7 +29,7 @@ var LCPageLayout = function LCPageLayout(_ref) {
     $css: css
   }, display === 'tb' ? /*#__PURE__*/React.createElement(Layout.Main, null, (children === null || children === void 0 ? void 0 : children.length) === display.split('').length ? /*#__PURE__*/React.createElement(MemorySplit, {
     split: "horizontal"
-  }, children === null || children === void 0 ? void 0 : children[0], children === null || children === void 0 ? void 0 : children[1]) : null) : /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Layout.Sider, null, children === null || children === void 0 ? void 0 : children[0]), /*#__PURE__*/React.createElement(Layout.Main, null, (children === null || children === void 0 ? void 0 : children.length) === display.split('').length ? /*#__PURE__*/React.createElement(React.Fragment, null, display === 'lr' ? children === null || children === void 0 ? void 0 : children[1] : /*#__PURE__*/React.createElement(MemorySplit, {
+  }, children) : null) : /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Layout.Sider, null, children === null || children === void 0 ? void 0 : children[0]), /*#__PURE__*/React.createElement(Layout.Main, null, (children === null || children === void 0 ? void 0 : children.length) === display.split('').length ? /*#__PURE__*/React.createElement(React.Fragment, null, display === 'lr' ? children === null || children === void 0 ? void 0 : children[1] : /*#__PURE__*/React.createElement(MemorySplit, {
     split: display === 'ltb' ? 'horizontal' : 'vertical'
   }, children === null || children === void 0 ? void 0 : children[1], children === null || children === void 0 ? void 0 : children[2])) : null))));
 };

package/lib/lowcode/engine/tools/usePageDataStore.js

@@ -4,7 +4,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.useTemporalStore = exports.useTask = exports.useGet = exports.resetPageData = exports.modifyNode = exports.getSelfAndParent = exports.getLevelNodes = exports.getCanUndoAndRedo = exports.deleteNode = exports.default = exports.addNode = void 0;
+exports.useTemporalStore = exports.useTask = exports.useGet = exports.resetPageData = exports.modifyNode = exports.getSelfAndParent = exports.getLevelNodes = exports.getCanUndoAndRedo = exports.deleteNode = exports.default = exports.clearChildren = exports.addNode = void 0;
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
 var _react = require("react");
@@ -252,6 +252,20 @@ var modifyNode = exports.modifyNode = function modifyNode(id, data) {
     });
   });
 };
+var clearChildren = exports.clearChildren = function clearChildren(id) {
+  usePageDataStore.setState(function (state) {
+    if (id === _constants.LC_BUILDIN_UNIT_KEY.PAGE_ROOT) {
+      return;
+    }
+    var _ref4 = findNode(state.pageData, id) || {},
+      target = _ref4.target;
+    if (!target) return;
+    (0, _lodash.forEach)(target.children, function (c) {
+      delete target[c];
+    });
+    delete target['children'];
+  });
+};
 var useTask = exports.useTask = function useTask(type) {
   var promiseRef = (0, _react.useRef)(null);
   var task = (0, _react.useCallback)(function () {

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

@@ -1,17 +1,14 @@
 "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 _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
-var _react = _interopRequireWildcard(require("react"));
-var _reactDom = require("react-dom");
-var _ahooks = require("ahooks");
+var _react = _interopRequireDefault(require("react"));
+var _umi = require("umi");
 var _styledComponents = _interopRequireDefault(require("styled-components"));
-var _preview = _interopRequireDefault(require("../../preview"));
+var _ahooks = require("ahooks");
 var Iframe = _styledComponents.default.iframe.withConfig({
   displayName: "Iframe",
   componentId: "luckda-6530__sc-cyloc5-0"
@@ -19,45 +16,11 @@ var Iframe = _styledComponents.default.iframe.withConfig({
 var PreviewIframe = function PreviewIframe(_ref) {
   var code = _ref.code,
     userId = _ref.userId;
-  var ref = (0, _react.useRef)();
-  var _useBoolean = (0, _ahooks.useBoolean)(false),
-    _useBoolean2 = (0, _slicedToArray2.default)(_useBoolean, 2),
-    isMount = _useBoolean2[0],
-    setTrue = _useBoolean2[1].setTrue;
-  (0, _react.useEffect)(function () {
-    var styles = Array.from(document.styleSheets).map(function (styleSheet) {
-      if (styleSheet.href) {
-        var link = document.createElement('link');
-        link.rel = 'stylesheet';
-        link.href = styleSheet.href;
-        return link;
-      } else {
-        try {
-          var style = document.createElement('style');
-          style.textContent = Array.from(styleSheet.cssRules).map(function (rule) {
-            return rule.cssText;
-          }).join('\n');
-          return style;
-        } catch (e) {
-          console.error(e);
-          return null;
-        }
-      }
-    }).filter(Boolean);
-    styles.forEach(function (style) {
-      return ref.current.contentDocument.head.appendChild(style);
-    });
-    ref.current.contentDocument.body.setAttribute('luck-theme', 'base');
-    setTrue();
-  }, []);
+  var basename = (0, _ahooks.useCreation)(function () {
+    return (0, _umi.getCreateHistoryOptions)().basename;
+  });
   return /*#__PURE__*/_react.default.createElement(Iframe, {
-    ref: ref
-  }, isMount && /*#__PURE__*/(0, _reactDom.createPortal)( /*#__PURE__*/_react.default.createElement("div", {
-    id: "root"
-  }, /*#__PURE__*/_react.default.createElement(_preview.default, {
-    code: code,
-    userId: userId,
-    debug: true
-  })), ref.current.contentDocument.body));
+    src: "".concat(basename === '/' ? '' : basename, "/byteman/preview?code=").concat(code, "&user=").concat(userId)
+  });
 };
 var _default = exports.default = PreviewIframe;

package/lib/lowcode/view/lc-components/PageLayout/FunctionDesign.js

@@ -12,7 +12,6 @@ var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/h
 var _react = _interopRequireWildcard(require("react"));
 var _ahooks = require("ahooks");
 var _utils = require("@luck-design-biz/base/utils");
-var _lodash = require("lodash");
 var _ContextProvider = require("../../../engine/provider/ContextProvider");
 var _index = _interopRequireDefault(require("./index"));
 var _boxPropsDefault = _interopRequireDefault(require("../../../engine/meta/box.props.default.json"));
@@ -27,18 +26,24 @@ var FunctionDesign = function FunctionDesign(_ref) {
     id: id
   });
   var refreshChild = (0, _ahooks.useMemoizedFn)(function () {
-    var _current$children;
     var ratioArr = display.split('');
-    if (ratioArr.length === ((_current$children = current.children) === null || _current$children === void 0 ? void 0 : _current$children.length)) return;
-    (0, _lodash.drop)(current.children, ratioArr.length).forEach(function (boxId) {
-      (0, _ContextProvider.deleteNode)(boxId);
-    });
-    ratioArr.forEach(function (_, index) {
-      var _current$children2;
-      if (!((_current$children2 = current.children) !== null && _current$children2 !== void 0 && _current$children2[index])) {
-        (0, _ContextProvider.addNode)(id, "box_".concat((0, _utils.suid)()), (0, _objectSpread2.default)((0, _objectSpread2.default)({}, _boxPropsDefault.default), {}, {
-          buildIn: true
-        }));
+    var prevChildren = [];
+    for (var i in current.children) {
+      var _box$children;
+      var _box = current[current.children[i]];
+      if (_box !== null && _box !== void 0 && (_box$children = _box.children) !== null && _box$children !== void 0 && _box$children[0]) {
+        prevChildren.push([_box.children[0], _box[_box.children[0]].props]);
+      }
+      if (i === ratioArr.length - 1) break;
+    }
+    (0, _ContextProvider.clearChildren)(id);
+    ratioArr.forEach(function (_, i) {
+      var _boxId = "box_".concat((0, _utils.suid)());
+      (0, _ContextProvider.addNode)(id, _boxId, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, _boxPropsDefault.default), {}, {
+        buildIn: true
+      }));
+      if (prevChildren[i]) {
+        (0, _ContextProvider.addNode)(_boxId, prevChildren[i][0], prevChildren[i][1]);
       }
     });
   });

package/lib/lowcode/view/lc-components/PageLayout/index.js

@@ -37,7 +37,7 @@ var LCPageLayout = function LCPageLayout(_ref) {
     $css: css
   }, display === 'tb' ? /*#__PURE__*/_react.default.createElement(_base.Layout.Main, null, (children === null || children === void 0 ? void 0 : children.length) === display.split('').length ? /*#__PURE__*/_react.default.createElement(_base.MemorySplit, {
     split: "horizontal"
-  }, children === null || children === void 0 ? void 0 : children[0], children === null || children === void 0 ? void 0 : children[1]) : null) : /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_base.Layout.Sider, null, children === null || children === void 0 ? void 0 : children[0]), /*#__PURE__*/_react.default.createElement(_base.Layout.Main, null, (children === null || children === void 0 ? void 0 : children.length) === display.split('').length ? /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, display === 'lr' ? children === null || children === void 0 ? void 0 : children[1] : /*#__PURE__*/_react.default.createElement(_base.MemorySplit, {
+  }, children) : null) : /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_base.Layout.Sider, null, children === null || children === void 0 ? void 0 : children[0]), /*#__PURE__*/_react.default.createElement(_base.Layout.Main, null, (children === null || children === void 0 ? void 0 : children.length) === display.split('').length ? /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, display === 'lr' ? children === null || children === void 0 ? void 0 : children[1] : /*#__PURE__*/_react.default.createElement(_base.MemorySplit, {
     split: display === 'ltb' ? 'horizontal' : 'vertical'
   }, children === null || children === void 0 ? void 0 : children[1], children === null || children === void 0 ? void 0 : children[2])) : null))));
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@luck-design-biz/luckda",
-  "version": "0.0.25-15",
+  "version": "0.0.25-16",
   "description": "前端配置管理中心业务组件库",
   "scripts": {
     "start": "cross-env NODE_OPTIONS=--max-old-space-size=10240 USER_RUNTIME=SITE RUNTIME=dev umi dev",