瀏覽代碼

标签交互修改

chente 5 年之前
父節點
當前提交
92d52131b4
共有 1 個文件被更改,包括 233 次插入215 次删除
  1. 233 215
      contact.html

+ 233 - 215
contact.html

@@ -391,125 +391,73 @@
                                         <i class="fas fa-circle tagcol-01-s"></i>
                                       </div>
                                     </div>
-                                    <input type="text" class="form-control border-left-0 border-right-0 bg-transparent pl-0" placeholder="请输入标签名" value="标签1">
-                                    <div class="input-group-append">
-                                      <div class="input-group-text  border-left-0 bg-transparent">
-                                        <div class="custom-control custom-checkbox">
-                                          <input type="checkbox" class="custom-control-input" id="tabcheck1">
-                                          <label class="custom-control-label" for="tabcheck1"></label>
-                                        </div>
-                                      </div>
-                                    </div>
+                                    <input type="text" class="form-control border-left-0 bg-transparent pl-0" placeholder="请输入标签名" value="这是一条标签名字很长很长的标签">
                                   </div>
                                 </li>
                                 <li class="mb-1">
                                   <div class="input-group bg-white shadow-inset-2">
                                     <div class="input-group-prepend">
-                                      <span class="input-group-text bg-transparent border-right-0">
-                																<i class="fas fa-circle tagcol-02-s"></i>
-                															</span>
-                                    </div>
-                                    <input type="text" class="form-control border-left-0 border-right-0 bg-transparent pl-0" placeholder="请输入标签名" value="标签2">
-                                    <div class="input-group-append">
-                                      <div class="input-group-text  border-left-0 bg-transparent">
-                                        <div class="custom-control custom-checkbox">
-                                          <input type="checkbox" class="custom-control-input" id="tabcheck2">
-                                          <label class="custom-control-label" for="tabcheck2"></label>
-                                        </div>
+                                      <div class="input-group-text bg-transparent border-right-0">
+                                        <i class="fas fa-circle tagcol-02-s"></i>
                                       </div>
                                     </div>
+                                    <input type="text" class="form-control border-left-0 bg-transparent pl-0" placeholder="请输入标签名" value="标签2">
                                   </div>
                                 </li>
                                 <li class="mb-1">
                                   <div class="input-group bg-white shadow-inset-2">
                                     <div class="input-group-prepend">
-                                      <span class="input-group-text bg-transparent border-right-0">
-                																<i class="fas fa-circle tagcol-03-s"></i>
-                															</span>
-                                    </div>
-                                    <input type="text" class="form-control border-left-0 border-right-0 bg-transparent pl-0" placeholder="请输入标签名" value="标签3">
-                                    <div class="input-group-append">
-                                      <div class="input-group-text  border-left-0 bg-transparent">
-                                        <div class="custom-control custom-checkbox">
-                                          <input type="checkbox" class="custom-control-input" id="tabcheck3">
-                                          <label class="custom-control-label" for="tabcheck3"></label>
-                                        </div>
+                                      <div class="input-group-text bg-transparent border-right-0">
+                                        <i class="fas fa-circle tagcol-03-s"></i>
                                       </div>
                                     </div>
+                                    <input type="text" class="form-control border-left-0 bg-transparent pl-0" placeholder="请输入标签名" value="标签3">
                                   </div>
                                 </li>
                                 <li class="mb-1">
                                   <div class="input-group bg-white shadow-inset-2">
                                     <div class="input-group-prepend">
-                                      <span class="input-group-text bg-transparent border-right-0">
-                																<i class="fas fa-circle tagcol-04-s"></i>
-                															</span>
-                                    </div>
-                                    <input type="text" class="form-control border-left-0 border-right-0 bg-transparent pl-0" placeholder="请输入标签名" value="标签4">
-                                    <div class="input-group-append">
-                                      <div class="input-group-text  border-left-0 bg-transparent">
-                                        <div class="custom-control custom-checkbox">
-                                          <input type="checkbox" class="custom-control-input" id="tabcheck4">
-                                          <label class="custom-control-label" for="tabcheck4"></label>
-                                        </div>
+                                      <div class="input-group-text bg-transparent border-right-0">
+                                        <i class="fas fa-circle tagcol-04-s"></i>
                                       </div>
                                     </div>
