@luck-design-biz/luckda 1.0.6-13tl → 1.0.7

package/es/lowcode/painter/DesignToolbar.js

@@ -1,39 +1,60 @@
-import _extends from "@babel/runtime/helpers/esm/extends";
-import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
 import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
-import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _regeneratorRuntime from "@babel/runtime/helpers/esm/regeneratorRuntime";
 import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
-var _excluded = ["key", "label"];
 import React, { useRef, useEffect, useState } from 'react';
-import { useLocation } from 'umi';
+import { useLocation, getCreateHistoryOptions } from 'umi';
 import classNames from 'classnames';
-import { useMemoizedFn, useRequest, useDebounceFn, useCookieState } from 'ahooks';
-import { Select, Button, Icon, Divider, Modal, message, Drawer } from 'luck-design/antd';
+import { useMemoizedFn, useRequest } from 'ahooks';
+import { Select, Icon, Divider, Modal, message } from 'luck-design/antd';
 import { formatMessage } from '@luck-design-biz/base/utils';
 import { useContext, useGet, resetPageData, setNeedPrompt, getNeedPrompt, useTemporalStore } from "../engine/provider/ContextProvider";
 import JsonEditor from "../painter/components/code-editor/JsonEditor";
-import PreviewIframe from "./components/PreviewIframe";
-import { LC_BUILDIN_UNIT_KEY, COOKIE_VIRTUAL_ACCOUNT_KEY } from "../constants";
+import { LC_BUILDIN_UNIT_KEY } from "../constants";
 import styles from "./style/design.less";
-import { fetchClearCache, fetchUpdatePageData, fetchSearchUser } from "../constants/api-url";
+import { fetchClearCache, fetchUpdatePageData } from "../constants/api-url";
 import { getLDMetaAttr } from "../engine/tools/helper";
 import TipIcon from "./components/TipIcon";
+import ShortcutModal from "./components/shortcut-modal";
 var CodeSvg = function CodeSvg() {
   return /*#__PURE__*/React.createElement("svg", {
     width: "18",
     height: "18",
     viewBox: "0 0 18 18",
-    fill: "none",
-    xmlns: "http://www.w3.org/2000/svg"
+    fill: "none"
   }, /*#__PURE__*/React.createElement("path", {
     d: "M2.4749 9.0916L5.45264 6.20703L5.45439 5.93457V4.69707L0.91748 9.0916L5.45439 13.4844V12.2469L5.45264 11.9744L2.4749 9.0916ZM15.2067 9.00723L12.229 6.12441L12.2272 5.85195V4.61445L16.7642 9.00723L12.2272 13.4018V12.1625L12.229 11.89L15.2067 9.00723ZM8.12451 15.0295H6.76045L9.55713 2.80566H10.9212L8.12451 15.0295Z",
     fill: "currentColor"
   }));
 };
