From d891a5169bef4e64ca8acd354bfe5eab75dbbb4d Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 18 十月 2023 17:33:14 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/templates/modalconfig/dragelement/card.jsx | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/src/templates/modalconfig/dragelement/card.jsx b/src/templates/modalconfig/dragelement/card.jsx
index 063f651..dcd142a 100644
--- a/src/templates/modalconfig/dragelement/card.jsx
+++ b/src/templates/modalconfig/dragelement/card.jsx
@@ -1,7 +1,7 @@
import React from 'react'
import { useDrag, useDrop } from 'react-dnd'
import { Select, DatePicker, Input, InputNumber, Button, Popover, Switch, Radio, Checkbox, Form, Rate } from 'antd'
-import { QuestionCircleOutlined, UploadOutlined, EditOutlined, CopyOutlined, CloseOutlined, StarFilled, FontColorsOutlined } from '@ant-design/icons'
+import { QuestionCircleOutlined, UploadOutlined, EditOutlined, CopyOutlined, CloseOutlined, StarFilled, SearchOutlined, FontColorsOutlined } from '@ant-design/icons'
import moment from 'moment'
import asyncComponent from '@/utils/asyncComponent'
@@ -80,6 +80,8 @@
formItem = (<InputNumber value={card.initval} precision={card.decimal} />)
} else if (card.type === 'multiselect' || card.type === 'select' || card.type === 'link' || card.type === 'cascader') {
formItem = (<Select value={selectval}></Select>)
+ } else if (card.type === 'popSelect') {
+ formItem = (<Select value={card.initval} suffixIcon={<SearchOutlined />}></Select>)
} else if (card.type === 'color') {
formItem = (<ColorSketch value={card.initval || 'transparent'}/>)
} else if (card.type === 'date') {
--
Gitblit v1.8.0