From 2cb09105d702ccae0644126ca6ea7f85e1f218bc Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 10 十二月 2021 14:06:14 +0800
Subject: [PATCH] 2021-12-10
---
src/menu/components/table/normal-table/columns/editColumn/formconfig.jsx | 4
src/templates/sharecomponent/searchcomponent/searcheditable/index.jsx | 10 -
src/templates/zshare/modalform/index.jsx | 4
src/utils/utils-datamanage.js | 2
src/menu/components/table/edit-table/columns/tableIn/index.jsx | 6
src/templates/formtabconfig/index.jsx | 2
src/templates/sharecomponent/actioncomponent/verifyprint/editable/index.jsx | 5
src/templates/sharecomponent/searchcomponent/index.jsx | 2
src/locales/zh-CN/model.js | 42 --------
src/templates/sharecomponent/columncomponent/markcolumn/index.jsx | 7
src/templates/sharecomponent/columncomponent/index.jsx | 6
src/templates/sharecomponent/columncomponent/colspanform/index.jsx | 14 +-
src/templates/sharecomponent/tablecomponent/index.jsx | 2
src/locales/en-US/model.js | 42 --------
src/templates/sharecomponent/tabscomponent/index.jsx | 4
src/templates/sharecomponent/actioncomponent/verifyprint/index.jsx | 2
src/menu/components/chart/antv-bar/chartcompile/formconfig.jsx | 4
src/templates/comtableconfig/menuform/index.jsx | 2
src/templates/zshare/formconfig.jsx | 48 ++++----
src/menu/components/share/actioncomponent/formconfig.jsx | 8
src/templates/sharecomponent/columncomponent/gridbtnform/index.jsx | 30 -----
src/templates/sharecomponent/actioncomponent/index.jsx | 2
src/templates/modalconfig/source.jsx | 2
src/templates/zshare/modalform/modaleditable/index.jsx | 13 +-
src/templates/sharecomponent/searchcomponent/searchform/index.jsx | 2
25 files changed, 73 insertions(+), 192 deletions(-)
diff --git a/src/locales/en-US/model.js b/src/locales/en-US/model.js
index ea0c882..78b531a 100644
--- a/src/locales/en-US/model.js
+++ b/src/locales/en-US/model.js
@@ -176,9 +176,6 @@
'header.form.action.LogicDelete': '閫昏緫鍒犻櫎',
'header.form.action.delete': '鐗╃悊鍒犻櫎',
'header.form.valueField': '鍊悸峰瓧娈�',
- 'header.form.valueText': '鏂囨湰路瀛楁',
- 'header.form.orderBy': '鎺掑簭路瀛楁',
- 'header.form.orderType': '鎺掑簭鏂瑰紡',
'header.form.match': '鍖归厤妯″紡',
'header.form.matchVal': '鍖归厤鍊�',
'header.form.asc': '姝ｅ簭',
@@ -188,58 +185,19 @@
'header.form.button': '鎸夐挳',
'model.form.style': '椋庢牸',
'model.form.color': 'Color',
- 'header.form.order': '鎺掑垪',
- 'header.form.horizontal': '妯悜',
- 'header.form.vertical': '绾靛悜',
- 'header.form.vertical2': '绾靛悜(2鍒�)',
- 'header.form.topPicBottomText': '涓婂浘涓嬫枃',
- 'header.form.leftPicRightText': '宸﹀浘鍙虫枃',
- 'model.form.selectItem.error': '涓嬫媺閫夐」璁剧疆閿欒锛�',
- 'header.form.readonly': '鍙',
- 'header.form.queryType': '鏌ヨ绫诲瀷',
- 'header.form.query': '鏌ヨ',
- 'header.form.statistics': '缁熻',
- 'header.form.database': '鏁版嵁搴�',
- 'header.form.database.local': '鏈湴',
- 'header.form.database.sso': '绯荤粺',
- 'header.form.linkMain': '鍏宠仈涓昏〃',
'model.query.delete': '纭畾鍒犻櫎鍚�?',
- 'header.form.up': '涓婄Щ',
- 'header.form.down': '涓嬬Щ',
'header.form.status.change': '鐘舵�佸垏鎹�',
'model.status.forbidden': '绂佺敤',
'model.status.open': '鍚敤',
- 'header.form.readin': '鑷姩濉厖',
- 'header.form.pagination': '鍒嗛〉',
- 'header.form.regular': '姝ｅ垯鏍￠獙',
- 'header.form.quickadd': '蹇嵎娣诲姞',
'model.form.funcbutton': 'Function button',
- 'header.form.funcType': '鍔熻兘绫诲瀷',
- 'header.form.func.changeuser': '鍒囨崲鐢ㄦ埛',
- 'header.form.func.print': '鎵撳嵃',
'model.form.execMode': 'Mode',
- 'header.form.thawbutton': '瑙ｅ喕鎸夐挳',
- 'header.form.maxRows': '鏈�澶ц鏁�',
'header.form.paste': '绮樿创',
'header.form.ratio': '姣斾緥',
'header.form.blacklist': '榛戝悕鍗�',
'model.form.linkmenu': 'Association',
- 'header.form.clickscale': '鐐瑰嚮缂╂斁',
- 'header.form.easyCode': 'EasyCode',
- 'header.modal.form.edit': '琛ㄥ崟-缂栬緫',
'model.action': '鎸夐挳',
- 'header.modal.action.copy': '鎸夐挳-澶嶅埗',
- 'header.modal.form.copy': '琛ㄥ崟-澶嶅埗',
- 'header.modal.column.edit': '鏄剧ず鍒�-缂栬緫',
- 'header.modal.gridbtn.edit': '鎿嶄綔鍒�-缂栬緫',
- 'header.modal.tabs.edit': '鏍囩-缂栬緫',
'form.required.input': 'Please enter the ',
'form.required.select': 'Please select a ',
'form.required.add': 'Please add ',
- 'model.tooltip.table.guide': '姝ゅ鍙互娣诲姞椤甸潰閰嶇疆鐩稿叧鐨勫父鐢ㄨ〃锛屽彲閫氳繃宸ュ叿鏍忎腑鐨勬坊鍔犳寜閽紝鍙壒閲忔坊鍔犺〃鏍肩浉鍏冲瓧娈点��',
- 'model.tooltip.search.guide': '鍦ㄥ乏渚у伐鍏锋爮銆婃悳绱€�嬩腑锛岄�夋嫨瀵瑰簲鎼滅储妗嗘嫋鑷虫澶勬坊鍔狅紱鎴栫偣鍑绘寜閽�婃坊鍔犳悳绱㈡潯浠躲�嬫壒閲忔坊鍔狅紝閫夋嫨鎵归噺娣诲姞鏃讹紝闇�鎻愬墠閫夋嫨浣跨敤琛ㄣ��',
- 'model.tooltip.action.guide': '鍦ㄥ乏渚у伐鍏锋爮銆婃寜閽�嬩腑锛岄�夋嫨瀵瑰簲绫诲瀷鐨勬寜閽嫋鑷虫澶勬坊鍔狅紝濡傞�夋嫨鎸夐挳绫诲瀷涓鸿〃鍗曘�佹柊鏍囩椤电瓑鍚湁閰嶇疆椤甸潰鐨勬寜閽紝鍙湪宸︿晶宸ュ叿鏍�-鎸夐挳-鍙厤缃寜閽锛岀偣鍑绘寜閽畬鎴愮浉鍏抽厤缃�傛敞锛氬綋璁剧疆鎸夐挳鏄剧ず浣嶇疆涓鸿〃鏍兼椂锛屾樉绀哄垪浼氬鍔犳搷浣滃垪銆�',
- 'model.tooltip.column.guide': '鍦ㄥ乏渚у伐鍏锋爮銆婃樉绀哄垪銆嬩腑锛岄�夋嫨瀵瑰簲绫诲瀷鐨勬樉绀哄垪鎷栬嚦姝ゅ娣诲姞锛涙垨鐐瑰嚮銆婃坊鍔犳樉绀哄垪銆嬫寜閽壒閲忔坊鍔狅紝閫夋嫨鎵归噺娣诲姞鏃讹紝闇�鎻愬墠閫夋嫨浣跨敤琛ㄣ�傛敞锛氭坊鍔犲悎骞跺垪鏃讹紝闇�璁剧疆鍙�夊垪銆�',
- 'model.tooltip.tabs.guide': '鍦ㄥ乏渚у伐鍏锋爮銆婃爣绛鹃〉銆嬩腑锛岄�夋嫨瀵瑰簲绫诲瀷鐨勬爣绛鹃〉鎷栬嚦姝ゅ娣诲姞銆�',
'model.tooltip.func.innerface': '鍑芥暟鍚嶇О闇�浠ableField绛夊瓧绗﹀紑濮�;',
}
\ No newline at end of file
diff --git a/src/locales/zh-CN/model.js b/src/locales/zh-CN/model.js
index cddbf3b..035823e 100644
--- a/src/locales/zh-CN/model.js
+++ b/src/locales/zh-CN/model.js
@@ -176,9 +176,6 @@
'header.form.action.LogicDelete': '閫昏緫鍒犻櫎',
'header.form.action.delete': '鐗╃悊鍒犻櫎',
'header.form.valueField': '鍊悸峰瓧娈�',
- 'header.form.valueText': '鏂囨湰路瀛楁',
- 'header.form.orderBy': '鎺掑簭路瀛楁',
- 'header.form.orderType': '鎺掑簭鏂瑰紡',
'header.form.match': '鍖归厤妯″紡',
'header.form.matchVal': '鍖归厤鍊�',
'header.form.asc': '姝ｅ簭',
@@ -188,58 +185,19 @@
'header.form.button': '鎸夐挳',
'model.form.style': '椋庢牸',
'model.form.color': '棰滆壊',
- 'header.form.order': '鎺掑垪',
- 'header.form.horizontal': '妯悜',
- 'header.form.vertical': '绾靛悜',
- 'header.form.vertical2': '绾靛悜(2鍒�)',
- 'header.form.topPicBottomText': '涓婂浘涓嬫枃',
- 'header.form.leftPicRightText': '宸﹀浘鍙虫枃',
- 'model.form.selectItem.error': '涓嬫媺閫夐」璁剧疆閿欒锛�',
- 'header.form.readonly': '鍙',
- 'header.form.queryType': '鏌ヨ绫诲瀷',
- 'header.form.query': '鏌ヨ',
- 'header.form.statistics': '缁熻',
- 'header.form.database': '鏁版嵁搴�',
- 'header.form.database.local': '鏈湴',
- 'header.form.database.sso': '绯荤粺',
- 'header.form.linkMain': '鍏宠仈涓昏〃',
'model.query.delete': '纭畾鍒犻櫎鍚�?',
- 'header.form.up': '涓婄Щ',
- 'header.form.down': '涓嬬Щ',
'header.form.status.change': '鐘舵�佸垏鎹�',
'model.status.forbidden': '绂佺敤',
'model.status.open': '鍚敤',
- 'header.form.readin': '鑷姩濉厖',
- 'header.form.pagination': '鍒嗛〉',
- 'header.form.regular': '姝ｅ垯鏍￠獙',
- 'header.form.quickadd': '蹇嵎娣诲姞',
'model.form.funcbutton': '鍔熻兘鎸夐挳',
- 'header.form.funcType': '鍔熻兘绫诲瀷',
- 'header.form.func.changeuser': '鍒囨崲鐢ㄦ埛',
- 'header.form.func.print': '鎵撳嵃',
'model.form.execMode': '鎵ц鏂瑰紡',
- 'header.form.thawbutton': '瑙ｅ喕鎸夐挳',
- 'header.form.maxRows': '鏈�澶ц鏁�',
'header.form.paste': '绮樿创',
'header.form.ratio': '姣斾緥',
'header.form.blacklist': '榛戝悕鍗�',
'model.form.linkmenu': '鍏宠仈鑿滃崟',
- 'header.form.clickscale': '鐐瑰嚮缂╂斁',
- 'header.form.easyCode': '鍔╄鐮�',
- 'header.modal.form.edit': '琛ㄥ崟-缂栬緫',
'model.action': '鎸夐挳',
- 'header.modal.action.copy': '鎸夐挳-澶嶅埗',
- 'header.modal.form.copy': '琛ㄥ崟-澶嶅埗',
- 'header.modal.column.edit': '鏄剧ず鍒�-缂栬緫',
- 'header.modal.gridbtn.edit': '鎿嶄綔鍒�-缂栬緫',
- 'header.modal.tabs.edit': '鏍囩-缂栬緫',
'form.required.input': '璇疯緭鍏�',
'form.required.select': '璇烽�夋嫨',
'form.required.add': '璇锋坊鍔�',
- 'model.tooltip.table.guide': '娣诲姞椤甸潰閰嶇疆鐩稿叧鐨勫父鐢ㄨ〃锛屽彲閫氳繃甯哥敤琛ㄥ瓧娈垫壒閲忔坊鍔犳悳绱㈡潯浠躲�佹樉绀哄垪銆佹暟鎹簮瀛楁闆嗙瓑銆�',
- 'model.tooltip.search.guide': '鍦ㄥ乏渚у伐鍏锋爮銆婃悳绱€�嬩腑锛岄�夋嫨瀵瑰簲鎼滅储妗嗘嫋鑷虫澶勬坊鍔狅紱鎴栫偣鍑绘寜閽�婃坊鍔犳悳绱㈡潯浠躲�嬫壒閲忔坊鍔狅紝閫夋嫨鎵归噺娣诲姞鏃讹紝闇�鎻愬墠閫夋嫨浣跨敤琛ㄣ��',
- 'model.tooltip.action.guide': '鍦ㄥ乏渚у伐鍏锋爮銆婃寜閽�嬩腑锛岄�夋嫨瀵瑰簲绫诲瀷鐨勬寜閽嫋鑷虫澶勬坊鍔狅紝濡傞�夋嫨鎸夐挳绫诲瀷涓鸿〃鍗曘�佹柊鏍囩椤电瓑鍚湁閰嶇疆椤甸潰鐨勬寜閽紝鍙湪宸︿晶宸ュ叿鏍�-鎸夐挳-鍙厤缃寜閽锛岀偣鍑绘寜閽畬鎴愮浉鍏抽厤缃�傛敞锛氬綋璁剧疆鎸夐挳鏄剧ず浣嶇疆涓鸿〃鏍兼椂锛屾樉绀哄垪浼氬鍔犳搷浣滃垪銆�',
- 'model.tooltip.column.guide': '鍦ㄥ乏渚у伐鍏锋爮銆婃樉绀哄垪銆嬩腑锛岄�夋嫨瀵瑰簲绫诲瀷鐨勬樉绀哄垪鎷栬嚦姝ゅ娣诲姞锛涙垨鐐瑰嚮銆婃坊鍔犳樉绀哄垪銆嬫寜閽壒閲忔坊鍔狅紝閫夋嫨鎵归噺娣诲姞鏃讹紝闇�鎻愬墠閫夋嫨浣跨敤琛ㄣ�傛敞锛氭坊鍔犲悎骞跺垪鏃讹紝闇�璁剧疆鍙�夊垪銆�',
- 'model.tooltip.tabs.guide': '鍦ㄥ乏渚у伐鍏锋爮銆婃爣绛鹃〉銆嬩腑锛岄�夋嫨瀵瑰簲绫诲瀷鐨勬爣绛鹃〉鎷栬嚦姝ゅ娣诲姞銆�',
'model.tooltip.func.innerface': '鍑芥暟鍚嶇О闇�浠ableField绛夊瓧绗﹀紑濮�;',
}
\ No newline at end of file
diff --git a/src/menu/components/chart/antv-bar/chartcompile/formconfig.jsx b/src/menu/components/chart/antv-bar/chartcompile/formconfig.jsx
index 5a05c54..5be7778 100644
--- a/src/menu/components/chart/antv-bar/chartcompile/formconfig.jsx
+++ b/src/menu/components/chart/antv-bar/chartcompile/formconfig.jsx
@@ -167,8 +167,8 @@
tooltip: '缁熻鍥捐〃閫傜敤浜庡睍绀烘暟鎹被鍨嬩负鍔ㄦ�佸�笺��',
required: false,
options: [
- { value: 'query', text: Formdict['header.form.query'] },
- { value: 'statistics', text: Formdict['header.form.statistics'] }
+ { value: 'query', text: '鏌ヨ' },
+ { value: 'statistics', text: '缁熻' }
]
}, {
type: 'select',
diff --git a/src/menu/components/share/actioncomponent/formconfig.jsx b/src/menu/components/share/actioncomponent/formconfig.jsx
index f910a4e..c29592b 100644
--- a/src/menu/components/share/actioncomponent/formconfig.jsx
+++ b/src/menu/components/share/actioncomponent/formconfig.jsx
@@ -82,7 +82,7 @@
const isApp = ['pc', 'mob'].includes(appType)
let funTypes = [
- { value: 'changeuser', text: Formdict['header.form.func.changeuser'] },
+ { value: 'changeuser', text: '鍒囨崲鐢ㄦ埛' },
{ value: 'print', text: '鏍囩鎵撳嵃' },
{ value: 'closetab', text: '鏍囩鍏抽棴' },
]
@@ -122,7 +122,7 @@
{ value: 'custom', text: '閾炬帴' }
]
funTypes = [
- { value: 'changeuser', text: Formdict['header.form.func.changeuser'] },
+ { value: 'changeuser', text: '鍒囨崲鐢ㄦ埛' },
]
opentypes = opentypes.filter(item => item.value !== 'tab')
}
@@ -157,7 +157,7 @@
{
type: 'select',
key: 'funcType',
- label: Formdict['header.form.funcType'],
+ label: '鍔熻兘绫诲瀷',
initVal: card.funcType || '',
required: true,
options: funTypes
@@ -539,7 +539,7 @@
{
type: 'radio',
key: 'pagination',
- label: Formdict['header.form.pagination'],
+ label: '鍒嗛〉',
initVal: card.pagination || 'false',
required: false,
options: [{
diff --git a/src/menu/components/table/edit-table/columns/tableIn/index.jsx b/src/menu/components/table/edit-table/columns/tableIn/index.jsx
index 8079458..33b21b2 100644
--- a/src/menu/components/table/edit-table/columns/tableIn/index.jsx
+++ b/src/menu/components/table/edit-table/columns/tableIn/index.jsx
@@ -150,9 +150,9 @@
dataIndex: 'operation',
render: (text, record) =>
(<div>
- <span className="operation-btn" title={this.props.dict['model.edit']} onClick={() => this.handleEdit(record, 'scripts')} style={{color: '#1890ff'}}><Icon type="edit" /></span>
- <span className="operation-btn" title={this.props.dict['header.form.up']} onClick={() => this.handleUpDown(record, 'scripts', 'up')} style={{color: '#1890ff'}}><Icon type="arrow-up" /></span>
- <span className="operation-btn" title={this.props.dict['header.form.down']} onClick={() => this.handleUpDown(record, 'scripts', 'down')} style={{color: '#ff4d4f'}}><Icon type="arrow-down" /></span>
+ <span className="operation-btn" onClick={() => this.handleEdit(record, 'scripts')} style={{color: '#1890ff'}}><Icon type="edit" /></span>
+ <span className="operation-btn" onClick={() => this.handleUpDown(record, 'scripts', 'up')} style={{color: '#1890ff'}}><Icon type="arrow-up" /></span>
+ <span className="operation-btn" onClick={() => this.handleUpDown(record, 'scripts', 'down')} style={{color: '#ff4d4f'}}><Icon type="arrow-down" /></span>
<span className="operation-btn" title={this.props.dict['header.form.status.change']} onClick={() => this.handleStatus(record, 'scripts')} style={{color: '#8E44AD'}}><Icon type="swap" /></span>
<Popconfirm
overlayClassName="popover-confirm"
diff --git a/src/menu/components/table/normal-table/columns/editColumn/formconfig.jsx b/src/menu/components/table/normal-table/columns/editColumn/formconfig.jsx
index a703766..dc56d65 100644
--- a/src/menu/components/table/normal-table/columns/editColumn/formconfig.jsx
+++ b/src/menu/components/table/normal-table/columns/editColumn/formconfig.jsx
@@ -319,8 +319,8 @@
{
type: 'radio',
key: 'scale',
- label: Formdict['header.form.clickscale'],
- initVal: card.scale || 'false',
+ label: '鐐瑰嚮缂╂斁',
+ initVal: card.scale || 'true',
required: false,
options: [{
value: 'true',
diff --git a/src/templates/comtableconfig/menuform/index.jsx b/src/templates/comtableconfig/menuform/index.jsx
index 6461cc3..cbf66a2 100644
--- a/src/templates/comtableconfig/menuform/index.jsx
+++ b/src/templates/comtableconfig/menuform/index.jsx
@@ -207,7 +207,7 @@
</Form.Item>
</Col>
<Col span={24}>
- <Form.Item label={dict['header.form.easyCode']}>
+ <Form.Item label="鍔╄鐮�">
{getFieldDecorator('easyCode', {
initialValue: config.easyCode,
rules: [
diff --git a/src/templates/formtabconfig/index.jsx b/src/templates/formtabconfig/index.jsx
index ae8ce10..321f242 100644
--- a/src/templates/formtabconfig/index.jsx
+++ b/src/templates/formtabconfig/index.jsx
@@ -1946,7 +1946,7 @@
</DndProvider>
{/* 缂栬緫琛ㄥ崟 */}
<Modal
- title={this.state.card && this.state.card.iscopy ? this.state.dict['header.modal.form.copy'] : this.state.dict['header.modal.form.edit']}
+ title={this.state.card && this.state.card.iscopy ? '琛ㄥ崟-澶嶅埗' : '琛ㄥ崟-缂栬緫'}
visible={modaltype === 'search'}
width={700}
maskClosable={false}
diff --git a/src/templates/modalconfig/source.jsx b/src/templates/modalconfig/source.jsx
index 8a514cd..230eeb8 100644
--- a/src/templates/modalconfig/source.jsx
+++ b/src/templates/modalconfig/source.jsx
@@ -179,7 +179,7 @@
},
{
type: 'form',
- label: CommonDict['header.form.linkMain'],
+ label: '鍏宠仈涓昏〃',
subType: 'linkMain',
}
]
diff --git a/src/templates/sharecomponent/actioncomponent/index.jsx b/src/templates/sharecomponent/actioncomponent/index.jsx
index 635027e..191b031 100644
--- a/src/templates/sharecomponent/actioncomponent/index.jsx
+++ b/src/templates/sharecomponent/actioncomponent/index.jsx
@@ -864,7 +864,7 @@
return (
<div className="model-table-action-list" style={config.charts.length > 1 ? {paddingTop: 25} : null}>
- <Tooltip placement="bottomLeft" overlayClassName="middle" title={dict['model.tooltip.action.guide']}>
+ <Tooltip placement="bottomLeft" overlayClassName="middle" title="鍦ㄥ乏渚у伐鍏锋爮銆婃寜閽�嬩腑锛岄�夋嫨瀵瑰簲绫诲瀷鐨勬寜閽嫋鑷虫澶勬坊鍔狅紝濡傞�夋嫨鎸夐挳绫诲瀷涓鸿〃鍗曘�佹柊鏍囩椤电瓑鍚湁閰嶇疆椤甸潰鐨勬寜閽紝鍙湪宸︿晶宸ュ叿鏍�-鎸夐挳-鍙厤缃寜閽锛岀偣鍑绘寜閽畬鎴愮浉鍏抽厤缃�傛敞锛氬綋璁剧疆鎸夐挳鏄剧ず浣嶇疆涓鸿〃鏍兼椂锛屾樉绀哄垪浼氬鍔犳搷浣滃垪銆�">
<QuestionCircleOutlined style={{color: '#c49f47', position: 'absolute', left: '5px', top: '5px'}} />
</Tooltip>
<DragElement
diff --git a/src/templates/sharecomponent/actioncomponent/verifyprint/editable/index.jsx b/src/templates/sharecomponent/actioncomponent/verifyprint/editable/index.jsx
index 54b7ec4..4d8d4d8 100644
--- a/src/templates/sharecomponent/actioncomponent/verifyprint/editable/index.jsx
+++ b/src/templates/sharecomponent/actioncomponent/verifyprint/editable/index.jsx
@@ -114,11 +114,10 @@
render: (text, record) =>
this.state.dataSource.length >= 1 ? (
<div>
- <span className="operation-btn" title={props.dict['header.form.up']} onClick={() => this.handleUpDown(record, 'up')} style={{color: '#1890ff'}}><Icon type="arrow-up" /></span>
- <span className="operation-btn" title={props.dict['header.form.down']} onClick={() => this.handleUpDown(record, 'down')} style={{color: '#ff4d4f'}}><Icon type="arrow-down" /></span>
+ <span className="operation-btn" onClick={() => this.handleUpDown(record, 'up')} style={{color: '#1890ff'}}><Icon type="arrow-up" /></span>
+ <span className="operation-btn" onClick={() => this.handleUpDown(record, 'down')} style={{color: '#ff4d4f'}}><Icon type="arrow-down" /></span>
<Popconfirm
overlayClassName="popover-confirm"
- title={props.dict['model.query.delete']}
onConfirm={() => this.handleDelete(record.key)
}>
<span style={{color: '#1890ff', cursor: 'pointer'}}><Icon type="delete" /></span>
diff --git a/src/templates/sharecomponent/actioncomponent/verifyprint/index.jsx b/src/templates/sharecomponent/actioncomponent/verifyprint/index.jsx
index 7b796c3..5f7e68e 100644
--- a/src/templates/sharecomponent/actioncomponent/verifyprint/index.jsx
+++ b/src/templates/sharecomponent/actioncomponent/verifyprint/index.jsx
@@ -353,7 +353,7 @@
</Form.Item>
</Col>
<Col span={24}>
- <EditTable data={verify.printerTypeList} dict={this.props.dict} ref="editTable"/>
+ <EditTable data={verify.printerTypeList} ref="editTable"/>
</Col>
</Row>
</Form>
diff --git a/src/templates/sharecomponent/columncomponent/colspanform/index.jsx b/src/templates/sharecomponent/columncomponent/colspanform/index.jsx
index 5a7f9b8..0c9be7e 100644
--- a/src/templates/sharecomponent/columncomponent/colspanform/index.jsx
+++ b/src/templates/sharecomponent/columncomponent/colspanform/index.jsx
@@ -179,22 +179,22 @@
</Form.Item>
</Col>
<Col span={12}>
- <Form.Item label={this.props.dict['header.form.order']}>
+ <Form.Item label="鎺掑垪">
{getFieldDecorator('order', {
initialValue: card.order,
rules: [
{
required: true,
- message: this.props.dict['form.required.select'] + this.props.dict['header.form.order'] + '!'
+ message: this.props.dict['form.required.select'] + '鎺掑垪!'
}
]
})(
<Select getPopupContainer={() => document.getElementById('columncolspan')} >
- <Select.Option value="vertical">{this.props.dict['header.form.vertical']}</Select.Option>
- <Select.Option value="horizontal">{this.props.dict['header.form.horizontal']}</Select.Option>
- <Select.Option value="vertical2">{this.props.dict['header.form.vertical2']}</Select.Option>
- <Select.Option value="topPicBottomText">{this.props.dict['header.form.topPicBottomText']}</Select.Option>
- <Select.Option value="leftPicRightText">{this.props.dict['header.form.leftPicRightText']}</Select.Option>
+ <Select.Option value="vertical">绾靛悜</Select.Option>
+ <Select.Option value="horizontal">妯悜</Select.Option>
+ <Select.Option value="vertical2">绾靛悜(2鍒�)</Select.Option>
+ <Select.Option value="topPicBottomText">涓婂浘涓嬫枃</Select.Option>
+ <Select.Option value="leftPicRightText">宸﹀浘鍙虫枃</Select.Option>
</Select>
)}
</Form.Item>
diff --git a/src/templates/sharecomponent/columncomponent/gridbtnform/index.jsx b/src/templates/sharecomponent/columncomponent/gridbtnform/index.jsx
index 17b5968..6d701af 100644
--- a/src/templates/sharecomponent/columncomponent/gridbtnform/index.jsx
+++ b/src/templates/sharecomponent/columncomponent/gridbtnform/index.jsx
@@ -44,35 +44,7 @@
label: this.props.dict['model.form.columnWidth'],
initVal: this.props.card.Width,
required: true
- },
- // {
- // type: 'select',
- // key: 'style',
- // label: this.props.dict['model.form.style'],
- // initVal: this.props.card.style,
- // required: true,
- // options: [{
- // MenuID: 'button',
- // text: this.props.dict['header.form.button']
- // }, {
- // MenuID: 'text',
- // text: this.props.dict['model.form.href']
- // }]
- // },
- // {
- // type: 'select',
- // key: 'show',
- // label: this.props.dict['header.form.order'],
- // initVal: this.props.card.show,
- // required: true,
- // options: [{
- // MenuID: 'horizontal',
- // text: this.props.dict['header.form.horizontal']
- // }, {
- // MenuID: 'vertical',
- // text: this.props.dict['header.form.vertical']
- // }]
- // }
+ }
]
}
diff --git a/src/templates/sharecomponent/columncomponent/index.jsx b/src/templates/sharecomponent/columncomponent/index.jsx
index ac3da97..d9ced0d 100644
--- a/src/templates/sharecomponent/columncomponent/index.jsx
+++ b/src/templates/sharecomponent/columncomponent/index.jsx
@@ -501,7 +501,7 @@
return (
<div className="model-table-column-list">
- <Tooltip placement="bottomLeft" overlayClassName="middle" title={dict['model.tooltip.column.guide']}>
+ <Tooltip placement="bottomLeft" overlayClassName="middle" title="鍦ㄥ乏渚у伐鍏锋爮銆婃樉绀哄垪銆嬩腑锛岄�夋嫨瀵瑰簲绫诲瀷鐨勬樉绀哄垪鎷栬嚦姝ゅ娣诲姞锛涙垨鐐瑰嚮銆婃坊鍔犳樉绀哄垪銆嬫寜閽壒閲忔坊鍔狅紝閫夋嫨鎵归噺娣诲姞鏃讹紝闇�鎻愬墠閫夋嫨浣跨敤琛ㄣ�傛敞锛氭坊鍔犲悎骞跺垪鏃讹紝闇�璁剧疆鍙�夊垪銆�">
<QuestionCircleOutlined style={{color: '#c49f47', position: 'relative', left: '-15px', top: '5px'}} />
</Tooltip>
{columnlist && columnlist.length > 0 ?
@@ -522,7 +522,7 @@
/>
{/* 鏄剧ず鍒楃紪杈� */}
<Modal
- title={dict['header.modal.column.edit']}
+ title="鏄剧ず鍒�-缂栬緫"
visible={modaltype === 'columns'}
width={800}
maskClosable={false}
@@ -559,7 +559,7 @@
</Modal>
{/* 鎿嶄綔鍒楃紪杈� */}
<Modal
- title={dict['header.modal.gridbtn.edit']}
+ title="鎿嶄綔鍒�-缂栬緫"
visible={modaltype === 'gridbtn'}
width={800}
maskClosable={false}
diff --git a/src/templates/sharecomponent/columncomponent/markcolumn/index.jsx b/src/templates/sharecomponent/columncomponent/markcolumn/index.jsx
index f98be64..45662b3 100644
--- a/src/templates/sharecomponent/columncomponent/markcolumn/index.jsx
+++ b/src/templates/sharecomponent/columncomponent/markcolumn/index.jsx
@@ -113,12 +113,11 @@
render: (text, record) =>
(
<div>
- <span className="operation-btn" title={this.props.dict['model.edit']} onClick={() => this.handleEdit(record)} style={{color: '#1890ff'}}><Icon type="edit" /></span>
- <span className="operation-btn" title={this.props.dict['header.form.up']} onClick={() => this.handleUpDown(record, 'up')} style={{color: '#1890ff'}}><Icon type="arrow-up" /></span>
- <span className="operation-btn" title={this.props.dict['header.form.down']} onClick={() => this.handleUpDown(record, 'down')} style={{color: '#ff4d4f'}}><Icon type="arrow-down" /></span>
+ <span className="operation-btn" onClick={() => this.handleEdit(record)} style={{color: '#1890ff'}}><Icon type="edit" /></span>
+ <span className="operation-btn" onClick={() => this.handleUpDown(record, 'up')} style={{color: '#1890ff'}}><Icon type="arrow-up" /></span>
+ <span className="operation-btn" onClick={() => this.handleUpDown(record, 'down')} style={{color: '#ff4d4f'}}><Icon type="arrow-down" /></span>
<Popconfirm
overlayClassName="popover-confirm"
- title={this.props.dict['model.query.delete']}
onConfirm={() => this.handleDelete(record)
}>
<span className="operation-btn" style={{color: '#ff4d4f'}}><Icon type="delete" /></span>
diff --git a/src/templates/sharecomponent/searchcomponent/index.jsx b/src/templates/sharecomponent/searchcomponent/index.jsx
index 18643d9..273fa6c 100644
--- a/src/templates/sharecomponent/searchcomponent/index.jsx
+++ b/src/templates/sharecomponent/searchcomponent/index.jsx
@@ -342,7 +342,7 @@
return (
<div className={'model-table-search-list length' + searchlist.length}>
- <Tooltip placement="bottomLeft" overlayClassName="middle" title={dict['model.tooltip.search.guide']}>
+ <Tooltip placement="bottomLeft" overlayClassName="middle" title="鍦ㄥ乏渚у伐鍏锋爮銆婃悳绱€�嬩腑锛岄�夋嫨瀵瑰簲鎼滅储妗嗘嫋鑷虫澶勬坊鍔狅紱鎴栫偣鍑绘寜閽�婃坊鍔犳悳绱㈡潯浠躲�嬫壒閲忔坊鍔狅紝閫夋嫨鎵归噺娣诲姞鏃讹紝闇�鎻愬墠閫夋嫨浣跨敤琛ㄣ��">
<QuestionCircleOutlined style={{color: '#c49f47', position: 'relative', left: '-15px', top: '5px'}} />
</Tooltip>
<FieldsComponent config={{uuid: config.uuid, search: searchlist}} type="search" />
diff --git a/src/templates/sharecomponent/searchcomponent/searcheditable/index.jsx b/src/templates/sharecomponent/searchcomponent/searcheditable/index.jsx
index eb43982..4504389 100644
--- a/src/templates/sharecomponent/searchcomponent/searcheditable/index.jsx
+++ b/src/templates/sharecomponent/searchcomponent/searcheditable/index.jsx
@@ -113,11 +113,10 @@
render: (text, record) =>
this.state.dataSource.length >= 1 ? (
<div>
- <span className="operation-btn" title={props.dict['header.form.down']} onClick={() => this.handleUpDown(record, 'down')} style={{color: '#ff4d4f'}}><Icon type="arrow-down" /></span>
- <span className="operation-btn" title={props.dict['header.form.up']} onClick={() => this.handleUpDown(record, 'up')} style={{color: '#1890ff'}}><Icon type="arrow-up" /></span>
+ <span className="operation-btn" onClick={() => this.handleUpDown(record, 'down')} style={{color: '#ff4d4f'}}><Icon type="arrow-down" /></span>
+ <span className="operation-btn" onClick={() => this.handleUpDown(record, 'up')} style={{color: '#1890ff'}}><Icon type="arrow-up" /></span>
<Popconfirm
overlayClassName="popover-confirm"
- title={props.dict['model.query.delete']}
onConfirm={() => this.handleDelete(record.key)
}>
<span style={{color: '#ff4d4f', cursor: 'pointer'}}><Icon type="delete" /></span>
@@ -227,11 +226,10 @@
render: (text, record) =>
this.state.dataSource.length >= 1 ? (
<div>
- <span className="operation-btn" title={this.props.dict['header.form.up']} onClick={() => this.handleUpDown(record, 'up')} style={{color: '#1890ff'}}><Icon type="arrow-up" /></span>
- <span className="operation-btn" title={this.props.dict['header.form.down']} onClick={() => this.handleUpDown(record, 'down')} style={{color: '#ff4d4f'}}><Icon type="arrow-down" /></span>
+ <span className="operation-btn" onClick={() => this.handleUpDown(record, 'up')} style={{color: '#1890ff'}}><Icon type="arrow-up" /></span>
+ <span className="operation-btn" onClick={() => this.handleUpDown(record, 'down')} style={{color: '#ff4d4f'}}><Icon type="arrow-down" /></span>
<Popconfirm
overlayClassName="popover-confirm"
- title={this.props.dict['model.query.delete']}
onConfirm={() => this.handleDelete(record.key)
}>
<span style={{color: '#1890ff', cursor: 'pointer'}}><Icon type="delete" /></span>
diff --git a/src/templates/sharecomponent/searchcomponent/searchform/index.jsx b/src/templates/sharecomponent/searchcomponent/searchform/index.jsx
index 10232b9..8c0fb58 100644
--- a/src/templates/sharecomponent/searchcomponent/searchform/index.jsx
+++ b/src/templates/sharecomponent/searchcomponent/searchform/index.jsx
@@ -726,7 +726,7 @@
} else {
notification.warning({
top: 92,
- message: this.props.dict['model.form.selectItem.error'],
+ message: '涓嬫媺閫夐」璁剧疆閿欒锛�',
duration: 5
})
}
diff --git a/src/templates/sharecomponent/tablecomponent/index.jsx b/src/templates/sharecomponent/tablecomponent/index.jsx
index abb58fe..d67b39e 100644
--- a/src/templates/sharecomponent/tablecomponent/index.jsx
+++ b/src/templates/sharecomponent/tablecomponent/index.jsx
@@ -275,7 +275,7 @@
{/* 琛ㄥ悕娣诲姞 */}
<div className="ant-col ant-form-item-label">
<label>
- <Tooltip placement="topLeft" title={dict['model.tooltip.table.guide']}>
+ <Tooltip placement="topLeft" title="姝ゅ鍙互娣诲姞椤甸潰閰嶇疆鐩稿叧鐨勫父鐢ㄨ〃锛屽彲閫氳繃宸ュ叿鏍忎腑鐨勬坊鍔犳寜閽紝鍙壒閲忔坊鍔犺〃鏍肩浉鍏冲瓧娈点��">
<QuestionCircleOutlined className="mk-form-tip" />
{dict['header.menu.table.add']}
</Tooltip>
diff --git a/src/templates/sharecomponent/tabscomponent/index.jsx b/src/templates/sharecomponent/tabscomponent/index.jsx
index 3db153a..43e9a29 100644
--- a/src/templates/sharecomponent/tabscomponent/index.jsx
+++ b/src/templates/sharecomponent/tabscomponent/index.jsx
@@ -392,7 +392,7 @@
{tabgroups.map((group, index) => {
return (
<div key={index} className="tab-line-list">
- {index === 0 ? <Tooltip placement="bottomLeft" overlayClassName="middle" title={dict['model.tooltip.tabs.guide']}>
+ {index === 0 ? <Tooltip placement="bottomLeft" overlayClassName="middle" title="鍦ㄥ乏渚у伐鍏锋爮銆婃爣绛鹃〉銆嬩腑锛岄�夋嫨瀵瑰簲绫诲瀷鐨勬爣绛鹃〉鎷栬嚦姝ゅ娣诲姞銆�">
<QuestionCircleOutlined style={{color: '#c49f47', position: 'absolute', left: '5px', top: '20px'}} />
</Tooltip> : null}
{index !== (tabgroups.length - 1) ?
@@ -413,7 +413,7 @@
})}
{/* 鏍囩缂栬緫 */}
<Modal
- title={dict['header.modal.tabs.edit']}
+ title="鏍囩-缂栬緫"
visible={visible}
width={750}
maskClosable={false}
diff --git a/src/templates/zshare/formconfig.jsx b/src/templates/zshare/formconfig.jsx
index ff31f6c..2d4fc3b 100644
--- a/src/templates/zshare/formconfig.jsx
+++ b/src/templates/zshare/formconfig.jsx
@@ -565,7 +565,7 @@
{
type: 'text',
key: 'valueText',
- label: Formdict['header.form.valueText'],
+ label: '鏂囨湰路瀛楁',
initVal: card.valueText || '',
required: true,
readonly: false
@@ -573,7 +573,7 @@
{
type: 'text',
key: 'orderBy',
- label: Formdict['header.form.orderBy'],
+ label: '鎺掑簭路瀛楁',
initVal: card.orderBy || '',
required: false,
readonly: false
@@ -581,7 +581,7 @@
{
type: 'select',
key: 'orderType',
- label: Formdict['header.form.orderType'],
+ label: '鎺掑簭鏂瑰紡',
initVal: card.orderType || 'asc',
options: [{
value: 'asc',
@@ -617,14 +617,14 @@
{
type: 'radio',
key: 'database',
- label: Formdict['header.form.database'],
+ label: '鏁版嵁搴�',
initVal: card.database || 'local',
options: [{
value: 'local',
- text: Formdict['header.form.database.local']
+ text: '鏈湴'
}, {
value: 'sso',
- text: Formdict['header.form.database.sso']
+ text: '绯荤粺'
}]
},
{
@@ -898,12 +898,12 @@
{
type: 'select',
key: 'funcType',
- label: Formdict['header.form.funcType'],
+ label: '鍔熻兘绫诲瀷',
initVal: card.funcType || '',
required: true,
options: [{
value: 'changeuser',
- text: Formdict['header.form.func.changeuser']
+ text: '鍒囨崲鐢ㄦ埛'
}, {
value: 'print',
text: '鏍囩鎵撳嵃'
@@ -1290,7 +1290,7 @@
{
type: 'radio',
key: 'pagination',
- label: Formdict['header.form.pagination'],
+ label: '鍒嗛〉',
initVal: card.pagination || 'false',
required: false,
options: [{
@@ -1665,8 +1665,8 @@
{
type: 'radio',
key: 'scale',
- label: Formdict['header.form.clickscale'],
- initVal: card.scale || 'false',
+ label: '鐐瑰嚮缂╂斁',
+ initVal: card.scale || 'true',
required: false,
options: [{
value: 'true',
@@ -1946,8 +1946,8 @@
readonly: !(setting.laypage === 'false'),
forbid: !['line', 'bar'].includes(card.chartType),
options: [
- { value: 'query', text: Formdict['header.form.query'] },
- { value: 'statistics', text: Formdict['header.form.statistics'] }
+ { value: 'query', text: '鏌ヨ' },
+ { value: 'statistics', text: '缁熻' }
]
},
{
@@ -2268,7 +2268,7 @@
text: '鍒嗛殧绾�'
}, {
value: 'linkMain',
- text: Formdict['header.form.linkMain']
+ text: '鍏宠仈涓昏〃'
}]
let _fieldlength = 50
@@ -2537,7 +2537,7 @@
{
type: 'text',
key: 'valueText',
- label: Formdict['header.form.valueText'],
+ label: '鏂囨湰路瀛楁',
initVal: card.valueText || '',
required: true,
readonly: false
@@ -2545,7 +2545,7 @@
{
type: 'text',
key: 'orderBy',
- label: Formdict['header.form.orderBy'],
+ label: '鎺掑簭路瀛楁',
initVal: card.orderBy || '',
required: false,
readonly: false
@@ -2553,7 +2553,7 @@
{
type: 'select',
key: 'orderType',
- label: Formdict['header.form.orderType'],
+ label: '鎺掑簭鏂瑰紡',
initVal: card.orderType || 'asc',
options: [{
value: 'asc',
@@ -2727,7 +2727,7 @@
min: 1,
max: 100,
precision: 0,
- label: appType === 'mob' ? '琛屾暟' : Formdict['header.form.maxRows'],
+ label: appType === 'mob' ? '琛屾暟' : '鏈�澶ц鏁�',
tooltip: appType === 'mob' ? '琛屾暟涓虹┖鏃讹紝楂樺害鑷�傚簲' : '',
initVal: card.maxRows || (appType === 'mob' ? '' : 6),
required: false
@@ -2735,7 +2735,7 @@
{
type: 'select',
key: 'regular',
- label: Formdict['header.form.regular'],
+ label: '姝ｅ垯鏍￠獙',
initVal: card.regular || '',
options: [{
value: '',
@@ -2800,7 +2800,7 @@
{
type: 'radio',
key: 'readonly',
- label: Formdict['header.form.readonly'],
+ label: '鍙',
initVal: card.readonly || 'false',
options: [{
value: 'true',
@@ -2839,14 +2839,14 @@
{
type: 'radio',
key: 'database',
- label: Formdict['header.form.database'],
+ label: '鏁版嵁搴�',
initVal: card.database || 'local',
options: [{
value: 'local',
- text: Formdict['header.form.database.local']
+ text: '鏈湴'
}, {
value: 'sso',
- text: Formdict['header.form.database.sso']
+ text: '绯荤粺'
}]
},
{
@@ -2883,7 +2883,7 @@
{
type: 'radio',
key: 'readin',
- label: Formdict['header.form.readin'],
+ label: '鑷姩濉厖',
tooltip: '鏄惁灏嗚〃鏍奸�変腑鐨勬暟鎹嚜鍔ㄥ～鍏呭埌琛ㄥ崟锛堝瓧娈电浉鍚岋級',
initVal: card.readin || 'true',
options: [{
diff --git a/src/templates/zshare/modalform/index.jsx b/src/templates/zshare/modalform/index.jsx
index 4860148..d4c4ea5 100644
--- a/src/templates/zshare/modalform/index.jsx
+++ b/src/templates/zshare/modalform/index.jsx
@@ -685,7 +685,7 @@
<Form.Item label={item.label} className="text-area">
{getFieldDecorator(item.key, {
initialValue: item.initVal
- })(<EditTable dict={this.props.dict} type={openType} linkSubFields={this.state.linkSubFields}/>)}
+ })(<EditTable type={openType} linkSubFields={this.state.linkSubFields}/>)}
</Form.Item>
</Col>
)
@@ -771,7 +771,7 @@
if (empty) {
notification.warning({
top: 92,
- message: this.props.dict['model.form.selectItem.error'],
+ message: '涓嬫媺閫夐」璁剧疆閿欒锛�',
duration: 5
})
return
diff --git a/src/templates/zshare/modalform/modaleditable/index.jsx b/src/templates/zshare/modalform/modaleditable/index.jsx
index 7944d0c..2af510f 100644
--- a/src/templates/zshare/modalform/modaleditable/index.jsx
+++ b/src/templates/zshare/modalform/modaleditable/index.jsx
@@ -109,7 +109,6 @@
class EditTable extends Component {
static propTpyes = {
- dict: PropTypes.object, // 瀛楀吀椤�
type: PropTypes.string, // 琛ㄥ崟绫诲瀷
linkSubFields: PropTypes.array, // 鍏宠仈瀛楁
onChange: PropTypes.func // 鏁版嵁鍙樺寲
@@ -124,7 +123,7 @@
}
UNSAFE_componentWillMount () {
- const { linkSubFields, type, dict } = this.props
+ const { linkSubFields, type } = this.props
let data = this.props['data-__meta'].initialValue
if (!data) {
@@ -167,11 +166,10 @@
render: (text, record) =>
this.state.dataSource.length >= 1 ? (
<div>
- <span className="operation-btn" title={dict['header.form.up']} onClick={() => this.handleUpDown(record, 'up')} style={{color: '#1890ff'}}><Icon type="arrow-up" /></span>
- <span className="operation-btn" title={dict['header.form.down']} onClick={() => this.handleUpDown(record, 'down')} style={{color: '#ff4d4f'}}><Icon type="arrow-down" /></span>
+ <span className="operation-btn" onClick={() => this.handleUpDown(record, 'up')} style={{color: '#1890ff'}}><Icon type="arrow-up" /></span>
+ <span className="operation-btn" onClick={() => this.handleUpDown(record, 'down')} style={{color: '#ff4d4f'}}><Icon type="arrow-down" /></span>
<Popconfirm
overlayClassName="popover-confirm"
- title={dict['model.query.delete']}
onConfirm={() => this.handleDelete(record.key)
}>
<span style={{color: '#ff4d4f', cursor: 'pointer'}}><Icon type="delete" /></span>
@@ -382,11 +380,10 @@
render: (text, record) =>
this.state.dataSource.length >= 1 ? (
<div>
- <span className="operation-btn" title={this.props.dict['header.form.up']} onClick={() => this.handleUpDown(record, 'up')} style={{color: '#1890ff'}}><Icon type="arrow-up" /></span>
- <span className="operation-btn" title={this.props.dict['header.form.down']} onClick={() => this.handleUpDown(record, 'down')} style={{color: '#ff4d4f'}}><Icon type="arrow-down" /></span>
+ <span className="operation-btn" onClick={() => this.handleUpDown(record, 'up')} style={{color: '#1890ff'}}><Icon type="arrow-up" /></span>
+ <span className="operation-btn" onClick={() => this.handleUpDown(record, 'down')} style={{color: '#ff4d4f'}}><Icon type="arrow-down" /></span>
<Popconfirm
overlayClassName="popover-confirm"
- title={this.props.dict['model.query.delete']}
onConfirm={() => this.handleDelete(record.key)
}>
<span style={{color: '#ff4d4f', cursor: 'pointer'}}><Icon type="delete" /></span>
diff --git a/src/utils/utils-datamanage.js b/src/utils/utils-datamanage.js
index 2ef1ab7..dc431c4 100644
--- a/src/utils/utils-datamanage.js
+++ b/src/utils/utils-datamanage.js
@@ -672,7 +672,7 @@
// 娴嬭瘯绯荤粺鎵撳嵃鏌ヨ璇彞
if ((options.sysType === 'local' && !window.GLOB.systemType) || window.debugger === true) {
- _customScript && console.info(`${setting.$name ? `/*${setting.$name} 鑷畾涔夎剼鏈紙鍚屾鏌ヨ锛�/\n` : ''}${_dataresource ? '' : '/*涓嶆墽琛岄粯璁ql*/\n'}${_customScript}`)
+ _customScript && console.info(`${setting.$name ? `/*${setting.$name} 鑷畾涔夎剼鏈紙鍚屾鏌ヨ锛�*/\n` : ''}${_dataresource ? '' : '/*涓嶆墽琛岄粯璁ql*/\n'}${_customScript}`)
_dataresource && console.info(`${setting.$name ? `/*${setting.$name} 鏁版嵁婧愶紙鍚屾鏌ヨ锛�*/\n` : ''}` + _dataresource)
}
--
Gitblit v1.8.0