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

package/lib/lowcode/painter/Outline.js

@@ -23,8 +23,9 @@ var _outline = _interopRequireDefault(require("./style/outline.less"));
 var _excluded = ["props", "children"];
 var TreeNode = _antd.Tree.TreeNode;
 var PAGE_CELL = [_constants.CELL_KEY.PAGE_HEADER, _constants.CELL_KEY.PAGE_CONTENT, _constants.CELL_KEY.PAGE_FOOTER];
-var Outline = function Outline(_ref) {
-  var open = _ref.open;
+var Outline = function Outline() {
+  var modalTreeRef = (0, _react.useRef)();
+  var pageTreeRef = (0, _react.useRef)();
   var openModal = (0, _react.useRef)(void 0);
   var clickBySelf = (0, _react.useRef)(false);
   var context = (0, _ContextProvider.useLDContext)();
@@ -44,8 +45,6 @@ var Outline = function Outline(_ref) {
     _useState8 = (0, _slicedToArray2.default)(_useState7, 2),
     pageExpandedKeys = _useState8[0],
     setPageExpandedKeys = _useState8[1];
-  var latestModalExpandedKeysRef = (0, _ahooks.useLatest)(modalExpandedKeys);
-  var lastPageExpandedKeysRef = (0, _ahooks.useLatest)(pageExpandedKeys);
   (0, _react.useEffect)(function () {
     var _id = context.$subscriber(context.topics.COMPONENT_ACTIVE).on(function (payload) {
       setSelectedKey(payload.id);
@@ -53,20 +52,17 @@ var Outline = function Outline(_ref) {
         clickBySelf.current = false;
         return;
       }
-      if (openModal.current) {
-        setModalExpandedKeys((0, _lodash.uniq)([].concat((0, _toConsumableArray2.default)(latestModalExpandedKeysRef.current), (0, _toConsumableArray2.default)((0, _lodash.split)((0, _dataProcess.getPathById)(context.pageData, payload.id), '/')))));
-      } else {
-        setPageExpandedKeys((0, _lodash.uniq)([].concat((0, _toConsumableArray2.default)(lastPageExpandedKeysRef.current), (0, _toConsumableArray2.default)((0, _lodash.split)((0, _dataProcess.getPathById)(context.pageData, payload.id), '/')))));
-      }
+      setModalExpandedKeys((0, _lodash.uniq)([].concat((0, _toConsumableArray2.default)((openModal.current ? modalTreeRef : pageTreeRef).current.props.expandedKeys), (0, _toConsumableArray2.default)((0, _lodash.split)((0, _dataProcess.getPathById)(context.pageData, payload.id), '/')))));
     }).watch();
     return function () {
       context.$unsubscriber(context.topics.COMPONENT_ACTIVE, _id);
     };
-  }, [context.pageData]);
+  }, []);
   var handleSelect = function handleSelect(_key) {
     clickBySelf.current = true;
     context.$publisher(context.topics.COMPONENT_ACTIVE, _key ? {
-      id: _key
+      id: _key,
+      cellNode: context.componentMap.get(_key).dom
     } : null);
   };
   var handleOpenModal = (0, _ahooks.useMemoizedFn)(function (_key) {
@@ -76,16 +72,16 @@ var Outline = function Outline(_ref) {
     _comp.api.doOpen();
     openModal.current = _key;
   });
-  var render = (0, _ahooks.useMemoizedFn)(function (_ref2) {
-    var props = _ref2.props,
-      children = _ref2.children,
-      childrenMap = (0, _objectWithoutProperties2.default)(_ref2, _excluded);
+  var render = (0, _ahooks.useMemoizedFn)(function (_ref) {
+    var props = _ref.props,
+      children = _ref.children,
+      childrenMap = (0, _objectWithoutProperties2.default)(_ref, _excluded);
     if (props) {
       return /*#__PURE__*/_react.default.createElement(TreeNode, {
         icon: /*#__PURE__*/_react.default.createElement(_antd.Icon, {
           type: "layout"
         }),
-        title: props.name,
+        title: props.label,
         key: props.id
       }, (children === null || children === void 0 ? void 0 : children.length) && children.map(function (_id) {
         return render(childrenMap[_id]);
@@ -96,9 +92,6 @@ var Outline = function Outline(_ref) {
     });
   });
   (0, _ahooks.useDeepCompareLayoutEffect)(function () {
-    if (!context.pageData) {
-      return;
-    }
     var _reduce = (0, _lodash.reduce)(context.pageData.children, function (result, _id) {
         var resultKey = PAGE_CELL.includes(_id) ? 'page' : 'modal';
         result[resultKey][_id] = context.pageData[_id];
@@ -149,6 +142,7 @@ var Outline = function Outline(_ref) {
       padding: 0
     }
   }, /*#__PURE__*/_react.default.createElement(_antd.Tree, {
+    ref: modalTreeRef,
     showLine: true,
     showIcon: true,
     blockNode: true,
@@ -156,11 +150,11 @@ var Outline = function Outline(_ref) {
       type: "down"
     }),
     selectedKeys: [selectedKey],
-    onSelect: function onSelect(_ref3, _ref4) {
-      var _ref5 = (0, _slicedToArray2.default)(_ref3, 1),
-        _key = _ref5[0];
-      var selected = _ref4.selected,
-        node = _ref4.node;
+    onSelect: function onSelect(_ref2, _ref3) {
+      var _ref4 = (0, _slicedToArray2.default)(_ref2, 1),
+        _key = _ref4[0];
+      var selected = _ref3.selected,
+        node = _ref3.node;
       if (selected && node.props.pos.split('-').length === 2) {
         handleOpenModal(_key);
         handleSelect(_key);
@@ -180,16 +174,17 @@ var Outline = function Outline(_ref) {
       }
     },
     expandedKeys: modalExpandedKeys,
-    onExpand: function onExpand(_keys, _ref6) {
-      var expanded = _ref6.expanded,
-        node = _ref6.node;
+    onExpand: function onExpand(_keys, _ref5) {
+      var expanded = _ref5.expanded,
+        node = _ref5.node;
       if (expanded && node.props.pos.split('-').length === 2) {
         handleSelect(null);
         handleOpenModal(node.props.eventKey);
       }
       setModalExpandedKeys(_keys);
     }
-  }, pageAndModal === null || pageAndModal === void 0 ? void 0 : pageAndModal.modal)), open && /*#__PURE__*/_react.default.createElement(_antd.Tree, {
+  }, pageAndModal === null || pageAndModal === void 0 ? void 0 : pageAndModal.modal)), /*#__PURE__*/_react.default.createElement(_antd.Tree, {
+    ref: pageTreeRef,
     showLine: true,
     showIcon: true,
     blockNode: true,
@@ -197,10 +192,10 @@ var Outline = function Outline(_ref) {
       type: "down"
     }),
     selectedKeys: [selectedKey],
-    onSelect: function onSelect(_ref7, _ref8) {
-      var _ref9 = (0, _slicedToArray2.default)(_ref7, 1),
-        _key = _ref9[0];
-      var node = _ref8.node;
+    onSelect: function onSelect(_ref6, _ref7) {
+      var _ref8 = (0, _slicedToArray2.default)(_ref6, 1),
+        _key = _ref8[0];
+      var node = _ref7.node;
       if (openModal.current) {
         var _prevComp = context.componentMap.get(openModal.current);
         _prevComp.api.doClose();

package/lib/lowcode/painter/Panel.js

@@ -1,215 +1,16 @@
 "use strict";
 
-var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard").default;
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
+var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard").default;
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-var _objectSpread3 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
-var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _react = _interopRequireWildcard(require("react"));
-var _ahooks = require("ahooks");
-var _antd = require("luck-design/antd");
-var _classnames = _interopRequireDefault(require("classnames"));
-var _lodash = require("lodash");
-var _ContextProvider = require("../engine/provider/ContextProvider");
-var _PanelItem = _interopRequireDefault(require("./components/PanelItem"));
-var _panelItemFactory = _interopRequireDefault(require("../engine/factory/panel-item-factory"));
-var _dataProcess = require("../engine/tools/dataProcess");
 var _panel = _interopRequireDefault(require("./style/panel.less"));
-var _TAB_LIST_ = [{
-  title: '属性',
-  key: 'attrs'
-}, {
-  title: '样式',
-  key: 'styles'
-}, {
-  title: '高级',
-  key: 'advance'
-}];
 var Panel = function Panel() {
-  var _nextRef$current, _nextRef$current2;
-  var activeTabRef = (0, _react.useRef)(null);
-  var underLineRef = (0, _react.useRef)(null);
-  var nextRef = (0, _react.useRef)(null);
-  var factory = (0, _react.useRef)(new _panelItemFactory.default());
-  var _useState = (0, _react.useState)(null),
-    _useState2 = (0, _slicedToArray2.default)(_useState, 2),
-    activeNode = _useState2[0],
-    setActiveNode = _useState2[1];
-  var _useState3 = (0, _react.useState)('attrs'),
-    _useState4 = (0, _slicedToArray2.default)(_useState3, 2),
-    activeTabKey = _useState4[0],
-    setActiveTabKey = _useState4[1];
-  var _useBoolean = (0, _ahooks.useBoolean)(false),
-    _useBoolean2 = (0, _slicedToArray2.default)(_useBoolean, 2),
-    open = _useBoolean2[0],
-    _useBoolean2$ = _useBoolean2[1],
-    setTrue = _useBoolean2$.setTrue,
-    setFalse = _useBoolean2$.setFalse;
-  var context = (0, _ContextProvider.useLDContext)();
-  var handleChange = (0, _ahooks.useMemoizedFn)(function (field, value) {
-    var component = context.componentMap.get(activeNode.node.id);
-    var _component$api$getSel = component.api.getSelfAndParentLCData(),
-      node = _component$api$getSel.node;
-    var cloneData = (0, _lodash.cloneDeep)(context.pageData);
-    (0, _dataProcess.modifyById)(cloneData, activeNode.node.id, (0, _objectSpread3.default)((0, _objectSpread3.default)({}, node.props), {}, (0, _defineProperty2.default)({}, field, value)));
-    context._setPageData(cloneData).then(function (newData) {
-      context.$publisher(context.topics.COMPONENT_MODIFY, {
-        id: activeNode.node.id,
-        pageData: (0, _lodash.cloneDeep)(newData)
-      });
-    });
-    setFalse();
-  });
-  var renderPanelItems = (0, _ahooks.useMemoizedFn)(function (items) {
-    return items.map(function (item) {
-      var Comp = factory.current.getPanelItemFor((0, _lodash.startsWith)(item.type, '_') ? 'dynamic' : item.type, item.type);
-      if (item.type === 'group') {
-        return /*#__PURE__*/_react.default.createElement(Comp, {
-          key: item.key,
-          label: item.name,
-          defaultCollapsed: true
-        }, renderPanelItems(item.props));
-      }
-      console.log(11111, item.key, activeNode.node);
-      return /*#__PURE__*/_react.default.createElement(_PanelItem.default, {
-        key: item.key,
-        label: item.name
-      }, Comp && /*#__PURE__*/_react.default.createElement(Comp, {
-        defaultValue: activeNode.node[item.key],
-        next: function next() {
-          if (!item.next) return;
-          nextRef.current = {
-            name: item.next.name,
-            NextComp: renderPanelItems(item.next.props)
-          };
-          setTrue();
-        },
-        options: item.options,
-        disabled: item.disabled,
-        onChange: function onChange(value) {
-          return handleChange(item.key, value);
-        },
-        size: "small"
-      }));
-    });
-  });
-  var PropsComps = (0, _ahooks.useCreation)(function () {
-    var _meta;
-    try {
-      _meta = require("../engine/meta/".concat(activeNode.node.component.toLowerCase(), ".props.json"));
-    } catch (e) {
-      return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null);
-    }
-    return renderPanelItems(_meta.props);
-  }, [activeNode]);
-  (0, _react.useEffect)(function () {
-    if (!open) {
-      nextRef.current = null;
-    }
-  }, [open]);
-  (0, _react.useEffect)(function () {
-    var _id = context.$subscriber(context.topics.COMPONENT_ACTIVE).on(function (payload) {
-      if (!payload.id) {
-        setActiveNode(null);
-        return;
-      }
-      var component = context.componentMap.get(payload.id);
-      var _component$api$getSel2 = component.api.getSelfAndParentLCData(),
-        node = _component$api$getSel2.node;
-      var levelNodes = (0, _lodash.takeRight)(component.api.getLevelNodes(), 4);
-      setActiveNode({
-        node: node.props,
-        level: levelNodes
-      });
-    }).watch();
-    return function () {
-      context.$unsubscriber(context.topics.COMPONENT_ACTIVE, _id);
-    };
-  }, [context.pageData]);
-  (0, _react.useLayoutEffect)(function () {
-    underLineRef.current.style.left = "".concat(activeTabRef.current.offsetLeft + activeTabRef.current.offsetWidth / 2 - 10, "px");
-  }, [activeTabKey, !!activeNode]);
   return /*#__PURE__*/_react.default.createElement("div", {
     className: _panel.default['lc-painter-panel']
-  }, /*#__PURE__*/_react.default.createElement("div", {
-    className: (0, _classnames.default)(_panel.default['lc-painter-panel-topbar'], (0, _defineProperty2.default)({}, _panel.default.hidden, !activeNode))
-  }, /*#__PURE__*/_react.default.createElement(_antd.Breadcrumb, {
-    separator: ">",
-    style: {
-      fontSize: 12
-    }
-  }, activeNode === null || activeNode === void 0 ? void 0 : activeNode.level.map(function (_ref) {
-    var id = _ref.id,
-      name = _ref.name;
-    return /*#__PURE__*/_react.default.createElement(_antd.Breadcrumb.Item, {
-      key: id,
-      className: (0, _classnames.default)((0, _defineProperty2.default)({}, _panel.default['active-node-level'], id !== activeNode.node.id)),
-      onMouseEnter: function onMouseEnter() {
-        if (id === activeNode.node.id) return;
-        context.$publisher(context.topics.COMPONENT_HOVER, {
-          id: id
-        });
-      },
-      onMouseLeave: function onMouseLeave() {
-        if (id === activeNode.node.id) return;
-        context.$publisher(context.topics.COMPONENT_HOVER, null);
-      },
-      onClick: function onClick() {
-        if (id === activeNode.node.id) return;
-        context.$publisher(context.topics.COMPONENT_ACTIVE, {
-          id: id
-        });
-      }
-    }, name);
-  }))), /*#__PURE__*/_react.default.createElement("div", {
-    className: (0, _classnames.default)(_panel.default['lc-painter-panel-tabbar'], (0, _defineProperty2.default)({}, _panel.default.hidden, !activeNode))
-  }, /*#__PURE__*/_react.default.createElement("ul", {
-    className: _panel.default.headerList
-  }, _TAB_LIST_.map(function (_item) {
-    return /*#__PURE__*/_react.default.createElement("li", {
-      key: _item.key,
-      ref: activeTabKey === _item.key ? activeTabRef : null,
-      className: (0, _classnames.default)((0, _defineProperty2.default)({}, _panel.default.actived, activeTabKey === _item.key)),
-      onClick: function onClick() {
-        return setActiveTabKey(_item.key);
-      }
-    }, _item.title);
-  })), /*#__PURE__*/_react.default.createElement("div", {
-    ref: underLineRef,
-    className: _panel.default.underline
-  })), activeTabKey === _TAB_LIST_[0].key && /*#__PURE__*/_react.default.createElement("div", {
-    className: (0, _classnames.default)(_panel.default['lc-painter-panel-content'], (0, _defineProperty2.default)({}, _panel.default.hidden, !activeNode))
-  }, PropsComps, /*#__PURE__*/_react.default.createElement(_antd.Drawer, {
-    visible: open,
-    width: 320,
-    mask: false,
-    closable: false,
-    getContainer: false,
-    destroyOnClose: true,
-    style: {
-      position: 'absolute'
-    },
-    bodyStyle: {
-      padding: 0,
-      height: '100%'
-    }
-  }, /*#__PURE__*/_react.default.createElement("div", {
-    className: _panel.default['next-content']
-  }, /*#__PURE__*/_react.default.createElement("div", {
-    className: _panel.default['next-content-header'],
-    onClick: setFalse
-  }, /*#__PURE__*/_react.default.createElement(_antd.Icon, {
-    type: "left"
-  }), (_nextRef$current = nextRef.current) === null || _nextRef$current === void 0 ? void 0 : _nextRef$current.name, /*#__PURE__*/_react.default.createElement(_antd.Icon, {
-    type: "close"
-  })), /*#__PURE__*/_react.default.createElement("div", {
-    className: _panel.default['next-content-body']
-  }, (_nextRef$current2 = nextRef.current) === null || _nextRef$current2 === void 0 ? void 0 : _nextRef$current2.NextComp)))), activeTabKey === _TAB_LIST_[1].key && /*#__PURE__*/_react.default.createElement("div", null, "\u6837\u5F0F\u9762\u677F"), activeTabKey === _TAB_LIST_[2].key && /*#__PURE__*/_react.default.createElement("div", null, "\u9AD8\u7EA7\u9762\u677F"), /*#__PURE__*/_react.default.createElement("div", {
-    className: (0, _classnames.default)(_panel.default['lc-painter-panel-empty'], (0, _defineProperty2.default)({}, _panel.default.hidden, !!activeNode))
-  }, "\u8BF7\u5728\u5DE6\u4FA7\u753B\u5E03\u9009\u4E2D\u8282\u70B9"));
+  }, "Panel");
 };
 var _default = exports.default = Panel;

package/lib/lowcode/painter/Ribbon.js

@@ -1,41 +1,24 @@
 "use strict";
 
-var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard").default;
+var _interopRequireWildcard3 = 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 _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
-var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
+var _regeneratorRuntime2 = _interopRequireDefault(require("@babel/runtime/helpers/regeneratorRuntime"));
+var _interopRequireWildcard2 = _interopRequireDefault(require("@babel/runtime/helpers/interopRequireWildcard"));
+var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
-var _react = _interopRequireWildcard(require("react"));
+var _react = _interopRequireWildcard3(require("react"));
+var _ahooks = require("ahooks");
+var _umi = require("umi");
 var _luckDesign = require("luck-design");
 var _antd = require("luck-design/antd");
-var _Outline = _interopRequireDefault(require("./Outline"));
-var _Components = _interopRequireDefault(require("./Components"));
-var _I18n = _interopRequireDefault(require("./I18n"));
 var _utils = require("@luck-design-biz/base/utils");
+var _lodash = require("lodash");
 var _ribbon = _interopRequireDefault(require("./style/ribbon.less"));
 var _WIDTH_ = 48;
-var _DRAWER_PROPS = {
-  placement: 'left',
-  mask: false,
-  getContainer: false,
-  zIndex: 10000,
-  headerStyle: {
-    borderBottom: 'none'
-  },
-  style: {
-    position: 'absolute',
-    left: _WIDTH_
-  },
-  bodyStyle: {
-    overflowY: 'auto',
-    height: 'calc(100% - 55px)',
-    padding: 0
-  }
-};
 var _DRAWER_OUTLINE_ = {
   width: 300,
   key: 'outline',
@@ -46,7 +29,7 @@ var _DRAWER_COMPONENTS_ = {
   width: 310,
   key: 'components',
   title: '组件',
-  fix: true
+  fix: false
 };
 var _DRAWER_I18N_ = {
   width: 450,
@@ -59,6 +42,46 @@ var Ribbon = function Ribbon() {
     _useState2 = (0, _slicedToArray2.default)(_useState, 2),
     drawer = _useState2[0],
     setDrawer = _useState2[1];
+  var Detail = (0, _ahooks.useCreation)(function () {
+    return (0, _umi.dynamic)({
+      loader: function () {
+        var _loader = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee() {
+          var name, _yield$import, Comp;
+          return (0, _regeneratorRuntime2.default)().wrap(function _callee$(_context) {
+            while (1) switch (_context.prev = _context.next) {
+              case 0:
+                if (!drawer) {
+                  _context.next = 7;
+                  break;
+                }
+                name = (0, _lodash.upperFirst)(drawer.key);
+                _context.next = 4;
+                return function (specifier) {
+                  return new Promise(function (r) {
+                    return r(specifier);
+                  }).then(function (s) {
+                    return (0, _interopRequireWildcard2.default)(require(s));
+                  });
+                }("./".concat(name));
+              case 4:
+                _yield$import = _context.sent;
+                Comp = _yield$import.default;
+                return _context.abrupt("return", Comp);
+              case 7:
+                return _context.abrupt("return", null);
+              case 8:
+              case "end":
+                return _context.stop();
+            }
+          }, _callee);
+        }));
+        function loader() {
+          return _loader.apply(this, arguments);
+        }
+        return loader;
+      }()
+    });
+  }, [drawer]);
   return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_luckDesign.Box, {
     className: _ribbon.default['lc-painter-ribbon'],
     width: _WIDTH_,
@@ -101,50 +124,28 @@ var Ribbon = function Ribbon() {
     onClick: function onClick() {
       return setDrawer((drawer === null || drawer === void 0 ? void 0 : drawer.key) === _DRAWER_I18N_.key ? null : _DRAWER_I18N_);
     }
-  }))), /*#__PURE__*/_react.default.createElement(_antd.Drawer, (0, _extends2.default)({
-    title: drawer ? (0, _utils.formatMessage)({
-      id: "luckda.lowcode.".concat(drawer.key),
-      label: drawer.title
-    }) : '',
-    width: (drawer === null || drawer === void 0 ? void 0 : drawer.width) || 0,
-    visible: (drawer === null || drawer === void 0 ? void 0 : drawer.key) === _DRAWER_OUTLINE_.key,
-    onClose: function onClose() {
-      return setDrawer(null);
-    }
-  }, _DRAWER_PROPS, {
-    style: (0, _objectSpread2.default)((0, _objectSpread2.default)({}, _DRAWER_PROPS.style), {}, {
-      display: (drawer === null || drawer === void 0 ? void 0 : drawer.key) === _DRAWER_OUTLINE_.key ? 'block' : 'none'
-    })
-  }), /*#__PURE__*/_react.default.createElement(_Outline.default, {
-    open: (drawer === null || drawer === void 0 ? void 0 : drawer.key) === _DRAWER_OUTLINE_.key
-  })), /*#__PURE__*/_react.default.createElement(_antd.Drawer, (0, _extends2.default)({
+  }))), /*#__PURE__*/_react.default.createElement(_antd.Drawer, {
     title: drawer ? (0, _utils.formatMessage)({
       id: "luckda.lowcode.".concat(drawer.key),
       label: drawer.title
     }) : '',
+    placement: "left",
     width: (drawer === null || drawer === void 0 ? void 0 : drawer.width) || 0,
-    visible: (drawer === null || drawer === void 0 ? void 0 : drawer.key) === _DRAWER_COMPONENTS_.key,
-    onClose: function onClose() {
-      return setDrawer(null);
-    }
-  }, _DRAWER_PROPS, {
-    style: (0, _objectSpread2.default)((0, _objectSpread2.default)({}, _DRAWER_PROPS.style), {}, {
-      display: (drawer === null || drawer === void 0 ? void 0 : drawer.key) === _DRAWER_COMPONENTS_.key ? 'block' : 'none'
-    })
-  }), /*#__PURE__*/_react.default.createElement(_Components.default, null)), /*#__PURE__*/_react.default.createElement(_antd.Drawer, (0, _extends2.default)({
-    title: drawer ? (0, _utils.formatMessage)({
-      id: "luckda.lowcode.".concat(drawer.key),
-      label: drawer.title
-    }) : '',
-    width: (drawer === null || drawer === void 0 ? void 0 : drawer.width) || 0,
-    visible: (drawer === null || drawer === void 0 ? void 0 : drawer.key) === _DRAWER_I18N_.key,
+    visible: !!drawer,
+    mask: false,
+    getContainer: false,
     onClose: function onClose() {
       return setDrawer(null);
+    },
+    style: {
+      position: 'absolute',
+      left: _WIDTH_
+    },
+    bodyStyle: {
+      overflowY: 'auto',
+      height: 'calc(100% - 55px)',
+      padding: 0
     }
-  }, _DRAWER_PROPS, {
-    style: (0, _objectSpread2.default)((0, _objectSpread2.default)({}, _DRAWER_PROPS.style), {}, {
-      display: (drawer === null || drawer === void 0 ? void 0 : drawer.key) === _DRAWER_I18N_.key ? 'block' : 'none'
-    })
-  }), /*#__PURE__*/_react.default.createElement(_I18n.default, null)));
+  }, Detail && /*#__PURE__*/_react.default.createElement(Detail, null)));
 };
 var _default = exports.default = Ribbon;

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

@@ -1,70 +1,26 @@
 "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 = _default;
-var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
-var _react = _interopRequireWildcard(require("react"));
-var _lodash = require("lodash");
+var _react = _interopRequireDefault(require("react"));
 var _panelItem = _interopRequireDefault(require("../style/panel-item.less"));
-var _antd = require("luck-design/antd");
 /**
- * `PanelItem` 组件用于展示属性面板中的单个属性项。
- * 它支持展示一个标签（属性名称）及对应的组件（例如输入框、选择器等），并可通过传入的 `addon` 属性添加额外的内容。
- * 此组件支持折叠功能，可以通过 `collapsed` 属性控制初始折叠状态。
- *
- * @component
- * @example
- * ```jsx
- * <PanelItem
- *   label="属性名称"
- *   collapsed={false}
- *   addon={<div>额外内容</div>}
- * >
- *   <input type="text" />
- * </PanelItem>
- * ```
- *
- * @param {Object} props 组件接收的参数。
- * @param {string} props.label 显示的属性名称。如果标签以 `#` 开头，则不显示。
- * @param {boolean} [props.collapsed=true] 初始是否折叠。默认为 `true`。
- * @param {React.ReactNode} props.addon 当属性项展开时，可以在下方显示额外内容。
- * @param {React.ReactNode} props.children 对应于属性名称的组件，可以是输入框、下拉菜单等 React 节点。
- *
- * @returns {React.Element} 渲染属性名称、对应的组件以及可选的额外内容。
+ * 属性面板属性行组件
+ * @param {string} label 属性名
+ * @param {React.ReactNode} component 属性组件
+ * @returns 
  */
 function _default(_ref) {
   var label = _ref.label,
-    _ref$collapsed = _ref.collapsed,
-    collapsed = _ref$collapsed === void 0 ? true : _ref$collapsed,
-    addon = _ref.addon,
-    children = _ref.children;
-  var _useState = (0, _react.useState)(collapsed),
-    _useState2 = (0, _slicedToArray2.default)(_useState, 2),
-    curClps = _useState2[0],
-    setCurClps = _useState2[1];
-  var HandleClick = function HandleClick() {
-    setCurClps(!curClps);
-  };
-  (0, _react.useEffect)(function () {
-    setCurClps(collapsed);
-  }, [collapsed]);
+    component = _ref.component;
   return /*#__PURE__*/_react.default.createElement("div", {
     className: _panelItem.default['lc-painter-components-panelitem']
-  }, /*#__PURE__*/_react.default.createElement("div", {
-    className: _panelItem.default['panelrow']
-  }, /*#__PURE__*/_react.default.createElement("div", {
+  }, /*#__PURE__*/_react.default.createElement("span", {
     className: _panelItem.default['item-label']
-  }, addon && /*#__PURE__*/_react.default.createElement(_antd.Icon, {
-    className: _panelItem.default['item-icon'],
-    type: !curClps ? 'down' : 'right',
-    onClick: HandleClick
-  }), label && !(0, _lodash.startsWith)(label, '#') && /*#__PURE__*/_react.default.createElement("span", null, label)), /*#__PURE__*/_react.default.createElement("span", {
+  }, label), /*#__PURE__*/_react.default.createElement("span", {
     className: _panelItem.default['item-component']
-  }, children)), !curClps && /*#__PURE__*/_react.default.createElement("div", {
-    className: _panelItem.default['addon']
-  }, addon));
+  }, component));
 }

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

@@ -7,13 +7,11 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
-var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _createForOfIteratorHelper2 = _interopRequireDefault(require("@babel/runtime/helpers/createForOfIteratorHelper"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 var _react = _interopRequireWildcard(require("react"));
 var _antd = require("luck-design/antd");
-var _classnames = _interopRequireDefault(require("classnames"));
 var _ruleInput = _interopRequireDefault(require("../style/rule-input.less"));
 var _excluded = ["onValueChange", "rules", "value"];
 /**
@@ -94,14 +92,16 @@ var _default = exports.default = /*#__PURE__*/(0, _react.forwardRef)(function (_
       onValueChange(e, value);
     } else {
       setErr(error);
-      console.error(error);
+      console.log('err', error);
     }
   };
+  var className = _ruleInput.default['lc-painter-components-ruleinput'];
+  if (err) className += ' ' + _ruleInput.default['err'];
   return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_antd.Tooltip, {
     title: err,
     visible: err
   }, /*#__PURE__*/_react.default.createElement(_antd.Input, (0, _extends2.default)({
-    className: (0, _classnames.default)(_ruleInput.default['lc-painter-components-ruleinput'], (0, _defineProperty2.default)({}, _ruleInput.default.err, !!err)),
+    className: className,
     size: "small",
     value: inputValue // 绑定输入值
     ,