From 44a2fa1d165ba52cd84eb790c2b81af5c596dcf9 Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Wed, 11 May 2022 11:09:23 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A6=85=E9=81=93=E5=B7=B2?= =?UTF-8?q?=E7=9F=A5bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/components/OcrAddForm/index.vue | 1 + .../src/components/SplitBatForm/index.vue | 2 ++ jero-web/src/components/SplitSearch/index.vue | 2 ++ jero-web/src/components/addForm/index.vue | 1 + .../src/components/currencySearch/index.vue | 2 ++ .../src/components/dict/JDictSelectTag.vue | 2 +- .../src/components/dict/JMultiSelectTag.vue | 13 +++---- .../src/components/libraryAddForm/index.vue | 16 +++++++-- jero-web/src/components/search/index.vue | 2 ++ .../src/components/searchaloneorc/index.vue | 2 ++ .../src/components/searchalonesplit/index.vue | 2 ++ .../splitting/modules/SplitAddForm.vue | 2 +- .../components/DocumentLibrary.vue | 1 + .../virtualList/components/batSetting.vue | 1 + .../virtualList/components/editModel.vue | 14 +++++++- .../parameterlist/components/addModel.vue | 1 + .../projectManagement/components/addModel.vue | 1 + .../components/listEditModel.vue | 36 +++++++++++++++---- jero-web/src/views/system/DepartList.vue | 1 + .../views/system/modules/PermissionModal.vue | 1 + 20 files changed, 83 insertions(+), 20 deletions(-) diff --git a/jero-web/src/components/OcrAddForm/index.vue b/jero-web/src/components/OcrAddForm/index.vue index d2645d8b2..9aa8fecd9 100644 --- a/jero-web/src/components/OcrAddForm/index.vue +++ b/jero-web/src/components/OcrAddForm/index.vue @@ -163,6 +163,7 @@ v-model="formInline[item.db_field_name]" style="width: 100%" :maxTagCount="1" + :getPopupContainer="triggerNode=> triggerNode.parentNode" :tree-data="treeData" tree-checkable placeholder="Please select" diff --git a/jero-web/src/components/SplitBatForm/index.vue b/jero-web/src/components/SplitBatForm/index.vue index 4e10d5a40..b2db30e99 100644 --- a/jero-web/src/components/SplitBatForm/index.vue +++ b/jero-web/src/components/SplitBatForm/index.vue @@ -155,6 +155,7 @@ v-model="formInline[item.db_field_name]" style="width: 100%" :maxTagCount="1" + :getPopupContainer="triggerNode=> triggerNode.parentNode" :tree-data="treeData" tree-checkable placeholder="Please select" @@ -222,6 +223,7 @@ :maxTagCount="1" style="width: 100%" :tree-data="item.tree" + :getPopupContainer="triggerNode=> triggerNode.parentNode" tree-checkable :placeholder="$t('PleaseSelect')+item.db_field_txt" /> diff --git a/jero-web/src/components/SplitSearch/index.vue b/jero-web/src/components/SplitSearch/index.vue index 7e53ca453..311425fce 100644 --- a/jero-web/src/components/SplitSearch/index.vue +++ b/jero-web/src/components/SplitSearch/index.vue @@ -12,6 +12,7 @@ v-model="queryParam[item.db_field_name]" :maxTagCount="1" :tree-data="item.tree" + :getPopupContainer="triggerNode=> triggerNode.parentNode" tree-checkable :placeholder="$t('PleaseSelect')+item.db_field_txt" /> @@ -76,6 +77,7 @@ class="box-input" v-model="queryParam[item.db_field_name]" :maxTagCount="1" + :getPopupContainer="triggerNode=> triggerNode.parentNode" :tree-data="item.tree" tree-checkable :placeholder="$t('PleaseSelect')+item.db_field_txt" diff --git a/jero-web/src/components/addForm/index.vue b/jero-web/src/components/addForm/index.vue index 13a4c1379..24dcac822 100644 --- a/jero-web/src/components/addForm/index.vue +++ b/jero-web/src/components/addForm/index.vue @@ -185,6 +185,7 @@ v-model="formInline[item.db_field_name]" :maxTagCount="1" style="width: 100%" + :getPopupContainer="triggerNode=> triggerNode.parentNode" :tree-data="item.tree" tree-checkable :placeholder="$t('PleaseSelect')+item.db_field_txt" diff --git a/jero-web/src/components/currencySearch/index.vue b/jero-web/src/components/currencySearch/index.vue index 9b6051e92..9884f8648 100644 --- a/jero-web/src/components/currencySearch/index.vue +++ b/jero-web/src/components/currencySearch/index.vue @@ -11,6 +11,7 @@ class="box-input" v-model="queryParam[item.db_field_name]" :maxTagCount="1" + :getPopupContainer="triggerNode=> triggerNode.parentNode" :tree-data="item.tree" tree-checkable :placeholder="$t('PleaseSelect')+item.db_field_txt" @@ -74,6 +75,7 @@ class="box-input" v-model="queryParam[item.db_field_name]" :maxTagCount="1" + :getPopupContainer="triggerNode=> triggerNode.parentNode" :tree-data="item.tree" tree-checkable :placeholder="$t('PleaseSelect')+item.db_field_txt" diff --git a/jero-web/src/components/dict/JDictSelectTag.vue b/jero-web/src/components/dict/JDictSelectTag.vue index 415c2d49f..14054444d 100644 --- a/jero-web/src/components/dict/JDictSelectTag.vue +++ b/jero-web/src/components/dict/JDictSelectTag.vue @@ -7,7 +7,7 @@ {{ item.text }} - + diff --git a/jero-web/src/components/dict/JMultiSelectTag.vue b/jero-web/src/components/dict/JMultiSelectTag.vue index e2cd32698..c02fcf545 100644 --- a/jero-web/src/components/dict/JMultiSelectTag.vue +++ b/jero-web/src/components/dict/JMultiSelectTag.vue @@ -10,11 +10,8 @@ @change="onChange" :disabled="disabled" mode="multiple" - :maxTagCount="1" - :maxTagTextLength="2" :placeholder="placeholder" :getPopupContainer="getParentContainer" - :maxTagPlaceholder="content" optionFilterProp="children" :filterOption="filterOption"> diff --git a/jero-web/src/components/libraryAddForm/index.vue b/jero-web/src/components/libraryAddForm/index.vue index 5de0dc6dd..31dee6e42 100644 --- a/jero-web/src/components/libraryAddForm/index.vue +++ b/jero-web/src/components/libraryAddForm/index.vue @@ -99,6 +99,7 @@ @@ -130,7 +131,7 @@ * {{item.db_field_txt}} - + {{$t('remarks')}} - + {{$t('remarks')}} - + @@ -335,6 +342,8 @@ diff --git a/jero-web/src/views/system/modules/PermissionModal.vue b/jero-web/src/views/system/modules/PermissionModal.vue index d31fca06b..215cf0721 100644 --- a/jero-web/src/views/system/modules/PermissionModal.vue +++ b/jero-web/src/views/system/modules/PermissionModal.vue @@ -48,6 +48,7 @@ {{ validateStatus=='error'? $t('selectSuperiorMenu'):'  ' }}