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

fix: bug#16963

This commit is contained in:
XieYongHong 2023-08-01 18:13:07 +08:00
parent ca1cd1fd53
commit daaf4bec20
12 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/Metadata/JsonParam/index.vue
View File

@ -19,7 +19,7 @@
{ max: 64, message: '最多可输入64个字符' }, { max: 64, message: '最多可输入64个字符' },
{ {
pattern: /^[a-zA-Z0-9_\-]+$/, pattern: /^[a-zA-Z0-9_\-]+$/,
message: 'ID只能由数字、字母、下划线、中划线组成', message: '标识只能由数字、字母、下划线、中划线组成',
}, },
]"> ]">
<j-input v-model:value="_value[index].id" size="small" placeholder="请输入标识"></j-input> <j-input v-model:value="_value[index].id" size="small" placeholder="请输入标识"></j-input>

2
src/components/Metadata/MetricsParam/index.vue
View File

@ -21,7 +21,7 @@
{ max: 64, message: '最多可输入64个字符' }, { max: 64, message: '最多可输入64个字符' },
{ {
pattern: /^[a-zA-Z0-9_\-]+$/, pattern: /^[a-zA-Z0-9_\-]+$/,
message: 'ID只能由数字、字母、下划线、中划线组成', message: '标识只能由数字、字母、下划线、中划线组成',
}, },
]"> ]">
<j-input v-model:value="_value[index].id" size="small" placeholder="请输入标识"></j-input> <j-input v-model:value="_value[index].id" size="small" placeholder="请输入标识"></j-input>

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

@ -4,7 +4,7 @@
{ max: 64, message: '最多可输入64个字符' }, { max: 64, message: '最多可输入64个字符' },
{ {
pattern: /^[a-zA-Z0-9_\-]+$/, pattern: /^[a-zA-Z0-9_\-]+$/,
message: 'ID只能由数字、字母、下划线、中划线组成', message: '标识只能由数字、字母、下划线、中划线组成',
}, },
]"> ]">
<j-input v-model:value="value.id" size="small" @change="asyncOtherConfig" :disabled="metadataStore.model.action === 'edit'" placeholder="请输入标识"></j-input> <j-input v-model:value="value.id" size="small" @change="asyncOtherConfig" :disabled="metadataStore.model.action === 'edit'" placeholder="请输入标识"></j-input>

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

@ -168,7 +168,7 @@ export const useColumns = (type?: MetadataType, target?: 'device' | 'product', n
{ max: 64, message: '最多可输入64个字符' }, { max: 64, message: '最多可输入64个字符' },
{ {
pattern: /^[a-zA-Z0-9_\-]+$/, pattern: /^[a-zA-Z0-9_\-]+$/,
message: 'ID只能由数字、字母、下划线、中划线组成', message: '标识只能由数字、字母、下划线、中划线组成',
}, },
] ]
}, },

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

@ -170,7 +170,7 @@ const columns = [
{ max: 64, message: '最多可输入64个字符' }, { max: 64, message: '最多可输入64个字符' },
{ {
pattern: /^[a-zA-Z0-9_\-]+$/, pattern: /^[a-zA-Z0-9_\-]+$/,
message: 'ID只能由数字、字母、下划线、中划线组成', message: '标识只能由数字、字母、下划线、中划线组成',
}, },
] ]
} }

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

@ -105,7 +105,7 @@ const columns = [{
{ max: 64, message: '最多可输入64个字符' }, { max: 64, message: '最多可输入64个字符' },
{ {
pattern: /^[a-zA-Z0-9_\-]+$/, pattern: /^[a-zA-Z0-9_\-]+$/,
message: 'ID只能由数字、字母、下划线、中划线组成', message: '标识只能由数字、字母、下划线、中划线组成',
}, },
] ]
} }

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

@ -46,7 +46,7 @@ const columns = [
{ max: 64, message: '最多可输入64个字符' }, { max: 64, message: '最多可输入64个字符' },
{ {
pattern: /^[a-zA-Z0-9_\-]+$/, pattern: /^[a-zA-Z0-9_\-]+$/,
message: 'ID只能由数字、字母、下划线、中划线组成', message: '标识只能由数字、字母、下划线、中划线组成',
}, },
] ]
} }

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

@ -84,7 +84,7 @@ const columns = ref([
{ max: 64, message: '最多可输入64个字符' }, { max: 64, message: '最多可输入64个字符' },
{ {
pattern: /^[a-zA-Z0-9_\-]+$/, pattern: /^[a-zA-Z0-9_\-]+$/,
message: 'ID只能由数字、字母、下划线、中划线组成', message: '标识只能由数字、字母、下划线、中划线组成',
}, },
] ]
} }

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

@ -120,7 +120,7 @@ const columns = [
{ max: 64, message: '最多可输入64个字符' }, { max: 64, message: '最多可输入64个字符' },
{ {
pattern: /^[a-zA-Z0-9_\-]+$/, pattern: /^[a-zA-Z0-9_\-]+$/,
message: 'ID只能由数字、字母、下划线、中划线组成', message: '标识只能由数字、字母、下划线、中划线组成',
}, },
] ]
} }

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

@ -78,7 +78,7 @@ const columns: any = [
{ max: 64, message: '最多可输入64个字符' }, { max: 64, message: '最多可输入64个字符' },
{ {
pattern: /^[a-zA-Z0-9_\-]+$/, pattern: /^[a-zA-Z0-9_\-]+$/,
message: 'ID只能由数字、字母、下划线、中划线组成', message: '标识只能由数字、字母、下划线、中划线组成',
}, },
] ]
}, },

4
vite.config.ts
View File

@ -94,9 +94,9 @@ export default defineConfig(({ mode}) => {
[env.VITE_APP_BASE_API]: { [env.VITE_APP_BASE_API]: {
// target: 'http://192.168.32.226:8844', // target: 'http://192.168.32.226:8844',
// target: 'http://192.168.32.244:8881', // 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://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', ws: 'ws://192.168.33.46:8844',
changeOrigin: true, changeOrigin: true,
rewrite: (path) => path.replace(/^\/api/, '') rewrite: (path) => path.replace(/^\/api/, '')

4
yarn.lock
View File

@ -3755,8 +3755,8 @@ jetlinks-ui-components@^1.0.23:
jetlinks-ui-components@^1.0.28: jetlinks-ui-components@^1.0.28:
version "1.0.28" version "1.0.28"
resolved "http://registry.jetlinks.cn/jetlinks-ui-components/-/jetlinks-ui-components-1.0.28.tgz#443df6fc65ecd0bfbc19eb12bff8d10c0ff6a129" resolved "http://registry.jetlinks.cn/jetlinks-ui-components/-/jetlinks-ui-components-1.0.28.tgz#592812416edb5b1f45991d1714ab13701eeba8da"
integrity sha512-+RmSq4LFoH/TODAELhUxK/YeqCvbnqjgT6C5mZyIM1veARbVyUEiIJ3+dDOLL42Sm/fbNTJ2IQH4PYeVAeTU9g== integrity sha512-+6zDWT3QwnrtmCNwpZkejZ084Sx5UrH+Jd7z0e8Ds71p7VGxMx/GE+2DQ/ob8ZW2tB7dHQmJi7JhYblHxl6EFg==
dependencies: dependencies:
"@vueuse/core" "^9.12.0" "@vueuse/core" "^9.12.0"
"@vueuse/router" "^9.13.0" "@vueuse/router" "^9.13.0"