From 439e3b0f076280311b7cd4251a95820730242780 Mon Sep 17 00:00:00 2001
From: Ben Lin <maobin001@msn.com>
Date: 星期三, 07 八月 2024 10:43:33 +0800
Subject: [PATCH] 一些更新
---
src/views/tigerprojects/bas/checkrule/checkrule.data.ts | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 50 insertions(+), 2 deletions(-)
diff --git a/src/views/tigerprojects/bas/checkrule/checkrule.data.ts b/src/views/tigerprojects/bas/checkrule/checkrule.data.ts
index 21f0591..0dd63c3 100644
--- a/src/views/tigerprojects/bas/checkrule/checkrule.data.ts
+++ b/src/views/tigerprojects/bas/checkrule/checkrule.data.ts
@@ -21,6 +21,49 @@
dataIndex: 'DESCRIPTION',
},
{
+ title: '鏁版嵁绫诲瀷',
+ dataIndex: 'DATA_TYPE',
+ customRender: ({ record }) => {
+ const type = record.DATA_TYPE;
+ var text = '';
+ var color = 'blue';
+ switch (type) {
+ case Data_Types.Character:
+ text = '绾瓧姣�';
+ break;
+ case Data_Types.Numeric:
+ text = '绾暟瀛�';
+ color = 'yellow';
+ break;
+ case Data_Types.DateCode:
+ text = '鏃ユ湡';
+ color = 'orange';
+ break;
+ case Data_Types.TimeCode:
+ text = '鏃堕棿';
+ color = '#bfbfbf';
+ break;
+ case Data_Types.DbCheck:
+ text = '鍏宠仈鏍￠獙';
+ color = '#0b9da9';
+ break;
+ case Data_Types.FixedCode:
+ text = '鍥哄畾鍊�';
+ color = 'green';
+ break;
+ case Data_Types.SerialCode:
+ text = '娴佹按鍙�';
+ color = '#b442df';
+ break;
+ }
+ return h(Tag, { color: color }, () => text);
+ },
+ },
+ {
+ title: '鏍￠獙浣嶆暟',
+ dataIndex: 'CHECK_LENGTH',
+ },
+ {
title: '鏍￠獙浣嶆暟',
dataIndex: 'CHECK_LENGTH',
},
@@ -192,7 +235,7 @@
formModel.CHECK_LENGTH = '';
}
if (e == Data_Types.DbCheck || e == Data_Types.NoCheck) {
- formModel.DATA_REGEX = `(.{${formModel.CHECK_LENGTH}}){${formModel.REPEAT_TIMES}}`;
+ formModel.DATA_REGEX = formModel.CHECK_LENGTH>0? `(.{${formModel.CHECK_LENGTH}}){${formModel.REPEAT_TIMES}}`: `(.*){${formModel.REPEAT_TIMES}}`;
}
if (e == Data_Types.SerialCode) {
formModel.DATA_REGEX = `([0-9]{${formModel.CHECK_LENGTH}}){${formModel.REPEAT_TIMES}}`;
@@ -616,8 +659,13 @@
formModel.DATA_REGEX = `(${_regex}){${formModel.REPEAT_TIMES}}`;
}
}
+ //formModel.CHECK_LENGTH>0? `(.{${formModel.CHECK_LENGTH}}){${formModel.REPEAT_TIMES}}`: `(.*){${formModel.REPEAT_TIMES}}`;
if (
- formModel.DATA_TYPE == Data_Types.DbCheck ||
+ formModel.DATA_TYPE == Data_Types.DbCheck
+ ) {
+ formModel.DATA_REGEX = val>0? `(.{${val}}){${formModel.REPEAT_TIMES}}`: `(.*){${formModel.REPEAT_TIMES}}`;
+ }
+ if (
formModel.DATA_TYPE == Data_Types.NoCheck
) {
formModel.DATA_REGEX = `(.{${val}}){${formModel.REPEAT_TIMES}}`;
--
Gitblit v1.9.3