li.shaoyi 4 tahun lalu
induk
melakukan
6898a93ec8

+ 5 - 12
src/common/components/btnList/index.vue

@@ -1,9 +1,9 @@
 <template>
-    <div class="btn-list">
-        <a-button :class="item.className" v-for="item in btnList" :key="item.lable" @click.stop="onClick(item)">
-            {{ item.lable }}
-        </a-button>
-    </div>
+  <div class="btn-list">
+    <a-button :class="item.className" v-for="item in btnList" :key="item.lable" @click.stop="onClick(item)">
+      {{ item.lable }}
+    </a-button>
+  </div>
 </template>
 
 <script lang="ts">
@@ -32,10 +32,3 @@ export default defineComponent({
     },
 });
 </script>
-
-<style lang="less">
-.btn-list {
-    display: inline-flex;
-    margin-top:7px;
-}
-</style>

+ 2 - 2
src/common/setup/table/tableQuote.ts

@@ -15,7 +15,7 @@ export function subcriteGoodsQuote(goodsCodes: string[], itemTableHeight = 31, s
     const uuid = v4();
 
     nextTick(() => {
-        listenSrcoll(document.querySelector(selector)!)
+        //listenSrcoll(document.querySelector(selector)!)
     });
 
     // 第一次自动订阅当前可视区域的数据
@@ -77,7 +77,7 @@ export function subcriteGoodsQuote(goodsCodes: string[], itemTableHeight = 31, s
     function subscribeAction(start: number, end: number) {
         removeSubscribeQuotation(uuid);
         const result: Array<{ exchangeCode: 250, goodsCode: string, subState: 0 }> = []
-        for (let i = start; i < end; i++) {
+        for (let i = 0; i < goodsCodes.length; i++) {
             const code = goodsCodes[i]
             result.push({
                 exchangeCode: 250,

+ 1 - 1
src/layout/components/bottom.vue

@@ -127,12 +127,12 @@ export default defineComponent({
         border-right: 1px solid @m-black2;
     }
     main {
-        max-width: 100%;
         flex: 1;
         .flex;
         flex-direction: column;
         background: @m-black36;
         position: relative;
+        overflow: hidden;
         .conditionIcon {
             font-size: 16px;
             color: @m-grey1;

+ 0 - 1
src/views/order/futures_information/components/futures_information_entrust/columns.tsx

@@ -74,7 +74,6 @@ export function getColumns() {
             dataIndex: el.key,
             width: 100,
             align: 'center',
-            slots: { customRender: el.key, },
             ...el
         }
     })

+ 1 - 1
src/views/order/futures_information/components/futures_information_entrust/index.vue

@@ -1,7 +1,7 @@
 <template>
   <!-- 期货订单-委托 -->
   <section class="futures_information_position">
-    <a-table :columns="getColumns()" class="srcollYTable expandLeftTable" :scroll="{ x: '100%', y: '190px' }" :pagination="false" :loading="loading" :expandedRowKeys="expandedRowKeys" :customRow="Rowclick" :expandIcon="expandIcon" :expandIconAsCell="false" rowKey="key" :data-source="tableList">
+    <a-table :columns="getColumns()" class="srcollYTable" :scroll="{ x: '100%', y: '190px' }" :pagination="false" :loading="loading" :expandedRowKeys="expandedRowKeys" :customRow="Rowclick" :expandIcon="expandIcon" :expandIconAsCell="false" rowKey="key" :data-source="tableList">
       <!-- 额外的展开行 -->
       <template v-if="btnList.length" #expandedRowRender="{ record }">
         <BtnList :btnList="handleBtnList(btnList,record)" :record="record" class="btn-list-sticky" @click="openComponent" />

+ 0 - 1
src/views/order/futures_information/components/futures_information_position/columns.tsx

@@ -66,7 +66,6 @@ export function getColumns() {
             dataIndex: el.key,
             width: 100,
             align: 'center',
-            slots: { customRender: el.key, },
             ...el
         }
     })

+ 1 - 1
src/views/order/futures_information/components/futures_information_position/index.vue

@@ -1,7 +1,7 @@
 <template>
   <!-- 期货订单-持仓 -->
   <section class="futures_information_position">
-    <a-table :columns="getColumns()" class="srcollYTable expandLeftTable" :scroll="{ x: '100%', y: '190px' }" :pagination="false" :loading="loading" :expandedRowKeys="expandedRowKeys" :customRow="Rowclick" :expandIcon="expandIcon" :expandIconAsCell="false" rowKey="key" :data-source="tableList">
+    <a-table :columns="getColumns()" class="srcollYTable" :scroll="{ x: '100%', y: '190px' }" :pagination="false" :loading="loading" :expandedRowKeys="expandedRowKeys" :customRow="Rowclick" :expandIcon="expandIcon" :expandIconAsCell="false" rowKey="key" :data-source="tableList">
       <!-- 额外的展开行 -->
       <template v-if="btnList.length" #expandedRowRender="{ record }">
         <BtnList :btnList="btnList" :record="record" class="btn-list-sticky" @click="openComponent" />

+ 0 - 1
src/views/order/futures_information/components/futures_information_success/columns.tsx

@@ -70,7 +70,6 @@ export function getColumns() {
             dataIndex: el.key,
             width: 100,
             align: 'center',
-            slots: { customRender: el.key, },
             ...el
         }
     })

+ 1 - 1
src/views/order/futures_information/components/futures_information_success/index.vue

@@ -1,7 +1,7 @@
 <template>
   <!-- 期货订单-成交 -->
   <section class="futures_information_position">
-    <a-table :columns="getColumns()" class="srcollYTable expandLeftTable" :scroll="{ x: '100%', y: '190px' }" :pagination="false" :loading="loading" :expandedRowKeys="expandedRowKeys" :customRow="Rowclick" :expandIcon="expandIcon" :expandIconAsCell="false" rowKey="key" :data-source="tableList">
+    <a-table :columns="getColumns()" class="srcollYTable" :scroll="{ x: '100%', y: '190px' }" :pagination="false" :loading="loading" :expandedRowKeys="expandedRowKeys" :customRow="Rowclick" :expandIcon="expandIcon" :expandIconAsCell="false" rowKey="key" :data-source="tableList">
       <!-- 额外的展开行 -->
       <template v-if="btnList.length" #expandedRowRender="{ record }">
         <BtnList :btnList="btnList" :record="record" class="btn-list-sticky" @click="openComponent" />