Merge remote-tracking branch 'origin/master'

qmjszx-admin/src/main/resources/static/ruoyi/js/ry-ui.js

@@ -1195,6 +1195,20 @@ var table = {
                         return;
                     }
                     var url = table.options.updateUrl.replace("{id}", row[table.options.uniqueId]);
+                    $.modal.openFull("修改" + table.options.modalName, url);
+                } else {
+                    $.modal.openFull("修改" + table.options.modalName, $.operate.editUrl(id));
+                }
+            },
+            editToSet: function(id){
+                table.set();
+                if ($.common.isEmpty(id) && table.options.type == table_type.bootstrapTreeTable) {
+                    var row = $("#" + table.options.id).bootstrapTreeTable('getSelections')[0];
+                    if ($.common.isEmpty(row)) {
+                        $.modal.alertWarning("请至少选择一条记录");
+                        return;
+                    }
+                    var url = table.options.updateUrl.replace("{id}", row[table.options.uniqueId]);
                     $.modal.open("修改" + table.options.modalName, url);
                 } else {
                     $.modal.open("修改" + table.options.modalName, $.operate.editUrl(id));