From d58353a9399f70471882a000a7a6c02ec54864eb Mon Sep 17 00:00:00 2001
From: XieYongHong <18010623010@163.com>
Date: Fri, 14 Jul 2023 16:43:49 +0800
Subject: [PATCH] fix: bug#16382

---
 src/components/FRuleEditor/Debug/index.vue    | 29 ++++++++++---------
 .../device/components/Metadata/Base/Base.vue  |  2 +-
 .../Base/components/VirtualRule/index.vue     |  1 +
 .../AccessConfig/components/Media/GB28181.vue |  5 +++-
 src/views/link/Protocol/Save/FileUpload.vue   |  5 ++--
 yarn.lock                                     |  4 +--
 6 files changed, 27 insertions(+), 19 deletions(-)

diff --git a/src/components/FRuleEditor/Debug/index.vue b/src/components/FRuleEditor/Debug/index.vue
index 2d34ec3b..00d9ce2c 100644
--- a/src/components/FRuleEditor/Debug/index.vue
+++ b/src/components/FRuleEditor/Debug/index.vue
@@ -129,7 +129,7 @@ const property = ref<propertyType[]>([]);
 
 const columns = [
     {
-        title: '属性ID',
+        title: '属性名称',
         dataIndex: 'id',
         key: 'id',
     },
@@ -251,19 +251,22 @@ onUnmounted(() => {
     clearAction();
 });
 
-const options = ref<{ text: string; value: string }[]>([]);
+const options = computed(() => {
+  return (medataSource.value || [])
+      .filter((p) => p.id !== props.id)
+      .map((item) => ({
+        text: item.name,
+        value: item.id,
+      }));
+})
 
-const getProperty = () => {
-    // const metadata = productStore.current.metadata || '{}';
-    // const _p: PropertyMetadata[] = JSON.parse(metadata).properties || [];
-    options.value = (medataSource.value || [])
-        .filter((p) => p.id !== props.id)
-        .map((item) => ({
-            text: item.name,
-            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>
 <style lang="less" scoped>
 .debug-container {
diff --git a/src/views/device/components/Metadata/Base/Base.vue b/src/views/device/components/Metadata/Base/Base.vue
index 6f201eb1..463b10e1 100644
--- a/src/views/device/components/Metadata/Base/Base.vue
+++ b/src/views/device/components/Metadata/Base/Base.vue
@@ -250,7 +250,7 @@ const detailData = reactive({
 const showSave = ref(metadata.value.length !== 0)
 
 const showLastDelete = ref(false)
-const dataSourceCache = ref<any[]>([])
+const dataSourceCache = ref<any[]>(metadata.value)
 
 provide('_dataSource', dataSourceCache)
 
diff --git a/src/views/device/components/Metadata/Base/components/VirtualRule/index.vue b/src/views/device/components/Metadata/Base/components/VirtualRule/index.vue
index 52aab1ad..e5f96596 100644
--- a/src/views/device/components/Metadata/Base/components/VirtualRule/index.vue
+++ b/src/views/device/components/Metadata/Base/components/VirtualRule/index.vue
@@ -249,6 +249,7 @@ const typeOptions = computed(() => {
 });
 
 const options = computed(() => {
+  console.log('virtualRule',dataSource?.value)
     return (dataSource?.value || []).filter((item: any) => item?.id !== props.value?.id);
 });
 
diff --git a/src/views/link/AccessConfig/components/Media/GB28181.vue b/src/views/link/AccessConfig/components/Media/GB28181.vue
index e5d0c744..5d09c24a 100644
--- a/src/views/link/AccessConfig/components/Media/GB28181.vue
+++ b/src/views/link/AccessConfig/components/Media/GB28181.vue
@@ -153,11 +153,14 @@
                                         },
                                     ]"
                                 >
-                                    <j-input
+                                    <j-input-number
                                         style="width: 105%"
                                         v-model:value="
                                             formState.hostPort.publicHost
                                         "
+                                        :max="65535"
+                                        :min="1"
+                                        :precision="0"
                                         placeholder="请输入IP地址"
                                     />
                                 </j-form-item>
diff --git a/src/views/link/Protocol/Save/FileUpload.vue b/src/views/link/Protocol/Save/FileUpload.vue
index cd6b7d32..90114088 100644
--- a/src/views/link/Protocol/Save/FileUpload.vue
+++ b/src/views/link/Protocol/Save/FileUpload.vue
@@ -17,7 +17,7 @@
             @change="handleChange"
             :showUploadList="false"
             class="upload-box"
-            :before-upload="beforeUpload"
+            :beforeUpload="beforeUpload"
         >
             <j-button type="primary">上传jar包</j-button>
         </j-upload>
@@ -53,12 +53,13 @@ const beforeUpload: UploadProps['beforeUpload'] = (file) => {
     const arr = file.name.split('.');
     const isFile = ['jar', 'zip'].includes(arr[arr.length - 1]); // file.type === 'application/zip' || file.type === 'application/javj-archive'
     if (!isFile) {
-        onlyMessage('请上传.zip.jar格式的文件', 'error');
         loading.value = false;
+        onlyMessage('请上传.zip.jar格式的文件', 'error');
     }
     return isFile;
 };
 const handleChange = async (info: UploadChangeParam) => {
+  if (!info.file.status) return
     loading.value = true;
     if (info.file.status === 'done') {
         loading.value = false;
diff --git a/yarn.lock b/yarn.lock
index fa4a1c87..c653147c 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3837,8 +3837,8 @@ jetlinks-ui-components@^1.0.23:
 
 jetlinks-ui-components@^1.0.24:
   version "1.0.24"
-  resolved "http://registry.jetlinks.cn/jetlinks-ui-components/-/jetlinks-ui-components-1.0.24.tgz#c912a709e666fd088d66a19bbc9cb0e9dc618355"
-  integrity sha512-NTnPoAhmvT4/C+uapN/W5R9CFe3YTs3mYN9ZA7wi8ShzQHovhoJFihaOv7WWXwhcqCFPS4EjViJ1S5HPP2P2Cw==
+  resolved "http://registry.jetlinks.cn/jetlinks-ui-components/-/jetlinks-ui-components-1.0.24.tgz#0bd3caf482367d46974244558519dfa7919baf1f"
+  integrity sha512-bXJZUWU27kDpnvhR+zKtUZQjrq+S130abBD2D37PnbHeUtT8g/i1CRV8Qnp1SMzk7aRDH9glVSjbzIQxem3YMQ==
   dependencies:
     "@vueuse/core" "^9.12.0"
     "@vueuse/router" "^9.13.0"