@luck-design-biz/luckda 0.0.23 → 0.0.24-2

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

@@ -11,11 +11,14 @@ exports.decompress = decompress;
 exports.deleteById = deleteById;
 exports.findNodeAndParent = findNodeAndParent;
 exports.getPathById = getPathById;
+exports.getPathNodesById = getPathNodesById;
 exports.modifyById = modifyById;
+var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 var _createForOfIteratorHelper2 = _interopRequireDefault(require("@babel/runtime/helpers/createForOfIteratorHelper"));
 var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
 var LZString = _interopRequireWildcard(require("lz-string"));
+var _constants = require("../../constants");
 /**
  * 数据压缩
  * @param {JSON} data
@@ -25,7 +28,7 @@ function compress(data) {
   // 将对象转换为JSON字符串
   var jsonString = JSON.stringify(data);
   // 使用LZ-String压缩JSON字符串
-  return LZString.compressToUTF16(jsonString);
+  return LZString.compressToBase64(jsonString);
 }
 
 /**
@@ -35,7 +38,7 @@ function compress(data) {
  */
 function decompress(compressedData) {
   // 使用LZ-String解压数据
-  var jsonString = LZString.decompressFromUTF16(compressedData);
+  var jsonString = LZString.decompressFromBase64(compressedData);
   // 将JSON字符串转换回对象
   return JSON.parse(jsonString);
 }
