@nocobase/client 0.7.2-alpha.7 → 0.7.4-alpha.4

package/lib/collection-manager/interfaces/properties/operators.js

@@ -95,11 +95,11 @@ var datetime = [{
   value: '$dateNotAfter'
 }, {
   label: "{{ t('is empty') }}",
-  value: '$null',
+  value: '$empty',
   noValue: true
 }, {
   label: "{{ t('is not empty') }}",
-  value: '$notNull',
+  value: '$notEmpty',
   noValue: true
 }];
 exports.datetime = datetime;
@@ -213,11 +213,11 @@ var time = [{
   value: '$neq'
 }, {
   label: '{{t("is empty")}}',
-  value: '$null',
+  value: '$empty',
   noValue: true
 }, {
   label: '{{t("is not empty")}}',
-  value: '$notNull',
+  value: '$notEmpty',
   noValue: true
 }];
 exports.time = time;

package/lib/collection-manager/interfaces/radioGroup.js

@@ -29,6 +29,7 @@ var radioGroup = {
       'x-component': 'Radio.Group'
     }
   },
+  hasDefaultValue: true,
   properties: _objectSpread(_objectSpread({}, _properties.defaultProps), {}, {
     'uiSchema.enum': _properties.dataSource
   }),

package/lib/collection-manager/interfaces/richText.js

@@ -7,6 +7,8 @@ exports.richText = void 0;
 
 var _properties = require("./properties");
 
+var _i18n = require("../../i18n");
+
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
@@ -28,6 +30,7 @@ var richText = {
       'x-component': 'RichText'
     }
   },
+  hasDefaultValue: true,
   properties: _objectSpread({}, _properties.defaultProps),
   schemaInitialize: function schemaInitialize(schema, _ref) {
     var block = _ref.block;
@@ -36,6 +39,39 @@ var richText = {
       schema['x-component-props'] = schema['x-component-props'] || {};
       schema['x-component-props']['ellipsis'] = true;
     }
+  },
+  validateSchema: function validateSchema(fieldSchema, formItemStyle) {
+    return {
+      max: {
+        type: 'number',
+        title: '{{ t("Max length") }}',
+        minimum: 0,
+        'x-decorator': 'FormItem',
+        'x-component': 'InputNumber',
+        'x-component-props': {
+          precision: 0
+        },
+        'x-reactions': "{{(field) => {\n          const targetValue = field.query('.min').value();\n          field.selfErrors =\n            !!targetValue && !!field.value && targetValue > field.value ? '".concat(_i18n.i18n.t('Max length must greater than min length'), "' : ''\n        }}}")
+      },
+      min: {
+        type: 'number',
+        title: '{{ t("Min length") }}',
+        minimum: 0,
+        'x-decorator': 'FormItem',
+        'x-component': 'InputNumber',
+        'x-component-props': {
+          precision: 0
+        },
+        'x-reactions': {
+          dependencies: ['.max'],
+          fulfill: {
+            state: {
+              selfErrors: "{{!!$deps[0] && !!$self.value && $deps[0] < $self.value ? '".concat(_i18n.i18n.t('Min length must less than max length'), "' : ''}}")
+            }
+          }
+        }
+      }
+    };
   }
 };
 exports.richText = richText;

package/lib/collection-manager/interfaces/select.js

@@ -30,6 +30,7 @@ var select = {
       enum: []
     }
   },
+  hasDefaultValue: true,
   properties: _objectSpread(_objectSpread({}, _properties.defaultProps), {}, {
     'uiSchema.enum': _properties.dataSource
   }),

package/lib/collection-manager/interfaces/textarea.js

@@ -7,6 +7,8 @@ exports.textarea = void 0;
 
 var _properties = require("./properties");
 
+var _i18n = require("../../i18n");
+
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
@@ -28,6 +30,7 @@ var textarea = {
       'x-component': 'Input.TextArea'
     }
   },
