From b3feae4fa2b376d2790c19398e188f30d2d95bd4 Mon Sep 17 00:00:00 2001
From: xjs <1294405880@qq.com>
Date: Thu, 17 Mar 2022 01:07:13 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E5=B1=9E=E6=80=A7=E5=88=86=E7=BB=84?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BDCRUD=E5=9F=BA=E6=9C=AC=E5=AE=9E=E7=8E=B0=202?=
 =?UTF-8?q?=E3=80=81=E9=81=87=E5=88=B0=E7=9A=84=E9=97=AE=E9=A2=98=20->=20e?=
 =?UTF-8?q?lementUI=E7=BA=A7=E8=81=94=E9=80=89=E6=8B=A9=E6=A1=86=E5=9B=9E?=
 =?UTF-8?q?=E6=98=BE=E6=A0=BC=E5=BC=8F=20[1,2,3]=203=E3=80=81JsonConfig?=
 =?UTF-8?q?=E7=B1=BB=E9=85=8D=E7=BD=AE=E8=BF=87=E6=BB=A4=E5=99=A8=E5=BE=AE?=
 =?UTF-8?q?=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/mall/category-cascader.vue     |  2 -
 .../attribute/attrgroup-add-or-update.vue     | 45 +++++++++++++------
 .../mall/product/brand-add-or-update.vue      |  2 +-
 ruoyi-ui/src/views/mall/product/category.vue  |  4 +-
 .../main/java/com/xjs/config/JsonConfig.java  |  3 --
 .../controller/AttrGroupController.java       |  7 ++-
 .../mall/product/entity/AttrGroupEntity.java  |  5 ++-
 7 files changed, 43 insertions(+), 25 deletions(-)

diff --git a/ruoyi-ui/src/views/components/mall/category-cascader.vue b/ruoyi-ui/src/views/components/mall/category-cascader.vue
index 03da4c3e..9f43c905 100644
--- a/ruoyi-ui/src/views/components/mall/category-cascader.vue
+++ b/ruoyi-ui/src/views/components/mall/category-cascader.vue
@@ -51,8 +51,6 @@ export default {
     },
     paths(v){
       this.$emit("update:catelogPath",v);
-      //还可以使用pubsub-js进行传值
-      // this.PubSub.publish("catPath",v);
     }
   },
   //方法集合
diff --git a/ruoyi-ui/src/views/mall/product/attribute/attrgroup-add-or-update.vue b/ruoyi-ui/src/views/mall/product/attribute/attrgroup-add-or-update.vue
index ee9405a5..8a37aa42 100644
--- a/ruoyi-ui/src/views/mall/product/attribute/attrgroup-add-or-update.vue
+++ b/ruoyi-ui/src/views/mall/product/attribute/attrgroup-add-or-update.vue
@@ -1,5 +1,6 @@
 <template>
   <el-dialog
+    width="600px"
     :title="!dataForm.id ? '新增' : '修改'"
     :close-on-click-modal="false"
     :visible.sync="visible"
@@ -10,20 +11,39 @@
       :rules="dataRule"
       ref="dataForm"
       @keyup.enter.native="dataFormSubmit()"
-      label-width="120px"
+      label-width="90px"
     >
       <el-form-item label="组名" prop="attrGroupName">
         <el-input v-model="dataForm.attrGroupName" placeholder="组名"></el-input>
       </el-form-item>
       <el-form-item label="排序" prop="sort">
-        <el-input v-model="dataForm.sort" placeholder="排序"></el-input>
+        <el-input-number v-model.number="dataForm.sort" :min="1" :max="9999" label="排序"></el-input-number>
       </el-form-item>
       <el-form-item label="描述" prop="descript">
-        <el-input v-model="dataForm.descript" placeholder="描述"></el-input>
+        <el-input type="textarea" :rows="2" v-model="dataForm.descript" placeholder="描述"></el-input>
       </el-form-item>
+
       <el-form-item label="组图标" prop="icon">
-        <el-input v-model="dataForm.icon" placeholder="组图标"></el-input>
+        <el-popover
+          placement="bottom-start"
+          width="460"
+          trigger="click"
+          @show="$refs['iconSelect'].reset()"
+        >
+          <IconSelect ref="iconSelect" @selected="selected"/>
+          <el-input slot="reference" :value="dataForm.icon" placeholder="点击选择图标" readonly>
+            <svg-icon
+              v-if="dataForm.icon"
+              slot="prefix"
+              :icon-class="dataForm.icon"
+              class="el-input__icon"
+              style="height: 32px;width: 16px;"
+            />
+            <i v-else slot="prefix" class="el-icon-search el-input__icon"/>
+          </el-input>
+        </el-popover>
       </el-form-item>
+
       <el-form-item label="所属分类" prop="catelogId">
         <category-cascader :catelogPath.sync="catelogPath"></category-cascader>
       </el-form-item>
@@ -37,32 +57,27 @@
 
 <script>
 import CategoryCascader from '../../../components/mall/category-cascader'
-import {getMenus} from "@/api/mall/product/category";
 
 import {addAttrGroup, getAttrGroup} from "@/api/mall/product/attr-group";
