Merge branch 'positec' into dms

king

2025-04-08 475ae0c8764deff7895f06327940e8e59e2acf94

Merge branch 'positec' into dms

 src/templates/zshare/modalform/index.jsx

@@ -394,11 +394,11 @@
      this.record.initval = ''
      this.record.fieldlength = 50
      _fieldval.initval = ''

      
      if (value === 'text' || value === 'number') {
        this.record.enter = 'sub'
        _fieldval.enter = 'sub'
      } else if (['select', 'link', 'popSelect', 'vercode'].includes(value)) {
      } else if (['select', 'link', 'switch', 'check', 'date', 'datemonth', 'popSelect', 'vercode'].includes(value)) {
        _fieldval.enter = 'false'
      }


 src/views/syscheck/index.jsx

@@ -523,7 +523,22 @@
  
          if (item.setting && item.setting.interType === 'system') {
            item.setting.$name = item.$menuname || ''
  

            if (!item.setting.primaryKey) {
              window.mkInfo(`${item.$menuname} 未设置主键！`)
            } else if (item.columns) {
              let columns = item.columns.map(c => c.field)
              if (!columns.includes(item.setting.primaryKey)) {
                window.mkInfo(`${item.$menuname} 主键已失效！`)
              }
            }

            item.scripts && item.scripts.forEach(c => {
              if (/"ErrCode":\s*"true"/.test(c.sql)) {
                window.mkInfo(`${item.$menuname} 数据源自定义脚本中使用了"ErrCode":"true"！`)
              }
            })

            sqls.push({uuid: item.uuid, type: 'datasource', LText: item.setting.$name})
          }
  
@@ -749,8 +764,25 @@
        if (cell.callbackType === 'script' && cell.verify && cell.verify.cbScripts) {
          sqls.push({uuid: 'back_' + cell.uuid, type: 'btnCallBack', LText: cell.logLabel})
        }

        if (cell.verify) {
          cell.verify.scripts && cell.verify.scripts.forEach(c => {
            if (/"ErrCode":\s*"true"/.test(c.sql)) {
              window.mkInfo(`${cell.logLabel} 自定义脚本中使用了"ErrCode":"true"！`)
            }
          })
          cell.verify.cbScripts && cell.verify.cbScripts.forEach(c => {
            if (/"ErrCode":\s*"true"/.test(c.sql)) {
              window.mkInfo(`${cell.logLabel} 回调脚本中使用了"ErrCode":"true"！`)
            }
          })
        }

        if (['pop', 'formSubmit'].includes(cell.OpenType) && cell.modal && cell.modal.fields) {
          cell.modal.fields.forEach(form => {
            // if (form.type === 'fileupload' && form.compress !== 'oss') {
            //   window.mkInfo(`${cell.logLabel}-${form.label}`)
            // }
            // 数据源sql语句，预处理，权限黑名单字段设置为隐藏表单
            if (['select', 'link', 'multiselect', 'radio', 'checkbox', 'checkcard'].includes(form.type) && form.resourceType === '1') {
              sqls.push({uuid: md5(cell.uuid + form.uuid), type: 'form', LText: `${cell.logLabel}-${form.label}（表单）`})
@@ -781,6 +813,9 @@
          }
          if (cell.execMode === 'pop' && cell.modal && cell.modal.fields) {
            cell.modal.fields.forEach(form => {
              // if (form.type === 'fileupload' && form.compress !== 'oss') {
              //   window.mkInfo(`${cell.logLabel}-${form.label}`)
              // }
              // 数据源sql语句，预处理，权限黑名单字段设置为隐藏表单
              if (['select', 'link', 'multiselect', 'radio', 'checkbox', 'checkcard'].includes(form.type) && form.resourceType === '1') {
                sqls.push({uuid: md5(cell.uuid + form.uuid), type: 'form', LText: `${cell.logLabel}-${form.label}（表单）`})