@nocobase/client 0.9.3-alpha.1 → 0.9.4-alpha.2

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

@@ -11,6 +11,7 @@ var _css = require("@emotion/css");
 var _antd = require("@formily/antd");
 var _react = require("@formily/react");
 var _shared = require("@formily/shared");
+var _antd2 = require("antd");
 var _lodash = _interopRequireDefault(require("lodash"));
 var _moment = _interopRequireDefault(require("moment"));
 var _react2 = _interopRequireWildcard(require("react"));
@@ -19,19 +20,21 @@ var _ACLProvider = require("../../../acl/ACLProvider");
 var _blockProvider = require("../../../block-provider");
 var _collectionManager = require("../../../collection-manager");
 var _CollectionFields = require("../../../collection-manager/Configuration/CollectionFields");
+var _GeneralSchemaItems = require("../../../schema-items/GeneralSchemaItems");
 var _schemaSettings = require("../../../schema-settings");
 var _VariableInput = require("../../../schema-settings/VariableInput/VariableInput");
-var _FilterDynamicComponent = require("../table-v2/FilterDynamicComponent");
+var _useIsShowMultipleSwitch = require("../../../schema-settings/hooks/useIsShowMultipleSwitch");
 var _uitls = require("../../common/utils/uitls");
 var _core = require("../../core");
-var _filter = require("../filter");
 var _hooks = require("../../hooks");
 var _blockItem = require("../block-item");
+var _filter = require("../filter");
 var _shared2 = require("../input/shared");
+var _FilterDynamicComponent = require("../table-v2/FilterDynamicComponent");
 var _variable = require("../variable");
 var _FormItem = require("./FormItem.FilterFormDesigner");
 var _SchemaSettingOptions = require("./SchemaSettingOptions");
-var _templateObject, _templateObject2;
+var _templateObject, _templateObject2, _templateObject3;
 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 }; }
@@ -73,10 +76,12 @@ var FormItem = (0, _react.observer)(function (props) {
       }
     }
   }, []);
