Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions apps/app-mobile/src/api/index.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import {HttpClient} from "@coding-flow/flow-core";
import {HttpClient, resolveHttpTimeout} from "@coding-flow/flow-core";
import { message } from "antd";

export const httpClient = new HttpClient(10000,{
export const httpClient = new HttpClient(resolveHttpTimeout(),{
success:(msg:string)=>{
message.success(msg)
},
Expand Down
4 changes: 2 additions & 2 deletions apps/app-pc/src/api/index.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import {HttpClient} from "@coding-flow/flow-core";
import {HttpClient, resolveHttpTimeout} from "@coding-flow/flow-core";
import { message } from "antd";

export const httpClient = new HttpClient(10000,{
export const httpClient = new HttpClient(resolveHttpTimeout(),{
success:(msg:string)=>{
message.success(msg)
},
Expand Down
8 changes: 8 additions & 0 deletions packages/flow-approval-presenter/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,13 @@
# @coding-flow/flow-approval-presenter

## 0.2.0

### Patch Changes

- Updated dependencies
- @coding-flow/flow-core@0.2.0
- @coding-flow/flow-types@0.2.0

## 0.1.9

### Patch Changes
Expand Down
2 changes: 1 addition & 1 deletion packages/flow-approval-presenter/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@coding-flow/flow-approval-presenter",
"version": "0.1.9",
"version": "0.2.0",
"description": "flow-engine approval presenter framework ",
"type": "module",
"sideEffects": [
Expand Down
9 changes: 9 additions & 0 deletions packages/flow-core/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,14 @@
# @coding-flow/flow-core

## 0.2.0

### Minor Changes

- feat: 接口请求超时时间支持通过 localStorage 动态配置,未配置时回退默认值(issue #211)

- 新增 `resolveHttpTimeout()` / `FLOW_HTTP_TIMEOUT_KEY`,从 localStorage 读取超时配置
- 各调用点(PC/移动端审批、设计器、示例应用)去除写死的 10000ms 硬编码

## 0.1.9

## 0.1.8
Expand Down
2 changes: 1 addition & 1 deletion packages/flow-core/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@coding-flow/flow-core",
"version": "0.1.9",
"version": "0.2.0",
"description": "flow-engine core lib framework ",
"type": "module",
"sideEffects": [
Expand Down
23 changes: 23 additions & 0 deletions packages/flow-core/src/http.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,29 @@ export interface MessageBox {
error: (msg: string) => void;
}

/**
* 接口请求超时时间(毫秒)在 localStorage 中的配置键。
* 未配置时使用默认值 {@link DEFAULT_HTTP_TIMEOUT}。
*/
export const FLOW_HTTP_TIMEOUT_KEY = 'flow_http_timeout';

/** 默认接口请求超时时间(毫秒),未配置 localStorage 时生效。 */
const DEFAULT_HTTP_TIMEOUT = 10000;

/**
* 解析接口请求超时时间(毫秒)。
* 优先读取 localStorage 中 {@link FLOW_HTTP_TIMEOUT_KEY} 对应的配置,
* 未配置或配置值非法(非正数)时回退到默认值。
*/
export function resolveHttpTimeout(): number {
const raw = localStorage.getItem(FLOW_HTTP_TIMEOUT_KEY);
if (!raw) {
return DEFAULT_HTTP_TIMEOUT;
}
const value = Number(raw);
return Number.isFinite(value) && value > 0 ? value : DEFAULT_HTTP_TIMEOUT;
}

export type Response = {
success: boolean;
errCode?: string;
Expand Down
48 changes: 48 additions & 0 deletions packages/flow-core/tests/http.test.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
import {describe, expect, it, beforeEach, afterEach} from '@rstest/core';
import {FLOW_HTTP_TIMEOUT_KEY, resolveHttpTimeout} from "@/http";

describe('resolveHttpTimeout', () => {

beforeEach(() => {
localStorage.removeItem(FLOW_HTTP_TIMEOUT_KEY);
});

afterEach(() => {
localStorage.removeItem(FLOW_HTTP_TIMEOUT_KEY);
});

it('未配置 localStorage 时返回默认值 10000', () => {
const timeout = resolveHttpTimeout();
expect(timeout).toEqual(10000);
});

it('已配置合法正整数时返回对应超时时间', () => {
localStorage.setItem(FLOW_HTTP_TIMEOUT_KEY, '30000');
const timeout = resolveHttpTimeout();
expect(timeout).toEqual(30000);
});

it('已配置 "0" 时视为非法,回退默认值', () => {
localStorage.setItem(FLOW_HTTP_TIMEOUT_KEY, '0');
const timeout = resolveHttpTimeout();
expect(timeout).toEqual(10000);
});

it('已配置负整数时视为非法,回退默认值', () => {
localStorage.setItem(FLOW_HTTP_TIMEOUT_KEY, '-5000');
const timeout = resolveHttpTimeout();
expect(timeout).toEqual(10000);
});

it('已配置非数字时视为非法,回退默认值', () => {
localStorage.setItem(FLOW_HTTP_TIMEOUT_KEY, 'abc');
const timeout = resolveHttpTimeout();
expect(timeout).toEqual(10000);
});

it('已配置小数时按原值返回', () => {
localStorage.setItem(FLOW_HTTP_TIMEOUT_KEY, '2500.5');
const timeout = resolveHttpTimeout();
expect(timeout).toEqual(2500.5);
});
});
10 changes: 10 additions & 0 deletions packages/flow-design/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,15 @@
# @coding-flow/flow-design

## 0.2.0

### Patch Changes

- Updated dependencies
- @coding-flow/flow-core@0.2.0
- @coding-flow/flow-icons@0.2.0
- @coding-flow/flow-pc-ui@0.2.0
- @coding-flow/flow-types@0.2.0

## 0.1.9

### Patch Changes
Expand Down
2 changes: 1 addition & 1 deletion packages/flow-design/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@coding-flow/flow-design",
"version": "0.1.9",
"version": "0.2.0",
"description": "flow-engine design components ",
"type": "module",
"sideEffects": [
Expand Down
4 changes: 2 additions & 2 deletions packages/flow-design/src/api/index.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import {HttpClient} from "@coding-flow/flow-core";
import {HttpClient, resolveHttpTimeout} from "@coding-flow/flow-core";
import { message } from "antd";

export const httpClient = new HttpClient(10000,{
export const httpClient = new HttpClient(resolveHttpTimeout(),{
success:(msg:string)=>{
message.success(msg)
},
Expand Down
7 changes: 7 additions & 0 deletions packages/flow-icons/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
# @coding-flow/flow-icons

## 0.2.0

### Patch Changes

- Updated dependencies
- @coding-flow/flow-core@0.2.0

## 0.1.9

### Patch Changes
Expand Down
2 changes: 1 addition & 1 deletion packages/flow-icons/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@coding-flow/flow-icons",
"version": "0.1.9",
"version": "0.2.0",
"description": "flow-engine icons ",
"type": "module",
"sideEffects": [
Expand Down
12 changes: 12 additions & 0 deletions packages/flow-mobile/flow-mobile-approval/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,17 @@
# @coding-flow/flow-mobile-approval

## 0.2.0

### Patch Changes

- Updated dependencies
- @coding-flow/flow-core@0.2.0
- @coding-flow/flow-approval-presenter@0.2.0
- @coding-flow/flow-icons@0.2.0
- @coding-flow/flow-mobile-form@0.2.0
- @coding-flow/flow-mobile-ui@0.2.0
- @coding-flow/flow-types@0.2.0

## 0.1.9

### Patch Changes
Expand Down
2 changes: 1 addition & 1 deletion packages/flow-mobile/flow-mobile-approval/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@coding-flow/flow-mobile-approval",
"version": "0.1.9",
"version": "0.2.0",
"description": "flow-engine pc mobile approval components",
"type": "module",
"sideEffects": [
Expand Down
4 changes: 2 additions & 2 deletions packages/flow-mobile/flow-mobile-approval/src/api/index.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import {HttpClient} from "@coding-flow/flow-core";
import {HttpClient, resolveHttpTimeout} from "@coding-flow/flow-core";
import { message } from "antd";

export const httpClient = new HttpClient(10000,{
export const httpClient = new HttpClient(resolveHttpTimeout(),{
success:(msg:string)=>{
message.success(msg)
},
Expand Down
8 changes: 8 additions & 0 deletions packages/flow-mobile/flow-mobile-form/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,13 @@
# @coding-flow/flow-mobile-form

## 0.2.0

### Patch Changes

- Updated dependencies
- @coding-flow/flow-core@0.2.0
- @coding-flow/flow-types@0.2.0

## 0.1.9

### Patch Changes
Expand Down
2 changes: 1 addition & 1 deletion packages/flow-mobile/flow-mobile-form/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@coding-flow/flow-mobile-form",
"version": "0.1.9",
"version": "0.2.0",
"description": "flow-engine mobile form engine",
"type": "module",
"sideEffects": [
Expand Down
7 changes: 7 additions & 0 deletions packages/flow-mobile/flow-mobile-ui/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
# @coding-flow/flow-mobile-ui

## 0.2.0

### Patch Changes

- Updated dependencies
- @coding-flow/flow-core@0.2.0

## 0.1.9

### Patch Changes
Expand Down
2 changes: 1 addition & 1 deletion packages/flow-mobile/flow-mobile-ui/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@coding-flow/flow-mobile-ui",
"version": "0.1.9",
"version": "0.2.0",
"description": "flow-engine mobile ui components",
"type": "module",
"sideEffects": [
Expand Down
12 changes: 12 additions & 0 deletions packages/flow-pc/flow-pc-approval/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,17 @@
# @coding-flow/flow-pc-approval

## 0.2.0

### Patch Changes

- Updated dependencies
- @coding-flow/flow-core@0.2.0
- @coding-flow/flow-approval-presenter@0.2.0
- @coding-flow/flow-icons@0.2.0
- @coding-flow/flow-pc-form@0.2.0
- @coding-flow/flow-pc-ui@0.2.0
- @coding-flow/flow-types@0.2.0

## 0.1.9

### Patch Changes
Expand Down
2 changes: 1 addition & 1 deletion packages/flow-pc/flow-pc-approval/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@coding-flow/flow-pc-approval",
"version": "0.1.9",
"version": "0.2.0",
"description": "flow-engine pc form approval components",
"type": "module",
"sideEffects": [
Expand Down
4 changes: 2 additions & 2 deletions packages/flow-pc/flow-pc-approval/src/api/index.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import {HttpClient} from "@coding-flow/flow-core";
import {HttpClient, resolveHttpTimeout} from "@coding-flow/flow-core";
import { message } from "antd";

export const httpClient = new HttpClient(10000,{
export const httpClient = new HttpClient(resolveHttpTimeout(),{
success:(msg:string)=>{
message.success(msg)
},
Expand Down
8 changes: 8 additions & 0 deletions packages/flow-pc/flow-pc-form/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,13 @@
# @coding-flow/flow-pc-form

## 0.2.0

### Patch Changes

- Updated dependencies
- @coding-flow/flow-core@0.2.0
- @coding-flow/flow-types@0.2.0

## 0.1.9

### Patch Changes
Expand Down
2 changes: 1 addition & 1 deletion packages/flow-pc/flow-pc-form/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@coding-flow/flow-pc-form",
"version": "0.1.9",
"version": "0.2.0",
"description": "flow-engine pc form engine",
"type": "module",
"sideEffects": [
Expand Down
7 changes: 7 additions & 0 deletions packages/flow-pc/flow-pc-ui/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
# @coding-flow/flow-pc-ui

## 0.2.0

### Patch Changes

- Updated dependencies
- @coding-flow/flow-core@0.2.0

## 0.1.9

### Patch Changes
Expand Down
2 changes: 1 addition & 1 deletion packages/flow-pc/flow-pc-ui/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@coding-flow/flow-pc-ui",
"version": "0.1.9",
"version": "0.2.0",
"description": "flow-engine pc ui components",
"type": "module",
"sideEffects": [
Expand Down
7 changes: 7 additions & 0 deletions packages/flow-types/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
# @coding-flow/flow-types

## 0.2.0

### Patch Changes

- Updated dependencies
- @coding-flow/flow-core@0.2.0

## 0.1.9

### Patch Changes
Expand Down
2 changes: 1 addition & 1 deletion packages/flow-types/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@coding-flow/flow-types",
"version": "0.1.9",
"version": "0.2.0",
"description": "flow-engine types",
"type": "module",
"sideEffects": [
Expand Down
Loading