@nocobase/client 0.10.0-alpha.2 → 0.10.0-alpha.3

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

@@ -0,0 +1,19 @@
+import { Schema } from '@formily/react';
+export declare const useFormVariable: ({ blockForm, rootCollection, operator, schema, level, }: {
+    blockForm?: any;
+    rootCollection: string;
+    operator?: any;
+    schema: Schema;
+    level?: number;
+}) => {
+    label: string;
+    value: string;
+    key: string;
+    children: any[];
+    isLeaf: boolean;
+    field: {
+        target: string;
+    };
+    depth: number;
+    loadChildren: (option: any) => Promise<void>;
+};

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

@@ -0,0 +1,96 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.useFormVariable = void 0;
+var _react = require("react");
+var _schemaComponent = require("../../../schema-component");
+var getChildren = function getChildren(options, _ref) {
+  var depth = _ref.depth,
+    maxDepth = _ref.maxDepth,
+    loadChildren = _ref.loadChildren,
+    compile = _ref.compile;
+  var result = options.map(function (option) {
+    if (!option.target) {
+      return {
+        key: option.name,
+        value: option.name,
+        label: compile(option.title),
+        depth: depth
+      };
+    }
+    if (depth >= maxDepth) {
+      return null;
+    }
+    return {
+      key: option.name,
+      value: option.name,
+      label: compile(option.title),
+      children: [],
+      isLeaf: false,
+      field: option,
+      depth: depth,
+      loadChildren: loadChildren
+    };
+  }).filter(Boolean);
+  return result;
+};
+var useFormVariable = function useFormVariable(_ref2) {
+  var blockForm = _ref2.blockForm,
+    rootCollection = _ref2.rootCollection,
+    operator = _ref2.operator,
+    schema = _ref2.schema,
+    level = _ref2.level;
+  var compile = (0, _schemaComponent.useCompile)();
+  var getFilterOptions = (0, _schemaComponent.useGetFilterOptions)();
+  var loadChildren = function loadChildren(option) {
+    var _option$field;
+    if (!((_option$field = option.field) === null || _option$field === void 0 ? void 0 : _option$field.target)) {
+      return new Promise(function (resolve) {
+        resolve(void 0);
+      });
+    }
+    var collectionName = option.field.target;
+    var fields = getFilterOptions(collectionName);
+    var allowFields = option.depth === 0 ? fields.filter(function (field) {
+      return Object.keys(blockForm.fields).some(function (name) {
+        return name.includes(".".concat(field.name));
+      });
+    }) : fields;
+    return new Promise(function (resolve) {
+      setTimeout(function () {
+        var children = getChildren(allowFields, {
+          depth: option.depth + 1,
+          maxDepth: 4,
+          loadChildren: loadChildren,
+          compile: compile
+        }) || [];
+        if (children.length === 0) {
+          option.disabled = true;
+          resolve();
+          return;
+        }
+        option.children = children;
+        resolve();
+        // 延迟 5 毫秒，防止阻塞主线程，导致 UI 卡顿
+      }, 5);
+    });
+  };
+  var result = (0, _react.useMemo)(function () {
+    return blockForm && {
+      label: "{{t(\"Current form\")}}",
+      value: '$form',
+      key: '$form',
+      children: [],
+      isLeaf: false,
+      field: {
+        target: rootCollection
+      },
+      depth: 0,
+      loadChildren: loadChildren
+    };
+  }, [rootCollection]);
+  return result;
+};
+exports.useFormVariable = useFormVariable;

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

@@ -0,0 +1,8 @@
+export declare const useIterationVariable: ({ blockForm, collectionField, operator, schema, level, rootCollection, }: {
+    blockForm?: any;
+    collectionField: any;
+    operator?: any;
+    schema: any;
+    level?: number;
+    rootCollection?: string;
+}) => any;

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

