diff --git a/src/assets/core.scss b/src/assets/core.scss index 14b57a7..2b1299c 100644 --- a/src/assets/core.scss +++ b/src/assets/core.scss @@ -223,6 +223,30 @@ //max-height: calc(100vh - var(--app-header-header) - 200px); //overflow: auto; } +.root-modal-confirm{ + z-index: calc(var(--header-z-index) + 1) !important; + background: rgba(0, 0, 0, 0.05); + .ant-modal-confirm-title{ + font-size: 20px; + margin-top: -2px; + } + .ant-modal-confirm-content{ + margin-top: 10px; + margin-left: -30px; + } + .ant-modal-confirm-btns{ + @apply mt-8; + button{ + @apply rounded-2xl py-4 px-8; + } + .ant-btn-default{ + @apply bg-white shadow-none text-popconfirm-btn-cancel border border-popconfirm-btn-cancel hover:border-popconfirm-btn-cancel hover:text-popconfirm-btn-cancel hover:bg-white hover:bg-popconfirm-btn-cancel/10; + } + .ant-btn-primary{ + @apply bg-white shadow-none text-popconfirm-bg border border-popconfirm-bg hover:text-popconfirm-bg hover:bg-white hover:bg-popconfirm-btn-primary-hover/10; + } + } +} .video-player { .video-js { diff --git a/src/components/button-batch.tsx b/src/components/button-batch.tsx index 12bc966..83e9026 100644 --- a/src/components/button-batch.tsx +++ b/src/components/button-batch.tsx @@ -47,6 +47,7 @@ export default function ButtonBatch( return; } Modal.confirm({ + rootClassName:'root-modal-confirm', title: title || '操作提示', centered: true, content: confirmMessage, diff --git a/src/components/form/tag-select.tsx b/src/components/form/tag-select.tsx index 32ce172..cc21e49 100644 --- a/src/components/form/tag-select.tsx +++ b/src/components/form/tag-select.tsx @@ -1,4 +1,4 @@ -import React, {useMemo, useRef} from "react"; +import React, {useEffect, useMemo, useRef} from "react"; import {Checkbox, Popover} from "antd"; import {useBoolean, useClickAway} from "ahooks"; import {CaretUpOutlined} from "@ant-design/icons"; @@ -9,6 +9,7 @@ const TagSelect = (props: { options: OptionItem[]; onChange: (values: Id[][]) => void; className?: string; + defaultSelectTags?: Id[][]; }) => { const [selectValues, __setSelectValues] = React.useState([]) const [checkedAll, _setCheckedAll] = React.useState(false) @@ -104,6 +105,12 @@ const TagSelect = (props: { useClickAway(()=>{ set(false) },ref) + useEffect(()=>{ + if(props.defaultSelectTags){ + __setSelectValues(props.defaultSelectTags) + } + //console.log('props.defaultSelectTags',props.defaultSelectTags) + },[props.defaultSelectTags]) return (
} - title={'你确定要删除吗?'} - description={`删除后需从重新${type == 'create' ? '生成' : '推流'}`} + title={'你确定要删除此视频吗?'} + // description={`删除后需从重新${type == 'create' ? '生成' : '推流'}`} onConfirm={onRemove} >} { diff --git a/src/pages/news/components/button-delete-batch.tsx b/src/pages/news/components/button-delete-batch.tsx index 9cf1305..8df378a 100644 --- a/src/pages/news/components/button-delete-batch.tsx +++ b/src/pages/news/components/button-delete-batch.tsx @@ -25,6 +25,8 @@ export default function ButtonDeleteBatch(props: { ids: Id[];onSuccess?: () => v return } modal.confirm({ + wrapClassName:'root-modal-confirm', + className:'modal-confirm', title: `你确定要删除选择的 ${props.ids.length} 条新闻吗?`, content: '删除后需从新闻素材中重新选择', onOk: handlePush, diff --git a/src/pages/news/components/edit-search-form.tsx b/src/pages/news/components/edit-search-form.tsx index 161d29a..1ae249b 100644 --- a/src/pages/news/components/edit-search-form.tsx +++ b/src/pages/news/components/edit-search-form.tsx @@ -79,7 +79,7 @@ export default function EditSearchForm(props: { {/* options={articleTags}*/} {/* onChange={setTags}*/} {/*/>*/} - +
) } \ No newline at end of file diff --git a/src/pages/news/components/search-panel.tsx b/src/pages/news/components/search-panel.tsx index e0c0a09..de5ebfd 100644 --- a/src/pages/news/components/search-panel.tsx +++ b/src/pages/news/components/search-panel.tsx @@ -145,7 +145,7 @@ export default function SearchPanel({onSearch,defaultParams}: SearchPanelProps) setPrevSearchName(e.target.value)} - className="w-[250px] rounded-3xl" + className="w-[270px] rounded-3xl" placeholder={'请输入新闻标题关键词进行搜索'} onPressEnter={onFinish} onBlur={onFinish} diff --git a/src/pages/video/index.tsx b/src/pages/video/index.tsx index 1aac079..2939d98 100644 --- a/src/pages/video/index.tsx +++ b/src/pages/video/index.tsx @@ -248,7 +248,7 @@ export default function VideoIndex() { emptyMessage={`请选择要删除的新闻视频`} title={`已选择${checkedIdArray.length}条,确定要全部删除吗?`} className='bg-gray-300 hover:bg-gray-400 text-white' - confirmMessage={`删除后需从新闻素材中`} + confirmMessage={`删除后需重新生成视频`} onSuccess={() => { showToast('删除成功!', 'success') loadList()