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

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

@@ -190,10 +190,10 @@ 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"] = (0, _SharedFilterProvider.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: (0, _SharedFilterProvider.mergeFilter)(Object.values(filters))
+        filter: (0, _SharedFilterProvider.mergeFilter)([].concat(_toConsumableArray(Object.values(filters)), [defaultFilter]))
       }), {
         filters: filters
       });
@@ -208,13 +208,17 @@ 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: (0, _SharedFilterProvider.mergeFilter)([].concat(_toConsumableArray(Object.values(filters)), [filter])),
         page: 1
-      }));
+      }), {
+        filters: filters
+      });
       field.title = t('Filter');
     }
   };

package/lib/schema-component/antd/table-v2/TableBlockDesigner.js

@@ -15,6 +15,8 @@ var _reactI18next = require("react-i18next");
 
 var _blockProvider = require("../../../block-provider");
 
+var _SharedFilterProvider = require("../../../block-provider/SharedFilterProvider");
+
 var _collectionManager = require("../../../collection-manager");
 
 var _actionHooks = require("../../../collection-manager/action-hooks");
@@ -29,6 +31,18 @@ var _page = require("../page");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
+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 _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+
+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 _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
+
 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; }
@@ -107,17 +121,20 @@ var TableBlockDesigner = function TableBlockDesigner() {
       }
     },
     onSubmit: function onSubmit(_ref) {
-      var _service$params2, _schema2;
+      var _service$params2, _service$params2$, _service$params3, _schema2;
 
       var filter = _ref.filter;
       var params = field.decoratorProps.params || {};
       params.filter = filter;
       field.decoratorProps.params = params;
       fieldSchema['x-decorator-props']['params'] = params;
-      service.run(_objectSpread(_objectSpread({}, (_service$params2 = service.params) === null || _service$params2 === void 0 ? void 0 : _service$params2[0]), {}, {
-        filter: filter,
+      var filters = ((_service$params2 = service.params) === null || _service$params2 === void 0 ? void 0 : (_service$params2$ = _service$params2[1]) === null || _service$params2$ === void 0 ? void 0 : _service$params2$.filters) || {};
+      service.run(_objectSpread(_objectSpread({}, (_service$params3 = service.params) === null || _service$params3 === void 0 ? void 0 : _service$params3[0]), {}, {
+        filter: (0, _SharedFilterProvider.mergeFilter)([].concat(_toConsumableArray(Object.values(filters)), [filter])),
         page: 1
-      }));
+      }), {
+        filters: filters
+      });
       dn.emit('patch', {
         schema: (_schema2 = {}, _defineProperty(_schema2, 'x-uid', fieldSchema['x-uid']), _defineProperty(_schema2, 'x-decorator-props', fieldSchema['x-decorator-props']), _schema2)
       });
@@ -194,7 +211,7 @@ var TableBlockDesigner = function TableBlockDesigner() {
       }
     },
     onSubmit: function onSubmit(_ref2) {
-      var _schema3, _service$params3;
+      var _schema3, _service$params4;
 
       var sort = _ref2.sort;
       var sortArr = sort.map(function (item) {
@@ -207,7 +224,7 @@ var TableBlockDesigner = function TableBlockDesigner() {
       dn.emit('patch', {
         schema: (_schema3 = {}, _defineProperty(_schema3, 'x-uid', fieldSchema['x-uid']), _defineProperty(_schema3, 'x-decorator-props', fieldSchema['x-decorator-props']), _schema3)
       });
-      service.run(_objectSpread(_objectSpread({}, (_service$params3 = service.params) === null || _service$params3 === void 0 ? void 0 : _service$params3[0]), {}, {
+      service.run(_objectSpread(_objectSpread({}, (_service$params4 = service.params) === null || _service$params4 === void 0 ? void 0 : _service$params4[0]), {}, {
         sort: sortArr
       }));
     }
@@ -231,13 +248,13 @@ var TableBlockDesigner = function TableBlockDesigner() {
       value: 200
     }],
     onChange: function onChange(pageSize) {
-      var _service$params4, _schema4;
+      var _service$params5, _schema4;
 
       var params = field.decoratorProps.params || {};
       params.pageSize = pageSize;
       field.decoratorProps.params = params;
       fieldSchema['x-decorator-props']['params'] = params;
-      service.run(_objectSpread(_objectSpread({}, (_service$params4 = service.params) === null || _service$params4 === void 0 ? void 0 : _service$params4[0]), {}, {
+      service.run(_objectSpread(_objectSpread({}, (_service$params5 = service.params) === null || _service$params5 === void 0 ? void 0 : _service$params5[0]), {}, {
         pageSize: pageSize,
         page: 1
       }));

package/lib/system-settings/SystemSettingsShortcut.js

@@ -61,7 +61,7 @@ function _asyncToGenerator(fn) { return function () { var self = this, args = ar
 
 var langs = Object.keys(_locale.default).map(function (lang) {
   return {
-    label: _locale.default[lang].label,
+    label: "".concat(_locale.default[lang].label, " (").concat(lang, ")"),
     value: lang
   };
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/client",
-  "version": "0.9.0-alpha.1",
+  "version": "0.9.0-alpha.2",
   "license": "Apache-2.0",
   "main": "lib",
   "module": "es/index.js",
@@ -13,8 +13,8 @@
     "@formily/antd": "2.0.20",
     "@formily/core": "2.0.20",
     "@formily/react": "2.0.20",
-    "@nocobase/sdk": "0.9.0-alpha.1",
-    "@nocobase/utils": "0.9.0-alpha.1",
+    "@nocobase/sdk": "0.9.0-alpha.2",
+    "@nocobase/utils": "0.9.0-alpha.2",
     "ahooks": "^3.7.2",
     "antd": "4.22.8",
     "axios": "^0.26.1",
@@ -22,7 +22,8 @@
     "cron-parser": "^4.6.0",
     "cronstrue": "^2.11.0",
     "file-saver": "^2.0.5",
-    "i18next": "^21.6.0",
+    "i18next": "^22.4.9",
+    "i18next-http-backend": "^2.1.1",
     "json-templates": "^4.2.0",
     "marked": "^4.0.12",
     "mathjs": "^10.6.0",
@@ -54,5 +55,5 @@
     "@types/marked": "^4.0.1",
     "axios-mock-adapter": "^1.20.0"
   },
-  "gitHead": "d84c2a47c42c2ffec4fbf317d53268952fbd58d7"
+  "gitHead": "b8f76ad38e60e677c5bb4aab0a4cdb28d98a0f49"
 }