Merge branch 'develop'

king

2023-08-31 a24767eaec0a43617f386ef950eff2272eae003f

 src/templates/zshare/verifycard/customscript/index.jsx

@@ -251,6 +251,8 @@
  }

  selectScript = (value, option) => {
    // const { flowType } = this.props

    if (!value || !option) return

    let _sql = this.props.form.getFieldValue('sql')
@@ -261,6 +263,11 @@
      _sql = _sql + ` 

      `
    }

    if (value === 'flowSql') {
      value = `insert into s_my_works_flow ( works_flow_id,works_flow_code,works_flow_param,work_group,works_flow_detail_id,work_grade,bid,createuserid,CreateUser,CreateStaff)
      select @ID@,'流程编码','下一步要用到的参数串','职员分组','流程节点id','职员等级',@bid@,@UserID@,@UserName,@FullName`
    }

    _sql = _sql.replace(/\s{6}$/, '')
@@ -275,7 +282,7 @@
  }

  render() {
    const { usefulfields, systemScripts, btn, type } = this.props
    const { usefulfields, systemScripts, btn, type, workFlow } = this.props
    const { getFieldDecorator } = this.props.form
    const { editItem, skip } = this.state
    const formItemLayout = {
@@ -341,6 +348,7 @@
                getPopupContainer={() => document.getElementById('verify-custom-scripts' + _type)}
              >
                <Select.Option key="default" value={this.props.defaultsql}>默认sql</Select.Option>
                {window.GLOB.process && workFlow === 'true' ? <Select.Option key="flow" value="flowSql">默认sql（工作流）</Select.Option> : null}
                <Select.Option key="debugger" value={`z_debug: select @ErrorCode='E',@retmsg='测试断点' goto aaa`}>
                  测试断点
                </Select.Option>