Handy_Cao 1 rok temu
rodzic
commit
ee97efeb8d

Plik diff jest za duży
+ 348 - 347
public/locales/en-US.json


+ 1 - 0
public/locales/th-TH.json

@@ -190,6 +190,7 @@
         "tips": "页面不存在"
     },
     "common": {
+        "orderindex": "序號",
         "pleaseenter": "请输入",
         "pleasechoice": "请选择",
         "operate": "操作",

+ 9 - 8
public/locales/zh-CN.json

@@ -190,6 +190,7 @@
         "tips": "页面不存在"
     },
     "common": {
+        "orderindex": "序号",
         "pleaseenter": "请输入",
         "pleasechoice": "请选择",
         "operate": "操作",
@@ -791,14 +792,14 @@
             },
             "liquidation": {
                 "countDown": "每10秒刷新一次,下次刷新:",
-                "start": "开始监控",
-                "stop": "停止监控",
-                "accountid": "斩仓资金账户",
-                "goodsname": "商品",
-                "buyorsell": "交易方向",
-                "cuttime": "斩仓时间",
-                "cuttradeqty": "已斩数量",
-                "cutorderid": "关联单号"
+                "start": "Start",
+                "stop": "Stop",
+                "accountid": "AccountID",
+                "goodsname": "GoodsName",
+                "buyorsell": "BuyOrSell",
+                "cuttime": "CutTime",
+                "cuttradeqty": "CutTradeQty",
+                "cutorderid": "CutOrderID"
             },
             "marketer": {},
             "positionsumm": {},

+ 1 - 0
public/locales/zh-TW.json

@@ -190,6 +190,7 @@
         "tips": "頁面不存在"
     },
     "common": {
+        "orderindex": "序號",
         "pleaseenter": "請輸入",
         "pleasechoice": "請選擇",
         "operate": "操作",

+ 1 - 4
src/packages/pc/components/base/table-details/index.vue

@@ -11,7 +11,7 @@
                     <template v-for="(item, n) in items" :key="n">
                         <th :style="labelStyle">
                             <slot :name="item.prop + 'Label'">
-                                {{ t(item.formatLabel ? item.formatLabel(data[item.prop]) : item.label ?? '') }}
+                                {{ $t(item.formatLabel ? item.formatLabel(data[item.prop]) : item.label ?? '') }}
                             </slot>
                         </th>
                         <td :colspan="(items.length - 1) === n ? (column * 2 - items.length * 2) + 1 : 1"
@@ -32,9 +32,6 @@
 import { PropType, computed } from 'vue'
 import { handleNoneValue } from '@/filters'
 import { CellProp } from './types'
-import { i18n } from '@/stores'
-
-const { global: { t } } = i18n
 
 const props = defineProps({
     title: String,

+ 2 - 4
src/packages/pc/components/base/table/index.vue

@@ -27,11 +27,11 @@
         <el-table-column type="selection" :selectable="selectable" width="55" align="center" fixed
           v-if="selectionType" />
         <!-- 序号 -->
-        <el-table-column type="index" :label="t('common.orderindex')" align="center" :width="80" v-if="showIndex" />
+        <el-table-column type="index" :label="$t('common.orderindex')" align="center" :width="80" v-if="showIndex" />
         <!-- 数据列 -->
         <template v-for="(item, index) in columns" :key="index">
           <el-table-column :align="item.align ?? 'center'" :min-width="120" :width="item.width"
-            :label="item.formatLabel ? item.formatLabel() : t(item.label ?? '')" :prop="item.field" :fixed="item.fixed || false"
+            :label="$t(item.formatLabel ? item.formatLabel() : item.label)" :prop="item.field" :fixed="item.fixed || false"
             :sortable="item.sortable" :show-overflow-tooltip="item.field !== 'operate'" v-if="item.show ?? true">
             <template #default="{ row, $index }">
               <slot :name="item.field" :row="row" :value="row[item.field]" :index="$index">
@@ -56,7 +56,6 @@
 <script lang="ts">
 import { defineComponent, shallowRef, PropType } from 'vue'
 import { handleNoneValue } from '@/filters'
-import { i18n } from '@/stores'
 import AppTableSetting from '../table-setting/index.vue'
 
 export default defineComponent({
@@ -90,7 +89,6 @@ export default defineComponent({
     const showTableSetting = shallowRef(false)
     const refresh = () => emit('refresh')
     const updateColumn = (value: Model.TableColumn[]) => emit('update:columns', value)
-    const { global: { t } } = i18n
 
     // 当某一行被勾选时触发的事件
     const onSelect = (selection: unknown[], currentRow: unknown) => {

Niektóre pliki nie zostały wyświetlone z powodu dużej ilości zmienionych plików