@@ -0,0 +1,84 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.useIterationVariable = 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) {
+      return {
+        key: option.name,
+        value: option.name,
+        label: option.title,
+        // TODO: 现在是通过组件的名称来过滤能够被选择的选项，这样的坏处是不够精确，后续可以优化
+        // disabled: schema?.['x-component'] !== option.schema?.['x-component'],
+        disabled: false
+      };
+    }
+    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 useIterationVariable = function useIterationVariable(_ref2) {
+  var blockForm = _ref2.blockForm,
+    collectionField = _ref2.collectionField,
+    operator = _ref2.operator,
+    schema = _ref2.schema,
+    level = _ref2.level,
+    rootCollection = _ref2.rootCollection;
+  var compile = (0, _schemaComponent.useCompile)();
+  var getFilterOptions = (0, _schemaComponent.useGetFilterOptions)();
+  var fields = getFilterOptions(collectionField === null || collectionField === void 0 ? void 0 : collectionField.collectionName);
+  var children = (0, _react.useMemo)(function () {
+    var allowFields = fields.filter(function (field) {
+      return Object.keys(blockForm.fields).some(function (name) {
+        return name.includes(field.name);
+      });
+    });
+    return getChildren(allowFields, {
+      schema: schema,
+      operator: operator,
+      maxDepth: level || 3,
+      getFilterOptions: getFilterOptions
+    }) || [];
+  }, [operator, schema, blockForm]);
+  return (0, _react.useMemo)(function () {
+    return rootCollection !== (collectionField === null || collectionField === void 0 ? void 0 : collectionField.collectionName) && children.length > 0 ? compile({
+      label: "{{t(\"Current object\")}}",
+      value: '$iteration',
+      key: '$iteration',
+      disabled: children.every(function (option) {
+        return option.disabled;
+      }),
+      children: children
+    }) : null;
+  }, [children]);
+};
+exports.useIterationVariable = useIterationVariable;

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

@@ -1,12 +1,5 @@
-export declare const useVariableOptions: () => ({
-    label: string;
-    value: string;
-    key: string;
-    disabled: boolean;
-    children: {
-        key: string;
-        value: string;
-        label: string;
-        disabled: boolean;
-    }[];
-} | import("../type").Option)[];
+export declare const useVariableOptions: ({ form, collectionField, rootCollection }: {
+    form: any;
+    collectionField: any;
+    rootCollection: any;
+}) => any[];

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

@@ -8,7 +8,12 @@ var _react = require("react");
 var _useValues2 = require("../../../schema-component/antd/filter/useValues");
 var _useDateVariable = require("./useDateVariable");
 var _useUserVariable = require("./useUserVariable");
-var useVariableOptions = function useVariableOptions() {
+var _useFormVariable = require("./useFormVariable");
+var _useIterationVariable = require("./useIterationVariable");
+var useVariableOptions = function useVariableOptions(_ref) {
+  var form = _ref.form,
+    collectionField = _ref.collectionField,
+    rootCollection = _ref.rootCollection;
   var _useValues = (0, _useValues2.useValues)(),
     operator = _useValues.operator,
     schema = _useValues.schema;
@@ -20,9 +25,20 @@ var useVariableOptions = function useVariableOptions() {
     operator: operator,
     schema: schema
   });
+  var formVariabele = (0, _useFormVariable.useFormVariable)({
+    blockForm: form,
+    rootCollection: rootCollection,
+    schema: schema
+  });
+  var iterationVariabele = (0, _useIterationVariable.useIterationVariable)({
+    blockForm: form,
+    collectionField: collectionField,
+    schema: schema,
+    rootCollection: rootCollection
+  });
   var result = (0, _react.useMemo)(function () {
-    return [userVariable, dateVariable];
-  }, [dateVariable, userVariable]);
+    return [userVariable, dateVariable, formVariabele, iterationVariabele].filter(Boolean);
+  }, [dateVariable, userVariable, formVariabele, iterationVariabele]);
   if (!operator || !schema) return [];
   return result;
 };

package/lib/schema-templates/BlockTemplateDetails.js

@@ -5,6 +5,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.BlockTemplateDetails = void 0;
+var _proLayout = require("@ant-design/pro-layout");
 var _antd = require("antd");
 var _react = _interopRequireWildcard(require("react"));
 var _reactRouterDom = require("react-router-dom");
