@nocobase/client 0.9.2-alpha.1 → 0.9.2-alpha.3

package/lib/schema-settings/SchemaSettings.js

@@ -4,7 +4,7 @@ function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" =
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.useSchemaSettings = exports.useDataTemplates = exports.SchemaSettingsProvider = exports.SchemaSettings = void 0;
+exports.useSchemaSettings = exports.useDataTemplates = exports.isSystemField = exports.isShowDefaultValue = exports.isPatternDisabled = exports.SchemaSettingsProvider = exports.SchemaSettings = void 0;
 var _css = require("@emotion/css");
 var _antd = require("@formily/antd");
 var _core = require("@formily/core");
@@ -23,7 +23,6 @@ var _utilts = require("../schema-component/antd/association-filter/utilts");
 var _schemaTemplates = require("../schema-templates");
 var _BlockTemplate = require("../schema-templates/BlockTemplate");
 var _DataTemplates = require("./DataTemplates");
-var _EnableChildCollections = require("./EnableChildCollections");
 var _LinkageRules = require("./LinkageRules");
 var _actionHooks = require("./LinkageRules/action-hooks");
 var _templateObject;
@@ -109,7 +108,7 @@ var SchemaSettings = function SchemaSettings(props) {
   return DropdownMenu;
 };
 exports.SchemaSettings = SchemaSettings;
-SchemaSettings.Template = function (props) {
+SchemaSettings.Template = function Template(props) {
   var componentName = props.componentName,
     collectionName = props.collectionName,
     resourceName = props.resourceName;
@@ -281,7 +280,7 @@ var findBlockTemplateSchema = function findBlockTemplateSchema(fieldSchema) {
     return buf;
   }, null);
 };
-SchemaSettings.FormItemTemplate = function (props) {
+SchemaSettings.FormItemTemplate = function FormItemTemplate(props) {
   var _props$insertAdjacent = props.insertAdjacentPosition,
     insertAdjacentPosition = _props$insertAdjacent === void 0 ? 'afterBegin' : _props$insertAdjacent,
     componentName = props.componentName,
@@ -456,7 +455,7 @@ SchemaSettings.FormItemTemplate = function (props) {
     }()
   }, t('Save as block template'));
 };
-SchemaSettings.Item = function (props) {
+SchemaSettings.Item = function Item(props) {
   var eventKey = props.eventKey;
   var key = (0, _react2.useMemo)(function () {
     return (0, _shared.uid)();
@@ -485,7 +484,7 @@ SchemaSettings.SubMenu = function (props) {
 SchemaSettings.Divider = function (props) {
   return /*#__PURE__*/_react2.default.createElement(_antd2.Menu.Divider, _objectSpread({}, props));
 };
-SchemaSettings.Remove = function (props) {
+SchemaSettings.Remove = function Remove(props) {
   var confirm = props.confirm,
     removeParentsIfNoChildren = props.removeParentsIfNoChildren,
     breakRemoveOn = props.breakRemoveOn;
@@ -525,7 +524,7 @@ SchemaSettings.Remove = function (props) {
     }
   }, t('Delete'));
 };
-SchemaSettings.ConnectDataBlocks = function (props) {
+SchemaSettings.ConnectDataBlocks = function ConnectDataBlocks(props) {
   var type = props.type,
     emptyDescription = props.emptyDescription;
   var fieldSchema = (0, _react.useFieldSchema)();
@@ -650,7 +649,7 @@ SchemaSettings.ConnectDataBlocks = function (props) {
     image: _antd2.Empty.PRESENTED_IMAGE_SIMPLE
   }));
 };
-SchemaSettings.SelectItem = function (props) {
+SchemaSettings.SelectItem = function SelectItem(props) {
   var title = props.title,
     options = props.options,
     value = props.value,
@@ -669,11 +668,12 @@ SchemaSettings.SelectItem = function (props) {
     }
     _onClick === null || _onClick === void 0 ? void 0 : _onClick.apply(void 0, args);
   };
+  var onMouseEnter = (0, _react2.useCallback)(function () {
+    return setOpen(true);
+  }, []);
   // 鼠标 hover 时，打开下拉框
   var moreProps = openOnHover ? {
-    onMouseEnter: (0, _react2.useCallback)(function () {
-      return setOpen(true);
-    }, []),
+    onMouseEnter: onMouseEnter,
     open: open
   } : {};
   return /*#__PURE__*/_react2.default.createElement(SchemaSettings.Item, _objectSpread({}, others), /*#__PURE__*/_react2.default.createElement("div", {
@@ -719,7 +719,7 @@ SchemaSettings.CascaderItem = function (props) {
     }
   })));
 };
-SchemaSettings.SwitchItem = function (props) {
+SchemaSettings.SwitchItem = function SwitchItem(props) {
   var title = props.title,
     onChange = props.onChange,
     others = _objectWithoutProperties(props, _excluded5);
@@ -746,7 +746,7 @@ SchemaSettings.SwitchItem = function (props) {
     }
   })));
 };
