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

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

@@ -8,7 +8,7 @@ import { useBoolean, useCreation, useMemoizedFn } from 'ahooks';
 import { Drawer, Icon } from 'luck-design/antd';
 import classNames from 'classnames';
 import { startsWith, isNil, get } from 'lodash';
-import { useContext } from "../../engine/provider/ContextProvider";
+import { useGet } from "../../engine/provider/ContextProvider";
 import PanelItemFactory from "../../engine/factory/panel-item-factory";
 import PanelItem from "./PanelItem";
 import Collapse from "./Collapse";
@@ -16,7 +16,7 @@ import styles from "../style/panel-attrs.less";
 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 = useRef(null);
   var factory = useRef(new PanelItemFactory());
@@ -26,10 +26,18 @@ var AttrsPanel = function AttrsPanel(_ref) {
     _useBoolean2$ = _useBoolean2[1],
     setTrue = _useBoolean2$.setTrue,
     setFalse = _useBoolean2$.setFalse;
-  var context = useContext();
-  var handleChange = useMemoizedFn(function (field, val, repositioning) {
+  var node = useGet({
+    id: nodeId,
+    path: 'props'
+  });
+  var handleChange = 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();
     }
@@ -44,25 +52,23 @@ var AttrsPanel = function AttrsPanel(_ref) {
     setTrue();
   });
   var renderPanelItems = 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 = _objectWithoutProperties(_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 = _objectWithoutProperties(_ref3, _excluded);
       var Comp = factory.current.getPanelItemFor(startsWith(type, '_') ? 'dynamic' : type, type);
       if (type === 'group') {
         return /*#__PURE__*/React.createElement(Comp, {
-          nodeId: value.id,
+          nodeId: nodeId,
           key: key,
           field: key,
           label: name,
@@ -73,26 +79,29 @@ var AttrsPanel = function AttrsPanel(_ref) {
           desc: desc
         }, renderPanelItems(props || [], dynamicProps));
       }
-      var _originalVal = get(node.props, valueKey || key);
+      var _originalVal = get(node, valueKey || key);
       var comp = Comp && /*#__PURE__*/React.createElement(Comp, _extends({
-        nodeId: value.id,
+        nodeId: nodeId,
         key: key,
         defaultValue: 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 : PanelItem;
       return /*#__PURE__*/React.createElement(Wrapper, _extends({
         key: key,
-        nodeId: value.id,
+        nodeId: nodeId,
         field: key,
         label: name,
         desc: desc
@@ -105,7 +114,7 @@ var AttrsPanel = function AttrsPanel(_ref) {
       return /*#__PURE__*/React.createElement(React.Fragment, null);
     }
     return renderPanelItems(meta.props);
-  }, [value]);
+  }, [nodeId]);
   useEffect(function () {
     if (!open) {
       nextRef.current = null;
@@ -113,7 +122,7 @@ var AttrsPanel = function AttrsPanel(_ref) {
   }, [open]);
   return /*#__PURE__*/React.createElement("div", {
     id: "lc-painter-panel-attrs-container",
-    className: classNames(styles['lc-painter-panel-attrs'], _defineProperty(_defineProperty({}, styles.hidden, !value), styles.showNext, open))
+    className: classNames(styles['lc-painter-panel-attrs'], _defineProperty(_defineProperty({}, styles.hidden, !nodeId), styles.showNext, open))
   }, PropsComps, /*#__PURE__*/React.createElement(Drawer, {
     visible: open,
     width: 320,

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

@@ -61,7 +61,7 @@ export default function (_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/es/lowcode/painter/components/code-editor/BaseEditor.js

@@ -1,7 +1,7 @@
 import _extends from "@babel/runtime/helpers/esm/extends";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-var _excluded = ["onChange", "isFullscreen"],
+var _excluded = ["onChange", "isFullscreen", "style"],
   _excluded2 = ["children", "language", "options"];
 import React, { useEffect, useRef, useImperativeHandle, forwardRef } from 'react';
 import * as monaco from 'monaco-editor';
@@ -42,6 +42,7 @@ import * as monaco from 'monaco-editor';
 var BaseEditor = /*#__PURE__*/forwardRef(function (_ref, ref) {
   var onChange = _ref.onChange,
     isFullscreen = _ref.isFullscreen,
+    style = _ref.style,
     props = _objectWithoutProperties(_ref, _excluded);
   var children = props.children,
     _props$language = props.language,
@@ -102,7 +103,7 @@ var BaseEditor = /*#__PURE__*/forwardRef(function (_ref, ref) {
   };
   return /*#__PURE__*/React.createElement("div", _extends({
     ref: editorRef,
-    style: editorStyle
+    style: _objectSpread(_objectSpread({}, editorStyle), style)
   }, rest));
 });
 export default /*#__PURE__*/React.memo(BaseEditor);

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

@@ -0,0 +1,108 @@
+import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
+import React, { useRef, useImperativeHandle, useState } from 'react';
+import { useMount, useCreation } from 'ahooks';
+import { keyBy } from 'lodash';
+import { Form, Row, Col, Select } from 'luck-design/antd';
+import styled from 'styled-components';
+import { formatMessage } from '@luck-design-biz/base/utils';
+import { JSEditor } from "../code-editor";
+import { getFrontRules } from "./meta/frontRules";
+var _I18N_PREFIX_ = 'luckda.lowcode.painter.panel-section.fieldsSetting.checkRules';
+var FormItem = styled(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 = useState(),
+    _useState2 = _slicedToArray(_useState, 2),
+    verifyType = _useState2[0],
+    setVerifyType = _useState2[1];
+  var _useState3 = useState(''),
+    _useState4 = _slicedToArray(_useState3, 2),
+    expression = _useState4[0],
+    setExpression = _useState4[1];
+  var jsRef = useRef();
+  useImperativeHandle(ruleRef, function () {
+    return jsRef.current;
+  });
+  useMount(function () {
+    if (rule.uid) {
+      form.setFieldsValue({
+        verifyType: rule.verifyType
+      });
+      setExpression(rule.expression);
+    } else {
+      var defaultType = getFrontRules(fieldData.property)[0].key;
+      form.setFieldsValue({
+        verifyType: defaultType
+      });
+      setVerifyType(defaultType);
+    }
+  });
+  var frontRulesObj = useCreation(function () {
+    return keyBy(getFrontRules(fieldData.property), 'key');
+  }, []);
+  var frontRule = 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.createElement(Form, {
+    layout: "vertical"
+  }, /*#__PURE__*/React.createElement(Row, {
+    gutter: 8
+  }, /*#__PURE__*/React.createElement(Col, {
+    span: 24
+  }, /*#__PURE__*/React.createElement(FormItem, {
+    label: formatMessage({
+      id: "".concat(_I18N_PREFIX_, ".verifyType"),
+      label: '校验规则'
+    })
+  }, form.getFieldDecorator('verifyType', {
+    rules: [{
+      required: true,
+      message: formatMessage({
+        id: "".concat(_I18N_PREFIX_, ".message.verifyType"),
+        label: '请选择校验规则'
+      })
+    }]
+  })( /*#__PURE__*/React.createElement(Select, {
+    onChange: function onChange(val) {
+      console.log('setVerifyType');
+      setVerifyType(val);
+    }
+  }, getFrontRules(fieldData.property).map(function (rule) {
+    return /*#__PURE__*/React.createElement(Option, {
+      key: rule.key,
+      value: rule.key
+    }, rule.label);
+  }))))), !frontRule.noCode && /*#__PURE__*/React.createElement(Col, {
+    span: 24
+  }, /*#__PURE__*/React.createElement("span", {
+    style: {
+      fontSize: '14px',
+      marginBottom: '16px',
+      color: 'rgba(0, 0, 0, 0.85)'
+    }
+  }, formatMessage({
+    id: "".concat(_I18N_PREFIX_, ".logic"),
+    label: '校验逻辑'
+  })), /*#__PURE__*/React.createElement(JSEditor, {
+    style: {
+      height: '300px',
+      border: '1px solid rgb(217, 217, 217)',
+      borderRadius: '4px',
+      padding: '12px'
+    },
+    ref: jsRef
+  }, expression))));
+};
+export default CheckRules;

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

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

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

@@ -2,12 +2,15 @@ import _regeneratorRuntime from "@babel/runtime/helpers/esm/regeneratorRuntime";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
-import React from 'react';
+import React, { useRef } from 'react';
 import { useMemoizedFn, useBoolean } from 'ahooks';
 import { Modal, Form } from 'luck-design/antd';
+import { formatMessage } from '@luck-design-biz/base/utils';
 import CheckRules from "./CheckRules";
+import CheckFrontRules from "./CheckFrontRules";
 import { fetchAddFieldAttrs, fetchUpdateFieldAttrs } from "../../../constants/api-url";
 import { FIELD_SCOPES } from "../../../constants";
+var _I18N_PREFIX_ = 'luckda.lowcode.painter.panel-section.fieldsSetting';
 var FieldRulesModal = Form.create({
   name: 'field-rules-form'
 })(function (_ref) {
@@ -27,6 +30,7 @@ var FieldRulesModal = Form.create({
     _useBoolean2$ = _useBoolean2[1],
     setTrue = _useBoolean2$.setTrue,
     setFalse = _useBoolean2$.setFalse;
+  var frontRuleRef = useRef();
   var handleOk = useMemoizedFn( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
     return _regeneratorRuntime().wrap(function _callee2$(_context2) {
       while (1) switch (_context2.prev = _context2.next) {
@@ -34,7 +38,8 @@ var FieldRulesModal = Form.create({
           setTrue();
           form.validateFields( /*#__PURE__*/function () {
             var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(err, vals) {
-              var request, data, _yield$request, code;
+              var _frontRuleRef$current;
+              var request, data, expression, _val, _yield$request, code;
               return _regeneratorRuntime().wrap(function _callee$(_context) {
                 while (1) switch (_context.prev = _context.next) {
                   case 0:
@@ -48,29 +53,35 @@ var FieldRulesModal = Form.create({
                     data = {
                       scope: FIELD_SCOPES.CHECK_RULES
                     };
+                    expression = (_frontRuleRef$current = frontRuleRef.current) === null || _frontRuleRef$current === void 0 ? void 0 : _frontRuleRef$current.editor.getValue();
+                    _val = expression ? _objectSpread(_objectSpread({}, vals), {}, {
+                      expression: expression
+                    }) : vals;
                     if (rule.uid) {
-                      data.ccmModuleFieldVerifies = [_objectSpread(_objectSpread({}, vals), {}, {
-                        uid: rule.uid
+                      data.ccmModuleFieldVerifies = [_objectSpread(_objectSpread({}, _val), {}, {
+                        uid: rule.uid,
+                        verifyScope: (rule === null || rule === void 0 ? void 0 : rule.ruleType) === 'front' ? 0 : 1
                       })];
                     } else {
-                      data.ccmModuleFieldVerifies = [_objectSpread(_objectSpread({}, vals), {}, {
-                        dataModelKey: dataModelKey
+                      data.ccmModuleFieldVerifies = [_objectSpread(_objectSpread({}, _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();
                 }
@@ -87,7 +98,10 @@ var FieldRulesModal = Form.create({
     }, _callee2);
   })));
   return /*#__PURE__*/React.createElement(Modal, {
-    title: condition === null || condition === void 0 || (_condition$FIELD_SCOP = condition[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' ? formatMessage({
+      id: "".concat(_I18N_PREFIX_, ".rules.front"),
+      label: '前端校验规则'
+    }) : condition === null || condition === void 0 || (_condition$FIELD_SCOP = condition[FIELD_SCOPES.CHECK_RULES]) === null || _condition$FIELD_SCOP === void 0 ? void 0 : _condition$FIELD_SCOP.scopeName,
     width: 800,
     visible: !!rule,
     getContainer: function getContainer() {
@@ -104,9 +118,15 @@ var FieldRulesModal = 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.createElement(CheckRules, {
+  }, (rule === null || rule === void 0 ? void 0 : rule.ruleType) === 'front' && /*#__PURE__*/React.createElement(CheckFrontRules, {
+    form: form,
+    rule: rule,
+    fields: fields,
+    ruleRef: frontRuleRef,
+    fieldData: fieldData
+  }), (rule === null || rule === void 0 ? void 0 : rule.ruleType) === 'back' && /*#__PURE__*/React.createElement(CheckRules, {
     form: form,
     rule: rule,
     condition: condition === null || condition === void 0 ? void 0 : condition[FIELD_SCOPES.CHECK_RULES],