fix: 修改bug
This commit is contained in:
parent
e2170d8f50
commit
1e6a7e1588
|
@ -197,6 +197,7 @@ const runScript = () => {
|
||||||
onlyMessage('请编辑规则', 'warning');
|
onlyMessage('请编辑规则', 'warning');
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
ws.value = getWebSocket(
|
ws.value = getWebSocket(
|
||||||
`virtual-property-debug-${props.id}-${new Date().getTime()}`,
|
`virtual-property-debug-${props.id}-${new Date().getTime()}`,
|
||||||
'/virtual-property-debug',
|
'/virtual-property-debug',
|
||||||
|
|
|
@ -94,10 +94,6 @@ const addOperatorValue = (val: string) => {
|
||||||
editor.value.addOperatorValue(val);
|
editor.value.addOperatorValue(val);
|
||||||
};
|
};
|
||||||
|
|
||||||
watchEffect(() => {
|
|
||||||
console.log(props.value, _value.value, 'hhhhh')
|
|
||||||
})
|
|
||||||
|
|
||||||
watch(() => _value.value, () => {
|
watch(() => _value.value, () => {
|
||||||
_disabled.value = true
|
_disabled.value = true
|
||||||
})
|
})
|
||||||
|
|
|
@ -1,6 +1,21 @@
|
||||||
<template>
|
<template>
|
||||||
<j-modal :width="'900px'" visible @cancel="emit('close')" :zIndex="1100">
|
<j-modal :width="'900px'" visible @cancel="emit('close')" :zIndex="1100">
|
||||||
<template v-if="getType === 'notifier-dingTalk'">
|
<template v-if="getType === 'notifier-weixin'">
|
||||||
|
<j-spin :spinning="loading">
|
||||||
|
<div class="code" style="height: 450px">
|
||||||
|
<iframe
|
||||||
|
id="notifier_iframe"
|
||||||
|
class="code-item"
|
||||||
|
width="100%"
|
||||||
|
height="100%"
|
||||||
|
:src="url"
|
||||||
|
sandbox="allow-forms allow-scripts allow-same-origin allow-popups"
|
||||||
|
v-if="!loading"
|
||||||
|
></iframe>
|
||||||
|
</div>
|
||||||
|
</j-spin>
|
||||||
|
</template>
|
||||||
|
<template v-else-if="getType === 'notifier-dingTalk'">
|
||||||
<j-spin :spinning="loading">
|
<j-spin :spinning="loading">
|
||||||
<div class="code" style="height: 600px;">
|
<div class="code" style="height: 600px;">
|
||||||
<iframe
|
<iframe
|
||||||
|
@ -14,20 +29,7 @@
|
||||||
</div>
|
</div>
|
||||||
</j-spin>
|
</j-spin>
|
||||||
</template>
|
</template>
|
||||||
<template v-else-if="getType === 'notifier-weixin'">
|
|
||||||
<j-spin :spinning="loading">
|
|
||||||
<div class="code" style="height: 450px">
|
|
||||||
<iframe
|
|
||||||
id="notifier_iframe"
|
|
||||||
class="code-item"
|
|
||||||
width="100%"
|
|
||||||
height="100%"
|
|
||||||
:src="url"
|
|
||||||
v-if="!loading"
|
|
||||||
></iframe>
|
|
||||||
</div>
|
|
||||||
</j-spin>
|
|
||||||
</template>
|
|
||||||
<template #footer>
|
<template #footer>
|
||||||
<j-button @click="emit('close')">关闭</j-button>
|
<j-button @click="emit('close')">关闭</j-button>
|
||||||
<!-- <j-button type="primary" @click="emit('close')">确定</j-button> -->
|
<!-- <j-button type="primary" @click="emit('close')">确定</j-button> -->
|
||||||
|
@ -103,8 +105,9 @@ const updateIframeStyle = () => {
|
||||||
const iframe = document.querySelector(
|
const iframe = document.querySelector(
|
||||||
'#notifier_iframe',
|
'#notifier_iframe',
|
||||||
) as HTMLIFrameElement;
|
) as HTMLIFrameElement;
|
||||||
|
console.log(iframe)
|
||||||
iframe.onload = () => {
|
iframe.onload = () => {
|
||||||
console.log(iframe?.contentWindow)
|
console.log(iframe?.contentWindow, '123')
|
||||||
const currentUrl = iframe?.contentWindow?.location?.search || '';
|
const currentUrl = iframe?.contentWindow?.location?.search || '';
|
||||||
let authCode = '';
|
let authCode = '';
|
||||||
if (currentUrl.startsWith('?')) {
|
if (currentUrl.startsWith('?')) {
|
||||||
|
|
|
@ -29,10 +29,6 @@ const onChange = (val: string | undefined) => {
|
||||||
onClose()
|
onClose()
|
||||||
}
|
}
|
||||||
|
|
||||||
watchEffect(() => {
|
|
||||||
console.log(props.virtualRule, props.value, '123')
|
|
||||||
})
|
|
||||||
|
|
||||||
const onClose = () => {
|
const onClose = () => {
|
||||||
visible.value = false
|
visible.value = false
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue