From 309cdd2d05e87051d451ad069e12db05fbbdc20c Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 15 十月 2021 17:11:41 +0800
Subject: [PATCH] 2021-10-15
---
src/menu/components/card/cardcellcomponent/formconfig.jsx | 3 ++-
src/mob/components/topbar/normal-navbar/index.scss | 2 +-
src/pc/modulesource/option.jsx | 2 ++
src/mob/components/topbar/normal-navbar/index.jsx | 17 +++++++++++++++--
src/templates/modalconfig/settingform/index.jsx | 2 +-
5 files changed, 21 insertions(+), 5 deletions(-)
diff --git a/src/menu/components/card/cardcellcomponent/formconfig.jsx b/src/menu/components/card/cardcellcomponent/formconfig.jsx
index 66ca494..4c48124 100644
--- a/src/menu/components/card/cardcellcomponent/formconfig.jsx
+++ b/src/menu/components/card/cardcellcomponent/formconfig.jsx
@@ -226,7 +226,7 @@
key: 'qrWidth',
min: 5,
max: 1000,
- label: '瀹藉害',
+ label: '浜岀淮鐮佸昂瀵�',
initVal: card.qrWidth || 50,
required: true,
},
@@ -425,6 +425,7 @@
key: 'noValue',
label: '绌哄��',
initVal: card.noValue || 'show',
+ tooltip: '褰撳厓绱犲唴瀹逛负绌烘椂锛屾槸鍚︽樉绀哄綋鍓嶅厓绱犮��',
required: false,
options: [
{ value: 'show', text: '鏄剧ず' },
diff --git a/src/mob/components/topbar/normal-navbar/index.jsx b/src/mob/components/topbar/normal-navbar/index.jsx
index b495c89..fc6c79b 100644
--- a/src/mob/components/topbar/normal-navbar/index.jsx
+++ b/src/mob/components/topbar/normal-navbar/index.jsx
@@ -180,6 +180,19 @@
this.updateComponent({...this.state.card, wrap: res})
}
+ skip = () => {
+ const { wrap } = this.state.card
+
+ if (!wrap.linkmenu) return
+
+ MKEmitter.emit('changeEditMenu', {
+ MenuID: wrap.linkmenu,
+ copyMenuId: '',
+ MenuNo: '',
+ MenuName: '',
+ })
+ }
+
render() {
const { card } = this.state
@@ -188,10 +201,10 @@
right = <Icon type="logout" />
}
if (card.wrap.scan === 'true') {
- right = !right ? <ExpandOutlined /> : <Icon type="ellipsis" />
+ right = !right ? <ExpandOutlined onDoubleClick={this.skip}/> : <Icon type="ellipsis" />
}
if (card.wrap.refresh === 'true') {
- right = !right ? <ReloadOutlined /> : <Icon type="ellipsis" />
+ right = !right ? <ReloadOutlined /> : <Icon type="ellipsis" onDoubleClick={this.skip}/>
}
return (
diff --git a/src/mob/components/topbar/normal-navbar/index.scss b/src/mob/components/topbar/normal-navbar/index.scss
index fc14075..c75f268 100644
--- a/src/mob/components/topbar/normal-navbar/index.scss
+++ b/src/mob/components/topbar/normal-navbar/index.scss
@@ -73,7 +73,7 @@
cursor: pointer;
}
>.anticon:not(.anticon-search) {
- margin: 0px 5px;
+ padding: 0px 5px;
}
}
}
diff --git a/src/pc/modulesource/option.jsx b/src/pc/modulesource/option.jsx
index bcbbf12..a81e981 100644
--- a/src/pc/modulesource/option.jsx
+++ b/src/pc/modulesource/option.jsx
@@ -24,6 +24,7 @@
import dashboard from '@/assets/mobimg/dashboard.png'
import ratioboard from '@/assets/mobimg/ratioboard.png'
import scatter from '@/assets/mobimg/scatter.png'
+import chart from '@/assets/mobimg/chart.png'
import tree from '@/assets/mobimg/tree.png'
// 缁勪欢閰嶇疆淇℃伅
@@ -53,6 +54,7 @@
{ type: 'menu', url: dashboard, component: 'dashboard', subtype: 'dashboard', title: '浠〃鐩�', width: 12 },
{ type: 'menu', url: ratioboard, component: 'dashboard', subtype: 'ratioboard', title: '鍗犳瘮鍥�', width: 12 },
{ type: 'menu', url: scatter, component: 'scatter', subtype: 'scatter', title: '鏁ｇ偣鍥�', width: 24 },
+ { type: 'menu', url: chart, component: 'chart', subtype: 'custom', title: '鑷畾涔夊浘琛�', width: 24 },
{ type: 'menu', url: Editor, component: 'editor', subtype: 'brafteditor', title: '瀵屾枃鏈�', width: 24 },
{ type: 'menu', url: SandBox, component: 'code', subtype: 'sandbox', title: '鑷畾涔�', width: 24 },
{ type: 'menu', url: group, component: 'group', subtype: 'normalgroup', title: '鍒嗙粍', width: 24 },
diff --git a/src/templates/modalconfig/settingform/index.jsx b/src/templates/modalconfig/settingform/index.jsx
index 1b6be2a..7ca2a4b 100644
--- a/src/templates/modalconfig/settingform/index.jsx
+++ b/src/templates/modalconfig/settingform/index.jsx
@@ -236,7 +236,7 @@
)}
</Form.Item>
</Col> : null}
- {display === 'drawer' ? <Col span={12}>
+ {display === 'drawer' && appType !== 'mob' ? <Col span={12}>
<Form.Item label="琛ㄥ崟绫诲瀷">
{getFieldDecorator('formType', {
initialValue: config.setting.formType || 'edit'
--
Gitblit v1.8.0