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

fix: bug#16382

This commit is contained in:
XieYongHong 2023-07-14 16:43:49 +08:00
parent 6dd7f7e387
commit d58353a939
6 changed files with 27 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/components/FRuleEditor/Debug/index.vue
View File

@ -129,7 +129,7 @@ const property = ref<propertyType[]>([]);
const columns = [ const columns = [
{ {
title: '属性ID', title: '属性名称',
dataIndex: 'id', dataIndex: 'id',
key: 'id', key: 'id',
}, },
@ -251,19 +251,22 @@ onUnmounted(() => {
clearAction(); clearAction();
}); });
const options = ref<{ text: string; value: string }[]>([]); const options = computed(() => {
return (medataSource.value || [])
const getProperty = () => {
// const metadata = productStore.current.metadata || '{}';
// const _p: PropertyMetadata[] = JSON.parse(metadata).properties || [];
options.value = (medataSource.value || [])
.filter((p) => p.id !== props.id) .filter((p) => p.id !== props.id)
.map((item) => ({ .map((item) => ({
text: item.name, text: item.name,
value: item.id, value: item.id,
})); }));
}; })
getProperty();
// const getProperty = () => {
// // const metadata = productStore.current.metadata || '{}';
// // const _p: PropertyMetadata[] = JSON.parse(metadata).properties || [];
// console.log(medataSource.value)
// options.value =
// };
// getProperty();
</script> </script>
<style lang="less" scoped> <style lang="less" scoped>
.debug-container { .debug-container {

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

@ -250,7 +250,7 @@ const detailData = reactive({
const showSave = ref(metadata.value.length !== 0) const showSave = ref(metadata.value.length !== 0)
const showLastDelete = ref(false) const showLastDelete = ref(false)
const dataSourceCache = ref<any[]>([]) const dataSourceCache = ref<any[]>(metadata.value)
provide('_dataSource', dataSourceCache) provide('_dataSource', dataSourceCache)

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

@ -249,6 +249,7 @@ const typeOptions = computed(() => {
}); });
const options = computed(() => { const options = computed(() => {
console.log('virtualRule',dataSource?.value)
return (dataSource?.value || []).filter((item: any) => item?.id !== props.value?.id); return (dataSource?.value || []).filter((item: any) => item?.id !== props.value?.id);
}); });

5
src/views/link/AccessConfig/components/Media/GB28181.vue
View File

@ -153,11 +153,14 @@
}, },
]" ]"
> >
<j-input <j-input-number
style="width: 105%" style="width: 105%"
v-model:value=" v-model:value="
formState.hostPort.publicHost formState.hostPort.publicHost
" "
:max="65535"
:min="1"
:precision="0"
placeholder="请输入IP地址" placeholder="请输入IP地址"
/> />
</j-form-item> </j-form-item>

5
src/views/link/Protocol/Save/FileUpload.vue
View File

@ -17,7 +17,7 @@
@change="handleChange" @change="handleChange"
:showUploadList="false" :showUploadList="false"
class="upload-box" class="upload-box"
:before-upload="beforeUpload" :beforeUpload="beforeUpload"
> >
<j-button type="primary">上传jar包</j-button> <j-button type="primary">上传jar包</j-button>
</j-upload> </j-upload>
@ -53,12 +53,13 @@ const beforeUpload: UploadProps['beforeUpload'] = (file) => {
const arr = file.name.split('.'); const arr = file.name.split('.');
const isFile = ['jar', 'zip'].includes(arr[arr.length - 1]); // file.type === 'application/zip' || file.type === 'application/javj-archive' const isFile = ['jar', 'zip'].includes(arr[arr.length - 1]); // file.type === 'application/zip' || file.type === 'application/javj-archive'
if (!isFile) { if (!isFile) {
onlyMessage('请上传.zip.jar格式的文件', 'error');
loading.value = false; loading.value = false;
onlyMessage('请上传.zip.jar格式的文件', 'error');
} }
return isFile; return isFile;
}; };
const handleChange = async (info: UploadChangeParam) => { const handleChange = async (info: UploadChangeParam) => {
if (!info.file.status) return
loading.value = true; loading.value = true;
if (info.file.status === 'done') { if (info.file.status === 'done') {
loading.value = false; loading.value = false;

4
yarn.lock
View File

@ -3837,8 +3837,8 @@ jetlinks-ui-components@^1.0.23:
jetlinks-ui-components@^1.0.24: jetlinks-ui-components@^1.0.24:
version "1.0.24" version "1.0.24"
resolved "http://registry.jetlinks.cn/jetlinks-ui-components/-/jetlinks-ui-components-1.0.24.tgz#c912a709e666fd088d66a19bbc9cb0e9dc618355" resolved "http://registry.jetlinks.cn/jetlinks-ui-components/-/jetlinks-ui-components-1.0.24.tgz#0bd3caf482367d46974244558519dfa7919baf1f"
integrity sha512-NTnPoAhmvT4/C+uapN/W5R9CFe3YTs3mYN9ZA7wi8ShzQHovhoJFihaOv7WWXwhcqCFPS4EjViJ1S5HPP2P2Cw== integrity sha512-bXJZUWU27kDpnvhR+zKtUZQjrq+S130abBD2D37PnbHeUtT8g/i1CRV8Qnp1SMzk7aRDH9glVSjbzIQxem3YMQ==
dependencies: dependencies:
"@vueuse/core" "^9.12.0" "@vueuse/core" "^9.12.0"
"@vueuse/router" "^9.13.0" "@vueuse/router" "^9.13.0"