From ed1cc4adc145f8685d04763e19fbd6b0bd80c136 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 09 六月 2022 16:22:44 +0800
Subject: [PATCH] 2022-06-09
---
public/options.json | 1 +
src/menu/components/card/cardcellcomponent/index.jsx | 17 +++++++++++------
public/README.txt | 3 ++-
src/menu/components/card/data-card/index.jsx | 2 +-
src/menu/components/share/actioncomponent/index.jsx | 2 ++
5 files changed, 17 insertions(+), 8 deletions(-)
diff --git a/public/README.txt b/public/README.txt
index 96a1b4e..c2b7797 100644
--- a/public/README.txt
+++ b/public/README.txt
@@ -13,4 +13,5 @@
debugger -- 鍊间负true鏃跺紑鍚皟璇曟ā寮忥紝寮�鍚悗绉诲姩绔瓙搴旂敤涓細鏈夋帶鍒跺彴
licenseKey -- 璁稿彲瀵嗛挜锛屽湪鍐呴儴缃戠粶涓娇鐢ㄧ郴缁熸椂锛屼細璺宠繃epc楠岃瘉
probation -- 璇曠敤鏈燂紙YYYY-MM-DD锛夛紝鍦ㄦ寮忕郴缁熶腑锛岃瘯鐢ㄦ湡鍐呰皟鐢ㄧ郴缁熸帴鍙ｇ殑鑴氭湰浼氳褰曚笅鏉�
-keepPassword -- 璁颁綇瀵嗙爜锛岄粯璁ゅ紑鍚紝褰撳�间负"false"鏃剁鐢�
\ No newline at end of file
+keepPassword -- 璁颁綇瀵嗙爜锛岄粯璁ゅ紑鍚紝褰撳�间负"false"鏃剁鐢�
+platforms -- 绉诲姩绔彲浣跨敤鐨勫钩鍙扮被鍨嬶紝榛樿涓� ["H5", "wechat", "android", "ios"] 鍒嗗埆浠ｈ〃H5椤甸潰銆佸井淇″叕浼楀彿銆佸畨鍗揂PP銆佽嫻鏋淎PP
\ No newline at end of file
diff --git a/public/options.json b/public/options.json
index fa76f1c..2b6d9b6 100644
--- a/public/options.json
+++ b/public/options.json
@@ -13,6 +13,7 @@
"licenseKey": "",
"probation": "",
"keepPassword": "true",
+ "platforms": ["H5", "wechat", "android", "ios"],
"host": "http://qingqiumarket.cn",
"service": "MKWMS/"
}
\ No newline at end of file
diff --git a/src/menu/components/card/cardcellcomponent/index.jsx b/src/menu/components/card/cardcellcomponent/index.jsx
index 7fd33b7..a87da47 100644
--- a/src/menu/components/card/cardcellcomponent/index.jsx
+++ b/src/menu/components/card/cardcellcomponent/index.jsx
@@ -427,14 +427,17 @@
this.actionFormRef.handleConfirm().then(res => {
let _elements = elements.map(cell => {
if (cell.uuid === res.uuid) {
- res = {...cell, ...res}
+ res.eleType = cell.eleType || null
+ res.style = cell.style || null
+ res.modal = cell.modal || null
+ // res = {...cell, ...res}
- if (!res.control) {
- delete res.controlField
- delete res.controlVal
- }
+ // if (!res.control) {
+ // delete res.controlField
+ // delete res.controlVal
+ // }
- delete res.focus
+ // delete res.focus
if (res.OpenType === 'form') {
if (cell.OpenType !== 'form') {
@@ -560,6 +563,8 @@
MKEmitter.emit('changePopview', cards, btn)
} else if (btn.OpenType === 'innerpage' && btn.pageTemplate === 'linkpage') {
MKEmitter.emit('changeEditMenu', {MenuID: btn.linkmenu})
+ } else if (btn.OpenType === 'funcbutton' && (btn.funcType === 'copyurl' || btn.funcType === 'scan') && btn.linkmenu) {
+ MKEmitter.emit('changeEditMenu', {MenuID: btn.linkmenu})
} else {
this.handleElement(item)
}
diff --git a/src/menu/components/card/data-card/index.jsx b/src/menu/components/card/data-card/index.jsx
index a57d028..e81688c 100644
--- a/src/menu/components/card/data-card/index.jsx
+++ b/src/menu/components/card/data-card/index.jsx
@@ -204,7 +204,7 @@
card.errors.push({ level: 0, detail: '鏁版嵁婧愪腑鏃犲彲鐢ㄨ剼鏈紒'})
} else if (!card.setting.primaryKey) {
card.errors.push({ level: 0, detail: '鏈缃富閿紒'})
- } else if (!card.setting.supModule) {
+ } else if (card.wrap.supType !== 'multi' && !card.setting.supModule) {
card.errors.push({ level: 0, detail: '鏈缃笂绾х粍浠讹紒'})
}
diff --git a/src/menu/components/share/actioncomponent/index.jsx b/src/menu/components/share/actioncomponent/index.jsx
index 5eb74eb..aed95d3 100644
--- a/src/menu/components/share/actioncomponent/index.jsx
+++ b/src/menu/components/share/actioncomponent/index.jsx
@@ -427,6 +427,8 @@
this.props.setSubConfig(element)
} else if (element.OpenType === 'innerpage' && element.pageTemplate === 'linkpage') {
MKEmitter.emit('changeEditMenu', {MenuID: element.linkmenu})
+ } else if (element.OpenType === 'funcbutton' && (element.funcType === 'copyurl' || element.funcType === 'scan') && element.linkmenu) {
+ MKEmitter.emit('changeEditMenu', {MenuID: element.linkmenu})
} else {
this.handleAction(element)
}
--
Gitblit v1.8.0