'commit'

WebRoot/view/tb/org/fields_set.html

@@ -17,6 +17,10 @@
             display: none;
         }
 
+        .err_border {
+            border: 1px solid red !important;
+        }
+
         .layui-layer-title {
             padding: 0 80px 0 20px;
             height: 50px;
@@ -205,39 +209,42 @@
             util.on({
                 confirm: function () {
                     var data = table.getData('setField');
-                    // if (errArr.length > 0) {
+                    if (errArr.length > 0) {
-                    //     layer.msg("有问题的数据，请检查！");
+                        layer.msg("字段名称存在问题，请检查！", {
-                    // } else {
+                            icon: 2,
-                    //     layer.msg(JSON.stringify(data));
+                            time: 1500,
-                    // }
+                        });
-
+                    } else {
-                    var tableName = $("#tableName").val();
+                        var tableName = $("#tableName").val();
-                    $.ajax({
+                        $.ajax({
-                        type: "POST",
+                            type: "POST",
-                        async: false,
+                            async: false,
-                        dataType: "json",
+                            dataType: "json",
-                        url: "/QingLong/collect/saveSheet",
+                            url: "/QingLong/collect/saveSheet",
-                        data: {
+                            data: {
-                            "json": JSON.stringify(data),
+                                "json": JSON.stringify(data),
-                            "table_name": tableName,
+                                "table_name": tableName,
-                            "job_id": jobId,
+                                "job_id": jobId,
-                            "sheet_index": initSheetIndex
+                                "sheet_index": initSheetIndex
-                        },
+                            },
-                        success: function (result) {
+                            success: function (result) {
-                            if (result.success) {
+                                if (result.success) {
-                                $('#ico' + initSheetIndex).removeClass('dh_ico');
+                                    $('#ico' + initSheetIndex).removeClass('dh_ico');
-                                layer.msg("确认成功！", {
+                                    layer.msg("确认成功！", {
-                                    icon: 1,
+                                        icon: 1,
-                                    time: 1500
+                                        time: 1500
-                                });
+                                    });
-                            } else {
+                                } else {
-                                layer.msg(result.message, {
+                                    layer.msg(result.message, {
-                                    icon: 2,
+                                        icon: 2,
-                                    time: 1500
+                                        time: 1500
-                                });
+                                    });
+                                }
                             }
-                        }
+                        });
-                    });
+                    }
+
+
                 },
                 save: function () {
 
@@ -278,24 +285,29 @@
 
             //监听单元格编辑
             table.on('edit(setField)', function (obj) {
-                
+
                 $('#ico' + initSheetIndex).addClass('dh_ico');
-                // var field = obj.field;
+                var field = obj.field;
-
+
-                // var regex = /^[a-z][a-z0-9]{0,31}$/;
+                var regex = /^(?![_0-9])[a-z0-9_]{2,32}$/i;
-                // var cellElem = obj.tr.find('td[data-field="column_name"]');
+                var cellElem = obj.tr.find('td[data-field="column_name"]');
-                // if (regex.test(obj.value)) {
+                console.log(cellElem);
-                //     var _index = errArr.indexOf(obj.index);
+                if (regex.test(obj.value)) {
-                //     errArr.splice(_index, 1);
+                    var _index = errArr.indexOf(obj.index);
-                //     console.log('变量值符合正则表达式');
+                    errArr.splice(_index, 1);
-                //     cellElem.css('color', '');
+                    // cellElem.css('border-color', '');
-                // } else {
+                    cellElem.removeClass('err_border');
-                //     if (!errArr.includes(obj.index)) {
+
-                //         errArr.push(obj.index);
+                } else {
-                //     }
+                    if (!errArr.includes(obj.index)) {
-                //     console.log('变量值不符合正则表达式');
+                        errArr.push(obj.index);
-                //     cellElem.css('color', 'red');
+                    }
-                // }
+                    layer.msg('刚修改的字段名称不正确，请重新修改！', {
+                        icon: 3,
+                        time: 2000
+                    });
+                    cellElem.addClass('err_border');
+                }
 
                 // console.log('修改的字段为' + obj.field + '<br>' + '修改的值为' + obj.value + '<br>' + JSON.stringify(obj.data));
             });