Merge branch 'fix/Query.table_name_startWith_alpha' into 'wrdp'

Merge of fix/Query.table_name_startWith_alpha 数据中心自建表名加了校验 to wrdp

See merge request o2oa/o2oa!2055

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;

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": "是否确定删除当前列？",