@luck-design-biz/luckda 1.0.1 → 1.0.2

package/lib/lowcode/engine/meta/js-editor/auto-complete.json

@@ -12,7 +12,20 @@
   {
     "name": "CardList",
     "triggerWord": "cardlist",
-    "completions": []
+    "completions": [
+      {
+        "label": "getInstance",
+        "kind": "method",
+        "insertText": "getInstance",
+        "documentation": "    /**\r\n     * 获取表格实例\r\n     * @method\r\n     */\r"
+      },
+      {
+        "label": "refresh",
+        "kind": "method",
+        "insertText": "refresh",
+        "documentation": "    /**\r\n     * 刷新表格\r\n     * @method\r\n     */\r"
+      }
+    ]
   },
   {
     "name": "Dialog",
@@ -52,7 +65,7 @@
         "label": "open",
         "kind": "property",
         "insertText": "open",
-        "documentation": "    /**\r\n     * 是否打开\r\n     * @property\r\n     */\r"
+        "documentation": "    /**\r\n     * 弹窗打开状态\r\n     * @property\r\n     */\r"
       },
       {
         "label": "doOpen",
@@ -67,10 +80,10 @@
         "documentation": "    /**\r\n     * 关闭弹窗\r\n     * @method\r\n     */\r"
       },
       {
-        "label": "toggle",
+        "label": "setTitle",
         "kind": "method",
-        "insertText": "toggle",
-        "documentation": "    /**\r\n     * @method\r\n     * 切换弹窗\r\n     */\r"
+        "insertText": "setTitle(title)",
+        "documentation": "    /**\r\n     * 设置弹窗标题\r\n     * @method\r\n     * @param {stirng} title -标题\r\n     */\r"
       }
     ]
   },
@@ -92,6 +105,11 @@
       }
     ]
   },
