From 3d365ad3f0832f7410562a14300466bf984f5a85 Mon Sep 17 00:00:00 2001 From: va1is Date: Wed, 29 Oct 2025 15:01:54 +0300 Subject: [PATCH] UI fix "" instead of NONE --- API-UI/main.py | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/API-UI/main.py b/API-UI/main.py index 9633e7b..30a48b3 100644 --- a/API-UI/main.py +++ b/API-UI/main.py @@ -518,21 +518,22 @@ class ImportApp(QMainWindow): "category": {"name": cast_value(cat_name, "string") or ""}, "brand": {"name": cast_value(brand_name, "string") or ""}, "variant": { - # значения по умолчанию, если не заданы маппингом/фиксами - "status_id": v.get("status_id", 1), - "color": v.get("color", ""), - "sku": v.get("sku", ""), - "size": v.get("size", ""), - "cost": v.get("cost", 0), - "originalUrl": v.get("originalUrl", ""), - "originalName": v.get("originalName", ""), - "originalDescription": v.get("originalDescription", ""), - "originalComposition": v.get("originalComposition", ""), - "images": v.get("images", []), - "inStock": v.get("inStock", True), - "weight": v.get("weight", 0) + "status_id": v.get("status_id") if v.get("status_id") is not None else 1, + "color": v.get("color") if v.get("color") is not None else "", + "sku": v.get("sku") if v.get("sku") is not None else "", + "size": v.get("size") if v.get("size") is not None else "", + "cost": v.get("cost") if v.get("cost") is not None else 0, + "originalUrl": v.get("originalUrl") if v.get("originalUrl") is not None else "", + "originalName": v.get("originalName") if v.get("originalName") is not None else "", + # КЛЮЧЕВОЕ: пустые строки вместо null + "originalDescription": v.get("originalDescription") or "", + "originalComposition": v.get("originalComposition") or "", + "images": v.get("images") if v.get("images") is not None else [], + "inStock": v.get("inStock") if v.get("inStock") is not None else True, + "weight": v.get("weight") if v.get("weight") is not None else 0 } } + # фильтр пустых строк: нужен хотя бы sku или originalUrl или название if any([item["variant"]["sku"], item["variant"]["originalUrl"], item["variant"]["originalName"]]): result["items"].append(item)