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

package/es/acl/Configuration/FilterDynamicComponent.d.ts

@@ -0,0 +1,2 @@
+/// <reference types="react" />
+export declare function FilterDynamicComponent(props: any): JSX.Element;

package/es/{schema-component/antd/table-v2/hooks/useUserVariable.js → acl/Configuration/FilterDynamicComponent.js}

@@ -1,4 +1,8 @@
-import { useFilterOptions } from '../../filter';
+import React from 'react';
+import { useCompile } from '../../schema-component';
+import { useFilterOptions } from '../../schema-component/antd/filter';
+import { useValues } from '../../schema-component/antd/filter/useValues';
+import { Variable } from '../../schema-component/antd/variable';
 var useOptions = function useOptions(collectionName, _ref) {
   var schema = _ref.schema,
     operator = _ref.operator,
@@ -36,13 +40,13 @@ var useOptions = function useOptions(collectionName, _ref) {
   });
   return result;
 };
-export var useUserVariable = function useUserVariable(_ref2) {
+var useUserVariable = function useUserVariable(_ref2) {
   var schema = _ref2.schema,
     operator = _ref2.operator;
   var options = useOptions('users', {
     schema: schema,
     operator: operator,
-    maxDepth: 3
+    maxDepth: 1
   }) || [];
   return {
     label: "{{t(\"Current user\")}}",
@@ -53,4 +57,28 @@ export var useUserVariable = function useUserVariable(_ref2) {
     }),
     children: options
   };
-};
+};
+var useVariableOptions = function useVariableOptions() {
+  var _useValues = useValues(),
+    operator = _useValues.operator,
+    schema = _useValues.schema;
+  var userVariable = useUserVariable({
+    schema: schema,
+    operator: operator
+  });
+  if (!operator || !schema) return [];
+  return [userVariable];
+};
+export function FilterDynamicComponent(props) {
+  var value = props.value,
+    onChange = props.onChange,
+    renderSchemaComponent = props.renderSchemaComponent;
+  var options = useVariableOptions();
+  var compile = useCompile();
+  var scope = compile(options);
+  return /*#__PURE__*/React.createElement(Variable.Input, {
+    value: value,
+    onChange: onChange,
+    scope: scope
+  }, renderSchemaComponent());
+}

package/es/acl/Configuration/schemas/scopes.js

@@ -1,6 +1,7 @@
 import { useContext, useEffect } from 'react';
 import { useFormBlockContext } from '../../../block-provider';
 import { useFilterOptions } from '../../../schema-component';
