@luck-design-biz/luckda 1.0.2-9 → 1.0.3-13tl

package/lib/lowcode/engine/meta/box.props.default.json

@@ -6,7 +6,7 @@
   "group": "container",
   "groupName": "布局",
   "order": 3,
-  "css": "height:auto; width: auto; background-color: #fff;",
+  "css": "height:auto; width: auto;",
   "advance": {
     "events": {}
   }

package/lib/lowcode/engine/meta/box.props.json

@@ -14,7 +14,7 @@
       "disabled": true
     }
   ],
-  "css": "height:auto; width: auto; background-color: #fff;",
+  "css": "height:auto; width: auto;",
   "advance": {
     "events": [
       {

package/lib/lowcode/engine/meta/dialog.props.default.json

@@ -7,6 +7,7 @@
   "groupName": "基础",
   "order": 1,
   "title": "对话框",
+  "size": "custom",
   "width": "700px",
   "height": "50vh",
   "padding": 16,
@@ -14,7 +15,9 @@
   "mask": true,
   "closable": true,
   "destroyOnClose": true,
-  "footer": true,
+  "footer": {
+    "checked": true
+  },
   "okText": "确定",
   "cancelText": "取消",
   "btnGroup": {

package/lib/lowcode/engine/meta/dialog.props.json

@@ -20,10 +20,16 @@
       "type": "_I18nInput",
       "default": "对话框"
     },
+    {
+      "key": "size",
+      "name": "#展现尺寸",
+      "type": "_DialogSize",
+      "default": "custom"
+    },
     {
       "key": "width",
       "name": "对话框宽度",
-      "type": "_WidthHeight",
+      "type": "_DialogWidthHeight",
       "options": [
         {
           "label": "px",
@@ -42,12 +48,18 @@
           "value": "auto"
         }
       ],
+      "sizeOptions": {
+        "small": "540px",
+        "default": "700px",
+        "large": "1150px",
+        "full": "100vw"
+      },
       "default": "700px"
     },
     {
       "key": "height",
       "name": "内容区高度",
-      "type": "_WidthHeight",
+      "type": "_DialogWidthHeight",
       "options": [
         {
           "label": "px",
@@ -62,6 +74,12 @@
           "value": "auto"
         }
       ],
+      "sizeOptions": {
+        "small": "40vh",
+        "default": "60vh",
+        "large": "85vh",
+        "full": "100vh"
+      },
       "default": "50vh"
     },
     {
@@ -142,8 +160,10 @@
           "key": "footer",
           "name": "显示footer",
           "desc": "是否显示底部按钮区域",
-          "type": "switch",
-          "default": true
+          "type": "_ConditionCheck",
+          "default": {
+            "checked": true
+          }
         },
         {
           "key": "okText",

package/lib/lowcode/engine/meta/drawer.props.json

@@ -180,7 +180,7 @@
           "key": "footer",
           "name": "显示footer",
           "desc": "是否显示底部按钮区域",
-          "type": "switch",
+          "type": "_ConditionCheck",
           "default": true
         },
         {

package/lib/lowcode/engine/meta/form.props.json

@@ -661,7 +661,7 @@
         "key": "beforeSave",
         "name": "保存前置事件",
         "desc": "保存前置事件，promise，返回false取消执行",
-        "func": "function beforeSave(values, data) {\n return values; \n}"
+        "func": "function beforeSave(values, data) {\n return new Promise(resolve=>resolve(values)); \n}"
       },
       {
         "key": "onSaveCallback",

package/lib/lowcode/engine/provider/ContextProvider/router.js

@@ -1,5 +1,6 @@
 "use strict";
 
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
@@ -13,8 +14,14 @@ Object.defineProperty(exports, "history", {
 exports.push = push;
 exports.replace = replace;
 exports.stringifyQuery = stringifyQuery;
+var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
+var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
+var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _umi = require("umi");
 var _lodash = require("lodash");
+var _qs = require("qs");
+var _excluded = ["title", "subTitle"],
+  _excluded2 = ["title", "subTitle"];
 function push(path, params) {
   var type = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 'push';
   var blank = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : false;
@@ -27,7 +34,21 @@ function push(path, params) {
       method: 'replace'
     });
   } else if (type === 'layer') {
-    window.openUrl("layer:".concat(path), params);
+    var _path$split = path.split('?'),
+      _path$split2 = (0, _slicedToArray2.default)(_path$split, 2),
+      _path = _path$split2[0],
+      argsStr = _path$split2[1];
+    var title = params.title,
+      subTitle = params.subTitle,
+      _params = (0, _objectWithoutProperties2.default)(params, _excluded);
+    var _parse = (0, _qs.parse)(argsStr),
+      _title = _parse.title,
+      _subTitle = _parse.subTitle,
+      args = (0, _objectWithoutProperties2.default)(_parse, _excluded2);
+    window.openUrl("layer:".concat(_path, "?").concat((0, _qs.stringify)((0, _objectSpread2.default)({
+      title: title || _title,
+      subTitle: subTitle || _subTitle
+    }, args))), _params);
   } else if (type === 'iframe') {
     window.openUrl("iframe:".concat(path));
   } else if (type === 'sso') {

package/lib/lowcode/painter/DesignOperator.js

@@ -272,15 +272,16 @@ var DesignOperator = function DesignOperator(_ref) {
       var toggle = _ref6.toggle,
         id = _ref6.id;
       if (toggle && id !== currentModal.current) {
-        canvas.current.style.setProperty('overflow', 'hidden');
+        var _canvas$current2;
+        (_canvas$current2 = canvas.current) === null || _canvas$current2 === void 0 || _canvas$current2.style.setProperty('overflow', 'hidden');
         var _modal = context.componentMap.get(id);
         var _prevModal = currentModal.current ? context.componentMap.get(currentModal.current) : null;
         _prevModal === null || _prevModal === void 0 || _prevModal.api.doClose();
         _modal.api.doOpen();
         currentModal.current = id;
       } else if (!toggle) {
-        var _canvas$current2;
-        (_canvas$current2 = canvas.current) === null || _canvas$current2 === void 0 || _canvas$current2.style.removeProperty('overflow');
+        var _canvas$current3;
+        (_canvas$current3 = canvas.current) === null || _canvas$current3 === void 0 || _canvas$current3.style.removeProperty('overflow');
         var _id = id || currentModal.current;
         if (_id) {
           var _modal2 = context.componentMap.get(_id);

package/lib/lowcode/painter/History.js

@@ -0,0 +1,308 @@
+"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 _antd = require("luck-design/antd");
+var _luckDesign = require("luck-design");
+var _moment = _interopRequireDefault(require("moment"));
+var _lodash = require("lodash");
+var _base = require("@luck-design-biz/base");
+var _ContextProvider = require("../engine/provider/ContextProvider");
+var _TipIcon = _interopRequireDefault(require("./components/TipIcon"));
+var _DiffEditor = _interopRequireDefault(require("./components/code-editor/DiffEditor"));
+var _utils = require("@luck-design-biz/base/utils");
+var _helper = require("../engine/tools/helper");
+var _dataProcess = require("../engine/tools/dataProcess");
+var _history = _interopRequireDefault(require("./style/history.less"));
+var _apiUrl = require("../constants/api-url");
+var History = function History(_ref) {
+  var form = _ref.form;
+  var ref = (0, _react.useRef)();
+  var editorRef = (0, _react.useRef)();
+  var versionListRef = (0, _react.useRef)(null);
+  var ctx = (0, _ContextProvider.useContext)();
+  var _useState = (0, _react.useState)([]),
+    _useState2 = (0, _slicedToArray2.default)(_useState, 2),
+    versionList = _useState2[0],
+    setVersionList = _useState2[1];
+  var _useState3 = (0, _react.useState)(null),
+    _useState4 = (0, _slicedToArray2.default)(_useState3, 2),
+    version = _useState4[0],
+    setVersion = _useState4[1];
+  var _useState5 = (0, _react.useState)(false),
+    _useState6 = (0, _slicedToArray2.default)(_useState5, 2),
+    visible = _useState6[0],
+    setVisible = _useState6[1];
+  var _useInViewport = (0, _ahooks.useInViewport)(ref),
+    _useInViewport2 = (0, _slicedToArray2.default)(_useInViewport, 1),
+    inViewport = _useInViewport2[0];
+  var pageData = (0, _ContextProvider.useGet)();
+  var _useRequest = (0, _ahooks.useRequest)(_apiUrl.fetchHistoryVersionList, {
+      manual: true,
+      onSuccess: function onSuccess(_ref2) {
+        var code = _ref2.code,
+          list = _ref2.list,
+          detail = _ref2.detail;
+        if (code === 1) {
+          versionListRef.current = list.map(function (id) {
+            return detail[id];
+          });
+          setVersionList(versionListRef.current);
+        }
+      }
+    }),
+    loading = _useRequest.loading,
+    runFetchHistoryVersionList = _useRequest.run;
+  var _useRequest2 = (0, _ahooks.useRequest)(_apiUrl.fetchAddHistoryVersion, {
+      manual: true,
+      onSuccess: function onSuccess(_ref3) {
+        var code = _ref3.code;
+        if (code === 1) {
+          setVisible(false);
+          runFetchHistoryVersionList({
+            pageCode: (0, _helper.getLDMetaAttr)('pageCode')
+          });
+        }
+      }
+    }),
+    addLoading = _useRequest2.loading,
+    runFetchAddHistoryVersion = _useRequest2.run;
+  var _useRequest3 = (0, _ahooks.useRequest)(_apiUrl.fetchDelHistoryVersion, {
+      manual: true,
+      onSuccess: function onSuccess(_ref4) {
+        var code = _ref4.code;
+        if (code === 1) {
+          runFetchHistoryVersionList({
+            pageCode: (0, _helper.getLDMetaAttr)('pageCode')
+          });
+        }
+      }
+    }),
+    deleteLoading = _useRequest3.loading,
+    runFetchDelHistoryVersion = _useRequest3.run;
+  var _useRequest4 = (0, _ahooks.useRequest)(_apiUrl.fetchRecoverHistoryVersion, {
+      manual: true,
+      onSuccess: function onSuccess(_ref5) {
+        var code = _ref5.code;
+        return code === 1 && window.location.reload();
+      }
+    }),
+    runFetchRecoverHistoryVersion = _useRequest4.run;
+  var handleSearch = (0, _ahooks.useMemoizedFn)(function (value) {
+    if ((0, _lodash.isNil)(value)) {
+      setVersionList(versionListRef.current);
+    } else {
+      setVersionList(versionListRef.current.filter(function (item) {
+        return JSON.stringify(item).includes(value);
+      }));
+    }
+  });
+  var handleAddVersion = (0, _ahooks.useMemoizedFn)(function () {
+    form.validateFields(function (err, values) {
+      if (!err) {
+        runFetchAddHistoryVersion({
+          pageCode: (0, _helper.getLDMetaAttr)('pageCode'),
+          backupName: values.title,
+          backupNote: values.note
+        });
+      }
+    });
+  });
+  var handleDeleteVersion = (0, _ahooks.useMemoizedFn)(function (item) {
+    (0, _base.recheck)({
+      title: "".concat((0, _utils.formatMessage)({
+        id: 'luckda.lowcode.version.delete',
+        label: '你确定要删除该历史版本吗？'
+      })),
+      checkWords: "".concat(item.backupName, "(").concat(item.backupUserName, ")"),
+      cancelText: (0, _utils.formatMessage)({
+        id: 'app.base.operate.cancel'
+      }),
+      okText: (0, _utils.formatMessage)({
+        id: 'app.base.operate.ok'
+      }),
+      onOk: function onOk() {
+        runFetchDelHistoryVersion({
+          uid: item.id
+        });
+      }
+    });
+  });
+  var handleRecoverVersion = (0, _ahooks.useMemoizedFn)(function () {
+    (0, _base.recheck)({
+      title: "".concat((0, _utils.formatMessage)({
+        id: 'luckda.lowcode.version.confirm.recover',
+        label: '你确定要还原到该历史版本吗？'
+      })),
+      checkWords: "".concat(version.backupName, "(").concat(version.backupUserName, ")"),
+      cancelText: (0, _utils.formatMessage)({
+        id: 'app.base.operate.cancel'
+      }),
+      okText: (0, _utils.formatMessage)({
+        id: 'luckda.lowcode.version.recover',
+        label: '还原版本'
+      }),
+      onOk: function onOk() {
+        return runFetchRecoverHistoryVersion({
+          uid: version.id
+        });
+      }
+    });
+  });
+  var handleUseVersion = (0, _ahooks.useMemoizedFn)(function () {
+    var code = editorRef.current.getModel().modified.getValue();
+    try {
+      var data = JSON.parse(code);
+      (0, _ContextProvider.resetPageData)(data);
+      setVersion(null);
+    } catch (e) {
+      console.error(e);
+      message.warning((0, _utils.formatMessage)({
+        id: 'luckda.lowcode.error.pagedata',
+        label: '页面数据错误'
+      }));
+    }
+  });
+  (0, _react.useEffect)(function () {
+    if (inViewport) {
+      runFetchHistoryVersionList({
+        pageCode: (0, _helper.getLDMetaAttr)('pageCode')
+      });
+    }
+  }, [inViewport]);
+  return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement("div", {
+    ref: ref,
+    className: _history.default['lc-painter-history']
+  }, /*#__PURE__*/_react.default.createElement("div", {
+    className: _history.default.historyToolbar
+  }, /*#__PURE__*/_react.default.createElement(_antd.Input.Search, {
+    placeholder: (0, _utils.formatMessage)({
+      id: 'luckda.lowcode.version.placeholder.search',
+      label: '请输入查询内容'
+    }),
+    size: "small",
+    onSearch: handleSearch
+  }), /*#__PURE__*/_react.default.createElement(_antd.Button, {
+    type: "primary",
+    icon: "plus",
+    size: "small",
+    style: {
+      marginLeft: '8px',
+      flexShrink: 0
+    },
+    onClick: function onClick() {
+      return setVisible(true);
+    }
+  })), /*#__PURE__*/_react.default.createElement(_antd.Spin, {
+    spinning: loading || deleteLoading
+  }, /*#__PURE__*/_react.default.createElement(_antd.Timeline, null, versionList.map(function (item) {
+    return /*#__PURE__*/_react.default.createElement(_antd.Timeline.Item, {
+      className: _history.default.timelineItem
+    }, /*#__PURE__*/_react.default.createElement("div", {
+      className: _history.default.timelineItemHeader
+    }, /*#__PURE__*/_react.default.createElement("div", null, item.backupName), /*#__PURE__*/_react.default.createElement("div", {
+      className: _history.default.timelineItemActions
+    }, /*#__PURE__*/_react.default.createElement(_TipIcon.default, {
+      title: (0, _utils.formatMessage)({
+        id: 'app.base.operate.delete',
+        label: '删除'
+      }),
+      type: "delete",
+      style: {
+        color: 'var(--luck-color-danger)',
+        marginRight: 8
+      },
+      onClick: function onClick() {
+        return handleDeleteVersion(item);
+      }
+    }), /*#__PURE__*/_react.default.createElement(_TipIcon.default, {
+      title: (0, _utils.formatMessage)({
+        id: 'luckda.lowcode.version.diff',
+        label: '差异比对'
+      }),
+      type: "swap",
+      onClick: function onClick() {
+        ctx.$publisher(ctx.topics.COMPONENT_ACTIVE, null);
+        setVersion(item);
+      }
+    }))), /*#__PURE__*/_react.default.createElement("div", {
+      className: _history.default.timelineItemUser
+    }, /*#__PURE__*/_react.default.createElement(_antd.Avatar, {
+      style: {
+        backgroundColor: 'var(--luck-ant-colorful-primary)',
+        verticalAlign: 'middle',
+        marginRight: '8px'
+      }
+    }, item.backupUserName.slice(-1)), item.backupUserName), /*#__PURE__*/_react.default.createElement("div", {
+      className: _history.default.timelineItemTime
+    }, (0, _moment.default)(item.backupTime).fromNow()));
+  })))), /*#__PURE__*/_react.default.createElement(_luckDesign.LuckModal, {
+    title: "".concat(version === null || version === void 0 ? void 0 : version.backupName, "(").concat(version === null || version === void 0 ? void 0 : version.backupUserName, ") \u21CB \u5F53\u524D\u7248\u672C"),
+    width: "80vw",
+    height: "80vh",
+    visible: !(0, _lodash.isNil)(version),
+    fullScreen: true,
+    getContainer: function getContainer() {
+      return document.getElementById('lc-design-workspace');
+    },
+    okText: (0, _utils.formatMessage)({
+      id: 'luckda.lowcode.version.recover',
+      label: '还原版本'
+    }),
+    cancelText: (0, _utils.formatMessage)({
+      id: 'luckda.lowcode.version.use',
+      label: '使用'
+    }),
+    cancelButtonProps: {
+      onClick: handleUseVersion
+    },
+    onOk: handleRecoverVersion,
+    onClose: function onClose() {
+      return setVersion(null);
+    }
+  }, /*#__PURE__*/_react.default.createElement(_DiffEditor.default, {
+    ref: editorRef,
+    language: "json",
+    originalCode: version ? JSON.stringify((0, _dataProcess.decompress)(version === null || version === void 0 ? void 0 : version.pageData), null, '\t') : '',
+    modifiedCode: JSON.stringify(pageData, null, '\t')
+  })), /*#__PURE__*/_react.default.createElement(_luckDesign.LuckModal, {
+    title: (0, _utils.formatMessage)({
+      id: 'luckda.lowcode.version.add',
+      label: '添加到历史版本'
+    }),
+    size: "small",
+    visible: visible,
+    okButtonProps: {
+      loading: addLoading
+    },
+    onOk: handleAddVersion,
+    onClose: function onClose() {
+      return setVisible(false);
+    }
+  }, /*#__PURE__*/_react.default.createElement(_antd.Form, null, /*#__PURE__*/_react.default.createElement(_antd.Form.Item, null, form.getFieldDecorator('title', {
+    rules: [{
+      required: true
+    }]
+  })( /*#__PURE__*/_react.default.createElement(_antd.Input, {
+    placeholder: (0, _utils.formatMessage)({
+      id: 'luckda.lowcode.version.placeholder.title',
+      label: '请输入版本标题'
+    })
+  }))), /*#__PURE__*/_react.default.createElement(_antd.Form.Item, null, form.getFieldDecorator('note')( /*#__PURE__*/_react.default.createElement(_antd.Input.TextArea, {
+    rows: 6,
+    placeholder: (0, _utils.formatMessage)({
+      id: 'luckda.lowcode.version.placeholder.note',
+      label: '请输入版本描述'
+    })
+  }))))));
+};
+var _default = exports.default = _antd.Form.create({
+  name: 'version_form'
+})(History);

package/lib/lowcode/painter/Ribbon.js

@@ -15,6 +15,7 @@ var _antd = require("luck-design/antd");
 var _Outline = _interopRequireDefault(require("./Outline"));
 var _Components = _interopRequireDefault(require("./Components"));
 var _I18n = _interopRequireDefault(require("./I18n"));
+var _History = _interopRequireDefault(require("./History"));
 var _utils = require("@luck-design-biz/base/utils");
 var _expect = _interopRequireDefault(require("./expect"));
 var _ribbon = _interopRequireDefault(require("./style/ribbon.less"));
@@ -55,6 +56,12 @@ var _DRAWER_I18N_ = {
   title: '多语言文案管理',
   fix: false
 };
+var _DRAWER_HISTORY_ = {
+  width: 240,
+  key: 'history',
+  title: '版本历史',
+  fix: false
+};
 var Ribbon = function Ribbon() {
   var _useState = (0, _react.useState)(null),
     _useState2 = (0, _slicedToArray2.default)(_useState, 2),
@@ -114,6 +121,21 @@ 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.Tooltip, {
+    placement: "right",
+    title: (0, _utils.formatMessage)({
+      id: 'luckda.lowcode.history',
+      label: _DRAWER_HISTORY_.title
+    })
+  }, /*#__PURE__*/_react.default.createElement(_antd.Icon, {
+    type: "history",
+    style: {
+      color: (drawer === null || drawer === void 0 ? void 0 : drawer.key) === _DRAWER_HISTORY_.key && '#1d79f2',
+      fontSize: 20
+    },
+    onClick: function onClick() {
+      return setDrawer((drawer === null || drawer === void 0 ? void 0 : drawer.key) === _DRAWER_HISTORY_.key ? null : _DRAWER_HISTORY_);
+    }
   }))), /*#__PURE__*/_react.default.createElement(_antd.Drawer, (0, _extends2.default)({
     title: drawer ? (0, _utils.formatMessage)({
       id: "luckda.lowcode.".concat(drawer.key),
@@ -158,6 +180,20 @@ var Ribbon = function Ribbon() {
     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(_expect.default, null)));
+  }), /*#__PURE__*/_react.default.createElement(_expect.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_HISTORY_.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_HISTORY_.key ? 'block' : 'none'
+    })
+  }), /*#__PURE__*/_react.default.createElement(_History.default, null)));
 };
 var _default = exports.default = Ribbon;

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

@@ -28,7 +28,7 @@ var _I18N_PREFIX_ = 'luckda.lowcode.painter.advancePanel';
 var EventItem = _styledComponents.default.div.withConfig({
   displayName: "EventItem",
   componentId: "luckda-6530__sc-6426fo-0"
-})(["display:flex;align-items:center;justify-content:space-between;padding:4px 8px;border:1px solid #e5e6e8;border-radius:6px;margin-bottom:6px;font-size:12px;i{color:rgba(0,0,0,0.4);cursor:pointer;}i:not(:last-child){margin-right:6px;}"]);
+})(["display:flex;align-items:center;justify-content:space-between;padding:4px 8px;border:1px solid #e5e6e8;border-radius:6px;margin-bottom:6px;font-size:12px;i{color:var(--ant-text-color);cursor:pointer;}i:not(:last-child){margin-right:6px;}"]);
 var _DEFAULT_FUNC_ = 'function isTrue() {\n return true; \n}';
 var AdvancePanel = function AdvancePanel(_ref) {
   var _value$render2, _Map$get;

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

@@ -0,0 +1,49 @@
+"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 _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
+var _react = _interopRequireWildcard(require("react"));
+var monaco = _interopRequireWildcard(require("monaco-editor"));
+var _useCombinedRefs = _interopRequireDefault(require("../../../engine/tools/useCombinedRefs"));
+var DiffEditor = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref) {
+  var originalCode = _ref.originalCode,
+    modifiedCode = _ref.modifiedCode,
+    _ref$language = _ref.language,
+    language = _ref$language === void 0 ? 'javascript' : _ref$language,
+    _ref$options = _ref.options,
+    options = _ref$options === void 0 ? {} : _ref$options;
+  var containerRef = (0, _react.useRef)(null);
+  var editorRef = (0, _useCombinedRefs.default)(ref);
+  (0, _react.useEffect)(function () {
+    if (containerRef.current) {
+      editorRef.current = monaco.editor.createDiffEditor(containerRef.current, (0, _objectSpread2.default)({
+        language: language,
+        automaticLayout: true,
+        autoIndent: true,
+        tabSize: 2
+      }, options));
+      editorRef.current.setModel({
+        original: monaco.editor.createModel(originalCode, language),
+        modified: monaco.editor.createModel(modifiedCode, language)
+      });
+    }
+    return function () {
+      if (editorRef.current) {
+        editorRef.current.dispose();
+      }
+    };
+  }, []);
+  return /*#__PURE__*/_react.default.createElement("div", {
+    ref: containerRef,
+    style: {
+      width: '100%',
+      height: '100%'
+    }
+  });
+});
+var _default = exports.default = /*#__PURE__*/(0, _react.memo)(DiffEditor);

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

