From daaf4bec20a51ad16a26c398c88d921c23a6583d Mon Sep 17 00:00:00 2001
From: XieYongHong <18010623010@163.com>
Date: Tue, 1 Aug 2023 18:13:07 +0800
Subject: [PATCH] fix: bug#16963
---
src/components/Metadata/JsonParam/index.vue | 2 +-
src/components/Metadata/MetricsParam/index.vue | 2 +-
src/views/device/components/Metadata/Base/Edit/BaseForm.vue | 2 +-
src/views/device/components/Metadata/Base/columns.tsx | 2 +-
.../components/Metadata/Base/components/ConfigModal.vue | 2 +-
.../device/components/Metadata/Base/components/DataType.vue | 2 +-
.../Metadata/Base/components/Events/ConfigParams.vue | 2 +-
.../Metadata/Base/components/Function/InputParams.vue | 2 +-
.../Metadata/Base/components/Function/OutputParams.vue | 2 +-
.../Metadata/Base/components/Properties/Metrics/Metrics.vue | 2 +-
vite.config.ts | 4 ++--
yarn.lock | 4 ++--
12 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/src/components/Metadata/JsonParam/index.vue b/src/components/Metadata/JsonParam/index.vue
index c1b901d9..ade586ca 100644
--- a/src/components/Metadata/JsonParam/index.vue
+++ b/src/components/Metadata/JsonParam/index.vue
@@ -19,7 +19,7 @@
{ max: 64, message: '最多可输入64个字符' },
{
pattern: /^[a-zA-Z0-9_\-]+$/,
- message: 'ID只能由数字、字母、下划线、中划线组成',
+ message: '标识只能由数字、字母、下划线、中划线组成',
},
]">
diff --git a/src/components/Metadata/MetricsParam/index.vue b/src/components/Metadata/MetricsParam/index.vue
index 5391cd3f..8093b2a2 100644
--- a/src/components/Metadata/MetricsParam/index.vue
+++ b/src/components/Metadata/MetricsParam/index.vue
@@ -21,7 +21,7 @@
{ max: 64, message: '最多可输入64个字符' },
{
pattern: /^[a-zA-Z0-9_\-]+$/,
- message: 'ID只能由数字、字母、下划线、中划线组成',
+ message: '标识只能由数字、字母、下划线、中划线组成',
},
]">
diff --git a/src/views/device/components/Metadata/Base/Edit/BaseForm.vue b/src/views/device/components/Metadata/Base/Edit/BaseForm.vue
index 6b48e943..c1776126 100644
--- a/src/views/device/components/Metadata/Base/Edit/BaseForm.vue
+++ b/src/views/device/components/Metadata/Base/Edit/BaseForm.vue
@@ -4,7 +4,7 @@
{ max: 64, message: '最多可输入64个字符' },
{
pattern: /^[a-zA-Z0-9_\-]+$/,
- message: 'ID只能由数字、字母、下划线、中划线组成',
+ message: '标识只能由数字、字母、下划线、中划线组成',
},
]">
diff --git a/src/views/device/components/Metadata/Base/columns.tsx b/src/views/device/components/Metadata/Base/columns.tsx
index 007a0372..d8d1249f 100644
--- a/src/views/device/components/Metadata/Base/columns.tsx
+++ b/src/views/device/components/Metadata/Base/columns.tsx
@@ -168,7 +168,7 @@ export const useColumns = (type?: MetadataType, target?: 'device' | 'product', n
{ max: 64, message: '最多可输入64个字符' },
{
pattern: /^[a-zA-Z0-9_\-]+$/,
- message: 'ID只能由数字、字母、下划线、中划线组成',
+ message: '标识只能由数字、字母、下划线、中划线组成',
},
]
},
diff --git a/src/views/device/components/Metadata/Base/components/ConfigModal.vue b/src/views/device/components/Metadata/Base/components/ConfigModal.vue
index d76c8858..65f11305 100644
--- a/src/views/device/components/Metadata/Base/components/ConfigModal.vue
+++ b/src/views/device/components/Metadata/Base/components/ConfigModal.vue
@@ -170,7 +170,7 @@ const columns = [
{ max: 64, message: '最多可输入64个字符' },
{
pattern: /^[a-zA-Z0-9_\-]+$/,
- message: 'ID只能由数字、字母、下划线、中划线组成',
+ message: '标识只能由数字、字母、下划线、中划线组成',
},
]
}
diff --git a/src/views/device/components/Metadata/Base/components/DataType.vue b/src/views/device/components/Metadata/Base/components/DataType.vue
index 05475080..a1812280 100644
--- a/src/views/device/components/Metadata/Base/components/DataType.vue
+++ b/src/views/device/components/Metadata/Base/components/DataType.vue
@@ -105,7 +105,7 @@ const columns = [{
{ max: 64, message: '最多可输入64个字符' },
{
pattern: /^[a-zA-Z0-9_\-]+$/,
- message: 'ID只能由数字、字母、下划线、中划线组成',
+ message: '标识只能由数字、字母、下划线、中划线组成',
},
]
}
diff --git a/src/views/device/components/Metadata/Base/components/Events/ConfigParams.vue b/src/views/device/components/Metadata/Base/components/Events/ConfigParams.vue
index 3969d598..a3153165 100644
--- a/src/views/device/components/Metadata/Base/components/Events/ConfigParams.vue
+++ b/src/views/device/components/Metadata/Base/components/Events/ConfigParams.vue
@@ -46,7 +46,7 @@ const columns = [
{ max: 64, message: '最多可输入64个字符' },
{
pattern: /^[a-zA-Z0-9_\-]+$/,
- message: 'ID只能由数字、字母、下划线、中划线组成',
+ message: '标识只能由数字、字母、下划线、中划线组成',
},
]
}
diff --git a/src/views/device/components/Metadata/Base/components/Function/InputParams.vue b/src/views/device/components/Metadata/Base/components/Function/InputParams.vue
index 4f19b52f..3be6897b 100644
--- a/src/views/device/components/Metadata/Base/components/Function/InputParams.vue
+++ b/src/views/device/components/Metadata/Base/components/Function/InputParams.vue
@@ -84,7 +84,7 @@ const columns = ref([
{ max: 64, message: '最多可输入64个字符' },
{
pattern: /^[a-zA-Z0-9_\-]+$/,
- message: 'ID只能由数字、字母、下划线、中划线组成',
+ message: '标识只能由数字、字母、下划线、中划线组成',
},
]
}
diff --git a/src/views/device/components/Metadata/Base/components/Function/OutputParams.vue b/src/views/device/components/Metadata/Base/components/Function/OutputParams.vue
index dd5793ff..a83297c6 100644
--- a/src/views/device/components/Metadata/Base/components/Function/OutputParams.vue
+++ b/src/views/device/components/Metadata/Base/components/Function/OutputParams.vue
@@ -120,7 +120,7 @@ const columns = [
{ max: 64, message: '最多可输入64个字符' },
{
pattern: /^[a-zA-Z0-9_\-]+$/,
- message: 'ID只能由数字、字母、下划线、中划线组成',
+ message: '标识只能由数字、字母、下划线、中划线组成',
},
]
}
diff --git a/src/views/device/components/Metadata/Base/components/Properties/Metrics/Metrics.vue b/src/views/device/components/Metadata/Base/components/Properties/Metrics/Metrics.vue
index 1c1d83cd..2cccec4a 100644
--- a/src/views/device/components/Metadata/Base/components/Properties/Metrics/Metrics.vue
+++ b/src/views/device/components/Metadata/Base/components/Properties/Metrics/Metrics.vue
@@ -78,7 +78,7 @@ const columns: any = [
{ max: 64, message: '最多可输入64个字符' },
{
pattern: /^[a-zA-Z0-9_\-]+$/,
- message: 'ID只能由数字、字母、下划线、中划线组成',
+ message: '标识只能由数字、字母、下划线、中划线组成',
},
]
},
diff --git a/vite.config.ts b/vite.config.ts
index ffa11a2c..36d90794 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -94,9 +94,9 @@ export default defineConfig(({ mode}) => {
[env.VITE_APP_BASE_API]: {
// target: 'http://192.168.32.226:8844',
// target: 'http://192.168.32.244:8881',
- target: 'http://192.168.32.163:8844', //张季本地
+ // target: 'http://192.168.32.163:8844', //张季本地
// target: 'http://120.77.179.54:8844', // 120测试
- // target: 'http://192.168.33.46:8844', // 本地开发环境
+ target: 'http://192.168.33.46:8844', // 本地开发环境
ws: 'ws://192.168.33.46:8844',
changeOrigin: true,
rewrite: (path) => path.replace(/^\/api/, '')
diff --git a/yarn.lock b/yarn.lock
index 16539df8..d00dce27 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3755,8 +3755,8 @@ jetlinks-ui-components@^1.0.23:
jetlinks-ui-components@^1.0.28:
version "1.0.28"
- resolved "http://registry.jetlinks.cn/jetlinks-ui-components/-/jetlinks-ui-components-1.0.28.tgz#443df6fc65ecd0bfbc19eb12bff8d10c0ff6a129"
- integrity sha512-+RmSq4LFoH/TODAELhUxK/YeqCvbnqjgT6C5mZyIM1veARbVyUEiIJ3+dDOLL42Sm/fbNTJ2IQH4PYeVAeTU9g==
+ resolved "http://registry.jetlinks.cn/jetlinks-ui-components/-/jetlinks-ui-components-1.0.28.tgz#592812416edb5b1f45991d1714ab13701eeba8da"
+ integrity sha512-+6zDWT3QwnrtmCNwpZkejZ084Sx5UrH+Jd7z0e8Ds71p7VGxMx/GE+2DQ/ob8ZW2tB7dHQmJi7JhYblHxl6EFg==
dependencies:
"@vueuse/core" "^9.12.0"
"@vueuse/router" "^9.13.0"