From 24bfb39e86c7a265803486bc4b546ea2bfaef4a5 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期日, 02 四月 2023 23:40:30 +0800
Subject: [PATCH] 2023-04-02
---
src/templates/zshare/modalform/index.jsx | 2
src/views/menudesign/menuform/index.scss | 8 +
src/views/pcdesign/menuform/index.scss | 8 +
src/templates/sharecomponent/actioncomponent/verifyexcelin/columnform/index.jsx | 4
src/views/mobdesign/menuform/index.jsx | 2
src/views/pcdesign/menuform/index.jsx | 2
src/templates/sharecomponent/actioncomponent/verifyexcelout/columnform/index.jsx | 6
src/menu/components/share/actioncomponent/index.jsx | 43 ++++++-
src/tabviews/zshare/actionList/printbutton/index.jsx | 111 ++++++++++-------
src/views/menudesign/menuform/index.jsx | 2
public/options.json | 12 +-
src/tabviews/zshare/mutilform/index.jsx | 12 +-
src/views/tabledesign/menuform/index.jsx | 2
src/menu/components/table/base-table/index.scss | 3
src/menu/components/card/data-card/index.scss | 9 -
src/tabviews/custom/components/form/step-form/index.jsx | 12 +-
src/views/billprint/index.jsx | 12 +
src/views/mobdesign/menuform/index.scss | 8 +
src/menu/components/table/base-table/index.jsx | 2
src/tabviews/zshare/actionList/normalbutton/index.jsx | 65 ++++------
src/views/tabledesign/menuform/index.scss | 8 +
21 files changed, 207 insertions(+), 126 deletions(-)
diff --git a/public/options.json b/public/options.json
index 428c496..4e405d0 100644
--- a/public/options.json
+++ b/public/options.json
@@ -1,12 +1,12 @@
{
- "appId": "202108312122504607B107A83F55B40C98CCF",
- "appkey": "20210831212235413F287EC3BF489424496C8",
+ "appId": "201912040924165801464FF1788654BC5AC73",
+ "appkey": "20191106103859640976D6E924E464D029CF0",
"mainSystemApi": "http://sso.mk9h.cn/cloud/webapi/dostars",
"systemType": "",
"externalDatabase": "",
- "lineColor": "red",
+ "lineColor": "",
"filter": "false",
- "defaultApp": "retail_pad",
+ "defaultApp": "mk",
"defaultLang": "zh-CN",
"WXAppID": "",
"WXminiAppID": "",
@@ -17,6 +17,6 @@
"transfer": "false",
"keepPassword": "true",
"platforms": ["H5", "wechat", "android", "ios", "wxMiniProgram"],
- "host": "http://demo.mk9h.cn",
- "service": "erp_new/"
+ "host": "http://qingqiumarket.cn",
+ "service": "MKWMS/"
}
\ No newline at end of file
diff --git a/src/menu/components/card/data-card/index.scss b/src/menu/components/card/data-card/index.scss
index 3ccba56..8c298e3 100644
--- a/src/menu/components/card/data-card/index.scss
+++ b/src/menu/components/card/data-card/index.scss
@@ -51,16 +51,13 @@
right: -30px;
font-size: 16px;
}
+ .page-card {
+ line-height: 55px;
+ }
}
.ant-pagination {
float: right;
margin: 10px;
- }
-
- .model-menu-action-list {
- .page-card {
- line-height: 55px;
- }
}
.normal-pagination {
.am-button::before {
diff --git a/src/menu/components/share/actioncomponent/index.jsx b/src/menu/components/share/actioncomponent/index.jsx
index 4d26f43..e4be98c 100644
--- a/src/menu/components/share/actioncomponent/index.jsx
+++ b/src/menu/components/share/actioncomponent/index.jsx
@@ -263,13 +263,12 @@
this.actionFormRef.handleConfirm().then(btn => {
_actionlist = _actionlist.filter(item => !item.origin || item.uuid === btn.uuid)
- if ((btn.OpenType === 'excelIn' || btn.OpenType === 'excelOut') && (!btn.verify || !btn.verify.columns) && config.subtype === 'basetable') {
+ if ((btn.OpenType === 'excelIn' || btn.OpenType === 'excelOut') && (!btn.verify || !btn.verify.columns) && (config.subtype === 'basetable' || config.subtype === 'normaltable')) {
let columns = []
+ let maps = []
if (btn.OpenType === 'excelOut') {
- config.cols.forEach(item => {
- if (!item.field || item.Hide === 'true') return
-
+ let pushcol = (item) => {
let cell = {
Column: item.field,
Text: item.label,
@@ -287,14 +286,28 @@
}
columns.push(cell)
+ }
+
+ config.cols.forEach(item => {
+ if (item.type === 'colspan' && config.subtype === 'normaltable') {
+ item.subcols.forEach(cell => {
+ if (!cell.field || cell.Hide === 'true' || maps.includes(cell.field)) return
+ maps.push(cell.field)
+
+ pushcol(cell)
+ })
+ }
+
+ if (!item.field || item.Hide === 'true' || maps.includes(item.field)) return
+ maps.push(item.field)
+
+ pushcol(item)
})
btn.verify = btn.verify || {enable: 'false', dataType: 'default', scripts: []}
btn.verify.columns = columns
} else {
- config.cols.forEach(item => {
- if (!item.field || item.Hide === 'true') return
-
+ let pushcol = (item) => {
let _type = 'Nvarchar(50)'
let _limit = '50'
if (item.type === 'number' && !item.decimal) {
@@ -321,6 +334,22 @@
}
columns.push(_cell)
+ }
+
+ config.cols.forEach(item => {
+ if (item.type === 'colspan' && config.subtype === 'normaltable') {
+ item.subcols.forEach(cell => {
+ if (!cell.field || cell.Hide === 'true' || maps.includes(cell.field)) return
+ maps.push(cell.field)
+
+ pushcol(cell)
+ })
+ }
+
+ if (!item.field || item.Hide === 'true' || maps.includes(item.field)) return
+ maps.push(item.field)
+
+ pushcol(item)
})
btn.verify = btn.verify || {sheet: 'Sheet1', default: 'true', range: 1, scripts: [], uniques: []}
diff --git a/src/menu/components/table/base-table/index.jsx b/src/menu/components/table/base-table/index.jsx
index c1f4e85..bd16cd3 100644
--- a/src/menu/components/table/base-table/index.jsx
+++ b/src/menu/components/table/base-table/index.jsx
@@ -191,7 +191,7 @@
}
card.action.forEach(cell => {
- if (cell.hidden === 'true') return
+ if (cell.hidden === 'true' || cell.origin) return
if (cell.OpenType === 'pop' || (cell.OpenType === 'funcbutton' && cell.execMode === 'pop')) {
if (!cell.modal || cell.modal.fields.length === 0) {
card.errors.push({ level: 0, detail: `鎸夐挳鈥�${cell.label}鈥濅腑琛ㄥ崟灏氭湭娣诲姞`})
diff --git a/src/menu/components/table/base-table/index.scss b/src/menu/components/table/base-table/index.scss
index 36252f5..408f2e5 100644
--- a/src/menu/components/table/base-table/index.scss
+++ b/src/menu/components/table/base-table/index.scss
@@ -48,6 +48,9 @@
min-height: 55px;
}
}
+ .model-menu-action-list:not(.length0):not(.length1):not(.length2):not(.length3):not(.length4):not(.length5):not(.length6):not(.length7):not(.length8):not(.length9) {
+ margin-bottom: 20px;
+ }
.ant-btn.mk-link {
padding: 0;
diff --git a/src/tabviews/custom/components/form/step-form/index.jsx b/src/tabviews/custom/components/form/step-form/index.jsx
index 83349ad..561a5b7 100644
--- a/src/tabviews/custom/components/form/step-form/index.jsx
+++ b/src/tabviews/custom/components/form/step-form/index.jsx
@@ -98,8 +98,8 @@
let _group = config.subcards[0]
- if (_data && config.wrap.statusControl && _data[config.wrap.statusControl]) {
- let _status = _data[config.wrap.statusControl]
+ if (_data && config.wrap.statusControl && _data[config.wrap.statusControl] !== undefined) {
+ let _status = _data[config.wrap.statusControl] + ''
let _groups = config.subcards.filter(item => item.setting.status === _status)[0]
_group = _groups || _group
@@ -172,8 +172,8 @@
_data.$$uuid = _data[config.setting.primaryKey] || ''
- if (config.wrap.statusControl && _data[config.wrap.statusControl]) {
- let _status = _data[config.wrap.statusControl]
+ if (config.wrap.statusControl && _data[config.wrap.statusControl] !== undefined) {
+ let _status = _data[config.wrap.statusControl] + ''
let _groups = config.subcards.filter(item => item.setting.status === _status)[0]
_group = _groups || _group
}
@@ -313,8 +313,8 @@
_group = config.subcards[0]
}
- if (config.wrap.statusControl && _data[config.wrap.statusControl]) {
- let _status = _data[config.wrap.statusControl]
+ if (config.wrap.statusControl && _data[config.wrap.statusControl] !== undefined) {
+ let _status = _data[config.wrap.statusControl] + ''
let _groups = config.subcards.filter(item => item.setting.status === _status)[0]
_group = _groups || _group
}
diff --git a/src/tabviews/zshare/actionList/normalbutton/index.jsx b/src/tabviews/zshare/actionList/normalbutton/index.jsx
index 699bebe..65f734e 100644
--- a/src/tabviews/zshare/actionList/normalbutton/index.jsx
+++ b/src/tabviews/zshare/actionList/normalbutton/index.jsx
@@ -2586,57 +2586,50 @@
btnconfig.fields.forEach(item => {
if (!item.field) return
+
let _item = {
key: item.field,
readin: item.readin !== 'false' && item.readin !== 'top',
fieldlen: item.fieldlength || 50,
writein: item.writein !== 'false',
- type: item.type
+ type: item.type,
+ value: item.initval
}
- let _initval = item.initval
+ let key = item.field.toLowerCase()
let _readin = item.readin !== 'false'
- let _format = item.precision || 'day' // 鏃堕棿鏍煎紡鍖�
- if (item.type === 'funcvar') {
- _initval = ''
- _readin = false
- _item.readin = false
- } else if (item.type === 'linkMain') {
- _readin = false
- _item.readin = false
- } else if (item.type === 'date') {
- if (_format !== 'day') {
- _format = 'YYYY-MM-DD HH:mm:ss'
- } else {
- _format = 'YYYY-MM-DD'
- }
- } else if (item.type === 'datetime') {
+ if (_item.type === 'date') { // 鏃堕棿鍏煎
+ _item.precision = item.precision || 'day'
+ } else if (_item.type === 'datetime') {
_item.type = 'date'
- _format = 'YYYY-MM-DD HH:mm:ss'
- } else if (['select', 'link', 'radio'].includes(item.type)) { // 閫変腑绗竴椤�
- if (typeof(_initval) === 'string' && _initval.indexOf('$first') > -1) {
- _initval = ''
+ _item.precision = 'second'
+ } else if (['funcvar', 'linkMain'].includes(_item.type)) {
+ _readin = false
+ _item.readin = false
+ } else if (['select', 'link', 'radio'].includes(_item.type)) { // 閫変腑绗竴椤�
+ if (/^\s*\$first\s*$/.test(_item.value)) {
+ _item.value = ''
if (item.resourceType === '0' && item.options[0] && item.options[0].Value) {
- _initval = item.options[0].Value
+ _item.value = item.options[0].Value
}
}
}
- let key = item.field.toLowerCase()
-
- if (_item.type === 'linkMain' && BData.hasOwnProperty(key)) {
- _initval = BData[key]
+ if (_item.type === 'funcvar') {
+ _item.value = ''
+ } else if (_item.type === 'linkMain' && BData.hasOwnProperty(key)) {
+ _item.value = BData[key]
} else if (_readin && _data.hasOwnProperty(key)) {
- _initval = _data[key]
- } else if (_item.type === 'date' && _initval) {
- _initval = moment().subtract(_initval, 'days').format(_format)
- } else if (_item.type === 'datemonth' && _initval) {
- _initval = moment().subtract(_initval, 'month').format('YYYY-MM')
+ _item.value = _data[key]
+ } else if (_item.type === 'date' && _item.value) {
+ _item.value = moment().subtract(_item.value, 'days').format(_item.precision === 'day' ? 'YYYY-MM-DD' : 'YYYY-MM-DD HH:mm:ss')
+ } else if (_item.type === 'datemonth' && _item.value) {
+ _item.value = moment().subtract(_item.value, 'month').format('YYYY-MM')
}
- _item.value = _initval === undefined ? '' : _initval
+ _item.value = _item.value === undefined ? '' : _item.value
if (_item.type === 'number' || item.declare === 'decimal') {
_item.type = 'number'
@@ -2658,10 +2651,10 @@
_item.value = _item.value.slice(-item.fieldlength)
}
}
- } else if (_item.type.indexOf('date') > -1) {
- if (item.declareType === 'nvarchar(50)') {
- _item.type = 'text'
- }
+ } else if (_item.type === 'datemonth') {
+ _item.type = 'text'
+ } else if (_item.type === 'date') {
+ _item.type = item.declareType === 'nvarchar(50)' ? 'text' : 'date'
} else if (_item.type === 'rate') {
let count = item.rateCount || 5
_item.value = parseInt(_item.value)
diff --git a/src/tabviews/zshare/actionList/printbutton/index.jsx b/src/tabviews/zshare/actionList/printbutton/index.jsx
index 9bdf99e..0dceae9 100644
--- a/src/tabviews/zshare/actionList/printbutton/index.jsx
+++ b/src/tabviews/zshare/actionList/printbutton/index.jsx
@@ -2115,70 +2115,87 @@
btnconfig.fields.forEach(item => {
if (!item.field) return
- let _readin = item.readin !== 'false'
- let _initval = item.initval
- if (item.type === 'linkMain' || item.type === 'funcvar') {
+ let _item = {
+ key: item.field,
+ readin: item.readin !== 'false' && item.readin !== 'top',
+ fieldlen: item.fieldlength || 50,
+ writein: item.writein !== 'false',
+ type: item.type,
+ value: item.initval
+ }
+
+ let key = item.field.toLowerCase()
+ let _readin = item.readin !== 'false'
+
+ if (_item.type === 'date') { // 鏃堕棿鍏煎
+ _item.precision = item.precision || 'day'
+ } else if (_item.type === 'datetime') {
+ _item.type = 'date'
+ _item.precision = 'second'
+ } else if (['funcvar', 'linkMain'].includes(_item.type)) {
_readin = false
- } else if (['select', 'link', 'radio'].includes(item.type)) { // 閫変腑绗竴椤�
- if (typeof(_initval) === 'string' && _initval.indexOf('$first') > -1) {
- _initval = ''
+ _item.readin = false
+ } else if (['select', 'link', 'radio'].includes(_item.type)) { // 閫変腑绗竴椤�
+ if (/^\s*\$first\s*$/.test(_item.value)) {
+ _item.value = ''
if (item.resourceType === '0' && item.options[0] && item.options[0].Value) {
- _initval = item.options[0].Value
+ _item.value = item.options[0].Value
}
}
}
- if (item.type === 'linkMain' && BData.hasOwnProperty(item.field.toLowerCase())) {
- _initval = BData[item.field.toLowerCase()]
- } else if (_readin && _data.hasOwnProperty(item.field.toLowerCase())) {
- _initval = _data[item.field.toLowerCase()]
- } else if (item.type === 'date' && _initval) {
- _initval = moment().subtract(_initval, 'days').format('YYYY-MM-DD')
- } else if (item.type === 'datemonth' && _initval) {
- _initval = moment().subtract(_initval, 'month').format('YYYY-MM')
- } else if (item.type === 'datetime' && _initval) {
- _initval = moment().subtract(_initval, 'days').format('YYYY-MM-DD HH:mm:ss')
+ if (_item.type === 'funcvar') {
+ _item.value = ''
+ } else if (_item.type === 'linkMain' && BData.hasOwnProperty(key)) {
+ _item.value = BData[key]
+ } else if (_readin && _data.hasOwnProperty(key)) {
+ _item.value = _data[key]
+ } else if (_item.type === 'date' && _item.value) {
+ _item.value = moment().subtract(_item.value, 'days').format(_item.precision === 'day' ? 'YYYY-MM-DD' : 'YYYY-MM-DD HH:mm:ss')
+ } else if (_item.type === 'datemonth' && _item.value) {
+ _item.value = moment().subtract(_item.value, 'month').format('YYYY-MM')
}
- let _fieldlen = item.fieldlength || 50
- if (item.type === 'textarea' || item.type === 'fileupload' || item.type === 'multiselect') {
- _fieldlen = item.fieldlength || 512
- } else if (item.type === 'number') {
- _fieldlen = item.decimal ? item.decimal : 0
- } else if (item.type === 'rate') {
- item.rateCount = item.rateCount || 5
- let allowHalf = item.allowHalf === 'true'
+ _item.value = _item.value === undefined ? '' : _item.value
- if (allowHalf) {
- _initval = parseFloat(_initval)
- if (_initval % 0.5 !== 0) {
- _initval = parseInt(_initval)
+ if (_item.type === 'number' || item.declare === 'decimal') {
+ _item.type = 'number'
+ _item.fieldlen = item.decimal || 0
+ } else if (['text', 'textarea', 'linkMain'].includes(_item.type)) {
+ _item.value = _item.value + ''
+ _item.value = _item.value.replace(/\t*|\v*/g, '') // 鍘婚櫎鍒惰〃绗�
+
+ if (item.interception !== 'false') { // 鍘婚櫎棣栧熬绌烘牸
+ _item.value = _item.value.replace(/(^\s*|\s*$)/g, '')
+ }
+ if (_item.type === 'text' && /@appkey@|@SessionUid@|@bid@/ig.test(_item.value)) { // 鐗规畩瀛楁鏇挎崲
+ _item.value = _item.value.replace(/^(\s*)@appkey@(\s*)$/ig, window.GLOB.appkey).replace(/^(\s*)@SessionUid@(\s*)$/ig, (localStorage.getItem('SessionUid') || '')).replace(/^(\s*)@bid@(\s*)$/ig, (this.props.BID || ''))
+ }
+ if (_item.type === 'text' && item.lenControl && item.lenControl !== 'limit') {
+ if (item.lenControl === 'left') {
+ _item.value = _item.value.substr(0, item.fieldlength)
+ } else {
+ _item.value = _item.value.slice(-item.fieldlength)
}
- } else {
- _initval = parseInt(_initval)
}
+ } else if (_item.type === 'datemonth') {
+ _item.type = 'text'
+ } else if (_item.type === 'date') {
+ _item.type = item.declareType === 'nvarchar(50)' ? 'text' : 'date'
+ } else if (_item.type === 'rate') {
+ let count = item.rateCount || 5
+ _item.value = parseInt(_item.value)
- if (isNaN(_initval) || _initval < 0) {
- _initval = 0
- } else if (_initval > item.rateCount) {
- _initval = item.rateCount
+ if (isNaN(_item.value) || _item.value < 0) {
+ _item.value = 0
+ } else if (_item.value > count) {
+ _item.value = count
}
}
- if (_initval === undefined) {
- _initval = ''
- }
-
- result.push({
- key: item.field,
- readonly: item.readonly === 'true',
- readin: item.readin !== 'false' && item.readin !== 'top',
- fieldlen: _fieldlen,
- type: item.type,
- value: _initval
- })
+ result.push(_item)
})
if (btnconfig.setting.display === 'exec') {
diff --git a/src/tabviews/zshare/mutilform/index.jsx b/src/tabviews/zshare/mutilform/index.jsx
index 0f0de54..35287d8 100644
--- a/src/tabviews/zshare/mutilform/index.jsx
+++ b/src/tabviews/zshare/mutilform/index.jsx
@@ -117,7 +117,7 @@
}
delete item.field
return true
- } else if (item.type === 'date') { // 鏃堕棿鎼滅储
+ } else if (item.type === 'date') {
item.precision = item.precision || 'day'
} else if (item.type === 'datetime') {
item.type = 'date'
@@ -477,7 +477,7 @@
}
if (['select', 'link', 'radio'].includes(item.type)) { // 閫変腑绗竴椤�
- if (typeof(item.initval) === 'string' && item.initval.indexOf('$first') > -1) {
+ if (/^\s*\$first\s*$/.test(item.initval)) {
item.$first = true
item.initval = ''
}
@@ -1082,10 +1082,10 @@
_item.value = _item.value.slice(-item.fieldlength)
}
}
- } else if (item.type.indexOf('date') > -1) {
- if (item.declareType === 'nvarchar(50)') {
- _item.type = 'text'
- }
+ } else if (item.type === 'datemonth') {
+ _item.type = 'text'
+ } else if (item.type === 'date') {
+ _item.type = item.declareType === 'nvarchar(50)' ? 'text' : 'date'
} else if (item.type === 'vercode') {
_item.type = 'text'
forms.push({
diff --git a/src/templates/sharecomponent/actioncomponent/verifyexcelin/columnform/index.jsx b/src/templates/sharecomponent/actioncomponent/verifyexcelin/columnform/index.jsx
index a83f4a9..7724f6c 100644
--- a/src/templates/sharecomponent/actioncomponent/verifyexcelin/columnform/index.jsx
+++ b/src/templates/sharecomponent/actioncomponent/verifyexcelin/columnform/index.jsx
@@ -87,7 +87,7 @@
message: '璇疯緭鍏ュ瓧娈�!'
}
]
- })(<Input placeholder="" autoComplete="off" />)}
+ })(<Input placeholder="" autoComplete="off" onPressEnter={this.handleConfirm}/>)}
</Form.Item>
</Col>
<Col span={6}>
@@ -100,7 +100,7 @@
message: '璇疯緭鍏ュ悕绉�!'
}
]
- })(<Input placeholder="" autoComplete="off" />)}
+ })(<Input placeholder="" autoComplete="off" onPressEnter={this.handleConfirm}/>)}
</Form.Item>
</Col>
<Col span={6}>
diff --git a/src/templates/sharecomponent/actioncomponent/verifyexcelout/columnform/index.jsx b/src/templates/sharecomponent/actioncomponent/verifyexcelout/columnform/index.jsx
index e3159f8..76d36ee 100644
--- a/src/templates/sharecomponent/actioncomponent/verifyexcelout/columnform/index.jsx
+++ b/src/templates/sharecomponent/actioncomponent/verifyexcelout/columnform/index.jsx
@@ -48,7 +48,7 @@
message: '璇疯緭鍏ュ瓧娈�!'
}
]
- })(<Input placeholder="" autoComplete="off" />)}
+ })(<Input placeholder="" autoComplete="off" onPressEnter={this.handleConfirm}/>)}
</Form.Item>
</Col>
<Col span={5}>
@@ -61,7 +61,7 @@
message: '璇疯緭鍏ュ悕绉�!'
}
]
- })(<Input placeholder="" autoComplete="off" />)}
+ })(<Input placeholder="" autoComplete="off" onPressEnter={this.handleConfirm}/>)}
</Form.Item>
</Col>
<Col span={5}>
@@ -74,7 +74,7 @@
message: '璇疯緭鍏ュ垪瀹�!'
}
]
- })(<InputNumber min={5} max={200} precision={0} />)}
+ })(<InputNumber min={5} max={200} precision={0} onPressEnter={this.handleConfirm}/>)}
</Form.Item>
</Col>
<Col span={6}>
diff --git a/src/templates/zshare/modalform/index.jsx b/src/templates/zshare/modalform/index.jsx
index 3d08c71..cae1bd2 100644
--- a/src/templates/zshare/modalform/index.jsx
+++ b/src/templates/zshare/modalform/index.jsx
@@ -30,7 +30,7 @@
fileupload: ['readonly', 'required', 'readin', 'fieldlength', 'maxfile', 'fileType', 'span', 'labelwidth', 'tooltip', 'extra', 'compress', 'miniSet', 'splitline', 'marginTop', 'marginBottom', 'maxSize'],
switch: ['initval', 'openVal', 'closeVal', 'openText', 'closeText', 'readonly', 'hidden', 'readin', 'span', 'labelwidth', 'tooltip', 'extra', 'splitline', 'marginTop', 'marginBottom'],
date: ['initval', 'readonly', 'required', 'hidden', 'readin', 'span', 'labelwidth', 'tooltip', 'extra', 'declareType', 'mode', 'splitline', 'place', 'marginTop', 'marginBottom', 'minDate', 'maxDate', 'precision'],
- datemonth: ['initval', 'readonly', 'required', 'hidden', 'readin', 'span', 'labelwidth', 'tooltip', 'extra', 'declareType', 'splitline', 'place', 'marginTop', 'marginBottom'],
+ datemonth: ['initval', 'readonly', 'required', 'hidden', 'readin', 'span', 'labelwidth', 'tooltip', 'extra', 'splitline', 'place', 'marginTop', 'marginBottom'],
datetime: ['initval', 'readonly', 'required', 'hidden', 'readin', 'span', 'labelwidth', 'tooltip', 'extra', 'declareType', 'mode', 'splitline', 'marginTop', 'marginBottom', 'minDate', 'maxDate'],
textarea: ['initval', 'readonly', 'required', 'hidden', 'readin', 'fieldlength', 'span', 'labelwidth', 'maxRows', 'encryption', 'interception', 'tooltip', 'extra', 'place', 'count', 'placeholder', 'marginTop', 'marginBottom'],
cascader: ['readonly', 'required', 'hidden', 'readin', 'resourceType', 'fieldlength', 'span', 'labelwidth', 'tooltip', 'extra', 'place', 'splitline', 'marginTop', 'marginBottom', 'separator'],
diff --git a/src/views/billprint/index.jsx b/src/views/billprint/index.jsx
index b1a6a03..70a2505 100644
--- a/src/views/billprint/index.jsx
+++ b/src/views/billprint/index.jsx
@@ -455,13 +455,23 @@
}
reload = () => {
+ const { tempId } = this.state
+
this.setState({
loadingview: true,
pages: null,
data: '',
config: null
}, () => {
- this.getMenuParam()
+ Api.deleteMenuStorage(tempId)
+ setTimeout(() => {
+ this.getMenuParam()
+ }, 50)
+ // Api.getAppVersion(tempId).then(() => {
+ // this.getMenuParam()
+ // }, () => {
+ // this.getMenuParam()
+ // })
})
}
diff --git a/src/views/menudesign/menuform/index.jsx b/src/views/menudesign/menuform/index.jsx
index bd6d38f..7c8be79 100644
--- a/src/views/menudesign/menuform/index.jsx
+++ b/src/views/menudesign/menuform/index.jsx
@@ -432,7 +432,7 @@
}} />
</Form.Item>
</Col>
- <Col span={24}>
+ <Col span={24} className="red-font">
<Form.Item label="澶囨敞">
{getFieldDecorator('Remark', {
initialValue: config.Remark || '',
diff --git a/src/views/menudesign/menuform/index.scss b/src/views/menudesign/menuform/index.scss
index fa61282..39343af 100644
--- a/src/views/menudesign/menuform/index.scss
+++ b/src/views/menudesign/menuform/index.scss
@@ -5,4 +5,12 @@
font-size: 12px;
}
}
+ .red-font {
+ label {
+ color: red;
+ }
+ textarea {
+ color: red;
+ }
+ }
}
\ No newline at end of file
diff --git a/src/views/mobdesign/menuform/index.jsx b/src/views/mobdesign/menuform/index.jsx
index 9846e84..8a6b1b7 100644
--- a/src/views/mobdesign/menuform/index.jsx
+++ b/src/views/mobdesign/menuform/index.jsx
@@ -331,7 +331,7 @@
)}
</Form.Item>
</Col> : null}
- <Col span={24}>
+ <Col span={24} className="red-font">
<Form.Item label="澶囨敞">
{getFieldDecorator('Remark', {
initialValue: config.Remark || '',
diff --git a/src/views/mobdesign/menuform/index.scss b/src/views/mobdesign/menuform/index.scss
index 9c0c867..71c35b5 100644
--- a/src/views/mobdesign/menuform/index.scss
+++ b/src/views/mobdesign/menuform/index.scss
@@ -39,4 +39,12 @@
}
}
}
+ .red-font {
+ label {
+ color: red;
+ }
+ textarea {
+ color: red;
+ }
+ }
}
\ No newline at end of file
diff --git a/src/views/pcdesign/menuform/index.jsx b/src/views/pcdesign/menuform/index.jsx
index 1d7147c..7bc9112 100644
--- a/src/views/pcdesign/menuform/index.jsx
+++ b/src/views/pcdesign/menuform/index.jsx
@@ -209,7 +209,7 @@
)}
</Form.Item>
</Col> : null}
- <Col span={24}>
+ <Col span={24} className="red-font">
<Form.Item label="澶囨敞">
{getFieldDecorator('Remark', {
initialValue: config.Remark || '',
diff --git a/src/views/pcdesign/menuform/index.scss b/src/views/pcdesign/menuform/index.scss
index fa61282..39343af 100644
--- a/src/views/pcdesign/menuform/index.scss
+++ b/src/views/pcdesign/menuform/index.scss
@@ -5,4 +5,12 @@
font-size: 12px;
}
}
+ .red-font {
+ label {
+ color: red;
+ }
+ textarea {
+ color: red;
+ }
+ }
}
\ No newline at end of file
diff --git a/src/views/tabledesign/menuform/index.jsx b/src/views/tabledesign/menuform/index.jsx
index 5e16759..0d1dcea 100644
--- a/src/views/tabledesign/menuform/index.jsx
+++ b/src/views/tabledesign/menuform/index.jsx
@@ -347,7 +347,7 @@
})(<Input placeholder="" autoComplete="off" onChange={this.changeEasyCode}/>)}
</Form.Item>
</Col>
- <Col span={24}>
+ <Col span={24} className="red-font">
<Form.Item label="澶囨敞">
{getFieldDecorator('Remark', {
initialValue: config.Remark || '',
diff --git a/src/views/tabledesign/menuform/index.scss b/src/views/tabledesign/menuform/index.scss
index fa61282..39343af 100644
--- a/src/views/tabledesign/menuform/index.scss
+++ b/src/views/tabledesign/menuform/index.scss
@@ -5,4 +5,12 @@
font-size: 12px;
}
}
+ .red-font {
+ label {
+ color: red;
+ }
+ textarea {
+ color: red;
+ }
+ }
}
\ No newline at end of file
--
Gitblit v1.8.0