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

package/es/block-provider/SharedFilterProvider.js

@@ -10,6 +10,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; }
+
 import React, { createContext, useState } from 'react';
 export var SHARED_FILTER_CONDITION;
 
@@ -18,11 +20,25 @@ export var SHARED_FILTER_CONDITION;
   SHARED_FILTER_CONDITION["OR"] = "$or";
 })(SHARED_FILTER_CONDITION || (SHARED_FILTER_CONDITION = {}));
 
+export 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);
+};
 export 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;
   });
@@ -37,12 +53,12 @@ export var SharedFilterContext = /*#__PURE__*/createContext({
   getFilterParams: getFilterParams
 });
 export 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/es/collection-manager/CollectionHistoryProvider.js

@@ -3,7 +3,8 @@ function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try
 function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
 
 import { Spin } from 'antd';
-import React, { createContext, useContext } from 'react';
+import React, { createContext, useContext, useEffect } from 'react';
+import { useLocation } from 'react-router-dom';
 import { APIClientContext, useRequest } from '../api-client';
 var CollectionHistoryContext = /*#__PURE__*/createContext({
   historyCollections: [],
@@ -26,7 +27,18 @@ export var CollectionHistoryProvider = function CollectionHistoryProvider(props)
       sort: ['sort']
     }
   };
