From b48528b1a1a88e289fc0b7ad52f2da213a3f9dfe Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 23 四月 2025 16:34:38 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/tabviews/zshare/settingcomponent/editTable/index.jsx | 23 ++++++++++-------------
1 files changed, 10 insertions(+), 13 deletions(-)
diff --git a/src/tabviews/zshare/settingcomponent/editTable/index.jsx b/src/tabviews/zshare/settingcomponent/editTable/index.jsx
index 818744c..b0a64e2 100644
--- a/src/tabviews/zshare/settingcomponent/editTable/index.jsx
+++ b/src/tabviews/zshare/settingcomponent/editTable/index.jsx
@@ -3,11 +3,8 @@
import { Table, Form, Select, Cascader } from 'antd'
import { EditOutlined } from '@ant-design/icons'
-import zhCN from '@/locales/zh-CN/model.js'
-import enUS from '@/locales/en-US/model.js'
import './index.scss'
-let eTDict = sessionStorage.getItem('lang') !== 'en-US' ? zhCN : enUS
const EditableContext = React.createContext()
const shortkeycode = {
65: 'A', 66: 'B', 67: 'C', 68: 'D', 69: 'E', 70: 'F', 71: 'G', 72: 'H', 73: 'I', 74: 'J', 75: 'K', 76: 'L', 77: 'M',
@@ -70,11 +67,11 @@
editingKey: '',
visible: false,
columns: [{
- title: '鍚嶇О',
+ title: window.GLOB.dict['name'] || '鍚嶇О',
dataIndex: 'label',
width: '25%'
}, {
- title: '蹇嵎閿�',
+ title: window.GLOB.dict['shortcut'] || '蹇嵎閿�',
dataIndex: 'shortcut',
inputType: 'cascader',
editable: true,
@@ -85,14 +82,14 @@
return text[0] + '+' + shortkeycode[text[1]]
}
}, {
- title: '鎵撳嵃鏈�',
+ title: window.GLOB.dict['printer'] || '鎵撳嵃鏈�',
dataIndex: 'printer',
inputType: 'select',
editable: true,
options: [],
width: '25%'
}, {
- title: '鎿嶄綔',
+ title: window.GLOB.dict['operation'] || '鎿嶄綔',
dataIndex: 'operation',
width: '140px',
render: (text, record) => {
@@ -103,11 +100,11 @@
<EditableContext.Consumer>
{form => (
<span onClick={() => this.save(form, record.uuid)} style={{ marginRight: 8 , color: '#1890ff', cursor: 'pointer'}}>
- {eTDict['model.save']}
+ 淇濆瓨
</span>
)}
</EditableContext.Consumer>
- <span style={{ color: '#1890ff', cursor: 'pointer'}} onClick={() => this.cancel(record.uuid)}>{eTDict['model.cancel']}</span>
+ <span style={{ color: '#1890ff', cursor: 'pointer'}} onClick={() => this.cancel(record.uuid)}>鍙栨秷</span>
</div>
) : (
<div className={'edit-operation-btn' + (editingKey !== '' ? ' disabled' : '')} style={{minWidth: '110px'}}>
@@ -123,14 +120,14 @@
width: '26.1%'
},
{
- title: '鎵撳嵃鏈�',
+ title: window.GLOB.dict['printer'] || '鎵撳嵃鏈�',
dataIndex: 'printer',
inputType: 'select',
editable: true,
options: [],
},
{
- title: '鎿嶄綔',
+ title: window.GLOB.dict['operation'] || '鎿嶄綔',
dataIndex: 'operation',
width: '153px',
render: (text, record) => {
@@ -141,11 +138,11 @@
<EditableContext.Consumer>
{form => (
<span onClick={() => this.save(form, record.uuid, record.parentId)} style={{ marginRight: 8 , color: '#1890ff', cursor: 'pointer'}}>
- {eTDict['model.save']}
+ 淇濆瓨
</span>
)}
</EditableContext.Consumer>
- <span style={{ color: '#1890ff', cursor: 'pointer'}} onClick={() => this.cancel(record.uuid)}>{eTDict['model.cancel']}</span>
+ <span style={{ color: '#1890ff', cursor: 'pointer'}} onClick={() => this.cancel(record.uuid)}>鍙栨秷</span>
</div>
) : (
<div className={'edit-operation-btn' + (editingKey !== '' ? ' disabled' : '')} style={{minWidth: '110px'}}>
--
Gitblit v1.8.0