+  {
+    "name": "GroupTree",
+    "triggerWord": "grouptree",
+    "completions": []
+  },
   {
     "name": "Iframe",
     "triggerWord": "iframe",

package/lib/lowcode/engine/meta/link.props.default.json

@@ -9,7 +9,7 @@
   "css": "",
   "textOverflow": false,
   "type": "page",
-  "isLayer": false,
+  "isBlank": true,
   "effect": "hidden",
   "advance": {
     "events": {}

package/lib/lowcode/engine/meta/link.props.json

@@ -9,7 +9,7 @@
   "props": [
     {
       "key": "id",
-      "desc": "唯一标识",
+      "name": "唯一标识",
       "type": "string",
       "disabled": true
     },
@@ -22,8 +22,8 @@
     {
       "key": "textOverflow",
       "name": "单行截断",
-      "desc": "文字超过一行，使甲...显示；开后此项后，同时会显示html标签的title",
-      "type": "boolean",
+      "desc": "文字超过一行，使用...显示；开后此项后，同时会显示html标签的title",
+      "type": "switch",
       "default": false
     },
     {
@@ -50,16 +50,16 @@
       "type": "string"
     },
     {
-      "key": "isLayer",
-      "name": "弹窗打开",
-      "desc": "是否以弹窗形式打开",
-      "type": "boolean",
-      "default": false
+      "key": "isBlank",
+      "name": "新开页面",
+      "desc": "是否新开页面",
+      "type": "switch",
+      "default": true
     },
     {
       "key": "params",
       "name": "携带参数",
-      "desc": "超链的携带参数",
+      "desc": "超链的携带参数，key=value形式，多个参数中间用&拼接，例如：pageNo=1&pageSize=20",
       "type": "string"
     },
     {

package/lib/lowcode/engine/meta/table.props.json

@@ -168,7 +168,7 @@
             "default": {
               "todoList": []
             },
-            "defaultCode": "function onBatchOperationsClick(key, selectedRows) {\n\n}",
+            "defaultCode": "function onBatchOperationsClick(key, selectedRows, cb) {\n\n}",
             "suppressDisplay": true,
             "suppressMax": true,
             "suppressMore": true,

package/lib/lowcode/engine/meta/tabs.props.default.json

@@ -12,7 +12,7 @@
       "id": "tab_lvwdncx1",
       "name": "标签项",
       "active": true,
-      "destory": false,
+      "destory": true,
       "serial": null,
       "serialEffect": "hidden"
     }

package/lib/lowcode/engine/meta/tabs.props.json

@@ -23,7 +23,7 @@
           "id": "tab_lvwdncx1",
           "name": "标签项",
           "active": true,
-          "destory": false,
+          "destory": true,
           "serial": null,
           "serialEffect": "hidden"
         }

package/lib/lowcode/engine/meta/tree.props.json

@@ -9,7 +9,7 @@
   "props": [
     {
       "key": "id",
-      "desc": "唯一标识",
+      "name": "唯一标识",
       "type": "string",
       "disabled": true
     },
@@ -194,7 +194,7 @@
       "props": [
         {
           "key": "cancelSelect",
-          "name": "取消选中",
+          "name": "允许取消选中",
           "desc": "是否可以取消选中",
           "type": "switch",
           "default": true

package/lib/lowcode/engine/provider/ContextProvider/index.js

@@ -75,11 +75,15 @@ var _default = exports.default = function _default(_ref) {
     _componentList.current.push([id, component]);
   });
   var _unregister = (0, _ahooks.useMemoizedFn)(function (id) {
-    _componentList.current = _componentList.current.filter(function (_ref2) {
+    var index = _componentList.current.findIndex(function (_ref2) {
       var _ref3 = (0, _slicedToArray2.default)(_ref2, 1),
         _id = _ref3[0];
-      return _id !== id;
+      return _id === id;
     });
+    if (index !== -1) {
+      _componentList.current.splice(index, 1);
+    }
+    ;
   });
   var _initRemoteApiMap = (0, _ahooks.useMemoizedFn)(function (_apiMap) {
     _remoteApiMap.current = _apiMap;

package/lib/lowcode/engine/provider/ContextProvider/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.setNeedPrompt = exports.resetPageData = exports.modifyNode = exports.getSelfAndParent = exports.getNeedPrompt = exports.getModuleData = exports.getLevelNodes = exports.deleteNode = exports.default = exports.clearChildren = exports.addNode = void 0;
+exports.useTemporalStore = exports.useTask = exports.useGet = exports.setNeedPrompt = exports.resetPageData = exports.moveNode = exports.modifyNode = exports.getSelfAndParent = exports.getNeedPrompt = exports.getModuleData = exports.getLevelNodes = 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");
@@ -264,13 +264,93 @@ var modifyNode = exports.modifyNode = function modifyNode(id, data) {
     });
   });
 };
+
+/**
+ * 移动页面中的一个节点到另一个位置。
+ * 
+ * @param {string} sid - 源节点的ID。
+ * @param {string} tid - 目标节点的ID。
+ * @param {string} action - 移动类型，可以是 'inside', 'left', 'right' 中的一个。
+ * @param {string} newid - 新节点的ID，仅在创建新节点时使用。
+ * @param {Object} json - 新节点的初始属性，仅在创建新节点时使用。
+ * 
+ * @description
+ * 此函数会更新页面数据状态，根据提供的动作类型（`action`），将源节点（`sourceNode`）移动到目标节点（`targetNode`）的相应位置。
+ * - 'inside': 将源节点作为目标节点的子节点。
+ * - 'left': 将源节点放在目标节点的左边（同一父节点下）。
+ * - 'right': 将源节点放在目标节点的右边（同一父节点下）。
+ * 如果 `sid` 是空但提供了 `newid`，则函数会创建一个新的节点。
+ * 
+ */
+var moveNode = exports.moveNode = function moveNode(sid, tid, action, newid, json) {
+  usePageDataStore.setState(function (state) {
+    var sourceNode;
+    var sourceParent;
+    if (sid) {
+      var sourceData = findNode(state.pageData, sid) || {};
+      sourceNode = sourceData === null || sourceData === void 0 ? void 0 : sourceData.target;
+      sourceParent = sourceData === null || sourceData === void 0 ? void 0 : sourceData.parent;
+    } else if (newid) {
+      sid = newid;
+      sourceNode = {
+        props: (0, _objectSpread2.default)((0, _objectSpread2.default)({}, json), {}, {
+          id: newid
+        })
+      };
+    }
+    var _ref4 = findNode(state.pageData, tid) || {},
+      targetNode = _ref4.target,
+      targetParent = _ref4.parent;
+    if (!sourceNode || !targetNode) {
+      console.error('Source or target node does not exist.');
+      return;
+    }
+    if (sourceParent) {
+      sourceParent.children.splice(sourceParent.children.indexOf(sid), 1);
+      if (sourceParent.children.length === 0) {
+        delete sourceParent['children'];
+      }
+      delete sourceParent[sid];
+    }
+    switch (action) {
+      case 'inside':
+        if (!targetNode.hasOwnProperty('children')) {
+          targetNode.children = [];
+        }
+        targetNode.children.push(sid);
+        sourceNode.props.parentId = tid;
+        targetNode[sid] = sourceNode;
+        break;
+      case 'left':
+      case 'right':
+        if (!targetParent) {
+          console.error('Target node must have a parent for left or right operations.');
+          return;
+        }
+        var idx = targetParent.children.indexOf(tid);
+        if (idx === -1) {
+          console.error("Target node is not found in its parent's children list.");
+          return;
+        }
+        if (action === 'right') {
+          idx++;
+        }
+        targetParent.children.splice(idx, 0, sid);
+        sourceNode.props.parentId = targetParent.props.id;
+        targetParent[sid] = sourceNode;
+        break;
+      default:
+        break;
+    }
+  });
+};
 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;
+    var _ref5 = findNode(state.pageData, id) || {},
+      target = _ref5.target;
     if (!target) return;
     (0, _lodash.forEach)(target.children, function (c) {
       delete target[c];

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

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.executeCode = executeCode;
 exports.extractKeywords = extractKeywords;
+exports.findFirstLeafNode = findFirstLeafNode;
 exports.getCtx = getCtx;
 exports.getFuncBody = getFuncBody;
 exports.getLDMetaAttr = getLDMetaAttr;
@@ -260,4 +261,25 @@ function loadScript(path) {
     ref: script,
     status: script.getAttribute('data-status') || 'ready'
   };
+}
+function findFirstLeafNode(node) {
+  if (!node.children || node.children.length === 0) {
+    return node;
+  }
+  var _iterator2 = (0, _createForOfIteratorHelper2.default)(node.children),
+    _step2;
+  try {
+    for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
+      var child = _step2.value;
+      var leaf = findFirstLeafNode(child);
+      if (leaf) {
+        return leaf;
+      }
+    }
+  } catch (err) {
+    _iterator2.e(err);
+  } finally {
+    _iterator2.f();
+  }
+  return null;
 }

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

@@ -14,6 +14,7 @@ var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/h
 var _react = _interopRequireWildcard3(require("react"));
 var _umi = require("umi");
 var _ahooks = require("ahooks");
+var _antd = require("luck-design/antd");
 var _lodash = require("lodash");
 var _ContextProvider = require("../provider/ContextProvider");
 var _constants = require("../../constants");
@@ -70,7 +71,18 @@ function useCanvasRender(data, deps) {
               return _loader.apply(this, arguments);
             }
             return loader;
-          }()
+          }(),
+          loading: function loading() {
+            return /*#__PURE__*/_react.default.createElement(_antd.Skeleton, {
+              active: true,
+              title: {
+                width: '70%'
+              },
+              paragraph: {
+                rows: 7
+              }
+            });
+          }
         });
       }
       var renderable = true;

