2020-12-01

king

2020-12-01 b3852c89968e9d5d6a3b9a4998d869bfbbfd1842

 src/templates/sharecomponent/settingcalcomponent/verifycard/index.jsx

@@ -22,7 +22,6 @@
  static propTpyes = {
    dict: PropTypes.object,          // 字典项
    tableFields: PropTypes.any,      // 数据源信息
    permFuncField: PropTypes.any,    // 数据源信息
    config: PropTypes.object,        // 数据源信息
    menuId: PropTypes.string,        // 菜单Id
    searches: PropTypes.array,       // 搜索条件
@@ -149,6 +148,7 @@
              })
            }, () => {             // 验证失败
              this.setState({
                activeKey: val,
                loading: false
              })
            }, activeKey)
@@ -197,6 +197,7 @@
        })
      }, () => {             // 验证失败
        this.setState({
          activeKey: val,
          loading: false
        })
      }, activeKey)
@@ -243,7 +244,7 @@
  }

  sqlverify = (resolve, reject, type, testScripts) => {
    const { searches } = this.props
    const { searches, config } = this.props
    const { columns, setting, scripts } = this.state

    if (setting.interType !== 'system') { // 不使用系统接口时，不需要sql验证
@@ -277,7 +278,7 @@
    } else if (setting.execute !== 'false' || _scripts.length > 0) {
      let param = {
        func: 's_debug_sql',
        LText: SettingUtils.getDebugSql(setting, _scripts, columns, searches)
        LText: SettingUtils.getDebugSql(setting, _scripts, columns, Utils.getRegOptions(searches), config.calendar)
      }
      param.LText = Utils.formatOptions(param.LText)
      param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
@@ -336,7 +337,6 @@
            <SettingForm
              menuId={this.props.menuId}
              dict={this.props.dict}
              permFuncField={this.props.permFuncField}
              columns={columns}
              setting={setting}
              scripts={scripts}
@@ -364,7 +364,12 @@
              pagination={false}
            />
          </TabPane>
          <TabPane tab="自定义脚本" key="scripts">
          <TabPane tab={
            <span>
              自定义脚本
              {scripts.length ? <span className="count-tip">{scripts.length}</span> : null}
            </span>
          } key="scripts">
            <CustomScript
              dict={this.props.dict}
              setting={setting}