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

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

@@ -4,35 +4,19 @@ 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); }
-function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
-function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
-function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
-function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
-function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0); } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i.return && (_r = _i.return(), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } }
-function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
-import React, { useEffect, useState } from 'react';
-import { useField, observer } from '@formily/react';
+import React from 'react';
+import { observer } from '@formily/react';
 import { AssociationFieldProvider } from './AssociationFieldProvider';
 import { InternalNester } from './InternalNester';
 import { ReadPrettyInternalViewer } from './InternalViewer';
-import { useCollection, useCollectionManager } from '../../../collection-manager';
 import { InternalSubTable } from './InternalSubTable';
 import { FileManageReadPretty } from './FileManager';
+import { useAssociationFieldContext } from './hooks';
+var ReadPrettyAssociationField = observer(function (props) {
+  var _useAssociationFieldC = useAssociationFieldContext(),
+    currentMode = _useAssociationFieldC.currentMode;
+  return /*#__PURE__*/React.createElement(React.Fragment, null, ['Select', 'Picker'].includes(currentMode) && /*#__PURE__*/React.createElement(ReadPrettyInternalViewer, _objectSpread({}, props)), currentMode === 'Nester' && /*#__PURE__*/React.createElement(InternalNester, _objectSpread({}, props)), currentMode === 'SubTable' && /*#__PURE__*/React.createElement(InternalSubTable, _objectSpread({}, props)), currentMode === 'FileManager' && /*#__PURE__*/React.createElement(FileManageReadPretty, _objectSpread({}, props)));
+});
 export var ReadPretty = observer(function (props) {
-  var _getCollection;
-  var field = useField();
-  var _useCollection = useCollection(),
-    getField = _useCollection.getField;
-  var _useCollectionManager = useCollectionManager(),
-    getCollection = _useCollectionManager.getCollection;
-  var collectionField = getField(field.props.name);
-  var isFileCollection = ((_getCollection = getCollection(collectionField === null || collectionField === void 0 ? void 0 : collectionField.target)) === null || _getCollection === void 0 ? void 0 : _getCollection.template) === 'file';
-  var _useState = useState(props.mode || (isFileCollection ? 'FileManager' : 'Select')),
-    _useState2 = _slicedToArray(_useState, 2),
-    currentMode = _useState2[0],
-    setCurrentMode = _useState2[1];
-  useEffect(function () {
-    props.mode && setCurrentMode(props.mode);
-  }, [props.mode]);
-  return /*#__PURE__*/React.createElement(AssociationFieldProvider, null, ['Select', 'Picker'].includes(currentMode) && /*#__PURE__*/React.createElement(ReadPrettyInternalViewer, _objectSpread({}, props)), currentMode === 'Nester' && /*#__PURE__*/React.createElement(InternalNester, _objectSpread({}, props)), currentMode === 'SubTable' && /*#__PURE__*/React.createElement(InternalSubTable, _objectSpread({}, props)), currentMode === 'FileManager' && /*#__PURE__*/React.createElement(FileManageReadPretty, _objectSpread({}, props)));
+  return /*#__PURE__*/React.createElement(AssociationFieldProvider, null, /*#__PURE__*/React.createElement(ReadPrettyAssociationField, _objectSpread({}, props)));
 });

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

@@ -0,0 +1,2 @@
+import React from 'react';
+export declare const CreateRecordAction: React.MemoExoticComponent<React.FunctionComponent<unknown>>;

package/es/schema-component/antd/association-field/components/CreateRecordAction.js

@@ -0,0 +1,61 @@
+function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
+function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
+function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
+function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
+function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0); } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i.return && (_r = _i.return(), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } }
+function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
+import { RecursionField, observer, useField, useFieldSchema } from '@formily/react';
+import React, { useState } from 'react';
+import { CollectionProvider } from '../../../../collection-manager';
+import { CreateAction } from '../../../../schema-initializer/components';
+import { ActionContext, useActionContext } from '../../action';
+import { useAssociationFieldContext, useInsertSchema } from '../hooks';
+import schema from '../schema';
+export var CreateRecordAction = observer(function (props) {
+  var field = useField();
+  var fieldSchema = useFieldSchema();
+  var ctx = useActionContext();
+  var insertAddNewer = useInsertSchema('AddNewer');
+  var _useAssociationFieldC = useAssociationFieldContext(),
+    collectionField = _useAssociationFieldC.options;
+  var _useState = useState(false),
+    _useState2 = _slicedToArray(_useState, 2),
+    visibleAddNewer = _useState2[0],
+    setVisibleAddNewer = _useState2[1];
+  var _useState3 = useState(collectionField === null || collectionField === void 0 ? void 0 : collectionField.target),
+    _useState4 = _slicedToArray(_useState3, 2),
+    currentCollection = _useState4[0],
+    setCurrentCollection = _useState4[1];
+  var addbuttonClick = function addbuttonClick(name) {
+    insertAddNewer(schema.AddNewer);
+    setVisibleAddNewer(true);
+    setCurrentCollection(name);
+  };
+  return /*#__PURE__*/React.createElement(CollectionProvider, {
+    name: collectionField === null || collectionField === void 0 ? void 0 : collectionField.target
+  }, /*#__PURE__*/React.createElement(CreateAction, _objectSpread(_objectSpread({}, props), {}, {
+    onClick: function onClick(arg) {
+      return addbuttonClick(arg);
+    }
+  })), /*#__PURE__*/React.createElement(ActionContext.Provider, {
+    value: _objectSpread(_objectSpread({}, ctx), {}, {
+      visible: visibleAddNewer,
+      setVisible: setVisibleAddNewer
+    })
+  }, /*#__PURE__*/React.createElement(CollectionProvider, {
+    name: currentCollection
+  }, /*#__PURE__*/React.createElement(RecursionField, {
+    onlyRenderProperties: true,
+    basePath: field.address,
+    schema: fieldSchema,
+    filterProperties: function filterProperties(s) {
+      return s['x-component'] === 'AssociationField.AddNewer';
+    }
+  }))));
+});

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

