Merge remote-tracking branch 'origin/feature_dev_20230109_BTTZ' into dev_2nd_20230213

# Conflicts:
#	jero-web/src/mixins/header.js
#	jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/evaluationResultsList.vue
#	jero-web/src/views/documentManage/collection/index.vue
#	jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue
#	jero-web/src/views/projectManagement/components/customizeList.vue

jero-web/src/views/parameter/ParameterTemplate/index.vue

@@ -52,6 +52,7 @@
         size="middle"
         :loading="loading"
         :pagination="false"
+        :components="drag(columns,'columns')"
         :scroll="{x: '100%',y:'calc(100vh - 130px)'}"
         rowKey="id"
         :data-source="dataSource"
@@ -120,11 +121,14 @@ import axios from 'axios'
 import { ACCESS_TOKEN } from '@/store/mutation-types'
 import eventBUs from '../../../common/event'
 import Vue from 'vue'
+import { ResizeHeader, ResizeColumnProvide } from '@/mixins/header'
+
 export default {
   name: 'index',
   components: {
     addModel,
   },
+  mixins:[ResizeHeader, ResizeColumnProvide],
   data() {
     return {
       token:Vue.ls.get(ACCESS_TOKEN),
@@ -180,6 +184,7 @@ export default {
           ellipsis: true,
           dataIndex: 'description',
           // scopedSlots: { customRender: 'titleName' }
+          width: 192
         },
         // {
         //   title: this.$t('zoneOfApplication'),
@@ -535,4 +540,8 @@ export default {
 ::v-deep .ant-table-body {
   background: transparent!important;
 }
+
+::v-deep .ant-table-placeholder{
+  margin-top: 8px !important;
+}
 </style>

jero-web/src/views/parameter/escalationlibrary/index.vue

@@ -34,6 +34,7 @@
       <a-table
         ref="table"
         size="middle"
+        :components="drag(columns,'columns')"
         :loading="loading"
         :pagination="false"
         :scroll="{x: '100%',y:'calc(100vh - 158px)'}"
@@ -43,9 +44,9 @@
         :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
         :columns="columns"
       >
-        <span slot="projectName" slot-scope="text,record" :title="text">
-            {{ text && text.length > 20 ? text.slice(0, 19) + '...' : text }}
-        </span>
+<!--        <span slot="projectName" slot-scope="text,record" :title="text">-->
+<!--            {{ text && text.length > 20 ? text.slice(0, 19) + '...' : text }}-->
+<!--        </span>-->
         <span slot="operation" slot-scope="text,record">
             <a class="text-operation" @click="handlecody(record)" v-has="'params:report:history'">{{$t('Exporthistory')}}</a>
             <a class="text-operation" @click="deleteLib(record)" v-has="'report:detail:list'">{{$t('See')}}</a>
@@ -110,12 +111,14 @@
   import { ACCESS_TOKEN } from '@/store/mutation-types'
   import eventBUs from '../../../common/event'
   import Vue from 'vue'
+  import { ResizeHeader, ResizeColumnProvide } from '@/mixins/header'
 
   export default {
     name: 'index',
     components: {
       ExportHistory
     },
+    mixins:[ResizeHeader, ResizeColumnProvide],
     data() {
       return {
         token: Vue.ls.get(ACCESS_TOKEN),
@@ -157,7 +160,7 @@
           {
             title: this.$t('entryName'),
             align: 'left',
-            width: '17%',
+            width: 210,
             dataIndex: 'projectName',
             sorter:true,
             scopedSlots: { customRender: 'projectName' }
@@ -165,11 +168,13 @@
           {
             title: this.$t('ListTitle'),
             align: 'left',
-            dataIndex: 'title'
+            width: 380,
+            dataIndex: 'title',
           },
           {
             title: this.$t('Version'),
             align: 'left',
+            width: 382,
             dataIndex: 'version'
           },
           {
@@ -483,4 +488,14 @@
   ::v-deep .ant-table-body {
     background: transparent!important;
   }
+
+  ::v-deep .ant-table-row-cell-break-word{
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+  }
+
+  ::v-deep .ant-table-placeholder{
+    margin-top: 8px !important
+  }
 </style>

jero-web/src/views/parameter/parameterexport/index.vue

@@ -46,6 +46,7 @@
       <a-table
         ref="table"
         size="middle"
+        :components="drag(columns,'columns')"
         :loading="loading"
         :pagination="false"
         :scroll="{x: '100%',y:'calc(100vh - 160px)'}"
@@ -114,11 +115,14 @@ import axios from 'axios'
 import { ACCESS_TOKEN } from '@/store/mutation-types'
 import eventBUs from '../../../common/event'
 import Vue from 'vue'
+import { ResizeHeader, ResizeColumnProvide } from '@/mixins/header'
+
 export default {
   name: 'index',
   components: {
     addModel,
   },
+  mixins:[ResizeHeader, ResizeColumnProvide],
   data() {
     return {
       token:Vue.ls.get(ACCESS_TOKEN),
@@ -166,7 +170,7 @@ export default {
           dataIndex: 'templateName',
           sorter:true,
           ellipsis: true,
-          width: 300,
+          width: 201,
           scopedSlots: { customRender: 'templateName' }
         },
         {
@@ -174,7 +178,7 @@ export default {
           align: 'left',
           dataIndex: 'description',
           ellipsis: true,
-          width: 300,
+          width: 192,
           scopedSlots: { customRender: 'projectName' }
         },
         {

jero-web/src/views/parameter/parameterlist/index.vue

@@ -70,6 +70,7 @@
       <a-table
         ref="table"
         size="middle"
+        :components="drag(columns,'columns')"
         :loading="loading"
         :pagination="false"
         :scroll="{x: '100%',y:'calc(100vh - 130px)'}"
@@ -113,12 +114,15 @@ import axios from 'axios'
 import { ACCESS_TOKEN } from '@/store/mutation-types'
 import ImportFileOnlyList from '@/components/ImportFileOnlyList/index'
 import Vue from 'vue'
+import { ResizeHeader, ResizeColumnProvide } from '@/mixins/header'
+
 export default {
   name: 'index',
   components: {
     addModel,
     ImportFileOnlyList
   },
+  mixins:[ResizeHeader, ResizeColumnProvide],
   data() {
     return {
       certCategoryParamsInfoEOList: [],
@@ -174,6 +178,7 @@ export default {
           align: 'left',
           dataIndex: 'description',
           ellipsis: true,
+          width: 180,
           // scopedSlots: { customRender: 'titleName' }
         },
         {
@@ -527,4 +532,8 @@ export default {
 ::v-deep .ant-table-body {
   background: transparent!important;
 }
+
+::v-deep .ant-table-placeholder{
+  margin-top: 8px !important;
+}
 </style>