收藏夹

ant-design-vue-jeecg/src/views/collecttype/admin/CollectTypeList.vue

@@ -4,6 +4,21 @@
     <div class="table-page-search-wrapper">
       <a-form layout="inline" @keyup.enter.native="searchQuery">
         <a-row :gutter="24">
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-form-item label="收藏分类名">
+              <a-input placeholder="请输入收藏分类名" v-model="queryParam.collectTypeName"></a-input>
+            </a-form-item>
+          </a-col>
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
+              <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
+              <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
+              <a @click="handleToggleSearch" style="margin-left: 8px">
+                {{ toggleSearchStatus ? '收起' : '展开' }}
+                <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
+              </a>
+            </span>
+          </a-col>
         </a-row>
       </a-form>
     </div>

ant-design-vue-jeecg/src/views/collecttype/admin/modules/CollectTypeModal.vue

@@ -11,12 +11,12 @@
     <a-spin :spinning="confirmLoading">
       <a-form-model ref="form" :model="model" :rules="validatorRules">
         <a-form-model-item label="收藏分类名" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="collectTypeName">
-          <a-input v-model="model.collectTypeName" placeholder="请输入收藏分类名" ></a-input>
+          <a-input v-model="model.collectTypeName" placeholder="请输入顶级收藏夹" ></a-input>
         </a-form-model-item>
-        <a-form-model-item label="父级节点" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="pid">
+        <a-form-model-item label="上级收藏夹" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="pid">
           <j-tree-select
             ref="treeSelect"
-            placeholder="请选择父级节点"
+            placeholder="请选择上级收藏夹"
             v-model="model.pid"
             dict="collect_type,collect_type_name,id"
             pidField="pid"

jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/collecttype/entity/CollectType.java

@@ -58,9 +58,9 @@ public class CollectType implements Serializable {
     @Excel(name = "收藏分类名", width = 15)
     @ApiModelProperty(value = "收藏分类名")
     private java.lang.String collectTypeName;
-	/**父级节点*/
-	@Excel(name = "父级节点", width = 15)
-    @ApiModelProperty(value = "父级节点")
+    /**上级收藏夹*/
+    @Excel(name = "上级收藏夹", width = 15)
+    @ApiModelProperty(value = "上级收藏夹")
     private java.lang.String pid;
     /**是否有子节点*/
     @Excel(name = "是否有子节点", width = 15, dicCode = "yn")