+                                    <input type="text" class="form-control border-left-0 bg-transparent pl-0" placeholder="请输入标签名" value="标签4">
                                   </div>
                                 </li>
                                 <li class="mb-1">
                                   <div class="input-group bg-white shadow-inset-2">
                                     <div class="input-group-prepend">
-                                      <span class="input-group-text bg-transparent border-right-0">
-                																<i class="fas fa-circle tagcol-05-s"></i>
-                															</span>
-                                    </div>
-                                    <input type="text" class="form-control border-left-0 border-right-0 bg-transparent pl-0" placeholder="请输入标签名" value="标签5">
-                                    <div class="input-group-append">
-                                      <div class="input-group-text  border-left-0 bg-transparent">
-                                        <div class="custom-control custom-checkbox">
-                                          <input type="checkbox" class="custom-control-input" id="tabcheck5">
-                                          <label class="custom-control-label" for="tabcheck5"></label>
-                                        </div>
+                                      <div class="input-group-text bg-transparent border-right-0">
+                                        <i class="fas fa-circle tagcol-05-s"></i>
                                       </div>
                                     </div>
+                                    <input type="text" class="form-control border-left-0 bg-transparent pl-0" placeholder="请输入标签名" value="标签5">
                                   </div>
                                 </li>
                                 <li class="mb-1">
                                   <div class="input-group bg-white shadow-inset-2">
                                     <div class="input-group-prepend">
-                                      <span class="input-group-text bg-transparent border-right-0">
-                																<i class="fas fa-circle tagcol-06-s"></i>
-                															</span>
-                                    </div>
-                                    <input type="text" class="form-control border-left-0 border-right-0 bg-transparent pl-0" placeholder="请输入标签名" value="标签6">
-                                    <div class="input-group-append">
-                                      <div class="input-group-text  border-left-0 bg-transparent">
-                                        <div class="custom-control custom-checkbox">
-                                          <input type="checkbox" class="custom-control-input" id="tabcheck6">
-                                          <label class="custom-control-label" for="tabcheck6"></label>
-                                        </div>
+                                      <div class="input-group-text bg-transparent border-right-0">
+                                        <i class="fas fa-circle tagcol-06-s"></i>
                                       </div>
                                     </div>
+                                    <input type="text" class="form-control border-left-0 bg-transparent pl-0" placeholder="请输入标签名" value="标签6">
                                   </div>
                                 </li>
                                 <li class="mb-1">
                                   <div class="input-group bg-white shadow-inset-2">
                                     <div class="input-group-prepend">
-                                      <span class="input-group-text bg-transparent border-right-0">
-                																<i class="fas fa-circle tagcol-07-s"></i>
-                															</span>
-                                    </div>
-                                    <input type="text" class="form-control border-left-0 border-right-0 bg-transparent pl-0" placeholder="请输入标签名" value="标签7">
-                                    <div class="input-group-append">
-                                      <div class="input-group-text  border-left-0 bg-transparent">
-                                        <div class="custom-control custom-checkbox">
-                                          <input type="checkbox" class="custom-control-input" id="tabcheck7">
-                                          <label class="custom-control-label" for="tabcheck7"></label>
-                                        </div>
+                                      <div class="input-group-text bg-transparent border-right-0">
+                                        <i class="fas fa-circle tagcol-07-s"></i>
                                       </div>
                                     </div>
+                                    <input type="text" class="form-control border-left-0 bg-transparent pl-0" placeholder="请输入标签名" value="标签7">
                                   </div>
                                 </li>
+                                <li class="mb-1">
+                                  <button type="button" class="btn btn-sm btn-primary">确定</button>
+                                  <button type="button" class="btn btn-sm btn-secondary">取消</button>
+                                </li>
                               </ul>
                             </div><!--添加标签 end-->
                           </td>
