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

Merge branch 'dev-dictionary' of github.com:jetlinks/jetlinks-ui-vue into dev-dictionary

This commit is contained in:
leiqiaochu 2023-10-17 15:29:13 +08:00
parent c0bb93b2f7 18433ef6e3
commit 329ec037d2
4 changed files with 16 additions and 18 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="继承自产品物模型的数据不支持修改"
>
<!-- <ModelButton :disabled="true"/>-->
<j-button :disabled="true" type="link" style="padding-left: 0;">
<AIcon type="SettingOutlined" />
配置
</j-button>
<j-button :disabled="true" type="link" >
<AIcon type="SettingOutlined" />
配置
</j-button>
</j-tooltip>
<PermissionButton
v-else
@ -93,7 +94,7 @@
title="继承自产品物模型的数据不支持修改"
>
<!-- <ModelButton :disabled="true"/>-->
<j-button :disabled="true" type="link" style="padding-left: 0;">
<j-button :disabled="true" type="link">
<AIcon type="SettingOutlined" />
配置
</j-button>
@ -116,30 +117,29 @@
</j-tag>
</template>
<template #other="{ data }">
<j-tooltip
<!-- <j-tooltip
v-if="target === 'device' && productNoEdit.id?.includes?.(data.record.id)"
title="继承自产品物模型的数据不支持修改"
>
> -->
<!-- <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" />
配置
</j-button>
</j-tooltip>
</j-button> -->
<!-- </j-tooltip> -->
<PermissionButton
v-else
:has-permission="`${permission}:update`"
type="link"
key="setting"
:tooltip="target === 'device' && productNoEdit.id?.includes?.(data.record.id) ? {
title: '继承自产品物模型的数据不支持删除',
} : undefined"
>
<OtherSetting
v-model:value="data.record.expands"
:id="data.record.id"
:disabled="target === 'device' && productNoEdit.id?.includes?.(data.record.id)"
:record="data.record"
:tooltip="target === 'device' && productNoEdit.id?.includes?.(data.record.id) ? {
title: '继承自产品物模型的数据不支持删除',
} : undefined"
:type="data.record.valueType.type"
/>
</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'] ||
'{}',
);
if(data?.type === 'import'){
if(data?.type !== 'copy'){
Object.keys(_object).forEach((i:any)=>{
const map = new Map()
_object[i].forEach((item:any)=>(

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

@ -319,7 +319,6 @@
</j-button>
</div>
</FullPage>
<Relation></Relation>
</page-container>
</template>
@ -333,7 +332,6 @@ import { save_api } from '@/api/system/basis';
import { usePermissionStore } from '@/store/permission';
import { useSystem } from '@/store/system';
import { settingDetail } from '@/api/login';
import Relation from '@/components/Relation/index.vue'
const action = `${BASE_API_PATH}/file/static`;
const headers = { [TOKEN_KEY]: LocalStore.get(TOKEN_KEY) };
const formRef = ref();