修改禅道已知bug

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"

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"
                 />

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"

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"

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"

jero-web/src/components/dict/JDictSelectTag.vue

@@ -7,7 +7,7 @@
     <a-radio-button v-for="(item, key) in dictOptions" :key="key" :value="item.value">{{ item.text }}</a-radio-button>
   </a-radio-group>
 
-  <a-select v-else-if="tagType=='select'" :getPopupContainer = "getPopupContainer" :placeholder="placeholder" :disabled="disabled" :value="getValueSting" @change="handleInput">
+  <a-select v-else-if="tagType=='select'" allowClear :getPopupContainer = "getPopupContainer" :placeholder="placeholder" :disabled="disabled" :value="getValueSting" @change="handleInput">
 <!--    <a-select-option :value="null">{{$t('pleaseSelect')}}</a-select-option>-->
     <a-select-option v-for="(item, key) in dictOptionsValue" :key="key" :value="item.value">
       <span class="itemOption" :title=" item.text || item.label ">

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">
     <a-select-option
@@ -187,13 +184,11 @@
   /*    max-width: 50% !important;*/
   /*}*/
   .ant-select-selection--multiple {
-    overflow: hidden;
+    overflow: auto;
   }
 
-  .ant-select-selection__rendered ul {
+  .ant-select-selection--multiple::-webkit-scrollbar {
-    word-break: break-all;
+    display: none; /* Chrome Safari */
-    display: -webkit-box;
-    -webkit-box-orient: vertical;
-    float: left;
   }
+
 </style>

jero-web/src/components/libraryAddForm/index.vue

@@ -99,6 +99,7 @@
                   <a-form-model-item class="itemModel" :prop="item.db_field_name">
                     <a-range-picker class="box-input" v-model="formInline[item.db_field_name]"
                                     :disabled="disabled"
+                                    :getCalendarContainer="(trigger) => trigger.parentNode"
                                     @change="onChange(item.db_field_name)"></a-range-picker>
                   </a-form-model-item>
                 </div>
@@ -130,7 +131,7 @@
                     <span class="Required" v-if="item.field_must_input == 1">*</span>
                     <span class="title-text-text" :title="item.db_field_txt">{{item.db_field_txt}}</span>
                   </div>
-                  <a-form-model-item class="itemModel" :prop="item.db_field_name">
+                  <a-form-model-item class="itemModel-text" :prop="item.db_field_name">
                     <a-textarea
                       :placeholder="$t('PleaseEnter')+item.db_field_txt"
                       :disabled="disabled"
@@ -196,6 +197,7 @@
                     <a-tree-select
                       v-model="formInline[item.db_field_name]"
                       :maxTagCount="1"
+                      :getPopupContainer="triggerNode=> triggerNode.parentNode"
                       style="width: 100%"
                       :tree-data="item.tree"
                       tree-checkable
@@ -424,7 +426,7 @@
               })
             }
           }
