diff --git a/com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/js/coe.pal.processlevel.create.js b/com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/js/coe.pal.processlevel.create.js index 35f150dd..4f948a8e 100755 --- a/com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/js/coe.pal.processlevel.create.js +++ b/com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/js/coe.pal.processlevel.create.js @@ -930,7 +930,11 @@ function showTableDialog(obj,value,id) { name: tableName, table: parent.operateList } - saveDialogTableValue(value,id,obj) + if(value.table.some(item => item.name == '') || value.table.some(item => item.desc == '')) { // 表格存在空值 + $.simpleAlert("表格内容不能存在空值",'warning') + } else { + saveDialogTableValue(value,id,obj) + } parent.$("#attribute-table-window1").dialog("close"); } }, { diff --git a/com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/lib/designer/extend/js/designer.extend.link.js b/com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/lib/designer/extend/js/designer.extend.link.js index 28f3cc64..3d8b4872 100755 --- a/com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/lib/designer/extend/js/designer.extend.link.js +++ b/com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/lib/designer/extend/js/designer.extend.link.js @@ -2117,8 +2117,12 @@ function openTableDialog(obj,value) { name: tableName, table: dialogTableList } - updateAttributeById($(obj).attr("objid"), tableObj); - $("#attribute-table-window").dialog('close'); + if(dialogTableList.some(item => item.name == '') || dialogTableList.some(item => item.desc == '')) { + $.simpleAlert("表格内容不能存在空值",'warning') + } else { + updateAttributeById($(obj).attr("objid"), tableObj); + $("#attribute-table-window").dialog('close'); + } } }, { text : '取消', @@ -2129,17 +2133,6 @@ function openTableDialog(obj,value) { }) } -// function tableInputHeight() { -// var input = $("#attribute-table-content").find(".dialog_table_input_css"); -// input.each(function () { -// $(this).on('input', function(){ -// if(this.scrollHeight > $(this).height()) { -// var curRow = parseInt($(this).attr('rows')) -// $(this).attr('rows',curRow + 1) -// } -// }); -// }) -// } function addTableTr(obj) { let newTrId = Utils.newId()