@nocobase/client 0.7.0-alpha.82 → 0.7.1-alpha.4

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

@@ -49,7 +49,7 @@ var useOptions = function useOptions() {
 };
 
 var CalendarDesigner = function CalendarDesigner() {
-  var _fieldSchema$xDecora, _fieldSchema$xDecora$, _fieldSchema$xDecora2;
+  var _fieldSchema$xDecora, _fieldSchema$xDecora$, _fieldSchema$xDecora2, _fieldSchema$xDecora3;
 
   var field = (0, _react.useField)();
   var fieldSchema = (0, _react.useFieldSchema)();
@@ -76,10 +76,11 @@ var CalendarDesigner = function CalendarDesigner() {
   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, {
     template: template,
     title: title || name
-  }, /*#__PURE__*/_react2.default.createElement(_schemaSettings.SchemaSettings.SelectItem, {
+  }, /*#__PURE__*/_react2.default.createElement(_schemaSettings.SchemaSettings.BlockTitleItem, null), /*#__PURE__*/_react2.default.createElement(_schemaSettings.SchemaSettings.SelectItem, {
     title: t('Title field'),
     value: fieldNames.title,
     options: options,
@@ -164,7 +165,8 @@ var CalendarDesigner = function CalendarDesigner() {
     }
   }), /*#__PURE__*/_react2.default.createElement(_schemaSettings.SchemaSettings.Divider, null), /*#__PURE__*/_react2.default.createElement(_schemaSettings.SchemaSettings.Template, {
     componentName: 'Calendar',
-    collectionName: name
+    collectionName: name,
+    resourceName: defaultResource
   }), /*#__PURE__*/_react2.default.createElement(_schemaSettings.SchemaSettings.Divider, null), /*#__PURE__*/_react2.default.createElement(_schemaSettings.SchemaSettings.Remove, {
     removeParentsIfNoChildren: true,
     breakRemoveOn: {

package/lib/schema-component/antd/cascader/Cascader.js

@@ -118,7 +118,7 @@ var Cascader = (0, _react.connect)(function (props) {
     fieldNames: fieldNames,
     displayRender: displayRender,
     onChange: function onChange(value, selectedOptions) {
-      if (labelInValue) {
+      if (value && labelInValue) {
         _onChange(selectedOptions.map(function (option) {
           return (0, _lodash.omit)(option, [fieldNames.children]);
         }));

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

@@ -33,8 +33,9 @@ ReadPretty.DatePicker = function (props) {
   var prefixCls = (0, _builtins__.usePrefixCls)('description-date-picker', props);
 
   var getLabels = function getLabels() {
-    var d = (0, _moment.default)(props.value);
-    var labels = (0, _builtins__.formatMomentValue)(d.isValid() ? d : null, (0, _util.getDefaultFormat)(props), props.placeholder);
+    var format = (0, _util.getDefaultFormat)(props);
+    var m = (0, _util.str2moment)(props.value, props);
+    var labels = _moment.default.isMoment(m) ? m.format(format) : '';
     return (0, _shared.isArr)(labels) ? labels.join('~') : labels;
   };
 
@@ -45,9 +46,18 @@ ReadPretty.DatePicker = function (props) {
 
 ReadPretty.DateRangePicker = function (props) {
   var prefixCls = (0, _builtins__.usePrefixCls)('description-text', props);
+  var format = (0, _util.getDefaultFormat)(props);
 
   var getLabels = function getLabels() {
-    var labels = (0, _builtins__.formatMomentValue)(props.value, props.format, props.placeholder);
+    var m = (0, _util.str2moment)(props.value, props);
+
+    if (!m) {
+      return '';
+    }
+
+    var labels = m.map(function (m) {
+      return m.format(format);
+    });
     return (0, _shared.isArr)(labels) ? labels.join('~') : labels;
   };
 

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

@@ -1,6 +1,18 @@
 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<import("moment").Moment> | (string | import("rc-picker/lib/interface").CustomFormat<import("moment").Moment>)[];
+}) => 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/lib/schema-component/antd/date-picker/util.js

@@ -3,9 +3,11 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.mapDateFormat = exports.getDefaultFormat = void 0;
+exports.str2moment = exports.moment2str = exports.mapDateFormat = exports.getDefaultFormat = void 0;
 
-var _builtins__ = require("@formily/antd/lib/__builtins__");
+var _moment = _interopRequireDefault(require("moment"));
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 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; }
 
@@ -13,6 +15,118 @@ 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 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.default.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';
+  }
+
+  if (picker === 'month') {
+    return value.format('YYYY-MM') + '-01T00:00:00.000Z';
+  }
+
+  if (picker === 'quarter') {
+    return value.format('YYYY-MM') + '-01T00:00:00.000Z';
+  }
+
+  if (picker === 'week') {
+    return value.format('YYYY-MM-DD') + 'T00:00:00.000Z';
+  }
+
+  return value.format('YYYY-MM-DD') + 'T00:00:00.000Z';
+};
+
+var toGmtByPicker = function toGmtByPicker(value, picker) {
+  if (!value) {
+    return value;
+  }
+
+  if (Array.isArray(value)) {
+    return value.map(function (val) {
+      return toStringByPicker(val, picker);
+    });
+  }
+
+  if (_moment.default.isMoment(value)) {
+    return toStringByPicker(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.default.isMoment(value)) {
+    return value.toISOString();
+  }
+};
+
+var toMoment = function toMoment(val, options) {
+  if (_moment.default.isMoment(val)) {
+    return val;
+  }
+
+  var gmt = options.gmt,
+      picker = options.picker;
+
+  if (gmt || picker) {
+    val = val.replace('T', ' ').replace('Z', '');
+    return (0, _moment.default)(val);
+  }
+
+  return (0, _moment.default)(val);
+};
+
+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;
+};
+
+exports.str2moment = str2moment;
+
+var moment2str = function moment2str(value) {
+  var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+  var showTime = options.showTime,
+      gmt = options.gmt,
+      picker = options.picker;
+
+  if (!value) {
+    return value;
+  }
+
+  if (showTime) {
+    return gmt ? toGmt(value) : toLocal(value);
+  }
+
+  return toGmtByPicker(value, picker);
+};
+
+exports.moment2str = moment2str;
+
 var getDefaultFormat = function getDefaultFormat(props) {
   if (props.format) {
     return props.format;
@@ -47,10 +161,10 @@ var mapDateFormat = function mapDateFormat() {
     var _onChange = props.onChange;
     return _objectSpread(_objectSpread({}, props), {}, {
       format: format,
-      value: (0, _builtins__.momentable)(props.value, format === 'YYYY-wo' ? 'YYYY-w' : format),
+      value: str2moment(props.value, props),
       onChange: function onChange(value) {
         if (_onChange) {
-          _onChange((0, _builtins__.formatMomentValue)(value, format));
+          _onChange(moment2str(value, props));
         }
       }
     });

package/lib/schema-component/antd/filter/FilterItem.js

@@ -15,6 +15,8 @@ var _antd = require("antd");
 
 var _react2 = _interopRequireWildcard(require("react"));
 
+var _reactI18next = require("react-i18next");
+
 var _ = require("../..");
 
 var _context = require("./context");
@@ -28,6 +30,9 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "functio
 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 FilterItem = (0, _react.observer)(function (props) {
+  var _useTranslation = (0, _reactI18next.useTranslation)(),
+      t = _useTranslation.t;
+
   var compile = (0, _.useCompile)();
   var remove = (0, _react2.useContext)(_context.RemoveConditionContext);
 
@@ -52,24 +57,20 @@ var FilterItem = (0, _react.observer)(function (props) {
       value: 'name',
       children: 'children'
     },
-    style: {
-      width: 150
-    },
     changeOnSelect: false,
     value: dataIndex,
     options: compile(fields),
     onChange: function onChange(value) {
       setDataIndex(value);
-    }
+    },
+    placeholder: t('Select Field')
   }), /*#__PURE__*/_react2.default.createElement(_antd.Select, {
     value: operator === null || operator === void 0 ? void 0 : operator.value,
     options: compile(operators),
     onChange: function onChange(value) {
       setOperator(value);
     },
-    style: {
-      minWidth: 100
-    }
+    placeholder: t('Comparison')
   }), !(operator === null || operator === void 0 ? void 0 : operator.noValue) && /*#__PURE__*/_react2.default.createElement(_DynamicComponent.DynamicComponent, {
     value: value,
     schema: schema,

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

@@ -17,6 +17,8 @@ var _reactI18next = require("react-i18next");
 
 var _ = require("../..");
 
+var _blockProvider = require("../../../block-provider");
+
 var _collectionManager = require("../../../collection-manager");
 
 var _schemaSettings = require("../../../schema-settings");
@@ -42,7 +44,7 @@ var FormItem = function FormItem(props) {
   return /*#__PURE__*/_react2.default.createElement(_blockItem.BlockItem, {
     className: 'nb-form-item'
   }, /*#__PURE__*/_react2.default.createElement(_antd.FormItem, _objectSpread(_objectSpread({
-    className: "".concat((0, _css.css)(_templateObject || (_templateObject = _taggedTemplateLiteral(["& .ant-space{\n        flex-wrap:wrap;\n      }"]))))
+    className: "".concat((0, _css.css)(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n          & .ant-space {\n            flex-wrap: wrap;\n          }\n        "]))))
   }, props), {}, {
     extra: field.description ? /*#__PURE__*/_react2.default.createElement("div", {
       dangerouslySetInnerHTML: {
@@ -63,6 +65,9 @@ FormItem.Designer = function () {
   var _useCollection = (0, _collectionManager.useCollection)(),
       getField = _useCollection.getField;
 
+  var _useFormBlockContext = (0, _blockProvider.useFormBlockContext)(),
+      form = _useFormBlockContext.form;
+
   var field = (0, _react.useField)();
   var fieldSchema = (0, _react.useFieldSchema)();
 
@@ -95,7 +100,18 @@ FormItem.Designer = function () {
       label: compile(field === null || field === void 0 ? void 0 : (_field$uiSchema = field.uiSchema) === null || _field$uiSchema === void 0 ? void 0 : _field$uiSchema.title) || (field === null || field === void 0 ? void 0 : field.name)
     };
   });
+  var readOnlyMode = 'editable';
+
+  if (fieldSchema['x-disabled'] === true) {
+    readOnlyMode = 'readonly';
+  }
+
+  if (fieldSchema['x-read-pretty'] === true) {
+    readOnlyMode = 'read-pretty';
+  }
+
   return /*#__PURE__*/_react2.default.createElement(_schemaSettings.GeneralSchemaDesigner, null, collectionField && /*#__PURE__*/_react2.default.createElement(_schemaSettings.SchemaSettings.ModalItem, {
+    key: "edit-field-title",
     title: t('Edit field title'),
     schema: {
       type: 'object',
@@ -128,6 +144,7 @@ FormItem.Designer = function () {
       dn.refresh();
     }
   }), !field.readPretty && /*#__PURE__*/_react2.default.createElement(_schemaSettings.SchemaSettings.ModalItem, {
+    key: "edit-description",
     title: t('Edit description'),
     schema: {
       type: 'object',
@@ -155,6 +172,7 @@ FormItem.Designer = function () {
       dn.refresh();
     }
   }), field.readPretty && /*#__PURE__*/_react2.default.createElement(_schemaSettings.SchemaSettings.ModalItem, {
+    key: "edit-tooltip",
     title: t('Edit tooltip'),
     schema: {
       type: 'object',
@@ -182,6 +200,7 @@ FormItem.Designer = function () {
       dn.refresh();
     }
   }), !field.readPretty && /*#__PURE__*/_react2.default.createElement(_schemaSettings.SchemaSettings.SwitchItem, {
+    key: "required",
     title: t('Required'),
     checked: field.required,
     onChange: function onChange(required) {
@@ -195,7 +214,67 @@ FormItem.Designer = function () {
       });
       refresh();
     }
+  }), form && !(form === null || form === void 0 ? void 0 : form.readPretty) && (collectionField === null || collectionField === void 0 ? void 0 : collectionField.interface) !== 'o2m' && /*#__PURE__*/_react2.default.createElement(_schemaSettings.SchemaSettings.SelectItem, {
+    key: "pattern",
+    title: t('Pattern'),
+    options: [{
+      label: t('Editable'),
+      value: 'editable'
+    }, {
+      label: t('Readonly'),
+      value: 'readonly'
+    }, {
+      label: t('Easy-reading'),
+      value: 'read-pretty'
+    }],
+    value: readOnlyMode,
+    onChange: function onChange(v) {
+      console.log('v', v);
+
+      var schema = _defineProperty({}, 'x-uid', fieldSchema['x-uid']);
+
+      switch (v) {
+        case 'readonly':
+          {
+            fieldSchema['x-read-pretty'] = false;
+            fieldSchema['x-disabled'] = true;
+            schema['x-read-pretty'] = false;
+            schema['x-disabled'] = true;
+            field.readPretty = false;
+            field.disabled = true;
+            break;
+          }
+
+        case 'read-pretty':
+          {
+            fieldSchema['x-read-pretty'] = true;
+            fieldSchema['x-disabled'] = false;
+            schema['x-read-pretty'] = true;
+            schema['x-disabled'] = false;
+            field.readPretty = true; // field.disabled = true;
+
+            break;
+          }
+
+        default:
+          {
+            fieldSchema['x-read-pretty'] = false;
+            fieldSchema['x-disabled'] = false;
+            schema['x-read-pretty'] = false;
+            schema['x-disabled'] = false;
+            field.readPretty = false;
+            field.disabled = false;
+            break;
+          }
+      }
+
+      dn.emit('patch', {
+        schema: schema
+      });
+      dn.refresh();
+    }
   }), (collectionField === null || collectionField === void 0 ? void 0 : collectionField.target) && /*#__PURE__*/_react2.default.createElement(_schemaSettings.SchemaSettings.SelectItem, {
+    key: "title-field",
     title: t('Title field'),
     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,
@@ -218,6 +297,7 @@ FormItem.Designer = function () {
       dn.refresh();
     }
   }), collectionField && /*#__PURE__*/_react2.default.createElement(_schemaSettings.SchemaSettings.Divider, null), /*#__PURE__*/_react2.default.createElement(_schemaSettings.SchemaSettings.Remove, {
+    key: "remove",
     removeParentsIfNoChildren: true,
     confirm: {
       title: t('Delete field')

package/lib/schema-component/antd/form-v2/Form.Designer.js

@@ -38,6 +38,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; }
 
 var FormDesigner = function FormDesigner() {
+  var _fieldSchema$xDecora;
+
   var _useCollection = (0, _collectionManager.useCollection)(),
       name = _useCollection.name,
       title = _useCollection.title;
@@ -56,12 +58,14 @@ var FormDesigner = function FormDesigner() {
   var _useActionContext = (0, _action.useActionContext)(),
       visible = _useActionContext.visible;
 
+  var defaultResource = fieldSchema === null || fieldSchema === void 0 ? void 0 : (_fieldSchema$xDecora = fieldSchema['x-decorator-props']) === null || _fieldSchema$xDecora === void 0 ? void 0 : _fieldSchema$xDecora.resource;
   return /*#__PURE__*/_react2.default.createElement(_schemaSettings.GeneralSchemaDesigner, {
     template: template,
     title: title || name
-  }, /*#__PURE__*/_react2.default.createElement(_schemaSettings.SchemaSettings.FormItemTemplate, {
+  }, /*#__PURE__*/_react2.default.createElement(_schemaSettings.SchemaSettings.BlockTitleItem, null), /*#__PURE__*/_react2.default.createElement(_schemaSettings.SchemaSettings.FormItemTemplate, {
     componentName: 'FormItem',
-    collectionName: name
+    collectionName: name,
+    resourceName: defaultResource
   }), /*#__PURE__*/_react2.default.createElement(_schemaSettings.SchemaSettings.Divider, null), /*#__PURE__*/_react2.default.createElement(_schemaSettings.SchemaSettings.Remove, {
     removeParentsIfNoChildren: true,
     breakRemoveOn: {
@@ -73,18 +77,23 @@ var FormDesigner = function FormDesigner() {
 exports.FormDesigner = FormDesigner;
 
 var ReadPrettyFormDesigner = function ReadPrettyFormDesigner() {
+  var _fieldSchema$xDecora2;
+
   var _useCollection2 = (0, _collectionManager.useCollection)(),
       name = _useCollection2.name,
       title = _useCollection2.title;
 
   var template = (0, _schemaTemplates.useSchemaTemplate)();
+  var fieldSchema = (0, _react.useFieldSchema)();
+  var defaultResource = fieldSchema === null || fieldSchema === void 0 ? void 0 : (_fieldSchema$xDecora2 = fieldSchema['x-decorator-props']) === null || _fieldSchema$xDecora2 === void 0 ? void 0 : _fieldSchema$xDecora2.resource;
   return /*#__PURE__*/_react2.default.createElement(_schemaSettings.GeneralSchemaDesigner, {
     template: template,
     title: title || name
-  }, /*#__PURE__*/_react2.default.createElement(_schemaSettings.SchemaSettings.FormItemTemplate, {
+  }, /*#__PURE__*/_react2.default.createElement(_schemaSettings.SchemaSettings.BlockTitleItem, null), /*#__PURE__*/_react2.default.createElement(_schemaSettings.SchemaSettings.FormItemTemplate, {
     insertAdjacentPosition: 'beforeEnd',
     componentName: 'ReadPrettyFormItem',
-    collectionName: name
+    collectionName: name,
+    resourceName: defaultResource
   }), /*#__PURE__*/_react2.default.createElement(_schemaSettings.SchemaSettings.Divider, null), /*#__PURE__*/_react2.default.createElement(_schemaSettings.SchemaSettings.Remove, {
     removeParentsIfNoChildren: true,
     breakRemoveOn: {
@@ -96,7 +105,7 @@ var ReadPrettyFormDesigner = function ReadPrettyFormDesigner() {
 exports.ReadPrettyFormDesigner = ReadPrettyFormDesigner;
 
 var DetailsDesigner = function DetailsDesigner() {
-  var _fieldSchema$xDecora, _fieldSchema$xDecora$, _fieldSchema$xDecora2, _fieldSchema$xDecora3;
+  var _fieldSchema$xDecora3, _fieldSchema$xDecora4, _fieldSchema$xDecora5, _fieldSchema$xDecora6, _fieldSchema$xDecora7;
 
   var _useCollection3 = (0, _collectionManager.useCollection)(),
       name = _useCollection3.name,
@@ -118,8 +127,9 @@ var DetailsDesigner = function DetailsDesigner() {
       dn = _useDesignable2.dn;
 
   var sortFields = (0, _actionHooks.useSortFields)(name);
-  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 defaultSort = (fieldSchema === null || fieldSchema === void 0 ? void 0 : (_fieldSchema$xDecora2 = fieldSchema['x-decorator-props']) === null || _fieldSchema$xDecora2 === void 0 ? void 0 : (_fieldSchema$xDecora3 = _fieldSchema$xDecora2.params) === null || _fieldSchema$xDecora3 === void 0 ? void 0 : _fieldSchema$xDecora3.sort) || [];
+  var defaultFilter = (fieldSchema === null || fieldSchema === void 0 ? void 0 : (_fieldSchema$xDecora3 = fieldSchema['x-decorator-props']) === null || _fieldSchema$xDecora3 === void 0 ? void 0 : (_fieldSchema$xDecora4 = _fieldSchema$xDecora3.params) === null || _fieldSchema$xDecora4 === void 0 ? void 0 : _fieldSchema$xDecora4.filter) || {};
+  var defaultSort = (fieldSchema === null || fieldSchema === void 0 ? void 0 : (_fieldSchema$xDecora5 = fieldSchema['x-decorator-props']) === null || _fieldSchema$xDecora5 === void 0 ? void 0 : (_fieldSchema$xDecora6 = _fieldSchema$xDecora5.params) === null || _fieldSchema$xDecora6 === void 0 ? void 0 : _fieldSchema$xDecora6.sort) || [];
+  var defaultResource = fieldSchema === null || fieldSchema === void 0 ? void 0 : (_fieldSchema$xDecora7 = fieldSchema['x-decorator-props']) === null || _fieldSchema$xDecora7 === void 0 ? void 0 : _fieldSchema$xDecora7.resource;
   var sort = defaultSort === null || defaultSort === void 0 ? void 0 : defaultSort.map(function (item) {
     return item.startsWith('-') ? {
       field: item.substring(1),
@@ -132,7 +142,7 @@ var DetailsDesigner = function DetailsDesigner() {
   return /*#__PURE__*/_react2.default.createElement(_schemaSettings.GeneralSchemaDesigner, {
     template: template,
     title: title || name
-  }, /*#__PURE__*/_react2.default.createElement(_schemaSettings.SchemaSettings.ModalItem, {
+  }, /*#__PURE__*/_react2.default.createElement(_schemaSettings.SchemaSettings.BlockTitleItem, null), /*#__PURE__*/_react2.default.createElement(_schemaSettings.SchemaSettings.ModalItem, {
     title: t('Set the data scope'),
     schema: {
       type: 'object',
@@ -253,7 +263,8 @@ var DetailsDesigner = function DetailsDesigner() {
     }
   }), /*#__PURE__*/_react2.default.createElement(_schemaSettings.SchemaSettings.Template, {
     componentName: 'Details',
-    collectionName: name
+    collectionName: name,
+    resourceName: defaultResource
   }), /*#__PURE__*/_react2.default.createElement(_schemaSettings.SchemaSettings.Divider, null), /*#__PURE__*/_react2.default.createElement(_schemaSettings.SchemaSettings.Remove, {
     removeParentsIfNoChildren: true,
     breakRemoveOn: {

package/lib/schema-component/antd/form-v2/Form.js

@@ -13,7 +13,7 @@ var _core = require("@formily/core");
 
 var _react = require("@formily/react");
 
-var _utils = require("@nocobase/utils");
+var _shared = require("@formily/shared");
 
 var _antd2 = require("antd");
 
@@ -106,7 +106,7 @@ var WithForm = function WithForm(props) {
       setFormValueChanged = _useActionContext.setFormValueChanged;
 
   (0, _react2.useEffect)(function () {
-    var id = (0, _utils.uid)();
+    var id = (0, _shared.uid)();
     form.addEffects(id, function () {
       (0, _core.onFormInputChange)(function (form) {
         setFormValueChanged === null || setFormValueChanged === void 0 ? void 0 : setFormValueChanged(true);
@@ -129,7 +129,7 @@ var WithoutForm = function WithoutForm(props) {
     return (0, _core.createForm)({
       effects: function effects() {
         (0, _core.onFormInputChange)(function (form) {
-          setFormValueChanged(true);
+          setFormValueChanged === null || setFormValueChanged === void 0 ? void 0 : setFormValueChanged(true);
         });
       }
     });

package/lib/schema-component/antd/formula-input/Compute.d.ts

@@ -0,0 +1,3 @@
+import React from 'react';
+export declare const Compute: React.ForwardRefExoticComponent<Pick<Partial<any>, string | number | symbol> & React.RefAttributes<unknown>>;
+export default Compute;

package/lib/schema-component/antd/formula-input/Compute.js

@@ -0,0 +1,79 @@
+"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 = exports.Compute = void 0;
+
+var _core = require("@formily/core");
+
+var _react = require("@formily/react");
+
+var _antd = require("antd");
+
+var _lodash = _interopRequireDefault(require("lodash"));
+
+var math = _interopRequireWildcard(require("mathjs"));
+
+var _react2 = _interopRequireDefault(require("react"));
+
+var _hooks = require("../../../collection-manager/hooks");
+
+var _ReadPretty = require("../input-number/ReadPretty");
+
+var _excluded = ["onChange"];
+
+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; }
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+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 _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; }
+
+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; }
+
+var AntdCompute = function AntdCompute(props) {
+  var onChange = props.onChange,
+      others = _objectWithoutProperties(props, _excluded);
+
+  var _useCollection = (0, _hooks.useCollection)(),
+      getField = _useCollection.getField;
+
+  var fieldSchema = (0, _react.useFieldSchema)();
+  var options = getField(fieldSchema.name);
+  var expression = options.expression;
+  (0, _react.useFormEffects)(function () {
+    (0, _core.onFormValuesChange)(function (form) {
+      var scope = _lodash.default.cloneDeep(form.values);
+
+      var result;
+
+      try {
+        result = math.evaluate(expression, scope);
+        result = math.round(result, 9);
+      } catch (_unused) {}
+
+      if (onChange) {
+        onChange(result);
+      }
+    });
+  });
+  return /*#__PURE__*/_react2.default.createElement(_antd.InputNumber, _objectSpread(_objectSpread({}, others), {}, {
+    readOnly: true,
+    stringMode: true
+  }));
+};
+
+var Compute = (0, _react.connect)(AntdCompute, (0, _react.mapReadPretty)(_ReadPretty.ReadPretty));
+exports.Compute = Compute;
+var _default = Compute;
+exports.default = _default;

package/lib/schema-component/antd/formula-input/FormulaInput.d.ts

@@ -0,0 +1,3 @@
+import React from 'react';
+export declare const FormulaInput: React.ForwardRefExoticComponent<Pick<Partial<any>, string | number | symbol> & React.RefAttributes<unknown>>;
+export default FormulaInput;