@nocobase/plugin-workflow 0.9.4-alpha.1 → 0.10.0-alpha.2

package/lib/client/nodes/manual/forms/create.js

@@ -0,0 +1,104 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+function _react() {
+  const data = _interopRequireDefault(require("react"));
+  _react = function _react() {
+    return data;
+  };
+  return data;
+}
+function _client() {
+  const data = require("@nocobase/client");
+  _client = function _client() {
+    return data;
+  };
+  return data;
+}
+var _locale = require("../../../locale");
+var _utils = require("../utils");
+var _FormBlockInitializer = require("../FormBlockInitializer");
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: 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 = 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; }
+function CreateFormDesigner() {
+  const _useCollection = (0, _client().useCollection)(),
+    name = _useCollection.name,
+    title = _useCollection.title;
+  return _react().default.createElement(_client().GeneralSchemaDesigner, {
+    title: title || name
+  }, _react().default.createElement(_client().SchemaSettings.BlockTitleItem, null), _react().default.createElement(_client().SchemaSettings.LinkageRules, {
+    collectionName: name
+  }), _react().default.createElement(_client().SchemaSettings.DataTemplates, {
+    collectionName: name
+  }), _react().default.createElement(_client().SchemaSettings.Divider, null), _react().default.createElement(_client().SchemaSettings.Remove, {
+    removeParentsIfNoChildren: true,
+    breakRemoveOn: {
+      'x-component': 'Grid'
+    }
+  }));
+}
+var _default = {
+  title: `{{t("Create record form", { ns: "${_locale.NAMESPACE}" })}}`,
+  config: {
+    useInitializer() {
+      const _useCollectionManager = (0, _client().useCollectionManager)(),
+        collections = _useCollectionManager.collections;
+      return {
+        key: 'createRecordForm',
+        type: 'subMenu',
+        title: `{{t("Create record form", { ns: "${_locale.NAMESPACE}" })}}`,
+        children: collections.filter(item => !item.hidden).map(item => ({
+          key: `createForm-${item.name}`,
+          type: 'item',
+          title: item.title,
+          schema: {
+            collection: item.name,
+            title: `{{t("Create record", { ns: "${_locale.NAMESPACE}" })}}`,
+            formType: 'create',
+            'x-designer': 'CreateFormDesigner'
+          },
+          component: _FormBlockInitializer.FormBlockInitializer
+        }))
+      };
+    },
+    initializers: {
+      // AddCustomFormField
+    },
+    components: {
+      CreateFormDesigner
+    },
+    parseFormOptions(root) {
+      const forms = {};
+      const formBlocks = (0, _utils.findSchema)(root, item => item['x-decorator'] === 'FormBlockProvider' && item['x-decorator-props'].formType === 'create');
+      formBlocks.forEach(formBlock => {
+        var _formBlock$xComponen;
+        const _Object$keys = Object.keys(formBlock.properties),
+          _Object$keys2 = _slicedToArray(_Object$keys, 1),
+          formKey = _Object$keys2[0];
+        const formSchema = formBlock.properties[formKey];
+        forms[formKey] = {
+          type: 'create',
+          title: ((_formBlock$xComponen = formBlock['x-component-props']) === null || _formBlock$xComponen === void 0 ? void 0 : _formBlock$xComponen.title) || formKey,
+          actions: (0, _utils.findSchema)(formSchema.properties.actions, item => item['x-component'] === 'Action').map(item => item['x-decorator-props'].value),
+          collection: formBlock['x-decorator-props'].collection
+        };
+      });
+      return forms;
+    }
+  },
+  block: {
+    scope: {
+      // useFormBlockProps
+    },
+    components: {}
+  }
+};
+exports.default = _default;

package/lib/client/nodes/manual/forms/custom.d.ts

@@ -0,0 +1,3 @@
+import { ManualFormType } from '../SchemaConfig';
+declare const _default: ManualFormType;
+export default _default;

package/lib/client/nodes/manual/forms/{customForm.js → custom.js}

@@ -55,6 +55,7 @@ function _client2() {
 }
 var _constants = require("../../../constants");
 var _locale = require("../../../locale");
+var _utils = require("../utils");
 const _excluded = ["insert"],
   _excluded2 = ["unique", "type"],
   _excluded3 = ["properties"];