+import { FilterDynamicComponent } from '../FilterDynamicComponent';
 import { RoleResourceCollectionContext } from '../RolesResourcesActions';
 export var rolesResourcesScopesCollection = {
   name: 'rolesResourcesScopes',
@@ -139,6 +140,7 @@ export var scopesSchema = {
                                       'x-decorator': 'FormItem',
                                       'x-component': 'Filter',
                                       'x-component-props': {
+                                        dynamicComponent: FilterDynamicComponent,
                                         useProps: function useProps() {
                                           var ctx = useContext(RoleResourceCollectionContext);
                                           var options = useFilterOptions(ctx.name);
@@ -267,6 +269,7 @@ export var scopesSchema = {
                                               'x-decorator': 'FormItem',
                                               'x-component': 'Filter',
                                               'x-component-props': {
+                                                dynamicComponent: FilterDynamicComponent,
                                                 useProps: function useProps() {
                                                   var ctx = useContext(RoleResourceCollectionContext);
                                                   var options = useFilterOptions(ctx.name);

package/es/application/Application.d.ts

@@ -22,5 +22,6 @@ export declare class Application {
      * TODO
      */
     plugin(plugin: PluginCallback): void;
+    handleErrors(error: any): void;
     render(): (props: any) => JSX.Element;
 }

package/es/application/Application.js

@@ -23,6 +23,7 @@ function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToAr
 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; }
 import { Spin } from 'antd';
 import React, { useEffect, useState } from 'react';
+import { ErrorBoundary } from 'react-error-boundary';
 import { I18nextProvider } from 'react-i18next';
 import { Link, NavLink } from 'react-router-dom';
 import { ACLProvider } from '../acl';
@@ -35,6 +36,7 @@ import { PinnedPluginListProvider } from '../plugin-manager';
 import PMProvider, { PluginManagerLink, SettingsCenterDropdown } from '../pm';
 import { AdminLayout, AuthLayout, RemoteRouteSwitchProvider, RouteSchemaComponent, RouteSwitch, useRoutes } from '../route-switch';
 import { AntdSchemaComponentProvider, DesignableSwitch, MenuItemInitializers, SchemaComponentProvider } from '../schema-component';
+import { ErrorFallback } from '../schema-component/antd/error-fallback';
 import { SchemaInitializerProvider } from '../schema-initializer';
 import { BlockTemplateDetails, BlockTemplatePage } from '../schema-templates';
 import { SystemSettingsProvider } from '../system-settings';
@@ -156,6 +158,11 @@ export var Application = /*#__PURE__*/function () {
     value: function plugin(_plugin) {
       this.plugins.push(_plugin);
     }
+  }, {
+    key: "handleErrors",
+    value: function handleErrors(error) {
+      console.error(error);
+    }
   }, {
     key: "render",
     value: function render() {
@@ -226,9 +233,12 @@ export var Application = /*#__PURE__*/function () {
         if (loading) {
           return /*#__PURE__*/React.createElement(Spin, null);
         }
-        return /*#__PURE__*/React.createElement(App, {
+        return /*#__PURE__*/React.createElement(ErrorBoundary, {
+          FallbackComponent: ErrorFallback,
+          onError: _this.handleErrors
+        }, /*#__PURE__*/React.createElement(App, {
           providers: _this.providers
-        });
+        }));
       };
     }
   }]);

package/es/block-provider/FormFieldProvider.js

@@ -7,6 +7,7 @@ function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input ==
 import { createForm, onFormValuesChange } from '@formily/core';
 import { useField } from '@formily/react';
 import { autorun } from '@formily/reactive';
+import { forEach } from '@nocobase/utils/client';
 import { Spin } from 'antd';
 import React, { createContext, useContext, useEffect, useMemo } from 'react';
 import { RecordProvider } from '../record-provider';
@@ -39,7 +40,14 @@ var InternalFormFieldProvider = function InternalFormFieldProvider(props) {
   useEffect(function () {
     var dispose = autorun(function () {
       var _formBlockCtx$form2;
-      form.values = (formBlockCtx === null || formBlockCtx === void 0 ? void 0 : (_formBlockCtx$form2 = formBlockCtx.form) === null || _formBlockCtx$form2 === void 0 ? void 0 : _formBlockCtx$form2.values[fieldName]) || form.values;
+      var data = (formBlockCtx === null || formBlockCtx === void 0 ? void 0 : (_formBlockCtx$form2 = formBlockCtx.form) === null || _formBlockCtx$form2 === void 0 ? void 0 : _formBlockCtx$form2.values[fieldName]) || {};
+      // 先清空表单值，再赋值，避免当值为空时，表单未被清空
+      form.reset();
+      forEach(data, function (value, key) {
+        if (value) {
+          form.values[key] = value;
+        }
+      });
     });
     return dispose;
   }, []);

package/es/block-provider/TableSelectorProvider.js

@@ -18,6 +18,7 @@ import { Schema, useField, useFieldSchema } from '@formily/react';
 import uniq from 'lodash/uniq';
 import React, { createContext, useContext, useEffect, useState } from 'react';
 import { useCollectionManager } from '../collection-manager';
+import { isInFilterFormBlock } from '../filter-provider';
 import { RecordProvider, useRecord } from '../record-provider';
 import { SchemaComponentOptions } from '../schema-component';
 import { BlockProvider, RenderChildrenWithAssociationFilter, useBlockRequestContext } from './BlockProvider';
@@ -189,7 +190,7 @@ export var TableSelectorProvider = function TableSelectorProvider(props) {
   }
   var extraFilter;
   if (collectionField) {
-    if (['oho', 'o2m'].includes(collectionField.interface)) {
+    if (['oho', 'o2m'].includes(collectionField.interface) && !isInFilterFormBlock(fieldSchema)) {
       if (record === null || record === void 0 ? void 0 : record[collectionField.sourceKey]) {
         extraFilter = {
           $or: [_defineProperty({}, collectionField.foreignKey, {
@@ -204,7 +205,7 @@ export var TableSelectorProvider = function TableSelectorProvider(props) {
         });
       }
     }
-    if (['obo'].includes(collectionField.interface)) {
+    if (['obo'].includes(collectionField.interface) && !isInFilterFormBlock(fieldSchema)) {
       var fields = getCollectionFields(collectionField.target);
       var targetField = fields.find(function (f) {
         return f.foreignKey && f.foreignKey === collectionField.foreignKey;

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

@@ -25,7 +25,7 @@ import { useHistory } from 'react-router-dom';
 import { useReactToPrint } from 'react-to-print';
 import { AssociationFilter, useFormBlockContext, useTableBlockContext } from '../..';
 import { useAPIClient, useRequest } from '../../api-client';
-import { useCollection } from '../../collection-manager';
+import { useCollection, useCollectionManager } from '../../collection-manager';
 import { useFilterBlock } from '../../filter-provider/FilterProvider';
 import { transformToFilter } from '../../filter-provider/utils';
 import { useRecord } from '../../record-provider';
@@ -292,6 +292,10 @@ export var useFilterBlockActionProps = function useFilterBlockActionProps() {
   var fieldSchema = useFieldSchema();
   var _useFilterBlock = useFilterBlock(),
     getDataBlocks = _useFilterBlock.getDataBlocks;
+  var _useCollection2 = useCollection(),
+    name = _useCollection2.name;
+  var _useCollectionManager = useCollectionManager(),
+    getCollectionJoinField = _useCollectionManager.getCollectionJoinField;
   actionField.data = actionField.data || {};
   return {
     onClick: function onClick() {
@@ -322,7 +326,7 @@ export 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] = removeNullCondition(transformToFilter(form.values, fieldSchema));
+                        storedFilter[uid] = removeNullCondition(transformToFilter(form.values, fieldSchema, getCollectionJoinField, name));
                         mergedFilter = mergeFilter([].concat(_toConsumableArray(Object.values(storedFilter).map(function (filter) {
                           return removeNullCondition(filter);
                         })), [block.defaultFilter]));
@@ -344,13 +348,14 @@ export 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();
           }
@@ -822,9 +827,9 @@ export var useCustomizeRequestActionProps = function useCustomizeRequestActionPr
   var actionSchema = useFieldSchema();
   var compile = useCompile();
   var form = useForm();
-  var _useCollection2 = useCollection(),
-    fields = _useCollection2.fields,
-    getField = _useCollection2.getField;
+  var _useCollection3 = useCollection(),
+    fields = _useCollection3.fields,
+    getField = _useCollection3.getField;
   var _useBlockRequestConte5 = useBlockRequestContext(),
     field = _useBlockRequestConte5.field,
     resource = _useBlockRequestConte5.resource,
@@ -964,9 +969,9 @@ export var useUpdateActionProps = function useUpdateActionProps() {
     setVisible = _useActionContext3.setVisible;
   var actionSchema = useFieldSchema();
   var history = useHistory();
-  var _useCollection3 = useCollection(),
-    fields = _useCollection3.fields,
-    getField = _useCollection3.getField;
+  var _useCollection4 = useCollection(),
+    fields = _useCollection4.fields,
+    getField = _useCollection4.getField;
   var compile = useCompile();
   var actionField = useField();
   var _useFormBlockContext = useFormBlockContext(),
@@ -1284,9 +1289,9 @@ export var useAssociationFilterProps = function useAssociationFilterProps() {
   };
 };
 export var useOptionalFieldList = function useOptionalFieldList() {
-  var _useCollection4 = useCollection(),
-    _useCollection4$curre = _useCollection4.currentFields,
-    currentFields = _useCollection4$curre === void 0 ? [] : _useCollection4$curre;
+  var _useCollection5 = useCollection(),
+    _useCollection5$curre = _useCollection5.currentFields,
+    currentFields = _useCollection5$curre === void 0 ? [] : _useCollection5$curre;
   return currentFields.filter(function (field) {
     return isOptionalField(field) && field.uiSchema.enum;
   });

package/es/board/CardAdder.js

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

package/es/board/ColumnForm.js

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

package/es/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/es/board/DefaultColumnHeader.js

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

package/es/collection-manager/CollectionField.js

@@ -8,17 +8,19 @@ import { connect, useField, useFieldSchema } from '@formily/react';
 import { merge } from '@formily/shared';
 import { concat } from 'lodash';
 import React, { useEffect } from 'react';
+import { useTranslation } from 'react-i18next';
 import { useActionContext, useCompile, useComponent, useFormBlockContext, useRecord } from '..';
 import { CollectionFieldProvider } from './CollectionFieldProvider';
 import { useCollectionField } from './hooks';
 // TODO: 初步适配
 var InternalField = function InternalField(props) {
+  var component = props.component;
   var field = useField();
   var fieldSchema = useFieldSchema();
   var _useCollectionField = useCollectionField(),
     uiSchema = _useCollectionField.uiSchema,
     defaultValue = _useCollectionField.defaultValue;
-  var component = useComponent((uiSchema === null || uiSchema === void 0 ? void 0 : uiSchema['x-component']) || 'Input');
+  var Component = useComponent(component || (uiSchema === null || uiSchema === void 0 ? void 0 : uiSchema['x-component']) || 'Input');
   var compile = useCompile();
   var setFieldProps = function setFieldProps(key, value) {
     field[key] = typeof field[key] === 'undefined' ? value : field[key];
@@ -61,21 +63,12 @@ var InternalField = function InternalField(props) {
     field.dataSource = uiSchema.enum;
     var originalProps = compile(uiSchema['x-component-props']) || {};
     var componentProps = 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__*/React.createElement(component, props, props.children);
+  return /*#__PURE__*/React.createElement(Component, props, props.children);
 };
 export var InternalFallbackField = function InternalFallbackField() {
   var _fieldSchema$xCompon, _fieldSchema$xCompon2, _fieldSchema$xCompon3;
@@ -98,6 +91,16 @@ export var InternalFallbackField = function InternalFallbackField() {
   }
   return /*#__PURE__*/React.createElement("div", null, displayText);
 };
+// 当字段被删除时，显示一个提示占位符
+var DeletedField = function DeletedField() {
+  var _useTranslation = useTranslation(),
+    t = _useTranslation.t;
+  return /*#__PURE__*/React.createElement("div", {
+    style: {
+      color: '#ccc'
+    }
+  }, t('The field has bee deleted'));
+};
 export var CollectionField = connect(function (props) {
   var _fieldSchema$xCompon4;
   var fieldSchema = useFieldSchema();
@@ -107,7 +110,7 @@ export var CollectionField = connect(function (props) {
   return /*#__PURE__*/React.createElement(CollectionFieldProvider, {
     name: fieldSchema.name,
     field: field,
-    fallback: snapshot ? /*#__PURE__*/React.createElement(InternalFallbackField, null) : null
+    fallback: snapshot ? /*#__PURE__*/React.createElement(InternalFallbackField, null) : /*#__PURE__*/React.createElement(DeletedField, null)
   }, /*#__PURE__*/React.createElement(InternalField, _objectSpread({}, props)));
 });
 export default CollectionField;

package/es/collection-manager/CollectionManagerProvider.js

@@ -32,6 +32,7 @@ export 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 = keyBy(templateOptions(), function (item) {
     return item.name;
@@ -43,7 +44,8 @@ export 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.createElement(CollectionManagerSchemaComponentProvider, null, props.children));
 };
@@ -135,6 +137,11 @@ export var RemoteCollectionManagerProvider = function RemoteCollectionManagerPro
       return _ref2.apply(this, arguments);
     };
   }();
+  var updateCollection = function updateCollection(collection) {
+    service.mutate({
+      data: collection
+    });
+  };
   return /*#__PURE__*/React.createElement(CollectionCategroriesProvider, {
     service: _objectSpread({}, result),
     refreshCategory: refreshCategory
@@ -144,7 +151,8 @@ export var RemoteCollectionManagerProvider = function RemoteCollectionManagerPro
       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)));
 };
 export var CollectionCategroriesProvider = function CollectionCategroriesProvider(props) {

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

@@ -32,8 +32,8 @@ import { useResourceActionContext, useResourceContext } from '../ResourceActionP
 import { useCancelAction } from '../action-hooks';
 import { useCollectionManager } from '../hooks';
 import * as components from './components';
-import { templateOptions } from './templates';
 import { TemplateSummay } from './components/TemplateSummay';
+import { templateOptions } from './templates';
 var getSchema = function getSchema(schema, category, compile) {
   if (!schema) {
     return;

package/es/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;