package/lib/lowcode/painter/Components.js

@@ -18,6 +18,7 @@ var _core = require("@dnd-kit/core");
 var _components = _interopRequireDefault(require("./style/components.less"));
 var _componentsList = _interopRequireDefault(require("../engine/meta/components-list.json"));
 var _DragDropContext = require("./components/DragDrop/DragDropContext");
+var _expect = _interopRequireDefault(require("./expect.jsx"));
 var TabPane = _antd.Tabs.TabPane;
 var Search = _antd.Input.Search;
 var BaseCom = function BaseCom(_ref) {
@@ -133,6 +134,10 @@ var Components = function Components(_ref3) {
       label: '自定义组件'
     }),
     key: "dataset"
-  }, "\u656C\u8BF7\u671F\u5F85")));
+  }, /*#__PURE__*/_react.default.createElement(_expect.default, {
+    style: {
+      paddingTop: '80px'
+    }
+  }))));
 };
 var _default = exports.default = Components;

package/lib/lowcode/painter/Design.js

@@ -76,6 +76,7 @@ var Design = function Design() {
     locale: locale,
     onLangChange: handleLangChange
   }), /*#__PURE__*/_react.default.createElement("div", {
+    id: "design-workspace",
     className: _design.default['lc-painter-design-workspace']
   }, /*#__PURE__*/_react.default.createElement(_DesignOperator.default, {
     canvas: simulatorRef

package/lib/lowcode/painter/DesignOperator.js

@@ -11,6 +11,7 @@ var _react = _interopRequireWildcard(require("react"));
 var _lodash = require("lodash");
 var _ahooks = require("ahooks");
 var _antd = require("luck-design/antd");
+var _classnames = _interopRequireDefault(require("classnames"));
 var _utils = require("@luck-design-biz/base/utils");
 var _ContextProvider = require("../engine/provider/ContextProvider");
 var _constants = require("../constants");
@@ -32,7 +33,7 @@ var getOperatorStyle = function getOperatorStyle(canvas, cellNode) {
   };
 };
 var DesignOperator = function DesignOperator(_ref) {
-  var _getElement, _getElement2;
+  var _getElement2;
   var canvas = _ref.canvas;
   var context = (0, _ContextProvider.useContext)();
   var size = (0, _ahooks.useSize)(canvas);
@@ -76,7 +77,9 @@ var DesignOperator = function DesignOperator(_ref) {
         context.$publisher(context.topics.COMPONENT_APPEND, {
           id: _id
         });
-        handleSelect(_id);
+        setTimeout(function () {
+          handleSelect(_id);
+        });
       }
     }).watch();
     var json = require("../engine/meta/".concat(data.component.toLowerCase(), ".props.default.json"));
@@ -117,6 +120,15 @@ var DesignOperator = function DesignOperator(_ref) {
       }))
     };
   }, [operatorId.selector]);
