2024-05-24

king

2024-05-24 c2e3da0fa536e12d078731146008a9d8e0ba96aa

2024-05-24

 src/menu/debug/index.jsx

@@ -430,7 +430,7 @@
      }
    } else if (cell.OpenType === 'excelIn') {
      if (cell.intertype === 'system') {
        sql = this.getExcelInSql(cell)
        sql = this.getExcelInSql(cell, process)
      }
    } else if (cell.OpenType === 'excelOut') {
      if (cell.intertype === 'system' && cell.verify && cell.verify.dataType === 'custom') {
@@ -1580,13 +1580,55 @@

      ${_uniquesql}
      ${_prevCustomScript}
      ${_insert}
      ${_insert}`

    if (btn.workFlow === 'true' && process) {
      if (btn.flowSql === 'true') {
        sql += `
        /* 工作流默认sql */
        insert into s_my_works_flow (works_flow_id,works_flow_code,works_flow_name,works_flow_param,status,statusname,work_group,works_flow_detail_id,work_grade,bid,createuserid,CreateUser,CreateStaff,upid)
        select jskey,@works_flow_code@,@works_flow_name@,@works_flow_param@,@status@,@statusname@,@work_group@,@works_flow_detail_id@,@work_grade@,@bid@,@UserID@,@UserName,@FullName,@time_id@
        #${sheet}
                                                                   
        insert into s_my_works_flow_log (works_flow_id,works_flow_code,works_flow_name,works_flow_param,status,statusname,works_flow_detail_id,work_group,work_grade,bid,createuserid,CreateUser,CreateStaff,upid)
        select jskey,@works_flow_code@,@works_flow_name@ ,@works_flow_param@,@status@,@statusname@,@works_flow_detail_id@,@work_group@,@work_grade@,@bid@,@UserID@,@UserName,@FullName,@time_id@
        #${sheet}
                                                                   
        insert into s_my_works_flow_notice (works_flow_id,works_flow_code,works_flow_detail_id,userid,notice_type,createuserid,CreateUser,CreateStaff,upid)
        select jskey,@works_flow_code@,@works_flow_detail_id@,@userid@,@start_type@,@userid@,@UserName,@FullName,@time_id@
        #${sheet}
                                                                   
        insert into s_my_works_flow_role (works_flow_id,works_flow_code,userid,works_flow_detail_id,createuserid,CreateUser,CreateStaff,upid,typecharone)
        select jskey,@works_flow_code@,@userid@,@works_flow_detail_id@,@userid@,@UserName,@FullName,@time_id@,'begin'
        #${sheet}
        `
      }

      sql += `
      ${_backCustomScript}

      drop table #${sheet}
      
      aaa: select @ErrorCode as ErrorCode,@retmsg as retmsg`

      sql = sql.replace(/@start_type@/ig, `'开始'`)
      sql = sql.replace(/@works_flow_code@/ig, `'mk'`)
      sql = sql.replace(/@works_flow_name@/ig, `'mk'`)
      sql = sql.replace(/@works_flow_param@/ig, `''`)
      sql = sql.replace(/@works_flow_detail_id@/ig, `'0'`)
      sql = sql.replace(/@status@/ig, `'888'`)
      sql = sql.replace(/@statusname@/ig, `'结束'`)
      sql = sql.replace(/@work_group@/ig, `'mk'`)
      sql = sql.replace(/@work_grade@/ig, `'0'`)
    } else {
      sql += `
        ${_backCustomScript}
  
        drop table #${sheet}
        
        aaa: select @ErrorCode as ErrorCode,@retmsg as retmsg`
    }

    return sql
  }


 src/templates/sharecomponent/actioncomponent/verifyexcelin/customscript/index.jsx

@@ -81,7 +81,7 @@
  }

  handleConfirm = () => {
    const { type, btn } = this.props
    const { type, btn, workFlow } = this.props
    const { editItem, skip } = this.state

    // 表单提交时检查输入值是否正确
@@ -169,6 +169,18 @@
        let sql = this.state.verifySql + _initCustomScript + _prevCustomScript + _backCustomScript + tail
        sql = sql.replace(/@\$|\$@/ig, '').replace(/\$check@|@check\$/ig, '').replace(/@datam@/ig, `''`).replace(/@typename@/ig, `'debug'`)
        
        if (workFlow === 'true') {
          sql = sql.replace(/@works_flow_code@/ig, `'works_flow_code'`)
          sql = sql.replace(/@works_flow_name@/ig, `'works_flow_name'`)
          sql = sql.replace(/@works_flow_param@/ig, `'works_flow_param'`)
          sql = sql.replace(/@works_flow_detail_id@/ig, `'works_flow_detail_id'`)
          sql = sql.replace(/@status@/ig, `0`)
          sql = sql.replace(/@statusname@/ig, `'开始'`)
          sql = sql.replace(/@work_group@/ig, `'work_group'`)
          sql = sql.replace(/@work_grade@/ig, '0')
          sql = sql.replace(/@start_type@/ig, `'开始'`)
        }

        if (skip) {
          this.setState({
            skip: false,
@@ -233,6 +245,24 @@
      database = database ? (database[0] || '') : ''

      _value = `Insert into ${database}${sheet} (${fields}createuserid,createuser,createstaff,bid)\nSelect ${fields}@userid@,@username,@fullname,@BID@ From #${sheet}`
    } else if (value === 'flowSql') {
      let sheet = btn.sheet.replace(/(.*)\.(.*)\.|@db@/ig, '')

      _value = `insert into s_my_works_flow (works_flow_id,works_flow_code,works_flow_name,works_flow_param,status,statusname,work_group,works_flow_detail_id,work_grade,bid,createuserid,CreateUser,CreateStaff,upid)
      select jskey,@works_flow_code@,@works_flow_name@,@works_flow_param@,@status@,@statusname@,@work_group@,@works_flow_detail_id@,@work_grade@,@bid@,@UserID@,@UserName,@FullName,@time_id@
      #${sheet}
                                                                 
      insert into s_my_works_flow_log (works_flow_id,works_flow_code,works_flow_name,works_flow_param,status,statusname,works_flow_detail_id,work_group,work_grade,bid,createuserid,CreateUser,CreateStaff,upid)
      select jskey,@works_flow_code@,@works_flow_name@ ,@works_flow_param@,@status@,@statusname@,@works_flow_detail_id@,@work_group@,@work_grade@,@bid@,@UserID@,@UserName,@FullName,@time_id@
      #${sheet}
                                                                 
      insert into s_my_works_flow_notice (works_flow_id,works_flow_code,works_flow_detail_id,userid,notice_type,createuserid,CreateUser,CreateStaff,upid)
      select jskey,@works_flow_code@,@works_flow_detail_id@,@userid@,@start_type@,@userid@,@UserName,@FullName,@time_id@
      #${sheet}
                                                                 
      insert into s_my_works_flow_role (works_flow_id,works_flow_code,userid,works_flow_detail_id,createuserid,CreateUser,CreateStaff,upid,typecharone)
      select jskey,@works_flow_code@,@userid@,@works_flow_detail_id@,@userid@,@UserName,@FullName,@time_id@,'begin'
      #${sheet}`
    } else {
      _value = value
    }
@@ -259,7 +289,7 @@
  }

  render() {
    const { systemScripts, btn, type } = this.props
    const { systemScripts, btn, type, workFlow } = this.props
    const { usefulfields, editItem, skip } = this.state
    const { getFieldDecorator } = this.props.form
    const formItemLayout = {
@@ -289,6 +319,7 @@
          {!type ? <Col span={24} className="sqlfield">
            <Form.Item label="可用字段">
              <Tooltip mouseLeaveDelay={0.3} mouseEnterDelay={0.3} placement="top" title={'公共值，请按照@xxx@格式使用。'}><span style={{color: '#1890ff'}}>BID, ID, LoginUID, SessionUid, UserID, Appkey, time_id, typename</span></Tooltip>,&nbsp;
              {workFlow === 'true' ? <Tooltip mouseLeaveDelay={0.3} mouseEnterDelay={0.3} placement="top" title="工作流变量，请按照@xxx@格式使用。"><span style={{color: '#26C281'}}>works_flow_code, works_flow_name, works_flow_param, works_flow_detail_id, status, statusname, work_group, work_grade, start_type, </span></Tooltip> : null}
              <Tooltip mouseLeaveDelay={0.3} mouseEnterDelay={0.3} placement="top" title={'系统变量，系统会定义变量并赋值。'}><span style={{color: '#fa8c16'}}>UserName, FullName, RoleID, mk_departmentcode, mk_organization, mk_user_type, mk_nation, mk_province, mk_city, mk_district, mk_address</span></Tooltip>,&nbsp;
              {usefulfields}
            </Form.Item>
@@ -319,9 +350,8 @@
                onSelect={this.selectScript}
                getPopupContainer={() => document.getElementById('verify-excelin-custom-scripts')}
              >
                <Select.Option key="default" value={'default'}>
                  默认sql
                </Select.Option>
                <Select.Option key="default" value="default">默认sql</Select.Option>
                {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>

 src/templates/sharecomponent/actioncomponent/verifyexcelin/index.jsx

@@ -259,12 +259,8 @@

          let _sheet = this.props.card.sheet

          if (window.GLOB.externalDatabase !== null) {
            _sheet = _sheet.replace(/@db@/ig, window.GLOB.externalDatabase)
          }

          let database = _sheet.match(/(.*)\.(.*)\./ig)
          let sheet = _sheet.replace(/(.*)\.(.*)\./ig, '')
          let database = _sheet.match(/(.*)\.(.*)\.|@db@/ig) || ''
          let sheet = _sheet.replace(/(.*)\.(.*)\.|@db@/ig, '')
          
          database = database ? (database[0] || '') : ''

@@ -403,6 +399,16 @@
    _verify.columns = _columns
    _verify.scripts = _verify.scripts || []
    _verify.uniques = _verify.uniques || []

    if (window.GLOB.process && card.intertype === 'system') {
      _verify.workFlow = _verify.workFlow || 'false'
      _verify.flowType = 'start'
      _verify.flowSql = _verify.flowSql || 'true'
    } else {
      delete _verify.workFlow
      delete _verify.flowType
      delete _verify.flowSql
    }

    this.setState({
      searchKey: '',
@@ -879,21 +885,11 @@
    })
  }

  onOptionChange = (e) => {
  onOptionChange = (value, key) => {
    const { verify } = this.state
    let value = e.target.value

    this.setState({
      verify: {...verify, default: value}
    })
  }

  onHandleChange = (e) => {
    const { verify } = this.state
    let value = e.target.value

    this.setState({
      verify: {...verify, excelHandle: value}
      verify: {...verify, [key]: value}
    })
  }

@@ -975,8 +971,8 @@
            <Form {...formItemLayout}>
              <Row gutter={24}>
                {card.intertype === 'system' ? <Col span={8}>
                  <Form.Item label={'默认sql'}>
                    <Radio.Group value={verify.default} onChange={this.onOptionChange}>
                  <Form.Item label="默认sql">
                    <Radio.Group value={verify.default} onChange={(e) => this.onOptionChange(e.target.value, 'default')}>
                      <Radio value="true">执行</Radio>
                      <Radio value="false">不执行</Radio>
                    </Radio.Group>
@@ -992,7 +988,7 @@
                    {getFieldDecorator('excelHandle', {
                      initialValue: verify.excelHandle
                    })(
                    <Radio.Group onChange={this.onHandleChange}>
                    <Radio.Group onChange={(e) => this.onOptionChange(e.target.value, 'excelHandle')}>
                      <Radio value="false">默认</Radio>
                      <Radio value="true">自定义</Radio>
                    </Radio.Group>)}
@@ -1041,6 +1037,22 @@
                    })(<CodeMirror mode="text/javascript" theme="cobalt" />)}
                  </Form.Item>
                </Col> : null}
                {window.GLOB.process && card.intertype === 'system' ? <Col span={8}>
                  <Form.Item label="工作流">
                    <Radio.Group value={verify.workFlow} onChange={(e) => {this.onOptionChange(e.target.value, 'workFlow')}}>
                      <Radio value="true">开启</Radio>
                      <Radio value="false">不开启</Radio>
                    </Radio.Group>
                  </Form.Item>
                </Col> : null}
                {verify.workFlow === 'true' ? <Col span={8}>
                  <Form.Item label="默认sql（工作流）">
                    <Radio.Group value={verify.flowSql} onChange={(e) => {this.onOptionChange(e.target.value, 'flowSql')}}>
                      <Radio value="true">执行</Radio>
                      <Radio value="false">不执行</Radio>
                    </Radio.Group>
                  </Form.Item>
                </Col> : null}
              </Row>
            </Form>
          </TabPane>
@@ -1087,6 +1099,7 @@
                btn={this.props.card}
                usefulfields={verify.columns}
                scripts={verify.scripts}
                workFlow={verify.workFlow}
                systemScripts={this.state.systemScripts}
                scriptsChange={this.scriptsChange}
                wrappedComponentRef={(inst) => this.scriptsFullForm = inst}
@@ -1096,6 +1109,7 @@
              btn={this.props.card}
              usefulfields={verify.columns}
              scripts={verify.scripts}
              workFlow={verify.workFlow}
              systemScripts={this.state.systemScripts}
              scriptsChange={this.scriptsChange}
              wrappedComponentRef={(inst) => this.scriptsForm = inst}

 src/utils/utils.js

@@ -1256,13 +1256,85 @@

      ${_uniquesql}
      ${_prevCustomScript}
      ${_insert}
      ${_insert}`

    if (item.$process && btn.workFlow === 'true' && window.GLOB.UserCacheMap.has(item.$flowId)) {
      let flow = window.GLOB.UserCacheMap.get(item.$flowId)
      let target = flow.cells.filter(cell => cell.mknode === 'start')[0]
      
      let flowsql = ''
      let status = 0
      let statusName = ''
      let detailId = ''
      let work_grade = sessionStorage.getItem('work_grade') || 0
  
      if (target) {
        detailId = target.id
        status = target.mkdata.status
        statusName = target.mkdata.statusName
      }
  
      if (!target) {
        status = 0
        statusName = '异常'
  
        flowsql = `
        /* 工作流异常sql */
        select @ErrorCode='E',@retmsg='工作流无开始节点' goto aaa
        `
      } else if (btn.flowSql === 'true') {
        flowsql = `
        /* 工作流默认sql */
        insert into s_my_works_flow (works_flow_id,works_flow_code,works_flow_name,works_flow_param,status,statusname,work_group,works_flow_detail_id,work_grade,bid,createuserid,CreateUser,CreateStaff,upid)
        select jskey,@works_flow_code@,@works_flow_name@,@works_flow_param@,@status@,@statusname@,@work_group@,@works_flow_detail_id@,@work_grade@,@bid@,@UserID@,@UserName,@FullName,@time_id@
        #${sheet}
                                                                   
        insert into s_my_works_flow_log (works_flow_id,works_flow_code,works_flow_name,works_flow_param,status,statusname,works_flow_detail_id,work_group,work_grade,bid,createuserid,CreateUser,CreateStaff,upid)
        select jskey,@works_flow_code@,@works_flow_name@ ,@works_flow_param@,@status@,@statusname@,@works_flow_detail_id@,@work_group@,@work_grade@,@bid@,@UserID@,@UserName,@FullName,@time_id@
        #${sheet}
                                                                   
        insert into s_my_works_flow_notice (works_flow_id,works_flow_code,works_flow_detail_id,userid,notice_type,createuserid,CreateUser,CreateStaff,upid)
        select jskey,@works_flow_code@,@works_flow_detail_id@,@userid@,@start_type@,@userid@,@UserName,@FullName,@time_id@
        #${sheet}
                                                                   
        insert into s_my_works_flow_role (works_flow_id,works_flow_code,userid,works_flow_detail_id,createuserid,CreateUser,CreateStaff,upid,typecharone)
        select jskey,@works_flow_code@,@userid@,@works_flow_detail_id@,@userid@,@UserName,@FullName,@time_id@,'begin'
        #${sheet}
        `
      }
      sql += `
      ${flowsql}
      ${_backCustomScript}

      drop table #${sheet}
      
      aaa: select @ErrorCode as ErrorCode,@retmsg as retmsg`

      sql = sql.replace(/@start_type@/ig, `'开始'`)
      sql = sql.replace(/@works_flow_code@/ig, `'${flow.flow_code}'`)
      sql = sql.replace(/@works_flow_name@/ig, `'${flow.flow_name}'`)
  
      if (target) {
        let label = target.attrs && target.attrs.text && target.attrs.text.text ? target.attrs.text.text : ''
        let msg = {...target.mkdata, label: label, id: target.id, checkIds: [], checkUsers: []}
        sql = sql.replace(/@works_flow_param@/ig, `'${window.btoa(window.encodeURIComponent(JSON.stringify(msg)))}'`)
      } else {
        sql = sql.replace(/@works_flow_param@/ig, `''`)
      }
      sql = sql.replace(/@works_flow_detail_id@/ig, `'${detailId}'`)
      sql = sql.replace(/@status@/ig, `'${status}'`)
      sql = sql.replace(/@statusname@/ig, `'${statusName}'`)
      sql = sql.replace(/@work_group@/ig, `'${sessionStorage.getItem('work_group') || ''}'`)
      sql = sql.replace(/@work_grade@/ig, `'${work_grade}'`)
    } else {
      sql += `
      ${_backCustomScript}

      drop table #${sheet}
      
      aaa: select @ErrorCode as ErrorCode,@retmsg as retmsg`
    }

    sql = sql.replace(/\n\s{6}/ig, '\n')

    if (window.GLOB.debugger === true) {