From 2aa5ab63b4bbce5c36dbb3511b205b3b5f6af9bd Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 07 五月 2024 11:34:20 +0800
Subject: [PATCH] 2024-05-07
---
src/templates/zshare/modalform/index.jsx | 2
src/tabviews/custom/components/chart/antv-X6/nodeupdate/nodeform.jsx | 4
src/menu/components/form/formaction/actionform/index.jsx | 2
src/menu/components/form/simple-form/index.jsx | 6 +
src/templates/sharecomponent/fieldscomponent/index.jsx | 2
src/tabviews/custom/components/form/step-form/index.scss | 20 +++-
src/tabviews/custom/components/module/invoice/index.jsx | 2
src/menu/components/form/step-form/options.jsx | 20 ++++
src/utils/utils.js | 9 +
src/tabviews/custom/components/chart/antv-X6/nodeupdate/index.jsx | 2
src/menu/components/form/formaction/formconfig.jsx | 20 ++++
src/tabviews/zshare/actionList/tabbutton/index.jsx | 4
src/menu/components/module/invoice/verifycard/baseform/index.jsx | 5 +
src/menu/components/form/step-form/index.jsx | 1
src/menu/stylecontroller/index.jsx | 2
src/templates/zshare/formconfig.jsx | 16 ++++
src/menu/components/form/tab-form/index.jsx | 1
src/menu/components/share/actioncomponent/formconfig.jsx | 10 ++
src/tabviews/custom/components/table/normal-table/index.jsx | 4 +
src/templates/zshare/verifycard/index.jsx | 2
src/tabviews/zshare/mutilform/index.jsx | 16 ++-
src/menu/components/share/actioncomponent/actionform/index.jsx | 2
src/tabviews/custom/components/form/step-form/index.jsx | 25 +++++-
src/menu/components/table/edit-table/columns/tableIn/customscript/index.jsx | 2
src/menu/debug/index.jsx | 2
src/templates/zshare/verifycard/baseform/index.jsx | 35 +++++---
26 files changed, 165 insertions(+), 51 deletions(-)
diff --git a/src/menu/components/form/formaction/actionform/index.jsx b/src/menu/components/form/formaction/actionform/index.jsx
index 827b091..58a9db3 100644
--- a/src/menu/components/form/formaction/actionform/index.jsx
+++ b/src/menu/components/form/formaction/actionform/index.jsx
@@ -57,7 +57,7 @@
} else if (this.record.type === 'close' || this.record.type === 'reset') {
shows = ['typeName', 'label']
} else {
- shows = ['typeName', 'label', 'intertype', 'Ot', 'execSuccess', 'syncComponent', 'anchors', 'linkmenu', 'output', 'reload', 'preButton'] // 閫夐」鍒楄〃
+ shows = ['typeName', 'label', 'intertype', 'Ot', 'execSuccess', 'syncComponent', 'anchors', 'linkmenu', 'output', 'reload', 'preButton', 'refreshTab'] // 閫夐」鍒楄〃
if (this.record.execSuccess === 'never') {
shows.push('resetForms')
diff --git a/src/menu/components/form/formaction/formconfig.jsx b/src/menu/components/form/formaction/formconfig.jsx
index 8bb1628..5d3565e 100644
--- a/src/menu/components/form/formaction/formconfig.jsx
+++ b/src/menu/components/form/formaction/formconfig.jsx
@@ -123,6 +123,14 @@
})
}
+ let closetab = []
+ if (!appType && viewType !== 'popview') {
+ closetab = [{
+ value: 'closetab',
+ text: '鍏抽棴鏍囩'
+ }]
+ }
+
let resets = []
fields.forEach(item => {
if (item.type !== 'text' && item.type !== 'number') return
@@ -431,7 +439,17 @@
}, {
value: 'mainline',
text: '鍒锋柊涓婄骇缁勪欢 - 琛�'
- }, ...refresh]
+ }, ...closetab, ...refresh]
+ },
+ {
+ type: 'cascader',
+ key: 'refreshTab',
+ label: '鍒锋柊鑿滃崟',
+ initVal: card.refreshTab || [],
+ tooltip: '鎵ц鎴愬姛鍚庯紙鎴栧姛鑳芥寜閽腑鏍囩鍏抽棴绫诲瀷锛夛紝闇�瑕佸悓姝ュ埛鏂扮殑鑿滃崟',
+ required: false,
+ forbid: appType === 'pc' || appType === 'mob' || viewType === 'popview',
+ options: menulist
},
{
type: (appType === 'pc' || appType === 'mob') ? 'select' : 'cascader',
diff --git a/src/menu/components/form/simple-form/index.jsx b/src/menu/components/form/simple-form/index.jsx
index a394711..2d1855a 100644
--- a/src/menu/components/form/simple-form/index.jsx
+++ b/src/menu/components/form/simple-form/index.jsx
@@ -481,6 +481,10 @@
pasteForm = (forms, res) => {
let _config = fromJS(this.state.card).toJS()
+ forms.forEach(item => {
+ delete item.focus
+ })
+
_config.subcards[0].fields = forms
if (res.subButton) {
@@ -511,8 +515,6 @@
}
})
} else {
- _config.subcards[0].fields = forms
-
this.updateComponent(_config)
}
}
diff --git a/src/menu/components/form/step-form/index.jsx b/src/menu/components/form/step-form/index.jsx
index b2a9e85..8704f5e 100644
--- a/src/menu/components/form/step-form/index.jsx
+++ b/src/menu/components/form/step-form/index.jsx
@@ -592,6 +592,7 @@
res.fields.forEach(item => {
item.uuid = Utils.getuuid()
+ delete item.focus
})
if (!res.prevButton) {
diff --git a/src/menu/components/form/step-form/options.jsx b/src/menu/components/form/step-form/options.jsx
index 1ec6a9e..647d7a0 100644
--- a/src/menu/components/form/step-form/options.jsx
+++ b/src/menu/components/form/step-form/options.jsx
@@ -128,9 +128,23 @@
{value: 'show', label: '鏄剧ず'},
{value: 'hidden', label: '闅愯棌'},
],
- // controlFields: [
- // {field: 'labelSize', values: ['show']},
- // ]
+ controlFields: [
+ // {field: 'labelSize', values: ['show']},
+ {field: 'labelJump', values: ['show']},
+ ]
+ },
+ {
+ type: 'radio',
+ field: 'labelJump',
+ label: '鍚嶇О鍒囨崲',
+ initval: wrap.labelJump || 'false',
+ tooltip: '寮�鍚椂锛屽彲閫氳繃鐐瑰嚮鍒嗙粍鍚嶇О鍚戝墠璺宠浆銆�',
+ required: false,
+ forbid: config.subtype === 'tabform',
+ options: [
+ {value: 'false', label: '鍏抽棴'},
+ {value: 'true', label: '寮�鍚�'},
+ ]
},
// {
// type: 'number',
diff --git a/src/menu/components/form/tab-form/index.jsx b/src/menu/components/form/tab-form/index.jsx
index ecc6b22..8ee36a7 100644
--- a/src/menu/components/form/tab-form/index.jsx
+++ b/src/menu/components/form/tab-form/index.jsx
@@ -597,6 +597,7 @@
res.fields.forEach(item => {
item.uuid = Utils.getuuid()
+ delete item.focus
})
delete res.prevButton
diff --git a/src/menu/components/module/invoice/verifycard/baseform/index.jsx b/src/menu/components/module/invoice/verifycard/baseform/index.jsx
index 3074d39..60a80d4 100644
--- a/src/menu/components/module/invoice/verifycard/baseform/index.jsx
+++ b/src/menu/components/module/invoice/verifycard/baseform/index.jsx
@@ -158,7 +158,10 @@
{verify.type === 'billout' ? <Col span={8}>
<Form.Item label="鍥炶皟琛ㄥ悕">
{getFieldDecorator('cbTable', {
- initialValue: verify.cbTable || ''
+ initialValue: verify.cbTable || '',
+ rules: [
+ { required: true, message: '璇疯緭鍏ヨ〃鍚�!' }
+ ]
})(
<Input autoComplete="off"/>
)}
diff --git a/src/menu/components/share/actioncomponent/actionform/index.jsx b/src/menu/components/share/actioncomponent/actionform/index.jsx
index 7c83d79..3faa23c 100644
--- a/src/menu/components/share/actioncomponent/actionform/index.jsx
+++ b/src/menu/components/share/actioncomponent/actionform/index.jsx
@@ -415,7 +415,7 @@
if (shows.includes('linkmenu') && this.record.linkmenu[0] === 'multiMenu') {
shows.push('multiMenus')
- } else if (this.record.sysId === 'js') {
+ } else if (Ot === 'notRequired' && this.record.sysId === 'js') {
shows.push('sign')
}
diff --git a/src/menu/components/share/actioncomponent/formconfig.jsx b/src/menu/components/share/actioncomponent/formconfig.jsx
index 937540a..c9f53f2 100644
--- a/src/menu/components/share/actioncomponent/formconfig.jsx
+++ b/src/menu/components/share/actioncomponent/formconfig.jsx
@@ -1535,10 +1535,13 @@
required: false,
options: [{
value: '',
- text: '绌�'
+ text: '缁勪欢BID'
}, {
value: 'js',
text: '鍓嶇鐢熸垚'
+ }, {
+ value: 'empty',
+ text: '绌�'
}]
},
{
@@ -2631,10 +2634,13 @@
required: false,
options: [{
value: '',
- text: '绌�'
+ text: '缁勪欢BID'
}, {
value: 'js',
text: '鍓嶇鐢熸垚'
+ }, {
+ value: 'empty',
+ text: '绌�'
}]
},
{
diff --git a/src/menu/components/table/edit-table/columns/tableIn/customscript/index.jsx b/src/menu/components/table/edit-table/columns/tableIn/customscript/index.jsx
index ad0da61..e1a539a 100644
--- a/src/menu/components/table/edit-table/columns/tableIn/customscript/index.jsx
+++ b/src/menu/components/table/edit-table/columns/tableIn/customscript/index.jsx
@@ -36,7 +36,7 @@
fields.push('jskey')
let sheet = btn.sheet.replace(/(.*)\.(.*)\.|@db@/ig, '')
- let _sql = `create table #${sheet} (${usefulfields.map(item => item.field + ' ' + item.datatype).join(',')},jskey nvarchar(50),data_type nvarchar(50),BID nvarchar(50))
+ let _sql = `create table #${sheet} (${usefulfields.map(item => item.field + ' ' + item.datatype).join(',')},jskey nvarchar(50),data_type nvarchar(50),BID nvarchar(256))
Declare @UserName nvarchar(50),@FullName nvarchar(50),@RoleID nvarchar(512),@mk_departmentcode nvarchar(512),@mk_organization nvarchar(512),@mk_user_type nvarchar(20),@mk_nation nvarchar(50),@mk_province nvarchar(50),@mk_city nvarchar(50),@mk_district nvarchar(50),@mk_address nvarchar(100),@ErrorCode nvarchar(50), @retmsg nvarchar(4000),@tbid Nvarchar(512)
Select @ErrorCode='', @retmsg=''
`
diff --git a/src/menu/debug/index.jsx b/src/menu/debug/index.jsx
index 17a1765..00257da 100644
--- a/src/menu/debug/index.jsx
+++ b/src/menu/debug/index.jsx
@@ -1714,7 +1714,7 @@
`
}
- sql = `create table #${sheet} (${declarefields.join(',')},jskey nvarchar(50),data_type nvarchar(50),BID nvarchar(50) )
+ sql = `create table #${sheet} (${declarefields.join(',')},jskey nvarchar(50),data_type nvarchar(50),BID nvarchar(256))
Declare @UserName nvarchar(50),@FullName nvarchar(50),@RoleID nvarchar(512),@mk_departmentcode nvarchar(512),@mk_organization nvarchar(512),@mk_user_type nvarchar(20),@mk_nation nvarchar(50),@mk_province nvarchar(50),@mk_city nvarchar(50),@mk_district nvarchar(50),@mk_address nvarchar(100),@ErrorCode nvarchar(50),@retmsg nvarchar(4000),@tbid Nvarchar(512)
Select @ErrorCode='', @retmsg='', @UserName='${userName}', @FullName='${fullName}', @RoleID='${RoleID}', @mk_departmentcode='${departmentcode}', @mk_organization='${organization}', @mk_user_type='${mk_user_type}', @mk_nation='${nation}', @mk_province='${province}', @mk_city='${city}', @mk_district='${district}', @mk_address='${address}'
diff --git a/src/menu/stylecontroller/index.jsx b/src/menu/stylecontroller/index.jsx
index 789d1e5..c5ed9e0 100644
--- a/src/menu/stylecontroller/index.jsx
+++ b/src/menu/stylecontroller/index.jsx
@@ -1095,7 +1095,7 @@
<Col span={24}>
<Form.Item
colon={false}
- label={<SwapOutlined title="娴姩"/>}
+ label={<SwapOutlined title="鏄剧ず"/>}
labelCol={{xs: { span: 24 }, sm: { span: 4 }}} wrapperCol={ {xs: { span: 24 }, sm: { span: 20 }} }
>
<Radio.Group style={{whiteSpace: 'nowrap'}} defaultValue={card.display || 'block'} onChange={(e) => this.changeNormalStyle(e.target.value, 'display')}>
diff --git a/src/tabviews/custom/components/chart/antv-X6/nodeupdate/index.jsx b/src/tabviews/custom/components/chart/antv-X6/nodeupdate/index.jsx
index 91c6cee..80c4e33 100644
--- a/src/tabviews/custom/components/chart/antv-X6/nodeupdate/index.jsx
+++ b/src/tabviews/custom/components/chart/antv-X6/nodeupdate/index.jsx
@@ -524,7 +524,7 @@
visible={visible}
closable={false}
maskClosable={false}
- width={1050}
+ width={1070}
centered={true}
onOk={this.confirm}
onCancel={() => this.setState({visible: false})}
diff --git a/src/tabviews/custom/components/chart/antv-X6/nodeupdate/nodeform.jsx b/src/tabviews/custom/components/chart/antv-X6/nodeupdate/nodeform.jsx
index 7980951..92efe95 100644
--- a/src/tabviews/custom/components/chart/antv-X6/nodeupdate/nodeform.jsx
+++ b/src/tabviews/custom/components/chart/antv-X6/nodeupdate/nodeform.jsx
@@ -33,7 +33,7 @@
} else if (node.mknode === 'end') {
} else if (node.mknode === 'endEdge') {
- options = ['approvalMethod']
+ options = ['approvalMethod', 'execCondition']
} else if (node.mknode === 'startEdge') {
readOnly = true
} else if (node.mknode === 'firstEdge') {
@@ -102,7 +102,7 @@
return (
<Form {...formItemLayout} className="normal-node-form">
<Row gutter={24}>
- {options.includes('approver') ? <Col span={24}>
+ {options.includes('approver') || options.includes('execCondition') ? <Col span={24}>
<p className="mk-split">鎸夐挳鎵ц鍛戒护</p>
</Col> : null}
<Col span={12}>
diff --git a/src/tabviews/custom/components/form/step-form/index.jsx b/src/tabviews/custom/components/form/step-form/index.jsx
index 50e227b..7b48e9c 100644
--- a/src/tabviews/custom/components/form/step-form/index.jsx
+++ b/src/tabviews/custom/components/form/step-form/index.jsx
@@ -115,6 +115,8 @@
_config.sortStyle = {width: s, height: s, lineHeight: s, borderRadius: s}
}
+ _config.style['--mk-active-color'] = _config.wrap.color || '#1890ff'
+
this.setState({
data: _data,
group: _group,
@@ -457,6 +459,18 @@
})
}
+ changeGroup = (sort) => {
+ const { config, step } = this.state
+
+ if (config.wrap.labelJump !== 'true' || sort > step) return
+
+ let _group = config.subcards.filter(item => item.sort === sort)[0]
+
+ this.setState({group: null, step: sort - 1}, () => {
+ this.setState({group: _group})
+ })
+ }
+
render() {
const { config, loading, BID, BData, data, group, step } = this.state
@@ -471,13 +485,14 @@
<Spin />
</div> : null
}
- {config.wrap.groupLabel !== 'hidden' ? <div className="mk-normal-form-title">
+ {config.wrap.groupLabel !== 'hidden' ? <div className={'mk-normal-form-title' + (config.wrap.labelJump === 'true' ? ' jumpable' : '')}>
{config.subcards.map(card => (
<div key={card.uuid} style={config.titleStyle} className={'form-title' + (card.sort <= step ? ' active' : '')}>
- <span className="form-sort" style={{background: config.wrap.color, ...config.sortStyle}}>{card.sort}</span>
- <span className="before-line" style={{background: config.wrap.color}}></span>
- <span className="after-line" style={{background: config.wrap.color}}></span>
- {card.setting.title}
+ <span className="form-sort" onClick={() => this.changeGroup(card.sort)} style={config.sortStyle}>{card.sort}</span>
+ <br/>
+ <span className="form-label" onClick={() => this.changeGroup(card.sort)}>{card.setting.title}</span>
+ <span className="before-line"></span>
+ <span className="after-line"></span>
</div>))
}
</div> : null}
diff --git a/src/tabviews/custom/components/form/step-form/index.scss b/src/tabviews/custom/components/form/step-form/index.scss
index 6638ab3..edeee82 100644
--- a/src/tabviews/custom/components/form/step-form/index.scss
+++ b/src/tabviews/custom/components/form/step-form/index.scss
@@ -5,6 +5,7 @@
background-size: cover;
position: relative;
min-height: 50px;
+ --mk-active-color: #1890ff;
.mk-normal-form-title {
display: flex;
@@ -19,7 +20,7 @@
font-weight: inherit;
.form-sort {
background: #d8d8d8;
- display: block;
+ display: inline-block;
width: 20px;
height: 20px;
line-height: 20px;
@@ -54,11 +55,20 @@
top: 18px;
}
.form-title:not(.active) {
- .form-sort {
- background: #d8d8d8!important;
+ .form-sort, .before-line, .after-line {
+ background: #d8d8d8;
}
- .before-line, .after-line {
- background: #d8d8d8!important;
+ }
+ .form-title.active {
+ .form-sort, .before-line, .after-line {
+ background: var(--mk-active-color);
+ }
+ }
+ }
+ .mk-normal-form-title.jumpable {
+ .form-title.active {
+ .form-label, .form-sort {
+ cursor: pointer;
}
}
}
diff --git a/src/tabviews/custom/components/module/invoice/index.jsx b/src/tabviews/custom/components/module/invoice/index.jsx
index 9af7c75..def7f66 100644
--- a/src/tabviews/custom/components/module/invoice/index.jsx
+++ b/src/tabviews/custom/components/module/invoice/index.jsx
@@ -894,7 +894,7 @@
`
let _backCustomScript = ''
- btn.verify.cbScripts.forEach(script => {
+ btn.cbScripts.forEach(script => {
if (script.status === 'false') return
if (script.position === 'front') {
diff --git a/src/tabviews/custom/components/table/normal-table/index.jsx b/src/tabviews/custom/components/table/normal-table/index.jsx
index c2ba689..88851eb 100644
--- a/src/tabviews/custom/components/table/normal-table/index.jsx
+++ b/src/tabviews/custom/components/table/normal-table/index.jsx
@@ -152,6 +152,10 @@
_config.colsCtrls = null
}
+ // if (_config.hasExtend) {
+
+ // }
+
this.setState({
pageSize: setting.pageSize || 10,
BID: BID || '',
diff --git a/src/tabviews/zshare/actionList/tabbutton/index.jsx b/src/tabviews/zshare/actionList/tabbutton/index.jsx
index 461c1aa..dbc22b9 100644
--- a/src/tabviews/zshare/actionList/tabbutton/index.jsx
+++ b/src/tabviews/zshare/actionList/tabbutton/index.jsx
@@ -152,7 +152,7 @@
return uuid
})()
primaryId = primaryId + (btn.sign || '')
- } else {
+ } else if (btn.sysId !== 'empty') {
primaryId = BID || ''
}
}
@@ -256,7 +256,7 @@
return uuid
})()
primaryId = primaryId + (tab.sign || '')
- } else {
+ } else if (btn.sysId !== 'empty') {
primaryId = BID || ''
}
}
diff --git a/src/tabviews/zshare/mutilform/index.jsx b/src/tabviews/zshare/mutilform/index.jsx
index 97da891..309cff6 100644
--- a/src/tabviews/zshare/mutilform/index.jsx
+++ b/src/tabviews/zshare/mutilform/index.jsx
@@ -1229,11 +1229,17 @@
if (item.hidden) return
if (item.type === 'split') {
- fields.push(
- <Col span={24} key={index}>
- <p className="mk-form-split-line" style={item.style}>{item.label}</p>
- </Col>
- )
+ if (item.opacity === 'false') {
+ fields.push(
+ <div key={index}></div>
+ )
+ } else {
+ fields.push(
+ <Col span={24} key={index}>
+ <p className="mk-form-split-line" style={item.style}>{item.label}</p>
+ </Col>
+ )
+ }
} else if (item.type === 'hint') {
fields.push(
<Col span={item.span || 24} key={index}>
diff --git a/src/templates/sharecomponent/fieldscomponent/index.jsx b/src/templates/sharecomponent/fieldscomponent/index.jsx
index 2886fa7..52d7eb1 100644
--- a/src/templates/sharecomponent/fieldscomponent/index.jsx
+++ b/src/templates/sharecomponent/fieldscomponent/index.jsx
@@ -332,6 +332,8 @@
newcard.span = 24
newcard.labelwidth = 16.2
}
+ } else if (item.type === 'text') {
+ newcard.fieldlength = item.length || 50
}
items.push(newcard)
diff --git a/src/templates/zshare/formconfig.jsx b/src/templates/zshare/formconfig.jsx
index d39db79..6ca893d 100644
--- a/src/templates/zshare/formconfig.jsx
+++ b/src/templates/zshare/formconfig.jsx
@@ -2510,6 +2510,22 @@
readonly: false
},
{
+ type: 'radio',
+ key: 'opacity',
+ label: '鏄惁鍙',
+ initVal: card.opacity || 'true',
+ tooltip: '涓嶅彲瑙佹椂浠呯敤浣滆〃鍗曞垎闅旓紝涓嶆樉绀哄悕绉般��',
+ required: false,
+ forbid: appType === 'mob',
+ options: [{
+ value: 'true',
+ text: '鍙'
+ }, {
+ value: 'false',
+ text: '涓嶅彲瑙�'
+ }]
+ },
+ {
type: 'text',
key: 'regularExtra',
label: '姝ｅ垯鎵╁睍绗�',
diff --git a/src/templates/zshare/modalform/index.jsx b/src/templates/zshare/modalform/index.jsx
index 0984c6e..e1311da 100644
--- a/src/templates/zshare/modalform/index.jsx
+++ b/src/templates/zshare/modalform/index.jsx
@@ -39,7 +39,7 @@
color: ['initval', 'readonly', 'required', 'hidden', 'readin', 'span', 'labelwidth', 'tooltip', 'colorType', 'extra', 'marginTop', 'marginBottom'],
rate: ['initval', 'readonly', 'required', 'hidden', 'readin', 'span', 'labelwidth', 'splitline', 'tooltip', 'extra', 'marginTop', 'marginBottom', 'allowHalf', 'color', 'rateCount', 'character', 'place'],
hint: ['label', 'field', 'type', 'blacklist', 'supField', 'message', 'span', 'labelwidth', 'splitline', 'marginTop', 'marginBottom'],
- split: ['label', 'type', 'marginTop', 'marginBottom', 'splitline', 'splitctrl', 'supField'],
+ split: ['label', 'type', 'marginTop', 'marginBottom', 'splitline', 'splitctrl', 'supField', 'opacity'],
formula: ['label', 'type', 'marginTop', 'marginBottom', 'splitline', 'supField', 'span', 'labelwidth', 'formula', 'eval', 'postfix'],
brafteditor: ['required', 'hidelabel', 'hidden', 'readin', 'fieldlength', 'readonly', 'span', 'labelwidth', 'tooltip', 'extra', 'encryption', 'marginTop', 'marginBottom'],
funcvar: ['span', 'labelwidth', 'splitline', 'marginTop', 'marginBottom'],
diff --git a/src/templates/zshare/verifycard/baseform/index.jsx b/src/templates/zshare/verifycard/baseform/index.jsx
index 44e887b..3e4403f 100644
--- a/src/templates/zshare/verifycard/baseform/index.jsx
+++ b/src/templates/zshare/verifycard/baseform/index.jsx
@@ -292,7 +292,7 @@
}
render() {
- const { unionFields, verify, notes, emailCodes, card, appType, columns } = this.props
+ const { unionFields, verify, notes, emailCodes, card, appType, columns, fields } = this.props
const { wxTemps, selectTemp } = this.state
const formItemLayout = {
labelCol: {
@@ -306,13 +306,24 @@
}
let _columns = []
- if (window.GLOB.process) {
- _columns = columns.filter(col => {
- if (!col.field) return false
- if (col.field.toLowerCase() === 'id') return false
- if (col.type === 'text' && col.fieldlength > 100) return false
+ if (window.GLOB.process && card.intertype !== 'inner') {
+ let cols = []
+ fields.forEach(col => {
+ if (!col.field) return
+
+ cols.push(col.field.toLowerCase())
+ _columns.push(col)
+ })
+
+ columns.forEach(col => {
+ if (!col.field) return
+
+ let key = col.field.toLowerCase()
+
+ if (key === 'id' || cols.includes(key)) return
+ if (col.type === 'text' && col.fieldlength > 100) return
- return true
+ _columns.push(col)
})
}
@@ -524,7 +535,7 @@
</Form.Item>
</Col> : null}
<Col span={24}></Col>
- {window.GLOB.process ? <Col span={8}>
+ {window.GLOB.process && card.intertype !== 'inner' ? <Col span={8}>
<Form.Item label={
<Tooltip placement="bottomLeft" title="鍦ㄨ彍鍗曞紑鍚伐浣滄祦鏃舵湁鏁堛��">
<QuestionCircleOutlined className="mk-form-tip" />
@@ -537,7 +548,7 @@
</Radio.Group>
</Form.Item>
</Col> : null}
- {window.GLOB.process && verify.workFlow === 'true' ? <Col span={8}>
+ {window.GLOB.process && card.intertype !== 'inner' && verify.workFlow === 'true' ? <Col span={8}>
<Form.Item label="绫诲瀷">
<Radio.Group value={verify.flowType} onChange={(e) => {this.onOptionChange(e.target.value, 'flowType')}}>
<Radio value="start">鍙戣捣</Radio>
@@ -546,7 +557,7 @@
</Radio.Group>
</Form.Item>
</Col> : null}
- {window.GLOB.process && verify.workFlow === 'true' ? <Col span={8}>
+ {window.GLOB.process && card.intertype !== 'inner' && verify.workFlow === 'true' ? <Col span={8}>
<Form.Item label={
<Tooltip placement="bottomLeft" title="鎵ц浣嶇疆鍦ㄧ郴缁熼粯璁ql涔嬪悗銆�">
<QuestionCircleOutlined className="mk-form-tip" />
@@ -559,9 +570,9 @@
</Radio.Group>
</Form.Item>
</Col> : null}
- {window.GLOB.process && verify.workFlow === 'true' && verify.flowType === 'approval' ? <Col span={8}>
+ {window.GLOB.process && card.intertype !== 'inner' && verify.workFlow === 'true' && verify.flowType === 'approval' ? <Col span={8}>
<Form.Item label={
- <Tooltip placement="bottomLeft" title="濡傛灉瀹℃壒瀛樺湪澶氭潯鍒嗘敮锛屽彲娣诲姞瀹℃壒娴佺▼鐨勬帶鍒跺瓧娈碉紝閫氳繃琛屼俊鎭帶鍒舵祦绋嬭蛋鍚戙�傛敞锛氶渶鍦ㄦ祦绋嬪浘涓畬鍠勫垎鏀殑鎵ц鏉′欢銆�">
+ <Tooltip placement="bottomLeft" title="濡傛灉瀹℃壒瀛樺湪澶氭潯鍒嗘敮锛屽彲娣诲姞瀹℃壒娴佺▼鐨勬帶鍒跺瓧娈碉紝閫氳繃琛ㄥ崟淇℃伅鎴栬淇℃伅鎺у埗娴佺▼璧板悜銆傛敞锛氶渶鍦ㄦ祦绋嬪浘涓畬鍠勫垎鏀殑鎵ц鏉′欢銆�">
<QuestionCircleOutlined className="mk-form-tip" />
娴佺▼鎺у埗
</Tooltip>
diff --git a/src/templates/zshare/verifycard/index.jsx b/src/templates/zshare/verifycard/index.jsx
index c1951b2..6cebcac 100644
--- a/src/templates/zshare/verifycard/index.jsx
+++ b/src/templates/zshare/verifycard/index.jsx
@@ -1687,7 +1687,7 @@
{verify.default === 'false' ? <span className="count-tip"><ExclamationOutlined style={{color: 'orange'}}/></span> : null}
</span>
} key="base">
- <BaseForm card={card} appType={appType} columns={columns} unionFields={unionFields} verify={verify} notes={notes} emailCodes={emailCodes} onChange={(verify) => this.setState({verify})} wrappedComponentRef={(inst) => this.baseForm = inst}/>
+ <BaseForm card={card} appType={appType} fields={fields} columns={columns} unionFields={unionFields} verify={verify} notes={notes} emailCodes={emailCodes} onChange={(verify) => this.setState({verify})} wrappedComponentRef={(inst) => this.baseForm = inst}/>
</TabPane> : null}
{verifyInter === 'system' ? <TabPane tab={
<span>
diff --git a/src/utils/utils.js b/src/utils/utils.js
index cf6abd4..d151843 100644
--- a/src/utils/utils.js
+++ b/src/utils/utils.js
@@ -1439,7 +1439,7 @@
sql = `
/* 绯荤粺鐢熸垚 */
- create table #${sheet} (${declarefields.join(',')},jskey nvarchar(50),data_type nvarchar(50),BID nvarchar(50) )
+ create table #${sheet} (${declarefields.join(',')},jskey nvarchar(50),data_type nvarchar(50),BID nvarchar(256))
Declare @UserName nvarchar(50),@FullName nvarchar(50),@RoleID nvarchar(512),@mk_departmentcode nvarchar(512),@mk_organization nvarchar(512),@mk_user_type nvarchar(20),@mk_nation nvarchar(50),@mk_province nvarchar(50),@mk_city nvarchar(50),@mk_district nvarchar(50),@mk_address nvarchar(100),@ErrorCode nvarchar(50),@retmsg nvarchar(4000),@tbid Nvarchar(512)
Select @ErrorCode='', @retmsg='', @UserName='${userName}', @FullName='${fullName}', @RoleID='${RoleID}', @mk_departmentcode='${departmentcode}', @mk_organization='${organization}', @mk_user_type='${mk_user_type}', @mk_nation='${nation}', @mk_province='${province}', @mk_city='${city}', @mk_district='${district}', @mk_address='${address}'
@@ -2192,6 +2192,11 @@
}
} else {
let branchKey = verify.flowBranch ? verify.flowBranch.toLowerCase() : ''
+
+ formdata && formdata.forEach(form => {
+ let _key = form.key.toLowerCase()
+ _data[_key] = form.value
+ })
if (!branchKey) {
lines.forEach(line => {
@@ -2203,7 +2208,7 @@
line = lines[0]
}
} else if (!_data.hasOwnProperty(branchKey)) {
- error = '琛屼俊鎭腑鏃犳祦绋嬫帶鍒跺瓧娈点��'
+ error = '淇℃伅涓棤娴佺▼鎺у埗瀛楁銆�'
} else {
if (endEdge) {
line = endEdge
--
Gitblit v1.8.0