Merge branch 'develop'

king

2024-08-03 c547c75fce3c2d9badcb496da7d8e5443e22dbfc

 src/tabviews/custom/components/table/edit-table/normalTable/index.jsx

@@ -956,7 +956,7 @@
            // eslint-disable-next-line
            content = eval(content)
          } catch (e) {
            console.info(content)
            window.mkInfo(content)
            console.warn(e)
            content = ''
          }
@@ -1275,7 +1275,7 @@
            // eslint-disable-next-line
            content = eval(content)
          } catch (e) {
            console.info(content)
            window.mkInfo(content)
            console.warn(e)
            content = ''
          }
@@ -1892,7 +1892,7 @@
        sql = sql.replace(/@BID@/ig, `'${BID}'`)

        if (debug) {
          console.info(sql)
          window.mkInfo(sql)
        }

        sql = sql.replace(/%/ig, ' mpercent ')
@@ -1905,7 +1905,7 @@
        sql = sql.replace(/@BID@/ig, `'${BID}'`)

        if (debug) {
          console.info(sql)
          window.mkInfo(sql)
        }

        sql = sql.replace(/%/ig, ' mpercent ')