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

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

@@ -0,0 +1,304 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.loadConstrueLocale = void 0;
+
+var _cronstrue = _interopRequireDefault(require("cronstrue"));
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
+
+function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } }
+
+function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); Object.defineProperty(Constructor, "prototype", { writable: false }); return Constructor; }
+
+var CronstrueLocale = /*#__PURE__*/function () {
+  function CronstrueLocale(data) {
+    _classCallCheck(this, CronstrueLocale);
+
+    this.data = void 0;
+    this.data = data;
+  }
+
+  _createClass(CronstrueLocale, [{
+    key: "atX0SecondsPastTheMinuteGt20",
+    value: function atX0SecondsPastTheMinuteGt20() {
+      return this.data['atX0SecondsPastTheMinuteGt20'];
+    }
+  }, {
+    key: "atX0MinutesPastTheHourGt20",
+    value: function atX0MinutesPastTheHourGt20() {
+      return this.data['atX0MinutesPastTheHourGt20'];
+    }
+  }, {
+    key: "commaMonthX0ThroughMonthX1",
+    value: function commaMonthX0ThroughMonthX1() {
+      return this.data['commaMonthX0ThroughMonthX1'];
+    }
+  }, {
+    key: "commaYearX0ThroughYearX1",
+    value: function commaYearX0ThroughYearX1() {
+      return this.data['commaYearX0ThroughYearX1'];
+    }
+  }, {
+    key: "use24HourTimeFormatByDefault",
+    value: function use24HourTimeFormatByDefault() {
+      return this.data['use24HourTimeFormatByDefault'];
+    }
+  }, {
+    key: "anErrorOccuredWhenGeneratingTheExpressionD",
+    value: function anErrorOccuredWhenGeneratingTheExpressionD() {
+      return this.data['anErrorOccuredWhenGeneratingTheExpressionD'];
+    }
+  }, {
+    key: "everyMinute",
+    value: function everyMinute() {
+      return this.data['everyMinute'];
+    }
+  }, {
+    key: "everyHour",
+    value: function everyHour() {
+      return this.data['everyHour'];
+    }
+  }, {
+    key: "atSpace",
+    value: function atSpace() {
+      return this.data['atSpace'];
+    }
+  }, {
+    key: "everyMinuteBetweenX0AndX1",
+    value: function everyMinuteBetweenX0AndX1() {
+      return this.data['everyMinuteBetweenX0AndX1'];
+    }
+  }, {
+    key: "at",
+    value: function at() {
+      return this.data['at'];
+    }
+  }, {
+    key: "spaceAnd",
+    value: function spaceAnd() {
+      return this.data['spaceAnd'];
+    }
+  }, {
+    key: "everySecond",
+    value: function everySecond() {
+      return this.data['everySecond'];
+    }
+  }, {
+    key: "everyX0Seconds",
+    value: function everyX0Seconds() {
+      return this.data['everyX0Seconds'];
+    }
+  }, {
+    key: "secondsX0ThroughX1PastTheMinute",
+    value: function secondsX0ThroughX1PastTheMinute() {
+      return this.data['secondsX0ThroughX1PastTheMinute'];
+    }
+  }, {
+    key: "atX0SecondsPastTheMinute",
+    value: function atX0SecondsPastTheMinute() {
+      return this.data['atX0SecondsPastTheMinute'];
+    }
+  }, {
+    key: "everyX0Minutes",
+    value: function everyX0Minutes() {
+      return this.data['everyX0Minutes'];
+    }
+  }, {
+    key: "minutesX0ThroughX1PastTheHour",
+    value: function minutesX0ThroughX1PastTheHour() {
+      return this.data['minutesX0ThroughX1PastTheHour'];
+    }
+  }, {
+    key: "atX0MinutesPastTheHour",
+    value: function atX0MinutesPastTheHour() {
+      return this.data['atX0MinutesPastTheHour'];
+    }
+  }, {
+    key: "everyX0Hours",
+    value: function everyX0Hours() {
+      return this.data['everyX0Hours'];
+    }
+  }, {
+    key: "betweenX0AndX1",
+    value: function betweenX0AndX1() {
+      return this.data['betweenX0AndX1'];
+    }
+  }, {
+    key: "atX0",
+    value: function atX0() {
+      return this.data['atX0'];
+    }
+  }, {
+    key: "commaEveryDay",
+    value: function commaEveryDay() {
+      return this.data['commaEveryDay'];
+    }
+  }, {
+    key: "commaEveryX0DaysOfTheWeek",
+    value: function commaEveryX0DaysOfTheWeek() {
+      return this.data['commaEveryX0DaysOfTheWeek'];
+    }
+  }, {
+    key: "commaX0ThroughX1",
+    value: function commaX0ThroughX1() {
+      return this.data['commaX0ThroughX1'];
+    }
+  }, {
+    key: "commaAndX0ThroughX1",
+    value: function commaAndX0ThroughX1() {
+      return this.data['commaAndX0ThroughX1'];
+    }
+  }, {
+    key: "first",
+    value: function first() {
+      return this.data['first'];
+    }
+  }, {
+    key: "second",
+    value: function second() {
+      return this.data['second'];
+    }
+  }, {
+    key: "third",
+    value: function third() {
+      return this.data['third'];
+    }
+  }, {
+    key: "fourth",
+    value: function fourth() {
+      return this.data['fourth'];
+    }
+  }, {
+    key: "fifth",
+    value: function fifth() {
+      return this.data['fifth'];
+    }
+  }, {
+    key: "commaOnThe",
+    value: function commaOnThe() {
+      return this.data['commaOnThe'];
+    }
+  }, {
+    key: "spaceX0OfTheMonth",
+    value: function spaceX0OfTheMonth() {
+      return this.data['spaceX0OfTheMonth'];
+    }
+  }, {
+    key: "lastDay",
+    value: function lastDay() {
+      return this.data['lastDay'];
+    }
+  }, {
+    key: "commaOnTheLastX0OfTheMonth",
+    value: function commaOnTheLastX0OfTheMonth() {
+      return this.data['commaOnTheLastX0OfTheMonth'];
+    }
+  }, {
+    key: "commaOnlyOnX0",
+    value: function commaOnlyOnX0() {
+      return this.data['commaOnlyOnX0'];
+    }
+  }, {
+    key: "commaAndOnX0",
+    value: function commaAndOnX0() {
+      return this.data['commaAndOnX0'];
+    }
+  }, {
+    key: "commaEveryX0Months",
+    value: function commaEveryX0Months() {
+      return this.data['commaEveryX0Months'];
+    }
+  }, {
+    key: "commaOnlyInX0",
+    value: function commaOnlyInX0() {
+      return this.data['commaOnlyInX0'];
+    }
+  }, {
+    key: "commaOnTheLastDayOfTheMonth",
+    value: function commaOnTheLastDayOfTheMonth() {
+      return this.data['commaOnTheLastDayOfTheMonth'];
+    }
+  }, {
+    key: "commaOnTheLastWeekdayOfTheMonth",
+    value: function commaOnTheLastWeekdayOfTheMonth() {
+      return this.data['commaOnTheLastWeekdayOfTheMonth'];
+    }
+  }, {
+    key: "commaDaysBeforeTheLastDayOfTheMonth",
+    value: function commaDaysBeforeTheLastDayOfTheMonth() {
+      return this.data['commaDaysBeforeTheLastDayOfTheMonth'];
+    }
+  }, {
+    key: "firstWeekday",
+    value: function firstWeekday() {
+      return this.data['firstWeekday'];
+    }
+  }, {
+    key: "weekdayNearestDayX0",
+    value: function weekdayNearestDayX0() {
+      return this.data['weekdayNearestDayX0'];
+    }
+  }, {
+    key: "commaOnTheX0OfTheMonth",
+    value: function commaOnTheX0OfTheMonth() {
+      return this.data['commaOnTheX0OfTheMonth'];
+    }
+  }, {
+    key: "commaEveryX0Days",
+    value: function commaEveryX0Days() {
+      return this.data['commaEveryX0Days'];
+    }
+  }, {
+    key: "commaBetweenDayX0AndX1OfTheMonth",
+    value: function commaBetweenDayX0AndX1OfTheMonth() {
+      return this.data['commaBetweenDayX0AndX1OfTheMonth'];
+    }
+  }, {
+    key: "commaOnDayX0OfTheMonth",
+    value: function commaOnDayX0OfTheMonth() {
+      return this.data['commaOnDayX0OfTheMonth'];
+    }
+  }, {
+    key: "commaEveryHour",
+    value: function commaEveryHour() {
+      return this.data['commaEveryHour'];
+    }
+  }, {
+    key: "commaEveryX0Years",
+    value: function commaEveryX0Years() {
+      return this.data['commaEveryX0Years'];
+    }
+  }, {
+    key: "commaStartingX0",
+    value: function commaStartingX0() {
+      return this.data['commaStartingX0'];
+    }
+  }, {
+    key: "daysOfTheWeek",
+    value: function daysOfTheWeek() {
+      return this.data['daysOfTheWeek'];
+    }
+  }, {
+    key: "monthsOfTheYear",
+    value: function monthsOfTheYear() {
+      return this.data['monthsOfTheYear'];
+    }
+  }]);
+
+  return CronstrueLocale;
+}();
+
+var loadConstrueLocale = function loadConstrueLocale(data) {
+  _cronstrue.default.initialize({
+    load: function load(availableLocales) {
+      availableLocales[data === null || data === void 0 ? void 0 : data.lang] = new CronstrueLocale(data === null || data === void 0 ? void 0 : data.cronstrue);
+    }
+  });
+};
+
+exports.loadConstrueLocale = loadConstrueLocale;