@@ -1,7 +1,10 @@
 /// <reference types="react" />
 import { GeneralField } from '@formily/core';
 export interface AssociationFieldContextProps {
-    options: any;
-    field: GeneralField;
+    options?: any;
+    field?: GeneralField;
+    currentMode?: string;
+    allowMultiple?: boolean;
+    allowDissociate?: boolean;
 }
 export declare const AssociationFieldContext: import("react").Context<AssociationFieldContextProps>;

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

@@ -1,2 +1,2 @@
 import { createContext } from 'react';
-export var AssociationFieldContext = /*#__PURE__*/createContext(null);
+export var AssociationFieldContext = /*#__PURE__*/createContext({});

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

@@ -3,6 +3,9 @@ export declare const useInsertSchema: (component: any) => (ss: any) => void;
 export declare function useAssociationFieldContext<F extends GeneralField>(): {
     options: any;
     field: F;
+    currentMode: string;
+    allowMultiple?: boolean;
+    allowDissociate?: boolean;
 };
 export default function useServiceOptions(props: any): any;
 export declare const useFieldNames: (props: any) => any;

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

@@ -7,12 +7,12 @@ function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" =
 import { useFieldSchema } from '@formily/react';
 import cloneDeep from 'lodash/cloneDeep';
 import { useCallback, useContext, useMemo } from 'react';
-import { useDesignable } from '../../hooks';
 import { mergeFilter } from '../../../block-provider/SharedFilterProvider';
-import { AssociationFieldContext } from './context';
-import { useRecord } from '../../../record-provider';
-import { isInFilterFormBlock } from '../../../filter-provider';
 import { useCollection, useCollectionManager } from '../../../collection-manager';
