From fda3c459010b29c765d7a66ecd291d265ee6436d Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 16 二月 2022 17:59:46 +0800
Subject: [PATCH] 2022-02-16
---
src/templates/zshare/modalform/index.jsx | 5 ++
src/menu/components/card/cardcellcomponent/index.jsx | 4 +-
src/templates/zshare/formconfig.jsx | 1
src/templates/formtabconfig/index.jsx | 2
src/tabviews/custom/components/table/normal-table/index.jsx | 2 +
src/menu/components/share/actioncomponent/index.jsx | 5 +-
src/tabviews/zshare/actionList/excelInbutton/index.jsx | 2
src/tabviews/zshare/actionList/printbutton/index.jsx | 2
public/options.json | 14 +++---
src/mob/components/formdragelement/card.jsx | 2
src/tabviews/zshare/actionList/exceloutbutton/index.jsx | 2
src/menu/components/form/formaction/index.jsx | 2
src/templates/sharecomponent/actioncomponent/index.jsx | 2
src/tabviews/zshare/actionList/normalbutton/index.jsx | 16 ++++++-
src/templates/modalconfig/dragelement/card.jsx | 2
src/tabviews/custom/components/card/data-card/index.jsx | 2 +
16 files changed, 43 insertions(+), 22 deletions(-)
diff --git a/public/options.json b/public/options.json
index f317ad5..0f5b891 100644
--- a/public/options.json
+++ b/public/options.json
@@ -1,17 +1,17 @@
{
- "appId": "201912040924165801464FF1788654BC5AC73",
- "appkey": "20191106103859640976D6E924E464D029CF0",
+ "appId": "202108312122504607B107A83F55B40C98CCF",
+ "appkey": "20210831212235413F287EC3BF489424496C8",
"mainSystemApi": "http://sso.mk9h.cn/cloud/webapi/dostars",
"systemType": "",
"externalDatabase": "false",
"lineColor": "",
"filter": "false",
- "defaultApp": "mk",
+ "defaultApp": "mkindustry",
"defaultLang": "zh-CN",
"WXAppID": "",
"debugger": false,
- "licenseKey": "",
- "probation": "",
- "host": "http://qingqiumarket.cn",
- "service": "MKWMS/"
+ "licenseKey": "7EFE13KIKKILIJ7C8CFC",
+ "probation": "2021-12-31",
+ "host": "http://demo.mk9h.cn",
+ "service": "erp_new/"
}
\ No newline at end of file
diff --git a/src/menu/components/card/cardcellcomponent/index.jsx b/src/menu/components/card/cardcellcomponent/index.jsx
index db7b2ed..f388d44 100644
--- a/src/menu/components/card/cardcellcomponent/index.jsx
+++ b/src/menu/components/card/cardcellcomponent/index.jsx
@@ -676,7 +676,7 @@
</Modal>
{/* 缂栬緫鎸夐挳锛氬鍒躲�佺紪杈� */}
<Modal
- title={dict['model.action'] + '-' + (card && card.copyType === 'action' ? dict['model.copy'] : dict['model.edit'])}
+ title="鎸夐挳路缂栬緫"
visible={actvisible}
width={800}
maskClosable={false}
@@ -702,7 +702,7 @@
wrapClassName="model-table-action-verify-modal"
title={(card && card.label ? card.label + ' - ' : '') + '楠岃瘉淇℃伅'}
visible={profVisible}
- width={'75vw'}
+ width={'90vw'}
maskClosable={false}
okText={dict['model.submit']}
onOk={this.verifySubmit}
diff --git a/src/menu/components/form/formaction/index.jsx b/src/menu/components/form/formaction/index.jsx
index 12cc00f..5a19faa 100644
--- a/src/menu/components/form/formaction/index.jsx
+++ b/src/menu/components/form/formaction/index.jsx
@@ -248,7 +248,7 @@
wrapClassName="model-table-action-verify-modal"
title={'楠岃瘉淇℃伅'}
visible={profVisible}
- width={'75vw'}
+ width={'90vw'}
maskClosable={false}
okText={dict['model.submit']}
onOk={this.verifySubmit}
diff --git a/src/menu/components/share/actioncomponent/index.jsx b/src/menu/components/share/actioncomponent/index.jsx
index a924679..1504bbf 100644
--- a/src/menu/components/share/actioncomponent/index.jsx
+++ b/src/menu/components/share/actioncomponent/index.jsx
@@ -467,7 +467,8 @@
/>
{/* 缂栬緫鎸夐挳锛氬鍒躲�佺紪杈� */}
<Modal
- title={dict['model.action'] + '-' + (card && card.copyType === 'action' ? dict['model.copy'] : dict['model.edit'])}
+ // title={dict['model.action'] + '-' + (card && card.copyType === 'action' ? dict['model.copy'] : dict['model.edit'])}
+ title="鎸夐挳路缂栬緫"
visible={visible}
width={850}
maskClosable={false}
@@ -493,7 +494,7 @@
wrapClassName="model-table-action-verify-modal"
title={(card && card.label ? card.label + ' - ' : '') + '楠岃瘉淇℃伅'}
visible={profVisible}
- width={'75vw'}
+ width={'90vw'}
maskClosable={false}
okText={dict['model.submit']}
onOk={this.verifySubmit}
diff --git a/src/mob/components/formdragelement/card.jsx b/src/mob/components/formdragelement/card.jsx
index c16fd53..3b4a23c 100644
--- a/src/mob/components/formdragelement/card.jsx
+++ b/src/mob/components/formdragelement/card.jsx
@@ -195,7 +195,7 @@
>
{formItem}
{showField ? <div className="field-name" style={card.writein === 'false' ? {color: 'orange'} : {}}>
- {card.field}{card.hidden === 'true' ? '锛堥殣钘忥級' : ''}{card.readonly === 'true' ? '锛堝彧璇伙級' : ''}
+ {card.field}{card.hidden === 'true' ? '锛堥殣钘忥級' : ''}{card.readonly === 'true' ? '锛堝彧璇伙級' : ''}{card.linkField ? <span style={{color: '#1890ff'}}>{`锛堝叧鑱�${card.linkField}锛塦}</span> : ''}{card.supField ? <span style={{color: '#8E44AD'}}>{`锛堜笂绾�${card.supField}锛塦}</span> : ''}
</div> : ''}
</Form.Item>}
</div>
diff --git a/src/tabviews/custom/components/card/data-card/index.jsx b/src/tabviews/custom/components/card/data-card/index.jsx
index efb8f0e..ac76430 100644
--- a/src/tabviews/custom/components/card/data-card/index.jsx
+++ b/src/tabviews/custom/components/card/data-card/index.jsx
@@ -599,6 +599,8 @@
} catch (e) {
console.warn('鏁版嵁鏌ヨ閿欒')
}
+
+ MKEmitter.emit('resetSelectLine', config.uuid, _data.$$uuid || '', _data)
}
this.setState({
diff --git a/src/tabviews/custom/components/table/normal-table/index.jsx b/src/tabviews/custom/components/table/normal-table/index.jsx
index b7e0ba2..e96e837 100644
--- a/src/tabviews/custom/components/table/normal-table/index.jsx
+++ b/src/tabviews/custom/components/table/normal-table/index.jsx
@@ -318,6 +318,8 @@
} catch (e) {
console.warn('鏁版嵁鏌ヨ閿欒')
}
+
+ MKEmitter.emit('resetSelectLine', config.uuid, _data.$$uuid || '', _data)
}
this.setState({
diff --git a/src/tabviews/zshare/actionList/excelInbutton/index.jsx b/src/tabviews/zshare/actionList/excelInbutton/index.jsx
index dc4e82e..01eb659 100644
--- a/src/tabviews/zshare/actionList/excelInbutton/index.jsx
+++ b/src/tabviews/zshare/actionList/excelInbutton/index.jsx
@@ -191,7 +191,7 @@
execSuccess = (res) => {
const { btn } = this.props
- if (res && res.ErrCode === 'S') { // 鎵ц鎴愬姛
+ if (res && (res.ErrCode === 'S' || !res.ErrCode)) { // 鎵ц鎴愬姛
notification.success({
top: 92,
message: res.ErrMesg || this.state.dict['main.action.confirm.success'],
diff --git a/src/tabviews/zshare/actionList/exceloutbutton/index.jsx b/src/tabviews/zshare/actionList/exceloutbutton/index.jsx
index 7c91df8..d31fe59 100644
--- a/src/tabviews/zshare/actionList/exceloutbutton/index.jsx
+++ b/src/tabviews/zshare/actionList/exceloutbutton/index.jsx
@@ -858,7 +858,7 @@
execSuccess = (res) => {
const { btn } = this.props
- if (res && res.ErrCode === 'S') { // 鎵ц鎴愬姛
+ if (res && (res.ErrCode === 'S' || !res.ErrCode)) { // 鎵ц鎴愬姛
notification.success({
top: 92,
message: res.ErrMesg || this.state.dict['main.action.confirm.success'],
diff --git a/src/tabviews/zshare/actionList/normalbutton/index.jsx b/src/tabviews/zshare/actionList/normalbutton/index.jsx
index 61a8389..12daac6 100644
--- a/src/tabviews/zshare/actionList/normalbutton/index.jsx
+++ b/src/tabviews/zshare/actionList/normalbutton/index.jsx
@@ -1459,7 +1459,7 @@
const { btn } = this.props
const { btnconfig, autoMatic } = this.state
- if ((res && res.ErrCode === 'S') || autoMatic) { // 鎵ц鎴愬姛
+ if ((res && (res.ErrCode === 'S' || !res.ErrCode)) || autoMatic) { // 鎵ц鎴愬姛
notification.success({
top: 92,
message: res.ErrMesg || this.state.dict['main.action.confirm.success'],
@@ -1495,6 +1495,15 @@
if (btn.output) {
id = res.mk_b_id || res[btn.output] || ''
}
+ let tabId = ''
+ if (btn.refreshTab && btn.refreshTab.length > 0) {
+ tabId = btn.refreshTab[btn.refreshTab.length - 1]
+ }
+
+ if (tabId && btn.$MenuID === tabId) { // 鍒锋柊褰撳墠鑿滃崟鏃讹紝鍋滄鍏朵粬鎿嶄綔
+ MKEmitter.emit('reloadMenuView', tabId, 'table')
+ return
+ }
if (btn.execSuccess === 'closetab') {
MKEmitter.emit('closeTabView', btn.$MenuID)
@@ -1504,9 +1513,10 @@
MKEmitter.emit('refreshByButtonResult', btn.$menuId, btn.execSuccess, btn, id, this.state.selines)
}
- if (btn.refreshTab && btn.refreshTab.length > 0) {
- MKEmitter.emit('reloadMenuView', btn.refreshTab[btn.refreshTab.length - 1], 'table')
+ if (tabId) {
+ MKEmitter.emit('reloadMenuView', tabId, 'table')
}
+
if (btn.switchTab && btn.switchTab.length > 0) {
let id = btn.switchTab[btn.switchTab.length - 1]
let node = document.getElementById('tab' + id)
diff --git a/src/tabviews/zshare/actionList/printbutton/index.jsx b/src/tabviews/zshare/actionList/printbutton/index.jsx
index 90ae0dd..8d97947 100644
--- a/src/tabviews/zshare/actionList/printbutton/index.jsx
+++ b/src/tabviews/zshare/actionList/printbutton/index.jsx
@@ -1269,7 +1269,7 @@
const { btn } = this.props
const { autoMatic } = this.state
- if ((res && res.ErrCode === 'S') || autoMatic) { // 鎵ц鎴愬姛
+ if ((res && (res.ErrCode === 'S' || !res.ErrCode)) || autoMatic) { // 鎵ц鎴愬姛
notification.success({
top: 92,
message: res.ErrMesg || this.state.dict['main.action.confirm.success'],
diff --git a/src/templates/formtabconfig/index.jsx b/src/templates/formtabconfig/index.jsx
index 297b37b..4752fbd 100644
--- a/src/templates/formtabconfig/index.jsx
+++ b/src/templates/formtabconfig/index.jsx
@@ -2009,7 +2009,7 @@
wrapClassName="common-table-fields-modal"
title={'楠岃瘉淇℃伅'}
visible={this.state.profileVisible}
- width={'75vw'}
+ width={'90vw'}
maskClosable={false}
okText={this.state.dict['model.submit']}
onOk={this.verifySubmit}
diff --git a/src/templates/modalconfig/dragelement/card.jsx b/src/templates/modalconfig/dragelement/card.jsx
index 662a035..e2ab66e 100644
--- a/src/templates/modalconfig/dragelement/card.jsx
+++ b/src/templates/modalconfig/dragelement/card.jsx
@@ -156,7 +156,7 @@
>
{formItem}
{showField ? <div className="field-name" style={card.writein === 'false' ? {color: 'orange'} : {}}>
- {card.field}{card.hidden === 'true' ? '锛堥殣钘忥級' : ''}{card.readonly === 'true' ? '锛堝彧璇伙級' : ''}
+ {card.field}{card.hidden === 'true' ? '锛堥殣钘忥級' : ''}{card.readonly === 'true' ? '锛堝彧璇伙級' : ''}{card.linkField ? <span style={{color: '#1890ff'}}>{`锛堝叧鑱�${card.linkField}锛塦}</span> : ''}{card.supField ? <span style={{color: '#8E44AD'}}>{`锛堜笂绾�${card.supField}锛塦}</span> : ''}
</div> : ''}
</Form.Item>}
</div>
diff --git a/src/templates/sharecomponent/actioncomponent/index.jsx b/src/templates/sharecomponent/actioncomponent/index.jsx
index b1ff516..8a0a704 100644
--- a/src/templates/sharecomponent/actioncomponent/index.jsx
+++ b/src/templates/sharecomponent/actioncomponent/index.jsx
@@ -906,7 +906,7 @@
wrapClassName="model-table-action-verify-modal"
title={(card && card.label ? card.label + ' - ' : '') + '楠岃瘉淇℃伅'}
visible={profVisible}
- width={'75vw'}
+ width={'90vw'}
maskClosable={false}
okText={dict['model.submit']}
onOk={this.verifySubmit}
diff --git a/src/templates/zshare/formconfig.jsx b/src/templates/zshare/formconfig.jsx
index 90b2040..7cc7d9d 100644
--- a/src/templates/zshare/formconfig.jsx
+++ b/src/templates/zshare/formconfig.jsx
@@ -3247,6 +3247,7 @@
{
type: 'text',
key: 'supvalue',
+ max: 512,
label: '鏄剧ず鍊�',
tooltip: '璇峰～鍐欐樉绀哄�硷紝鍙湁涓婄骇琛ㄥ崟鍊间笌鏄剧ず鍊肩浉鍚屾椂锛岃琛ㄥ崟鎵嶄細鏄剧ず锛屾敞锛�1銆佸涓�肩敤閫楀彿鍒嗛殧锛�2銆佷笂绾ц〃鍗曞垵濮嬪�间负$first鏃舵殏鏈鐞嗐��',
initVal: card.supvalue || '',
diff --git a/src/templates/zshare/modalform/index.jsx b/src/templates/zshare/modalform/index.jsx
index b0d6203..d79df83 100644
--- a/src/templates/zshare/modalform/index.jsx
+++ b/src/templates/zshare/modalform/index.jsx
@@ -441,6 +441,11 @@
max: formRule.field.max,
message: formRule.field.maxMessage
})
+ } else if (item.max) {
+ rules.push({
+ max: item.max,
+ message: `${item.label}鏈�澶�${item.max}涓瓧绗
+ })
} else {
rules.push({
max: formRule.input.max,
--
Gitblit v1.8.0