@luck-design-biz/luckda 1.0.2-12 → 1.0.2-14

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

@@ -116,26 +116,26 @@ var prettierFormetter = function prettierFormetter(unformattedCode) {
   }
 };
 
-/**
- * JSEditor 组件是一个专为 JavaScript 编辑设计的 React 组件，它基于 BaseEditor 组件构建，并集成了自动完成功能。
- * 该组件利用 monaco-editor 提供的 API，通过 setupAutocomplete 函数设置自动完成项，从而增强代码编辑体验。
- * 自动完成逻辑包括从预定义的自动完成模块中加载补全项，以及在编辑器中键入特定字符（如"."）时触发补全建议。
- *
- * @component
- * @example
- * <JSEditor
- *   language="javascript"
- *   options={{ fontSize: 14 }}
- * >
- *   {`function sayHello() {\n  console.log('Hello, World!');\n}`}
- * </JSEditor>
- *
- * @param {Object} props - 组件的属性。
- * @param {React.ReactNode} children - 传递给 BaseEditor 的 children，通常是初始代码或内容。
- * @param {Object} rest - 传递给 BaseEditor 组件的其他属性。
- * @param {React.Ref} ref - React ref 引用，用于在外部组件中访问 BaseEditor 实例的方法。
- *
- * @returns {ReactElement} 返回一个 React 元素，其中包含了一个具有自动完成功能的 JavaScript 编辑器实例。
+/**
+ * JSEditor 组件是一个专为 JavaScript 编辑设计的 React 组件，它基于 BaseEditor 组件构建，并集成了自动完成功能。
+ * 该组件利用 monaco-editor 提供的 API，通过 setupAutocomplete 函数设置自动完成项，从而增强代码编辑体验。
+ * 自动完成逻辑包括从预定义的自动完成模块中加载补全项，以及在编辑器中键入特定字符（如"."）时触发补全建议。
+ *
+ * @component
+ * @example
+ * <JSEditor
+ *   language="javascript"
+ *   options={{ fontSize: 14 }}
+ * >
+ *   {`function sayHello() {\n  console.log('Hello, World!');\n}`}
+ * </JSEditor>
+ *
+ * @param {Object} props - 组件的属性。
+ * @param {React.ReactNode} children - 传递给 BaseEditor 的 children，通常是初始代码或内容。
+ * @param {Object} rest - 传递给 BaseEditor 组件的其他属性。
+ * @param {React.Ref} ref - React ref 引用，用于在外部组件中访问 BaseEditor 实例的方法。
+ *
+ * @returns {ReactElement} 返回一个 React 元素，其中包含了一个具有自动完成功能的 JavaScript 编辑器实例。
  */
 var JSEditor = /*#__PURE__*/(0, _react.forwardRef)(function (_ref2, outRef) {
   var children = _ref2.children,

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

@@ -11,31 +11,31 @@ var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/h
 var _react = _interopRequireWildcard(require("react"));
 var _BaseEditor = _interopRequireDefault(require("./BaseEditor"));
 var _excluded = ["children"];
-/**
- * JsonEditor 组件是一个专门用于编辑 CSS 代码的 React 组件，它基于 BaseEditor 组件构建。
- * 该组件通过将 language 属性固定设置为 "css"，确保编辑器环境专门用于 CSS 代码编辑。
- * 用户可以传入 CSS 代码作为 children，并通过其他 props 控制 BaseEditor 提供的额外功能。
- *
- * @component
- * @example
- * const handleCssChange = (newCss, event) => {
- *   console.log('CSS changed: ', newCss);
- * };
- * <JsonEditor
- *   onChange={handleCssChange}
- *   isFullscreen={false}
- *   width="600px"
- *   height="400px"
- * >
- *   {`body { margin: 0; font-family: Arial, sans-serif; }`}
- * </JsonEditor>
- *
- * @param {Object} props - 组件的属性。
- * @param {React.ReactNode} children - 子组件，通常是编辑器的初始 CSS 代码。
- * @param {Object} rest - 传递给 BaseEditor 组件的其他属性。
- * @param {React.Ref} ref - React ref 引用，用于外部组件调用编辑器实例的方法。
- *
- * @returns {ReactElement} 返回一个 React 元素，该元素内部是一个专门用于 CSS 编辑的 BaseEditor 组件实例。
+/**
+ * JsonEditor 组件是一个专门用于编辑 CSS 代码的 React 组件，它基于 BaseEditor 组件构建。
+ * 该组件通过将 language 属性固定设置为 "css"，确保编辑器环境专门用于 CSS 代码编辑。
+ * 用户可以传入 CSS 代码作为 children，并通过其他 props 控制 BaseEditor 提供的额外功能。
+ *
+ * @component
+ * @example
+ * const handleCssChange = (newCss, event) => {
+ *   console.log('CSS changed: ', newCss);
+ * };
+ * <JsonEditor
+ *   onChange={handleCssChange}
+ *   isFullscreen={false}
+ *   width="600px"
+ *   height="400px"
+ * >
+ *   {`body { margin: 0; font-family: Arial, sans-serif; }`}
+ * </JsonEditor>
+ *
+ * @param {Object} props - 组件的属性。
+ * @param {React.ReactNode} children - 子组件，通常是编辑器的初始 CSS 代码。
+ * @param {Object} rest - 传递给 BaseEditor 组件的其他属性。
+ * @param {React.Ref} ref - React ref 引用，用于外部组件调用编辑器实例的方法。
+ *
+ * @returns {ReactElement} 返回一个 React 元素，该元素内部是一个专门用于 CSS 编辑的 BaseEditor 组件实例。
  */
 var JsonEditor = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref) {
   var children = _ref.children,

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

@@ -28,6 +28,37 @@ var _apiUrl = require("../../../constants/api-url");
 var _frontRules = require("./meta/frontRules");
 var _constants = require("../../../constants");
 var _I18N_PREFIX_ = 'luckda.lowcode.painter.panel-section.fieldsSetting';
+var _DATA_FORMAT_OPTIONS = [{
+  value: 'YYYY-MM-DD HH:mm:ss',
+  label: '年-月-日 时:分:秒'
+}, {
+  value: 'YYYY-MM-DD HH:mm',
+  label: '年-月-日 时:分'
+}, {
+  value: 'YYYY-MM-DD HH',
+  label: '年-月-日 时'
+}, {
+  value: 'YYYY-MM-DD',
+  label: '年-月-日'
+}, {
+  value: 'YYYY-MM',
+  label: '年-月'
+}, {
+  value: 'YYYY',
+  label: '年'
+}, {
+  value: 'HH:mm:ss',
+  label: '时:分:秒'
+}, {
+  value: 'HH:mm',
+  label: '时:分'
+}, {
+  value: 'mm:ss',
+  label: '分:秒'
+}, {
+  value: 'YYYY-wo',
+  label: '年-周'
+}];
 var _ALIGN_OPTIONS_ = [{
   label: (0, _utils.formatMessage)({
     id: "".concat(_I18N_PREFIX_, ".align.left"),
@@ -407,7 +438,25 @@ var SettingUI = function SettingUI(_ref) {
       id: "".concat(_I18N_PREFIX_, ".readonly"),
       label: '是否只读'
     })
-  }, renderCodeIcon(fieldReadonly, _constants.FIELD_SCOPES.FIELD_READONLY)), !isBatch ? /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, ['table', 'tableForm'].includes(component) ? /*#__PURE__*/_react.default.createElement(_Collapse.default, {
+  }, renderCodeIcon(fieldReadonly, _constants.FIELD_SCOPES.FIELD_READONLY)), !isBatch ? /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, ['table', 'tableForm'].includes(component) ? /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, fieldData.property === 'date' && /*#__PURE__*/_react.default.createElement(_PanelItem.default, {
+    label: (0, _utils.formatMessage)({
+      id: "".concat(_I18N_PREFIX_, ".dateFormat"),
+      label: '日期格式'
+    })
+  }, /*#__PURE__*/_react.default.createElement(_antd.Select, {
+    size: "small",
+    onChange: function onChange(val) {
+      return run('dateFormat', val);
+    },
+    defaultValue: fieldData.dateFormat || 'YYYY-MM-DD HH:mm:ss'
+  }, _DATA_FORMAT_OPTIONS.map(function (opt) {
+    return /*#__PURE__*/_react.default.createElement(_antd.Select.Option, {
+      key: opt.value,
+      value: opt.value
+    }, /*#__PURE__*/_react.default.createElement(_antd.Tooltip, {
+      title: opt.label
+    }, opt.label));
+  }))), /*#__PURE__*/_react.default.createElement(_Collapse.default, {
     label: (0, _utils.formatMessage)({
       id: "".concat(_I18N_PREFIX_, ".render"),
       label: '内容定制渲染'
@@ -417,8 +466,11 @@ var SettingUI = function SettingUI(_ref) {
     onChange: function onChange(val) {
       return run('render', val);
     },
-    defaultCode: _DEFAULT_RENDER_CODE
-  })) : null, /*#__PURE__*/_react.default.createElement(_Collapse.default, {
+    defaultCode: _DEFAULT_RENDER_CODE,
+    onClear: function onClear() {
+      return run('render');
+    }
+  }))) : null, /*#__PURE__*/_react.default.createElement(_Collapse.default, {
     label: (0, _utils.formatMessage)({
       id: "".concat(_I18N_PREFIX_, ".defaultValue"),
       label: '默认值'

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

@@ -12,9 +12,11 @@ var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/sli
 var _react = _interopRequireDefault(require("react"));
 var _ahooks = require("ahooks");
 var _lodash = require("lodash");
+var _moment = _interopRequireDefault(require("moment"));
 var _ContextProvider = require("../../../engine/provider/ContextProvider");
 var _SettingUI = _interopRequireDefault(require("./SettingUI"));
 var _apiUrl = require("../../../constants/api-url");
+var _RuntimeComp = _interopRequireDefault(require("../../../view/lc-components/JSX/RuntimeComp"));
 var _constants = require("../../../constants");
 var _TRUE_FALSE_ = ['__TRUE__', '__FALSE__'];
 var FieldSetting = function FieldSetting(_ref) {
@@ -199,6 +201,27 @@ var FieldSetting = function FieldSetting(_ref) {
               columns: [fieldData.field],
               force: true
             });
+          } else if ('dateFormat' === key && !fieldData.render) {
+            col.colDef.cellRendererFramework = function (params) {
+              return params.value ? (0, _moment.default)(params.value).format(val) : '';
+            };
+            gridApi.api.refreshCells({
+              columns: [fieldData.field],
+              force: true
+            });
+          } else if ('render' === key) {
+            col.colDef.cellRendererFramework = function (params) {
+              return /*#__PURE__*/_react.default.createElement(_RuntimeComp.default, {
+                value: params.value,
+                data: params.data,
+                rowIndex: params.rowIndex,
+                params: params
+              }, val.replace(/(function\s*\w*\s*)\([^)]*\)(\s*{)/, '$1()$2'));
+            };
+            gridApi.api.refreshCells({
+              columns: [fieldData.field],
+              force: true
+            });
           }
         }
         onChange(newFields);
@@ -234,7 +257,7 @@ var FieldSetting = function FieldSetting(_ref) {
             _context.next = 38;
             break;
           case 5:
-            if (!(key === 'align' || key === 'headerAlign' || key === 'pinned' || key === 'tip' || key === 'render')) {
+            if (!(key === 'align' || key === 'headerAlign' || key === 'pinned' || key === 'tip' || key === 'render' || key === 'dateFormat')) {
               _context.next = 9;
               break;
             }

package/lib/lowcode/painter/components/shortcut-modal/KeyIcon.js

@@ -0,0 +1,18 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+var _react = _interopRequireDefault(require("react"));
+var _styledComponents = _interopRequireDefault(require("styled-components"));
+var Wrapper = _styledComponents.default.div.withConfig({
+  displayName: "Wrapper",
+  componentId: "luckda-6530__sc-o36flt-0"
+})(["min-width:12px;height:22px;line-height:22px;text-align:center;border:1px solid var(--ant-border-color-base,#d9d9d9);border-radius:3px;padding:0 7px;color:var(--ant-text-color,rgba(0,0,0,0.65));margin:0 2px;"]);
+var KeyIcon = function KeyIcon(_ref) {
+  var children = _ref.children;
+  return /*#__PURE__*/_react.default.createElement(Wrapper, null, children);
+};
+var _default = exports.default = KeyIcon;

package/lib/lowcode/painter/components/shortcut-modal/index.js

@@ -0,0 +1,215 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
+var _react = _interopRequireDefault(require("react"));
+var _ahooks = require("ahooks");
+var _antd = require("luck-design/antd");
+var _styledComponents = _interopRequireDefault(require("styled-components"));
+var _utils = require("@luck-design-biz/base/utils");
+var _KeyIcon = _interopRequireDefault(require("./KeyIcon"));
+var _ContextProvider = require("../../../engine/provider/ContextProvider");
+var Title = _styledComponents.default.div.withConfig({
+  displayName: "Title",
+  componentId: "luckda-6530__sc-hk09ii-0"
+})(["display:flex;align-items:center;justify-content:space-between;border-bottom:1px solid var(--ant-border-color-base,#d9d9d9);margin-bottom:6px;height:32px;font-size:14px;color:var(--ant-text-color,rgba(0,0,0,0.65));"]);
+var Item = _styledComponents.default.div.withConfig({
+  displayName: "Item",
+  componentId: "luckda-6530__sc-hk09ii-1"
+})(["display:flex;flex-wrap:nowrap;align-items:center;justify-content:space-between;color:var(--ant-text-color,rgba(0,0,0,0.65));font-size:12px;min-height:24px;"]);
+var ItemLeft = _styledComponents.default.div.withConfig({
+  displayName: "ItemLeft",
+  componentId: "luckda-6530__sc-hk09ii-2"
+})(["display:flex;align-items:center;height:34px;padding:0 6px;line-height:22px;white-space:nowrap;"]);
+var ItemRight = _styledComponents.default.div.withConfig({
+  displayName: "ItemRight",
+  componentId: "luckda-6530__sc-hk09ii-3"
+})(["display:flex;flex-wrap:wrap;align-items:center;justify-content:flex-end;padding:5px 0;"]);
+var ShortcutModal = function ShortcutModal(_ref) {
+  var target = _ref.target,
+    show = _ref.show,
+    onClose = _ref.onClose;
+  var ctx = (0, _ContextProvider.useContext)();
+  var _useCreation = (0, _ahooks.useCreation)(function () {
+      var isMac = /macintosh|mac os x/i.test(navigator.userAgent);
+      var cKey = isMac ? '⌘' : 'Ctrl';
+      var cKeyAlias = isMac ? 'meta' : 'ctrl';
+      var aKey = isMac ? '⌥' : 'Alt';
+      return {
+        general: [{
+          key: 'save',
+          buttons: [cKey, 'S'],
+          buttonKeys: [cKeyAlias, 's'],
+          label: (0, _utils.formatMessage)({
+            id: 'luckda.lowcode.design.toolbar.shortcut.save',
+            label: '保存'
+          })
+        }, {
+          key: 'preview',
+          buttons: [cKey, 'P'],
+          buttonKeys: [cKeyAlias, 'p'],
+          label: (0, _utils.formatMessage)({
+            id: 'luckda.lowcode.design.toolbar.shortcut.preview',
+            label: '预览调试'
+          })
+        }, {
+          key: 'undo',
+          buttons: [cKey, 'Z'],
+          buttonKeys: [cKeyAlias, 'z'],
+          label: (0, _utils.formatMessage)({
+            id: 'luckda.lowcode.design.toolbar.shortcut.undo',
+            label: '撤销'
+          })
+        }, {
+          key: 'redo',
+          buttons: [cKey, 'Shift', 'Z'],
+          buttonKeys: [cKeyAlias, 'shift', 'z'],
+          label: (0, _utils.formatMessage)({
+            id: 'luckda.lowcode.design.toolbar.shortcut.redo',
+            label: '重做'
+          })
+        }, {
+          key: 'clone',
+          buttons: [cKey, 'C'],
+          buttonKeys: [cKeyAlias, 'c'],
+          label: (0, _utils.formatMessage)({
+            id: 'luckda.lowcode.design.toolbar.shortcut.copy',
+            label: '克隆组件'
+          })
+        }, {
+          key: 'delete',
+          buttons: ['Backspace'],
+          buttonKeys: ['backspace'],
+          label: (0, _utils.formatMessage)({
+            id: 'luckda.lowcode.design.toolbar.shortcut.delete',
+            label: '删除组件'
+          })
+        }],
+        others: [{
+          key: 'selectParent',
+          buttons: ['↑'],
+          buttonKeys: ['uparrow'],
+          label: (0, _utils.formatMessage)({
+            id: 'luckda.lowcode.design.toolbar.shortcut.selectParent',
+            label: '选择父级组件'
+          })
+        }, {
+          key: 'selectChildren',
+          buttons: ['↓'],
+          buttonKeys: ['downarrow'],
+          label: (0, _utils.formatMessage)({
+            id: 'luckda.lowcode.design.toolbar.shortcut.selectChildren',
+            label: '选择子级组件'
+          })
+        }, {
+          key: 'selectLeftBrother',
+          buttons: ['←'],
+          buttonKeys: ['leftarrow'],
+          label: (0, _utils.formatMessage)({
+            id: 'luckda.lowcode.design.toolbar.shortcut.selectLeftBrother',
+            label: '向左选择兄弟组件'
+          })
+        }, {
+          key: 'selectRightBrother',
+          buttons: ['→'],
+          buttonKeys: ['rightarrow'],
+          label: (0, _utils.formatMessage)({
+            id: 'luckda.lowcode.design.toolbar.shortcut.selectRightBrother',
+            label: '向右选择兄弟组件'
+          })
+        }, {
+          key: 'moveLeft',
+          buttons: [aKey, '←'],
+          buttonKeys: ['alt', 'leftarrow'],
+          label: (0, _utils.formatMessage)({
+            id: 'luckda.lowcode.design.toolbar.shortcut.moveLeft',
+            label: '向左移动组件'
+          })
+        }, {
+          key: 'moveRight',
+          buttons: [aKey, '→'],
+          buttonKeys: ['alt', 'rightarrow'],
+          label: (0, _utils.formatMessage)({
+            id: 'luckda.lowcode.design.toolbar.shortcut.moveRight',
+            label: '向右移动组件'
+          })
+        }]
+      };
+    }, []),
+    general = _useCreation.general,
+    others = _useCreation.others;
+  (0, _ahooks.useKeyPress)([].concat((0, _toConsumableArray2.default)(general), (0, _toConsumableArray2.default)(others)).map(function (_ref2) {
+    var buttonKeys = _ref2.buttonKeys;
+    return buttonKeys.join('.');
+  }), function (event, key) {
+    event.preventDefault();
+    event.stopPropagation();
+    ctx.$publisher(ctx.topics.DESIGN_SHORTCUT_EMIT, {
+      event: event,
+      key: key
+    });
+  }, {
+    exactMatch: true,
+    useCapture: true,
+    target: target
+  });
+  return /*#__PURE__*/_react.default.createElement(_antd.Modal, {
+    title: (0, _utils.formatMessage)({
+      id: 'luckda.lowcode.design.toolbar.shortcut',
+      label: '快捷键'
+    }),
+    visible: show,
+    onCancel: onClose,
+    width: 860,
+    footer: null,
+    getContainer: function getContainer() {
+      return document.getElementById('lc-design-workspace');
+    },
+    bodyStyle: {
+      marginTop: 0,
+      maxHeight: '60vh',
+      overflowY: 'auto'
+    }
+  }, /*#__PURE__*/_react.default.createElement(_antd.Row, {
+    gutter: 16
+  }, /*#__PURE__*/_react.default.createElement(_antd.Col, {
+    className: "gutter-row",
+    span: 12
+  }, /*#__PURE__*/_react.default.createElement(Title, null, (0, _utils.formatMessage)({
+    id: 'luckda.lowcode.design.toolbar.shortcut.general',
+    label: '常规操作'
+  })), general.map(function (_ref3) {
+    var key = _ref3.key,
+      buttons = _ref3.buttons,
+      label = _ref3.label;
+    return /*#__PURE__*/_react.default.createElement(Item, {
+      key: key
+    }, /*#__PURE__*/_react.default.createElement(ItemLeft, null, label), /*#__PURE__*/_react.default.createElement(ItemRight, null, buttons.map(function (b) {
+      return /*#__PURE__*/_react.default.createElement(_KeyIcon.default, {
+        key: b
+      }, b);
+    })));
+  })), /*#__PURE__*/_react.default.createElement(_antd.Col, {
+    className: "gutter-row",
+    span: 12
+  }, /*#__PURE__*/_react.default.createElement(Title, null, (0, _utils.formatMessage)({
+    id: 'luckda.lowcode.design.toolbar.shortcut.others',
+    label: '组件选择和移动'
+  })), others.map(function (_ref4) {
+    var key = _ref4.key,
+      buttons = _ref4.buttons,
+      label = _ref4.label;
+    return /*#__PURE__*/_react.default.createElement(Item, {
+      key: key
+    }, /*#__PURE__*/_react.default.createElement(ItemLeft, null, label), /*#__PURE__*/_react.default.createElement(ItemRight, null, buttons.map(function (b) {
+      return /*#__PURE__*/_react.default.createElement(_KeyIcon.default, {
+        key: b
+      }, b);
+    })));
+  }))));
+};
+var _default = exports.default = ShortcutModal;

package/lib/lowcode/painter/panel-section/BlockEditor/index.js

@@ -8,12 +8,7 @@ exports.default = void 0;
 var _react = _interopRequireDefault(require("react"));
 var _ahooks = require("ahooks");
 var _antd = require("luck-design/antd");
-var _styledComponents = _interopRequireDefault(require("styled-components"));
-var Paragraph = _antd.Typography.Paragraph;
-var BlockIdSpan = (0, _styledComponents.default)(Paragraph).withConfig({
-  displayName: "BlockIdSpan",
-  componentId: "luckda-6530__sc-gbohir-0"
-})(["display:inline-block;margin:0;color:#595959;text-decoration:var(--ant-primary-color) wavy underline;cursor:copy;padding:0 4px;"]);
+var _utils = require("@luck-design-biz/base/utils");
 var BlockEditor = function BlockEditor(_ref) {
   var blockName = _ref.blockName,
     blockId = _ref.blockId,
@@ -24,25 +19,21 @@ var BlockEditor = function BlockEditor(_ref) {
       blockId: blockId
     });
   });
-  var handleCopyBlockId = (0, _ahooks.useMemoizedFn)(function (e) {
-    e.stopPropagation();
-  });
   return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement("span", {
     onClick: handleClick,
     style: next ? {
       color: 'var(--ant-primary-color)',
       cursor: 'pointer'
     } : {}
-  }, blockName, /*#__PURE__*/_react.default.createElement("span", {
-    onClick: handleCopyBlockId
-  }, /*#__PURE__*/_react.default.createElement(BlockIdSpan, {
-    style: {
-      display: 'inline-block',
-      margin: 0
+  }, blockName, /*#__PURE__*/_react.default.createElement(_antd.Icon, {
+    type: "copy",
+    onClick: function onClick(e) {
+      e.stopPropagation();
+      (0, _utils.copyToClipboard)(blockId);
     },
-    copyable: {
-      text: blockId
+    style: {
+      margin: '0 8px'
     }
-  }, blockId))));
+  })));
 };
 var _default = exports.default = BlockEditor;

package/lib/lowcode/painter/panel-section/BlocksEditor/index.js

@@ -63,7 +63,10 @@ var BlocksEditor = function BlocksEditor(_ref) {
     var _id = "block_".concat((0, _utils.suid)());
     var newData = (0, _lodash.concat)(blocks, (0, _objectSpread2.default)((0, _objectSpread2.default)({
       id: _id,
-      name: _id,
+      name: (0, _utils.formatMessage)({
+        id: "".concat(_I18N_PREFIX_, ".defaultBlock"),
+        label: '默认区块'
+      }),
       type: type,
       serialEffect: 'hidden',
       mode: ['add', 'update', 'edit', 'info']

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

@@ -0,0 +1,78 @@
+"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 = exports.Wrapper = void 0;
+var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
+var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
+var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
+var _react = _interopRequireWildcard(require("react"));
+var _antd = require("luck-design/antd");
+var _styledComponents = _interopRequireDefault(require("styled-components"));
+var _lodash = require("lodash");
+var _ahooks = require("ahooks");
+var _JSEditor = _interopRequireDefault(require("../panel-section/JSEditor"));
+var _DEFAULT_FUNC_ = 'function isTrue() {\n return true; \n}';
+var Wrapper = exports.Wrapper = _styledComponents.default.div.withConfig({
+  displayName: "Wrapper",
+  componentId: "luckda-6530__sc-167zb23-0"
+})(["display:flex;width:100%;justify-content:flex-end;align-items:center;"]);
+var ConditionCheck = function ConditionCheck(_ref) {
+  var defaultValue = _ref.defaultValue,
+    onChange = _ref.onChange;
+  var dValue = (0, _ahooks.useCreation)(function () {
+    return (0, _lodash.isBoolean)(defaultValue) ? {
+      checked: defaultValue
+    } : defaultValue;
+  }, []);
+  var _useState = (0, _react.useState)(dValue),
+    _useState2 = (0, _slicedToArray2.default)(_useState, 2),
+    value = _useState2[0],
+    setValue = _useState2[1];
+  var handleChange = (0, _ahooks.useMemoizedFn)(function (val) {
+    var data = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, value), val);
+    setValue(data);
+    onChange(data);
+  });
+  var handleClear = (0, _ahooks.useMemoizedFn)(function () {
+    var data = (0, _lodash.cloneDeep)(value);
+    delete data.code;
+    setValue(data);
+    onChange(data);
+  });
+  return /*#__PURE__*/_react.default.createElement(Wrapper, null, /*#__PURE__*/_react.default.createElement(_JSEditor.default, {
+    defaultCode: (value === null || value === void 0 ? void 0 : value.code) || _DEFAULT_FUNC_,
+    onChange: function onChange(code) {
+      return handleChange({
+        code: code,
+        checked: true
+      });
+    },
+    onClear: handleClear
+  }, /*#__PURE__*/_react.default.createElement(_antd.Badge, (0, _extends2.default)({
+    dot: value.code
+  }, value.code ? {
+    color: "lime"
+  } : {}), /*#__PURE__*/_react.default.createElement(_antd.Icon, {
+    type: "form",
+    style: {
+      fontSize: '14px',
+      paddingBottom: '1px'
+    }
+  }))), /*#__PURE__*/_react.default.createElement(_antd.Checkbox, {
+    style: {
+      marginLeft: 8,
+      lineHeight: 1
+    },
+    checked: value.checked,
+    onChange: function onChange(e) {
+      return handleChange({
+        checked: e.target.checked
+      });
+    }
+  }));
+};
+var _default = exports.default = ConditionCheck;

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

@@ -140,13 +140,16 @@ var DataSetSelector = function DataSetSelector(_ref) {
     style: {
       width: 145
     },
-    loading: loading
+    loading: loading,
+    showSearch: true,
+    optionFilterProp: "title"
   }, options.map(function (opt) {
     return /*#__PURE__*/_react.default.createElement(_antd.Select.Option, {
       key: opt.uid,
-      value: opt.code
+      value: opt.code,
+      title: "".concat(opt.name, "|").concat(opt.code)
     }, /*#__PURE__*/_react.default.createElement(_antd.Tooltip, {
-      title: opt.name
+      title: "".concat(opt.name, "(").concat(opt.code, ")")
     }, opt.name));
   })), /*#__PURE__*/_react.default.createElement(_antd.Tooltip, {
     title: (0, _utils.formatMessage)({

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

@@ -24,7 +24,7 @@ var _apiUrl = require("../../constants/api-url");
 var _helper = require("../../engine/tools/helper");
 var _fieldsSetting = _interopRequireDefault(require("../style/fields-setting.less"));
 var _I18N_PREFIX_ = 'luckda.lowcode.painter.panel-section.fieldsSetting';
-var _PICK_KEYS_ = ['id', 'uid', 'field', 'width', 'align', 'headerAlign', 'pinned', 'tip', 'render', 'col', 'row', 'note', 'placeholder', 'fieldAliasName', 'complexConfig', 'formMode'];
+var _PICK_KEYS_ = ['id', 'uid', 'field', 'width', 'align', 'headerAlign', 'pinned', 'tip', 'render', 'col', 'row', 'note', 'placeholder', 'fieldAliasName', 'complexConfig', 'formMode', 'dateFormat'];
 var Header = _styledComponents.default.div.withConfig({
   displayName: "Header",
   componentId: "luckda-6530__sc-gcwvp1-0"