+var KeyboardSvg = function KeyboardSvg() {
+  return /*#__PURE__*/React.createElement("svg", {
+    fill: "none",
+    width: "18",
+    height: "18",
+    viewBox: "0 0 1024 1024"
+  }, /*#__PURE__*/React.createElement("path", {
+    fill: "currentColor",
+    d: "M800 544h-96a32 32 0 0 1 0-64h64v-128a32 32 0 0 1 64 0v160a32 32 0 0 1-32 32zM128 192h768a64 64 0 0 1 64 64v512a64 64 0 0 1-64 64H128a64 64 0 0 1-64-64V256a64 64 0 0 1 64-64z m32 64a32 32 0 0 0-32 32v448a32 32 0 0 0 32 32h704a32 32 0 0 0 32-32V288a32 32 0 0 0-32-32H160z m64 64h64a32 32 0 1 1 0 64H224a32 32 0 1 1 0-64z m192 0h64a32 32 0 0 1 0 64h-64a32 32 0 0 1 0-64z m192 0h64a32 32 0 0 1 0 64h-64a32 32 0 0 1 0-64zM224 480h32a32 32 0 1 1 0 64H224a32 32 0 0 1 0-64z m160 0h32a32 32 0 0 1 0 64h-32a32 32 0 0 1 0-64z m160 0h32a32 32 0 0 1 0 64h-32a32 32 0 0 1 0-64zM224 640h32a32 32 0 0 1 0 64H224a32 32 0 0 1 0-64z m160 0h256a32 32 0 0 1 0 64h-256a32 32 0 0 1 0-64z m384 0h32a32 32 0 0 1 0 64h-32a32 32 0 0 1 0-64z"
+  }));
+};
+var clearSvg = function clearSvg() {
+  return /*#__PURE__*/React.createElement("svg", {
+    fill: "none",
+    viewBox: "0 0 1024 1024",
+    width: "18",
+    height: "18"
+  }, /*#__PURE__*/React.createElement("path", {
+    d: "M837.818182 915.549091h-131.956364c-12.8 0-23.272727-10.472727-23.272727-23.272727v-58.181819c0-4.189091-8.843636-11.636364-23.272727-11.636363s-23.272727 7.447273-23.272728 11.636363v58.181819c0 12.8-10.472727 23.272727-23.272727 23.272727H465.454545c-12.8 0-23.272727-10.472727-23.272727-23.272727s10.472727-23.272727 23.272727-23.272728h124.043637v-34.909091c0-32.581818 30.72-58.181818 69.818182-58.181818s69.818182 25.6 69.818181 58.181818v34.909091H814.545455v-232.727272H209.454545v232.727272h93.789091c12.8 0 23.272727 10.472727 23.272728 23.272728s-10.472727 23.272727-23.272728 23.272727H186.181818c-12.8 0-23.272727-10.472727-23.272727-23.272727v-279.272728c0-12.8 10.472727-23.272727 23.272727-23.272727h651.636364c12.8 0 23.272727 10.472727 23.272727 23.272727v279.272728c0 12.8-10.472727 23.272727-23.272727 23.272727z",
+    fill: "currentColor"
+  }), /*#__PURE__*/React.createElement("path", {
+    d: "M837.818182 636.276364H186.181818c-12.8 0-23.272727-10.472727-23.272727-23.272728v-69.818181c0-11.403636 8.145455-20.945455 19.316364-22.807273l244.596363-43.054546V124.276364c0-26.065455 23.970909-46.545455 54.225455-46.545455h62.138182c30.487273 0 54.225455 20.48 54.225454 46.545455V477.090909l244.596364 43.054546c11.170909 1.861818 19.316364 11.636364 19.316363 22.807272v69.818182A23.738182 23.738182 0 0 1 837.818182 636.276364z m-628.363637-46.545455h605.09091v-26.996364l-244.596364-43.054545a23.202909 23.202909 0 0 1-19.316364-22.807273V126.138182a13.172364 13.172364 0 0 0-7.68-2.094546h-62.138182c-3.723636 0-6.516364 1.163636-7.68 2.094546v370.269091c0 11.403636-8.145455 20.945455-19.316363 22.807272L209.454545 562.734545v26.996364z",
+    fill: "currentColor"
+  }));
+};
 var DesignToolbar = function DesignToolbar(_ref) {
-  var locale = _ref.locale,
+  var canvas = _ref.canvas,
+    locale = _ref.locale,
     onLangChange = _ref.onLangChange;
   var location = useLocation();
   var editorRef = useRef();
@@ -53,12 +74,8 @@ var DesignToolbar = function DesignToolbar(_ref) {
     setShow = _useState6[1];
   var _useState7 = useState(false),
     _useState8 = _slicedToArray(_useState7, 2),
-    showPreview = _useState8[0],
-    setShowPreview = _useState8[1];
-  var _useState9 = useState([]),
-    _useState10 = _slicedToArray(_useState9, 2),
-    userOptions = _useState10[0],
-    setUserOptions = _useState10[1];
+    showShortcut = _useState8[0],
+    setShowShortcut = _useState8[1];
   var _useTemporalStore = useTemporalStore(function (state) {
       return {
         undo: state.undo,
@@ -71,10 +88,6 @@ var DesignToolbar = function DesignToolbar(_ref) {
     canRedo = _useTemporalStore.canRedo,
     undo = _useTemporalStore.undo,
     redo = _useTemporalStore.redo;
-  var _useCookieState = useCookieState(COOKIE_VIRTUAL_ACCOUNT_KEY),
-    _useCookieState2 = _slicedToArray(_useCookieState, 2),
-    userId = _useCookieState2[0],
-    setUserId = _useCookieState2[1];
   var _useRequest = useRequest(fetchClearCache, {
       manual: true
     }),
@@ -134,7 +147,6 @@ var DesignToolbar = function DesignToolbar(_ref) {
     var lssid = context.$subscriber(context.topics.LANG_SETTING_SELECT).on(function (_ref3) {
       var _langList = _ref3.langList;
       setLangList(_langList);
-      console.log(11111, _langList);
     }).watch();
     var dasid = context.$subscriber(context.topics.DESIGN_OPERATE_SAVE).on(handleSave).watch();
     return function () {
@@ -142,11 +154,6 @@ var DesignToolbar = function DesignToolbar(_ref) {
       context.$unsubscriber(context.topics.DESIGN_OPERATE_SAVE, dasid);
     };
   }, []);
-  useEffect(function () {
-    if (!showPreview) {
-      setUserId(void 0);
-    }
-  }, [showPreview]);
   var handleClearCache = useMemoizedFn(function () {
     Modal.confirm({
       title: formatMessage({
@@ -181,43 +188,6 @@ var DesignToolbar = function DesignToolbar(_ref) {
       }));
     }
   });
-  var _useDebounceFn = useDebounceFn( /*#__PURE__*/function () {
-      var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(value) {
-        var _yield$fetchSearchUse, code, list, detail;
-        return _regeneratorRuntime().wrap(function _callee2$(_context2) {
-          while (1) switch (_context2.prev = _context2.next) {
-            case 0:
-              _context2.next = 2;
-              return fetchSearchUser({
-                sname: value
-              });
-            case 2:
-              _yield$fetchSearchUse = _context2.sent;
-              code = _yield$fetchSearchUse.code;
-              list = _yield$fetchSearchUse.list;
-              detail = _yield$fetchSearchUse.detail;
-              if (code === 1) {
-                setUserOptions(list.map(function (id) {
-                  var item = detail[id];
-                  return _objectSpread(_objectSpread({}, item), {}, {
-                    key: "".concat(item.indocno),
-                    label: item.sname
-                  });
-                }));
-              }
-            case 7:
-            case "end":
-              return _context2.stop();
-          }
-        }, _callee2);
-      }));
-      return function (_x) {
-        return _ref4.apply(this, arguments);
-      };
-    }(), {
-      wait: 500
-    }),
-    handleSearch = _useDebounceFn.run;
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
     className: styles['lc-painter-design-toolbar']
   }, /*#__PURE__*/React.createElement(Select, {
@@ -302,18 +272,37 @@ var DesignToolbar = function DesignToolbar(_ref) {
     label: '页面属性'
   })), /*#__PURE__*/React.createElement(Divider, {
     type: "vertical"
-  }), /*#__PURE__*/React.createElement(Button, {
-    size: "small",
+  }), /*#__PURE__*/React.createElement(TipIcon, {
+    title: formatMessage({
+      id: 'luckda.lowcode.design.toolbar.shortcut',
+      label: '快捷键'
+    }),
+    component: KeyboardSvg,
+    className: styles.hoverPrimary,
     style: {
       fontSize: 14,
-      margin: '0 4px 0 2px'
+      margin: '0 8px 0 6px'
     },
-    disabled: clearCacheLoading,
-    onClick: handleClearCache
-  }, formatMessage({
-    id: 'luckda.lowcode.design.toolbar.clear',
-    label: '清除缓存'
-  })), /*#__PURE__*/React.createElement(TipIcon, {
+    onClick: function onClick() {
+      return setShowShortcut(true);
+    }
+  }), /*#__PURE__*/React.createElement(TipIcon, {
+    title: formatMessage({
+      id: 'luckda.lowcode.design.toolbar.code',
+      label: 'Schema面板'
+    }),
+    component: CodeSvg,
+    className: styles.hoverPrimary,
+    style: {
+      fontSize: 14,
+      margin: '0 8px 0 6px'
+    },
+    onClick: function onClick() {
+      if (!updatePageDataLoading) setShow(true);
+    }
+  }), /*#__PURE__*/React.createElement(Divider, {
+    type: "vertical"
+  }), /*#__PURE__*/React.createElement(TipIcon, {
     title: formatMessage({
       id: 'luckda.lowcode.design.toolbar.debug',
       label: '调试'
@@ -324,45 +313,34 @@ var DesignToolbar = function DesignToolbar(_ref) {
       margin: '0 8px 0 6px'
     },
     className: styles.hoverPrimary,
-    onClick: /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
-      return _regeneratorRuntime().wrap(function _callee3$(_context3) {
-        while (1) switch (_context3.prev = _context3.next) {
-          case 0:
-            if (!updatePageDataLoading) {
-              if (getNeedPrompt()) {
-                context.$publisher(context.topics.DESIGN_OPERATE_SAVE);
-              }
-              context.$publisher(context.topics.COMPONENT_ACTIVE, null);
-              setShowPreview(true);
-            }
-          case 1:
-          case "end":
-            return _context3.stop();
+    onClick: function onClick() {
+      if (!updatePageDataLoading) {
+        var _getCreateHistoryOpti = getCreateHistoryOptions(),
+          basename = _getCreateHistoryOpti.basename;
+        var previewUrl = "".concat(basename === '/' ? '' : basename, "/byteman/preview/").concat(location.query.code);
+        if (getNeedPrompt()) {
+          context.$publisherOnce(context.topics.DESIGN_OPERATE_SAVE).then(function () {
+            window.open(previewUrl, '_blank');
+          });
+        } else {
+          window.open(previewUrl, '_blank');
         }
-      }, _callee3);
-    }))
+        context.$publisher(context.topics.COMPONENT_ACTIVE, null);
+      }
+    }
   }), /*#__PURE__*/React.createElement(TipIcon, {
     title: formatMessage({
-      id: 'luckda.lowcode.design.toolbar.code',
-      label: 'Schema面板'
+      id: 'luckda.lowcode.design.toolbar.clear',
+      label: '清除缓存'
     }),
-    component: CodeSvg,
+    component: clearSvg,
     className: styles.hoverPrimary,
+    loading: clearCacheLoading,
     style: {
       fontSize: 14,
       margin: '0 8px 0 6px'
     },
-    onClick: /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4() {
-      return _regeneratorRuntime().wrap(function _callee4$(_context4) {
-        while (1) switch (_context4.prev = _context4.next) {
-          case 0:
-            if (!updatePageDataLoading) setShow(true);
-          case 1:
-          case "end":
-            return _context4.stop();
-        }
-      }, _callee4);
-    }))
+    onClick: handleClearCache
   }), /*#__PURE__*/React.createElement(TipIcon, {
     title: formatMessage({
       id: 'luckda.lowcode.design.toolbar.save',
@@ -392,75 +370,12 @@ var DesignToolbar = function DesignToolbar(_ref) {
     style: {
       height: '70vh'
     }
-  }, JSON.stringify(pageData, null, '\t'))), /*#__PURE__*/React.createElement(Drawer, {
-    title: /*#__PURE__*/React.createElement("div", {
-      id: "preview-drawer-header",
-      style: {
-        display: 'flex',
-        height: 54,
-        alignItems: 'center',
-        justifyContent: 'space-between'
-      }
-    }, /*#__PURE__*/React.createElement("h3", {
-      style: {
-        marginBottom: 0
-      }
-    }, formatMessage({
-      id: 'luckda.lowcode.design.toolbar.pagePreview',
-      label: '页面预览'
-    })), /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(Select, {
-      placeholder: formatMessage({
-        id: 'luckda.lowcode.design.toolbar.selectUser',
-        label: '请选择模拟登录人'
-      }),
-      allowClear: true,
-      style: {
-        width: 180
-      },
-      filterOption: false,
-      labelInValue: true,
-      showSearch: true,
-      getPopupContainer: function getPopupContainer() {
-        return document.getElementById('preview-drawer-header').closest('.ant-drawer-wrapper-body');
-      },
-      onSearch: handleSearch,
-      onChange: function onChange(_, _opt) {
-        if (_opt) {
-          setUserId(_opt.props.sloginid);
-        } else {
-          setUserId(void 0);
-        }
-      }
-    }, userOptions.map(function (_ref7) {
-      var key = _ref7.key,
-        label = _ref7.label,
-        rest = _objectWithoutProperties(_ref7, _excluded);
-      return /*#__PURE__*/React.createElement(Select.Option, _extends({
-        key: key,
-        value: key
-      }, rest), label);
-    })))),
-    placement: "bottom",
-    height: "94vh",
-    footer: false,
-    headerStyle: {
-      padding: '0 48px 0 24px'
-    },
-    bodyStyle: {
-      height: 'calc(100% - 54px)',
-      backgroundColor: 'var(--ant-component-background,#F0F2F5)'
-    },
-    visible: showPreview,
-    destroyOnClose: true,
+  }, JSON.stringify(pageData, null, '\t'))), /*#__PURE__*/React.createElement(ShortcutModal, {
+    target: canvas,
+    show: showShortcut,
     onClose: function onClose() {
-      return setShowPreview(false);
-    },
-    getContainer: function getContainer() {
-      return document.getElementById('lc-design-workspace');
+      return setShowShortcut(false);
     }
-  }, /*#__PURE__*/React.createElement(PreviewIframe, {
-    code: location.query.code,
-    userId: userId
-  })));
+  }));
 };
 export default DesignToolbar;

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

