From f5130f2469384b423043a111223b518e78f43075 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 05 四月 2024 22:53:56 +0800
Subject: [PATCH] 2024-04-05
---
src/tabviews/zshare/actionList/exceloutbutton/index.jsx | 6 ++
src/menu/components/share/actioncomponent/actionform/index.jsx | 18 ++++-
src/menu/components/share/actioncomponent/formconfig.jsx | 52 +++++++++++------
src/tabviews/custom/components/group/normal-group/index.jsx | 2
src/tabviews/zshare/actionList/normalbutton/index.jsx | 6 ++
src/templates/zshare/verifycard/customscript/index.jsx | 2
src/menu/components/group/normal-group/options.jsx | 16 +++++
src/tabviews/custom/components/group/normal-group/index.scss | 47 ++++++++++++++-
src/tabviews/zshare/actionList/excelInbutton/index.jsx | 3 +
src/tabviews/zshare/actionList/printbutton/index.jsx | 3 +
10 files changed, 127 insertions(+), 28 deletions(-)
diff --git a/src/menu/components/group/normal-group/options.jsx b/src/menu/components/group/normal-group/options.jsx
index 9829b7f..521a003 100644
--- a/src/menu/components/group/normal-group/options.jsx
+++ b/src/menu/components/group/normal-group/options.jsx
@@ -126,11 +126,27 @@
field: 'mergeAble',
label: '灞曞紑/鏀惰捣',
initval: setting.mergeAble || 'false',
+ tooltip: '鍚敤鏃讹紝缁勪欢鍙充笂瑙掑皢鍑虹幇灞曞紑/鏀惰捣鐨勫浘鏍囷紝鍙皢褰撳墠缁勪欢灞曞紑鎴栨敹璧枫��',
required: false,
options: [
{value: 'true', label: '鍚敤'},
{value: 'false', label: '绂佺敤'},
],
+ controlFields: [
+ {field: 'ctrlNumber', values: ['true']},
+ ],
+ forbid: appType === 'mob'
+ },
+ {
+ type: 'number',
+ field: 'ctrlNumber',
+ label: '鎺у埗鏁�',
+ initval: setting.ctrlNumber || 1,
+ tooltip: '褰撶粍浠舵敹璧锋椂锛屽叾鍚庨渶瑕佸睍寮�鐨勭粍浠舵暟銆�',
+ min: 1,
+ max: 5,
+ precision: 0,
+ required: true,
forbid: appType === 'mob'
},
{
diff --git a/src/menu/components/share/actioncomponent/actionform/index.jsx b/src/menu/components/share/actioncomponent/actionform/index.jsx
index a88a6f8..b3be041 100644
--- a/src/menu/components/share/actioncomponent/actionform/index.jsx
+++ b/src/menu/components/share/actioncomponent/actionform/index.jsx
@@ -215,7 +215,7 @@
shows.push('exInterface', 'exProInterface')
}
} else if (intertype === 'inner') {
- shows.push('innerFunc', 'output', 'recordUser')
+ shows.push('innerFunc', 'output', 'extraParam')
if (Ot === 'requiredOnce') { // 鍓嶇疆鍑芥暟
shows.push('preFunc')
}
@@ -296,7 +296,7 @@
shows.push('exInterface', 'exProInterface')
}
} else if (intertype === 'inner') {
- shows.push('innerFunc', 'recordUser')
+ shows.push('innerFunc', 'extraParam')
reRequired.innerFunc = true
} else {
shows.push('sql', 'sqlType')
@@ -347,7 +347,7 @@
shows.push('exInterface', 'exProInterface')
}
} else if (this.record.intertype === 'inner') {
- shows.push('innerFunc', 'recordUser')
+ shows.push('innerFunc', 'extraParam')
reRequired.innerFunc = true
}
if (this.record.execSuccess === 'grid' || this.record.execError === 'grid') {
@@ -382,7 +382,7 @@
shows.push('exInterface', 'exProInterface')
}
} else if (this.record.intertype === 'inner') {
- shows.push('innerFunc', 'recordUser')
+ shows.push('innerFunc', 'extraParam')
reRequired.innerFunc = true
}
if (this.record.execSuccess === 'grid' || this.record.execError === 'grid') {
@@ -473,7 +473,7 @@
shows.push('exInterface', 'exProInterface')
}
} else if (this.record.intertype === 'inner') {
- shows.push('innerFunc', 'recordUser')
+ shows.push('innerFunc', 'extraParam')
reRequired.innerFunc = true
}
if (this.record.execSuccess === 'grid' || this.record.execError === 'grid') {
@@ -1179,6 +1179,14 @@
})
}
+ if (values.extraParam) {
+ values.extraParam.forEach(n => {
+ values[n] = 'true'
+ })
+
+ delete values.extraParam
+ }
+
resolve(values)
} else {
reject(err)
diff --git a/src/menu/components/share/actioncomponent/formconfig.jsx b/src/menu/components/share/actioncomponent/formconfig.jsx
index e37705d..342dc62 100644
--- a/src/menu/components/share/actioncomponent/formconfig.jsx
+++ b/src/menu/components/share/actioncomponent/formconfig.jsx
@@ -318,6 +318,14 @@
width = +width.replace(/x/, '.5')
}
+ let extraParam = []
+ if (card.recordUser === 'true') {
+ extraParam.push('recordUser')
+ }
+ if (card.dataM === 'true') {
+ extraParam.push('dataM')
+ }
+
let forms = [
{
type: 'select',
@@ -1259,18 +1267,18 @@
forbid: appType === 'mob'
},
{
- type: 'radio',
- key: 'recordUser',
- label: '璁板綍鐢ㄦ埛',
- initVal: card.recordUser || 'false',
- tooltip: '褰撻�夋嫨鈥滄槸鈥濇椂锛屽唴閮ㄥ嚱鏁扮殑浼犲弬浼氬鍔� username 涓� fullname銆�',
+ type: 'checkbox',
+ key: 'extraParam',
+ label: '鎵╁睍鍙傛暟',
+ initVal: extraParam,
+ tooltip: '閫夋嫨鈥滅敤鎴蜂俊鎭�濇椂锛屽唴閮ㄥ嚱鏁扮殑浼犲弬浼氬鍔� username 涓� fullname銆傞�夋嫨鈥滄暟鎹鐞嗗憳鈥濇椂锛屽唴閮ㄥ嚱鏁扮殑浼犲弬浼氬鍔� dataM 锛岀鐞嗗憳鍊间负鈥淵鈥濓紝鏅�氱敤鎴蜂负绌恒��',
required: false,
options: [{
- value: 'false',
- text: '鍚�'
+ value: 'recordUser',
+ text: '鐢ㄦ埛淇℃伅'
}, {
- value: 'true',
- text: '鏄�'
+ value: 'dataM',
+ text: '鏁版嵁绠＄悊鍛�'
}]
},
{
@@ -1690,6 +1698,14 @@
if (card.OpenType === 'form') { // 鎷栨嫿娣诲姞绫诲瀷杞崲
card.OpenType = 'pop'
+ }
+
+ let extraParam = []
+ if (card.recordUser === 'true') {
+ extraParam.push('recordUser')
+ }
+ if (card.dataM === 'true') {
+ extraParam.push('dataM')
}
let forms = [
@@ -2442,18 +2458,18 @@
required: false
},
{
- type: 'radio',
- key: 'recordUser',
- label: '璁板綍鐢ㄦ埛',
- initVal: card.recordUser || 'false',
- tooltip: '褰撻�夋嫨鈥滄槸鈥濇椂锛屽唴閮ㄥ嚱鏁扮殑浼犲弬浼氬鍔� username 涓� fullname銆�',
+ type: 'checkbox',
+ key: 'extraParam',
+ label: '鎵╁睍鍙傛暟',
+ initVal: extraParam,
+ tooltip: '閫夋嫨鈥滅敤鎴蜂俊鎭�濇椂锛屽唴閮ㄥ嚱鏁扮殑浼犲弬浼氬鍔� username 涓� fullname銆傞�夋嫨鈥滄暟鎹鐞嗗憳鈥濇椂锛屽唴閮ㄥ嚱鏁扮殑浼犲弬浼氬鍔� dataM 锛岀鐞嗗憳鍊间负鈥淵鈥濓紝鏅�氱敤鎴蜂负绌恒��',
required: false,
options: [{
- value: 'false',
- text: '鍚�'
+ value: 'recordUser',
+ text: '鐢ㄦ埛淇℃伅'
}, {
- value: 'true',
- text: '鏄�'
+ value: 'dataM',
+ text: '鏁版嵁绠＄悊鍛�'
}]
},
{
diff --git a/src/tabviews/custom/components/group/normal-group/index.jsx b/src/tabviews/custom/components/group/normal-group/index.jsx
index 512b48e..3868f59 100644
--- a/src/tabviews/custom/components/group/normal-group/index.jsx
+++ b/src/tabviews/custom/components/group/normal-group/index.jsx
@@ -24,7 +24,7 @@
if (config.components.length === 0) return (<div className={'ant-col ant-col-' + config.width} style={style}><div style={config.style}></div></div>)
return (
- <div className={'ant-col ant-col-' + config.width + (mergeAble ? ' mk-merge-able' : '') + (visible ? '' : ' close')} style={style}>
+ <div className={`ant-col ant-col-${config.width} ${mergeAble ? ' mk-merge-able mk-ctrl-' + (config.setting.ctrlNumber || 1) : ''} ${visible ? '' : ' close'}`} style={style}>
<div className={'normal-group-wrap ' + (config.setting.layout || '')} id={'anchor' + config.uuid} style={config.style}>
<div className="mk-control">
<DoubleLeftOutlined onClick={() => this.setState({visible: false})}/>
diff --git a/src/tabviews/custom/components/group/normal-group/index.scss b/src/tabviews/custom/components/group/normal-group/index.scss
index 8cde523..4db2871 100644
--- a/src/tabviews/custom/components/group/normal-group/index.scss
+++ b/src/tabviews/custom/components/group/normal-group/index.scss
@@ -73,9 +73,7 @@
}
}
}
-.mk-merge-able + .ant-col {
- transition: all 0.2s;
-}
+
.mk-merge-able.close {
width: 25px;
.normal-group-wrap {
@@ -96,6 +94,49 @@
}
}
}
+
+.mk-merge-able + .ant-col,
+.mk-merge-able + .ant-col + .ant-col,
+.mk-merge-able + .ant-col + .ant-col + .ant-col,
+.mk-merge-able + .ant-col + .ant-col + .ant-col + .ant-col,
+.mk-merge-able + .ant-col + .ant-col + .ant-col + .ant-col + .ant-col {
+ transition: all 0.2s;
+}
+
.mk-merge-able.close + .ant-col {
width: calc(100% - 25px);
+}
+
+.mk-merge-able.close.mk-ctrl-2 + .ant-col + .ant-col {
+ width: calc(100% - 25px);
+}
+
+.mk-merge-able.close.mk-ctrl-3 + .ant-col + .ant-col {
+ width: calc(100% - 25px);
+}
+.mk-merge-able.close.mk-ctrl-3 + .ant-col + .ant-col + .ant-col {
+ width: calc(100% - 25px);
+}
+
+.mk-merge-able.close.mk-ctrl-4 + .ant-col + .ant-col {
+ width: calc(100% - 25px);
+}
+.mk-merge-able.close.mk-ctrl-4 + .ant-col + .ant-col + .ant-col {
+ width: calc(100% - 25px);
+}
+.mk-merge-able.close.mk-ctrl-4 + .ant-col + .ant-col + .ant-col + .ant-col {
+ width: calc(100% - 25px);
+}
+
+.mk-merge-able.close.mk-ctrl-5 + .ant-col + .ant-col {
+ width: calc(100% - 25px);
+}
+.mk-merge-able.close.mk-ctrl-5 + .ant-col + .ant-col + .ant-col {
+ width: calc(100% - 25px);
+}
+.mk-merge-able.close.mk-ctrl-5 + .ant-col + .ant-col + .ant-col + .ant-col {
+ width: calc(100% - 25px);
+}
+.mk-merge-able.close.mk-ctrl-5 + .ant-col + .ant-col + .ant-col + .ant-col + .ant-col {
+ width: calc(100% - 25px);
}
\ No newline at end of file
diff --git a/src/tabviews/zshare/actionList/excelInbutton/index.jsx b/src/tabviews/zshare/actionList/excelInbutton/index.jsx
index 616dc32..b14214d 100644
--- a/src/tabviews/zshare/actionList/excelInbutton/index.jsx
+++ b/src/tabviews/zshare/actionList/excelInbutton/index.jsx
@@ -408,6 +408,9 @@
param.username = sessionStorage.getItem('User_Name') || ''
param.fullname = sessionStorage.getItem('Full_Name') || ''
}
+ if (btn.dataM === 'true') {
+ param.dataM = sessionStorage.getItem('dataM') === 'true' ? 'Y' : ''
+ }
Api.genericInterface(param).then((res) => {
if (res.status) {
diff --git a/src/tabviews/zshare/actionList/exceloutbutton/index.jsx b/src/tabviews/zshare/actionList/exceloutbutton/index.jsx
index b279673..3a33cdd 100644
--- a/src/tabviews/zshare/actionList/exceloutbutton/index.jsx
+++ b/src/tabviews/zshare/actionList/exceloutbutton/index.jsx
@@ -184,6 +184,9 @@
param.username = sessionStorage.getItem('User_Name') || ''
param.fullname = sessionStorage.getItem('Full_Name') || ''
}
+ if (btn.dataM === 'true') {
+ param.dataM = sessionStorage.getItem('dataM') === 'true' ? 'Y' : ''
+ }
Api.genericInterface(param).then(result => {
if (result.status) {
@@ -387,6 +390,9 @@
param.username = sessionStorage.getItem('User_Name') || ''
param.fullname = sessionStorage.getItem('Full_Name') || ''
}
+ if (btn.dataM === 'true') {
+ param.dataM = sessionStorage.getItem('dataM') === 'true' ? 'Y' : ''
+ }
} else if (btn.intertype === 'outer' && !btn.innerFunc) { // 浣跨敤澶栭儴鍑芥暟
param = this.getExcelCustomParam(viewParam.orderBy, viewParam.search, true, pageIndex, pageSize)
diff --git a/src/tabviews/zshare/actionList/normalbutton/index.jsx b/src/tabviews/zshare/actionList/normalbutton/index.jsx
index 74a59d7..30162ab 100644
--- a/src/tabviews/zshare/actionList/normalbutton/index.jsx
+++ b/src/tabviews/zshare/actionList/normalbutton/index.jsx
@@ -756,6 +756,9 @@
param.username = sessionStorage.getItem('User_Name') || ''
param.fullname = sessionStorage.getItem('Full_Name') || ''
}
+ if (btn.dataM === 'true') {
+ param.dataM = sessionStorage.getItem('dataM') === 'true' ? 'Y' : ''
+ }
let primaryId = ''
@@ -798,6 +801,9 @@
param.username = sessionStorage.getItem('User_Name') || ''
param.fullname = sessionStorage.getItem('Full_Name') || ''
}
+ if (btn.dataM === 'true') {
+ param.dataM = sessionStorage.getItem('dataM') === 'true' ? 'Y' : ''
+ }
let primaryId = setting.primaryKey ? cell[setting.primaryKey] || '' : ''
diff --git a/src/tabviews/zshare/actionList/printbutton/index.jsx b/src/tabviews/zshare/actionList/printbutton/index.jsx
index 07b9df2..86a4840 100644
--- a/src/tabviews/zshare/actionList/printbutton/index.jsx
+++ b/src/tabviews/zshare/actionList/printbutton/index.jsx
@@ -915,6 +915,9 @@
_param.username = sessionStorage.getItem('User_Name') || ''
_param.fullname = sessionStorage.getItem('Full_Name') || ''
}
+ if (btn.dataM === 'true') {
+ _param.dataM = sessionStorage.getItem('dataM') === 'true' ? 'Y' : ''
+ }
return _param
})
diff --git a/src/templates/zshare/verifycard/customscript/index.jsx b/src/templates/zshare/verifycard/customscript/index.jsx
index e738f2a..3112852 100644
--- a/src/templates/zshare/verifycard/customscript/index.jsx
+++ b/src/templates/zshare/verifycard/customscript/index.jsx
@@ -409,7 +409,7 @@
</Col>
<Col span={24} className="sql">
<Form.Item label={
- <Tooltip placement="topLeft" overlayStyle={{width: '320px', maxWidth: '320px'}} title={<><div>{'璋冭瘯鏇挎崲绗� /*$breakpoint_begin_xxxx@ 銆丂breakpoint_end_xxxx$*/锛屽湪鎺у埗鍙颁腑杈撳叆 window.debug = \'xxxx\' 浼氬惎鐢ㄥ搴旂殑璋冭瘯璇彞锛屽揩鎹烽敭 ctrl+c 鎴栧湪鎺у埗鍙颁腑杈撳叆 window.debug = false 鍏抽棴璋冭瘯銆傛敞锛氳皟璇曟椂瀛楃 $breakpoint_proc@ 灏嗚鏇挎崲銆�'}</div><div style={{height: '5px'}}></div><div>{'鏁版嵁妫�鏌ユ浛鎹㈢ $check@ -> \'\'銆� @check$ -> \'\'锛孍rrorCode绛変簬C鏃朵細璇㈤棶鏄惁缁х画鎵ц锛岀‘瀹氭椂 $check@ -> /*銆� @check$ -> */銆傛敞锛�1銆侀渶浣跨敤绯荤粺鎺ュ彛 2銆佽璁剧疆涓衡�滈�夋嫨澶氳鈥濇椂鏃犳晥銆�'}</div></>}>
+ <Tooltip placement="topLeft" overlayStyle={{width: '520px', maxWidth: '520px'}} title={<><div>{`璋冭瘯鏇挎崲绗� /*$breakpoint_begin_xxxx@ 銆丂breakpoint_end_xxxx$*/锛屽湪鎺у埗鍙颁腑杈撳叆 window.debug = 'xxxx' 浼氬惎鐢ㄥ搴旂殑璋冭瘯璇彞锛屽揩鎹烽敭 ctrl+c 鎴栧湪鎺у埗鍙颁腑杈撳叆 window.debug = false 鍏抽棴璋冭瘯銆傛敞锛氳皟璇曟椂瀛楃 $breakpoint_proc@ 灏嗚鏇挎崲銆俙}</div><div style={{height: '5px'}}></div><div>{`鏁版嵁妫�鏌ユ浛鎹㈢ $check@ -> ''銆� @check$ -> ''锛孍rrorCode绛変簬C鏃朵細璇㈤棶鏄惁缁х画鎵ц锛岀‘瀹氭椂 $check@ -> /*銆� @check$ -> */銆傛敞锛�1銆侀渶浣跨敤绯荤粺鎺ュ彛 2銆佽璁剧疆涓衡�滈�夋嫨澶氳鈥濇椂鏃犳晥銆俙}</div><div style={{height: '5px'}}></div><div>{`鏁版嵁鏉冮檺鏇挎崲绗� $@ -> /* 鎴� ''銆� @$ -> */ 鎴� ''`}</div></>}>
<QuestionCircleOutlined className="mk-form-tip" />
sql
</Tooltip>
--
Gitblit v1.8.0