@@ -525,12 +473,7 @@
                               <ul class="list-unstyled px-3 pt-2 mb-0">
                                 <li class="mb-1">
                                   <div class="input-group bg-white shadow-inset-2">
-                                    <div class="input-group-prepend">
-                                      <div class="input-group-text bg-transparent border-right-0">
-                                        <i class="fas fa-circle tagcol-01-s"></i>
-                                      </div>
-                                    </div>
-                                    <input type="text" class="form-control border-left-0 border-right-0 bg-transparent pl-0" placeholder="请输入标签名" value="标签1">
+                                    <span class="form-control text-truncate text-truncate-lg"><i class="fas fa-circle tagcol-01-s mr-2"></i>这是一条标签名字很长很长的标签</span>
                                     <div class="input-group-append">
                                       <div class="input-group-text  border-left-0 bg-transparent">
                                         <div class="custom-control custom-checkbox">
@@ -543,12 +486,7 @@
                                 </li>
                                 <li class="mb-1">
                                   <div class="input-group bg-white shadow-inset-2">
-                                    <div class="input-group-prepend">
-                                      <span class="input-group-text bg-transparent border-right-0">
-                																<i class="fas fa-circle tagcol-02-s"></i>
-                															</span>
-                                    </div>
-                                    <input type="text" class="form-control border-left-0 border-right-0 bg-transparent pl-0" placeholder="请输入标签名" value="标签2">
+                                    <span class="form-control text-truncate text-truncate-lg"><i class="fas fa-circle tagcol-02-s mr-2"></i>标签2</span>
                                     <div class="input-group-append">
                                       <div class="input-group-text  border-left-0 bg-transparent">
                                         <div class="custom-control custom-checkbox">
@@ -561,12 +499,7 @@
                                 </li>
                                 <li class="mb-1">
                                   <div class="input-group bg-white shadow-inset-2">
-                                    <div class="input-group-prepend">
-                                      <span class="input-group-text bg-transparent border-right-0">
-                																<i class="fas fa-circle tagcol-03-s"></i>
-                															</span>
-                                    </div>
-                                    <input type="text" class="form-control border-left-0 border-right-0 bg-transparent pl-0" placeholder="请输入标签名" value="标签3">
+                                    <span class="form-control text-truncate text-truncate-lg"><i class="fas fa-circle tagcol-03-s mr-2"></i>标签3</span>
                                     <div class="input-group-append">
                                       <div class="input-group-text  border-left-0 bg-transparent">
                                         <div class="custom-control custom-checkbox">
@@ -579,12 +512,7 @@
                                 </li>
                                 <li class="mb-1">
                                   <div class="input-group bg-white shadow-inset-2">
-                                    <div class="input-group-prepend">
-                                      <span class="input-group-text bg-transparent border-right-0">
-                																<i class="fas fa-circle tagcol-04-s"></i>
-                															</span>
-                                    </div>
-                                    <input type="text" class="form-control border-left-0 border-right-0 bg-transparent pl-0" placeholder="请输入标签名" value="标签4">
+                                    <span class="form-control text-truncate text-truncate-lg"><i class="fas fa-circle tagcol-04-s mr-2"></i>标签4</span>
                                     <div class="input-group-append">
                                       <div class="input-group-text  border-left-0 bg-transparent">
                                         <div class="custom-control custom-checkbox">
@@ -597,12 +525,7 @@
                                 </li>
                                 <li class="mb-1">
                                   <div class="input-group bg-white shadow-inset-2">
-                                    <div class="input-group-prepend">
-                                      <span class="input-group-text bg-transparent border-right-0">
-                																<i class="fas fa-circle tagcol-05-s"></i>
-                															</span>
-                                    </div>
-                                    <input type="text" class="form-control border-left-0 border-right-0 bg-transparent pl-0" placeholder="请输入标签名" value="标签5">
+                                    <span class="form-control text-truncate text-truncate-lg"><i class="fas fa-circle tagcol-05-s mr-2"></i>标签5</span>
                                     <div class="input-group-append">
                                       <div class="input-group-text  border-left-0 bg-transparent">
                                         <div class="custom-control custom-checkbox">
