@luck-design-biz/luckda 0.0.25-6 → 0.0.25-8

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

@@ -24,7 +24,7 @@ var _excluded = ["type", "key", "valueKey", "name", "desc", "default", "props",
 var AttrsPanel = function AttrsPanel(_ref) {
   var _nextRef$current2, _nextRef$current3;
   var meta = _ref.meta,
-    value = _ref.value,
+    nodeId = _ref.nodeId,
     onChange = _ref.onChange;
   var nextRef = (0, _react.useRef)(null);
   var factory = (0, _react.useRef)(new _panelItemFactory.default());
@@ -34,10 +34,18 @@ var AttrsPanel = function AttrsPanel(_ref) {
     _useBoolean2$ = _useBoolean2[1],
     setTrue = _useBoolean2$.setTrue,
     setFalse = _useBoolean2$.setFalse;
-  var context = (0, _ContextProvider.useContext)();
-  var handleChange = (0, _ahooks.useMemoizedFn)(function (field, val, repositioning) {
+  var node = (0, _ContextProvider.useGet)({
+    id: nodeId,
+    path: 'props'
+  });
+  var handleChange = (0, _ahooks.useMemoizedFn)(function (field, val, _ref2) {
     var _nextRef$current;
-    onChange(field, val, repositioning);
+    var repositioning = _ref2.repositioning,
+      before = _ref2.before;
+    onChange(field, val, {
+      repositioning: repositioning,
+      before: before
+    });
     if ((_nextRef$current = nextRef.current) !== null && _nextRef$current !== void 0 && _nextRef$current.autoClose) {
       setFalse();
     }
@@ -52,25 +60,23 @@ var AttrsPanel = function AttrsPanel(_ref) {
     setTrue();
   });
   var renderPanelItems = (0, _ahooks.useMemoizedFn)(function (items, dynamicProps) {
-    var _context$componentMap = context.componentMap.get(value.id).api.getSelfAndParentLCData(),
-      node = _context$componentMap.node;
-    return items.map(function (_ref2) {
-      var type = _ref2.type,
-        key = _ref2.key,
-        valueKey = _ref2.valueKey,
-        name = _ref2.name,
-        desc = _ref2.desc,
-        defaultValue = _ref2.default,
-        props = _ref2.props,
-        wrapper = _ref2.wrapper,
-        wrapperProps = _ref2.wrapperProps,
-        next = _ref2.next,
-        repositioning = _ref2.repositioning,
-        rest = (0, _objectWithoutProperties2.default)(_ref2, _excluded);
+    return items.map(function (_ref3) {
+      var type = _ref3.type,
+        key = _ref3.key,
+        valueKey = _ref3.valueKey,
+        name = _ref3.name,
+        desc = _ref3.desc,
+        defaultValue = _ref3.default,
+        props = _ref3.props,
+        wrapper = _ref3.wrapper,
+        wrapperProps = _ref3.wrapperProps,
+        next = _ref3.next,
+        repositioning = _ref3.repositioning,
+        rest = (0, _objectWithoutProperties2.default)(_ref3, _excluded);
       var Comp = factory.current.getPanelItemFor((0, _lodash.startsWith)(type, '_') ? 'dynamic' : type, type);
       if (type === 'group') {
         return /*#__PURE__*/_react.default.createElement(Comp, {
-          nodeId: value.id,
+          nodeId: nodeId,
           key: key,
           field: key,
           label: name,
@@ -81,26 +87,29 @@ var AttrsPanel = function AttrsPanel(_ref) {
           desc: desc
         }, renderPanelItems(props || [], dynamicProps));
       }
-      var _originalVal = (0, _lodash.get)(node.props, valueKey || key);
+      var _originalVal = (0, _lodash.get)(node, valueKey || key);
       var comp = Comp && /*#__PURE__*/_react.default.createElement(Comp, (0, _extends2.default)({
-        nodeId: value.id,
+        nodeId: nodeId,
         key: key,
         defaultValue: (0, _lodash.isNil)(_originalVal) ? defaultValue : _originalVal,
         next: next !== null && next !== void 0 && next.props ? function (_dp) {
           return goNext(next, _dp);
         } : null,
-        onChange: function onChange(val) {
-          return handleChange(valueKey || key, val, repositioning);
+        onChange: function onChange(val, before) {
+          return handleChange(valueKey || key, val, {
+            repositioning: repositioning,
+            before: before
+          });
         },
         size: "small",
-        settings: node.props,
+        settings: node,
         renderPanelItems: renderPanelItems
       }, rest, dynamicProps));
       if (wrapper === 'hidden') return comp;
       var Wrapper = wrapper === 'collapse' ? _Collapse.default : _PanelItem.default;
       return /*#__PURE__*/_react.default.createElement(Wrapper, (0, _extends2.default)({
         key: key,
-        nodeId: value.id,
+        nodeId: nodeId,
         field: key,
         label: name,
         desc: desc
@@ -113,7 +122,7 @@ var AttrsPanel = function AttrsPanel(_ref) {
       return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null);
     }
     return renderPanelItems(meta.props);
-  }, [value]);
+  }, [nodeId]);
   (0, _react.useEffect)(function () {
     if (!open) {
       nextRef.current = null;
@@ -121,7 +130,7 @@ var AttrsPanel = function AttrsPanel(_ref) {
   }, [open]);
   return /*#__PURE__*/_react.default.createElement("div", {
     id: "lc-painter-panel-attrs-container",
-    className: (0, _classnames.default)(_panelAttrs.default['lc-painter-panel-attrs'], (0, _defineProperty2.default)((0, _defineProperty2.default)({}, _panelAttrs.default.hidden, !value), _panelAttrs.default.showNext, open))
+    className: (0, _classnames.default)(_panelAttrs.default['lc-painter-panel-attrs'], (0, _defineProperty2.default)((0, _defineProperty2.default)({}, _panelAttrs.default.hidden, !nodeId), _panelAttrs.default.showNext, open))
   }, PropsComps, /*#__PURE__*/_react.default.createElement(_antd.Drawer, {
     visible: open,
     width: 320,

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

@@ -70,7 +70,7 @@ function _default(_ref) {
 }
 function pubEvent(event, eventName, ctx) {
   if (event.active && event.over && event.active.data.current.id !== event.over.data.current.id) {
-    var parentNode = ctx.componentMap.get(event.over.data.current.id).api.getSelfAndParentLCData().parent;
+    var parentNode = ctx.componentMap.get(event.over.data.current.id).api.getSelfAndParentData().parent;
 
     // console.log('event.over.data.current.type', event.over.data.current.type)
     var actionSide = getAction(event.over.data.current.type, event.over.data.current.component.component, event.active.rect.current.translated, event.over.rect, parentNode);

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

@@ -11,7 +11,7 @@ var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/obje
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 var _react = _interopRequireWildcard(require("react"));
 var monaco = _interopRequireWildcard(require("monaco-editor"));
-var _excluded = ["onChange", "isFullscreen"],
+var _excluded = ["onChange", "isFullscreen", "style"],
   _excluded2 = ["children", "language", "options"];
 /**
  * BaseEditor 组件是一个封装了 monaco 编辑器的 React 组件，支持前向 ref 引用。
@@ -49,6 +49,7 @@ var _excluded = ["onChange", "isFullscreen"],
 var BaseEditor = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref) {
   var onChange = _ref.onChange,
     isFullscreen = _ref.isFullscreen,
+    style = _ref.style,
     props = (0, _objectWithoutProperties2.default)(_ref, _excluded);
   var children = props.children,
     _props$language = props.language,
@@ -109,7 +110,7 @@ var BaseEditor = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref) {
   };
   return /*#__PURE__*/_react.default.createElement("div", (0, _extends2.default)({
     ref: editorRef,
-    style: editorStyle
+    style: (0, _objectSpread2.default)((0, _objectSpread2.default)({}, editorStyle), style)
   }, rest));
 });
 var _default = exports.default = /*#__PURE__*/_react.default.memo(BaseEditor);

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

@@ -0,0 +1,116 @@
+"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 _ahooks = require("ahooks");
+var _lodash = require("lodash");
+var _antd = require("luck-design/antd");
+var _styledComponents = _interopRequireDefault(require("styled-components"));
+var _utils = require("@luck-design-biz/base/utils");
+var _codeEditor = require("../code-editor");
+var _frontRules = require("./meta/frontRules");
+var _I18N_PREFIX_ = 'luckda.lowcode.painter.panel-section.fieldsSetting.checkRules';
+var FormItem = (0, _styledComponents.default)(_antd.Form.Item).withConfig({
+  displayName: "FormItem",
+  componentId: "luckda-6530__sc-d9mrmm-0"
+})(["margin-bottom:0;"]);
+var CheckRules = function CheckRules(_ref) {
+  var form = _ref.form,
+    fields = _ref.fields,
+    rule = _ref.rule,
+    fieldData = _ref.fieldData,
+    ruleRef = _ref.ruleRef;
+  var _useState = (0, _react.useState)(),
+    _useState2 = (0, _slicedToArray2.default)(_useState, 2),
+    verifyType = _useState2[0],
+    setVerifyType = _useState2[1];
+  var _useState3 = (0, _react.useState)(''),
+    _useState4 = (0, _slicedToArray2.default)(_useState3, 2),
+    expression = _useState4[0],
+    setExpression = _useState4[1];
+  var jsRef = (0, _react.useRef)();
+  (0, _react.useImperativeHandle)(ruleRef, function () {
+    return jsRef.current;
+  });
+  (0, _ahooks.useMount)(function () {
+    if (rule.uid) {
+      form.setFieldsValue({
+        verifyType: rule.verifyType
+      });
+      setExpression(rule.expression);
+    } else {
+      var defaultType = (0, _frontRules.getFrontRules)(fieldData.property)[0].key;
+      form.setFieldsValue({
+        verifyType: defaultType
+      });
+      setVerifyType(defaultType);
+    }
+  });
+  var frontRulesObj = (0, _ahooks.useCreation)(function () {
+    return (0, _lodash.keyBy)((0, _frontRules.getFrontRules)(fieldData.property), 'key');
+  }, []);
+  var frontRule = (0, _ahooks.useCreation)(function () {
+    var _frontRulesObj$verify;
+    setExpression(((_frontRulesObj$verify = frontRulesObj[verifyType]) === null || _frontRulesObj$verify === void 0 ? void 0 : _frontRulesObj$verify.defaultCode) || '');
+    if (verifyType) return frontRulesObj[verifyType];
+    return {
+      noCode: false
+    };
+  }, [verifyType]);
+  return /*#__PURE__*/_react.default.createElement(_antd.Form, {
+    layout: "vertical"
+  }, /*#__PURE__*/_react.default.createElement(_antd.Row, {
+    gutter: 8
+  }, /*#__PURE__*/_react.default.createElement(_antd.Col, {
+    span: 24
+  }, /*#__PURE__*/_react.default.createElement(FormItem, {
+    label: (0, _utils.formatMessage)({
+      id: "".concat(_I18N_PREFIX_, ".verifyType"),
+      label: '校验规则'
+    })
+  }, form.getFieldDecorator('verifyType', {
+    rules: [{
+      required: true,
+      message: (0, _utils.formatMessage)({
+        id: "".concat(_I18N_PREFIX_, ".message.verifyType"),
+        label: '请选择校验规则'
+      })
+    }]
+  })( /*#__PURE__*/_react.default.createElement(_antd.Select, {
+    onChange: function onChange(val) {
+      console.log('setVerifyType');
+      setVerifyType(val);
+    }
+  }, (0, _frontRules.getFrontRules)(fieldData.property).map(function (rule) {
+    return /*#__PURE__*/_react.default.createElement(Option, {
+      key: rule.key,
+      value: rule.key
+    }, rule.label);
+  }))))), !frontRule.noCode && /*#__PURE__*/_react.default.createElement(_antd.Col, {
+    span: 24
+  }, /*#__PURE__*/_react.default.createElement("span", {
+    style: {
+      fontSize: '14px',
+      marginBottom: '16px',
+      color: 'rgba(0, 0, 0, 0.85)'
+    }
+  }, (0, _utils.formatMessage)({
+    id: "".concat(_I18N_PREFIX_, ".logic"),
+    label: '校验逻辑'
+  })), /*#__PURE__*/_react.default.createElement(_codeEditor.JSEditor, {
+    style: {
+      height: '300px',
+      border: '1px solid rgb(217, 217, 217)',
+      borderRadius: '4px',
+      padding: '12px'
+    },
+    ref: jsRef
+  }, expression))));
+};
+var _default = exports.default = CheckRules;

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

@@ -36,7 +36,7 @@ var CheckRules = function CheckRules(_ref) {
   }, /*#__PURE__*/_react.default.createElement(_antd.Row, {
     gutter: 8
   }, /*#__PURE__*/_react.default.createElement(_antd.Col, {
-    span: 12
+    span: 24
   }, /*#__PURE__*/_react.default.createElement(FormItem, {
     label: (0, _utils.formatMessage)({
       id: "".concat(_I18N_PREFIX_, ".verifyType"),
@@ -57,31 +57,6 @@ var CheckRules = function CheckRules(_ref) {
     }, val));
     return types;
   }, []))))), /*#__PURE__*/_react.default.createElement(_antd.Col, {
-    span: 12
-  }, /*#__PURE__*/_react.default.createElement(FormItem, {
-    label: (0, _utils.formatMessage)({
-      id: "".concat(_I18N_PREFIX_, ".verifyScope"),
-      label: '校验类型'
-    })
-  }, form.getFieldDecorator('verifyScope', {
-    rules: [{
-      required: true,
-      message: (0, _utils.formatMessage)({
-        id: "".concat(_I18N_PREFIX_, ".message.verifyScope"),
-        label: '请选择校验类型'
-      })
-    }]
-  })( /*#__PURE__*/_react.default.createElement(_antd.Select, null, /*#__PURE__*/_react.default.createElement(Option, {
-    value: 0
-  }, (0, _utils.formatMessage)({
-    id: "".concat(_I18N_PREFIX_, ".frontend"),
-    label: '前端'
-  })), /*#__PURE__*/_react.default.createElement(Option, {
-    value: 1
-  }, (0, _utils.formatMessage)({
-    id: "".concat(_I18N_PREFIX_, ".backend"),
-    label: '后端'
-  })))))), /*#__PURE__*/_react.default.createElement(_antd.Col, {
     span: 24
   }, /*#__PURE__*/_react.default.createElement(FormItem, {
     label: (0, _utils.formatMessage)({

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

@@ -1,5 +1,6 @@
 "use strict";
 
+var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard").default;
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
 Object.defineProperty(exports, "__esModule", {
   value: true
@@ -9,12 +10,15 @@ var _regeneratorRuntime2 = _interopRequireDefault(require("@babel/runtime/helper
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
-var _react = _interopRequireDefault(require("react"));
+var _react = _interopRequireWildcard(require("react"));
 var _ahooks = require("ahooks");
 var _antd = require("luck-design/antd");
+var _utils = require("@luck-design-biz/base/utils");
 var _CheckRules = _interopRequireDefault(require("./CheckRules"));
+var _CheckFrontRules = _interopRequireDefault(require("./CheckFrontRules"));
 var _apiUrl = require("../../../constants/api-url");
 var _constants = require("../../../constants");
+var _I18N_PREFIX_ = 'luckda.lowcode.painter.panel-section.fieldsSetting';
 var FieldRulesModal = _antd.Form.create({
   name: 'field-rules-form'
 })(function (_ref) {
@@ -34,6 +38,7 @@ var FieldRulesModal = _antd.Form.create({
     _useBoolean2$ = _useBoolean2[1],
     setTrue = _useBoolean2$.setTrue,
     setFalse = _useBoolean2$.setFalse;
+  var frontRuleRef = (0, _react.useRef)();
   var handleOk = (0, _ahooks.useMemoizedFn)( /*#__PURE__*/(0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee2() {
     return (0, _regeneratorRuntime2.default)().wrap(function _callee2$(_context2) {
       while (1) switch (_context2.prev = _context2.next) {
@@ -41,7 +46,8 @@ var FieldRulesModal = _antd.Form.create({
           setTrue();
           form.validateFields( /*#__PURE__*/function () {
             var _ref3 = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee(err, vals) {
-              var request, data, _yield$request, code;
+              var _frontRuleRef$current;
+              var request, data, expression, _val, _yield$request, code;
               return (0, _regeneratorRuntime2.default)().wrap(function _callee$(_context) {
                 while (1) switch (_context.prev = _context.next) {
                   case 0:
@@ -55,29 +61,35 @@ var FieldRulesModal = _antd.Form.create({
                     data = {
                       scope: _constants.FIELD_SCOPES.CHECK_RULES
                     };
+                    expression = (_frontRuleRef$current = frontRuleRef.current) === null || _frontRuleRef$current === void 0 ? void 0 : _frontRuleRef$current.editor.getValue();
+                    _val = expression ? (0, _objectSpread2.default)((0, _objectSpread2.default)({}, vals), {}, {
+                      expression: expression
+                    }) : vals;
                     if (rule.uid) {
-                      data.ccmModuleFieldVerifies = [(0, _objectSpread2.default)((0, _objectSpread2.default)({}, vals), {}, {
-                        uid: rule.uid
+                      data.ccmModuleFieldVerifies = [(0, _objectSpread2.default)((0, _objectSpread2.default)({}, _val), {}, {
+                        uid: rule.uid,
+                        verifyScope: (rule === null || rule === void 0 ? void 0 : rule.ruleType) === 'front' ? 0 : 1
                       })];
                     } else {
-                      data.ccmModuleFieldVerifies = [(0, _objectSpread2.default)((0, _objectSpread2.default)({}, vals), {}, {
-                        dataModelKey: dataModelKey
+                      data.ccmModuleFieldVerifies = [(0, _objectSpread2.default)((0, _objectSpread2.default)({}, _val), {}, {
+                        dataModelKey: dataModelKey,
+                        verifyScope: (rule === null || rule === void 0 ? void 0 : rule.ruleType) === 'front' ? 0 : 1
                       })];
                       data.dataModelKey = dataModelKey;
                       data.datasetBusinessUids = [fieldData.uid];
                       data.moduleDatasetUid = datasetId;
                       data.moduleUid = moduleId;
                     }
-                    _context.next = 7;
+                    _context.next = 9;
                     return request(data);
-                  case 7:
+                  case 9:
                     _yield$request = _context.sent;
                     code = _yield$request.code;
                     setFalse();
                     if (code === 1) {
-                      onClose(true);
+                      onClose(true, (rule === null || rule === void 0 ? void 0 : rule.ruleType) === 'front' ? 0 : 1);
                     }
-                  case 11:
+                  case 13:
                   case "end":
                     return _context.stop();
                 }
@@ -94,7 +106,10 @@ var FieldRulesModal = _antd.Form.create({
     }, _callee2);
   })));
   return /*#__PURE__*/_react.default.createElement(_antd.Modal, {
-    title: condition === null || condition === void 0 || (_condition$FIELD_SCOP = condition[_constants.FIELD_SCOPES.CHECK_RULES]) === null || _condition$FIELD_SCOP === void 0 ? void 0 : _condition$FIELD_SCOP.scopeName,
+    title: (rule === null || rule === void 0 ? void 0 : rule.ruleType) === 'front' ? (0, _utils.formatMessage)({
+      id: "".concat(_I18N_PREFIX_, ".rules.front"),
+      label: '前端校验规则'
+    }) : condition === null || condition === void 0 || (_condition$FIELD_SCOP = condition[_constants.FIELD_SCOPES.CHECK_RULES]) === null || _condition$FIELD_SCOP === void 0 ? void 0 : _condition$FIELD_SCOP.scopeName,
     width: 800,
     visible: !!rule,
     getContainer: function getContainer() {
@@ -111,9 +126,15 @@ var FieldRulesModal = _antd.Form.create({
     },
     onOk: handleOk,
     onCancel: function onCancel() {
-      return onClose(false);
+      return onClose(false, (rule === null || rule === void 0 ? void 0 : rule.ruleType) === 'front' ? 0 : 1);
     }
-  }, /*#__PURE__*/_react.default.createElement(_CheckRules.default, {
+  }, (rule === null || rule === void 0 ? void 0 : rule.ruleType) === 'front' && /*#__PURE__*/_react.default.createElement(_CheckFrontRules.default, {
+    form: form,
+    rule: rule,
+    fields: fields,
+    ruleRef: frontRuleRef,
+    fieldData: fieldData
+  }), (rule === null || rule === void 0 ? void 0 : rule.ruleType) === 'back' && /*#__PURE__*/_react.default.createElement(_CheckRules.default, {
     form: form,
     rule: rule,
     condition: condition === null || condition === void 0 ? void 0 : condition[_constants.FIELD_SCOPES.CHECK_RULES],