+  hasDefaultValue: true,
   properties: _objectSpread({}, _properties.defaultProps),
   schemaInitialize: function schemaInitialize(schema, _ref) {
     var block = _ref.block;
@@ -36,6 +39,39 @@ var textarea = {
       schema['x-component-props'] = schema['x-component-props'] || {};
       schema['x-component-props']['ellipsis'] = true;
     }
+  },
+  validateSchema: function validateSchema(fieldSchema) {
+    return {
+      max: {
+        type: 'number',
+        title: '{{ t("Max length") }}',
+        minimum: 0,
+        'x-decorator': 'FormItem',
+        'x-component': 'InputNumber',
+        'x-component-props': {
+          precision: 0
+        },
+        'x-reactions': "{{(field) => {\n          const targetValue = field.query('.min').value();\n          field.selfErrors =\n            !!targetValue && !!field.value && targetValue > field.value ? '".concat(_i18n.i18n.t('Max length must greater than min length'), "' : ''\n        }}}")
+      },
+      min: {
+        type: 'number',
+        title: '{{ t("Min length") }}',
+        minimum: 0,
+        'x-decorator': 'FormItem',
+        'x-component': 'InputNumber',
+        'x-component-props': {
+          precision: 0
+        },
+        'x-reactions': {
+          dependencies: ['.max'],
+          fulfill: {
+            state: {
+              selfErrors: "{{!!$deps[0] && !!$self.value && $deps[0] < $self.value ? '".concat(_i18n.i18n.t('Min length must less than max length'), "' : ''}}")
+            }
+          }
+        }
+      }
+    };
   }
 };
 exports.textarea = textarea;

package/lib/collection-manager/interfaces/time.js

@@ -28,6 +28,7 @@ var time = {
       'x-component': 'TimePicker'
     }
   },