@@ -615,12 +538,7 @@
                                 </li>
                                 <li class="mb-1">
                                   <div class="input-group bg-white shadow-inset-2">
-                                    <div class="input-group-prepend">
-                                      <span class="input-group-text bg-transparent border-right-0">
-                																<i class="fas fa-circle tagcol-06-s"></i>
-                															</span>
-                                    </div>
-                                    <input type="text" class="form-control border-left-0 border-right-0 bg-transparent pl-0" placeholder="请输入标签名" value="标签6">
+                                    <span class="form-control text-truncate text-truncate-lg"><i class="fas fa-circle tagcol-06-s mr-2"></i>标签6</span>
                                     <div class="input-group-append">
                                       <div class="input-group-text  border-left-0 bg-transparent">
                                         <div class="custom-control custom-checkbox">
@@ -633,12 +551,7 @@
                                 </li>
                                 <li class="mb-1">
                                   <div class="input-group bg-white shadow-inset-2">
-                                    <div class="input-group-prepend">
-                                      <span class="input-group-text bg-transparent border-right-0">
-                																<i class="fas fa-circle tagcol-07-s"></i>
-                															</span>
-                                    </div>
-                                    <input type="text" class="form-control border-left-0 border-right-0 bg-transparent pl-0" placeholder="请输入标签名" value="标签7">
+                                    <span class="form-control text-truncate text-truncate-lg"><i class="fas fa-circle tagcol-07-s mr-2"></i>标签7</span>
                                     <div class="input-group-append">
                                       <div class="input-group-text  border-left-0 bg-transparent">
                                         <div class="custom-control custom-checkbox">
@@ -649,6 +562,9 @@
                                     </div>
                                   </div>
                                 </li>
+                                <li class="mb-1">
+                                  <a href="#">编辑标签</a>
+                                </li>
                               </ul>
                             </div><!--添加标签 end-->
                           </td>
@@ -944,122 +860,103 @@
                       <div class="cldform-control">
                         <div class="cldform-contarl-box cldform-contarl-textareabox cldform-contarl-blank"><span class="badge tagcol-01">标签</span><span class="badge tagcol-02">特别关注</span><!--添加标签--><a title="添加标签" class="badge badge-secondary tagcol-08" href="" data-toggle="dropdown"><i class="far fa-plus"></i></a>
                           <div class="dropdown-menu">
-                            <ul class="list-unstyled px-3 pt-2 mb-0">
-                              <li class="mb-1">
-                                <div class="input-group bg-white shadow-inset-2">
-                                  <div class="input-group-prepend">
-                                    <div class="input-group-text bg-transparent border-right-0"><i class="fas fa-circle tagcol-01-s"></i></div>
-                                  </div><input type="text" class="form-control border-left-0 border-right-0 bg-transparent pl-0" placeholder="请输入标签名" value="标签1">
-                                  <div class="input-group-append">
-                                    <div class="input-group-text  border-left-0 bg-transparent">
-                                      <div class="custom-control custom-checkbox"><input type="checkbox" class="custom-control-input" id="tabcheck1"><label class="custom-control-label" for="tabcheck1"></label></div>
+                              <ul class="list-unstyled px-3 pt-2 mb-0">
+                                <li class="mb-1">
+                                  <div class="input-group bg-white shadow-inset-2">
+                                    <span class="form-control text-truncate text-truncate-lg"><i class="fas fa-circle tagcol-01-s mr-2"></i>这是一条标签名字很长很长的标签</span>
+                                    <div class="input-group-append">
+                                      <div class="input-group-text  border-left-0 bg-transparent">
+                                        <div class="custom-control custom-checkbox">
+                                          <input type="checkbox" class="custom-control-input" id="tabcheck1">
+                                          <label class="custom-control-label" for="tabcheck1"></label>
+                                        </div>
+                                      </div>
                                     </div>
                                   </div>