package/lib/api-client/APIClient.js

@@ -85,6 +85,11 @@ var APIClient = /*#__PURE__*/function (_APIClientSDK) {
   }, {
     key: "interceptors",
     value: function interceptors() {
+      this.axios.interceptors.request.use(function (config) {
+        config.headers['X-With-ACL-Meta'] = true;
+        return config;
+      });
+
       _get(_getPrototypeOf(APIClient.prototype), "interceptors", this).call(this);
 
       this.notification();

package/lib/block-provider/FormBlockProvider.js

@@ -13,20 +13,24 @@ var _react = require("@formily/react");
 
 var _antd = require("antd");
 
+var _isEmpty = _interopRequireDefault(require("lodash/isEmpty"));
+
 var _react2 = _interopRequireWildcard(require("react"));
 
-var _recordProvider = require("../record-provider");
+var _collectionManager = require("../collection-manager");
 
-var _BlockProvider = require("./BlockProvider");
+var _recordProvider = require("../record-provider");
 
 var _schemaComponent = require("../schema-component");
 
-var _collectionManager = require("../collection-manager");
+var _BlockProvider = require("./BlockProvider");
 
 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; }
 
 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; }
@@ -53,6 +57,7 @@ var InternalFormBlockProvider = function InternalFormBlockProvider(props) {
       service = _useBlockRequestConte.service;
 
   var formBlockRef = (0, _react2.useRef)();
+  var record = (0, _recordProvider.useRecord)();
 
   if (service.loading) {
     return /*#__PURE__*/_react2.default.createElement(_antd.Spin, null);
@@ -69,6 +74,7 @@ var InternalFormBlockProvider = function InternalFormBlockProvider(props) {
       formBlockRef: formBlockRef
     }
   }, readPretty ? /*#__PURE__*/_react2.default.createElement(_recordProvider.RecordProvider, {
+    parent: (0, _isEmpty.default)(record === null || record === void 0 ? void 0 : record.__parent) ? record : record === null || record === void 0 ? void 0 : record.__parent,
     record: service === null || service === void 0 ? void 0 : (_service$data = service.data) === null || _service$data === void 0 ? void 0 : _service$data.data
   }, /*#__PURE__*/_react2.default.createElement("div", {
     ref: formBlockRef

package/lib/block-provider/KanbanBlockProvider.js

@@ -227,14 +227,14 @@ var useDisableCardDrag = function useDisableCardDrag() {
   var _useACLRoleContext = (0, _acl.useACLRoleContext)(),
       allowAll = _useACLRoleContext.allowAll,
       allowConfigure = _useACLRoleContext.allowConfigure,
-      getActionParams = _useACLRoleContext.getActionParams;
+      parseAction = _useACLRoleContext.parseAction;
 
   if (allowAll || allowConfigure) {
     return false;
   }
 
-  var result = getActionParams("".concat(ctx === null || ctx === void 0 ? void 0 : (_ctx$props = ctx.props) === null || _ctx$props === void 0 ? void 0 : _ctx$props.resource, ":update"), {
-    skipOwnCheck: true
+  var result = parseAction("".concat(ctx === null || ctx === void 0 ? void 0 : (_ctx$props = ctx.props) === null || _ctx$props === void 0 ? void 0 : _ctx$props.resource, ":update"), {
+    ignoreScope: true
   });
   return !result;
 };

package/lib/block-provider/SharedFilterProvider.d.ts

@@ -12,6 +12,7 @@ export declare type SharedFilterContextValue = {
     setSharedFilterStore: (filterStore: SharedFilterStore) => void;
     getFilterParams: (filterStore?: SharedFilterStore) => any;
 };
+export declare const mergeFilter: (filters: any[], op?: string) => any;
 export declare const getFilterParams: (filterStore?: SharedFilterStore) => {
     $and: SharedFilter[];
 } | {

package/lib/block-provider/SharedFilterProvider.js

@@ -5,7 +5,7 @@ function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" =
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.getFilterParams = exports.concatFilter = exports.SharedFilterProvider = exports.SharedFilterContext = exports.SHARED_FILTER_CONDITION = void 0;
+exports.mergeFilter = exports.getFilterParams = exports.concatFilter = exports.SharedFilterProvider = exports.SharedFilterContext = exports.SHARED_FILTER_CONDITION = void 0;
 
 var _react = _interopRequireWildcard(require("react"));
 
@@ -25,6 +25,8 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
+function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+
 var SHARED_FILTER_CONDITION;
 exports.SHARED_FILTER_CONDITION = SHARED_FILTER_CONDITION;
 
@@ -33,11 +35,28 @@ exports.SHARED_FILTER_CONDITION = SHARED_FILTER_CONDITION;
   SHARED_FILTER_CONDITION["OR"] = "$or";
 })(SHARED_FILTER_CONDITION || (exports.SHARED_FILTER_CONDITION = SHARED_FILTER_CONDITION = {}));
 
+var mergeFilter = function mergeFilter(filters) {
+  var op = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : '$and';
+  var items = filters.filter(Boolean);
+
+  if (items.length === 0) {
+    return {};
+  }
+
+  if (items.length === 1) {
+    return items[0];
+  }
+
+  return _defineProperty({}, op, items);
+};
+
+exports.mergeFilter = mergeFilter;
+
 var getFilterParams = function getFilterParams(filterStore) {
-  var newAssociationFilterList = Object.entries(filterStore).map(function (_ref) {
-    var _ref2 = _slicedToArray(_ref, 2),
-        key = _ref2[0],
-        filter = _ref2[1];
+  var newAssociationFilterList = Object.entries(filterStore).map(function (_ref2) {
+    var _ref3 = _slicedToArray(_ref2, 2),
+        key = _ref3[0],
+        filter = _ref3[1];
 
     return filter;
   });
@@ -56,12 +75,12 @@ var SharedFilterContext = /*#__PURE__*/(0, _react.createContext)({
 exports.SharedFilterContext = SharedFilterContext;
 
 var concatFilter = function concatFilter(f1, f2) {
-  var newAnd = [f1.$and, f2.$and].filter(function (i) {
+  var newAnd = [f1 === null || f1 === void 0 ? void 0 : f1.$and, f2 === null || f2 === void 0 ? void 0 : f2.$and].filter(function (i) {
     return i;
   }).reduce(function (pre, cur) {
     return pre.concat(cur);
   }, []);
-  var newOr = [f1.$or, f2.$or].filter(function (i) {
+  var newOr = [f1 === null || f1 === void 0 ? void 0 : f1.$or, f2 === null || f2 === void 0 ? void 0 : f2.$or].filter(function (i) {
     return i;
   }).reduce(function (pre, cur) {
     return pre.concat(cur);

package/lib/collection-manager/CollectionHistoryProvider.js

@@ -11,6 +11,8 @@ var _antd = require("antd");
 
 var _react = _interopRequireWildcard(require("react"));
 
+var _reactRouterDom = require("react-router-dom");
+
 var _apiClient = require("../api-client");
 
 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); }
@@ -43,7 +45,18 @@ var CollectionHistoryProvider = function CollectionHistoryProvider(props) {
       sort: ['sort']
     }
   };
-  var service = (0, _apiClient.useRequest)(options); // 刷新 collecionHistory
+  var location = (0, _reactRouterDom.useLocation)(); // console.log('location', location);
+
+  var service = (0, _apiClient.useRequest)(options, {
+    manual: true
+  });
+  var isAdminPage = location.pathname.startsWith('/admin');
+  var token = api.auth.getToken() || '';
+  (0, _react.useEffect)(function () {
+    if (isAdminPage && token) {
+      service.run();
+    }
+  }, [isAdminPage, token]); // 刷新 collecionHistory
 
   var refreshCH = /*#__PURE__*/function () {
     var _ref = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee() {

package/lib/collection-manager/hooks/useCollection.d.ts

@@ -4,6 +4,7 @@ export declare const useCollection: () => {
     resource: import("@nocobase/sdk").IResource;
     getField(name: SchemaKey): CollectionFieldOptions;
     fields: import("../types").FieldOptions[];
+    getPrimaryKey: () => any;
     currentFields: import("../types").FieldOptions[];
     inheritedFields: any[];
     name?: string;

package/lib/collection-manager/hooks/useCollection.js

@@ -48,6 +48,16 @@ var useCollection = function useCollection() {
       });
     },
     fields: totalFields,
+    getPrimaryKey: function getPrimaryKey() {
+      if (collection.targetKey || collection.filterTargetKey) {
+        return collection.targetKey || collection.filterTargetKey;
+      }
+
+      var field = currentFields.find(function (field) {
+        return field.primaryKey;
+      });
+      return field ? field.name : 'id';
+    },
     currentFields: currentFields,
     inheritedFields: inheritedFields
   });

package/lib/collection-manager/interfaces/index.d.ts

@@ -6,7 +6,6 @@ export * from './createdAt';
 export * from './createdBy';
 export * from './datetime';
 export * from './email';
-export * from './formula';
 export * from './icon';
 export * from './id';
 export * from './input';

package/lib/collection-manager/interfaces/index.js

@@ -108,19 +108,6 @@ Object.keys(_email).forEach(function (key) {
   });
 });
 
-var _formula = require("./formula");
-
-Object.keys(_formula).forEach(function (key) {
-  if (key === "default" || key === "__esModule") return;
-  if (key in exports && exports[key] === _formula[key]) return;
-  Object.defineProperty(exports, key, {
-    enumerable: true,
-    get: function get() {
-      return _formula[key];
-    }
-  });
-});
-
 var _icon = require("./icon");
 
 Object.keys(_icon).forEach(function (key) {

package/lib/collection-manager/interfaces/o2m.js

@@ -69,6 +69,7 @@ var o2m = {
           block: {
             type: 'void',
             'x-decorator': 'TableFieldProvider',
+            'x-acl-action': "".concat(association, ":list"),
             'x-decorator-props': {
               collection: field.target,
               association: association,

package/lib/collection-manager/interfaces/properties/operators.js

@@ -153,6 +153,13 @@ var id = [{
   visible: function visible(field) {
     return field.collectionName === 'users';
   }
+}, {
+  label: '{{t("is not current logged-in user")}}',
+  value: '$isNotCurrentUser',
+  noValue: true,
+  visible: function visible(field) {
+    return field.collectionName === 'users';
+  }
 }, {
   label: '{{t("exists")}}',
   value: '$exists',

package/lib/collection-manager/interfaces/subTable.js

@@ -42,6 +42,7 @@ var subTable = {
       block: {
         type: 'void',
         'x-decorator': 'TableFieldProvider',
+        'x-acl-action': "".concat(field.target, ":list"),
         'x-decorator-props': {
           collection: field.target,
           association: association,

package/lib/collection-manager/templates/calendar.js

@@ -13,6 +13,11 @@ var calendar = {
   order: 2,
   color: 'orange',
   default: {
+    createdBy: true,
+    updatedBy: true,
+    createdAt: true,
+    updatedAt: true,
+    sortable: true,
     fields: [{
       name: 'cron',
       type: 'string',

package/lib/formula/Expression.d.ts

@@ -0,0 +1,2 @@
+export declare const Expression: (props: any) => JSX.Element;
+export default Expression;