Compare commits

..
Author SHA1 Message Date
jiang dca2817320 merge: integrate agent-mvp into master
Merge PR #1 after frontend, cross-repository contract, and container gates passed.
2026-08-18 17:56:45 +08:00
jiang 41bf7d71e3 chore(api): sync backend contract mirror 2026-08-18 17:56:11 +08:00
jiang 5bea86dbf6 fix(deps): update XML parser and nanoid 2026-08-18 16:50:46 +08:00
jiang 78a470e89e merge(frontend): integrate master into agent-mvp 2026-08-18 16:41:52 +08:00
jiang 4a978de905 ci(frontend): inject public build configuration 2026-08-11 10:44:56 +08:00
TJWater CI f5bcf28f7e fix(map): preserve hook order while data loads
Generic Container CI/CD / test-build-publish (push) Failing after 1m50s
Frontend CI/CD v2 / build-test-publish-and-deploy (push) Failing after 1m50s
2026-08-11 10:32:18 +08:00
TJWater CI ab45c8da8e ci: add frontend v2 deployment workflow
Generic Container CI/CD / test-build-publish (push) Failing after 1m13s
Frontend CI/CD v2 / build-test-publish-and-deploy (push) Failing after 1m14s
2026-08-11 09:51:13 +08:00
5 changed files with 36 additions and 41 deletions
+4
View File
@@ -4,6 +4,10 @@
"agent": {
"file": "agent-v1.openapi.json",
"sha256": "94bd8914597c56b6429160e8c556993ac0617ad079de2980a4b6cb9fdf89c039"
},
"server": {
"file": "server-v1.openapi.json",
"sha256": "df7ae927dcf5ae32c3c1ad9be3245b1b78b984ce1902dd91e6313770860e0d48"
}
}
}
+5 -17
View File
@@ -1859,7 +1859,7 @@
"title": "PressureRegulationRest",
"type": "object"
},
"PressureSensorPlacement": {
"PressureSensorPlacementRest": {
"properties": {
"min_diameter": {
"default": 0,
@@ -1867,11 +1867,6 @@
"title": "Min Diameter",
"type": "integer"
},
"name": {
"description": "管网名称(或数据库名称)",
"title": "Name",
"type": "string"
},
"scheme_name": {
"description": "方案名称",
"title": "Scheme Name",
@@ -1881,20 +1876,13 @@
"description": "传感器数量",
"title": "Sensor Number",
"type": "integer"
},
"username": {
"description": "用户名",
"title": "Username",
"type": "string"
}
},
"required": [
"name",
"scheme_name",
"sensor_number",
"username"
"sensor_number"
],
"title": "PressureSensorPlacement",
"title": "PressureSensorPlacementRest",
"type": "object"
},
"ProblemDetails": {
@@ -24894,7 +24882,7 @@
"content": {
"application/json": {
"schema": {
"$ref": "#/components/schemas/PressureSensorPlacement",
"$ref": "#/components/schemas/PressureSensorPlacementRest",
"description": "传感器放置分析参数"
}
}
@@ -25134,7 +25122,7 @@
"content": {
"application/json": {
"schema": {
"$ref": "#/components/schemas/PressureSensorPlacement",
"$ref": "#/components/schemas/PressureSensorPlacementRest",
"description": "传感器放置分析参数"
}
}
+22 -9
View File
@@ -5611,6 +5611,18 @@
"node": ">= 10"
}
},
"node_modules/@nodable/entities": {
"version": "2.2.0",
"resolved": "https://registry.npmjs.org/@nodable/entities/-/entities-2.2.0.tgz",
"integrity": "sha512-9uGyhaQavEUMC8AIddIjau4NsnsXhou+j5sBAGojCM1oxmQpVKTWR/9JxABD6UAv12vpIms55fPZKFQEhG6uBg==",
"funding": [
{
"type": "github",
"url": "https://github.com/sponsors/nodable"
}
],
"license": "MIT"
},
"node_modules/@nodelib/fs.scandir": {
"version": "2.1.5",
"resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
@@ -13640,9 +13652,9 @@
}
},
"node_modules/fast-xml-parser": {
"version": "5.5.9",
"resolved": "https://registry.npmjs.org/fast-xml-parser/-/fast-xml-parser-5.5.9.tgz",
"integrity": "sha512-jldvxr1MC6rtiZKgrFnDSvT8xuH+eJqxqOBThUVjYrxssYTo1avZLGql5l0a0BAERR01CadYzZ83kVEkbyDg+g==",
"version": "5.7.0",
"resolved": "https://registry.npmjs.org/fast-xml-parser/-/fast-xml-parser-5.7.0.tgz",
"integrity": "sha512-MTcrUoRQ1GSQ9iG3QJzBGquYYYeA7piZaJoIWbPFGbRn6Jj6z7xgoAyi4DrZX4y2ZIQQBF59gc/zmvvejjgoFQ==",
"funding": [
{
"type": "github",
@@ -13651,9 +13663,10 @@
],
"license": "MIT",
"dependencies": {
"fast-xml-builder": "^1.1.4",
"path-expression-matcher": "^1.2.0",
"strnum": "^2.2.2"
"@nodable/entities": "^2.1.0",
"fast-xml-builder": "^1.1.5",
"path-expression-matcher": "^1.5.0",
"strnum": "^2.2.3"
},
"bin": {
"fxparser": "src/cli/cli.js"
@@ -18189,9 +18202,9 @@
"license": "MIT"
},
"node_modules/nanoid": {
"version": "3.3.16",
"resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.16.tgz",
"integrity": "sha512-bzlKTyNJ7+LdGIIwy8ijFpIqEQIvafahV7eYykJ8Cvh42EdJeODoJ6gUJXpQJvej1BddH8OqTXZNE/KfbWAu8Q==",
"version": "3.3.18",
"resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.18.tgz",
"integrity": "sha512-DTg4MJbGMWkfi6VZFdNt2/caMbQy4Ou+Op/hJQvGEWcnVfoA1QA+xzRKAzw9jD6+GVOOeYr/mIcuDSdug6F6+w==",
"funding": [
{
"type": "github",
+1 -1
View File
@@ -59,7 +59,7 @@
"zustand": "^5.0.11"
},
"overrides": {
"fast-xml-parser": "5.5.9",
"fast-xml-parser": "5.7.0",
"postcss": "8.5.25",
"sharp": "0.35.3"
},
+4 -14
View File
@@ -7810,19 +7810,14 @@ export interface components {
*/
tank_init_level?: Record<string, never> | null;
};
/** PressureSensorPlacement */
PressureSensorPlacement: {
/** PressureSensorPlacementRest */
PressureSensorPlacementRest: {
/**
* Min Diameter
* @description
* @default 0
*/
min_diameter: number;
/**
* Name
* @description
*/
name: string;
/**
* Scheme Name
* @description
@@ -7833,11 +7828,6 @@ export interface components {
* @description
*/
sensor_number: number;
/**
* Username
* @description
*/
username: string;
};
/**
* ProblemDetails
@@ -23881,7 +23871,7 @@ export interface operations {
};
requestBody: {
content: {
"application/json": components["schemas"]["PressureSensorPlacement"];
"application/json": components["schemas"]["PressureSensorPlacementRest"];
};
};
responses: {
@@ -24044,7 +24034,7 @@ export interface operations {
};
requestBody: {
content: {
"application/json": components["schemas"]["PressureSensorPlacement"];
"application/json": components["schemas"]["PressureSensorPlacementRest"];
};
};
responses: {