@luck-design-biz/luckda 0.0.25-23 → 0.0.25-24

package/es/components/LdTree/index.js

@@ -7,18 +7,29 @@ import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutPr
 var _excluded = ["columns", "resources", "actions", "doAction", "wrapperRef", "ldId", "dataSetKey", "defaultParmas", "moduleCode", "readOnly", "title", "rowKey", "treeNodeTitle", "unselectableNodes", "rightMenus", "defaultExpandDeep", "draggable", "onDrop", "className", "treeClassName", "rootAdd", "suppressInit", "afterQuery", "afterInit", "isTree", "service", "dataToTreeFormat", "boxRef", "doubleClickExpand", "onNodeDoubleClick", "width", "height", "treeNodeCheckable", "treeNodeDisableCheckbox", "treeNodeDisable", "treeNodeIcon", "asyncLoad", "parentKey", "onMount", "onUnmount", "onDataSetChange", "onTreeNodeRender", "onlyRoot"],
   _excluded2 = ["onClick"];
 import React, { useState, useRef, useImperativeHandle, forwardRef, useLayoutEffect } from 'react';
-import { isFunction, isNumber, transform, includes, remove, cloneDeep, isNil, differenceBy } from 'lodash';
+import { isFunction, isNumber, transform, includes, remove, cloneDeep, isNil, differenceBy, groupBy, forEach, assign } from 'lodash';
 import { useRequest, useMemoizedFn, useCreation } from 'ahooks';
 import PropTypes from 'prop-types';
 import classNames from 'classnames';
 import { Icon, Popover } from 'luck-design/antd';
 import { LuckTree } from 'luck-design';
-import { formatMessage, dataToTree, dragTreeData, flattenTree } from '@luck-design-biz/base/utils';
+import { formatMessage, dataToTree, dragTreeData } from '@luck-design-biz/base/utils';
 import { TreeBox } from '@luck-design-biz/base';
 import ldBuilder from "../../helper/ldBuilder";
 import { behaviorCall } from "../../utils";
 import styles from "./index.less";
