소스 검색

merge feature/1002532 into main

merge "feature/1002532" into "main"
1002532

Created-by: lizi
Author-id: 7030146
MR-id: 7282
Commit-by: lizi
Merged-by: Kevin
Description: merge "feature/1002532" into "main"
1002532

See merge request: zhcqdn00001/front!47
Kevin 2 년 전
부모
커밋
cb3bc10e85

+ 1 - 1
src/views/report/components/report-list/QueryBox.vue

@@ -58,7 +58,7 @@ function onSearch() {
       <a-input-search
         :value="keyword"
         placeholder="请输入关键词进行查询"
-        enter-button="查&nbsp;&nbsp;询"
+        enter-button
         size="large"
         @change="onKeywordChange"
         @search="onSearch"

+ 1 - 1
src/views/reportTemplate/components/ReportTemplateQueryBox.vue

@@ -56,7 +56,7 @@ function onSearch() {
       <a-input-search
         :value="keyword"
         placeholder="请输入关键词进行查询"
-        enter-button="查&nbsp;&nbsp;询"
+        enter-button
         size="large"
         @change="onKeywordChange"
         @search="onSearch"

+ 8 - 1
src/views/search/AdvancedSearchView.vue

@@ -54,7 +54,14 @@ function onSearch() {
         </div>
         <a-space class="button-box">
           <a-button>清除</a-button>
-          <a-button type="primary" @click="onSearch">搜索</a-button>
+          <a-button type="primary" @click="onSearch"> 
+            <svg focusable="false" class="" data-icon="search" width="1em" height="1em" fill="currentColor" aria-hidden="true" viewBox="64 64 896 896">
+              <path d="M909.6 854.5L649.9 594.8C690.2 542.7 712 479 712 412c0-80.2-31.3-155.4-87.9-212.1-56.6-56.7-132-87.9-212.1-87.9s-155.5 31.3-212.1 87.9C143.2 
+              256.5 112 331.8 112 412c0 80.1 31.3 155.5 87.9 212.1C256.5 680.8 331.8 712 412 712c67 0 130.6-21.8 182.7-62l259.7 259.6a8.2 8.2 0 0011.6 0l43.6-43.5a8.2 
+              8.2 0 000-11.6zM570.4 570.4C528 612.7 471.8 636 412 636s-116-23.3-158.4-65.6C211.3 528 188 471.8 188 412s23.3-116.1 65.6-158.4C296 211.3 352.2 188 412 188s116.1 
+              23.2 158.4 65.6S636 352.2 636 412s-23.3 116.1-65.6 158.4z"></path>
+            </svg>
+          </a-button>
         </a-space>
       </div>
     </div>

+ 1 - 1
src/views/search/SearchView.vue

@@ -117,7 +117,7 @@ function search(kwd: string){
         <a-input-search
           v-model:value="keyword"
           :placeholder="placeholder"
-          enter-button="搜&nbsp;&nbsp;索"
+          enter-button
           size="large"
           @search="onSearch"
         />

+ 1 - 1
src/views/search/components/AdvancedSearchBox.vue

@@ -24,7 +24,7 @@ function onSearch(query: string) {
   <a-input-search
     :value="query"
     placeholder="请输入查询表达式"
-    enter-button="搜&nbsp;&nbsp;索"
+    enter-button
     size="large"
     @search="onSearch"
     @change="onQueryChange"

+ 1 - 1
src/views/search/components/SearchBox.vue

@@ -69,7 +69,7 @@ function onFieldChange(value: string) {
       <a-input-search
         :value="keyword"
         :placeholder="placeholder"
-        enter-button="搜&nbsp;&nbsp;索"
+        enter-button
         size="large"
         @change="onKeywordChange"
         @search="onSearch"