From 0ddf0f980d675d28c41f746b55d0d7cc55007d8a Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 02 七月 2024 00:05:15 +0800
Subject: [PATCH] 2024-07-02
---
src/menu/datasource/verifycard/utils.jsx | 6 ++++++
src/views/mobdesign/menuform/index.jsx | 27 +++++++++++++++++++++++++++
src/menu/debug/index.jsx | 8 +++++++-
src/menu/datasource/verifycard/customscript/index.jsx | 2 +-
4 files changed, 41 insertions(+), 2 deletions(-)
diff --git a/src/menu/datasource/verifycard/customscript/index.jsx b/src/menu/datasource/verifycard/customscript/index.jsx
index cf60479..1a6b210 100644
--- a/src/menu/datasource/verifycard/customscript/index.jsx
+++ b/src/menu/datasource/verifycard/customscript/index.jsx
@@ -243,7 +243,7 @@
</Col>
<Col span={24}>
<Form.Item label="鍙敤瀛楁" className="field-able">
- <Tooltip mouseLeaveDelay={0.3} mouseEnterDelay={0.3} placement="top" title={'鍏叡鍊硷紝璇锋寜鐓xxx@鏍煎紡浣跨敤銆�'}><span style={{color: '#1890ff'}}>BID, LoginUID, SessionUid, UserID, Appkey, lang, time_id, typename, datam</span></Tooltip>,
+ <Tooltip mouseLeaveDelay={0.3} mouseEnterDelay={0.3} placement="top" title={'鍏叡鍊硷紝璇锋寜鐓xxx@鏍煎紡浣跨敤銆�'}><span style={{color: '#1890ff'}}>BID, LoginUID, SessionUid, UserID, Appkey, lang, time_id, typename, datam{window.GLOB.getLocation ? ', mk_longitude, mk_latitude' : ''}</span></Tooltip>,
<Tooltip mouseLeaveDelay={0.3} mouseEnterDelay={0.3} placement="top" title={'绯荤粺鍙橀噺锛岀郴缁熶細瀹氫箟鍙橀噺骞惰祴鍊笺��'}><span style={{color: '#fa8c16'}}>UserName, FullName, RoleID, mk_departmentcode, mk_organization, mk_user_type, mk_nation, mk_province, mk_city, mk_district, mk_address</span></Tooltip>,
<Tooltip mouseLeaveDelay={0.3} mouseEnterDelay={0.3} placement="top" title={'鎺掑簭銆佸垎椤典互鍙婃悳绱㈡潯浠跺彉閲忥紝璇锋寜鐓xxx@鏍煎紡浣跨敤銆備娇鐢ˊpageSize@銆丂orderBy@ 鎴栬剼鏈腑瀛樺湪 @mk_total 浠ｈ〃鑷畾涔夊垎椤碉紝鎬绘暟璇蜂互mk_total杩斿洖銆�'}>orderBy, pageSize, pageIndex{usefulFields ? ', ' + usefulFields : ''}{type === 'calendar' ? ', mk_year' : ''}{hasExtend ? ', mk_time' : ''}</Tooltip>
<Tooltip mouseLeaveDelay={0.3} mouseEnterDelay={0.3} placement="top" title={'url鍙橀噺锛岃鎸夌収@xxx@鏍煎紡浣跨敤銆�'}>{urlFields ? ', ' : ''}<span style={{color: '#13c2c2'}}>{urlFields}</span></Tooltip>
diff --git a/src/menu/datasource/verifycard/utils.jsx b/src/menu/datasource/verifycard/utils.jsx
index 6714e81..da4c71d 100644
--- a/src/menu/datasource/verifycard/utils.jsx
+++ b/src/menu/datasource/verifycard/utils.jsx
@@ -76,6 +76,12 @@
if (type === 'calendar') {
regs.push({reg: /@mk_year@/ig, value: '2024'})
}
+ if (window.GLOB.getLocation) {
+ regs.push(
+ {reg: /@mk_longitude@/ig, value: 0},
+ {reg: /@mk_latitude@/ig, value: 0}
+ )
+ }
// 澶栬仈鏁版嵁搴撴浛鎹�
if (window.GLOB.externalDatabase !== null) {
diff --git a/src/menu/debug/index.jsx b/src/menu/debug/index.jsx
index 6cf383d..be6eaec 100644
--- a/src/menu/debug/index.jsx
+++ b/src/menu/debug/index.jsx
@@ -2063,11 +2063,17 @@
)
if (item.hasExtend) {
- regs.push({reg: /@mk_time@/ig, value: '2024-04-29 17:20:00'})
+ regoptions.push({reg: /@mk_time@/ig, value: '2024-04-29 17:20:00'})
}
if (item.type === 'calendar') {
regoptions.push({ reg: /@mk_year@/ig, value: '2024' })
}
+ if (window.GLOB.getLocation) {
+ regoptions.push(
+ {reg: /@mk_longitude@/ig, value: 0},
+ {reg: /@mk_latitude@/ig, value: 0}
+ )
+ }
regoptions.forEach(cell => {
sql = sql.replace(cell.reg, cell.value)
diff --git a/src/views/mobdesign/menuform/index.jsx b/src/views/mobdesign/menuform/index.jsx
index 49d4013..16fa737 100644
--- a/src/views/mobdesign/menuform/index.jsx
+++ b/src/views/mobdesign/menuform/index.jsx
@@ -20,6 +20,14 @@
state = {}
+ componentDidMount() {
+ const { config, adapters } = this.props
+
+ if (adapters.includes('wxmini') && config.getLocation === 'true') {
+ window.GLOB.getLocation = true
+ }
+ }
+
// 涓�浜岀骇鑿滃崟鍒囨崲
selectChange = (key, value, hex) => {
if (key === 'cacheTime' || key === 'localCacheTime') {
@@ -36,6 +44,8 @@
} else {
delete _config.statusBarHexColor
}
+ } else if (key === 'getLocation') {
+ window.GLOB.getLocation = value === 'true'
}
this.props.updateConfig(_config)
@@ -279,6 +289,23 @@
)}
</Form.Item>
</Col> : null}
+ {adapters.includes('wxmini') ? <Col span={24}>
+ <Form.Item label={
+ <Tooltip placement="topLeft" title="寮�鍚椂锛屽湪灏忕▼搴忎腑鍙幏鍙栫敤鎴锋墍鍦ㄧ粡绾害銆�">
+ <QuestionCircleOutlined className="mk-form-tip" />
+ 瀹氫綅
+ </Tooltip>
+ }>
+ {getFieldDecorator('getLocation', {
+ initialValue: config.getLocation || 'false'
+ })(
+ <Radio.Group onChange={(e) => {this.selectChange('getLocation', e.target.value)}}>
+ <Radio value="true">寮�鍚�</Radio>
+ <Radio value="false">涓嶅紑鍚�</Radio>
+ </Radio.Group>
+ )}
+ </Form.Item>
+ </Col> : null}
{adapters.includes('weixin') || adapters.includes('wxmini') ? <Col span={24}>
<Form.Item label={
<Tooltip placement="topLeft" title="浣跨敤榛樿鏃惰鍦ㄥ瓙搴旂敤璁剧疆鍒嗕韩淇℃伅锛屼娇鐢╱rl鍙傛暟浼氫娇鐢ㄤ笂椤靛弬鏁版浛鎹㈢浉搴斿瓧娈碉紙@field@锛夈�傛敞锛氫娇鐢ㄨ嚜瀹氫箟鎴杣rl鍙傛暟鏃朵細鍒嗕韩褰撳墠椤甸潰銆�">
--
Gitblit v1.8.0