From 785bcede9f308264b5aa6e0ebb801213181e2f1d Mon Sep 17 00:00:00 2001 From: YuanFeng <770153798@qq.com> Date: Sun, 8 Sep 2024 16:34:49 +0800 Subject: [PATCH] =?UTF-8?q?=E6=94=B9=E9=80=A0=20=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E4=BA=A7=E5=93=81=E4=BF=9D=E5=85=BB=E9=A1=B9=EF=BC=8C=E4=BA=A7?= =?UTF-8?q?=E5=93=81=E6=94=AF=E6=8C=81=E5=A4=9A=E7=A8=BF=E4=BB=B6=E5=85=B3?= =?UTF-8?q?=E8=81=94=EF=BC=8C=E4=BA=A7=E5=93=81=E4=BF=9D=E5=85=BB=E9=A2=84?= =?UTF-8?q?=E8=A7=88=E6=95=B0=E6=8D=AE=E7=BB=93=E6=9E=84=E4=BC=98=E5=8C=96?= =?UTF-8?q?=20=E4=BF=AE=E5=A4=8D=20=E5=B7=B2=E7=9F=A5=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ProductCareItemController.java | 10 + .../vo/ProductCareItemPageReqVO.java | 14 +- .../vo/ProductCareItemRespVO.java | 27 +- .../vo/ProductCareItemSaveReqVO.java | 16 +- .../productinfo/vo/ProductInfoPageReqVO.java | 13 +- .../productinfo/vo/ProductInfoRespVO.java | 19 +- .../productinfo/vo/ProductInfoSaveReqVO.java | 15 +- .../productcareitem/ProductCareItemDO.java | 20 +- .../dataobject/productinfo/ProductInfoDO.java | 16 +- .../ProductCareItemMapper.java | 41 +- .../mysql/productinfo/ProductInfoMapper.java | 1 + .../ProductCareItemService.java | 1 + .../ProductCareItemServiceImpl.java | 4 + .../productinfo/ProductInfoService.java | 7 +- .../ProductCareItemServiceImplTest.java | 16 +- .../ProductInfoServiceImplTest.java | 18 +- .../src/api/oms/productcareitem/index.ts | 97 +-- .../src/api/oms/productinfo/index.ts | 96 +-- .../src/BrandDataListDialog/DataForm.vue | 2 +- .../src/BrandDataListDialog/config.data.ts | 1 + .../Dialog/src/BrandDataListDialog/index.vue | 38 +- .../src/components/Dialog/src/Dialog.vue | 2 +- .../DraftDesignDataListDialog/DataForm.vue | 2 +- .../DraftDesignDataListDialog/config.data.ts | 1 + .../src/DraftDesignDataListDialog/index.vue | 25 +- .../ProductTypeDataListDialog/DataForm.vue | 2 +- .../src/ProductTypeDataListDialog/index.vue | 20 +- .../components/DesignPreviewDialog.vue | 14 +- .../DraftDesign/components/DesignPropEdit.vue | 326 ++++--- .../components/DynamicPropConfig.vue | 26 +- .../DraftDesign/components/layout/index.vue | 189 ++++- .../components/node/DottedLineNode.vue | 221 +++++ .../components/node/LineCellNode.vue | 16 +- .../components/node/ShapeCellNode.vue | 16 +- .../components/node/ShapeCircleNode.vue | 16 +- .../components/node/ShapeEllipseNode.vue | 16 +- .../components/node/ShapeFivePointedNode.vue | 16 +- .../components/node/ShapeImageNode.vue | 16 +- .../components/node/ShapeLozengeNode.vue | 16 +- .../components/node/ShapeRectNode.vue | 16 +- .../components/node/ShapeRightArrowNode.vue | 16 +- .../node/ShapeRightTriangleNode.vue | 16 +- .../components/node/ShapeTriangleNode.vue | 16 +- .../components/node/TextCellNode.vue | 35 +- .../components/DraftDesign/config/index.ts | 25 + .../components/DraftDesign/icons/demo.html | 16 +- .../DraftDesign/icons/fonts/Read Me.txt | 7 - .../icons/fonts/demo-files/demo.css | 152 ---- .../icons/fonts/demo-files/demo.js | 30 - .../DraftDesign/icons/fonts/demo.html | 794 ------------------ .../DraftDesign/icons/fonts/fonts/icomoon.eot | Bin 12020 -> 0 bytes .../DraftDesign/icons/fonts/fonts/icomoon.svg | 64 -- .../DraftDesign/icons/fonts/fonts/icomoon.ttf | Bin 11856 -> 0 bytes .../icons/fonts/fonts/icomoon.woff | Bin 11932 -> 0 bytes .../DraftDesign/icons/fonts/icomoon.eot | Bin 14540 -> 14628 bytes .../DraftDesign/icons/fonts/icomoon.svg | 1 + .../DraftDesign/icons/fonts/icomoon.ttf | Bin 14376 -> 14464 bytes .../DraftDesign/icons/fonts/icomoon.woff | Bin 14452 -> 14540 bytes .../DraftDesign/icons/fonts/selection.json | 1 - .../DraftDesign/icons/fonts/style.css | 189 ----- .../DraftDesign/icons/selection.json | 2 +- .../components/DraftDesign/icons/style.css | 13 +- .../src/components/DraftDesign/index.vue | 176 ++-- .../src/components/Editor/src/Editor.vue | 2 +- .../src/components/Form/src/Form.vue | 2 +- .../src/components/Table/src/Table.vue | 3 +- hangtag-ui/hangtag-ui-admin/src/utils/dict.ts | 3 +- .../oms/draftdesigndata/detials/index.vue | 11 +- .../src/views/oms/draftdesigndata/index.vue | 7 + .../productcareitem/ProductCareItemForm.vue | 310 ++++--- .../src/views/oms/productcareitem/index.vue | 7 - .../views/oms/productinfo/ProductInfoForm.vue | 166 +++- .../system/codingrules/CodingRulesForm.vue | 6 +- .../codingrules/components/edit-item.vue | 7 +- .../src/api/oms/productcareitem/index.ts | 97 +-- .../src/api/oms/productinfo/index.ts | 96 +-- .../src/BrandDataListDialog/DataForm.vue | 2 +- .../src/BrandDataListDialog/config.data.ts | 1 + .../Dialog/src/BrandDataListDialog/index.vue | 38 +- .../src/components/Dialog/src/Dialog.vue | 2 +- .../DraftDesignDataListDialog/DataForm.vue | 2 +- .../DraftDesignDataListDialog/config.data.ts | 1 + .../src/DraftDesignDataListDialog/index.vue | 25 +- .../ProductTypeDataListDialog/DataForm.vue | 2 +- .../src/ProductTypeDataListDialog/index.vue | 20 +- .../components/DesignPreviewDialog.vue | 14 +- .../DraftDesign/components/DesignPropEdit.vue | 326 ++++--- .../components/DynamicPropConfig.vue | 26 +- .../DraftDesign/components/layout/index.vue | 189 ++++- .../components/node/DottedLineNode.vue | 221 +++++ .../components/node/LineCellNode.vue | 16 +- .../components/node/ShapeCellNode.vue | 16 +- .../components/node/ShapeCircleNode.vue | 16 +- .../components/node/ShapeEllipseNode.vue | 16 +- .../components/node/ShapeFivePointedNode.vue | 16 +- .../components/node/ShapeImageNode.vue | 16 +- .../components/node/ShapeLozengeNode.vue | 16 +- .../components/node/ShapeRectNode.vue | 16 +- .../components/node/ShapeRightArrowNode.vue | 16 +- .../node/ShapeRightTriangleNode.vue | 16 +- .../components/node/ShapeTriangleNode.vue | 16 +- .../components/node/TextCellNode.vue | 35 +- .../components/DraftDesign/config/index.ts | 25 + .../components/DraftDesign/icons/demo.html | 16 +- .../DraftDesign/icons/fonts/icomoon.eot | Bin 14540 -> 14628 bytes .../DraftDesign/icons/fonts/icomoon.svg | 1 + .../DraftDesign/icons/fonts/icomoon.ttf | Bin 14376 -> 14464 bytes .../DraftDesign/icons/fonts/icomoon.woff | Bin 14452 -> 14540 bytes .../DraftDesign/icons/selection.json | 2 +- .../components/DraftDesign/icons/style.css | 13 +- .../src/components/DraftDesign/index.vue | 176 ++-- .../oms/draftdesigndata/detials/index.vue | 11 +- .../src/views/oms/draftdesigndata/index.vue | 7 + .../productcareitem/ProductCareItemForm.vue | 311 ++++--- .../src/views/oms/productcareitem/index.vue | 7 - .../views/oms/productinfo/ProductInfoForm.vue | 166 +++- .../产品保养项，及产品关联稿件结构改造.sql | 71 ++ 117 files changed, 3323 insertions(+), 2261 deletions(-) create mode 100644 hangtag-ui/hangtag-ui-admin/src/components/DraftDesign/components/node/DottedLineNode.vue delete mode 100644 hangtag-ui/hangtag-ui-admin/src/components/DraftDesign/icons/fonts/Read Me.txt delete mode 100644 hangtag-ui/hangtag-ui-admin/src/components/DraftDesign/icons/fonts/demo-files/demo.css delete mode 100644 hangtag-ui/hangtag-ui-admin/src/components/DraftDesign/icons/fonts/demo-files/demo.js delete mode 100644 hangtag-ui/hangtag-ui-admin/src/components/DraftDesign/icons/fonts/demo.html delete mode 100644 hangtag-ui/hangtag-ui-admin/src/components/DraftDesign/icons/fonts/fonts/icomoon.eot delete mode 100644 hangtag-ui/hangtag-ui-admin/src/components/DraftDesign/icons/fonts/fonts/icomoon.svg delete mode 100644 hangtag-ui/hangtag-ui-admin/src/components/DraftDesign/icons/fonts/fonts/icomoon.ttf delete mode 100644 hangtag-ui/hangtag-ui-admin/src/components/DraftDesign/icons/fonts/fonts/icomoon.woff delete mode 100644 hangtag-ui/hangtag-ui-admin/src/components/DraftDesign/icons/fonts/selection.json delete mode 100644 hangtag-ui/hangtag-ui-admin/src/components/DraftDesign/icons/fonts/style.css create mode 100644 hangtag-ui/hangtag-ui-front/src/components/DraftDesign/components/node/DottedLineNode.vue create mode 100644 sql/mysql/20240908/产品保养项，及产品关联稿件结构改造.sql diff --git a/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/controller/admin/productcareitem/ProductCareItemController.java b/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/controller/admin/productcareitem/ProductCareItemController.java index 394eb88..db4540c 100644 --- a/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/controller/admin/productcareitem/ProductCareItemController.java +++ b/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/controller/admin/productcareitem/ProductCareItemController.java @@ -79,6 +79,16 @@ public class ProductCareItemController { return success(BeanUtils.toBean(pageResult, ProductCareItemRespVO.class)); } + @GetMapping("/list") + @Operation(summary = "获取列表") + @PreAuthorize("@ss.hasPermission('oms:product-care-item:query')") + public CommonResult> queryList(@Valid ProductCareItemPageReqVO pageReqVO) { + // 不分页 + pageReqVO.setPageSize(-1); + PageResult pageResult = productCareItemService.queryList(pageReqVO); + return success(BeanUtils.toBean(pageResult, ProductCareItemRespVO.class)); + } + @GetMapping("/export-excel") @Operation(summary = "导出产品保养项 Excel") @PreAuthorize("@ss.hasPermission('oms:product-care-item:export')") diff --git a/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/controller/admin/productcareitem/vo/ProductCareItemPageReqVO.java b/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/controller/admin/productcareitem/vo/ProductCareItemPageReqVO.java index 59b4ba5..67a4c78 100644 --- a/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/controller/admin/productcareitem/vo/ProductCareItemPageReqVO.java +++ b/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/controller/admin/productcareitem/vo/ProductCareItemPageReqVO.java @@ -18,15 +18,21 @@ public class ProductCareItemPageReqVO extends PageParam { @Schema(description = "说明") private String value; + @Schema(description = "类型 字典oms_product_care_item_type", example = "2") + private String type; + + @Schema(description = "语言对照") + private String langMapping; + @Schema(description = "icon图标", example = "https://www.iocoder.cn") private String iconUrl; - @Schema(description = "品牌") - private String brandIds; - - @Schema(description = "只作用于组合") + @Schema(description = "进行多语言组合") private Boolean isCombo; + @Schema(description = "品牌专属") + private String brandIds; + @Schema(description = "品牌通用") private Boolean isAll; diff --git a/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/controller/admin/productcareitem/vo/ProductCareItemRespVO.java b/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/controller/admin/productcareitem/vo/ProductCareItemRespVO.java index 0acc7dc..08b2971 100644 --- a/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/controller/admin/productcareitem/vo/ProductCareItemRespVO.java +++ b/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/controller/admin/productcareitem/vo/ProductCareItemRespVO.java @@ -6,15 +6,13 @@ import java.util.*; import org.springframework.format.annotation.DateTimeFormat; import java.time.LocalDateTime; import com.alibaba.excel.annotation.*; -import cn.hangtag.framework.excel.core.annotations.DictFormat; -import cn.hangtag.framework.excel.core.convert.DictConvert; @Schema(description = "管理后台 - 产品保养项 Response VO") @Data @ExcelIgnoreUnannotated public class ProductCareItemRespVO { - @Schema(description = "id", requiredMode = Schema.RequiredMode.REQUIRED, example = "3104") + @Schema(description = "id", requiredMode = Schema.RequiredMode.REQUIRED, example = "27850") @ExcelProperty("id") private Long id; @@ -22,25 +20,32 @@ public class ProductCareItemRespVO { @ExcelProperty("说明") private String value; + @Schema(description = "类型 字典oms_product_care_item_type", example = "2") + @ExcelProperty("类型 字典oms_product_care_item_type") + private String type; + + @Schema(description = "语言对照") + @ExcelProperty("语言对照") + private String langMapping; + @Schema(description = "icon图标", example = "https://www.iocoder.cn") @ExcelProperty("icon图标") private String iconUrl; - @Schema(description = "品牌") - @ExcelProperty("品牌") - private String brandIds; - - @Schema(description = "只作用于组合") - @ExcelProperty("只作用于组合") + @Schema(description = "进行多语言组合") + @ExcelProperty("进行多语言组合") private Boolean isCombo; + @Schema(description = "品牌专属") + @ExcelProperty("品牌专属") + private String brandIds; + @Schema(description = "品牌通用") @ExcelProperty("品牌通用") private Boolean isAll; @Schema(description = "语言标识 字典-language_locale") - @ExcelProperty(value = "语言标识 字典-language_locale", converter = DictConvert.class) - @DictFormat("language_locale") // TODO 代码优化：建议设置到对应的 DictTypeConstants 枚举类中 + @ExcelProperty("语言标识 字典-language_locale") private String locale; @Schema(description = "启用状态") diff --git a/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/controller/admin/productcareitem/vo/ProductCareItemSaveReqVO.java b/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/controller/admin/productcareitem/vo/ProductCareItemSaveReqVO.java index 1265477..a3469e9 100644 --- a/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/controller/admin/productcareitem/vo/ProductCareItemSaveReqVO.java +++ b/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/controller/admin/productcareitem/vo/ProductCareItemSaveReqVO.java @@ -9,22 +9,28 @@ import javax.validation.constraints.*; @Data public class ProductCareItemSaveReqVO { - @Schema(description = "id", requiredMode = Schema.RequiredMode.REQUIRED, example = "3104") + @Schema(description = "id", requiredMode = Schema.RequiredMode.REQUIRED, example = "27850") private Long id; @Schema(description = "说明", requiredMode = Schema.RequiredMode.REQUIRED) @NotEmpty(message = "说明不能为空") private String value; + @Schema(description = "类型 字典oms_product_care_item_type", example = "2") + private String type; + + @Schema(description = "语言对照") + private String langMapping; + @Schema(description = "icon图标", example = "https://www.iocoder.cn") private String iconUrl; - @Schema(description = "品牌") - private String brandIds; - - @Schema(description = "只作用于组合") + @Schema(description = "进行多语言组合") private Boolean isCombo; + @Schema(description = "品牌专属") + private String brandIds; + @Schema(description = "品牌通用") private Boolean isAll; diff --git a/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/controller/admin/productinfo/vo/ProductInfoPageReqVO.java b/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/controller/admin/productinfo/vo/ProductInfoPageReqVO.java index 3b4d443..4fdae2b 100644 --- a/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/controller/admin/productinfo/vo/ProductInfoPageReqVO.java +++ b/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/controller/admin/productinfo/vo/ProductInfoPageReqVO.java @@ -18,25 +18,28 @@ public class ProductInfoPageReqVO extends PageParam { @Schema(description = "产品编码") private String code; - @Schema(description = "产品名称", example = "张三") + @Schema(description = "产品名称", example = "芋艿") private String name; @Schema(description = "封面") private String cover; - @Schema(description = "品牌", example = "13561") + @Schema(description = "品牌", example = "12523") private Long brandId; - @Schema(description = "产品类型id", example = "17099") + @Schema(description = "产品类型id", example = "26002") private Long productTypeId; - @Schema(description = "设计稿id", example = "22184") + @Schema(description = "设计稿id", example = "29789") private String draftDesignDataId; + @Schema(description = "设计稿列表 json数据带名称") + private String draftDesignList; + @Schema(description = "启用状态") private Boolean enabled; - @Schema(description = "备注", example = "你猜") + @Schema(description = "备注", example = "你说的对") private String remark; @Schema(description = "详情介绍") diff --git a/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/controller/admin/productinfo/vo/ProductInfoRespVO.java b/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/controller/admin/productinfo/vo/ProductInfoRespVO.java index 01b7f31..700c097 100644 --- a/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/controller/admin/productinfo/vo/ProductInfoRespVO.java +++ b/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/controller/admin/productinfo/vo/ProductInfoRespVO.java @@ -12,7 +12,7 @@ import com.alibaba.excel.annotation.*; @ExcelIgnoreUnannotated public class ProductInfoRespVO { - @Schema(description = "id", requiredMode = Schema.RequiredMode.REQUIRED, example = "14473") + @Schema(description = "id", requiredMode = Schema.RequiredMode.REQUIRED, example = "3187") @ExcelProperty("id") private Long id; @@ -20,7 +20,7 @@ public class ProductInfoRespVO { @ExcelProperty("产品编码") private String code; - @Schema(description = "产品名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "张三") + @Schema(description = "产品名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋艿") @ExcelProperty("产品名称") private String name; @@ -28,26 +28,27 @@ public class ProductInfoRespVO { @ExcelProperty("封面") private String cover; - @Schema(description = "品牌", example = "13561") + @Schema(description = "品牌", example = "12523") @ExcelProperty("品牌") private Long brandId; - @ExcelProperty("品牌") - private String brandName; - - @Schema(description = "产品类型id", example = "17099") + @Schema(description = "产品类型id", example = "26002") @ExcelProperty("产品类型id") private Long productTypeId; - @Schema(description = "设计稿id", example = "22184") + @Schema(description = "设计稿id", example = "29789") @ExcelProperty("设计稿id") private String draftDesignDataId; + @Schema(description = "设计稿列表 json数据带名称") + @ExcelProperty("设计稿列表 json数据带名称") + private String draftDesignList; + @Schema(description = "启用状态") @ExcelProperty("启用状态") private Boolean enabled; - @Schema(description = "备注", example = "你猜") + @Schema(description = "备注", example = "你说的对") @ExcelProperty("备注") private String remark; diff --git a/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/controller/admin/productinfo/vo/ProductInfoSaveReqVO.java b/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/controller/admin/productinfo/vo/ProductInfoSaveReqVO.java index 1d8df24..141f1d9 100644 --- a/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/controller/admin/productinfo/vo/ProductInfoSaveReqVO.java +++ b/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/controller/admin/productinfo/vo/ProductInfoSaveReqVO.java @@ -9,32 +9,35 @@ import javax.validation.constraints.*; @Data public class ProductInfoSaveReqVO { - @Schema(description = "id", requiredMode = Schema.RequiredMode.REQUIRED, example = "14473") + @Schema(description = "id", requiredMode = Schema.RequiredMode.REQUIRED, example = "3187") private Long id; @Schema(description = "产品编码") private String code; - @Schema(description = "产品名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "张三") + @Schema(description = "产品名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋艿") @NotEmpty(message = "产品名称不能为空") private String name; @Schema(description = "封面") private String cover; - @Schema(description = "品牌", example = "13561") + @Schema(description = "品牌", example = "12523") private Long brandId; - @Schema(description = "产品类型id", example = "17099") + @Schema(description = "产品类型id", example = "26002") private Long productTypeId; - @Schema(description = "设计稿id", example = "22184") + @Schema(description = "设计稿id", example = "29789") private String draftDesignDataId; + @Schema(description = "设计稿列表 json数据带名称") + private String draftDesignList; + @Schema(description = "启用状态") private Boolean enabled; - @Schema(description = "备注", example = "你猜") + @Schema(description = "备注", example = "你说的对") private String remark; @Schema(description = "详情介绍") diff --git a/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/dal/dataobject/productcareitem/ProductCareItemDO.java b/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/dal/dataobject/productcareitem/ProductCareItemDO.java index 9451f44..eba8afb 100644 --- a/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/dal/dataobject/productcareitem/ProductCareItemDO.java +++ b/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/dal/dataobject/productcareitem/ProductCareItemDO.java @@ -31,26 +31,32 @@ public class ProductCareItemDO extends BaseDO { * 说明 */ private String value; + /** + * 类型 字典oms_product_care_item_type + */ + private String type; + /** + * 语言对照 + */ + private String langMapping; /** * icon图标 */ private String iconUrl; /** - * 品牌 - */ - private String brandIds; - /** - * 只作用于组合 + * 进行多语言组合 */ private Boolean isCombo; + /** + * 品牌专属 + */ + private String brandIds; /** * 品牌通用 */ private Boolean isAll; /** * 语言标识 字典-language_locale - * - * 枚举 {@link TODO language_locale 对应的类} */ private String locale; /** diff --git a/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/dal/dataobject/productinfo/ProductInfoDO.java b/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/dal/dataobject/productinfo/ProductInfoDO.java index 15d31f7..02b527f 100644 --- a/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/dal/dataobject/productinfo/ProductInfoDO.java +++ b/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/dal/dataobject/productinfo/ProductInfoDO.java @@ -43,12 +43,6 @@ public class ProductInfoDO extends BaseDO { * 品牌 */ private Long brandId; - - /** - * 品牌名称 - */ - @TableField(exist = false) - private String brandName; /** * 产品类型id */ @@ -57,6 +51,10 @@ public class ProductInfoDO extends BaseDO { * 设计稿id */ private String draftDesignDataId; + /** + * 设计稿列表 json数据带名称 + */ + private String draftDesignList; /** * 启用状态 */ @@ -70,4 +68,10 @@ public class ProductInfoDO extends BaseDO { */ private String details; + /** + * 品牌名称 + */ + @TableField(exist = false) + private String brandName; + } \ No newline at end of file diff --git a/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/dal/mysql/productcareitem/ProductCareItemMapper.java b/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/dal/mysql/productcareitem/ProductCareItemMapper.java index cc287a0..c35ca7e 100644 --- a/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/dal/mysql/productcareitem/ProductCareItemMapper.java +++ b/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/dal/mysql/productcareitem/ProductCareItemMapper.java @@ -3,6 +3,7 @@ package cn.hangtag.module.oms.dal.mysql.productcareitem; import java.util.*; import cn.hangtag.framework.common.pojo.PageResult; +import cn.hangtag.framework.common.util.FuncUtil; import cn.hangtag.framework.mybatis.core.query.LambdaQueryWrapperX; import cn.hangtag.framework.mybatis.core.mapper.BaseMapperX; import cn.hangtag.module.oms.dal.dataobject.productcareitem.ProductCareItemDO; @@ -20,9 +21,11 @@ public interface ProductCareItemMapper extends BaseMapperX { default PageResult selectPage(ProductCareItemPageReqVO reqVO) { return selectPage(reqVO, new LambdaQueryWrapperX() .eqIfPresent(ProductCareItemDO::getValue, reqVO.getValue()) + .eqIfPresent(ProductCareItemDO::getType, reqVO.getType()) + .eqIfPresent(ProductCareItemDO::getLangMapping, reqVO.getLangMapping()) .eqIfPresent(ProductCareItemDO::getIconUrl, reqVO.getIconUrl()) - .eqIfPresent(ProductCareItemDO::getBrandIds, reqVO.getBrandIds()) .eqIfPresent(ProductCareItemDO::getIsCombo, reqVO.getIsCombo()) + .eqIfPresent(ProductCareItemDO::getBrandIds, reqVO.getBrandIds()) .eqIfPresent(ProductCareItemDO::getIsAll, reqVO.getIsAll()) .eqIfPresent(ProductCareItemDO::getLocale, reqVO.getLocale()) .eqIfPresent(ProductCareItemDO::getEnabled, reqVO.getEnabled()) @@ -31,4 +34,40 @@ public interface ProductCareItemMapper extends BaseMapperX { .orderByDesc(ProductCareItemDO::getId)); } + default PageResult queryPage(ProductCareItemPageReqVO reqVO) { + LambdaQueryWrapperX queryWrapperX = new LambdaQueryWrapperX() + .eqIfPresent(ProductCareItemDO::getValue, reqVO.getValue()) + .eqIfPresent(ProductCareItemDO::getLangMapping, reqVO.getLangMapping()) + .eqIfPresent(ProductCareItemDO::getIconUrl, reqVO.getIconUrl()) + .eqIfPresent(ProductCareItemDO::getIsCombo, reqVO.getIsCombo()) + .eqIfPresent(ProductCareItemDO::getLocale, reqVO.getLocale()) + .eqIfPresent(ProductCareItemDO::getEnabled, reqVO.getEnabled()) + .eqIfPresent(ProductCareItemDO::getRemark, reqVO.getRemark()) + .betweenIfPresent(ProductCareItemDO::getCreateTime, reqVO.getCreateTime()) + .orderByDesc(ProductCareItemDO::getId); + String brandIds = reqVO.getBrandIds(); + if(FuncUtil.isNotEmpty(reqVO.getType())){ + String[] split = reqVO.getType().split(","); + List types = new ArrayList<>(); + for (String s : split) { + types.add(new Long(s)); + } + queryWrapperX.in(ProductCareItemDO::getType, types); + } + if (brandIds != null && !brandIds.isEmpty()) { + queryWrapperX.and(w ->{ + String[] split = brandIds.split(","); + List brandIdList = new ArrayList<>(); + for (String s : split) { + brandIdList.add(new Long(s)); + } + w.eq(ProductCareItemDO::getIsAll, reqVO.getIsAll()); + w.or().in(ProductCareItemDO::getBrandIds, brandIdList); + }); + }else { + queryWrapperX.eqIfPresent(ProductCareItemDO::getIsAll, true); + } + return selectPage(reqVO, queryWrapperX); + } + } \ No newline at end of file diff --git a/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/dal/mysql/productinfo/ProductInfoMapper.java b/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/dal/mysql/productinfo/ProductInfoMapper.java index 1e5d36f..8077d96 100644 --- a/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/dal/mysql/productinfo/ProductInfoMapper.java +++ b/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/dal/mysql/productinfo/ProductInfoMapper.java @@ -25,6 +25,7 @@ public interface ProductInfoMapper extends BaseMapperX { .eqIfPresent(ProductInfoDO::getBrandId, reqVO.getBrandId()) .eqIfPresent(ProductInfoDO::getProductTypeId, reqVO.getProductTypeId()) .eqIfPresent(ProductInfoDO::getDraftDesignDataId, reqVO.getDraftDesignDataId()) + .eqIfPresent(ProductInfoDO::getDraftDesignList, reqVO.getDraftDesignList()) .eqIfPresent(ProductInfoDO::getEnabled, reqVO.getEnabled()) .eqIfPresent(ProductInfoDO::getRemark, reqVO.getRemark()) .eqIfPresent(ProductInfoDO::getDetails, reqVO.getDetails()) diff --git a/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/service/productcareitem/ProductCareItemService.java b/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/service/productcareitem/ProductCareItemService.java index 09f785c..e189e7c 100644 --- a/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/service/productcareitem/ProductCareItemService.java +++ b/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/service/productcareitem/ProductCareItemService.java @@ -51,5 +51,6 @@ public interface ProductCareItemService { * @return 产品保养项 分页 */ PageResult getProductCareItemPage(ProductCareItemPageReqVO pageReqVO); + PageResult queryList(ProductCareItemPageReqVO pageReqVO); } \ No newline at end of file diff --git a/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/service/productcareitem/ProductCareItemServiceImpl.java b/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/service/productcareitem/ProductCareItemServiceImpl.java index 571447f..3b6237a 100644 --- a/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/service/productcareitem/ProductCareItemServiceImpl.java +++ b/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/service/productcareitem/ProductCareItemServiceImpl.java @@ -71,4 +71,8 @@ public class ProductCareItemServiceImpl implements ProductCareItemService { return productCareItemMapper.selectPage(pageReqVO); } + @Override + public PageResult queryList(ProductCareItemPageReqVO pageReqVO) { + return productCareItemMapper.queryPage(pageReqVO); + } } \ No newline at end of file diff --git a/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/service/productinfo/ProductInfoService.java b/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/service/productinfo/ProductInfoService.java index ae383b7..bec5194 100644 --- a/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/service/productinfo/ProductInfoService.java +++ b/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/service/productinfo/ProductInfoService.java @@ -52,5 +52,10 @@ public interface ProductInfoService { */ PageResult getProductInfoPage(ProductInfoPageReqVO pageReqVO); - String getNewCode(); + /** + * 获取编码 + * + * @return {@link String } + */ + public String getNewCode(); } \ No newline at end of file diff --git a/hangtag-module-oms/hangtag-module-oms-biz/src/test/java/cn/hangtag/module/oms/service/productcareitem/ProductCareItemServiceImplTest.java b/hangtag-module-oms/hangtag-module-oms-biz/src/test/java/cn/hangtag/module/oms/service/productcareitem/ProductCareItemServiceImplTest.java index 488eb31..070e266 100644 --- a/hangtag-module-oms/hangtag-module-oms-biz/src/test/java/cn/hangtag/module/oms/service/productcareitem/ProductCareItemServiceImplTest.java +++ b/hangtag-module-oms/hangtag-module-oms-biz/src/test/java/cn/hangtag/module/oms/service/productcareitem/ProductCareItemServiceImplTest.java @@ -111,9 +111,11 @@ public class ProductCareItemServiceImplTest extends BaseDbUnitTest { // mock 数据 ProductCareItemDO dbProductCareItem = randomPojo(ProductCareItemDO.class, o -> { // 等会查询到 o.setValue(null); + o.setType(null); + o.setLangMapping(null); o.setIconUrl(null); - o.setBrandIds(null); o.setIsCombo(null); + o.setBrandIds(null); o.setIsAll(null); o.setLocale(null); o.setEnabled(null); @@ -123,12 +125,16 @@ public class ProductCareItemServiceImplTest extends BaseDbUnitTest { productCareItemMapper.insert(dbProductCareItem); // 测试 value 不匹配 productCareItemMapper.insert(cloneIgnoreId(dbProductCareItem, o -> o.setValue(null))); + // 测试 type 不匹配 + productCareItemMapper.insert(cloneIgnoreId(dbProductCareItem, o -> o.setType(null))); + // 测试 langMapping 不匹配 + productCareItemMapper.insert(cloneIgnoreId(dbProductCareItem, o -> o.setLangMapping(null))); // 测试 iconUrl 不匹配 productCareItemMapper.insert(cloneIgnoreId(dbProductCareItem, o -> o.setIconUrl(null))); - // 测试 brandIds 不匹配 - productCareItemMapper.insert(cloneIgnoreId(dbProductCareItem, o -> o.setBrandIds(null))); // 测试 isCombo 不匹配 productCareItemMapper.insert(cloneIgnoreId(dbProductCareItem, o -> o.setIsCombo(null))); + // 测试 brandIds 不匹配 + productCareItemMapper.insert(cloneIgnoreId(dbProductCareItem, o -> o.setBrandIds(null))); // 测试 isAll 不匹配 productCareItemMapper.insert(cloneIgnoreId(dbProductCareItem, o -> o.setIsAll(null))); // 测试 locale 不匹配 @@ -142,9 +148,11 @@ public class ProductCareItemServiceImplTest extends BaseDbUnitTest { // 准备参数 ProductCareItemPageReqVO reqVO = new ProductCareItemPageReqVO(); reqVO.setValue(null); + reqVO.setType(null); + reqVO.setLangMapping(null); reqVO.setIconUrl(null); - reqVO.setBrandIds(null); reqVO.setIsCombo(null); + reqVO.setBrandIds(null); reqVO.setIsAll(null); reqVO.setLocale(null); reqVO.setEnabled(null); diff --git a/hangtag-module-oms/hangtag-module-oms-biz/src/test/java/cn/hangtag/module/oms/service/productinfo/ProductInfoServiceImplTest.java b/hangtag-module-oms/hangtag-module-oms-biz/src/test/java/cn/hangtag/module/oms/service/productinfo/ProductInfoServiceImplTest.java index 8dd2712..4ae8abb 100644 --- a/hangtag-module-oms/hangtag-module-oms-biz/src/test/java/cn/hangtag/module/oms/service/productinfo/ProductInfoServiceImplTest.java +++ b/hangtag-module-oms/hangtag-module-oms-biz/src/test/java/cn/hangtag/module/oms/service/productinfo/ProductInfoServiceImplTest.java @@ -31,7 +31,7 @@ import static org.mockito.Mockito.*; /** * {@link ProductInfoServiceImpl} 的单元测试类 * - * @author YuanFeng + * @author 芋道源码 */ @Import(ProductInfoServiceImpl.class) public class ProductInfoServiceImplTest extends BaseDbUnitTest { @@ -112,23 +112,31 @@ public class ProductInfoServiceImplTest extends BaseDbUnitTest { ProductInfoDO dbProductInfo = randomPojo(ProductInfoDO.class, o -> { // 等会查询到 o.setCode(null); o.setName(null); + o.setCover(null); o.setBrandId(null); o.setProductTypeId(null); + o.setDraftDesignDataId(null); + o.setDraftDesignList(null); o.setEnabled(null); o.setRemark(null); o.setDetails(null); o.setCreateTime(null); - o.setCover(null); }); productInfoMapper.insert(dbProductInfo); // 测试 code 不匹配 productInfoMapper.insert(cloneIgnoreId(dbProductInfo, o -> o.setCode(null))); // 测试 name 不匹配 productInfoMapper.insert(cloneIgnoreId(dbProductInfo, o -> o.setName(null))); + // 测试 cover 不匹配 + productInfoMapper.insert(cloneIgnoreId(dbProductInfo, o -> o.setCover(null))); // 测试 brandId 不匹配 productInfoMapper.insert(cloneIgnoreId(dbProductInfo, o -> o.setBrandId(null))); // 测试 productTypeId 不匹配 productInfoMapper.insert(cloneIgnoreId(dbProductInfo, o -> o.setProductTypeId(null))); + // 测试 draftDesignDataId 不匹配 + productInfoMapper.insert(cloneIgnoreId(dbProductInfo, o -> o.setDraftDesignDataId(null))); + // 测试 draftDesignList 不匹配 + productInfoMapper.insert(cloneIgnoreId(dbProductInfo, o -> o.setDraftDesignList(null))); // 测试 enabled 不匹配 productInfoMapper.insert(cloneIgnoreId(dbProductInfo, o -> o.setEnabled(null))); // 测试 remark 不匹配 @@ -137,19 +145,19 @@ public class ProductInfoServiceImplTest extends BaseDbUnitTest { productInfoMapper.insert(cloneIgnoreId(dbProductInfo, o -> o.setDetails(null))); // 测试 createTime 不匹配 productInfoMapper.insert(cloneIgnoreId(dbProductInfo, o -> o.setCreateTime(null))); - // 测试 cover 不匹配 - productInfoMapper.insert(cloneIgnoreId(dbProductInfo, o -> o.setCover(null))); // 准备参数 ProductInfoPageReqVO reqVO = new ProductInfoPageReqVO(); reqVO.setCode(null); reqVO.setName(null); + reqVO.setCover(null); reqVO.setBrandId(null); reqVO.setProductTypeId(null); + reqVO.setDraftDesignDataId(null); + reqVO.setDraftDesignList(null); reqVO.setEnabled(null); reqVO.setRemark(null); reqVO.setDetails(null); reqVO.setCreateTime(buildBetweenTime(2023, 2, 1, 2023, 2, 28)); - reqVO.setCover(null); // 调用 PageResult pageResult = productInfoService.getProductInfoPage(reqVO); diff --git a/hangtag-ui/hangtag-ui-admin/src/api/oms/productcareitem/index.ts b/hangtag-ui/hangtag-ui-admin/src/api/oms/productcareitem/index.ts index 17592fb..6112330 100644 --- a/hangtag-ui/hangtag-ui-admin/src/api/oms/productcareitem/index.ts +++ b/hangtag-ui/hangtag-ui-admin/src/api/oms/productcareitem/index.ts @@ -1,47 +1,50 @@ -import request from '@/config/axios' - -// 产品保养项 VO -export interface ProductCareItemVO { - id: number // id - value: string // 说明 - iconUrl: string // icon图标 - brandIds: string // 品牌 - isCombo: boolean // 只作用于组合 - isAll: boolean // 品牌通用 - locale: string // 语言标识 字典-language_locale - enabled: boolean // 启用状态 - remark: string // 备注 -} - -// 产品保养项 API -export const ProductCareItemApi = { - // 查询产品保养项 分页 - getProductCareItemPage: async (params: any) => { - return await request.get({ url: `/oms/product-care-item/page`, params }) - }, - - // 查询产品保养项 详情 - getProductCareItem: async (id: number) => { - return await request.get({ url: `/oms/product-care-item/get?id=` + id }) - }, - - // 新增产品保养项 - createProductCareItem: async (data: ProductCareItemVO) => { - return await request.post({ url: `/oms/product-care-item/create`, data }) - }, - - // 修改产品保养项 - updateProductCareItem: async (data: ProductCareItemVO) => { - return await request.put({ url: `/oms/product-care-item/update`, data }) - }, - - // 删除产品保养项 - deleteProductCareItem: async (id: number) => { - return await request.delete({ url: `/oms/product-care-item/delete?id=` + id }) - }, - - // 导出产品保养项 Excel - exportProductCareItem: async (params) => { - return await request.download({ url: `/oms/product-care-item/export-excel`, params }) - }, -} \ No newline at end of file +import request from '@/config/axios' + +// 产品保养项 VO +export interface ProductCareItemVO { + id: number // id + value: string // 说明 + iconUrl: string // icon图标 + brandIds: string // 品牌 + isCombo: boolean // 只作用于组合 + isAll: boolean // 品牌通用 + locale: string // 语言标识 字典-language_locale + enabled: boolean // 启用状态 + remark: string // 备注 +} + +// 产品保养项 API +export const ProductCareItemApi = { + // 查询产品保养项 分页 + getProductCareItemPage: async (params: any) => { + return await request.get({ url: `/oms/product-care-item/page`, params }) + }, + queryList: async (params: any) => { + return await request.get({ url: `/oms/product-care-item/list`, params }) + }, + + // 查询产品保养项 详情 + getProductCareItem: async (id: number) => { + return await request.get({ url: `/oms/product-care-item/get?id=` + id }) + }, + + // 新增产品保养项 + createProductCareItem: async (data: ProductCareItemVO) => { + return await request.post({ url: `/oms/product-care-item/create`, data }) + }, + + // 修改产品保养项 + updateProductCareItem: async (data: ProductCareItemVO) => { + return await request.put({ url: `/oms/product-care-item/update`, data }) + }, + + // 删除产品保养项 + deleteProductCareItem: async (id: number) => { + return await request.delete({ url: `/oms/product-care-item/delete?id=` + id }) + }, + + // 导出产品保养项 Excel + exportProductCareItem: async (params) => { + return await request.download({ url: `/oms/product-care-item/export-excel`, params }) + }, +} diff --git a/hangtag-ui/hangtag-ui-admin/src/api/oms/productinfo/index.ts b/hangtag-ui/hangtag-ui-admin/src/api/oms/productinfo/index.ts index 6c877ef..6497f5f 100644 --- a/hangtag-ui/hangtag-ui-admin/src/api/oms/productinfo/index.ts +++ b/hangtag-ui/hangtag-ui-admin/src/api/oms/productinfo/index.ts @@ -1,47 +1,49 @@ -import request from '@/config/axios' - -// 产品资料 VO -export interface ProductInfoVO { - id: number // id - code: string // 产品编码 - name: string // 产品名称 - brandId: number // 品牌 - productTypeId: number // 产品类型id - enabled: boolean // 启用状态 - remark: string // 备注 - details: string // 详情介绍 - cover: string // 封面 -} - -// 产品资料 API -export const ProductInfoApi = { - // 查询产品资料 分页 - getProductInfoPage: async (params: any) => { - return await request.get({ url: `/oms/product-info/page`, params }) - }, - - // 查询产品资料 详情 - getProductInfo: async (id: number) => { - return await request.get({ url: `/oms/product-info/get?id=` + id }) - }, - - // 新增产品资料 - createProductInfo: async (data: ProductInfoVO) => { - return await request.post({ url: `/oms/product-info/create`, data }) - }, - - // 修改产品资料 - updateProductInfo: async (data: ProductInfoVO) => { - return await request.put({ url: `/oms/product-info/update`, data }) - }, - - // 删除产品资料 - deleteProductInfo: async (id: number) => { - return await request.delete({ url: `/oms/product-info/delete?id=` + id }) - }, - - // 导出产品资料 Excel - exportProductInfo: async (params) => { - return await request.download({ url: `/oms/product-info/export-excel`, params }) - }, -} \ No newline at end of file +import request from '@/config/axios' + +// 产品资料 VO +export interface ProductInfoVO { + id: number // id + code: string // 产品编码 + name: string // 产品名称 + brandId: number // 品牌 + productTypeId: number // 产品类型id + enabled: boolean // 启用状态 + remark: string // 备注 + details: string // 详情介绍 + cover: string // 封面 + draftDesignList: string, // 设计稿列表 + draftDesignDataId: string // 设计稿数据id +} + +// 产品资料 API +export const ProductInfoApi = { + // 查询产品资料 分页 + getProductInfoPage: async (params: any) => { + return await request.get({ url: `/oms/product-info/page`, params }) + }, + + // 查询产品资料 详情 + getProductInfo: async (id: number) => { + return await request.get({ url: `/oms/product-info/get?id=` + id }) + }, + + // 新增产品资料 + createProductInfo: async (data: ProductInfoVO) => { + return await request.post({ url: `/oms/product-info/create`, data }) + }, + + // 修改产品资料 + updateProductInfo: async (data: ProductInfoVO) => { + return await request.put({ url: `/oms/product-info/update`, data }) + }, + + // 删除产品资料 + deleteProductInfo: async (id: number) => { + return await request.delete({ url: `/oms/product-info/delete?id=` + id }) + }, + + // 导出产品资料 Excel + exportProductInfo: async (params) => { + return await request.download({ url: `/oms/product-info/export-excel`, params }) + }, +} diff --git a/hangtag-ui/hangtag-ui-admin/src/components/Dialog/src/BrandDataListDialog/DataForm.vue b/hangtag-ui/hangtag-ui-admin/src/components/Dialog/src/BrandDataListDialog/DataForm.vue index d436e72..e040c14 100644 --- a/hangtag-ui/hangtag-ui-admin/src/components/Dialog/src/BrandDataListDialog/DataForm.vue +++ b/hangtag-ui/hangtag-ui-admin/src/components/Dialog/src/BrandDataListDialog/DataForm.vue @@ -1,5 +1,5 @@