-          if (res.field_show_type === '1'  ||
+          if (res.field_show_type === '1' ||
             res.field_show_type === '8' || res.field_show_type === '9' || res.field_show_type === '10'
             || res.field_show_type === '11') {
             rule.push({
@@ -501,6 +503,9 @@
     width: 100%;
   }
 
+  .itemModel-text .ant-form-item-control-wrapper {
+    width: 100% !important;
+  }
   .box-input .ant-select-selection--single {
     height: 38px;
   }
@@ -563,6 +568,13 @@
     width: calc(100% - 130px);
     display: inline-block;
     margin-top: 2px;
+    height: 40px;
+  }
+
+  .itemModel-text {
+    width: calc(100% - 130px);
+    display: inline-block;
+    margin-top: 2px;
   }
 
   .Required {

jero-web/src/components/search/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"
@@ -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"

jero-web/src/components/searchaloneorc/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"
@@ -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"

jero-web/src/components/searchalonesplit/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"
@@ -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"

jero-web/src/views/documentManage/splitting/modules/SplitAddForm.vue

@@ -199,7 +199,7 @@
                               <a-form-model-item class="itemModel" :prop="item.db_field_name">
                                 <a-tree-select
                                   v-model="formInline[item.db_field_name]"
-
+                                  :getPopupContainer="triggerNode=> triggerNode.parentNode"
                                   style="width: 100%"
                                   :tree-data="item.tree"
                                   tree-checkable

jero-web/src/views/documentTools/searchCenter/components/DocumentLibrary.vue

@@ -9,6 +9,7 @@
               class="text-select"
               v-model="queryParamOne[item.db_field_name]"
               :maxTagCount="1"
+              :getPopupContainer="triggerNode=> triggerNode.parentNode"
               :tree-data="item.tree"
               tree-checkable
               @click="treeClick(item.db_field_name)"

jero-web/src/views/documentTools/virtualList/components/batSetting.vue

@@ -112,6 +112,7 @@
               <a-tree-select
                 v-model="formInline.technologyTerritory"
                 :maxTagCount="1"
+                :getPopupContainer="triggerNode=> triggerNode.parentNode"
                 class="box-input"
                 style="width: 100%"
                 :tree-data="CategoryTreeList"

jero-web/src/views/documentTools/virtualList/components/editModel.vue

@@ -182,6 +182,7 @@
                 <a-tree-select
                   v-model="formInline.technologyTerritory"
                   :maxTagCount="1"
+                  :getPopupContainer="triggerNode=> triggerNode.parentNode"
                   class="box-input"
                   style="width: 100%"
                   :tree-data="CategoryTreeList"
@@ -266,7 +267,7 @@
               <div class="title-text">
                 <span class="title-text-text" :title="$t('remarks')">{{$t('remarks')}}</span>
               </div>
-              <a-form-model-item class="itemModel" :prop="'remark'">
+              <a-form-model-item class="itemModel-text" :prop="'remark'">
                 <a-textarea
                   :placeholder="$t('PleaseEnter')+$t('remarks')"
                   :disabled="disabled"
@@ -661,6 +662,10 @@
     width: 100%;
   }
 
+  .itemModel-text .ant-form-item-control-wrapper {
+    width: 100% !important;
+  }
+
   .box-input .ant-select-selection--single {
     height: 38px;
   }
@@ -731,6 +736,13 @@
     width: calc(100% - 130px);
     display: inline-block;
     margin-top: 2px;
+    height: 40px;
+  }
+
+  .itemModel-text {
+    width: calc(100% - 130px);
+    display: inline-block;
+    margin-top: 2px;
   }
 
   .Required {

jero-web/src/views/parameter/parameterlist/components/addModel.vue

@@ -67,6 +67,7 @@
                     v-model="formInline.technologyTerritory"
                     :maxTagCount="1"
                     class="box-input"
+                    :getPopupContainer="triggerNode=> triggerNode.parentNode"
                     style="width: 100%"
                     :tree-data="CategoryTreeList"
                     tree-checkable

jero-web/src/views/projectManagement/components/addModel.vue

@@ -432,6 +432,7 @@
     width: calc(100% - 130px);
     display: inline-block;
     margin-top: 2px;
+    height: 40px;
   }
 
   .Required {

jero-web/src/views/projectManagement/components/listEditModel.vue

@@ -196,6 +196,8 @@
               </div>
               <a-form-model-item class="itemModel" :prop="'regulationOwnerId'">
                 <a-select :placeholder="$t('PleaseSelect')+$t('regulatoryEngineer')"
+                          class="box-input"
+                          allowClear
                           :disabled="formInline.roleCode == 0 ? false : true"
                           v-model="formInline.regulationOwnerId">
                   <a-select-option v-for="(item, key) in regulatoryEngineerList"
@@ -219,6 +221,8 @@
               </div>
               <a-form-model-item class="itemModel" :prop="'homologationEngineerId'">
                 <a-select :placeholder="$t('PleaseSelect')+$t('certifiedEngineer')"
+                          class="box-input"
+                          allowClear
                           :disabled="formInline.roleCode == 0 ? false : true"
                           v-model="formInline.homologationEngineerId">
                   <a-select-option v-for="(item, key) in certificationEngineerList"
@@ -240,6 +244,8 @@
               </div>
               <a-form-model-item class="itemModel" :prop="'engineeringInterfacePerson'">
                 <a-select :placeholder="$t('PleaseSelect')+$t('engineeringInterfacePerson')"
+                          class="box-input"
+                          allowClear
                           :disabled="formInline.roleCode == 0 ? false : true"
                           v-model="formInline.engineeringInterfacePerson">
                   <a-select-option v-for="(item, key) in engineeringInterfacePersonList"
@@ -279,8 +285,9 @@
               <div class="title-text">
                 <span class="title-text-text" :title="$t('remarks')">{{$t('remarks')}}</span>
               </div>
-              <a-form-model-item class="itemModel" :prop="'remarks'">
+              <a-form-model-item class="itemModel-text" :prop="'remarks'">
                 <a-textarea
+                  style="width: 100%"
                   :placeholder="$t('PleaseEnter')+$t('remarks')"
                   :disabled="false"
                   v-model="formInline.remark" :rows="4"/>
@@ -335,6 +342,8 @@
               <a-form-model-item class="itemModel" prop="designInitiatorId">
                 <a-select :placeholder="$t('PleaseSelect')+$t('Sponsor')"
                           :disabled="formInline.roleCode == 0 ? false : true"
+                          class="box-input"
+                          allowClear
                           v-model="formInline.designInitiatorId">
                   <a-select-option v-for="(item, key) in designInitiatorList"
                                    :key="key"
@@ -362,6 +371,8 @@
               <a-form-model-item class="itemModel" prop="designDutyId">
                 <a-select :placeholder="$t('PleaseSelect')+$t('personLiable')"
                           :disabled="formInline.roleCode == 0 ? false : true"
+                          class="box-input"
+                          allowClear
                           v-model="formInline.designDutyId">
                   <a-select-option v-for="(item, key) in designDutyList"
                                    :key="key"
@@ -450,6 +461,8 @@
               <a-form-model-item class="itemModel" prop="prehomoInitiatorId">
                 <a-select :placeholder="$t('PleaseSelect')+$t('Sponsor')"
                           :disabled="formInline.roleCode == 0 ? false : true"
+                          class="box-input"
+                          allowClear
                           v-model="formInline.prehomoInitiatorId">
                   <a-select-option v-for="(item, key) in prehomoInitiatorList"
                                    :key="key"
@@ -476,6 +489,8 @@
               </div>
               <a-form-model-item class="itemModel" prop="prehomoDutyId">
                 <a-select :placeholder="$t('PleaseSelect')+$t('personLiable')"
+                          class="box-input"
+                          allowClear
                           :disabled="formInline.roleCode == 0 ? false : true"
                           v-model="formInline.prehomoDutyId">
                   <a-select-option v-for="(item, key) in prehomoDutyList"
@@ -562,6 +577,8 @@
               </div>
               <a-form-model-item class="itemModel" prop="verifyInitiatorId">
                 <a-select :placeholder="$t('PleaseSelect')+$t('Sponsor')"
+                          class="box-input"
+                          allowClear
                           :disabled="formInline.roleCode == 0 ? false : true"
                           v-model="formInline.verifyInitiatorId">
                   <a-select-option v-for="(item, key) in verifyInitiatorList"
@@ -589,6 +606,8 @@
               </div>
               <a-form-model-item class="itemModel" prop="verifyDutyId">
                 <a-select :placeholder="$t('PleaseSelect')+$t('personLiable')"
+                          class="box-input"
+                          allowClear
                           :disabled="formInline.roleCode == 0 ? false : true"
                           v-model="formInline.verifyDutyId">
                   <a-select-option v-for="(item, key) in verifyDutyList"
@@ -999,14 +1018,12 @@
     width: calc(100% - 130px);
   }
 
-  /*.formAdd .ant-form-item {*/
-  /*  margin-bottom: 20px;*/
-  /*}*/
-
   .itemModel .ant-form-item-control-wrapper {
     width: 100%;
   }
-
+  .itemModel-text .ant-form-item-control-wrapper{
+    width: 100% !important;
+  }
   .box-input .ant-select-selection--single {
     height: 38px;
   }
@@ -1077,6 +1094,13 @@
     width: calc(100% - 130px);
     display: inline-block;
     margin-top: 2px;
+    height: 40px;
+  }
+
+  .itemModel-text {
+    width: calc(100% - 130px);
+    display: inline-block;
+    margin-top: 2px;
   }
 
   .Required {

jero-web/src/views/system/DepartList.vue

@@ -86,6 +86,7 @@
                   :dropdownStyle="{maxHeight:'200px',overflow:'auto'}"
                   :treeData="treeData"
                   :disabled="disable"
+                  :getPopupContainer="triggerNode=> triggerNode.parentNode"
                   v-model="model.parentId"
                   :placeholder="$t('nothing')">
                 </a-tree-select>

jero-web/src/views/system/modules/PermissionModal.vue

@@ -48,6 +48,7 @@
             <span slot="help">{{ validateStatus=='error'? $t('selectSuperiorMenu'):'&nbsp;&nbsp;' }}</span>
             <a-tree-select
               style="width:100%"
+              :getPopupContainer="triggerNode=> triggerNode.parentNode"
               :dropdownStyle="{ maxHeight: '200px', overflow: 'auto' }"
               :treeData="treeData"
               v-model="model.parentId"