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

Merge branch 'dev' into dev-dictionary

This commit is contained in:
XieYongHong 2023-10-12 17:56:03 +08:00
parent 54a9c3382f e6205e6602
commit 940be8e53b
2 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/views/device/components/Metadata/Base/Base.vue
View File

@ -61,10 +61,11 @@
title="继承自产品物模型的数据不支持修改" title="继承自产品物模型的数据不支持修改"
> >
<!-- <ModelButton :disabled="true"/>--> <!-- <ModelButton :disabled="true"/>-->
<j-button :disabled="true" type="link" style="padding-left: 0;"> <j-button :disabled="true" type="link" >
<AIcon type="SettingOutlined" /> <AIcon type="SettingOutlined" />
配置 配置
</j-button> </j-button>
</j-tooltip> </j-tooltip>
<PermissionButton <PermissionButton
v-else v-else
@ -93,7 +94,7 @@
title="继承自产品物模型的数据不支持修改" title="继承自产品物模型的数据不支持修改"
> >
<!-- <ModelButton :disabled="true"/>--> <!-- <ModelButton :disabled="true"/>-->
<j-button :disabled="true" type="link" style="padding-left: 0;"> <j-button :disabled="true" type="link">
<AIcon type="SettingOutlined" /> <AIcon type="SettingOutlined" />
配置 配置
</j-button> </j-button>
@ -116,30 +117,29 @@
</j-tag> </j-tag>
</template> </template>
<template #other="{ data }"> <template #other="{ data }">
<j-tooltip <!-- <j-tooltip
v-if="target === 'device' && productNoEdit.id?.includes?.(data.record.id)" v-if="target === 'device' && productNoEdit.id?.includes?.(data.record.id)"
title="继承自产品物模型的数据不支持修改" title="继承自产品物模型的数据不支持修改"
> > -->
<!-- <ModelButton :disabled="true"/>--> <!-- <ModelButton :disabled="true"/>-->
<j-button :disabled="true" type="link" style="padding-left: 0;"> <!-- <j-button :disabled="true" type="link" style="padding-left: 0;">
<AIcon type="SettingOutlined" /> <AIcon type="SettingOutlined" />
配置 配置
</j-button> </j-button> -->
</j-tooltip> <!-- </j-tooltip> -->
<PermissionButton <PermissionButton
v-else
:has-permission="`${permission}:update`" :has-permission="`${permission}:update`"
type="link" type="link"
key="setting" key="setting"
:tooltip="target === 'device' && productNoEdit.id?.includes?.(data.record.id) ? {
title: '继承自产品物模型的数据不支持删除',
} : undefined"
> >
<OtherSetting <OtherSetting
v-model:value="data.record.expands" v-model:value="data.record.expands"
:id="data.record.id" :id="data.record.id"
:disabled="target === 'device' && productNoEdit.id?.includes?.(data.record.id)" :disabled="target === 'device' && productNoEdit.id?.includes?.(data.record.id)"
:record="data.record" :record="data.record"
:tooltip="target === 'device' && productNoEdit.id?.includes?.(data.record.id) ? {
title: '继承自产品物模型的数据不支持删除',
} : undefined"
:type="data.record.valueType.type" :type="data.record.valueType.type"
/> />
</PermissionButton> </PermissionButton>

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

@ -637,7 +637,7 @@ const handleImport = async () => {
data[data?.type === 'copy' ? 'copy' : 'import'] || data[data?.type === 'copy' ? 'copy' : 'import'] ||
'{}', '{}',
); );
if(data?.type === 'import'){ if(data?.type !== 'copy'){
Object.keys(_object).forEach((i:any)=>{ Object.keys(_object).forEach((i:any)=>{
const map = new Map() const map = new Map()
_object[i].forEach((item:any)=>( _object[i].forEach((item:any)=>(