@nocobase/client 0.7.4-alpha.7 → 0.7.6-alpha.1

package/lib/locale/zh_CN.js

@@ -49,6 +49,7 @@ var _default = {
   "Super admin": "超级管理员",
   "Language": "语言设置",
   "Allow sign up": "允许注册",
+  "Enable SMS authentication": "启用短信登录和注册",
   "Sign out": "注销",
   "Cancel": "取消",
   "Submit": "提交",
@@ -132,6 +133,20 @@ var _default = {
   "Password": "密码",
   "Formula": "公式",
   "Formula description": "基于同一条记录中的其他字段计算出一个值。",
+  "Sequence": "自动编码",
+  "Sequence rules": "编号规则",
+  "Add rule": "添加规则",
+  "Type": "类型",
+  "Autoincrement": "自增数字",
+  "Fixed text": "固定文本",
+  "Text content": "文本内容",
+  "Rule content": "规则内容",
+  "{{value}} Digits": "{{value}} 位数字",
+  "Digits": "位数",
+  "Start from": "起始于",
+  "Starts from {{value}}": "从 {{value}} 开始",
+  "Reset cycle": "重置周期",
+  "Operations": "操作",
   "Choices": "选择类型",
   "Checkbox": "勾选",
   "Single select": "下拉菜单（单选）",
@@ -163,7 +178,8 @@ var _default = {
   "Time format": "时间格式",
   "12 hour": "12 小时制",
   "24 hour": "24 小时制",
-  "Relationship type": "关联类型",
+  "Relationship type": "关系类型",
+  "Inverse relationship type": "反向关系类型",
   "Source collection": "源数据表",
   "Source key": "源数据表字段标识",
   "Target collection": "目标数据表",
@@ -236,6 +252,7 @@ var _default = {
   "Custom column name": "自定义列名称",
   "Edit description": "编辑描述",
   "Required": "必填",
+  "Unique": "不允许重复",
   "Label field": "标签字段",
   "Default is the ID field": "默认为 ID 字段",
   "Set default sorting rules": "设置排序规则",
@@ -301,13 +318,18 @@ var _default = {
   "Saved successfully": "保存成功",
   "Nickname": "昵称",
   "Sign in": "登录",
+  "Sign in via account": "账号密码登录",
+  "Sign in via phone": "手机号登录",
   "Create an account": "注册账号",
   "Sign up": "注册",
   "Confirm password": "确认密码",
   "Log in with an existing account": "使用已有账号登录",
   "Signed up successfully. It will jump to the login page.": "注册成功，将跳转登录页。",
-  "Password mismatch": "确认密码不匹配",
+  "Password mismatch": "重复密码不匹配",
   "Users": "用户",
+  "Verification code": "验证码",
+  "Send code": "发送验证码",
+  "Retry after {{count}} seconds": "{{count}} 秒后重试",
   "Roles": "角色",
   "Add role": "添加角色",
   "Role name": "角色名称",
@@ -453,11 +475,14 @@ var _default = {
   'Add storage': '添加文件存储',
   'Edit storage': '编辑文件存储',
   'Storage base URL': 'Base URL',
-  'Destination': '文件路径',
+  'Destination': '存储路径（绝对）',
   'Use the built-in static file server': '使用内置静态文件服务',
   'Local storage': '本地存储',
   'Aliyun OSS': '阿里云 OSS',
   'Amazon S3': '亚马逊 S3',
+  'Region': '区域',
+  'Bucket': '存储桶',
+  'Path': '路径（相对）',
   // plugins/workflow
   'Workflow': '工作流',
   'Execution History': '执行历史',
@@ -529,6 +554,7 @@ var _default = {
   'Calculation result': '运算结果',
   'True': '真',
   'False': '假',
+  'concat': '连接',
   'Condition': '条件判断',
   'Mode': '模式',
   'Continue when "Yes"': '“是”则继续',
@@ -606,6 +632,10 @@ var _default = {
   "Province/city/area name": "省市区名称",
   "Enabled languages": "启用的语言",
   "View all plugins": "查看所有插件",
-  "Print": "打印"
+  "Print": "打印",
+  'Sign up successfully, and automatically jump to the sign in page': '注册成功，即将跳转到登录页面',
+  'Create inverse field in the target collection': '在目标数据表里创建反向关系字段',
+  'Inverse field name': '反向关系字段标识',
+  'Inverse field display name': '反向关系字段名称'
 };
 exports.default = _default;

package/lib/route-switch/antd/admin-layout/index.js

@@ -105,17 +105,32 @@ var MenuEditor = function MenuEditor(props) {
       var schema = filterByACL(data === null || data === void 0 ? void 0 : data.data, ctx);
 
       if (defaultSelectedUid) {
+        if (defaultSelectedUid.includes('/')) {
+          return;
+        }
+
         var s = (0, _.findByUid)(schema, defaultSelectedUid);
 
         if (s) {
           setTitle(s.title);
+        } else {
+          var _s = (0, _.findMenuItem)(schema);
+
+          if (_s) {
+            history.push("/admin/".concat(_s['x-uid']));
+            setTitle(_s.title);
+          } else {
+            history.push("/admin/");
+          }
         }
       } else {
-        var _s = (0, _.findMenuItem)(schema);
+        var _s2 = (0, _.findMenuItem)(schema);
 
-        if (_s) {
-          history.push("/admin/".concat(_s['x-uid']));
-          setTitle(_s.title);
+        if (_s2) {
+          history.push("/admin/".concat(_s2['x-uid']));
+          setTitle(_s2.title);
+        } else {
+          history.push("/admin/");
         }
       }
     }

package/lib/schema-component/antd/action/Action.js

@@ -115,6 +115,7 @@ var Action = (0, _react.observer)(function (props) {
 
   var fieldSchema = (0, _react.useFieldSchema)();
   var compile = (0, _hooks.useCompile)();
+  var form = (0, _react.useForm)();
   var designerProps = fieldSchema['x-designer-props'];
   var openMode = fieldSchema === null || fieldSchema === void 0 ? void 0 : (_fieldSchema$xCompon = fieldSchema['x-component-props']) === null || _fieldSchema$xCompon === void 0 ? void 0 : _fieldSchema$xCompon['openMode'];
 
@@ -126,6 +127,7 @@ var Action = (0, _react.observer)(function (props) {
       icon: /*#__PURE__*/_react2.default.createElement(_icon.Icon, {
         type: icon
       }),
+      disabled: form.disabled,
       onClick: function onClick(e) {
         e.preventDefault();
         e.stopPropagation();

package/lib/schema-component/antd/action/ActionBar.js

@@ -5,6 +5,8 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.ActionBar = void 0;
 
+var _css = require("@emotion/css");
+
 var _react = require("@formily/react");
 
 var _antd = require("antd");
@@ -15,10 +17,14 @@ var _schemaInitializer = require("../../../schema-initializer");
 
 var _common = require("../../common");
 
+var _templateObject;
+
 var _excluded = ["layout", "style"];
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
+function _taggedTemplateLiteral(strings, raw) { if (!raw) { raw = strings.slice(0); } return Object.freeze(Object.defineProperties(strings, { raw: { value: Object.freeze(raw) } })); }
+
 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; }
@@ -62,9 +68,11 @@ var ActionBar = (0, _react.observer)(function (props) {
     style: _objectSpread({
       display: 'flex',
       justifyContent: 'space-between',
-      alignItems: 'center'
+      alignItems: 'center',
+      overflowX: 'auto'
     }, style)
   }, others), /*#__PURE__*/_react2.default.createElement("div", {
+    className: (0, _css.css)(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n        .ant-space:last-child {\n          margin-left: 8px;\n        }\n      "]))),
     style: {
       display: 'flex',
       justifyContent: 'space-between',

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

@@ -0,0 +1,6 @@
+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/lib/schema-component/antd/cron/Cron.js

@@ -0,0 +1,67 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = exports.Cron = void 0;
+
+var _react = _interopRequireDefault(require("react"));
+
+var _react2 = require("@formily/react");
+
+var _reactJsCron = require("react-js-cron");
+
+var _cronstrue = _interopRequireDefault(require("cronstrue"));
+
+require("cronstrue/locales/zh_CN");
+
+var _css = require("@emotion/css");
+
+var _zhCN = _interopRequireDefault(require("./locale/zh-CN"));
+
+var _templateObject;
+
+var _excluded = ["onChange"];
+
+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; }
+
+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; }
+
+function _taggedTemplateLiteral(strings, raw) { if (!raw) { raw = strings.slice(0); } return Object.freeze(Object.defineProperties(strings, { raw: { value: Object.freeze(raw) } })); }
+
+function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
+
+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 ComponentLocales = {
+  'zh-CN': _zhCN.default
+};
+var ReadPrettyLocales = {
+  'en-US': 'en',
+  'zh-CN': 'zh_CN'
+};
+var Cron = (0, _react2.connect)(function (props) {
+  var onChange = props.onChange,
+      rest = _objectWithoutProperties(props, _excluded);
+
+  var locale = ComponentLocales[localStorage.getItem('NOCOBASE_LOCALE') || 'en-US'];
+  return /*#__PURE__*/_react.default.createElement("fieldset", {
+    className: (0, _css.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      "])))
+  }, /*#__PURE__*/_react.default.createElement(_reactJsCron.Cron, _objectSpread({
+    setValue: onChange,
+    locale: locale
+  }, rest)));
+}, (0, _react2.mapReadPretty)(function (props) {
+  var locale = ReadPrettyLocales[localStorage.getItem('NOCOBASE_LOCALE') || 'en-US'];
+  return props.value ? /*#__PURE__*/_react.default.createElement("span", null, _cronstrue.default.toString(props.value, {
+    locale: locale,
+    use24HourTimeFormat: true
+  })) : null;
+}));
+exports.Cron = Cron;
+var _default = Cron;
+exports.default = _default;

package/lib/schema-component/antd/cron/index.d.ts

@@ -0,0 +1 @@
+export * from './Cron';

package/lib/{file-manager → schema-component/antd/cron}/index.js

@@ -4,15 +4,15 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 
-var _FileStorageShortcut = require("./FileStorageShortcut");
+var _Cron = require("./Cron");
 
-Object.keys(_FileStorageShortcut).forEach(function (key) {
+Object.keys(_Cron).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
-  if (key in exports && exports[key] === _FileStorageShortcut[key]) return;
+  if (key in exports && exports[key] === _Cron[key]) return;
   Object.defineProperty(exports, key, {
     enumerable: true,
     get: function get() {
-      return _FileStorageShortcut[key];
+      return _Cron[key];
     }
   });
 });

package/lib/schema-component/antd/cron/locale/zh-CN.d.ts

@@ -0,0 +1,34 @@
+declare const _default: {
+    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[];
+};
+export default _default;

package/lib/schema-component/antd/cron/locale/zh-CN.js

@@ -0,0 +1,44 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+var _default = {
+  everyText: '每',
+  emptyMonths: '每月',
+  emptyMonthDays: '每日(月)',
+  emptyMonthDaysShort: '每日',
+  emptyWeekDays: '每天(周)',
+  emptyWeekDaysShort: '每天(周)',
+  emptyHours: '每小时',
+  emptyMinutes: '每分钟',
+  emptyMinutesForHourPeriod: '每',
+  yearOption: '年',
+  monthOption: '月',
+  weekOption: '周',
+  dayOption: '天',
+  hourOption: '小时',
+  minuteOption: '分钟',
+  rebootOption: '重启',
+  prefixPeriod: '每',
+  prefixMonths: '的',
+  prefixMonthDays: '的',
+  prefixWeekDays: '的',
+  prefixWeekDaysForMonthAndYearPeriod: '并且',
+  prefixHours: '的',
+  prefixMinutes: ':',
+  prefixMinutesForHourPeriod: '的',
+  suffixMinutesForHourPeriod: '分钟',
+  errorInvalidCron: '不符合 cron 规则的表达式',
+  clearButtonText: '清空',
+  weekDays: [// Order is important, the index will be used as value
+  '周日', '周一', '周二', '周三', '周四', '周五', '周六'],
+  months: [// Order is important, the index will be used as value
+  '一月', '二月', '三月', '四月', '五月', '六月', '七月', '八月', '九月', '十月', '十一月', '十二月'],
+  altWeekDays: [// Order is important, the index will be used as value
+  '周日', '周一', '周二', '周三', '周四', '周五', '周六'],
+  altMonths: [// Order is important, the index will be used as value
+  '一月', '二月', '三月', '四月', '五月', '六月', '七月', '八月', '九月', '十月', '十一月', '十二月']
+};
+exports.default = _default;

package/lib/schema-component/antd/filter/Filter.Action.Designer.js

@@ -80,6 +80,7 @@ var FilterActionDesigner = function FilterActionDesigner(props) {
 
     var checked = !nonfilterable.includes(field.name);
     return /*#__PURE__*/_react2.default.createElement(_schemaSettings.SchemaSettings.SwitchItem, {
+      key: field.name,
       checked: checked,
       title: compile(field === null || field === void 0 ? void 0 : (_field$uiSchema = field.uiSchema) === null || _field$uiSchema === void 0 ? void 0 : _field$uiSchema.title),
       onChange: function onChange(value) {

package/lib/schema-component/antd/filter/useFilterActionProps.d.ts

@@ -1,7 +1,18 @@
 export declare const useFilterOptions: (collectionName: string) => any[];
+export declare const useFilterFieldOptions: (fields: any) => any[];
+export declare const removeNullCondition: (filter: any) => any;
 export declare const mergeFilter: (filter1: any, filter2: any) => any;
 export declare const useFilterActionProps: () => {
-    options: any[];
+    options: any;
+    onSubmit(values: any): void;
+    onReset(): void;
+};
+export declare const useFilterFieldProps: ({ options, service, params }: {
+    options: any;
+    service: any;
+    params: any;
+}) => {
+    options: any;
     onSubmit(values: any): void;
     onReset(): void;
 };

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

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.useFilterOptions = exports.useFilterActionProps = exports.mergeFilter = void 0;
+exports.useFilterOptions = exports.useFilterFieldProps = exports.useFilterFieldOptions = exports.useFilterActionProps = exports.removeNullCondition = exports.mergeFilter = void 0;
 
 var _react = require("@formily/react");
 
@@ -36,16 +36,24 @@ function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToAr
 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; }
 
 var useFilterOptions = function useFilterOptions(collectionName) {
+  var _useCollectionManager = (0, _collectionManager.useCollectionManager)(),
+      getCollectionFields = _useCollectionManager.getCollectionFields;
+
+  var fields = getCollectionFields(collectionName);
+  return useFilterFieldOptions(fields);
+};
+
+exports.useFilterOptions = useFilterOptions;
+
+var useFilterFieldOptions = function useFilterFieldOptions(fields) {
   var _fieldSchema$xCompon;
 
   var fieldSchema = (0, _react.useFieldSchema)();
   var nonfilterable = (fieldSchema === null || fieldSchema === void 0 ? void 0 : (_fieldSchema$xCompon = fieldSchema['x-component-props']) === null || _fieldSchema$xCompon === void 0 ? void 0 : _fieldSchema$xCompon.nonfilterable) || [];
 
-  var _useCollectionManager = (0, _collectionManager.useCollectionManager)(),
-      getCollectionFields = _useCollectionManager.getCollectionFields,
-      getInterface = _useCollectionManager.getInterface;
-
-  var fields = getCollectionFields(collectionName);
+  var _useCollectionManager2 = (0, _collectionManager.useCollectionManager)(),
+      getCollectionFields = _useCollectionManager2.getCollectionFields,
+      getInterface = _useCollectionManager2.getInterface;
 
   var field2option = function field2option(field, depth) {
     var _field$uiSchema, _operators$filter;
@@ -119,7 +127,7 @@ var useFilterOptions = function useFilterOptions(collectionName) {
   return getOptions(fields, 1);
 };
 
-exports.useFilterOptions = useFilterOptions;
+exports.useFilterFieldOptions = useFilterFieldOptions;
 
 var isEmpty = function isEmpty(obj) {
   return obj && Object.keys(obj).length === 0 && Object.getPrototypeOf(obj) === Object.prototype;
@@ -140,6 +148,8 @@ var removeNullCondition = function removeNullCondition(filter) {
   return _flat.default.unflatten(values);
 };
 
+exports.removeNullCondition = removeNullCondition;
+
 var mergeFilter = function mergeFilter(filter1, filter2) {
   if (filter1 && filter2) {
     return {
@@ -170,18 +180,31 @@ var useFilterActionProps = function useFilterActionProps() {
       service = _useBlockRequestConte.service,
       props = _useBlockRequestConte.props;
 
-  var field = (0, _react.useField)();
+  return useFilterFieldProps({
+    options: options,
+    service: service,
+    params: props.params
+  });
+};
+
+exports.useFilterActionProps = useFilterActionProps;
+
+var useFilterFieldProps = function useFilterFieldProps(_ref) {
+  var options = _ref.options,
+      service = _ref.service,
+      params = _ref.params;
 
   var _useTranslation = (0, _reactI18next.useTranslation)(),
       t = _useTranslation.t;
 
+  var field = (0, _react.useField)();
   return {
     options: options,
     onSubmit: function onSubmit(values) {
       var _service$params;
 
       // filter parameter for the block
-      var defaultFilter = removeNullCondition(props.params.filter); // filter parameter for the filter action
+      var defaultFilter = removeNullCondition(params.filter); // filter parameter for the filter action
 
       var filter = removeNullCondition(values === null || values === void 0 ? void 0 : values.filter);
       service.run(_objectSpread(_objectSpread({}, (_service$params = service.params) === null || _service$params === void 0 ? void 0 : _service$params[0]), {}, {
@@ -201,7 +224,7 @@ var useFilterActionProps = function useFilterActionProps() {
     onReset: function onReset() {
       var _service$params2;
 
-      var filter = removeNullCondition(props.params.filter);
+      var filter = removeNullCondition(params.filter);
       service.run(_objectSpread(_objectSpread({}, (_service$params2 = service.params) === null || _service$params2 === void 0 ? void 0 : _service$params2[0]), {}, {
         filter: filter,
         page: 1
@@ -211,4 +234,4 @@ var useFilterActionProps = function useFilterActionProps() {
   };
 };
 
-exports.useFilterActionProps = useFilterActionProps;
+exports.useFilterFieldProps = useFilterFieldProps;

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

@@ -103,7 +103,6 @@ var useValues = function useValues() {
     field.data.operator = operator;
     field.data.schema = (0, _shared.merge)(option === null || option === void 0 ? void 0 : option.schema, operator === null || operator === void 0 ? void 0 : operator.schema);
     field.data.value = (0, _get.default)(field.value, "".concat(fieldPath, ".$").concat(operatorValue));
-    console.log('option', operator, field.data.value);
   };
 
   (0, _react2.useEffect)(function () {

package/lib/schema-component/antd/formula-input/Compute.js

@@ -59,7 +59,7 @@ var AntdCompute = function AntdCompute(props) {
 
       try {
         result = math.evaluate(expression, scope);
-        result = math.round(result, 9);
+        result = Number.isFinite(result) ? math.round(result, 9) : null;
       } catch (_unused) {}
 
       if (onChange) {