+import { isInFilterFormBlock } from '../../../filter-provider';
+import { useRecord } from '../../../record-provider';
+import { useDesignable } from '../../hooks';
+import { AssociationFieldContext } from './context';
 export var useInsertSchema = function useInsertSchema(component) {
   var fieldSchema = useFieldSchema();
   var _useDesignable = useDesignable(),
@@ -41,10 +41,10 @@ export default function useServiceOptions(props) {
   var params = (service === null || service === void 0 ? void 0 : service.params) || {};
   var fieldSchema = useFieldSchema();
   var _useCollection = useCollection(),
-    getField = _useCollection.getField,
-    fields = _useCollection.fields;
+    getField = _useCollection.getField;
   var _useCollectionManager = useCollectionManager(),
-    getCollectionFields = _useCollectionManager.getCollectionFields;
+    getCollectionFields = _useCollectionManager.getCollectionFields,
+    getCollectionJoinField = _useCollectionManager.getCollectionJoinField;
   var record = useRecord();
   var normalizeValues = useCallback(function (obj) {
     if (obj && _typeof(obj) === 'object') {
@@ -63,14 +63,14 @@ export default function useServiceOptions(props) {
     }
   }, [props.value, normalizeValues]);
   var collectionField = useMemo(function () {
-    return getField(fieldSchema.name);
+    return getField(fieldSchema.name) || getCollectionJoinField(fieldSchema === null || fieldSchema === void 0 ? void 0 : fieldSchema['x-collection-field']);
   }, [fieldSchema.name]);
   var sourceValue = record === null || record === void 0 ? void 0 : record[collectionField === null || collectionField === void 0 ? void 0 : collectionField.sourceKey];
   var filter = useMemo(function () {
     var isOToAny = ['oho', 'o2m'].includes(collectionField === null || collectionField === void 0 ? void 0 : collectionField.interface);
-    return mergeFilter([mergeFilter([isOToAny && !isInFilterFormBlock(fieldSchema) ? _defineProperty({}, collectionField.foreignKey, {
+    return mergeFilter([mergeFilter([isOToAny && !isInFilterFormBlock(fieldSchema) && (collectionField === null || collectionField === void 0 ? void 0 : collectionField.foreignKey) ? _defineProperty({}, collectionField.foreignKey, {
       $is: null
-    }) : null, params === null || params === void 0 ? void 0 : params.filter]), isOToAny && sourceValue !== undefined && sourceValue !== null && !isInFilterFormBlock(fieldSchema) ? _defineProperty({}, collectionField.foreignKey, {
+    }) : null, params === null || params === void 0 ? void 0 : params.filter]), isOToAny && sourceValue !== undefined && sourceValue !== null && !isInFilterFormBlock(fieldSchema) && (collectionField === null || collectionField === void 0 ? void 0 : collectionField.foreignKey) ? _defineProperty({}, collectionField.foreignKey, {
       $eq: sourceValue
     }) : null, (params === null || params === void 0 ? void 0 : params.filter) && value ? _defineProperty({}, fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames.value, _defineProperty({}, '$in', value)) : null], '$or');
   }, [params === null || params === void 0 ? void 0 : params.filter, getCollectionFields, collectionField, sourceValue, value, fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames.value]);

package/es/schema-component/antd/association-filter/AssociationFilter.Item.js

@@ -20,9 +20,9 @@ import cls from 'classnames';
 import React, { useMemo, useState } from 'react';
 import { SortableItem } from '../../common';
 import { useCompile, useDesigner, useProps } from '../../hooks';
+import { EllipsisWithTooltip } from '../input';
 import { getLabelFormatValue, useLabelUiSchema } from '../record-picker';
 import { AssociationFilter } from './AssociationFilter';
-import { EllipsisWithTooltip } from '../input';
 var Panel = Collapse.Panel;
 export var AssociationFilterItem = function AssociationFilterItem(props) {
   var _fieldSchema$xCompon, _fieldSchema$xCompon$, _fieldSchema$title, _collectionField$uiSc;
@@ -45,7 +45,7 @@ export var AssociationFilterItem = function AssociationFilterItem(props) {
     searchVisible = _useState2[0],
     setSearchVisible = _useState2[1];
   var defaultActiveKeyCollapse = useMemo(function () {
-    return defaultCollapse ? [collectionField.name] : [];
+    return defaultCollapse && (collectionField === null || collectionField === void 0 ? void 0 : collectionField.name) ? [collectionField.name] : [];
   }, []);
   var valueKey = _valueKey || (collectionField === null || collectionField === void 0 ? void 0 : collectionField.targetKey) || 'id';
   var labelKey = _labelKey || ((_fieldSchema$xCompon = fieldSchema['x-component-props']) === null || _fieldSchema$xCompon === void 0 ? void 0 : (_fieldSchema$xCompon$ = _fieldSchema$xCompon.fieldNames) === null || _fieldSchema$xCompon$ === void 0 ? void 0 : _fieldSchema$xCompon$.label) || valueKey;
@@ -93,7 +93,7 @@ export var AssociationFilterItem = function AssociationFilterItem(props) {
   var handleSearchInput = function handleSearchInput(e) {
     _handleSearchInput(e);
   };
-  var title = (_fieldSchema$title = fieldSchema.title) !== null && _fieldSchema$title !== void 0 ? _fieldSchema$title : (_collectionField$uiSc = collectionField.uiSchema) === null || _collectionField$uiSc === void 0 ? void 0 : _collectionField$uiSc.title;
+  var title = (_fieldSchema$title = fieldSchema.title) !== null && _fieldSchema$title !== void 0 ? _fieldSchema$title : collectionField === null || collectionField === void 0 ? void 0 : (_collectionField$uiSc = collectionField.uiSchema) === null || _collectionField$uiSc === void 0 ? void 0 : _collectionField$uiSc.title;
   var labelUiSchema = useLabelUiSchema(collectionField, (fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames.title) || 'label');
   return /*#__PURE__*/React.createElement(SortableItem, {
     className: cls('nb-block-item', props.className, css(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n          position: relative;\n          &:hover {\n            > .general-schema-designer {\n              display: block;\n            }\n          }\n          &.nb-form-item:hover {\n            > .general-schema-designer {\n              background: rgba(241, 139, 98, 0.06) !important;\n              border: 0 !important;\n              top: -5px !important;\n              bottom: -5px !important;\n              left: -5px !important;\n              right: -5px !important;\n            }\n          }\n          > .general-schema-designer {\n            position: absolute;\n            z-index: 999;\n            top: 0;\n            bottom: 0;\n            left: 0;\n            right: 0;\n            display: none;\n            border: 2px solid rgba(241, 139, 98, 0.3);\n            pointer-events: none;\n            > .general-schema-designer-icons {\n              position: absolute;\n              right: 2px;\n              top: 2px;\n              line-height: 16px;\n              pointer-events: all;\n              .ant-space-item {\n                background-color: #f18b62;\n                color: #fff;\n                line-height: 16px;\n                width: 16px;\n                padding-left: 1px;\n              }\n            }\n          }\n        "]))))