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-09-20 16:38:21 +08:00
parent 47fc37fffe 1b4ebe5297
commit a9e25810f9
15 changed files with 148 additions and 99 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

84
src/views/device/Instance/Detail/EdgeMap/index.vue
View File

@ -210,6 +210,7 @@ import PatchMapping from './PatchMapping.vue';
import { onlyMessage } from '@/utils/comm'; import { onlyMessage } from '@/utils/comm';
import { cloneDeep } from 'lodash-es'; import { cloneDeep } from 'lodash-es';
import { usePermissionStore } from '@/store/permission'; import { usePermissionStore } from '@/store/permission';
import { dataTool } from 'echarts';
const columns = [ const columns = [
{ {
title: '名称', title: '名称',
@ -250,6 +251,7 @@ const columns = [
const permissionStore = usePermissionStore(); const permissionStore = usePermissionStore();
const data:any = ref([])
const isPermission = permissionStore.hasPermission('device/Instance:update'); const isPermission = permissionStore.hasPermission('device/Instance:update');
const current = ref<number>(1); const current = ref<number>(1);
@ -260,10 +262,11 @@ const metadata = JSON.parse(instanceStore.current?.metadata || '{}');
const loading = ref<boolean>(false); const loading = ref<boolean>(false);
const channelList = ref<any[]>([]); const channelList = ref<any[]>([]);
const _properties = computed(() => { // const _properties = computed(() => {
const _cur = current.value >= 1 ? current.value : 1; // const _cur = current.value >= 1 ? current.value : 1;
return metadata.properties?.slice((_cur - 1) * 10, _cur * 10) || []; // const _pageSize = pageSize.value
}); // return metadata.properties?.slice((_cur - 1) * _pageSize, _cur * _pageSize) || [];
// });
const modelRef = reactive<{ const modelRef = reactive<{
dataSource: any[]; dataSource: any[];
@ -287,14 +290,21 @@ const getChannel = async () => {
} }
}; };
const handleSearch = async (_array: any[]) => { const handleSearch = async () => {
loading.value = true; loading.value = true;
const _metadata: any[] = _array.map((item: any) => ({ const _metadataMap = new Map ()
metadataId: item.id, const _metadata: any[] = metadata.properties.map((item: any) => {
metadataName: `${item.name}(${item.id})`, const value = {
metadataType: 'property', metadataId: item.id,
name: item.name, metadataName: `${item.name}(${item.id})`,
})); metadataType: 'property',
name: item.name,
}
_metadataMap.set(item.id,value)
return value
});
if (_metadata && _metadata.length) { if (_metadata && _metadata.length) {
const resp: any = await getEdgeMap( const resp: any = await getEdgeMap(
instanceStore.current?.parentId || '', instanceStore.current?.parentId || '',
@ -307,32 +317,25 @@ const handleSearch = async (_array: any[]) => {
loading.value = false; loading.value = false;
}); });
if (resp.status === 200) { if (resp.status === 200) {
const array = _metadata.map((item: any) => { // const array = _metadata.map((item: any) => {
const metadataId = resp.result?.[0].find((x: any) => x.metadataId === item.metadataId); // const metadataId = resp.result?.[0].find((x: any) => x.metadataId === item.metadataId);
Object.assign(item, metadataId); // Object.assign(item, metadataId);
return item // return item
}) // })
resp.result?.[0].forEach((item:any)=>{ // resp.result?.[0].forEach((item: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)
}
})
// const array = resp.result?.[0].reduce((x: any, y: any) => {
// const metadataId = _metadata.find(
// (item: any) => item.metadataId === y.metadataId,
// );
// if (metadataId) {
// Object.assign(metadataId, y);
// } else {
// x.push(y);
// } // }
// return x; // })
// }, _metadata);
console.log(array) resp.result?.[0].forEach((item:any)=>{
modelRef.dataSource = array; _metadataMap.has(item.metadataId) ? _metadataMap.set(item.metadataId,Object.assign(_metadataMap.get(item.metadataId),item)) : _metadataMap.set(item.metadataId,item)
})
data.value = [..._metadataMap.values()]
onPageChange()
} }
} }
loading.value = false; loading.value = false;
@ -350,7 +353,7 @@ const unbind = async (id: string) => {
); );
if (resp.status === 200) { if (resp.status === 200) {
onlyMessage('操作成功！', 'success'); onlyMessage('操作成功！', 'success');
handleSearch(_properties.value); handleSearch();
} }
} }
}; };
@ -371,11 +374,14 @@ const onChannelChange = (_index: number, type: 'collector' | 'channel') => {
onMounted(() => { onMounted(() => {
getChannel(); getChannel();
handleSearch(_properties.value); handleSearch();
}); });
const onPageChange = () => { const onPageChange = () => {
handleSearch(_properties.value); const _cur = current.value >= 1 ? current.value : 1;
const _pageSize = pageSize.value
const array = data.value.slice((_cur - 1) * _pageSize, _cur * _pageSize) || [];
modelRef.dataSource = array;
}; };
const onSave = () => { const onSave = () => {

20
src/views/device/Instance/Detail/Info/components/Config/index.vue
View File

@ -67,9 +67,27 @@
" "
>******</span >******</span
> >
<span v-else-if="item.type.type === 'enum'">
<Ellipsis>{{
item.type.elements?.find((i)=>
i.value === instanceStore.current?.configuration?.[
item.property
]
)?.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] || instanceStore.current?.configuration?.[item.property] ||
'' ''
}}</Ellipsis> }}</Ellipsis>
<j-tooltip <j-tooltip

