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

package/es/pm/index.js

@@ -9,9 +9,10 @@ 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 { PageHeader } from '@ant-design/pro-layout';
 import { css } from '@emotion/css';
-import { Layout, Menu, PageHeader, Result, Spin, Tabs } from 'antd';
-import { sortBy } from 'lodash';
+import { Layout, Menu, Result, Spin, Tabs } from 'antd';
+import _, { sortBy } from 'lodash';
 import React, { createContext, useContext, useEffect, useMemo } from 'react';
 import { useTranslation } from 'react-i18next';
 import { Navigate, useNavigate, useParams } from 'react-router-dom';
@@ -109,23 +110,28 @@ var PluginList = function PluginList(props) {
     }
   }, []);
   return snippets.includes('pm') ? /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(PageHeader, {
+    style: {
+      backgroundColor: 'white',
+      paddingBottom: 0
+    },
     ghost: false,
     title: t('Plugin manager'),
     footer: /*#__PURE__*/React.createElement(Tabs, {
       activeKey: tabName,
       onChange: function onChange(activeKey) {
         navigate("/admin/pm/list/".concat(activeKey));
-      }
-    }, /*#__PURE__*/React.createElement(Tabs.TabPane, {
-      tab: t('Local'),
-      key: 'local'
-    }), /*#__PURE__*/React.createElement(Tabs.TabPane, {
-      tab: t('Built-in'),
-      key: 'built-in'
-    }), /*#__PURE__*/React.createElement(Tabs.TabPane, {
-      tab: t('Marketplace'),
-      key: 'marketplace'
-    }))
+      },
+      items: [{
+        key: 'local',
+        label: t('Local')
+      }, {
+        key: 'built-in',
+        label: t('Built-in')
+      }, {
+        key: 'marketplace',
+        label: t('Marketplace')
+      }]
+    })
   }), /*#__PURE__*/React.createElement("div", {
     className: 'm24',
     style: {
@@ -190,7 +196,7 @@ var settings = {
     }
   }
 };
-export var getPluginsTabs = function getPluginsTabs(items, snippets) {
+export var getPluginsTabs = _.memoize(function (items, snippets) {
   var pluginsTabs = Object.keys(items).map(function (plugin) {
     var tabsObj = items[plugin].tabs;
     var tabs = sortBy(Object.keys(tabsObj).map(function (tab) {
@@ -213,7 +219,7 @@ export var getPluginsTabs = function getPluginsTabs(items, snippets) {
   return sortBy(pluginsTabs, function (o) {
     return !o.isAllow;
   });
-};
+});
 var SettingsCenter = function SettingsCenter(props) {
   var _activePlugin$tabs$fi, _items$pluginName2, _items$pluginName2$ta, _items$pluginName2$ta2, _items$pluginName3, _plugin$tabs;
   var _useACLRoleContext2 = useACLRoleContext(),
@@ -289,19 +295,27 @@ var SettingsCenter = function SettingsCenter(props) {
     },
     items: menuItems
   })), /*#__PURE__*/React.createElement(Layout.Content, null, aclPluginTabCheck && /*#__PURE__*/React.createElement(PageHeader, {
+    style: {
+      backgroundColor: 'white',
+      paddingBottom: 0
+    },
     ghost: false,
     title: compile((_items$pluginName3 = items[pluginName]) === null || _items$pluginName3 === void 0 ? void 0 : _items$pluginName3.title),
     footer: /*#__PURE__*/React.createElement(Tabs, {
       activeKey: tabName,
       onChange: function onChange(activeKey) {
         navigate("/admin/settings/".concat(pluginName, "/").concat(activeKey));
-      }
-    }, (_plugin$tabs = plugin.tabs) === null || _plugin$tabs === void 0 ? void 0 : _plugin$tabs.map(function (tab) {
-      return tab.isAllow && /*#__PURE__*/React.createElement(Tabs.TabPane, {
-        tab: compile(tab === null || tab === void 0 ? void 0 : tab.title),
-        key: tab.key
-      });
-    }))
+      },
+      items: (_plugin$tabs = plugin.tabs) === null || _plugin$tabs === void 0 ? void 0 : _plugin$tabs.map(function (tab) {
+        if (!tab.isAllow) {
+          return null;
+        }
+        return {
+          label: compile(tab === null || tab === void 0 ? void 0 : tab.title),
+          key: tab.key
+        };
+      })
+    })
   }), /*#__PURE__*/React.createElement("div", {
     className: 'm24',
     style: {

package/es/route-switch/antd/admin-layout/index.js

@@ -16,7 +16,7 @@ import { css } from '@emotion/css';
 import { Layout, Spin } from 'antd';
 import React, { createContext, useContext, useEffect, useMemo, useRef, useState } from 'react';
 import { Outlet, useNavigate, useParams } from 'react-router-dom';
-import { ACLRolesCheckProvider, CurrentAppInfoProvider, CurrentUser, CurrentUserProvider, PinnedPluginList, RemoteCollectionManagerProvider, RemoteSchemaTemplateManagerProvider, SchemaComponent, findByUid, findMenuItem, useACLRoleContext, useDocumentTitle, useRequest, useRoute, useSystemSettings } from '../../../';
+import { ACLRolesCheckProvider, CurrentAppInfoProvider, CurrentUser, CurrentUserProvider, PinnedPluginList, RemoteCollectionManagerProvider, RemoteSchemaTemplateManagerProvider, SchemaComponent, findByUid, findMenuItem, useACLRoleContext, useAdminSchemaUid, useDocumentTitle, useRequest, useSystemSettings } from '../../../';
 import { useCollectionManager } from '../../../collection-manager';
 var filterByACL = function filterByACL(schema, options) {
   var allowAll = options.allowAll,
@@ -60,7 +60,6 @@ var MenuEditor = function MenuEditor(props) {
   var defaultSelectedUid = params.name;
   var sideMenuRef = props.sideMenuRef;
   var ctx = useACLRoleContext();
-  var route = useRoute();
   var _useState = useState(null),
     _useState2 = _slicedToArray(_useState, 2),
     current = _useState2[0],
@@ -72,10 +71,11 @@ var MenuEditor = function MenuEditor(props) {
     setCurrent(schema);
     navigate("/admin/".concat(schema['x-uid']));
   };
+  var adminSchemaUid = useAdminSchemaUid();
   var _useRequest = useRequest({
-      url: "/uiSchemas:getJsonSchema/".concat(route.uiSchemaUid)
+      url: "/uiSchemas:getJsonSchema/".concat(adminSchemaUid)
     }, {
-      refreshDeps: [route.uiSchemaUid],
+      refreshDeps: [adminSchemaUid],
       onSuccess: function onSuccess(data) {
         var schema = filterByACL(data === null || data === void 0 ? void 0 : data.data, ctx);
         // url 为 `/admin` 的情况

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

@@ -15,7 +15,7 @@ function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _ty
 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 { connect, mapProps, useField, useFieldSchema } from '@formily/react';
 import { isValid, uid } from '@formily/shared';
-import { Tree as AntdTree, Menu } from 'antd';
+import { Tree as AntdTree } from 'antd';
 import { cloneDeep } from 'lodash';
 import React, { useEffect, useState } from 'react';
 import { useTranslation } from 'react-i18next';
@@ -49,7 +49,7 @@ var MenuGroup = function MenuGroup(props) {
   if (!['customize:popup', 'customize:update', 'customize:save', 'customize:table:request', 'customize:form:request'].includes(actionType)) {
     return /*#__PURE__*/React.createElement(React.Fragment, null, props.children);
   }
-  return /*#__PURE__*/React.createElement(Menu.ItemGroup, {
+  return /*#__PURE__*/React.createElement(SchemaSettings.ItemGroup, {
     title: "".concat(t('Customize'), " > ").concat(actionTitles[actionType])
   }, props.children);
 };
@@ -63,9 +63,7 @@ export var ActionDesigner = function ActionDesigner(props) {
   var _useCollection = useCollection(),
     name = _useCollection.name;
   var _useCollectionManager = useCollectionManager(),
-    getChildrenCollections = _useCollectionManager.getChildrenCollections,
-    getCollection = _useCollectionManager.getCollection,
-    getCollectionField = _useCollectionManager.getCollectionField;
+    getChildrenCollections = _useCollectionManager.getChildrenCollections;
   var _useDesignable = useDesignable(),
     dn = _useDesignable.dn;
   var _useTranslation2 = useTranslation(),

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

@@ -45,7 +45,7 @@ export var ActionDrawer = observer(function (props) {
     width: openSizeWidthMap.get(openSize),
     title: field.title
   }, others), drawerProps), modalProps), {}, {
-    style: _objectSpread(_objectSpread({}, drawerProps === null || drawerProps === void 0 ? void 0 : drawerProps.style), others === null || others === void 0 ? void 0 : others.style),
+    rootStyle: _objectSpread(_objectSpread({}, drawerProps === null || drawerProps === void 0 ? void 0 : drawerProps.style), others === null || others === void 0 ? void 0 : others.style),
     destroyOnClose: true,
     open: visible,
     onClose: function onClose() {

package/es/schema-component/antd/action/ActionBar.js

@@ -9,7 +9,7 @@ function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input ==
 function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
 import { cx } from '@emotion/css';
-import { observer, RecursionField, useFieldSchema } from '@formily/react';
+import { RecursionField, observer, useFieldSchema } from '@formily/react';
 import { Space } from 'antd';
 import React, { useContext } from 'react';
 import { createPortal } from 'react-dom';

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

@@ -35,7 +35,7 @@ export var SubTable = observer(function (props) {
   return /*#__PURE__*/React.createElement("div", {
     className: css(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n          .ant-table-footer {\n            padding: 0 !important;\n          }\n          .ant-formily-item-error-help {\n            display: none;\n          }\n          .ant-description-textarea {\n            line-height: 34px;\n          }\n          .ant-table-cell .ant-formily-item-error-help {\n            display: block;\n            position: absolute;\n            font-size: 12px;\n            top: 100%;\n            background: #fff;\n            width: 100%;\n            margin-top: 3px;\n            padding: 3px;\n            z-index: 1;\n            border-radius: 3px;\n            box-shadow: 0 0 10px #eee;\n            animation: none;\n            transform: translateY(0);\n            opacity: 1;\n          }\n        "])))
   }, /*#__PURE__*/React.createElement(Table, {
-    className: css(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\n            .ant-select-selector {\n              /* min-height: 31px; */\n            }\n            .ant-formily-item.ant-formily-item-feedback-layout-loose {\n              margin-bottom: 0px !important;\n            }\n            .ant-formily-editable {\n              vertical-align: sub;\n            }\n            .ant-table table {\n            }\n            td:not(.ant-table-selection-column) {\n              padding: 0 !important;\n            }\n          "]))),
+    className: css(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\n            .ant-select-selector {\n              /* min-height: 31px; */\n            }\n            .ant-formily-item.ant-formily-item-feedback-layout-loose {\n              margin-bottom: 0px !important;\n            }\n            .ant-formily-editable {\n              vertical-align: sub;\n            }\n            .ant-table table {\n            }\n            td:not(.ant-table-selection-column) {\n              padding: 5px !important;\n            }\n          "]))),
     bordered: true,
     size: 'small',
     field: field,

package/es/schema-component/antd/calendar/DeleteEvent.js

@@ -94,7 +94,7 @@ export var DeleteEvent = observer(function () {
     t = _useTranslation.t;
   return /*#__PURE__*/createPortal( /*#__PURE__*/React.createElement(Modal, {
     title: cron ? t('Delete events') : null,
-    visible: visible,
+    open: visible,
     onCancel: function onCancel() {
       return setVisible(false);
     },

package/es/schema-component/antd/cascader/Cascader.js

@@ -76,7 +76,7 @@ export var Cascader = connect(function (props) {
     }));
   };
   var handelDropDownVisible = function handelDropDownVisible(value) {
-    if (value && !field.dataSource) {
+    if (value && !field.dataSource.length) {
       run();
     }
   };

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

@@ -83,6 +83,7 @@ FormItem.Designer = function Designer() {
     getField = _useCollection.getField;
   var _useFormBlockContext = useFormBlockContext(),
     form = _useFormBlockContext.form;
+  var ctx = useBlockRequestContext();
   var field = useField();
   var fieldSchema = useFieldSchema();
   var _useTranslation = useTranslation(),
@@ -399,12 +400,15 @@ FormItem.Designer = function Designer() {
       properties: {
         filter: {
           default: defaultFilter,
-          // title: '数据范围',
           enum: dataSource,
           'x-component': 'Filter',
           'x-component-props': {
             dynamicComponent: function dynamicComponent(props) {
-              return FilterDynamicComponent(_objectSpread({}, props));
+              return FilterDynamicComponent(_objectSpread(_objectSpread({}, props), {}, {
+                form: form,
+                collectionField: collectionField,
+                rootCollection: ctx.props.collection || ctx.props.resource
+              }));
             }
           }
         }
@@ -416,7 +420,6 @@ FormItem.Designer = function Designer() {
       filter = removeNullCondition(filter);
       _.set(field.componentProps, 'service.params.filter', filter);
       fieldSchema['x-component-props'] = field.componentProps;
-      field.componentProps = field.componentProps;
       dn.emit('patch', {
         schema: (_schema5 = {}, _defineProperty(_schema5, 'x-uid', fieldSchema['x-uid']), _defineProperty(_schema5, 'x-component-props', field.componentProps), _schema5)
       });
@@ -778,6 +781,10 @@ FormItem.Designer = function Designer() {
 export function isFileCollection(collection) {
   return (collection === null || collection === void 0 ? void 0 : collection.template) === 'file';
 }
+function extractFirstPart(path) {
+  var firstDotIndex = path.indexOf('.');
+  return firstDotIndex !== -1 ? path.slice(0, firstDotIndex) : path;
+}
 FormItem.FilterFormDesigner = FilterFormDesigner;
 export function getFieldDefaultValue(fieldSchema, collectionField) {
   var _fieldSchema$default, _collectionField$uiSc5;

package/es/schema-component/antd/grid-card/GridCard.Designer.js

@@ -4,21 +4,20 @@ 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 { useFieldSchema, useField } from '@formily/react';
-import React, { useMemo } from 'react';
 import { ArrayItems } from '@formily/antd';
+import { useField, useFieldSchema } from '@formily/react';
 import { Slider } from 'antd';
 import _ from 'lodash';
+import React, { useMemo } from 'react';
 import { useTranslation } from 'react-i18next';
 import { useCollection, useCollectionFilterOptions, useSortFields } from '../../../collection-manager';
 import { GeneralSchemaDesigner, SchemaSettings } from '../../../schema-settings';
 import { useSchemaTemplate } from '../../../schema-templates';
+import { SchemaComponentOptions } from '../../core';
 import { useDesignable } from '../../hooks';
 import { removeNullCondition } from '../filter';
 import { FilterDynamicComponent } from '../table-v2/FilterDynamicComponent';
-import { SchemaComponentOptions } from '../../core';
 import { defaultColumnCount, gridSizes, pageSizeOptions, screenSizeMaps, screenSizeTitleMaps } from './options';
-Slider;
 var columnCountMarks = [1, 2, 3, 4, 6, 8, 12, 24].reduce(function (obj, cur) {
   obj[cur] = cur;
   return obj;

package/es/schema-component/antd/index.less

@@ -42,7 +42,5 @@
 }
 
 html body {
-  --adm-font-family: -apple-system, BlinkMacSystemFont, Segoe UI, PingFang SC, Hiragino Sans GB,
-  Microsoft YaHei, Helvetica Neue, Helvetica, Arial, sans-serif, Apple Color Emoji, Segoe UI Emoji,
-  Segoe UI Symbol;
+  --adm-font-family: -apple-system,BlinkMacSystemFont,"Segoe UI",Roboto,"Helvetica Neue",Arial,"Noto Sans",sans-serif,"Apple Color Emoji","Segoe UI Emoji","Segoe UI Symbol","Noto Color Emoji";
 }