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

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

@@ -0,0 +1,89 @@
+import { useMemo } from 'react';
+import { useCompile, useGetFilterOptions } from '../../../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;
+};
+export var useFormVariable = function useFormVariable(_ref2) {
+  var blockForm = _ref2.blockForm,
+    rootCollection = _ref2.rootCollection,
+    operator = _ref2.operator,
+    schema = _ref2.schema,
+    level = _ref2.level;
+  var compile = useCompile();
+  var getFilterOptions = 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 = 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;
+};

package/es/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/es/schema-settings/VariableInput/hooks/useIterationVariable.js

@@ -0,0 +1,77 @@
+import { useMemo } from 'react';
+import { useCompile, useGetFilterOptions } from '../../../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;
+};
+export 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 = useCompile();
+  var getFilterOptions = useGetFilterOptions();
+  var fields = getFilterOptions(collectionField === null || collectionField === void 0 ? void 0 : collectionField.collectionName);
+  var children = 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 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]);
+};

package/es/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/es/schema-settings/VariableInput/hooks/useVariableOptions.js

@@ -2,7 +2,12 @@ import { useMemo } from 'react';
 import { useValues } from '../../../schema-component/antd/filter/useValues';
 import { useDateVariable } from './useDateVariable';
 import { useUserVariable } from './useUserVariable';
-export var useVariableOptions = function useVariableOptions() {
+import { useFormVariable } from './useFormVariable';
+import { useIterationVariable } from './useIterationVariable';
+export var useVariableOptions = function useVariableOptions(_ref) {
+  var form = _ref.form,
+    collectionField = _ref.collectionField,
+    rootCollection = _ref.rootCollection;
   var _useValues = useValues(),
     operator = _useValues.operator,
     schema = _useValues.schema;
@@ -14,9 +19,20 @@ export var useVariableOptions = function useVariableOptions() {
     operator: operator,
     schema: schema
   });
+  var formVariabele = useFormVariable({
+    blockForm: form,
+    rootCollection: rootCollection,
+    schema: schema
+  });
+  var iterationVariabele = useIterationVariable({
+    blockForm: form,
+    collectionField: collectionField,
+    schema: schema,
+    rootCollection: rootCollection
+  });
   var result = 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/es/schema-templates/BlockTemplateDetails.js

@@ -10,7 +10,8 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
 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 = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0); } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i.return && (_r = _i.return(), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
-import { PageHeader as AntdPageHeader, Input, Spin } from 'antd';
+import { PageHeader as AntdPageHeader } from '@ant-design/pro-layout';
+import { Input, Spin } from 'antd';
 import React, { useContext, useState } from 'react';
 import { useNavigate, useParams } from 'react-router-dom';
 import { useAPIClient, useRequest, useSchemaTemplateManager } from '..';
@@ -85,6 +86,9 @@ export var BlockTemplateDetails = function BlockTemplateDetails() {
     return /*#__PURE__*/React.createElement(Spin, null);
   }
   return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(AntdPageHeader, {
+    style: {
+      backgroundColor: 'white'
+    },
     onBack: function onBack() {
       navigate('/admin/plugins/block-templates');
     },

package/es/schema-templates/BlockTemplatePage.js

@@ -1,4 +1,4 @@
-import { PageHeader as AntdPageHeader } from 'antd';
+import { PageHeader as AntdPageHeader } from '@ant-design/pro-layout';
 import React from 'react';
 import { useTranslation } from 'react-i18next';
 import { CollectionManagerProvider } from '../collection-manager';
@@ -9,6 +9,9 @@ export var BlockTemplatePage = function BlockTemplatePage() {
   var _useTranslation = useTranslation(),
     t = _useTranslation.t;
   return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(AntdPageHeader, {
+    style: {
+      backgroundColor: 'white'
+    },
     ghost: false,
     title: t('Block templates')
   }), /*#__PURE__*/React.createElement("div", {

package/es/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/es/user/ChangePassword.js

@@ -13,12 +13,10 @@ 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 { useForm } from '@formily/react';
 import { uid } from '@formily/shared';
-import { Menu } from 'antd';
-import React, { useContext, useState } from 'react';
+import React, { useContext, useMemo, useState } from 'react';
 import { useTranslation } from 'react-i18next';
-import { ActionContextProvider, SchemaComponent, useActionContext } from '../';
+import { ActionContextProvider, DropdownVisibleContext, SchemaComponent, useActionContext } from '../';
 import { useAPIClient } from '../api-client';
-import { DropdownVisibleContext } from './CurrentUser';
 var useCloseAction = function useCloseAction() {
   var _useActionContext = useActionContext(),
     setVisible = _useActionContext.setVisible;
@@ -151,32 +149,38 @@ var schema = {
     }
   })
 };
-export var ChangePassword = function ChangePassword() {
+export var useChangePassword = function useChangePassword() {
+  var ctx = useContext(DropdownVisibleContext);
   var _useState = useState(false),
     _useState2 = _slicedToArray(_useState, 2),
     visible = _useState2[0],
     setVisible = _useState2[1];
   var _useTranslation = useTranslation(),
     t = _useTranslation.t;
-  var ctx = useContext(DropdownVisibleContext);
-  return /*#__PURE__*/React.createElement(ActionContextProvider, {
-    value: {
-      visible: visible,
-      setVisible: setVisible
-    }
-  }, /*#__PURE__*/React.createElement(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__*/React.createElement(SchemaComponent, {
-    scope: {
-      useCloseAction: useCloseAction,
-      useSaveCurrentUserValues: useSaveCurrentUserValues
-    },
-    schema: schema
-  }));
+  return useMemo(function () {
+    return {
+      key: 'password',
+      eventKey: 'ChangePassword',
+      onClick: function onClick() {
+        setVisible(true);
+        ctx === null || ctx === void 0 ? void 0 : ctx.setVisible(false);
+      },
+      label: /*#__PURE__*/React.createElement(React.Fragment, null, t('Change password'), /*#__PURE__*/React.createElement(ActionContextProvider, {
+        value: {
+          visible: visible,
+          setVisible: setVisible
+        }
+      }, /*#__PURE__*/React.createElement("div", {
+        onClick: function onClick(e) {
+          return e.stopPropagation();
+        }
+      }, /*#__PURE__*/React.createElement(SchemaComponent, {
+        scope: {
+          useCloseAction: useCloseAction,
+          useSaveCurrentUserValues: useSaveCurrentUserValues
+        },
+        schema: schema
+      }))))
+    };
+  }, [visible]);
 };