Commit c11fc549 authored by timel's avatar timel

fix: remove prop

parent 4792ca5d
Pipeline #22424 failed with stages
in 15 minutes and 33 seconds
...@@ -27,7 +27,6 @@ export default async ({ ...@@ -27,7 +27,6 @@ export default async ({
cancelable, cancelable,
min: min, min: min,
max: max, max: max,
single: true,
selecteds: [...selecteds1, ...selecteds2], selecteds: [...selecteds1, ...selecteds2],
mustSelects: [...mustSelect1, ...mustSelect2], mustSelects: [...mustSelect1, ...mustSelect2],
selectables: [...selectable1, ...selectable2], selectables: [...selectable1, ...selectable2],
......
...@@ -21,7 +21,6 @@ const defaultProps: Omit< ...@@ -21,7 +21,6 @@ const defaultProps: Omit<
isChain: false, isChain: false,
min: 0, min: 0,
max: 0, max: 0,
single: true,
selecteds: [] as Option[], // 最少选择多少卡 selecteds: [] as Option[], // 最少选择多少卡
selectables: [] as Option[], // 最多选择多少卡 selectables: [] as Option[], // 最多选择多少卡
mustSelects: [] as Option[], // 单选 mustSelects: [] as Option[], // 单选
...@@ -39,7 +38,6 @@ export const SelectActionsModal: React.FC = () => { ...@@ -39,7 +38,6 @@ export const SelectActionsModal: React.FC = () => {
isChain, isChain,
min, min,
max, max,
single,
selecteds, selecteds,
selectables, selectables,
mustSelects, mustSelects,
...@@ -77,7 +75,6 @@ export const SelectActionsModal: React.FC = () => { ...@@ -77,7 +75,6 @@ export const SelectActionsModal: React.FC = () => {
isChain, isChain,
min, min,
max, max,
single,
selecteds, selecteds,
selectables, selectables,
mustSelects, mustSelects,
......
...@@ -19,7 +19,6 @@ export interface SelectCardsModalProps { ...@@ -19,7 +19,6 @@ export interface SelectCardsModalProps {
isChain: boolean; isChain: boolean;
min: number; min: number;
max: number; max: number;
single: boolean;
selecteds: Snapshot<Option[]>; // 已经选择了的卡 selecteds: Snapshot<Option[]>; // 已经选择了的卡
selectables: Snapshot<Option[]>; // 最多选择多少卡 selectables: Snapshot<Option[]>; // 最多选择多少卡
mustSelects: Snapshot<Option[]>; // 单选 mustSelects: Snapshot<Option[]>; // 单选
...@@ -37,7 +36,6 @@ export const SelectCardsModal: React.FC<SelectCardsModalProps> = ({ ...@@ -37,7 +36,6 @@ export const SelectCardsModal: React.FC<SelectCardsModalProps> = ({
isChain, isChain,
min, min,
max, max,
single,
selecteds, selecteds,
selectables, selectables,
mustSelects, mustSelects,
...@@ -51,6 +49,7 @@ export const SelectCardsModal: React.FC<SelectCardsModalProps> = ({ ...@@ -51,6 +49,7 @@ export const SelectCardsModal: React.FC<SelectCardsModalProps> = ({
}) => { }) => {
const [result, setResult] = useState<Option[]>([]); const [result, setResult] = useState<Option[]>([]);
const [submitable, setSubmitable] = useState(false); const [submitable, setSubmitable] = useState(false);
const single = min === 1 && max === 1; // 是否是单选
const hint = useSnapshot(matStore.hint); const hint = useSnapshot(matStore.hint);
const preHintMsg = hint?.esHint || ""; const preHintMsg = hint?.esHint || "";
...@@ -144,7 +143,6 @@ export const SelectCardsModal: React.FC<SelectCardsModalProps> = ({ ...@@ -144,7 +143,6 @@ export const SelectCardsModal: React.FC<SelectCardsModalProps> = ({
<div className="checkcard-container" key={i}> <div className="checkcard-container" key={i}>
<CheckCard.Group <CheckCard.Group
onChange={(res) => { onChange={(res) => {
console.log("setresult", res);
setResult((single ? [res] : res) as any); setResult((single ? [res] : res) as any);
}} }}
// TODO 考虑如何设置默认值,比如只有一个的,就直接选中 // TODO 考虑如何设置默认值,比如只有一个的,就直接选中
......
...@@ -18,7 +18,6 @@ export const SimpleSelectCardsModal: React.FC = () => { ...@@ -18,7 +18,6 @@ export const SimpleSelectCardsModal: React.FC = () => {
isChain={false} isChain={false}
min={1} min={1}
max={1} max={1}
single
selecteds={[]} selecteds={[]}
mustSelects={[]} mustSelects={[]}
selectables={selectables} selectables={selectables}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment