@nocobase/client 0.8.1-alpha.4 → 0.9.0-alpha.2

package/es/schema-component/hooks/useDesignable.js

@@ -408,25 +408,54 @@ export var Designable = /*#__PURE__*/function () {
     }
   }, {
     key: "emit",
-    value: function emit(name) {
-      var _this = this;
-
-      if (!this.events[name]) {
-        return;
-      }
+    value: function () {
+      var _emit = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee5(name) {
+        var _this = this;
+
+        var _len,
+            args,
+            _key,
+            opts,
+            others,
+            _args5 = arguments;
+
+        return regeneratorRuntime.wrap(function _callee5$(_context5) {
+          while (1) {
+            switch (_context5.prev = _context5.next) {
+              case 0:
+                if (this.events[name]) {
+                  _context5.next = 2;
+                  break;
+                }
+
+                return _context5.abrupt("return");
+
+              case 2:
+                for (_len = _args5.length, args = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
+                  args[_key - 1] = _args5[_key];
+                }
+
+                opts = args[0], others = args.slice(1);
+                return _context5.abrupt("return", Promise.all(this.events[name].map(function (fn) {
+                  return fn.bind(_this).apply(void 0, [_objectSpread({
+                    current: _this.current
+                  }, opts)].concat(_toConsumableArray(others)));
+                })));
+
+              case 5:
+              case "end":
+                return _context5.stop();
+            }
+          }
+        }, _callee5, this);
+      }));
 
-      for (var _len = arguments.length, args = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
-        args[_key - 1] = arguments[_key];
+      function emit(_x5) {
+        return _emit.apply(this, arguments);
       }
 
-      var opts = args[0],
-          others = args.slice(1);
-      this.events[name].forEach(function (fn) {
-        return fn.bind(_this).apply(void 0, [_objectSpread({
-          current: _this.current
-        }, opts)].concat(_toConsumableArray(others)));
-      });
-    }
+      return emit;
+    }()
   }, {
     key: "parentsIn",
     value: function parentsIn(schema) {

package/es/schema-component/hooks/useFieldTitle.js

@@ -1,5 +1,6 @@
 import { useField, useFieldSchema } from "@formily/react";
 import { useEffect } from "react";
+import { useCompile } from "./useCompile";
 import { useCollection, useCollectionManager } from "../../collection-manager";
 export var useFieldTitle = function useFieldTitle() {
   var _collectionField$uiSc2;
@@ -14,11 +15,12 @@ export var useFieldTitle = function useFieldTitle() {
       getCollectionJoinField = _useCollectionManager.getCollectionJoinField;
 
   var collectionField = getField(fieldSchema['name']) || getCollectionJoinField(fieldSchema['x-collection-field']);
+  var compile = useCompile();
   useEffect(function () {
     if (!(field === null || field === void 0 ? void 0 : field.title)) {
       var _collectionField$uiSc;
 
-      field.title = collectionField === null || collectionField === void 0 ? void 0 : (_collectionField$uiSc = collectionField.uiSchema) === null || _collectionField$uiSc === void 0 ? void 0 : _collectionField$uiSc.title;
+      field.title = compile(collectionField === null || collectionField === void 0 ? void 0 : (_collectionField$uiSc = collectionField.uiSchema) === null || _collectionField$uiSc === void 0 ? void 0 : _collectionField$uiSc.title);
     }
   }, [collectionField === null || collectionField === void 0 ? void 0 : (_collectionField$uiSc2 = collectionField.uiSchema) === null || _collectionField$uiSc2 === void 0 ? void 0 : _collectionField$uiSc2.title]);
 };

package/es/schema-initializer/buttons/ReadPrettyFormActionInitializers.d.ts

@@ -93,6 +93,7 @@ export declare const ReadPrettyFormActionInitializers: {
                         };
                     };
                 };
+                'x-decorator'?: undefined;
                 'x-acl-action'?: undefined;
                 'x-action-settings'?: undefined;
             };
@@ -105,6 +106,7 @@ export declare const ReadPrettyFormActionInitializers: {
                 'x-component': string;
                 'x-designer': string;
                 'x-action': string;
+                'x-decorator': string;
                 'x-acl-action': string;
                 'x-action-settings': {
                     assignedValues: {};
@@ -148,6 +150,7 @@ export declare const ReadPrettyFormActionInitializers: {
                 };
                 type?: undefined;
                 properties?: undefined;
+                'x-decorator'?: undefined;
                 'x-acl-action'?: undefined;
             };
         })[];

package/es/schema-initializer/buttons/ReadPrettyFormActionInitializers.js

