@nocobase/client 0.9.0-alpha.1 → 0.9.0-alpha.2

package/es/locale/index.d.ts

@@ -1,8 +1,205 @@
 export declare type LocaleOptions = {
     label: string;
-    moment: string;
-    antd: any;
-    resources?: any;
 };
-declare const _default: Record<string, LocaleOptions>;
+export { default as cron } from '../schema-component/antd/cron/locale';
+declare const _default: {
+    'ar-EG': {
+        label: string;
+    };
+    'az-AZ': {
+        label: string;
+    };
+    'bg-BG': {
+        label: string;
+    };
+    'bn-BD': {
+        label: string;
+    };
+    'by-BY': {
+        label: string;
+    };
+    'ca-ES': {
+        label: string;
+    };
+    'cs-CZ': {
+        label: string;
+    };
+    'da-DK': {
+        label: string;
+    };
+    'de-DE': {
+        label: string;
+    };
+    'el-GR': {
+        label: string;
+    };
+    'en-GB': {
+        label: string;
+    };
+    'en-US': {
+        label: string;
+    };
+    'es-ES': {
+        label: string;
+    };
+    'et-EE': {
+        label: string;
+    };
+    'fa-IR': {
+        label: string;
+    };
+    'fi-FI': {
+        label: string;
+    };
+    'fr-BE': {
+        label: string;
+    };
+    'fr-CA': {
+        label: string;
+    };
+    'fr-FR': {
+        label: string;
+    };
+    'ga-IE': {
+        label: string;
+    };
+    'gl-ES': {
+        label: string;
+    };
+    'he-IL': {
+        label: string;
+    };
+    'hi-IN': {
+        label: string;
+    };
+    'hr-HR': {
+        label: string;
+    };
+    'hu-HU': {
+        label: string;
+    };
+    'hy-AM': {
+        label: string;
+    };
+    'id-ID': {
+        label: string;
+    };
+    'is-IS': {
+        label: string;
+    };
+    'it-IT': {
+        label: string;
+    };
+    'ja-JP': {
+        label: string;
+    };
+    'ka-GE': {
+        label: string;
+    };
+    'kk-KZ': {
+        label: string;
+    };
+    'km-KH': {
+        label: string;
+    };
+    'kn-IN': {
+        label: string;
+    };
+    'ko-KR': {
+        label: string;
+    };
+    'ku-IQ': {
+        label: string;
+    };
+    'lt-LT': {
+        label: string;
+    };
+    'lv-LV': {
+        label: string;
+    };
+    'mk-MK': {
+        label: string;
+    };
+    'ml-IN': {
+        label: string;
+    };
+    'mn-MN': {
+        label: string;
+    };
+    'ms-MY': {
+        label: string;
+    };
+    'nb-NO': {
+        label: string;
+    };
+    'ne-NP': {
+        label: string;
+    };
+    'nl-BE': {
+        label: string;
+    };
+    'nl-NL': {
+        label: string;
+    };
+    'pl-PL': {
+        label: string;
+    };
+    'pt-BR': {
+        label: string;
+    };
+    'pt-PT': {
+        label: string;
+    };
+    'ro-RO': {
+        label: string;
+    };
+    'ru-RU': {
+        label: string;
+    };
+    'si-LK': {
+        label: string;
+    };
+    'sk-SK': {
+        label: string;
+    };
+    'sl-SI': {
+        label: string;
+    };
+    'sr-RS': {
+        label: string;
+    };
+    'sv-SE': {
+        label: string;
+    };
+    'ta-IN': {
+        label: string;
+    };
+    'th-TH': {
+        label: string;
+    };
+    'tk-TK': {
+        label: string;
+    };
+    'tr-TR': {
+        label: string;
+    };
+    'uk-UA': {
+        label: string;
+    };
+    'ur-PK': {
+        label: string;
+    };
+    'vi-VN': {
+        label: string;
+    };
+    'zh-CN': {
+        label: string;
+    };
+    'zh-HK': {
+        label: string;
+    };
+    'zh-TW': {
+        label: string;
+    };
+};
 export default _default;

