From 614b0106f079e67bb674a37ede2bd0fe3df2a430 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期四, 27 七月 2023 17:45:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 cloud-server-management/src/main/webapp/static/modular/system/menu/menu.js |   94 +++++++----------------------------------------
 1 files changed, 14 insertions(+), 80 deletions(-)

diff --git a/cloud-server-management/src/main/webapp/static/modular/system/menu/menu.js b/cloud-server-management/src/main/webapp/static/modular/system/menu/menu.js
index 84ae822..79e65a1 100644
--- a/cloud-server-management/src/main/webapp/static/modular/system/menu/menu.js
+++ b/cloud-server-management/src/main/webapp/static/modular/system/menu/menu.js
@@ -7,7 +7,7 @@
     table: null,
     layerIndex: -1
 };
-var language =$("#language").val()
+
 /**
  * 初始化表格的列
  */
@@ -15,55 +15,14 @@
     var columns = [
         {field: 'selectItem', radio: true},
         {title: 'id', field: 'id', visible: false, align: 'center', valign: 'middle'},
-        {title: language==1?'菜单名称':(language==2?'Menu Name':'Nama Menu'), field: 'name', align: 'center', valign: 'middle', sortable: true},
-        {title:language==1?'菜单编号':(language==2?'Menu Number':'Nomor Menu') , field: 'code', align: 'center', valign: 'middle', sortable: true},
-        {title:language==1?'菜单父编号':(language==2?'Menu parent Number':'Nomor induk menu') , field: 'pcode', align: 'center', valign: 'middle', sortable: true},
-        {title: language==1?'请求地址':(language==2?'Address of request':'Alamat permintaan'), field: 'url', align: 'center', valign: 'middle', sortable: true},
-        {title: language==1?'排序':(language==2?'Sort':'Urutkan'), field: 'num', align: 'center', valign: 'middle', sortable: true},
-        {title:language==1? '层级':(language==2?'hierarchy':'hierarki'), field: 'levels', align: 'center', valign: 'middle', sortable: true},
-        {title: language==1? '是否是菜单':(language==2?'Menu or not':'Menu atau tidak'), field: 'isMenuName', align: 'center', valign: 'middle', sortable: true,
-            formatter:function (data) {
-                if(data=="是"){
-                    if(language==1){
-                        return "是"
-                    }else if(language==2){
-                        return "Yes"
-                    }   else {
-                        return "Ya"
-                    }
-                }else if(data=="否"){
-                    if(language==1){
-                        return "否"
-                    }else if(language==2){
-                        return "No"
-                    }   else {
-                        return "Tidak"
-                    }
-                }
-            }
-        },
-        {title: language==1?'状态':(language==2?'State':'Status'), field: 'statusName', align: 'center', valign: 'middle', sortable: true,
-            formatter:function (data) {
-                if(data=="启用"){
-                    if(language==1){
-                        return "启用"
-                    }else if(language==2){
-                        return "Enable"
-                    }   else {
-                        return "Aktifkan"
-                    }
-                }else if(data=="禁用"){
-                    if(language==1){
-                        return "禁用"
-                    }else if(language==2){
-                        return "Disabled"
-                    }   else {
-                        return "Dilumpuhkan"
-                    }
-                }
-            }
-
-        }]
+        {title: '菜单名称', field: 'name', align: 'center', valign: 'middle', sortable: true},
+        {title: '菜单编号', field: 'code', align: 'center', valign: 'middle', sortable: true},
+        {title: '菜单父编号', field: 'pcode', align: 'center', valign: 'middle', sortable: true},
+        {title: '请求地址', field: 'url', align: 'center', valign: 'middle', sortable: true},
+        {title: '排序', field: 'num', align: 'center', valign: 'middle', sortable: true},
+        {title: '层级', field: 'levels', align: 'center', valign: 'middle', sortable: true},
+        {title: '是否是菜单', field: 'isMenuName', align: 'center', valign: 'middle', sortable: true},
+        {title: '状态', field: 'statusName', align: 'center', valign: 'middle', sortable: true}]
     return columns;
 };
 
@@ -74,14 +33,7 @@
 Menu.check = function () {
     var selected = $('#' + this.id).bootstrapTreeTable('getSelections');
     if (selected.length == 0) {
-        if(language==1){
-            Feng.info("请先选中表格中的某一记录!");
-        }else if(language==2){
-            Feng.info("Please select a record in the table first!");
-        }else {
-            Feng.info("Pilih catatan di tabel terlebih dahulu!");
-        }
-
+        Feng.info("请先选中表格中的某一记录!");
         return false;
     } else {
         Menu.seItem = selected[0];
@@ -95,7 +47,7 @@
 Menu.openAddMenu = function () {
     var index = layer.open({
         type: 2,
-        title: language==1?'添加':(language==2?'Add':'Tambahkan'),
+        title: '添加菜单',
         area: ['830px', '450px'], //宽高
         fix: false, //不固定
         maxmin: true,
@@ -129,34 +81,16 @@
 
         var operation = function () {
             var ajax = new $ax(Feng.ctxPath + "/menu/remove", function (data) {
-                if(language==1){
-                    Feng.success("删除成功!");
-                }else if(language==2){
-                    Feng.success("Delete succeeded!");
-                }else {
-                    Feng.success("Hapus berhasil!");
-                }
+                Feng.success("删除成功!");
                 Menu.table.refresh();
             }, function (data) {
-                if(language==1){
-                    Feng.error("删除失败!" + data.responseJSON.message + "!");
-                }else if(language==2){
-                    Feng.error("Delete failed!" + data.responseJSON.message + "!");
-                }else {
-                    Feng.error("Hapus gagal!" + data.responseJSON.message + "!");
-                }
+                Feng.error("删除失败!" + data.responseJSON.message + "!");
             });
             ajax.set("menuId", Menu.seItem.id);
             ajax.start();
         };
-        if(language==1){
-            Feng.confirm("是否刪除该菜单?", operation);
-        }else if(language==2){
-            Feng.confirm("Whether to delete the menu?", operation);
-        }else {
-            Feng.confirm("Apakah untuk menghapus menu?", operation);
-        }
 
+        Feng.confirm("是否刪除该菜单?", operation);
     }
 };
 

--
Gitblit v1.7.1