-  var service = useRequest(options); // 刷新 collecionHistory
+  var location = useLocation(); // console.log('location', location);
+
+  var service = useRequest(options, {
+    manual: true
+  });
+  var isAdminPage = location.pathname.startsWith('/admin');
+  var token = api.auth.getToken() || '';
+  useEffect(function () {
+    if (isAdminPage && token) {
+      service.run();
+    }
+  }, [isAdminPage, token]); // 刷新 collecionHistory
 
   var refreshCH = /*#__PURE__*/function () {
     var _ref = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee() {

package/es/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/es/collection-manager/hooks/useCollection.js

@@ -36,6 +36,16 @@ export 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/es/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/es/collection-manager/interfaces/index.js

@@ -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/es/collection-manager/interfaces/o2m.js

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

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

@@ -143,6 +143,13 @@ export 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/es/collection-manager/interfaces/subTable.js

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

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

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

package/es/formula/Expression.d.ts

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

package/es/formula/Expression.js

@@ -0,0 +1,296 @@
+var _templateObject;
+
+function _taggedTemplateLiteral(strings, raw) { if (!raw) { raw = strings.slice(0); } return Object.freeze(Object.defineProperties(strings, { raw: { value: Object.freeze(raw) } })); }
+
+function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
+
+function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
+
+function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
+
+function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+
+function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"]; if (_i == null) return; var _arr = []; var _n = true; var _d = false; var _s, _e; try { for (_i = _i.call(arr); !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"] != null) _i["return"](); } finally { if (_d) throw _e; } } return _arr; }
+
+function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
+
+function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e2) { throw _e2; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e3) { didErr = true; err = _e3; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
+
+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 _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; }
+
+import { css } from '@emotion/css';
+import { onFormSubmitValidateStart } from '@formily/core';
+import { useField, useFormEffects } from '@formily/react';
+import { Dropdown, Menu } from 'antd';
+import React, { useEffect, useRef, useState } from 'react';
+import { useTranslation } from 'react-i18next';
+
+function pasteHtml(html) {
+  var selectPastedContent = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
+  var sel, range;
+
+  if (window.getSelection) {
+    // IE9 and non-IE
+    sel = window.getSelection();
+
+    if (sel.getRangeAt && sel.rangeCount) {
+      range = sel.getRangeAt(0);
+      range.deleteContents(); // Range.createContextualFragment() would be useful here but is
+      // only relatively recently standardized and is not supported in
+      // some browsers (IE9, for one)
+
+      var el = document.createElement('div');
+      el.innerHTML = html;
+      var frag = document.createDocumentFragment(),
+          node,
+          lastNode;
+
+      while (node = el.firstChild) {
+        lastNode = frag.appendChild(node);
+      }
+
+      var firstNode = frag.firstChild;
+      range.insertNode(frag); // Preserve the selection
+
+      if (lastNode) {
+        range = range.cloneRange();
+        range.setStartAfter(lastNode);
+
+        if (selectPastedContent) {
+          range.setStartBefore(firstNode);
+        } else {
+          range.collapse(true);
+        }
+
+        sel.removeAllRanges();
+        sel.addRange(range);
+      }
+    }
+  }
+}
+
+var getValue = function getValue(el) {
+  var _values$join;
+
+  var values = [];
+
+  var _iterator = _createForOfIteratorHelper(el.childNodes),
+      _step;
+
+  try {
+    for (_iterator.s(); !(_step = _iterator.n()).done;) {
+      var node = _step.value;
+
+      if (node.nodeName === 'SPAN') {
+        values.push("{{".concat(node['dataset']['key'], "}}"));
+      } else {
+        var _node$textContent, _node$textContent$tri;
+
+        values.push((_node$textContent = node.textContent) === null || _node$textContent === void 0 ? void 0 : (_node$textContent$tri = _node$textContent.trim) === null || _node$textContent$tri === void 0 ? void 0 : _node$textContent$tri.call(_node$textContent));
+      }
+    }
+  } catch (err) {
+    _iterator.e(err);
+  } finally {
+    _iterator.f();
+  }
+
+  var text = (_values$join = values.join(' ')) === null || _values$join === void 0 ? void 0 : _values$join.replace(/\s+/g, ' ').trim();
+  return " ".concat(text, " ");
+};
+
+var renderExp = function renderExp(exp) {
+  var scope = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+  return exp.replace(/{{([^}]+)}}/g, function (_, i) {
+    return scope[i.trim()] || '';
+  });
+};
+
+export var Expression = function Expression(props) {
+  var evaluate = props.evaluate,
+      value = props.value,
+      supports = props.supports,
+      useCurrentFields = props.useCurrentFields;
+  var field = useField();
+
+  var _useTranslation = useTranslation(),
+      t = _useTranslation.t;
+
+  var fields = useCurrentFields();
+  var inputRef = useRef();
+
+  var _useState = useState(false),
+      _useState2 = _slicedToArray(_useState, 2),
+      changed = _useState2[0],
+      setChanged = _useState2[1];
+
+  var onChange = function onChange(value) {
+    setChanged(true);
+    props.onChange(value);
+  };
+
+  var numColumns = new Map();
+  var scope = {};
+  fields.filter(function (field) {
+    return supports.includes(field.interface);
+  }).forEach(function (field) {
+    numColumns.set(field.name, field.uiSchema.title);
+    scope[field.name] = 1;
+  });
+  var keys = Array.from(numColumns.keys());
+
+  var _useState3 = useState(function () {
+    var scope = {};
+
+    var _iterator2 = _createForOfIteratorHelper(keys),
+        _step2;
+
+    try {
+      for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
+        var key = _step2.value;
+        var val = numColumns.get(key);
+        scope[key] = "  <span class=\"ant-tag\" style=\"margin: 0 3px;\" contentEditable=\"false\" data-key=\"".concat(key, "\">").concat(val, "</span>  ");
+      }
+    } catch (err) {
+      _iterator2.e(err);
+    } finally {
+      _iterator2.f();
+    }
+
+    return renderExp(value || '', scope);
+  }),
+      _useState4 = _slicedToArray(_useState3, 2),
+      html = _useState4[0],
+      setHtml = _useState4[1];
+
+  useEffect(function () {
+    if (changed) {
+      return;
+    }
+
+    var scope = {};
+
+    var _iterator3 = _createForOfIteratorHelper(keys),
+        _step3;
+
+    try {
+      for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
+        var key = _step3.value;
+
+        var _val = numColumns.get(key);
+
+        scope[key] = "  <span class=\"ant-tag\" style=\"margin: 0 3px;\" contentEditable=\"false\" data-key=\"".concat(key, "\">").concat(_val, "</span>  ");
+      }
+    } catch (err) {
+      _iterator3.e(err);
+    } finally {
+      _iterator3.f();
+    }
+
+    var val = renderExp(value || '', scope);
+    setHtml(val);
+  }, [value]);
+  var menu = /*#__PURE__*/React.createElement(Menu, null, keys.length > 0 ? keys.map(function (key) {
+    return /*#__PURE__*/React.createElement(Menu.Item, {
+      disabled: true,
+      key: key
+    }, /*#__PURE__*/React.createElement("button", {
+      onClick: function () {
+        var _onClick = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee(args) {
+          var val, text;
+          return regeneratorRuntime.wrap(function _callee$(_context) {
+            while (1) {
+              switch (_context.prev = _context.next) {
+                case 0:
+                  inputRef.current.focus();
+                  val = numColumns.get(key);
+                  pasteHtml("  <span class=\"ant-tag\" style=\"margin: 0 3px;\" contentEditable=\"false\" data-key=\"".concat(key, "\">").concat(val, "</span>  "));
+                  text = getValue(inputRef.current);
+                  onChange(text);
+                  console.log('onChange', text);
+
+                case 6:
+                case "end":
+                  return _context.stop();
+              }
+            }
+          }, _callee);
+        }));
+
+        function onClick(_x) {
+          return _onClick.apply(this, arguments);
+        }
+
+        return onClick;
+      }()
+    }, numColumns.get(key)));
+  }) : /*#__PURE__*/React.createElement(Menu.Item, {
+    disabled: true,
+    key: 0
+  }, t('No available fields')));
+  useFormEffects(function () {
+    onFormSubmitValidateStart(function () {
+      try {
+        evaluate(field.value, scope);
+        field.feedbacks = [];
+      } catch (e) {
+        console.error(field.value, scope, e.message);
+        field.setFeedback({
+          type: 'error',
+          code: 'FormulaError',
+          messages: [t('Formula error.')]
+        });
+      }
+    });
+  });
+  return /*#__PURE__*/React.createElement(Dropdown, {
+    trigger: ['click'],
+    overlay: menu,
+    overlayClassName: css(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n        .ant-dropdown-menu-item {\n          padding: 0;\n        }\n        button {\n          cursor: pointer;\n          padding: 5px 12px;\n          text-align: left;\n          color: rgba(0, 0, 0, 0.85);\n          width: 100%;\n          line-height: inherit;\n          height: auto;\n          border: 0px;\n          background-color: transparent;\n          &:hover {\n            background-color: #f5f5f5;\n          }\n        }\n      "])))
+  }, /*#__PURE__*/React.createElement("div", {
+    onKeyDown: function onKeyDown(e) {
+      var text = getValue(e.currentTarget);
+
+      if (e.key === 'Backspace') {
+        if (text && keys.map(function (k) {
+          return "{{".concat(k, "}}");
+        }).includes(text)) {
+          inputRef.current.innerHTML = '  ';
+        }
+      }
+    },
+    onKeyUp: function onKeyUp(e) {
+      var text = getValue(e.currentTarget);
+
+      if (e.key === 'Backspace') {// pasteHtml(' ');
+      }
+
+      onChange(text);
+    },
+    // onClick={(e) => {
+    //   const text = getValue(e.currentTarget);
+    //   onChange(text);
+    //   console.log('onChange', text);
+    // }}
+    onBlur: function onBlur(e) {
+      var text = getValue(e.currentTarget);
+      onChange(text);
+    },
+    onInput: function onInput(e) {
+      var text = getValue(e.currentTarget);
+      onChange(text);
+    },
+    className: 'ant-input',
+    style: {
+      display: 'block'
+    },
+    ref: inputRef,
+    contentEditable: true,
+    dangerouslySetInnerHTML: {
+      __html: html
+    }
+  }));
+};
+export default Expression;

package/es/formula/Result.d.ts

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

package/es/formula/Result.js

@@ -0,0 +1,91 @@
+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 _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
+
+function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure 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 _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 _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"]; if (_i == null) return; var _arr = []; var _n = true; var _d = false; var _s, _e; try { for (_i = _i.call(arr); !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"] != null) _i["return"](); } finally { if (_d) throw _e; } } return _arr; }
+
+function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
+
+import { onFormValuesChange } from '@formily/core';
+import { useField, useFieldSchema, useForm, useFormEffects } from '@formily/react';
+import { toFixedByStep } from '@nocobase/utils/client';
+import cloneDeep from 'lodash/cloneDeep';
+import * as math from 'mathjs';
+import { isNumber } from 'mathjs';
+import React, { useState } from 'react';
+import { useCollection } from '../collection-manager';
+
+var ReadPretty = function ReadPretty(props) {
+  var _props$options;
+
+  if ((props === null || props === void 0 ? void 0 : (_props$options = props.options) === null || _props$options === void 0 ? void 0 : _props$options.dataType) !== 'string') {
+    return /*#__PURE__*/React.createElement("div", null, toFixedByStep(props.value, props.step));
+  }
+
+  return /*#__PURE__*/React.createElement("div", null, props.value);
+};
+
+var Input = function Input(props) {
+  var evaluate = props.evaluate,
+      options = props.options;
+  var dataType = options.dataType,
+      expression = options.expression;
+  var form = useForm();
+
+  var val = function val() {
+    var scope = cloneDeep(form.values);
+
+    try {
+      var result = evaluate(expression, scope);
+      result = isNumber(result) && Number.isFinite(result) ? math.round(result, 9) : result;
+      return result;
+    } catch (error) {
+      return null;
+    }
+  };
+
+  var _useState = useState(function () {
+    return val();
+  }),
+      _useState2 = _slicedToArray(_useState, 2),
+      value = _useState2[0],
+      setVal = _useState2[1];
+
+  useFormEffects(function () {
+    onFormValuesChange(function () {
+      setVal(val());
+    });
+  });
+
+  if (dataType !== 'string') {
+    return /*#__PURE__*/React.createElement("div", null, toFixedByStep(value, props.step));
+  }
+
+  return /*#__PURE__*/React.createElement("div", null, value);
+};
+
+export var Result = function Result(props) {
+  var field = useField();
+
+  var _useCollection = useCollection(),
+      getField = _useCollection.getField;
+
+  var fieldSchema = useFieldSchema();
+  var options = getField(fieldSchema.name);
+  return field.readPretty ? /*#__PURE__*/React.createElement(ReadPretty, _objectSpread(_objectSpread({}, props), {}, {
+    options: options
+  })) : /*#__PURE__*/React.createElement(Input, _objectSpread(_objectSpread({}, props), {}, {
+    options: options
+  }));
+};
+export default Result;