@@ -28,11 +28,11 @@ var Wrapper = _styledComponents.default.div.withConfig({
 var Title = _styledComponents.default.p.withConfig({
   displayName: "Title",
   componentId: "luckda-6530__sc-rwt684-1"
-})(["font-weight:700;margin-bottom:8px;color:rgba(0,0,0,0.8);display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center;justify-content:space-between;"]);
+})(["font-weight:700;margin-bottom:8px;color:var(--ant-text-color);display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center;justify-content:space-between;"]);
 var LeftBox = _styledComponents.default.div.withConfig({
   displayName: "LeftBox",
   componentId: "luckda-6530__sc-rwt684-2"
-})(["width:100%;flex:1;border:1px solid #e5e6e8;border-radius:6px;"]);
+})(["width:100%;flex:1;border:1px solid #e5e6e8;border-radius:6px;overflow:hidden;"]);
 var Option = _styledComponents.default.div.withConfig({
   displayName: "Option",
   componentId: "luckda-6530__sc-rwt684-3"

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

@@ -417,7 +417,6 @@ var SettingUI = function SettingUI(_ref) {
     onChange: function onChange(val) {
       return run('render', val);
     },
-    isjsx: true,
     defaultCode: _DEFAULT_RENDER_CODE
   })) : null, /*#__PURE__*/_react.default.createElement(_Collapse.default, {
     label: (0, _utils.formatMessage)({