Merge branch 'next' into develop

packages/core/client/src/schema-component/antd/variable/TextArea.tsx

@@ -171,7 +171,6 @@ function getSingleEndRange(nodes: ChildNode[], index: number, offset: number): [
     let realIndex = 0;
     let textOffset = 0;
     for (let i = 0; i < index + 1; i++) {
-      // console.log(i, realIndex, textOffset);
       if (nodes[i]?.nodeName === '#text') {
         if (i !== index && nodes[i + 1] && nodes[i + 1]?.nodeName !== '#text') {
           realIndex += 1;

packages/core/client/src/schema-settings/GeneralSchemaDesigner.tsx

@@ -12,10 +12,10 @@ import { css } from '@emotion/css';
 import { useField, useFieldSchema } from '@formily/react';
 import { Space } from 'antd';
 import classNames from 'classnames';
-//@ts-ignore
 import React, {
   createContext,
   FC,
+  //@ts-ignore
   startTransition,
   useCallback,
   useEffect,

packages/plugins/@nocobase/plugin-workflow-request/src/server/RequestInstruction.ts

@@ -168,7 +168,7 @@ export default class extends Instruction {
 
     processor.logger.info(`request (#${node.id}) sent to "${config.url}", waiting for response...`);
 
-    return job;
+    return null;
   }
 
   async resume(node: FlowNodeModel, job, processor: Processor) {

packages/plugins/@nocobase/plugin-workflow-test/src/server/index.ts

@@ -78,7 +78,7 @@ export async function getApp({
   });
   await anotherDB.sync();
 
-  another.acl.allow('*', '*');
+  another.acl.allow('*', '*', 'loggedIn');
 
   return app;
 }