From ce0211bddb6aeaf4f26649995de9bbc3207c7cd1 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 03 十二月 2021 18:11:59 +0800
Subject: [PATCH] 2021-12-03
---
src/components/header/resetpwd/index.jsx | 2
src/templates/sharecomponent/fieldscomponent/index.jsx | 2
src/menu/datasource/verifycard/utils.jsx | 21 -------
src/templates/sharecomponent/columncomponent/dragcolumn/index.jsx | 2
src/menu/datasource/verifycard/settingform/index.jsx | 22 -------
src/templates/zshare/verifycard/index.jsx | 21 -------
src/menu/components/table/normal-table/columns/index.jsx | 3
src/menu/datasource/verifycard/index.jsx | 70 +----------------------
src/menu/components/table/edit-table/columns/index.jsx | 3
9 files changed, 11 insertions(+), 135 deletions(-)
diff --git a/src/components/header/resetpwd/index.jsx b/src/components/header/resetpwd/index.jsx
index 70a6cc2..5db93ce 100644
--- a/src/components/header/resetpwd/index.jsx
+++ b/src/components/header/resetpwd/index.jsx
@@ -91,7 +91,7 @@
},
wrapperCol: {
xs: { span: 24 },
- sm: { span: 16 }
+ sm: { span: 14 }
}
}
diff --git a/src/menu/components/table/edit-table/columns/index.jsx b/src/menu/components/table/edit-table/columns/index.jsx
index 4b57040..023ccbf 100644
--- a/src/menu/components/table/edit-table/columns/index.jsx
+++ b/src/menu/components/table/edit-table/columns/index.jsx
@@ -429,7 +429,7 @@
let cell = { uuid: Utils.getuuid(), label: item.label, field: item.field, Align: 'left', Hide: 'false', IsSort: 'false', Width: 120, blacklist: [], postfix: '', prefix: '', linkmenu: [], marks: [], perspective: 'linkmenu' }
- if (/Nvarchar/ig.test(item.datatype)) {
+ if (/Nvarchar|date/ig.test(item.datatype)) {
cell.type = 'text'
cell.rowspan = 'false'
cell.textFormat = 'none'
@@ -438,6 +438,7 @@
cell.format = 'none'
cell.sum = 'false'
cell.decimal = item.decimal || 0
+ cell.Width = 80
}
columns.push(cell)
diff --git a/src/menu/components/table/normal-table/columns/index.jsx b/src/menu/components/table/normal-table/columns/index.jsx
index 80f4594..8ce3695 100644
--- a/src/menu/components/table/normal-table/columns/index.jsx
+++ b/src/menu/components/table/normal-table/columns/index.jsx
@@ -496,7 +496,7 @@
let cell = { uuid: Utils.getuuid(), label: item.label, field: item.field, Align: 'left', Hide: 'false', IsSort: 'true', Width: 120, blacklist: [], postfix: '', prefix: '', linkmenu: [], marks: [], perspective: 'linkmenu' }
- if (/Nvarchar/ig.test(item.datatype)) {
+ if (/Nvarchar|date/ig.test(item.datatype)) {
cell.type = 'text'
cell.rowspan = 'false'
cell.textFormat = 'none'
@@ -505,6 +505,7 @@
cell.format = 'none'
cell.sum = 'false'
cell.decimal = item.decimal || 0
+ cell.Width = 80
}
columns.push(cell)
diff --git a/src/menu/datasource/verifycard/index.jsx b/src/menu/datasource/verifycard/index.jsx
index 095b693..edd2fa1 100644
--- a/src/menu/datasource/verifycard/index.jsx
+++ b/src/menu/datasource/verifycard/index.jsx
@@ -152,52 +152,13 @@
}
UNSAFE_componentWillMount() {
- const { config, mainSearch, menu } = this.props
+ const { config, mainSearch } = this.props
let search = config.search || []
if (config.setting.useMSearch === 'true') { // 浣跨敤涓绘悳绱㈡潯浠�
search = [...search, ...mainSearch]
}
-
- let Marks = []
- let getcomponentmarks = (box, conf) => {
- if (!conf.parentId && box.Template === 'CustomPage') {
- box.components.forEach(item => {
- if (item.type === 'group') {
- item.components.forEach(cell => {
- if (cell.uuid !== conf.uuid && cell.setting && cell.setting.varMark) {
- Marks.push(cell.setting.varMark.toLowerCase())
- }
- })
- } else if (item.uuid !== conf.uuid && item.setting && item.setting.varMark) {
- Marks.push(item.setting.varMark.toLowerCase())
- }
- })
- } else if (conf.parentId === box.parentId && conf.tabId === box.uuid) {
- box.components.forEach(item => {
- if (item.type === 'group') {
- item.components.forEach(cell => {
- if (cell.uuid !== conf.uuid && cell.setting && cell.setting.varMark) {
- Marks.push(cell.setting.varMark.toLowerCase())
- }
- })
- } else if (item.uuid !== conf.uuid && item.setting && item.setting.varMark) {
- Marks.push(item.setting.varMark.toLowerCase())
- }
- })
- } else {
- box.components.forEach(item => {
- if (item.type !== 'tabs') return
-
- item.subtabs.forEach(tab => {
- getcomponentmarks(tab, conf)
- })
- })
- }
- }
-
- getcomponentmarks(menu, config)
let _setting = fromJS(config.setting).toJS()
let scripts = fromJS(config.scripts).toJS()
@@ -225,8 +186,7 @@
columns: fromJS(config.columns).toJS(),
setting: _setting,
searches: search,
- defaultSearch: _search,
- varMarks: Marks
+ defaultSearch: _search
})
this.getsysScript()
@@ -376,7 +336,7 @@
changeTab = (val) => {
const { config, mainSearch } = this.props
- const { activeKey, varMarks } = this.state
+ const { activeKey } = this.state
this.setState({loading: true})
if (activeKey === 'setting') {
@@ -385,18 +345,6 @@
if (res.useMSearch === 'true') { // 浣跨敤涓绘悳绱㈡潯浠�
search = [...search, ...mainSearch]
- }
-
- if (res.varMark && varMarks.includes(res.varMark.toLowerCase())) {
- notification.warning({
- top: 92,
- message: '鍙橀噺鏍囪瘑涓嶅彲閲嶅锛�',
- duration: 5
- })
- this.setState({
- loading: false
- })
- return
}
let _search = this.formatSearch(search)
@@ -529,7 +477,7 @@
submitDataSource = () => {
const { config, mainSearch } = this.props
- const { activeKey, setting, columns, scripts, varMarks } = this.state
+ const { activeKey, setting, columns, scripts } = this.state
return new Promise((resolve, reject) => {
if (activeKey === 'setting') {
@@ -538,16 +486,6 @@
if (res.useMSearch === 'true') { // 浣跨敤涓绘悳绱㈡潯浠�
search = [...search, ...mainSearch]
- }
-
- if (res.varMark && varMarks.includes(res.varMark.toLowerCase())) {
- notification.warning({
- top: 92,
- message: '鍙橀噺鏍囪瘑涓嶅彲閲嶅锛�',
- duration: 5
- })
- reject()
- return
}
let _search = this.formatSearch(search)
diff --git a/src/menu/datasource/verifycard/settingform/index.jsx b/src/menu/datasource/verifycard/settingform/index.jsx
index 4d61040..854ee9b 100644
--- a/src/menu/datasource/verifycard/settingform/index.jsx
+++ b/src/menu/datasource/verifycard/settingform/index.jsx
@@ -228,28 +228,6 @@
</Radio.Group>)}
</Form.Item>
</Col> : null}
- {interType === 'system' ? <Col span={8}>
- <Form.Item label={
- <Tooltip placement="topLeft" title={'鑷畾涔夎剼鏈腑鐨勫彉閲忥紙闄ゆ姤閿欏強鍙敤瀛楁澶栵級锛岄渶浠ユ鏍囪瘑寮�澶淬��'}>
- <QuestionCircleOutlined className="mk-form-tip" />
- 鍙橀噺鏍囪瘑
- </Tooltip>
- }>
- {getFieldDecorator('varMark', {
- initialValue: setting.varMark || '',
- rules: [
- {
- pattern: /^[a-zA-Z_]*$/ig,
- message: '璇蜂娇鐢ㄥ瓧姣嶆垨_'
- },
- {
- max: 3,
- message: '鏈�澶氫笁涓瓧绗︺��'
- }
- ]
- })(<Input placeholder={''} autoComplete="off" />)}
- </Form.Item>
- </Col> : null}
{interType === 'inner' ? <Col span={8}>
<Form.Item label={tooltip ?
<Tooltip placement="topLeft" title={tooltip}>
diff --git a/src/menu/datasource/verifycard/utils.jsx b/src/menu/datasource/verifycard/utils.jsx
index d3a042f..7537ed2 100644
--- a/src/menu/datasource/verifycard/utils.jsx
+++ b/src/menu/datasource/verifycard/utils.jsx
@@ -156,27 +156,6 @@
_customScript = _customScript.replace(item.reg, '0')
originscript = originscript.replace(item.reg, '0')
})
-
- if (setting.varMark) {
- originscript = originscript.replace(/@ErrorCode/ig, '')
- originscript = originscript.replace(/@retmsg/ig, '')
- originscript = originscript.replace(/@UserName@/ig, '').replace(/@UserName/ig, '')
- originscript = originscript.replace(/@FullName@/ig, '').replace(/@FullName/ig, '')
- originscript = originscript.replace(/@login_city@/ig, '').replace(/@login_city/ig, '')
- originscript = originscript.replace(/@id@/ig, '').replace(/@id/ig, '')
- originscript = originscript.replace(/@bid@/ig, '').replace(/@bid/ig, '')
- originscript = originscript.replace(/@loginuid@/ig, '').replace(/@loginuid/ig, '')
- originscript = originscript.replace(/@sessionuid@/ig, '').replace(/@sessionuid/ig, '')
- originscript = originscript.replace(/@userid@/ig, '').replace(/@userid/ig, '')
- originscript = originscript.replace(/@appkey@/ig, '').replace(/@appkey/ig, '')
- originscript = originscript.replace(/@time_id@/ig, '').replace(/@time_id/ig, '')
-
- originscript = originscript.replace(new RegExp('@' + setting.varMark, 'ig'), '')
-
- if (/@/ig.test(originscript)) {
- error = '浣跨敤浜嗗彉閲忔爣璇嗗鐨勫瓧娈碉紒'
- }
- }
}
let sumSql = ''
diff --git a/src/templates/sharecomponent/columncomponent/dragcolumn/index.jsx b/src/templates/sharecomponent/columncomponent/dragcolumn/index.jsx
index 1fa8a7c..5baa6cc 100644
--- a/src/templates/sharecomponent/columncomponent/dragcolumn/index.jsx
+++ b/src/templates/sharecomponent/columncomponent/dragcolumn/index.jsx
@@ -63,7 +63,7 @@
newcard.contrastType = 'static'
newcard.IsSort = 'true'
newcard.type = item.subType
- newcard.Width = 120
+ newcard.Width = item.subType === 'number' ? 80 : 120
if (item.subType === 'colspan') {
newcard.sublist = []
newcard.subfield = []
diff --git a/src/templates/sharecomponent/fieldscomponent/index.jsx b/src/templates/sharecomponent/fieldscomponent/index.jsx
index c7630d7..85b0013 100644
--- a/src/templates/sharecomponent/fieldscomponent/index.jsx
+++ b/src/templates/sharecomponent/fieldscomponent/index.jsx
@@ -146,7 +146,7 @@
Hide: 'false',
IsSort: item.type === 'picture' ? 'false' : 'true',
type: item.type,
- Width: 120
+ Width: item.type === 'number' ? 80 : 120
}
if (item.type === 'number') {
diff --git a/src/templates/zshare/verifycard/index.jsx b/src/templates/zshare/verifycard/index.jsx
index 9d42d79..e8d149d 100644
--- a/src/templates/zshare/verifycard/index.jsx
+++ b/src/templates/zshare/verifycard/index.jsx
@@ -1413,30 +1413,9 @@
const { verify, oriVerify } = this.state
// 琛ㄥ崟鎻愪氦鏃舵鏌ヨ緭鍏ュ�兼槸鍚︽纭�
return new Promise((resolve, reject) => {
- let msg = ''
- if (this.customForm && this.customForm.state.editItem) {
- msg = '鑷畾涔夐獙璇�'
- } else if (this.customForm && this.customForm.props.form.getFieldValue('sql') && !/^\s+$/.test(this.customForm.props.form.getFieldValue('sql'))) {
- msg = '鑷畾涔夐獙璇�'
- } else if (this.orderForm && this.orderForm.state.editItem) {
- msg = '鍗曞彿鐢熸垚'
- } else if (this.scriptsForm && this.scriptsForm.state.editItem) {
- msg = '鑷畾涔夎剼鏈�'
- } else if (this.scriptsForm && this.scriptsForm.props.form.getFieldValue('sql') && !/^\s+$/.test(this.scriptsForm.props.form.getFieldValue('sql'))) {
- msg = '鑷畾涔夎剼鏈�'
- }
-
if (!is(fromJS(verify), fromJS(oriVerify))) {
confirm({
content: '楠岃瘉淇℃伅宸蹭慨鏀癸紝纭畾鍙栨秷鍚楋紵',
- onOk() {
- resolve()
- },
- onCancel() {}
- })
- } else if (msg) {
- confirm({
- content: msg + '鏈繚瀛橈紝纭畾鍙栨秷鍚楋紵',
onOk() {
resolve()
},
--
Gitblit v1.8.0