+import IconSelect from "@/components/IconSelect";
 
 export default {
   name: "attrgroup-add-or-update",
 
-  components: {CategoryCascader},
+  components: {CategoryCascader,IconSelect},
 
   data() {
     return {
-      props: {
-        value: "catId",
-        label: "name",
-        children: "children"
-      },
       visible: false,
-      categorys: [],
       catelogPath: [],
+
       dataForm: {
         attrGroupId: 0,
         attrGroupName: "",
         sort: "",
         descript: "",
         icon: "",
-        catelogId: 0
+        catelogId: 0,
       },
       dataRule: {
         attrGroupName: [
@@ -85,6 +100,10 @@ export default {
       this.catelogPath = [];
     },
 
+    // 选择图标
+    selected(name) {
+      this.dataForm.icon = name;
+    },
 
     init(id) {
       this.dataForm.attrGroupId = id;
diff --git a/ruoyi-ui/src/views/mall/product/brand-add-or-update.vue b/ruoyi-ui/src/views/mall/product/brand-add-or-update.vue
index e2b07acd..8333d5df 100644
--- a/ruoyi-ui/src/views/mall/product/brand-add-or-update.vue
+++ b/ruoyi-ui/src/views/mall/product/brand-add-or-update.vue
@@ -33,7 +33,7 @@
         <el-input v-model="dataForm.firstLetter" placeholder="检索首字母" style="width: 200px"></el-input>
       </el-form-item>
       <el-form-item label="排序" prop="sort">
-        <el-input-number v-model.number="dataForm.sort" :min="1" :max="9999" label="描述文字"></el-input-number>
+        <el-input-number v-model.number="dataForm.sort" :min="1" :max="9999" label="排序"></el-input-number>
       </el-form-item>
     </el-form>
     <span slot="footer" class="dialog-footer">
diff --git a/ruoyi-ui/src/views/mall/product/category.vue b/ruoyi-ui/src/views/mall/product/category.vue
index cc7899c1..b61e6756 100644
--- a/ruoyi-ui/src/views/mall/product/category.vue
+++ b/ruoyi-ui/src/views/mall/product/category.vue
@@ -62,7 +62,7 @@
             @show="$refs['iconSelect'].reset()"
           >
             <IconSelect ref="iconSelect" @selected="selected"/>
-            <el-input slot="reference" v-model="category.icon" placeholder="点击选择图标" readonly>
+            <el-input slot="reference" :value="category.icon" placeholder="点击选择图标" readonly>
               <svg-icon
                 v-if="category.icon"
                 slot="prefix"
@@ -111,7 +111,7 @@ export default {
         showStatus: 1,
         sort: 0,
         productUnit: "",
-        icon: "",
+        icon: null,
         catId: null
       },
       dialogVisible: false,
diff --git a/xjs-business/xjs-business-common/src/main/java/com/xjs/config/JsonConfig.java b/xjs-business/xjs-business-common/src/main/java/com/xjs/config/JsonConfig.java
index 5822ac3b..c4611e89 100644
--- a/xjs-business/xjs-business-common/src/main/java/com/xjs/config/JsonConfig.java
+++ b/xjs-business/xjs-business-common/src/main/java/com/xjs/config/JsonConfig.java
@@ -62,9 +62,6 @@ public class JsonConfig {
 
         //忽略某些空值
         PropertyFilter filter = (source, key, value) -> {
-            if (value == null) {
-                return false;
-            }
             if(value instanceof List && ((List) value).size() == 0){
                 return  false;
             }
diff --git a/xjs-business/xjs-project-mall/mall-product/src/main/java/com/xjs/mall/product/controller/AttrGroupController.java b/xjs-business/xjs-project-mall/mall-product/src/main/java/com/xjs/mall/product/controller/AttrGroupController.java
index bb4a4b1b..f74312d8 100644
--- a/xjs-business/xjs-project-mall/mall-product/src/main/java/com/xjs/mall/product/controller/AttrGroupController.java
+++ b/xjs-business/xjs-project-mall/mall-product/src/main/java/com/xjs/mall/product/controller/AttrGroupController.java
@@ -9,8 +9,9 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.Arrays;
+import java.util.List;
 import java.util.Map;
-
+import java.util.stream.Collectors;
 
 
 /**
@@ -48,7 +49,9 @@ public class AttrGroupController {
 		AttrGroupEntity attrGroup = attrGroupService.getById(attrGroupId);
 
         Long[] path=categoryService.finCatelogPath(attrGroup.getCatelogId());
-        attrGroup.setCatelogPath(path);
+        List<String> collect = Arrays.stream(path).map(String::valueOf).collect(Collectors.toList());
+
+        attrGroup.setCatelogPath(collect);
 
         return R.ok().put("attrGroup", attrGroup);
     }
diff --git a/xjs-business/xjs-project-mall/mall-product/src/main/java/com/xjs/mall/product/entity/AttrGroupEntity.java b/xjs-business/xjs-project-mall/mall-product/src/main/java/com/xjs/mall/product/entity/AttrGroupEntity.java
index 018b95c9..decf51db 100644
--- a/xjs-business/xjs-project-mall/mall-product/src/main/java/com/xjs/mall/product/entity/AttrGroupEntity.java
+++ b/xjs-business/xjs-project-mall/mall-product/src/main/java/com/xjs/mall/product/entity/AttrGroupEntity.java
@@ -6,10 +6,11 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.util.List;
 
 /**
  * 属性分组
- * 
+ *
  * @author xiejs
  * @email 1294405880@qq.com
  * @date 2022-03-15 10:16:53
@@ -49,6 +50,6 @@ public class AttrGroupEntity implements Serializable {
 	 * 分类id完整路径
 	 */
 	@TableField(exist = false)
-	private Long[] catelogPath;
+	private List<String> catelogPath;
 
 }