@@ -75,22 +76,36 @@ 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; }
-const FormCollectionContext = _react().default.createContext(null);
-function FormCollectionProvider(props) {
-  var _props$collection$fie, _props$collection;
+function CustomFormBlockProvider(props) {
+  var _props$collection$fie, _props$collection, _fieldSchema$toJSON$p, _userJob$result;
   const _useState = (0, _react().useState)((_props$collection$fie = (_props$collection = props.collection) === null || _props$collection === void 0 ? void 0 : _props$collection.fields) !== null && _props$collection$fie !== void 0 ? _props$collection$fie : []),
     _useState2 = _slicedToArray(_useState, 2),
     fields = _useState2[0],
     setCollectionFields = _useState2[1];
-  return _react().default.createElement(FormCollectionContext.Provider, {
-    value: {
-      setCollectionFields
-    }
-  }, _react().default.createElement(_client().CollectionProvider, {
+  const userJob = (0, _client().useRecord)();
+  const field = (0, _react2().useField)();
+  const fieldSchema = (0, _react2().useFieldSchema)();
+  const _Object$keys = Object.keys((_fieldSchema$toJSON$p = fieldSchema.toJSON().properties) !== null && _fieldSchema$toJSON$p !== void 0 ? _fieldSchema$toJSON$p : {}),
+    _Object$keys2 = _slicedToArray(_Object$keys, 1),
+    formKey = _Object$keys2[0];
+  const values = userJob === null || userJob === void 0 ? void 0 : (_userJob$result = userJob.result) === null || _userJob$result === void 0 ? void 0 : _userJob$result[formKey];
+  const form = (0, _react().useMemo)(() => (0, _core().createForm)({
+    initialValues: values
+  }), [values]);
+  return _react().default.createElement(_client().CollectionProvider, {
     collection: _objectSpread(_objectSpread({}, props.collection), {}, {
       fields
     })
-  }, props.children));
+  }, _react().default.createElement(_client().RecordProvider, {
+    record: values,
+    parent: false
+  }, _react().default.createElement(_client().FormBlockContext.Provider, {
+    value: {
+      form,
+      field,
+      setCollectionFields
+    }
+  }, props.children)));
 }
 function CustomFormBlockInitializer(_ref) {
   let insert = _ref.insert,
@@ -99,7 +114,7 @@ function CustomFormBlockInitializer(_ref) {
     onClick: () => {
       insert({
         type: 'void',
-        'x-decorator': 'FormCollectionProvider',
+        'x-decorator': 'CustomFormBlockProvider',
         'x-decorator-props': {
           collection: {
             name: (0, _client2().uid)(),
@@ -227,7 +242,7 @@ function AddCustomFormField(props) {
     _useState6 = _slicedToArray(_useState5, 2),
     insert = _useState6[0],
     setCallback = _useState6[1];
-  const _useContext = (0, _react().useContext)(FormCollectionContext),
+  const _useContext = (0, _react().useContext)(_client().FormBlockContext),
     setCollectionFields = _useContext.setCollectionFields;
   return _react().default.createElement(AddCustomFormFieldButtonContext.Provider, {
     value: {
@@ -251,7 +266,7 @@ function AddCustomFormField(props) {
     items: items,
     component: component,
     title: "{{t('Configure fields')}}"
-  }), _react().default.createElement(_client().ActionContext.Provider, {
+  }), _react().default.createElement(_client().ActionContextProvider, {
     value: {
       visible: Boolean(interfaceOptions)
     }
@@ -322,7 +337,9 @@ function AddCustomFormField(props) {
                           type: options.uiSchema.type,
                           'x-decorator': 'FormItem',
                           'x-component': 'CollectionField',
-                          'x-interface-options': newField,
+                          'x-component-props': {
+                            field: newField
+                          },
                           'x-collection-field': `${collection.name}.${options.name}`,
                           'x-designer': 'FormItem.Designer'
                         });
@@ -360,50 +377,51 @@ function CustomFormFieldInitializer(props) {
     }
   });
 }
-function useFormBlockProps() {
-  var _user$data;
-  const _useRecord = (0, _client().useRecord)(),
-    status = _useRecord.status,
-    result = _useRecord.result,
-    userId = _useRecord.userId;
-  const _useCurrentUserContex = (0, _client().useCurrentUserContext)(),
-    user = _useCurrentUserContex.data;
-  const _useFieldSchema = (0, _react2().useFieldSchema)(),
-    name = _useFieldSchema.name;
-  const pattern = status ? (result === null || result === void 0 ? void 0 : result[name]) ? 'readPretty' : 'disabled' : (user === null || user === void 0 ? void 0 : (_user$data = user.data) === null || _user$data === void 0 ? void 0 : _user$data.id) !== userId ? 'disabled' : 'editable';
-  const form = (0, _react().useMemo)(() => {
-    var _result$name;
-    return (0, _core().createForm)({
-      pattern,
-      initialValues: (_result$name = result === null || result === void 0 ? void 0 : result[name]) !== null && _result$name !== void 0 ? _result$name : {}
-    });
-  }, [result, name]);
-  return {
-    form
-  };
-}
 var _default = {
   title: `{{t("Custom form", { ns: "${_locale.NAMESPACE}" })}}`,
   config: {
-    initializer: {
-      key: 'customForm',
-      type: 'item',
-      title: `{{t("Custom form", { ns: "${_locale.NAMESPACE}" })}}`,
-      component: CustomFormBlockInitializer
+    useInitializer() {
+      return {
+        key: 'customForm',
+        type: 'item',
+        title: `{{t("Custom form", { ns: "${_locale.NAMESPACE}" })}}`,
+        component: CustomFormBlockInitializer
+      };
     },
     initializers: {
       AddCustomFormField
     },
     components: {
-      FormCollectionProvider
+      CustomFormBlockProvider
+    },
+    parseFormOptions(root) {
+      const forms = {};
+      const formBlocks = (0, _utils.findSchema)(root, item => item['x-decorator'] === 'CustomFormBlockProvider');
+      formBlocks.forEach(formBlock => {
+        var _formBlock$xComponen;
+        const _Object$keys3 = Object.keys(formBlock.properties),
+          _Object$keys4 = _slicedToArray(_Object$keys3, 1),
+          formKey = _Object$keys4[0];
+        const formSchema = formBlock.properties[formKey];
+        const fields = (0, _utils.findSchema)(formSchema.properties.grid, item => item['x-component'] === 'CollectionField', true);
+        formBlock['x-decorator-props'].collection.fields = fields.map(field => {
+          var _field$xComponentPr, _field$xComponentPr2;
+          return (_field$xComponentPr = (_field$xComponentPr2 = field['x-component-props']) === null || _field$xComponentPr2 === void 0 ? void 0 : _field$xComponentPr2.field) !== null && _field$xComponentPr !== void 0 ? _field$xComponentPr : field['x-interface-options'];
+        });
+        forms[formKey] = {
+          type: 'custom',
+          title: ((_formBlock$xComponen = formBlock['x-component-props']) === null || _formBlock$xComponen === void 0 ? void 0 : _formBlock$xComponen.title) || formKey,
+          actions: (0, _utils.findSchema)(formSchema.properties.actions, item => item['x-component'] === 'Action').map(item => item['x-decorator-props'].value),
+          collection: formBlock['x-decorator-props'].collection
+        };
+      });
+      return forms;
     }
   },
   block: {
-    scope: {
-      useFormBlockProps
-    },
+    scope: {},
     components: {
-      FormCollectionProvider: _client().CollectionProvider
+      CustomFormBlockProvider
     }
   }
 };

package/lib/client/nodes/manual/forms/update.d.ts

@@ -0,0 +1,3 @@
+import { ManualFormType } from '../SchemaConfig';
+declare const _default: ManualFormType;
+export default _default;

package/lib/client/nodes/manual/forms/update.js

@@ -0,0 +1,161 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+function _react() {
+  const data = _interopRequireDefault(require("react"));
+  _react = function _react() {
+    return data;
+  };
+  return data;
+}
+function _react2() {
+  const data = require("@formily/react");
+  _react2 = function _react2() {
+    return data;
+  };
+  return data;
+}
+function _reactI18next() {
+  const data = require("react-i18next");
+  _reactI18next = function _reactI18next() {
+    return data;
+  };
+  return data;
+}
+function _client() {
+  const data = require("@nocobase/client");
+  _client = function _client() {
+    return data;
+  };
+  return data;
+}
+var _locale = require("../../../locale");
+var _utils = require("../utils");
+var _FilterDynamicComponent = require("../../../components/FilterDynamicComponent");
+var _FormBlockInitializer = require("../FormBlockInitializer");
+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) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return typeof key === "symbol" ? key : String(key); }
+function _toPrimitive(input, hint) { if (typeof input !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (typeof res !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
+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 = 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; }
+function UpdateFormDesigner() {
+  const _useCollection = (0, _client().useCollection)(),
+    name = _useCollection.name,
+    title = _useCollection.title;
+  const fieldSchema = (0, _react2().useFieldSchema)();
+  const _useTranslation = (0, _reactI18next().useTranslation)(),
+    t = _useTranslation.t;
+  const _useDesignable = (0, _client().useDesignable)(),
+    dn = _useDesignable.dn;
+  return _react().default.createElement(_client().GeneralSchemaDesigner, {
+    title: title || name
+  }, _react().default.createElement(_client().SchemaSettings.BlockTitleItem, null), _react().default.createElement(_client().SchemaSettings.ActionModalItem, {
+    title: t('Filter settings', {
+      ns: _locale.NAMESPACE
+    }),
+    schema: {
+      name: 'filter',
+      type: 'object',
+      title: `{{t("Filter")}}`,
+      // 'x-decorator': 'FormItem',
+      'x-component': 'Filter',
+      'x-component-props': {
+        useProps() {
+          var _fieldSchema$xDecora;
+          const options = (0, _client().useCollectionFilterOptions)(fieldSchema === null || fieldSchema === void 0 ? void 0 : (_fieldSchema$xDecora = fieldSchema['x-decorator-props']) === null || _fieldSchema$xDecora === void 0 ? void 0 : _fieldSchema$xDecora.collection);
+          return {
+            options
+          };
+        },
+        dynamicComponent: 'FilterDynamicComponent'
+      }
+    },
+    initialValues: fieldSchema === null || fieldSchema === void 0 ? void 0 : fieldSchema['x-decorator-props'],
+    onSubmit: ({
+      filter
+    }) => {
+      fieldSchema['x-decorator-props'].filter = filter;
+      dn.emit('patch', {
+        schema: {
+          // ['x-uid']: fieldSchema['x-uid'],
+          'x-decorator-props': fieldSchema['x-decorator-props']
+        }
+      });
+      dn.refresh();
+    }
+  }), _react().default.createElement(_client().SchemaSettings.LinkageRules, {
+    collectionName: name
+  }), _react().default.createElement(_client().SchemaSettings.Divider, null), _react().default.createElement(_client().SchemaSettings.Remove, {
+    removeParentsIfNoChildren: true,
+    breakRemoveOn: {
+      'x-component': 'Grid'
+    }
+  }));
+}
+var _default = {
+  title: `{{t("Update record form", { ns: "${_locale.NAMESPACE}" })}}`,
+  config: {
+    useInitializer() {
+      const _useCollectionManager = (0, _client().useCollectionManager)(),
+        collections = _useCollectionManager.collections;
+      return {
+        key: 'updateRecordForm',
+        type: 'subMenu',
+        title: `{{t("Update record form", { ns: "${_locale.NAMESPACE}" })}}`,
+        children: collections.filter(item => !item.hidden).map(item => ({
+          key: `updateForm-${item.name}`,
+          type: 'item',
+          title: item.title,
+          schema: {
+            collection: item.name,
+            title: `{{t("Update record", { ns: "${_locale.NAMESPACE}" })}}`,
+            formType: 'update',
+            'x-designer': 'UpdateFormDesigner'
+          },
+          component: _FormBlockInitializer.FormBlockInitializer
+        }))
+      };
+    },
+    initializers: {
+      // AddCustomFormField
+    },
+    components: {
+      FilterDynamicComponent: _FilterDynamicComponent.FilterDynamicComponent,
+      UpdateFormDesigner
+    },
+    parseFormOptions(root) {
+      const forms = {};
+      const formBlocks = (0, _utils.findSchema)(root, item => item['x-decorator'] === 'FormBlockProvider' && item['x-decorator-props'].formType === 'update');
+      formBlocks.forEach(formBlock => {
+        var _formBlock$xComponen;
+        const _Object$keys = Object.keys(formBlock.properties),
+          _Object$keys2 = _slicedToArray(_Object$keys, 1),
+          formKey = _Object$keys2[0];
+        const formSchema = formBlock.properties[formKey];
+        forms[formKey] = _objectSpread(_objectSpread({}, formBlock['x-decorator-props']), {}, {
+          type: 'update',
+          title: ((_formBlock$xComponen = formBlock['x-component-props']) === null || _formBlock$xComponen === void 0 ? void 0 : _formBlock$xComponen.title) || formKey,
+          actions: (0, _utils.findSchema)(formSchema.properties.actions, item => item['x-component'] === 'Action').map(item => item['x-decorator-props'].value)
+        });
+      });
+      return forms;
+    }
+  },
+  block: {
+    scope: {
+      // useFormBlockProps
+    },
+    components: {}
+  }
+};
+exports.default = _default;

package/lib/client/nodes/manual/index.d.ts

@@ -1,5 +1,4 @@
 import { SchemaInitializerItemOptions } from '@nocobase/client';
-import { CollectionFieldInitializers } from '../../components/CollectionFieldInitializers';
 import { SchemaConfig, SchemaConfigButton } from './SchemaConfig';
 import { ModeConfig } from './ModeConfig';
 import { AssigneesSelect } from './AssigneesSelect';
@@ -68,11 +67,9 @@ declare const _default: {
         value: string;
         label: any;
         title: any;
-        children: any;
+        children: import("../../variable").VariableOption[];
     }[];
     useInitializers(node: any): SchemaInitializerItemOptions | null;
-    initializers: {
-        CollectionFieldInitializers: typeof CollectionFieldInitializers;
-    };
+    initializers: {};
 };
 export default _default;

package/lib/client/nodes/manual/index.js

@@ -12,7 +12,6 @@ function _client() {
   return data;
 }
 var _CollectionBlockInitializer = require("../../components/CollectionBlockInitializer");
-var _CollectionFieldInitializers = require("../../components/CollectionFieldInitializers");
 var _variable = require("../../variable");
 var _locale = require("../../locale");
 var _SchemaConfig = require("./SchemaConfig");
@@ -105,35 +104,39 @@ var _default = {
       return null;
     }
     const options = formKeys.map(formKey => {
-      var _form$collection$fiel, _form$collection;
+      var _form$collection;
       const form = config.forms[formKey];
-      const fields = ((_form$collection$fiel = (_form$collection = form.collection) === null || _form$collection === void 0 ? void 0 : _form$collection.fields) !== null && _form$collection$fiel !== void 0 ? _form$collection$fiel : []).map(field => ({
-        key: field.name,
-        value: field.name,
-        label: field.uiSchema.title,
-        title: field.uiSchema.title
-      }));
-      const filteredFields = (0, _variable.filterTypedFields)(fields, types);
-      return filteredFields.length ? {
+      // eslint-disable-next-line react-hooks/rules-of-hooks
+      const options = (0, _variable.useCollectionFieldOptions)({
+        fields: (_form$collection = form.collection) === null || _form$collection === void 0 ? void 0 : _form$collection.fields,
+        collection: form.collection,
+        types
+      });
+      return options.length ? {
         key: formKey,
         value: formKey,
         label: form.title || formKey,
         title: form.title || formKey,
-        children: filteredFields
+        children: options
       } : null;
     }).filter(Boolean);
     return options.length ? options : null;
   },
   useInitializers(node) {
     var _node$config$forms;
+    const _useCollectionManager = (0, _client().useCollectionManager)(),
+      getCollection = _useCollectionManager.getCollection;
     const formKeys = Object.keys((_node$config$forms = node.config.forms) !== null && _node$config$forms !== void 0 ? _node$config$forms : {});
     if (!formKeys.length || node.config.mode) {
       return null;
     }
     const forms = formKeys.map(formKey => {
-      var _form$collection2, _form$collection2$fie, _form$title;
+      var _form$title;
       const form = node.config.forms[formKey];
-      return ((_form$collection2 = form.collection) === null || _form$collection2 === void 0 ? void 0 : (_form$collection2$fie = _form$collection2.fields) === null || _form$collection2$fie === void 0 ? void 0 : _form$collection2$fie.length) ? {
+      const _getCollection = getCollection(form.collection),
+        _getCollection$fields = _getCollection.fields,
+        fields = _getCollection$fields === void 0 ? [] : _getCollection$fields;
+      return fields.length ? {
         type: 'item',
         title: (_form$title = form.title) !== null && _form$title !== void 0 ? _form$title : formKey,
         component: _CollectionBlockInitializer.CollectionBlockInitializer,
@@ -148,8 +151,6 @@ var _default = {
       children: forms
     } : null;
   },
-  initializers: {
-    CollectionFieldInitializers: _CollectionFieldInitializers.CollectionFieldInitializers
-  }
+  initializers: {}
 };
 exports.default = _default;

package/lib/client/nodes/manual/utils.d.ts

@@ -0,0 +1,2 @@
+export declare function traverseSchema(schema: any, fn: any): void;
+export declare function findSchema(schema: any, filter: any, onlyLeaf?: boolean): any[];

package/lib/client/nodes/manual/utils.js

@@ -0,0 +1,31 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.findSchema = findSchema;
+exports.traverseSchema = traverseSchema;
+function traverseSchema(schema, fn) {
+  fn(schema);
+  if (schema.properties) {
+    Object.keys(schema.properties).forEach(key => {
+      traverseSchema(schema.properties[key], fn);
+    });
+  }
+}
+function findSchema(schema, filter, onlyLeaf = false) {
+  const result = [];
+  if (!schema) {
+    return result;
+  }
+  if (filter(schema) && (!onlyLeaf || !schema.properties)) {
+    result.push(schema);
+    return result;
+  }
+  if (schema.properties) {
+    Object.keys(schema.properties).forEach(key => {
+      result.push(...findSchema(schema.properties[key], filter));
+    });
+  }
+  return result;
+}

package/lib/client/nodes/parallel.d.ts

@@ -1,3 +1,4 @@
+import React from 'react';
 import { RadioWithTooltip } from '../components/RadioWithTooltip';
 declare const _default: {
     title: string;
@@ -21,7 +22,9 @@ declare const _default: {
         };
     };
     view: {};
-    render(data: any): JSX.Element;
+    component: ({ data }: {
+        data: any;
+    }) => React.JSX.Element;
     components: {
         RadioWithTooltip: typeof RadioWithTooltip;
     };

package/lib/client/nodes/parallel.js

@@ -76,7 +76,9 @@ var _default = {
     }
   },
   view: {},
-  render(data) {
+  component: function Component({
+    data
+  }) {
     const id = data.id,
       mode = data.config.mode;
     const _useFlowContext = (0, _FlowContext.useFlowContext)(),

package/lib/client/nodes/query.d.ts

@@ -1,5 +1,4 @@
 import { SchemaInitializerItemOptions, useCollectionDataSource } from '@nocobase/client';
-import { CollectionFieldInitializers } from '../components/CollectionFieldInitializers';
 import { FilterDynamicComponent } from '../components/FilterDynamicComponent';
 declare const _default: {
     title: string;
@@ -76,14 +75,12 @@ declare const _default: {
     };
     components: {
         FilterDynamicComponent: typeof FilterDynamicComponent;
-        FieldsSelect: import("react").MemoExoticComponent<import("react").FunctionComponent<Pick<any, string | number | symbol>>>;
+        FieldsSelect: import("react").MemoExoticComponent<import("@formily/reactive-react").ReactFC<Pick<any, string | number | symbol>>>;
     };
     useVariables({ config }: {
         config: any;
     }, options: any): import("../variable").VariableOption[];
     useInitializers(node: any): SchemaInitializerItemOptions | null;
-    initializers: {
-        CollectionFieldInitializers: typeof CollectionFieldInitializers;
-    };
+    initializers: {};
 };
 export default _default;

package/lib/client/nodes/query.js

@@ -14,7 +14,6 @@ function _client() {
 var _collection = require("../schemas/collection");
 var _locale = require("../locale");
 var _CollectionBlockInitializer = require("../components/CollectionBlockInitializer");
-var _CollectionFieldInitializers = require("../components/CollectionFieldInitializers");
 var _FilterDynamicComponent = require("../components/FilterDynamicComponent");
 var _variable = require("../variable");
 var _FieldsSelect = require("../components/FieldsSelect");
@@ -72,7 +71,7 @@ var _default = {
   },
   useInitializers(node) {
     var _node$title;
-    if (!node.config.collection) {
+    if (!node.config.collection || node.config.multiple) {
       return null;
     }
     return {
@@ -83,8 +82,6 @@ var _default = {
       dataSource: `{{$jobsMapByNodeId.${node.id}}}`
     };
   },
-  initializers: {
-    CollectionFieldInitializers: _CollectionFieldInitializers.CollectionFieldInitializers
-  }
+  initializers: {}
 };
 exports.default = _default;