0017
/
iot-ui-vue
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: bug#10936

This commit is contained in:
xieyonghong 2023-04-03 17:46:31 +08:00
parent 453973fe32
commit af3159ef95
4 changed files with 5 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/views/rule-engine/Scene/Save/action/ListItem/Item.vue
View File

@ -551,9 +551,9 @@ const onPropsCancel = () => {
const rules = [{ const rules = [{
validator(_: any, v?: ActionsType) { validator(_: any, v?: ActionsType) {
console.log('validator',v) console.log('validator-action-item',v)
if (v?.executor === 'device') { if (v?.executor === 'device') {
if(!v.device?.productId || !v.device?.selectorValues) { if(v?.device?.source === 'fixed' && (!v.device?.productId || !v.device?.selectorValues)) {
return Promise.reject(new Error('该数据已发生变更，请重新配置')) return Promise.reject(new Error('该数据已发生变更，请重新配置'))
} }
} }

13
src/views/rule-engine/Scene/Save/action/ListItem/List.vue
View File

@ -73,19 +73,6 @@ const thenName = computed(() => {
return _data.value.branches![props.branchesName].then.findIndex(item => item.parallel === props.parallel) return _data.value.branches![props.branchesName].then.findIndex(item => item.parallel === props.parallel)
}) })
const rules = [{
validator(_: any, v?: ActionsType) {
console.log('validator',v)
if (v?.executor === 'device') {
if(!v.device?.productId || !v.device?.selectorValues) {
return Promise.reject(new Error('该数据已发生变更，请重新配置'))
}
}
return Promise.resolve()
}
}]
const onAdd = () => { const onAdd = () => {
visible.value = true; visible.value = true;
}; };

2
src/views/system/Apply/index.vue
View File

@ -49,7 +49,7 @@
> >
<template #img> <template #img>
<slot name="img"> <slot name="img">
<img :src="slotProps.sso.configuration.oauth2.logoUrl || getImage('/apply.png')" /> <img :src="getImage('/apply.png')" />
</slot> </slot>
</template> </template>
<template #content> <template #content>

4
vite.config.ts
View File

@ -92,8 +92,8 @@ export default defineConfig(({ mode}) => {
[env.VITE_APP_BASE_API]: { [env.VITE_APP_BASE_API]: {
// target: 'http://192.168.32.226:8844', // target: 'http://192.168.32.226:8844',
// target: 'http://192.168.32.244:8881', // target: 'http://192.168.32.244:8881',
// target: 'http://120.77.179.54:8844', // 120测试 target: 'http://120.77.179.54:8844', // 120测试
target: 'http://192.168.33.46:8844', // 本地开发环境 // target: 'http://192.168.33.46:8844', // 本地开发环境
ws: 'ws://192.168.33.46:8844', ws: 'ws://192.168.33.46:8844',
changeOrigin: true, changeOrigin: true,
rewrite: (path) => path.replace(/^\/api/, '') rewrite: (path) => path.replace(/^\/api/, '')