From 5c9504925c4d90f6dd58868bf778f15034e82b0d Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 04 七月 2024 16:26:10 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/menu/components/share/actioncomponent/actionform/index.jsx | 5 ++
src/assets/img/map.jpg | 0
src/pc/components/login/normal-login/signform.jsx | 4 +-
src/views/mobdesign/menuform/index.jsx | 10 ++--
src/menu/components/share/actioncomponent/formconfig.jsx | 35 +++++++++++++----
src/mob/mobshell/card.jsx | 3 -
src/mob/modulesource/option.jsx | 4 +-
src/pc/createview/index.jsx | 4 ++
8 files changed, 45 insertions(+), 20 deletions(-)
diff --git a/src/assets/img/map.jpg b/src/assets/img/map.jpg
index 5dd38ff..757308d 100644
--- a/src/assets/img/map.jpg
+++ b/src/assets/img/map.jpg
Binary files differ
diff --git a/src/menu/components/share/actioncomponent/actionform/index.jsx b/src/menu/components/share/actioncomponent/actionform/index.jsx
index 0d1897c..730898c 100644
--- a/src/menu/components/share/actioncomponent/actionform/index.jsx
+++ b/src/menu/components/share/actioncomponent/actionform/index.jsx
@@ -547,6 +547,11 @@
}
} else if (_funcType === 'shareLink') {
shows.push('shortUrl', 'shareUrl', 'shareProUrl', 'shareTip')
+ } else if (_funcType === 'openLocation') {
+ shows.push('Ot')
+ if (Ot === 'requiredSgl') {
+ shows.push('nameField', 'addressField')
+ }
// } else if (_funcType === 'expPdf') {
// shows.push('exportType')
}
diff --git a/src/menu/components/share/actioncomponent/formconfig.jsx b/src/menu/components/share/actioncomponent/formconfig.jsx
index 4d90ee7..3b176a2 100644
--- a/src/menu/components/share/actioncomponent/formconfig.jsx
+++ b/src/menu/components/share/actioncomponent/formconfig.jsx
@@ -18,6 +18,11 @@
let type = ''
let alltype = config.type + '_' + config.subtype
+ columns = columns.map(item => ({
+ value: item.field,
+ text: `${item.label}锛�${item.field}锛塦
+ }))
+
if (card.eleType === 'button') {
type = 'card'
} else if (config.subtype === 'datacard' || config.subtype === 'tablecard' || config.subtype === 'dualdatacard') {
@@ -211,6 +216,7 @@
{ value: 'copyurl', text: '澶嶅埗閾炬帴鍦板潃' },
{ value: 'expPdf', text: '瀵煎嚭PDF' },
{ value: 'shareLink', text: '鍒嗕韩閾炬帴' },
+ { value: 'openLocation', text: '鎵撳紑鍦板浘'},
{ value: 'logout', text: '閫�鍑�' },
{ value: 'goBack', text: '杩斿洖' },
]
@@ -857,6 +863,25 @@
}]
},
{
+ type: 'select',
+ key: 'nameField',
+ label: '浣嶇疆鍚嶅瓧娈�',
+ initVal: card.nameField || '',
+ tooltip: '鎵撳紑鍦板浘鏃跺彲灞曠ず浣嶇疆鍚嶄笌璇︾粏鍦板潃锛岃缁戝畾鏁版嵁婧愬瓧娈甸泦锛岀粡绾害璇蜂娇鐢╨atitude銆乴ongitude涓旂粡绾害涓嶅彲涓虹┖銆�',
+ required: false,
+ allowClear: true,
+ options: columns
+ },
+ {
+ type: 'select',
+ key: 'addressField',
+ label: '鍦板潃瀛楁',
+ initVal: card.addressField || '',
+ required: false,
+ allowClear: true,
+ options: columns
+ },
+ {
type: 'radio',
key: 'shortUrl',
label: '鐭摼鎺�',
@@ -1151,10 +1176,7 @@
required: false,
allowClear: true,
forbid: position !== 'line',
- options: columns.map(item => ({
- value: item.field,
- text: `${item.label}锛�${item.field}锛塦
- }))
+ options: columns
},
{
type: 'radio',
@@ -1371,10 +1393,7 @@
initVal: card.controlField || '',
required: true,
allowClear: true,
- options: columns.map(item => ({
- value: item.field,
- text: `${item.label}锛�${item.field}锛塦
- }))
+ options: columns
},
{
type: 'text',
diff --git a/src/mob/mobshell/card.jsx b/src/mob/mobshell/card.jsx
index c5a1344..ca91322 100644
--- a/src/mob/mobshell/card.jsx
+++ b/src/mob/mobshell/card.jsx
@@ -31,7 +31,6 @@
const Timeline = asyncComponent(() => import('@/menu/components/timeline/normal-timeline'))
const OfficialAccount = asyncComponent(() => import('@/mob/components/official'))
const ShareCode = asyncComponent(() => import('@/mob/components/sharecode'))
-const TxMap = asyncComponent(() => import('@/mob/components/txmap'))
const Iframe = asyncComponent(() => import('@/menu/components/iframe'))
const DoubleDataCard = asyncComponent(() => import('@/menu/components/card/double-data-card'))
@@ -151,8 +150,6 @@
return (<Iframe card={card} updateConfig={updateConfig} deletecomponent={delCard}/>)
} else if (card.type === 'sharecode') {
return (<ShareCode card={card} updateConfig={updateConfig} deletecomponent={delCard}/>)
- } else if (card.type === 'map') {
- return (<TxMap card={card} updateConfig={updateConfig} deletecomponent={delCard}/>)
}
}
diff --git a/src/mob/modulesource/option.jsx b/src/mob/modulesource/option.jsx
index 9e80200..aa5f650 100644
--- a/src/mob/modulesource/option.jsx
+++ b/src/mob/modulesource/option.jsx
@@ -28,7 +28,7 @@
import officialAccount from '@/assets/mobimg/guanzhu.jpg'
import Iframe from '@/assets/img/newpage.jpg'
import Share from '@/assets/mobimg/share.jpg'
-import MkMap from '@/assets/img/map.jpg'
+// import MkMap from '@/assets/img/map.jpg'
// 缁勪欢閰嶇疆淇℃伅
export const menuOptions = [
@@ -62,7 +62,7 @@
{ type: 'menu', url: SandBox, component: 'code', subtype: 'sandbox', title: '鑷畾涔�', width: 24 },
{ type: 'menu', url: group, component: 'group', subtype: 'normalgroup', title: '鍒嗙粍', width: 24 },
{ type: 'menu', url: Login, component: 'login', subtype: 'normallogin', title: '娉ㄥ唽/鐧诲綍', width: 24 },
- { type: 'menu', url: MkMap, component: 'map', subtype: 'txmap', title: '鍦板浘', width: 24, adapter: 'mini' },
+ // { type: 'menu', url: MkMap, component: 'map', subtype: 'txmap', title: '鍦板浘', width: 24, adapter: 'mini' },
{ type: 'menu', url: officialAccount, component: 'officialAccount', subtype: 'officialAccount', title: '鍏虫敞鍏紬鍙凤紙灏忕▼搴忎腑锛�', width: 24, adapter: 'mini' },
{ type: 'menu', url: Share, component: 'sharecode', subtype: 'sharecode', title: '鍒嗕韩鐮�', width: 24 },
{ type: 'menu', url: Iframe, component: 'iframe', subtype: 'iframe', title: 'iframe', width: 24 }
diff --git a/src/pc/components/login/normal-login/signform.jsx b/src/pc/components/login/normal-login/signform.jsx
index 4d3d42d..311c433 100644
--- a/src/pc/components/login/normal-login/signform.jsx
+++ b/src/pc/components/login/normal-login/signform.jsx
@@ -42,7 +42,7 @@
} else if (way === 'weixin') {
signWays.push({
type: 'weixin',
- label: '寰俊鐧诲綍',
+ label: '鎵嬫満鍙峰揩鎹风櫥褰�',
icon: <WechatOutlined />,
sort: 3
})
@@ -79,7 +79,7 @@
} else if (way === 'weixin') {
signWays.push({
type: 'weixin',
- label: '寰俊鐧诲綍',
+ label: '鎵嬫満鍙峰揩鎹风櫥褰�',
sort: 3
})
}
diff --git a/src/pc/createview/index.jsx b/src/pc/createview/index.jsx
index 2465808..bacaa39 100644
--- a/src/pc/createview/index.jsx
+++ b/src/pc/createview/index.jsx
@@ -175,6 +175,10 @@
config.components = this.collectTB(config.components)
config.version = 2.0
}
+
+ if (_config.getLocation) {
+ config.getLocation = _config.getLocation
+ }
}
param.LongParam = window.btoa(window.encodeURIComponent(JSON.stringify(config)))
diff --git a/src/views/mobdesign/menuform/index.jsx b/src/views/mobdesign/menuform/index.jsx
index 16fa737..00b8042 100644
--- a/src/views/mobdesign/menuform/index.jsx
+++ b/src/views/mobdesign/menuform/index.jsx
@@ -21,9 +21,9 @@
state = {}
componentDidMount() {
- const { config, adapters } = this.props
+ const { config } = this.props
- if (adapters.includes('wxmini') && config.getLocation === 'true') {
+ if (config.getLocation === 'true') {
window.GLOB.getLocation = true
}
}
@@ -289,9 +289,9 @@
)}
</Form.Item>
</Col> : null}
- {adapters.includes('wxmini') ? <Col span={24}>
+ <Col span={24}>
<Form.Item label={
- <Tooltip placement="topLeft" title="寮�鍚椂锛屽湪灏忕▼搴忎腑鍙幏鍙栫敤鎴锋墍鍦ㄧ粡绾害銆�">
+ <Tooltip placement="topLeft" title="寮�鍚悗鏁版嵁婧愪腑灏嗘浛鎹� @mk_longitude@銆丂mk_latitude@锛屽湪灏忕▼搴忎腑灏嗚幏鍙栫敤鎴锋墍鍦ㄧ粡绾害銆�">
<QuestionCircleOutlined className="mk-form-tip" />
瀹氫綅
</Tooltip>
@@ -305,7 +305,7 @@
</Radio.Group>
)}
</Form.Item>
- </Col> : null}
+ </Col>
{adapters.includes('weixin') || adapters.includes('wxmini') ? <Col span={24}>
<Form.Item label={
<Tooltip placement="topLeft" title="浣跨敤榛樿鏃惰鍦ㄥ瓙搴旂敤璁剧疆鍒嗕韩淇℃伅锛屼娇鐢╱rl鍙傛暟浼氫娇鐢ㄤ笂椤靛弬鏁版浛鎹㈢浉搴斿瓧娈碉紙@field@锛夈�傛敞锛氫娇鐢ㄨ嚜瀹氫箟鎴杣rl鍙傛暟鏃朵細鍒嗕韩褰撳墠椤甸潰銆�">
--
Gitblit v1.8.0