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

jero-web/src/App.vue

@@ -193,4 +193,17 @@
     padding-top: 12px!important;
     padding-bottom: 12px!important;
   }
+
+  .ant-tooltip-inner {
+    color: #333;
+    background-color: #fff !important;
+  }
+
+  .ant-tooltip-arrow::before {
+    background-color: #fff !important;
+  }
+
+  .ant-menu-inline-collapsed-tooltip a {
+    color: #333 !important;
+  }
 </style>

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

@@ -7,7 +7,7 @@
         :components="drag(columns,'columns')"
         :row-selection="{ fixed: true, selectedRowKeys: selectedRowKeys, onChange: onSelectChange  }"
         :pagination="false"
-        :scroll="{x: true}"
+        :scroll="{x: '100%'}"
         :data-source="dataSource"
         :loading="loading"
         :columns="columns"
@@ -25,7 +25,7 @@
         <span slot="operation" slot-scope="record" class="operate">
            <a v-for="(ol,index) in OperationList"
               @click="OperationClick(ol,record)">
-              <span class="text" v-if="ol.text==$t('edit')" v-has="'split:sarFileSplitItems:update'">
+              <span v-if="ol.text==$t('edit')" v-has="'split:sarFileSplitItems:update'">
                      {{ol.text}}
               </span>
               <span class="text" v-if="ol.text==$t('delete')" v-has="'split:sarFileSplitItems:delete'">
@@ -35,12 +35,14 @@
          </span>
         <span slot="urlClick" slot-scope="text,record">
               <a class="text" :title="text" @click="urlClick(text)">
-                {{text && text.length > 18?text.slice(0,17)+'...':text}}
+<!--                {{text && text.length > 18?text.slice(0,17)+'...':text}}-->
+                {{text}}
               </a>
         </span>
         <span slot="detailText" slot-scope="text,record">
-              <span class="text" :title="text">
-               {{text && text.length > 18?text.slice(0,17)+'...':text}}
+              <span  :title="text">
+<!--               {{text && text.length > 18?text.slice(0,17)+'...':text}}-->
+                {{text}}
               </span>
         </span>
       </a-table>
@@ -186,7 +188,7 @@
                   customRender: 'urlClick'
                 }
               }else if(res.db_field_name=='iterms_conditions'){
-                this.columns[index].width='500'
+                this.columns[index].width= 500
                 this.columns[index].scopedSlots = {
                   customRender: 'showContent'
                 }
@@ -296,7 +298,7 @@
     .table{
       .ant-table-row-cell-break-word{
         span{
-          display: block;
+          //display: block;
           width: inherit;
 
         }
@@ -317,7 +319,7 @@
   }
 </style>
 <style lang="less" scoped>
-  @import '~@assets/less/common.less';
+  @import'~@assets/less/common.less';
 
   .ant-table td {
     white-space: nowrap;