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

fix: bug#17001

This commit is contained in:
XieYongHong 2023-08-02 16:55:57 +08:00
parent 480b241b15
commit 1f7cc1eaff
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/views/device/components/Metadata/Base/columns.tsx
View File

@ -426,21 +426,21 @@ export const useColumns = (type?: MetadataType, target?: 'device' | 'product', n
}, },
form: { form: {
required: true, required: true,
rules: target !== 'device' ? [ rules: [
{ {
callback: async (rule: any, value: any, dataSource: any[]) => { callback: async (rule: any, value: any, dataSource: any[]) => {
const field = rule.field.split('.') const field = rule.field.split('.')
const fieldIndex = Number(field[1]) const fieldIndex = Number(field[1])
const values = dataSource.find((item, index) => index === fieldIndex) const values = dataSource.find((item, index) => index === fieldIndex)
const virtualRule = values.elements?.virtualRule const virtualRule = values.expands?.virtualRule
const source = value.source const source = value.source
const ids = (noEdit?.value?.id || []) as any[] const ids = (noEdit?.value?.id || []) as any[]
if (source) { if (source) {
if (source !== 'rule' && !value.type?.length) { if (source === 'device' && !value.type?.length) {
return Promise.reject('请选择读写类型'); return Promise.reject('请选择读写类型');
} else if(!ids.includes(values.id) && !virtualRule){ } else if( source === 'rule' && !virtualRule){
return Promise.reject('请配置规则'); return Promise.reject('请配置规则');
} }
@ -450,7 +450,7 @@ export const useColumns = (type?: MetadataType, target?: 'device' | 'product', n
return Promise.reject('请选择属性来源'); return Promise.reject('请选择属性来源');
} }
}, },
]: [] ]
}, },
control(newValue, oldValue) { control(newValue, oldValue) {
if (newValue && !oldValue) { if (newValue && !oldValue) {

2
src/views/device/components/Metadata/Base/components/VirtualRule/index.vue
View File

@ -50,7 +50,7 @@
</j-select> </j-select>
</j-form-item> </j-form-item>
<j-form-item <j-form-item
:name="['virtualRule', 'rule', 'script']" :name="['virtualRule', 'script']"
label="计算规则" label="计算规则"
required required
> >