diff --git a/package.json b/package.json index 23e3d0b9..8585c640 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "makeit-admin-pro", - "version": "2.1.363", + "version": "2.1.364", "author": { "url": "https://admin.makeit.vip", "name": "lirongtong", diff --git a/src/components/captcha/captcha.tsx b/src/components/captcha/captcha.tsx index d29c5bfd..35068b41 100644 --- a/src/components/captcha/captcha.tsx +++ b/src/components/captcha/captcha.tsx @@ -79,7 +79,11 @@ export default defineComponent({ afterInit() props.initAction() } else { - $request[props.initMethod.toLowerCase()](props.initAction, props.initParams) + $request[props.initMethod.toLowerCase()]( + props.initAction, + props.initParams, + props.actionConfig + ) .then((res: any) => { afterInit() if (res?.data?.key && !params.verifyParams.key) @@ -99,7 +103,11 @@ export default defineComponent({ params.status.ready = false params.status.scanning = true if (props.checkAction) { - $request[props.checkMethod.toLowerCase()](props.checkAction, props.checkParams) + $request[props.checkMethod.toLowerCase()]( + props.checkAction, + props.checkParams, + props.actionConfig + ) .then((res: any) => { if (res.data.pass) params.pass = true else initCaptchaModal() @@ -224,6 +232,7 @@ export default defineComponent({ verifyMethod={props.verifyMethod} verifyParams={params.verifyParams} verifyAction={props.verifyAction} + actionConfig={props.actionConfig} onModalClose={closeCaptchaModal} image={props.image} /> diff --git a/src/components/captcha/modal.tsx b/src/components/captcha/modal.tsx index 6e04f9c5..e472d1f0 100644 --- a/src/components/captcha/modal.tsx +++ b/src/components/captcha/modal.tsx @@ -2,33 +2,15 @@ import { defineComponent, ref, reactive, onMounted, onBeforeUnmount, Transition import { Tooltip } from 'ant-design-vue' import { CloseCircleOutlined, ReloadOutlined, QuestionCircleOutlined } from '@ant-design/icons-vue' import { useI18n } from 'vue-i18n' -import PropTypes from '../_utils/props-types' import { getPrefixCls } from '../_utils/props-tools' import { $tools } from '../../utils/tools' import { $g, MI_POWERED, MI_AVATAR } from '../../utils/global' import { $request } from '../../utils/request' import { background } from '../../utils/images' +import { captchaModalProps } from './props' const TARGET = 'https://admin.makeit.vip/components/captcha' -export const captchaModalProps = () => ({ - prefixCls: PropTypes.string, - show: PropTypes.bool.def(false), - image: PropTypes.string, - position: PropTypes.object, - mask: PropTypes.bool.def(true), - maskClosable: PropTypes.bool.def(true), - themeColor: PropTypes.string, - bgColor: PropTypes.string, - boxShadow: PropTypes.bool.def(true), - boxShadowColor: PropTypes.string, - boxShadowBlur: PropTypes.number.def(6), - maxTries: PropTypes.number.def(5), - verifyParams: PropTypes.object.def({}), - verifyMethod: PropTypes.string.def('post'), - verifyAction: PropTypes.string -}) - export default defineComponent({ name: 'MiCaptchaModal', inheritAttrs: false, @@ -427,7 +409,8 @@ export default defineComponent({ if (props.verifyAction) { await $request[props.verifyMethod.toLowerCase()]( props.verifyAction, - props.verifyParams + props.verifyParams, + props.actionConfig ) .then((res: any) => { if (res.ret.code === 200) { diff --git a/src/components/captcha/props.ts b/src/components/captcha/props.ts index 1cbea17d..800e2f46 100644 --- a/src/components/captcha/props.ts +++ b/src/components/captcha/props.ts @@ -1,53 +1,55 @@ -import PropTypes from '../_utils/props-types' -import { tuple } from '../_utils/props-tools' -import { $g } from '../../utils/global' - -export const captchaProps = () => ({ - prefixCls: PropTypes.string, - width: PropTypes.oneOfType([PropTypes.number, PropTypes.string]).def(320), - height: PropTypes.number, - radius: PropTypes.number.def(48), - themeColor: PropTypes.string, - bgColor: PropTypes.string, - borderColor: PropTypes.string, - textColor: PropTypes.string, - boxShadow: PropTypes.bool.def(true), - boxShadowColor: PropTypes.string, - boxShadowBlur: PropTypes.number.def(4), - modalBgColor: PropTypes.string, - modalBoxShadow: PropTypes.bool.def(true), - modalBoxShadowColor: PropTypes.string, - modalBoxShadowBlur: PropTypes.number, - image: PropTypes.string, - logo: PropTypes.string, - mask: PropTypes.bool.def(true), - maskClosable: PropTypes.bool.def(true), - maxTries: PropTypes.number.def(5), - initParams: PropTypes.object.def({}), - initAction: PropTypes.oneOfType([PropTypes.func, PropTypes.string]), - initMethod: PropTypes.oneOf(tuple(...$g.methods)).def('get'), - verifyParams: PropTypes.object.def({}), - verifyAction: PropTypes.oneOfType([PropTypes.func, PropTypes.string]), - verifyMethod: PropTypes.oneOf(tuple(...$g.methods)).def('post'), - checkParams: PropTypes.object.def({}), - checkAction: PropTypes.string, - checkMethod: PropTypes.oneOf(tuple(...$g.methods)).def('post') -}) - -export const captchaModalProps = () => ({ - prefixCls: PropTypes.string, - show: PropTypes.bool.def(false), - image: PropTypes.string, - position: PropTypes.object, - mask: PropTypes.bool.def(true), - maskClosable: PropTypes.bool.def(true), - themeColor: PropTypes.string, - bgColor: PropTypes.string, - boxShadow: PropTypes.bool.def(true), - boxShadowColor: PropTypes.string, - boxShadowBlur: PropTypes.number.def(6), - maxTries: PropTypes.number.def(5), - verifyParams: PropTypes.object.def({}), - verifyMethod: PropTypes.string.def('post'), - verifyAction: PropTypes.string -}) +import PropTypes from '../_utils/props-types' +import { tuple } from '../_utils/props-tools' +import { $g } from '../../utils/global' + +export const captchaProps = () => ({ + prefixCls: PropTypes.string, + width: PropTypes.oneOfType([PropTypes.number, PropTypes.string]).def(320), + height: PropTypes.number, + radius: PropTypes.number.def(48), + themeColor: PropTypes.string, + bgColor: PropTypes.string, + borderColor: PropTypes.string, + textColor: PropTypes.string, + boxShadow: PropTypes.bool.def(true), + boxShadowColor: PropTypes.string, + boxShadowBlur: PropTypes.number.def(4), + modalBgColor: PropTypes.string, + modalBoxShadow: PropTypes.bool.def(true), + modalBoxShadowColor: PropTypes.string, + modalBoxShadowBlur: PropTypes.number, + image: PropTypes.string, + logo: PropTypes.string, + mask: PropTypes.bool.def(true), + maskClosable: PropTypes.bool.def(true), + maxTries: PropTypes.number.def(5), + initParams: PropTypes.object.def({}), + initAction: PropTypes.oneOfType([PropTypes.func, PropTypes.string]), + initMethod: PropTypes.oneOf(tuple(...$g.methods)).def('get'), + verifyParams: PropTypes.object.def({}), + verifyAction: PropTypes.oneOfType([PropTypes.func, PropTypes.string]), + verifyMethod: PropTypes.oneOf(tuple(...$g.methods)).def('post'), + checkParams: PropTypes.object.def({}), + checkAction: PropTypes.string, + checkMethod: PropTypes.oneOf(tuple(...$g.methods)).def('post'), + actionConfig: PropTypes.object.def({}) +}) + +export const captchaModalProps = () => ({ + prefixCls: PropTypes.string, + show: PropTypes.bool.def(false), + image: PropTypes.string, + position: PropTypes.object, + mask: PropTypes.bool.def(true), + maskClosable: PropTypes.bool.def(true), + themeColor: PropTypes.string, + bgColor: PropTypes.string, + boxShadow: PropTypes.bool.def(true), + boxShadowColor: PropTypes.string, + boxShadowBlur: PropTypes.number.def(6), + maxTries: PropTypes.number.def(5), + verifyParams: PropTypes.object.def({}), + verifyMethod: PropTypes.string.def('post'), + verifyAction: PropTypes.string, + actionConfig: PropTypes.object.def({}) +})