@@ -50,6 +53,12 @@ function decompress(compressedData) {
  */
 function findNodeAndParent(id, current) {
   var parent = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : null;
+  if (!parent && current.props.id === id) {
+    return {
+      node: current,
+      parent: null
+    };
+  }
   if (current.hasOwnProperty('children') && current.children.includes(id)) {
     return {
       node: current[id],
@@ -57,7 +66,7 @@ function findNodeAndParent(id, current) {
     };
   }
   for (var key in current) {
-    if (current[key] && (0, _typeof2.default)(current[key]) === 'object' && key !== 'props') {
+    if (current[key] && (0, _typeof2.default)(current[key]) === 'object' && key !== 'props' && key !== 'children') {
       var result = findNodeAndParent(id, current[key], current);
       if (result.node) {
         return result;
@@ -111,7 +120,7 @@ function process(json, path, id, data) {
     current[id] = {
       props: (0, _objectSpread2.default)((0, _objectSpread2.default)({}, data), {}, {
         id: id,
-        parentId: current.id
+        parentId: current.props.id
       })
     };
   } else if (!path && id && data) {
@@ -146,12 +155,12 @@ function process(json, path, id, data) {
  * 对指定的JSON结构进行节点的添加操作。
  *
  * @param {Object} json - 要操作的JSON对象。
- * @param {string|null} path - 要操作的节点路径，使用'/'分隔。
+ * @param {string} parentId - 父节点的唯一标识符。
  * @param {string} id - 操作节点的唯一标识符。
  * @param {Object|null} data - 要添加或修改的数据。如果为null，表示删除操作。
  */
-function add(json, path, id, data) {
-  process(json, path, id, data);
+function add(json, parentId, id, data) {
+  process(json, getPathById(json, parentId), id, data);
 }
 
 /**
@@ -166,7 +175,7 @@ function modifyById(json, id, data) {
 }
 
 /**
- * 查找指定ID的节点及其父节点。
+ * 删除指定id的节点。
  *
  * @param {Object} json - JSON对象。
  * @param {string} id - 要删除的节点ID。
@@ -186,6 +195,7 @@ function deleteById(json, id) {
 function getPathById(json, id) {
   var currentPath = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : '';
   for (var key in json) {
+    if (id === _constants.CELL_KEY.PAGE_ROOT) return '/';
     var newPath = currentPath ? "".concat(currentPath, "/").concat(key) : key;
     if (json[key].props && json[key].props.id === id) {
       return newPath;
@@ -198,4 +208,72 @@ function getPathById(json, id) {
     }
   }
   return null;
+}
+
+/**
+ * 在给定的JSON结构中搜索具有特定id的节点，并返回包含该节点及其所有父节点的props属性的路径数组。
+ *
+ * @param {Object} data - 待搜索的JSON对象，它代表了一个复杂的树状结构，每个节点都可能有props和children属性。
+ * @param {string} targetId - 需要找到的目标节点的id。
+ * @returns {Array<Object>} 一个包含目标节点及其所有父节点的props属性的数组。如果未找到目标节点，则返回空数组。
+ *
+ * @example
+ * const data = {
+ *   props: {
+ *     id: 'page_root',
+ *     type: 'Page',
+ *     name: '页面',
+ *     hasHeder: true,
+ *     hasFooter: true,
+ *   },
+ *   // ...其他节点
+ * };
+ *
+ * const path = getPathNodesById(data, 'form_jknbjkun');
+ * console.log(path);
+ * // 输出目标节点及其所有父节点的props属性的数组
+ */
+function getPathNodesById(data, targetId) {
+  // 初始化结果数组
+  var result = [];
+
+  // 定义递归函数以搜索路径
+  function search(node) {
+    var path = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
+    // 检查当前节点是否是目标节点
+    if (node && node.props && node.props.id === targetId) {
+      // 如果是，将当前路径和节点自身添加到结果中
+      result = [].concat((0, _toConsumableArray2.default)(path), [node.props]);
+      return true;
+    }
+
+    // 遍历子节点
+    if (node && node.children) {
+      var _iterator2 = (0, _createForOfIteratorHelper2.default)(node.children),
+        _step2;
+      try {
+        for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
+          var childId = _step2.value;
+          // 对每个子节点，首先尝试从当前节点获取子节点数据
+          var childNode = node[childId];
+          if (search(childNode, [].concat((0, _toConsumableArray2.default)(path), [node.props]))) {
+            return true;
+          }
+        }
+      } catch (err) {
+        _iterator2.e(err);
+      } finally {
+        _iterator2.f();
+      }
+    }
+    return false;
+  }
+
+  // 从顶层"data"对象开始搜索
+  if (search(data)) {
+    return result;
+  }
+
+  // 如果未找到目标节点，返回空数组
+  return [];
 }

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

@@ -5,7 +5,77 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.isPromise = isPromise;
+exports.listReducer = listReducer;
+exports.omitBadProps = omitBadProps;
+var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
+var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
+var _lodash = require("lodash");
 function isPromise(value) {
   return !!value && (0, _typeof2.default)(value) === 'object' && typeof value.then === 'function';
+}
+function omitBadProps(props) {
+  var rubbish = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
+  return (0, _lodash.omit)(props, ['component', 'name', 'desc', 'icon', 'group', 'groupName', 'order'].concat((0, _toConsumableArray2.default)(rubbish)));
+}
+function listReducer(state, action) {
+  switch (action.type) {
+    case 'add':
+      {
+        var _action$callback;
+        var newState = [].concat((0, _toConsumableArray2.default)(state), [action.payload]);
+        (_action$callback = action.callback) === null || _action$callback === void 0 || _action$callback.call(action, newState);
+        return newState;
+      }
+    case 'delete':
+      {
+        var _action$callback2;
+        var _newState = state.filter(function (item) {
+          return item.id !== action.payload;
+        });
+        (_action$callback2 = action.callback) === null || _action$callback2 === void 0 || _action$callback2.call(action, _newState);
+        return _newState;
+      }
+    case 'edit':
+      {
+        var _action$callback3;
+        var _newState2 = state.map(function (item) {
+          return item.id === action.payload.id ? (0, _objectSpread2.default)((0, _objectSpread2.default)({}, item), action.payload.data) : item;
+        });
+        (_action$callback3 = action.callback) === null || _action$callback3 === void 0 || _action$callback3.call(action, _newState2);
+        return _newState2;
+      }
+    case 'active':
+      {
+        var _action$callback4;
+        var _newState3 = state.map(function (item) {
+          item.active = false;
+          return item.id === action.payload.id ? (0, _objectSpread2.default)((0, _objectSpread2.default)({}, item), action.payload.data) : item;
+        });
+        (_action$callback4 = action.callback) === null || _action$callback4 === void 0 || _action$callback4.call(action, _newState3);
+        return _newState3;
+      }
+    case 'new':
+      {
+        var _action$callback5;
+        var _newState4 = (0, _toConsumableArray2.default)(action.payload);
+        (_action$callback5 = action.callback) === null || _action$callback5 === void 0 || _action$callback5.call(action, _newState4);
+        return _newState4;
+      }
+    case 'sort':
+      {
+        var _action$callback6;
+        var sortItems = action.payload;
+        var newItems = state.sort(function (a, b) {
+          var indexA = sortItems.indexOf(a.id);
+          var indexB = sortItems.indexOf(b.id);
+          return indexA - indexB;
+        });
+        (_action$callback6 = action.callback) === null || _action$callback6 === void 0 || _action$callback6.call(action, _newState5);
+        var _newState5 = (0, _toConsumableArray2.default)(newItems);
+        return _newState5;
+      }
+    default:
+      throw new Error();
+  }
 }

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

@@ -0,0 +1,31 @@
+"use strict";
+
+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 = require("react");
+var _ahooks = require("ahooks");
+var usePromiseState = function usePromiseState(initialState) {
+  var _useSafeState = (0, _ahooks.useSafeState)(initialState),
+    _useSafeState2 = (0, _slicedToArray2.default)(_useSafeState, 2),
+    state = _useSafeState2[0],
+    setState = _useSafeState2[1];
+  var promiseRef = (0, _react.useRef)(null);
+  var setStatePromise = (0, _react.useCallback)(function (_state) {
+    return new Promise(function (resolve) {
+      promiseRef.current = resolve;
+      setState(_state);
+    });
+  }, []);
+  (0, _ahooks.useDeepCompareEffect)(function () {
+    if (promiseRef.current) {
+      promiseRef.current(state);
+      promiseRef.current = null;
+    }
+  }, [state]);
+  return [state, setStatePromise];
+};
+var _default = exports.default = usePromiseState;

package/lib/lowcode/index.js

@@ -16,5 +16,9 @@ Object.defineProperty(exports, "View", {
     return _view.default;
   }
 });
+exports.default = launcher;
 var _painter = _interopRequireDefault(require("./painter"));
-var _view = _interopRequireDefault(require("./view"));
+var _view = _interopRequireDefault(require("./view"));
+// export * as dataProcess  from './engine/tools/dataProcess';
+
+function launcher() {}

package/lib/lowcode/painter/Design.js

@@ -1,105 +1,60 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
 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 _umi = require("umi");
 var _ahooks = require("ahooks");
-var _ContextProvider = require("../engine/provider/ContextProvider");
+var _moment = _interopRequireDefault(require("moment"));
+var _antd = require("luck-design/antd");
+var _DesignToolbar = _interopRequireDefault(require("./DesignToolbar"));
+var _DesignOperator = _interopRequireDefault(require("./DesignOperator"));
 var _Page = _interopRequireDefault(require("../view/Page"));
-var _constants = require("../constants");
 var _design = _interopRequireDefault(require("./style/design.less"));
 var Design = function Design() {
-  var context = (0, _ContextProvider.useLDContext)();
-  var detectorRef = (0, _react.useRef)(null);
-  var selectorRef = (0, _react.useRef)(null);
+  var _localeInfo$locale;
   var simulatorRef = (0, _react.useRef)(null);
-  var hoverCellRef = (0, _react.useRef)(null);
-  var activeCellRef = (0, _react.useRef)(null);
-  (0, _ahooks.useEventListener)('mousemove', function (event) {
-    var elem = event.target;
-    var targetCell = elem.closest(".".concat(_constants.CELL_CLASS_NAME));
-    if (targetCell && !targetCell.isEqualNode(hoverCellRef.current) && !targetCell.isEqualNode(activeCellRef.current)) {
-      var _id = targetCell.id;
-      hoverCellRef.current = targetCell;
-      context.$publisher(context.topics.COMPONENT_HOVER, {
-        id: _id,
-        cellNode: targetCell
-      });
-    } else if (!targetCell || targetCell.isEqualNode(activeCellRef.current)) {
-      hoverCellRef.current = null;
-      context.$publisher(context.topics.COMPONENT_HOVER, null);
+  var _useState = (0, _react.useState)(function () {
+      return (0, _umi.getLocale)();
+    }),
+    _useState2 = (0, _slicedToArray2.default)(_useState, 2),
+    locale = _useState2[0],
+    setLocale = _useState2[1];
+  var _useState3 = (0, _react.useState)(function () {
+      return (0, _umi.getIntl)((0, _umi.getLocale)(), true);
+    }),
+    _useState4 = (0, _slicedToArray2.default)(_useState3, 2),
+    intl = _useState4[0],
+    setIntl = _useState4[1];
+  var handleLangChange = (0, _ahooks.useMemoizedFn)(function (_locale) {
+    if (_moment.default !== null && _moment.default !== void 0 && _moment.default.locale) {
+      var _localeInfo$_locale;
+      _moment.default.locale(((_localeInfo$_locale = _umi.localeInfo[_locale]) === null || _localeInfo$_locale === void 0 ? void 0 : _localeInfo$_locale.momentLocale) || 'en');
     }
-  }, {
-    target: simulatorRef
+    setLocale(_locale);
+    setIntl((0, _umi.getIntl)(_locale));
   });
-  (0, _ahooks.useEventListener)('mouseleave', function () {
-    if (hoverCellRef.current) {
-      hoverCellRef.current = null;
-      context.$publisher(context.topics.COMPONENT_HOVER, null);
-    }
-  }, {
-    target: simulatorRef
-  });
-  (0, _ahooks.useEventListener)('click', function (event) {
-    var elem = event.target;
-    var targetCell = elem.closest(".".concat(_constants.CELL_CLASS_NAME));
-    if (!targetCell || targetCell.isEqualNode(activeCellRef.current)) return;
-    activeCellRef.current = targetCell;
-    hoverCellRef.current = null;
-    context.$publisher(context.topics.COMPONENT_HOVER, null);
-    context.$publisher(context.topics.COMPONENT_ACTIVE, {
-      id: activeCellRef.current.id,
-      cellNode: activeCellRef.current
-    });
-  }, {
-    target: simulatorRef
-  });
-  (0, _react.useEffect)(function () {
-    var setRect = function setRect(node, cellNode) {
-      node.style.left = "".concat(cellNode.offsetLeft, "px");
-      node.style.top = "".concat(cellNode.offsetTop, "px");
-      node.style.width = "".concat(cellNode.offsetWidth, "px");
-      node.style.height = "".concat(cellNode.offsetHeight, "px");
-    };
-    var hcid = context.$subscriber(context.topics.COMPONENT_HOVER).on(function (payload) {
-      if (payload.id) {
-        detectorRef.current.style.display = 'block';
-        setRect(detectorRef.current, payload.cellNode);
-      } else {
-        detectorRef.current.style.display = 'none';
-      }
-    }).watch();
-    var acid = context.$subscriber(context.topics.COMPONENT_ACTIVE).on(function (payload) {
-      if (payload.id) {
-        selectorRef.current.style.display = 'block';
-        setRect(selectorRef.current, payload.cellNode);
-      } else {
-        selectorRef.current.style.display = 'none';
-      }
-    }).watch();
-    return function () {
-      context.$unsubscriber(context.topics.COMPONENT_HOVER, hcid);
-      context.$unsubscriber(context.topics.COMPONENT_ACTIVE, acid);
-    };
-  }, []);
   return /*#__PURE__*/_react.default.createElement("div", {
     className: _design.default['lc-painter-design']
-  }, /*#__PURE__*/_react.default.createElement("div", {
-    id: "lc-detector",
-    ref: detectorRef,
-    className: _design.default.detector
+  }, /*#__PURE__*/_react.default.createElement(_DesignToolbar.default, {
+    locale: locale,
+    onLangChange: handleLangChange
   }), /*#__PURE__*/_react.default.createElement("div", {
-    id: "lc-selector",
-    ref: selectorRef,
-    className: _design.default.selector
-  }), /*#__PURE__*/_react.default.createElement(_Page.default, {
+    className: _design.default['lc-painter-design-workspace']
+  }, /*#__PURE__*/_react.default.createElement(_DesignOperator.default, {
+    target: simulatorRef
+  }), /*#__PURE__*/_react.default.createElement(_antd.ConfigProvider, {
+    locale: ((_localeInfo$locale = _umi.localeInfo[locale]) === null || _localeInfo$locale === void 0 ? void 0 : _localeInfo$locale.antd) || {}
+  }, /*#__PURE__*/_react.default.createElement(_umi.RawIntlProvider, {
+    value: intl
+  }, /*#__PURE__*/_react.default.createElement(_Page.default, {
     ref: simulatorRef,
-    pageCode: "mk2i87qb",
-    className: _design.default.simulator
-  }));
+    className: _design.default['lc-painter-design-simulator']
+  })))));
 };
 var _default = exports.default = Design;