be

getrebuild · Mar 13, 2024 · 3feafad · 3feafad
1 parent 9ed78c3
commit 3feafad
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 8 deletions.
diff --git a/src/main/resources/web/assets/js/admin/system-cfg.js b/src/main/resources/web/assets/js/admin/system-cfg.js
@@ -279,13 +279,18 @@ $(document).ready(() => {
   $('button.J_MobileAppPath').on('click', () => $input[0].click())
 
   const $del = $('button.J_MobileAppPath-del').on('click', () => {
-    $.post(location.href, JSON.stringify({ MobileAppPath: '' }), (res) => {
-      if (res.error_code === 0) {
-        $('a.J_MobileAppPath').removeAttr('href').text('')
-        $del.addClass('hide')
-      } else {
-        RbHighbar.error(res.error_msg)
-      }
+    RbAlert.create($L('确认删除 APP 安装包？'), {
+      onConfirm: function () {
+        this.hide()
+        $.post(location.href, JSON.stringify({ MobileAppPath: '' }), (res) => {
+          if (res.error_code === 0) {
+            $('a.J_MobileAppPath').removeAttr('href').text('')
+            $del.addClass('hide')
+          } else {
+            RbHighbar.error(res.error_msg)
+          }
+        })
+      },
     })
   })
 

diff --git a/src/main/resources/web/assets/js/general/rb-datalist.common.js b/src/main/resources/web/assets/js/general/rb-datalist.common.js
@@ -1863,7 +1863,7 @@ class RecordMerger extends RbModalHandler {
                       if (idx === 0) return null
                       return (
                         <th key={idx} data-id={item[0]} onClick={() => this.setState({ keepMain: item[0] })}>
-                          <a href={`${rb.baseUrl}/app/redirect?id=${item[0]}&type=newtab`} target="_blank" title={$L('打开')}>
+                          <a href={`${rb.baseUrl}/app/redirect?id=${item[0]}&type=newtab`} target="_blank" title={$L('打开')} onClick={(e) => $stopEvent(e)}>
                             <b className="fs-12">{item[1]}</b>
                             <i className="icon zmdi zmdi zmdi-open-in-new ml-1" />
                           </a>
@@ -1876,6 +1876,7 @@ class RecordMerger extends RbModalHandler {
               <tbody ref={(c) => (this._$tbody = c)}>
                 {datas.map((item, idx) => {
                   if (idx === 0) return null
+                  if ($isSysMask(item[0][1])) return null
 
                   let chk
                   const data4field = []