diff --git a/src/components/FRuleEditor/Debug/index.vue b/src/components/FRuleEditor/Debug/index.vue
index 7255bc03..d8a4016c 100644
--- a/src/components/FRuleEditor/Debug/index.vue
+++ b/src/components/FRuleEditor/Debug/index.vue
@@ -275,6 +275,7 @@ const stopAction = () => {
if (ws.value) {
ws.value.unsubscribe?.();
}
+ window.clearInterval(timer.value)
timer.value = null
};
const clearAction = () => {
@@ -286,6 +287,7 @@ onUnmounted(() => {
ws.value.unsubscribe?.();
}
clearAction();
+ window.clearInterval(timer.value)
timer.value = null
});
diff --git a/src/router/menu.ts b/src/router/menu.ts
index 6f9dd189..f7d68cd4 100644
--- a/src/router/menu.ts
+++ b/src/router/menu.ts
@@ -79,5 +79,12 @@ export default [
},
component: () => import('@/views/oauth/index.vue')
},
+ {
+ path: '/oauth/wechat',
+ meta: {
+ title: '微信授权页'
+ },
+ component: () => import('@/views/oauth/WeChat.vue')
+ },
AccountMenu
]
\ No newline at end of file
diff --git a/src/views/account/Center/components/Subscribe/components/Bind.vue b/src/views/account/Center/components/Subscribe/components/Bind.vue
index 9bad82ba..299b09b0 100644
--- a/src/views/account/Center/components/Subscribe/components/Bind.vue
+++ b/src/views/account/Center/components/Subscribe/components/Bind.vue
@@ -9,10 +9,9 @@
width="100%"
height="100%"
:src="url"
- sandbox="allow-forms allow-scripts allow-same-origin allow-popups"
v-if="!loading"
> -->
-
+
@@ -45,10 +44,10 @@ import {
getUserBind,
getWechatOAuth2,
} from '@/api/account/notificationSubscription';
+import { LocalStore } from '@/utils/comm';
import Wechat from './Wechat.vue';
const emit = defineEmits(['close', 'save']);
-
const props = defineProps({
data: {
// 外层数据
@@ -69,7 +68,7 @@ const getType = computed(() => {
return props.current?.channelProvider;
});
-const _current = ref({})
+const _current = ref({});
const onBindHandle = (
type: 'notifier-weixin' | 'notifier-dingTalk',
@@ -115,11 +114,12 @@ const updateIframeStyle = () => {
const params = Object.fromEntries(_url?.entries());
let authCode = '';
if (props.current?.channelProvider === 'notifier-dingTalk') {
- authCode = params?.authCode
- } else {
- authCode = params?.code
- }
-
+ authCode = params?.authCode;
+ }
+ // else {
+ // authCode = params?.code;
+ // }
+
if (authCode) {
loading.value = true;
onBindHandle(props.current?.channelProvider, authCode);
@@ -128,6 +128,7 @@ const updateIframeStyle = () => {
};
const handleSearch = async () => {
+ LocalStore.remove('wexin_code')
if (props.current?.channelProvider === 'notifier-weixin') {
loading.value = true;
const resp: any = await getWechatOAuth2(
@@ -141,10 +142,7 @@ const handleSearch = async () => {
const _url = new URLSearchParams(resp?.result);
const params = Object.fromEntries(_url?.entries());
_current.value = params;
- // url.value = resp.result as string;
- // nextTick(() => {
- // updateIframeStyle();
- // });
+ url.value = resp.result as string;
}
}
if (props.current?.channelProvider === 'notifier-dingTalk') {
@@ -164,6 +162,10 @@ const handleSearch = async () => {
}
};
+const onSuccess = (code: string) => {
+ onBindHandle(props.current?.channelProvider, code);
+}
+
watch(
() => props.current,
() => {
diff --git a/src/views/account/Center/components/Subscribe/components/Wechat.vue b/src/views/account/Center/components/Subscribe/components/Wechat.vue
index 01cf82dd..be15a86b 100644
--- a/src/views/account/Center/components/Subscribe/components/Wechat.vue
+++ b/src/views/account/Center/components/Subscribe/components/Wechat.vue
@@ -1,37 +1,46 @@
\ No newline at end of file
diff --git a/src/views/oauth/WeChat.vue b/src/views/oauth/WeChat.vue
new file mode 100644
index 00000000..baa01324
--- /dev/null
+++ b/src/views/oauth/WeChat.vue
@@ -0,0 +1,20 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/src/views/rule-engine/Scene/Save/action/Notify/NotifyConfig.vue b/src/views/rule-engine/Scene/Save/action/Notify/NotifyConfig.vue
index a086a64d..2f3406e1 100644
--- a/src/views/rule-engine/Scene/Save/action/Notify/NotifyConfig.vue
+++ b/src/views/rule-engine/Scene/Save/action/Notify/NotifyConfig.vue
@@ -16,6 +16,7 @@
}"
:params="params"
:gridColumn="2"
+ :alertRender="false"
:rowSelection="{
selectedRowKeys: _selectedRowKeys,
onChange: onSelectChange,
diff --git a/src/views/rule-engine/Scene/Save/action/Notify/NotifyTemplate.vue b/src/views/rule-engine/Scene/Save/action/Notify/NotifyTemplate.vue
index 69b0162f..dc55b032 100644
--- a/src/views/rule-engine/Scene/Save/action/Notify/NotifyTemplate.vue
+++ b/src/views/rule-engine/Scene/Save/action/Notify/NotifyTemplate.vue
@@ -18,6 +18,7 @@
:params="params"
:gridColumn="2"
:noPagination="true"
+ :alertRender="false"
:rowSelection="{
selectedRowKeys: _selectedRowKeys,
onChange: onSelectChange,