fm453/nocobase
1
0
Fork 0
mirror of https://gitee.com/nocobase/nocobase.git synced 2025-07-02 03:02:19 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'next' into develop

Browse Source
This commit is contained in:
nocobase[bot] 2025-01-22 09:16:20 +00:00
commit 22bb0eba39
4 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

2
packages/core/client/src/schema-settings/GeneralSchemaDesigner.tsx
View File

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

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

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

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

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