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

package/lib/acl/Configuration/RoleTable.js

@@ -15,15 +15,17 @@ var _apiClient = require("../../api-client");
 
 var _schemaComponent = require("../../schema-component");
 
-var _roles = require("./schemas/roles");
-
 var _MenuItemsProvider = require("../Configuration/MenuItemsProvider");
 
+var _PermisionProvider = require("../Configuration/PermisionProvider");
+
+var _roles = require("./schemas/roles");
+
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 
-var AvailableActionsContext = /*#__PURE__*/(0, _react.createContext)(null);
+var AvailableActionsContext = /*#__PURE__*/(0, _react.createContext)([]);
 
 var AvailableActionsProver = function AvailableActionsProver(props) {
   var _useRequest = (0, _apiClient.useRequest)({
@@ -52,7 +54,9 @@ var RoleTable = function RoleTable() {
   return /*#__PURE__*/_react.default.createElement("div", null, /*#__PURE__*/_react.default.createElement(AvailableActionsProver, null, /*#__PURE__*/_react.default.createElement(_schemaComponent.SchemaComponent, {
     schema: _roles.roleSchema,
     components: {
-      MenuItemsProvider: _MenuItemsProvider.MenuItemsProvider
+      MenuItemsProvider: _MenuItemsProvider.MenuItemsProvider,
+      SettingCenterPermissionProvider: _PermisionProvider.SettingCenterPermissionProvider,
+      PermissionProvider: _PermisionProvider.PermissionProvider
     }
   })));
 };

package/lib/acl/Configuration/RolesResourcesActions.js

@@ -85,8 +85,8 @@ var RolesResourcesActions = (0, _react.connect)(function (props) {
       getCollection = _useCollectionManager.getCollection,
       getCollectionFields = _useCollectionManager.getCollectionFields;
 
-  var collection = getCollection(roleCollection.name);
-  var collectionFields = getCollectionFields(roleCollection.name);
+  var collection = getCollection(roleCollection.collectionName);
+  var collectionFields = getCollectionFields(roleCollection.collectionName);
   var compile = (0, _.useCompile)();
 
   var _useTranslation = (0, _reactI18next.useTranslation)(),

package/lib/acl/Configuration/index.d.ts

@@ -3,3 +3,4 @@ export { RoleConfigure } from './RoleConfigure';
 export { RolesResourcesActions } from './RolesResourcesActions';
 export { RoleTable } from './RoleTable';
 export { StrategyActions } from './StrategyActions';
+export { SettingsCenterConfigure, SettingCenterProvider } from './ConfigureCenter';

package/lib/acl/Configuration/index.js

@@ -27,6 +27,18 @@ Object.defineProperty(exports, "RolesResourcesActions", {
     return _RolesResourcesActions.RolesResourcesActions;
   }
 });
+Object.defineProperty(exports, "SettingCenterProvider", {
+  enumerable: true,
+  get: function get() {
+    return _ConfigureCenter.SettingCenterProvider;
+  }
+});
+Object.defineProperty(exports, "SettingsCenterConfigure", {
+  enumerable: true,
+  get: function get() {
+    return _ConfigureCenter.SettingsCenterConfigure;
+  }
+});
 Object.defineProperty(exports, "StrategyActions", {
   enumerable: true,
   get: function get() {
@@ -42,4 +54,6 @@ var _RolesResourcesActions = require("./RolesResourcesActions");
 
 var _RoleTable = require("./RoleTable");
 
-var _StrategyActions = require("./StrategyActions");
+var _StrategyActions = require("./StrategyActions");
+
+var _ConfigureCenter = require("./ConfigureCenter");

package/lib/acl/Configuration/schemas/roleCollections.js

@@ -23,18 +23,34 @@ var collection = {
       'x-component': 'Input',
       required: true
     }
-  }, // {
-  //   type: 'string',
-  //   name: 'name',
-  //   interface: 'input',
-  //   uiSchema: {
-  //     title: '数据表标识',
-  //     type: 'string',
-  //     'x-component': 'Input',
-  //     description: '使用英文',
-  //   } as ISchema,
-  // },
-  {
+  }, {
+    type: 'string',
+    name: 'name',
+    interface: 'input',
+    uiSchema: {
+      title: '{{t("Collection name")}}',
+      type: 'string',
+      'x-component': 'Input'
+    }
+  }, {
+    type: 'string',
+    name: 'type',
+    interface: 'input',
+    uiSchema: {
+      title: '{{t("Resource type")}}',
+      type: 'string',
+      'x-component': 'Select',
+      enum: [{
+        label: '{{t("Collection")}}',
+        value: 'collection',
+        color: 'green'
+      }, {
+        label: '{{t("Association")}}',
+        value: 'association',
+        color: 'blue'
+      }]
+    }
+  }, {
     type: 'string',
     name: 'usingConfig',
     interface: 'input',
@@ -100,7 +116,7 @@ var roleCollectionsSchema = {
         useDataSource: '{{ cm.useDataSourceFromRAC }}'
       },
       properties: {
-        column1: {
+        column0: {
           type: 'void',
           'x-decorator': 'Table.Column.Decorator',
           'x-component': 'Table.Column',
@@ -112,6 +128,18 @@ var roleCollectionsSchema = {
             }
           }
         },
+        // column1: {
+        //   type: 'void',
+        //   'x-decorator': 'Table.Column.Decorator',
+        //   'x-component': 'Table.Column',
+        //   properties: {
+        //     type: {
+        //       type: 'string',
+        //       'x-component': 'CollectionField',
+        //       'x-read-pretty': true,
+        //     },
+        //   },
+        // },
         column2: {
           type: 'void',
           'x-decorator': 'Table.Column.Decorator',

package/lib/acl/Configuration/schemas/roles.js

@@ -7,12 +7,20 @@ exports.roleSchema = void 0;
 
 var _shared = require("@formily/shared");
 
+var _pick = _interopRequireDefault(require("lodash/pick"));
+
+var _react = require("react");
+
 var _apiClient = require("../../../api-client");
 
+var _recordProvider = require("../../../record-provider");
+
 var _schemaComponent = require("../../../schema-component");
 
 var _roleCollections = require("./roleCollections");
 
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: 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; }
@@ -120,7 +128,8 @@ var roleSchema = {
                       return (0, _apiClient.useRequest)(function () {
                         return Promise.resolve({
                           data: {
-                            name: "r_".concat((0, _shared.uid)())
+                            name: "r_".concat((0, _shared.uid)()),
+                            snippets: ['!ui.*', '!pm', '!pm.*']
                           }
                         });
                       }, _objectSpread(_objectSpread({}, options), {}, {
@@ -236,11 +245,14 @@ var roleSchema = {
                       type: 'void',
                       title: '{{t("Configure")}}',
                       'x-component': 'Action.Link',
+                      'x-decorator': 'ACLActionProvider',
+                      'x-acl-action': 'roles:update',
                       'x-component-props': {},
                       properties: {
                         drawer: {
                           type: 'void',
                           'x-component': 'Action.Drawer',
+                          'x-decorator': 'PermissionProvider',
                           title: '{{t("Configure permissions")}}',
                           properties: {
                             tabs1: {
@@ -279,6 +291,19 @@ var roleSchema = {
                                       'x-component': 'MenuConfigure'
                                     }
                                   }
+                                },
+                                tab4: {
+                                  type: 'void',
+                                  title: '{{t("Plugin settings permissions")}}',
+                                  'x-decorator': 'SettingCenterPermissionProvider',
+                                  'x-component': 'Tabs.TabPane',
+                                  'x-component-props': {},
+                                  properties: {
+                                    menu: {
+                                      'x-decorator': 'SettingCenterProvider',
+                                      'x-component': 'SettingsCenterConfigure'
+                                    }
+                                  }
                                 }
                               }
                             }
@@ -289,6 +314,8 @@ var roleSchema = {
                     update: {
                       type: 'void',
                       title: '{{t("Edit")}}',
+                      'x-decorator': 'ACLActionProvider',
+                      'x-acl-action': 'roles:update',
                       'x-component': 'Action.Link',
                       'x-component-props': {
                         type: 'primary'
@@ -299,7 +326,23 @@ var roleSchema = {
                           'x-component': 'Action.Drawer',
                           'x-decorator': 'Form',
                           'x-decorator-props': {
-                            useValues: '{{ cm.useValuesFromRecord }}'
+                            useValues: function useValues(options) {
+                              var record = (0, _recordProvider.useRecord)();
+                              var result = (0, _apiClient.useRequest)(function () {
+                                return Promise.resolve({
+                                  data: (0, _pick.default)(record, ['title', 'name', 'default'])
+                                });
+                              }, _objectSpread(_objectSpread({}, options), {}, {
+                                manual: true
+                              }));
+                              var ctx = (0, _schemaComponent.useActionContext)();
+                              (0, _react.useEffect)(function () {
+                                if (ctx.visible) {
+                                  result.run();
+                                }
+                              }, [ctx.visible]);
+                              return result;
+                            }
                           },
                           title: '{{t("Edit role")}}',
                           properties: {
@@ -346,6 +389,8 @@ var roleSchema = {
                     delete: {
                       type: 'void',
                       title: '{{ t("Delete") }}',
+                      'x-acl-action': 'roles:destroy',
+                      'x-decorator': 'ACLActionProvider',
                       'x-component': 'Action.Link',
                       'x-component-props': {
                         confirm: {

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

@@ -236,6 +236,7 @@ var scopesSchema = {
                               type: 'void',
                               title: '{{ t("Edit") }}',
                               'x-action': 'update',
+                              'x-decorator': 'ACLActionProvider',
                               'x-component': 'Action.Link',
                               'x-component-props': {
                                 openMode: 'drawer',
@@ -322,6 +323,7 @@ var scopesSchema = {
                             destroy: {
                               title: '{{ t("Delete") }}',
                               'x-action': 'destroy',
+                              'x-decorator': 'ACLActionProvider',
                               'x-component': 'Action.Link',
                               'x-designer': 'Action.Designer',
                               'x-component-props': {

package/lib/acl/index.d.ts

@@ -1,2 +1,3 @@
 export * from './ACLProvider';
 export * from './ACLShortcut';
+import './style.less';

package/lib/acl/index.js

@@ -28,4 +28,6 @@ Object.keys(_ACLShortcut).forEach(function (key) {
       return _ACLShortcut[key];
     }
   });
-});
+});
+
+require("./style.less");

package/lib/acl/style.less

@@ -0,0 +1,10 @@
+.ant-table-cell {
+  > .ant-space-horizontal {
+    .ant-space-item:empty:not(:last-child) + .ant-space-item-split {
+      display: none;
+    }
+    .ant-space-item-split:has(+ .ant-space-item:empty) {
+      display: none;
+    }
+  }
+}

package/lib/antd-config-provider/index.d.ts

@@ -1,2 +1,4 @@
-/// <reference types="react" />
+import React from 'react';
+export declare const AppLangContext: React.Context<any>;
+export declare const useAppLangContext: () => any;
 export declare function AntdConfigProvider(props: any): JSX.Element;

package/lib/antd-config-provider/index.js

@@ -1,22 +1,31 @@
 "use strict";
 
+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); }
+
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.AntdConfigProvider = AntdConfigProvider;
+exports.useAppLangContext = exports.AppLangContext = void 0;
 
 var _antd = require("antd");
 
-var _react = _interopRequireDefault(require("react"));
+var _moment = _interopRequireDefault(require("moment"));
+
+var _react = _interopRequireWildcard(require("react"));
 
 var _reactI18next = require("react-i18next");
 
 var _apiClient = require("../api-client");
 
-var _locale = _interopRequireDefault(require("../locale"));
+var _loadConstrueLocale = require("./loadConstrueLocale");
 
 var _excluded = ["remoteLocale"];
 
+function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
+
+function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: 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; }
@@ -29,7 +38,18 @@ function _objectWithoutProperties(source, excluded) { if (source == null) return
 
 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; }
 
+var AppLangContext = /*#__PURE__*/(0, _react.createContext)({});
+exports.AppLangContext = AppLangContext;
+
+var useAppLangContext = function useAppLangContext() {
+  return (0, _react.useContext)(AppLangContext);
+};
+
+exports.useAppLangContext = useAppLangContext;
+
 function AntdConfigProvider(props) {
+  var _data$data9;
+
   var remoteLocale = props.remoteLocale,
       others = _objectWithoutProperties(props, _excluded);
 
@@ -42,7 +62,7 @@ function AntdConfigProvider(props) {
     url: 'app:getLang'
   }, {
     onSuccess: function onSuccess(data) {
-      var _data$data;
+      var _data$data, _data$data4, _data$data7, _data$data8;
 
       var locale = api.auth.locale;
 
@@ -52,18 +72,32 @@ function AntdConfigProvider(props) {
         api.auth.setLocale(data === null || data === void 0 ? void 0 : (_data$data2 = data.data) === null || _data$data2 === void 0 ? void 0 : _data$data2.lang);
         i18n.changeLanguage(data === null || data === void 0 ? void 0 : (_data$data3 = data.data) === null || _data$data3 === void 0 ? void 0 : _data$data3.lang);
       }
+
+      Object.keys((data === null || data === void 0 ? void 0 : (_data$data4 = data.data) === null || _data$data4 === void 0 ? void 0 : _data$data4.resources) || {}).forEach(function (key) {
+        var _data$data5, _data$data6;
+
+        i18n.addResources(data === null || data === void 0 ? void 0 : (_data$data5 = data.data) === null || _data$data5 === void 0 ? void 0 : _data$data5.lang, key, (data === null || data === void 0 ? void 0 : (_data$data6 = data.data) === null || _data$data6 === void 0 ? void 0 : _data$data6.resources[key]) || {});
+      });
+      (0, _loadConstrueLocale.loadConstrueLocale)(data === null || data === void 0 ? void 0 : data.data);
+
+      _moment.default.locale(data === null || data === void 0 ? void 0 : (_data$data7 = data.data) === null || _data$data7 === void 0 ? void 0 : _data$data7.moment);
+
+      window['cronLocale'] = data === null || data === void 0 ? void 0 : (_data$data8 = data.data) === null || _data$data8 === void 0 ? void 0 : _data$data8.cron;
     },
     manual: !remoteLocale
   }),
+      data = _useRequest.data,
       loading = _useRequest.loading;
 
   if (loading) {
     return /*#__PURE__*/_react.default.createElement(_antd.Spin, null);
   }
 
-  return /*#__PURE__*/_react.default.createElement(_antd.ConfigProvider, _objectSpread(_objectSpread({
+  return /*#__PURE__*/_react.default.createElement(AppLangContext.Provider, {
+    value: data === null || data === void 0 ? void 0 : data.data
+  }, /*#__PURE__*/_react.default.createElement(_antd.ConfigProvider, _objectSpread(_objectSpread({
     dropdownMatchSelectWidth: false
   }, others), {}, {
-    locale: _locale.default[i18n.language].antd
-  }), props.children);
+    locale: (data === null || data === void 0 ? void 0 : (_data$data9 = data.data) === null || _data$data9 === void 0 ? void 0 : _data$data9.antd) || {}
+  }), props.children));
 }

package/lib/antd-config-provider/loadConstrueLocale.d.ts

@@ -0,0 +1 @@
+export declare const loadConstrueLocale: (data: any) => void;