-var PRIMARY = window.appConfig.constraintKeys.PRIMARY;
+var _window$appConfig$con = window.appConfig.constraintKeys,
+  PRIMARY = _window$appConfig$con.PRIMARY,
+  PARENT = _window$appConfig$con.PARENT;
+var deepForEach = function deepForEach(children, deepForEachFn) {
+  forEach(children, function (child) {
+    var _child$children;
+    if (((_child$children = child.children) === null || _child$children === void 0 ? void 0 : _child$children.length) > 0) {
+      deepForEach(child.children, deepForEachFn);
+    }
+    deepForEachFn(child);
+  });
+};
 var LdTree = function LdTree(_ref) {
   var columns = _ref.columns,
     resources = _ref.resources,
@@ -128,26 +139,37 @@ var LdTree = function LdTree(_ref) {
     run(_objectSpread(_objectSpread(_objectSpread({}, params[0]), _params), defaultParams[0]));
   });
   var handleUpdateTree = function handleUpdateTree(type, nodes) {
-    var data = [];
-    var flattenData = flattenTree(dataSource);
+    var data = cloneDeep(dataSource);
+    var nodesGroup = groupBy(nodes, PARENT);
     switch (type) {
       case 'delete':
-        data = differenceBy(flattenData, nodes, window.appConfig.constraintKeys.PRIMARY);
+        deepForEach(data, function (child) {
+          if (nodesGroup[child[PRIMARY]]) {
+            var _child$children2;
+            if (((_child$children2 = child.children) === null || _child$children2 === void 0 ? void 0 : _child$children2.length) <= nodesGroup[child[PRIMARY]].length) child.isleaf = true;
+            child.children = differenceBy(child.children, nodesGroup[child[PRIMARY]], window.appConfig.constraintKeys.PRIMARY);
+          }
+        });
         break;
       case 'add':
-        data = [].concat(_toConsumableArray(flattenData), _toConsumableArray(nodes));
+        deepForEach(data, function (child) {
+          if (nodesGroup[child[PRIMARY]]) {
+            child.isleaf = false;
+            child.children = [].concat(_toConsumableArray(child.children || []), _toConsumableArray(nodesGroup[child[PRIMARY]]));
+          }
+        });
         break;
       default:
-        data = flattenData.map(function (i) {
+        deepForEach(data, function (child) {
           var findNode = nodes.find(function (n) {
-            return n[PRIMARY] === i[PRIMARY];
+            return n[PRIMARY] === child[PRIMARY];
           });
-          if (findNode) return _objectSpread(_objectSpread({}, i), findNode);
-          return i;
+          if (findNode) {
+            assign(child, findNode);
+          }
         });
     }
-    var treeData = dataToTreeFormat ? dataToTreeFormat(data) : dataToTree(data, null, window.appConfig.constraintKeys.PRIMARY, window.appConfig.constraintKeys.PARENT);
-    setDataSource(treeData);
+    setDataSource(data);
   };
   useImperativeHandle(wrapperRef, function () {
     return _objectSpread(_objectSpread({}, treeRef.current), {}, {
@@ -233,7 +255,7 @@ var LdTree = function LdTree(_ref) {
         disabled: treeNodeDisable && treeNodeDisable(item)
       };
       if (treeNodeIcon && !isNil(treeNodeIcon(item))) props.icon = treeNodeIcon(item);
-      if (!item.isleaf) {
+      if (!item.isleaf && !isNil(item.isleaf)) {
         return /*#__PURE__*/React.createElement(LuckTree.TreeNode, _extends({
           isLeaf: false
         }, props), renderTreeNodes(item.children || []));

package/es/lowcode/painter/DesignToolbar.js

@@ -143,7 +143,6 @@ var DesignToolbar = function DesignToolbar(_ref) {
       getContainer: function getContainer() {
         return document.getElementById('lc-design-workspace');
       },
-      zIndex: 3000,
       onOk: function onOk() {
         return runClearCache({
           moduleCode: getLDMetaAttr('moduleCode')
@@ -347,7 +346,6 @@ var DesignToolbar = function DesignToolbar(_ref) {
     getContainer: function getContainer() {
       return document.getElementById('lc-design-workspace');
     },
-    zIndex: 3000,
     onOk: handleOk,
     onCancel: function onCancel() {
       return setShow(false);
@@ -382,9 +380,6 @@ var DesignToolbar = function DesignToolbar(_ref) {
       style: {
         width: 180
       },
-      dropdownStyle: {
-        zIndex: 3100
-      },
       filterOption: false,
       labelInValue: true,
       showSearch: true,
@@ -410,9 +405,7 @@ var DesignToolbar = function DesignToolbar(_ref) {
     })))),
     placement: "bottom",
     height: "94vh",
-    footer: false
-    // zIndex={3000}
-    ,
+    footer: false,
     headerStyle: {
       padding: '0 48px 0 24px'
     },

package/es/lowcode/painter/Ribbon.js

@@ -14,7 +14,7 @@ var _DRAWER_PROPS = {
   placement: 'left',
   mask: false,
   getContainer: false,
-  zIndex: 2000,
+  zIndex: 20,
   headerStyle: {
     borderBottom: 'none'
   },

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

@@ -178,7 +178,6 @@ var ActionBindModal = function ActionBindModal(_ref) {
     getContainer: function getContainer() {
       return document.getElementById('lc-design-workspace');
     },
-    zIndex: 3000,
     onCancel: handleClose,
     onOk: handleComfirm
   }, /*#__PURE__*/React.createElement("div", {
@@ -278,8 +277,7 @@ var ActionBindModal = function ActionBindModal(_ref) {
     }),
     getPopupContainer: function getPopupContainer() {
       return document.getElementById('lc-design-workspace');
-    },
-    zIndex: 3000
+    }
   }, /*#__PURE__*/React.createElement(Icon, {
     style: {
       marginLeft: 4

package/es/lowcode/painter/components/DragDrop/DragDropContext.js

@@ -54,7 +54,7 @@ export default function (_ref) {
     onDragMove: handleDragMove
   }, children, /*#__PURE__*/React.createElement(DragOverlay, {
     style: {
-      zIndex: 2001
+      zIndex: 21
     },
     dropAnimation: null
   }, active && /*#__PURE__*/React.createElement(Overlay, null, active === null || active === void 0 || (_active$component = active.component) === null || _active$component === void 0 ? void 0 : _active$component.name))));

package/es/lowcode/painter/components/code-editor/BaseEditor.js

@@ -4,10 +4,7 @@ import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutPr
 var _excluded = ["onChange", "isFullscreen", "style"],
   _excluded2 = ["children", "language", "options"];
 import React, { useEffect, useRef, useImperativeHandle, forwardRef } from 'react';
-import { useMemoizedFn } from 'ahooks';
 import * as monaco from 'monaco-editor';
-import prettier from 'prettier/standalone';
-import parserBabel from 'prettier/parser-babel';
 
 /**
  * BaseEditor 组件是一个封装了 monaco 编辑器的 React 组件，支持前向 ref 引用。
@@ -55,14 +52,6 @@ var BaseEditor = /*#__PURE__*/forwardRef(function (_ref, ref) {
     rest = _objectWithoutProperties(props, _excluded2);
   var editorRef = useRef(null);
   var editorInstance = useRef(null);
-  var prettierFormetter = useMemoizedFn(function (unformattedCode) {
-    return prettier.format(unformattedCode, {
-      parser: 'babel',
-      plugins: [parserBabel],
-      tabWidth: 2,
-      useTabs: false
-    });
-  });
 
   // 初始化编辑器实例
   useEffect(function () {
@@ -87,14 +76,6 @@ var BaseEditor = /*#__PURE__*/forwardRef(function (_ref, ref) {
           onDidChangeStorage: function onDidChangeStorage() {}
         }
       });
-      var originalGetValue = editorInstance.current.getValue.bind(editorInstance.current);
-      editorInstance.current.getValue = function () {
-        return prettierFormetter(originalGetValue());
-      };
-      editorInstance.current.addCommand(monaco.KeyMod.CtrlCmd | monaco.KeyMod.Shift | monaco.KeyCode.KeyF, function () {
-        var formattedCode = prettierFormetter(originalGetValue());
-        editorInstance.current.setValue(formattedCode);
-      });
       editorInstance.current.onDidChangeModelContent(function (event) {
         if (onChange) onChange(editorInstance.current.getValue(), event);
       });

package/es/lowcode/painter/components/code-editor/JSEditor.js

@@ -7,7 +7,9 @@ import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 var _excluded = ["children", "keywords"];
 import React, { useEffect, forwardRef } from 'react';
 import * as monaco from 'monaco-editor';
-import { isNil } from 'lodash';
+import { isNil, uniqBy, compact } from 'lodash';
+import prettier from 'prettier/standalone';
+import parserBabel from 'prettier/parser-babel';
 import BaseEditor from "./BaseEditor";
 function capitalizeFirstLetter(string) {
   if (isNil(string)) return null;
@@ -72,7 +74,7 @@ var setupAutocomplete = /*#__PURE__*/function () {
                 allCompletionItems = allCompletionItems.concat(items);
               });
               return {
-                suggestions: allCompletionItems
+                suggestions: uniqBy(compact(allCompletionItems), 'label')
               };
             },
             triggerCharacters: ['.', "'", '"'] // 当用户输入点号时触发补全
@@ -87,6 +89,20 @@ var setupAutocomplete = /*#__PURE__*/function () {
     return _ref.apply(this, arguments);
   };
 }();
+var prettierFormetter = function prettierFormetter(unformattedCode) {
+  try {
+    var formattedCode = prettier.format(unformattedCode, {
+      parser: 'babel',
+      plugins: [parserBabel],
+      tabWidth: 2,
+      useTabs: false
+    });
+    return formattedCode;
+  } catch (e) {
+    console.error('Prettier formatting error:', e);
+    return unformattedCode;
+  }
+};
 
 /**
  * JSEditor 组件是一个专为 JavaScript 编辑设计的 React 组件，它基于 BaseEditor 组件构建，并集成了自动完成功能。
@@ -114,6 +130,14 @@ var JSEditor = /*#__PURE__*/forwardRef(function (_ref2, ref) {
     keywords = _ref2.keywords,
     rest = _objectWithoutProperties(_ref2, _excluded);
   useEffect(function () {
+    var originalGetValue = ref.current.editor.getValue.bind(ref.current.editor);
+    ref.current.editor.getValue = function () {
+      return prettierFormetter(originalGetValue());
+    };
+    ref.current.editor.addCommand(monaco.KeyMod.CtrlCmd | monaco.KeyMod.Shift | monaco.KeyCode.KeyF, function () {
+      var formattedCode = prettierFormetter(originalGetValue());
+      ref.current.editor.setValue(formattedCode);
+    });
     setupAutocomplete(monaco, keywords);
   }, []);
   return /*#__PURE__*/React.createElement(BaseEditor, _extends({

package/es/lowcode/painter/components/field-setting/FieldAttrsModal.js

@@ -200,7 +200,6 @@ var FieldAttrsModal = Form.create({
       getContainer: function getContainer() {
         return document.getElementById('lc-design-workspace');
       },
-      zIndex: 1001,
       onOk: function () {
         var _onOk = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
           var subData, _yield$fetchDelAttrs, code;
@@ -253,7 +252,6 @@ var FieldAttrsModal = Form.create({
     getContainer: function getContainer() {
       return document.getElementById('lc-design-workspace');
     },
-    zIndex: 1001,
     destroyOnClose: true,
     bodyStyle: {
       marginTop: 0,

package/es/lowcode/painter/components/field-setting/FieldRulesModal.js

@@ -107,7 +107,6 @@ var FieldRulesModal = Form.create({
     getContainer: function getContainer() {
       return document.getElementById('lc-design-workspace');
     },
-    zIndex: 1001,
     destroyOnClose: true,
     okButtonProps: {
       loading: loading

package/es/lowcode/painter/components/field-setting/SettingUI.js

@@ -208,7 +208,6 @@ var SettingUI = function SettingUI(_ref) {
               getContainer: function getContainer() {
                 return document.getElementById('lc-design-workspace');
               },
-              zIndex: 1001,
               onOk: function () {
                 var _onOk = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
                   var success;

package/es/lowcode/painter/panel-section/FieldsSetting.js

@@ -319,8 +319,7 @@ var FieldsSetting = function FieldsSetting(_ref) {
     style: {
       position: 'absolute',
       transform: 'none',
-      right: 320,
-      zIndex: 1001
+      right: 320
     }
   }, drawerType === 'single' ? /*#__PURE__*/React.createElement(FieldSetting, {
     key: fieldId,

package/es/lowcode/painter/style/design.less

@@ -7,7 +7,7 @@
   pointer-events: none;
   cursor: pointer;
   overflow: visible;
-  z-index: 1001;
+  z-index: 11;
 }
 
 .selector-item {
@@ -142,7 +142,7 @@
 }
 
 .next-overlay-wrapper {
-  z-index: 3000;
+  z-index: 30;
   display: flex;
   flex-direction: column;
   & > div > span {

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

@@ -20,7 +20,6 @@ var FunctionDesign = function FunctionDesign(_ref) {
   var ctx = useContext();
   useImperativeHandle(apiRef, function () {
     return {
-      open: true,
       doOpen: function doOpen() {
         ctx.componentMap.get(id).api.getSelfDom().closest('.ant-modal-root').style.display = 'block';
       },
@@ -47,8 +46,13 @@ var FunctionDesign = function FunctionDesign(_ref) {
       position: 'absolute'
     }
   }, props, {
-    defaultOpen: true,
-    $apiRef: apiRef
+    $apiRef: apiRef,
+    $designProps: {
+      closable: false,
+      maskClosable: false,
+      visible: true,
+      zIndex: 10
+    }
   }), children);
 };
 export default FunctionDesign;

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

@@ -36,7 +36,8 @@ var LCDialog = function LCDialog(_ref) {
     footer = _ref.footer,
     btnGroup = _ref.btnGroup,
     advance = _ref.advance,
-    $apiRef = _ref.$apiRef;
+    $apiRef = _ref.$apiRef,
+    $designProps = _ref.$designProps;
   var ctx = useContext();
   var apiRef = useRef();
   var domRef = useRef();
@@ -170,7 +171,7 @@ var LCDialog = function LCDialog(_ref) {
       return setOpen(false);
     },
     destroyOnClose: destroyOnClose
-  }), /*#__PURE__*/React.createElement("div", {
+  }, $designProps), /*#__PURE__*/React.createElement("div", {
     style: {
       height: 0,
       width: 0,

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

@@ -107,11 +107,11 @@ var LCTree = function LCTree(_ref) {
   var handleSelect = useMemoizedFn(function (_selectedKeys, e) {
     if (cancelSelect || e.selected) {
       setSelectedKeys(_selectedKeys);
+      ctx.doAction(advance.events.onSelect, {
+        checkedKeys: _selectedKeys,
+        e: e
+      });
     }
-    ctx.doAction(advance.events.onSelect, {
-      checkedKeys: _selectedKeys,
-      e: e
-    });
   });
   var afterInit = useMemoizedFn(function (treeData, data) {
     var selected = !isNil(defaultSelect) ? executeCode(ctx, defaultSelect, ['treeData'], treeData) : null;

package/lib/components/LdTree/index.js

@@ -26,7 +26,18 @@ var _utils2 = require("../../utils");
 var _index = _interopRequireDefault(require("./index.less"));
 var _excluded = ["columns", "resources", "actions", "doAction", "wrapperRef", "ldId", "dataSetKey", "defaultParmas", "moduleCode", "readOnly", "title", "rowKey", "treeNodeTitle", "unselectableNodes", "rightMenus", "defaultExpandDeep", "draggable", "onDrop", "className", "treeClassName", "rootAdd", "suppressInit", "afterQuery", "afterInit", "isTree", "service", "dataToTreeFormat", "boxRef", "doubleClickExpand", "onNodeDoubleClick", "width", "height", "treeNodeCheckable", "treeNodeDisableCheckbox", "treeNodeDisable", "treeNodeIcon", "asyncLoad", "parentKey", "onMount", "onUnmount", "onDataSetChange", "onTreeNodeRender", "onlyRoot"],
   _excluded2 = ["onClick"];
-var PRIMARY = window.appConfig.constraintKeys.PRIMARY;
+var _window$appConfig$con = window.appConfig.constraintKeys,
+  PRIMARY = _window$appConfig$con.PRIMARY,
+  PARENT = _window$appConfig$con.PARENT;
+var deepForEach = function deepForEach(children, deepForEachFn) {
+  (0, _lodash.forEach)(children, function (child) {
+    var _child$children;
+    if (((_child$children = child.children) === null || _child$children === void 0 ? void 0 : _child$children.length) > 0) {
+      deepForEach(child.children, deepForEachFn);
+    }
+    deepForEachFn(child);
+  });
+};
 var LdTree = function LdTree(_ref) {
   var columns = _ref.columns,
     resources = _ref.resources,
@@ -136,26 +147,37 @@ var LdTree = function LdTree(_ref) {
     run((0, _objectSpread3.default)((0, _objectSpread3.default)((0, _objectSpread3.default)({}, params[0]), _params), defaultParams[0]));
   });
   var handleUpdateTree = function handleUpdateTree(type, nodes) {
-    var data = [];
-    var flattenData = (0, _utils.flattenTree)(dataSource);
+    var data = (0, _lodash.cloneDeep)(dataSource);
+    var nodesGroup = (0, _lodash.groupBy)(nodes, PARENT);
     switch (type) {
       case 'delete':
-        data = (0, _lodash.differenceBy)(flattenData, nodes, window.appConfig.constraintKeys.PRIMARY);
+        deepForEach(data, function (child) {
+          if (nodesGroup[child[PRIMARY]]) {
+            var _child$children2;
+            if (((_child$children2 = child.children) === null || _child$children2 === void 0 ? void 0 : _child$children2.length) <= nodesGroup[child[PRIMARY]].length) child.isleaf = true;
+            child.children = (0, _lodash.differenceBy)(child.children, nodesGroup[child[PRIMARY]], window.appConfig.constraintKeys.PRIMARY);
+          }
+        });
         break;
       case 'add':
-        data = [].concat((0, _toConsumableArray2.default)(flattenData), (0, _toConsumableArray2.default)(nodes));
+        deepForEach(data, function (child) {
+          if (nodesGroup[child[PRIMARY]]) {
+            child.isleaf = false;
+            child.children = [].concat((0, _toConsumableArray2.default)(child.children || []), (0, _toConsumableArray2.default)(nodesGroup[child[PRIMARY]]));
+          }
+        });
         break;
       default:
-        data = flattenData.map(function (i) {
+        deepForEach(data, function (child) {
           var findNode = nodes.find(function (n) {
-            return n[PRIMARY] === i[PRIMARY];
+            return n[PRIMARY] === child[PRIMARY];
           });
-          if (findNode) return (0, _objectSpread3.default)((0, _objectSpread3.default)({}, i), findNode);
-          return i;
+          if (findNode) {
+            (0, _lodash.assign)(child, findNode);
+          }
         });
     }
-    var treeData = dataToTreeFormat ? dataToTreeFormat(data) : (0, _utils.dataToTree)(data, null, window.appConfig.constraintKeys.PRIMARY, window.appConfig.constraintKeys.PARENT);
-    setDataSource(treeData);
+    setDataSource(data);
   };
   (0, _react.useImperativeHandle)(wrapperRef, function () {
     return (0, _objectSpread3.default)((0, _objectSpread3.default)({}, treeRef.current), {}, {
@@ -241,7 +263,7 @@ var LdTree = function LdTree(_ref) {
         disabled: treeNodeDisable && treeNodeDisable(item)
       };
       if (treeNodeIcon && !(0, _lodash.isNil)(treeNodeIcon(item))) props.icon = treeNodeIcon(item);
-      if (!item.isleaf) {
+      if (!item.isleaf && !(0, _lodash.isNil)(item.isleaf)) {
         return /*#__PURE__*/_react.default.createElement(_luckDesign.LuckTree.TreeNode, (0, _extends2.default)({
           isLeaf: false
         }, props), renderTreeNodes(item.children || []));

package/lib/lowcode/painter/DesignToolbar.js

@@ -151,7 +151,6 @@ var DesignToolbar = function DesignToolbar(_ref) {
       getContainer: function getContainer() {
         return document.getElementById('lc-design-workspace');
       },
-      zIndex: 3000,
       onOk: function onOk() {
         return runClearCache({
           moduleCode: (0, _helper.getLDMetaAttr)('moduleCode')
@@ -355,7 +354,6 @@ var DesignToolbar = function DesignToolbar(_ref) {
     getContainer: function getContainer() {
       return document.getElementById('lc-design-workspace');
     },
-    zIndex: 3000,
     onOk: handleOk,
     onCancel: function onCancel() {
       return setShow(false);
@@ -390,9 +388,6 @@ var DesignToolbar = function DesignToolbar(_ref) {
       style: {
         width: 180
       },
-      dropdownStyle: {
-        zIndex: 3100
-      },
       filterOption: false,
       labelInValue: true,
       showSearch: true,
@@ -418,9 +413,7 @@ var DesignToolbar = function DesignToolbar(_ref) {
     })))),
     placement: "bottom",
     height: "94vh",
-    footer: false
-    // zIndex={3000}
-    ,
+    footer: false,
     headerStyle: {
       padding: '0 48px 0 24px'
     },

package/lib/lowcode/painter/Ribbon.js

@@ -22,7 +22,7 @@ var _DRAWER_PROPS = {
   placement: 'left',
   mask: false,
   getContainer: false,
-  zIndex: 2000,
+  zIndex: 20,
   headerStyle: {
     borderBottom: 'none'
   },

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

@@ -185,7 +185,6 @@ var ActionBindModal = function ActionBindModal(_ref) {
     getContainer: function getContainer() {
       return document.getElementById('lc-design-workspace');
     },
-    zIndex: 3000,
     onCancel: handleClose,
     onOk: handleComfirm
   }, /*#__PURE__*/_react.default.createElement("div", {
@@ -285,8 +284,7 @@ var ActionBindModal = function ActionBindModal(_ref) {
     }),
     getPopupContainer: function getPopupContainer() {
       return document.getElementById('lc-design-workspace');
-    },
-    zIndex: 3000
+    }
   }, /*#__PURE__*/_react.default.createElement(_antd.Icon, {
     style: {
       marginLeft: 4

package/lib/lowcode/painter/components/DragDrop/DragDropContext.js

@@ -63,7 +63,7 @@ function _default(_ref) {
     onDragMove: handleDragMove
   }, children, /*#__PURE__*/_react.default.createElement(_core.DragOverlay, {
     style: {
-      zIndex: 2001
+      zIndex: 21
     },
     dropAnimation: null
   }, active && /*#__PURE__*/_react.default.createElement(_Overlay.default, null, active === null || active === void 0 || (_active$component = active.component) === null || _active$component === void 0 ? void 0 : _active$component.name))));

package/lib/lowcode/painter/components/code-editor/BaseEditor.js

@@ -10,10 +10,7 @@ var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends")
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 var _react = _interopRequireWildcard(require("react"));
-var _ahooks = require("ahooks");
 var monaco = _interopRequireWildcard(require("monaco-editor"));
-var _standalone = _interopRequireDefault(require("prettier/standalone"));
-var _parserBabel = _interopRequireDefault(require("prettier/parser-babel"));
 var _excluded = ["onChange", "isFullscreen", "style"],
   _excluded2 = ["children", "language", "options"];
 /**
@@ -62,14 +59,6 @@ var BaseEditor = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref) {
     rest = (0, _objectWithoutProperties2.default)(props, _excluded2);
   var editorRef = (0, _react.useRef)(null);
   var editorInstance = (0, _react.useRef)(null);
-  var prettierFormetter = (0, _ahooks.useMemoizedFn)(function (unformattedCode) {
-    return _standalone.default.format(unformattedCode, {
-      parser: 'babel',
-      plugins: [_parserBabel.default],
-      tabWidth: 2,
-      useTabs: false
-    });
-  });
 
   // 初始化编辑器实例
   (0, _react.useEffect)(function () {
@@ -94,14 +83,6 @@ var BaseEditor = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref) {
           onDidChangeStorage: function onDidChangeStorage() {}
         }
       });
-      var originalGetValue = editorInstance.current.getValue.bind(editorInstance.current);
-      editorInstance.current.getValue = function () {
-        return prettierFormetter(originalGetValue());
-      };
-      editorInstance.current.addCommand(monaco.KeyMod.CtrlCmd | monaco.KeyMod.Shift | monaco.KeyCode.KeyF, function () {
-        var formattedCode = prettierFormetter(originalGetValue());
-        editorInstance.current.setValue(formattedCode);
-      });
       editorInstance.current.onDidChangeModelContent(function (event) {
         if (onChange) onChange(editorInstance.current.getValue(), event);
       });

package/lib/lowcode/painter/components/code-editor/JSEditor.js

@@ -16,6 +16,8 @@ var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/obje
 var _react = _interopRequireWildcard3(require("react"));
 var monaco = _interopRequireWildcard3(require("monaco-editor"));
 var _lodash = require("lodash");
+var _standalone = _interopRequireDefault(require("prettier/standalone"));
+var _parserBabel = _interopRequireDefault(require("prettier/parser-babel"));
 var _BaseEditor = _interopRequireDefault(require("./BaseEditor"));
 var _excluded = ["children", "keywords"];
 function capitalizeFirstLetter(string) {
@@ -83,7 +85,7 @@ var setupAutocomplete = /*#__PURE__*/function () {
                 allCompletionItems = allCompletionItems.concat(items);
               });
               return {
-                suggestions: allCompletionItems
+                suggestions: (0, _lodash.uniqBy)((0, _lodash.compact)(allCompletionItems), 'label')
               };
             },
             triggerCharacters: ['.', "'", '"'] // 当用户输入点号时触发补全
@@ -98,6 +100,20 @@ var setupAutocomplete = /*#__PURE__*/function () {
     return _ref.apply(this, arguments);
   };
 }();
+var prettierFormetter = function prettierFormetter(unformattedCode) {
+  try {
+    var formattedCode = _standalone.default.format(unformattedCode, {
+      parser: 'babel',
+      plugins: [_parserBabel.default],
+      tabWidth: 2,
+      useTabs: false
+    });
+    return formattedCode;
+  } catch (e) {
+    console.error('Prettier formatting error:', e);
+    return unformattedCode;
+  }
+};
 
 /**
  * JSEditor 组件是一个专为 JavaScript 编辑设计的 React 组件，它基于 BaseEditor 组件构建，并集成了自动完成功能。
@@ -125,6 +141,14 @@ var JSEditor = /*#__PURE__*/(0, _react.forwardRef)(function (_ref2, ref) {
     keywords = _ref2.keywords,
     rest = (0, _objectWithoutProperties2.default)(_ref2, _excluded);
   (0, _react.useEffect)(function () {
+    var originalGetValue = ref.current.editor.getValue.bind(ref.current.editor);
+    ref.current.editor.getValue = function () {
+      return prettierFormetter(originalGetValue());
+    };
+    ref.current.editor.addCommand(monaco.KeyMod.CtrlCmd | monaco.KeyMod.Shift | monaco.KeyCode.KeyF, function () {
+      var formattedCode = prettierFormetter(originalGetValue());
+      ref.current.editor.setValue(formattedCode);
+    });
     setupAutocomplete(monaco, keywords);
   }, []);
   return /*#__PURE__*/_react.default.createElement(_BaseEditor.default, (0, _extends2.default)({

package/lib/lowcode/painter/components/field-setting/FieldAttrsModal.js

@@ -208,7 +208,6 @@ var FieldAttrsModal = _antd.Form.create({
       getContainer: function getContainer() {
         return document.getElementById('lc-design-workspace');
       },
-      zIndex: 1001,
       onOk: function () {
         var _onOk = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee3() {
           var subData, _yield$fetchDelAttrs, code;
@@ -261,7 +260,6 @@ var FieldAttrsModal = _antd.Form.create({
     getContainer: function getContainer() {
       return document.getElementById('lc-design-workspace');
     },
-    zIndex: 1001,
     destroyOnClose: true,
     bodyStyle: {
       marginTop: 0,

package/lib/lowcode/painter/components/field-setting/FieldRulesModal.js

@@ -115,7 +115,6 @@ var FieldRulesModal = _antd.Form.create({
     getContainer: function getContainer() {
       return document.getElementById('lc-design-workspace');
     },
-    zIndex: 1001,
     destroyOnClose: true,
     okButtonProps: {
       loading: loading

package/lib/lowcode/painter/components/field-setting/SettingUI.js

@@ -216,7 +216,6 @@ var SettingUI = function SettingUI(_ref) {
               getContainer: function getContainer() {
                 return document.getElementById('lc-design-workspace');
               },
-              zIndex: 1001,
               onOk: function () {
                 var _onOk = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee() {
                   var success;

package/lib/lowcode/painter/panel-section/FieldsSetting.js

@@ -327,8 +327,7 @@ var FieldsSetting = function FieldsSetting(_ref) {
     style: {
       position: 'absolute',
       transform: 'none',
-      right: 320,
-      zIndex: 1001
+      right: 320
     }
   }, drawerType === 'single' ? /*#__PURE__*/_react.default.createElement(_fieldSetting.default, {
     key: fieldId,

package/lib/lowcode/painter/style/design.less

@@ -7,7 +7,7 @@
   pointer-events: none;
   cursor: pointer;
   overflow: visible;
-  z-index: 1001;
+  z-index: 11;
 }
 
 .selector-item {
@@ -142,7 +142,7 @@
 }
 
 .next-overlay-wrapper {
-  z-index: 3000;
+  z-index: 30;
   display: flex;
   flex-direction: column;
   & > div > span {

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

@@ -28,7 +28,6 @@ var FunctionDesign = function FunctionDesign(_ref) {
   var ctx = (0, _ContextProvider.useContext)();
   (0, _react.useImperativeHandle)(apiRef, function () {
     return {
-      open: true,
       doOpen: function doOpen() {
         ctx.componentMap.get(id).api.getSelfDom().closest('.ant-modal-root').style.display = 'block';
       },
@@ -55,8 +54,13 @@ var FunctionDesign = function FunctionDesign(_ref) {
       position: 'absolute'
     }
   }, props, {
-    defaultOpen: true,
-    $apiRef: apiRef
+    $apiRef: apiRef,
+    $designProps: {
+      closable: false,
+      maskClosable: false,
+      visible: true,
+      zIndex: 10
+    }
   }), children);
 };
 var _default = exports.default = FunctionDesign;

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

@@ -44,7 +44,8 @@ var LCDialog = function LCDialog(_ref) {
     footer = _ref.footer,
     btnGroup = _ref.btnGroup,
     advance = _ref.advance,
-    $apiRef = _ref.$apiRef;
+    $apiRef = _ref.$apiRef,
+    $designProps = _ref.$designProps;
   var ctx = (0, _ContextProvider.useContext)();
   var apiRef = (0, _react.useRef)();
   var domRef = (0, _react.useRef)();
@@ -178,7 +179,7 @@ var LCDialog = function LCDialog(_ref) {
       return setOpen(false);
     },
     destroyOnClose: destroyOnClose
-  }), /*#__PURE__*/_react.default.createElement("div", {
+  }, $designProps), /*#__PURE__*/_react.default.createElement("div", {
     style: {
       height: 0,
       width: 0,

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

@@ -115,11 +115,11 @@ var LCTree = function LCTree(_ref) {
   var handleSelect = (0, _ahooks.useMemoizedFn)(function (_selectedKeys, e) {
     if (cancelSelect || e.selected) {
       setSelectedKeys(_selectedKeys);
+      ctx.doAction(advance.events.onSelect, {
+        checkedKeys: _selectedKeys,
+        e: e
+      });
     }
-    ctx.doAction(advance.events.onSelect, {
-      checkedKeys: _selectedKeys,
-      e: e
-    });
   });
   var afterInit = (0, _ahooks.useMemoizedFn)(function (treeData, data) {
     var selected = !(0, _lodash.isNil)(defaultSelect) ? (0, _helper.executeCode)(ctx, defaultSelect, ['treeData'], treeData) : null;

package/package.json

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