|
@@ -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 }[]>([])
|