From 1779677cece5864b62a65df4b01a4a69496e149a Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 13 五月 2025 20:51:15 +0800
Subject: [PATCH] Merge branch 'master' into positec
---
src/tabviews/zshare/settingcomponent/editTable/index.jsx | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/tabviews/zshare/settingcomponent/editTable/index.jsx b/src/tabviews/zshare/settingcomponent/editTable/index.jsx
index b0a64e2..2dad740 100644
--- a/src/tabviews/zshare/settingcomponent/editTable/index.jsx
+++ b/src/tabviews/zshare/settingcomponent/editTable/index.jsx
@@ -77,7 +77,7 @@
editable: true,
options: [],
width: '25%',
- render: (text, record) => {
+ render: (text) => {
if (!text) return ''
return text[0] + '+' + shortkeycode[text[1]]
}
@@ -92,7 +92,7 @@
title: window.GLOB.dict['operation'] || '鎿嶄綔',
dataIndex: 'operation',
width: '140px',
- render: (text, record) => {
+ render: (_, record) => {
const { editingKey } = this.state
const editable = this.isEditing(record)
return editable ? (
@@ -100,11 +100,11 @@
<EditableContext.Consumer>
{form => (
<span onClick={() => this.save(form, record.uuid)} style={{ marginRight: 8 , color: '#1890ff', cursor: 'pointer'}}>
- 淇濆瓨
+ {window.GLOB.dict['save'] || '淇濆瓨'}
</span>
)}
</EditableContext.Consumer>
- <span style={{ color: '#1890ff', cursor: 'pointer'}} onClick={() => this.cancel(record.uuid)}>鍙栨秷</span>
+ <span style={{ color: '#1890ff', cursor: 'pointer'}} onClick={() => this.cancel(record.uuid)}>{window.GLOB.dict['cancel'] || '鍙栨秷'}</span>
</div>
) : (
<div className={'edit-operation-btn' + (editingKey !== '' ? ' disabled' : '')} style={{minWidth: '110px'}}>
@@ -115,7 +115,7 @@
}],
printTypeColumns: [
{
- title: '鎵撳嵃绫诲瀷',
+ title: window.GLOB.dict['print_type'] || '鎵撳嵃绫诲瀷',
dataIndex: 'Text',
width: '26.1%'
},
@@ -130,7 +130,7 @@
title: window.GLOB.dict['operation'] || '鎿嶄綔',
dataIndex: 'operation',
width: '153px',
- render: (text, record) => {
+ render: (_, record) => {
const { editingKey } = this.state
const editable = this.isEditing(record)
return editable ? (
@@ -138,11 +138,11 @@
<EditableContext.Consumer>
{form => (
<span onClick={() => this.save(form, record.uuid, record.parentId)} style={{ marginRight: 8 , color: '#1890ff', cursor: 'pointer'}}>
- 淇濆瓨
+ {window.GLOB.dict['save'] || '淇濆瓨'}
</span>
)}
</EditableContext.Consumer>
- <span style={{ color: '#1890ff', cursor: 'pointer'}} onClick={() => this.cancel(record.uuid)}>鍙栨秷</span>
+ <span style={{ color: '#1890ff', cursor: 'pointer'}} onClick={() => this.cancel(record.uuid)}>{window.GLOB.dict['cancel'] || '鍙栨秷'}</span>
</div>
) : (
<div className={'edit-operation-btn' + (editingKey !== '' ? ' disabled' : '')} style={{minWidth: '110px'}}>
--
Gitblit v1.8.0