Merge branch 'dev' into dev-dictionary
This commit is contained in:
commit
0bfe7efc43
|
@ -316,7 +316,7 @@ const handleSearch = async (_array: any[]) => {
|
||||||
const differ = array.every((i:any)=>{
|
const differ = array.every((i:any)=>{
|
||||||
return item.metadataId !== i.metadataId
|
return item.metadataId !== i.metadataId
|
||||||
})
|
})
|
||||||
if(!differ){
|
if(differ){
|
||||||
array.push(item)
|
array.push(item)
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
|
|
@ -67,10 +67,31 @@
|
||||||
"
|
"
|
||||||
>******</span
|
>******</span
|
||||||
>
|
>
|
||||||
|
<span v-else-if="item.type.type === 'enum'">
|
||||||
|
<Ellipsis>{{
|
||||||
|
item.type.elements?.filter((i)=>
|
||||||
|
i.value === instanceStore.current?.configuration?.[
|
||||||
|
item.property
|
||||||
|
]
|
||||||
|
)[0].text
|
||||||
|
}}</Ellipsis>
|
||||||
|
<j-tooltip
|
||||||
|
v-if="isExit(item.property)"
|
||||||
|
:title="`有效值:${
|
||||||
|
instanceStore.current?.configuration?.[
|
||||||
|
item.property
|
||||||
|
]
|
||||||
|
}`"
|
||||||
|
><AIcon type="QuestionCircleOutlined"
|
||||||
|
/></j-tooltip>
|
||||||
|
</span>
|
||||||
<span v-else>
|
<span v-else>
|
||||||
<Ellipsis>{{
|
<Ellipsis>{{
|
||||||
instanceStore.current?.configuration?.[item.property] ||
|
item.type.elements?.filter((i)=>
|
||||||
''
|
i.value === instanceStore.current?.configuration?.[
|
||||||
|
item.property
|
||||||
|
]
|
||||||
|
)[0].text
|
||||||
}}</Ellipsis>
|
}}</Ellipsis>
|
||||||
<j-tooltip
|
<j-tooltip
|
||||||
v-if="isExit(item.property)"
|
v-if="isExit(item.property)"
|
||||||
|
|
|
@ -82,17 +82,18 @@ const rightList = ref<any[]>([]);
|
||||||
const dataSource = ref<any[]>([]);
|
const dataSource = ref<any[]>([]);
|
||||||
const loading = ref<boolean>(false);
|
const loading = ref<boolean>(false);
|
||||||
|
|
||||||
const handleData = (data: any[], type: string) => {
|
const handleData = (data: any[], type: string,provider?:string) => {
|
||||||
data.forEach((item) => {
|
data.forEach((item) => {
|
||||||
item.key = item.id;
|
item.key = item.id;
|
||||||
item.title = item.name;
|
item.title = item.name;
|
||||||
item.checkable = type === 'collectors';
|
item.checkable = type === 'collectors';
|
||||||
|
provider ? item.provider = provider : ''
|
||||||
if (
|
if (
|
||||||
item.collectors &&
|
item.collectors &&
|
||||||
Array.isArray(item.collectors) &&
|
Array.isArray(item.collectors) &&
|
||||||
item.collectors.length
|
item.collectors.length
|
||||||
) {
|
) {
|
||||||
item.children = handleData(item.collectors, 'collectors');
|
item.children = handleData(item.collectors, 'collectors',item.provider);
|
||||||
}
|
}
|
||||||
if (item.points && Array.isArray(item.points) && item.points.length) {
|
if (item.points && Array.isArray(item.points) && item.points.length) {
|
||||||
item.children = handleData(item.points, 'points');
|
item.children = handleData(item.points, 'points');
|
||||||
|
@ -134,6 +135,7 @@ const _delete = (_key: string) => {
|
||||||
};
|
};
|
||||||
|
|
||||||
const handleClick = async () => {
|
const handleClick = async () => {
|
||||||
|
|
||||||
if (!rightList.value.length) {
|
if (!rightList.value.length) {
|
||||||
onlyMessage('请选择采集器', 'warning');
|
onlyMessage('请选择采集器', 'warning');
|
||||||
} else {
|
} else {
|
||||||
|
@ -146,10 +148,11 @@ const handleClick = async () => {
|
||||||
metadataType: 'property',
|
metadataType: 'property',
|
||||||
metadataId: (_props.metaData as any[]).find((i: any) => i.name === element.name)
|
metadataId: (_props.metaData as any[]).find((i: any) => i.name === element.name)
|
||||||
?.metadataId,
|
?.metadataId,
|
||||||
provider: _props.type
|
provider: item.provider
|
||||||
}));
|
}));
|
||||||
params.push(...array);
|
params.push(...array);
|
||||||
});
|
});
|
||||||
|
|
||||||
const filterParms = params.filter((item) => !!item.metadataId);
|
const filterParms = params.filter((item) => !!item.metadataId);
|
||||||
if (filterParms && filterParms.length !== 0) {
|
if (filterParms && filterParms.length !== 0) {
|
||||||
const res = await saveMapping(_props.deviceId, _props.type, filterParms);
|
const res = await saveMapping(_props.deviceId, _props.type, filterParms);
|
||||||
|
|
|
@ -247,6 +247,7 @@ import type {
|
||||||
ProductItem,
|
ProductItem,
|
||||||
} from '@/views/device/Product/typings';
|
} from '@/views/device/Product/typings';
|
||||||
import type { PropType } from 'vue';
|
import type { PropType } from 'vue';
|
||||||
|
import { TOKEN_KEY } from '@/utils/variable'
|
||||||
import {useRouter, onBeforeRouteUpdate} from 'vue-router'
|
import {useRouter, onBeforeRouteUpdate} from 'vue-router'
|
||||||
import { useMetadata, useOperateLimits } from './hooks';
|
import { useMetadata, useOperateLimits } from './hooks';
|
||||||
import {TypeStringMap, useColumns} from './columns';
|
import {TypeStringMap, useColumns} from './columns';
|
||||||
|
@ -259,7 +260,7 @@ import { useProductStore } from '@/store/product';
|
||||||
import { asyncUpdateMetadata, updateMetadata } from '../metadata';
|
import { asyncUpdateMetadata, updateMetadata } from '../metadata';
|
||||||
import { useMetadataStore } from '@/store/metadata';
|
import { useMetadataStore } from '@/store/metadata';
|
||||||
import { DeviceInstance } from '@/views/device/Instance/typings';
|
import { DeviceInstance } from '@/views/device/Instance/typings';
|
||||||
import { onlyMessage } from '@/utils/comm';
|
import { onlyMessage , LocalStore} from '@/utils/comm';
|
||||||
import {omit} from "lodash-es";
|
import {omit} from "lodash-es";
|
||||||
import { PropertiesModal, FunctionModal, EventModal, TagsModal } from './DetailModal'
|
import { PropertiesModal, FunctionModal, EventModal, TagsModal } from './DetailModal'
|
||||||
import { Modal } from 'jetlinks-ui-components'
|
import { Modal } from 'jetlinks-ui-components'
|
||||||
|
@ -510,7 +511,7 @@ const handleSaveClick = async (next?: Function) => {
|
||||||
const tabsChange = inject('tabsChange')
|
const tabsChange = inject('tabsChange')
|
||||||
|
|
||||||
const parentTabsChange = (next?: Function) => {
|
const parentTabsChange = (next?: Function) => {
|
||||||
if (editStatus.value && permissionStore.hasPermission(`${props.permission}:update`)) {
|
if (editStatus.value && permissionStore.hasPermission(`${props.permission}:update`) && LocalStore.get(TOKEN_KEY)) {
|
||||||
const modal = Modal.confirm({
|
const modal = Modal.confirm({
|
||||||
content: '页面改动数据未保存',
|
content: '页面改动数据未保存',
|
||||||
okText: '保存',
|
okText: '保存',
|
||||||
|
|
|
@ -85,8 +85,9 @@ export const handleTypeValue = (type:string, value: any = {}) => {
|
||||||
obj.format = value
|
obj.format = value
|
||||||
break;
|
break;
|
||||||
case 'string':
|
case 'string':
|
||||||
|
obj.maxLength = JSON.stringify(value) === '{}' ? undefined : value
|
||||||
case 'password':
|
case 'password':
|
||||||
obj.maxLength = value
|
obj.maxLength = JSON.stringify(value) === '{}' ? undefined : value
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
obj = value
|
obj = value
|
||||||
|
|
|
@ -236,7 +236,7 @@ const confirm = async () => {
|
||||||
// }
|
// }
|
||||||
// }
|
// }
|
||||||
const resetRules = async() =>{
|
const resetRules = async() =>{
|
||||||
let res:any = await resetRule(instanceStore.current?.productId,instanceStore.current?.id,props.value?.id)
|
let res:any = await resetRule(instanceStore.current?.productId,instanceStore.current?.id,[props.value?.id])
|
||||||
if(res.status === 200){
|
if(res.status === 200){
|
||||||
onlyMessage('操作成功!')
|
onlyMessage('操作成功!')
|
||||||
}
|
}
|
||||||
|
|
|
@ -101,7 +101,7 @@
|
||||||
:key="i"
|
:key="i"
|
||||||
>
|
>
|
||||||
<PermissionButton
|
<PermissionButton
|
||||||
:disabled="o.disabled || item.state !== 'online'"
|
:disabled="o.disabled || slotProps.state.value !== 'online'"
|
||||||
:popConfirm="o.popConfirm"
|
:popConfirm="o.popConfirm"
|
||||||
:tooltip="{
|
:tooltip="{
|
||||||
...o.tooltip,
|
...o.tooltip,
|
||||||
|
|
|
@ -100,6 +100,7 @@
|
||||||
type="primary"
|
type="primary"
|
||||||
@click="addProcotol"
|
@click="addProcotol"
|
||||||
hasPermission="link/Protocol:add"
|
hasPermission="link/Protocol:add"
|
||||||
|
:disabled="id !== ':id'"
|
||||||
>
|
>
|
||||||
<template #icon><AIcon type="PlusOutlined" /></template>
|
<template #icon><AIcon type="PlusOutlined" /></template>
|
||||||
新增
|
新增
|
||||||
|
|
|
@ -426,20 +426,24 @@ const handleSubmit = () => {
|
||||||
formRef.value
|
formRef.value
|
||||||
?.validate()
|
?.validate()
|
||||||
.then(async () => {
|
.then(async () => {
|
||||||
const resq:any = await DeviceApi.validateId(id)
|
|
||||||
if(resq.status === 200 && resq?.result?.passed){
|
|
||||||
btnLoading.value = true;
|
btnLoading.value = true;
|
||||||
const res = !route.query.id
|
let res;
|
||||||
? await DeviceApi.save(params)
|
if(!route.query.id){
|
||||||
: await DeviceApi.update(params);
|
const resp:any = await DeviceApi.validateId(id)
|
||||||
|
if(resp.status === 200 && resp?.result?.passed){
|
||||||
|
res = await DeviceApi.save(params)
|
||||||
|
}else{
|
||||||
|
notification.error({ key: 'error', message: '设备ID已重复'})
|
||||||
|
}
|
||||||
|
}else{
|
||||||
|
res = await DeviceApi.update(params);
|
||||||
|
}
|
||||||
if (res?.success) {
|
if (res?.success) {
|
||||||
onlyMessage('保存成功');
|
onlyMessage('保存成功');
|
||||||
history.back();
|
history.back();
|
||||||
}
|
}
|
||||||
}else{
|
|
||||||
notification.error({ key: 'error', message: '设备ID已重复'})
|
|
||||||
}
|
}
|
||||||
})
|
)
|
||||||
.catch((err: any) => {
|
.catch((err: any) => {
|
||||||
console.log('err: ', err);
|
console.log('err: ', err);
|
||||||
})
|
})
|
||||||
|
|
|
@ -9,41 +9,43 @@
|
||||||
style="margin-bottom: 24px"
|
style="margin-bottom: 24px"
|
||||||
/>
|
/>
|
||||||
<!-- 使用v-if用于解决异步加载数据后不展开的问题 -->
|
<!-- 使用v-if用于解决异步加载数据后不展开的问题 -->
|
||||||
<j-tree
|
<div class="tree">
|
||||||
v-if="leftData.treeData.length > 0"
|
<j-tree
|
||||||
defaultExpandAll
|
v-if="leftData.treeData.length > 0"
|
||||||
:tree-data="leftData.treeData"
|
defaultExpandAll
|
||||||
v-model:selectedKeys="leftData.selectedKeys"
|
:tree-data="leftData.treeData"
|
||||||
@select="onSelect"
|
v-model:selectedKeys="leftData.selectedKeys"
|
||||||
:showLine="{ showLeafIcon: false }"
|
@select="onSelect"
|
||||||
:show-icon="true"
|
:showLine="{ showLeafIcon: false }"
|
||||||
>
|
:show-icon="true"
|
||||||
<template #title="{ dataRef }">
|
>
|
||||||
<Ellipsis>
|
<template #title="{ dataRef }">
|
||||||
<div
|
<Ellipsis>
|
||||||
v-if="dataRef.root"
|
<div
|
||||||
style="
|
v-if="dataRef.root"
|
||||||
justify-content: space-between;
|
style="
|
||||||
display: flex;
|
justify-content: space-between;
|
||||||
align-items: center;
|
display: flex;
|
||||||
width: 200px;
|
align-items: center;
|
||||||
"
|
width: 200px;
|
||||||
>
|
"
|
||||||
<span>
|
>
|
||||||
|
<span>
|
||||||
|
{{ dataRef.title }}
|
||||||
|
</span>
|
||||||
|
<AIcon
|
||||||
|
type="PlusOutlined"
|
||||||
|
style="color: #1d39c4"
|
||||||
|
@click="addTable"
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
<span v-else>
|
||||||
{{ dataRef.title }}
|
{{ dataRef.title }}
|
||||||
</span>
|
</span>
|
||||||
<AIcon
|
</Ellipsis>
|
||||||
type="PlusOutlined"
|
</template>
|
||||||
style="color: #1d39c4"
|
</j-tree>
|
||||||
@click="addTable"
|
</div>
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
<span v-else>
|
|
||||||
{{ dataRef.title }}
|
|
||||||
</span>
|
|
||||||
</Ellipsis>
|
|
||||||
</template>
|
|
||||||
</j-tree>
|
|
||||||
</div>
|
</div>
|
||||||
<div class="right">
|
<div class="right">
|
||||||
<div class="btns">
|
<div class="btns">
|
||||||
|
@ -507,7 +509,10 @@ const checkName = (_: any, value: any) =>
|
||||||
box-sizing: border-box;
|
box-sizing: border-box;
|
||||||
width:300px;
|
width:300px;
|
||||||
height:100%;
|
height:100%;
|
||||||
overflow-y: auto;
|
.tree{
|
||||||
|
max-height: 680px;
|
||||||
|
overflow-y: auto;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
.right {
|
.right {
|
||||||
width: calc(100% - 280px);
|
width: calc(100% - 280px);
|
||||||
|
|
|
@ -73,6 +73,13 @@ onMounted(() => {
|
||||||
emit('update:value', options.value?.[0]?.value);
|
emit('update:value', options.value?.[0]?.value);
|
||||||
emit('update:name', options.value?.[0]?.label);
|
emit('update:name', options.value?.[0]?.label);
|
||||||
emit('change', {label: options.value?.[0]?.label, value: options.value?.[0]?.value});
|
emit('change', {label: options.value?.[0]?.label, value: options.value?.[0]?.value});
|
||||||
|
}else{
|
||||||
|
options.value.find((item:any)=>{
|
||||||
|
if(item.value === props.value){
|
||||||
|
emit('update:name',item.label)
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
})
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
loading.value = false;
|
loading.value = false;
|
||||||
|
|
Loading…
Reference in New Issue