package/es/locale/index.js

@@ -1,69 +1,202 @@
-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) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-
-import antdEnUS from 'antd/lib/locale/en_US';
-import antdJaJP from 'antd/lib/locale/ja_JP';
-import antdRuRU from 'antd/lib/locale/ru_RU';
-import antdTrTR from 'antd/lib/locale/tr_TR';
-import antdZhCN from 'antd/lib/locale/zh_CN';
-import enUS from './en_US';
-import jaJP from './ja_JP';
-import ruRU from './ru_RU';
-import trTR from './tr_TR';
-import zhCN from './zh_CN';
+export { default as cron } from '../schema-component/antd/cron/locale';
 export default {
+  'ar-EG': {
+    label: 'العربية'
+  },
+  'az-AZ': {
+    label: 'Azərbaycan dili'
+  },
+  'bg-BG': {
+    label: 'Български'
+  },
+  'bn-BD': {
+    label: 'Bengali'
+  },
+  'by-BY': {
+    label: 'Беларускі'
+  },
+  'ca-ES': {
+    label: 'Сatalà/Espanya'
+  },
+  'cs-CZ': {
+    label: 'Česky'
+  },
+  'da-DK': {
+    label: 'Dansk'
+  },
+  'de-DE': {
+    label: 'Deutsch'
+  },
+  'el-GR': {
+    label: 'Ελληνικά'
+  },
+  'en-GB': {
+    label: 'English(GB)'
+  },
   'en-US': {
-    label: 'English',
-    // https://github.com/moment/moment/blob/develop/locale/en.js
-    moment: 'en',
-    // https://github.com/ant-design/ant-design/tree/master/components/locale/en_US
-    antd: antdEnUS,
-    resources: {
-      client: _objectSpread({}, enUS)
-    }
+    label: 'English'
+  },
+  'es-ES': {
+    label: 'Español'
+  },
+  'et-EE': {
+    label: 'Estonian (Eesti)'
+  },
+  'fa-IR': {
+    label: 'فارسی'
+  },
+  'fi-FI': {
+    label: 'Suomi'
+  },
+  'fr-BE': {
+    label: 'Français(BE)'
+  },
+  'fr-CA': {
+    label: 'Français(CA)'
+  },
+  'fr-FR': {
+    label: 'Français'
+  },
+  'ga-IE': {
+    label: 'Gaeilge'
+  },
+  'gl-ES': {
+    label: 'Galego'
+  },
+  'he-IL': {
+    label: 'עברית'
+  },
+  'hi-IN': {
+    label: 'हिन्दी'
+  },
+  'hr-HR': {
+    label: 'Hrvatski jezik'
+  },
+  'hu-HU': {
+    label: 'Magyar'
+  },
+  'hy-AM': {
+    label: 'Հայերեն'
+  },
+  'id-ID': {
+    label: 'Bahasa Indonesia'
+  },
+  'is-IS': {
+    label: 'Íslenska'
+  },
+  'it-IT': {
+    label: 'Italiano'
   },
   'ja-JP': {
-    label: '日本語',
-    // https://github.com/moment/moment/blob/develop/locale/ja.js
-    moment: 'ja',
-    // https://github.com/ant-design/ant-design/tree/master/components/locale/ja_JP
-    antd: antdJaJP,
-    resources: {
-      client: _objectSpread({}, jaJP)
-    }
+    label: '日本語'
   },
-  'zh-CN': {
-    label: '简体中文',
-    // https://github.com/moment/moment/blob/develop/locale/zh-cn.js
-    moment: 'zh-cn',
-    // https://github.com/ant-design/ant-design/tree/master/components/locale/zh_CN
-    antd: antdZhCN,
-    // i18next
-    resources: {
-      client: _objectSpread({}, zhCN)
-    }
+  'ka-GE': {
+    label: 'ქართული'
+  },
+  'kk-KZ': {
+    label: 'Қазақ тілі'
+  },
+  'km-KH': {
+    label: 'ភាសាខ្មែរ'
+  },
+  // 'kmr-IQ': { label: 'kmr_IQ' },
+  'kn-IN': {
+    label: 'ಕನ್ನಡ'
+  },
+  'ko-KR': {
+    label: '한국어'
+  },
+  'ku-IQ': {
+    label: 'کوردی'
+  },
+  'lt-LT': {
+    label: 'lietuvių'
+  },
+  'lv-LV': {
+    label: 'Latviešu valoda'
+  },
+  'mk-MK': {
+    label: 'македонски јазик'
+  },
+  'ml-IN': {
+    label: 'മലയാളം'
+  },
+  'mn-MN': {
+    label: 'Монгол хэл'
+  },
+  'ms-MY': {
+    label: 'بهاس ملايو'
+  },
+  'nb-NO': {
+    label: 'Norsk bokmål'
+  },
+  'ne-NP': {
+    label: 'नेपाली'
+  },
+  'nl-BE': {
+    label: 'Vlaams'
+  },
+  'nl-NL': {
+    label: 'Nederlands'
+  },
+  'pl-PL': {
+    label: 'Polski'
+  },
+  'pt-BR': {
+    label: 'Português brasileiro'
+  },
+  'pt-PT': {
+    label: 'Português'
+  },
+  'ro-RO': {
+    label: 'România'
   },
   'ru-RU': {
-    label: 'Русский',
-    // https://github.com/moment/moment/blob/develop/locale/ru.js
-    moment: 'ru',
-    // https://github.com/ant-design/ant-design/tree/master/components/locale/ru_RU
-    antd: antdRuRU,
-    resources: {
-      client: _objectSpread({}, ruRU)
-    }
+    label: 'Русский'
+  },
+  'si-LK': {
+    label: 'සිංහල'
+  },
+  'sk-SK': {
+    label: 'Slovenčina'
+  },
+  'sl-SI': {
+    label: 'Slovenščina'
+  },
+  'sr-RS': {
+    label: 'српски језик'
+  },
+  'sv-SE': {
+    label: 'Svenska'
+  },
+  'ta-IN': {
+    label: 'Tamil'
+  },
+  'th-TH': {
+    label: 'ภาษาไทย'
+  },
+  'tk-TK': {
+    label: 'Turkmen'
   },
   'tr-TR': {
-    label: 'Türkçe',
-    // https://github.com/moment/moment/blob/develop/locale/tr.js
-    moment: 'tr',
-    // https://github.com/ant-design/ant-design/tree/master/components/locale/tr_TR
-    antd: antdTrTR,
-    resources: {
-      client: _objectSpread({}, trTR)
-    }
+    label: 'Türkçe'
+  },
+  'uk-UA': {
+    label: 'Українська'
+  },
+  'ur-PK': {
+    label: 'Oʻzbekcha'
+  },
+  'vi-VN': {
+    label: 'Tiếng Việt'
+  },
+  'zh-CN': {
+    label: '简体中文'
+  },
+  'zh-HK': {
+    label: '繁體中文（香港）'
+  },
+  'zh-TW': {
+    label: '繁體中文（台湾）'
   }
 };

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

@@ -2,6 +2,14 @@ var _templateObject, _templateObject2, _templateObject3, _templateObject4, _temp
 
 function _taggedTemplateLiteral(strings, raw) { if (!raw) { raw = strings.slice(0); } return Object.freeze(Object.defineProperties(strings, { raw: { value: Object.freeze(raw) } })); }
 
+function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
+
+function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+
+function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
+
+function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
+
 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; }
