fix: bug#16963

2023-08-01 18:13:07 +08:00 · 2023-08-01 18:13:07 +08:00 · daaf4bec20
parent ca1cd1fd53
commit daaf4bec20
12 changed files with 14 additions and 14 deletions
--- 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: '标识只能由数字、字母、下划线、中划线组成',
                },
              ]">
                <j-input v-model:value="_value[index].id" size="small" placeholder="请输入标识"></j-input>
--- 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: '标识只能由数字、字母、下划线、中划线组成',
                  },
                ]">
                  <j-input v-model:value="_value[index].id" size="small" placeholder="请输入标识"></j-input>
--- 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: '标识只能由数字、字母、下划线、中划线组成',
    },
  ]">
    <j-input v-model:value="value.id" size="small" @change="asyncOtherConfig" :disabled="metadataStore.model.action === 'edit'" placeholder="请输入标识"></j-input>
--- 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: '标识只能由数字、字母、下划线、中划线组成',
          },
        ]
      },
--- 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: '标识只能由数字、字母、下划线、中划线组成',
        },
      ]
    }
--- 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: '标识只能由数字、字母、下划线、中划线组成',
      },
    ]
  }
--- 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: '标识只能由数字、字母、下划线、中划线组成',
              },
            ]
        }
--- 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: '标识只能由数字、字母、下划线、中划线组成',
        },
      ]
    }
--- 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: '标识只能由数字、字母、下划线、中划线组成',
        },
      ]
    }
--- 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: '标识只能由数字、字母、下划线、中划线组成',
        },
      ]
    },
--- 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/, '')
--- 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"