9
src/views/device/Instance/Detail/components/EditTable/PatchMapping.vue
View File

@ -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);

6
src/views/device/Product/index.vue
View File

@ -399,11 +399,9 @@ const beforeUpload = (file: any) => {
onlyMessage('文件内容不能为空','error') onlyMessage('文件内容不能为空','error')
return false; return false;
} }
try {
const data = JSON.parse(text); const data = JSON.parse(text);
// 设置导入的产品状态为未发布 // 设置导入的产品状态为未发布
data.state = 0; data.state = 0;
if (Array.isArray(data)) { if (Array.isArray(data)) {
onlyMessage('请上传正确格式文件', 'error'); onlyMessage('请上传正确格式文件', 'error');
return false; return false;
@ -418,10 +416,6 @@ const beforeUpload = (file: any) => {
tableRef.value?.reload(); tableRef.value?.reload();
} }
return true; return true;
} catch(e) {
onlyMessage('请上传正确格式文件', 'error');
}
return true;
}; };
return false; return false;
}; };

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

@ -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: '保存',

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

@ -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

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

@ -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('操作成功！')
} }

2
src/views/edge/Device/index.vue
View File

@ -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,

2
src/views/home/components/BootCardSmall.vue
View File

@ -17,7 +17,7 @@
</div> </div>
</div> </div>
<div class="right-bj"> <div class="right-bj">
<img :src="`/images/home/home-${index + 1}.png`" alt="" /> <img :src="`/images/home/${index + 1}.png`" alt="" />
</div> </div>
</div> </div>
</div> </div>

11
src/views/iframe/index.vue
View File

@ -1,19 +1,23 @@
<template> <template>
<page-container> <page-container>
<full-page>
<iframe <iframe
v-if="loading" v-if="loading"
:src="iframeUrl" :src="iframeUrl"
scrolling="no"
frameBorder="0" frameBorder="0"
style="width: 100%; height: calc(100vh - 140px)" style="width: 100%; height: 100%"
></iframe> ></iframe>
</full-page>
</page-container> </page-container>
</template> </template>
<script setup lang="ts"> <script lang="ts" name="IframgePage" setup>
import { TOKEN_KEY } from '@/utils/variable'; import { TOKEN_KEY } from '@/utils/variable';
import { LocalStore, getToken } from '@/utils/comm'; import { LocalStore, getToken } from '@/utils/comm';
import { getAppInfo_api } from '@/api/system/apply'; import { getAppInfo_api } from '@/api/system/apply';
import { lowCodeUrl } from '@/api/comm' import { lowCodeUrl } from '@/api/comm'
import FullPage from "components/Layout/FullPage.vue";
const iframeUrl = ref<string>(''); const iframeUrl = ref<string>('');
const route = useRoute() const route = useRoute()
@ -42,9 +46,12 @@ const handle = async (appId: string, url: string) => {
const lowCode = () => { const lowCode = () => {
lowCodeUrl().then(res => { lowCodeUrl().then(res => {
console.log(res.success && res.result)
if (res.success && res.result) { if (res.success && res.result) {
const url = res.result['ui-addr'] const url = res.result['ui-addr']
iframeUrl.value = url + '/#' + route.path + '?&token=' + getToken() iframeUrl.value = url + '/#' + route.path + '?&token=' + getToken()
console.log(iframeUrl.value)
loading.value = true
} }
}) })
} }

1
src/views/link/AccessConfig/components/Network/index.vue
View File

@ -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>
新增 新增

20
src/views/media/Device/Save/index.vue
View File

@ -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);
}) })

74
src/views/system/DataSource/Management/index.vue
View File

@ -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">
@ -93,6 +95,7 @@
]" ]"
> >
<j-input <j-input
:disabled="record.old_id"
v-model:value="record.type" v-model:value="record.type"
placeholder="请输入类型" placeholder="请输入类型"
/> />
@ -507,7 +510,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{
height: 680px;
overflow-y: auto;
}
} }
.right { .right {
width: calc(100% - 280px); width: calc(100% - 280px);

7
src/views/system/NoticeRule/components/Save/components/NotifyWay.vue
View File

@ -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;

1
vite.config.ts
View File

@ -98,6 +98,7 @@ export default defineConfig(({ mode}) => {
// 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', // 本地开发环境
// target: 'http://192.168.32.5:8848', // 刘本地 // target: 'http://192.168.32.5:8848', // 刘本地
// target: 'http://192.168.32.187: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/, '')