@nocobase/client 0.9.2-alpha.2 → 0.9.2-alpha.4

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

@@ -31,7 +31,7 @@ var findOption = function findOption() {
   var options = arguments.length > 1 ? arguments[1] : undefined;
   var items = options;
   var option;
-  dataIndex === null || dataIndex === void 0 ? void 0 : (_dataIndex$forEach = dataIndex.forEach) === null || _dataIndex$forEach === void 0 ? void 0 : _dataIndex$forEach.call(dataIndex, function (name, index) {
+  dataIndex === null || dataIndex === void 0 ? void 0 : (_dataIndex$forEach = dataIndex.forEach) === null || _dataIndex$forEach === void 0 ? void 0 : _dataIndex$forEach.call(dataIndex, function (name) {
     var item = items.find(function (item) {
       return item.name === name;
     });
@@ -44,9 +44,8 @@ var findOption = function findOption() {
 };
 var useValues = function useValues() {
   var field = (0, _react.useField)();
-  var logic = (0, _react2.useContext)(_context.FilterLogicContext);
-  var _useContext = (0, _react2.useContext)(_context.FilterContext),
-    options = _useContext.options;
+  var _ref = (0, _react2.useContext)(_context.FilterContext) || {},
+    options = _ref.options;
   var data2value = function data2value() {
     var _field$data$dataIndex, _field$data, _field$data$operator, _field$data2;
     field.value = _flat.default.unflatten(_defineProperty({}, "".concat((_field$data$dataIndex = field.data.dataIndex) === null || _field$data$dataIndex === void 0 ? void 0 : _field$data$dataIndex.join('.'), ".").concat((_field$data = field.data) === null || _field$data === void 0 ? void 0 : (_field$data$operator = _field$data.operator) === null || _field$data$operator === void 0 ? void 0 : _field$data$operator.value), (_field$data2 = field.data) === null || _field$data2 === void 0 ? void 0 : _field$data2.value));
@@ -56,7 +55,7 @@ var useValues = function useValues() {
     field.data = field.data || {};
     var values = (0, _flat.default)(field.value);
     var path = Object.keys(values).shift() || '';
-    if (!path) {
+    if (!path || !options) {
       return;
     }
     var _path$split = path.split('.$'),
@@ -80,10 +79,10 @@ var useValues = function useValues() {
     field.data.schema = (0, _shared.merge)(option === null || option === void 0 ? void 0 : option.schema, operator === null || operator === void 0 ? void 0 : operator.schema);
     field.data.value = (0, _get.default)(field.value, "".concat(fieldPath, ".$").concat(operatorValue));
   };
-  (0, _react2.useEffect)(value2data, [logic]);
+  (0, _react2.useEffect)(value2data, [field.path.entire]);
   return _objectSpread(_objectSpread({
     fields: options
-  }, field.data), {}, {
+  }, (field === null || field === void 0 ? void 0 : field.data) || {}), {}, {
     setDataIndex: function setDataIndex(dataIndex) {
       var _option$operators;
       var option = findOption(dataIndex, options);

package/lib/schema-component/antd/form-item/FormItem.d.ts

@@ -1 +1,4 @@
+import { ISchema } from '@formily/react';
+import { CollectionFieldOptions } from '../../../collection-manager';
 export declare const FormItem: any;
+export declare function getFieldDefaultValue(fieldSchema: ISchema, collectionField: CollectionFieldOptions): any;

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

@@ -1,39 +1,47 @@
 "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.FormItem = void 0;
+exports.getFieldDefaultValue = getFieldDefaultValue;
 var _css = require("@emotion/css");
 var _antd = require("@formily/antd");
 var _react = require("@formily/react");
 var _shared = require("@formily/shared");
 var _lodash = _interopRequireDefault(require("lodash"));
+var _moment = _interopRequireDefault(require("moment"));
 var _react2 = _interopRequireWildcard(require("react"));
 var _reactI18next = require("react-i18next");
 var _ACLProvider = require("../../../acl/ACLProvider");
 var _blockProvider = require("../../../block-provider");
 var _collectionManager = require("../../../collection-manager");
+var _CollectionFields = require("../../../collection-manager/Configuration/CollectionFields");
 var _schemaSettings = require("../../../schema-settings");
+var _VariableInput = require("../../../schema-settings/VariableInput/VariableInput");
+var _uitls = require("../../common/utils/uitls");
+var _core = require("../../core");
 var _hooks = require("../../hooks");
 var _blockItem = require("../block-item");
 var _shared2 = require("../input/shared");
+var _variable = require("../variable");
 var _FormItem = require("./FormItem.FilterFormDesigner");
 var _SchemaSettingOptions = require("./SchemaSettingOptions");
-var _templateObject;
+var _templateObject, _templateObject2;
 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 _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); }
 function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
 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; }
-function _taggedTemplateLiteral(strings, raw) { if (!raw) { raw = strings.slice(0); } return Object.freeze(Object.defineProperties(strings, { raw: { value: Object.freeze(raw) } })); }
 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) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
 function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
+function _taggedTemplateLiteral(strings, raw) { if (!raw) { raw = strings.slice(0); } return Object.freeze(Object.defineProperties(strings, { raw: { value: Object.freeze(raw) } })); }
+var defaultInputStyle = (0, _css.css)(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  & > .nb-form-item {\n    flex: 1;\n  }\n"])));
 var divWrap = function divWrap(schema) {
   return {
     type: 'void',
@@ -49,17 +57,23 @@ var FormItem = (0, _react.observer)(function (props) {
   var field = (0, _react.useField)();
   var ctx = (0, _react2.useContext)(_blockProvider.BlockRequestContext);
   var schema = (0, _react.useFieldSchema)();
+  var variablesCtx = (0, _uitls.useVariablesCtx)();
   (0, _react2.useEffect)(function () {
     if ((ctx === null || ctx === void 0 ? void 0 : ctx.block) === 'form') {
       ctx.field.data = ctx.field.data || {};
       ctx.field.data.activeFields = ctx.field.data.activeFields || new Set();
       ctx.field.data.activeFields.add(schema.name);
+      // 如果默认值是一个变量，则需要解析之后再显示出来
+      if ((0, _uitls.isVariable)(schema === null || schema === void 0 ? void 0 : schema.default)) {
+        var _field$setInitialValu;
+        (_field$setInitialValu = field.setInitialValue) === null || _field$setInitialValu === void 0 ? void 0 : _field$setInitialValu.call(field, (0, _uitls.parseVariables)(schema.default, variablesCtx));
+      }
     }
   }, []);
   return /*#__PURE__*/_react2.default.createElement(_ACLProvider.ACLCollectionFieldProvider, null, /*#__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(["\n            & .ant-space {\n              flex-wrap: wrap;\n            }\n          "]))))
+    className: "".concat((0, _css.css)(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\n            & .ant-space {\n              flex-wrap: wrap;\n            }\n          "]))))
   }, props), {}, {
     extra: typeof field.description === 'string' ? /*#__PURE__*/_react2.default.createElement("div", {
       dangerouslySetInnerHTML: {
@@ -69,8 +83,8 @@ var FormItem = (0, _react.observer)(function (props) {
   }))));
 });
 exports.FormItem = FormItem;
-FormItem.Designer = function () {
-  var _interfaceConfig$vali, _collectionField$uiSc, _getCollectionFields, _collectionField$uiSc2, _fieldSchema$xDecora, _fieldSchema$xCompon, _fieldSchema$xCompon2, _collectionField$uiSc4, _fieldSchema$xCompon3, _fieldSchema$xCompon4, _fieldSchema$xCompon5, _field$componentProps, _field$componentProps2;
+FormItem.Designer = function Designer() {
+  var _interfaceConfig$vali, _collectionField$uiSc, _getCollectionFields, _collectionField$uiSc2, _fieldSchema$xDecora, _fieldSchema$xCompon, _fieldSchema$xCompon2, _fieldSchema$xCompon3, _fieldSchema$xCompon4, _fieldSchema$xCompon5, _field$componentProps, _field$componentProps2;
   var _useCollectionManager = (0, _collectionManager.useCollectionManager)(),
     getCollectionFields = _useCollectionManager.getCollectionFields,
     getInterface = _useCollectionManager.getInterface,
@@ -90,6 +104,7 @@ FormItem.Designer = function () {
     refresh = _useDesignable.refresh,
     insertAdjacent = _useDesignable.insertAdjacent;
   var compile = (0, _hooks.useCompile)();
+  var variablesCtx = (0, _uitls.useVariablesCtx)();
   var collectionField = getField(fieldSchema['name']) || getCollectionJoinField(fieldSchema['x-collection-field']);
   var targetCollection = getCollection(collectionField === null || collectionField === void 0 ? void 0 : collectionField.target);
   var interfaceConfig = getInterface(collectionField === null || collectionField === void 0 ? void 0 : collectionField.interface);
@@ -105,7 +120,7 @@ FormItem.Designer = function () {
     initialValue['required'] = field.required;
   }
   var options = targetFields.filter(function (field) {
-    return !(field === null || field === void 0 ? void 0 : field.target) && field.type !== 'boolean';
+    return (0, _CollectionFields.isTitleField)(field);
   }).map(function (field) {
     var _field$uiSchema;
     return {
@@ -386,28 +401,72 @@ FormItem.Designer = function () {
       });
       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, {
+  }), form && !(form === null || form === void 0 ? void 0 : form.readPretty) && (0, _schemaSettings.isShowDefaultValue)(collectionField, getInterface) && !(0, _schemaSettings.isPatternDisabled)(fieldSchema) && /*#__PURE__*/_react2.default.createElement(_schemaSettings.SchemaSettings.ModalItem, {
     title: t('Set default value'),
     components: {
       ArrayCollapse: _antd.ArrayCollapse,
-      FormLayout: _antd.FormLayout
+      FormLayout: _antd.FormLayout,
+      VariableInput: _VariableInput.VariableInput
     },
+    width: 800,
     schema: {
       type: 'object',
       title: t('Set default value'),
       properties: {
-        default: _objectSpread(_objectSpread({}, collectionField === null || collectionField === void 0 ? void 0 : collectionField.uiSchema), {}, {
+        default: (0, _variable.isInvariable)(interfaceConfig) ? _objectSpread(_objectSpread({}, fieldSchema || {}), {}, {
+          'x-decorator': 'FormItem',
+          'x-component-props': _objectSpread(_objectSpread({}, fieldSchema['x-component-props']), {}, {
+            component: (collectionField === null || collectionField === void 0 ? void 0 : collectionField.target) && collectionField.interface !== 'chinaRegion' ? 'AssociationSelect' : undefined,
+            service: {
+              resource: collectionField === null || collectionField === void 0 ? void 0 : collectionField.target
+            },
+            style: {
+              width: '100%',
+              verticalAlign: 'top'
+            }
+          }),
           name: 'default',
           title: t('Default value'),
+          default: getFieldDefaultValue(fieldSchema, collectionField),
+          'x-read-pretty': false,
+          'x-disabled': false
+        }) : _objectSpread(_objectSpread({}, fieldSchema || {}), {}, {
           'x-decorator': 'FormItem',
-          default: fieldSchema.default || (collectionField === null || collectionField === void 0 ? void 0 : collectionField.defaultValue)
+          'x-component': 'VariableInput',
+          'x-component-props': _objectSpread(_objectSpread({}, (fieldSchema === null || fieldSchema === void 0 ? void 0 : fieldSchema['x-component-props']) || {}), {}, {
+            collectionName: collectionField === null || collectionField === void 0 ? void 0 : collectionField.collectionName,
+            schema: collectionField === null || collectionField === void 0 ? void 0 : collectionField.uiSchema,
+            className: defaultInputStyle,
+            renderSchemaComponent: function Com(props) {
+              var s = _lodash.default.cloneDeep(fieldSchema) || {};
+              s.title = '';
+              s['x-read-pretty'] = false;
+              s['x-disabled'] = false;
+              return /*#__PURE__*/_react2.default.createElement(_core.SchemaComponent, {
+                schema: _objectSpread(_objectSpread({}, s || {}), {}, {
+                  'x-component-props': _objectSpread(_objectSpread({}, s['x-component-props']), {}, {
+                    onChange: props.onChange,
+                    value: props.value,
+                    defaultValue: getFieldDefaultValue(s, collectionField),
+                    style: {
+                      width: '100%',
+                      verticalAlign: 'top'
+                    }
+                  })
+                })
+              });
+            }
+          }),
+          name: 'default',
+          title: t('Default value'),
+          default: getFieldDefaultValue(fieldSchema, collectionField)
         })
       }
     },
     onSubmit: function onSubmit(v) {
       var schema = _defineProperty({}, 'x-uid', fieldSchema['x-uid']);
       if (field.value !== v.default) {
-        field.value = v.default;
+        field.value = (0, _uitls.parseVariables)(v.default, variablesCtx);
       }
       fieldSchema.default = v.default;
       schema.default = v.default;
@@ -421,7 +480,7 @@ FormItem.Designer = function () {
     options: fieldComponentOptions,
     value: fieldSchema['x-component'],
     onChange: function onChange(type) {
-      var _collectionField$uiSc5, _interfaceConfig$sche;
+      var _collectionField$uiSc4, _interfaceConfig$sche;
       var schema = {
         name: collectionField === null || collectionField === void 0 ? void 0 : collectionField.name,
         type: 'void',
@@ -434,7 +493,7 @@ FormItem.Designer = function () {
         'x-validator': fieldSchema['x-validator'],
         'x-collection-field': fieldSchema['x-collection-field'],
         'x-decorator-props': fieldSchema['x-decorator-props'],
-        'x-component-props': _objectSpread(_objectSpread({}, collectionField === null || collectionField === void 0 ? void 0 : (_collectionField$uiSc5 = collectionField.uiSchema) === null || _collectionField$uiSc5 === void 0 ? void 0 : _collectionField$uiSc5['x-component-props']), fieldSchema['x-component-props'])
+        'x-component-props': _objectSpread(_objectSpread({}, collectionField === null || collectionField === void 0 ? void 0 : (_collectionField$uiSc4 = collectionField.uiSchema) === null || _collectionField$uiSc4 === void 0 ? void 0 : _collectionField$uiSc4['x-component-props']), fieldSchema['x-component-props'])
       };
       interfaceConfig === null || interfaceConfig === void 0 ? void 0 : (_interfaceConfig$sche = interfaceConfig.schemaInitialize) === null || _interfaceConfig$sche === void 0 ? void 0 : _interfaceConfig$sche.call(interfaceConfig, schema, {
         field: collectionField,
@@ -454,9 +513,25 @@ FormItem.Designer = function () {
         }
       });
     }
+  }), form && !(form === null || form === void 0 ? void 0 : form.readPretty) && ['o2m', 'm2m'].includes(collectionField === null || collectionField === void 0 ? void 0 : collectionField.interface) && fieldSchema['x-component'] !== 'TableField' && /*#__PURE__*/_react2.default.createElement(_schemaSettings.SchemaSettings.SwitchItem, {
+    key: "multiple",
+    title: t('Multiple'),
+    checked: ((_fieldSchema$xCompon3 = fieldSchema['x-component-props']) === null || _fieldSchema$xCompon3 === void 0 ? void 0 : _fieldSchema$xCompon3.multiple) === undefined ? true : fieldSchema['x-component-props'].multiple,
+    onChange: function onChange(value) {
+      var schema = _defineProperty({}, 'x-uid', fieldSchema['x-uid']);
+      fieldSchema['x-component-props'] = fieldSchema['x-component-props'] || {};
+      field.componentProps = field.componentProps || {};
+      fieldSchema['x-component-props'].multiple = value;
+      field.componentProps.multiple = value;
+      schema['x-component-props'] = fieldSchema['x-component-props'];
+      dn.emit('patch', {
+        schema: schema
+      });
+      refresh();
+    }
   }), field.readPretty && options.length > 0 && fieldSchema['x-component'] === 'CollectionField' && /*#__PURE__*/_react2.default.createElement(_schemaSettings.SchemaSettings.SwitchItem, {
     title: t('Enable link'),
-    checked: ((_fieldSchema$xCompon3 = (_fieldSchema$xCompon4 = fieldSchema['x-component-props']) === null || _fieldSchema$xCompon4 === void 0 ? void 0 : _fieldSchema$xCompon4.mode) !== null && _fieldSchema$xCompon3 !== void 0 ? _fieldSchema$xCompon3 : 'links') === 'links',
+    checked: ((_fieldSchema$xCompon4 = (_fieldSchema$xCompon5 = fieldSchema['x-component-props']) === null || _fieldSchema$xCompon5 === void 0 ? void 0 : _fieldSchema$xCompon5.mode) !== null && _fieldSchema$xCompon4 !== void 0 ? _fieldSchema$xCompon4 : 'links') === 'links',
     onChange: function onChange(flag) {
       fieldSchema['x-component-props'] = _objectSpread(_objectSpread({}, fieldSchema === null || fieldSchema === void 0 ? void 0 : fieldSchema['x-component-props']), {}, {
         mode: flag ? 'links' : 'tags'
@@ -469,7 +544,7 @@ FormItem.Designer = function () {
       });
       dn.refresh();
     }
-  }), form && !(form === null || form === void 0 ? void 0 : form.readPretty) && (collectionField === null || collectionField === void 0 ? void 0 : collectionField.interface) !== 'o2m' && (fieldSchema === null || fieldSchema === void 0 ? void 0 : (_fieldSchema$xCompon5 = fieldSchema['x-component-props']) === null || _fieldSchema$xCompon5 === void 0 ? void 0 : _fieldSchema$xCompon5['pattern-disable']) != true && /*#__PURE__*/_react2.default.createElement(_schemaSettings.SchemaSettings.SelectItem, {
+  }), form && !(form === null || form === void 0 ? void 0 : form.readPretty) && (collectionField === null || collectionField === void 0 ? void 0 : collectionField.interface) !== 'o2m' && !(0, _schemaSettings.isPatternDisabled)(fieldSchema) && /*#__PURE__*/_react2.default.createElement(_schemaSettings.SchemaSettings.SelectItem, {
     key: "pattern",
     title: t('Pattern'),
     options: [{
@@ -527,9 +602,9 @@ FormItem.Designer = function () {
     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$uiSc6, _collectionField$uiSc7;
+      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$uiSc6 = collectionField.uiSchema) === null || _collectionField$uiSc6 === void 0 ? void 0 : (_collectionField$uiSc7 = _collectionField$uiSc6['x-component-props']) === null || _collectionField$uiSc7 === void 0 ? void 0 : _collectionField$uiSc7['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
       });
       fieldSchema['x-component-props'] = fieldSchema['x-component-props'] || {};
@@ -554,4 +629,12 @@ FormItem.Designer = function () {
 function isFileCollection(collection) {
   return (collection === null || collection === void 0 ? void 0 : collection.template) === 'file';
 }
-FormItem.FilterFormDesigner = _FormItem.FilterFormDesigner;
+FormItem.FilterFormDesigner = _FormItem.FilterFormDesigner;
+function getFieldDefaultValue(fieldSchema, collectionField) {
+  var _collectionField$uiSc7;
+  var result = (fieldSchema === null || fieldSchema === void 0 ? void 0 : fieldSchema.default) || (collectionField === null || collectionField === void 0 ? void 0 : collectionField.defaultValue);
+  if ((collectionField === null || collectionField === void 0 ? void 0 : (_collectionField$uiSc7 = collectionField.uiSchema) === null || _collectionField$uiSc7 === void 0 ? void 0 : _collectionField$uiSc7['x-component']) === 'DatePicker' && result) {
+    return (0, _moment.default)(result);
+  }
+  return result;
+}

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

@@ -464,7 +464,6 @@ var EditComponent = function EditComponent() {
 };
 exports.EditComponent = EditComponent;
 var EditPattern = function EditPattern() {
-  var _fieldSchema$xCompon;
   var _useCollectionManager5 = (0, _collectionManager.useCollectionManager)(),
     getCollectionJoinField = _useCollectionManager5.getCollectionJoinField;
   var _useCollection5 = (0, _collectionManager.useCollection)(),
@@ -485,7 +484,7 @@ var EditPattern = function EditPattern() {
   if (fieldSchema['x-read-pretty'] === true) {
     readOnlyMode = 'read-pretty';
   }
-  return form && !(form === null || form === void 0 ? void 0 : form.readPretty) && (collectionField === null || collectionField === void 0 ? void 0 : collectionField.interface) !== 'o2m' && (fieldSchema === null || fieldSchema === void 0 ? void 0 : (_fieldSchema$xCompon = fieldSchema['x-component-props']) === null || _fieldSchema$xCompon === void 0 ? void 0 : _fieldSchema$xCompon['pattern-disable']) != true ? /*#__PURE__*/_react2.default.createElement(_schemaSettings.SchemaSettings.SelectItem, {
+  return form && !(form === null || form === void 0 ? void 0 : form.readPretty) && (collectionField === null || collectionField === void 0 ? void 0 : collectionField.interface) !== 'o2m' && !(0, _schemaSettings.isPatternDisabled)(fieldSchema) ? /*#__PURE__*/_react2.default.createElement(_schemaSettings.SchemaSettings.SelectItem, {
     key: "pattern",
     title: t('Pattern'),
     options: [{

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

@@ -5,12 +5,14 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.Templates = void 0;
 var _react = require("@formily/react");
+var _client = require("@nocobase/utils/client");
 var _antd = require("antd");
 var _lodash = _interopRequireDefault(require("lodash"));
 var _react2 = _interopRequireWildcard(require("react"));
 var _reactI18next = require("react-i18next");
 var _apiClient = require("../../../api-client");
 var _blockProvider = require("../../../block-provider");
+var _collectionManager = require("../../../collection-manager");
 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 }; }
@@ -65,6 +67,8 @@ var Templates = function Templates(_ref) {
     display = _useDataTemplates.display,
     enabled = _useDataTemplates.enabled,
     defaultTemplate = _useDataTemplates.defaultTemplate;
+  var _useCollectionManager = (0, _collectionManager.useCollectionManager)(),
+    getCollectionField = _useCollectionManager.getCollectionField;
   var _React$useState = _react2.default.useState((defaultTemplate === null || defaultTemplate === void 0 ? void 0 : defaultTemplate.key) || 'none'),
     _React$useState2 = _slicedToArray(_React$useState, 2),
     value = _React$useState2[0],
@@ -76,8 +80,14 @@ var Templates = function Templates(_ref) {
     if (defaultTemplate) {
       fetchTemplateData(api, defaultTemplate).then(function (data) {
         if (form) {
-          form.values = data;
+          (0, _client.forEach)(data, function (value, key) {
+            if (value) {
+              form.values[key] = value;
+            }
+          });
         }
+      }).catch(function (err) {
+        console.error(err);
       });
     }
   }, []);
@@ -87,24 +97,20 @@ var Templates = function Templates(_ref) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
             setValue(value);
-            if (!(option.key !== 'none')) {
-              _context.next = 8;
-              break;
-            }
-            if (!form) {
-              _context.next = 6;
-              break;
+            if (option.key !== 'none') {
+              fetchTemplateData(api, option).then(function (data) {
+                if (form) {
+                  (0, _client.forEach)(data, function (value, key) {
+                    if (value) {
+                      form.values[key] = value;
+                    }
+                  });
+                }
+              });
+            } else {
+              form === null || form === void 0 ? void 0 : form.reset();
             }
-            _context.next = 5;
-            return fetchTemplateData(api, option);
-          case 5:
-            form.values = _context.sent;
-          case 6:
-            _context.next = 9;
-            break;
-          case 8:
-            form === null || form === void 0 ? void 0 : form.reset();
-          case 9:
+          case 2:
           case "end":
             return _context.stop();
         }

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

@@ -4,11 +4,10 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.linkageMergeAction = void 0;
+var _client = require("@nocobase/evaluators/client");
 var _lodash = require("lodash");
-var _uitls = require("../../common/utils/uitls");
 var _type = require("../../../schema-settings/LinkageRules/type");
-var _client = _interopRequireDefault(require("@nocobase/evaluators/client"));
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+var _uitls = require("../../common/utils/uitls");
 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); }
 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; }
@@ -23,7 +22,7 @@ var linkageMergeAction = function linkageMergeAction(_ref, field, condition, val
   var displayResult = (field === null || field === void 0 ? void 0 : (_field$linkagePropert2 = field.linkageProperty) === null || _field$linkagePropert2 === void 0 ? void 0 : _field$linkagePropert2.display) || [field === null || field === void 0 ? void 0 : (_field$initProperty2 = field.initProperty) === null || _field$initProperty2 === void 0 ? void 0 : _field$initProperty2.display];
   var patternResult = (field === null || field === void 0 ? void 0 : (_field$linkagePropert3 = field.linkageProperty) === null || _field$linkagePropert3 === void 0 ? void 0 : _field$linkagePropert3.pattern) || [field === null || field === void 0 ? void 0 : (_field$initProperty3 = field.initProperty) === null || _field$initProperty3 === void 0 ? void 0 : _field$initProperty3.pattern];
   var valueResult = (field === null || field === void 0 ? void 0 : (_field$linkagePropert4 = field.linkageProperty) === null || _field$linkagePropert4 === void 0 ? void 0 : _field$linkagePropert4.value) || [field.value || (field === null || field === void 0 ? void 0 : (_field$initProperty4 = field.initProperty) === null || _field$initProperty4 === void 0 ? void 0 : _field$initProperty4.value)];
-  var _evaluators$get = _client.default.get('formula.js'),
+  var _evaluators$get = _client.evaluators.get('formula.js'),
     evaluate = _evaluators$get.evaluate;
   switch (operator) {
     case _type.ActionType.Required:

package/lib/schema-component/antd/gantt/components/calendar/top-part-of-calendar.d.ts

@@ -1,4 +1,4 @@
-import React from "react";
+import React from 'react';
 declare type TopPartOfCalendarProps = {
     value: string;
     x1Line: number;

package/lib/schema-component/antd/gantt/components/calendar/top-part-of-calendar.js

@@ -23,9 +23,9 @@ var TopPartOfCalendar = function TopPartOfCalendar(_ref) {
     x2: x1Line,
     y2: y2Line,
     className: (0, _css.cx)(_style.calendarTopTick),
-    key: value + "line"
+    key: value + 'line'
   }), /*#__PURE__*/_react.default.createElement("text", {
-    key: value + "text",
+    key: value + 'text',
     y: yText,
     x: xText,
     className: (0, _css.cx)(_style.calendarTopText)

package/lib/schema-component/antd/gantt/components/gantt/gantt.js

@@ -484,7 +484,7 @@ var Gantt = function Gantt(props) {
             _context.next = 2;
             return resource.update({
               filterByTk: task.id,
-              values: _objectSpread(_objectSpread({}, task), {}, _defineProperty({}, fieldNames.progress, task.progress / 100))
+              values: _defineProperty({}, fieldNames.progress, task.progress / 100)
             });
           case 2:
             _antd.message.success(t('Saved successfully'));
@@ -502,14 +502,14 @@ var Gantt = function Gantt(props) {
   }();
   var handleTaskChange = /*#__PURE__*/function () {
     var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(task) {
-      var _objectSpread3;
+      var _values2;
       return _regeneratorRuntime().wrap(function _callee2$(_context2) {
         while (1) switch (_context2.prev = _context2.next) {
           case 0:
             _context2.next = 2;
             return resource.update({
               filterByTk: task.id,
-              values: _objectSpread(_objectSpread({}, task), {}, (_objectSpread3 = {}, _defineProperty(_objectSpread3, fieldNames.start, task.start), _defineProperty(_objectSpread3, fieldNames.end, task.end), _objectSpread3))
+              values: (_values2 = {}, _defineProperty(_values2, fieldNames.start, task.start), _defineProperty(_values2, fieldNames.end, task.end), _values2)
             });
           case 2:
             _antd.message.success(t('Saved successfully'));

package/lib/schema-component/antd/gantt/components/gantt/style.js

@@ -7,7 +7,7 @@ exports.wrapper = exports.horizontalContainer = exports.ganttVerticalContainer =
 var _css = require("@emotion/css");
 var _templateObject, _templateObject2, _templateObject3;
 function _taggedTemplateLiteral(strings, raw) { if (!raw) { raw = strings.slice(0); } return Object.freeze(Object.defineProperties(strings, { raw: { value: Object.freeze(raw) } })); }
-var ganttVerticalContainer = (0, _css.css)(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  overflow: hidden;\n  font-size: 0;\n  margin: 0;\n  padding: 0;\n  width:100%;\n  border-left: 2px solid #f4f2f2;\n"])));
+var ganttVerticalContainer = (0, _css.css)(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  overflow: hidden;\n  font-size: 0;\n  margin: 0;\n  padding: 0;\n  width: 100%;\n  border-left: 2px solid #f4f2f2;\n"])));
 exports.ganttVerticalContainer = ganttVerticalContainer;
 var horizontalContainer = (0, _css.css)(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\n  margin: 0;\n  padding: 0;\n  overflow: hidden;\n"])));
 exports.horizontalContainer = horizontalContainer;

package/lib/schema-component/antd/gantt/components/grid/grid.d.ts

@@ -1,4 +1,4 @@
-import React from "react";
-import { GridBodyProps } from "./grid-body";
+import React from 'react';
+import { GridBodyProps } from './grid-body';
 export declare type GridProps = GridBodyProps;
 export declare const Grid: React.FC<GridProps>;

package/lib/schema-component/antd/gantt/components/grid/style.js

@@ -11,7 +11,7 @@ var gridRow = (0, _css.css)(_templateObject || (_templateObject = _taggedTemplat
 exports.gridRow = gridRow;
 var gridHeightRow = (0, _css.css)(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\n  fill: #e6f7ff;\n  border-color: rgba(0, 0, 0, 0.03);\n"])));
 exports.gridHeightRow = gridHeightRow;
-var gridRowLine = (0, _css.css)(_templateObject3 || (_templateObject3 = _taggedTemplateLiteral(["\n  stroke: #f0f0f0;\n  stroke-width:0;\n  border-bottom: 1px solid #f0f0f0;\n"])));
+var gridRowLine = (0, _css.css)(_templateObject3 || (_templateObject3 = _taggedTemplateLiteral(["\n  stroke: #f0f0f0;\n  stroke-width: 0;\n  border-bottom: 1px solid #f0f0f0;\n"])));
 exports.gridRowLine = gridRowLine;
 var gridTick = (0, _css.css)(_templateObject4 || (_templateObject4 = _taggedTemplateLiteral(["\n  stroke: #f0f0f0;\n"])));
 exports.gridTick = gridTick;

package/lib/schema-component/antd/gantt/components/other/arrow.d.ts

@@ -1,5 +1,5 @@
-import React from "react";
-import { BarTask } from "../../types/bar-task";
+import React from 'react';
+import { BarTask } from '../../types/bar-task';
 declare type ArrowProps = {
     taskFrom: BarTask;
     taskTo: BarTask;

package/lib/schema-component/antd/gantt/components/other/arrow.js

@@ -47,7 +47,7 @@ var drownPathAndTriangle = function drownPathAndTriangle(taskFrom, taskTo, rowHe
   var indexCompare = taskFrom.index > taskTo.index ? -1 : 1;
   var taskToEndPosition = taskTo.y + taskHeight / 2;
   var taskFromEndPosition = taskFrom.x2 + arrowIndent * 2;
-  var taskFromHorizontalOffsetValue = taskFromEndPosition < taskTo.x1 ? "" : "H ".concat(taskTo.x1 - arrowIndent);
+  var taskFromHorizontalOffsetValue = taskFromEndPosition < taskTo.x1 ? '' : "H ".concat(taskTo.x1 - arrowIndent);
   var taskToHorizontalOffsetValue = taskFromEndPosition > taskTo.x1 ? arrowIndent : taskTo.x1 - taskFrom.x2 - arrowIndent;
   var path = "M ".concat(taskFrom.x2, " ").concat(taskFrom.y + taskHeight / 2, " \n  h ").concat(arrowIndent, " \n  v ").concat(indexCompare * rowHeight / 2, " \n  ").concat(taskFromHorizontalOffsetValue, "\n  V ").concat(taskToEndPosition, " \n  h ").concat(taskToHorizontalOffsetValue);
   var trianglePoints = "".concat(taskTo.x1, ",").concat(taskToEndPosition, " \n  ").concat(taskTo.x1 - 5, ",").concat(taskToEndPosition - 5, " \n  ").concat(taskTo.x1 - 5, ",").concat(taskToEndPosition + 5);
@@ -57,7 +57,7 @@ var drownPathAndTriangleRTL = function drownPathAndTriangleRTL(taskFrom, taskTo,
   var indexCompare = taskFrom.index > taskTo.index ? -1 : 1;
   var taskToEndPosition = taskTo.y + taskHeight / 2;
   var taskFromEndPosition = taskFrom.x1 - arrowIndent * 2;
-  var taskFromHorizontalOffsetValue = taskFromEndPosition > taskTo.x2 ? "" : "H ".concat(taskTo.x2 + arrowIndent);
+  var taskFromHorizontalOffsetValue = taskFromEndPosition > taskTo.x2 ? '' : "H ".concat(taskTo.x2 + arrowIndent);
   var taskToHorizontalOffsetValue = taskFromEndPosition < taskTo.x2 ? -arrowIndent : taskTo.x2 - taskFrom.x1 + arrowIndent;
   var path = "M ".concat(taskFrom.x1, " ").concat(taskFrom.y + taskHeight / 2, " \n  h ").concat(-arrowIndent, " \n  v ").concat(indexCompare * rowHeight / 2, " \n  ").concat(taskFromHorizontalOffsetValue, "\n  V ").concat(taskToEndPosition, " \n  h ").concat(taskToHorizontalOffsetValue);
   var trianglePoints = "".concat(taskTo.x2, ",").concat(taskToEndPosition, " \n  ").concat(taskTo.x2 + 5, ",").concat(taskToEndPosition + 5, " \n  ").concat(taskTo.x2 + 5, ",").concat(taskToEndPosition - 5);

package/lib/schema-component/antd/gantt/components/other/horizontal-scroll.d.ts

@@ -1,4 +1,4 @@
-import React, { SyntheticEvent } from "react";
+import React, { SyntheticEvent } from 'react';
 export declare const HorizontalScroll: React.FC<{
     scroll: number;
     svgWidth: number;

package/lib/schema-component/antd/gantt/components/other/style.js

@@ -7,7 +7,7 @@ exports.verticalScroll = exports.tooltipDetailsContainerHidden = exports.tooltip
 var _css = require("@emotion/css");
 var _templateObject, _templateObject2, _templateObject3, _templateObject4, _templateObject5, _templateObject6, _templateObject7;
 function _taggedTemplateLiteral(strings, raw) { if (!raw) { raw = strings.slice(0); } return Object.freeze(Object.defineProperties(strings, { raw: { value: Object.freeze(raw) } })); }
-var scrollWrapper = (0, _css.css)(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  overflow: auto;\n  position: absolute;\n  bottom: -4px;\n  max-width: 100%;\n  /*firefox*/\n  scrollbar-width: thin;\n  /*iPad*/\n  height: 1.2rem;\n  &::-webkit-scrollbar {\n    width: 1.1rem;\n    height: 1.1rem;\n  }\n  &::-webkit-scrollbar-corner {\n    background: transparent;\n  }\n  &::-webkit-scrollbar-thumb {\n    border: 5px solid transparent;\n    background:  #5c5858cc;\n    border-radius: 10px;\n    background-clip: padding-box;\n  }\n  &::-webkit-scrollbar-thumb:hover {\n    border: 4px solid transparent;\n    background: #5c5858bd;\n    background-clip: padding-box;\n  }\n"])));
+var scrollWrapper = (0, _css.css)(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  overflow: auto;\n  position: absolute;\n  bottom: -4px;\n  max-width: 100%;\n  /*firefox*/\n  scrollbar-width: thin;\n  /*iPad*/\n  height: 1.2rem;\n  &::-webkit-scrollbar {\n    width: 1.1rem;\n    height: 1.1rem;\n  }\n  &::-webkit-scrollbar-corner {\n    background: transparent;\n  }\n  &::-webkit-scrollbar-thumb {\n    border: 5px solid transparent;\n    background: #5c5858cc;\n    border-radius: 10px;\n    background-clip: padding-box;\n  }\n  &::-webkit-scrollbar-thumb:hover {\n    border: 4px solid transparent;\n    background: #5c5858bd;\n    background-clip: padding-box;\n  }\n"])));
 exports.scrollWrapper = scrollWrapper;
 var horizontalScroll = (0, _css.css)(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\n  height: 1px;\n"])));
 exports.horizontalScroll = horizontalScroll;

package/lib/schema-component/antd/gantt/components/task-item/bar/bar-display.d.ts

@@ -1,4 +1,4 @@
-import React from "react";
+import React from 'react';
 declare type BarDisplayProps = {
     x: number;
     y: number;

package/lib/schema-component/antd/gantt/components/task-item/bar/bar-small.d.ts

@@ -1,3 +1,3 @@
-import React from "react";
-import { TaskItemProps } from "../task-item";
+import React from 'react';
+import { TaskItemProps } from '../task-item';
 export declare const BarSmall: React.FC<TaskItemProps>;

package/lib/schema-component/antd/gantt/components/task-item/bar/bar-small.js

@@ -32,14 +32,14 @@ var BarSmall = function BarSmall(_ref) {
     styles: task.styles,
     isSelected: isSelected,
     onMouseDown: function onMouseDown(e) {
-      isDateChangeable && onEventStart("move", task, e);
+      isDateChangeable && onEventStart('move', task, e);
     }
   }), /*#__PURE__*/_react.default.createElement("g", {
     className: "handleGroup"
   }, isProgressChangeable && /*#__PURE__*/_react.default.createElement(_barProgressHandle.BarProgressHandle, {
     progressPoint: progressPoint,
     onMouseDown: function onMouseDown(e) {
-      onEventStart("progress", task, e);
+      onEventStart('progress', task, e);
     }
   })));
 };

package/lib/schema-component/antd/gantt/components/task-item/bar/bar.d.ts

@@ -1,3 +1,3 @@
-import React from "react";
-import { TaskItemProps } from "../task-item";
+import React from 'react';
+import { TaskItemProps } from '../task-item';
 export declare const Bar: React.FC<TaskItemProps>;