From a02fc6a77fa1b35c6516b2d37108d80e260c6c85 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 07 十一月 2024 22:05:08 +0800
Subject: [PATCH] 2024-11-07

---
 src/tabviews/custom/components/table/edit-table/normalTable/index.jsx |   37 ++++++++++++++++++++++++++++++++-----
 1 files changed, 32 insertions(+), 5 deletions(-)

diff --git a/src/tabviews/custom/components/table/edit-table/normalTable/index.jsx b/src/tabviews/custom/components/table/edit-table/normalTable/index.jsx
index d5c4720..e8b2a2b 100644
--- a/src/tabviews/custom/components/table/edit-table/normalTable/index.jsx
+++ b/src/tabviews/custom/components/table/edit-table/normalTable/index.jsx
@@ -877,6 +877,9 @@
         }
         if (col.format === 'percent') {
           content = content * 100
+          if (!col.round) {
+            content = +content.toFixed(2)
+          }
         } else if (col.format === 'abs') {
           content = Math.abs(content)
         }
@@ -961,6 +964,15 @@
           content = ''
         }
       } else {
+        if (col.eval === 'false' && col.noValue === 'hide') { // 绌哄�奸殣钘�
+          Object.keys(record).forEach(key => {
+            if (/^\$/.test(key)) return
+            if (record[key]) return
+
+            content = content.replace(new RegExp('[^@]*@' + key + '@', 'ig'), '')
+          })
+        }
+
         Object.keys(record).forEach(key => {
           let reg = new RegExp('@' + key + '@', 'ig')
           content = content.replace(reg, record[key])
@@ -1207,6 +1219,9 @@
           }
           if (col.format === 'percent') {
             content = content * 100
+            if (!col.round) {
+              content = +content.toFixed(2)
+            }
           } else if (col.format === 'abs') {
             content = Math.abs(content)
           }
@@ -1280,6 +1295,15 @@
           content = ''
         }
       } else {
+        if (col.eval === 'false' && col.noValue === 'hide') { // 绌哄�奸殣钘�
+          Object.keys(record).forEach(key => {
+            if (/^\$/.test(key)) return
+            if (record[key]) return
+
+            content = content.replace(new RegExp('[^@]*@' + key + '@', 'ig'), '')
+          })
+        }
+        
         Object.keys(record).forEach(key => {
           let reg = new RegExp('@' + key + '@', 'ig')
           content = content.replace(reg, record[key])
@@ -1962,7 +1986,7 @@
       deffers.push(
         new Promise(resolve => {
           Api.getSystemCacheConfig(param, false).then(res => {
-            if (!res.status) {
+            if (!res.status && res.ErrCode !== '-2') {
               notification.warning({
                 top: 92,
                 message: res.message,
@@ -2001,7 +2025,7 @@
       deffers.push(
         new Promise(resolve => {
           Api.getSystemCacheConfig(mainparam, false).then(res => {
-            if (!res.status) {
+            if (!res.status && res.ErrCode !== '-2') {
               notification.warning({
                 top: 92,
                 message: res.message,
@@ -2062,8 +2086,8 @@
 
       let cell = {
         id: ex.id,
-        exps: exps,
         menuname: item.label + '锛堣〃鍗曪級',
+        exps: exps,
         md5_id: ''
       }
 
@@ -2077,6 +2101,7 @@
     if (localItems.length) {
       deffers.push({
         $backend: true,
+        $type: 's_Get_SelectedList',
         data: localItems
       })
     }
@@ -2084,6 +2109,7 @@
     if (mainItems.length) {
       deffers.push({
         $backend: true,
+        $type: 's_Get_SelectedList',
         data: mainItems,
         rduri: window.GLOB.mainSystemApi
       })
@@ -2094,7 +2120,7 @@
     deffers = deffers.map(item => {
       return new Promise(resolve => {
         Api.getSystemCacheConfig(item, false).then(res => {
-          if (!res.status) {
+          if (!res.status && res.ErrCode !== '-2') {
             notification.warning({
               top: 92,
               message: res.message,
@@ -2632,10 +2658,11 @@
 
     return {
       $backend: true,
+      $type: 's_TableData_InUpDe',
       data: [{
         id: ex.id,
-        exps: exps,
         menuname: btn.logLabel || '',
+        exps: exps,
         md5_id: md5_id
       }]
     }

--
Gitblit v1.8.0