-                                </div>
-                              </li>
-                              <li class="mb-1">
-                                <div class="input-group bg-white shadow-inset-2">
-                                  <div class="input-group-prepend"><span class="input-group-text bg-transparent border-right-0"><i class="fas fa-circle tagcol-02-s"></i></span></div><input type="text" class="form-control border-left-0 border-right-0 bg-transparent pl-0" placeholder="请输入标签名"
-                                    value="标签2">
-                                  <div class="input-group-append">
-                                    <div class="input-group-text  border-left-0 bg-transparent">
-                                      <div class="custom-control custom-checkbox"><input type="checkbox" class="custom-control-input" id="tabcheck2"><label class="custom-control-label" for="tabcheck2"></label></div>
+                                </li>
+                                <li class="mb-1">
+                                  <div class="input-group bg-white shadow-inset-2">
+                                    <span class="form-control text-truncate text-truncate-lg"><i class="fas fa-circle tagcol-02-s mr-2"></i>标签2</span>
+                                    <div class="input-group-append">
+                                      <div class="input-group-text  border-left-0 bg-transparent">
+                                        <div class="custom-control custom-checkbox">
+                                          <input type="checkbox" class="custom-control-input" id="tabcheck2">
+                                          <label class="custom-control-label" for="tabcheck2"></label>
+                                        </div>
+                                      </div>
                                     </div>
                                   </div>
-                                </div>
-                              </li>
-                              <li class="mb-1">
-                                <div class="input-group bg-white shadow-inset-2">
-                                  <div class="input-group-prepend">
-                                    <span class="input-group-text bg-transparent border-right-0">
-                            												<i class="fas fa-circle tagcol-03-s"></i>
-                            											</span>
-                                  </div>
-                                  <input type="text" class="form-control border-left-0 border-right-0 bg-transparent pl-0" placeholder="请输入标签名" value="标签3">
-                                  <div class="input-group-append">
-                                    <div class="input-group-text  border-left-0 bg-transparent">
-                                      <div class="custom-control custom-checkbox">
-                                        <input type="checkbox" class="custom-control-input" id="tabcheck3">
-                                        <label class="custom-control-label" for="tabcheck3"></label>
+                                </li>
+                                <li class="mb-1">
+                                  <div class="input-group bg-white shadow-inset-2">
+                                    <span class="form-control text-truncate text-truncate-lg"><i class="fas fa-circle tagcol-03-s mr-2"></i>标签3</span>
+                                    <div class="input-group-append">
+                                      <div class="input-group-text  border-left-0 bg-transparent">
+                                        <div class="custom-control custom-checkbox">
+                                          <input type="checkbox" class="custom-control-input" id="tabcheck3">
+                                          <label class="custom-control-label" for="tabcheck3"></label>
+                                        </div>
                                       </div>
                                     </div>
                                   </div>
-                                </div>
-                              </li>
-                              <li class="mb-1">
-                                <div class="input-group bg-white shadow-inset-2">
-                                  <div class="input-group-prepend">
-                                    <span class="input-group-text bg-transparent border-right-0">
-                            												<i class="fas fa-circle tagcol-04-s"></i>
-                            											</span>
-                                  </div>
-                                  <input type="text" class="form-control border-left-0 border-right-0 bg-transparent pl-0" placeholder="请输入标签名" value="标签4">
-                                  <div class="input-group-append">
-                                    <div class="input-group-text  border-left-0 bg-transparent">
-                                      <div class="custom-control custom-checkbox">
-                                        <input type="checkbox" class="custom-control-input" id="tabcheck4">
-                                        <label class="custom-control-label" for="tabcheck4"></label>
+                                </li>
+                                <li class="mb-1">
+                                  <div class="input-group bg-white shadow-inset-2">
+                                    <span class="form-control text-truncate text-truncate-lg"><i class="fas fa-circle tagcol-04-s mr-2"></i>标签4</span>
+                                    <div class="input-group-append">
+                                      <div class="input-group-text  border-left-0 bg-transparent">
+                                        <div class="custom-control custom-checkbox">
+                                          <input type="checkbox" class="custom-control-input" id="tabcheck4">
+                                          <label class="custom-control-label" for="tabcheck4"></label>
+                                        </div>
                                       </div>
                                     </div>
                                   </div>