@@ -98,6 +98,7 @@ export var ReadPrettyFormActionInitializers = {
         'x-component': 'Action',
         'x-designer': 'Action.Designer',
         'x-action': 'customize:update',
+        'x-decorator': 'ACLActionProvider',
         'x-acl-action': 'update',
         'x-action-settings': {
           assignedValues: {},

package/es/schema-initializer/buttons/TableActionColumnInitializers.js

@@ -176,6 +176,7 @@ export var TableActionColumnInitializers = function TableActionColumnInitializer
           title: '{{ t("Update record") }}',
           'x-component': 'Action.Link',
           'x-action': 'customize:update',
+          'x-decorator': 'ACLActionProvider',
           'x-acl-action': 'update',
           'x-designer': 'Action.Designer',
           'x-action-settings': {

package/es/schema-initializer/utils.js

@@ -283,7 +283,6 @@ export var useFormItemInitializerFields = function useFormItemInitializerFields(
     var schema = {
       type: 'string',
       name: field.name,
-      // title: field?.uiSchema?.title || field.name,
       'x-designer': 'FormItem.Designer',
       'x-component': field.interface === 'o2m' && !snapshot ? 'TableField' : 'CollectionField',
       'x-decorator': 'FormItem',
@@ -355,7 +354,6 @@ export var useAssociatedFormItemInitializerFields = function useAssociatedFormIt
       var schema = {
         type: 'string',
         name: "".concat(field.name, ".").concat(subField.name),
-        // title: subField?.uiSchema?.title || subField.name,
         'x-designer': 'FormItem.Designer',
         'x-component': 'CollectionField',
         'x-read-pretty': readPretty,
@@ -364,8 +362,7 @@ export var useAssociatedFormItemInitializerFields = function useAssociatedFormIt
         },
         'x-decorator': 'FormItem',
         'x-collection-field': "".concat(name, ".").concat(field.name, ".").concat(subField.name)
-      }; // interfaceConfig?.schemaInitialize?.(schema, { field, block: 'Form', readPretty: form.readPretty });
-
+      };
       return {
         type: 'item',
         title: (subField === null || subField === void 0 ? void 0 : (_subField$uiSchema2 = subField.uiSchema) === null || _subField$uiSchema2 === void 0 ? void 0 : _subField$uiSchema2.title) || subField.name,
@@ -808,7 +805,7 @@ export var createDetailsBlockSchema = function createDetailsBlockSchema(options)
   var resourceName = resource || association || collection;
   var schema = {
     type: 'void',
-    'x-acl-action': "".concat(resourceName, ":get"),
+    'x-acl-action': "".concat(resourceName, ":view"),
     'x-decorator': 'DetailsBlockProvider',
     'x-decorator-props': _objectSpread({
       resource: resourceName,
@@ -974,8 +971,8 @@ export var createReadPrettyFormBlockSchema = function createReadPrettyFormBlockS
         }
       }
     })
-  };
-  console.log(JSON.stringify(schema, null, 2));
+  }; // console.log(JSON.stringify(schema, null, 2));
+
   return schema;
 };
 export var createTableBlockSchema = function createTableBlockSchema(options) {
@@ -1047,8 +1044,8 @@ export var createTableBlockSchema = function createTableBlockSchema(options) {
         }
       }
     })
-  };
-  console.log(JSON.stringify(schema, null, 2));
+  }; // console.log(JSON.stringify(schema, null, 2));
+
   return schema;
 };
 export var createTableSelectorSchema = function createTableSelectorSchema(options) {

package/es/schema-templates/BlockTemplate.js

@@ -25,7 +25,7 @@ export var BlockTemplate = observer(function (props) {
   var template = useMemo(function () {
     return getTemplateById(templateId);
   }, [templateId]);
-  return template ? /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(BlockTemplateContext.Provider, {
+  return template ? /*#__PURE__*/React.createElement(BlockTemplateContext.Provider, {
     value: {
       dn: dn,
       field: field,
@@ -35,5 +35,5 @@ export var BlockTemplate = observer(function (props) {
   }, /*#__PURE__*/React.createElement(RemoteSchemaComponent, {
     noForm: true,
     uid: template === null || template === void 0 ? void 0 : template.uid
-  }))) : null;
+  })) : null;
 });

package/es/schema-templates/SchemaTemplateManagerProvider.js

@@ -62,7 +62,7 @@ export var SchemaTemplateManagerProvider = function SchemaTemplateManagerProvide
 };
 
 var regenerateUid = function regenerateUid(s) {
-  s['x-uid'] = uid();
+  s['name'] = s['x-uid'] = uid();
   Object.keys(s.properties || {}).forEach(function (key) {
     regenerateUid(s.properties[key]);
   });

package/es/system-settings/SystemSettingsShortcut.js

@@ -34,7 +34,7 @@ import locale from '../locale';
 import { ActionContext, SchemaComponent, useActionContext } from '../schema-component';
 var langs = Object.keys(locale).map(function (lang) {
   return {
-    label: locale[lang].label,
+    label: "".concat(locale[lang].label, " (").concat(lang, ")"),
     value: lang
   };
 });

package/lib/acl/ACLProvider.d.ts

@@ -1,13 +1,27 @@
+import { Schema } from '@formily/react';
 import React from 'react';
 export declare const ACLContext: React.Context<any>;
 export declare const ACLProvider: (props: any) => JSX.Element;
 export declare const ACLRolesCheckProvider: (props: any) => JSX.Element;
 export declare const useRoleRecheck: () => () => void;
 export declare const useACLContext: () => any;
-export declare const useACLRoleContext: () => any;
-export declare const ACLAllowConfigure: (props: any) => JSX.Element;
+export declare const ACLActionParamsContext: React.Context<any>;
+export declare const useACLRolesCheck: () => {
+    data: any;
+    getActionAlias: (actionPath: string) => any;
+    inResources: (resourceName: string) => any;
+    getResourceActionParams: (actionPath: string) => any;
+    getStrategyActionParams: (actionPath: string) => {};
+};
+export declare function useACLRoleContext(): any;
 export declare const ACLCollectionProvider: (props: any) => JSX.Element;
+export declare const useACLActionParamsContext: () => any;
+export declare const useRecordPkValue: () => any;
 export declare const ACLActionProvider: (props: any) => JSX.Element;
+export declare const useACLFieldWhitelist: () => {
+    whitelist: any[];
+    schemaInWhitelist(fieldSchema: Schema): boolean;
+};
 export declare const ACLCollectionFieldProvider: (props: any) => JSX.Element;
 export declare const ACLMenuItemProvider: (props: any) => JSX.Element;
 export default ACLProvider;