@nocobase/client 0.7.6-alpha.2 → 0.8.0-alpha.4

package/lib/schema-component/antd/action/Action.Designer.js

@@ -76,7 +76,7 @@ var MenuGroup = function MenuGroup(props) {
 };
 
 var ActionDesigner = function ActionDesigner(props) {
-  var _fieldSchema$xCompon, _fieldSchema$xCompon2, _fieldSchema$xCompon3, _fieldSchema$xCompon4, _fieldSchema$xAction, _fieldSchema$xAction2, _fieldSchema$xAction3, _fieldSchema$xAction4, _fieldSchema$xAction5, _fieldSchema$xAction6, _fieldSchema$xAction7, _fieldSchema$xAction8, _fieldSchema$xAction9;
+  var _fieldSchema$xCompon, _fieldSchema$xCompon2, _fieldSchema$xCompon3, _fieldSchema$xCompon4, _fieldSchema$xAction, _fieldSchema$xAction2, _fieldSchema$xAction3, _fieldSchema$xAction4, _fieldSchema$xAction5, _fieldSchema$xAction6, _fieldSchema$xAction7, _fieldSchema$xAction8, _fieldSchema$xAction9, _fieldSchema$xAction10;
 
   var modalTip = props.modalTip,
       restProps = _objectWithoutProperties(props, _excluded);
@@ -92,6 +92,7 @@ var ActionDesigner = function ActionDesigner(props) {
 
   var compile = (0, _.useCompile)();
   var isPopupAction = ['create', 'update', 'view', 'customize:popup'].includes(fieldSchema['x-action'] || '');
+  var isUpdateModePopupAction = ['customize:bulkUpdate', 'customize:bulkEdit'].includes(fieldSchema['x-action']);
   var context = (0, _.useActionContext)();
 
   var _useState = (0, _react2.useState)(),
@@ -200,12 +201,32 @@ var ActionDesigner = function ActionDesigner(props) {
       });
       dn.refresh();
     }