-                                </div>
-                              </li>
-                              <li class="mb-1">
-                                <div class="input-group bg-white shadow-inset-2">
-                                  <div class="input-group-prepend">
-                                    <span class="input-group-text bg-transparent border-right-0">
-                            												<i class="fas fa-circle tagcol-05-s"></i>
-                            											</span>
-                                  </div>
-                                  <input type="text" class="form-control border-left-0 border-right-0 bg-transparent pl-0" placeholder="请输入标签名" value="标签5">
-                                  <div class="input-group-append">
-                                    <div class="input-group-text  border-left-0 bg-transparent">
-                                      <div class="custom-control custom-checkbox">
-                                        <input type="checkbox" class="custom-control-input" id="tabcheck5">
-                                        <label class="custom-control-label" for="tabcheck5"></label>
+                                </li>
+                                <li class="mb-1">
+                                  <div class="input-group bg-white shadow-inset-2">
+                                    <span class="form-control text-truncate text-truncate-lg"><i class="fas fa-circle tagcol-05-s mr-2"></i>标签5</span>
+                                    <div class="input-group-append">
+                                      <div class="input-group-text  border-left-0 bg-transparent">
+                                        <div class="custom-control custom-checkbox">
+                                          <input type="checkbox" class="custom-control-input" id="tabcheck5">
+                                          <label class="custom-control-label" for="tabcheck5"></label>
+                                        </div>
                                       </div>
                                     </div>
                                   </div>
-                                </div>
-                              </li>
-                              <li class="mb-1">
-                                <div class="input-group bg-white shadow-inset-2">
-                                  <div class="input-group-prepend">
-                                    <span class="input-group-text bg-transparent border-right-0">
-                            												<i class="fas fa-circle tagcol-06-s"></i>
-                            											</span>
-                                  </div>
-                                  <input type="text" class="form-control border-left-0 border-right-0 bg-transparent pl-0" placeholder="请输入标签名" value="标签6">
-                                  <div class="input-group-append">
-                                    <div class="input-group-text  border-left-0 bg-transparent">
-                                      <div class="custom-control custom-checkbox">
-                                        <input type="checkbox" class="custom-control-input" id="tabcheck6">
-                                        <label class="custom-control-label" for="tabcheck6"></label>
+                                </li>
+                                <li class="mb-1">
+                                  <div class="input-group bg-white shadow-inset-2">
+                                    <span class="form-control text-truncate text-truncate-lg"><i class="fas fa-circle tagcol-06-s mr-2"></i>标签6</span>
+                                    <div class="input-group-append">
+                                      <div class="input-group-text  border-left-0 bg-transparent">
+                                        <div class="custom-control custom-checkbox">
+                                          <input type="checkbox" class="custom-control-input" id="tabcheck6">
+                                          <label class="custom-control-label" for="tabcheck6"></label>
+                                        </div>
                                       </div>
                                     </div>
                                   </div>
-                                </div>
-                              </li>
-                              <li class="mb-1">
-                                <div class="input-group bg-white shadow-inset-2">
-                                  <div class="input-group-prepend">
-                                    <span class="input-group-text bg-transparent border-right-0">
-                            												<i class="fas fa-circle tagcol-07-s"></i>
-                            											</span>
-                                  </div>
-                                  <input type="text" class="form-control border-left-0 border-right-0 bg-transparent pl-0" placeholder="请输入标签名" value="标签7">
-                                  <div class="input-group-append">
-                                    <div class="input-group-text  border-left-0 bg-transparent">
-                                      <div class="custom-control custom-checkbox">
-                                        <input type="checkbox" class="custom-control-input" id="tabcheck7">
-                                        <label class="custom-control-label" for="tabcheck7"></label>
+                                </li>
+                                <li class="mb-1">
+                                  <div class="input-group bg-white shadow-inset-2">
+                                    <span class="form-control text-truncate text-truncate-lg"><i class="fas fa-circle tagcol-07-s mr-2"></i>标签7</span>
+                                    <div class="input-group-append">
+                                      <div class="input-group-text  border-left-0 bg-transparent">
+                                        <div class="custom-control custom-checkbox">
+                                          <input type="checkbox" class="custom-control-input" id="tabcheck7">
+                                          <label class="custom-control-label" for="tabcheck7"></label>
+                                        </div>
                                       </div>
                                     </div>
                                   </div>
