From 63663db92125c687adbb634430a4a1abbf15b8f7 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 15 九月 2021 13:35:34 +0800
Subject: [PATCH] 2021-09-15
---
src/menu/picturecontroller/editform/index.jsx | 3 +
src/views/mobdesign/menuform/index.scss | 3 +
src/views/pcdesign/index.jsx | 62 ++++++++++++++++++++
src/views/design/header/versions/index.jsx | 6 +-
src/views/mobdesign/index.jsx | 62 ++++++++++++++++++++
src/tabviews/custom/components/share/normalTable/index.scss | 8 ++
src/tabviews/zshare/normalTable/index.scss | 8 ++
7 files changed, 149 insertions(+), 3 deletions(-)
diff --git a/src/menu/picturecontroller/editform/index.jsx b/src/menu/picturecontroller/editform/index.jsx
index 778cc0a..30a0c83 100644
--- a/src/menu/picturecontroller/editform/index.jsx
+++ b/src/menu/picturecontroller/editform/index.jsx
@@ -19,12 +19,15 @@
}
handleConfirm = () => {
+ const { card } = this.props
// 琛ㄥ崟鎻愪氦鏃舵鏌ヨ緭鍏ュ�兼槸鍚︽纭�
return new Promise((resolve, reject) => {
this.props.form.validateFieldsAndScroll((err, values) => {
if (!err) {
if (values.urls) {
values.linkurl = values.urls
+ } else if (card.typecharone === 'color' && /^[0-9a-f]{6}$/.test(values.linkurl)) {
+ values.linkurl = '#' + values.linkurl
}
resolve(values)
} else {
diff --git a/src/tabviews/custom/components/share/normalTable/index.scss b/src/tabviews/custom/components/share/normalTable/index.scss
index 7b1e821..1ded89d 100644
--- a/src/tabviews/custom/components/share/normalTable/index.scss
+++ b/src/tabviews/custom/components/share/normalTable/index.scss
@@ -182,6 +182,14 @@
background: rgba(0, 0, 0, 0);
}
}
+.normal-custom-table.fixed-height {
+ .ant-table-body {
+ border-bottom: 1px solid rgba(0, 0, 0, .05);
+ .ant-table-fixed {
+ border-bottom: 0;
+ }
+ }
+}
.normal-custom-table.hidden {
thead {
display: none;
diff --git a/src/tabviews/zshare/normalTable/index.scss b/src/tabviews/zshare/normalTable/index.scss
index 02bfed8..8202f79 100644
--- a/src/tabviews/zshare/normalTable/index.scss
+++ b/src/tabviews/zshare/normalTable/index.scss
@@ -241,4 +241,12 @@
border: 1px solid rgba(0, 0, 0, 0.07);
background: rgba(0, 0, 0, 0);
}
+}
+.normal-data-table.fixed-height {
+ .ant-table-body {
+ border-bottom: 1px solid rgba(0, 0, 0, .05);
+ .ant-table-fixed {
+ border-bottom: 0;
+ }
+ }
}
\ No newline at end of file
diff --git a/src/views/design/header/versions/index.jsx b/src/views/design/header/versions/index.jsx
index 5290e82..74243b2 100644
--- a/src/views/design/header/versions/index.jsx
+++ b/src/views/design/header/versions/index.jsx
@@ -63,7 +63,7 @@
if (window.GLOB.systemType === 'production' || sysType !== 'local') {
sysType = ''
}
-
+
let param = {
func: 's_get_sversions_sys_epc',
edition_int: edition_int,
@@ -415,8 +415,8 @@
closable={false}
maskClosable={false}
footer={[
- error && version && versions && versions.length > (version.index + 1) ? <Button key="close" onClick={this.skip}>璺宠繃</Button> : null,
- error && version ? <Button key="close" onClick={this.reset}>閲嶆柊鎵ц</Button> : null,
+ error && version && versions && versions.length > (version.index + 1) ? <Button key="skip" className="mk-orange" onClick={this.skip}>璺宠繃</Button> : null,
+ error && version ? <Button key="reset" type="primary" onClick={this.reset}>閲嶆柊鎵ц</Button> : null,
<Button key="close" onClick={this.stop}>鍏抽棴</Button>,
]}
destroyOnClose
diff --git a/src/views/mobdesign/index.jsx b/src/views/mobdesign/index.jsx
index b3c5773..41af15d 100644
--- a/src/views/mobdesign/index.jsx
+++ b/src/views/mobdesign/index.jsx
@@ -1281,6 +1281,67 @@
})
}
+ setLoginView = () => {
+ const { oriConfig, config } = this.state
+
+ if (!oriConfig || !is(fromJS(oriConfig), fromJS(config))) {
+ notification.warning({
+ top: 92,
+ message: '閰嶇疆淇℃伅鏈繚瀛橈紒',
+ duration: 5
+ })
+ return
+ }
+
+ let param = {
+ func: 's_kei_link_keyids_addupt',
+ BID: sessionStorage.getItem('appId'),
+ exec_type: 'y',
+ LText: ''
+ }
+
+ let appViewList = sessionStorage.getItem('appViewList')
+ appViewList = appViewList ? JSON.parse(appViewList) : []
+ appViewList = appViewList.filter(item => item.keys_type !== 'login')
+
+ appViewList.unshift({
+ appkey: window.GLOB.appkey || '',
+ bid: sessionStorage.getItem('appId') || '',
+ kei_no: sessionStorage.getItem('kei_no') || '',
+ keys_id: config.MenuID,
+ keys_type: 'login',
+ remark: config.MenuName
+ })
+
+ param.LText = appViewList.map(item => `select '${item.keys_id}','${item.keys_type}','${item.kei_no}','${item.appkey}','${item.bid}','${sessionStorage.getItem('CloudUserID')}','${item.remark}'`)
+ param.LText = param.LText.join(' union all ')
+ param.LText = Utils.formatOptions(param.LText)
+
+ param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
+ param.secretkey = Utils.encrypt('', param.timestamp)
+
+ let hasLogin = config.components.findIndex(item => item.type === 'login') > -1
+
+ confirm({
+ title: '纭畾璁剧疆鏈〉闈负鐧诲綍椤靛悧锛�',
+ content: hasLogin ? '' : '褰撳墠椤甸潰灏氭湭娣诲姞鐧诲綍缁勪欢銆�',
+ onOk() {
+ Api.getSystemConfig(param).then(result => {
+ if (!result.status) {
+ notification.warning({
+ top: 92,
+ message: result.message,
+ duration: 5
+ })
+ } else {
+ sessionStorage.setItem('appViewList', JSON.stringify(appViewList))
+ }
+ })
+ },
+ onCancel() {}
+ })
+ }
+
changeView = (val) => {
if (val !== 'vertical') {
window.GLOB.winWidth = 992
@@ -1374,6 +1435,7 @@
<PictureController/>
<Quotecomponent config={config} updateConfig={this.updateConfig}/>
<Button className="mk-border-green" icon="home" onClick={this.setHomeView}>璁句负棣栭〉</Button>
+ <Button className="mk-border-purple" icon="login" onClick={this.setLoginView}>璁句负鐧诲綍椤�</Button>
<ReplaceField type="custom" config={config} updateConfig={this.resetConfig}/>
<Transfer MenuID={MenuId} />
<Versions MenuId={MenuId} open_edition={config ? config.open_edition : ''}/>
diff --git a/src/views/mobdesign/menuform/index.scss b/src/views/mobdesign/menuform/index.scss
index 2f72f46..1dd4245 100644
--- a/src/views/mobdesign/menuform/index.scss
+++ b/src/views/mobdesign/menuform/index.scss
@@ -16,4 +16,7 @@
.ant-radio-group {
white-space: nowrap;
}
+ .mk-source-wrap .mk-source-item-info .anticon-delete {
+ color: #ff4d4f;
+ }
}
\ No newline at end of file
diff --git a/src/views/pcdesign/index.jsx b/src/views/pcdesign/index.jsx
index f85e19a..4b74987 100644
--- a/src/views/pcdesign/index.jsx
+++ b/src/views/pcdesign/index.jsx
@@ -1546,6 +1546,67 @@
})
}
+ setLoginView = () => {
+ const { oriConfig, config } = this.state
+
+ if (!oriConfig || !is(fromJS(oriConfig), fromJS(config))) {
+ notification.warning({
+ top: 92,
+ message: '閰嶇疆淇℃伅鏈繚瀛橈紒',
+ duration: 5
+ })
+ return
+ }
+
+ let param = {
+ func: 's_kei_link_keyids_addupt',
+ BID: sessionStorage.getItem('appId'),
+ exec_type: 'y',
+ LText: ''
+ }
+
+ let appViewList = sessionStorage.getItem('appViewList')
+ appViewList = appViewList ? JSON.parse(appViewList) : []
+ appViewList = appViewList.filter(item => item.keys_type !== 'login')
+
+ appViewList.unshift({
+ appkey: window.GLOB.appkey || '',
+ bid: sessionStorage.getItem('appId') || '',
+ kei_no: sessionStorage.getItem('kei_no') || '',
+ keys_id: config.MenuID,
+ keys_type: 'login',
+ remark: config.MenuName
+ })
+
+ param.LText = appViewList.map(item => `select '${item.keys_id}','${item.keys_type}','${item.kei_no}','${item.appkey}','${item.bid}','${sessionStorage.getItem('CloudUserID')}','${item.remark}'`)
+ param.LText = param.LText.join(' union all ')
+ param.LText = Utils.formatOptions(param.LText)
+
+ param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
+ param.secretkey = Utils.encrypt('', param.timestamp)
+
+ let hasLogin = config.components.findIndex(item => item.type === 'login') > -1
+
+ confirm({
+ title: '纭畾璁剧疆鏈〉闈负鐧诲綍椤靛悧锛�',
+ content: hasLogin ? '' : '褰撳墠椤甸潰灏氭湭娣诲姞鐧诲綍缁勪欢銆�',
+ onOk() {
+ Api.getSystemConfig(param).then(result => {
+ if (!result.status) {
+ notification.warning({
+ top: 92,
+ message: result.message,
+ duration: 5
+ })
+ } else {
+ sessionStorage.setItem('appViewList', JSON.stringify(appViewList))
+ }
+ })
+ },
+ onCancel() {}
+ })
+ }
+
render () {
const { localedict, loading, visible, popBtn, comloading, activeKey, settingshow, controlshow, dict, MenuId, config, menuloading, customComponents } = this.state
@@ -1603,6 +1664,7 @@
<PictureController/>
<Quotecomponent config={config} updateConfig={this.updateConfig}/>
<Button className="mk-border-green" icon="home" onClick={this.setHomeView}>璁句负棣栭〉</Button>
+ <Button className="mk-border-purple" icon="login" onClick={this.setLoginView}>璁句负鐧诲綍椤�</Button>
<ReplaceField type="custom" config={config} updateConfig={this.resetConfig}/>
<Transfer MenuID={MenuId} />
<Versions MenuId={MenuId} open_edition={config ? config.open_edition : ''}/>
--
Gitblit v1.8.0