scrollX 删除自定义，改为统一配置

2021-11-19 14:28:13 +08:00 · 2021-11-19 14:28:13 +08:00 · 6050d0b8ba
parent 046a840914
commit 6050d0b8ba
21 changed files with 4 additions and 26 deletions
--- a/jeepay-ui-manager/src/components/JeepayTable/JeepayTable.vue
+++ b/jeepay-ui-manager/src/components/JeepayTable/JeepayTable.vue
@ -47,7 +47,7 @@ export default {
    pageSize: { type: Number, default: 10 }, // 默认每页条数
    rowSelection: Object, // checkbox选择
    rowKey: { type: [String, Function] }, // 定义rowKey 如果不定义将会出现（树状结构出问题， checkbox不消失等）
-    scrollX: { type: Number, default: 800 }, // 表格显示滚动条的宽度
+    scrollX: { type: Number, default: 500 }, // 表格显示滚动条的宽度
    tableRowCrossColor: { type: Boolean, default: false } // 是隔行换色
  },

--- a/jeepay-ui-manager/src/views/isv/IsvList.vue
+++ b/jeepay-ui-manager/src/views/isv/IsvList.vue
@ -32,7 +32,6 @@
        :reqTableDataFunc="reqTableDataFunc"
        :tableColumns="tableColumns"
        :searchData="searchData"
-        :scrollX="1100"
        rowKey="isvNo"
      >
        <template slot="isvNameSlot" slot-scope="{record}"><b>{{ record.isvName }}</b></template> <!-- 自定义插槽 -->
--- a/jeepay-ui-manager/src/views/mch/MchList.vue
+++ b/jeepay-ui-manager/src/views/mch/MchList.vue
@ -40,7 +40,6 @@
        :reqTableDataFunc="reqTableDataFunc"
        :tableColumns="tableColumns"
        :searchData="searchData"
-        :scrollX="1200"
        rowKey="mchNo"
      >
        <template slot="mchNameSlot" slot-scope="{record}">
--- a/jeepay-ui-manager/src/views/mchApp/List.vue
+++ b/jeepay-ui-manager/src/views/mchApp/List.vue
@ -34,7 +34,6 @@
        :reqTableDataFunc="reqTableDataFunc"
        :tableColumns="tableColumns"
        :searchData="searchData"
-        :scrollX="1200"
        rowKey="appId"
      >
        <template slot="appIdSlot" slot-scope="{record}">
--- a/jeepay-ui-manager/src/views/order/notify/MchNotifyList.vue
+++ b/jeepay-ui-manager/src/views/order/notify/MchNotifyList.vue
@ -55,7 +55,6 @@
        :searchData="searchData"
        :rowSelection="rowSelection"
        rowKey="orderId"
-        :scrollX="1050"
      >
        <template slot="stateSlot" slot-scope="{record}">
          <a-tag
--- a/jeepay-ui-manager/src/views/order/pay/PayOrderList.vue
+++ b/jeepay-ui-manager/src/views/order/pay/PayOrderList.vue
@ -73,7 +73,6 @@
        :tableColumns="tableColumns"
        :searchData="searchData"
        rowKey="payOrderId"
-        :scrollX="1250"
        :tableRowCrossColor="true"
      >
        <template slot="amountSlot" slot-scope="{record}"><b>￥{{ record.amount/100 }}</b></template> <!-- 自定义插槽 -->
--- a/jeepay-ui-manager/src/views/order/refund/RefundOrderList.vue
+++ b/jeepay-ui-manager/src/views/order/refund/RefundOrderList.vue
@ -55,7 +55,6 @@
        :tableColumns="tableColumns"
        :searchData="searchData"
        rowKey="refundOrderId"
-        :scrollX="1250"
        :tableRowCrossColor="true"
      >
        <template slot="payAmountSlot" slot-scope="{record}"><b>￥{{ record.payAmount/100 }}</b></template> <!-- 自定义插槽 -->
--- a/jeepay-ui-manager/src/views/order/transfer/TransferOrderList.vue
+++ b/jeepay-ui-manager/src/views/order/transfer/TransferOrderList.vue
@ -46,7 +46,6 @@
        :tableColumns="tableColumns"
        :searchData="searchData"
        rowKey="transferId"
