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

package/es/lowcode/engine/meta/{components/tree.json → tree.props.json}

@@ -1,156 +1,157 @@
-{
-  "component": "Tree",
-  "name": "树",
-  "desc": "用于展示和管理具有层级结构的数据。它提供了层级结构、节点展开/折叠、节点选择、节点操作和展示样式等功能和配置选项，使用户能够轻松创建和管理树结构。",
-  "icon": "icon-tree",
-  "group": "advance",
-  "groupName": "高级",
-  "props": [
-    {
-      "key": "id",
-      "desc": "唯一标识",
-      "type": "string",
-      "disabled": true
-    },
-    {
-      "key": "dateset",
-      "name": "数据集",
-      "desc": "选择系统中的可用树形数据集",
-      "type": "_DataSetSelector"
-    },
-    {
-      "key": "showLine",
-      "name": "显示线",
-      "desc": "是否显示树组件的连接线",
-      "type": "boolean",
-      "default": false
-    },
-    {
-      "key": "lazyLoad",
-      "name": "懒加载",
-      "desc": "是否树形组件懒加载",
-      "type": "boolean",
-      "default": false
-    },
-    {
-      "key": "editable",
-      "name": "支持编辑",
-      "desc": "是否支持编辑树",
-      "type": "boolean",
-      "default": false
-    },
-    {
-      "key": "draggable",
-      "name": "支持拖拽",
-      "desc": "是否支持拖拽",
-      "type": "boolean",
-      "default": false
-    },
-    {
-      "key": "defaultExpandDeep",
-      "name": "默认展开层级",
-      "desc": "默认展开多少层级",
-      "type": "select",
-      "options": [
-        {
-          "label": "1",
-          "value": "1"
-        },
-        {
-          "label": "2",
-          "value": "2"
-        },
-        {
-          "label": "3",
-          "value": "3"
-        },
-        {
-          "label": "4",
-          "value": "4"
-        },
-        {
-          "label": "5",
-          "value": "5"
-        },
-        {
-          "label": "全部",
-          "value": "all"
-        }
-      ],
-      "default": 1
-    },
-    {
-      "key": "rowKey",
-      "name": "数据主键key",
-      "desc": "数据主键",
-      "type": "string"
-    },
-    {
-      "key": "actions",
-      "name": "操作项",
-      "desc": "单行操作项",
-      "type": "_ActionSelector"
-    },
-    {
-      "key": "doubleClick",
-      "name": "开启双击事件",
-      "desc": "是否开启双击事件（默认双击收缩节点）",
-      "type": "boolean",
-      "default": true
-    },
-    {
-      "key": "multiple",
-      "name": "多选",
-      "desc": "是否支持多选",
-      "type": "boolean",
-      "default": false
-    }
-  ],
-  "style": {},
-  "advance": {
-    "events": [
-      {
-        "key": "onMount",
-        "name": "组件首次渲染时",
-        "desc": "在组件首次渲染时，执行方法",
-        "func": "(params)=>{\n\t\n}"
-      },
-      {
-        "key": "onUnmount",
-        "name": "组件卸载时",
-        "desc": "在组件卸载时，执行方法。",
-        "func": "(params)=>{\n\t\n}"
-      },
-      {
-        "key": "processDataSource",
-        "name": "数据预处理",
-        "desc": "数据渲染前预处理",
-        "func": "(data)=>{\n\t\n}"
-      },
-      {
-        "key": "onTreeNodeRender",
-        "name": "定制渲染",
-        "desc": "单行树节点渲染",
-        "func": "(title, rowData)=>{\n\t\n}"
-      },
-      {
-        "key": "unSelectableNodes",
-        "name": "失活节点",
-        "desc": "不可选择的节点",
-        "func": "(data)=>{\n\t\n}"
-      },
-      {
-        "key": "onRightMenus",
-        "name": "定制渲染",
-        "desc": "返回为false时，该操作不可见",
-        "func": "(title, rowData)=>{\n\t\n}"
-      },
-      {
-        "key": "onDoubleClick",
-        "name": "自定义双击事件",
-        "desc": "自定义双击事件，默认为收缩节点",
-        "func": "(rowData)=>{\n\t\n}"
-      }
-    ]
-  }
+{
+  "component": "Tree",
+  "name": "树",
+  "desc": "用于展示和管理具有层级结构的数据。它提供了层级结构、节点展开/折叠、节点选择、节点操作和展示样式等功能和配置选项，使用户能够轻松创建和管理树结构。",
+  "icon": "icon-tree",
+  "group": "advance",
+  "groupName": "高级",
+  "order": 1,
+  "props": [
+    {
+      "key": "id",
+      "desc": "唯一标识",
+      "type": "string",
+      "disabled": true
+    },
+    {
+      "key": "dateset",
+      "name": "数据集",
+      "desc": "选择系统中的可用树形数据集",
+      "type": "_DataSetSelector"
+    },
+    {
+      "key": "showLine",
+      "name": "显示线",
+      "desc": "是否显示树组件的连接线",
+      "type": "boolean",
+      "default": false
+    },
+    {
+      "key": "lazyLoad",
+      "name": "懒加载",
+      "desc": "是否树形组件懒加载",
+      "type": "boolean",
+      "default": false
+    },
+    {
+      "key": "editable",
+      "name": "支持编辑",
+      "desc": "是否支持编辑树",
+      "type": "boolean",
+      "default": false
+    },
+    {
+      "key": "draggable",
+      "name": "支持拖拽",
+      "desc": "是否支持拖拽",
+      "type": "boolean",
+      "default": false
+    },
+    {
+      "key": "defaultExpandDeep",
+      "name": "默认展开层级",
+      "desc": "默认展开多少层级",
+      "type": "select",
+      "options": [
+        {
+          "label": "1",
+          "value": "1"
+        },
+        {
+          "label": "2",
+          "value": "2"
+        },
+        {
+          "label": "3",
+          "value": "3"
+        },
+        {
+          "label": "4",
+          "value": "4"
+        },
+        {
+          "label": "5",
+          "value": "5"
+        },
+        {
+          "label": "全部",
+          "value": "all"
+        }
+      ],
+      "default": 1
+    },
+    {
+      "key": "rowKey",
+      "name": "数据主键key",
+      "desc": "数据主键",
+      "type": "string"
+    },
+    {
+      "key": "actions",
+      "name": "操作项",
+      "desc": "单行操作项",
+      "type": "_ActionSelector"
+    },
+    {
+      "key": "doubleClick",
+      "name": "开启双击事件",
+      "desc": "是否开启双击事件（默认双击收缩节点）",
+      "type": "boolean",
+      "default": true
+    },
+    {
+      "key": "multiple",
+      "name": "多选",
+      "desc": "是否支持多选",
+      "type": "boolean",
+      "default": false
+    }
+  ],
+  "style": {},
+  "advance": {
+    "events": [
+      {
+        "key": "onMount",
+        "name": "组件首次渲染时",
+        "desc": "在组件首次渲染时，执行方法",
+        "func": "(params)=>{\n\t\n}"
+      },
+      {
+        "key": "onUnmount",
+        "name": "组件卸载时",
+        "desc": "在组件卸载时，执行方法。",
+        "func": "(params)=>{\n\t\n}"
+      },
+      {
+        "key": "processDataSource",
+        "name": "数据预处理",
+        "desc": "数据渲染前预处理",
+        "func": "(data)=>{\n\t\n}"
+      },
+      {
+        "key": "onTreeNodeRender",
+        "name": "定制渲染",
+        "desc": "单行树节点渲染",
+        "func": "(title, rowData)=>{\n\t\n}"
+      },
+      {
+        "key": "unSelectableNodes",
+        "name": "失活节点",
+        "desc": "不可选择的节点",
+        "func": "(data)=>{\n\t\n}"
+      },
+      {
+        "key": "onRightMenus",
+        "name": "定制渲染",
+        "desc": "返回为false时，该操作不可见",
+        "func": "(title, rowData)=>{\n\t\n}"
+      },
+      {
+        "key": "onDoubleClick",
+        "name": "自定义双击事件",
+        "desc": "自定义双击事件，默认为收缩节点",
+        "func": "(rowData)=>{\n\t\n}"
+      }
+    ]
+  }
 }

package/es/lowcode/engine/provider/ContextProvider.js

@@ -2,14 +2,15 @@ import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import React, { createContext, useContext, useRef } from 'react';
 import { history } from 'umi';
-import { useMemoizedFn } from 'ahooks';
+import { useMemoizedFn, useSafeState } from 'ahooks';
 import { useLDEventBus } from "./EventBusProvider";
+import usePromiseState from "../tools/usePromiseState";
 import * as topics from "../../constants/event-topics";
 export var Context = /*#__PURE__*/createContext(null);
 export var useLDContext = function useLDContext() {
   return useContext(Context);
 };
-var PRIVATE_KEYS = ['pageCode', 'moduleCode', 'pageData', 'componentList', 'componentMap'];
+var PRIVATE_KEYS = ['pageCode', 'moduleCode', 'componentList', 'componentMap'];
 export default (function (_ref) {
   var children = _ref.children;
   var eventBus = useLDEventBus();
@@ -27,17 +28,15 @@ export default (function (_ref) {
   /**
    * 页面数据
    */
-  var _pageData = useRef(null);
+  var _usePromiseState = usePromiseState(null),
+    _usePromiseState2 = _slicedToArray(_usePromiseState, 2),
+    pageData = _usePromiseState2[0],
+    _setPageData = _usePromiseState2[1];
 
   /**
    * 组件列表
    */
   var _componentList = useRef([]);
-
-  /**
-   * 组件id与组件的映射
-   */
-  var _componentMap = useRef(new Map());
   var _privateGetter = useRef({
     pageCode: function pageCode() {
       return _pageCode.current;
@@ -45,14 +44,11 @@ export default (function (_ref) {
     moduleCode: function moduleCode() {
       return _moduleCode.current;
     },
-    pageData: function pageData() {
-      return _pageData.current;
-    },
     componentList: function componentList() {
       return _componentList.current;
     },
     componentMap: function componentMap() {
-      return _componentMap.current;
+      return new Map(_componentList.current);
     }
   });
 
@@ -62,7 +58,6 @@ export default (function (_ref) {
    * component:ReactNode 组件
    */
   var register = useMemoizedFn(function (id, component) {
-    _componentMap.current.set(id, component);
     _componentList.current.push([id, component]);
   });
 
@@ -71,7 +66,6 @@ export default (function (_ref) {
    * id:string 组件id
    */
   var unregister = useMemoizedFn(function (id) {
-    _componentMap.current.delete(id);
     _componentList.current = _componentList.current.filter(function (_ref2) {
       var _ref3 = _slicedToArray(_ref2, 1),
         _id = _ref3[0];
@@ -129,9 +123,8 @@ export default (function (_ref) {
     value: new Proxy(_objectSpread({
       _pageCode: _pageCode,
       _moduleCode: _moduleCode,
-      _pageData: _pageData,
-      _componentList: _componentList,
-      _componentMap: _componentMap,
+      _setPageData: _setPageData,
+      pageData: pageData,
       history: history,
       topics: topics,
       register: register,

package/es/lowcode/engine/provider/EventBusProvider.js

@@ -4,7 +4,7 @@ import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutPr
 var _excluded = ["topic"];
 import React, { createContext, useContext } from 'react';
 import { useEventEmitter, useCreation, useMemoizedFn } from 'ahooks';
-import lcid from "../tools/lcid";
+import { suid } from '@luck-design-biz/base/utils';
 import { isPromise } from "../tools/helper";
 export var EventBus = /*#__PURE__*/createContext(null);
 export var useLDEventBus = function useLDEventBus() {
@@ -87,7 +87,7 @@ export default (function (_ref) {
   });
   var $subscriber = useMemoizedFn(function (topic) {
     if (!subscriberPool.has(topic)) subscriberPool.set(topic, []);
-    var id = lcid();
+    var id = suid();
     var _subscriber = Subscriber(id);
     subscriberPool.get(topic).push([id, _subscriber]);
     return _subscriber;

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

@@ -1,3 +1,4 @@
+import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _createForOfIteratorHelper from "@babel/runtime/helpers/esm/createForOfIteratorHelper";
 import _typeof from "@babel/runtime/helpers/esm/typeof";
@@ -37,6 +38,12 @@ export function decompress(compressedData) {
  */
 export 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],
@@ -44,7 +51,7 @@ export function findNodeAndParent(id, current) {
     };
   }
   for (var key in current) {
-    if (current[key] && _typeof(current[key]) === 'object' && key !== 'props') {
+    if (current[key] && _typeof(current[key]) === 'object' && key !== 'props' && key !== 'children') {
       var result = findNodeAndParent(id, current[key], current);
       if (result.node) {
         return result;
@@ -133,12 +140,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，表示删除操作。
  */
-export function add(json, path, id, data) {
-  process(json, path, id, data);
+export function add(json, parentId, id, data) {
+  process(json, getPathById(json, parentId), id, data);
 }
 
 /**
@@ -153,7 +160,7 @@ export function modifyById(json, id, data) {
 }
 
 /**
- * 查找指定ID的节点及其父节点。
+ * 删除指定id的节点。
  *
  * @param {Object} json - JSON对象。
  * @param {string} id - 要删除的节点ID。
@@ -185,4 +192,72 @@ export 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属性的数组
+ */
+export 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(_toConsumableArray(path), [node.props]);
+      return true;
+    }
+
+    // 遍历子节点
+    if (node && node.children) {
+      var _iterator2 = _createForOfIteratorHelper(node.children),
+        _step2;
+      try {
+        for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
+          var childId = _step2.value;
+          // 对每个子节点，首先尝试从当前节点获取子节点数据
+          var childNode = node[childId];
+          if (search(childNode, [].concat(_toConsumableArray(path), [node.props]))) {
+            return true;
+          }
+        }
+      } catch (err) {
+        _iterator2.e(err);
+      } finally {
+        _iterator2.f();
+      }
+    }
+    return false;
+  }
+
+  // 从顶层"data"对象开始搜索
+  if (search(data)) {
+    return result;
+  }
+
+  // 如果未找到目标节点，返回空数组
+  return [];
 }

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

@@ -0,0 +1,24 @@
+import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
+import { useRef, useCallback } from 'react';
+import { useSafeState, useDeepCompareEffect } from 'ahooks';
+var usePromiseState = function usePromiseState(initialState) {
+  var _useSafeState = useSafeState(initialState),
+    _useSafeState2 = _slicedToArray(_useSafeState, 2),
+    state = _useSafeState2[0],
+    setState = _useSafeState2[1];
+  var promiseRef = useRef(null);
+  var setStatePromise = useCallback(function (_state) {
+    return new Promise(function (resolve) {
+      promiseRef.current = resolve;
+      setState(_state);
+    });
+  }, []);
+  useDeepCompareEffect(function () {
+    if (promiseRef.current) {
+      promiseRef.current(state);
+      promiseRef.current = null;
+    }
+  }, [state]);
+  return [state, setStatePromise];
+};
+export default usePromiseState;