-                                </div>
-                              </li>
-                            </ul>
-                          </div><!--添加标签 end-->
+                                </li>
+                                <li class="mb-1">
+                                  <a href="#">编辑标签</a>
+                                </li>
+                              </ul>
+                            </div><!--添加标签 end-->
                         </div>
                       </div>
                     </div>
@@ -2615,6 +2512,7 @@
           <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true"><i class="fal fa-times"></i></span></button>
         </div>
         <div class="modal-body">
+          <!--条件1-->
           <div class="form-group">
               <label class="form-label d-flex" for="dropdown-on-left">姓名<a href="#" class="ml-auto" title="移除条件"><i class="fal fa-times"></i></a></label>
               <div class="input-group">
@@ -2640,6 +2538,7 @@
                   </div>
               </div>
           </div>
+          <!--条件2-->
           <div class="form-group">
               <label class="form-label d-flex" for="dropdown-on-left">姓名<a href="#" class="ml-auto" title="移除条件"><i class="fal fa-times"></i></a></label>
               <div class="input-group">
@@ -2662,7 +2561,8 @@
                   </div>
               </div>
           </div>
-          <div class="form-group">
+          <!--条件3-->
+<!--           <div class="form-group">
               <label class="form-label d-flex" for="dropdown-on-left">姓名<a href="#" class="ml-auto" title="移除条件"><i class="fal fa-times"></i></a></label>
               <div class="input-group">
                   <div class="input-group-prepend">
@@ -2680,6 +2580,124 @@
                   </div>
                   <input type="text" class="form-control" aria-label="Text input with dropdown button" id="dropdown-on-left">
               </div>