@@ -47,7 +55,8 @@ export var AssociationFilterItem = function AssociationFilterItem(props) {
   var compile = useCompile();
 
   var _useBlockRequestConte = useBlockRequestContext(),
-      service = _useBlockRequestConte.service;
+      service = _useBlockRequestConte.service,
+      blockProps = _useBlockRequestConte.props;
 
   var _useState = useState(false),
       _useState2 = _slicedToArray(_useState, 2),
@@ -102,7 +111,7 @@ export var AssociationFilterItem = function AssociationFilterItem(props) {
   };
 
   var onSelect = function onSelect(selectedKeysValue) {
-    var _service$params, _service$params$, _service$params2;
+    var _service$params, _service$params$, _service$params2, _blockProps$params;
 
     setSelectedKeys(selectedKeysValue);
     var filters = ((_service$params = service.params) === null || _service$params === void 0 ? void 0 : (_service$params$ = _service$params[1]) === null || _service$params$ === void 0 ? void 0 : _service$params$.filters) || {};
@@ -116,7 +125,7 @@ export var AssociationFilterItem = function AssociationFilterItem(props) {
     service.run(_objectSpread(_objectSpread({}, (_service$params2 = service.params) === null || _service$params2 === void 0 ? void 0 : _service$params2[0]), {}, {
       pageSize: 200,
       page: 1,
-      filter: mergeFilter(Object.values(filters))
+      filter: mergeFilter([].concat(_toConsumableArray(Object.values(filters)), [blockProps === null || blockProps === void 0 ? void 0 : (_blockProps$params = blockProps.params) === null || _blockProps$params === void 0 ? void 0 : _blockProps$params.filter]))
     }), {
       filters: filters
     });

package/es/schema-component/antd/cron/Cron.d.ts

@@ -1,6 +1,5 @@
 import React from 'react';
 import { CronProps } from 'react-js-cron';
-import 'cronstrue/locales/zh_CN';
 declare type ComposedCron = React.FC<CronProps> & {};
 export declare const Cron: ComposedCron;
 export default Cron;

package/es/schema-component/antd/cron/Cron.js

@@ -14,36 +14,33 @@ 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; }
 
-import React from 'react';
+import { css } from '@emotion/css';
 import { connect, mapReadPretty } from '@formily/react';
-import { Cron as ReactCron } from 'react-js-cron';
 import cronstrue from 'cronstrue';
-import 'cronstrue/locales/zh_CN';
-import { css } from '@emotion/css';
-import localeZhCN from './locale/zh-CN';
-var ComponentLocales = {
-  'zh-CN': localeZhCN
-};
-var ReadPrettyLocales = {
-  'en-US': 'en',
-  'zh-CN': 'zh_CN'
-};
-export var Cron = connect(function (props) {
+import React from 'react';
+import { Cron as ReactCron } from 'react-js-cron';
+import { useAPIClient } from '../../../api-client';
+
+var Input = function Input(props) {
   var onChange = props.onChange,
       rest = _objectWithoutProperties(props, _excluded);
 
-  var locale = ComponentLocales[localStorage.getItem('NOCOBASE_LOCALE') || 'en-US'];
   return /*#__PURE__*/React.createElement("fieldset", {
-    className: css(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n        .react-js-cron{\n          padding: .5em .5em 0 .5em;\n          border: 1px dashed #ccc;\n\n          .react-js-cron-field{\n            flex-shrink: 0;\n            margin-bottom: .5em;\n\n            > span{\n              flex-shrink: 0;\n              margin: 0 .5em 0 0;\n            }\n\n            > .react-js-cron-select{\n              margin: 0 .5em 0 0;\n            }\n          }\n      "])))
+    className: css(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n        .react-js-cron {\n          padding: 0.5em 0.5em 0 0.5em;\n          border: 1px dashed #ccc;\n          .react-js-cron-field {\n            flex-shrink: 0;\n            margin-bottom: 0.5em;\n\n            > span {\n              flex-shrink: 0;\n              margin: 0 0.5em 0 0;\n            }\n\n            > .react-js-cron-select {\n              margin: 0 0.5em 0 0;\n            }\n          }\n        }\n      "])))
   }, /*#__PURE__*/React.createElement(ReactCron, _objectSpread({
     setValue: onChange,
-    locale: locale
+    locale: window['cronLocale']
   }, rest)));
-}, mapReadPretty(function (props) {
-  var locale = ReadPrettyLocales[localStorage.getItem('NOCOBASE_LOCALE') || 'en-US'];
+};
+
+var ReadPretty = function ReadPretty(props) {
+  var api = useAPIClient();
+  var locale = api.auth.getLocale();
   return props.value ? /*#__PURE__*/React.createElement("span", null, cronstrue.toString(props.value, {
     locale: locale,
     use24HourTimeFormat: true
   })) : null;
-}));
+};
+
+export var Cron = connect(Input, mapReadPretty(ReadPretty));
 export default Cron;

package/es/schema-component/antd/cron/locale/index.d.ts

@@ -0,0 +1,37 @@
+declare const _default: {
+    'zh-CN': {
+        everyText: string;
+        emptyMonths: string;
+        emptyMonthDays: string;
+        emptyMonthDaysShort: string;
+        emptyWeekDays: string;
+        emptyWeekDaysShort: string;
+        emptyHours: string;
+        emptyMinutes: string;
+        emptyMinutesForHourPeriod: string;
+        yearOption: string;
+        monthOption: string;
+        weekOption: string;
+        dayOption: string;
+        hourOption: string;
+        minuteOption: string;
+        rebootOption: string;
+        prefixPeriod: string;
+        prefixMonths: string;
+        prefixMonthDays: string;
+        prefixWeekDays: string;
+        prefixWeekDaysForMonthAndYearPeriod: string;
+        prefixHours: string;
+        prefixMinutes: string;
+        prefixMinutesForHourPeriod: string;
+        suffixMinutesForHourPeriod: string;
+        errorInvalidCron: string;
+        clearButtonText: string;
+        weekDays: string[];
+        months: string[];
+        altWeekDays: string[];
+        altMonths: string[];
+    };
+    'en-US': import("react-js-cron").DefaultLocale;
+};
+export default _default;

package/es/schema-component/antd/cron/locale/index.js

@@ -0,0 +1,6 @@
+import { DEFAULT_LOCALE_EN } from 'react-js-cron/dist/cjs/locale';
+import zhCN from './zh-CN';
+export default {
+  'zh-CN': zhCN,
+  'en-US': DEFAULT_LOCALE_EN
+};

package/es/schema-component/antd/filter/useFilterActionProps.js

@@ -164,10 +164,10 @@ export var useFilterFieldProps = function useFilterFieldProps(_ref) {
 
       var filter = removeNullCondition(values === null || values === void 0 ? void 0 : values.filter);
       var filters = ((_service$params = service.params) === null || _service$params === void 0 ? void 0 : (_service$params$ = _service$params[1]) === null || _service$params$ === void 0 ? void 0 : _service$params$.filters) || {};
-      filters["default"] = mergeFilter([defaultFilter, filter]);
+      filters["filterAction"] = filter;
       service.run(_objectSpread(_objectSpread({}, (_service$params2 = service.params) === null || _service$params2 === void 0 ? void 0 : _service$params2[0]), {}, {
         page: 1,
-        filter: mergeFilter(Object.values(filters))
+        filter: mergeFilter([].concat(_toConsumableArray(Object.values(filters)), [defaultFilter]))
       }), {
         filters: filters
       });
@@ -182,13 +182,17 @@ export var useFilterFieldProps = function useFilterFieldProps(_ref) {
       }
     },
     onReset: function onReset() {
-      var _service$params3;
+      var _service$params3, _service$params3$, _service$params4;
 
       var filter = params.filter;
-      service.run(_objectSpread(_objectSpread({}, (_service$params3 = service.params) === null || _service$params3 === void 0 ? void 0 : _service$params3[0]), {}, {
-        filter: filter,
+      var filters = ((_service$params3 = service.params) === null || _service$params3 === void 0 ? void 0 : (_service$params3$ = _service$params3[1]) === null || _service$params3$ === void 0 ? void 0 : _service$params3$.filters) || {};
+      delete filters["filterAction"];
+      service.run(_objectSpread(_objectSpread({}, (_service$params4 = service.params) === null || _service$params4 === void 0 ? void 0 : _service$params4[0]), {}, {
+        filter: mergeFilter([].concat(_toConsumableArray(Object.values(filters)), [filter])),
         page: 1
-      }));
+      }), {
+        filters: filters
+      });
       field.title = t('Filter');
     }
   };