-SchemaSettings.PopupItem = function (props) {
+SchemaSettings.PopupItem = function PopupItem(props) {
   var schema = props.schema,
     others = _objectWithoutProperties(props, _excluded6);
   var _useState7 = (0, _react2.useState)(false),
@@ -897,7 +897,7 @@ SchemaSettings.ActionModalItem = /*#__PURE__*/_react2.default.memo(function (pro
     schema: schema
   }))))), document.body));
 });
-SchemaSettings.ModalItem = function (props) {
+SchemaSettings.ModalItem = function ModalItem(props) {
   var hidden = props.hidden,
     title = props.title,
     components = props.components,
@@ -977,7 +977,7 @@ SchemaSettings.ModalItem = function (props) {
     }()
   }), props.children || props.title);
 };
-SchemaSettings.BlockTitleItem = function () {
+SchemaSettings.BlockTitleItem = function BlockTitleItem() {
   var _fieldSchema$xCompon;
   var field = (0, _react.useField)();
   var fieldSchema = (0, _react.useFieldSchema)();
@@ -1014,7 +1014,7 @@ SchemaSettings.BlockTitleItem = function () {
     }
   });
 };
-SchemaSettings.DefaultSortingRules = function (props) {
+SchemaSettings.DefaultSortingRules = function DefaultSortingRules(props) {
   var sort = props.sort,
     sortFields = props.sortFields,
     onSubmit = props.onSubmit;
@@ -1094,7 +1094,7 @@ SchemaSettings.DefaultSortingRules = function (props) {
     onSubmit: onSubmit
   });
 };
-SchemaSettings.LinkageRules = function (props) {
+SchemaSettings.LinkageRules = function LinkageRules(props) {
   var collectionName = props.collectionName;
   var fieldSchema = (0, _react.useFieldSchema)();
   var _useDesignable3 = (0, _2.useDesignable)(),
@@ -1167,7 +1167,7 @@ var useDataTemplates = function useDataTemplates() {
   };
 };
 exports.useDataTemplates = useDataTemplates;
-SchemaSettings.DataTemplates = function (props) {
+SchemaSettings.DataTemplates = function DataTemplates(props) {
   var collectionName = props.collectionName;
   var fieldSchema = (0, _react.useFieldSchema)();
   var _useDesignable4 = (0, _2.useDesignable)(),
@@ -1213,7 +1213,7 @@ SchemaSettings.DataTemplates = function (props) {
     }
   });
 };