+  var _props$showTitle = props.showTitle,
+    showTitle = _props$showTitle === void 0 ? true : _props$showTitle;
   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)(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\n            & .ant-space {\n              flex-wrap: wrap;\n            }\n          "]))))
+    className: (0, _css.cx)((0, _css.css)(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\n              & .ant-space {\n                flex-wrap: wrap;\n              }\n            "]))), _defineProperty({}, (0, _css.css)(_templateObject3 || (_templateObject3 = _taggedTemplateLiteral(["\n                > .ant-formily-item-label {\n                  display: none;\n                }\n              "]))), showTitle === false))
   }, props), {}, {
     extra: typeof field.description === 'string' ? /*#__PURE__*/_react2.default.createElement("div", {
       dangerouslySetInnerHTML: {
@@ -87,7 +92,7 @@ var FormItem = (0, _react.observer)(function (props) {
 });
 exports.FormItem = FormItem;
 FormItem.Designer = function Designer() {
-  var _interfaceConfig$vali, _collectionField$uiSc, _getCollectionFields, _field$componentProps, _field$componentProps2, _field$componentProps3, _field$componentProps4, _field$componentProps5, _field$componentProps6, _field$componentProps7, _collectionField$uiSc2, _fieldSchema$xDecora, _fieldSchema$xCompon, _fieldSchema$xCompon2, _fieldSchema$xCompon3, _fieldSchema$xCompon4, _field$componentProps8, _field$componentProps9;
+  var _interfaceConfig$vali, _collectionField$uiSc, _getCollectionFields, _field$componentProps, _field$componentProps2, _field$componentProps3, _field$componentProps4, _field$componentProps5, _field$componentProps6, _field$componentProps7, _fieldSchema$xCompon, _fieldSchema$xCompon2, _fieldSchema$xCompon3, _fieldSchema$xCompon4, _fieldSchema$xCompon5, _fieldSchema$xCompon6, _fieldSchema$xCompon7, _fieldSchema$xCompon8, _fieldSchema$xCompon9, _fieldSchema$xCompon10, _field$componentProps8, _field$componentProps9;
   var _useCollectionManager = (0, _collectionManager.useCollectionManager)(),
     getCollectionFields = _useCollectionManager.getCollectionFields,
     getInterface = _useCollectionManager.getInterface,
@@ -95,7 +100,6 @@ FormItem.Designer = function Designer() {
     getCollection = _useCollectionManager.getCollection;
   var _useCollection = (0, _collectionManager.useCollection)(),
     getField = _useCollection.getField;
-  var tk = (0, _blockProvider.useFilterByTk)();
   var _useFormBlockContext = (0, _blockProvider.useFormBlockContext)(),
     form = _useFormBlockContext.form;
   var field = (0, _react.useField)();
@@ -108,6 +112,7 @@ FormItem.Designer = function Designer() {
     insertAdjacent = _useDesignable.insertAdjacent;
   var compile = (0, _hooks.useCompile)();
   var variablesCtx = (0, _uitls.useVariablesCtx)();
+  var IsShowMultipleSwitch = (0, _useIsShowMultipleSwitch.useIsShowMultipleSwitch)();
   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);
@@ -147,7 +152,7 @@ FormItem.Designer = function Designer() {
   var fieldMode = (field === null || field === void 0 ? void 0 : (_field$componentProps7 = field.componentProps) === null || _field$componentProps7 === void 0 ? void 0 : _field$componentProps7['mode']) || (isFileField ? 'FileManager' : 'Select');
   var isSelectFieldMode = fieldMode === 'Select';
   var sort = defaultSort === null || defaultSort === void 0 ? void 0 : defaultSort.map(function (item) {
-    return item.startsWith('-') ? {
+    return (item === null || item === void 0 ? void 0 : item.startsWith('-')) ? {
       field: item.substring(1),
       direction: 'desc'
     } : {
@@ -155,111 +160,15 @@ FormItem.Designer = function Designer() {
       direction: 'asc'
     };
   });
-  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',
-      title: t('Edit field title'),
-      properties: {
-        title: {
-          title: t('Field title'),
-          default: field === null || field === void 0 ? void 0 : field.title,
-          description: "".concat(t('Original field title: ')).concat(collectionField === null || collectionField === void 0 ? void 0 : (_collectionField$uiSc2 = collectionField.uiSchema) === null || _collectionField$uiSc2 === void 0 ? void 0 : _collectionField$uiSc2.title),
-          'x-decorator': 'FormItem',
-          'x-component': 'Input',
-          'x-component-props': {}
-        }
-      }
-    },
-    onSubmit: function onSubmit(_ref) {
-      var title = _ref.title;
-      if (title) {
-        field.title = title;
-        fieldSchema.title = title;
-        dn.emit('patch', {
-          schema: {
-            'x-uid': fieldSchema['x-uid'],
-            title: fieldSchema.title
-          }
-        });
-      }
-      dn.refresh();
-    }
-  }), !field.readPretty && /*#__PURE__*/_react2.default.createElement(_schemaSettings.SchemaSettings.ModalItem, {
-    key: "edit-description",
-    title: t('Edit description'),
-    schema: {
-      type: 'object',
-      title: t('Edit description'),
-      properties: {
-        description: {
-          // title: t('Description'),
-          default: field === null || field === void 0 ? void 0 : field.description,
-          'x-decorator': 'FormItem',
-          'x-component': 'Input.TextArea',
-          'x-component-props': {}
-        }
-      }
-    },
-    onSubmit: function onSubmit(_ref2) {
-      var description = _ref2.description;
-      field.description = description;
-      fieldSchema.description = description;
-      dn.emit('patch', {
-        schema: {
-          'x-uid': fieldSchema['x-uid'],
-          description: fieldSchema.description
-        }
-      });
-      dn.refresh();
-    }
-  }), field.readPretty && /*#__PURE__*/_react2.default.createElement(_schemaSettings.SchemaSettings.ModalItem, {
-    key: "edit-tooltip",
-    title: t('Edit tooltip'),
-    schema: {
-      type: 'object',
-      title: t('Edit description'),
-      properties: {
-        tooltip: {
-          default: fieldSchema === null || fieldSchema === void 0 ? void 0 : (_fieldSchema$xDecora = fieldSchema['x-decorator-props']) === null || _fieldSchema$xDecora === void 0 ? void 0 : _fieldSchema$xDecora.tooltip,
-          'x-decorator': 'FormItem',
-          'x-component': 'Input.TextArea',
-          'x-component-props': {}
-        }
-      }
-    },
-    onSubmit: function onSubmit(_ref3) {
-      var tooltip = _ref3.tooltip;
-      field.decoratorProps.tooltip = tooltip;
-      fieldSchema['x-decorator-props'] = fieldSchema['x-decorator-props'] || {};
-      fieldSchema['x-decorator-props']['tooltip'] = tooltip;
-      dn.emit('patch', {
-        schema: {
-          'x-uid': fieldSchema['x-uid'],
-          'x-decorator-props': fieldSchema['x-decorator-props']
-        }
-      });
-      dn.refresh();
-    }
-  }), !field.readPretty && fieldSchema['x-component'] !== 'FormField' && /*#__PURE__*/_react2.default.createElement(_schemaSettings.SchemaSettings.SwitchItem, {
-    key: "required",
-    title: t('Required'),
-    checked: fieldSchema.required,
-    onChange: function onChange(required) {
-      var schema = _defineProperty({}, 'x-uid', fieldSchema['x-uid']);
-      field.required = required;
-      fieldSchema['required'] = required;
-      schema['required'] = required;
-      dn.emit('patch', {
-        schema: schema
-      });
-      refresh();
-    }
-  }), !(form === null || form === void 0 ? void 0 : form.readPretty) && isFileField ? /*#__PURE__*/_react2.default.createElement(_schemaSettings.SchemaSettings.SwitchItem, {
+  var fieldSchemaWithoutRequired = _lodash.default.omit(fieldSchema, 'required');
+  var isSubFormMode = ((_fieldSchema$xCompon = fieldSchema['x-component-props']) === null || _fieldSchema$xCompon === void 0 ? void 0 : _fieldSchema$xCompon.mode) === 'Nester';
+  var isPickerMode = ((_fieldSchema$xCompon2 = fieldSchema['x-component-props']) === null || _fieldSchema$xCompon2 === void 0 ? void 0 : _fieldSchema$xCompon2.mode) === 'Picker';
+  var showFieldMode = isAssociationField && fieldModeOptions && !isTableField;
+  var showModeSelect = showFieldMode && isPickerMode;
+  return /*#__PURE__*/_react2.default.createElement(_schemaSettings.GeneralSchemaDesigner, null, /*#__PURE__*/_react2.default.createElement(_GeneralSchemaItems.GeneralSchemaItems, null), !(form === null || form === void 0 ? void 0 : form.readPretty) && isFileField ? /*#__PURE__*/_react2.default.createElement(_schemaSettings.SchemaSettings.SwitchItem, {
     key: "quick-upload",
     title: t('Quick upload'),
-    checked: ((_fieldSchema$xCompon = fieldSchema['x-component-props']) === null || _fieldSchema$xCompon === void 0 ? void 0 : _fieldSchema$xCompon.quickUpload) !== false,
+    checked: ((_fieldSchema$xCompon3 = fieldSchema['x-component-props']) === null || _fieldSchema$xCompon3 === void 0 ? void 0 : _fieldSchema$xCompon3.quickUpload) !== false,
     onChange: function onChange(value) {
       var schema = _defineProperty({}, 'x-uid', fieldSchema['x-uid']);
       field.componentProps.quickUpload = value;
@@ -274,7 +183,7 @@ FormItem.Designer = function Designer() {
   }) : null, !(form === null || form === void 0 ? void 0 : form.readPretty) && isFileField ? /*#__PURE__*/_react2.default.createElement(_schemaSettings.SchemaSettings.SwitchItem, {
     key: "select-file",
     title: t('Select file'),
-    checked: ((_fieldSchema$xCompon2 = fieldSchema['x-component-props']) === null || _fieldSchema$xCompon2 === void 0 ? void 0 : _fieldSchema$xCompon2.selectFile) !== false,
+    checked: ((_fieldSchema$xCompon4 = fieldSchema['x-component-props']) === null || _fieldSchema$xCompon4 === void 0 ? void 0 : _fieldSchema$xCompon4.selectFile) !== false,
     onChange: function onChange(value) {
       var schema = _defineProperty({}, 'x-uid', fieldSchema['x-uid']);
       field.componentProps.selectFile = value;
@@ -374,7 +283,7 @@ FormItem.Designer = function Designer() {
       }
     },
     onSubmit: function onSubmit(v) {
-      var _collectionField$uiSc3;
+      var _collectionField$uiSc2;
       var rules = [];
       var _iterator = _createForOfIteratorHelper(v.rules),
         _step;
@@ -412,7 +321,7 @@ FormItem.Designer = function Designer() {
           _iterator2.f();
         }
       }
-      var concatValidator = _lodash.default.concat([], (collectionField === null || collectionField === void 0 ? void 0 : (_collectionField$uiSc3 = collectionField.uiSchema) === null || _collectionField$uiSc3 === void 0 ? void 0 : _collectionField$uiSc3['x-validator']) || [], rules);
+      var concatValidator = _lodash.default.concat([], (collectionField === null || collectionField === void 0 ? void 0 : (_collectionField$uiSc2 = collectionField.uiSchema) === null || _collectionField$uiSc2 === void 0 ? void 0 : _collectionField$uiSc2['x-validator']) || [], rules);
       field.validator = concatValidator;
       fieldSchema['x-validator'] = rules;
       schema['x-validator'] = rules;
@@ -433,10 +342,10 @@ FormItem.Designer = function Designer() {
       type: 'object',
       title: t('Set default value'),
       properties: {
-        default: (0, _variable.isInvariable)(interfaceConfig) ? _objectSpread(_objectSpread({}, fieldSchema || {}), {}, {
+        default: (0, _variable.isInvariable)(interfaceConfig) ? _objectSpread(_objectSpread({}, fieldSchemaWithoutRequired || {}), {}, {
           '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,
+            component: (collectionField === null || collectionField === void 0 ? void 0 : collectionField.target) && (collectionField === null || collectionField === void 0 ? void 0 : collectionField.interface) !== 'chinaRegion' ? 'AssociationSelect' : undefined,
             service: {
               resource: collectionField === null || collectionField === void 0 ? void 0 : collectionField.target
             },
@@ -450,7 +359,7 @@ FormItem.Designer = function Designer() {
           default: getFieldDefaultValue(fieldSchema, collectionField),
           'x-read-pretty': false,
           'x-disabled': false
-        }) : _objectSpread(_objectSpread({}, fieldSchema || {}), {}, {
+        }) : _objectSpread(_objectSpread({}, fieldSchemaWithoutRequired || {}), {}, {
           'x-decorator': 'FormItem',
           'x-component': 'VariableInput',
           'x-component-props': _objectSpread(_objectSpread({}, (fieldSchema === null || fieldSchema === void 0 ? void 0 : fieldSchema['x-component-props']) || {}), {}, {
@@ -458,7 +367,7 @@ FormItem.Designer = function Designer() {
             schema: collectionField === null || collectionField === void 0 ? void 0 : collectionField.uiSchema,
             className: defaultInputStyle,
             renderSchemaComponent: function Com(props) {
-              var s = _lodash.default.cloneDeep(fieldSchema) || {};
+              var s = _lodash.default.cloneDeep(fieldSchemaWithoutRequired) || {};
               s.title = '';
               s['x-read-pretty'] = false;
               s['x-disabled'] = false;
@@ -514,15 +423,15 @@ FormItem.Designer = function Designer() {
         }
       }
     },
-    onSubmit: function onSubmit(_ref4) {
-      var _schema6;
-      var filter = _ref4.filter;
+    onSubmit: function onSubmit(_ref) {
+      var _schema5;
+      var filter = _ref.filter;
       filter = (0, _filter.removeNullCondition)(filter);
       _lodash.default.set(field.componentProps, 'service.params.filter', filter);
       fieldSchema['x-component-props'] = field.componentProps;
       field.componentProps = field.componentProps;
       dn.emit('patch', {
-        schema: (_schema6 = {}, _defineProperty(_schema6, 'x-uid', fieldSchema['x-uid']), _defineProperty(_schema6, 'x-component-props', field.componentProps), _schema6)
+        schema: (_schema5 = {}, _defineProperty(_schema5, 'x-uid', fieldSchema['x-uid']), _defineProperty(_schema5, 'x-component-props', field.componentProps), _schema5)
       });
     }
   }), isSelectFieldMode && !field.readPretty && /*#__PURE__*/_react2.default.createElement(_schemaSettings.SchemaSettings.ModalItem, {
@@ -554,6 +463,7 @@ FormItem.Designer = function Designer() {
                   field: {
                     type: 'string',
                     enum: sortFields,
+                    required: true,
                     'x-decorator': 'FormItem',
                     'x-component': 'Select',
                     'x-component-props': {
@@ -596,19 +506,19 @@ FormItem.Designer = function Designer() {
         }
       }
     },
-    onSubmit: function onSubmit(_ref5) {
-      var _schema7;
-      var sort = _ref5.sort;
+    onSubmit: function onSubmit(_ref2) {
+      var _schema6;
+      var sort = _ref2.sort;
       var sortArr = sort.map(function (item) {
         return item.direction === 'desc' ? "-".concat(item.field) : item.field;
       });
       _lodash.default.set(field.componentProps, 'service.params.sort', sortArr);
       fieldSchema['x-component-props'] = field.componentProps;
       dn.emit('patch', {
-        schema: (_schema7 = {}, _defineProperty(_schema7, 'x-uid', fieldSchema['x-uid']), _defineProperty(_schema7, 'x-component-props', field.componentProps), _schema7)
+        schema: (_schema6 = {}, _defineProperty(_schema6, 'x-uid', fieldSchema['x-uid']), _defineProperty(_schema6, 'x-component-props', field.componentProps), _schema6)
       });
     }
-  }), isAssociationField && fieldModeOptions && !isTableField && /*#__PURE__*/_react2.default.createElement(_schemaSettings.SchemaSettings.SelectItem, {
+  }), showFieldMode && /*#__PURE__*/_react2.default.createElement(_schemaSettings.SchemaSettings.SelectItem, {
     key: "field-mode",
     title: t('Field mode'),
     options: fieldModeOptions,
@@ -620,20 +530,75 @@ FormItem.Designer = function Designer() {
       schema['x-component-props'] = fieldSchema['x-component-props'];
       field.componentProps = field.componentProps || {};
       field.componentProps.mode = mode;
-      if (mode === 'Nester') {
-        var initValue = ['o2m', 'm2m'].includes(collectionField.interface) ? [] : {};
-        field.value = field.value || initValue;
-      }
+      // if (mode === 'Nester') {
+      //   const initValue = ['hasMany', 'belongsToMany'].includes(collectionField?.type) ? [{}] : {};
+      //   field.value = field.value || initValue;
+      // }
       dn.emit('patch', {
         schema: schema
       });
       dn.refresh();
     }
-  }), !field.readPretty && isAssociationField && ['Select', 'Picker'].includes(fieldMode) && /*#__PURE__*/_react2.default.createElement(_schemaSettings.SchemaSettings.SwitchItem, {
+  }), showModeSelect && /*#__PURE__*/_react2.default.createElement(_schemaSettings.SchemaSettings.Item, null, /*#__PURE__*/_react2.default.createElement("div", {
+    style: {
+      alignItems: 'center',
+      display: 'flex',
+      justifyContent: 'space-between'
+    }
+  }, t('Popup size'), /*#__PURE__*/_react2.default.createElement(_antd2.Select, {
+    bordered: false,
+    options: [{
+      label: t('Small'),
+      value: 'small'
+    }, {
+      label: t('Middle'),
+      value: 'middle'
+    }, {
+      label: t('Large'),
+      value: 'large'
+    }],
+    value: (_fieldSchema$xCompon5 = fieldSchema === null || fieldSchema === void 0 ? void 0 : (_fieldSchema$xCompon6 = fieldSchema['x-component-props']) === null || _fieldSchema$xCompon6 === void 0 ? void 0 : _fieldSchema$xCompon6['openSize']) !== null && _fieldSchema$xCompon5 !== void 0 ? _fieldSchema$xCompon5 : (fieldSchema === null || fieldSchema === void 0 ? void 0 : (_fieldSchema$xCompon7 = fieldSchema['x-component-props']) === null || _fieldSchema$xCompon7 === void 0 ? void 0 : _fieldSchema$xCompon7['openMode']) == 'modal' ? 'large' : 'middle',
+    onChange: function onChange(value) {
+      field.componentProps.openSize = value;
+      fieldSchema['x-component-props'] = field.componentProps;
+      dn.emit('patch', {
+        schema: {
+          'x-uid': fieldSchema['x-uid'],
+          'x-component-props': fieldSchema['x-component-props']
+        }
+      });
+      dn.refresh();
+    },
+    style: {
+      textAlign: 'right',
+      minWidth: 100
+    }
+  }))), !field.readPretty && isAssociationField && ['Select', 'Picker'].includes(fieldMode) && /*#__PURE__*/_react2.default.createElement(_schemaSettings.SchemaSettings.SwitchItem, {
     key: "allowAddNew",
     title: t('Allow add new data'),
     checked: fieldSchema['x-add-new'],
     onChange: function onChange(allowAddNew) {
+      var hasAddNew = fieldSchema.reduceProperties(function (buf, schema) {
+        if (schema['x-component'] === 'Action') {
+          return schema;
+        }
+        return buf;
+      }, null);
+      if (!hasAddNew) {
+        var addNewActionschema = {
+          'x-action': 'create',
+          title: "{{t('Add new')}}",
+          'x-designer': 'Action.Designer',
+          'x-component': 'Action',
+          'x-decorator': 'ACLActionProvider',
+          'x-component-props': {
+            openMode: 'drawer',
+            type: 'default',
+            component: 'CreateRecordAction'
+          }
+        };
+        insertAdjacent('afterBegin', addNewActionschema);
+      }
       var schema = _defineProperty({}, 'x-uid', fieldSchema['x-uid']);
       field['x-add-new'] = allowAddNew;
       fieldSchema['x-add-new'] = allowAddNew;
@@ -643,10 +608,10 @@ FormItem.Designer = function Designer() {
       });
       refresh();
     }
-  }), 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, {
+  }), IsShowMultipleSwitch() ? /*#__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,
+    title: t('Allow multiple'),
+    checked: ((_fieldSchema$xCompon8 = fieldSchema['x-component-props']) === null || _fieldSchema$xCompon8 === void 0 ? void 0 : _fieldSchema$xCompon8.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'] || {};
@@ -659,9 +624,25 @@ FormItem.Designer = function Designer() {
       });
       refresh();
     }
-  }), field.readPretty && options.length > 0 && fieldSchema['x-component'] === 'CollectionField' && !isFileField && /*#__PURE__*/_react2.default.createElement(_schemaSettings.SchemaSettings.SwitchItem, {
+  }) : null, IsShowMultipleSwitch() && isSubFormMode ? /*#__PURE__*/_react2.default.createElement(_schemaSettings.SchemaSettings.SwitchItem, {
+    key: "allowDissociate",
+    title: t('Allow dissociate'),
+    checked: ((_fieldSchema$xCompon9 = fieldSchema['x-component-props']) === null || _fieldSchema$xCompon9 === void 0 ? void 0 : _fieldSchema$xCompon9.allowDissociate) !== false,
+    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'].allowDissociate = value;
+      field.componentProps.allowDissociate = value;
+      schema['x-component-props'] = fieldSchema['x-component-props'];
+      dn.emit('patch', {
+        schema: schema
+      });
+      refresh();
+    }
+  }) : null, field.readPretty && options.length > 0 && fieldSchema['x-component'] === 'CollectionField' && !isFileField && /*#__PURE__*/_react2.default.createElement(_schemaSettings.SchemaSettings.SwitchItem, {
     title: t('Enable link'),
-    checked: ((_fieldSchema$xCompon4 = fieldSchema['x-component-props']) === null || _fieldSchema$xCompon4 === void 0 ? void 0 : _fieldSchema$xCompon4.enableLink) !== false,
+    checked: ((_fieldSchema$xCompon10 = fieldSchema['x-component-props']) === null || _fieldSchema$xCompon10 === void 0 ? void 0 : _fieldSchema$xCompon10.enableLink) !== false,
     onChange: function onChange(flag) {
       fieldSchema['x-component-props'] = _objectSpread(_objectSpread({}, fieldSchema === null || fieldSchema === void 0 ? void 0 : fieldSchema['x-component-props']), {}, {
         enableLink: flag
@@ -727,15 +708,15 @@ FormItem.Designer = function Designer() {
       });
       dn.refresh();
     }
-  }), options.length > 0 && fieldSchema['x-component'] === 'CollectionField' && /*#__PURE__*/_react2.default.createElement(_schemaSettings.SchemaSettings.SelectItem, {
+  }), options.length > 0 && isAssociationField && /*#__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$componentProps8 = field.componentProps) === null || _field$componentProps8 === void 0 ? void 0 : (_field$componentProps9 = _field$componentProps8.fieldNames) === null || _field$componentProps9 === void 0 ? void 0 : _field$componentProps9.label,
     onChange: function onChange(label) {
-      var _collectionField$uiSc4, _collectionField$uiSc5;
+      var _collectionField$uiSc3, _collectionField$uiSc4;
       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$uiSc3 = collectionField.uiSchema) === null || _collectionField$uiSc3 === void 0 ? void 0 : (_collectionField$uiSc4 = _collectionField$uiSc3['x-component-props']) === null || _collectionField$uiSc4 === void 0 ? void 0 : _collectionField$uiSc4['fieldNames']), field.componentProps.fieldNames), {}, {
         label: label
       });
       fieldSchema['x-component-props'] = fieldSchema['x-component-props'] || {};
@@ -763,9 +744,9 @@ function isFileCollection(collection) {
 }
 FormItem.FilterFormDesigner = _FormItem.FilterFormDesigner;
 function getFieldDefaultValue(fieldSchema, collectionField) {
-  var _collectionField$uiSc6;
+  var _collectionField$uiSc5;
   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$uiSc6 = collectionField.uiSchema) === null || _collectionField$uiSc6 === void 0 ? void 0 : _collectionField$uiSc6['x-component']) === 'DatePicker' && result) {
+  if ((collectionField === null || collectionField === void 0 ? void 0 : (_collectionField$uiSc5 = collectionField.uiSchema) === null || _collectionField$uiSc5 === void 0 ? void 0 : _collectionField$uiSc5['x-component']) === 'DatePicker' && result) {
     return (0, _moment.default)(result);
   }
   return result;

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

@@ -378,11 +378,11 @@ var EditDefaultValue = function EditDefaultValue() {
       type: 'object',
       title: t('Set default value'),
       properties: {
-        default: _objectSpread(_objectSpread({}, collectionField.uiSchema), {}, {
+        default: _objectSpread(_objectSpread({}, collectionField === null || collectionField === void 0 ? void 0 : collectionField.uiSchema), {}, {
           name: 'default',
           title: t('Default value'),
           'x-decorator': 'FormItem',
-          default: fieldSchema.default || collectionField.defaultValue
+          default: fieldSchema.default || (collectionField === null || collectionField === void 0 ? void 0 : collectionField.defaultValue)
         })
       }
     },
@@ -576,7 +576,7 @@ var EditTitleField = function EditTitleField() {
     dn = _useDesignable10.dn;
   var compile = (0, _hooks.useCompile)();
   var collectionField = getField(fieldSchema['name']) || getCollectionJoinField(fieldSchema['x-collection-field']);
-  var targetFields = (collectionField === null || collectionField === void 0 ? void 0 : collectionField.target) ? getCollectionFields(collectionField.target) : (_getCollectionFields = getCollectionFields(collectionField === null || collectionField === void 0 ? void 0 : collectionField.targetCollection)) !== null && _getCollectionFields !== void 0 ? _getCollectionFields : [];
+  var targetFields = (collectionField === null || collectionField === void 0 ? void 0 : collectionField.target) ? getCollectionFields(collectionField === null || collectionField === void 0 ? void 0 : collectionField.target) : (_getCollectionFields = getCollectionFields(collectionField === null || collectionField === void 0 ? void 0 : collectionField.targetCollection)) !== null && _getCollectionFields !== void 0 ? _getCollectionFields : [];
   var options = targetFields.filter(function (field) {
     return !(field === null || field === void 0 ? void 0 : field.target) && field.type !== 'boolean';
   }).map(function (field) {

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

@@ -171,6 +171,7 @@ var DetailsDesigner = function DetailsDesigner() {
                   field: {
                     type: 'string',
                     enum: sortFields,
+                    required: true,
                     'x-decorator': 'FormItem',
                     'x-component': 'Select',
                     'x-component-props': {

package/lib/schema-component/antd/form-v2/Templates.d.ts

@@ -1,3 +1,23 @@
+export interface ITemplate {
+    config?: {
+        [key: string]: {
+            /** 设置的数据范围 */
+            filter?: any;
+            /** 设置的标题字段 */
+            titleField?: string;
+        };
+    };
+    items: {
+        key: string;
+        title: string;
+        collection: string;
+        dataId: number;
+        fields: string[];
+        default?: boolean;
+    }[];
+    /** 是否在 Form 区块显示模板选择器 */
+    display: boolean;
+}
 export declare const Templates: ({ style, form }: {
     style?: {};
     form: any;

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

@@ -40,6 +40,24 @@ var useDataTemplates = function useDataTemplates() {
     items = _findDataTemplates$it === void 0 ? [] : _findDataTemplates$it,
     _findDataTemplates$di = _findDataTemplates.display,
     display = _findDataTemplates$di === void 0 ? true : _findDataTemplates$di;
+  var _useCollectionManager = (0, _collectionManager.useCollectionManager)(),
+    getCollectionJoinField = _useCollectionManager.getCollectionJoinField;
+  // 过滤掉已经被删除的字段
+  items.forEach(function (item) {
+    try {
+      var _item$fields;
+      item.fields = (_item$fields = item.fields) === null || _item$fields === void 0 ? void 0 : _item$fields.map(function (field) {
+        var joinField = getCollectionJoinField("".concat(item.collection, ".").concat(field));
+        if (joinField) {
+          return field;
+        }
+        return '';
+      }).filter(Boolean);
+    } catch (err) {
+      (0, _client.error)(err);
+      item.fields = [];
+    }
+  });
   var templates = [{
     key: 'none',
     title: t('None')
@@ -55,7 +73,9 @@ var useDataTemplates = function useDataTemplates() {
     templates: templates,
     display: display,
     defaultTemplate: defaultTemplate,
-    enabled: items.length > 0
+    enabled: items.length > 0 && items.every(function (item) {
+      return item.dataId !== undefined;
+    })
   };
 };
 var Templates = function Templates(_ref) {
@@ -67,8 +87,6 @@ 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],
@@ -77,15 +95,16 @@ var Templates = function Templates(_ref) {
   var _useTranslation2 = (0, _reactI18next.useTranslation)(),
     t = _useTranslation2.t;
   (0, _react2.useEffect)(function () {
-    if (defaultTemplate) {
-      fetchTemplateData(api, defaultTemplate).then(function (data) {
-        if (form) {
+    if (enabled && defaultTemplate) {
+      fetchTemplateData(api, defaultTemplate, t).then(function (data) {
+        if (form && data) {
           (0, _client.forEach)(data, function (value, key) {
             if (value) {
               form.values[key] = value;
             }
           });
         }
+        return data;
       }).catch(function (err) {
         console.error(err);
       });
@@ -98,14 +117,19 @@ var Templates = function Templates(_ref) {
           case 0:
             setValue(value);
             if (option.key !== 'none') {
-              fetchTemplateData(api, option).then(function (data) {
-                if (form) {
+              fetchTemplateData(api, option, t).then(function (data) {
+                if (form && data) {
+                  // 切换之前先把之前的数据清空
+                  form.reset();
                   (0, _client.forEach)(data, function (value, key) {
                     if (value) {
                       form.values[key] = value;
                     }
                   });
                 }
+                return data;
+              }).catch(function (err) {
+                console.error(err);
               });
             } else {
               form === null || form === void 0 ? void 0 : form.reset();
@@ -158,14 +182,20 @@ function findDataTemplates(fieldSchema) {
   }
   return {};
 }
-function fetchTemplateData(_x4, _x5) {
+function fetchTemplateData(_x4, _x5, _x6) {
   return _fetchTemplateData.apply(this, arguments);
 }
 function _fetchTemplateData() {
-  _fetchTemplateData = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(api, template) {
+  _fetchTemplateData = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(api, template, t) {
     return _regeneratorRuntime().wrap(function _callee2$(_context2) {
       while (1) switch (_context2.prev = _context2.next) {
         case 0:
+          if (!(template.fields.length === 0)) {
+            _context2.next = 2;
+            break;
+          }
+          return _context2.abrupt("return");
+        case 2:
           return _context2.abrupt("return", api.resource(template.collection).get({
             filterByTk: template.dataId,
             fields: template.fields,
@@ -174,7 +204,7 @@ function _fetchTemplateData() {
             var _data$data;
             return (_data$data = data.data) === null || _data$data === void 0 ? void 0 : _data$data.data;
           }));
-        case 1:
+        case 3:
         case "end":
           return _context2.stop();
       }