-  }), (0, _shared.isValid)(fieldSchema === null || fieldSchema === void 0 ? void 0 : (_fieldSchema$xAction = fieldSchema['x-action-settings']) === null || _fieldSchema$xAction === void 0 ? void 0 : _fieldSchema$xAction.assignedValues) && /*#__PURE__*/_react2.default.createElement(_schemaSettings.SchemaSettings.ActionModalItem, {
+  }), isUpdateModePopupAction && /*#__PURE__*/_react2.default.createElement(_schemaSettings.SchemaSettings.SelectItem, {
+    title: t('Data will be updated'),
+    options: [{
+      label: t('Selected'),
+      value: 'selected'
+    }, {
+      label: t('All'),
+      value: 'all'
+    }],
+    value: fieldSchema === null || fieldSchema === void 0 ? void 0 : (_fieldSchema$xAction = fieldSchema['x-action-settings']) === null || _fieldSchema$xAction === void 0 ? void 0 : _fieldSchema$xAction['updateMode'],
+    onChange: function onChange(value) {
+      fieldSchema['x-action-settings']['updateMode'] = value;
+      dn.emit('patch', {
+        schema: {
+          'x-uid': fieldSchema['x-uid'],
+          'x-action-settings': fieldSchema['x-action-settings']
+        }
+      });
+      dn.refresh();
+    }
+  }), (0, _shared.isValid)(fieldSchema === null || fieldSchema === void 0 ? void 0 : (_fieldSchema$xAction2 = fieldSchema['x-action-settings']) === null || _fieldSchema$xAction2 === void 0 ? void 0 : _fieldSchema$xAction2.assignedValues) && /*#__PURE__*/_react2.default.createElement(_schemaSettings.SchemaSettings.ActionModalItem, {
     title: t('Assign field values'),
     initialSchema: initialSchema,
-    initialValues: fieldSchema === null || fieldSchema === void 0 ? void 0 : (_fieldSchema$xAction2 = fieldSchema['x-action-settings']) === null || _fieldSchema$xAction2 === void 0 ? void 0 : _fieldSchema$xAction2.assignedValues,
+    initialValues: fieldSchema === null || fieldSchema === void 0 ? void 0 : (_fieldSchema$xAction3 = fieldSchema['x-action-settings']) === null || _fieldSchema$xAction3 === void 0 ? void 0 : _fieldSchema$xAction3.assignedValues,
     modalTip: tips[actionType],
-    uid: fieldSchema === null || fieldSchema === void 0 ? void 0 : (_fieldSchema$xAction3 = fieldSchema['x-action-settings']) === null || _fieldSchema$xAction3 === void 0 ? void 0 : _fieldSchema$xAction3.schemaUid,
+    uid: fieldSchema === null || fieldSchema === void 0 ? void 0 : (_fieldSchema$xAction4 = fieldSchema['x-action-settings']) === null || _fieldSchema$xAction4 === void 0 ? void 0 : _fieldSchema$xAction4.schemaUid,
     onSubmit: function onSubmit(assignedValues) {
       var _schema2;
 
@@ -215,10 +236,10 @@ var ActionDesigner = function ActionDesigner(props) {
       });
       dn.refresh();
     }
-  }), (0, _shared.isValid)(fieldSchema === null || fieldSchema === void 0 ? void 0 : (_fieldSchema$xAction4 = fieldSchema['x-action-settings']) === null || _fieldSchema$xAction4 === void 0 ? void 0 : _fieldSchema$xAction4.requestSettings) && /*#__PURE__*/_react2.default.createElement(_schemaSettings.SchemaSettings.ActionModalItem, {
+  }), (0, _shared.isValid)(fieldSchema === null || fieldSchema === void 0 ? void 0 : (_fieldSchema$xAction5 = fieldSchema['x-action-settings']) === null || _fieldSchema$xAction5 === void 0 ? void 0 : _fieldSchema$xAction5.requestSettings) && /*#__PURE__*/_react2.default.createElement(_schemaSettings.SchemaSettings.ActionModalItem, {
     title: t('Request settings'),
     schema: _utils.requestSettingsSchema,
-    initialValues: fieldSchema === null || fieldSchema === void 0 ? void 0 : (_fieldSchema$xAction5 = fieldSchema['x-action-settings']) === null || _fieldSchema$xAction5 === void 0 ? void 0 : _fieldSchema$xAction5.requestSettings,
+    initialValues: fieldSchema === null || fieldSchema === void 0 ? void 0 : (_fieldSchema$xAction6 = fieldSchema['x-action-settings']) === null || _fieldSchema$xAction6 === void 0 ? void 0 : _fieldSchema$xAction6.requestSettings,
     onSubmit: function onSubmit(requestSettings) {
       var _schema3;
 
@@ -228,9 +249,9 @@ var ActionDesigner = function ActionDesigner(props) {
       });
       dn.refresh();
     }
-  }), (0, _shared.isValid)(fieldSchema === null || fieldSchema === void 0 ? void 0 : (_fieldSchema$xAction6 = fieldSchema['x-action-settings']) === null || _fieldSchema$xAction6 === void 0 ? void 0 : _fieldSchema$xAction6.skipValidator) && /*#__PURE__*/_react2.default.createElement(_schemaSettings.SchemaSettings.SwitchItem, {
+  }), (0, _shared.isValid)(fieldSchema === null || fieldSchema === void 0 ? void 0 : (_fieldSchema$xAction7 = fieldSchema['x-action-settings']) === null || _fieldSchema$xAction7 === void 0 ? void 0 : _fieldSchema$xAction7.skipValidator) && /*#__PURE__*/_react2.default.createElement(_schemaSettings.SchemaSettings.SwitchItem, {
     title: t('Skip required validation'),
-    checked: !!(fieldSchema === null || fieldSchema === void 0 ? void 0 : (_fieldSchema$xAction7 = fieldSchema['x-action-settings']) === null || _fieldSchema$xAction7 === void 0 ? void 0 : _fieldSchema$xAction7.skipValidator),
+    checked: !!(fieldSchema === null || fieldSchema === void 0 ? void 0 : (_fieldSchema$xAction8 = fieldSchema['x-action-settings']) === null || _fieldSchema$xAction8 === void 0 ? void 0 : _fieldSchema$xAction8.skipValidator),
     onChange: function onChange(value) {
       var _schema4;
 
@@ -239,21 +260,23 @@ var ActionDesigner = function ActionDesigner(props) {
         schema: (_schema4 = {}, _defineProperty(_schema4, 'x-uid', fieldSchema['x-uid']), _defineProperty(_schema4, 'x-action-settings', _objectSpread({}, fieldSchema['x-action-settings'])), _schema4)
       });
     }
-  }), (0, _shared.isValid)(fieldSchema === null || fieldSchema === void 0 ? void 0 : (_fieldSchema$xAction8 = fieldSchema['x-action-settings']) === null || _fieldSchema$xAction8 === void 0 ? void 0 : _fieldSchema$xAction8['onSuccess']) && /*#__PURE__*/_react2.default.createElement(_schemaSettings.SchemaSettings.ModalItem, {
+  }), (0, _shared.isValid)(fieldSchema === null || fieldSchema === void 0 ? void 0 : (_fieldSchema$xAction9 = fieldSchema['x-action-settings']) === null || _fieldSchema$xAction9 === void 0 ? void 0 : _fieldSchema$xAction9['onSuccess']) && /*#__PURE__*/_react2.default.createElement(_schemaSettings.SchemaSettings.ModalItem, {
     title: {
       'customize:save': t('After successful save'),
       'customize:update': t('After successful update'),
       'customize:table:request': t('After successful request'),
-      'customize:form:request': t('After successful request')
+      'customize:form:request': t('After successful request'),
+      'customize:bulkUpdate': t('After successful bulk update')
     }[actionType],
-    initialValues: fieldSchema === null || fieldSchema === void 0 ? void 0 : (_fieldSchema$xAction9 = fieldSchema['x-action-settings']) === null || _fieldSchema$xAction9 === void 0 ? void 0 : _fieldSchema$xAction9['onSuccess'],
+    initialValues: fieldSchema === null || fieldSchema === void 0 ? void 0 : (_fieldSchema$xAction10 = fieldSchema['x-action-settings']) === null || _fieldSchema$xAction10 === void 0 ? void 0 : _fieldSchema$xAction10['onSuccess'],
     schema: {
       type: 'object',
       title: {
         'customize:save': t('After successful save'),
         'customize:update': t('After successful update'),
         'customize:table:request': t('After successful request'),
-        'customize:form:request': t('After successful request')
+        'customize:form:request': t('After successful request'),
+        'customize:bulkUpdate': t('After successful bulk update')
       }[actionType],
       properties: {
         successMessage: {

package/lib/schema-component/antd/action/Action.Modal.js

@@ -21,7 +21,7 @@ var _ = require(".");
 
 var _templateObject, _templateObject2;
 
-var _excluded = ["footerNodeName"];
+var _excluded = ["footerNodeName", "width"];
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
@@ -40,6 +40,8 @@ function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) r
 var ActionModal = (0, _react.observer)(function (props) {
   var _props$footerNodeName = props.footerNodeName,
       footerNodeName = _props$footerNodeName === void 0 ? 'Action.Modal.Footer' : _props$footerNodeName,
+      _props$width = props.width,
+      width = _props$width === void 0 ? '80%' : _props$width,
       others = _objectWithoutProperties(props, _excluded);
 
   var _useActionContext = (0, _.useActionContext)(),
@@ -60,7 +62,7 @@ var ActionModal = (0, _react.observer)(function (props) {
       e.stopPropagation();
     }
   }, /*#__PURE__*/_react2.default.createElement(_antd.Modal, _objectSpread(_objectSpread({
-    width: '80%',
+    width: width,
     title: field.title
   }, others), {}, {
     destroyOnClose: true,

package/lib/schema-component/antd/action/Action.js

@@ -43,7 +43,7 @@ var _context = require("./context");
 
 var _hooks2 = require("./hooks");
 
-var _excluded = ["popover", "confirm", "containerRefKey", "component", "useAction", "className", "disabled", "icon", "title"];
+var _excluded = ["popover", "confirm", "containerRefKey", "component", "useAction", "className", "icon", "title"];
 
 var _templateObject, _templateObject2;
 
@@ -89,7 +89,6 @@ var Action = (0, _react.observer)(function (props) {
       _props$useAction = props.useAction,
       useAction = _props$useAction === void 0 ? _hooks2.useA : _props$useAction,
       className = props.className,
-      disabled = props.disabled,
       icon = props.icon,
       title = props.title,
       others = _objectWithoutProperties(props, _excluded);
@@ -159,7 +158,8 @@ var Action = (0, _react.observer)(function (props) {
       formValueChanged: formValueChanged,
       setFormValueChanged: setFormValueChanged,
       openMode: openMode,
-      containerRefKey: containerRefKey
+      containerRefKey: containerRefKey,
+      fieldSchema: fieldSchema
     }
   }, popover && /*#__PURE__*/_react2.default.createElement(_react.RecursionField, {
     basePath: field.address,

package/lib/schema-component/antd/action/context.d.ts

@@ -1,4 +1,5 @@
 /// <reference types="react" />
+import { Schema } from '@formily/react';
 export declare const ActionContext: import("react").Context<ActionContextProps>;
 export interface ActionContextProps {
     button?: any;
@@ -8,4 +9,5 @@ export interface ActionContextProps {
     containerRefKey?: string;
     formValueChanged?: boolean;
     setFormValueChanged?: (v: boolean) => void;
+    fieldSchema?: Schema;
 }

package/lib/schema-component/antd/action/hooks.d.ts

@@ -9,6 +9,7 @@ export declare const useActionContext: () => {
     containerRefKey?: string;
     formValueChanged?: boolean;
     setFormValueChanged?: (v: boolean) => void;
+    fieldSchema?: import("@formily/react").Schema<any, any, any, any, any, any, any, any, any>;
 };
 export declare const useCloseAction: () => {
     run(): Promise<void>;

package/lib/schema-component/antd/calendar/Calendar.Designer.js

@@ -103,12 +103,25 @@ var CalendarDesigner = function CalendarDesigner() {
       });
       dn.refresh();
     }
+  }), /*#__PURE__*/_react2.default.createElement(_schemaSettings.SchemaSettings.SwitchItem, {
+    title: t('Show lunar'),
+    checked: field.decoratorProps.showLunar,
+    onChange: function onChange(v) {
+      var _schema2;
+
+      field.decoratorProps.showLunar = v;
+      fieldSchema['x-decorator-props']['showLunar'] = v;
+      dn.emit('patch', {
+        schema: (_schema2 = {}, _defineProperty(_schema2, 'x-uid', fieldSchema['x-uid']), _defineProperty(_schema2, 'x-decorator-props', field.decoratorProps), _schema2)
+      });
+      dn.refresh();
+    }
   }), /*#__PURE__*/_react2.default.createElement(_schemaSettings.SchemaSettings.SelectItem, {
     title: t('Start date field'),
     value: fieldNames.start,
     options: useOptions('date'),
     onChange: function onChange(start) {
-      var _schema2;
+      var _schema3;
 
       var fieldNames = field.decoratorProps.fieldNames || {};
       fieldNames['start'] = start;
@@ -116,7 +129,7 @@ var CalendarDesigner = function CalendarDesigner() {
       fieldSchema['x-decorator-props']['fieldNames'] = fieldNames;
       service.refresh();
       dn.emit('patch', {
-        schema: (_schema2 = {}, _defineProperty(_schema2, 'x-uid', fieldSchema['x-uid']), _defineProperty(_schema2, 'x-decorator-props', field.decoratorProps), _schema2)
+        schema: (_schema3 = {}, _defineProperty(_schema3, 'x-uid', fieldSchema['x-uid']), _defineProperty(_schema3, 'x-decorator-props', field.decoratorProps), _schema3)
       });
       dn.refresh();
     }
@@ -125,7 +138,7 @@ var CalendarDesigner = function CalendarDesigner() {
     value: fieldNames.end,
     options: useOptions('date'),
     onChange: function onChange(end) {
-      var _schema3;
+      var _schema4;
 
       var fieldNames = field.decoratorProps.fieldNames || {};
       fieldNames['end'] = end;
@@ -133,7 +146,7 @@ var CalendarDesigner = function CalendarDesigner() {
       fieldSchema['x-decorator-props']['fieldNames'] = fieldNames;
       service.refresh();
       dn.emit('patch', {
-        schema: (_schema3 = {}, _defineProperty(_schema3, 'x-uid', fieldSchema['x-uid']), _defineProperty(_schema3, 'x-decorator-props', field.decoratorProps), _schema3)
+        schema: (_schema4 = {}, _defineProperty(_schema4, 'x-uid', fieldSchema['x-uid']), _defineProperty(_schema4, 'x-decorator-props', field.decoratorProps), _schema4)
       });
       dn.refresh();
     }
@@ -155,7 +168,7 @@ var CalendarDesigner = function CalendarDesigner() {
       // icon: field.componentProps.icon,
     },
     onSubmit: function onSubmit(_ref) {
-      var _service$params, _schema4;
+      var _service$params, _schema5;
 
       var filter = _ref.filter;
       var params = field.decoratorProps.params || {};
@@ -166,7 +179,7 @@ var CalendarDesigner = function CalendarDesigner() {
         filter: filter
       }));
       dn.emit('patch', {
-        schema: (_schema4 = {}, _defineProperty(_schema4, 'x-uid', fieldSchema['x-uid']), _defineProperty(_schema4, 'x-decorator-props', field.decoratorProps), _schema4)
+        schema: (_schema5 = {}, _defineProperty(_schema5, 'x-uid', fieldSchema['x-uid']), _defineProperty(_schema5, 'x-decorator-props', field.decoratorProps), _schema5)
       });
     }
   }), /*#__PURE__*/_react2.default.createElement(_schemaSettings.SchemaSettings.Divider, null), /*#__PURE__*/_react2.default.createElement(_schemaSettings.SchemaSettings.Template, {

package/lib/schema-component/antd/calendar/Calendar.js

@@ -33,6 +33,8 @@ var _useProps2 = require("../../hooks/useProps");
 
 var _action = require("../action");
 
+var _Header = _interopRequireDefault(require("./components/Header"));
+
 var _context = require("./context");
 
 require("./style.less");
@@ -152,7 +154,8 @@ var CalendarRecordViewer = function CalendarRecordViewer(props) {
 var Calendar = (0, _react.observer)(function (props) {
   var _useProps = (0, _useProps2.useProps)(props),
       dataSource = _useProps.dataSource,
-      fieldNames = _useProps.fieldNames;
+      fieldNames = _useProps.fieldNames,
+      showLunar = _useProps.showLunar;
 
   var events = useEvents(dataSource, fieldNames);
 
@@ -217,7 +220,26 @@ var Calendar = (0, _react.observer)(function (props) {
     },
     defaultDate: new Date(),
     components: {
-      toolbar: Toolbar
+      toolbar: function toolbar(props) {
+        return /*#__PURE__*/_react2.default.createElement(Toolbar, _objectSpread(_objectSpread({}, props), {}, {
+          showLunar: showLunar
+        }));
+      },
+      week: {
+        header: function header(props) {
+          return /*#__PURE__*/_react2.default.createElement(_Header.default, _objectSpread(_objectSpread({}, props), {}, {
+            type: "week",
+            showLunar: showLunar
+          }));
+        }
+      },
+      month: {
+        dateHeader: function dateHeader(props) {
+          return /*#__PURE__*/_react2.default.createElement(_Header.default, _objectSpread(_objectSpread({}, props), {}, {
+            showLunar: showLunar
+          }));
+        }
+      }
     },
     localizer: localizer
   }));

package/lib/schema-component/antd/calendar/Title.js

@@ -15,6 +15,8 @@ var _hooks = require("../../hooks");
 
 var _context = require("./context");
 
+var _utils = require("./utils");
+
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
@@ -24,14 +26,28 @@ var Title = (0, _react.observer)(function () {
       DesignableBar = _useDesignable.DesignableBar;
 
   var _useContext = (0, _react2.useContext)(_context.CalendarToolbarContext),
-      label = _useContext.label;
+      date = _useContext.date,
+      view = _useContext.view,
+      label = _useContext.label,
+      showLunar = _useContext.showLunar;
+
+  var lunarElement = (0, _react2.useMemo)(function () {
+    if (!showLunar || view !== 'day') {
+      return;
+    }
 
+    return /*#__PURE__*/_react2.default.createElement("span", null, (0, _utils.getLunarDay)(date));
+  }, [view, date, showLunar]);
   return /*#__PURE__*/_react2.default.createElement("div", {
     className: "ant-btn-group",
     style: {
       fontSize: '1.75em',
       fontWeight: 300
     }
-  }, label, /*#__PURE__*/_react2.default.createElement(DesignableBar, null));
+  }, /*#__PURE__*/_react2.default.createElement("span", null, label), /*#__PURE__*/_react2.default.createElement("span", {
+    style: {
+      marginLeft: '4px'
+    }
+  }, lunarElement), /*#__PURE__*/_react2.default.createElement(DesignableBar, null));
 });
 exports.Title = Title;

package/lib/schema-component/antd/calendar/components/Header.d.ts

@@ -0,0 +1,10 @@
+declare const Header: ({ date, label, drilldownView, onDrillDown, showLunar, type, localizer }: {
+    date: any;
+    label: any;
+    drilldownView: any;
+    onDrillDown: any;
+    showLunar?: boolean;
+    type: any;
+    localizer: any;
+}) => JSX.Element;
+export default Header;

package/lib/schema-component/antd/calendar/components/Header.js

@@ -0,0 +1,57 @@
+"use strict";
+
+function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+
+var _react = _interopRequireWildcard(require("react"));
+
+var _utils = require("../utils");
+
+function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
+
+function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+
+var Header = function Header(_ref) {
+  var date = _ref.date,
+      label = _ref.label,
+      drilldownView = _ref.drilldownView,
+      onDrillDown = _ref.onDrillDown,
+      _ref$showLunar = _ref.showLunar,
+      showLunar = _ref$showLunar === void 0 ? false : _ref$showLunar,
+      type = _ref.type,
+      localizer = _ref.localizer;
+  var lunarElement = (0, _react.useMemo)(function () {
+    if (!showLunar) {
+      return;
+    }
+
+    return /*#__PURE__*/_react.default.createElement("span", {
+      className: "rbc-date-lunar"
+    }, (0, _utils.getLunarDay)(date));
+  }, [date, showLunar]);
+  var child = (0, _react.useMemo)(function () {
+    if (type === 'week') {
+      return /*#__PURE__*/_react.default.createElement("div", null, /*#__PURE__*/_react.default.createElement("span", null, localizer.format(date, 'ddd')), /*#__PURE__*/_react.default.createElement("div", {
+        className: "rbc-date-wrap"
+      }, /*#__PURE__*/_react.default.createElement("span", {
+        className: "rbc-date-solar"
+      }, localizer.format(date, 'DD')), lunarElement));
+    } else {
+      return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement("span", {
+        className: "rbc-date-solar"
+      }, label), lunarElement);
+    }
+  }, [type]);
+  var Wrapper = drilldownView ? 'a' : _react.default.Fragment;
+  return /*#__PURE__*/_react.default.createElement(Wrapper, {
+    onClick: onDrillDown,
+    role: "cell"
+  }, child);
+};
+
+var _default = Header;
+exports.default = _default;

package/lib/schema-component/antd/calendar/style.less

@@ -74,7 +74,6 @@ button.rbc-input::-moz-focus-inner {
   text-overflow: ellipsis;
   white-space: nowrap;
   padding: 4px 12px;
-  text-align: right;
   vertical-align: middle;
   // font-weight: 500;
   min-height: 32px;
@@ -338,24 +337,39 @@ button.rbc-input::-moz-focus-inner {
   // cursor: pointer;
   flex: 1 1 0;
   min-width: 0;
-  padding-right: 12px;
+  padding-left: 12px;
   padding-top: 4px;
-  text-align: right;
 }
-.rbc-date-cell.rbc-now a {
+.rbc-date-cell.rbc-now span {
   // font-weight: bold;
   color: #1890ff;
 }
-.rbc-date-cell > a,
-.rbc-date-cell > a:active,
-.rbc-date-cell > a:visited {
+.rbc-date-cell a,
+.rbc-date-cell a:active,
+.rbc-date-cell a:visited {
   color: inherit;
   text-decoration: none;
 }
-.rbc-date-cell > a:hover {
+.rbc-date-cell a:hover {
   color: #1890ff;
 }
 
+.rbc-date-cell .rbc-date-solar {
+  font-weight: 500;
+}
+
+.rbc-date-cell .rbc-date-lunar {
+  padding-left: 12px;
+}
+
+.rbc-date-cell:not(.rbc-off-range) .rbc-date-lunar {
+  color: #aaa
+}
+
+.rbc-date-cell .rbc-date-lunar:hover {
+  color: inherit
+}
+
 .rbc-row-bg {
   display: flex;
   flex-direction: row;
@@ -553,6 +567,36 @@ button.rbc-input::-moz-focus-inner {
 .rbc-time-header-cell {
   min-height: 32px !important;
 }
+.rbc-time-header-cell .rbc-header {
+  display: flex;
+}
+.rbc-time-header-cell .rbc-header.rbc-today {
+  border-color: #1890ff;
+  background-color: #e6f7ff;
+  color: #1890ff
+}
+
+.rbc-time-header-cell .rbc-header a {
+  display: flex;
+  flex-direction: column;
+}
+
+.rbc-time-header-cell .rbc-date-wrap {
+  display: flex;
+  align-items: center;
+}
+
+.rbc-time-header-cell .rbc-date-solar {
+  font-size: 18px;
+}
+.rbc-time-header-cell .rbc-date-lunar {
+  margin-left: 4px;
+}
+
+.rbc-time-header-cell .rbc-header:not(.rbc-today) .rbc-date-lunar {
+  color: #aaa;
+}
+
 .rbc-calendar.view-week {
   .rbc-time-header-cell {
     margin-top: -32px;
@@ -695,7 +739,7 @@ button.rbc-input::-moz-focus-inner {
 
 .rbc-time-header-content {
   flex: 1;
-  display: flex;
+  // display: flex;
   min-width: 0;
   flex-direction: column;
   // border-left: 1px solid #f0f0f0;

package/lib/schema-component/antd/calendar/types.d.ts

@@ -5,4 +5,10 @@ export interface ToolbarProps {
   views?: any;
   onNavigate?: (action: string) => void;
   onView?: (view: string) => void;
+
+  date: string;
+  /**
+   * 是否展示农历
+   */
+  showLunar: boolean;
 }

package/lib/schema-component/antd/calendar/utils.d.ts

@@ -1,6 +1,8 @@
+import moment from 'moment';
 export declare const toEvents: (data: any[], fieldNames: any) => {
     id: any;
     title: any;
     start: Date;
     end: Date;
 }[];
+export declare const getLunarDay: (date: moment.MomentInput) => string | number;

package/lib/schema-component/antd/calendar/utils.js

@@ -3,12 +3,18 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.toEvents = void 0;
+exports.toEvents = exports.getLunarDay = void 0;
 
 var _lodash = require("lodash");
 
+var _moment = _interopRequireDefault(require("moment"));
+
+var _solarlunarEs = _interopRequireDefault(require("solarlunar-es"));
+
 var _i18n = require("../../../i18n");
 
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
 var toEvents = function toEvents(data, fieldNames) {
   return data === null || data === void 0 ? void 0 : data.map(function (item) {
     return {
@@ -20,4 +26,14 @@ var toEvents = function toEvents(data, fieldNames) {
   });
 };
 
-exports.toEvents = toEvents;
+exports.toEvents = toEvents;
+
+var getLunarDay = function getLunarDay(date) {
+  var md = (0, _moment.default)(date);
+
+  var result = _solarlunarEs.default.solar2lunar(md.year(), md.month() + 1, md.date());
+
+  return typeof result !== 'number' ? result.lunarFestival || result.term || result.dayCn : result;
+};
+
+exports.getLunarDay = getLunarDay;

package/lib/schema-component/antd/checkbox/Checkbox.js

@@ -25,7 +25,15 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 
-var Checkbox = (0, _react.connect)(_antd.Checkbox, (0, _react.mapProps)({
+var Checkbox = (0, _react.connect)(function (props) {
+  var changeHandler = function changeHandler(val) {
+    props === null || props === void 0 ? void 0 : props.onChange(val);
+  };
+
+  return /*#__PURE__*/_react2.default.createElement(_antd.Checkbox, _objectSpread(_objectSpread({}, props), {}, {
+    onChange: changeHandler
+  }));
+}, (0, _react.mapProps)({
   value: 'checked',
   onInput: 'onChange'
 }, function (props, field) {
@@ -33,7 +41,7 @@ var Checkbox = (0, _react.connect)(_antd.Checkbox, (0, _react.mapProps)({
   return _objectSpread({}, props);
 }), (0, _react.mapReadPretty)(function (props) {
   if (!(0, _shared.isValid)(props.value)) {
-    return /*#__PURE__*/_react2.default.createElement("div", null);
+    return null;
   }
 
   return props.value ? /*#__PURE__*/_react2.default.createElement(_icons.CheckOutlined, {
@@ -48,7 +56,7 @@ Checkbox.Group = (0, _react.connect)(_antd.Checkbox.Group, (0, _react.mapProps)(
   dataSource: 'options'
 }), (0, _react.mapReadPretty)(function (props) {
   if (!(0, _shared.isValid)(props.value)) {
-    return /*#__PURE__*/_react2.default.createElement("div", null);
+    return null;
   }
 
   var _props$options = props.options,
@@ -61,7 +69,8 @@ Checkbox.Group = (0, _react.connect)(_antd.Checkbox.Group, (0, _react.mapProps)(
   }).map(function (option, key) {
     return /*#__PURE__*/_react2.default.createElement(_antd.Tag, {
       key: key,
-      color: option.color
+      color: option.color,
+      icon: option.icon
     }, option.label);
   }));
 }));