-SchemaSettings.EnableChildCollections = function (props) {
+SchemaSettings.EnableChildCollections = function EnableChildCollections(props) {
   var collectionName = props.collectionName;
   var fieldSchema = (0, _react.useFieldSchema)();
   var _useDesignable5 = (0, _2.useDesignable)(),
@@ -1233,7 +1233,7 @@ SchemaSettings.EnableChildCollections = function (props) {
       title: t('Enable child collections'),
       properties: {
         enableChildren: {
-          'x-component': _EnableChildCollections.EnableChildCollections,
+          'x-component': EnableChildCollections,
           'x-component-props': {
             useProps: function useProps() {
               return {
@@ -1287,4 +1287,20 @@ SchemaSettings.EnableChildCollections = function (props) {
       dn.refresh();
     }
   });
-};
+};
+// 是否显示默认值配置项
+var isShowDefaultValue = function isShowDefaultValue(collectionField, getInterface) {
+  return !['o2o', 'oho', 'obo', 'o2m', 'attachment'].includes(collectionField === null || collectionField === void 0 ? void 0 : collectionField.interface) && !isSystemField(collectionField, getInterface);
+};
+// 是否是系统字段
+exports.isShowDefaultValue = isShowDefaultValue;
+var isSystemField = function isSystemField(collectionField, getInterface) {
+  var i = getInterface === null || getInterface === void 0 ? void 0 : getInterface(collectionField === null || collectionField === void 0 ? void 0 : collectionField.interface);
+  return (i === null || i === void 0 ? void 0 : i.group) === 'systemInfo';
+};
+exports.isSystemField = isSystemField;
+var isPatternDisabled = function isPatternDisabled(fieldSchema) {
+  var _fieldSchema$xCompon2;
+  return (fieldSchema === null || fieldSchema === void 0 ? void 0 : (_fieldSchema$xCompon2 = fieldSchema['x-component-props']) === null || _fieldSchema$xCompon2 === void 0 ? void 0 : _fieldSchema$xCompon2['pattern-disable']) == true;
+};
+exports.isPatternDisabled = isPatternDisabled;

package/lib/schema-settings/VariableInput/VariableInput.d.ts

@@ -0,0 +1,13 @@
+import React from 'react';
+declare type Props = {
+    value: any;
+    onChange: (value: any) => void;
+    collectionName: string;
+    renderSchemaComponent?: (props: any) => any;
+    style: React.CSSProperties;
+    schema: any;
+    operator: any;
+    children: any;
+};
+export declare const VariableInput: (props: Props) => JSX.Element;
+export {};

package/lib/schema-settings/VariableInput/VariableInput.js

@@ -0,0 +1,47 @@
+"use strict";
+
+function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.VariableInput = void 0;
+var _react = _interopRequireWildcard(require("react"));
+var _schemaComponent = require("../../schema-component");
+var _useUserVariable = require("./hooks/useUserVariable");
+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; }
+var VariableInput = function VariableInput(props) {
+  var value = props.value,
+    onChange = props.onChange,
+    RenderSchemaComponent = props.renderSchemaComponent,
+    style = props.style,
+    schema = props.schema;
+  var compile = (0, _schemaComponent.useCompile)();
+  var userVariable = (0, _useUserVariable.useUserVariable)({
+    schema: schema,
+    level: 1
+  });
+  var scope = (0, _react.useMemo)(function () {
+    return [userVariable, compile({
+      label: "{{t(\"Date variables\")}}",
+      value: '$date',
+      key: '$date',
+      disabled: schema['x-component'] !== 'DatePicker',
+      children: [{
+        key: 'now',
+        value: 'now',
+        label: "{{t(\"Now\")}}"
+      }]
+    })];
+  }, []);
+  return /*#__PURE__*/_react.default.createElement(_schemaComponent.Variable.Input, {
+    value: value,
+    onChange: onChange,
+    scope: scope,
+    style: style
+  }, /*#__PURE__*/_react.default.createElement(RenderSchemaComponent, {
+    value: value,
+    onChange: onChange
+  }));
+};
+exports.VariableInput = VariableInput;

package/lib/schema-settings/VariableInput/hooks/useDateVariable.d.ts

@@ -0,0 +1,4 @@
+export declare const useDateVariable: ({ operator, schema }: {
+    operator: any;
+    schema: any;
+}) => any;

package/lib/schema-settings/VariableInput/hooks/useDateVariable.js

@@ -0,0 +1,136 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.useDateVariable = void 0;
+var _schemaComponent = require("../../../schema-component");
+var useDateVariable = function useDateVariable(_ref) {
+  var operator = _ref.operator,
+    schema = _ref.schema;
+  var compile = (0, _schemaComponent.useCompile)();
+  var operatorValue = (operator === null || operator === void 0 ? void 0 : operator.value) || '';
+  if (!operator || !schema) return null;
+  var disabled = !['DatePicker', 'DatePicker.RangePicker'].includes(schema['x-component']);
+  var dateOptions = [{
+    key: 'now',
+    value: 'now',
+    label: "{{t(\"Now\")}}",
+    disabled: schema['x-component'] !== 'DatePicker' || operatorValue === '$dateBetween'
+  }, {
+    key: 'yesterday',
+    value: 'yesterday',
+    label: "{{t(\"Yesterday\")}}",
+    disabled: disabled
+  }, {
+    key: 'today',
+    value: 'today',
+    label: "{{t(\"Today\")}}",
+    disabled: disabled
+  }, {
+    key: 'tomorrow',
+    value: 'tomorrow',
+    label: "{{t(\"Tomorrow\")}}",
+    disabled: disabled
+  }, {
+    key: 'lastIsoWeek',
+    value: 'lastIsoWeek',
+    label: "{{t(\"Last week\")}}",
+    disabled: disabled
+  }, {
+    key: 'thisIsoWeek',
+    value: 'thisIsoWeek',
+    label: "{{t(\"This week\")}}",
+    disabled: disabled
+  }, {
+    key: 'nextIsoWeek',
+    value: 'nextIsoWeek',
+    label: "{{t(\"Next week\")}}",
+    disabled: disabled
+  }, {
+    key: 'lastMonth',
+    value: 'lastMonth',
+    label: "{{t(\"Last month\")}}",
+    disabled: disabled
+  }, {
+    key: 'thisMonth',
+    value: 'thisMonth',
+    label: "{{t(\"This month\")}}",
+    disabled: disabled
+  }, {
+    key: 'nextMonth',
+    value: 'nextMonth',
+    label: "{{t(\"Next month\")}}",
+    disabled: disabled
+  }, {
+    key: 'lastQuarter',
+    value: 'lastQuarter',
+    label: "{{t(\"Last quarter\")}}",
+    disabled: disabled
+  }, {
+    key: 'thisQuarter',
+    value: 'thisQuarter',
+    label: "{{t(\"This quarter\")}}",
+    disabled: disabled
+  }, {
+    key: 'nextQuarter',
+    value: 'nextQuarter',
+    label: "{{t(\"Next quarter\")}}",
+    disabled: disabled
+  }, {
+    key: 'lastYear',
+    value: 'lastYear',
+    label: "{{t(\"Last year\")}}",
+    disabled: disabled
+  }, {
+    key: 'thisYear',
+    value: 'thisYear',
+    label: "{{t(\"This year\")}}",
+    disabled: disabled
+  }, {
+    key: 'nextYear',
+    value: 'nextYear',
+    label: "{{t(\"Next year\")}}",
+    disabled: disabled
+  }, {
+    key: 'last7Days',
+    value: 'last7Days',
+    label: "{{t(\"Last 7 days\")}}",
+    disabled: disabled
+  }, {
+    key: 'next7Days',
+    value: 'next7Days',
+    label: "{{t(\"Next 7 days\")}}",
+    disabled: disabled
+  }, {
+    key: 'last30Days',
+    value: 'last30Days',
+    label: "{{t(\"Last 30 days\")}}",
+    disabled: disabled
+  }, {
+    key: 'next30Days',
+    value: 'next30Days',
+    label: "{{t(\"Next 30 days\")}}",
+    disabled: disabled
+  }, {
+    key: 'last90Days',
+    value: 'last90Days',
+    label: "{{t(\"Last 90 days\")}}",
+    disabled: disabled
+  }, {
+    key: 'next90Days',
+    value: 'next90Days',
+    label: "{{t(\"Next 90 days\")}}",
+    disabled: disabled
+  }];
+  return compile({
+    label: "{{t(\"Date variables\")}}",
+    value: '$date',
+    key: '$date',
+    disabled: dateOptions.every(function (option) {
+      return option.disabled;
+    }),
+    children: dateOptions
+  });
+};
+exports.useDateVariable = useDateVariable;

package/lib/schema-settings/VariableInput/hooks/useUserVariable.d.ts

@@ -0,0 +1,5 @@
+export declare const useUserVariable: ({ operator, schema, level }: {
+    operator?: any;
+    schema: any;
+    level?: number;
+}) => any;

package/lib/schema-settings/VariableInput/hooks/useUserVariable.js

@@ -0,0 +1,75 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.useUserVariable = void 0;
+var _react = require("react");
+var _schemaComponent = require("../../../schema-component");
+var getChildren = function getChildren(options, _ref) {
+  var schema = _ref.schema,
+    operator = _ref.operator,
+    maxDepth = _ref.maxDepth,
+    _ref$count = _ref.count,
+    count = _ref$count === void 0 ? 1 : _ref$count,
+    getFilterOptions = _ref.getFilterOptions;
+  if (count > maxDepth) {
+    return [];
+  }
+  var result = options.map(function (option) {
+    if (option.type !== 'belongsTo' && option.type !== 'hasOne' || !option.target) {
+      var _option$schema;
+      return {
+        key: option.name,
+        value: option.name,
+        label: option.title,
+        // TODO: 现在是通过组件的名称来过滤能够被选择的选项，这样的坏处是不够精确，后续可以优化
+        disabled: (schema === null || schema === void 0 ? void 0 : schema['x-component']) !== ((_option$schema = option.schema) === null || _option$schema === void 0 ? void 0 : _option$schema['x-component'])
+      };
+    }
+    var children = getChildren(getFilterOptions(option.target), {
+      schema: schema,
+      operator: operator,
+      maxDepth: maxDepth,
+      count: count + 1,
+      getFilterOptions: getFilterOptions
+    }) || [];
+    return {
+      key: option.name,
+      value: option.name,
+      label: option.title,
+      children: children,
+      disabled: children.every(function (child) {
+        return child.disabled;
+      })
+    };
+  });
+  return result;
+};
+var useUserVariable = function useUserVariable(_ref2) {
+  var operator = _ref2.operator,
+    schema = _ref2.schema,
+    level = _ref2.level;
+  var compile = (0, _schemaComponent.useCompile)();
+  var getFilterOptions = (0, _schemaComponent.useGetFilterOptions)();
+  var children = (0, _react.useMemo)(function () {
+    return getChildren(getFilterOptions('users'), {
+      schema: schema,
+      operator: operator,
+      maxDepth: level || 3,
+      getFilterOptions: getFilterOptions
+    }) || [];
+  }, [operator, schema]);
+  return (0, _react.useMemo)(function () {
+    return compile({
+      label: "{{t(\"Current user\")}}",
+      value: '$user',
+      key: '$user',
+      disabled: children.every(function (option) {
+        return option.disabled;
+      }),
+      children: children
+    });
+  }, [children]);
+};
+exports.useUserVariable = useUserVariable;

package/lib/schema-settings/VariableInput/hooks/useVariableOptions.d.ts

@@ -0,0 +1 @@
+export declare const useVariableOptions: () => any[];

package/lib/schema-settings/VariableInput/hooks/useVariableOptions.js

@@ -0,0 +1,25 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.useVariableOptions = void 0;
+var _useValues2 = require("../../../schema-component/antd/filter/useValues");
+var _useDateVariable = require("./useDateVariable");
+var _useUserVariable = require("./useUserVariable");
+var useVariableOptions = function useVariableOptions() {
+  var _useValues = (0, _useValues2.useValues)(),
+    operator = _useValues.operator,
+    schema = _useValues.schema;
+  var userVariable = (0, _useUserVariable.useUserVariable)({
+    operator: operator,
+    schema: schema
+  });
+  var dateVariable = (0, _useDateVariable.useDateVariable)({
+    operator: operator,
+    schema: schema
+  });
+  if (!operator || !schema) return [];
+  return [userVariable, dateVariable];
+};
+exports.useVariableOptions = useVariableOptions;

package/lib/user/VerificationCode.js

@@ -95,9 +95,8 @@ function VerificationCode(_ref) {
     }));
     return _onGetCode.apply(this, arguments);
   }
