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

package/lib/block-provider/TableSelectorProvider.js

@@ -8,6 +8,7 @@ var _react = require("@formily/react");
 var _uniq = _interopRequireDefault(require("lodash/uniq"));
 var _react2 = _interopRequireWildcard(require("react"));
 var _collectionManager = require("../collection-manager");
+var _filterProvider = require("../filter-provider");
 var _recordProvider = require("../record-provider");
 var _schemaComponent = require("../schema-component");
 var _BlockProvider = require("./BlockProvider");
@@ -200,7 +201,7 @@ var TableSelectorProvider = function TableSelectorProvider(props) {
   }
   var extraFilter;
   if (collectionField) {
-    if (['oho', 'o2m'].includes(collectionField.interface)) {
+    if (['oho', 'o2m'].includes(collectionField.interface) && !(0, _filterProvider.isInFilterFormBlock)(fieldSchema)) {
       if (record === null || record === void 0 ? void 0 : record[collectionField.sourceKey]) {
         extraFilter = {
           $or: [_defineProperty({}, collectionField.foreignKey, {
@@ -215,7 +216,7 @@ var TableSelectorProvider = function TableSelectorProvider(props) {
         });
       }
     }
-    if (['obo'].includes(collectionField.interface)) {
+    if (['obo'].includes(collectionField.interface) && !(0, _filterProvider.isInFilterFormBlock)(fieldSchema)) {
       var fields = getCollectionFields(collectionField.target);
       var targetField = fields.find(function (f) {
         return f.foreignKey && f.foreignKey === collectionField.foreignKey;

package/lib/block-provider/hooks/index.js

@@ -303,6 +303,10 @@ var useFilterBlockActionProps = function useFilterBlockActionProps() {
   var fieldSchema = (0, _react.useFieldSchema)();
   var _useFilterBlock = (0, _FilterProvider.useFilterBlock)(),
     getDataBlocks = _useFilterBlock.getDataBlocks;
+  var _useCollection2 = (0, _collectionManager.useCollection)(),
+    name = _useCollection2.name;
+  var _useCollectionManager = (0, _collectionManager.useCollectionManager)(),
+    getCollectionJoinField = _useCollectionManager.getCollectionJoinField;
   actionField.data = actionField.data || {};
   return {
     onClick: function onClick() {
@@ -333,7 +337,7 @@ var useFilterBlockActionProps = function useFilterBlockActionProps() {
                       case 3:
                         param = ((_block$service$params = block.service.params) === null || _block$service$params === void 0 ? void 0 : _block$service$params[0]) || {}; // 保留原有的 filter
                         storedFilter = ((_block$service$params2 = block.service.params) === null || _block$service$params2 === void 0 ? void 0 : (_block$service$params3 = _block$service$params2[1]) === null || _block$service$params3 === void 0 ? void 0 : _block$service$params3.filters) || {};
-                        storedFilter[uid] = (0, _schemaComponent.removeNullCondition)((0, _utils.transformToFilter)(form.values, fieldSchema));
+                        storedFilter[uid] = (0, _schemaComponent.removeNullCondition)((0, _utils.transformToFilter)(form.values, fieldSchema, getCollectionJoinField, name));
                         mergedFilter = (0, _SharedFilterProvider.mergeFilter)([].concat(_toConsumableArray(Object.values(storedFilter).map(function (filter) {
                           return (0, _schemaComponent.removeNullCondition)(filter);
                         })), [block.defaultFilter]));
@@ -355,13 +359,14 @@ var useFilterBlockActionProps = function useFilterBlockActionProps() {
               }()));
             case 5:
               actionField.data.loading = false;
-              _context4.next = 11;
+              _context4.next = 12;
               break;
             case 8:
               _context4.prev = 8;
               _context4.t0 = _context4["catch"](2);
+              console.error(_context4.t0);
               actionField.data.loading = false;
-            case 11:
+            case 12:
             case "end":
               return _context4.stop();
           }
@@ -838,9 +843,9 @@ var useCustomizeRequestActionProps = function useCustomizeRequestActionProps() {
   var actionSchema = (0, _react.useFieldSchema)();
   var compile = (0, _schemaComponent.useCompile)();
   var form = (0, _react.useForm)();
-  var _useCollection2 = (0, _collectionManager.useCollection)(),
-    fields = _useCollection2.fields,
-    getField = _useCollection2.getField;
+  var _useCollection3 = (0, _collectionManager.useCollection)(),
+    fields = _useCollection3.fields,
+    getField = _useCollection3.getField;
   var _useBlockRequestConte5 = (0, _BlockProvider.useBlockRequestContext)(),
     field = _useBlockRequestConte5.field,
     resource = _useBlockRequestConte5.resource,
@@ -981,9 +986,9 @@ var useUpdateActionProps = function useUpdateActionProps() {
     setVisible = _useActionContext3.setVisible;
   var actionSchema = (0, _react.useFieldSchema)();
   var history = (0, _reactRouterDom.useHistory)();
-  var _useCollection3 = (0, _collectionManager.useCollection)(),
-    fields = _useCollection3.fields,
-    getField = _useCollection3.getField;
+  var _useCollection4 = (0, _collectionManager.useCollection)(),
+    fields = _useCollection4.fields,
+    getField = _useCollection4.getField;
   var compile = (0, _schemaComponent.useCompile)();
   var actionField = (0, _react.useField)();
   var _useFormBlockContext = (0, _2.useFormBlockContext)(),
@@ -1308,9 +1313,9 @@ var useAssociationFilterProps = function useAssociationFilterProps() {
 };
 exports.useAssociationFilterProps = useAssociationFilterProps;
 var useOptionalFieldList = function useOptionalFieldList() {
-  var _useCollection4 = (0, _collectionManager.useCollection)(),
-    _useCollection4$curre = _useCollection4.currentFields,
-    currentFields = _useCollection4$curre === void 0 ? [] : _useCollection4$curre;
+  var _useCollection5 = (0, _collectionManager.useCollection)(),
+    _useCollection5$curre = _useCollection5.currentFields,
+    currentFields = _useCollection5$curre === void 0 ? [] : _useCollection5$curre;
   return currentFields.filter(function (field) {
     return isOptionalField(field) && field.uiSchema.enum;
   });

package/lib/board/CardAdder.js

@@ -33,7 +33,7 @@ function CardAdder(_ref) {
       return setAddingCard(false);
     }
   }) : /*#__PURE__*/_react.default.createElement("button", {
-    className: 'react-kanban-card-adder-button',
+    className: "react-kanban-card-adder-button",
     onClick: function onClick() {
       return setAddingCard(!addingCard);
     }

package/lib/board/ColumnForm.js

@@ -19,7 +19,7 @@ function ColumnForm(_ref) {
     (0, _utils.when)(inputColumnTitle.current.value)(onConfirm);
   }
   return /*#__PURE__*/_react.default.createElement("div", {
-    className: 'react-kanban-column',
+    className: "react-kanban-column",
     style: {
       minWidth: '230px'
     }
@@ -30,13 +30,13 @@ function ColumnForm(_ref) {
     },
     onSubmit: addColumn
   }, /*#__PURE__*/_react.default.createElement("input", {
-    type: 'text',
+    type: "text",
     ref: inputColumnTitle,
     autoFocus: true
   }), /*#__PURE__*/_react.default.createElement("button", {
-    type: 'submit'
+    type: "submit"
   }, "Add"), /*#__PURE__*/_react.default.createElement("button", {
-    type: 'button',
+    type: "button",
     onClick: onCancel
   }, "Cancel")));
 }

package/lib/board/DefaultColumnHeader.d.ts

@@ -1,5 +1,5 @@
 /// <reference types="react" />
-declare function DefaultColumnHeader({ children: column, allowRemoveColumn, onColumnRemove, allowRenameColumn, onColumnRename }: {
+declare function DefaultColumnHeader({ children: column, allowRemoveColumn, onColumnRemove, allowRenameColumn, onColumnRename, }: {
     children: any;
     allowRemoveColumn: any;
     onColumnRemove: any;

package/lib/board/DefaultColumnHeader.js

@@ -59,11 +59,11 @@ function DefaultColumnHeader(_ref2) {
     toggleRenameMode();
   }
   return /*#__PURE__*/_react.default.createElement("div", {
-    className: 'react-kanban-column-header'
+    className: "react-kanban-column-header"
   }, renameMode ? /*#__PURE__*/_react.default.createElement("form", {
     onSubmit: handleRenameColumn
   }, /*#__PURE__*/_react.default.createElement("span", null, /*#__PURE__*/_react.default.createElement("input", {
-    type: 'text',
+    type: "text",
     value: titleInput,
     onChange: function onChange(_ref3) {
       var value = _ref3.target.value;
@@ -71,11 +71,11 @@ function DefaultColumnHeader(_ref2) {
     },
     autoFocus: true
   })), /*#__PURE__*/_react.default.createElement("span", null, /*#__PURE__*/_react.default.createElement("button", {
-    className: 'react-kanban-column-header__button',
-    type: 'submit'
+    className: "react-kanban-column-header__button",
+    type: "submit"
   }, "Rename"), /*#__PURE__*/_react.default.createElement("button", {
-    className: 'react-kanban-column-header__button',
-    type: 'button',
+    className: "react-kanban-column-header__button",
+    type: "button",
     onClick: handleRenameMode
   }, "Cancel"))) : /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(ColumnTitle, {
     allowRenameColumn: allowRenameColumn,

package/lib/collection-manager/CollectionField.js

@@ -8,6 +8,7 @@ var _react = require("@formily/react");
 var _shared = require("@formily/shared");
 var _lodash = require("lodash");
 var _react2 = _interopRequireWildcard(require("react"));
+var _reactI18next = require("react-i18next");
 var _ = require("..");
 var _CollectionFieldProvider = require("./CollectionFieldProvider");
 var _hooks = require("./hooks");
@@ -21,12 +22,13 @@ function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input ==
 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); }
 // TODO: 初步适配
 var InternalField = function InternalField(props) {
+  var component = props.component;
   var field = (0, _react.useField)();
   var fieldSchema = (0, _react.useFieldSchema)();
   var _useCollectionField = (0, _hooks.useCollectionField)(),
     uiSchema = _useCollectionField.uiSchema,
     defaultValue = _useCollectionField.defaultValue;
-  var component = (0, _.useComponent)((uiSchema === null || uiSchema === void 0 ? void 0 : uiSchema['x-component']) || 'Input');
+  var Component = (0, _.useComponent)(component || (uiSchema === null || uiSchema === void 0 ? void 0 : uiSchema['x-component']) || 'Input');
   var compile = (0, _.useCompile)();
   var setFieldProps = function setFieldProps(key, value) {
     field[key] = typeof field[key] === 'undefined' ? value : field[key];
@@ -69,21 +71,12 @@ var InternalField = function InternalField(props) {
     field.dataSource = uiSchema.enum;
     var originalProps = compile(uiSchema['x-component-props']) || {};
     var componentProps = (0, _shared.merge)(originalProps, field.componentProps || {});
-    field.component = [component, componentProps];
-    // if (interfaceType === 'input') {
-    //   field.componentProps.ellipsis = true;
-    // } else if (interfaceType === 'textarea') {
-    //   field.componentProps.ellipsis = true;
-    // } else if (interfaceType === 'markdown') {
-    //   field.componentProps.ellipsis = true;
-    // } else if (interfaceType === 'attachment') {
-    //   field.componentProps.size = 'small';
-    // }
+    field.component = [Component, componentProps];
   }, [JSON.stringify(uiSchema)]);
   if (!uiSchema) {
     return null;
   }
-  return /*#__PURE__*/_react2.default.createElement(component, props, props.children);
+  return /*#__PURE__*/_react2.default.createElement(Component, props, props.children);
 };
 var InternalFallbackField = function InternalFallbackField() {
   var _fieldSchema$xCompon, _fieldSchema$xCompon2, _fieldSchema$xCompon3;
@@ -106,7 +99,17 @@ var InternalFallbackField = function InternalFallbackField() {
   }
   return /*#__PURE__*/_react2.default.createElement("div", null, displayText);
 };
+// 当字段被删除时，显示一个提示占位符
 exports.InternalFallbackField = InternalFallbackField;
+var DeletedField = function DeletedField() {
+  var _useTranslation = (0, _reactI18next.useTranslation)(),
+    t = _useTranslation.t;
+  return /*#__PURE__*/_react2.default.createElement("div", {
+    style: {
+      color: '#ccc'
+    }
+  }, t('The field has bee deleted'));
+};
 var CollectionField = (0, _react.connect)(function (props) {
   var _fieldSchema$xCompon4;
   var fieldSchema = (0, _react.useFieldSchema)();
@@ -116,7 +119,7 @@ var CollectionField = (0, _react.connect)(function (props) {
   return /*#__PURE__*/_react2.default.createElement(_CollectionFieldProvider.CollectionFieldProvider, {
     name: fieldSchema.name,
     field: field,
-    fallback: snapshot ? /*#__PURE__*/_react2.default.createElement(InternalFallbackField, null) : null
+    fallback: snapshot ? /*#__PURE__*/_react2.default.createElement(InternalFallbackField, null) : /*#__PURE__*/_react2.default.createElement(DeletedField, null)
   }, /*#__PURE__*/_react2.default.createElement(InternalField, _objectSpread({}, props)));
 });
 exports.CollectionField = CollectionField;

package/lib/collection-manager/CollectionManagerProvider.js

@@ -40,6 +40,7 @@ var CollectionManagerProvider = function CollectionManagerProvider(props) {
     _props$collections = props.collections,
     collections = _props$collections === void 0 ? [] : _props$collections,
     refreshCM = props.refreshCM,
+    updateCollection = props.updateCollection,
     templates = props.templates;
   var defaultTemplates = (0, _lodash.keyBy)((0, _templates.templateOptions)(), function (item) {
     return item.name;
@@ -51,7 +52,8 @@ var CollectionManagerProvider = function CollectionManagerProvider(props) {
       interfaces: _objectSpread(_objectSpread(_objectSpread({}, defaultInterfaces), ctx.interfaces), interfaces),
       templates: _objectSpread(_objectSpread({}, defaultTemplates), templates),
       collections: [].concat(_toConsumableArray(ctx.collections), _toConsumableArray(collections)),
-      refreshCM: refreshCM
+      refreshCM: refreshCM,
+      updateCollection: updateCollection
     })
   }, /*#__PURE__*/_react.default.createElement(_CollectionManagerSchemaComponentProvider.CollectionManagerSchemaComponentProvider, null, props.children));
 };
@@ -144,6 +146,11 @@ var RemoteCollectionManagerProvider = function RemoteCollectionManagerProvider(p
       return _ref2.apply(this, arguments);
     };
   }();
+  var updateCollection = function updateCollection(collection) {
+    service.mutate({
+      data: collection
+    });
+  };
   return /*#__PURE__*/_react.default.createElement(CollectionCategroriesProvider, {
     service: _objectSpread({}, result),
     refreshCategory: refreshCategory
@@ -153,7 +160,8 @@ var RemoteCollectionManagerProvider = function RemoteCollectionManagerProvider(p
       setContentLoading: setContentLoading
     }),
     collections: service === null || service === void 0 ? void 0 : (_service$data = service.data) === null || _service$data === void 0 ? void 0 : _service$data.data,
-    refreshCM: refreshCM
+    refreshCM: refreshCM,
+    updateCollection: updateCollection
   }, props)));
 };
 exports.RemoteCollectionManagerProvider = RemoteCollectionManagerProvider;

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

@@ -19,8 +19,8 @@ var _ResourceActionProvider = require("../ResourceActionProvider");
 var _actionHooks = require("../action-hooks");
 var _hooks = require("../hooks");
 var components = _interopRequireWildcard(require("./components"));
-var _templates = require("./templates");
 var _TemplateSummay = require("./components/TemplateSummay");
+var _templates = require("./templates");
 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 _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); }

package/lib/collection-manager/Configuration/CollectionFields.d.ts

@@ -0,0 +1,2 @@
+export declare const isTitleField: (field: any) => boolean;
+export declare const CollectionFields: (props: any) => JSX.Element;