@luck-design-biz/luckda 0.0.25 → 0.0.26

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

@@ -7,16 +7,13 @@ 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 _ahooks = require("ahooks");
 var _antd = require("luck-design/antd");
-var _classnames = _interopRequireDefault(require("classnames"));
 var _ruleInput = _interopRequireDefault(require("../style/rule-input.less"));
-var _excluded = ["onValueChange", "rules", "value", "defaultValue"];
+var _excluded = ["onValueChange", "rules", "value"];
 /**
  * 带校验功能的输入组件。
  *
@@ -52,9 +49,8 @@ var _default = exports.default = /*#__PURE__*/(0, _react.forwardRef)(function (_
   var onValueChange = _ref.onValueChange,
     rules = _ref.rules,
     value = _ref.value,
-    defaultValue = _ref.defaultValue,
     rest = (0, _objectWithoutProperties2.default)(_ref, _excluded);
-  var _useState = (0, _react.useState)(value || defaultValue),
+  var _useState = (0, _react.useState)(value),
     _useState2 = (0, _slicedToArray2.default)(_useState, 2),
     inputValue = _useState2[0],
     setInputValue = _useState2[1]; // 托管输入值的状态
@@ -64,7 +60,7 @@ var _default = exports.default = /*#__PURE__*/(0, _react.forwardRef)(function (_
     setErr = _useState4[1];
 
   // 使用useEffect钩子监听value的变化
-  (0, _ahooks.useUpdateEffect)(function () {
+  (0, _react.useEffect)(function () {
     setInputValue(value);
     setErr(null);
   }, [value]);
@@ -96,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 // 绑定输入值
     ,

package/lib/lowcode/painter/index.js

@@ -1,13 +1,12 @@
 "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 = void 0;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-var _react = _interopRequireWildcard(require("react"));
+var _react = _interopRequireDefault(require("react"));
 var _classnames = _interopRequireDefault(require("classnames"));
 var _EventBusProvider = _interopRequireDefault(require("../engine/provider/EventBusProvider"));
 var _ContextProvider = _interopRequireDefault(require("../engine/provider/ContextProvider"));
@@ -16,42 +15,11 @@ var _Design = _interopRequireDefault(require("./Design"));
 var _Panel = _interopRequireDefault(require("./Panel"));
 var _index = require("../constants/index");
 var _index2 = _interopRequireDefault(require("./style/index.less"));
-// import { history } from 'umi';
-// import { formatMessage } from '@luck-design-biz/base/utils';
-
 var Painter = function Painter(_ref) {
-  var className = _ref.className,
-    code = _ref.code;
-  // 修改后刷新提示功能，暂时关掉，等待提供数据对比进行判断
-  // useEffect(() => {
-  //   const handleBeforeUnload = (event) => {
-  //     event.preventDefault();
-  //     event.returnValue = null;
-  //     return null;
-  //   };
-
-  //   window.addEventListener('beforeunload', handleBeforeUnload);
-
-  //   const unblock = history.block(() =>
-  //     confirm(`${formatMessage({
-  //       id: 'app.base.operate.comfire.reload', label: '重新加载此网站？'
-  //     })}\n${formatMessage({
-  //       id: 'app.base.operate.comfire.message.reload', label: '系统可能不会保存您所做的更改。'
-  //     })}`)
-  //   );
-
-  //   return () => {
-  //     unblock();
-  //     window.removeEventListener('beforeunload', handleBeforeUnload);
-  //   };
-  // }, []);
-
+  var className = _ref.className;
   return /*#__PURE__*/_react.default.createElement(_EventBusProvider.default, {
     runtime: _index.RUNTIME.DESIGN
-  }, /*#__PURE__*/_react.default.createElement(_ContextProvider.default, {
-    code: code
-  }, /*#__PURE__*/_react.default.createElement("div", {
-    id: "lc-design-workspace",
+  }, /*#__PURE__*/_react.default.createElement(_ContextProvider.default, null, /*#__PURE__*/_react.default.createElement("div", {
     className: (0, _classnames.default)(_index2.default['lc-painter'], (0, _defineProperty2.default)({}, className, !!className))
   }, /*#__PURE__*/_react.default.createElement(_Ribbon.default, null), /*#__PURE__*/_react.default.createElement(_Design.default, null), /*#__PURE__*/_react.default.createElement(_Panel.default, null))));
 };

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

@@ -8,54 +8,44 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _react = _interopRequireWildcard(require("react"));
-var _ahooks = require("ahooks");
 var _layoutRatio = _interopRequireDefault(require("../style/layout-ratio.less"));
 var _utils = require("@luck-design-biz/base/utils");
 var _RuleInput = _interopRequireDefault(require("../components/RuleInput"));
 var _PanelItem = _interopRequireDefault(require("../components/PanelItem"));
-var _RATIOS_ = ['12', '6:6', '3:9', '9:3', '4:4:4', '3:6:3', '3:3:3:3', '2:2:2:2:2:2'];
-var _DEFAULTRATIO_ = '12:3:9';
+var ratios = ['12', '6:6', '3:9', '9:3', '4:4:4', '3:6:3', '3:3:3:3', '2:2:2:2:2:2'];
+var defaultRatio = '12';
 
 /**
- * `LayoutRatio`组件提供了一个布局比例选择器，允许用户选择或输入特定的比例配置。
- * 支持的比例配置包括预定义的比例数组`_RATIOS_`，用户还可以通过输入框自定义比例，
- * 自定义比例需要符合一定的规则：是数字或数字与冒号的组合，且数字之和必须等于12。
- * ，
- * 允许父组件获取当前选中的布局比例。
- *
- * @component
- * @example
- * ```jsxsdsdsdsdsdsdsd
- * <LayoutRatio
- *   value="6:6"
- *   onChange={(option) => console.log(option)}
- * />
- * ```
- *
- * @param {Object} props
- * @param {string} [props.value='12'] 初始化时选中的布局比例，默认为"12"。
- * @param {Function} props.onChange 当用户选择一个新的布局比例时调用的回调函数。
- *
- * @returns {React.Element} 渲染的React元素。
+ * 布局比例组件
+ * 
+ * @param {string} value 默认值
+ * @param {Function} onChange 当合法数据变化时触发
+ * @returns 
  */
-var LayoutRatio = function LayoutRatio(_ref) {
-  var defaultValue = _ref.defaultValue,
+var LayoutRatio = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref) {
+  var value = _ref.value,
     onChange = _ref.onChange;
-  var _useState = (0, _react.useState)(defaultValue || _DEFAULTRATIO_),
+  var _useState = (0, _react.useState)(value || defaultRatio),
     _useState2 = (0, _slicedToArray2.default)(_useState, 2),
     currentRatio = _useState2[0],
     setCurrentRatio = _useState2[1];
   var handleInputChange = function handleInputChange(_, value) {
-    // console.log('value', value);
-    // if (!value) value = _DEFAULTRATIO_;
+    console.log('value', value);
+    if (!value) value = defaultRatio;
     setCurrentRatio(value);
-    onChange === null || onChange === void 0 || onChange(value);
   };
   var handGridClick = function handGridClick(selectedRadio) {
     // console.log('selectedRadio', selectedRadio);
     setCurrentRatio(selectedRadio);
-    onChange === null || onChange === void 0 || onChange(selectedRadio);
+    if (onChange) onChange(selectedRadio);
   };
+  (0, _react.useImperativeHandle)(ref, function () {
+    return {
+      getValue: function getValue() {
+        return currentRatio;
+      }
+    };
+  });
 
   // 定义验证规则
   var rules = [{
@@ -64,41 +54,44 @@ var LayoutRatio = function LayoutRatio(_ref) {
       if (typeof value !== 'string') return false;
 
       // 使用正则表达式检查字符串是否只包含数字和冒号，并且不以冒号开始或结束
-      return /^[0-9]+(:[0-9]+)*$/.test(value);
+      if (!/^[0-9]+(:[0-9]+)*$/.test(value)) return false;
+
+      // 使用冒号分割字符串，并将分割后的每个元素转换为数字
+      var numbers = value.split(':').map(Number);
+
+      // 计算所有数字的总和
+      var sum = numbers.reduce(function (acc, cur) {
+        return acc + cur;
+      }, 0);
+
+      // 判断总和是否等于12
+      return sum === 12;
     },
     err: (0, _utils.formatMessage)({
       id: 'luckda.lowcode.painter.panel-section.Layoutratio.err',
       label: '必须是数字或者数字加:号的组合，且数字之和必须等于12'
     })
   }];
-  var _useCreation = (0, _ahooks.useCreation)(function () {
-      return {
-        isCurrentInRatios: _RATIOS_.includes(currentRatio),
-        currentItemRatios: currentRatio.split(':')
-      };
-    }, [currentRatio]),
-    isCurrentInRatios = _useCreation.isCurrentInRatios,
-    currentItemRatios = _useCreation.currentItemRatios;
+  var isCurrentInRatios = ratios.includes(currentRatio);
+  var currentItemRatios = currentRatio.split(':');
   return /*#__PURE__*/_react.default.createElement("div", {
     className: _layoutRatio.default['lc-painter-panel-section-layoutratio']
   }, /*#__PURE__*/_react.default.createElement("div", {
     className: _layoutRatio.default['ratio-view']
   }, /*#__PURE__*/_react.default.createElement("div", {
     className: _layoutRatio.default['gridbox-container']
-  }, _RATIOS_.map(function (ratio, i) {
+  }, ratios.map(function (ratio) {
     var itemRatios = ratio.split(':');
     var isCurrent = ratio == currentRatio;
     var className = _layoutRatio.default['gridbox'];
     if (isCurrent) className = className + ' ' + _layoutRatio.default['current'];
     return /*#__PURE__*/_react.default.createElement("div", {
-      key: "grid-".concat(i),
       className: className,
       onClick: function onClick() {
         return handGridClick(ratio);
       }
-    }, itemRatios.map(function (itemRatio, j) {
+    }, itemRatios.map(function (itemRatio) {
       return /*#__PURE__*/_react.default.createElement("div", {
-        key: "gridItem-".concat(j),
         className: _layoutRatio.default['girditem'],
         style: {
           gridColumn: 'span ' + itemRatio
@@ -110,9 +103,8 @@ var LayoutRatio = function LayoutRatio(_ref) {
     onClick: function onClick() {
       return handGridClick(ratio);
     }
-  }, currentItemRatios.map(function (itemRatio, index) {
+  }, currentItemRatios.map(function (itemRatio) {
     return /*#__PURE__*/_react.default.createElement("div", {
-      key: "itemRatio-".concat(index),
       className: _layoutRatio.default['girditem'],
       style: {
         gridColumn: 'span ' + itemRatio
@@ -125,15 +117,15 @@ var LayoutRatio = function LayoutRatio(_ref) {
       id: 'luckda.lowcode.painter.panel-section.Layoutratio.label',
       label: '列比例'
     }),
-    suppressPadding: true
-  }, /*#__PURE__*/_react.default.createElement(_RuleInput.default, {
-    placeholder: (0, _utils.formatMessage)({
-      id: 'luckda.lowcode.painter.panel-section.Layoutratio.placeholder',
-      label: '请输入列比例'
-    }),
-    rules: rules,
-    onValueChange: handleInputChange,
-    value: currentRatio
-  }))));
-};
+    component: /*#__PURE__*/_react.default.createElement(_RuleInput.default, {
+      placeholder: (0, _utils.formatMessage)({
+        id: 'luckda.lowcode.painter.panel-section.Layoutratio.placeholder',
+        label: '请输入列比例'
+      }),
+      rules: rules,
+      onValueChange: handleInputChange,
+      value: currentRatio
+    })
+  })));
+});
 var _default = exports.default = LayoutRatio;

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

@@ -0,0 +1,65 @@
+"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 = void 0;
+var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
+var _react = _interopRequireWildcard(require("react"));
+var _radio = _interopRequireDefault(require("../style/radio.less"));
+/**
+ * Radio组件允许用户从一组选项中选择一个。它接收一个`options`数组来渲染选项，以及一个可选的`onChange`回调函数，
+ * 当用户选择不同的选项时，`onChange`会被调用并传递当前选中的选项对象。
+ * 
+ * @component
+ * @example
+ * const options = [
+ *   { label: '小', value: 'small' },
+ *   { label: '中', value: 'middle' },
+ *   { label: '大', value: 'large' }
+ * ];
+ * 
+ * function handleChange(option) {
+ *   console.log(option);
+ * }
+ * 
+ * <Radio options={options} onChange={handleChange} />
+ * 
+ * @param {Object} props - 组件的props。
+ * @param {Object[]} props.options - 选项数组，每个对象都应包含`label`和`value`。
+ * @param {string} props.options[].label - 选项的显示文本。
+ * @param {string} props.options[].value - 选项的值，应唯一。
+ * @param {Function} [props.onChange] - 可选，当选项变化时调用的回调函数。传递当前选中的选项对象。
+ */
+var Radio = function Radio(_ref) {
+  var _options$;
+  var options = _ref.options,
+    onChange = _ref.onChange;
+  var _useState = (0, _react.useState)((_options$ = options[0]) === null || _options$ === void 0 ? void 0 : _options$.value),
+    _useState2 = (0, _slicedToArray2.default)(_useState, 2),
+    activeValue = _useState2[0],
+    setActiveValue = _useState2[1];
+
+  // 点击事件处理函数
+  var handleClick = function handleClick(option) {
+    // 设置当前激活的选项
+    setActiveValue(option.value);
+    if (onChange) {
+      onChange(option);
+    }
+  };
+  return /*#__PURE__*/_react.default.createElement("div", {
+    className: _radio.default['lc-painter-panel-section-radio']
+  }, options.map(function (option) {
+    return /*#__PURE__*/_react.default.createElement("div", {
+      key: option.value,
+      className: "".concat(_radio.default['radio-item'], " ").concat(activeValue === option.value ? 'active' : ''),
+      onClick: function onClick() {
+        return handleClick(option);
+      }
+    }, option.label);
+  }));
+};
+var _default = exports.default = Radio;

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

@@ -4,22 +4,11 @@
   height: 0;
   top: 0;
   left: 0;
+  display: none;
   pointer-events: none;
   cursor: pointer;
   overflow: visible;
-  z-index: 1001;
-}
-
-.selector-item {
-  height: 20px;
-  background-color: var(--ant-primary-color);
-  color: #fff;
-  font-size: 16px;
-  line-height: 20px;
-  min-width: 20px;
-  text-align: center;
-  cursor: pointer;
-  border-radius: 3px;
+  z-index: 9999;
 }
 
 .lc-painter-design {
@@ -28,122 +17,22 @@
   height: 100%;
   overflow: auto;
 
-  &-toolbar {
-    width: 100%;
-    height: 40px;
-    padding: 8px 16px;
-    border-bottom: 1px solid #e3e3e3;
-    background-color: white;
-    display: flex;
-    align-items: center;
-    justify-content: flex-end;
-
-    .i18n-selecter {
-      width: 125px;
-      padding: 0 8px;
-    }
-
-    .toolbar-item {
-      display: inline-block;
-      width: 32px;
-      height: 32px;
-      border-radius: 3px;
-      padding: 6px;
-      margin: 0 2px;
-      cursor: pointer;
-      text-align: center;
-      color: #8c8c8c;
-    }
-
-    .toolbar-item:hover {
-      color: #262626;
-    }
-
-    .toolbar-item.actived {
-      color: #8c8c8c;
-      background: #f1f2f3;
-    }
-  }
-
-  &-workspace {
-    width: calc(100% - 16px);
-    height: calc(100% - 48px);
-    position: relative;
-    margin: 8px 8px 0 8px;
-    background-color: transparent;
-    overflow-x: hidden;
-    overflow-y: auto;
-  }
-
-  &-simulator {
-    min-height: 100%;
-    height: auto;
-    display: grid;
+  .simulator {
     :global {
       .ant-form-item {
         pointer-events: none;
       }
-      .luck-grid-table {
-        .topLayout,
-        .gridTableBody {
-          pointer-events: none;
-        }
-      }
     }
   }
 
-  &-detector {
+  .detector {
     border: 1px dashed var(--ant-primary-color);
     background-color: color-mix(in sRGB, var(--ant-primary-color), transparent 95%);
     .box();
-
-    &-name{
-      position: absolute;
-      color: var(--ant-primary-color);
-      font-size: 12px;
-      line-height: 20px;
-    }
   }
 
-  &-selector {
+  .selector {
     border: 2px solid var(--ant-primary-6);
     .box();
-
-    .lc-borders-actions {
-      position: absolute;
-      right: -2px;
-      pointer-events: all;
-      cursor: default;
-      display: flex;
-
-      & > div {
-        .selector-item();
-      }
-
-      :local {
-        .instance-node-selector {
-          padding: 0 6px;
-          margin-right: 3px;
-          font-size: 12px !important;
-        }
-      }
-    }
-  }
-}
-
-.next-overlay-wrapper {
-  z-index: 3000;
-  display: flex;
-  flex-direction: column;
-  & > div > span {
-    .selector-item();
-
-    display: inline-block;
-    font-size: 12px;
-    padding: 0 6px;
-    background-color: #78869a;
-    &:not(:last-child) {
-      margin-bottom: 3px;
-    }
   }
 }

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

@@ -3,4 +3,5 @@
   height: 100%;
   position: relative;
   display: flex;
+  background-color: #fff;
 }

package/lib/lowcode/painter/style/layout-ratio.less

@@ -1,5 +1,5 @@
 .lc-painter-panel-section-layoutratio {
-  @gridbox-width: 58px; // 定义变量
+  @gridbox-width: 66px; // 定义变量
   @grid-gap: 10px; // 间隔变量
   @grid-items-per-row: 4; // 每行的gridbox数量
 

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

@@ -1,6 +1,4 @@
 .lc-painter-outline {
-  background-color: #fff;
-
   .page-node {
     cursor: pointer;
     display: flex;

package/lib/lowcode/painter/style/panel-item.less

@@ -1,54 +1,21 @@
 .lc-painter-components-panelitem {
-  padding: 0 16px;
+  display: flex;
+  justify-content: space-between;
+  gap: 20px;
+  align-items: center;
+  min-height: 28px;
 
-  &:not(:last-child) {
-    margin-bottom: 4px;
+  .item-label {
+    font-size: 12px;
   }
 
-  .panelrow {
+  .item-component {
     display: flex;
-    justify-content: space-between;
-    align-items: center;
-    min-height: 28px;
-
-    .item-label {
-      font-size: 12px;
-      width: 80px;
-      display: flex;
-      justify-content: flex-start;
-      align-items: center;
-      gap: 4px;
-      user-select: none;
-    }
-
-    .item-component {
-      display: flex;
-      flex: 1;
-    }
-
-    .item-icon {
-      font-size: 8px;
-      cursor: pointer;
-    }
-
-    /* 使.item-component-box的直接子元素铺满 */
-    .item-component > *:not(.ant-switch) {
-      flex-grow: 1;
-    }
-    .panel-pointer {
-      cursor: pointer;
-    }
+    width: 215px;
   }
 
-  .addon {
-    background-color: rgba(31, 56, 88, 0.04);
-    min-height: 20px;
-    margin-bottom: 6px;
-    margin-top: 6px;
-    padding: 4px 8px;
-    border-radius: 6px;
+  /* 使.item-component-box的直接子元素铺满 */
+  .item-component > * {
+    flex-grow: 1;
   }
 }
-.lc-painter-components-panelitem.no-padding {
-  padding: 0;
-}