From ee635de6fc758c044db0761faa003d0db1e82563 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 07 八月 2023 20:32:35 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/templates/sharecomponent/searchcomponent/searchform/index.jsx | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/src/templates/sharecomponent/searchcomponent/searchform/index.jsx b/src/templates/sharecomponent/searchcomponent/searchform/index.jsx
index 41a27a1..3d14095 100644
--- a/src/templates/sharecomponent/searchcomponent/searchform/index.jsx
+++ b/src/templates/sharecomponent/searchcomponent/searchform/index.jsx
@@ -84,6 +84,7 @@
{value: '[3, 0]', label: '杩戜笁澶�'},
{value: '[7, 0]', label: '杩戜竷澶�'},
{value: '[30, 0]', label: '杩�30澶�'},
+ {value: '[90, 0]', label: '杩�90澶�'},
{value: '[7, -7]', label: '鍓嶅悗涓冨ぉ'},
{value: '[30, -30]', label: '鍓嶅悗30澶�'},
{value: '[90, -90]', label: '鍓嶅悗90澶�'},
@@ -98,6 +99,7 @@
const searchTypeOptions = {
text: ['label', 'field', 'initval', 'type', 'match', 'ratio', 'blacklist', 'required', 'Hide', 'labelShow', 'inputType', 'advanced', 'query', 'labelwidth'],
select: ['label', 'field', 'resourceType', 'initval', 'type', 'match', 'ratio', 'blacklist', 'required', 'Hide', 'labelShow', 'advanced', 'setAll', 'dropdown', 'query', 'labelwidth'],
+ radio: ['label', 'field', 'resourceType', 'initval', 'type', 'match', 'ratio', 'blacklist', 'required', 'Hide', 'labelShow', 'advanced', 'setAll', 'query', 'labelwidth'],
multiselect: ['label', 'field', 'resourceType', 'initval', 'type', 'match', 'ratio', 'blacklist', 'required', 'Hide', 'labelShow', 'advanced', 'query', 'labelwidth'],
link: ['label', 'field', 'resourceType', 'initval', 'type', 'linkField', 'match', 'ratio', 'blacklist', 'required', 'Hide', 'labelShow', 'advanced', 'setAll', 'dropdown', 'query', 'labelwidth'],
date: ['label', 'field', 'initval', 'type', 'match', 'ratio', 'blacklist', 'required', 'Hide', 'labelShow', 'advanced', 'query', 'precision', 'labelwidth'],
@@ -179,7 +181,7 @@
let reRequired = {}
let reLabel = {}
- if (['multiselect', 'select', 'link'].includes(type)) {
+ if (['multiselect', 'select', 'link', 'radio'].includes(type)) {
reRequired.linkField = true
if (this.record.resourceType === '0') { // 鑷畾涔夎祫婧�
shows.push('options')
@@ -318,7 +320,7 @@
uuid: key
}]
}
- } else if (['multiselect', 'select', 'link'].includes(value)) {
+ } else if (['multiselect', 'select', 'link', 'radio'].includes(value)) {
if (!this.record.options[0].Text && this.record.fields.length > 0) {
let field = this.record.fields[0].field
@@ -618,7 +620,7 @@
if (!err) {
values.uuid = this.props.card.uuid
// 涓嬫媺鑿滃崟鎴栬仈鍔ㄨ彍鍗�
- if (['multiselect', 'select', 'link'].includes(values.type)) {
+ if (['multiselect', 'select', 'link', 'radio'].includes(values.type)) {
if (values.resourceType === '0') {
values.options = values.options || []
values.dataSource = ''
--
Gitblit v1.8.0