From 6c66c9c2a6d0f7e7ccc65d4d9e478f1acb74d87e Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 20 八月 2021 12:12:48 +0800
Subject: [PATCH] 2021-08-20
---
src/tabviews/zshare/actionList/tabbutton/index.jsx | 2
package-lock.json | 6 +-
src/tabviews/zshare/actionList/popupbutton/index.jsx | 2
src/tabviews/zshare/topSearch/index.jsx | 16 +++++---
src/templates/sharecomponent/searchcomponent/dragsearch/card.jsx | 2
src/tabviews/zshare/actionList/excelInbutton/index.jsx | 2
src/tabviews/zshare/actionList/printbutton/index.jsx | 2
public/options.json | 14 +++---
src/store/options.js | 2
src/tabviews/zshare/actionList/exceloutbutton/index.jsx | 2
src/tabviews/zshare/topSearch/mkSelect/index.jsx | 2
src/tabviews/zshare/mutilform/index.jsx | 3 +
src/tabviews/zshare/actionList/newpagebutton/index.jsx | 2
src/tabviews/zshare/topSearch/index.scss | 15 +++++++
src/tabviews/zshare/topSearch/advanceform/index.scss | 11 +++++
src/tabviews/zshare/actionList/normalbutton/index.jsx | 2
src/tabviews/zshare/topSearch/advanceform/index.jsx | 7 ++-
src/tabviews/zshare/actionList/changeuserbutton/index.jsx | 2
src/views/login/index.jsx | 8 ++--
19 files changed, 68 insertions(+), 34 deletions(-)
diff --git a/package-lock.json b/package-lock.json
index c23f03b..a907381 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -4793,9 +4793,9 @@
}
},
"caniuse-lite": {
- "version": "1.0.30001191",
- "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001191.tgz",
- "integrity": "sha512-xJJqzyd+7GCJXkcoBiQ1GuxEiOBCLQ0aVW9HMekifZsAVGdj5eJ4mFB9fEhSHipq9IOk/QXFJUiIr9lZT+EsGw=="
+ "version": "1.0.30001251",
+ "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001251.tgz",
+ "integrity": "sha512-HOe1r+9VkU4TFmnU70z+r7OLmtR+/chB1rdcJUeQlAinjEeb0cKL20tlAtOagNZhbrtLnCvV19B4FmF1rgzl6A=="
},
"capture-exit": {
"version": "2.0.0",
diff --git a/public/options.json b/public/options.json
index 7ca016a..3f069a7 100644
--- a/public/options.json
+++ b/public/options.json
@@ -1,16 +1,16 @@
{
- "appId": "201912040924165801464FF1788654BC5AC73",
- "appkey": "20191106103859640976D6E924E464D029CF0",
- "mainSystemApi": "http://sso.mk9h.cn/cloud/webapi/dostars",
+ "appId": "202011020835217933120E25C41C54A8988AA",
+ "appkey": "20201102081641237BDDE0D5F2E98420BA7EC",
+ "mainSystemApi": "https://cloud.positecgroup.com/webapi/dostars",
"systemType": "",
- "externalDatabase": "false",
+ "externalDatabase": "mkdata_oms_test",
"lineColor": "",
"filter": "false",
"defaultApp": "",
"defaultLang": "zh-CN",
"WXAppID": "",
"debugger": false,
- "licenseKey": "E1A8FE",
- "host": "http://qingqiumarket.cn",
- "service": "mkwms/"
+ "licenseKey": "",
+ "host": "http://oms-test.positecgroup.com.cn",
+ "service": "oms_new/"
}
\ No newline at end of file
diff --git a/src/store/options.js b/src/store/options.js
index 563c2e0..ec0cb09 100644
--- a/src/store/options.js
+++ b/src/store/options.js
@@ -9,7 +9,7 @@
sysType: 'bG9j$mkYWw=',
caId: 'MjAyMDAxMTYxMjMzMzU1MDd$mkGQzkyMzI1Rjk4MDY0QUNGQjQ2Mg==',
cakey: 'MjAyMDAxMTYxMjQwMDQ2NDM$mk2N0QzODE2MjExNUI0MTc4OTVDMQ==',
- cdomain: 'aHR0cHM6Ly9jbG91$mkZC5tazloLmNu'
+ cdomain: 'aHR0cHM6Ly9jbG91ZC5$mkwb3NpdGVjZ3JvdXAuY29t'
}
/**
diff --git a/src/tabviews/zshare/actionList/changeuserbutton/index.jsx b/src/tabviews/zshare/actionList/changeuserbutton/index.jsx
index bbee103..5af5cf2 100644
--- a/src/tabviews/zshare/actionList/changeuserbutton/index.jsx
+++ b/src/tabviews/zshare/actionList/changeuserbutton/index.jsx
@@ -203,7 +203,7 @@
label = btn.label
icon = btn.icon || ''
} else if (show === 'link') {
- label = <span>{btn.label}{btn.icon ? <Icon type={btn.icon}/> : ''}</span>
+ label = <span>{btn.label}{btn.icon ? <Icon style={{marginLeft: '8px'}} type={btn.icon}/> : ''}</span>
icon = ''
} else if (show === 'icon') {
icon = btn.icon || ''
diff --git a/src/tabviews/zshare/actionList/excelInbutton/index.jsx b/src/tabviews/zshare/actionList/excelInbutton/index.jsx
index 55277b0..e943949 100644
--- a/src/tabviews/zshare/actionList/excelInbutton/index.jsx
+++ b/src/tabviews/zshare/actionList/excelInbutton/index.jsx
@@ -463,7 +463,7 @@
label = btn.label
icon = btn.icon || ''
} else if (show === 'link') {
- label = <span>{btn.label}{btn.icon ? <Icon type={btn.icon}/> : ''}</span>
+ label = <span>{btn.label}{btn.icon ? <Icon style={{marginLeft: '8px'}} type={btn.icon}/> : ''}</span>
icon = ''
} else if (show === 'icon') {
icon = btn.icon || 'upload'
diff --git a/src/tabviews/zshare/actionList/exceloutbutton/index.jsx b/src/tabviews/zshare/actionList/exceloutbutton/index.jsx
index 7af9862..814f29e 100644
--- a/src/tabviews/zshare/actionList/exceloutbutton/index.jsx
+++ b/src/tabviews/zshare/actionList/exceloutbutton/index.jsx
@@ -877,7 +877,7 @@
label = btn.label
icon = btn.icon || ''
} else if (show === 'link') {
- label = <span>{btn.label}{btn.icon ? <Icon type={btn.icon}/> : ''}</span>
+ label = <span>{btn.label}{btn.icon ? <Icon style={{marginLeft: '8px'}} type={btn.icon}/> : ''}</span>
icon = ''
} else if (show === 'icon') {
icon = btn.icon || 'download'
diff --git a/src/tabviews/zshare/actionList/newpagebutton/index.jsx b/src/tabviews/zshare/actionList/newpagebutton/index.jsx
index bde0cee..6ce5e9b 100644
--- a/src/tabviews/zshare/actionList/newpagebutton/index.jsx
+++ b/src/tabviews/zshare/actionList/newpagebutton/index.jsx
@@ -209,7 +209,7 @@
label = btn.label
icon = btn.icon || ''
} else if (show === 'link') {
- label = <span>{btn.label}{btn.icon ? <Icon type={btn.icon}/> : ''}</span>
+ label = <span>{btn.label}{btn.icon ? <Icon style={{marginLeft: '8px'}} type={btn.icon}/> : ''}</span>
icon = ''
} else if (show === 'icon') {
icon = btn.icon || ''
diff --git a/src/tabviews/zshare/actionList/normalbutton/index.jsx b/src/tabviews/zshare/actionList/normalbutton/index.jsx
index 097be7a..8aac0c2 100644
--- a/src/tabviews/zshare/actionList/normalbutton/index.jsx
+++ b/src/tabviews/zshare/actionList/normalbutton/index.jsx
@@ -1806,7 +1806,7 @@
label = btn.label
icon = btn.icon || ''
} else if (show === 'link') {
- label = <span>{btn.label}{btn.icon ? <Icon type={btn.icon}/> : ''}</span>
+ label = <span>{btn.label}{btn.icon ? <Icon style={{marginLeft: '8px'}} type={btn.icon}/> : ''}</span>
icon = ''
} else if (show === 'icon') {
icon = btn.icon || ''
diff --git a/src/tabviews/zshare/actionList/popupbutton/index.jsx b/src/tabviews/zshare/actionList/popupbutton/index.jsx
index a797d90..840c725 100644
--- a/src/tabviews/zshare/actionList/popupbutton/index.jsx
+++ b/src/tabviews/zshare/actionList/popupbutton/index.jsx
@@ -203,7 +203,7 @@
label = btn.label
icon = btn.icon || ''
} else if (show === 'link') {
- label = <span>{btn.label}{btn.icon ? <Icon type={btn.icon}/> : ''}</span>
+ label = <span>{btn.label}{btn.icon ? <Icon style={{marginLeft: '8px'}} type={btn.icon}/> : ''}</span>
icon = ''
} else if (show === 'icon') {
icon = btn.icon || ''
diff --git a/src/tabviews/zshare/actionList/printbutton/index.jsx b/src/tabviews/zshare/actionList/printbutton/index.jsx
index d90e50b..ac9fa04 100644
--- a/src/tabviews/zshare/actionList/printbutton/index.jsx
+++ b/src/tabviews/zshare/actionList/printbutton/index.jsx
@@ -1516,7 +1516,7 @@
label = btn.label
icon = btn.icon || ''
} else if (show === 'link') {
- label = <span>{btn.label}{btn.icon ? <Icon type={btn.icon}/> : ''}</span>
+ label = <span>{btn.label}{btn.icon ? <Icon style={{marginLeft: '8px'}} type={btn.icon}/> : ''}</span>
icon = ''
} else if (show === 'icon') {
icon = btn.icon || ''
diff --git a/src/tabviews/zshare/actionList/tabbutton/index.jsx b/src/tabviews/zshare/actionList/tabbutton/index.jsx
index c139e00..db9b04b 100644
--- a/src/tabviews/zshare/actionList/tabbutton/index.jsx
+++ b/src/tabviews/zshare/actionList/tabbutton/index.jsx
@@ -201,7 +201,7 @@
label = btn.label
icon = btn.icon || ''
} else if (show === 'link') {
- label = <span>{btn.label}{btn.icon ? <Icon type={btn.icon}/> : ''}</span>
+ label = <span>{btn.label}{btn.icon ? <Icon style={{marginLeft: '8px'}} type={btn.icon}/> : ''}</span>
icon = ''
} else if (show === 'icon') {
icon = btn.icon || ''
diff --git a/src/tabviews/zshare/mutilform/index.jsx b/src/tabviews/zshare/mutilform/index.jsx
index eda166d..7006e7b 100644
--- a/src/tabviews/zshare/mutilform/index.jsx
+++ b/src/tabviews/zshare/mutilform/index.jsx
@@ -160,6 +160,9 @@
}
if (item.type === 'text') {
+ if (typeof(item.initval) === 'number') {
+ item.initval = item.initval + ''
+ }
let _rules = [{
pattern: /^[^']*$/ig,
message: formRule.input.quotemsg
diff --git a/src/tabviews/zshare/topSearch/advanceform/index.jsx b/src/tabviews/zshare/topSearch/advanceform/index.jsx
index dd07f57..9a9f6d9 100644
--- a/src/tabviews/zshare/topSearch/advanceform/index.jsx
+++ b/src/tabviews/zshare/topSearch/advanceform/index.jsx
@@ -43,9 +43,9 @@
if (item.type === 'text') {
if (item.inputType === 'search') {
- content = <Search placeholder={item.labelShow === 'false' ? item.label : ''} autoComplete="off" onSearch={this.handleSubmit} enterButton/>
+ content = <Search allowClear placeholder={item.labelShow === 'false' ? item.label : ''} autoComplete="off" onSearch={this.handleSubmit} enterButton/>
} else {
- content = <Input placeholder={item.labelShow === 'false' ? item.label : ''} autoComplete="off" onPressEnter={this.handleSubmit} />
+ content = <Input allowClear placeholder={item.labelShow === 'false' ? item.label : ''} autoComplete="off" onPressEnter={this.handleSubmit} />
}
} else if (item.type === 'select' || item.type === 'link' || item.type === 'multiselect') {
content = (<MKSelect config={item}/>)
@@ -72,7 +72,8 @@
return fields
}
- handleSubmit = () => {
+ handleSubmit = (e) => {
+ e.stopPropagation()
// 鍥炶溅鎴栫偣鍑绘悳绱�
this.props.form.validateFields((err, values) => {
if (err) return
diff --git a/src/tabviews/zshare/topSearch/advanceform/index.scss b/src/tabviews/zshare/topSearch/advanceform/index.scss
index 74b0bca..21216b0 100644
--- a/src/tabviews/zshare/topSearch/advanceform/index.scss
+++ b/src/tabviews/zshare/topSearch/advanceform/index.scss
@@ -38,4 +38,15 @@
padding: 10px;
border-top: 1px solid #f0f0f0;
}
+ .ant-input-affix-wrapper {
+ .ant-input-suffix {
+ opacity: 1;
+ transition: opacity 0.3s;
+ }
+ }
+ .ant-input-affix-wrapper:not(:hover) {
+ .ant-input-suffix {
+ opacity: 0;
+ }
+ }
}
\ No newline at end of file
diff --git a/src/tabviews/zshare/topSearch/index.jsx b/src/tabviews/zshare/topSearch/index.jsx
index c16a881..90209bf 100644
--- a/src/tabviews/zshare/topSearch/index.jsx
+++ b/src/tabviews/zshare/topSearch/index.jsx
@@ -362,7 +362,8 @@
resetSearch = (result) => {
let _searchlist = this.state.searchlist.map(item => {
if (['select', 'link', 'multiselect', 'checkcard'].includes(item.type) && result[item.field] && result[item.field].length > 0) {
- let options = result[item.field].map(cell => {
+ let options = []
+ result[item.field].forEach(cell => {
let _item = {
key: Utils.getuuid()
}
@@ -370,6 +371,9 @@
if (item.type !== 'checkcard') {
_item.Value = cell[item.valueField]
_item.Text = cell[item.valueText]
+ if (!_item.Text && _item.Text !== 0) {
+ return
+ }
} else {
_item.$value = cell[item.cardValField]
_item = {..._item, ...cell}
@@ -379,7 +383,7 @@
_item.ParentID = cell[item.linkField]
}
- return _item
+ options.push(_item)
})
item.oriOptions = [...item.oriOptions, ...options]
@@ -427,7 +431,7 @@
getFields() {
const { getFieldDecorator } = this.props.form
- const { dict, showButton, showAdvanced, float } = this.state
+ const { dict, showButton, showAdvanced, float, visible } = this.state
const fields = []
this.state.searchlist.forEach((item, index) => {
@@ -445,9 +449,9 @@
if (item.type === 'text') {
if (item.inputType === 'search') {
- content = <Search placeholder={item.labelShow === 'false' ? item.label : ''} autoComplete="off" onSearch={this.handleSubmit} enterButton/>
+ content = <Search allowClear placeholder={item.labelShow === 'false' ? item.label : ''} autoComplete="off" onSearch={this.handleSubmit} enterButton/>
} else {
- content = <Input placeholder={item.labelShow === 'false' ? item.label : ''} autoComplete="off" onPressEnter={this.handleSubmit} />
+ content = <Input allowClear placeholder={item.labelShow === 'false' ? item.label : ''} autoComplete="off" onPressEnter={this.handleSubmit} />
}
} else if (item.type === 'select' || item.type === 'link' || item.type === 'multiselect') {
content = (<MKSelect config={item} onChange={(val, defer) => this.recordChange(val, defer, item)} />)
@@ -484,7 +488,7 @@
<Button style={{ marginLeft: 8 }} onClick={this.handleReset}>
{dict['main.reset']}
</Button>
- {showAdvanced ? <Button type="link" onClick={this.handleAdvance}>
+ {showAdvanced && !visible ? <Button type="link" onClick={this.handleAdvance}>
楂樼骇
</Button> : null}
</Form.Item>
diff --git a/src/tabviews/zshare/topSearch/index.scss b/src/tabviews/zshare/topSearch/index.scss
index f5378b0..90da412 100644
--- a/src/tabviews/zshare/topSearch/index.scss
+++ b/src/tabviews/zshare/topSearch/index.scss
@@ -37,6 +37,7 @@
}
}
.search-button {
+ min-height: 60px;
.ant-btn-link, .ant-btn-link:hover, .ant-btn-link:active{
border-color: transparent;
span {
@@ -67,6 +68,20 @@
.check-card-form-box {
margin-top: 5px;
}
+ .ant-calendar-picker-clear, .ant-calendar-picker-icon {
+ right: 8px;
+ }
+ .ant-input-affix-wrapper {
+ .ant-input-suffix {
+ opacity: 1;
+ transition: opacity 0.3s;
+ }
+ }
+ .ant-input-affix-wrapper:not(:hover) {
+ .ant-input-suffix {
+ opacity: 0;
+ }
+ }
}
.top-search.right {
>.ant-row {
diff --git a/src/tabviews/zshare/topSearch/mkSelect/index.jsx b/src/tabviews/zshare/topSearch/mkSelect/index.jsx
index 725c805..53d6385 100644
--- a/src/tabviews/zshare/topSearch/mkSelect/index.jsx
+++ b/src/tabviews/zshare/topSearch/mkSelect/index.jsx
@@ -111,7 +111,7 @@
onChange={this.selectChange}
>
{options.map(option =>
- <Select.Option id={option.key} key={option.key} value={option.Value}>{option.Text}</Select.Option>
+ <Select.Option id={option.key} key={option.key} title={option.Text} value={option.Value}>{option.Text}</Select.Option>
)}
</Select>
)
diff --git a/src/templates/sharecomponent/searchcomponent/dragsearch/card.jsx b/src/templates/sharecomponent/searchcomponent/dragsearch/card.jsx
index 1981f06..c0d3aa2 100644
--- a/src/templates/sharecomponent/searchcomponent/dragsearch/card.jsx
+++ b/src/templates/sharecomponent/searchcomponent/dragsearch/card.jsx
@@ -92,7 +92,7 @@
</div>
} trigger="hover">
<div className={'page-card ' + (card.labelShow || '')} style={{ opacity: opacity}}>
- <div ref={node => drag(drop(node))}>
+ <div ref={node => drag(drop(node))} onDoubleClick={() => editCard(id)}>
<Form.Item
labelCol={{xs: { span: 24 }, sm: { span: 8 }}}
wrapperCol = {{xs: { span: 24 }, sm: { span: 16 }}}
diff --git a/src/views/login/index.jsx b/src/views/login/index.jsx
index 099622e..40590de 100644
--- a/src/views/login/index.jsx
+++ b/src/views/login/index.jsx
@@ -411,10 +411,10 @@
Api.getSystemConfig(_param).then(res => {
if (res.status) {
// positecgroup
- // res.Banner = res.Banner ? res.Banner.replace(/:8080/ig, '').replace(/http:/ig, 'https:') : ''
- // res.doclogo = res.doclogo ? res.doclogo.replace(/:8080/ig, '').replace(/http:/ig, 'https:') : ''
- // res.indexlogo = res.indexlogo ? res.indexlogo.replace(/:8080/ig, '').replace(/http:/ig, 'https:') : ''
- // res.loginlogo = res.loginlogo ? res.loginlogo.replace(/:8080/ig, '').replace(/http:/ig, 'https:') : ''
+ res.Banner = res.Banner ? res.Banner.replace(/:8080/ig, '').replace(/http:/ig, 'https:') : ''
+ res.doclogo = res.doclogo ? res.doclogo.replace(/:8080/ig, '').replace(/http:/ig, 'https:') : ''
+ res.indexlogo = res.indexlogo ? res.indexlogo.replace(/:8080/ig, '').replace(/http:/ig, 'https:') : ''
+ res.loginlogo = res.loginlogo ? res.loginlogo.replace(/:8080/ig, '').replace(/http:/ig, 'https:') : ''
let _url = window.location.href.split('#')[0] + 'system'
let systemMsg = {
--
Gitblit v1.8.0