-  ;
   return /*#__PURE__*/_react2.default.createElement("fieldset", {
-    className: (0, _css.css)(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n      display: flex;\n      gap: .5em;\n    "])))
+    className: (0, _css.css)(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n        display: flex;\n        gap: 0.5em;\n      "])))
   }, /*#__PURE__*/_react2.default.createElement(_antd.Input, {
     value: value,
     onChange: onChange,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/client",
-  "version": "0.9.2-alpha.1",
+  "version": "0.9.2-alpha.3",
   "license": "Apache-2.0",
   "main": "lib",
   "module": "es/index.js",
@@ -13,9 +13,9 @@
     "@formily/antd": "2.0.20",
     "@formily/core": "2.0.20",
     "@formily/react": "2.0.20",
-    "@nocobase/evaluators": "0.9.2-alpha.1",
-    "@nocobase/sdk": "0.9.2-alpha.1",
-    "@nocobase/utils": "0.9.2-alpha.1",
+    "@nocobase/evaluators": "0.9.2-alpha.3",
+    "@nocobase/sdk": "0.9.2-alpha.3",
+    "@nocobase/utils": "0.9.2-alpha.3",
     "ahooks": "^3.7.2",
     "antd": "^4.24.8",
     "axios": "^0.26.1",
@@ -33,6 +33,7 @@
     "react-beautiful-dnd": "^13.1.0",
     "react-big-calendar": "^0.38.7",
     "react-drag-listview": "^0.1.9",
+    "react-error-boundary": "^4.0.3",
     "react-helmet": "^6.1.0",
     "react-hotkeys-hook": "^3.4.7",
     "react-i18next": "^11.15.1",
@@ -59,5 +60,5 @@
     "@types/markdown-it-highlightjs": "3.3.1",
     "axios-mock-adapter": "^1.20.0"
   },
-  "gitHead": "a4f103eb0144f07205aff7b2a6be8ea6aa1330df"
+  "gitHead": "b6b5f9372202d942c97d2d90a4197e060db05124"
 }

package/es/schema-component/antd/table-v2/hooks/useUserVariable.d.ts

@@ -1,10 +0,0 @@
-export declare const useUserVariable: ({ schema, operator }: {
-    schema: any;
-    operator: any;
-}) => {
-    label: string;
-    value: string;
-    key: string;
-    disabled: any;
-    children: any;
-};

package/lib/schema-component/antd/table-v2/hooks/useUserVariable.d.ts

@@ -1,10 +0,0 @@
-export declare const useUserVariable: ({ schema, operator }: {
-    schema: any;
-    operator: any;
-}) => {
-    label: string;
-    value: string;
-    key: string;
-    disabled: any;
-    children: any;
-};