Merge pull request '修改文档搜索框显示不下自动换行' (#11) from zjl into develop

Reviewed-on: #11

package-lock.json

@@ -4007,9 +4007,9 @@
       }
     },
     "node_modules/code-brick-zj": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/code-brick-zj/-/code-brick-zj-1.0.3.tgz",
-      "integrity": "sha512-7RG5c6/85mnLh+XG06dSWJHe+c3xITQ+OD4c9+0H+9tMTV+gwiEGlor8hbl0HsLk1KLB4ERDhcl5bdmRr7mU/Q=="
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/code-brick-zj/-/code-brick-zj-1.1.0.tgz",
+      "integrity": "sha512-J6S5ILHdweYMiEfpLuU8EvgQNEJ4EMAvjBAbLRtpGOBtXNX4U7z+IB9jDu2FE1TdkOaKJUpVLubgZwxkGzXNaA=="
     },
     "node_modules/color-convert": {
       "version": "1.9.3",
@@ -14473,9 +14473,9 @@
       }
     },
     "code-brick-zj": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/code-brick-zj/-/code-brick-zj-1.0.3.tgz",
-      "integrity": "sha512-7RG5c6/85mnLh+XG06dSWJHe+c3xITQ+OD4c9+0H+9tMTV+gwiEGlor8hbl0HsLk1KLB4ERDhcl5bdmRr7mU/Q=="
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/code-brick-zj/-/code-brick-zj-1.1.0.tgz",
+      "integrity": "sha512-J6S5ILHdweYMiEfpLuU8EvgQNEJ4EMAvjBAbLRtpGOBtXNX4U7z+IB9jDu2FE1TdkOaKJUpVLubgZwxkGzXNaA=="
     },
     "color-convert": {
       "version": "1.9.3",

src/views/home/introduce.vue

@@ -3,9 +3,27 @@
     <p>
       组件包目前封装常用的四个组件:表格，搜索区域，分页，对话框。包npm地址为：https://www.npmjs.com/package/code-brick-zj。
     </p>
-    <p>文档当前使用的组件包的版本为：1.0.3</p>
+    <p>文档当前使用的组件包的版本为：1.1.0</p>
     <div class="block">
       <el-timeline>
+        <el-timeline-item timestamp="2024/4/10" placement="top">
+          <el-card>
+            <h4>修改</h4>
+            <h4>搜索栏：去除展开收起的样式，变成显示不下自动换行</h4>
+            <p>组件版本号为：1.1.0</p>
+          </el-card>
+        </el-timeline-item>
+        <el-timeline-item timestamp="2023/11/28" placement="top">
+          <el-card>
+            <h4>修改</h4>
+            <h4>
+              searchBar：select增加属性collapseTags将选中值按文字的形式展示
+              multipleLimit来设置多选时用户最多可以选择的项目数
+              placeholder有值显示，无值默认显示label
+            </h4>
+            <p>组件版本号为：1.0.5</p>
+          </el-card>
+        </el-timeline-item>
         <el-timeline-item timestamp="2023/11/24" placement="top">
           <el-card>
             <h4>增加/修改</h4>
@@ -20,7 +38,7 @@
         <el-timeline-item timestamp="2023/2/28" placement="top">
           <el-card>
             <h4>修改</h4>
-            <h4>搜索栏：增加展开收起的样式</h4>
+            <h4>搜索栏：增加展开收起的样式" 1.1.0 "版本开始废弃</h4>
             <p>组件版本号为：1.0.2</p>
           </el-card>
         </el-timeline-item>

src/views/searchBar/searchBar.vue

@@ -64,6 +64,9 @@
       <h3>
         select下拉框(选项默认是id和name,可以通过labelField，valueField去改取值的key)
       </h3>
+      <p>
+        可以通过multiple:true来开启多选，collapseTags:true来将选中值按文字的形式展示，multipleLimit来设置多选时用户最多可以选择的项目数
+      </p>
       <div style="height: 50px">
         <SearchBar
           :formConfigs="formConfig2"
@@ -123,10 +126,16 @@
                         label: '性别',
                         selectOptions: [
                           { id: 1, name: '男(可多选)' },
-                          { id: 2, name: '女' }
+                          { id: 2, name: '女' },
+                          { id: 3, name: '未知1' },
+                          { id: 4, name: '保密' },
+                          { id: 5, name: '保密2' }
                         ],
+                        placeholder: '多选',
                         param: 'xb4',
-                        multiple: true
+                        multiple: true,
+                        collapseTags: true,
+                        multipleLimit: 3
                       },
                       {
                         type: 'select',
@@ -153,21 +162,17 @@
       <div>
         <SearchBar
           :formConfigs="formConfig22"
-          :isFold="true"
           @headBtnClick="headBtnClickCascader"
         />
       </div>
       <el-collapse>
         <el-collapse-item title="显示代码">
-          <div class="description">
-            搜索条件过多的，可以使用展开收起功能<code>isFold</code>属性，的值为true即可
-          </div>
+          <div class="description">搜索条件过多的，显示不下自动换行</div>
           <div>
             <pre>
               &lt;<span>template</span>&gt;
                 &lt;SearchBar
                   :formConfigs="formConfig22"
-                  :isFold="true"
                   @headBtnClick="headBtnClickCascader" /&gt;
               &lt;<span>/template</span>&gt;
               &lt;script&gt;
@@ -1212,10 +1217,16 @@ export default {
           label: '性别',
           selectOptions: [
             { id: 1, name: '男(可多选)' },
-            { id: 2, name: '女' }
+            { id: 2, name: '女' },
+            { id: 3, name: '未知1' },
+            { id: 4, name: '保密' },
+            { id: 5, name: '保密2' }
           ],
+          placeholder: '多选',
           param: 'xb4',
-          multiple: true
+          multiple: true,
+          collapseTags: true,
+          multipleLimit: 3
         },
         {
           type: 'select',