~jinfei/pc-plat.git

parent: c9967063 | 补丁 | 提交 | show whitespace

2023-09-05

king

2023-09-05 7aa71d78c64b1698ded0f32470488f4268051621

2023-09-05

12个文件已修改

	src/api/index.js	14 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/index.js	8 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/tabviews/basetable/index.jsx	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/tabviews/custom/index.jsx	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/tabviews/zshare/actionList/excelInbutton/index.jsx	16 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/tabviews/zshare/actionList/exceloutbutton/index.jsx	56 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/tabviews/zshare/actionList/normalbutton/index.jsx	65 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/tabviews/zshare/actionList/printbutton/index.jsx	14 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/tabviews/zshare/mutilform/index.jsx	13 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/tabviews/zshare/topSearch/index.jsx	10 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/utils/utils-datamanage.js	16 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/views/systemfunc/index.jsx	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 src/api/index.js

@@ -521,11 +521,7 @@
    param.appkey = param.appkey || window.GLOB.appkey

    let url = '/webapi/dostars'
    if (window.GLOB.mkHS && window.GLOB.cloudServiceApi) { // HS下，且存在云端地址
      url = window.GLOB.cloudServiceApi
      param.userid = sessionStorage.getItem('CloudUserID') || ''
      param.LoginUID = sessionStorage.getItem('CloudLoginUID') || ''
    } else if (window.GLOB.mainSystemApi) {
    if (window.GLOB.mainSystemApi) {
      if (!window.GLOB.transfer) {
        url = window.GLOB.mainSystemApi
      } else {
@@ -553,13 +549,7 @@
    param.appkey = param.appkey || window.GLOB.appkey || ''

    let url = '/webapi/dostars'
    if (window.GLOB.mkHS) {          // HS下，单点登录服务器为云端
      if (window.GLOB.cloudServiceApi) { // 存在云端地址时，使用云端系统参数
        url = window.GLOB.cloudServiceApi
        param.userid = sessionStorage.getItem('CloudUserID') || ''
        param.LoginUID = sessionStorage.getItem('CloudLoginUID') || ''
      }
    } else if (window.GLOB.mainSystemApi) {
    if (window.GLOB.mainSystemApi) {
      if (!window.GLOB.transfer) {
        url = window.GLOB.mainSystemApi
      } else {

 src/index.js

@@ -112,6 +112,14 @@

    if (/#\/hs$/.test(window.location.href)) { // hs下不打印脚本
      GLOB.debugger = false

      if (GLOB.mainSystemApi) {
        GLOB.localSystemApi = GLOB.mainSystemApi
        GLOB.mainSystemApi = ''
      }
      if (GLOB.cloudServiceApi) {
        GLOB.mainSystemApi = GLOB.cloudServiceApi
      }
    }

    if (GLOB.sysType !== 'cloud') {

 src/tabviews/basetable/index.jsx

@@ -145,7 +145,7 @@
      }

      // HS不使用自定义设置
      if (result.LongParamUser && !window.GLOB.mkHS) {
      if (result.LongParamUser) {
        try { // 配置信息解析
          let userConfig = JSON.parse(window.decodeURIComponent(window.atob(result.LongParamUser)))
          if (userConfig) {

 src/tabviews/custom/index.jsx

@@ -177,7 +177,7 @@
      }

      // HS不使用自定义设置
      if (result.LongParamUser && !window.GLOB.mkHS) {
      if (result.LongParamUser) {
        try { // 配置信息解析
          let userConfig = JSON.parse(window.decodeURIComponent(window.atob(result.LongParamUser)))
          if (userConfig) {

 src/tabviews/zshare/actionList/excelInbutton/index.jsx

@@ -354,7 +354,7 @@

      param.LText = Utils.formatOptions(param.LText)
      param.secretkey = Utils.encrypt('', param.timestamp)
      if (window.GLOB.mkHS && param.timestamp) { // 云端验证
      if (window.GLOB.mkHS) { // 云端验证
        param.open_key = Utils.encryptOpenKey(param.secretkey, param.timestamp)
      }

@@ -473,19 +473,6 @@
        // 外部请求
        _outParam = fromJS(res).toJS()

        if (window.GLOB.mkHS) {
          if (btn.sysInterface === 'true' && window.GLOB.cloudServiceApi) {
            param.rduri = window.GLOB.cloudServiceApi
            param.userid = sessionStorage.getItem('CloudUserID') || ''
            param.LoginUID = sessionStorage.getItem('CloudLoginUID') || ''
          } else if (btn.sysInterface !== 'true') {
            if (window.GLOB.systemType === 'production' && btn.proInterface) {
              param.rduri = btn.proInterface
            } else {
              param.rduri = btn.interface
            }
          }
        } else {
          if (btn.sysInterface === 'true') {
            if (window.GLOB.mainSystemApi) {
              param.rduri = window.GLOB.mainSystemApi
@@ -506,7 +493,6 @@
            let host = window.GLOB.baseurl.replace(/http(s):\/\//, '')
            if (param.rduri.indexOf(host) === -1 && /\/dostars/.test(param.rduri)) {
              param.$login = true
            }
          }
        }


 src/tabviews/zshare/actionList/exceloutbutton/index.jsx

@@ -198,19 +198,6 @@
      } else if (btn.intertype === 'outer' && !btn.innerFunc) { // 使用外部函数
        let param = this.getExcelCustomParam(viewParam.orderBy, viewParam.search)

        if (window.GLOB.mkHS) {
          if (btn.sysInterface === 'true' && window.GLOB.cloudServiceApi) {
            param.rduri = window.GLOB.cloudServiceApi
            param.userid = sessionStorage.getItem('CloudUserID') || ''
            param.LoginUID = sessionStorage.getItem('CloudLoginUID') || ''
          } else if (btn.sysInterface !== 'true') {
            if (window.GLOB.systemType === 'production' && btn.proInterface) {
              param.rduri = btn.proInterface
            } else {
              param.rduri = btn.interface
            }
          }
        } else {
          if (btn.sysInterface === 'true') {
            if (window.GLOB.mainSystemApi) {
              param.rduri = window.GLOB.mainSystemApi
@@ -230,7 +217,6 @@
            let host = window.GLOB.baseurl.replace(/http(s):\/\//, '')
            if (param.rduri.indexOf(host) === -1 && /\/dostars/.test(param.rduri)) {
              param.$login = true
            }
          }
        }
  
@@ -259,19 +245,6 @@
            delete res.message
            delete res.status

            if (window.GLOB.mkHS) {
              if (btn.sysInterface === 'true' && window.GLOB.cloudServiceApi) {
                res.rduri = window.GLOB.cloudServiceApi
                res.userid = sessionStorage.getItem('CloudUserID') || ''
                res.LoginUID = sessionStorage.getItem('CloudLoginUID') || ''
              } else if (btn.sysInterface !== 'true') {
                if (window.GLOB.systemType === 'production' && btn.proInterface) {
                  res.rduri = btn.proInterface
                } else {
                  res.rduri = btn.interface
                }
              }
            } else {
              if (btn.sysInterface === 'true') {
                if (window.GLOB.mainSystemApi) {
                  res.rduri = window.GLOB.mainSystemApi
@@ -291,7 +264,6 @@
                let host = window.GLOB.baseurl.replace(/http(s):\/\//, '')
                if (res.rduri.indexOf(host) === -1 && /\/dostars/.test(res.rduri)) {
                  res.$login = true
                }
              }
            }
  
@@ -345,19 +317,6 @@
        delete res.message
        delete res.status

        if (window.GLOB.mkHS) {
          if (btn.sysInterface === 'true' && window.GLOB.cloudServiceApi) {
            res.rduri = window.GLOB.cloudServiceApi
            res.userid = sessionStorage.getItem('CloudUserID') || ''
            res.LoginUID = sessionStorage.getItem('CloudLoginUID') || ''
          } else if (btn.sysInterface !== 'true') {
            if (window.GLOB.systemType === 'production' && btn.proInterface) {
              res.rduri = btn.proInterface
            } else {
              res.rduri = btn.interface
            }
          }
        } else {
          if (btn.sysInterface === 'true') {
            if (window.GLOB.mainSystemApi) {
              res.rduri = window.GLOB.mainSystemApi
@@ -377,7 +336,6 @@
            let host = window.GLOB.baseurl.replace(/http(s):\/\//, '')
            if (res.rduri.indexOf(host) === -1 && /\/dostars/.test(res.rduri)) {
              res.$login = true
            }
          }
        }

@@ -433,19 +391,6 @@
    } else if (btn.intertype === 'outer' && !btn.innerFunc) { // 使用外部函数
      param = this.getExcelCustomParam(viewParam.orderBy, viewParam.search, true, pageIndex, pageSize)

      if (window.GLOB.mkHS) {
        if (btn.sysInterface === 'true' && window.GLOB.cloudServiceApi) {
          param.rduri = window.GLOB.cloudServiceApi
          param.userid = sessionStorage.getItem('CloudUserID') || ''
          param.LoginUID = sessionStorage.getItem('CloudLoginUID') || ''
        } else if (btn.sysInterface !== 'true') {
          if (window.GLOB.systemType === 'production' && btn.proInterface) {
            param.rduri = btn.proInterface
          } else {
            param.rduri = btn.interface
          }
        }
      } else {
        if (btn.sysInterface === 'true') {
          if (window.GLOB.mainSystemApi) {
            param.rduri = window.GLOB.mainSystemApi
@@ -466,7 +411,6 @@
          let host = window.GLOB.baseurl.replace(/http(s):\/\//, '')
          if (param.rduri.indexOf(host) === -1 && /\/dostars/.test(param.rduri)) {
            param.$login = true
          }
        }
      }
      

 src/tabviews/zshare/actionList/normalbutton/index.jsx

@@ -1531,9 +1531,11 @@
        }
      })

      keys = keys.join(',')

      lines.push({
        table: tb,
        insert: `Insert into ${pre}${tb} (${keys.join(',')},[mk_level],[mk_id],[mk_bid])`,
        table: md5(tb + keys),
        insert: `Insert into ${pre}${tb} (${keys},[mk_level],[mk_id],[mk_bid])`,
        select: `Select ${vals.join(',')},'${level}','${id}','${bid}'`
      })

@@ -1617,19 +1619,17 @@
      sql = sql.replace(/@Appkey@/ig, `'${window.GLOB.appkey || ''}'`)
      sql = sql.replace(/@typename@/ig, `'admin'`)

      if (sessionStorage.getItem('dataM') === 'true') { // 数据权限
        sql = sql.replace(/\$@/ig, '/*').replace(/@\$/ig, '*/').replace(/@datam@/ig, '\'Y\'')
      } else {
        sql = sql.replace(/@\$|\$@/ig, '').replace(/@datam@/ig, '\'\'')
      }

      if (window.GLOB.debugger === true) {
        console.info(sql.replace(/\n\s{8}/ig, '\n'))
      }

      param.LText = sql
      
      if (sessionStorage.getItem('dataM') === 'true') { // 数据权限
        param.LText = param.LText.replace(/\$@/ig, '/*').replace(/@\$/ig, '*/').replace(/@datam@/ig, '\'Y\'')
      } else {
        param.LText = param.LText.replace(/@\$|\$@/ig, '').replace(/@datam@/ig, '\'\'')
      }
      param.LText = param.LText.replace(/\$check@|@check\$/ig, '')

      param.exec_type = 'y' // 后台解码
      param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
      param.secretkey = Utils.encrypt('', param.timestamp)
@@ -1838,30 +1838,7 @@
    if (btn.outerFunc) {
      result.func = btn.outerFunc
    }
    if (window.GLOB.mkHS) {
      if (btn.outerFunc === 's_app_version_upt') { // special 更新版本号时访问sso
        if (window.GLOB.mainSystemApi) {
          result.rduri = window.GLOB.mainSystemApi
        }
      } else if (btn.sysInterface === 'true' && window.GLOB.cloudServiceApi) {
        result.rduri = window.GLOB.cloudServiceApi
        result.userid = sessionStorage.getItem('CloudUserID') || ''
        result.LoginUID = sessionStorage.getItem('CloudLoginUID') || ''
      } else if (btn.sysInterface !== 'true') {
        if (window.GLOB.systemType === 'production' && btn.proInterface) {
          result.rduri = btn.proInterface
        } else {
          result.rduri = btn.interface
        }
      }

      // special 函数 s_sDataDictb_TBBack 云端验证
      if (result.func === 's_sDataDictb_TBBack' && result.LTextOut) {
        result.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
        result.secretkey = Utils.encrypt(result.LTextOut, result.timestamp)
        result.open_key = Utils.encryptOpenKey(result.secretkey, result.timestamp)
      }
    } else {
      if (btn.sysInterface === 'true') {
        if (window.GLOB.mainSystemApi) {
          result.rduri = window.GLOB.mainSystemApi
@@ -1884,6 +1861,20 @@
        if (result.rduri.indexOf(host) === -1 && /\/dostars/.test(result.rduri)) {
          result.$login = true
        }
    }

    if (window.GLOB.mkHS) {
      if (result.func === 's_app_version_upt') { // special 更新版本号时访问sso
        delete result.rduri
        if (window.GLOB.localSystemApi) {
          result.rduri = window.GLOB.localSystemApi
        }
        result.userid = sessionStorage.getItem('LocalUserID') || ''
        result.LoginUID = sessionStorage.getItem('LocalLoginUID') || ''
      } else if (result.func === 's_sDataDictb_TBBack' && result.LTextOut) { // special 函数 s_sDataDictb_TBBack 云端验证
        result.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
        result.secretkey = Utils.encrypt(result.LTextOut, result.timestamp)
        result.open_key = Utils.encryptOpenKey(result.secretkey, result.timestamp)
      }
    }

@@ -2011,10 +2002,12 @@
      callParam.open_key = Utils.encryptOpenKey(callParam.secretkey, callParam.timestamp)
    }

    if (callParam.UpType === 'SSO' && window.GLOB.mainSystemApi) {
      ssoParam = fromJS(callParam).toJS()
    callParam.userid = sessionStorage.getItem('LocalUserID') || ''
    callParam.LoginUID = sessionStorage.getItem('LocalLoginUID') || ''

      ssoParam.rduri = window.GLOB.mainSystemApi
    if (callParam.UpType === 'SSO' && window.GLOB.localSystemApi) {
      ssoParam = fromJS(callParam).toJS()
      ssoParam.rduri = window.GLOB.localSystemApi

      delete ssoParam.UpType
    } else {

 src/tabviews/zshare/actionList/printbutton/index.jsx

@@ -1217,19 +1217,6 @@
      // 外部请求
      _outParam = JSON.parse(JSON.stringify(res))

      if (window.GLOB.mkHS) {
        if (btn.sysInterface === 'true' && window.GLOB.cloudServiceApi) {
          res.rduri = window.GLOB.cloudServiceApi
          res.userid = sessionStorage.getItem('CloudUserID') || ''
          res.LoginUID = sessionStorage.getItem('CloudLoginUID') || ''
        } else if (btn.sysInterface !== 'true') {
          if (window.GLOB.systemType === 'production' && btn.proInterface) {
            res.rduri = btn.proInterface
          } else {
            res.rduri = btn.interface
          }
        }
      } else {
        if (btn.sysInterface === 'true') {
          if (window.GLOB.mainSystemApi) {
            res.rduri = window.GLOB.mainSystemApi
@@ -1251,7 +1238,6 @@
          let host = window.GLOB.baseurl.replace(/http(s):\/\//, '')
          if (res.rduri.indexOf(host) === -1 && /\/dostars/.test(res.rduri)) {
            res.$login = true
          }
        }
      }


 src/tabviews/zshare/mutilform/index.jsx

@@ -751,15 +751,11 @@
      mainparam.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
      mainparam.secretkey = Utils.encrypt(mainparam.LText, mainparam.timestamp)

      if (window.GLOB.mainSystemApi) {
        mainparam.rduri = window.GLOB.mainSystemApi
      }
      if (window.GLOB.mkHS) { // 云端数据验证
        mainparam.open_key = Utils.encryptOpenKey(mainparam.secretkey, mainparam.timestamp)
        if (window.GLOB.cloudServiceApi) {
          mainparam.rduri = window.GLOB.cloudServiceApi
          mainparam.userid = sessionStorage.getItem('CloudUserID') || ''
          mainparam.LoginUID = sessionStorage.getItem('CloudLoginUID') || ''
        }
      } else if (window.GLOB.mainSystemApi) {
        mainparam.rduri = window.GLOB.mainSystemApi
      }

      deffers.push(
@@ -823,6 +819,9 @@
      if (form.database === 'sso' && window.GLOB.mainSystemApi) {
        param.rduri = window.GLOB.mainSystemApi
      }
      if (window.GLOB.mkHS) { // 云端数据验证
        param.open_key = Utils.encryptOpenKey(param.secretkey, param.timestamp)
      }
  
      return (
        new Promise(resolve => {

 src/tabviews/zshare/topSearch/index.jsx

@@ -331,15 +331,11 @@
      mainparam.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
      mainparam.secretkey = Utils.encrypt(mainparam.LText, mainparam.timestamp)

      if (window.GLOB.mainSystemApi) {
        mainparam.rduri = window.GLOB.mainSystemApi
      }
      if (window.GLOB.mkHS) { // 云端数据验证
        mainparam.open_key = Utils.encryptOpenKey(mainparam.secretkey, mainparam.timestamp)
        if (window.GLOB.cloudServiceApi) {
          mainparam.rduri = window.GLOB.cloudServiceApi
          mainparam.userid = sessionStorage.getItem('CloudUserID') || ''
          mainparam.LoginUID = sessionStorage.getItem('CloudLoginUID') || ''
        }
      } else if (window.GLOB.mainSystemApi) {
        mainparam.rduri = window.GLOB.mainSystemApi
      }

      deffers.push(

 src/utils/utils-datamanage.js

@@ -59,15 +59,6 @@
        param.fullname = sessionStorage.getItem('Full_Name') || ''
      }
    } else {
      if (window.GLOB.mkHS) {
        if (setting.sysInterface === 'true' && window.GLOB.cloudServiceApi) {
          param.rduri = window.GLOB.cloudServiceApi
          param.userid = sessionStorage.getItem('CloudUserID') || ''
          param.LoginUID = sessionStorage.getItem('CloudLoginUID') || ''
        } else if (setting.sysInterface !== 'true') {
          param.rduri = setting.interface
        }
      } else {
        if (setting.sysInterface === 'true') {
          if (window.GLOB.mainSystemApi) {
            param.rduri = window.GLOB.mainSystemApi
@@ -87,7 +78,6 @@
          let host = window.GLOB.baseurl.replace(/http(s):\/\//, '')
          if (param.rduri.indexOf(host) === -1 && /\/dostars/.test(param.rduri)) {
            param.$login = true
          }
        }
      }

@@ -290,10 +280,8 @@
      param.open_key = Utils.encryptOpenKey(param.secretkey, param.timestamp)

      // special HS自定义函数查询
      if (setting.tableName === 's_custom_script' && window.GLOB.cloudServiceApi) {
        param.rduri = window.GLOB.cloudServiceApi
        param.userid = sessionStorage.getItem('CloudUserID') || ''
        param.LoginUID = sessionStorage.getItem('CloudLoginUID') || ''
      if (setting.tableName === 's_custom_script' && window.GLOB.mainSystemApi) {
        param.rduri = window.GLOB.mainSystemApi
      }
    }


 src/views/systemfunc/index.jsx

@@ -17,10 +17,14 @@
    if (!sessionStorage.getItem('UserID')) {
      this.props.history.replace('/login')
    } else {
      sessionStorage.setItem('LocalUserID', sessionStorage.getItem('UserID'))
      sessionStorage.setItem('LocalLoginUID', sessionStorage.getItem('LoginUID'))
      sessionStorage.setItem('role_id', sessionStorage.getItem('cloudRole_id'))
      sessionStorage.setItem('dataM', sessionStorage.getItem('cloudDataM'))
      sessionStorage.setItem('User_Name', sessionStorage.getItem('CloudUserName'))
      sessionStorage.setItem('Full_Name', sessionStorage.getItem('CloudFullName'))
      sessionStorage.setItem('UserID', sessionStorage.getItem('CloudUserID'))
      sessionStorage.setItem('LoginUID', sessionStorage.getItem('CloudLoginUID'))
  
      document.body.className = 'mk-blue-black'
      window.GLOB.dataFormat = false // 去除水印

			@@ -521,11 +521,7 @@
			param.appkey = param.appkey \|\| window.GLOB.appkey

			let url = '/webapi/dostars'
			if (window.GLOB.mkHS && window.GLOB.cloudServiceApi) { // HS下，且存在云端地址
			url = window.GLOB.cloudServiceApi
			param.userid = sessionStorage.getItem('CloudUserID') \|\| ''
			param.LoginUID = sessionStorage.getItem('CloudLoginUID') \|\| ''
			} else if (window.GLOB.mainSystemApi) {
			if (window.GLOB.mainSystemApi) {
			if (!window.GLOB.transfer) {
			url = window.GLOB.mainSystemApi
			} else {
			@@ -553,13 +549,7 @@
			param.appkey = param.appkey \|\| window.GLOB.appkey \|\| ''

			let url = '/webapi/dostars'
			if (window.GLOB.mkHS) { // HS下，单点登录服务器为云端
			if (window.GLOB.cloudServiceApi) { // 存在云端地址时，使用云端系统参数
			url = window.GLOB.cloudServiceApi
			param.userid = sessionStorage.getItem('CloudUserID') \|\| ''
			param.LoginUID = sessionStorage.getItem('CloudLoginUID') \|\| ''
			}
			} else if (window.GLOB.mainSystemApi) {
			if (window.GLOB.mainSystemApi) {
			if (!window.GLOB.transfer) {
			url = window.GLOB.mainSystemApi
			} else {

			@@ -112,6 +112,14 @@

			if (/#\/hs$/.test(window.location.href)) { // hs下不打印脚本
			GLOB.debugger = false

			if (GLOB.mainSystemApi) {
			GLOB.localSystemApi = GLOB.mainSystemApi
			GLOB.mainSystemApi = ''
			}
			if (GLOB.cloudServiceApi) {
			GLOB.mainSystemApi = GLOB.cloudServiceApi
			}
			}

			if (GLOB.sysType !== 'cloud') {

			@@ -145,7 +145,7 @@
			}

			// HS不使用自定义设置
			if (result.LongParamUser && !window.GLOB.mkHS) {
			if (result.LongParamUser) {
			try { // 配置信息解析
			let userConfig = JSON.parse(window.decodeURIComponent(window.atob(result.LongParamUser)))
			if (userConfig) {

			@@ -177,7 +177,7 @@
			}

			// HS不使用自定义设置
			if (result.LongParamUser && !window.GLOB.mkHS) {
			if (result.LongParamUser) {
			try { // 配置信息解析
			let userConfig = JSON.parse(window.decodeURIComponent(window.atob(result.LongParamUser)))
			if (userConfig) {

			@@ -354,7 +354,7 @@

			param.LText = Utils.formatOptions(param.LText)
			param.secretkey = Utils.encrypt('', param.timestamp)
			if (window.GLOB.mkHS && param.timestamp) { // 云端验证
			if (window.GLOB.mkHS) { // 云端验证
			param.open_key = Utils.encryptOpenKey(param.secretkey, param.timestamp)
			}

			@@ -473,19 +473,6 @@
			// 外部请求
			_outParam = fromJS(res).toJS()

			if (window.GLOB.mkHS) {
			if (btn.sysInterface === 'true' && window.GLOB.cloudServiceApi) {
			param.rduri = window.GLOB.cloudServiceApi
			param.userid = sessionStorage.getItem('CloudUserID') \|\| ''
			param.LoginUID = sessionStorage.getItem('CloudLoginUID') \|\| ''
			} else if (btn.sysInterface !== 'true') {
			if (window.GLOB.systemType === 'production' && btn.proInterface) {
			param.rduri = btn.proInterface
			} else {
			param.rduri = btn.interface
			}
			}
			} else {
			if (btn.sysInterface === 'true') {
			if (window.GLOB.mainSystemApi) {
			param.rduri = window.GLOB.mainSystemApi
			@@ -506,7 +493,6 @@
			let host = window.GLOB.baseurl.replace(/http(s):\/\//, '')
			if (param.rduri.indexOf(host) === -1 && /\/dostars/.test(param.rduri)) {
			param.$login = true
			}
			}
			}

			@@ -198,19 +198,6 @@
			} else if (btn.intertype === 'outer' && !btn.innerFunc) { // 使用外部函数
			let param = this.getExcelCustomParam(viewParam.orderBy, viewParam.search)

			if (window.GLOB.mkHS) {
			if (btn.sysInterface === 'true' && window.GLOB.cloudServiceApi) {
			param.rduri = window.GLOB.cloudServiceApi
			param.userid = sessionStorage.getItem('CloudUserID') \|\| ''
			param.LoginUID = sessionStorage.getItem('CloudLoginUID') \|\| ''
			} else if (btn.sysInterface !== 'true') {
			if (window.GLOB.systemType === 'production' && btn.proInterface) {
			param.rduri = btn.proInterface
			} else {
			param.rduri = btn.interface
			}
			}
			} else {
			if (btn.sysInterface === 'true') {
			if (window.GLOB.mainSystemApi) {
			param.rduri = window.GLOB.mainSystemApi
			@@ -230,7 +217,6 @@
			let host = window.GLOB.baseurl.replace(/http(s):\/\//, '')
			if (param.rduri.indexOf(host) === -1 && /\/dostars/.test(param.rduri)) {
			param.$login = true
			}
			}
			}

			@@ -259,19 +245,6 @@
			delete res.message
			delete res.status

			if (window.GLOB.mkHS) {
			if (btn.sysInterface === 'true' && window.GLOB.cloudServiceApi) {
			res.rduri = window.GLOB.cloudServiceApi
			res.userid = sessionStorage.getItem('CloudUserID') \|\| ''
			res.LoginUID = sessionStorage.getItem('CloudLoginUID') \|\| ''
			} else if (btn.sysInterface !== 'true') {
			if (window.GLOB.systemType === 'production' && btn.proInterface) {
			res.rduri = btn.proInterface
			} else {
			res.rduri = btn.interface
			}
			}
			} else {
			if (btn.sysInterface === 'true') {
			if (window.GLOB.mainSystemApi) {
			res.rduri = window.GLOB.mainSystemApi
			@@ -291,7 +264,6 @@
			let host = window.GLOB.baseurl.replace(/http(s):\/\//, '')
			if (res.rduri.indexOf(host) === -1 && /\/dostars/.test(res.rduri)) {
			res.$login = true
			}
			}
			}

			@@ -345,19 +317,6 @@
			delete res.message
			delete res.status

			if (window.GLOB.mkHS) {
			if (btn.sysInterface === 'true' && window.GLOB.cloudServiceApi) {
			res.rduri = window.GLOB.cloudServiceApi
			res.userid = sessionStorage.getItem('CloudUserID') \|\| ''
			res.LoginUID = sessionStorage.getItem('CloudLoginUID') \|\| ''
			} else if (btn.sysInterface !== 'true') {
			if (window.GLOB.systemType === 'production' && btn.proInterface) {
			res.rduri = btn.proInterface
			} else {
			res.rduri = btn.interface
			}
			}
			} else {
			if (btn.sysInterface === 'true') {
			if (window.GLOB.mainSystemApi) {
			res.rduri = window.GLOB.mainSystemApi
			@@ -377,7 +336,6 @@
			let host = window.GLOB.baseurl.replace(/http(s):\/\//, '')
			if (res.rduri.indexOf(host) === -1 && /\/dostars/.test(res.rduri)) {
			res.$login = true
			}
			}
			}

			@@ -433,19 +391,6 @@
			} else if (btn.intertype === 'outer' && !btn.innerFunc) { // 使用外部函数
			param = this.getExcelCustomParam(viewParam.orderBy, viewParam.search, true, pageIndex, pageSize)

			if (window.GLOB.mkHS) {
			if (btn.sysInterface === 'true' && window.GLOB.cloudServiceApi) {
			param.rduri = window.GLOB.cloudServiceApi
			param.userid = sessionStorage.getItem('CloudUserID') \|\| ''
			param.LoginUID = sessionStorage.getItem('CloudLoginUID') \|\| ''
			} else if (btn.sysInterface !== 'true') {
			if (window.GLOB.systemType === 'production' && btn.proInterface) {
			param.rduri = btn.proInterface
			} else {
			param.rduri = btn.interface
			}
			}
			} else {
			if (btn.sysInterface === 'true') {
			if (window.GLOB.mainSystemApi) {
			param.rduri = window.GLOB.mainSystemApi
			@@ -466,7 +411,6 @@
			let host = window.GLOB.baseurl.replace(/http(s):\/\//, '')
			if (param.rduri.indexOf(host) === -1 && /\/dostars/.test(param.rduri)) {
			param.$login = true
			}
			}
			}

			@@ -1531,9 +1531,11 @@
			}
			})

			keys = keys.join(',')

			lines.push({
			table: tb,
			insert: `Insert into ${pre}${tb} (${keys.join(',')},[mk_level],[mk_id],[mk_bid])`,
			table: md5(tb + keys),
			insert: `Insert into ${pre}${tb} (${keys},[mk_level],[mk_id],[mk_bid])`,
			select: `Select ${vals.join(',')},'${level}','${id}','${bid}'`
			})

			@@ -1617,19 +1619,17 @@
			sql = sql.replace(/@Appkey@/ig, `'${window.GLOB.appkey \|\| ''}'`)
			sql = sql.replace(/@typename@/ig, `'admin'`)

			if (sessionStorage.getItem('dataM') === 'true') { // 数据权限
			sql = sql.replace(/\$@/ig, '/').replace(/@\$/ig, '/').replace(/@datam@/ig, '\'Y\'')
			} else {
			sql = sql.replace(/@\$\|\$@/ig, '').replace(/@datam@/ig, '\'\'')
			}

			if (window.GLOB.debugger === true) {
			console.info(sql.replace(/\n\s{8}/ig, '\n'))
			}

			param.LText = sql

			if (sessionStorage.getItem('dataM') === 'true') { // 数据权限
			param.LText = param.LText.replace(/\$@/ig, '/').replace(/@\$/ig, '/').replace(/@datam@/ig, '\'Y\'')
			} else {
			param.LText = param.LText.replace(/@\$\|\$@/ig, '').replace(/@datam@/ig, '\'\'')
			}
			param.LText = param.LText.replace(/\$check@\|@check\$/ig, '')

			param.exec_type = 'y' // 后台解码
			param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
			param.secretkey = Utils.encrypt('', param.timestamp)
			@@ -1838,30 +1838,7 @@
			if (btn.outerFunc) {
			result.func = btn.outerFunc
			}
			if (window.GLOB.mkHS) {
			if (btn.outerFunc === 's_app_version_upt') { // special 更新版本号时访问sso
			if (window.GLOB.mainSystemApi) {
			result.rduri = window.GLOB.mainSystemApi
			}
			} else if (btn.sysInterface === 'true' && window.GLOB.cloudServiceApi) {
			result.rduri = window.GLOB.cloudServiceApi
			result.userid = sessionStorage.getItem('CloudUserID') \|\| ''
			result.LoginUID = sessionStorage.getItem('CloudLoginUID') \|\| ''
			} else if (btn.sysInterface !== 'true') {
			if (window.GLOB.systemType === 'production' && btn.proInterface) {
			result.rduri = btn.proInterface
			} else {
			result.rduri = btn.interface
			}
			}

			// special 函数 s_sDataDictb_TBBack 云端验证
			if (result.func === 's_sDataDictb_TBBack' && result.LTextOut) {
			result.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
			result.secretkey = Utils.encrypt(result.LTextOut, result.timestamp)
			result.open_key = Utils.encryptOpenKey(result.secretkey, result.timestamp)
			}
			} else {
			if (btn.sysInterface === 'true') {
			if (window.GLOB.mainSystemApi) {
			result.rduri = window.GLOB.mainSystemApi
			@@ -1884,6 +1861,20 @@
			if (result.rduri.indexOf(host) === -1 && /\/dostars/.test(result.rduri)) {
			result.$login = true
			}
			}

			if (window.GLOB.mkHS) {
			if (result.func === 's_app_version_upt') { // special 更新版本号时访问sso
			delete result.rduri
			if (window.GLOB.localSystemApi) {
			result.rduri = window.GLOB.localSystemApi
			}
			result.userid = sessionStorage.getItem('LocalUserID') \|\| ''
			result.LoginUID = sessionStorage.getItem('LocalLoginUID') \|\| ''
			} else if (result.func === 's_sDataDictb_TBBack' && result.LTextOut) { // special 函数 s_sDataDictb_TBBack 云端验证
			result.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
			result.secretkey = Utils.encrypt(result.LTextOut, result.timestamp)
			result.open_key = Utils.encryptOpenKey(result.secretkey, result.timestamp)
			}
			}

			@@ -2011,10 +2002,12 @@
			callParam.open_key = Utils.encryptOpenKey(callParam.secretkey, callParam.timestamp)
			}

			if (callParam.UpType === 'SSO' && window.GLOB.mainSystemApi) {
			ssoParam = fromJS(callParam).toJS()
			callParam.userid = sessionStorage.getItem('LocalUserID') \|\| ''
			callParam.LoginUID = sessionStorage.getItem('LocalLoginUID') \|\| ''

			ssoParam.rduri = window.GLOB.mainSystemApi
			if (callParam.UpType === 'SSO' && window.GLOB.localSystemApi) {
			ssoParam = fromJS(callParam).toJS()
			ssoParam.rduri = window.GLOB.localSystemApi

			delete ssoParam.UpType
			} else {

			@@ -1217,19 +1217,6 @@
			// 外部请求
			_outParam = JSON.parse(JSON.stringify(res))

			if (window.GLOB.mkHS) {
			if (btn.sysInterface === 'true' && window.GLOB.cloudServiceApi) {
			res.rduri = window.GLOB.cloudServiceApi
			res.userid = sessionStorage.getItem('CloudUserID') \|\| ''
			res.LoginUID = sessionStorage.getItem('CloudLoginUID') \|\| ''
			} else if (btn.sysInterface !== 'true') {
			if (window.GLOB.systemType === 'production' && btn.proInterface) {
			res.rduri = btn.proInterface
			} else {
			res.rduri = btn.interface
			}
			}
			} else {
			if (btn.sysInterface === 'true') {
			if (window.GLOB.mainSystemApi) {
			res.rduri = window.GLOB.mainSystemApi
			@@ -1251,7 +1238,6 @@
			let host = window.GLOB.baseurl.replace(/http(s):\/\//, '')
			if (res.rduri.indexOf(host) === -1 && /\/dostars/.test(res.rduri)) {
			res.$login = true
			}
			}
			}

			@@ -751,15 +751,11 @@
			mainparam.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
			mainparam.secretkey = Utils.encrypt(mainparam.LText, mainparam.timestamp)

			if (window.GLOB.mainSystemApi) {
			mainparam.rduri = window.GLOB.mainSystemApi
			}
			if (window.GLOB.mkHS) { // 云端数据验证
			mainparam.open_key = Utils.encryptOpenKey(mainparam.secretkey, mainparam.timestamp)
			if (window.GLOB.cloudServiceApi) {
			mainparam.rduri = window.GLOB.cloudServiceApi
			mainparam.userid = sessionStorage.getItem('CloudUserID') \|\| ''
			mainparam.LoginUID = sessionStorage.getItem('CloudLoginUID') \|\| ''
			}
			} else if (window.GLOB.mainSystemApi) {
			mainparam.rduri = window.GLOB.mainSystemApi
			}

			deffers.push(
			@@ -823,6 +819,9 @@
			if (form.database === 'sso' && window.GLOB.mainSystemApi) {
			param.rduri = window.GLOB.mainSystemApi
			}
			if (window.GLOB.mkHS) { // 云端数据验证
			param.open_key = Utils.encryptOpenKey(param.secretkey, param.timestamp)
			}

			return (
			new Promise(resolve => {

			@@ -331,15 +331,11 @@
			mainparam.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
			mainparam.secretkey = Utils.encrypt(mainparam.LText, mainparam.timestamp)

			if (window.GLOB.mainSystemApi) {
			mainparam.rduri = window.GLOB.mainSystemApi
			}
			if (window.GLOB.mkHS) { // 云端数据验证
			mainparam.open_key = Utils.encryptOpenKey(mainparam.secretkey, mainparam.timestamp)
			if (window.GLOB.cloudServiceApi) {
			mainparam.rduri = window.GLOB.cloudServiceApi
			mainparam.userid = sessionStorage.getItem('CloudUserID') \|\| ''
			mainparam.LoginUID = sessionStorage.getItem('CloudLoginUID') \|\| ''
			}
			} else if (window.GLOB.mainSystemApi) {
			mainparam.rduri = window.GLOB.mainSystemApi
			}

			deffers.push(

			@@ -59,15 +59,6 @@
			param.fullname = sessionStorage.getItem('Full_Name') \|\| ''
			}
			} else {
			if (window.GLOB.mkHS) {
			if (setting.sysInterface === 'true' && window.GLOB.cloudServiceApi) {
			param.rduri = window.GLOB.cloudServiceApi
			param.userid = sessionStorage.getItem('CloudUserID') \|\| ''
			param.LoginUID = sessionStorage.getItem('CloudLoginUID') \|\| ''
			} else if (setting.sysInterface !== 'true') {
			param.rduri = setting.interface
			}
			} else {
			if (setting.sysInterface === 'true') {
			if (window.GLOB.mainSystemApi) {
			param.rduri = window.GLOB.mainSystemApi
			@@ -87,7 +78,6 @@
			let host = window.GLOB.baseurl.replace(/http(s):\/\//, '')
			if (param.rduri.indexOf(host) === -1 && /\/dostars/.test(param.rduri)) {
			param.$login = true
			}
			}
			}

			@@ -290,10 +280,8 @@
			param.open_key = Utils.encryptOpenKey(param.secretkey, param.timestamp)

			// special HS自定义函数查询
			if (setting.tableName === 's_custom_script' && window.GLOB.cloudServiceApi) {
			param.rduri = window.GLOB.cloudServiceApi
			param.userid = sessionStorage.getItem('CloudUserID') \|\| ''
			param.LoginUID = sessionStorage.getItem('CloudLoginUID') \|\| ''
			if (setting.tableName === 's_custom_script' && window.GLOB.mainSystemApi) {
			param.rduri = window.GLOB.mainSystemApi
			}
			}

			@@ -17,10 +17,14 @@
			if (!sessionStorage.getItem('UserID')) {
			this.props.history.replace('/login')
			} else {
			sessionStorage.setItem('LocalUserID', sessionStorage.getItem('UserID'))
			sessionStorage.setItem('LocalLoginUID', sessionStorage.getItem('LoginUID'))
			sessionStorage.setItem('role_id', sessionStorage.getItem('cloudRole_id'))
			sessionStorage.setItem('dataM', sessionStorage.getItem('cloudDataM'))
			sessionStorage.setItem('User_Name', sessionStorage.getItem('CloudUserName'))
			sessionStorage.setItem('Full_Name', sessionStorage.getItem('CloudFullName'))
			sessionStorage.setItem('UserID', sessionStorage.getItem('CloudUserID'))
			sessionStorage.setItem('LoginUID', sessionStorage.getItem('CloudLoginUID'))

			document.body.className = 'mk-blue-black'
			window.GLOB.dataFormat = false // 去除水印