From bd1a3fd9885436d38309bbcc083ec6a93217d770 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 24 七月 2023 11:00:50 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/tabviews/custom/popview/index.jsx | 3 +--
src/components/header/index.scss | 4 ++--
src/tabviews/custom/index.jsx | 3 +--
src/components/sidemenu/index.scss | 2 +-
src/tabviews/zshare/topSearch/index.jsx | 8 +++-----
src/templates/zshare/formconfig.jsx | 13 +++++++++++--
src/templates/sharecomponent/searchcomponent/searchform/index.jsx | 4 ++--
7 files changed, 21 insertions(+), 16 deletions(-)
diff --git a/src/components/header/index.scss b/src/components/header/index.scss
index d38a22d..dc9c47d 100644
--- a/src/components/header/index.scss
+++ b/src/components/header/index.scss
@@ -7,8 +7,8 @@
width: 100%;
height: 48px;
display: flex;
- background: var(--mk-sys-background);
- color: var(--mk-sys-font-color);
+ background: var(--mk-sys-background)!important;
+ color: var(--mk-sys-font-color)!important;
.header-logo {
width: 180px;
diff --git a/src/components/sidemenu/index.scss b/src/components/sidemenu/index.scss
index b92ca04..c69265a 100644
--- a/src/components/sidemenu/index.scss
+++ b/src/components/sidemenu/index.scss
@@ -6,7 +6,7 @@
padding: 48px 0 40px;
transition: width 0.2s, flex 0.2s;
border-right: 1px solid #d9d9d9;
- background: var(--mk-sys-background);
+ background: var(--mk-sys-background)!important;
.ant-menu-item {
padding-left: 0!important;
cursor: default;
diff --git a/src/tabviews/custom/index.jsx b/src/tabviews/custom/index.jsx
index 633b8c8..83bf8a9 100644
--- a/src/tabviews/custom/index.jsx
+++ b/src/tabviews/custom/index.jsx
@@ -920,8 +920,7 @@
})
return component
} else if (component.type === 'group') {
- component.components = this.formatSetting(component.components, params, inherit, regs, balMap)
- component = {...component, ...inherit}
+ component.components = this.formatSetting(component.components, params, null, regs, balMap)
return component
} else if (component.wrap && component.wrap.datatype === 'public') {
component.setting.useMSearch = false
diff --git a/src/tabviews/custom/popview/index.jsx b/src/tabviews/custom/popview/index.jsx
index 04c65bb..74ada91 100644
--- a/src/tabviews/custom/popview/index.jsx
+++ b/src/tabviews/custom/popview/index.jsx
@@ -714,8 +714,7 @@
})
return component
} else if (component.type === 'group') {
- component.components = this.formatSetting(component.components, params, inherit, regs, balMap)
- component = {...component, ...inherit}
+ component.components = this.formatSetting(component.components, params, null, regs, balMap)
return component
} else if (component.wrap && component.wrap.datatype === 'public') {
component.setting.useMSearch = false
diff --git a/src/tabviews/zshare/topSearch/index.jsx b/src/tabviews/zshare/topSearch/index.jsx
index 77ce4ca..c5f3537 100644
--- a/src/tabviews/zshare/topSearch/index.jsx
+++ b/src/tabviews/zshare/topSearch/index.jsx
@@ -151,9 +151,6 @@
// 鏁版嵁婧愭煡璇㈣鍙�
if (item.resourceType === '1' && item.dataSource) {
- if (item.multiple === 'dropdown') {
- item.parentField = 'pid'
- }
let _option = Utils.getSelectQueryOptions(item)
if (window.GLOB.debugger === true || (window.debugger === true && options.sysType !== 'cloud')) {
@@ -228,10 +225,11 @@
}
resetCheckcard = (item) => {
+ let pid = item.resourceType === '0' ? 'pid' : item.parentField
let _options = []
let _others = []
item.oriOptions.forEach(op => {
- if (op.pid === item.mark) {
+ if (op[pid] === item.mark) {
_options.push(op)
} else {
_others.push(op)
@@ -242,7 +240,7 @@
op.children = []
_others = _others.filter(cell => {
- if (cell.pid === op.$value) {
+ if (cell[pid] === op.$value) {
op.children.push(cell)
return false
}
diff --git a/src/templates/sharecomponent/searchcomponent/searchform/index.jsx b/src/templates/sharecomponent/searchcomponent/searchform/index.jsx
index 62e41e1..41a27a1 100644
--- a/src/templates/sharecomponent/searchcomponent/searchform/index.jsx
+++ b/src/templates/sharecomponent/searchcomponent/searchform/index.jsx
@@ -210,8 +210,8 @@
if (this.record.selectStyle === 'custom') {
shows.push('backgroundColor')
}
- if (this.record.multiple === 'dropdown') {
- shows.push('mark')
+ if (this.record.multiple === 'dropdown' && this.record.resourceType === '1') {
+ shows.push('mark', 'parentField')
}
}
shows.push('linkField')
diff --git a/src/templates/zshare/formconfig.jsx b/src/templates/zshare/formconfig.jsx
index d9ef0e8..5460629 100644
--- a/src/templates/zshare/formconfig.jsx
+++ b/src/templates/zshare/formconfig.jsx
@@ -597,9 +597,18 @@
key: 'multiple',
label: '閫夋嫨褰㈠紡',
initVal: card.multiple || 'false',
- tooltip: appType === '' ? '浣跨敤涓嬫媺鑿滃崟鏃讹紝閫夐」浼氫緷鎹� pid 缁勭粐鏁版嵁鐨勪笂涓嬬骇鍏崇郴锛屼簩绾ч�夐」浼氫笅鎷夊睍绀恒�傛敞锛�1銆佹樉绀轰负鏂囨湰鏃舵湁鏁堬紱2銆佷娇鐢ㄦ暟鎹簮璇疯繑鍥� pid 瀛楁銆�' : '',
+ // tooltip: appType === '' ? '浣跨敤涓嬫媺鑿滃崟鏃讹紝閫夐」浼氫緷鎹� pid 缁勭粐鏁版嵁鐨勪笂涓嬬骇鍏崇郴锛屼簩绾ч�夐」浼氫笅鎷夊睍绀恒�傛敞锛�1銆佹樉绀轰负鏂囨湰鏃舵湁鏁堬紱2銆佷娇鐢ㄦ暟鎹簮璇疯繑鍥� pid 瀛楁銆�' : '',
required: true,
options: muloptions
+ },
+ {
+ type: 'text',
+ key: 'parentField',
+ label: '涓婄骇瀛楁',
+ initVal: card.parentField || '',
+ tooltip: '鐢ㄤ簬缁勭粐鏁版嵁涓婁笅绾у叧绯伙紝璇锋敞鎰忓～鍐欓《绾ф爣璇嗐��',
+ required: true,
+ readonly: false
},
{
type: 'select',
@@ -923,7 +932,7 @@
key: 'mark',
label: '椤剁骇鏍囪瘑',
initVal: card.mark || '',
- tooltip: 'pid涓庨《绾ф爣璇嗙浉鍚屾椂锛岃涓洪《绾ц妭鐐广��',
+ tooltip: '涓婄骇瀛楁(pid)涓庨《绾ф爣璇嗙浉鍚屾椂锛岃涓洪《绾ц妭鐐广��',
required: false
},
{
--
Gitblit v1.8.0