From 46f59e30133c25f1f01074b1c92445f9e85b8c98 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 31 十二月 2019 15:58:37 +0800
Subject: [PATCH] 2019-12-31
---
src/templates/subtableconfig/index.jsx | 47 ++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 40 insertions(+), 7 deletions(-)
diff --git a/src/templates/subtableconfig/index.jsx b/src/templates/subtableconfig/index.jsx
index 0804431..325f49a 100644
--- a/src/templates/subtableconfig/index.jsx
+++ b/src/templates/subtableconfig/index.jsx
@@ -313,7 +313,16 @@
key: 'field',
label: this.state.dict['header.form.field'],
initVal: card.field,
+ tooltip: '瀛楁鍚嶅彲浠ヤ娇鐢ㄩ�楀彿鍒嗛殧锛岃繘琛屽瀛楁缁煎悎鎼滅储锛屾敞锛氱患鍚堟悳绱粎鍦ㄦ枃鏈被鍨嬫椂鏈夋晥',
+ tooltipClass: 'middle',
required: true,
+ rules: [{
+ pattern: /^[\u4E00-\u9FA50-9a-zA-Z,_]*$/ig,
+ message: '瀛楁鍚嶅彧鍏佽鍖呭惈鏁板瓧銆佸瓧姣嶃�佹眽瀛椾互鍙奯'
+ }, {
+ max: 50,
+ message: '瀛楁鍚嶆渶澶�50涓瓧绗︼紒'
+ }],
readonly: false
},
{
@@ -328,6 +337,9 @@
}, {
value: 'select',
text: this.state.dict['header.form.select']
+ }, {
+ value: 'multiselect',
+ text: this.state.dict['header.form.multiselect']
}, {
value: 'link',
text: this.state.dict['header.form.link']
@@ -760,6 +772,13 @@
label: this.state.dict['header.form.field'],
initVal: card.field,
required: true,
+ rules: [{
+ pattern: /^[\u4E00-\u9FA50-9a-zA-Z_]*$/ig,
+ message: '瀛楁鍚嶅彧鍏佽鍖呭惈鏁板瓧銆佸瓧姣嶃�佹眽瀛椾互鍙奯'
+ }, {
+ max: 50,
+ message: '瀛楁鍚嶆渶澶�50涓瓧绗︼紒'
+ }],
readonly: false
},
{
@@ -977,9 +996,15 @@
if (res.type === 'search') {
if ((res.values.type === 'select' || res.values.type === 'link') && res.values.resourceType === '1') {
- let sql = 'select ' + res.values.valueField + ',' + res.values.valueText + ' from ' + res.values.dataSource
+ let _datasource = res.values.dataSource
+
+ if (/\s/.test(_datasource)) {
+ _datasource = '(' + _datasource + ') tb'
+ }
+
+ let sql = 'select ' + res.values.valueField + ',' + res.values.valueText + ' from ' + _datasource
if (res.values.type === 'link') {
- sql = 'select ' + res.values.valueField + ',' + res.values.valueText + ',' + res.values.linkField + ' from ' + res.values.dataSource
+ sql = 'select ' + res.values.valueField + ',' + res.values.valueText + ',' + res.values.linkField + ' from ' + _datasource
}
if (res.values.orderBy) {
sql = sql + ' order by ' + res.values.orderBy + ' ' + res.values.orderType
@@ -2334,9 +2359,17 @@
onEnabledChange = () => {
const { config } = this.state
- this.setState({
- config: {...config, enabled: !config.enabled}
- })
+ if (config.setting.interType === 'inner' && !config.setting.innerFunc && !config.setting.dataresource) {
+ notification.warning({
+ top: 92,
+ message: '鑿滃崟灏氭湭璁剧疆鏁版嵁婧愶紝涓嶅彲鍚敤锛�',
+ duration: 10
+ })
+ } else {
+ this.setState({
+ config: {...config, enabled: !config.enabled}
+ })
+ }
}
onColumnNameChange = () => {
@@ -2439,7 +2472,7 @@
<Button
icon={item.icon}
style={{marginBottom: '10px'}}
- className={'mk-btn mk-' + item.class}
+ className={'config-button mk-btn mk-' + item.class}
onClick={() => this.setSubConfig(item)}
>{item.label}</Button>
</div>
@@ -2460,7 +2493,7 @@
<div className="setting">
<Card title={'鏍囩锛堝瓙琛級椤甸潰閰嶇疆'} bordered={false} extra={
<div>
- <Switch className="big" checkedChildren="鍚�" unCheckedChildren="鍋�" defaultChecked={this.state.config.enabled} onChange={this.onEnabledChange} />
+ <Switch className="big" checkedChildren="鍚�" unCheckedChildren="鍋�" checked={this.state.config.enabled} onChange={this.onEnabledChange} />
{/* <Button type="primary" onClick={this.changeTemplate}>{this.state.dict['header.menu.template.change']}</Button> */}
<Button type="primary" onClick={this.submitConfig} loading={this.state.menuloading}>{this.state.dict['header.save']}</Button>
<Button onClick={this.cancelConfig}>{this.state.dict['header.return']}</Button>
--
Gitblit v1.8.0