@nocobase/client 0.7.4-alpha.1 → 0.7.4-alpha.4

package/es/block-provider/FormBlockProvider.js

@@ -8,10 +8,13 @@ import { createForm } from '@formily/core';
 import { useField } from '@formily/react';
 import { Spin } from 'antd';
 import React, { createContext, useContext, useEffect, useMemo, useRef } from 'react';
+import { RecordProvider } from '../record-provider';
 import { BlockProvider, useBlockRequestContext } from './BlockProvider';
 export var FormBlockContext = /*#__PURE__*/createContext({});
 
 var InternalFormBlockProvider = function InternalFormBlockProvider(props) {
+  var _service$data;
+
   var action = props.action,
       readPretty = props.readPretty;
   var field = useField();
@@ -41,8 +44,12 @@ var InternalFormBlockProvider = function InternalFormBlockProvider(props) {
       updateAssociationValues: [],
       formBlockRef: formBlockRef
     }
+  }, readPretty ? /*#__PURE__*/React.createElement(RecordProvider, {
+    record: service === null || service === void 0 ? void 0 : (_service$data = service.data) === null || _service$data === void 0 ? void 0 : _service$data.data
   }, /*#__PURE__*/React.createElement("div", {
     ref: formBlockRef
+  }, props.children)) : /*#__PURE__*/React.createElement("div", {
+    ref: formBlockRef
   }, props.children));
 };
 

package/es/block-provider/TableSelectorProvider.js

@@ -79,7 +79,7 @@ export var TableSelectorProvider = function TableSelectorProvider(props) {
     params['sort'] = ['sort'];
   }
 