-        :scrollX="1350"
        :tableRowCrossColor="true"
      >
        <template slot="transferAmountSlot" slot-scope="{record}"><b>￥{{ record.amount/100 }}</b></template> <!-- 自定义插槽 -->
@ -106,12 +105,9 @@

  // eslint-disable-next-line no-unused-vars
  const tableColumns = [
-    { title: '转账金额', scopedSlots: { customRender: 'transferAmountSlot' } },
+    { title: '转账金额', scopedSlots: { customRender: 'transferAmountSlot' }, width: 108 },
    { title: '商户名称', dataIndex: 'mchName' },
-    { key: 'orderNo', title: '订单号', scopedSlots: { customRender: 'orderSlot' }, width: '260px' },
-    // { title: '转账订单号', dataIndex: 'transferId' },
-    // { title: '商户转账单号', dataIndex: 'mchOrderNo' },
-    // { title: '渠道订单号', dataIndex: 'channelOrderNo' },
+    { key: 'orderNo', title: '订单号', scopedSlots: { customRender: 'orderSlot' }, width: 210 },
    { title: '收款账号', dataIndex: 'accountNo' },
    { title: '收款人姓名', dataIndex: 'accountName' },
    { title: '转账备注', dataIndex: 'transferDesc' },
--- a/jeepay-ui-manager/src/views/payconfig/payWay/List.vue
+++ b/jeepay-ui-manager/src/views/payconfig/payWay/List.vue
@ -24,7 +24,6 @@
        :tableColumns="tableColumns"
        :searchData="searchData"
        rowKey="wayCode"
-        :scrollX="500"
      >
        <template slot="wayCodeSlot" slot-scope="{record}"><b>{{ record.wayCode }}</b></template> <!-- 自定义插槽 -->
        <template slot="opSlot" slot-scope="{record}">  <!-- 操作列插槽 -->
--- a/jeepay-ui-manager/src/views/role/RolePage.vue
+++ b/jeepay-ui-manager/src/views/role/RolePage.vue
@ -25,7 +25,6 @@
        :tableColumns="tableColumns"
        :searchData="searchData"
        @btnLoadClose="btnLoading=false"
-        :scrollX="500"
        rowKey="roleName"
      >
        <template slot="roleIdSlot" slot-scope="{record}"><b>{{ record.roleId }}</b></template> <!-- 自定义插槽 -->
--- a/jeepay-ui-manager/src/views/sys/log/SysLog.vue
+++ b/jeepay-ui-manager/src/views/sys/log/SysLog.vue
@ -45,7 +45,6 @@
        :searchData="searchData"
        :rowSelection="rowSelection"
        rowKey="sysLogId"
-        :scrollX="1200"
      >
        <template slot="userNameSlot" slot-scope="{record}"><b>{{ record.userName }}</b></template> <!-- 自定义插槽 -->
        <template slot="sysTypeSlot" slot-scope="{record}">
--- a/jeepay-ui-manager/src/views/sysuser/SysUserPage.vue
+++ b/jeepay-ui-manager/src/views/sysuser/SysUserPage.vue
@ -27,7 +27,6 @@
        :tableColumns="tableColumns"
        :searchData="searchData"
        rowKey="sysUserId"
-        :scrollX="1350"
      >

        <template slot="avatarSlot" slot-scope="{record}">
--- a/jeepay-ui-merchant/src/components/JeepayTable/JeepayTable.vue
+++ b/jeepay-ui-merchant/src/components/JeepayTable/JeepayTable.vue
@ -47,7 +47,7 @@ export default {
    pageSize: { type: Number, default: 10 }, // 默认每页条数
    rowSelection: Object, // checkbox选择
    rowKey: { type: [String, Function] }, // 定义rowKey 如果不定义将会出现（树状结构出问题， checkbox不消失等）
-    scrollX: { type: Number, default: 980 }, // 定义表格的最小宽度，在小就会出现横向的滚动条
+    scrollX: { type: Number, default: 800 }, // 定义表格的最小宽度，在小就会出现横向的滚动条
    tableRowCrossColor: { type: Boolean, default: false } // 是隔行换色
  },

--- a/jeepay-ui-merchant/src/views/division/group/DivisionReceiverGroupPage.vue
+++ b/jeepay-ui-merchant/src/views/division/group/DivisionReceiverGroupPage.vue
@ -27,7 +27,6 @@
          :tableColumns="tableColumns"
          :searchData="searchData"
          @btnLoadClose="btnLoading=false"
-          :scrollX="500"
          rowKey="receiverGroupId"
      >
        <template slot="opSlot" slot-scope="{record}">  <!-- 操作列插槽 -->
--- a/jeepay-ui-merchant/src/views/division/receiver/DivisionReceiverPage.vue
+++ b/jeepay-ui-merchant/src/views/division/receiver/DivisionReceiverPage.vue
@ -45,7 +45,6 @@
        :tableColumns="tableColumns"
        :searchData="searchData"
        @btnLoadClose="btnLoading=false"
-        :scrollX="500"
        rowKey="receiverId"
      >

--- a/jeepay-ui-merchant/src/views/mchApp/List.vue
+++ b/jeepay-ui-merchant/src/views/mchApp/List.vue
@ -33,7 +33,6 @@
        :reqTableDataFunc="reqTableDataFunc"
        :tableColumns="tableColumns"
        :searchData="searchData"
-        :scrollX="1200"
        rowKey="appId"
      >
        <template slot="appIdSlot" slot-scope="{record}">
--- a/jeepay-ui-merchant/src/views/order/pay/PayOrderList.vue
+++ b/jeepay-ui-merchant/src/views/order/pay/PayOrderList.vue
@ -66,7 +66,6 @@
        :tableColumns="tableColumns"
        :searchData="searchData"
        rowKey="payOrderId"
-        :scrollX="1000"
        :tableRowCrossColor="true"
      >
        <template slot="amountSlot" slot-scope="{record}"><b>￥{{ record.amount/100 }}</b></template> <!-- 自定义插槽 -->
--- a/jeepay-ui-merchant/src/views/order/refund/RefundOrderList.vue
+++ b/jeepay-ui-merchant/src/views/order/refund/RefundOrderList.vue
@ -48,7 +48,6 @@
        :reqTableDataFunc="reqTableDataFunc"
        :tableColumns="tableColumns"
        rowKey="refundOrderId"
-        :scrollX="1300"
        :tableRowCrossColor="true"
      >
        <template slot="payAmountSlot" slot-scope="{record}"><b>￥{{ record.payAmount/100 }}</b></template> <!-- 自定义插槽 -->
--- a/jeepay-ui-merchant/src/views/order/transfer/TransferOrderList.vue
+++ b/jeepay-ui-merchant/src/views/order/transfer/TransferOrderList.vue
@ -45,7 +45,6 @@
        :tableColumns="tableColumns"
        :searchData="searchData"
        rowKey="transferId"
-        :scrollX="1350"
        :tableRowCrossColor="true"
      >
        <template slot="transferAmountSlot" slot-scope="{record}"><b>￥{{ record.amount/100 }}</b></template> <!-- 自定义插槽 -->
--- a/jeepay-ui-merchant/src/views/role/RolePage.vue
+++ b/jeepay-ui-merchant/src/views/role/RolePage.vue
@ -27,7 +27,6 @@
        :tableColumns="tableColumns"
        :searchData="searchData"
        @btnLoadClose="btnLoading=false"
-        :scrollX="500"
        rowKey="roleId"
      >
        <template slot="roleIdSlot" slot-scope="{record}"><b>{{ record.roleId }}</b></template> <!-- 自定义插槽 -->
--- a/jeepay-ui-merchant/src/views/sysuser/SysUserPage.vue
+++ b/jeepay-ui-merchant/src/views/sysuser/SysUserPage.vue
@ -30,7 +30,6 @@
        :tableColumns="tableColumns"
        :searchData="searchData"
        rowKey="sysUserId"
-        :scrollX="1300"
      >

        <template slot="avatarSlot" slot-scope="{record}">