From bbcb3f45ad0ef4c808bf5a68ec10c0464c094e2f Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 27 十月 2021 11:51:40 +0800
Subject: [PATCH] Merge branch 'master' into bms
---
src/templates/zshare/modalform/index.jsx | 4 +-
src/api/cacheutils.js | 20 ++++++++++
src/mob/components/menubar/normal-menubar/menucomponent/index.jsx | 4 +-
src/components/header/index.jsx | 4 +-
src/menu/components/card/cardcellcomponent/index.jsx | 2
src/views/pcdesign/index.jsx | 2
src/templates/modalconfig/settingform/index.jsx | 2
src/templates/zshare/formconfig.jsx | 15 +++++++
src/mob/components/menubar/normal-menubar/menucomponent/options.jsx | 2
src/menu/components/share/actioncomponent/index.jsx | 2
src/mob/components/formdragelement/card.jsx | 2
src/mob/components/menubar/normal-menubar/index.scss | 4 +-
src/templates/sharecomponent/actioncomponent/index.jsx | 8 ++-
src/api/index.js | 3 +
src/mob/components/formdragelement/index.scss | 17 ++++++++
src/templates/sharecomponent/actioncomponent/dragaction/index.jsx | 1
src/tabviews/commontable/index.jsx | 1
src/views/mobdesign/index.jsx | 2
src/views/menudesign/index.jsx | 2
19 files changed, 76 insertions(+), 21 deletions(-)
diff --git a/src/api/cacheutils.js b/src/api/cacheutils.js
index aa742fc..3a983a0 100644
--- a/src/api/cacheutils.js
+++ b/src/api/cacheutils.js
@@ -43,6 +43,26 @@
}
/**
+ * @description 娓呯┖鍑芥暟
+ */
+ static clearFuncs (sysType) {
+ if (sysType !== 'local' || window.GLOB.systemType !== '') return
+ if (window.GLOB.WebSql) {
+ window.GLOB.WebSql.transaction(tx => {
+ tx.executeSql('DELETE FROM FUNCS')
+
+ tx.executeSql(`UPDATE VERSIONS SET createDate='1970-01-01 14:59:09.000' where CDefine1='funcs'`)
+ })
+ } else if (window.GLOB.IndexDB) {
+ let objectStore = window.GLOB.IndexDB.transaction(['funcs'], 'readwrite').objectStore('funcs')
+ objectStore.clear()
+
+ let funcStore = window.GLOB.IndexDB.transaction(['version'], 'readwrite').objectStore('version')
+ funcStore.put({id: 'funcs', version: '1.0', createDate: '1970-01-01 14:59:09.000'})
+ }
+ }
+
+ /**
* @description 鑾峰彇websql涓繚瀛樹俊鎭増鏈�
*/
static getWebSqlVersion () {
diff --git a/src/api/index.js b/src/api/index.js
index 4ae1cee..badf754 100644
--- a/src/api/index.js
+++ b/src/api/index.js
@@ -431,6 +431,7 @@
CacheUtils.updateWebSqlversion('1.00', curTime)
CacheUtils.clearIndexDBConfig()
CacheUtils.updateIndexDBversion({version: '1.00', createDate: curTime})
+ CacheUtils.clearFuncs(options.sysType)
}
/**
@@ -506,7 +507,7 @@
param.lang = param.lang || sessionStorage.getItem('lang') || ''
param.SessionUid = localStorage.getItem('SessionUid') || ''
param.LoginUID = param.LoginUID || sessionStorage.getItem('LoginUID') || ''
- param.appkey = window.GLOB.appkey || ''
+ param.appkey = param.appkey || window.GLOB.appkey
let url = '/webapi/dostars'
if (sessionStorage.getItem('isEditState') === 'true' && options.cloudServiceApi) { // 缂栬緫鐘舵�侊紝涓斿瓨鍦ㄤ簯绔湴鍧�
diff --git a/src/components/header/index.jsx b/src/components/header/index.jsx
index fc866fa..0c8f549 100644
--- a/src/components/header/index.jsx
+++ b/src/components/header/index.jsx
@@ -629,7 +629,7 @@
if (!window.GLOB.WebSql && !window.GLOB.IndexDB) {
notification.warning({
top: 92,
- message: '鍗囩骇澶辫触锛岃鍒锋柊椤甸潰閲嶈瘯锛�',
+ message: '鏇存柊澶辫触锛岃鍒锋柊椤甸潰閲嶈瘯锛�',
duration: 2
})
resolve()
@@ -638,7 +638,7 @@
setTimeout(() => {
notification.success({
top: 92,
- message: '鍗囩骇鎴愬姛锛�',
+ message: '鏇存柊鎴愬姛锛�',
duration: 2
})
resolve()
diff --git a/src/menu/components/card/cardcellcomponent/index.jsx b/src/menu/components/card/cardcellcomponent/index.jsx
index d6e718a..21ebe15 100644
--- a/src/menu/components/card/cardcellcomponent/index.jsx
+++ b/src/menu/components/card/cardcellcomponent/index.jsx
@@ -654,7 +654,7 @@
{/* 鎸夐挳浣跨敤绯荤粺瀛樺偍杩囩▼鏃讹紝楠岃瘉淇℃伅妯℃�佹 */}
<Modal
wrapClassName="model-table-action-verify-modal"
- title={'楠岃瘉淇℃伅'}
+ title={(card && card.label ? card.label + ' - ' : '') + '楠岃瘉淇℃伅'}
visible={profVisible}
width={'75vw'}
maskClosable={false}
diff --git a/src/menu/components/share/actioncomponent/index.jsx b/src/menu/components/share/actioncomponent/index.jsx
index 2a86e43..ea3fb0c 100644
--- a/src/menu/components/share/actioncomponent/index.jsx
+++ b/src/menu/components/share/actioncomponent/index.jsx
@@ -490,7 +490,7 @@
{/* 鎸夐挳浣跨敤绯荤粺瀛樺偍杩囩▼鏃讹紝楠岃瘉淇℃伅妯℃�佹 */}
<Modal
wrapClassName="model-table-action-verify-modal"
- title={'楠岃瘉淇℃伅'}
+ title={(card && card.label ? card.label + ' - ' : '') + '楠岃瘉淇℃伅'}
visible={profVisible}
width={'75vw'}
maskClosable={false}
diff --git a/src/mob/components/formdragelement/card.jsx b/src/mob/components/formdragelement/card.jsx
index bf36729..60de5ef 100644
--- a/src/mob/components/formdragelement/card.jsx
+++ b/src/mob/components/formdragelement/card.jsx
@@ -60,7 +60,7 @@
let formItem = null
if (card.type === 'text' || card.type === 'number') {
- formItem = (<div className="am-list-item"><div className="am-list-line"><div className="am-input-label">{card.label}</div><div className={'am-input-control ' + card.cursor}>{card.initval}</div>{card.scan && card.scan !== 'false' ? <div className="am-list-extra"><Icon type="scan" /></div> : null}</div></div>)
+ formItem = (<div className={'am-list-item ' + (card.place || '')}><div className="am-list-line"><div className="am-input-label">{card.label}</div><div className={'am-input-control ' + card.cursor}>{card.initval ? card.initval : <span style={{color: '#bcbcbc'}}>{card.placeholder || ''}</span> }</div>{card.scan && card.scan !== 'false' ? <div className="am-list-extra"><Icon type="scan" /></div> : null}</div></div>)
} else if (card.type === 'number') {
formItem = (<div className="am-list-item"><div className="am-list-line"><div className="am-input-label">{card.label}</div><div className={'am-input-control ' + card.cursor}>{card.initval}</div></div></div>)
} else if (card.type === 'select' || card.type === 'link') {
diff --git a/src/mob/components/formdragelement/index.scss b/src/mob/components/formdragelement/index.scss
index aa3c250..26bc526 100644
--- a/src/mob/components/formdragelement/index.scss
+++ b/src/mob/components/formdragelement/index.scss
@@ -65,6 +65,23 @@
}
}
}
+ .am-list-item.up_down {
+ height: auto;
+ .am-list-line {
+ display: block;
+ .am-input-label {
+ width: auto;
+ line-height: 32px;
+ }
+ .am-input-control {
+ height: 40px;
+ line-height: 24px;
+ }
+ .am-list-extra {
+ display: none;
+ }
+ }
+ }
.am-list-item.check-card {
height: auto;
.am-list-line {
diff --git a/src/mob/components/menubar/normal-menubar/index.scss b/src/mob/components/menubar/normal-menubar/index.scss
index c4c97f1..383a40c 100644
--- a/src/mob/components/menubar/normal-menubar/index.scss
+++ b/src/mob/components/menubar/normal-menubar/index.scss
@@ -43,10 +43,10 @@
.menu-sign {
text-align: center;
.anticon {
- border-radius: 50%;
+ border-radius: 15%;
}
img {
- border-radius: 50%;
+ border-radius: 15%;
}
}
}
diff --git a/src/mob/components/menubar/normal-menubar/menucomponent/index.jsx b/src/mob/components/menubar/normal-menubar/menucomponent/index.jsx
index ac239f9..10225a8 100644
--- a/src/mob/components/menubar/normal-menubar/menucomponent/index.jsx
+++ b/src/mob/components/menubar/normal-menubar/menucomponent/index.jsx
@@ -148,10 +148,10 @@
padding: card.setting.padding,
background: card.setting.background,
color: card.setting.color,
- borderRadius: card.setting.borderRadius || '50%'
+ borderRadius: card.setting.borderRadius || '15%'
}} type={card.setting.icon}/>
</div> : <div className="menu-sign">
- <img style={{width: card.setting.imgWidth, height: card.setting.imgWidth, borderRadius: card.setting.borderRadius || '50%'}} src={card.setting.url} alt=""/>
+ <img style={{width: card.setting.imgWidth, height: card.setting.imgWidth, borderRadius: card.setting.borderRadius || '15%'}} src={card.setting.url} alt=""/>
</div>}
<div className="menu-name">{card.setting.name}</div>
</div>
diff --git a/src/mob/components/menubar/normal-menubar/menucomponent/options.jsx b/src/mob/components/menubar/normal-menubar/menucomponent/options.jsx
index 285c662..79de0e1 100644
--- a/src/mob/components/menubar/normal-menubar/menucomponent/options.jsx
+++ b/src/mob/components/menubar/normal-menubar/menucomponent/options.jsx
@@ -145,7 +145,7 @@
type: 'styleInput',
field: 'borderRadius',
label: '鍦嗚',
- initval: setting.borderRadius || '50%',
+ initval: setting.borderRadius || '15%',
required: false
},
{
diff --git a/src/tabviews/commontable/index.jsx b/src/tabviews/commontable/index.jsx
index 1e13b23..070e950 100644
--- a/src/tabviews/commontable/index.jsx
+++ b/src/tabviews/commontable/index.jsx
@@ -398,7 +398,6 @@
}
})
}
- console.log(config)
this.setState({
loadingview: false,
diff --git a/src/templates/modalconfig/settingform/index.jsx b/src/templates/modalconfig/settingform/index.jsx
index 7ca2a4b..8504fa7 100644
--- a/src/templates/modalconfig/settingform/index.jsx
+++ b/src/templates/modalconfig/settingform/index.jsx
@@ -24,7 +24,7 @@
let fields = []
config.fields.forEach(f => {
- if (f.field && ['select', 'link', 'text', 'number'].includes(f.type) && f.hidden !== 'true' && f.readonly !== 'true') {
+ if (f.field && ['select', 'link', 'text', 'number', 'textarea'].includes(f.type) && f.hidden !== 'true' && f.readonly !== 'true') {
fields.push(f)
}
})
diff --git a/src/templates/sharecomponent/actioncomponent/dragaction/index.jsx b/src/templates/sharecomponent/actioncomponent/dragaction/index.jsx
index 36fdccb..f775300 100644
--- a/src/templates/sharecomponent/actioncomponent/dragaction/index.jsx
+++ b/src/templates/sharecomponent/actioncomponent/dragaction/index.jsx
@@ -56,6 +56,7 @@
copycard.focus = true
copycard.originCard = card
+ copycard.originCard.appkey = window.GLOB.appkey
if (copycard.OpenType === 'popview') { // 寰呭畬鍠�
copycard.linkTab = ''
diff --git a/src/templates/sharecomponent/actioncomponent/index.jsx b/src/templates/sharecomponent/actioncomponent/index.jsx
index 3d27967..e3edc42 100644
--- a/src/templates/sharecomponent/actioncomponent/index.jsx
+++ b/src/templates/sharecomponent/actioncomponent/index.jsx
@@ -273,7 +273,8 @@
return Api.getSystemConfig({
func: 'sPC_Get_LongParam',
- MenuID: card.originCard.uuid
+ MenuID: card.originCard.uuid,
+ appkey: card.originCard.appkey || ''
})
}).then(result => { // 澶嶅埗鎸夐挳閰嶇疆淇℃伅锛屼繚瀛樿嚦鏂版坊鍔犳寜閽�
if (result === 'save' || result === 'subtab') return result
@@ -370,7 +371,8 @@
return Api.getSystemConfig({
func: 'sPC_Get_LongParam',
- MenuID: card.originCard.linkTab
+ MenuID: card.originCard.linkTab,
+ appkey: card.originCard.appkey || ''
})
}).then(result => { // 鏍囩澶嶅埗
if (result === 'save') return result
@@ -895,7 +897,7 @@
{/* 鎸夐挳浣跨敤绯荤粺瀛樺偍杩囩▼鏃讹紝楠岃瘉淇℃伅妯℃�佹 */}
<Modal
wrapClassName="model-table-action-verify-modal"
- title={'楠岃瘉淇℃伅'}
+ title={(card && card.label ? card.label + ' - ' : '') + '楠岃瘉淇℃伅'}
visible={profVisible}
width={'75vw'}
maskClosable={false}
diff --git a/src/templates/zshare/formconfig.jsx b/src/templates/zshare/formconfig.jsx
index b9f856b..1cc2fce 100644
--- a/src/templates/zshare/formconfig.jsx
+++ b/src/templates/zshare/formconfig.jsx
@@ -3000,6 +3000,21 @@
},
{
type: 'radio',
+ key: 'place',
+ label: '鎺掑垪',
+ initVal: card.place || 'left_right',
+ tooltip: '鎻愮ず鏂囧瓧涓庤緭鍏ユ鐨勪綅缃叧绯汇�傛敞锛氫笂涓嬫帓鍒楁槸浼氱鐢ㄦ壂鐮佸姛鑳姐��',
+ forbid: appType !== 'mob',
+ options: [{
+ value: 'left_right',
+ text: '宸﹀彸'
+ }, {
+ value: 'up_down',
+ text: '涓婁笅'
+ }]
+ },
+ {
+ type: 'radio',
key: 'count',
label: '璁℃暟鍔熻兘',
initVal: card.count || 'false',
diff --git a/src/templates/zshare/modalform/index.jsx b/src/templates/zshare/modalform/index.jsx
index a950131..5b399e6 100644
--- a/src/templates/zshare/modalform/index.jsx
+++ b/src/templates/zshare/modalform/index.jsx
@@ -16,8 +16,8 @@
const DataTable = asyncComponent(() => import('./datatable'))
const modalTypeOptions = {
- text: ['initval', 'readonly', 'required', 'hidden', 'readin', 'fieldlength', 'regular', 'interception', 'span', 'labelwidth', 'tooltip', 'extra', 'enter', 'cursor', 'scan', 'splitline', 'placeholder'],
- number: ['initval', 'readonly', 'hidden', 'decimal', 'min', 'max', 'readin', 'span', 'labelwidth', 'tooltip', 'extra', 'enter', 'cursor', 'splitline'],
+ text: ['initval', 'readonly', 'required', 'hidden', 'readin', 'fieldlength', 'regular', 'interception', 'span', 'labelwidth', 'tooltip', 'extra', 'enter', 'cursor', 'scan', 'splitline', 'placeholder', 'place'],
+ number: ['initval', 'readonly', 'hidden', 'decimal', 'min', 'max', 'readin', 'span', 'labelwidth', 'tooltip', 'extra', 'enter', 'cursor', 'splitline', 'place'],
select: ['initval', 'readonly', 'required', 'hidden', 'readin', 'resourceType', 'setAll', 'linkSubField', 'span', 'labelwidth', 'tooltip', 'extra', 'emptyText', 'enter', 'splitline', 'dropdown'],
checkbox: ['initval', 'readonly', 'required', 'hidden', 'readin', 'resourceType', 'span', 'labelwidth', 'tooltip', 'extra', 'splitline', 'arrange'],
radio: ['initval', 'readonly', 'required', 'hidden', 'readin', 'resourceType', 'linkSubField', 'span', 'labelwidth', 'tooltip', 'extra', 'setAll', 'emptyText', 'splitline', 'arrange'],
diff --git a/src/views/menudesign/index.jsx b/src/views/menudesign/index.jsx
index 2477bd9..5e8086f 100644
--- a/src/views/menudesign/index.jsx
+++ b/src/views/menudesign/index.jsx
@@ -864,7 +864,7 @@
error = `缁勪欢銆�${item.name}銆嬫湭璁剧疆鏁版嵁婧愶紒`
} else if (!item.setting.primaryKey) {
error = `缁勪欢銆�${item.name}銆嬫湭璁剧疆涓婚敭锛乣
- } else if (!item.setting.supModule) {
+ } else if (!item.setting.supModule && item.type !== 'balcony') {
error = `缁勪欢銆�${item.name}銆嬫湭璁剧疆涓婄骇缁勪欢锛乣
}
}
diff --git a/src/views/mobdesign/index.jsx b/src/views/mobdesign/index.jsx
index 92afeab..3cc66e2 100644
--- a/src/views/mobdesign/index.jsx
+++ b/src/views/mobdesign/index.jsx
@@ -1143,7 +1143,7 @@
error = `缁勪欢銆�${item.name}銆嬫湭璁剧疆鏁版嵁婧愶紒`
} else if (!item.setting.primaryKey) {
error = `缁勪欢銆�${item.name}銆嬫湭璁剧疆涓婚敭锛乣
- } else if (!item.setting.supModule && item.type !== 'navbar') {
+ } else if (!item.setting.supModule && item.type !== 'navbar' && item.type !== 'balcony') {
error = `缁勪欢銆�${item.name}銆嬫湭璁剧疆涓婄骇缁勪欢锛乣
}
}
diff --git a/src/views/pcdesign/index.jsx b/src/views/pcdesign/index.jsx
index 84fd928..7d2fd86 100644
--- a/src/views/pcdesign/index.jsx
+++ b/src/views/pcdesign/index.jsx
@@ -1407,7 +1407,7 @@
error = `缁勪欢銆�${item.name}銆嬫湭璁剧疆鏁版嵁婧愶紒`
} else if (!item.setting.primaryKey) {
error = `缁勪欢銆�${item.name}銆嬫湭璁剧疆涓婚敭锛乣
- } else if (!item.setting.supModule) {
+ } else if (!item.setting.supModule && item.type !== 'balcony') {
error = `缁勪欢銆�${item.name}銆嬫湭璁剧疆涓婄骇缁勪欢锛乣
}
}
--
Gitblit v1.8.0