package/es/formula/index.d.ts

@@ -0,0 +1,6 @@
+export declare const Formula: {
+    (): any;
+    Result: (props: any) => JSX.Element;
+    Expression: (props: any) => JSX.Element;
+};
+export default Formula;

package/es/formula/index.js

@@ -0,0 +1,8 @@
+import Expression from './Expression';
+import Result from './Result';
+export var Formula = function Formula() {
+  return null;
+};
+Formula.Result = Result;
+Formula.Expression = Expression;
+export default Formula;

package/es/i18n/i18n.js

@@ -1,5 +1,4 @@
 import i18next from 'i18next';
-import moment from 'moment';
 import { initReactI18next } from 'react-i18next';
 import locale from '../locale';
 
@@ -10,26 +9,22 @@ var resources = {};
 Object.keys(locale).forEach(function (lang) {
   resources[lang] = locale[lang].resources;
 });
-i18n.use(initReactI18next).init({
+i18n // .use(Backend)
+.use(initReactI18next).init({
   lng: localStorage.getItem('NOCOBASE_LOCALE') || 'en-US',
   // debug: true,
   defaultNS: 'client',
+  // backend: {
+  //   // for all available options read the backend's repository readme file
+  //   loadPath: '/api/locales/{{lng}}/{{ns}}.json',
+  // },
   // parseMissingKeyHandler: (key) => {
   //   console.log('parseMissingKeyHandler', `'${key}': '${key}',`);
   //   return key;
   // },
   // ns: ['client'],
-  resources: resources
+  resources: {}
 });
-
-function setMomentLng(language) {
-  var lng = locale[language || 'en-US'].moment || 'en';
-  log(lng);
-  moment.locale(lng);
-}
-
-setMomentLng(localStorage.getItem('NOCOBASE_LOCALE'));
 i18n.on('languageChanged', function (lng) {
   localStorage.setItem('NOCOBASE_LOCALE', lng);
-  setMomentLng(lng);
 });

package/es/index.d.ts

@@ -3,6 +3,7 @@ import './global.less';
 export * from './acl';
 export * from './antd-config-provider';
 export * from './api-client';
+export * from './appInfo';
 export * from './application';
 export * from './async-data-provider';
 export * from './block-provider';
@@ -10,6 +11,7 @@ export * from './board';
 export * from './china-region';
 export * from './collection-manager';
 export * from './document-title';
+export * from './formula';
 export * from './i18n';
 export * from './icon';
 export * from './plugin-manager';
@@ -24,4 +26,3 @@ export * from './schema-templates';
 export * from './settings-form';
 export * from './system-settings';
 export * from './user';
-export * from './appInfo';

package/es/index.js

@@ -3,6 +3,7 @@ import './global.less';
 export * from './acl';
 export * from './antd-config-provider';
 export * from './api-client';
+export * from './appInfo';
 export * from './application';
 export * from './async-data-provider';
 export * from './block-provider';
@@ -10,6 +11,7 @@ export * from './board';
 export * from './china-region';
 export * from './collection-manager';
 export * from './document-title';
+export * from './formula';
 export * from './i18n';
 export * from './icon';
 export * from './plugin-manager';
@@ -23,5 +25,4 @@ export * from './schema-settings';
 export * from './schema-templates';
 export * from './settings-form';
 export * from './system-settings';
-export * from './user';
-export * from './appInfo';
+export * from './user';