Merge branch 'master' into positec

king

2023-07-28 839d9e1d6481ec2ca1a5979f24256ef3b2e741b1

 src/tabviews/custom/components/card/table-card/index.jsx

@@ -403,9 +403,14 @@
        })
      }

      let total = result.total || 0
      if (config.setting.custompage && data.length) {
        total = data[data.length - 1].mk_total || 0
      }

      this.setState({
        data: data,
        total: result.total,
        total: total,
        loading: false
      })