From eabb367803e675fc57bd20bfd53d4b65edaadae5 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 25 十一月 2021 21:22:54 +0800
Subject: [PATCH] 2021-11-25
---
src/assets/css/viewstyle.scss | 24 ++++++++++++
src/tabviews/zshare/calendar/index.jsx | 2
src/views/appmanage/index.jsx | 7 ++-
src/mob/components/tabs/antv-tabs/index.jsx | 4 +-
src/mob/components/tabs/antv-tabs/options.jsx | 2
src/tabviews/zshare/actionList/normalbutton/index.jsx | 2
src/views/appmanage/submutilform/index.jsx | 17 ++++++++
src/views/mobdesign/index.jsx | 10 +++++
8 files changed, 60 insertions(+), 8 deletions(-)
diff --git a/src/assets/css/viewstyle.scss b/src/assets/css/viewstyle.scss
index 9064e71..ac02bdb 100644
--- a/src/assets/css/viewstyle.scss
+++ b/src/assets/css/viewstyle.scss
@@ -417,6 +417,30 @@
border-color: $color2;;
}
}
+ .custom-tab-form-box .mk-normal-form-title.mkbtn {
+ .form-title {
+ color: $color6;
+ border-color: $color6;
+ }
+ .form-title.active {
+ background: $color6;
+ color: #ffffff;
+ }
+ }
+ .ant-input-search .ant-input-group-addon .ant-input-search-button {
+ background-color: $color6;
+ border-color: $color6;
+ }
+ .ant-modal-wrap .ant-modal-footer, .ant-drawer .ant-drawer-footer {
+ .ant-btn:not(.ant-btn-primary):hover {
+ color: $color6;
+ border-color: $color6;
+ }
+ .ant-btn-primary {
+ background-color: $color6;
+ border-color: $color6;
+ }
+ }
}
body.hidden-split-line #root { // 鍘婚櫎鐧诲綍椤靛垎鍓茬嚎
diff --git a/src/mob/components/tabs/antv-tabs/index.jsx b/src/mob/components/tabs/antv-tabs/index.jsx
index 08bb481..4d9f345 100644
--- a/src/mob/components/tabs/antv-tabs/index.jsx
+++ b/src/mob/components/tabs/antv-tabs/index.jsx
@@ -384,7 +384,7 @@
return (
<div className={'mob-tabs-edit-box ' + tabs.setting.display} style={_style} onClick={this.clickComponent} id={tabs.uuid}>
- <DraggableTabs defaultActiveKey={defaultActiveKey} tabPosition={tabs.setting.position} type={tabs.setting.tabStyle} tabsMove={this.moveSwitch} onChange={this.onChange}>
+ <DraggableTabs defaultActiveKey={defaultActiveKey} tabPosition={'top'} type={tabs.setting.tabStyle} tabsMove={this.moveSwitch} onChange={this.onChange}>
{tabs.subtabs.map(tab => (
<TabPane tab={
<Popover overlayClassName="mk-popover-control-wrap" mouseLeaveDelay={0.2} mouseEnterDelay={0.2} content={
@@ -400,7 +400,7 @@
<span style={_tabStyle}>{tab.icon ? <Icon type={tab.icon} /> : null}{tab.label}</span>
</Popover>
} key={tab.uuid}>
- {appType === 'mob' && tabs.setting.position === 'top' && tabs.setting.display === 'inline-block' && tab.hasSearch === 'icon' ?
+ {appType === 'mob' && tabs.setting.display === 'inline-block' && tab.hasSearch === 'icon' ?
<Icon className="search-icon" onDoubleClick={() => this.setSearch(tab)} type="search" /> : null}
<TabComponents config={tab} handleList={this.updateTabComponent} deleteCard={this.deleteCard} />
</TabPane>
diff --git a/src/mob/components/tabs/antv-tabs/options.jsx b/src/mob/components/tabs/antv-tabs/options.jsx
index e2dd8c8..7d7782b 100644
--- a/src/mob/components/tabs/antv-tabs/options.jsx
+++ b/src/mob/components/tabs/antv-tabs/options.jsx
@@ -44,7 +44,7 @@
{value: 'false', label: '鏃�'},
{value: 'icon', label: '鏈�'},
],
- forbid: appType !== 'mob' || setting.position !== 'top' || setting.display !== 'inline-block',
+ forbid: appType !== 'mob' || setting.display !== 'inline-block',
span: 22
},
{
diff --git a/src/tabviews/zshare/actionList/normalbutton/index.jsx b/src/tabviews/zshare/actionList/normalbutton/index.jsx
index 57f3d60..7278fd3 100644
--- a/src/tabviews/zshare/actionList/normalbutton/index.jsx
+++ b/src/tabviews/zshare/actionList/normalbutton/index.jsx
@@ -1899,7 +1899,7 @@
BData={BData}
wrappedComponentRef={(inst) => this.formRef = inst}
/>
- <div style={{ position: 'absolute', zIndex: 1, right: 0, bottom: 0, width: '100%', borderTop: '1px solid #e9e9e9', padding: '10px 16px', background: '#fff', textAlign: 'right'}}>
+ <div className="ant-drawer-footer" style={{ position: 'absolute', zIndex: 1, right: 0, bottom: 0, width: '100%', borderTop: '1px solid #e9e9e9', padding: '10px 16px', background: '#fff', textAlign: 'right'}}>
<Button onClick={this.handleCancel} style={{ marginRight: 8 }}>
{btnconfig.setting.formType !== 'check' ? '鍙栨秷' : '鍏抽棴'}
</Button>
diff --git a/src/tabviews/zshare/calendar/index.jsx b/src/tabviews/zshare/calendar/index.jsx
index eb5899f..19c209a 100644
--- a/src/tabviews/zshare/calendar/index.jsx
+++ b/src/tabviews/zshare/calendar/index.jsx
@@ -107,7 +107,7 @@
data && data.forEach(item => {
let startTime = item[calendar.startfield]
let endTime = item[calendar.endfield]
- let color = item[calendar.colorfield]
+ let color = item[calendar.colorfield] || '#ffffff'
if (!startTime || !/^(1|2)\d{3}(-|\/)\d{2}(-|\/)\d{2}/.test(startTime)) return
if (!endTime || !/^(1|2)\d{3}(-|\/)\d{2}(-|\/)\d{2}/.test(endTime)) return
diff --git a/src/views/appmanage/index.jsx b/src/views/appmanage/index.jsx
index 3f34590..9658cb1 100644
--- a/src/views/appmanage/index.jsx
+++ b/src/views/appmanage/index.jsx
@@ -472,6 +472,7 @@
cell.apptype = _param.apptype || ''
cell.delay = _param.delay || 0
cell.statusBarColor = _param.statusBarColor || 'black'
+ cell.adapter = _param.adapter || 'false'
}
return cell
@@ -604,7 +605,7 @@
sublist = sublist.filter(item => item.ID !== record.ID)
// param.LText = sublist.map(item => `select '${item.ID}','${item.typename}','${selectApp.ID}','${sessionStorage.getItem('CloudUserID') || ''}','${window.GLOB.appkey || ''}','${item.login_types || 'true'}','${item.link_type || 'true'}','${item.role_type || 'true'}','${item.lang || 'zh-CN'}'`)
- param.LText = sublist.map(item => `select '${item.ID}','${item.typename}','${selectApp.ID}','${sessionStorage.getItem('CloudUserID') || ''}','${window.GLOB.appkey || ''}','false','false','${item.role_type || 'true'}','${item.lang || 'zh-CN'}','${item.css || ''}','${item.title || ''}','${item.favicon || ''}','${item.user_binding || ''}','${item.sms_id || ''}','${window.btoa(window.encodeURIComponent(JSON.stringify({copyright: item.copyright || '', logo: item.logo || '', apptype: item.apptype || '', delay: item.delay || 0, statusBarColor: item.statusBarColor || 'black'})))}'`)
+ param.LText = sublist.map(item => `select '${item.ID}','${item.typename}','${selectApp.ID}','${sessionStorage.getItem('CloudUserID') || ''}','${window.GLOB.appkey || ''}','false','false','${item.role_type || 'true'}','${item.lang || 'zh-CN'}','${item.css || ''}','${item.title || ''}','${item.favicon || ''}','${item.user_binding || ''}','${item.sms_id || ''}','${window.btoa(window.encodeURIComponent(JSON.stringify({copyright: item.copyright || '', logo: item.logo || '', apptype: item.apptype || '', delay: item.delay || 0, statusBarColor: item.statusBarColor || 'black', adapter: item.adapter || 'false'})))}'`)
param.LText = param.LText.join(' union all ')
param.LText = Utils.formatOptions(param.LText)
@@ -828,7 +829,7 @@
if (visible === 'edit') {
// param.LText = selectApp.sublist.map(item => `select '${item.ID}','${item.typename}','${selectApp.ID}','${sessionStorage.getItem('CloudUserID') || ''}','${window.GLOB.appkey || ''}','${item.login_types || 'true'}','${item.link_type || 'true'}','${item.role_type || 'true'}','${item.lang || 'zh-CN'}','${item.css || ''}','${item.title || ''}','${item.favicon || ''}'`)
- param.LText = selectApp.sublist.map(item => `select '${item.ID}','${item.typename}','${selectApp.ID}','${sessionStorage.getItem('CloudUserID') || ''}','${window.GLOB.appkey || ''}','false','false','${item.role_type || 'true'}','${item.lang || 'zh-CN'}','${item.css || ''}','${item.title || ''}','${item.favicon || ''}','${item.user_binding || ''}','${item.sms_id || ''}','${window.btoa(window.encodeURIComponent(JSON.stringify({copyright: item.copyright || '', logo: item.logo || '', apptype: item.apptype || '', delay: item.delay || 0, statusBarColor: item.statusBarColor || 'black'})))}'`)
+ param.LText = selectApp.sublist.map(item => `select '${item.ID}','${item.typename}','${selectApp.ID}','${sessionStorage.getItem('CloudUserID') || ''}','${window.GLOB.appkey || ''}','false','false','${item.role_type || 'true'}','${item.lang || 'zh-CN'}','${item.css || ''}','${item.title || ''}','${item.favicon || ''}','${item.user_binding || ''}','${item.sms_id || ''}','${window.btoa(window.encodeURIComponent(JSON.stringify({copyright: item.copyright || '', logo: item.logo || '', apptype: item.apptype || '', delay: item.delay || 0, statusBarColor: item.statusBarColor || 'black', adapter: item.adapter || 'false'})))}'`)
param.LText = param.LText.join(' union all ')
param.LText = Utils.formatOptions(param.LText)
}
@@ -914,7 +915,7 @@
}
// param.LText = sublist.map(item => `select '${item.ID}','${item.typename}','${selectApp.ID}','${sessionStorage.getItem('CloudUserID') || ''}','${window.GLOB.appkey || ''}','${item.login_types || 'true'}','${item.link_type || 'true'}','${item.role_type || 'true'}','${item.lang || 'zh-CN'}','${item.css || ''}','${item.title || ''}','${item.favicon || ''}'`)
- param.LText = sublist.map(item => `select '${item.ID}','${item.typename}','${selectApp.ID}','${sessionStorage.getItem('CloudUserID') || ''}','${window.GLOB.appkey || ''}','false','false','${item.role_type || 'true'}','${item.lang || 'zh-CN'}','${item.css || ''}','${item.title || ''}','${item.favicon || ''}','${item.user_binding || ''}','${item.sms_id || ''}','${window.btoa(window.encodeURIComponent(JSON.stringify({copyright: item.copyright || '', logo: item.logo || '', apptype: item.apptype || '', delay: item.delay || 0, statusBarColor: item.statusBarColor || 'black'})))}'`)
+ param.LText = sublist.map(item => `select '${item.ID}','${item.typename}','${selectApp.ID}','${sessionStorage.getItem('CloudUserID') || ''}','${window.GLOB.appkey || ''}','false','false','${item.role_type || 'true'}','${item.lang || 'zh-CN'}','${item.css || ''}','${item.title || ''}','${item.favicon || ''}','${item.user_binding || ''}','${item.sms_id || ''}','${window.btoa(window.encodeURIComponent(JSON.stringify({copyright: item.copyright || '', logo: item.logo || '', apptype: item.apptype || '', delay: item.delay || 0, statusBarColor: item.statusBarColor || 'black', adapter: item.adapter || 'false'})))}'`)
param.LText = param.LText.join(' union all ')
param.LText = Utils.formatOptions(param.LText)
diff --git a/src/views/appmanage/submutilform/index.jsx b/src/views/appmanage/submutilform/index.jsx
index a25aa9e..e782e76 100644
--- a/src/views/appmanage/submutilform/index.jsx
+++ b/src/views/appmanage/submutilform/index.jsx
@@ -283,6 +283,23 @@
)}
</Form.Item>
</Col> : null}
+ {typename !== 'pc' ? <Col span={12}>
+ <Form.Item label={
+ <Tooltip placement="topLeft" title="璇风‘璁ゅ綋鍓嶅簲鐢ㄦ槸鍚﹀湪灏忕▼搴忎腑浣跨敤銆�">
+ <QuestionCircleOutlined className="mk-form-tip" />
+ 灏忕▼搴�
+ </Tooltip>
+ }>
+ {getFieldDecorator('adapter', {
+ initialValue: card ? card.adapter || 'false' : 'false'
+ })(
+ <Radio.Group>
+ <Radio value="false">涓嶉�傞厤</Radio>
+ <Radio value="true">閫傞厤</Radio>
+ </Radio.Group>
+ )}
+ </Form.Item>
+ </Col> : null}
</Row>
</Form>
)
diff --git a/src/views/mobdesign/index.jsx b/src/views/mobdesign/index.jsx
index dff1573..0de7b33 100644
--- a/src/views/mobdesign/index.jsx
+++ b/src/views/mobdesign/index.jsx
@@ -85,6 +85,7 @@
sessionStorage.setItem('role_type', param.role_type || 'true')
sessionStorage.setItem('login_types', param.login_types || 'false')
sessionStorage.setItem('typename', param.typename || 'mob')
+ sessionStorage.setItem('adapter', param.adapter || 'false')
this.setState({
localedict: sessionStorage.getItem('lang') !== 'en-US' ? antdZhCN : antdEnUS,
@@ -833,6 +834,11 @@
}
}
+ getMiniStyle = (config) => {
+ console.log(config)
+ return config
+ }
+
submitConfig = () => {
let config = fromJS(this.state.config).toJS()
@@ -868,6 +874,10 @@
config.loginview = false
}
+ if (sessionStorage.getItem('adapter') === 'true') {
+ config = this.getMiniStyle(config)
+ }
+
let param = {
func: 'sPC_TrdMenu_AddUpt',
FstID: 'mk_app',
--
Gitblit v1.8.0