From 8040a18c4b2a848d252bf01838f06c7aec1be9f3 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 07 六月 2024 15:16:11 +0800
Subject: [PATCH] 2024-06-07
---
src/mob/components/navbar/normal-navbar/menus/menuform/index.jsx | 1
src/menu/components/card/double-data-card/options.jsx | 1
src/components/normalform/modalform/index.jsx | 2
src/menu/components/table/normal-table/options.jsx | 2 +
src/menu/components/card/data-card/options.jsx | 1
src/menu/components/share/actioncomponent/formconfig.jsx | 4 ++
src/menu/components/table/base-table/options.jsx | 2 +
src/mob/components/menubar/normal-menubar/menucomponent/options.jsx | 1
src/pc/components/navbar/normal-navbar/menusetting/menuform/index.jsx | 2
src/menu/components/share/actioncomponent/index.jsx | 2 +
src/menu/components/table/edit-table/options.jsx | 1
src/menu/components/module/invoice/verifycard/callbackcustomscript/index.jsx | 1
src/components/normalform/modalform/mkSelect/index.jsx | 41 ++++++++++----------
src/menu/components/table/edit-table/columns/editColumn/formconfig.jsx | 1
src/pc/createview/settingform/index.jsx | 1
15 files changed, 40 insertions(+), 23 deletions(-)
diff --git a/src/components/normalform/modalform/index.jsx b/src/components/normalform/modalform/index.jsx
index c685080..e30a12a 100644
--- a/src/components/normalform/modalform/index.jsx
+++ b/src/components/normalform/modalform/index.jsx
@@ -385,7 +385,7 @@
}
return (
- <Form {...formItemLayout} className="normal-form-field">
+ <Form {...formItemLayout} className="normal-form-field" id="normal-form-field">
<Row gutter={24}>{this.getFields()}</Row>
</Form>
)
diff --git a/src/components/normalform/modalform/mkSelect/index.jsx b/src/components/normalform/modalform/mkSelect/index.jsx
index abbd6ac..4b8ee1a 100644
--- a/src/components/normalform/modalform/mkSelect/index.jsx
+++ b/src/components/normalform/modalform/mkSelect/index.jsx
@@ -1,4 +1,4 @@
-import React, {Component} from 'react'
+import React, { Component } from 'react'
import { is, fromJS } from 'immutable'
import { Select } from 'antd'
@@ -115,24 +115,7 @@
const { value, config, options } = this.state
if (config.type !== 'multiselect') {
- if (config.extendName) {
- return (
- <Select
- showSearch
- allowClear
- value={value}
- dropdownMatchSelectWidth={config.dropdown !== 'false'}
- filterOption={(input, option) => option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0 ||
- option.props.extend.toLowerCase().indexOf(input.toLowerCase()) >= 0}
- onSelect={this.selectChange}
- onChange={(val) => val === undefined && this.selectChange('')}
- >
- {options.map((option, i) =>
- <Select.Option key={i} disabled={option.disabled} title={option.label || option.text} extend={option[config.extendName] || ''} value={option.value || option.field || ''}>{option.label || option.text}</Select.Option>
- )}
- </Select>
- )
- } else {
+ if (config.joint) {
return (
<Select
showSearch
@@ -142,13 +125,30 @@
filterOption={(input, option) => option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0}
onSelect={this.selectChange}
onChange={(val) => val === undefined && this.selectChange('')}
+ getPopupContainer={() => document.getElementById('normal-form-field')}
>
{options.map((option, i) =>
- <Select.Option key={i} disabled={option.disabled} value={option.value || option.field || ''}>{option.label || option.text}</Select.Option>
+ <Select.Option key={i} disabled={option.disabled} value={option.field || ''}>{`${option.label}锛�${option.field}锛塦}</Select.Option>
)}
</Select>
)
}
+ return (
+ <Select
+ showSearch
+ allowClear
+ value={value}
+ dropdownMatchSelectWidth={config.dropdown !== 'false'}
+ filterOption={(input, option) => (option.props.children + option.props.extend).toLowerCase().indexOf(input.toLowerCase()) >= 0}
+ onSelect={this.selectChange}
+ onChange={(val) => val === undefined && this.selectChange('')}
+ getPopupContainer={() => document.getElementById('normal-form-field')}
+ >
+ {options.map((option, i) =>
+ <Select.Option key={i} disabled={option.disabled} title={option.label || option.text} extend={config.extendName ? (option[config.extendName] || '') : ''} value={option.value || option.field || ''}>{option.label || option.text}</Select.Option>
+ )}
+ </Select>
+ )
} else {
return (<Select
showSearch
@@ -156,6 +156,7 @@
defaultValue={value}
filterOption={(input, option) => option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0}
onChange={this.mutilselectChange}
+ getPopupContainer={() => document.getElementById('normal-form-field')}
>
{options.map((option, i) =>
<Select.Option key={i} disabled={option.disabled} value={option.value || option.field}>{option.label || option.text}</Select.Option>
diff --git a/src/menu/components/card/data-card/options.jsx b/src/menu/components/card/data-card/options.jsx
index ef3ad49..6a799d2 100644
--- a/src/menu/components/card/data-card/options.jsx
+++ b/src/menu/components/card/data-card/options.jsx
@@ -578,6 +578,7 @@
tooltip: '鐢ㄤ簬鎺у埗琛屾暟鎹槸鍚﹀彲閫夋嫨銆�',
required: false,
allowClear: true,
+ joint: true,
options: columns,
controlFields: [
{field: 'controlVal', notNull: true},
diff --git a/src/menu/components/card/double-data-card/options.jsx b/src/menu/components/card/double-data-card/options.jsx
index df705e7..5cb3395 100644
--- a/src/menu/components/card/double-data-card/options.jsx
+++ b/src/menu/components/card/double-data-card/options.jsx
@@ -182,6 +182,7 @@
tooltip: '鐢ㄤ簬鎺у埗琛屾暟鎹槸鍚﹀彲閫夋嫨銆�',
required: false,
allowClear: true,
+ joint: true,
options: columns,
controlFields: [
{field: 'controlVal', notNull: true},
diff --git a/src/menu/components/module/invoice/verifycard/callbackcustomscript/index.jsx b/src/menu/components/module/invoice/verifycard/callbackcustomscript/index.jsx
index c5cf723..a7834c9 100644
--- a/src/menu/components/module/invoice/verifycard/callbackcustomscript/index.jsx
+++ b/src/menu/components/module/invoice/verifycard/callbackcustomscript/index.jsx
@@ -253,7 +253,6 @@
filterOption={(input, option) => option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0}
onChange={this.selectScript}
>
- <Select.Option key="default" value="defaultSql">榛樿sql</Select.Option>
{systemScripts.map((option, i) =>
<Select.Option key={i} value={option.value}>{option.name}</Select.Option>
)}
diff --git a/src/menu/components/share/actioncomponent/formconfig.jsx b/src/menu/components/share/actioncomponent/formconfig.jsx
index 2b2637c..36e7338 100644
--- a/src/menu/components/share/actioncomponent/formconfig.jsx
+++ b/src/menu/components/share/actioncomponent/formconfig.jsx
@@ -26,6 +26,10 @@
type = 'chart'
}
+ if (card.color && (type !== 'datacard' || appType !== 'mob') && !card.class) {
+ card.class = 'primary'
+ }
+
let opentypes = [
{
value: 'pop',
diff --git a/src/menu/components/share/actioncomponent/index.jsx b/src/menu/components/share/actioncomponent/index.jsx
index 96a9190..27bde39 100644
--- a/src/menu/components/share/actioncomponent/index.jsx
+++ b/src/menu/components/share/actioncomponent/index.jsx
@@ -162,6 +162,8 @@
addButton = (cardId, element) => {
if (cardId !== this.props.config.uuid) return
+ delete element.eleType
+
const { actionlist } = this.state
this.setState({actionlist: [...actionlist, element]})
diff --git a/src/menu/components/table/base-table/options.jsx b/src/menu/components/table/base-table/options.jsx
index 22d06e6..d482819 100644
--- a/src/menu/components/table/base-table/options.jsx
+++ b/src/menu/components/table/base-table/options.jsx
@@ -198,6 +198,7 @@
tooltip: '榧犳爣鎮诞浜庤涓婃柟鏃剁殑鎻愮ず淇℃伅銆�',
required: false,
allowClear: true,
+ joint: true,
options: columns
},
{
@@ -208,6 +209,7 @@
tooltip: '鐢ㄤ簬鎺у埗琛屾暟鎹槸鍚﹀彲閫夋嫨銆�',
required: false,
allowClear: true,
+ joint: true,
options: columns,
controlFields: [
{field: 'controlVal', notNull: true},
diff --git a/src/menu/components/table/edit-table/columns/editColumn/formconfig.jsx b/src/menu/components/table/edit-table/columns/editColumn/formconfig.jsx
index 4379c5c..94e2a8c 100644
--- a/src/menu/components/table/edit-table/columns/editColumn/formconfig.jsx
+++ b/src/menu/components/table/edit-table/columns/editColumn/formconfig.jsx
@@ -562,6 +562,7 @@
tooltip: '鐢ㄤ簬鎺у埗琛屾暟鎹槸鍚﹀彲閫夋嫨銆傚瓧娈靛�间负true鏃讹紝閫夐」涓嶅彲閫夈��',
required: false,
allowClear: true,
+ joint: true,
options: 'columns'
},
{
diff --git a/src/menu/components/table/edit-table/options.jsx b/src/menu/components/table/edit-table/options.jsx
index 31d0eb1..1e409a4 100644
--- a/src/menu/components/table/edit-table/options.jsx
+++ b/src/menu/components/table/edit-table/options.jsx
@@ -237,6 +237,7 @@
tooltip: '榧犳爣鎮诞浜庤涓婃柟鏃剁殑鎻愮ず淇℃伅銆�',
required: false,
allowClear: true,
+ joint: true,
options: columns
},
{
diff --git a/src/menu/components/table/normal-table/options.jsx b/src/menu/components/table/normal-table/options.jsx
index c7a8433..1806ca8 100644
--- a/src/menu/components/table/normal-table/options.jsx
+++ b/src/menu/components/table/normal-table/options.jsx
@@ -246,6 +246,7 @@
tooltip: '榧犳爣鎮诞浜庤涓婃柟鏃剁殑鎻愮ず淇℃伅銆�',
required: false,
allowClear: true,
+ joint: true,
options: columns
},
{
@@ -256,6 +257,7 @@
tooltip: '鐢ㄤ簬鎺у埗琛屾暟鎹槸鍚﹀彲閫夋嫨銆�',
required: false,
allowClear: true,
+ joint: true,
options: columns,
controlFields: [
{field: 'controlVal', notNull: true},
diff --git a/src/mob/components/menubar/normal-menubar/menucomponent/options.jsx b/src/mob/components/menubar/normal-menubar/menucomponent/options.jsx
index d61728f..eace136 100644
--- a/src/mob/components/menubar/normal-menubar/menucomponent/options.jsx
+++ b/src/mob/components/menubar/normal-menubar/menucomponent/options.jsx
@@ -82,6 +82,7 @@
required: false,
options: menulist,
extendName: 'MenuNo',
+ dropdown: 'false',
controlFields: [
{field: 'clearMenu', notNull: true},
],
diff --git a/src/mob/components/navbar/normal-navbar/menus/menuform/index.jsx b/src/mob/components/navbar/normal-navbar/menus/menuform/index.jsx
index cacce83..bb3818d 100644
--- a/src/mob/components/navbar/normal-navbar/menus/menuform/index.jsx
+++ b/src/mob/components/navbar/normal-navbar/menus/menuform/index.jsx
@@ -168,6 +168,7 @@
<Select
allowClear
showSearch
+ dropdownMatchSelectWidth={false}
filterOption={(input, option) => option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0 ||
option.props.extend.toLowerCase().indexOf(input.toLowerCase()) >= 0}
onChange={(val) => this.setState({copyMenu: val})}
diff --git a/src/pc/components/navbar/normal-navbar/menusetting/menuform/index.jsx b/src/pc/components/navbar/normal-navbar/menusetting/menuform/index.jsx
index f8ea138..3454eb1 100644
--- a/src/pc/components/navbar/normal-navbar/menusetting/menuform/index.jsx
+++ b/src/pc/components/navbar/normal-navbar/menusetting/menuform/index.jsx
@@ -159,7 +159,7 @@
{getFieldDecorator('copyMenuId', {
initialValue: menu.copyMenuId || ''
})(
- <Select allowClear onChange={(val) => this.setState({copyMenu: val})}>
+ <Select allowClear dropdownMatchSelectWidth={false} onChange={(val) => this.setState({copyMenu: val})}>
{appMenus.map(item => (<Select.Option key={item.MenuID} value={item.MenuID}>{item.MenuName}</Select.Option>))}
</Select>
)}
diff --git a/src/pc/createview/settingform/index.jsx b/src/pc/createview/settingform/index.jsx
index 0405709..730abc6 100644
--- a/src/pc/createview/settingform/index.jsx
+++ b/src/pc/createview/settingform/index.jsx
@@ -120,6 +120,7 @@
<Select
allowClear
showSearch
+ dropdownMatchSelectWidth={false}
onChange={(val) => this.setState({copymenuId: val})}
filterOption={(input, option) => option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0}
>
--
Gitblit v1.8.0