@@ -92,7 +93,10 @@ var BlockTemplateDetails = function BlockTemplateDetails() {
   if (loading) {
     return /*#__PURE__*/_react.default.createElement(_antd.Spin, null);
   }
-  return /*#__PURE__*/_react.default.createElement("div", null, /*#__PURE__*/_react.default.createElement(_antd.PageHeader, {
+  return /*#__PURE__*/_react.default.createElement("div", null, /*#__PURE__*/_react.default.createElement(_proLayout.PageHeader, {
+    style: {
+      backgroundColor: 'white'
+    },
     onBack: function onBack() {
       navigate('/admin/plugins/block-templates');
     },

package/lib/schema-templates/BlockTemplatePage.js

@@ -4,7 +4,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.BlockTemplatesPane = exports.BlockTemplatePage = void 0;
-var _antd = require("antd");
+var _proLayout = require("@ant-design/pro-layout");
 var _react = _interopRequireDefault(require("react"));
 var _reactI18next = require("react-i18next");
 var _collectionManager = require("../collection-manager");
@@ -15,7 +15,10 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 var BlockTemplatePage = function BlockTemplatePage() {
   var _useTranslation = (0, _reactI18next.useTranslation)(),
     t = _useTranslation.t;
-  return /*#__PURE__*/_react.default.createElement("div", null, /*#__PURE__*/_react.default.createElement(_antd.PageHeader, {
+  return /*#__PURE__*/_react.default.createElement("div", null, /*#__PURE__*/_react.default.createElement(_proLayout.PageHeader, {
+    style: {
+      backgroundColor: 'white'
+    },
     ghost: false,
     title: t('Block templates')
   }), /*#__PURE__*/_react.default.createElement("div", {

package/lib/user/ChangePassword.d.ts

@@ -1,2 +1 @@
-import React from 'react';
-export declare const ChangePassword: () => React.JSX.Element;
+export declare const useChangePassword: () => import("antd/lib/menu/hooks/useItems").ItemType;

package/lib/user/ChangePassword.js

@@ -4,15 +4,13 @@ function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" =
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.ChangePassword = void 0;
+exports.useChangePassword = void 0;
 var _react = require("@formily/react");
 var _shared = require("@formily/shared");
-var _antd = require("antd");
 var _react2 = _interopRequireWildcard(require("react"));
 var _reactI18next = require("react-i18next");
 var _ = require("../");
 var _apiClient = require("../api-client");
-var _CurrentUser = require("./CurrentUser");
 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; }
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
@@ -159,33 +157,39 @@ var schema = {
     }
   })
 };
-var ChangePassword = function ChangePassword() {
+var useChangePassword = function useChangePassword() {
+  var ctx = (0, _react2.useContext)(_.DropdownVisibleContext);
   var _useState = (0, _react2.useState)(false),
     _useState2 = _slicedToArray(_useState, 2),
     visible = _useState2[0],
     setVisible = _useState2[1];
   var _useTranslation = (0, _reactI18next.useTranslation)(),
     t = _useTranslation.t;
-  var ctx = (0, _react2.useContext)(_CurrentUser.DropdownVisibleContext);
-  return /*#__PURE__*/_react2.default.createElement(_.ActionContextProvider, {
-    value: {
-      visible: visible,
-      setVisible: setVisible
-    }
-  }, /*#__PURE__*/_react2.default.createElement(_antd.Menu.Item, {
-    key: "password",
-    eventKey: 'ChangePassword',
-    onClick: function onClick() {
-      var _ctx$setVisible;
-      ctx === null || ctx === void 0 ? void 0 : (_ctx$setVisible = ctx.setVisible) === null || _ctx$setVisible === void 0 ? void 0 : _ctx$setVisible.call(ctx, false);
-      setVisible(true);
-    }
-  }, t('Change password')), /*#__PURE__*/_react2.default.createElement(_.SchemaComponent, {
-    scope: {
-      useCloseAction: useCloseAction,
-      useSaveCurrentUserValues: useSaveCurrentUserValues
-    },
-    schema: schema
-  }));
+  return (0, _react2.useMemo)(function () {
+    return {
+      key: 'password',
+      eventKey: 'ChangePassword',
+      onClick: function onClick() {
+        setVisible(true);
+        ctx === null || ctx === void 0 ? void 0 : ctx.setVisible(false);
+      },
+      label: /*#__PURE__*/_react2.default.createElement(_react2.default.Fragment, null, t('Change password'), /*#__PURE__*/_react2.default.createElement(_.ActionContextProvider, {
+        value: {
+          visible: visible,
+          setVisible: setVisible
+        }
+      }, /*#__PURE__*/_react2.default.createElement("div", {
+        onClick: function onClick(e) {
+          return e.stopPropagation();
+        }
+      }, /*#__PURE__*/_react2.default.createElement(_.SchemaComponent, {
+        scope: {
+          useCloseAction: useCloseAction,
+          useSaveCurrentUserValues: useSaveCurrentUserValues
+        },
+        schema: schema
+      }))))
+    };
+  }, [visible]);
 };
-exports.ChangePassword = ChangePassword;
+exports.useChangePassword = useChangePassword;