+          </div> -->
+          <!--条件 个人标签-->
+          <div class="form-group">
+              <label class="form-label d-flex" for="dropdown-on-left">个人标签<a href="#" class="ml-auto" title="移除条件"><i class="fal fa-times"></i></a></label>
+              <div class="input-group">
+                  <div class="input-group-prepend">
+                      <button class="btn btn-outline-default dropdown-toggle" type="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">是</button>
+                      <div class="dropdown-menu" x-placement="bottom-start">
+                          <a class="dropdown-item" href="#">是</a>
+                          <a class="dropdown-item" href="#">不是</a>
+                          <a class="dropdown-item" href="#">空</a>
+                          <a class="dropdown-item" href="#">不为空</a>
+                      </div>
+                  </div>
+                  <!--添加标签-->
+                  <div class="form-control">
+                    <!--已标签-->
+                    <i class="fas fa-circle tagcol-01-s mr-1"></i>
+                    <i class="fas fa-circle tagcol-03-s mr-1"></i>
+                    <!--添加标签按钮-->
+                    <a href="javascript:void" class="text-primary" title="添加标签"  data-toggle="dropdown"><i class="far fa-plus"></i></a>
+                    <div class="dropdown-menu">
+                      <ul class="list-unstyled px-3 pt-2 mb-0">
+                        <li class="mb-1">
+                          <div class="input-group bg-white shadow-inset-2">
+                            <span class="form-control text-truncate text-truncate-lg"><i class="fas fa-circle tagcol-01-s mr-2"></i>这是一条标签名字很长很长的标签</span>
+                            <div class="input-group-append">
+                              <div class="input-group-text  border-left-0 bg-transparent">
+                                <div class="custom-control custom-checkbox">
+                                  <input type="checkbox" class="custom-control-input" id="tabcheck1">
+                                  <label class="custom-control-label" for="tabcheck1"></label>
+                                </div>
+                              </div>
+                            </div>
+                          </div>
+                        </li>
+                        <li class="mb-1">
+                          <div class="input-group bg-white shadow-inset-2">
+                            <span class="form-control text-truncate text-truncate-lg"><i class="fas fa-circle tagcol-02-s mr-2"></i>标签2</span>
+                            <div class="input-group-append">
+                              <div class="input-group-text  border-left-0 bg-transparent">
+                                <div class="custom-control custom-checkbox">
+                                  <input type="checkbox" class="custom-control-input" id="tabcheck2">
+                                  <label class="custom-control-label" for="tabcheck2"></label>
+                                </div>
+                              </div>
+                            </div>
+                          </div>
+                        </li>
+                        <li class="mb-1">
+                          <div class="input-group bg-white shadow-inset-2">
+                            <span class="form-control text-truncate text-truncate-lg"><i class="fas fa-circle tagcol-03-s mr-2"></i>标签3</span>
+                            <div class="input-group-append">
+                              <div class="input-group-text  border-left-0 bg-transparent">
+                                <div class="custom-control custom-checkbox">
+                                  <input type="checkbox" class="custom-control-input" id="tabcheck3">
+                                  <label class="custom-control-label" for="tabcheck3"></label>
+                                </div>
+                              </div>
+                            </div>
+                          </div>
+                        </li>
+                        <li class="mb-1">
+                          <div class="input-group bg-white shadow-inset-2">
+                            <span class="form-control text-truncate text-truncate-lg"><i class="fas fa-circle tagcol-04-s mr-2"></i>标签4</span>
+                            <div class="input-group-append">
+                              <div class="input-group-text  border-left-0 bg-transparent">
+                                <div class="custom-control custom-checkbox">
+                                  <input type="checkbox" class="custom-control-input" id="tabcheck4">
+                                  <label class="custom-control-label" for="tabcheck4"></label>
+                                </div>
+                              </div>
+                            </div>
+                          </div>
+                        </li>
+                        <li class="mb-1">
+                          <div class="input-group bg-white shadow-inset-2">
+                            <span class="form-control text-truncate text-truncate-lg"><i class="fas fa-circle tagcol-05-s mr-2"></i>标签5</span>
+                            <div class="input-group-append">
+                              <div class="input-group-text  border-left-0 bg-transparent">
+                                <div class="custom-control custom-checkbox">
+                                  <input type="checkbox" class="custom-control-input" id="tabcheck5">
+                                  <label class="custom-control-label" for="tabcheck5"></label>
+                                </div>
+                              </div>
+                            </div>
+                          </div>
+                        </li>
+                        <li class="mb-1">
+                          <div class="input-group bg-white shadow-inset-2">
+                            <span class="form-control text-truncate text-truncate-lg"><i class="fas fa-circle tagcol-06-s mr-2"></i>标签6</span>
+                            <div class="input-group-append">
+                              <div class="input-group-text  border-left-0 bg-transparent">
+                                <div class="custom-control custom-checkbox">
+                                  <input type="checkbox" class="custom-control-input" id="tabcheck6">
+                                  <label class="custom-control-label" for="tabcheck6"></label>
+                                </div>
+                              </div>
+                            </div>
+                          </div>
+                        </li>
+                        <li class="mb-1">
+                          <div class="input-group bg-white shadow-inset-2">
+                            <span class="form-control text-truncate text-truncate-lg"><i class="fas fa-circle tagcol-07-s mr-2"></i>标签7</span>
+                            <div class="input-group-append">
+                              <div class="input-group-text  border-left-0 bg-transparent">
+                                <div class="custom-control custom-checkbox">
+                                  <input type="checkbox" class="custom-control-input" id="tabcheck7">
+                                  <label class="custom-control-label" for="tabcheck7"></label>
+                                </div>
+                              </div>
+                            </div>
+                          </div>
+                        </li>
+                      </ul>
+                    </div><!--添加标签 end-->
+                  </div>
+              </div>
           </div>
           <!--添加条件-->
           <div class="form-group">