+  hasDefaultValue: true,
   properties: _objectSpread(_objectSpread({}, _properties.defaultProps), {}, {
     'uiSchema.x-component-props.format': {
       type: 'string',

package/lib/file-manager/FileStorageShortcut.js

@@ -72,7 +72,7 @@ var FileStorageShortcut = function FileStorageShortcut() {
     onClick: function onClick() {
       setVisible(true);
     },
-    icon: /*#__PURE__*/_react.default.createElement(_icons.SettingOutlined, null),
+    icon: /*#__PURE__*/_react.default.createElement(_icons.FileOutlined, null),
     title: t('File storages')
   }), /*#__PURE__*/_react.default.createElement(_schemaComponent.SchemaComponent, {
     components: {

package/lib/locale/en_US.d.ts

@@ -54,7 +54,7 @@ declare const _default: {
     "Select data source": string;
     Calendar: string;
     Kanban: string;
-    "Select group field": string;
+    "Select grouping field": string;
     Media: string;
     Markdown: string;
     Wysiwyg: string;
@@ -98,6 +98,7 @@ declare const _default: {
     Update: string;
     View: string;
     "View record": string;
+    Refresh: string;
     "Data changes": string;
     "Field name": string;
     "Before change": string;
@@ -372,7 +373,7 @@ declare const _default: {
     "Reference template": string;
     "Create calendar block": string;
     "Create kanban block": string;
-    "Group field": string;
+    "Grouping field": string;
     "Tab name": string;
     "Current record blocks": string;
     "Popup message": string;
@@ -549,5 +550,10 @@ declare const _default: {
     "Field component": string;
     Subtable: string;
     Subform: string;
+    "Regular expression": string;
+    "Enabled languages": string;
+    "View all plugins": string;
+    Print: string;
+    'Single select and radio fields can be used as the grouping field': string;
 };
 export default _default;

package/lib/locale/en_US.js

@@ -60,7 +60,7 @@ var _default = {
   "Select data source": "Select data source",
   "Calendar": "Calendar",
   "Kanban": "Kanban",
-  "Select group field": "Select group field",
+  "Select grouping field": "Select grouping field",
   "Media": "Media",
   "Markdown": "Markdown",
   "Wysiwyg": "Wysiwyg",
@@ -104,6 +104,7 @@ var _default = {
   "Update": "Update",
   "View": "View",
   "View record": "View record",
+  "Refresh": "Refresh",
   "Data changes": "Data changes",
   "Field name": "Field name",
   "Before change": "Before change",
@@ -378,7 +379,7 @@ var _default = {
   "Reference template": "Reference template",
   "Create calendar block": "Create calendar block",
   "Create kanban block": "Create kanban block",
-  "Group field": "Group field",
+  "Grouping field": "Grouping field",
   "Tab name": "Tab name",
   "Current record blocks": "Current record blocks",
   "Popup message": "Popup message",
@@ -554,6 +555,11 @@ var _default = {
   "Province/city/area name": "Province/city/area name",
   "Field component": "Field component",
   "Subtable": "Subtable",
-  "Subform": "Subform"
+  "Subform": "Subform",
+  "Regular expression": "Pattern",
+  "Enabled languages": "Enabled languages",
+  "View all plugins": "View all plugins",
+  "Print": "Print",
+  'Single select and radio fields can be used as the grouping field': 'Single select and radio fields can be used as the grouping field'
 };
 exports.default = _default;

package/lib/locale/zh_CN.d.ts

@@ -54,7 +54,7 @@ declare const _default: {
     "Select data source": string;
     Calendar: string;
     Kanban: string;
-    "Select group field": string;
+    "Select grouping field": string;
     Media: string;
     Markdown: string;
     Wysiwyg: string;
@@ -98,6 +98,7 @@ declare const _default: {
     Update: string;
     View: string;
     "View record": string;
+    Refresh: string;
     "Data changes": string;
     "Field name": string;
     "Before change": string;
@@ -232,6 +233,26 @@ declare const _default: {
     "Label field": string;
     "Default is the ID field": string;
     "Set default sorting rules": string;
+    "Set validation rules": string;
+    "Max length": string;
+    "Min length": string;
+    Maximum: string;
+    Minimum: string;
+    "Max length must greater than min length": string;
+    "Min length must less than max length": string;
+    "Maximum must greater than minimum": string;
+    "Minimum must less than maximum": string;
+    "Validation rule": string;
+    "Add validation rule": string;
+    Format: string;
+    "Regular expression": string;
+    "Error message": string;
+    Length: string;
+    "The field value cannot be greater than ": string;
+    "The field value cannot be less than ": string;
+    "The field value is not an integer number": string;
+    "Set default value": string;
+    "Default value": string;
     "is before": string;
     "is after": string;
     "is on or after": string;
@@ -389,7 +410,8 @@ declare const _default: {
     'Reference template': string;
     'Create calendar block': string;
     'Create kanban block': string;
-    'Group field': string;
+    'Grouping field': string;
+    'Single select and radio fields can be used as the grouping field': string;
     'Tab name': string;
     'Current record blocks': string;
     'Popup message': string;
@@ -539,6 +561,7 @@ declare const _default: {
     'Dynamic value': string;
     'Current user': string;
     'Current record': string;
+    'Current time': string;
     'Popup close method': string;
     'Automatic close': string;
     'Manually close': string;
@@ -573,5 +596,8 @@ declare const _default: {
     "One to one (belongs to)": string;
     "Use the same time zone (GMT) for all users": string;
     "Province/city/area name": string;
+    "Enabled languages": string;
+    "View all plugins": string;
+    Print: string;
 };
 export default _default;

package/lib/locale/zh_CN.js

@@ -60,7 +60,7 @@ var _default = {
   "Select data source": "选择数据源",
   "Calendar": "日历",
   "Kanban": "看板",
-  "Select group field": "选择分组字段",
+  "Select grouping field": "选择分组字段",
   "Media": "多媒体",
   "Markdown": "Markdown",
   "Wysiwyg": "富文本",
@@ -104,6 +104,7 @@ var _default = {
   "Update": "更新",
   "View": "查看",
   "View record": "查看数据",
+  "Refresh": "刷新",
   "Data changes": "数据变更",
   "Field name": "字段标识",
   "Before change": "变更前",
@@ -238,6 +239,26 @@ var _default = {
   "Label field": "标签字段",
   "Default is the ID field": "默认为 ID 字段",
   "Set default sorting rules": "设置排序规则",
+  "Set validation rules": "设置验证规则",
+  "Max length": "最大长度",
+  "Min length": "最小长度",
+  "Maximum": "最大值",
+  "Minimum": "最小值",
+  "Max length must greater than min length": "最大长度必须大于最小长度",
+  "Min length must less than max length": "最小长度必须小于最大长度",
+  "Maximum must greater than minimum": "最大值必须大于最小值",
+  "Minimum must less than maximum": "最小值必须小于最大值",
+  "Validation rule": "验证规则",
+  "Add validation rule": "新增验证规则",
+  "Format": "格式",
+  "Regular expression": "正则表达式",
+  "Error message": "错误消息",
+  "Length": "长度",
+  "The field value cannot be greater than ": "数值不能大于",
+  "The field value cannot be less than ": "数值不能小于",
+  "The field value is not an integer number": "数字不是整数",
+  "Set default value": "设置默认值",
+  "Default value": "默认值",
   "is before": "早于",
   "is after": "晚于",
   "is on or after": "不早于",
@@ -395,7 +416,8 @@ var _default = {
   'Reference template': '引用模板',
   'Create calendar block': '创建日历区块',
   'Create kanban block': '创建看板区块',
-  'Group field': '分组字段',
+  'Grouping field': '分组字段',
+  'Single select and radio fields can be used as the grouping field': '数据表的单选字段可以作为分组字段',
   'Tab name': '标签名称',
   'Current record blocks': '当前数据区块',
   'Popup message': '弹窗提示消息',
@@ -546,6 +568,7 @@ var _default = {
   'Dynamic value': '动态值',
   'Current user': '当前用户',
   'Current record': '当前记录',
+  'Current time': '当前时间',
   'Popup close method': '弹窗关闭方式',
   'Automatic close': '自动关闭',
   'Manually close': '手动关闭',
@@ -580,6 +603,9 @@ var _default = {
   "One to one (has one)": "一对一（has one）",
   "One to one (belongs to)": "一对一（belongs to）",
   "Use the same time zone (GMT) for all users": "所有用户使用同一时区 (格林尼治标准时间)",
-  "Province/city/area name": "省市区名称"
+  "Province/city/area name": "省市区名称",
+  "Enabled languages": "启用的语言",
+  "View all plugins": "查看所有插件",
+  "Print": "打印"
 };
 exports.default = _default;

package/lib/plugin-manager/PluginManager.d.ts

@@ -7,6 +7,7 @@ declare type PluginManagerType = {
     Toolbar?: React.FC<ToolbarProps> & {
         Item?: React.FC<MenuItemProps & {
             selected?: boolean;
+            subtitle?: string;
         }>;
     };
 };

package/lib/plugin-manager/PluginManager.js

@@ -9,6 +9,8 @@ exports.usePrefixCls = exports.RemotePluginManagerToolbar = exports.PluginManage
 
 var _icons = require("@ant-design/icons");
 
+var _css = require("@emotion/css");
+
 var _antd = require("antd");
 
 var _classnames = _interopRequireDefault(require("classnames"));
@@ -17,11 +19,15 @@ var _lodash = require("lodash");
 
 var _react = _interopRequireWildcard(require("react"));
 
+var _reactI18next = require("react-i18next");
+
 var _apiClient = require("../api-client");
 
 var _context = require("./context");
 
-var _excluded = ["selected", "icon", "title"];
+var _templateObject;
+
+var _excluded = ["selected", "icon", "title", "subtitle"];
 
 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); }
 
@@ -33,6 +39,8 @@ function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (O
 
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 
+function _taggedTemplateLiteral(strings, raw) { if (!raw) { raw = strings.slice(0); } return Object.freeze(Object.defineProperties(strings, { raw: { value: Object.freeze(raw) } })); }
+
 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; }
 
 function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
@@ -107,6 +115,9 @@ PluginManager.Toolbar = function (props) {
       pinned = _splitItems2[0],
       unpinned = _splitItems2[1];
 
+  var _useTranslation = (0, _reactI18next.useTranslation)(),
+      t = _useTranslation.t;
+
   return /*#__PURE__*/_react.default.createElement("div", {
     style: {
       display: 'inline-block'
@@ -127,7 +138,7 @@ PluginManager.Toolbar = function (props) {
   }), unpinned.length > 0 && /*#__PURE__*/_react.default.createElement(_antd.Menu.SubMenu, {
     popupClassName: 'pm-sub-menu',
     key: 'more',
-    title: /*#__PURE__*/_react.default.createElement(_icons.MoreOutlined, null)
+    title: /*#__PURE__*/_react.default.createElement(_icons.EllipsisOutlined, null)
   }, unpinned.map(function (item, index) {
     var Action = (0, _lodash.get)(components, item.component);
     return Action && /*#__PURE__*/_react.default.createElement(ToolbarItemContext.Provider, {
@@ -139,8 +150,8 @@ PluginManager.Toolbar = function (props) {
   }), /*#__PURE__*/_react.default.createElement(_antd.Menu.Item, {
     key: 'plugins',
     disabled: true,
-    icon: /*#__PURE__*/_react.default.createElement(_icons.SettingOutlined, null)
-  }, "\u7BA1\u7406\u63D2\u4EF6"))));
+    icon: /*#__PURE__*/_react.default.createElement(_icons.AppstoreOutlined, null)
+  }, t('View all plugins')))));
 };
 
 PluginManager.Toolbar.Item = function (props) {
@@ -149,14 +160,21 @@ PluginManager.Toolbar.Item = function (props) {
   var selected = props.selected,
       icon = props.icon,
       title = props.title,
+      subtitle = props.subtitle,
       others = _objectWithoutProperties(props, _excluded);
 
   var prefix = usePrefixCls();
   var className = (0, _classnames.default)(_defineProperty({}, "".concat(prefix, "-menu-item-selected"), selected));
 
   if (item.pin) {
+    var subtitleComponent = subtitle && /*#__PURE__*/_react.default.createElement("div", {
+      className: (0, _css.css)(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n          font-size: 12px;\n          color: #999;\n        "])))
+    }, subtitle);
+
+    var titleComponent = /*#__PURE__*/_react.default.createElement("div", null, /*#__PURE__*/_react.default.createElement("div", null, title), subtitleComponent);
+
     return /*#__PURE__*/_react.default.createElement(_antd.Tooltip, {
-      title: title
+      title: titleComponent
     }, /*#__PURE__*/_react.default.createElement(_antd.Menu.Item, _objectSpread(_objectSpread({}, others), {}, {
       className: className,
       eventKey: item.component

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

@@ -68,7 +68,7 @@ var ActionModal = (0, _react.observer)(function (props) {
     onCancel: function onCancel() {
       return setVisible(false, true);
     },
-    className: (0, _classnames.default)(others.className, (0, _css.css)(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n                &.nb-action-popup {\n                  .ant-modal-body {\n                    background: #f0f2f5;\n                  }\n                }\n              "])))),
+    className: (0, _classnames.default)(others.className, (0, _css.css)(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n                &.nb-action-popup {\n                  .ant-modal-header {\n                    display: none;\n                  }\n                  .ant-modal-body {\n                    padding-top: 16px;\n                  }\n                  .ant-modal-body {\n                    background: #f0f2f5;\n                  }\n                  .ant-modal-close-x {\n                    width: 32px;\n                    height: 32px;\n                    line-height: 32px;\n                  }\n                }\n              "])))),
     footer: footerSchema ? /*#__PURE__*/_react2.default.createElement("div", {
       className: (0, _css.css)(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\n                    display: flex;\n                    justify-content: flex-end;\n                    width: 100%;\n                    .ant-btn {\n                      margin-right: 8px;\n                    }\n                  "])))
     }, /*#__PURE__*/_react2.default.createElement(_react.RecursionField, {

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

@@ -32,12 +32,17 @@ 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 useOptions = function useOptions() {
+  var _fields$filter;
+
+  var type = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 'string';
   var compile = (0, _.useCompile)();
 
   var _useCollection = (0, _collectionManager.useCollection)(),
       fields = _useCollection.fields;
 
-  var options = fields === null || fields === void 0 ? void 0 : fields.map(function (field) {
+  var options = fields === null || fields === void 0 ? void 0 : (_fields$filter = fields.filter(function (field) {
+    return field.type === type;
+  })) === null || _fields$filter === void 0 ? void 0 : _fields$filter.map(function (field) {
     var _field$uiSchema;
 
     return {
@@ -74,7 +79,6 @@ var CalendarDesigner = function CalendarDesigner() {
 
   var template = (0, _schemaTemplates.useSchemaTemplate)();
   var defaultFilter = (fieldSchema === null || fieldSchema === void 0 ? void 0 : (_fieldSchema$xDecora = fieldSchema['x-decorator-props']) === null || _fieldSchema$xDecora === void 0 ? void 0 : (_fieldSchema$xDecora$ = _fieldSchema$xDecora.params) === null || _fieldSchema$xDecora$ === void 0 ? void 0 : _fieldSchema$xDecora$.filter) || {};
-  var options = useOptions();
   var fieldNames = (fieldSchema === null || fieldSchema === void 0 ? void 0 : (_fieldSchema$xDecora2 = fieldSchema['x-decorator-props']) === null || _fieldSchema$xDecora2 === void 0 ? void 0 : _fieldSchema$xDecora2['fieldNames']) || {};
   var defaultResource = fieldSchema === null || fieldSchema === void 0 ? void 0 : (_fieldSchema$xDecora3 = fieldSchema['x-decorator-props']) === null || _fieldSchema$xDecora3 === void 0 ? void 0 : _fieldSchema$xDecora3.resource;
   return /*#__PURE__*/_react2.default.createElement(_schemaSettings.GeneralSchemaDesigner, {
@@ -83,14 +87,16 @@ var CalendarDesigner = function CalendarDesigner() {
   }, /*#__PURE__*/_react2.default.createElement(_schemaSettings.SchemaSettings.BlockTitleItem, null), /*#__PURE__*/_react2.default.createElement(_schemaSettings.SchemaSettings.SelectItem, {
     title: t('Title field'),
     value: fieldNames.title,
-    options: options,
+    options: useOptions('string'),
     onChange: function onChange(title) {
       var _schema;
 
       var fieldNames = field.decoratorProps.fieldNames || {};
       fieldNames['title'] = title;
       field.decoratorProps.params = fieldNames;
-      fieldSchema['x-decorator-props']['params'] = fieldNames;
+      fieldSchema['x-decorator-props']['params'] = fieldNames; // Select切换option后value未按照预期切换，固增加以下代码
+
+      fieldSchema['x-decorator-props']['fieldNames'] = fieldNames;
       service.refresh();
       dn.emit('patch', {
         schema: (_schema = {}, _defineProperty(_schema, 'x-uid', fieldSchema['x-uid']), _defineProperty(_schema, 'x-decorator-props', field.decoratorProps), _schema)
@@ -100,14 +106,14 @@ var CalendarDesigner = function CalendarDesigner() {
   }), /*#__PURE__*/_react2.default.createElement(_schemaSettings.SchemaSettings.SelectItem, {
     title: t('Start date field'),
     value: fieldNames.start,
-    options: options,
+    options: useOptions('date'),
     onChange: function onChange(start) {
       var _schema2;
 
       var fieldNames = field.decoratorProps.fieldNames || {};
       fieldNames['start'] = start;
-      field.decoratorProps.params = fieldNames;
-      fieldSchema['x-decorator-props']['params'] = fieldNames;
+      field.decoratorProps.fieldNames = fieldNames;
+      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)
@@ -117,14 +123,14 @@ var CalendarDesigner = function CalendarDesigner() {
   }), /*#__PURE__*/_react2.default.createElement(_schemaSettings.SchemaSettings.SelectItem, {
     title: t('End date field'),
     value: fieldNames.end,
-    options: options,
+    options: useOptions('date'),
     onChange: function onChange(end) {
       var _schema3;
 
       var fieldNames = field.decoratorProps.fieldNames || {};
       fieldNames['end'] = end;
-      field.decoratorProps.params = fieldNames;
-      fieldSchema['x-decorator-props']['params'] = fieldNames;
+      field.decoratorProps.fieldNames = fieldNames;
+      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)

package/lib/schema-component/antd/date-picker/DatePicker.d.ts

@@ -1,5 +1,5 @@
-import React from 'react';
 import type { DatePickerProps as AntdDatePickerProps, RangePickerProps as AntdRangePickerProps } from 'antd/lib/date-picker';
+import React from 'react';
 declare type ComposedDatePicker = React.FC<AntdDatePickerProps> & {
     RangePicker?: React.FC<AntdRangePickerProps>;
 };

package/lib/schema-component/antd/date-picker/DatePicker.js

@@ -5,10 +5,10 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = exports.DatePicker = void 0;
 
-var _antd = require("antd");
-
 var _react = require("@formily/react");
 
+var _antd = require("antd");
+
 var _ReadPretty = require("./ReadPretty");
 
 var _util = require("./util");

package/lib/schema-component/antd/date-picker/ReadPretty.js

@@ -9,14 +9,14 @@ var _builtins__ = require("@formily/antd/lib/__builtins__");
 
 var _shared = require("@formily/shared");
 
+var _client = require("@nocobase/utils/client");
+
 var _classnames = _interopRequireDefault(require("classnames"));
 
 var _moment = _interopRequireDefault(require("moment"));
 
 var _react = _interopRequireDefault(require("react"));
 
-var _util = require("./util");
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 var ReadPretty = function ReadPretty() {
@@ -33,8 +33,8 @@ ReadPretty.DatePicker = function (props) {
   var prefixCls = (0, _builtins__.usePrefixCls)('description-date-picker', props);
 
   var getLabels = function getLabels() {
-    var format = (0, _util.getDefaultFormat)(props);
-    var m = (0, _util.str2moment)(props.value, props);
+    var format = (0, _client.getDefaultFormat)(props);
+    var m = (0, _client.str2moment)(props.value, props);
     var labels = _moment.default.isMoment(m) ? m.format(format) : '';
     return (0, _shared.isArr)(labels) ? labels.join('~') : labels;
   };
@@ -46,10 +46,10 @@ ReadPretty.DatePicker = function (props) {
 
 ReadPretty.DateRangePicker = function (props) {
   var prefixCls = (0, _builtins__.usePrefixCls)('description-text', props);
-  var format = (0, _util.getDefaultFormat)(props);
+  var format = (0, _client.getDefaultFormat)(props);
 
   var getLabels = function getLabels() {
-    var m = (0, _util.str2moment)(props.value, props);
+    var m = (0, _client.str2moment)(props.value, props);
 
     if (!m) {
       return '';