From b39a99820db22b7b3292e149b8ae37a29cdaa182 Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 11 Nov 2020 11:23:58 +0800 Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E4=B8=AD=E5=BF=83=E8=87=AA?= =?UTF-8?q?=E5=BB=BA=E8=A1=A8=E5=90=8D=E5=8A=A0=E4=BA=86=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../x_component_query_TableDesigner/Table.js | 37 +++++++++++++++++++ .../lp/zh-cn.js | 4 ++ 2 files changed, 41 insertions(+) diff --git a/o2web/source/x_component_query_TableDesigner/Table.js b/o2web/source/x_component_query_TableDesigner/Table.js index 4f8ac0d5ee..a202f4c56c 100644 --- a/o2web/source/x_component_query_TableDesigner/Table.js +++ b/o2web/source/x_component_query_TableDesigner/Table.js @@ -369,10 +369,24 @@ MWF.xApplication.query.TableDesigner.Table = new Class({ } }, saveSilence: function(callback){ + debugger; if (!this.data.name){ this.designer.notice(this.designer.lp.inputTableName, "error"); return false; } + if( this.data.status !== "build" ){ + var reg = /^[A-Za-z]/; + if( !reg.test(this.data.name) ){ + this.designer.notice(this.designer.lp.tableNameNotStartWithLetter, "error"); + return false; + } + + var reg2 = /^[A-Za-z0-9]+$/; + if( !reg2.test(this.data.name) ){ + this.designer.notice(this.designer.lp.tableNameNotBeLetterAndNumber, "error"); + return false; + } + } if (!this.json.draftData.fieldList.length){ this.designer.notice(this.designer.lp.errorFieldList, "error"); return false; @@ -387,10 +401,33 @@ MWF.xApplication.query.TableDesigner.Table = new Class({ }.bind(this)); }, save: function(callback){ + debugger; if (!this.data.name){ this.designer.notice(this.designer.lp.inputTableName, "error"); return false; } + if( this.data.status !== "build" ){ + var reg = /^[A-Za-z]/; + if( !reg.test(this.data.name) ){ + this.designer.notice(this.designer.lp.tableNameNotStartWithLetter, "error"); + return false; + } + if( this.data.alias && !reg.test(this.data.alias) ){ + this.designer.notice(this.designer.lp.tableAliasNotStartWithLetter, "error"); + return false; + } + + + var reg2 = /^[A-Za-z0-9]+$/; + if( !reg2.test(this.data.name) ){ + this.designer.notice(this.designer.lp.tableNameNotBeLetterAndNumber, "error"); + return false; + } + if( this.data.alias && !reg2.test(this.data.alias) ){ + this.designer.notice(this.designer.lp.tableAliasNotBeLetterAndNumber, "error"); + return false; + } + } if (!this.json.draftData.fieldList.length){ this.designer.notice(this.designer.lp.errorFieldList, "error"); return false; diff --git a/o2web/source/x_component_query_TableDesigner/lp/zh-cn.js b/o2web/source/x_component_query_TableDesigner/lp/zh-cn.js index 1a92eaeb46..3d84c266f1 100644 --- a/o2web/source/x_component_query_TableDesigner/lp/zh-cn.js +++ b/o2web/source/x_component_query_TableDesigner/lp/zh-cn.js @@ -46,6 +46,10 @@ MWF.xApplication.query.TableDesigner.LP = { "duplicateName": "同名的列已存在", "inputName": "请输入列名称", "inputTableName": "请输入数据表名称", + "tableNameNotStartWithLetter" : "数据表名称必须以字母开头", + "tableAliasNotStartWithLetter" : "数据表别名必须以字母开头", + "tableNameNotBeLetterAndNumber" : "数据表名称必须是全字母或字母加数字", + "tableAliasNotBeLetterAndNumber" : "数据表别名必须是全字母或字母加数字", "save_success": "数据表保存成功！", "deleteColumnTitle": "删除列确认", "deleteColumn": "是否确定删除当前列？", -- GitLab