From c9bc327f4f8aec50fc9a8203c4a0e7ac11368c71 Mon Sep 17 00:00:00 2001 From: jokerxue <2509699647@qq.com> Date: Wed, 8 Jul 2026 16:39:57 +0800 Subject: [PATCH] 修改前端 --- 泰额版/Food Labeling Management Code/Yi.Vben5.Vue3/apps/web-antd/src/locales/langs/en-US/foodLabeling.json | 1 + 泰额版/Food Labeling Management Code/Yi.Vben5.Vue3/apps/web-antd/src/locales/langs/zh-CN/foodLabeling.json | 1 + 泰额版/Food Labeling Management Code/Yi.Vben5.Vue3/apps/web-antd/src/views/food-labeling/labeling/labels/data.ts | 7 +++++-- 泰额版/Food Labeling Management Code/Yi.Vben5.Vue3/apps/web-antd/src/views/food-labeling/labeling/labels/label-modal.vue | 2 +- 美国版/Food Labeling Management App UniApp/.env.development | 2 +- 美国版/Food Labeling Management App UniApp/.env.example | 2 +- 美国版/Food Labeling Management App UniApp/src/pages/labels/bluetooth.vue | 89 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++----------------------------- 美国版/Food Labeling Management App UniApp/src/pages/labels/labels.vue | 545 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- 美国版/Food Labeling Management App UniApp/src/pages/labels/preview.vue | 63 +++++++++++++++++++++++++++++++++------------------------------ 美国版/Food Labeling Management App UniApp/src/utils/apiBase.ts | 2 +- 美国版/Food Labeling Management App UniApp/src/utils/deviceInfo.ts | 21 +++++++++++++++++++++ 美国版/Food Labeling Management App UniApp/src/utils/labelPreview/normalizePreviewTemplate.ts | 69 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------- 美国版/Food Labeling Management App UniApp/src/utils/labelPreview/nutritionDefaultsMerge.ts | 157 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++- 美国版/Food Labeling Management App UniApp/src/utils/labelPreview/printInputOffset.ts | 113 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------- 美国版/Food Labeling Management App UniApp/src/utils/labelPreview/printInputOptions.ts | 59 +++++++++++++++++++++++++++++++++++++++++++++++++++-------- 美国版/Food Labeling Management App UniApp/src/utils/labelPreview/renderLabelPreviewCanvas.ts | 437 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------------------------------------------- 美国版/Food Labeling Management App UniApp/src/utils/nutritionFactsLayout.ts | 6 +++--- 美国版/Food Labeling Management App UniApp/src/utils/print/bleWriteModeRules.ts | 24 ++++++++++++++++-------- 美国版/Food Labeling Management App UniApp/src/utils/print/manager/printerManager.ts | 91 ++----------------------------------------------------------------------------------------- 美国版/Food Labeling Management App UniApp/src/utils/print/nativeTemplateElementSupport.ts | 28 ++++++++++++++++++++++++---- 美国版/Food Labeling Management App UniApp/src/utils/print/printerConnection.ts | 232 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------------------------------- 美国版/Food Labeling Management App UniApp/src/utils/print/systemTemplateAdapter.ts | 7 +++++++ 美国版/Food Labeling Management App UniApp/src/utils/printFromPrintDataList.ts | 104 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--------- 美国版/Food Labeling Management App UniApp/src/utils/textElementLayout.ts | 25 +++++++++++++++++++++++++ 美国版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application.Contracts/Dtos/Label/LabelCreateInputVo.cs | 3 ++- 美国版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application.Contracts/Dtos/Label/LabelUpdateInputVo.cs | 3 ++- 美国版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application.Contracts/IServices/ILabelAppService.cs | 2 +- 美国版/Food Labeling Management Platform/.env.local | 2 +- 美国版/Food Labeling Management Platform/src/components/labels/LabelCategoriesView.tsx | 102 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--------------------------------------- 美国版/Food Labeling Management Platform/src/components/labels/LabelTemplateEditor/LabelCanvas.tsx | 54 ++++++++++++++++++++++++++++++++++++++++++++++-------- 美国版/Food Labeling Management Platform/src/components/labels/LabelTemplateEditor/PropertiesPanel.tsx | 44 +++++++++++++++++++++++++++++++++++++++----- 美国版/Food Labeling Management Platform/src/components/labels/LabelTemplateEditor/index.tsx | 1 + 美国版/Food Labeling Management Platform/src/components/labels/LabelTypesView.tsx | 163 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------------------------------------------------------------- 美国版/Food Labeling Management Platform/src/components/labels/LabelsList.tsx | 9 +++++---- 美国版/Food Labeling Management Platform/src/components/labels/MultipleOptionsView.tsx | 163 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------------------------------------------------------------- 美国版/Food Labeling Management Platform/src/components/shared/category-scope-fields.tsx | 37 ++++++++++++++++++++++++++----------- 美国版/Food Labeling Management Platform/src/components/ui/searchable-multi-select.tsx | 14 +++++++++++++- 美国版/Food Labeling Management Platform/src/components/ui/searchable-select.tsx | 111 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---------------------------------------- 美国版/Food Labeling Management Platform/src/lib/categoryScopeForm.ts | 194 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++- 美国版/Food Labeling Management Platform/src/lib/nutritionFactsLayout.ts | 8 ++++---- 美国版/Food Labeling Management Platform/src/services/labelService.ts | 2 +- 美国版/Food Labeling Management Platform/src/types/label.ts | 2 +- 美国版/Food Labeling Management Platform/src/types/labelCategory.ts | 5 +++++ 美国版/Food Labeling Management Platform/src/types/labelMultipleOption.ts | 4 ++++ 美国版/Food Labeling Management Platform/src/types/labelTemplate.ts | 39 +-------------------------------------- 美国版/Food Labeling Management Platform/src/types/labelType.ts | 4 ++++ 美国版/Food Labeling Management Platform/src/utils/textElementLayout.ts | 41 +++++++++++++++++++++++++++++++++++++++++ 47 files changed, 2270 insertions(+), 824 deletions(-) diff --git a/泰额版/Food Labeling Management Code/Yi.Vben5.Vue3/apps/web-antd/src/locales/langs/en-US/foodLabeling.json b/泰额版/Food Labeling Management Code/Yi.Vben5.Vue3/apps/web-antd/src/locales/langs/en-US/foodLabeling.json index e0c8392..c221a5f 100644 --- a/泰额版/Food Labeling Management Code/Yi.Vben5.Vue3/apps/web-antd/src/locales/langs/en-US/foodLabeling.json +++ b/泰额版/Food Labeling Management Code/Yi.Vben5.Vue3/apps/web-antd/src/locales/langs/en-US/foodLabeling.json @@ -47,6 +47,7 @@ "selectLocation": "Select location", "selectCategory": "Select label category", "selectType": "Select label type", + "selectTypeOptional": "Optional — select label type", "selectTemplate": "Select template", "action": "Actions", "labelCodeOptional": "Leave empty to auto-generate", diff --git a/泰额版/Food Labeling Management Code/Yi.Vben5.Vue3/apps/web-antd/src/locales/langs/zh-CN/foodLabeling.json b/泰额版/Food Labeling Management Code/Yi.Vben5.Vue3/apps/web-antd/src/locales/langs/zh-CN/foodLabeling.json index 59aebcb..1d62726 100644 --- a/泰额版/Food Labeling Management Code/Yi.Vben5.Vue3/apps/web-antd/src/locales/langs/zh-CN/foodLabeling.json +++ b/泰额版/Food Labeling Management Code/Yi.Vben5.Vue3/apps/web-antd/src/locales/langs/zh-CN/foodLabeling.json @@ -47,6 +47,7 @@ "selectLocation": "选择门店", "selectCategory": "选择标签分类", "selectType": "选择标签类型", + "selectTypeOptional": "可选,选择标签类型", "selectTemplate": "选择模板", "action": "操作", "labelCodeOptional": "留空则由后端生成", diff --git a/泰额版/Food Labeling Management Code/Yi.Vben5.Vue3/apps/web-antd/src/views/food-labeling/labeling/labels/data.ts b/泰额版/Food Labeling Management Code/Yi.Vben5.Vue3/apps/web-antd/src/views/food-labeling/labeling/labels/data.ts index c87fb8e..8a26490 100644 --- a/泰额版/Food Labeling Management Code/Yi.Vben5.Vue3/apps/web-antd/src/views/food-labeling/labeling/labels/data.ts +++ b/泰额版/Food Labeling Management Code/Yi.Vben5.Vue3/apps/web-antd/src/views/food-labeling/labeling/labels/data.ts @@ -198,12 +198,15 @@ export function modalSchema(options: { component: 'Select', fieldName: 'labelTypeId', label: $t('foodLabeling.labels.labelType'), - rules: 'required', + ...(options.isUpdate ? { rules: 'required' as const } : {}), componentProps: { options: options.typeOptions, showSearch: true, optionFilterProp: 'label', - placeholder: $t('foodLabeling.labels.selectType'), + allowClear: !options.isUpdate, + placeholder: options.isUpdate + ? $t('foodLabeling.labels.selectType') + : $t('foodLabeling.labels.selectTypeOptional'), onChange: (v: string) => options.onLabelTypeIdChange?.(v), }, }, diff --git a/泰额版/Food Labeling Management Code/Yi.Vben5.Vue3/apps/web-antd/src/views/food-labeling/labeling/labels/label-modal.vue b/泰额版/Food Labeling Management Code/Yi.Vben5.Vue3/apps/web-antd/src/views/food-labeling/labeling/labels/label-modal.vue index a2850ad..51779bb 100644 --- a/泰额版/Food Labeling Management Code/Yi.Vben5.Vue3/apps/web-antd/src/views/food-labeling/labeling/labels/label-modal.vue +++ b/泰额版/Food Labeling Management Code/Yi.Vben5.Vue3/apps/web-antd/src/views/food-labeling/labeling/labels/label-modal.vue @@ -274,7 +274,7 @@ function formToPayload(values: Record) { templateCode: String(values.templateCode ?? '').trim(), locationId: String(values.locationId ?? '').trim(), labelCategoryId: String(values.labelCategoryId ?? '').trim(), - labelTypeId: String(values.labelTypeId ?? '').trim(), + labelTypeId: String(values.labelTypeId ?? '').trim() || null, productIds: productId ? [productId] : [], labelInfoJson: null, state: values.state !== false, diff --git a/美国版/Food Labeling Management App UniApp/.env.development b/美国版/Food Labeling Management App UniApp/.env.development index 03e1a64..f179b1d 100644 --- a/美国版/Food Labeling Management App UniApp/.env.development +++ b/美国版/Food Labeling Management App UniApp/.env.development @@ -1,2 +1,2 @@ # H5 / App 开发:直连本地后端(按本机 IP 与端口修改) -VITE_US_API_BASE=http://192.168.31.89:19001 +VITE_US_API_BASE=http://192.168.31.88:19001 diff --git a/美国版/Food Labeling Management App UniApp/.env.example b/美国版/Food Labeling Management App UniApp/.env.example index 4324ae4..ed624c9 100644 --- a/美国版/Food Labeling Management App UniApp/.env.example +++ b/美国版/Food Labeling Management App UniApp/.env.example @@ -1,2 +1,2 @@ # 复制为 .env.development(开发)或 .env.production(打包),按环境填写后端根地址(不含末尾 /) -VITE_US_API_BASE=http://192.168.31.89:19001 +VITE_US_API_BASE=http://192.168.31.88:19001 diff --git a/美国版/Food Labeling Management App UniApp/src/pages/labels/bluetooth.vue b/美国版/Food Labeling Management App UniApp/src/pages/labels/bluetooth.vue index f25d003..22f5eab 100644 --- a/美国版/Food Labeling Management App UniApp/src/pages/labels/bluetooth.vue +++ b/美国版/Food Labeling Management App UniApp/src/pages/labels/bluetooth.vue @@ -28,7 +28,7 @@ Bluetooth - - + + Print Route (Debug) @@ -92,7 +92,7 @@ -