소스 검색

Merge dev into prod (keep prod config files)

liujia 1 개월 전
부모
커밋
d892fa9ac1
4개의 변경된 파일73개의 추가작업 그리고 70개의 파일을 삭제
  1. 4 0
      CHANGELOG.md
  2. 1 1
      package.json
  3. 0 1
      src/layout/index.vue
  4. 68 68
      src/views/device/detail/components/deviceBaseConfig/index.vue

+ 4 - 0
CHANGELOG.md

@@ -1,4 +1,8 @@
 
+## v0.5.9 (2025-09-08)
+- refactor(deviceBaseConfig): 取消设备的xyz范围验证逻辑 (b88401b)
+- refactor(layout): 移除布局底部的路由名称显示 (2cf0367)
+
 ## v0.5.8 (2025-09-05)
 - refactor(ui): 优化设备详情和系统配置页面的样式和布局 (d0326f4)
 

+ 1 - 1
package.json

@@ -1,6 +1,6 @@
 {
   "name": "ln-web",
-  "version": "0.5.8",
+  "version": "0.5.9",
   "private": true,
   "type": "module",
   "scripts": {

+ 0 - 1
src/layout/index.vue

@@ -62,7 +62,6 @@
           <span>&nbsp;&nbsp;&nbsp;&nbsp;版本号:{{ version }}</span>
           <!-- <span>&nbsp;&nbsp;&nbsp;&nbsp;构建时间:{{ buildTime }}</span> -->
         </slot>
-        {{ route.name }}
       </a-layout-footer>
     </a-layout>
 

+ 68 - 68
src/views/device/detail/components/deviceBaseConfig/index.vue

@@ -337,83 +337,83 @@ const saveBaseConfig = async () => {
 }
 
 // 校验输入的范围大小
-const createRangeValidator = (min: number, max: number) => async (_rule: Rule, value: string) => {
-  if (!value) {
-    return Promise.reject(new Error('不能为空'))
-  }
+// const createRangeValidator = (min: number, max: number) => async (_rule: Rule, value: string) => {
+//   if (!value) {
+//     return Promise.reject(new Error('不能为空'))
+//   }
 
-  if (!/^-?\d+(\.\d+)?$/.test(value)) {
-    return Promise.reject(new Error('必须为数字'))
-  }
+//   if (!/^-?\d+(\.\d+)?$/.test(value)) {
+//     return Promise.reject(new Error('必须为数字'))
+//   }
 
-  const num = parseFloat(value)
-  if (num < min || num > max) {
-    return Promise.reject(new Error(`范围:${min} ~ ${max}`))
-  }
+//   const num = parseFloat(value)
+//   if (num < min || num > max) {
+//     return Promise.reject(new Error(`范围:${min} ~ ${max}`))
+//   }
 
-  return Promise.resolve()
-}
+//   return Promise.resolve()
+// }
 
 // 校验起始值和结束值的大小关系
-const validateRangeOrder = (startField: string, endField: string) => {
-  return async () => {
-    const startVal = parseFloat(baseFormState[startField as keyof BaseFormState] as string)
-    const endVal = parseFloat(baseFormState[endField as keyof BaseFormState] as string)
+// const validateRangeOrder = (startField: string, endField: string) => {
+//   return async () => {
+//     const startVal = parseFloat(baseFormState[startField as keyof BaseFormState] as string)
+//     const endVal = parseFloat(baseFormState[endField as keyof BaseFormState] as string)
 
-    if (startVal >= endVal) {
-      return Promise.reject(new Error('结束值须大于起始值'))
-    }
-    return Promise.resolve()
-  }
-}
+//     if (startVal >= endVal) {
+//       return Promise.reject(new Error('结束值须大于起始值'))
+//     }
+//     return Promise.resolve()
+//   }
+// }
 
 // 统一校验规则
 const rules: Record<string, Rule[]> = {
-  xRangeStart: [
-    {
-      required: true,
-      validator: createRangeValidator(-200, 200),
-      trigger: ['change', 'blur'],
-    },
-  ],
-  xRangeEnd: [
-    {
-      validator: createRangeValidator(-200, 200),
-      trigger: ['change', 'blur'],
-    },
-    {
-      validator: validateRangeOrder('xRangeStart', 'xRangeEnd'),
-      trigger: ['change', 'blur'],
-    },
-  ],
-  yRangeStart: [
-    {
-      validator: createRangeValidator(-250, 250),
-      trigger: ['change', 'blur'],
-    },
-  ],
-  yRangeEnd: [
-    {
-      validator: createRangeValidator(-250, 250),
-      trigger: ['change', 'blur'],
-    },
-    {
-      validator: validateRangeOrder('yRangeStart', 'yRangeEnd'),
-      trigger: ['change', 'blur'],
-    },
-  ],
-  zRangeStart: [
-    {
-      validator: createRangeValidator(0, 5),
-      trigger: ['change', 'blur'],
-    },
-  ],
-  zRangeEnd: [
-    {
-      validator: createRangeValidator(200, 300),
-      trigger: ['change', 'blur'],
-    },
-  ],
+  // xRangeStart: [
+  //   {
+  //     required: true,
+  //     validator: createRangeValidator(-200, 200),
+  //     trigger: ['change', 'blur'],
+  //   },
+  // ],
+  // xRangeEnd: [
+  //   {
+  //     validator: createRangeValidator(-200, 200),
+  //     trigger: ['change', 'blur'],
+  //   },
+  //   {
+  //     validator: validateRangeOrder('xRangeStart', 'xRangeEnd'),
+  //     trigger: ['change', 'blur'],
+  //   },
+  // ],
+  // yRangeStart: [
+  //   {
+  //     validator: createRangeValidator(-250, 250),
+  //     trigger: ['change', 'blur'],
+  //   },
+  // ],
+  // yRangeEnd: [
+  //   {
+  //     validator: createRangeValidator(-250, 250),
+  //     trigger: ['change', 'blur'],
+  //   },
+  //   {
+  //     validator: validateRangeOrder('yRangeStart', 'yRangeEnd'),
+  //     trigger: ['change', 'blur'],
+  //   },
+  // ],
+  // zRangeStart: [
+  //   {
+  //     validator: createRangeValidator(0, 5),
+  //     trigger: ['change', 'blur'],
+  //   },
+  // ],
+  // zRangeEnd: [
+  //   {
+  //     validator: createRangeValidator(200, 300),
+  //     trigger: ['change', 'blur'],
+  //   },
+  // ],
 }
 
 const tenantOptions = ref<{ label: string; value: string }[]>([])