Merge branch 'master' into positec

king

2023-06-29 48db4d4b22331f32bf6c6a0956a7cd4245ad6fde

 src/tabviews/zshare/normalTable/index.jsx

@@ -710,7 +710,7 @@
      }

      if (item.joint === 'true' && _href) {
        let _quary = `id=${record[this.props.setting.primaryKey]}&userid=${sessionStorage.getItem('UserID')}&appkey=${window.GLOB.appkey}&LoginUID=${sessionStorage.getItem('LoginUID')}`
        let _quary = `id=${record[this.props.setting.primaryKey]}&appkey=${window.GLOB.appkey}&userid=${sessionStorage.getItem('UserID')}&LoginUID=${sessionStorage.getItem('LoginUID')}`
        let _param = ''
        
        try {
@@ -783,6 +783,7 @@
                <NewPageButton
                  key={btn.uuid}
                  btn={btn}
                  BID={record.$$BID}
                  disabled={record.$disabled}
                  selectedData={[record]}
                  BData={this.props.BData}
@@ -912,7 +913,7 @@
          }

          if (col.joint === 'true' && _href) {
            let _quary = `id=${record[this.props.setting.primaryKey]}&userid=${sessionStorage.getItem('UserID')}&appkey=${window.GLOB.appkey}&LoginUID=${sessionStorage.getItem('LoginUID')}`
            let _quary = `id=${record[this.props.setting.primaryKey]}&appkey=${window.GLOB.appkey}&userid=${sessionStorage.getItem('UserID')}&LoginUID=${sessionStorage.getItem('LoginUID')}`
            let _param = ''

            try {