-  if (appends === null || appends === void 0 ? void 0 : appends.length) {
+  if (!Object.keys(params).includes('appends')) {
     params['appends'] = appends;
   }
 

package/es/collection-manager/CollectionField.js

@@ -19,8 +19,10 @@ var InternalField = function InternalField(props) {
   var _useCollectionField = useCollectionField(),
       name = _useCollectionField.name,
       interfaceType = _useCollectionField.interface,
-      uiSchema = _useCollectionField.uiSchema;
+      uiSchema = _useCollectionField.uiSchema,
+      defaultValue = _useCollectionField.defaultValue;
 
+  var collectionField = useCollectionField();
   var component = useComponent(uiSchema === null || uiSchema === void 0 ? void 0 : uiSchema['x-component']);
   var compile = useCompile();
 
@@ -50,7 +52,10 @@ var InternalField = function InternalField(props) {
     setFieldProps('content', uiSchema['x-content']);
     setFieldProps('title', uiSchema.title);
     setFieldProps('description', uiSchema.description);
-    setFieldProps('initialValue', uiSchema.default);
+
+    if (ctx === null || ctx === void 0 ? void 0 : ctx.form) {
+      setFieldProps('initialValue', fieldSchema.default || defaultValue);
+    }
 
     if (!field.validator && (uiSchema['x-validator'] || fieldSchema['x-validator'])) {
       var concatSchema = concat([], uiSchema['x-validator'] || [], fieldSchema['x-validator'] || []);

package/es/collection-manager/Configuration/AddFieldAction.js

@@ -43,6 +43,12 @@ var getSchema = function getSchema(schema, record, compile) {
 
   var properties = cloneDeep(schema.properties);
 
+  if (schema.hasDefaultValue === true) {
+    properties['defaultValue'] = cloneDeep(schema.default.uiSchema);
+    properties['defaultValue']['title'] = compile('{{ t("Default value") }}');
+    properties['defaultValue']['x-decorator'] = 'FormItem';
+  }
+
   var initialValue = _objectSpread(_objectSpread({
     name: "f_".concat(uid())
   }, cloneDeep(schema.default)), {}, {

package/es/collection-manager/Configuration/EditFieldAction.js

@@ -42,6 +42,13 @@ var getSchema = function getSchema(schema, record, compile) {
 
   var properties = cloneDeep(schema.properties);
   properties.name['x-disabled'] = true;
+
+  if (schema.hasDefaultValue === true) {
+    properties['defaultValue'] = cloneDeep(schema.default.uiSchema);
+    properties['defaultValue']['title'] = compile('{{ t("Default value") }}');
+    properties['defaultValue']['x-decorator'] = 'FormItem';
+  }
+
   return {
     type: 'object',
     properties: _defineProperty({}, uid(), {

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

@@ -19,6 +19,7 @@ export var checkbox = {
       'x-component': 'Checkbox'
     }
   },
+  hasDefaultValue: true,
   properties: _objectSpread({}, defaultProps),
   filterable: {
     operators: operators.boolean

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

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

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

@@ -24,6 +24,7 @@ export var datetime = {
       }
     }
   },
+  hasDefaultValue: true,
   properties: _objectSpread(_objectSpread(_objectSpread({}, defaultProps), dateTimeProps), {}, {
     'uiSchema.x-component-props.gmt': {
       type: 'boolean',

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

@@ -22,6 +22,7 @@ export var email = {
       'x-validator': 'email'
     }
   },
+  hasDefaultValue: true,
   properties: _objectSpread({}, defaultProps),
   filterable: {
     operators: operators.string

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

@@ -20,5 +20,6 @@ export var icon = {
       'x-component': 'IconPicker'
     }
   },
+  hasDefaultValue: true,
   properties: _objectSpread({}, defaultProps)
 };

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

@@ -21,6 +21,7 @@ export var input = {
       'x-component': 'Input'
     }
   },
+  hasDefaultValue: true,
   properties: _objectSpread({}, defaultProps),
   filterable: {
     operators: operators.string

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

@@ -32,6 +32,7 @@ export var integer = {
       'x-validator': 'integer'
     }
   },
+  hasDefaultValue: true,
   properties: _objectSpread({}, defaultProps),
   filterable: {
     operators: operators.number

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

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

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

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

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

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

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

@@ -22,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/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/zh_CN.d.ts

@@ -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;

package/es/locale/zh_CN.js

@@ -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": "不早于",

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

@@ -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,
@@ -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,11 +504,11 @@ 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$uiSc4, _collectionField$uiSc5;
+      var _collectionField$uiSc5, _collectionField$uiSc6;
 
       var schema = _defineProperty({}, 'x-uid', fieldSchema['x-uid']);
 
-      var fieldNames = _objectSpread(_objectSpread(_objectSpread({}, collectionField === null || collectionField === void 0 ? void 0 : (_collectionField$uiSc4 = collectionField.uiSchema) === null || _collectionField$uiSc4 === void 0 ? void 0 : (_collectionField$uiSc5 = _collectionField$uiSc4['x-component-props']) === null || _collectionField$uiSc5 === void 0 ? void 0 : _collectionField$uiSc5['fieldNames']), 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
       });
 

package/es/schema-settings/SchemaSettings.js

@@ -540,6 +540,8 @@ SchemaSettings.Remove = function (props) {
   var _useTranslation3 = useTranslation(),
       t = _useTranslation3.t;
 
+  var field = useField();
+  var fieldSchema = useFieldSchema();
   var ctx = useBlockTemplateContext();
   return /*#__PURE__*/React.createElement(SchemaSettings.Item, {
     onClick: function onClick() {
@@ -553,6 +555,11 @@ SchemaSettings.Remove = function (props) {
             breakRemoveOn: breakRemoveOn
           };
 
+          if (field && field.required) {
+            field.required = false;
+            fieldSchema['required'] = false;
+          }
+
           if (template && (ctx === null || ctx === void 0 ? void 0 : ctx.dn)) {
             ctx === null || ctx === void 0 ? void 0 : ctx.dn.remove(null, options);
           } else {

package/lib/block-provider/FormBlockProvider.js

@@ -15,6 +15,8 @@ var _antd = require("antd");
 
 var _react2 = _interopRequireWildcard(require("react"));
 
+var _recordProvider = require("../record-provider");
+
 var _BlockProvider = require("./BlockProvider");
 
 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); }
@@ -31,6 +33,8 @@ var FormBlockContext = /*#__PURE__*/(0, _react2.createContext)({});
 exports.FormBlockContext = FormBlockContext;
 
 var InternalFormBlockProvider = function InternalFormBlockProvider(props) {
+  var _service$data;
+
   var action = props.action,
       readPretty = props.readPretty;
   var field = (0, _react.useField)();
@@ -60,8 +64,12 @@ var InternalFormBlockProvider = function InternalFormBlockProvider(props) {
       updateAssociationValues: [],
       formBlockRef: formBlockRef
     }
+  }, readPretty ? /*#__PURE__*/_react2.default.createElement(_recordProvider.RecordProvider, {
+    record: service === null || service === void 0 ? void 0 : (_service$data = service.data) === null || _service$data === void 0 ? void 0 : _service$data.data
   }, /*#__PURE__*/_react2.default.createElement("div", {
     ref: formBlockRef
+  }, props.children)) : /*#__PURE__*/_react2.default.createElement("div", {
+    ref: formBlockRef
   }, props.children));
 };
 

package/lib/block-provider/TableSelectorProvider.js

@@ -99,7 +99,7 @@ var TableSelectorProvider = function TableSelectorProvider(props) {
     params['sort'] = ['sort'];
   }
 
-  if (appends === null || appends === void 0 ? void 0 : appends.length) {
+  if (!Object.keys(params).includes('appends')) {
     params['appends'] = appends;
   }
 

package/lib/collection-manager/CollectionField.js

@@ -39,8 +39,10 @@ var InternalField = function InternalField(props) {
   var _useCollectionField = (0, _hooks.useCollectionField)(),
       name = _useCollectionField.name,
       interfaceType = _useCollectionField.interface,
-      uiSchema = _useCollectionField.uiSchema;
+      uiSchema = _useCollectionField.uiSchema,
+      defaultValue = _useCollectionField.defaultValue;
 
+  var collectionField = (0, _hooks.useCollectionField)();
   var component = (0, _.useComponent)(uiSchema === null || uiSchema === void 0 ? void 0 : uiSchema['x-component']);
   var compile = (0, _.useCompile)();
 
@@ -70,7 +72,10 @@ var InternalField = function InternalField(props) {
     setFieldProps('content', uiSchema['x-content']);
     setFieldProps('title', uiSchema.title);
     setFieldProps('description', uiSchema.description);
-    setFieldProps('initialValue', uiSchema.default);
+
+    if (ctx === null || ctx === void 0 ? void 0 : ctx.form) {
+      setFieldProps('initialValue', fieldSchema.default || defaultValue);
+    }
 
     if (!field.validator && (uiSchema['x-validator'] || fieldSchema['x-validator'])) {
       var concatSchema = (0, _lodash.concat)([], uiSchema['x-validator'] || [], fieldSchema['x-validator'] || []);

package/lib/collection-manager/Configuration/AddFieldAction.js

@@ -70,6 +70,12 @@ var getSchema = function getSchema(schema, record, compile) {
 
   var properties = (0, _lodash.cloneDeep)(schema.properties);
 
+  if (schema.hasDefaultValue === true) {
+    properties['defaultValue'] = (0, _lodash.cloneDeep)(schema.default.uiSchema);
+    properties['defaultValue']['title'] = compile('{{ t("Default value") }}');
+    properties['defaultValue']['x-decorator'] = 'FormItem';
+  }
+
   var initialValue = _objectSpread(_objectSpread({
     name: "f_".concat((0, _shared.uid)())
   }, (0, _lodash.cloneDeep)(schema.default)), {}, {

package/lib/collection-manager/Configuration/EditFieldAction.js

@@ -68,6 +68,13 @@ var getSchema = function getSchema(schema, record, compile) {
 
   var properties = (0, _cloneDeep.default)(schema.properties);
   properties.name['x-disabled'] = true;
+
+  if (schema.hasDefaultValue === true) {
+    properties['defaultValue'] = (0, _cloneDeep.default)(schema.default.uiSchema);
+    properties['defaultValue']['title'] = compile('{{ t("Default value") }}');
+    properties['defaultValue']['x-decorator'] = 'FormItem';
+  }
+
   return {
     type: 'object',
     properties: _defineProperty({}, (0, _shared.uid)(), {

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

@@ -27,6 +27,7 @@ var checkbox = {
       'x-component': 'Checkbox'
     }
   },
+  hasDefaultValue: true,
   properties: _objectSpread({}, _properties.defaultProps),
   filterable: {
     operators: _properties.operators.boolean

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

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

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

@@ -32,6 +32,7 @@ var datetime = {
       }
     }
   },
+  hasDefaultValue: true,
   properties: _objectSpread(_objectSpread(_objectSpread({}, _properties.defaultProps), _properties.dateTimeProps), {}, {
     'uiSchema.x-component-props.gmt': {
       type: 'boolean',

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

@@ -30,6 +30,7 @@ var email = {
       'x-validator': 'email'
     }
   },
+  hasDefaultValue: true,
   properties: _objectSpread({}, _properties.defaultProps),
   filterable: {
     operators: _properties.operators.string

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

@@ -28,6 +28,7 @@ var icon = {
       'x-component': 'IconPicker'
     }
   },
+  hasDefaultValue: true,
   properties: _objectSpread({}, _properties.defaultProps)
 };
 exports.icon = icon;

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

@@ -30,6 +30,7 @@ var input = {
       'x-component': 'Input'
     }
   },
+  hasDefaultValue: true,
   properties: _objectSpread({}, _properties.defaultProps),
   filterable: {
     operators: _properties.operators.string

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

@@ -42,6 +42,7 @@ var integer = {
       'x-validator': 'integer'
     }
   },
+  hasDefaultValue: true,
   properties: _objectSpread({}, _properties.defaultProps),
   filterable: {
     operators: _properties.operators.number

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

@@ -29,6 +29,7 @@ var markdown = {
       'x-component': 'Markdown'
     }
   },
+  hasDefaultValue: true,
   properties: _objectSpread({}, _properties.defaultProps),
   schemaInitialize: function schemaInitialize(schema, _ref) {
     var block = _ref.block;

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

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

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

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

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

@@ -31,6 +31,7 @@ var password = {
       'x-component': 'Password'
     }
   },
+  hasDefaultValue: true,
   properties: _objectSpread({}, _properties.defaultProps),
   validateSchema: function validateSchema(fieldSchema) {
     return {

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

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

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

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

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

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

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

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

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/locale/zh_CN.d.ts

@@ -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;

package/lib/locale/zh_CN.js

@@ -257,6 +257,8 @@ var _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": "不早于",

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

@@ -75,7 +75,7 @@ var FormItem = function FormItem(props) {
 exports.FormItem = FormItem;
 
 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 = (0, _collectionManager.useCollectionManager)(),
       getCollectionFields = _useCollectionManager.getCollectionFields,
@@ -387,6 +387,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__*/_react2.default.createElement(_schemaSettings.SchemaSettings.ModalItem, {
+    title: t('Set default value'),
+    components: {
+      ArrayCollapse: _antd.ArrayCollapse,
+      FormLayout: _antd.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__*/_react2.default.createElement(_schemaSettings.SchemaSettings.SelectItem, {
     title: t('Field component'),
     options: (collectionField === null || collectionField === void 0 ? void 0 : collectionField.interface) === 'o2m' ? [{
@@ -495,11 +527,11 @@ 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$uiSc4, _collectionField$uiSc5;
+      var _collectionField$uiSc5, _collectionField$uiSc6;
 
       var schema = _defineProperty({}, 'x-uid', fieldSchema['x-uid']);
 
-      var fieldNames = _objectSpread(_objectSpread(_objectSpread({}, collectionField === null || collectionField === void 0 ? void 0 : (_collectionField$uiSc4 = collectionField.uiSchema) === null || _collectionField$uiSc4 === void 0 ? void 0 : (_collectionField$uiSc5 = _collectionField$uiSc4['x-component-props']) === null || _collectionField$uiSc5 === void 0 ? void 0 : _collectionField$uiSc5['fieldNames']), 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
       });
 

package/lib/schema-settings/SchemaSettings.js

@@ -578,6 +578,8 @@ SchemaSettings.Remove = function (props) {
   var _useTranslation3 = (0, _reactI18next.useTranslation)(),
       t = _useTranslation3.t;
 
+  var field = (0, _react.useField)();
+  var fieldSchema = (0, _react.useFieldSchema)();
   var ctx = (0, _BlockTemplate.useBlockTemplateContext)();
   return /*#__PURE__*/_react2.default.createElement(SchemaSettings.Item, {
     onClick: function onClick() {
@@ -591,6 +593,11 @@ SchemaSettings.Remove = function (props) {
             breakRemoveOn: breakRemoveOn
           };
 
+          if (field && field.required) {
+            field.required = false;
+            fieldSchema['required'] = false;
+          }
+
           if (template && (ctx === null || ctx === void 0 ? void 0 : ctx.dn)) {
             ctx === null || ctx === void 0 ? void 0 : ctx.dn.remove(null, options);
           } else {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/client",
-  "version": "0.7.4-alpha.1",
+  "version": "0.7.4-alpha.4",
   "license": "Apache-2.0",
   "licenses": [
     {
@@ -19,8 +19,8 @@
     "@formily/antd": "2.0.20",
     "@formily/core": "2.0.20",
     "@formily/react": "2.0.20",
-    "@nocobase/sdk": "0.7.4-alpha.1",
-    "@nocobase/utils": "0.7.4-alpha.1",
+    "@nocobase/sdk": "0.7.4-alpha.4",
+    "@nocobase/utils": "0.7.4-alpha.4",
     "ahooks": "^3.0.5",
     "antd": "~4.19.5",
     "axios": "^0.26.1",
@@ -55,5 +55,5 @@
     "@types/marked": "^4.0.1",
     "axios-mock-adapter": "^1.20.0"
   },
-  "gitHead": "543eb1c0308bb72a5ba54f208586cd78bfda8fa9"
+  "gitHead": "726c06b721b217a6aa5c1421b899d1315e552b57"
 }