@@ -1,3 +1,4 @@
+import _extends from "@babel/runtime/helpers/esm/extends";
 import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
@@ -5,10 +6,11 @@ import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 var _excluded = ["events"],
   _excluded2 = ["events"],
   _excluded3 = ["render"],
-  _excluded4 = ["render"];
+  _excluded4 = ["render"],
+  _excluded5 = ["render"];
 import React, { useRef, useState } from 'react';
 import { useCreation, useMemoizedFn } from 'ahooks';
-import { Menu, Dropdown, Button, Tooltip, Icon, Switch } from 'luck-design/antd';
+import { Menu, Dropdown, Button, Tooltip, Icon, Switch, Badge } from 'luck-design/antd';
 import styled from 'styled-components';
 import { isNil, keyBy, keys, omit, reduce } from 'lodash';
 import { useGet } from "../../engine/provider/ContextProvider";
@@ -23,7 +25,7 @@ var EventItem = styled.div.withConfig({
 })(["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;
+  var _value$render4, _Map$get;
   var meta = _ref.meta,
     nodeId = _ref.nodeId,
     target = _ref.target,
@@ -91,10 +93,20 @@ var AdvancePanel = function AdvancePanel(_ref) {
       }
     }));
   });
-  var handleRenderChange = useMemoizedFn(function (checked) {
+  var handleRenderClear = useMemoizedFn(function (_code) {
     var _ref5 = value || {},
       render = _ref5.render,
       rest = _objectWithoutProperties(_ref5, _excluded4);
+    onChange(_objectSpread(_objectSpread({}, rest), {}, {
+      render: {
+        value: isNil(render === null || render === void 0 ? void 0 : render.value) ? true : render.value
+      }
+    }));
+  });
+  var handleRenderChange = useMemoizedFn(function (checked) {
+    var _ref6 = value || {},
+      render = _ref6.render,
+      rest = _objectWithoutProperties(_ref6, _excluded5);
     onChange(_objectSpread(_objectSpread({}, rest), {}, {
       render: {
         value: checked,
@@ -142,16 +154,21 @@ var AdvancePanel = function AdvancePanel(_ref) {
     },
     suppressIcon: true,
     extraRender: function extraRender() {
-      var _value$render;
+      var _value$render, _value$render2, _value$render3;
       return /*#__PURE__*/React.createElement(JSEditor, {
         defaultCode: (value === null || value === void 0 || (_value$render = value.render) === null || _value$render === void 0 ? void 0 : _value$render.code) || _DEFAULT_FUNC_,
-        onChange: handleRenderComfirm
-      }, /*#__PURE__*/React.createElement(Icon, {
+        onChange: handleRenderComfirm,
+        onClear: handleRenderClear
+      }, /*#__PURE__*/React.createElement(Badge, _extends({
+        dot: value === null || value === void 0 || (_value$render2 = value.render) === null || _value$render2 === void 0 ? void 0 : _value$render2.code
+      }, value !== null && value !== void 0 && (_value$render3 = value.render) !== null && _value$render3 !== void 0 && _value$render3.code ? {
+        color: "lime"
+      } : {}), /*#__PURE__*/React.createElement(Icon, {
         type: "code"
-      }));
+      })));
     }
   }, /*#__PURE__*/React.createElement(Switch, {
-    checked: isNil(value === null || value === void 0 || (_value$render2 = value.render) === null || _value$render2 === void 0 ? void 0 : _value$render2.value) ? true : value.render.value,
+    checked: isNil(value === null || value === void 0 || (_value$render4 = value.render) === null || _value$render4 === void 0 ? void 0 : _value$render4.value) ? true : value.render.value,
     onChange: handleRenderChange
   })), /*#__PURE__*/React.createElement(Collapse, {
     field: "events",
@@ -204,7 +221,8 @@ var AdvancePanel = function AdvancePanel(_ref) {
   })))), /*#__PURE__*/React.createElement(JSEditor, {
     trigger: jseditorTrigger,
     defaultCode: ((_Map$get = new Map(event === null || event === void 0 ? void 0 : event.actionPool).get('coding')) === null || _Map$get === void 0 ? void 0 : _Map$get.code) || (event === null || event === void 0 ? void 0 : event.func),
-    onChange: handleComfirm
+    onChange: handleComfirm,
+    showClear: false
   }));
 };
 export default AdvancePanel;

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

