Просмотр исходного кода

修复代码生成的删除bug

Yue 2 лет назад
Родитель
Сommit
bc76013b99

+ 1 - 1
SERVER/VberAdminPlus/vber-generator/src/main/java/com/vber/generator/controller/GenController.java

@@ -137,7 +137,7 @@ public class GenController extends BaseController {
      * @param tableIds 表ID串
      */
     @DeleteMapping("/{tableIds}")
-    public R<Void> remove(@PathVariable Long[] tableIds) {
+    public R<Void> remove(@PathVariable("tableIds") Long[] tableIds) {
         genTableService.deleteGenTableByIds(tableIds);
         return R.ok();
     }

+ 34 - 2
SERVER/VberAdminPlus/vber-generator/src/main/resources/templates/index.html

@@ -57,7 +57,7 @@
             <a class="btn btn-primary single disabled" onclick="update()">
                 <i class="fa fa-edit"></i> 修改
             </a>
-            <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()">
+            <a class="btn btn-danger multiple disabled" onclick="remove()">
                 <i class="fa fa-remove"></i> 删除
             </a>
         </div>
@@ -146,7 +146,7 @@
                     var actions = [];
                     actions.push('<a class="btn btn-info btn-xs ' + previewFlag + '" href="javascript:void(0)" onclick="preview(\'' + row.tableId + '\')"><i class="fa fa-search"></i>预览</a> ');
                     actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="update(\'' + row.tableId + '\')"><i class="fa fa-edit"></i>编辑</a> ');
-                    actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.tableId + '\')"><i class="fa fa-remove"></i>删除</a> ');
+                    actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="remove(\'' + row.tableId + '\')"><i class="fa fa-remove"></i>删除</a> ');
                     actions.push('<a class="btn btn-warning btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="synchDb(\'' + row.tableName + '\')"><i class="fa fa-refresh"></i>同步</a> ');
                     actions.push('<a class="btn btn-primary btn-xs ' + codeFlag + '" href="javascript:void(0)" onclick="genCode(\'' + row.tableName + '\',\'' + row.genType + '\')"><i class="fa fa-bug"></i>生成代码</a> ');
                     return actions.join('');
@@ -199,6 +199,38 @@
         window.open(`/gen/edit/${$dataSource.val()}/${id}`, "修改表信息")
     }
 
+    function remove(id) {
+        if (id) {
+            table.set();
+            $.modal.confirm("确定删除该条" + table.options.modalName + "信息吗?", function () {
+                $.operate.submit({
+                    url: prefix + "/" + id,
+                    type: "delete",
+                    headers: {
+                        datasource: $dataSource.val()
+                    },
+                })
+            });
+        } else {
+            const rows = $.table.selectFirstColumns();
+            if (rows.length == 0) {
+                $.modal.alertWarning("请至少选择一条记录删除");
+            }
+            $.modal.confirm("确认要删除选中的" + rows.length + "条数据吗?", function () {
+                var ids = rows.join();
+                $.operate.submit({
+                    url: prefix + "/" + ids,
+                    type: "delete",
+                    headers: {
+                        datasource: $dataSource.val()
+                    },
+                })
+            });
+        }
+
+
+    }
+
     function projectReactor() {
         $.modal.open("创建新项目", prefix + "/project", 800, 400)
     }