+  var activeDomPosition = (0, _ahooks.useCreation)(function () {
+    var _getElement;
+    if (!operatorId.selector && !operatorId.selectorTarget) return null;
+    var targetTop = (_getElement = getElement((0, _lodash.isNil)(operatorId.selectorTarget) ? operatorId.selector : operatorId.selectorTarget.element)) === null || _getElement === void 0 ? void 0 : _getElement.getBoundingClientRect().top;
+    var delat = targetTop - canvas.current.getBoundingClientRect().top;
+    return {
+      top: delat > 24 ? -24 : 0
+    };
+  }, [operatorId.selector, operatorId.selectorTarget]);
   var lastDetectorName = (0, _ahooks.useCreation)(function () {
     var _last;
     return operatorId.detector && (0, _lodash.isString)(operatorId.detector) ? (_last = (0, _lodash.last)(context.componentMap.get(operatorId.detector).api.getLevelNodes())) === null || _last === void 0 ? void 0 : _last.name : void 0;
@@ -218,9 +230,11 @@ var DesignOperator = function DesignOperator(_ref) {
     }).watch();
     var hcid = context.$subscriber(context.topics.COMPONENT_HOVER).on(function (payload) {
       if (payload.target) setOperatorId({
-        detector: payload.target
+        detector: payload.target,
+        detectorSide: payload.side
       });else setOperatorId({
-        detector: null
+        detector: null,
+        detectorSide: null
       });
     }).watch();
     var acid = context.$subscriber(context.topics.COMPONENT_ACTIVE).on(function (payload) {
@@ -231,14 +245,16 @@ var DesignOperator = function DesignOperator(_ref) {
             selector: payload.target,
             selectorTarget: null,
             deletable: !node || node.props.buildIn !== true,
-            detector: null
+            detector: null,
+            detectorSide: null
           });
         } else {
           setOperatorId({
             selector: payload.target.id,
             selectorTarget: payload.target,
             deletable: false,
-            detector: null
+            detector: null,
+            detectorSide: null
           });
         }
       } else {
@@ -293,12 +309,12 @@ var DesignOperator = function DesignOperator(_ref) {
   }, [operatorId.selector]);
   return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, operatorId.detector && /*#__PURE__*/_react.default.createElement("div", {
     id: "lc-detector",
-    className: _design.default['lc-painter-design-detector'],
+    className: (0, _classnames.default)(_design.default['lc-painter-design-detector'], _design.default["sider-".concat(operatorId.detectorSide)]),
     style: getOperatorStyle(canvas.current, getElement(operatorId.detector))
   }, /*#__PURE__*/_react.default.createElement("span", {
     className: _design.default['lc-painter-design-detector-name'],
     style: {
-      top: ((_getElement = getElement(operatorId.detector)) === null || _getElement === void 0 ? void 0 : _getElement.offsetTop) < 23 ? 0 : '-23px'
+      top: ((_getElement2 = getElement(operatorId.detector)) === null || _getElement2 === void 0 ? void 0 : _getElement2.offsetTop) < 23 ? 0 : '-23px'
     }
   }, lastDetectorName ? "".concat(lastDetectorName, "(").concat(operatorId.detector, ")") : null)), operatorId.selector && /*#__PURE__*/_react.default.createElement("div", {
     id: "lc-selector",
@@ -307,13 +323,7 @@ var DesignOperator = function DesignOperator(_ref) {
     style: getOperatorStyle(canvas.current, getElement((0, _lodash.isNil)(operatorId.selectorTarget) ? operatorId.selector : operatorId.selectorTarget.element))
   }, acticeProps && /*#__PURE__*/_react.default.createElement("div", {
     className: _design.default['lc-borders-actions'],
-    style: acticeProps.props.id === _constants.LC_BUILDIN_UNIT_KEY.PAGE_ROOT ? {
-      top: 0
-    } : ((_getElement2 = getElement((0, _lodash.isNil)(operatorId.selectorTarget) ? operatorId.selector : operatorId.selectorTarget.element)) === null || _getElement2 === void 0 ? void 0 : _getElement2.offsetTop) < 23 ? {
-      bottom: '-23px'
-    } : {
-      top: '-23px'
-    }
+    style: activeDomPosition
   }, /*#__PURE__*/_react.default.createElement(_antd.Dropdown, {
     overlay: acticeProps.menu,
     placement: "bottomLeft"