@nocobase/client 0.7.3-alpha.1 → 0.7.4-alpha.7

package/es/collection-manager/interfaces/password.js

@@ -4,8 +4,8 @@ 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; }
 
-import { defaultProps } from './properties';
 import { i18n } from '../../i18n';
+import { defaultProps } from './properties';
 export var password = {
   name: 'password',
   type: 'object',
@@ -14,6 +14,7 @@ export var password = {
   title: '{{t("Password")}}',
   default: {
     type: 'password',
+    hidden: true,
     // name,
     uiSchema: {
       type: 'string',
@@ -21,6 +22,7 @@ export var password = {
       'x-component': 'Password'
     }
   },
+  hasDefaultValue: true,
   properties: _objectSpread({}, defaultProps),
   validateSchema: function validateSchema(fieldSchema) {
     return {

package/es/collection-manager/interfaces/percent.js

@@ -69,6 +69,7 @@ export var percent = {
       }
     }
   },
+  hasDefaultValue: true,
   properties: _objectSpread(_objectSpread({}, defaultProps), {}, {
     'uiSchema.x-component-props.step': {
       type: 'string',

package/es/collection-manager/interfaces/phone.js

@@ -25,6 +25,7 @@ export var phone = {
 
     }
   },
+  hasDefaultValue: true,
   properties: _objectSpread({}, defaultProps),
   filterable: {
     operators: operators.string

package/es/collection-manager/interfaces/properties/index.d.ts

@@ -21,6 +21,7 @@ export declare const defaultProps: {
         'x-disabled': string;
         'x-decorator': string;
         'x-component': string;
+        'x-validator': string;
         description: string;
     };
     type: import("@formily/react").Stringify<{

package/es/collection-manager/interfaces/properties/index.js

@@ -247,6 +247,7 @@ export var defaultProps = {
     'x-disabled': '{{ !createOnly }}',
     'x-decorator': 'FormItem',
     'x-component': 'Input',
+    'x-validator': 'uid',
     description: "{{t('Randomly generated and can be modified. Support letters, numbers and underscores, must start with an letter.')}}"
   },
   type: type

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

@@ -87,11 +87,11 @@ export 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
 }];
 export var number = [{
@@ -201,11 +201,11 @@ export 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
 }];
 export var boolean = [{

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

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

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

@@ -21,6 +21,7 @@ export var richText = {
       'x-component': 'RichText'
     }
   },
+  hasDefaultValue: true,
   properties: _objectSpread({}, defaultProps),
   schemaInitialize: function schemaInitialize(schema, _ref) {
     var block = _ref.block;

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

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

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

@@ -21,6 +21,7 @@ export var textarea = {
       'x-component': 'Input.TextArea'
     }
   },
+  hasDefaultValue: true,
   properties: _objectSpread({}, defaultProps),
   schemaInitialize: function schemaInitialize(schema, _ref) {
     var block = _ref.block;

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

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

package/es/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;
@@ -373,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;
@@ -554,5 +554,6 @@ declare const _default: {
     "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/es/locale/en_US.js

@@ -54,7 +54,7 @@ export 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",
@@ -373,7 +373,7 @@ export 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",
@@ -553,5 +553,6 @@ export default {
   "Regular expression": "Pattern",
   "Enabled languages": "Enabled languages",
   "View all plugins": "View all plugins",
-  "Print": "Print"
+  "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'
 };

package/es/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;
@@ -251,6 +251,8 @@ declare const _default: {
     "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;
@@ -408,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;

package/es/locale/zh_CN.js

@@ -54,7 +54,7 @@ export default {
   "Select data source": "选择数据源",
   "Calendar": "日历",
   "Kanban": "看板",
-  "Select group field": "选择分组字段",
+  "Select grouping field": "选择分组字段",
   "Media": "多媒体",
   "Markdown": "Markdown",
   "Wysiwyg": "富文本",
@@ -251,6 +251,8 @@ export default {
   "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": "不早于",
@@ -408,7 +410,8 @@ export 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': '弹窗提示消息',

package/es/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/es/plugin-manager/PluginManager.js

@@ -1,9 +1,13 @@
-var _excluded = ["selected", "icon", "title"];
+var _templateObject;
+
+var _excluded = ["selected", "icon", "title", "subtitle"];
 
 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; }
 
+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; }
@@ -25,6 +29,7 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
 
 import { AppstoreOutlined, EllipsisOutlined } from '@ant-design/icons';
+import { css } from '@emotion/css';
 import { ConfigProvider, Menu, Spin, Tooltip } from 'antd';
 import cls from 'classnames';
 import { get } from 'lodash';
@@ -126,14 +131,19 @@ 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 = cls(_defineProperty({}, "".concat(prefix, "-menu-item-selected"), selected));
 
   if (item.pin) {
+    var subtitleComponent = subtitle && /*#__PURE__*/React.createElement("div", {
+      className: css(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n          font-size: 12px;\n          color: #999;\n        "])))
+    }, subtitle);
+    var titleComponent = /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("div", null, title), subtitleComponent);
     return /*#__PURE__*/React.createElement(Tooltip, {
-      title: title
+      title: titleComponent
     }, /*#__PURE__*/React.createElement(Menu.Item, _objectSpread(_objectSpread({}, others), {}, {
       className: className,
       eventKey: item.component

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

@@ -15,12 +15,17 @@ import { GeneralSchemaDesigner, SchemaSettings } from '../../../schema-settings'
 import { useSchemaTemplate } from '../../../schema-templates';
 
 var useOptions = function useOptions() {
+  var _fields$filter;
+
+  var type = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 'string';
   var compile = useCompile();
 
   var _useCollection = 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 {
@@ -57,7 +62,6 @@ export var CalendarDesigner = function CalendarDesigner() {
 
   var template = 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__*/React.createElement(GeneralSchemaDesigner, {
@@ -66,14 +70,16 @@ export var CalendarDesigner = function CalendarDesigner() {
   }, /*#__PURE__*/React.createElement(SchemaSettings.BlockTitleItem, null), /*#__PURE__*/React.createElement(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)
@@ -83,14 +89,14 @@ export var CalendarDesigner = function CalendarDesigner() {
   }), /*#__PURE__*/React.createElement(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)
@@ -100,14 +106,14 @@ export var CalendarDesigner = function CalendarDesigner() {
   }), /*#__PURE__*/React.createElement(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/es/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/es/schema-component/antd/date-picker/DatePicker.js

@@ -1,5 +1,5 @@
-import { DatePicker as AntdDatePicker } from 'antd';
 import { connect, mapProps, mapReadPretty } from '@formily/react';
+import { DatePicker as AntdDatePicker } from 'antd';
 import { ReadPretty } from './ReadPretty';
 import { mapDateFormat } from './util';
 export var DatePicker = connect(AntdDatePicker, mapProps(mapDateFormat()), mapReadPretty(ReadPretty.DatePicker));

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

@@ -1,9 +1,9 @@
 import { usePrefixCls } from '@formily/antd/lib/__builtins__';
 import { isArr } from '@formily/shared';
+import { getDefaultFormat, str2moment } from '@nocobase/utils/client';
 import cls from 'classnames';
 import moment from 'moment';
 import React from 'react';
-import { getDefaultFormat, str2moment } from './util';
 export var ReadPretty = function ReadPretty() {
   return null;
 };

package/es/schema-component/antd/date-picker/util.d.ts

@@ -1,18 +1,8 @@
-import type { DatePickerProps } from 'antd/lib/date-picker';
 import moment from 'moment';
-export interface Str2momentOptions {
-    gmt?: boolean;
-    picker?: 'year' | 'month' | 'week' | 'quarter';
-}
-export declare const str2moment: (value?: string | string[], options?: Str2momentOptions) => any;
 export interface Moment2strOptions {
     showTime?: boolean;
     gmt?: boolean;
     picker?: 'year' | 'month' | 'week' | 'quarter';
 }
 export declare const moment2str: (value?: moment.Moment | moment.Moment[], options?: Moment2strOptions) => string | string[] | moment.Moment | moment.Moment[];
-export declare const getDefaultFormat: (props: DatePickerProps & {
-    dateFormat: string;
-    timeFormat: string;
-}) => string | import("rc-picker/lib/interface").CustomFormat<moment.Moment> | (string | import("rc-picker/lib/interface").CustomFormat<moment.Moment>)[];
 export declare const mapDateFormat: () => (props: any) => any;

package/es/schema-component/antd/date-picker/util.js

@@ -4,24 +4,9 @@ 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; }
 
+import { getDefaultFormat, str2moment, toGmt, toLocal } from '@nocobase/utils/client';
 import moment from 'moment';
 
-var toGmt = function toGmt(value) {
-  if (!value) {
-    return value;
-  }
-
-  if (Array.isArray(value)) {
-    return value.map(function (val) {
-      return "".concat(val.format('YYYY-MM-DD'), "T").concat(val.format('HH:mm:ss.SSS'), "Z");
-    });
-  }
-
-  if (moment.isMoment(value)) {
-    return "".concat(value.format('YYYY-MM-DD'), "T").concat(value.format('HH:mm:ss.SSS'), "Z");
-  }
-};
-
 var toStringByPicker = function toStringByPicker(value, picker) {
   if (picker === 'year') {
     return value.format('YYYY') + '-01-01T00:00:00.000Z';
@@ -58,44 +43,6 @@ var toGmtByPicker = function toGmtByPicker(value, picker) {
   }
 };
 
-var toLocal = function toLocal(value) {
-  if (!value) {
-    return value;
-  }
-
-  if (Array.isArray(value)) {
-    return value.map(function (val) {
-      return val.toISOString();
-    });
-  }
-
-  if (moment.isMoment(value)) {
-    return value.toISOString();
-  }
-};
-
-var toMoment = function toMoment(val, options) {
-  if (moment.isMoment(val)) {
-    return val;
-  }
-
-  var gmt = options.gmt,
-      picker = options.picker;
-
-  if (gmt || picker) {
-    val = val.replace('T', ' ').replace('Z', '');
-    return moment(val);
-  }
-
-  return moment(val);
-};
-
-export var str2moment = function str2moment(value) {
-  var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
-  return Array.isArray(value) ? value.map(function (val) {
-    return toMoment(val, options);
-  }) : value ? toMoment(value, options) : value;
-};
 export var moment2str = function moment2str(value) {
   var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
   var showTime = options.showTime,
@@ -112,31 +59,6 @@ export var moment2str = function moment2str(value) {
 
   return toGmtByPicker(value, picker);
 };
-export var getDefaultFormat = function getDefaultFormat(props) {
-  if (props.format) {
-    return props.format;
-  }
-
-  if (props.dateFormat) {
-    if (props['showTime']) {
-      return "".concat(props.dateFormat, " ").concat(props.timeFormat || 'HH:mm:ss');
-    }
-
-    return props.dateFormat;
-  }
-
-  if (props['picker'] === 'month') {
-    return 'YYYY-MM';
-  } else if (props['picker'] === 'quarter') {
-    return 'YYYY-\\QQ';
-  } else if (props['picker'] === 'year') {
-    return 'YYYY';
-  } else if (props['picker'] === 'week') {
-    return 'YYYY-wo';
-  }
-
-  return props['showTime'] ? 'YYYY-MM-DD HH:mm:ss' : 'YYYY-MM-DD';
-};
 export var mapDateFormat = function mapDateFormat() {
   return function (props) {
     var format = getDefaultFormat(props);

package/es/schema-component/antd/form-item/FormItem.js

@@ -18,6 +18,7 @@ import { css } from '@emotion/css';
 import { ArrayCollapse, FormItem as Item, FormLayout } from '@formily/antd';
 import { useField, useFieldSchema } from '@formily/react';
 import { uid } from '@formily/shared';
+import _ from 'lodash';
 import React from 'react';
 import { useTranslation } from 'react-i18next';
 import { useCompile, useDesignable } from '../..';
@@ -26,7 +27,6 @@ import { useCollection, useCollectionManager } from '../../../collection-manager
 import { GeneralSchemaDesigner, SchemaSettings } from '../../../schema-settings';
 import { BlockItem } from '../block-item';
 import { HTMLEncode } from '../input/shared';
-import * as _ from 'lodash';
 
 var divWrap = function divWrap(schema) {
   return {
@@ -52,7 +52,7 @@ export var FormItem = function FormItem(props) {
 };
 
 FormItem.Designer = function (props) {
-  var _interfaceConfig$vali, _collectionField$uiSc, _collectionField$uiSc2, _fieldSchema$xDecora, _fieldSchema$xCompon, _field$componentProps, _field$componentProps2;
+  var _interfaceConfig$vali, _collectionField$uiSc, _collectionField$uiSc2, _fieldSchema$xDecora, _collectionField$uiSc4, _fieldSchema$xCompon, _field$componentProps, _field$componentProps2;
 
   var _useCollectionManager = useCollectionManager(),
       getCollectionFields = _useCollectionManager.getCollectionFields,
@@ -207,7 +207,7 @@ FormItem.Designer = function (props) {
   }), !field.readPretty && fieldSchema['x-component'] !== 'FormField' && /*#__PURE__*/React.createElement(SchemaSettings.SwitchItem, {
     key: "required",
     title: t('Required'),
-    checked: field.required,
+    checked: fieldSchema.required,
     onChange: function onChange(required) {
       var schema = _defineProperty({}, 'x-uid', fieldSchema['x-uid']);
 
@@ -364,6 +364,38 @@ FormItem.Designer = function (props) {
       });
       refresh();
     }
+  }), form && !(form === null || form === void 0 ? void 0 : form.readPretty) && (collectionField === null || collectionField === void 0 ? void 0 : (_collectionField$uiSc4 = collectionField.uiSchema) === null || _collectionField$uiSc4 === void 0 ? void 0 : _collectionField$uiSc4.type) && /*#__PURE__*/React.createElement(SchemaSettings.ModalItem, {
+    title: t('Set default value'),
+    components: {
+      ArrayCollapse: ArrayCollapse,
+      FormLayout: FormLayout
+    },
+    schema: {
+      type: 'object',
+      title: t('Set default value'),
+      properties: {
+        default: _objectSpread(_objectSpread({}, collectionField.uiSchema), {}, {
+          name: 'default',
+          title: t('Default value'),
+          'x-decorator': 'FormItem',
+          default: fieldSchema.default || collectionField.defaultValue
+        })
+      }
+    },
+    onSubmit: function onSubmit(v) {
+      var schema = _defineProperty({}, 'x-uid', fieldSchema['x-uid']);
+
+      if (field.value !== v.default) {
+        field.value = v.default;
+      }
+
+      fieldSchema.default = v.default;
+      schema.default = v.default;
+      dn.emit('patch', {
+        schema: schema
+      });
+      refresh();
+    }
   }), form && !isSubFormAssocitionField && ['o2o', 'oho', 'obo', 'o2m'].includes(collectionField === null || collectionField === void 0 ? void 0 : collectionField.interface) && /*#__PURE__*/React.createElement(SchemaSettings.SelectItem, {
     title: t('Field component'),
     options: (collectionField === null || collectionField === void 0 ? void 0 : collectionField.interface) === 'o2m' ? [{
@@ -472,15 +504,13 @@ FormItem.Designer = function (props) {
     options: options,
     value: field === null || field === void 0 ? void 0 : (_field$componentProps = field.componentProps) === null || _field$componentProps === void 0 ? void 0 : (_field$componentProps2 = _field$componentProps.fieldNames) === null || _field$componentProps2 === void 0 ? void 0 : _field$componentProps2.label,
     onChange: function onChange(label) {
+      var _collectionField$uiSc5, _collectionField$uiSc6;
+
       var schema = _defineProperty({}, 'x-uid', fieldSchema['x-uid']);
 
-      var fieldNames = _objectSpread(_objectSpread({}, field.componentProps.fieldNames), {}, {
+      var fieldNames = _objectSpread(_objectSpread(_objectSpread({}, collectionField === null || collectionField === void 0 ? void 0 : (_collectionField$uiSc5 = collectionField.uiSchema) === null || _collectionField$uiSc5 === void 0 ? void 0 : (_collectionField$uiSc6 = _collectionField$uiSc5['x-component-props']) === null || _collectionField$uiSc6 === void 0 ? void 0 : _collectionField$uiSc6['fieldNames']), field.componentProps.fieldNames), {}, {
         label: label
-      }); // if (fieldSchema['x-component-props']?.['field']?.['uiSchema']?.['x-component-props']) {
-      //   fieldSchema['x-component-props']['field']['uiSchema']['x-component-props']['fieldNames'] = fieldNames;
-      // } else {
-      // }
-
+      });
 
       fieldSchema['x-component-props'] = fieldSchema['x-component-props'] || {};
       fieldSchema['x-component-props']['fieldNames'] = fieldNames;

package/es/schema-component/antd/input-number/InputNumber.js

@@ -10,9 +10,9 @@ function _objectWithoutProperties(source, excluded) { if (source == null) return
 
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
 
-import React from 'react';
 import { connect, mapReadPretty } from '@formily/react';
 import { InputNumber as AntdNumber } from 'antd';
+import React from 'react';
 import { ReadPretty } from './ReadPretty';
 export var InputNumber = connect(function (props) {
   var onChange = props.onChange,

package/es/schema-component/antd/input-number/ReadPretty.js

@@ -1,6 +1,5 @@
 import { isValid } from '@formily/shared';
-import { toFixed } from 'rc-input-number/lib/utils/MiniDecimal';
-import { getNumberPrecision } from 'rc-input-number/lib/utils/numberUtil';
+import { toFixedByStep } from '@nocobase/utils/client';
 import React from 'react';
 export var ReadPretty = function ReadPretty(props) {
   var step = props.step,
@@ -12,8 +11,7 @@ export var ReadPretty = function ReadPretty(props) {
     return /*#__PURE__*/React.createElement("div", null);
   }
 
-  var precision = Math.max(getNumberPrecision(String(value)), getNumberPrecision(step));
   return /*#__PURE__*/React.createElement("div", {
     className: 'nb-read-pretty-input-number'
-  }, addonBefore, toFixed(String(value), '.', precision), addonAfter);
+  }, addonBefore, toFixedByStep(value, step), addonAfter);
 };