@nocobase/client 0.9.2-alpha.3 → 0.9.3-alpha.1

package/es/collection-manager/interfaces/o2o.js

@@ -4,75 +4,7 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 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); }
-import { cloneDeep } from 'lodash';
-import { constraintsProps, recordPickerSelector, recordPickerViewer, relationshipType, reverseFieldProperties } from './properties';
-var internalSchameInitialize = function internalSchameInitialize(schema, _ref) {
-  var field = _ref.field,
-    block = _ref.block,
-    readPretty = _ref.readPretty,
-    action = _ref.action;
-  if (block === 'Form') {
-    if (schema['x-component'] === 'FormField') {
-      var association = "".concat(field.collectionName, ".").concat(field.name);
-      schema.type = 'void';
-      schema.properties = {
-        block: {
-          type: 'void',
-          'x-decorator': 'FormFieldProvider',
-          'x-decorator-props': {
-            collection: field.target,
-            association: association,
-            resource: association,
-            action: action,
-            fieldName: field.name,
-            readPretty: readPretty
-          },
-          'x-component': 'CardItem',
-          'x-component-props': {
-            bordered: true
-          },
-          properties: _defineProperty({}, field.name, {
-            type: 'object',
-            'x-component': 'FormV2',
-            'x-component-props': {
-              useProps: '{{ useFormFieldProps }}'
-            },
-            properties: {
-              __form_grid: {
-                type: 'void',
-                'x-component': 'Grid',
-                'x-initializer': 'FormItemInitializers',
-                properties: {}
-              }
-            }
-          })
-        }
-      };
-    } else if (schema['x-component'] === 'AssociationSelect') {
-      Object.assign(schema, {
-        type: 'string',
-        'x-designer': 'AssociationSelect.Designer'
-      });
-    } else {
-      schema.type = 'string';
-      schema['properties'] = {
-        viewer: cloneDeep(recordPickerViewer),
-        selector: cloneDeep(recordPickerSelector)
-      };
-    }
-    return schema;
-  }
-  schema.type = 'string';
-  if (readPretty) {
-    schema['properties'] = {
-      viewer: cloneDeep(recordPickerViewer)
-    };
-  } else {
-    schema['properties'] = {
-      selector: cloneDeep(recordPickerSelector)
-    };
-  }
-};
+import { constraintsProps, relationshipType, reverseFieldProperties } from './properties';
 export var o2o = {
   name: 'o2o',
   type: 'object',
@@ -86,7 +18,7 @@ export var o2o = {
     // name,
     uiSchema: {
       // title,
-      'x-component': 'RecordPicker',
+      'x-component': 'AssociationField',
       'x-component-props': {
         // mode: 'tags',
         multiple: false,
@@ -103,7 +35,7 @@ export var o2o = {
       // name,
       uiSchema: {
         // title,
-        'x-component': 'RecordPicker',
+        'x-component': 'AssociationField',
         'x-component-props': {
           // mode: 'tags',
           multiple: false,
@@ -116,17 +48,11 @@ export var o2o = {
     }
   },
   availableTypes: ['hasOne'],
-  schemaInitialize: function schemaInitialize(schema, _ref2) {
-    var field = _ref2.field,
-      block = _ref2.block,
-      readPretty = _ref2.readPretty,
-      action = _ref2.action;
-    internalSchameInitialize(schema, {
-      field: field,
-      block: block,
-      readPretty: readPretty,
-      action: action
-    });
+  schemaInitialize: function schemaInitialize(schema, _ref) {
+    var field = _ref.field,
+      block = _ref.block,
+      readPretty = _ref.readPretty,
+      action = _ref.action;
     if (['Table', 'Kanban'].includes(block)) {
       schema['x-component-props'] = schema['x-component-props'] || {};
       schema['x-component-props']['ellipsis'] = true;
@@ -254,7 +180,8 @@ export var o2o = {
       //   },
       // },
     ]
-  }
+  },
+  invariable: true
 };
 export var oho = {
   name: 'oho',
@@ -269,7 +196,7 @@ export var oho = {
     // name,
     uiSchema: {
       // title,
-      'x-component': 'RecordPicker',
+      'x-component': 'AssociationField',
       'x-component-props': {
         // mode: 'tags',
         multiple: false,
@@ -286,7 +213,7 @@ export var oho = {
       // name,
       uiSchema: {
         // title,
-        'x-component': 'RecordPicker',
+        'x-component': 'AssociationField',
         'x-component-props': {
           // mode: 'tags',
           multiple: false,
@@ -298,17 +225,12 @@ export var oho = {
       }
     }
   },
-  schemaInitialize: function schemaInitialize(schema, _ref3) {
-    var field = _ref3.field,
-      block = _ref3.block,
-      readPretty = _ref3.readPretty,
-      action = _ref3.action;
-    internalSchameInitialize(schema, {
-      field: field,
-      block: block,
-      readPretty: readPretty,
-      action: action
-    });
+  schemaInitialize: function schemaInitialize(schema, _ref2) {
+    var field = _ref2.field,
+      block = _ref2.block,
+      readPretty = _ref2.readPretty,
+      action = _ref2.action;
+    schema['type'] = 'object';
     if (['Table', 'Kanban'].includes(block)) {
       schema['x-component-props'] = schema['x-component-props'] || {};
       schema['x-component-props']['ellipsis'] = true;
@@ -427,7 +349,8 @@ export var oho = {
       //   },
       // },
     ]
-  }
+  },
+  invariable: true
 };
 export var obo = {
   name: 'obo',
@@ -442,7 +365,7 @@ export var obo = {
     // name,
     uiSchema: {
       // title,
-      'x-component': 'RecordPicker',
+      'x-component': 'AssociationField',
       'x-component-props': {
         // mode: 'tags',
         multiple: false,
@@ -458,7 +381,7 @@ export var obo = {
       // name,
       uiSchema: {
         // title,
-        'x-component': 'RecordPicker',
+        'x-component': 'AssociationField',
         'x-component-props': {
           // mode: 'tags',
           multiple: false,
@@ -470,18 +393,13 @@ export var obo = {
       }
     }
   },
-  schemaInitialize: function schemaInitialize(schema, _ref4) {
-    var field = _ref4.field,
-      block = _ref4.block,
-      readPretty = _ref4.readPretty,
-      action = _ref4.action,
-      targetCollection = _ref4.targetCollection;
-    internalSchameInitialize(schema, {
-      field: field,
-      block: block,
-      readPretty: readPretty,
-      action: action
-    });
+  schemaInitialize: function schemaInitialize(schema, _ref3) {
+    var field = _ref3.field,
+      block = _ref3.block,
+      readPretty = _ref3.readPretty,
+      action = _ref3.action,
+      targetCollection = _ref3.targetCollection;
+    schema['type'] = 'object';
     if (['Table', 'Kanban'].includes(block)) {
       schema['x-component-props'] = schema['x-component-props'] || {};
       schema['x-component-props']['ellipsis'] = true;
@@ -494,16 +412,6 @@ export var obo = {
       };
       schema['x-component-props'].fieldNames.label = targetCollection.titleField;
     }
-    if ((targetCollection === null || targetCollection === void 0 ? void 0 : targetCollection.template) === 'file') {
-      var fieldNames = schema['x-component-props']['fieldNames'] || {
-        label: 'preview',
-        value: 'id'
-      };
-      fieldNames.label = 'preview';
-      schema['x-component-props']['fieldNames'] = fieldNames;
-      schema['x-component-props'].quickUpload = true;
-      schema['x-component-props'].selectFile = true;
-    }
   },
   properties: _objectSpread(_objectSpread({
     'uiSchema.title': {
@@ -617,5 +525,6 @@ export var obo = {
       //   },
       // },
     ]
-  }
+  },
+  invariable: true
 };

package/es/collection-manager/interfaces/types.d.ts

@@ -8,6 +8,8 @@ export interface IField extends ISchema {
     default?: IDefault;
     operators?: any[];
     filterable?: any;
+    /** 不支持使用变量的值进行设置 */
+    invariable?: boolean;
     [key: string]: any;
 }
 export {};

package/es/collection-manager/interfaces/updatedBy.js

@@ -20,7 +20,7 @@ export var updatedBy = {
     uiSchema: {
       type: 'object',
       title: '{{t("Last updated by")}}',
-      'x-component': 'RecordPicker',
+      'x-component': 'AssociationField',
       'x-component-props': {
         fieldNames: {
           value: 'id',

package/es/collection-manager/sub-table.d.ts

@@ -2,20 +2,7 @@ import React from 'react';
 export declare const DataSourceContext: React.Context<any>;
 export declare const ds: {
     useSelectedRowKeys: () => any[];
-    useDataSource: (options: any) => {
-        state: {};
-        setState: import("ahooks/lib/useSetState").SetState<{}>;
-        loading: boolean;
-        data?: any;
-        error?: Error;
-        params: any;
-        cancel: () => void;
-        refresh: () => void;
-        refreshAsync: () => Promise<any>;
-        run: (...params: any) => void;
-        runAsync: (...params: any) => Promise<any>;
-        mutate: (data?: any) => void;
-    };
+    useDataSource: (options: any) => any;
     useCreateAction: () => {
         run(): Promise<void>;
     };

package/es/collection-manager/templates/tree.js

@@ -26,7 +26,7 @@ export var tree = {
       onDelete: 'CASCADE',
       uiSchema: {
         title: '{{t("Parent")}}',
-        'x-component': 'RecordPicker',
+        'x-component': 'AssociationField',
         'x-component-props': {
           // mode: 'tags',
           multiple: false,
@@ -45,7 +45,7 @@ export var tree = {
       onDelete: 'CASCADE',
       uiSchema: {
         title: '{{t("Children")}}',
-        'x-component': 'RecordPicker',
+        'x-component': 'AssociationField',
         'x-component-props': {
           // mode: 'tags',
           multiple: true,

package/es/filter-provider/FilterProvider.js

@@ -21,6 +21,7 @@ import { mergeFilter } from '../block-provider/SharedFilterProvider';
 import { useCollection } from '../collection-manager';
 import { removeNullCondition } from '../schema-component';
 import { useAssociatedFields } from './utils';
+import { uniqBy } from 'lodash';
 var FilterContext = /*#__PURE__*/createContext(null);
 /**
  * 主要用于记录当前页面中的数据区块的信息，用于在过滤区块中使用
@@ -121,8 +122,9 @@ export var useFilterBlock = function useFilterBlock() {
       existingBlock.defaultFilter = block.defaultFilter;
       return;
     }
+    // 由于 setDataBlocks 是异步操作，所以上面的 existingBlock 在判断时有可能用的是旧的 dataBlocks,所以下面还需要根据 uid 进行去重操作
     setDataBlocks(function (prev) {
-      return [].concat(_toConsumableArray(prev), [block]);
+      return uniqBy([].concat(_toConsumableArray(prev), [block]), 'uid');
     });
   };
   var getDataBlocks = function getDataBlocks() {

package/es/locale/en_US.d.ts

@@ -210,7 +210,7 @@ declare const _default: {
     "Association fields filter": string;
     "PK & FK fields": string;
     "Association fields": string;
-    "Optional fields": string;
+    "Choices fields": string;
     "System fields": string;
     "General fields": string;
     "Inherited fields": string;
@@ -241,6 +241,7 @@ declare const _default: {
     "Link to": string;
     "Link to description": string;
     "Sub-table": string;
+    "Sub-details": string;
     "System info": string;
     "Created at": string;
     "Last updated at": string;
@@ -282,6 +283,8 @@ declare const _default: {
     "Field component": string;
     Subtable: string;
     Subform: string;
+    "Field mode": string;
+    "Allow add new data": string;
     "Record picker": string;
     "Toggles the subfield mode": string;
     "Selector mode": string;

package/es/locale/en_US.js

@@ -210,7 +210,7 @@ export default {
   "Association fields filter": "Association fields filter",
   "PK & FK fields": "PK & FK fields",
   "Association fields": "Association fields",
-  "Optional fields": "Optional fields",
+  "Choices fields": "Choices fields",
   "System fields": "System fields",
   "General fields": "General fields",
   "Inherited fields": "Inherited fields",
@@ -241,6 +241,7 @@ export default {
   "Link to": "Link to",
   "Link to description": "Used to create collection relationships quickly and compatible with most common scenarios. Suitable for non-developer use. When present as a field, it is a drop-down selection used to select records from the target collection. Once created, it will simultaneously generate the associated fields of the current collection in the target collection.",
   "Sub-table": "Sub-table",
+  "Sub-details": "Sub-details",
   "System info": "System info",
   "Created at": "Created at",
   "Last updated at": "Last updated at",
@@ -281,12 +282,14 @@ export default {
   "Display field title": "Display field title",
   "Field component": "Field component",
   "Subtable": "Subtable",
-  "Subform": "Subform",
+  "Subform": "Sub-form",
+  "Field mode": "Field mode",
+  "Allow add new data": "Allow add new data",
   "Record picker": "Record picker",
   "Toggles the subfield mode": "Toggles the subfield mode",
   "Selector mode": "Selector mode",
   "Subtable mode": "Subtable mode",
-  "Subform mode": "Subform mode",
+  "Subform mode": "Sub-form mode",
   "Edit block title": "Edit block title",
   "Block title": "Block title",
   "Pattern": "Pattern",

package/es/locale/ja_JP.d.ts

@@ -556,6 +556,9 @@ declare const _default: {
     "Field component": string;
     Subtable: string;
     Subform: string;
+    "Sub-details": string;
+    "Field mode": string;
+    "Allow add new data": string;
     "Regular expression": string;
     "Enabled languages": string;
     "View all plugins": string;
@@ -576,7 +579,7 @@ declare const _default: {
     "Enable SMS authentication": string;
     "Display association fields": string;
     "Set default value": string;
-    "Optional fields": string;
+    "Choices fields": string;
     Editable: string;
     Readonly: string;
     "Easy-reading": string;

package/es/locale/ja_JP.js

@@ -556,6 +556,9 @@ export default {
   "Field component": "フィールドコンポーネント",
   "Subtable": "サブテーブル",
   "Subform": "サブフォーム",
+  "Sub-details": "サブリスト",
+  "Field mode": "フィールドコンポーネント",
+  "Allow add new data": "データの追加を許可",
   "Regular expression": "正規表現",
   "Enabled languages": "利用可能な言語",
   "View all plugins": "すべてのプラグラインを見る",
@@ -577,7 +580,7 @@ export default {
   "Enable SMS authentication": "SMS認証を有効にする",
   "Display association fields": "関連付けられたコレクションのフィールドを表示",
   "Set default value": "デフォルト値を設定",
-  "Optional fields": "オプションフィールド",
+  "Choices fields": "チョイスフィールド",
   "Editable": "編集可能",
   "Readonly": "読み取り専用（編集不可）",
   "Easy-reading": "読取り専用（読取りモード）",

package/es/locale/pt_BR.d.ts

@@ -170,7 +170,7 @@ declare const _default: {
     "Association fields filter": string;
     "PK & FK fields": string;
     "Association fields": string;
-    "Optional fields": string;
+    "Choices fields": string;
     "System fields": string;
     "General fields": string;
     "Inherited fields": string;

package/es/locale/pt_BR.js

@@ -170,7 +170,7 @@ export default {
   "Association fields filter": "Filtro de campos de associação",
   "PK & FK fields": "Campos PK & FK",
   "Association fields": "Campos de associação",
-  "Optional fields": "Campos opcionais",
+  "Choices fields": "Campos de opções",
   "System fields": "Campos do sistema",
   "General fields": "Campos gerais",
   "Inherited fields": "Campos herdados",

package/es/locale/zh_CN.d.ts

@@ -214,6 +214,7 @@ declare const _default: {
     "Edit collection": string;
     "Configure fields": string;
     "Configure columns": string;
+    "Please select the records you want to delete": string;
     "Edit field": string;
     Override: string;
     "Override field": string;
@@ -221,7 +222,7 @@ declare const _default: {
     "Association fields filter": string;
     "PK & FK fields": string;
     "Association fields": string;
-    "Optional fields": string;
+    "Choices fields": string;
     "System fields": string;
     "General fields": string;
     "Inherited fields": string;
@@ -300,11 +301,14 @@ declare const _default: {
     "Field component": string;
     Subtable: string;
     Subform: string;
+    "Sub-details": string;
     "Record picker": string;
     "Toggles the subfield mode": string;
     "Selector mode": string;
     "Subtable mode": string;
     "Subform mode": string;
+    "Field mode": string;
+    "Allow add new data": string;
     "Edit block title": string;
     "Block title": string;
     Pattern: string;

package/es/locale/zh_CN.js

@@ -214,6 +214,7 @@ export default {
   "Edit collection": "编辑数据表",
   "Configure fields": "配置字段",
   "Configure columns": "配置字段",
+  "Please select the records you want to delete": "请选择要删除的记录",
   "Edit field": "编辑字段",
   "Override": "重写",
   "Override field": "重写字段",
@@ -221,7 +222,7 @@ export default {
   "Association fields filter": "关系筛选",
   "PK & FK fields": "主外键字段",
   "Association fields": "关系字段",
-  "Optional fields": "可选字段",
+  "Choices fields": "选项字段",
   "System fields": "系统字段",
   "General fields": "普通字段",
   "Inherited fields": "继承字段",
@@ -300,11 +301,14 @@ export default {
   "Field component": "字段组件",
   "Subtable": "子表格",
   "Subform": "子表单",
+  "Sub-details": "子详情",
   "Record picker": "数据选择器",
   "Toggles the subfield mode": "切换子字段模式",
   "Selector mode": "选择器模式",
   "Subtable mode": "子表格模式",
   "Subform mode": "子表单模式",
+  "Field mode": "字段组件",
+  "Allow add new data": "允许添加数据",
   "Edit block title": "编辑区块标题",
   "Block title": "区块标题",
   "Pattern": "模式",

package/es/schema-component/antd/action/Action.Designer.js

@@ -58,6 +58,7 @@ export var ActionDesigner = function ActionDesigner(props) {
     dn = _useDesignable.dn;
   var _useTranslation2 = useTranslation(),
     t = _useTranslation2.t;
+  var isAction = useLinkageAction();
   var isPopupAction = ['create', 'update', 'view', 'customize:popup'].includes(fieldSchema['x-action'] || '');
   var isUpdateModePopupAction = ['customize:bulkUpdate', 'customize:bulkEdit'].includes(fieldSchema['x-action']);
   var _useState = useState(),
@@ -65,9 +66,8 @@ export var ActionDesigner = function ActionDesigner(props) {
     initialSchema = _useState2[0],
     setInitialSchema = _useState2[1];
   var actionType = (_fieldSchema$xAction = fieldSchema['x-action']) !== null && _fieldSchema$xAction !== void 0 ? _fieldSchema$xAction : '';
-  var isLinkageAction = linkageAction || useLinkageAction();
+  var isLinkageAction = linkageAction || isAction;
   var isChildCollectionAction = getChildrenCollections(name).length > 0 && fieldSchema['x-action'] === 'create';
-  var isSupportEditButton = fieldSchema['x-action'] !== 'expandAll';
   var isLink = fieldSchema['x-component'] === 'Action.Link';
   useEffect(function () {
     var schemaUid = uid();
@@ -96,8 +96,7 @@ export var ActionDesigner = function ActionDesigner(props) {
           'x-component': 'Input',
           title: t('Button title'),
           default: fieldSchema.title,
-          'x-component-props': {},
-          'x-visible': isSupportEditButton
+          'x-component-props': {}
           // description: `原字段标题：${collectionField?.uiSchema?.title}`,
         },
 
@@ -107,7 +106,7 @@ export var ActionDesigner = function ActionDesigner(props) {
           title: t('Button icon'),
           default: fieldSchema === null || fieldSchema === void 0 ? void 0 : (_fieldSchema$xCompon = fieldSchema['x-component-props']) === null || _fieldSchema$xCompon === void 0 ? void 0 : _fieldSchema$xCompon.icon,
           'x-component-props': {},
-          'x-visible': isSupportEditButton && !isLink
+          'x-visible': !isLink
           // description: `原字段标题：${collectionField?.uiSchema?.title}`,
         },
 

package/es/schema-component/antd/association-field/AssociationFieldProvider.d.ts

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

package/es/schema-component/antd/association-field/AssociationFieldProvider.js

@@ -0,0 +1,19 @@
+import { useField, useFieldSchema } from '@formily/react';
+import React, { useMemo } from 'react';
+import { useCollectionManager } from '../../../collection-manager';
+import { AssociationFieldContext } from './context';
+export function AssociationFieldProvider(props) {
+  var field = useField();
+  var _useCollectionManager = useCollectionManager(),
+    getCollectionField = _useCollectionManager.getCollectionField;
+  var fieldSchema = useFieldSchema();
+  var collectionField = useMemo(function () {
+    return getCollectionField(fieldSchema['x-collection-field']);
+  }, [fieldSchema['x-collection-field']]);
+  return /*#__PURE__*/React.createElement(AssociationFieldContext.Provider, {
+    value: {
+      options: collectionField,
+      field: field
+    }
+  }, props.children);
+}

package/es/schema-component/antd/association-field/AssociationSelect.d.ts

@@ -0,0 +1,14 @@
+import React from 'react';
+import { RemoteSelectProps } from '../remote-select';
+export declare type AssociationSelectProps<P = any> = RemoteSelectProps<P> & {
+    action?: string;
+    multiple?: boolean;
+};
+interface AssociationSelectInterface {
+    (props: any): React.ReactElement;
+    Designer: React.FC;
+    FilterDesigner: React.FC;
+}
+export declare const AssociationSelect: AssociationSelectInterface;
+export declare const AssociationSelectReadPretty: React.ForwardRefExoticComponent<Pick<Partial<any>, string | number | symbol> & React.RefAttributes<unknown>>;
+export {};