@@ -1,16 +1,24 @@
 import _extends from "@babel/runtime/helpers/esm/extends";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-var _excluded = ["title", "type"];
+var _excluded = ["title", "type", "loading", "component"];
 import React from 'react';
 import { Icon, Tooltip } from 'luck-design/antd';
 var TipIcon = function TipIcon(_ref) {
   var title = _ref.title,
     type = _ref.type,
+    loading = _ref.loading,
+    component = _ref.component,
     rest = _objectWithoutProperties(_ref, _excluded);
   return /*#__PURE__*/React.createElement(Tooltip, {
-    title: title
-  }, /*#__PURE__*/React.createElement(Icon, _extends({
-    type: type
+    title: title,
+    getPopupContainer: function getPopupContainer() {
+      return document.getElementById('lc-design-workspace');
+    }
+  }, loading ? /*#__PURE__*/React.createElement(Icon, _extends({
+    type: "loading"
+  }, rest)) : /*#__PURE__*/React.createElement(Icon, _extends({
+    type: type,
+    component: component
   }, rest)));
 };
 export default TipIcon;

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

@@ -5,7 +5,7 @@ import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import React, { useState } from 'react';
 import { useRequest, useMemoizedFn, useCreation } from 'ahooks';
-import { Spin, Input, Segmented, Switch, Checkbox, Tooltip, Icon, Radio, Modal } from 'luck-design/antd';
+import { Spin, Input, Segmented, Switch, Checkbox, Tooltip, Icon, Radio, Modal, Select } from 'luck-design/antd';
 import styled from 'styled-components';
 import { isArray, keyBy, isNil, groupBy } from 'lodash';
 import { formatMessage } from '@luck-design-biz/base/utils';
@@ -20,6 +20,37 @@ import { fetchFieldCondition, fetchAttrs } from "../../../constants/api-url";
 import { getFrontRules } from "./meta/frontRules";
 import { FIELD_SCOPES } from "../../../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: formatMessage({
     id: "".concat(_I18N_PREFIX_, ".align.left"),
@@ -399,7 +430,25 @@ var SettingUI = function SettingUI(_ref) {
       id: "".concat(_I18N_PREFIX_, ".readonly"),
       label: '是否只读'
     })
-  }, renderCodeIcon(fieldReadonly, FIELD_SCOPES.FIELD_READONLY)), !isBatch ? /*#__PURE__*/React.createElement(React.Fragment, null, ['table', 'tableForm'].includes(component) ? /*#__PURE__*/React.createElement(Collapse, {
+  }, renderCodeIcon(fieldReadonly, FIELD_SCOPES.FIELD_READONLY)), !isBatch ? /*#__PURE__*/React.createElement(React.Fragment, null, ['table', 'tableForm'].includes(component) ? /*#__PURE__*/React.createElement(React.Fragment, null, fieldData.property === 'date' && /*#__PURE__*/React.createElement(PanelItem, {
+    label: formatMessage({
+      id: "".concat(_I18N_PREFIX_, ".dateFormat"),
+      label: '日期格式'
+    })
+  }, /*#__PURE__*/React.createElement(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.createElement(Select.Option, {
+      key: opt.value,
+      value: opt.value
+    }, /*#__PURE__*/React.createElement(Tooltip, {
+      title: opt.label
+    }, opt.label));
+  }))), /*#__PURE__*/React.createElement(Collapse, {
     label: formatMessage({
       id: "".concat(_I18N_PREFIX_, ".render"),
       label: '内容定制渲染'
@@ -409,8 +458,11 @@ var SettingUI = function SettingUI(_ref) {
     onChange: function onChange(val) {
       return run('render', val);
     },
-    defaultCode: _DEFAULT_RENDER_CODE
-  })) : null, /*#__PURE__*/React.createElement(Collapse, {
+    defaultCode: _DEFAULT_RENDER_CODE,
+    onClear: function onClear() {
+      return run('render');
+    }
+  }))) : null, /*#__PURE__*/React.createElement(Collapse, {
     label: formatMessage({
       id: "".concat(_I18N_PREFIX_, ".defaultValue"),
       label: '默认值'

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

@@ -5,9 +5,11 @@ import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import React from 'react';
 import { useRequest, useSetState, useDebounceFn, useMemoizedFn } from 'ahooks';
 import { dropWhile, startsWith } from 'lodash';
+import moment from 'moment';
 import { useContext } from "../../../engine/provider/ContextProvider";
 import SettingUI from "./SettingUI";
 import { fetchUpdateUniqueField, fetchAttrs, fetchAddFieldAttrs, fetchUpdateFieldAttrs, fetchDelAttrs } from "../../../constants/api-url";
+import RuntimeComp from "../../../view/lc-components/JSX/RuntimeComp";
 import { FIELD_SCOPES } from "../../../constants";
 var _TRUE_FALSE_ = ['__TRUE__', '__FALSE__'];
 var FieldSetting = function FieldSetting(_ref) {
@@ -192,6 +194,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 ? moment(params.value).format(val) : '';
+            };
+            gridApi.api.refreshCells({
+              columns: [fieldData.field],
+              force: true
+            });
+          } else if ('render' === key) {
+            col.colDef.cellRendererFramework = function (params) {
+              return /*#__PURE__*/React.createElement(RuntimeComp, {
+                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);
@@ -227,7 +250,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/es/lowcode/painter/components/shortcut-modal/KeyIcon.js

@@ -0,0 +1,11 @@
+import React from 'react';
+import styled from 'styled-components';
+var Wrapper = styled.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.createElement(Wrapper, null, children);
+};
+export default KeyIcon;